diff --git a/Makefile b/Makefile index 65345527..c3f63f92 100644 --- a/Makefile +++ b/Makefile @@ -85,6 +85,9 @@ else ifeq ($(VERSION),sh) DEFINES += VERSION_SH=1 endif +# FIXLIGHTS - converts light objects to light color commands for assets, needed for vanilla-style lighting +FIXLIGHTS ?= 1 + DEBUG_MAP_STACKTRACE_FLAG := -D DEBUG_MAP_STACKTRACE TARGET := sm64 @@ -222,7 +225,7 @@ TARGET_STRING := sm64 # UNF - whether to use UNFLoader flashcart library # 1 - includes code in ROM -# 0 - does not +# 0 - does not UNF ?= 0 $(eval $(call validate-option,UNF,0 1)) ifeq ($(UNF),1) @@ -234,7 +237,7 @@ endif # ISVPRINT - whether to fake IS-Viewer presence, # allowing for usage of CEN64 (and possibly Project64) to print messages to terminal. # 1 - includes code in ROM -# 0 - does not +# 0 - does not ISVPRINT ?= 0 $(eval $(call validate-option,ISVPRINT,0 1)) ifeq ($(ISVPRINT),1) @@ -252,7 +255,7 @@ endif # HVQM - whether to use HVQM fmv library # 1 - includes code in ROM -# 0 - does not +# 0 - does not HVQM ?= 0 $(eval $(call validate-option,HVQM,0 1)) ifeq ($(HVQM),1) @@ -287,7 +290,7 @@ $(eval $(call validate-option,GZIPVER,std libdef)) # GODDARD - whether to use libgoddard (Mario Head) # 1 - includes code in ROM -# 0 - does not +# 0 - does not GODDARD ?= 0 $(eval $(call validate-option,GODDARD,0 1)) ifeq ($(GODDARD),1) @@ -423,8 +426,6 @@ DEP_FILES := $(O_FILES:.o=.d) $(LIBZ_O_FILES:.o=.d) $(GODDARD_O_FILES:.o=.d) $(B # detect prefix for MIPS toolchain ifneq ($(call find-command,mips64-elf-ld),) CROSS := mips64-elf- -else ifneq ($(call find-command,mips-n64-ld),) - CROSS := mips-n64- else ifneq ($(call find-command,mips64-ld),) CROSS := mips64- else ifneq ($(call find-command,mips-linux-gnu-ld),) @@ -513,6 +514,7 @@ AIFF_EXTRACT_CODEBOOK := $(TOOLS_DIR)/aiff_extract_codebook VADPCM_ENC := $(TOOLS_DIR)/vadpcm_enc EXTRACT_DATA_FOR_MIO := $(TOOLS_DIR)/extract_data_for_mio SKYCONV := $(TOOLS_DIR)/skyconv +FIXLIGHTS_PY := $(TOOLS_DIR)/fixlights.py ifeq ($(GZIPVER),std) GZIP := gzip else @@ -814,6 +816,14 @@ $(BUILD_DIR)/src/game/version_data.h: tools/make_version.sh #==============================================================================# # Compile C code +ifeq ($(FIXLIGHTS),1) +# This must not be run multiple times at once, so we run it ahead of time rather than in a rule +DUMMY != $(FIXLIGHTS_PY) actors +# Modify the leveldata build rule to fix lights for any files in that level's folder +$(BUILD_DIR)/levels/%/leveldata.o: levels/%/leveldata.c + $(V)$(FIXLIGHTS_PY) $(dir $<) + $(V)$(CC) -c $(CFLAGS) -MMD -MF $(BUILD_DIR)/$*.d -o $@ $< +endif $(BUILD_DIR)/%.o: %.c $(call print,Compiling:,$<,$@) $(V)$(CC) -c $(CFLAGS) -MMD -MF $(BUILD_DIR)/$*.d -o $@ $< diff --git a/actors/bird/model.inc.c b/actors/bird/model.inc.c index d7e2ca82..abedf2d8 100644 --- a/actors/bird/model.inc.c +++ b/actors/bird/model.inc.c @@ -1,22 +1,10 @@ // Birds // 0x05000000 -static const Lights1 birds_seg5_lights_05000000 = gdSPDefLights1( - 0x07, 0x24, 0x2c, - 0x1d, 0x91, 0xb0, 0x28, 0x28, 0x28 -); // 0x05000018 -static const Lights1 birds_seg5_lights_05000018 = gdSPDefLights1( - 0x33, 0x27, 0x0d, - 0xce, 0x9d, 0x34, 0x28, 0x28, 0x28 -); // 0x05000030 -static const Lights1 birds_seg5_lights_05000030 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05000048 static const Vtx birds_seg5_vertex_05000048[] = { @@ -138,8 +126,8 @@ static const Vtx birds_seg5_vertex_050004C8[] = { // 0x05000528 - 0x05000598 const Gfx birds_seg5_dl_05000528[] = { - gsSPLight(&birds_seg5_lights_05000000.l, 1), - gsSPLight(&birds_seg5_lights_05000000.a, 2), + gsSPLightColor(LIGHT_1, 0x1d91b0ff), + gsSPLightColor(LIGHT_2, 0x7242cff), gsSPVertex(birds_seg5_vertex_05000048, 9, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0), gsSP2Triangles( 4, 3, 2, 0x0, 5, 3, 6, 0x0), @@ -151,16 +139,16 @@ const Gfx birds_seg5_dl_05000528[] = { // 0x05000598 - 0x05000600 const Gfx birds_seg5_dl_05000598[] = { - gsSPLight(&birds_seg5_lights_05000000.l, 1), - gsSPLight(&birds_seg5_lights_05000000.a, 2), + gsSPLightColor(LIGHT_1, 0x1d91b0ff), + gsSPLightColor(LIGHT_2, 0x7242cff), gsSPVertex(birds_seg5_vertex_050000D8, 3, 0), gsSP1Triangle( 0, 1, 2, 0x0), - gsSPLight(&birds_seg5_lights_05000000.l, 1), - gsSPLight(&birds_seg5_lights_05000000.a, 2), + gsSPLightColor(LIGHT_1, 0x1d91b0ff), + gsSPLightColor(LIGHT_2, 0x7242cff), gsSPVertex(birds_seg5_vertex_05000108, 3, 0), gsSP1Triangle( 0, 1, 2, 0x0), - gsSPLight(&birds_seg5_lights_05000000.l, 1), - gsSPLight(&birds_seg5_lights_05000000.a, 2), + gsSPLightColor(LIGHT_1, 0x1d91b0ff), + gsSPLightColor(LIGHT_2, 0x7242cff), gsSPVertex(birds_seg5_vertex_05000138, 3, 0), gsSP1Triangle( 0, 1, 2, 0x0), gsSPEndDisplayList(), @@ -168,8 +156,8 @@ const Gfx birds_seg5_dl_05000598[] = { // 0x05000600 - 0x05000670 const Gfx birds_seg5_dl_05000600[] = { - gsSPLight(&birds_seg5_lights_05000000.l, 1), - gsSPLight(&birds_seg5_lights_05000000.a, 2), + gsSPLightColor(LIGHT_1, 0x1d91b0ff), + gsSPLightColor(LIGHT_2, 0x7242cff), gsSPVertex(birds_seg5_vertex_05000168, 9, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0), gsSP2Triangles( 0, 3, 4, 0x0, 5, 3, 6, 0x0), @@ -181,8 +169,8 @@ const Gfx birds_seg5_dl_05000600[] = { // 0x05000670 - 0x050007E0 const Gfx birds_seg5_dl_05000670[] = { - gsSPLight(&birds_seg5_lights_05000000.l, 1), - gsSPLight(&birds_seg5_lights_05000000.a, 2), + gsSPLightColor(LIGHT_1, 0x1d91b0ff), + gsSPLightColor(LIGHT_2, 0x7242cff), gsSPVertex(birds_seg5_vertex_050001F8, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 1, 9, 10, 0x0), @@ -198,16 +186,16 @@ const Gfx birds_seg5_dl_05000670[] = { gsSP1Triangle( 7, 6, 15, 0x0), gsSPVertex(birds_seg5_vertex_050003F8, 3, 0), gsSP1Triangle( 0, 1, 2, 0x0), - gsSPLight(&birds_seg5_lights_05000030.l, 1), - gsSPLight(&birds_seg5_lights_05000030.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(birds_seg5_vertex_05000428, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 0, 7, 0x0, 7, 8, 6, 0x0), gsSP2Triangles( 9, 7, 2, 0x0, 2, 7, 0, 0x0), gsSP2Triangles( 2, 3, 9, 0x0, 7, 9, 8, 0x0), gsSP1Triangle( 5, 4, 1, 0x0), - gsSPLight(&birds_seg5_lights_05000018.l, 1), - gsSPLight(&birds_seg5_lights_05000018.a, 2), + gsSPLightColor(LIGHT_1, 0xce9d34ff), + gsSPLightColor(LIGHT_2, 0x33270dff), gsSPVertex(birds_seg5_vertex_050004C8, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 4, 0x0), gsSP1Triangle( 1, 3, 5, 0x0), diff --git a/actors/blargg/model.inc.c b/actors/blargg/model.inc.c index 75904563..399ad6c6 100644 --- a/actors/blargg/model.inc.c +++ b/actors/blargg/model.inc.c @@ -1,34 +1,14 @@ // Blargg (Unused) // Unreferenced light group -UNUSED static const Lights1 blargg_lights_unused = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05004740 -static const Lights1 blargg_seg5_lights_05004740 = gdSPDefLights1( - 0x3f, 0x0d, 0x05, - 0xff, 0x36, 0x16, 0x28, 0x28, 0x28 -); // 0x05004758 -static const Lights1 blargg_seg5_lights_05004758 = gdSPDefLights1( - 0x2c, 0x2c, 0x2c, - 0xb2, 0xb2, 0xb2, 0x28, 0x28, 0x28 -); // 0x05004770 -static const Lights1 blargg_seg5_lights_05004770 = gdSPDefLights1( - 0x3f, 0x0a, 0x06, - 0xff, 0x2a, 0x1a, 0x28, 0x28, 0x28 -); // 0x05004788 -static const Lights1 blargg_seg5_lights_05004788 = gdSPDefLights1( - 0x3f, 0x0b, 0x07, - 0xff, 0x2e, 0x1f, 0x28, 0x28, 0x28 -); // 0x050047A0 static const Vtx blargg_seg5_vertex_050047A0[] = { @@ -383,8 +363,8 @@ static const Vtx blargg_seg5_vertex_050057E0[] = { // 0x050058D0 - 0x05005A60 const Gfx blargg_seg5_dl_050058D0[] = { - gsSPLight(&blargg_seg5_lights_05004758.l, 1), - gsSPLight(&blargg_seg5_lights_05004758.a, 2), + gsSPLightColor(LIGHT_1, 0xb2b2b2ff), + gsSPLightColor(LIGHT_2, 0x2c2c2cff), gsSPVertex(blargg_seg5_vertex_050047A0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), @@ -398,8 +378,8 @@ const Gfx blargg_seg5_dl_050058D0[] = { gsSPVertex(blargg_seg5_vertex_050049A0, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), - gsSPLight(&blargg_seg5_lights_05004740.l, 1), - gsSPLight(&blargg_seg5_lights_05004740.a, 2), + gsSPLightColor(LIGHT_1, 0xff3616ff), + gsSPLightColor(LIGHT_2, 0x3f0d05ff), gsSPVertex(blargg_seg5_vertex_05004A20, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), @@ -418,8 +398,8 @@ const Gfx blargg_seg5_dl_050058D0[] = { // 0x05005A60 - 0x05005D00 const Gfx blargg_seg5_dl_05005A60[] = { - gsSPLight(&blargg_seg5_lights_05004758.l, 1), - gsSPLight(&blargg_seg5_lights_05004758.a, 2), + gsSPLightColor(LIGHT_1, 0xb2b2b2ff), + gsSPLightColor(LIGHT_2, 0x2c2c2cff), gsSPVertex(blargg_seg5_vertex_05004BE0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), @@ -433,8 +413,8 @@ const Gfx blargg_seg5_dl_05005A60[] = { gsSPVertex(blargg_seg5_vertex_05004DE0, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), - gsSPLight(&blargg_seg5_lights_05004770.l, 1), - gsSPLight(&blargg_seg5_lights_05004770.a, 2), + gsSPLightColor(LIGHT_1, 0xff2a1aff), + gsSPLightColor(LIGHT_2, 0x3f0a06ff), gsSPVertex(blargg_seg5_vertex_05004E60, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 2, 6, 7, 0x0, 2, 7, 8, 0x0), @@ -472,8 +452,8 @@ const Gfx blargg_seg5_dl_05005A60[] = { // 0x05005D00 - 0x05005EB8 const Gfx blargg_seg5_dl_05005D00[] = { - gsSPLight(&blargg_seg5_lights_05004788.l, 1), - gsSPLight(&blargg_seg5_lights_05004788.a, 2), + gsSPLightColor(LIGHT_1, 0xff2e1fff), + gsSPLightColor(LIGHT_2, 0x3f0b07ff), gsSPVertex(blargg_seg5_vertex_050053E0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), diff --git a/actors/blue_coin_switch/model.inc.c b/actors/blue_coin_switch/model.inc.c index bb5c89fd..ccdbb73f 100644 --- a/actors/blue_coin_switch/model.inc.c +++ b/actors/blue_coin_switch/model.inc.c @@ -1,10 +1,6 @@ // Blue Coin Switch // 0x08000000 -static const Lights1 blue_coin_switch_seg8_lights_08000000 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x08000018 ALIGNED8 static const Texture blue_coin_switch_seg8_texture_08000018[] = { @@ -49,8 +45,8 @@ const Gfx blue_coin_switch_seg8_dl_08000D58[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, blue_coin_switch_seg8_texture_08000018), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&blue_coin_switch_seg8_lights_08000000.l, 1), - gsSPLight(&blue_coin_switch_seg8_lights_08000000.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(blue_coin_switch_seg8_vertex_08000C18, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), diff --git a/actors/blue_fish/model.inc.c b/actors/blue_fish/model.inc.c index 3545358a..9355e0f0 100644 --- a/actors/blue_fish/model.inc.c +++ b/actors/blue_fish/model.inc.c @@ -1,10 +1,6 @@ // Blue Fish // 0x0301B5C8 -static const Lights1 blue_fish_seg3_lights_0301B5C8 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0301B5E0 ALIGNED8 static const Texture blue_fish_seg3_texture_0301B5E0[] = { @@ -34,8 +30,8 @@ const Gfx blue_fish_seg3_dl_0301BEC0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, blue_fish_seg3_texture_0301B5E0), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&blue_fish_seg3_lights_0301B5C8.l, 1), - gsSPLight(&blue_fish_seg3_lights_0301B5C8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(blue_fish_seg3_vertex_0301BDE0, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 4, 0x0), gsSP2Triangles( 5, 0, 3, 0x0, 2, 6, 0, 0x0), @@ -86,8 +82,8 @@ const Gfx blue_fish_seg3_dl_0301C0A8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, blue_fish_seg3_texture_0301B5E0), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&blue_fish_seg3_lights_0301B5C8.l, 1), - gsSPLight(&blue_fish_seg3_lights_0301B5C8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(blue_fish_seg3_vertex_0301C018, 9, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 4, 0x0), gsSP2Triangles( 4, 5, 2, 0x0, 2, 5, 6, 0x0), diff --git a/actors/bobomb/model.inc.c b/actors/bobomb/model.inc.c index 6e4296c2..f9a48ac1 100644 --- a/actors/bobomb/model.inc.c +++ b/actors/bobomb/model.inc.c @@ -168,22 +168,10 @@ const Gfx bobomb_seg8_dl_08022D78[] = { }; // 0x08022DE8 -static const Lights1 bobomb_seg8_lights_08022DE8 = gdSPDefLights1( - 0x3f, 0x26, 0x04, - 0xff, 0x99, 0x12, 0x28, 0x28, 0x28 -); // 0x08022E00 -static const Lights1 bobomb_seg8_lights_08022E00 = gdSPDefLights1( - 0x2c, 0x2c, 0x2c, - 0xb2, 0xb2, 0xb2, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 bobomb_lights_unused = gdSPDefLights1( - 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x08022E30 static const Vtx bobomb_seg8_vertex_08022E30[] = { @@ -279,8 +267,8 @@ static const Vtx bobomb_seg8_vertex_08023190[] = { // 0x08023270 - 0x08023378 const Gfx bobomb_seg8_dl_08023270[] = { - gsSPLight(&bobomb_seg8_lights_08022DE8.l, 1), - gsSPLight(&bobomb_seg8_lights_08022DE8.a, 2), + gsSPLightColor(LIGHT_1, 0xff9912ff), + gsSPLightColor(LIGHT_2, 0x3f2604ff), gsSPVertex(bobomb_seg8_vertex_08022E30, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -302,8 +290,8 @@ const Gfx bobomb_seg8_dl_08023270[] = { // 0x08023378 - 0x08023480 const Gfx bobomb_seg8_dl_08023378[] = { - gsSPLight(&bobomb_seg8_lights_08022DE8.l, 1), - gsSPLight(&bobomb_seg8_lights_08022DE8.a, 2), + gsSPLightColor(LIGHT_1, 0xff9912ff), + gsSPLightColor(LIGHT_2, 0x3f2604ff), gsSPVertex(bobomb_seg8_vertex_08022F70, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -325,8 +313,8 @@ const Gfx bobomb_seg8_dl_08023378[] = { // 0x08023480 - 0x08023528 const Gfx bobomb_seg8_dl_08023480[] = { - gsSPLight(&bobomb_seg8_lights_08022E00.l, 1), - gsSPLight(&bobomb_seg8_lights_08022E00.a, 2), + gsSPLightColor(LIGHT_1, 0xb2b2b2ff), + gsSPLightColor(LIGHT_2, 0x2c2c2cff), gsSPVertex(bobomb_seg8_vertex_080230B0, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 0, 3, 0x0, 4, 3, 5, 0x0), diff --git a/actors/bomb/model.inc.c b/actors/bomb/model.inc.c index 9ccb342a..acd09554 100644 --- a/actors/bomb/model.inc.c +++ b/actors/bomb/model.inc.c @@ -1,10 +1,6 @@ // Bomb // 0x06057AA8 -static const Lights1 bomb_seg6_lights_06057AA8 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x06057AC0 ALIGNED8 static const Texture bomb_seg6_texture_06057AC0[] = { @@ -173,8 +169,8 @@ const Gfx bomb_seg6_dl_0605A8A8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bomb_seg6_texture_06059AC0), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bomb_seg6_lights_06057AA8.l, 1), - gsSPLight(&bomb_seg6_lights_06057AA8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(bomb_seg6_vertex_0605A340, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), diff --git a/actors/boo/model.inc.c b/actors/boo/model.inc.c index 8d77221e..a73739c8 100644 --- a/actors/boo/model.inc.c +++ b/actors/boo/model.inc.c @@ -1,10 +1,6 @@ // Boo // 0x05009B28 -static const Lights1 boo_seg5_lights_05009B28 = gdSPDefLights1( - 0x97, 0x9a, 0xff, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05009B40 ALIGNED8 static const Texture boo_seg5_texture_05009B40[] = { @@ -261,8 +257,8 @@ const Gfx boo_seg5_dl_0500BEE0[] = { gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&boo_seg5_lights_05009B28.l, 1), - gsSPLight(&boo_seg5_lights_05009B28.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x979affff), gsSPVertex(boo_seg5_vertex_0500B340, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), diff --git a/actors/boo_castle/model.inc.c b/actors/boo_castle/model.inc.c index 24506c4b..44debb4f 100644 --- a/actors/boo_castle/model.inc.c +++ b/actors/boo_castle/model.inc.c @@ -1,10 +1,6 @@ // Boo (Castle) // 0x06015658 -static const Lights1 boo_castle_seg6_lights_06015658 = gdSPDefLights1( - 0x97, 0x9a, 0xff, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x06015670 ALIGNED8 static const Texture boo_castle_seg6_texture_06015670[] = { @@ -261,8 +257,8 @@ const Gfx boo_castle_seg6_dl_06017A10[] = { gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&boo_castle_seg6_lights_06015658.l, 1), - gsSPLight(&boo_castle_seg6_lights_06015658.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x979affff), gsSPVertex(boo_castle_seg6_vertex_06016E70, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), diff --git a/actors/book/model.inc.c b/actors/book/model.inc.c index 309d7f7e..0232b25e 100644 --- a/actors/book/model.inc.c +++ b/actors/book/model.inc.c @@ -3,10 +3,6 @@ // This actor file requires including actor bookend because of bookend_seg5_texture_05000C60 // 0x05002558 -static const Lights1 book_seg5_lights_05002558 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05002570 ALIGNED8 static const Texture book_seg5_texture_05002570[] = { @@ -50,8 +46,8 @@ const Gfx book_seg5_dl_05002EF0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bookend_seg5_texture_05000C60), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 32 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)), - gsSPLight(&book_seg5_lights_05002558.l, 1), - gsSPLight(&book_seg5_lights_05002558.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(book_seg5_vertex_05002D70, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), diff --git a/actors/bookend/model.inc.c b/actors/bookend/model.inc.c index 02d862e8..24ae981b 100644 --- a/actors/bookend/model.inc.c +++ b/actors/bookend/model.inc.c @@ -1,28 +1,12 @@ // Bookend // Unreferenced light group -UNUSED static const Lights1 bookend_lights_unused1 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 bookend_lights_unused2 = gdSPDefLights1( - 0x03, 0x19, 0x09, - 0x0c, 0x66, 0x26, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 bookend_lights_unused3 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 bookend_lights_unused4 = gdSPDefLights1( - 0x3f, 0x00, 0x00, - 0xff, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x05000060 ALIGNED8 static const Texture bookend_seg5_texture_05000060[] = { @@ -50,10 +34,6 @@ ALIGNED8 static const Texture bookend_seg5_texture_05001060[] = { }; // 0x05001860 -static const Lights1 bookend_seg5_lights_05001860 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05001878 static const Vtx bookend_seg5_vertex_05001878[] = { @@ -76,8 +56,8 @@ const Gfx bookend_seg5_dl_050018F8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bookend_seg5_texture_05000060), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 32 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bookend_seg5_lights_05001860.l, 1), - gsSPLight(&bookend_seg5_lights_05001860.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(bookend_seg5_vertex_05001878, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSPEndDisplayList(), @@ -116,10 +96,6 @@ const Gfx bookend_seg5_dl_05001978[] = { }; // 0x05001A08 -static const Lights1 bookend_seg5_lights_05001A08 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05001A20 static const Vtx bookend_seg5_vertex_05001A20[] = { @@ -142,8 +118,8 @@ const Gfx bookend_seg5_dl_05001AA0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bookend_seg5_texture_05000060), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 32 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bookend_seg5_lights_05001A08.l, 1), - gsSPLight(&bookend_seg5_lights_05001A08.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(bookend_seg5_vertex_05001A20, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), @@ -182,10 +158,6 @@ const Gfx bookend_seg5_dl_05001B20[] = { }; // 0x05001BB0 -static const Lights1 bookend_seg5_lights_05001BB0 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05001BC8 static const Vtx bookend_seg5_vertex_05001BC8[] = { @@ -216,8 +188,8 @@ const Gfx bookend_seg5_dl_05001CC8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bookend_seg5_texture_05000860), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 32 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bookend_seg5_lights_05001BB0.l, 1), - gsSPLight(&bookend_seg5_lights_05001BB0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(bookend_seg5_vertex_05001BC8, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSPEndDisplayList(), @@ -255,10 +227,6 @@ const Gfx bookend_seg5_dl_05001D68[] = { }; // 0x05001DE0 -static const Lights1 bookend_seg5_lights_05001DE0 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05001DF8 static const Vtx bookend_seg5_vertex_05001DF8[] = { @@ -289,8 +257,8 @@ const Gfx bookend_seg5_dl_05001EF8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bookend_seg5_texture_05000860), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 32 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bookend_seg5_lights_05001DE0.l, 1), - gsSPLight(&bookend_seg5_lights_05001DE0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(bookend_seg5_vertex_05001DF8, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSPEndDisplayList(), @@ -328,10 +296,6 @@ const Gfx bookend_seg5_dl_05001F98[] = { }; // 0x05002010 -static const Lights1 bookend_seg5_lights_05002010 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05002028 static const Vtx bookend_seg5_vertex_05002028[] = { @@ -354,8 +318,8 @@ const Gfx bookend_seg5_dl_050020E8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bookend_seg5_texture_05000460), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 32 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bookend_seg5_lights_05002010.l, 1), - gsSPLight(&bookend_seg5_lights_05002010.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(bookend_seg5_vertex_05002028, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), @@ -381,10 +345,6 @@ const Gfx bookend_seg5_dl_05002140[] = { }; // 0x050021B0 -static const Lights1 bookend_seg5_lights_050021B0 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x050021C8 static const Vtx bookend_seg5_vertex_050021C8[] = { @@ -407,8 +367,8 @@ const Gfx bookend_seg5_dl_05002288[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bookend_seg5_texture_05000460), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 32 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bookend_seg5_lights_050021B0.l, 1), - gsSPLight(&bookend_seg5_lights_050021B0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(bookend_seg5_vertex_050021C8, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), diff --git a/actors/bowser/model.inc.c b/actors/bowser/model.inc.c index 1d7899bd..bfab8d8b 100644 --- a/actors/bowser/model.inc.c +++ b/actors/bowser/model.inc.c @@ -148,22 +148,10 @@ ALIGNED8 static const Texture bowser_seg6_texture_06037C38[] = { }; // 0x06038C38 -static const Lights1 bowser_seg6_lights_06038C38 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 bowser_lights_unused1 = gdSPDefLights1( - 0x33, 0x31, 0x00, - 0xce, 0xc7, 0x00, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 bowser_lights_unused2 = gdSPDefLights1( - 0x34, 0x34, 0x00, - 0xd2, 0xd2, 0x00, 0x28, 0x28, 0x28 -); // 0x06038C80 static const Vtx bowser_seg6_vertex_06038C80[] = { @@ -267,8 +255,8 @@ const Gfx bowser_seg6_dl_06039110[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bowser_seg6_texture_06022438), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bowser_seg6_lights_06038C38.l, 1), - gsSPLight(&bowser_seg6_lights_06038C38.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(bowser_seg6_vertex_06038C80, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 6, 5, 0x0, 7, 8, 9, 0x0), @@ -439,8 +427,8 @@ const Gfx bowser_seg6_dl_06039808[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bowser_seg6_texture_06023C38), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bowser_seg6_lights_06038C38.l, 1), - gsSPLight(&bowser_seg6_lights_06038C38.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(bowser_seg6_vertex_06039368, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), @@ -671,8 +659,8 @@ const Gfx bowser_seg6_dl_0603A210[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bowser_seg6_texture_06022438), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bowser_seg6_lights_06038C38.l, 1), - gsSPLight(&bowser_seg6_lights_06038C38.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(bowser_seg6_vertex_06039A60, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 4, 0x0), gsSP2Triangles( 4, 0, 2, 0x0, 2, 1, 5, 0x0), @@ -947,8 +935,8 @@ const Gfx bowser_seg6_dl_0603AED8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bowser_seg6_texture_06022438), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bowser_seg6_lights_06038C38.l, 1), - gsSPLight(&bowser_seg6_lights_06038C38.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(bowser_seg6_vertex_0603A568, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 6, 5, 0x0, 7, 5, 8, 0x0), @@ -1132,8 +1120,8 @@ const Gfx bowser_seg6_dl_0603B718[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bowser_seg6_texture_06022438), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bowser_seg6_lights_06038C38.l, 1), - gsSPLight(&bowser_seg6_lights_06038C38.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(bowser_seg6_vertex_0603B288, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 1, 3, 0x0), gsSP2Triangles( 1, 4, 3, 0x0, 5, 3, 4, 0x0), @@ -1308,8 +1296,8 @@ const Gfx bowser_seg6_dl_0603BDF8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bowser_seg6_texture_06023C38), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bowser_seg6_lights_06038C38.l, 1), - gsSPLight(&bowser_seg6_lights_06038C38.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(bowser_seg6_vertex_0603B948, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 3, 5, 0x0, 7, 6, 5, 0x0), @@ -1481,8 +1469,8 @@ const Gfx bowser_seg6_dl_0603C500[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bowser_seg6_texture_06023C38), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bowser_seg6_lights_06038C38.l, 1), - gsSPLight(&bowser_seg6_lights_06038C38.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(bowser_seg6_vertex_0603C050, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 7, 0x0, 3, 7, 4, 0x0), @@ -1716,8 +1704,8 @@ const Gfx bowser_seg6_dl_0603CF28[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bowser_seg6_texture_06022438), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bowser_seg6_lights_06038C38.l, 1), - gsSPLight(&bowser_seg6_lights_06038C38.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(bowser_seg6_vertex_0603C758, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 4, 0x0), gsSP2Triangles( 5, 0, 4, 0x0, 0, 2, 6, 0x0), @@ -2007,8 +1995,8 @@ const Gfx bowser_seg6_dl_0603DC70[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bowser_seg6_texture_06022438), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bowser_seg6_lights_06038C38.l, 1), - gsSPLight(&bowser_seg6_lights_06038C38.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(bowser_seg6_vertex_0603D280, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 6, 7, 0x0, 4, 7, 8, 0x0), @@ -2197,8 +2185,8 @@ const Gfx bowser_seg6_dl_0603E500[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bowser_seg6_texture_06022438), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bowser_seg6_lights_06038C38.l, 1), - gsSPLight(&bowser_seg6_lights_06038C38.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(bowser_seg6_vertex_0603E030, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), @@ -2676,8 +2664,8 @@ const Gfx bowser_seg6_dl_0603FBA8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bowser_seg6_texture_06023C38), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bowser_seg6_lights_06038C38.l, 1), - gsSPLight(&bowser_seg6_lights_06038C38.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(bowser_seg6_vertex_0603E718, 9, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), @@ -3388,8 +3376,8 @@ const Gfx bowser_seg6_dl_06041A28[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bowser_seg6_texture_06028438), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bowser_seg6_lights_06038C38.l, 1), - gsSPLight(&bowser_seg6_lights_06038C38.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(bowser_seg6_vertex_060402D8, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), @@ -3945,8 +3933,8 @@ const Gfx bowser_seg6_dl_06042EE0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bowser_seg6_texture_06020C38), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bowser_seg6_lights_06038C38.l, 1), - gsSPLight(&bowser_seg6_lights_06038C38.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(bowser_seg6_vertex_06042660, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 6, 7, 3, 0x0), @@ -4103,8 +4091,8 @@ const Gfx bowser_seg6_dl_06043548[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bowser_seg6_texture_06022438), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bowser_seg6_lights_06038C38.l, 1), - gsSPLight(&bowser_seg6_lights_06038C38.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(bowser_seg6_vertex_06043278, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 0, 0x0), gsSP2Triangles( 0, 2, 3, 0x0, 0, 5, 1, 0x0), diff --git a/actors/bowser_key/model.inc.c b/actors/bowser_key/model.inc.c index 7cee5952..a51365cb 100644 --- a/actors/bowser_key/model.inc.c +++ b/actors/bowser_key/model.inc.c @@ -1,10 +1,6 @@ // Bowser Key // 0x030156E0, ambient color brown - light color orange -static const Lights1 bowser_key_lights = gdSPDefLights1( - 0x3f, 0x2c, 0x00, - 0xff, 0xb2, 0x00, 0x28, 0x28, 0x28 -); // 0x030156F8 static const Vtx bowser_key_dl_vertex_group1[] = { @@ -232,8 +228,8 @@ static const Vtx bowser_key_dl_vertex_group12[] = { // 0x030161F8 - 0x03016530 const Gfx bowser_key_dl[] = { - gsSPLight(&bowser_key_lights.l, 1), - gsSPLight(&bowser_key_lights.a, 2), + gsSPLightColor(LIGHT_1, 0xffb200ff), + gsSPLightColor(LIGHT_2, 0x3f2c00ff), gsSPVertex(bowser_key_dl_vertex_group1, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), diff --git a/actors/breakable_box/model.inc.c b/actors/breakable_box/model.inc.c index a155b436..6cb74ca7 100644 --- a/actors/breakable_box/model.inc.c +++ b/actors/breakable_box/model.inc.c @@ -1,10 +1,6 @@ // Breakable Box // 0x08011A78 -static const Lights1 breakable_box_seg8_lights_default = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x08011A90 ALIGNED8 static const Texture breakable_box_seg8_texture_08011A90[] = { @@ -48,8 +44,8 @@ static const Vtx breakable_box_seg8_vertex[] = { // 0x08012C30 - 0x08012CD8 const Gfx breakable_box_seg8_sub_dl_end[] = { - gsSPLight(&breakable_box_seg8_lights_default.l, 1), - gsSPLight(&breakable_box_seg8_lights_default.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(breakable_box_seg8_vertex, 26, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), diff --git a/actors/bub/model.inc.c b/actors/bub/model.inc.c index 97d570f3..449dc70a 100644 --- a/actors/bub/model.inc.c +++ b/actors/bub/model.inc.c @@ -1,16 +1,8 @@ // Bub // 0x0600E278 -static const Lights1 bub_seg6_lights_0600E280 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0600E290 -static const Lights1 bub_seg6_lights_0600E290 = gdSPDefLights1( - 0x3f, 0x1d, 0x25, - 0xff, 0x75, 0x94, 0x28, 0x28, 0x28 -); // 0x0600E2A8 ALIGNED8 static const Texture bub_seg6_texture_0600E2A8[] = { @@ -163,8 +155,8 @@ const Gfx bub_seg6_dl_06011848[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bub_seg6_texture_0600E2A8), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bub_seg6_lights_0600E280.l, 1), - gsSPLight(&bub_seg6_lights_0600E280.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(bub_seg6_vertex_060112A8, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 5, 7, 6, 0x0), @@ -222,8 +214,8 @@ const Gfx bub_seg6_dl_06011968[] = { // 0x06011A50 - 0x06011B28 const Gfx bub_seg6_dl_06011A50[] = { - gsSPLight(&bub_seg6_lights_0600E290.l, 1), - gsSPLight(&bub_seg6_lights_0600E290.a, 2), + gsSPLightColor(LIGHT_1, 0xff7594ff), + gsSPLightColor(LIGHT_2, 0x3f1d25ff), gsSPVertex(bub_seg6_vertex_06011718, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 1, 4, 2, 0x0, 1, 3, 4, 0x0), @@ -232,8 +224,8 @@ const Gfx bub_seg6_dl_06011A50[] = { gsSP2Triangles( 8, 9, 10, 0x0, 8, 5, 0, 0x0), gsSP2Triangles( 0, 11, 8, 0x0, 8, 10, 5, 0x0), gsSP2Triangles( 5, 10, 6, 0x0, 10, 9, 6, 0x0), - gsSPLight(&bub_seg6_lights_0600E280.l, 1), - gsSPLight(&bub_seg6_lights_0600E280.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(bub_seg6_vertex_060117D8, 7, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 4, 0x0), gsSP2Triangles( 2, 1, 5, 0x0, 2, 5, 6, 0x0), @@ -284,8 +276,8 @@ const Gfx bub_seg6_dl_06011C58[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bub_seg6_texture_0600EAA8), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bub_seg6_lights_0600E280.l, 1), - gsSPLight(&bub_seg6_lights_0600E280.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(bub_seg6_vertex_06011BD8, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0), gsSP2Triangles( 4, 5, 0, 0x0, 0, 5, 6, 0x0), @@ -328,8 +320,8 @@ const Gfx bub_seg6_dl_06011DC0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bub_seg6_texture_0600EAA8), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bub_seg6_lights_0600E280.l, 1), - gsSPLight(&bub_seg6_lights_0600E280.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(bub_seg6_vertex_06011D50, 7, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 2, 0x0), gsSP2Triangles( 2, 4, 0, 0x0, 3, 2, 1, 0x0), @@ -371,8 +363,8 @@ const Gfx bub_seg6_dl_06011F18[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bub_seg6_texture_0600EAA8), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bub_seg6_lights_0600E280.l, 1), - gsSPLight(&bub_seg6_lights_0600E280.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(bub_seg6_vertex_06011EA8, 7, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 3, 0, 0x0, 0, 5, 6, 0x0), diff --git a/actors/bubba/model.inc.c b/actors/bubba/model.inc.c index 8e32bbbb..a64ca18b 100644 --- a/actors/bubba/model.inc.c +++ b/actors/bubba/model.inc.c @@ -34,22 +34,10 @@ ALIGNED8 static const Texture bubba_seg5_texture_05002408[] = { }; // 0x05004408 -static const Lights1 bubba_seg5_lights_05004408 = gdSPDefLights1( - 0x48, 0x31, 0x2a, - 0xf1, 0xa6, 0x8c, 0x28, 0x28, 0x28 -); // 0x05004420 -static const Lights1 bubba_seg5_lights_05004420 = gdSPDefLights1( - 0x4c, 0x4c, 0x4c, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05004438 -static const Lights1 bubba_seg5_lights_05004438 = gdSPDefLights1( - 0x10, 0x07, 0x08, - 0x36, 0x1a, 0x1c, 0x28, 0x28, 0x28 -); // 0x05004450 static const Vtx bubba_seg5_vertex_05004450[] = { @@ -187,8 +175,8 @@ const Gfx bubba_seg5_dl_05004A40[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bubba_seg5_texture_05000008), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 32 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bubba_seg5_lights_05004408.l, 1), - gsSPLight(&bubba_seg5_lights_05004408.a, 2), + gsSPLightColor(LIGHT_1, 0xf1a68cff), + gsSPLightColor(LIGHT_2, 0x48312aff), gsSPVertex(bubba_seg5_vertex_05004450, 7, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 0, 0x0), gsSP2Triangles( 4, 1, 3, 0x0, 5, 1, 4, 0x0), @@ -201,8 +189,8 @@ const Gfx bubba_seg5_dl_05004AA8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bubba_seg5_texture_05001408), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bubba_seg5_lights_05004420.l, 1), - gsSPLight(&bubba_seg5_lights_05004420.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(bubba_seg5_vertex_050044C0, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 0, 0x0), gsSP2Triangles( 0, 2, 3, 0x0, 5, 0, 4, 0x0), @@ -262,8 +250,8 @@ const Gfx bubba_seg5_dl_05004C40[] = { // 0x05004D48 - 0x05004E80 const Gfx bubba_seg5_dl_05004D48[] = { - gsSPLight(&bubba_seg5_lights_05004408.l, 1), - gsSPLight(&bubba_seg5_lights_05004408.a, 2), + gsSPLightColor(LIGHT_1, 0xf1a68cff), + gsSPLightColor(LIGHT_2, 0x48312aff), gsSPVertex(bubba_seg5_vertex_05004870, 13, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 2, 4, 5, 0x0, 4, 6, 5, 0x0), @@ -272,16 +260,16 @@ const Gfx bubba_seg5_dl_05004D48[] = { gsSP2Triangles(10, 11, 7, 0x0, 3, 7, 0, 0x0), gsSP2Triangles( 0, 11, 1, 0x0, 6, 10, 9, 0x0), gsSP2Triangles(12, 10, 6, 0x0, 12, 11, 10, 0x0), - gsSPLight(&bubba_seg5_lights_05004438.l, 1), - gsSPLight(&bubba_seg5_lights_05004438.a, 2), + gsSPLightColor(LIGHT_1, 0x361a1cff), + gsSPLightColor(LIGHT_2, 0x100708ff), gsSPVertex(bubba_seg5_vertex_05004940, 9, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 7, 0x0, 5, 6, 3, 0x0), gsSP2Triangles( 3, 8, 4, 0x0, 7, 6, 5, 0x0), gsSP2Triangles( 8, 2, 1, 0x0, 8, 1, 0, 0x0), gsSP1Triangle( 4, 8, 0, 0x0), - gsSPLight(&bubba_seg5_lights_05004420.l, 1), - gsSPLight(&bubba_seg5_lights_05004420.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(bubba_seg5_vertex_050049D0, 7, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 0, 0x0, 0, 5, 3, 0x0), @@ -316,22 +304,10 @@ const Gfx bubba_seg5_dl_05004E80[] = { }; // 0x05004F30 -static const Lights1 bubba_seg5_lights_05004F30 = gdSPDefLights1( - 0x48, 0x31, 0x2a, - 0xf1, 0xa6, 0x8c, 0x28, 0x28, 0x28 -); // 0x05004F48 -static const Lights1 bubba_seg5_lights_05004F50 = gdSPDefLights1( - 0x4c, 0x4c, 0x4c, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05004F60 -static const Lights1 bubba_seg5_lights_05004F60 = gdSPDefLights1( - 0x0a, 0x07, 0x08, - 0x22, 0x1a, 0x1c, 0x28, 0x28, 0x28 -); // 0x05004F78 static const Vtx bubba_seg5_vertex_05004F78[] = { @@ -466,8 +442,8 @@ const Gfx bubba_seg5_dl_05005538[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bubba_seg5_texture_05000008), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 32 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bubba_seg5_lights_05004F30.l, 1), - gsSPLight(&bubba_seg5_lights_05004F30.a, 2), + gsSPLightColor(LIGHT_1, 0xf1a68cff), + gsSPLightColor(LIGHT_2, 0x48312aff), gsSPVertex(bubba_seg5_vertex_05004F78, 7, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 4, 0x0), gsSP2Triangles( 4, 0, 5, 0x0, 5, 0, 2, 0x0), @@ -480,8 +456,8 @@ const Gfx bubba_seg5_dl_050055A0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bubba_seg5_texture_05001408), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bubba_seg5_lights_05004F50.l, 1), - gsSPLight(&bubba_seg5_lights_05004F50.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(bubba_seg5_vertex_05004FE8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 4, 0x0), gsSP2Triangles( 0, 5, 3, 0x0, 6, 5, 0, 0x0), @@ -541,8 +517,8 @@ const Gfx bubba_seg5_dl_05005738[] = { // 0x05005840 - 0x05005978 const Gfx bubba_seg5_dl_05005840[] = { - gsSPLight(&bubba_seg5_lights_05004F30.l, 1), - gsSPLight(&bubba_seg5_lights_05004F30.a, 2), + gsSPLightColor(LIGHT_1, 0xf1a68cff), + gsSPLightColor(LIGHT_2, 0x48312aff), gsSPVertex(bubba_seg5_vertex_05005368, 13, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 4, 0x0), gsSP2Triangles( 5, 2, 1, 0x0, 1, 6, 5, 0x0), @@ -551,16 +527,16 @@ const Gfx bubba_seg5_dl_05005840[] = { gsSP2Triangles(11, 6, 1, 0x0, 9, 10, 8, 0x0), gsSP2Triangles(12, 5, 9, 0x0, 7, 5, 12, 0x0), gsSP2Triangles( 9, 8, 12, 0x0, 0, 11, 1, 0x0), - gsSPLight(&bubba_seg5_lights_05004F60.l, 1), - gsSPLight(&bubba_seg5_lights_05004F60.a, 2), + gsSPLightColor(LIGHT_1, 0x221a1cff), + gsSPLightColor(LIGHT_2, 0xa0708ff), gsSPVertex(bubba_seg5_vertex_05005438, 9, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 5, 4, 6, 0x0, 6, 4, 3, 0x0), gsSP2Triangles( 3, 7, 6, 0x0, 3, 8, 7, 0x0), gsSP2Triangles( 7, 8, 0, 0x0, 8, 1, 0, 0x0), gsSP1Triangle( 8, 2, 1, 0x0), - gsSPLight(&bubba_seg5_lights_05004F50.l, 1), - gsSPLight(&bubba_seg5_lights_05004F50.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(bubba_seg5_vertex_050054C8, 7, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0), gsSP2Triangles( 0, 4, 1, 0x0, 5, 6, 0, 0x0), diff --git a/actors/bullet_bill/model.inc.c b/actors/bullet_bill/model.inc.c index e54a9de9..9bd581cf 100644 --- a/actors/bullet_bill/model.inc.c +++ b/actors/bullet_bill/model.inc.c @@ -1,10 +1,6 @@ // Bullet Bill // 0x0500BA90 -static const Lights1 bullet_bill_seg5_lights_0500BA90 = gdSPDefLights1( - 0x06, 0x07, 0x14, - 0x19, 0x1c, 0x52, 0x28, 0x28, 0x28 -); // 0x0500BAA8 ALIGNED8 static const Texture bullet_bill_seg5_texture_0500BAA8[] = { @@ -255,8 +251,8 @@ const Gfx bullet_bill_seg5_dl_0500E5E8[] = { gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bullet_bill_seg5_lights_0500BA90.l, 1), - gsSPLight(&bullet_bill_seg5_lights_0500BA90.a, 2), + gsSPLightColor(LIGHT_1, 0x191c52ff), + gsSPLightColor(LIGHT_2, 0x60714ff), gsSPVertex(bullet_bill_seg5_vertex_0500DAA8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), diff --git a/actors/bully/model.inc.c b/actors/bully/model.inc.c index b1593e59..9b1a4adf 100644 --- a/actors/bully/model.inc.c +++ b/actors/bully/model.inc.c @@ -60,28 +60,12 @@ const Gfx bully_seg5_dl_05000398[] = { }; // 0x05000408 -static const Lights1 bully_seg5_lights_05000408 = gdSPDefLights1( - 0x00, 0x38, 0x00, - 0x00, 0xe3, 0x00, 0x28, 0x28, 0x28 -); // 0x05000420 -static const Lights1 bully_seg5_lights_05000420 = gdSPDefLights1( - 0x00, 0x3f, 0x00, - 0x00, 0xff, 0x00, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 bully_lights_unused = gdSPDefLights1( - 0x3f, 0x29, 0x00, - 0xff, 0xa5, 0x00, 0x28, 0x28, 0x28 -); // 0x05000450 -static const Lights1 bully_seg5_lights_05000450 = gdSPDefLights1( - 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x05000468 ALIGNED8 static const Texture bully_seg5_texture_05000468[] = { @@ -312,8 +296,8 @@ static const Vtx bully_seg5_vertex_05003608[] = { // 0x05003708 - 0x050037A0 const Gfx bully_seg5_dl_05003708[] = { - gsSPLight(&bully_seg5_lights_05000408.l, 1), - gsSPLight(&bully_seg5_lights_05000408.a, 2), + gsSPLightColor(LIGHT_1, 0xe300ff), + gsSPLightColor(LIGHT_2, 0x3800ff), gsSPVertex(bully_seg5_vertex_05002C68, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 1, 3, 0x0), gsSP2Triangles( 2, 3, 4, 0x0, 1, 5, 6, 0x0), @@ -328,8 +312,8 @@ const Gfx bully_seg5_dl_05003708[] = { // 0x050037A0 - 0x05003838 const Gfx bully_seg5_dl_050037A0[] = { - gsSPLight(&bully_seg5_lights_05000420.l, 1), - gsSPLight(&bully_seg5_lights_05000420.a, 2), + gsSPLightColor(LIGHT_1, 0xff00ff), + gsSPLightColor(LIGHT_2, 0x3f00ff), gsSPVertex(bully_seg5_vertex_05002D88, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 1, 0x0), gsSP2Triangles( 3, 1, 0, 0x0, 5, 6, 7, 0x0), @@ -344,8 +328,8 @@ const Gfx bully_seg5_dl_050037A0[] = { // 0x05003878 - 0x05003C50 const Gfx bully_seg5_dl_05003878[] = { - gsSPLight(&bully_seg5_lights_05000450.l, 1), - gsSPLight(&bully_seg5_lights_05000450.a, 2), + gsSPLightColor(LIGHT_1, 0xff), + gsSPLightColor(LIGHT_2, 0xff), gsSPVertex(bully_seg5_vertex_05002F08, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 0, 3, 0x0), gsSP2Triangles( 1, 3, 4, 0x0, 4, 3, 5, 0x0), diff --git a/actors/cannon_barrel/model.inc.c b/actors/cannon_barrel/model.inc.c index de69ffff..af935f8d 100644 --- a/actors/cannon_barrel/model.inc.c +++ b/actors/cannon_barrel/model.inc.c @@ -1,16 +1,8 @@ // Cannon Barrel // 0x08005878 -static const Lights1 cannon_barrel_seg8_lights_08005878 = gdSPDefLights1( - 0x4c, 0x4c, 0x4c, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x08005890 -static const Lights1 cannon_barrel_seg8_lights_08005890 = gdSPDefLights1( - 0x00, 0x00, 0x0f, - 0x00, 0x00, 0x32, 0x28, 0x28, 0x28 -); // 0x080058A8 ALIGNED8 static const Texture cannon_barrel_seg8_texture_080058A8[] = { @@ -92,8 +84,8 @@ const Gfx cannon_barrel_seg8_dl_08006408[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cannon_barrel_seg8_texture_080058A8), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&cannon_barrel_seg8_lights_08005878.l, 1), - gsSPLight(&cannon_barrel_seg8_lights_08005878.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(cannon_barrel_seg8_vertex_080060A8, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 2, 4, 5, 0x0, 2, 1, 4, 0x0), @@ -108,8 +100,8 @@ const Gfx cannon_barrel_seg8_dl_08006408[] = { // 0x080064C0 - 0x08006660 const Gfx cannon_barrel_seg8_dl_080064C0[] = { - gsSPLight(&cannon_barrel_seg8_lights_08005890.l, 1), - gsSPLight(&cannon_barrel_seg8_lights_08005890.a, 2), + gsSPLightColor(LIGHT_1, 0x32ff), + gsSPLightColor(LIGHT_2, 0xfff), gsSPVertex(cannon_barrel_seg8_vertex_080061A8, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 4, 0x0, 6, 4, 3, 0x0), diff --git a/actors/cannon_base/model.inc.c b/actors/cannon_base/model.inc.c index 61816de6..06587989 100644 --- a/actors/cannon_base/model.inc.c +++ b/actors/cannon_base/model.inc.c @@ -1,16 +1,8 @@ // Cannon Base // 0x08004988 -static const Lights1 cannon_base_seg8_lights_08004988 = gdSPDefLights1( - 0x4c, 0x4c, 0x4c, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x080049A0 -static const Lights1 cannon_base_seg8_lights_080049A0 = gdSPDefLights1( - 0x0e, 0x10, 0x4c, - 0x30, 0x37, 0xff, 0x28, 0x28, 0x28 -); // 0x080049B8 ALIGNED8 static const Texture cannon_base_seg8_texture_080049B8[] = { @@ -116,8 +108,8 @@ const Gfx cannon_base_seg8_dl_08005658[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cannon_base_seg8_texture_080049B8), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&cannon_base_seg8_lights_08004988.l, 1), - gsSPLight(&cannon_base_seg8_lights_08004988.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(cannon_base_seg8_vertex_080051B8, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 4, 0x0), gsSP2Triangles( 0, 2, 5, 0x0, 0, 5, 3, 0x0), @@ -128,8 +120,8 @@ const Gfx cannon_base_seg8_dl_08005658[] = { // 0x080056D0 - 0x080057F8 const Gfx cannon_base_seg8_dl_080056D0[] = { - gsSPLight(&cannon_base_seg8_lights_080049A0.l, 1), - gsSPLight(&cannon_base_seg8_lights_080049A0.a, 2), + gsSPLightColor(LIGHT_1, 0x3037ffff), + gsSPLightColor(LIGHT_2, 0xe104cff), gsSPVertex(cannon_base_seg8_vertex_08005278, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), diff --git a/actors/cannon_lid/model.inc.c b/actors/cannon_lid/model.inc.c index 96e4ecc9..93a04fb0 100644 --- a/actors/cannon_lid/model.inc.c +++ b/actors/cannon_lid/model.inc.c @@ -1,10 +1,6 @@ // Cannon Lid // 0x08004040 -static const Lights1 cannon_lid_seg8_lights_08004040 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x08004058 ALIGNED8 static const Texture cannon_lid_seg8_texture_08004058[] = { @@ -24,8 +20,8 @@ const Gfx cannon_lid_seg8_dl_08004898[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cannon_lid_seg8_texture_08004058), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&cannon_lid_seg8_lights_08004040.l, 1), - gsSPLight(&cannon_lid_seg8_lights_08004040.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(cannon_lid_seg8_vertex_08004858, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), diff --git a/actors/capswitch/model.inc.c b/actors/capswitch/model.inc.c index 2f3f0cd5..53e3764c 100644 --- a/actors/capswitch/model.inc.c +++ b/actors/capswitch/model.inc.c @@ -1,40 +1,16 @@ // Capswitch // 0x05001BB8 -static const Lights1 capswitch_seg5_lights_05001BB8 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05001BD0 -static const Lights1 capswitch_seg5_lights_05001BD0 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05001BE8 -static const Lights1 capswitch_seg5_lights_05001BE8 = gdSPDefLights1( - 0x3f, 0x00, 0x00, - 0xff, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x05001C00 -static const Lights1 capswitch_seg5_lights_05001C00 = gdSPDefLights1( - 0x01, 0x2a, 0x09, - 0x07, 0xa9, 0x25, 0x28, 0x28, 0x28 -); // 0x05001C18 -static const Lights1 capswitch_seg5_lights_05001C18 = gdSPDefLights1( - 0x00, 0x00, 0x3f, - 0x00, 0x00, 0xff, 0x28, 0x28, 0x28 -); // 0x05001C30 -static const Lights1 capswitch_seg5_lights_05001C30 = gdSPDefLights1( - 0x3f, 0x25, 0x02, - 0xff, 0x96, 0x08, 0x28, 0x28, 0x28 -); // 0x05001C48 ALIGNED8 static const Texture capswitch_seg5_texture_05001C48[] = { @@ -67,8 +43,8 @@ const Gfx capswitch_seg5_dl_05002D88[] = { gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, capswitch_seg5_texture_05001C48), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&capswitch_seg5_lights_05001BB8.l, 1), - gsSPLight(&capswitch_seg5_lights_05001BB8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(capswitch_seg5_vertex_05002CC8, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 0, 3, 0x0), gsSP2Triangles( 4, 3, 0, 0x0, 5, 4, 0, 0x0), @@ -134,8 +110,8 @@ const Gfx capswitch_seg5_dl_05003020[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, capswitch_seg5_texture_05002C48), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 4 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)), - gsSPLight(&capswitch_seg5_lights_05001BD0.l, 1), - gsSPLight(&capswitch_seg5_lights_05001BD0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(capswitch_seg5_vertex_05002E60, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 6, 5, 0x0, 4, 7, 6, 0x0), @@ -210,32 +186,32 @@ const Gfx capswitch_seg5_dl_05003280[] = { // 0x05003350 - 0x05003370 const Gfx capswitch_seg5_dl_05003350[] = { - gsSPLight(&capswitch_seg5_lights_05001BE8.l, 1), - gsSPLight(&capswitch_seg5_lights_05001BE8.a, 2), + gsSPLightColor(LIGHT_1, 0xff0000ff), + gsSPLightColor(LIGHT_2, 0x3f0000ff), gsSPDisplayList(capswitch_seg5_dl_05003280), gsSPEndDisplayList(), }; // 0x05003370 - 0x05003390 const Gfx capswitch_seg5_dl_05003370[] = { - gsSPLight(&capswitch_seg5_lights_05001C00.l, 1), - gsSPLight(&capswitch_seg5_lights_05001C00.a, 2), + gsSPLightColor(LIGHT_1, 0x7a925ff), + gsSPLightColor(LIGHT_2, 0x12a09ff), gsSPDisplayList(capswitch_seg5_dl_05003280), gsSPEndDisplayList(), }; // 0x05003390 - 0x050033B0 const Gfx capswitch_seg5_dl_05003390[] = { - gsSPLight(&capswitch_seg5_lights_05001C18.l, 1), - gsSPLight(&capswitch_seg5_lights_05001C18.a, 2), + gsSPLightColor(LIGHT_1, 0xffff), + gsSPLightColor(LIGHT_2, 0x3fff), gsSPDisplayList(capswitch_seg5_dl_05003280), gsSPEndDisplayList(), }; // 0x050033B0 - 0x050033D0 const Gfx capswitch_seg5_dl_050033B0[] = { - gsSPLight(&capswitch_seg5_lights_05001C30.l, 1), - gsSPLight(&capswitch_seg5_lights_05001C30.a, 2), + gsSPLightColor(LIGHT_1, 0xff9608ff), + gsSPLightColor(LIGHT_2, 0x3f2502ff), gsSPDisplayList(capswitch_seg5_dl_05003280), gsSPEndDisplayList(), }; diff --git a/actors/chain_chomp/model.inc.c b/actors/chain_chomp/model.inc.c index 1f8bab63..a02952e6 100644 --- a/actors/chain_chomp/model.inc.c +++ b/actors/chain_chomp/model.inc.c @@ -1,22 +1,10 @@ // Chain Chomp // 0x06021388 -UNUSED static const Lights1 chain_chomp_lights_unused1 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x060213A0 -UNUSED static const Lights1 chain_chomp_lights_unused2 = gdSPDefLights1( - 0x03, 0x03, 0x05, - 0x0d, 0x0f, 0x16, 0x28, 0x28, 0x28 -); // 0x060213B8 -UNUSED static const Lights1 chain_chomp_lights_unused3 = gdSPDefLights1( - 0x25, 0x00, 0x00, - 0x96, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x060213D0 ALIGNED8 static const Texture chain_chomp_seg6_texture_060213D0[] = { @@ -366,10 +354,6 @@ const Gfx chain_chomp_seg6_dl_06024940[] = { }; // 0x060249D0 -static const Lights1 chain_chomp_seg6_lights_060249D0 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x060249E8 static const Vtx chain_chomp_seg6_vertex_060249E8[] = { @@ -392,8 +376,8 @@ const Gfx chain_chomp_seg6_dl_06024AA8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, chain_chomp_seg6_texture_060233D0), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&chain_chomp_seg6_lights_060249D0.l, 1), - gsSPLight(&chain_chomp_seg6_lights_060249D0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(chain_chomp_seg6_vertex_060249E8, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), diff --git a/actors/chair/model.inc.c b/actors/chair/model.inc.c index 86c65dad..6944dce3 100644 --- a/actors/chair/model.inc.c +++ b/actors/chair/model.inc.c @@ -1,10 +1,6 @@ // Chair // Unreferenced light group -UNUSED static const Lights1 chair_lights_unused = gdSPDefLights1( - 0x19, 0x0d, 0x06, - 0x64, 0x36, 0x1a, 0x28, 0x28, 0x28 -); // 0x05003060 ALIGNED8 static const Texture chair_seg5_texture_05003060[] = { @@ -28,10 +24,6 @@ UNUSED ALIGNED8 static const Texture chair_seg5_texture_05004460[] = { }; // 0x05004C60 -static const Lights1 chair_seg5_lights_05004C60 = gdSPDefLights1( - 0x47, 0x47, 0x47, - 0xb2, 0xb2, 0xb2, 0x28, 0x28, 0x28 -); // 0x05004C78 static const Vtx chair_seg5_vertex_05004C78[] = { @@ -74,8 +66,8 @@ const Gfx chair_seg5_dl_05004E38[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, chair_seg5_texture_05003060), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&chair_seg5_lights_05004C60.l, 1), - gsSPLight(&chair_seg5_lights_05004C60.a, 2), + gsSPLightColor(LIGHT_1, 0xb2b2b2ff), + gsSPLightColor(LIGHT_2, 0x474747ff), gsSPVertex(chair_seg5_vertex_05004C78, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 6, 5, 0x0, 7, 8, 9, 0x0), @@ -107,10 +99,6 @@ const Gfx chair_seg5_dl_05004EE8[] = { }; // 0x05004F58 -static const Lights1 chair_seg5_lights_05004F58 = gdSPDefLights1( - 0x47, 0x47, 0x47, - 0xb2, 0xb2, 0xb2, 0x28, 0x28, 0x28 -); // 0x05004F70 static const Vtx chair_seg5_vertex_05004F70[] = { @@ -149,8 +137,8 @@ const Gfx chair_seg5_dl_050050F0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, chair_seg5_texture_05004060), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 32 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)), - gsSPLight(&chair_seg5_lights_05004F58.l, 1), - gsSPLight(&chair_seg5_lights_05004F58.a, 2), + gsSPLightColor(LIGHT_1, 0xb2b2b2ff), + gsSPLightColor(LIGHT_2, 0x474747ff), gsSPVertex(chair_seg5_vertex_05004F70, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), @@ -181,10 +169,6 @@ const Gfx chair_seg5_dl_05005190[] = { }; // 0x05005200 -static const Lights1 chair_seg5_lights_05005200 = gdSPDefLights1( - 0x47, 0x47, 0x47, - 0xb2, 0xb2, 0xb2, 0x28, 0x28, 0x28 -); // 0x05005218 static const Vtx chair_seg5_vertex_05005218[] = { @@ -221,8 +205,8 @@ const Gfx chair_seg5_dl_05005378[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, chair_seg5_texture_05003860), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&chair_seg5_lights_05005200.l, 1), - gsSPLight(&chair_seg5_lights_05005200.a, 2), + gsSPLightColor(LIGHT_1, 0xb2b2b2ff), + gsSPLightColor(LIGHT_2, 0x474747ff), gsSPVertex(chair_seg5_vertex_05005218, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), @@ -253,10 +237,6 @@ const Gfx chair_seg5_dl_05005408[] = { }; // 0x05005478 -static const Lights1 chair_seg5_lights_05005478 = gdSPDefLights1( - 0x47, 0x47, 0x47, - 0xb2, 0xb2, 0xb2, 0x28, 0x28, 0x28 -); // 0x05005490 static const Vtx chair_seg5_vertex_05005490[] = { @@ -293,8 +273,8 @@ const Gfx chair_seg5_dl_050055F0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, chair_seg5_texture_05003860), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&chair_seg5_lights_05005478.l, 1), - gsSPLight(&chair_seg5_lights_05005478.a, 2), + gsSPLightColor(LIGHT_1, 0xb2b2b2ff), + gsSPLightColor(LIGHT_2, 0x474747ff), gsSPVertex(chair_seg5_vertex_05005490, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), diff --git a/actors/checkerboard_platform/model.inc.c b/actors/checkerboard_platform/model.inc.c index 3ce6ef3e..218f7191 100644 --- a/actors/checkerboard_platform/model.inc.c +++ b/actors/checkerboard_platform/model.inc.c @@ -1,10 +1,6 @@ // Checkerboard Platform // 0x0800C828 -static const Lights1 checkerboard_platform_seg8_lights_0800C828 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0800C840 ALIGNED8 static const Texture checkerboard_platform_seg8_texture_0800C840[] = { @@ -53,8 +49,8 @@ const Gfx checkerboard_platform_seg8_dl_0800D5C0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, checkerboard_platform_seg8_texture_0800C840), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&checkerboard_platform_seg8_lights_0800C828.l, 1), - gsSPLight(&checkerboard_platform_seg8_lights_0800C828.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(checkerboard_platform_seg8_vertex_0800D440, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), diff --git a/actors/chillychief/model.inc.c b/actors/chillychief/model.inc.c index 415329e2..d5ec2393 100644 --- a/actors/chillychief/model.inc.c +++ b/actors/chillychief/model.inc.c @@ -1,28 +1,12 @@ // Chilly Chief (Chill Bully) // 0x06000000 -static const Lights1 chilly_chief_seg6_lights_06000000 = gdSPDefLights1( - 0x00, 0x38, 0x00, - 0x00, 0xe3, 0x00, 0x28, 0x28, 0x28 -); // 0x06000018 -static const Lights1 chilly_chief_seg6_lights_06000018 = gdSPDefLights1( - 0x00, 0x3f, 0x00, - 0x00, 0xff, 0x00, 0x28, 0x28, 0x28 -); // 0x06000030 -static const Lights1 chilly_chief_seg6_lights_06000030 = gdSPDefLights1( - 0x3f, 0x29, 0x00, - 0xff, 0xa5, 0x00, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 chillychief_lights_unused = gdSPDefLights1( - 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x06000060 ALIGNED8 static const Texture chilly_chief_seg6_texture_06000060[] = { @@ -106,8 +90,8 @@ static const Vtx chilly_chief_seg6_vertex_06002AA0[] = { // 0x06002B30 - 0x06002BC8 const Gfx chilly_chief_seg6_dl_06002B30[] = { - gsSPLight(&chilly_chief_seg6_lights_06000000.l, 1), - gsSPLight(&chilly_chief_seg6_lights_06000000.a, 2), + gsSPLightColor(LIGHT_1, 0xe300ff), + gsSPLightColor(LIGHT_2, 0x3800ff), gsSPVertex(chilly_chief_seg6_vertex_06002860, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 1, 3, 0x0), gsSP2Triangles( 2, 3, 4, 0x0, 1, 5, 6, 0x0), @@ -122,8 +106,8 @@ const Gfx chilly_chief_seg6_dl_06002B30[] = { // 0x06002BC8 - 0x06002C60 const Gfx chilly_chief_seg6_dl_06002BC8[] = { - gsSPLight(&chilly_chief_seg6_lights_06000018.l, 1), - gsSPLight(&chilly_chief_seg6_lights_06000018.a, 2), + gsSPLightColor(LIGHT_1, 0xff00ff), + gsSPLightColor(LIGHT_2, 0x3f00ff), gsSPVertex(chilly_chief_seg6_vertex_06002980, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 1, 0x0), gsSP2Triangles( 3, 1, 0, 0x0, 5, 6, 7, 0x0), @@ -138,8 +122,8 @@ const Gfx chilly_chief_seg6_dl_06002BC8[] = { // 0x06002C60 - 0x06002C98 const Gfx chilly_chief_seg6_dl_06002C60[] = { - gsSPLight(&chilly_chief_seg6_lights_06000030.l, 1), - gsSPLight(&chilly_chief_seg6_lights_06000030.a, 2), + gsSPLightColor(LIGHT_1, 0xffa500ff), + gsSPLightColor(LIGHT_2, 0x3f2900ff), gsSPVertex(chilly_chief_seg6_vertex_06002AA0, 9, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP1Triangle( 6, 7, 8, 0x0), diff --git a/actors/chuckya/model.inc.c b/actors/chuckya/model.inc.c index f083ce70..b81cf31b 100644 --- a/actors/chuckya/model.inc.c +++ b/actors/chuckya/model.inc.c @@ -1,46 +1,18 @@ // Chuckya // Unreferenced light group -UNUSED static const Lights1 chuckya_lights_unused1 = gdSPDefLights1( - 0x26, 0x00, 0x27, - 0x9a, 0x00, 0x9c, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 chuckya_lights_unused2 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 chuckya_lights_unused3 = gdSPDefLights1( - 0x3f, 0x00, 0x00, - 0xff, 0x00, 0x00, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 chuckya_lights_unused4 = gdSPDefLights1( - 0x0e, 0x0e, 0x0e, - 0x39, 0x39, 0x39, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 chuckya_lights_unused5 = gdSPDefLights1( - 0x39, 0x20, 0x00, - 0xe4, 0x83, 0x00, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 chuckya_lights_unused6 = gdSPDefLights1( - 0x3f, 0x27, 0x00, - 0xff, 0x9e, 0x00, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 chuckya_lights_unused7 = gdSPDefLights1( - 0x15, 0x14, 0x16, - 0x57, 0x53, 0x58, 0x28, 0x28, 0x28 -); // 0x08006778 ALIGNED8 static const Texture chuckya_seg8_texture_08006778[] = { @@ -336,10 +308,6 @@ const Gfx chuckya_seg8_dl_0800A5F8[] = { }; // 0x0800A668 -static const Lights1 chuckya_seg8_lights_0800A668 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0800A680 static const Vtx chuckya_seg8_vertex_0800A680[] = { @@ -358,8 +326,8 @@ const Gfx chuckya_seg8_dl_0800A700[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, chuckya_seg8_texture_08006778), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&chuckya_seg8_lights_0800A668.l, 1), - gsSPLight(&chuckya_seg8_lights_0800A668.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(chuckya_seg8_vertex_0800A680, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), @@ -385,10 +353,6 @@ const Gfx chuckya_seg8_dl_0800A758[] = { }; // 0x0800A7C8 -static const Lights1 chuckya_seg8_lights_0800A7C8 = gdSPDefLights1( - 0x29, 0x29, 0x29, - 0x89, 0x89, 0x8a, 0x28, 0x28, 0x28 -); // 0x0800A7E0 static const Vtx chuckya_seg8_vertex_0800A7E0[] = { @@ -405,8 +369,8 @@ static const Vtx chuckya_seg8_vertex_0800A7E0[] = { // 0x0800A870 - 0x0800A8D0 const Gfx chuckya_seg8_dl_0800A870[] = { - gsSPLight(&chuckya_seg8_lights_0800A7C8.l, 1), - gsSPLight(&chuckya_seg8_lights_0800A7C8.a, 2), + gsSPLightColor(LIGHT_1, 0x89898aff), + gsSPLightColor(LIGHT_2, 0x292929ff), gsSPVertex(chuckya_seg8_vertex_0800A7E0, 9, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0), gsSP2Triangles( 1, 4, 2, 0x0, 5, 6, 2, 0x0), @@ -424,10 +388,6 @@ const Gfx chuckya_seg8_dl_0800A8D0[] = { }; // 0x0800A8F0 -static const Lights1 chuckya_seg8_lights_0800A8F0 = gdSPDefLights1( - 0x4c, 0x4c, 0x00, - 0xff, 0xff, 0x00, 0x28, 0x28, 0x28 -); // 0x0800A908 static const Vtx chuckya_seg8_vertex_0800A908[] = { @@ -440,8 +400,8 @@ static const Vtx chuckya_seg8_vertex_0800A908[] = { // 0x0800A958 - 0x0800A998 const Gfx chuckya_seg8_dl_0800A958[] = { - gsSPLight(&chuckya_seg8_lights_0800A8F0.l, 1), - gsSPLight(&chuckya_seg8_lights_0800A8F0.a, 2), + gsSPLightColor(LIGHT_1, 0xffff00ff), + gsSPLightColor(LIGHT_2, 0x4c4c00ff), gsSPVertex(chuckya_seg8_vertex_0800A908, 5, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 4, 0x0), gsSP2Triangles( 0, 2, 3, 0x0, 0, 4, 1, 0x0), @@ -457,10 +417,6 @@ const Gfx chuckya_seg8_dl_0800A998[] = { }; // 0x0800A9B8 -static const Lights1 chuckya_seg8_lights_0800A9B8 = gdSPDefLights1( - 0x0c, 0x0c, 0x0c, - 0x32, 0x32, 0x32, 0x28, 0x28, 0x28 -); // 0x0800A9D0 static const Vtx chuckya_seg8_vertex_0800A9D0[] = { @@ -498,8 +454,8 @@ static const Vtx chuckya_seg8_vertex_0800AAC0[] = { // 0x0800AB70 - 0x0800ABE8 const Gfx chuckya_seg8_dl_0800AB70[] = { - gsSPLight(&chuckya_seg8_lights_0800A9B8.l, 1), - gsSPLight(&chuckya_seg8_lights_0800A9B8.a, 2), + gsSPLightColor(LIGHT_1, 0x323232ff), + gsSPLightColor(LIGHT_2, 0xc0c0cff), gsSPVertex(chuckya_seg8_vertex_0800A9D0, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), diff --git a/actors/clam_shell/model.inc.c b/actors/clam_shell/model.inc.c index 40ebc6b3..b464073e 100644 --- a/actors/clam_shell/model.inc.c +++ b/actors/clam_shell/model.inc.c @@ -1,16 +1,8 @@ // Clam Shell // Unreferenced light group -UNUSED static const Lights1 clam_shell_lights_unused1 = gdSPDefLights1( - 0x1b, 0x23, 0x30, - 0x6d, 0x8f, 0xc3, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 clam_shell_lights_unused2 = gdSPDefLights1( - 0x18, 0x28, 0x38, - 0x60, 0xa2, 0xe2, 0x28, 0x28, 0x28 -); // 0x05000030 ALIGNED8 static const Texture clam_shell_seg5_texture_05000030[] = { @@ -23,10 +15,6 @@ ALIGNED8 static const Texture clam_shell_seg5_texture_05000830[] = { }; // 0x05001030 -static const Lights1 clam_shell_seg5_lights_05001030 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05001048 static const Vtx clam_shell_seg5_vertex_05001048[] = { @@ -63,8 +51,8 @@ const Gfx clam_shell_seg5_dl_050011A8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, clam_shell_seg5_texture_05000030), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&clam_shell_seg5_lights_05001030.l, 1), - gsSPLight(&clam_shell_seg5_lights_05001030.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(clam_shell_seg5_vertex_05001048, 11, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 4, 0x0), gsSP2Triangles( 4, 5, 3, 0x0, 4, 0, 6, 0x0), @@ -108,10 +96,6 @@ const Gfx clam_shell_seg5_dl_050012B8[] = { }; // 0x05001320 -static const Lights1 clam_shell_seg5_lights_05001320 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05001338 static const Vtx clam_shell_seg5_vertex_05001338[] = { @@ -146,8 +130,8 @@ const Gfx clam_shell_seg5_dl_05001478[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, clam_shell_seg5_texture_05000030), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&clam_shell_seg5_lights_05001320.l, 1), - gsSPLight(&clam_shell_seg5_lights_05001320.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(clam_shell_seg5_vertex_05001338, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 0, 0x0), gsSP2Triangles( 4, 5, 0, 0x0, 0, 5, 6, 0x0), diff --git a/actors/cyan_fish/model.inc.c b/actors/cyan_fish/model.inc.c index 9dff09c9..f7ef9e59 100644 --- a/actors/cyan_fish/model.inc.c +++ b/actors/cyan_fish/model.inc.c @@ -8,10 +8,6 @@ ALIGNED8 static const Texture cyan_fish_seg6_texture_0600D468[] = { #include "actors/cyan_fish/cyan_fish.rgba16.inc.c" }; -static const Lights1 cyan_fish_seg6_lights_0600DC68 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0600DC80 static const Vtx cyan_fish_seg6_vertex_0600DC80[] = { @@ -32,8 +28,8 @@ const Gfx cyan_fish_seg6_dl_0600DD20[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cyan_fish_seg6_texture_0600D468), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&cyan_fish_seg6_lights_0600DC68.l, 1), - gsSPLight(&cyan_fish_seg6_lights_0600DC68.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(cyan_fish_seg6_vertex_0600DC80, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0), gsSP2Triangles( 0, 4, 1, 0x0, 4, 0, 3, 0x0), @@ -63,10 +59,6 @@ const Gfx cyan_fish_seg6_dl_0600DDD8[] = { }; // 0x0600DE38 -static const Lights1 cyan_fish_seg6_lights_0600DE38 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0600DE50 static const Vtx cyan_fish_seg6_vertex_0600DE50[] = { @@ -81,8 +73,8 @@ const Gfx cyan_fish_seg6_dl_0600DE90[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cyan_fish_seg6_texture_0600D468), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&cyan_fish_seg6_lights_0600DE38.l, 1), - gsSPLight(&cyan_fish_seg6_lights_0600DE38.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(cyan_fish_seg6_vertex_0600DE50, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0), gsSPEndDisplayList(), @@ -107,10 +99,6 @@ const Gfx cyan_fish_seg6_dl_0600DED8[] = { }; // 0x0600DF48 -static const Lights1 cyan_fish_seg6_lights_0600DF48 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0600DF60 static const Vtx cyan_fish_seg6_vertex_0600DF60[] = { @@ -127,8 +115,8 @@ const Gfx cyan_fish_seg6_dl_0600DFC0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cyan_fish_seg6_texture_0600D468), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&cyan_fish_seg6_lights_0600DF48.l, 1), - gsSPLight(&cyan_fish_seg6_lights_0600DF48.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(cyan_fish_seg6_vertex_0600DF60, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 4, 0x0), gsSP2Triangles( 1, 4, 2, 0x0, 0, 3, 1, 0x0), diff --git a/actors/dirt/model.inc.c b/actors/dirt/model.inc.c index 529c17b6..d6411a66 100644 --- a/actors/dirt/model.inc.c +++ b/actors/dirt/model.inc.c @@ -1,28 +1,12 @@ // Dirt // 0x0302BD68 -static const Lights1 dirt_seg3_lights_red = gdSPDefLights1( - 0x3f, 0x19, 0x19, - 0xff, 0x64, 0x64, 0x28, 0x28, 0x28 -); // 0x0302BD80 -static const Lights1 dirt_seg3_lights_green = gdSPDefLights1( - 0x19, 0x3f, 0x19, - 0x64, 0xff, 0x64, 0x28, 0x28, 0x28 -); // 0x0302BD98 -static const Lights1 dirt_seg3_lights_blue = gdSPDefLights1( - 0x19, 0x19, 0x3f, - 0x64, 0x64, 0xff, 0x28, 0x28, 0x28 -); // 0x0302BDB0 -static const Lights1 dirt_seg3_lights_yellow = gdSPDefLights1( - 0x3f, 0x3f, 0x19, - 0xff, 0xff, 0x64, 0x28, 0x28, 0x28 -); // 0x0302BDC8 static const Vtx dirt_seg3_vertex_0302BDC8[] = { @@ -120,32 +104,32 @@ const Gfx dirt_seg3_sub_dl_cartoon_star[] = { // 0x0302C298 - 0x0302C2B8 const Gfx dirt_seg3_dl_cartoon_star_red[] = { - gsSPLight(&dirt_seg3_lights_red.l, 1), - gsSPLight(&dirt_seg3_lights_red.a, 2), + gsSPLightColor(LIGHT_1, 0xff6464ff), + gsSPLightColor(LIGHT_2, 0x3f1919ff), gsSPDisplayList(dirt_seg3_sub_dl_cartoon_star), gsSPEndDisplayList(), }; // 0x0302C2B8 - 0x0302C2D8 const Gfx dirt_seg3_dl_cartoon_star_green[] = { - gsSPLight(&dirt_seg3_lights_green.l, 1), - gsSPLight(&dirt_seg3_lights_green.a, 2), + gsSPLightColor(LIGHT_1, 0x64ff64ff), + gsSPLightColor(LIGHT_2, 0x193f19ff), gsSPDisplayList(dirt_seg3_sub_dl_cartoon_star), gsSPEndDisplayList(), }; // 0x0302C2D8 - 0x0302C2F8 const Gfx dirt_seg3_dl_cartoon_star_blue[] = { - gsSPLight(&dirt_seg3_lights_blue.l, 1), - gsSPLight(&dirt_seg3_lights_blue.a, 2), + gsSPLightColor(LIGHT_1, 0x6464ffff), + gsSPLightColor(LIGHT_2, 0x19193fff), gsSPDisplayList(dirt_seg3_sub_dl_cartoon_star), gsSPEndDisplayList(), }; // 0x0302C2F8 - 0x0302C318 const Gfx dirt_seg3_dl_cartoon_star_yellow[] = { - gsSPLight(&dirt_seg3_lights_yellow.l, 1), - gsSPLight(&dirt_seg3_lights_yellow.a, 2), + gsSPLightColor(LIGHT_1, 0xffff64ff), + gsSPLightColor(LIGHT_2, 0x3f3f19ff), gsSPDisplayList(dirt_seg3_sub_dl_cartoon_star), gsSPEndDisplayList(), }; @@ -164,8 +148,8 @@ const Gfx dirt_seg3_dl_cartoon_star_billboard[] = { // 0x0302C378 - 0x0302C3B0 const Gfx dirt_seg3_dl_tiny_particle_red[] = { - gsSPLight(&dirt_seg3_lights_red.l, 1), - gsSPLight(&dirt_seg3_lights_red.a, 2), + gsSPLightColor(LIGHT_1, 0xff6464ff), + gsSPLightColor(LIGHT_2, 0x3f1919ff), gsSPClearGeometryMode(G_CULL_BACK), gsSPVertex(dirt_seg3_vertex_tiny_particle, 3, 0), gsSP1Triangle( 0, 1, 2, 0x0), @@ -175,8 +159,8 @@ const Gfx dirt_seg3_dl_tiny_particle_red[] = { // 0x0302C3B0 - 0x0302C3E8 const Gfx dirt_seg3_dl_tiny_particle_green[] = { - gsSPLight(&dirt_seg3_lights_green.l, 1), - gsSPLight(&dirt_seg3_lights_green.a, 2), + gsSPLightColor(LIGHT_1, 0x64ff64ff), + gsSPLightColor(LIGHT_2, 0x193f19ff), gsSPClearGeometryMode(G_CULL_BACK), gsSPVertex(dirt_seg3_vertex_tiny_particle, 3, 0), gsSP1Triangle( 0, 1, 2, 0x0), @@ -186,8 +170,8 @@ const Gfx dirt_seg3_dl_tiny_particle_green[] = { // 0x0302C3E8 - 0x0302C420 const Gfx dirt_seg3_dl_tiny_particle_blue[] = { - gsSPLight(&dirt_seg3_lights_blue.l, 1), - gsSPLight(&dirt_seg3_lights_blue.a, 2), + gsSPLightColor(LIGHT_1, 0x6464ffff), + gsSPLightColor(LIGHT_2, 0x19193fff), gsSPClearGeometryMode(G_CULL_BACK), gsSPVertex(dirt_seg3_vertex_tiny_particle, 3, 0), gsSP1Triangle( 0, 1, 2, 0x0), @@ -197,8 +181,8 @@ const Gfx dirt_seg3_dl_tiny_particle_blue[] = { // 0x0302C420 - 0x0302C458 const Gfx dirt_seg3_dl_tiny_particle_yellow[] = { - gsSPLight(&dirt_seg3_lights_yellow.l, 1), - gsSPLight(&dirt_seg3_lights_yellow.a, 2), + gsSPLightColor(LIGHT_1, 0xffff64ff), + gsSPLightColor(LIGHT_2, 0x3f3f19ff), gsSPClearGeometryMode(G_CULL_BACK), gsSPVertex(dirt_seg3_vertex_tiny_particle, 3, 0), gsSP1Triangle( 0, 1, 2, 0x0), diff --git a/actors/door/model.inc.c b/actors/door/model.inc.c index 5cb0d8dc..d6910a06 100644 --- a/actors/door/model.inc.c +++ b/actors/door/model.inc.c @@ -1,16 +1,8 @@ // Door // 0x03009CE0 -static const Lights1 door_seg3_lights_default = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x03009CF8 -static const Lights1 door_seg3_lights_yellow_handle = gdSPDefLights1( - 0x3f, 0x3f, 0x00, - 0xff, 0xff, 0x00, 0x28, 0x28, 0x28 -); // 0x03009D10 ALIGNED8 static const Texture door_seg3_texture_polished_wooden_door[] = { @@ -151,8 +143,8 @@ const Gfx door_seg3_sub_dl_polished_wooden_door_near[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, door_seg3_texture_polished_wooden_door_sides), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&door_seg3_lights_default.l, 1), - gsSPLight(&door_seg3_lights_default.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(door_seg3_vertex_polished_wooden_door_near_sides, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -169,8 +161,8 @@ const Gfx door_seg3_sub_dl_polished_wooden_door_near[] = { // 0x03013CC8 - 0x03013D78 const Gfx door_seg3_sub_dl_polished_wooden_door_handle_1[] = { - gsSPLight(&door_seg3_lights_yellow_handle.l, 1), - gsSPLight(&door_seg3_lights_yellow_handle.a, 2), + gsSPLightColor(LIGHT_1, 0xffff00ff), + gsSPLightColor(LIGHT_2, 0x3f3f00ff), gsSPVertex(door_seg3_vertex_polished_wooden_door_handle_1, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 4, 0x0), gsSP2Triangles( 2, 1, 3, 0x0, 5, 2, 4, 0x0), @@ -186,8 +178,8 @@ const Gfx door_seg3_sub_dl_polished_wooden_door_handle_1[] = { // 0x03013D78 - 0x03013E28 const Gfx door_seg3_sub_dl_polished_wooden_door_handle_2[] = { - gsSPLight(&door_seg3_lights_yellow_handle.l, 1), - gsSPLight(&door_seg3_lights_yellow_handle.a, 2), + gsSPLightColor(LIGHT_1, 0xffff00ff), + gsSPLightColor(LIGHT_2, 0x3f3f00ff), gsSPVertex(door_seg3_vertex_polished_wooden_door_handle_2, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 0, 3, 4, 0x0, 0, 5, 1, 0x0), @@ -277,16 +269,16 @@ const Gfx door_seg3_sub_dl_polished_wooden_door_far[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, door_seg3_texture_polished_wooden_door), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&door_seg3_lights_default.l, 1), - gsSPLight(&door_seg3_lights_default.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(door_seg3_vertex_polished_wooden_door_far, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), gsDPPipeSync(), gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), - gsSPLight(&door_seg3_lights_yellow_handle.l, 1), - gsSPLight(&door_seg3_lights_yellow_handle.a, 2), + gsSPLightColor(LIGHT_1, 0xffff00ff), + gsSPLightColor(LIGHT_2, 0x3f3f00ff), gsSPVertex(door_seg3_vertex_polished_wooden_door_far_handle, 8, 0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), gsSPSetGeometryMode(G_SHADING_SMOOTH), @@ -334,8 +326,8 @@ const Gfx door_seg3_vertex_star_sign_begin[] = { gsDPTileSync(), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD), gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC), - gsSPLight(&door_seg3_lights_default.l, 1), - gsSPLight(&door_seg3_lights_default.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPEndDisplayList(), }; @@ -435,8 +427,8 @@ const Gfx door_seg3_sub_dl_key_door_sides[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, door_seg3_texture_polished_wooden_door_sides), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&door_seg3_lights_default.l, 1), - gsSPLight(&door_seg3_lights_default.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(door_seg3_vertex_key_door_sides, 16, 0), gsSP2Triangles( 0, 1, 3, 0x0, 1, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), @@ -510,8 +502,8 @@ const Gfx door_seg3_sub_dl_lock[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, door_seg3_texture_lock), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 32 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)), - gsSPLight(&door_seg3_lights_default.l, 1), - gsSPLight(&door_seg3_lights_default.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(door_seg3_vertex_lock, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), @@ -639,8 +631,8 @@ const Gfx door_seg3_sub_dl_themed_handle_near[] = { // TODO: Combine vertices // 0x030149C0 - 0x03014A20 const Gfx door_seg3_sub_dl_themed_door_sides[] = { - gsSPLight(&door_seg3_lights_default.l, 1), - gsSPLight(&door_seg3_lights_default.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(door_seg3_vertex_themed_door_sides, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -688,8 +680,8 @@ const Gfx door_seg3_dl_rough_wooden_door_near[] = { gsDPPipeSync(), gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), gsSPSetGeometryMode(G_SHADING_SMOOTH), - gsSPLight(&door_seg3_lights_yellow_handle.l, 1), - gsSPLight(&door_seg3_lights_yellow_handle.a, 2), + gsSPLightColor(LIGHT_1, 0xffff00ff), + gsSPLightColor(LIGHT_2, 0x3f3f00ff), gsSPBranchList(door_seg3_sub_dl_themed_handle_near), }; @@ -714,8 +706,8 @@ const Gfx door_seg3_dl_rough_wooden_door2_near[] = { gsDPPipeSync(), gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), gsSPSetGeometryMode(G_SHADING_SMOOTH), - gsSPLight(&door_seg3_lights_yellow_handle.l, 1), - gsSPLight(&door_seg3_lights_yellow_handle.a, 2), + gsSPLightColor(LIGHT_1, 0xffff00ff), + gsSPLightColor(LIGHT_2, 0x3f3f00ff), gsSPBranchList(door_seg3_sub_dl_themed_handle_near), }; @@ -740,8 +732,8 @@ const Gfx door_seg3_dl_metal_door_near[] = { gsDPPipeSync(), gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), gsSPSetGeometryMode(G_SHADING_SMOOTH), - gsSPLight(&door_seg3_lights_yellow_handle.l, 1), - gsSPLight(&door_seg3_lights_yellow_handle.a, 2), + gsSPLightColor(LIGHT_1, 0xffff00ff), + gsSPLightColor(LIGHT_2, 0x3f3f00ff), gsSPBranchList(door_seg3_sub_dl_themed_handle_near), }; @@ -766,8 +758,8 @@ const Gfx door_seg3_dl_cave_door_near[] = { gsDPPipeSync(), gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), gsSPSetGeometryMode(G_SHADING_SMOOTH), - gsSPLight(&door_seg3_lights_yellow_handle.l, 1), - gsSPLight(&door_seg3_lights_yellow_handle.a, 2), + gsSPLightColor(LIGHT_1, 0xffff00ff), + gsSPLightColor(LIGHT_2, 0x3f3f00ff), gsSPBranchList(door_seg3_sub_dl_themed_handle_near), }; @@ -792,8 +784,8 @@ const Gfx door_seg3_dl_haunted_door_near[] = { gsDPPipeSync(), gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), gsSPSetGeometryMode(G_SHADING_SMOOTH), - gsSPLight(&door_seg3_lights_yellow_handle.l, 1), - gsSPLight(&door_seg3_lights_yellow_handle.a, 2), + gsSPLightColor(LIGHT_1, 0xffff00ff), + gsSPLightColor(LIGHT_2, 0x3f3f00ff), gsSPBranchList(door_seg3_sub_dl_themed_handle_near), }; @@ -823,8 +815,8 @@ static const Vtx door_seg3_vertex_themed_handle_far[] = { // 0x03014EF0 - 0x03014F30 const Gfx door_seg3_sub_dl_themed_door_far[] = { - gsSPLight(&door_seg3_lights_default.l, 1), - gsSPLight(&door_seg3_lights_default.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(door_seg3_vertex_themed_door_far, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), @@ -863,8 +855,8 @@ const Gfx door_seg3_dl_rough_wooden_door_far[] = { gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), gsDPPipeSync(), gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), - gsSPLight(&door_seg3_lights_yellow_handle.l, 1), - gsSPLight(&door_seg3_lights_yellow_handle.a, 2), + gsSPLightColor(LIGHT_1, 0xffff00ff), + gsSPLightColor(LIGHT_2, 0x3f3f00ff), gsSPBranchList(door_seg3_sub_dl_themed_handle_far), }; @@ -881,8 +873,8 @@ const Gfx door_seg3_dl_rough_wooden_door2_far[] = { gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), gsDPPipeSync(), gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), - gsSPLight(&door_seg3_lights_yellow_handle.l, 1), - gsSPLight(&door_seg3_lights_yellow_handle.a, 2), + gsSPLightColor(LIGHT_1, 0xffff00ff), + gsSPLightColor(LIGHT_2, 0x3f3f00ff), gsSPBranchList(door_seg3_sub_dl_themed_handle_far), }; @@ -899,8 +891,8 @@ const Gfx door_seg3_dl_metal_door_far[] = { gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), gsDPPipeSync(), gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), - gsSPLight(&door_seg3_lights_yellow_handle.l, 1), - gsSPLight(&door_seg3_lights_yellow_handle.a, 2), + gsSPLightColor(LIGHT_1, 0xffff00ff), + gsSPLightColor(LIGHT_2, 0x3f3f00ff), gsSPBranchList(door_seg3_sub_dl_themed_handle_far), }; @@ -917,8 +909,8 @@ const Gfx door_seg3_dl_cave_door_far[] = { gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), gsDPPipeSync(), gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), - gsSPLight(&door_seg3_lights_yellow_handle.l, 1), - gsSPLight(&door_seg3_lights_yellow_handle.a, 2), + gsSPLightColor(LIGHT_1, 0xffff00ff), + gsSPLightColor(LIGHT_2, 0x3f3f00ff), gsSPBranchList(door_seg3_sub_dl_themed_handle_far), }; @@ -935,7 +927,7 @@ const Gfx door_seg3_dl_haunted_door_far[] = { gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), gsDPPipeSync(), gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), - gsSPLight(&door_seg3_lights_yellow_handle.l, 1), - gsSPLight(&door_seg3_lights_yellow_handle.a, 2), + gsSPLightColor(LIGHT_1, 0xffff00ff), + gsSPLightColor(LIGHT_2, 0x3f3f00ff), gsSPBranchList(door_seg3_sub_dl_themed_handle_far), }; diff --git a/actors/dorrie/model.inc.c b/actors/dorrie/model.inc.c index b2097a5d..b47a2017 100644 --- a/actors/dorrie/model.inc.c +++ b/actors/dorrie/model.inc.c @@ -16,10 +16,6 @@ ALIGNED8 static const Texture dorrie_seg6_texture_0600ADA0[] = { }; // 0x0600B5A0 -static const Lights1 dorrie_seg6_lights_0600B5A0 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0600B5B8 static const Vtx dorrie_seg6_vertex_0600B5B8[] = { @@ -93,8 +89,8 @@ const Gfx dorrie_seg6_dl_0600B8E8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, dorrie_seg6_texture_0600ADA0), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&dorrie_seg6_lights_0600B5A0.l, 1), - gsSPLight(&dorrie_seg6_lights_0600B5A0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(dorrie_seg6_vertex_0600B5B8, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 1, 4, 5, 0x0, 1, 3, 4, 0x0), @@ -167,10 +163,6 @@ const Gfx dorrie_seg6_dl_0600BAF8[] = { }; // 0x0600BBC0 -static const Lights1 dorrie_seg6_lights_0600BBC0 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0600BBD8 static const Vtx dorrie_seg6_vertex_0600BBD8[] = { @@ -230,8 +222,8 @@ const Gfx dorrie_seg6_dl_0600BE68[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, dorrie_seg6_texture_0600ADA0), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&dorrie_seg6_lights_0600BBC0.l, 1), - gsSPLight(&dorrie_seg6_lights_0600BBC0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(dorrie_seg6_vertex_0600BBD8, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 0, 3, 0x0, 0, 5, 1, 0x0), @@ -298,10 +290,6 @@ const Gfx dorrie_seg6_dl_0600C030[] = { }; // 0x0600C0F8 -static const Lights1 dorrie_seg6_lights_0600C0F8 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0600C110 static const Vtx dorrie_seg6_vertex_0600C110[] = { @@ -348,8 +336,8 @@ const Gfx dorrie_seg6_dl_0600C310[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, dorrie_seg6_texture_06009DA0), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&dorrie_seg6_lights_0600C0F8.l, 1), - gsSPLight(&dorrie_seg6_lights_0600C0F8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(dorrie_seg6_vertex_0600C110, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 4, 7, 0x0, 4, 8, 7, 0x0), @@ -399,10 +387,6 @@ const Gfx dorrie_seg6_dl_0600C468[] = { }; // 0x0600C510 -static const Lights1 dorrie_seg6_lights_0600C510 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0600C528 static const Vtx dorrie_seg6_vertex_0600C528[] = { @@ -456,8 +440,8 @@ const Gfx dorrie_seg6_dl_0600C758[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, dorrie_seg6_texture_06009DA0), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&dorrie_seg6_lights_0600C510.l, 1), - gsSPLight(&dorrie_seg6_lights_0600C510.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(dorrie_seg6_vertex_0600C528, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 5, 6, 7, 0x0, 5, 4, 6, 0x0), @@ -508,10 +492,6 @@ const Gfx dorrie_seg6_dl_0600C8B8[] = { }; // 0x0600C960 -static const Lights1 dorrie_seg6_lights_0600C960 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0600C978 static const Vtx dorrie_seg6_vertex_0600C978[] = { @@ -609,8 +589,8 @@ const Gfx dorrie_seg6_dl_0600CDE8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, dorrie_seg6_texture_06009DA0), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&dorrie_seg6_lights_0600C960.l, 1), - gsSPLight(&dorrie_seg6_lights_0600C960.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(dorrie_seg6_vertex_0600C978, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), gsSP2Triangles( 2, 4, 5, 0x0, 2, 5, 0, 0x0), @@ -671,10 +651,6 @@ const Gfx dorrie_seg6_dl_0600CFD0[] = { }; // 0x0600D078 -static const Lights1 dorrie_seg6_lights_0600D078 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0600D090 static const Vtx dorrie_seg6_vertex_0600D090[] = { @@ -732,8 +708,8 @@ const Gfx dorrie_seg6_dl_0600D300[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, dorrie_seg6_texture_06009DA0), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&dorrie_seg6_lights_0600D078.l, 1), - gsSPLight(&dorrie_seg6_lights_0600D078.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(dorrie_seg6_vertex_0600D090, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 2, 1, 0x0), gsSP2Triangles( 2, 4, 5, 0x0, 2, 5, 0, 0x0), @@ -782,10 +758,6 @@ const Gfx dorrie_seg6_dl_0600D440[] = { }; // 0x0600D4E8 -static const Lights1 dorrie_seg6_lights_0600D4E8 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0600D500 static const Vtx dorrie_seg6_vertex_0600D500[] = { @@ -818,8 +790,8 @@ const Gfx dorrie_seg6_dl_0600D620[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, dorrie_seg6_texture_06009DA0), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&dorrie_seg6_lights_0600D4E8.l, 1), - gsSPLight(&dorrie_seg6_lights_0600D4E8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(dorrie_seg6_vertex_0600D500, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 1, 4, 5, 0x0, 3, 4, 1, 0x0), @@ -859,10 +831,6 @@ const Gfx dorrie_seg6_dl_0600D6D8[] = { }; // 0x0600D780 -static const Lights1 dorrie_seg6_lights_0600D780 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0600D798 static const Vtx dorrie_seg6_vertex_0600D798[] = { @@ -881,8 +849,8 @@ const Gfx dorrie_seg6_dl_0600D818[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, dorrie_seg6_texture_06009DA0), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&dorrie_seg6_lights_0600D780.l, 1), - gsSPLight(&dorrie_seg6_lights_0600D780.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(dorrie_seg6_vertex_0600D798, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 2, 0x0), gsSP2Triangles( 2, 1, 5, 0x0, 2, 6, 3, 0x0), @@ -919,10 +887,6 @@ const Gfx dorrie_seg6_dl_0600D8B0[] = { }; // 0x0600D958 -static const Lights1 dorrie_seg6_lights_0600D958 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0600D970 static const Vtx dorrie_seg6_vertex_0600D970[] = { @@ -941,8 +905,8 @@ const Gfx dorrie_seg6_dl_0600D9F0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, dorrie_seg6_texture_06009DA0), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&dorrie_seg6_lights_0600D958.l, 1), - gsSPLight(&dorrie_seg6_lights_0600D958.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(dorrie_seg6_vertex_0600D970, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 1, 0x0), gsSP2Triangles( 1, 5, 3, 0x0, 2, 1, 4, 0x0), @@ -979,10 +943,6 @@ const Gfx dorrie_seg6_dl_0600DA88[] = { }; // 0x0600DB30 -static const Lights1 dorrie_seg6_lights_0600DB30 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0600DB48 static const Vtx dorrie_seg6_vertex_0600DB48[] = { @@ -1001,8 +961,8 @@ const Gfx dorrie_seg6_dl_0600DBC8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, dorrie_seg6_texture_06009DA0), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&dorrie_seg6_lights_0600DB30.l, 1), - gsSPLight(&dorrie_seg6_lights_0600DB30.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(dorrie_seg6_vertex_0600DB48, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 0, 0x0), gsSP2Triangles( 4, 2, 1, 0x0, 1, 3, 4, 0x0), @@ -1039,10 +999,6 @@ const Gfx dorrie_seg6_dl_0600DC60[] = { }; // 0x0600DD08 -static const Lights1 dorrie_seg6_lights_0600DD08 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0600DD20 static const Vtx dorrie_seg6_vertex_0600DD20[] = { @@ -1061,8 +1017,8 @@ const Gfx dorrie_seg6_dl_0600DDA0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, dorrie_seg6_texture_06009DA0), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&dorrie_seg6_lights_0600DD08.l, 1), - gsSPLight(&dorrie_seg6_lights_0600DD08.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(dorrie_seg6_vertex_0600DD20, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 0, 0x0), gsSP2Triangles( 0, 4, 5, 0x0, 0, 6, 3, 0x0), diff --git a/actors/exclamation_box/model.inc.c b/actors/exclamation_box/model.inc.c index a59b2280..4cd4f734 100644 --- a/actors/exclamation_box/model.inc.c +++ b/actors/exclamation_box/model.inc.c @@ -1,10 +1,6 @@ // Exclamation Box // 0x08012E10 -static const Lights1 exclamation_box_seg8_lights_08012E10 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x08012E28 ALIGNED8 static const Texture exclamation_box_seg8_texture_08012E28[] = { @@ -80,8 +76,8 @@ static const Vtx exclamation_box_seg8_vertex_08018F28[] = { // 0x08018FA8 - 0x08019008 const Gfx exclamation_box_seg8_dl_08018FA8[] = { - gsSPLight(&exclamation_box_seg8_lights_08012E10.l, 1), - gsSPLight(&exclamation_box_seg8_lights_08012E10.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(exclamation_box_seg8_vertex_08018E28, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -149,8 +145,8 @@ static const Vtx exclamation_box_seg8_vertex_080191A0[] = { // 0x08019220 - 0x08019280 const Gfx exclamation_box_seg8_dl_08019220[] = { - gsSPLight(&exclamation_box_seg8_lights_08012E10.l, 1), - gsSPLight(&exclamation_box_seg8_lights_08012E10.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(exclamation_box_seg8_vertex_080190A0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), diff --git a/actors/exclamation_box_outline/model.inc.c b/actors/exclamation_box_outline/model.inc.c index b60496d4..f7599270 100644 --- a/actors/exclamation_box_outline/model.inc.c +++ b/actors/exclamation_box_outline/model.inc.c @@ -1,28 +1,12 @@ // Exclamation Box Outline // 0x08024CB8 -static const Lights1 exclamation_box_outline_seg8_lights_08024CB8 = gdSPDefLights1( - 0x7f, 0x00, 0x00, - 0xff, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x08024CD0 -static const Lights1 exclamation_box_outline_seg8_lights_08024CD0 = gdSPDefLights1( - 0x00, 0x7f, 0x00, - 0x00, 0xff, 0x00, 0x28, 0x28, 0x28 -); // 0x08024CE8 -static const Lights1 exclamation_box_outline_seg8_lights_08024CE8 = gdSPDefLights1( - 0x00, 0x00, 0x7f, - 0x00, 0x00, 0xff, 0x28, 0x28, 0x28 -); // 0x08024D00 -static const Lights1 exclamation_box_outline_seg8_lights_08024D00 = gdSPDefLights1( - 0x7f, 0x6a, 0x00, - 0xff, 0xd4, 0x00, 0x28, 0x28, 0x28 -); // 0x08024D18 static const Vtx exclamation_box_outline_seg8_vertex_08024D18[] = { @@ -94,32 +78,32 @@ const Gfx exclamation_box_outline_seg8_dl_08024F58[] = { // 0x08024F88 - 0x08024FA8 const Gfx exclamation_box_outline_seg8_dl_08024F88[] = { gsSPDisplayList(exclamation_box_outline_seg8_dl_08024F30), - gsSPLight(&exclamation_box_outline_seg8_lights_08024CB8.l, 1), - gsSPLight(&exclamation_box_outline_seg8_lights_08024CB8.a, 2), + gsSPLightColor(LIGHT_1, 0xff0000ff), + gsSPLightColor(LIGHT_2, 0x7f0000ff), gsSPBranchList(exclamation_box_outline_seg8_dl_08024F58), }; // 0x08024FA8 - 0x08024FC8 const Gfx exclamation_box_outline_seg8_dl_08024FA8[] = { gsSPDisplayList(exclamation_box_outline_seg8_dl_08024F30), - gsSPLight(&exclamation_box_outline_seg8_lights_08024CD0.l, 1), - gsSPLight(&exclamation_box_outline_seg8_lights_08024CD0.a, 2), + gsSPLightColor(LIGHT_1, 0xff00ff), + gsSPLightColor(LIGHT_2, 0x7f00ff), gsSPBranchList(exclamation_box_outline_seg8_dl_08024F58), }; // 0x08024FC8 - 0x08024FE8 const Gfx exclamation_box_outline_seg8_dl_08024FC8[] = { gsSPDisplayList(exclamation_box_outline_seg8_dl_08024F30), - gsSPLight(&exclamation_box_outline_seg8_lights_08024CE8.l, 1), - gsSPLight(&exclamation_box_outline_seg8_lights_08024CE8.a, 2), + gsSPLightColor(LIGHT_1, 0xffff), + gsSPLightColor(LIGHT_2, 0x7fff), gsSPBranchList(exclamation_box_outline_seg8_dl_08024F58), }; // 0x08024FE8 - 0x08025008 const Gfx exclamation_box_outline_seg8_dl_08024FE8[] = { gsSPDisplayList(exclamation_box_outline_seg8_dl_08024F30), - gsSPLight(&exclamation_box_outline_seg8_lights_08024D00.l, 1), - gsSPLight(&exclamation_box_outline_seg8_lights_08024D00.a, 2), + gsSPLightColor(LIGHT_1, 0xffd400ff), + gsSPLightColor(LIGHT_2, 0x7f6a00ff), gsSPBranchList(exclamation_box_outline_seg8_dl_08024F58), }; @@ -193,10 +177,6 @@ const Gfx exclamation_box_outline_seg8_dl_080259F8[] = { }; // 0x08025A68 -static const Lights1 exclamation_box_outline_seg8_lights_08025A68 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x08025A80 ALIGNED8 static const Texture exclamation_box_outline_seg8_texture_08025A80[] = { @@ -216,8 +196,8 @@ const Gfx exclamation_box_outline_seg8_dl_08025EC0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, exclamation_box_outline_seg8_texture_08025A80), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 32 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)), - gsSPLight(&exclamation_box_outline_seg8_lights_08025A68.l, 1), - gsSPLight(&exclamation_box_outline_seg8_lights_08025A68.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(exclamation_box_outline_seg8_vertex_08025E80, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), diff --git a/actors/eyerok/model.inc.c b/actors/eyerok/model.inc.c index 629b3cda..a27ffa97 100644 --- a/actors/eyerok/model.inc.c +++ b/actors/eyerok/model.inc.c @@ -1,10 +1,6 @@ // Eyerok // Unreferenced light group -UNUSED static const Lights1 eyerok_lights_unused = gdSPDefLights1( - 0x3f, 0x2a, 0x16, - 0xff, 0xa9, 0x5b, 0x28, 0x28, 0x28 -); // 0x05008D40 ALIGNED8 static const Texture eyerok_seg5_texture_05008D40[] = { @@ -32,10 +28,6 @@ ALIGNED8 static const Texture eyerok_seg5_texture_0500AD40[] = { }; // 0x0500B540 -static const Lights1 eyerok_seg5_lights_0500B540 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0500B558 static const Vtx eyerok_seg5_vertex_0500B558[] = { @@ -72,8 +64,8 @@ const Gfx eyerok_seg5_dl_0500B6B8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, eyerok_seg5_texture_05008D40), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&eyerok_seg5_lights_0500B540.l, 1), - gsSPLight(&eyerok_seg5_lights_0500B540.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(eyerok_seg5_vertex_0500B558, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 3, 5, 0x0, 7, 8, 9, 0x0), @@ -104,10 +96,6 @@ const Gfx eyerok_seg5_dl_0500B748[] = { }; // 0x0500B7B8 -static const Lights1 eyerok_seg5_lights_0500B7B8 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0500B7D0 static const Vtx eyerok_seg5_vertex_0500B7D0[] = { @@ -144,8 +132,8 @@ const Gfx eyerok_seg5_dl_0500B930[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, eyerok_seg5_texture_05008D40), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&eyerok_seg5_lights_0500B7B8.l, 1), - gsSPLight(&eyerok_seg5_lights_0500B7B8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(eyerok_seg5_vertex_0500B7D0, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 6, 5, 0x0, 7, 8, 9, 0x0), @@ -176,10 +164,6 @@ const Gfx eyerok_seg5_dl_0500B9C0[] = { }; // 0x0500BA30 -static const Lights1 eyerok_seg5_lights_0500BA30 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0500BA48 static const Vtx eyerok_seg5_vertex_0500BA48[] = { @@ -220,8 +204,8 @@ const Gfx eyerok_seg5_dl_0500BBE8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, eyerok_seg5_texture_05008D40), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&eyerok_seg5_lights_0500BA30.l, 1), - gsSPLight(&eyerok_seg5_lights_0500BA30.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(eyerok_seg5_vertex_0500BA48, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 6, 5, 0x0, 7, 8, 9, 0x0), @@ -253,10 +237,6 @@ const Gfx eyerok_seg5_dl_0500BC88[] = { }; // 0x0500BCF8 -static const Lights1 eyerok_seg5_lights_0500BCF8 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0500BD10 static const Vtx eyerok_seg5_vertex_0500BD10[] = { @@ -293,8 +273,8 @@ const Gfx eyerok_seg5_dl_0500BE70[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, eyerok_seg5_texture_05008D40), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&eyerok_seg5_lights_0500BCF8.l, 1), - gsSPLight(&eyerok_seg5_lights_0500BCF8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(eyerok_seg5_vertex_0500BD10, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 6, 5, 0x0, 7, 8, 9, 0x0), @@ -325,10 +305,6 @@ const Gfx eyerok_seg5_dl_0500BF00[] = { }; // 0x0500BF70 -static const Lights1 eyerok_seg5_lights_0500BF70 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0500BF88 static const Vtx eyerok_seg5_vertex_0500BF88[] = { @@ -355,8 +331,8 @@ const Gfx eyerok_seg5_dl_0500C088[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, eyerok_seg5_texture_05008D40), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&eyerok_seg5_lights_0500BF70.l, 1), - gsSPLight(&eyerok_seg5_lights_0500BF70.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(eyerok_seg5_vertex_0500BF88, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 6, 5, 0x0, 7, 8, 9, 0x0), @@ -384,10 +360,6 @@ const Gfx eyerok_seg5_dl_0500C100[] = { }; // 0x0500C170 -static const Lights1 eyerok_seg5_lights_0500C170 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0500C188 static const Vtx eyerok_seg5_vertex_0500C188[] = { @@ -424,8 +396,8 @@ const Gfx eyerok_seg5_dl_0500C2E8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, eyerok_seg5_texture_05008D40), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&eyerok_seg5_lights_0500C170.l, 1), - gsSPLight(&eyerok_seg5_lights_0500C170.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(eyerok_seg5_vertex_0500C188, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 6, 5, 0x0, 7, 8, 9, 0x0), @@ -456,10 +428,6 @@ const Gfx eyerok_seg5_dl_0500C378[] = { }; // 0x0500C3E8 -static const Lights1 eyerok_seg5_lights_0500C3E8 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0500C400 static const Vtx eyerok_seg5_vertex_0500C400[] = { @@ -500,8 +468,8 @@ const Gfx eyerok_seg5_dl_0500C5A0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, eyerok_seg5_texture_05008D40), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&eyerok_seg5_lights_0500C3E8.l, 1), - gsSPLight(&eyerok_seg5_lights_0500C3E8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(eyerok_seg5_vertex_0500C400, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 6, 5, 0x0, 7, 8, 9, 0x0), @@ -533,10 +501,6 @@ const Gfx eyerok_seg5_dl_0500C640[] = { }; // 0x0500C6B0 -static const Lights1 eyerok_seg5_lights_0500C6B0 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0500C6C8 static const Vtx eyerok_seg5_vertex_0500C6C8[] = { @@ -577,8 +541,8 @@ const Gfx eyerok_seg5_dl_0500C868[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, eyerok_seg5_texture_05008D40), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&eyerok_seg5_lights_0500C6B0.l, 1), - gsSPLight(&eyerok_seg5_lights_0500C6B0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(eyerok_seg5_vertex_0500C6C8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), diff --git a/actors/flyguy/model.inc.c b/actors/flyguy/model.inc.c index a651ce1b..89eb6026 100644 --- a/actors/flyguy/model.inc.c +++ b/actors/flyguy/model.inc.c @@ -19,46 +19,18 @@ ALIGNED8 static const Texture flyguy_seg8_texture_0800F888[] = { }; // Unreferenced light group -UNUSED static const Lights1 flyguy_lights_unused1 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x080100A0 -static const Lights1 flyguy_seg8_lights_080100A0 = gdSPDefLights1( - 0x00, 0x1f, 0x33, - 0x02, 0x7f, 0xcc, 0x28, 0x28, 0x28 -); // 0x080100B8 -static const Lights1 flyguy_seg8_lights_080100B8 = gdSPDefLights1( - 0x3f, 0x32, 0x08, - 0xff, 0xc8, 0x23, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 flyguy_lights_unused2 = gdSPDefLights1( - 0x3a, 0x2f, 0x04, - 0xe8, 0xbd, 0x13, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 flyguy_lights_unused3 = gdSPDefLights1( - 0x2c, 0x00, 0x00, - 0xb2, 0x00, 0x00, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 flyguy_lights_unused4 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 flyguy_lights_unused5 = gdSPDefLights1( - 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x08010130 static const Vtx flyguy_seg8_vertex_08010130[] = { @@ -211,8 +183,8 @@ static const Vtx flyguy_seg8_vertex_08010770[] = { // 0x08010840 - 0x08010968 const Gfx flyguy_seg8_dl_08010840[] = { - gsSPLight(&flyguy_seg8_lights_080100A0.l, 1), - gsSPLight(&flyguy_seg8_lights_080100A0.a, 2), + gsSPLightColor(LIGHT_1, 0x27fccff), + gsSPLightColor(LIGHT_2, 0x1f33ff), gsSPVertex(flyguy_seg8_vertex_08010130, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 6, 8, 9, 0x0), @@ -238,8 +210,8 @@ const Gfx flyguy_seg8_dl_08010840[] = { // 0x08010968 - 0x08010A90 const Gfx flyguy_seg8_dl_08010968[] = { - gsSPLight(&flyguy_seg8_lights_080100A0.l, 1), - gsSPLight(&flyguy_seg8_lights_080100A0.a, 2), + gsSPLightColor(LIGHT_1, 0x27fccff), + gsSPLightColor(LIGHT_2, 0x1f33ff), gsSPVertex(flyguy_seg8_vertex_08010460, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), @@ -265,8 +237,8 @@ const Gfx flyguy_seg8_dl_08010968[] = { // 0x08010A90 - 0x08010AE0 const Gfx flyguy_seg8_dl_08010A90[] = { - gsSPLight(&flyguy_seg8_lights_080100B8.l, 1), - gsSPLight(&flyguy_seg8_lights_080100B8.a, 2), + gsSPLightColor(LIGHT_1, 0xffc823ff), + gsSPLightColor(LIGHT_2, 0x3f3208ff), gsSPVertex(flyguy_seg8_vertex_08010770, 13, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 0, 2, 0x0, 7, 8, 9, 0x0), @@ -275,10 +247,6 @@ const Gfx flyguy_seg8_dl_08010A90[] = { }; // 0x08010AE0 -static const Lights1 flyguy_seg8_lights_08010AE0 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x08010AF8 static const Vtx flyguy_seg8_vertex_08010AF8[] = { @@ -293,8 +261,8 @@ const Gfx flyguy_seg8_dl_08010B38[] = { gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, flyguy_seg8_texture_0800F888), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&flyguy_seg8_lights_08010AE0.l, 1), - gsSPLight(&flyguy_seg8_lights_08010AE0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(flyguy_seg8_vertex_08010AF8, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSPEndDisplayList(), @@ -319,22 +287,10 @@ const Gfx flyguy_seg8_dl_08010B80[] = { }; // 0x08010BF0 -static const Lights1 flyguy_seg8_lights_08010BF0 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x08010C08 -static const Lights1 flyguy_seg8_lights_08010C08 = gdSPDefLights1( - 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x08010C20 -static const Lights1 flyguy_seg8_lights_08010C20 = gdSPDefLights1( - 0x62, 0x00, 0x13, - 0xc4, 0x00, 0x26, 0x28, 0x28, 0x28 -); // 0x08010C38 static const Vtx flyguy_seg8_vertex_08010C38[] = { @@ -500,8 +456,8 @@ const Gfx flyguy_seg8_dl_080113A8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, flyguy_seg8_texture_0800F088), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&flyguy_seg8_lights_08010BF0.l, 1), - gsSPLight(&flyguy_seg8_lights_08010BF0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(flyguy_seg8_vertex_08010C38, 9, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), gsSP2Triangles( 4, 1, 0, 0x0, 2, 5, 0, 0x0), @@ -515,12 +471,12 @@ const Gfx flyguy_seg8_dl_08011420[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, flyguy_seg8_texture_0800E088), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPLight(&flyguy_seg8_lights_08010C08.l, 1), - gsSPLight(&flyguy_seg8_lights_08010C08.a, 2), + gsSPLightColor(LIGHT_1, 0xff), + gsSPLightColor(LIGHT_2, 0xff), gsSPVertex(flyguy_seg8_vertex_08010CC8, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), - gsSPLight(&flyguy_seg8_lights_08010C20.l, 1), - gsSPLight(&flyguy_seg8_lights_08010C20.a, 2), + gsSPLightColor(LIGHT_1, 0xc40026ff), + gsSPLightColor(LIGHT_2, 0x620013ff), gsSPVertex(flyguy_seg8_vertex_08010D28, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 4, 0x0), gsSP2Triangles( 1, 5, 3, 0x0, 1, 4, 2, 0x0), @@ -569,8 +525,8 @@ const Gfx flyguy_seg8_dl_08011420[] = { // 0x080116D0 - 0x08011710 const Gfx flyguy_seg8_dl_080116D0[] = { - gsSPLight(&flyguy_seg8_lights_08010C08.l, 1), - gsSPLight(&flyguy_seg8_lights_08010C08.a, 2), + gsSPLightColor(LIGHT_1, 0xff), + gsSPLightColor(LIGHT_2, 0xff), gsSPVertex(flyguy_seg8_vertex_08011348, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 1, 4, 2, 0x0, 1, 5, 4, 0x0), diff --git a/actors/goomba/model.inc.c b/actors/goomba/model.inc.c index 2ddba464..47c7d40b 100644 --- a/actors/goomba/model.inc.c +++ b/actors/goomba/model.inc.c @@ -1,40 +1,16 @@ // Goomba // Unreferenced light group -UNUSED static const Lights1 goomba_lights_unused1 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 goomba_lights_unused2 = gdSPDefLights1( - 0x2c, 0x2c, 0x2c, - 0xb2, 0xb2, 0xb2, 0x28, 0x28, 0x28 -); // 0x080194D0 -static const Lights1 goomba_seg8_lights_080194D0 = gdSPDefLights1( - 0x15, 0x0b, 0x04, - 0x54, 0x2e, 0x10, 0x28, 0x28, 0x28 -); // 0x080194E8 -static const Lights1 goomba_seg8_lights_080194E8 = gdSPDefLights1( - 0x18, 0x0d, 0x04, - 0x61, 0x34, 0x13, 0x28, 0x28, 0x28 -); // 0x08019500 -static const Lights1 goomba_seg8_lights_08019500 = gdSPDefLights1( - 0x1d, 0x10, 0x08, - 0x77, 0x42, 0x20, 0x28, 0x28, 0x28 -); // 0x08019518 -static const Lights1 goomba_seg8_lights_08019518 = gdSPDefLights1( - 0x37, 0x2d, 0x13, - 0xde, 0xb4, 0x4e, 0x28, 0x28, 0x28 -); // 0x08019530 ALIGNED8 static const Texture goomba_seg8_texture_08019530[] = { @@ -62,10 +38,6 @@ ALIGNED8 static const Texture floomba_seg8_texture_blink[] = { #endif // 0x0801AD30 -static const Lights1 goomba_seg8_lights_0801AD30 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0801AD48 static const Vtx goomba_seg8_vertex_0801AD48[] = { @@ -183,8 +155,8 @@ static const Vtx goomba_seg8_vertex_0801B238[] = { // 0x0801B2E8 - 0x0801B560 const Gfx goomba_seg8_dl_0801B2E8[] = { - gsSPLight(&goomba_seg8_lights_0801AD30.l, 1), - gsSPLight(&goomba_seg8_lights_0801AD30.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(goomba_seg8_vertex_0801AD48, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 5, 4, 0x0, 5, 7, 3, 0x0), @@ -800,8 +772,8 @@ static const Vtx goomba_seg8_vertex_0801CDF0[] = { // 0x0801CE20 - 0x0801CF78 const Gfx goomba_seg8_dl_0801CE20[] = { - gsSPLight(&goomba_seg8_lights_080194D0.l, 1), - gsSPLight(&goomba_seg8_lights_080194D0.a, 2), + gsSPLightColor(LIGHT_1, 0x542e10ff), + gsSPLightColor(LIGHT_2, 0x150b04ff), gsSPVertex(goomba_seg8_vertex_0801B700, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), @@ -829,8 +801,8 @@ const Gfx goomba_seg8_dl_0801CE20[] = { // 0x0801CF78 - 0x0801D0D0 const Gfx goomba_seg8_dl_0801CF78[] = { - gsSPLight(&goomba_seg8_lights_080194E8.l, 1), - gsSPLight(&goomba_seg8_lights_080194E8.a, 2), + gsSPLightColor(LIGHT_1, 0x613413ff), + gsSPLightColor(LIGHT_2, 0x180d04ff), gsSPVertex(goomba_seg8_vertex_0801BA50, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 1, 4, 5, 0x0, 1, 5, 2, 0x0), @@ -858,8 +830,8 @@ const Gfx goomba_seg8_dl_0801CF78[] = { // 0x0801D0D0 - 0x0801D360 const Gfx goomba_seg8_dl_0801D0D0[] = { - gsSPLight(&goomba_seg8_lights_08019500.l, 1), - gsSPLight(&goomba_seg8_lights_08019500.a, 2), + gsSPLightColor(LIGHT_1, 0x774220ff), + gsSPLightColor(LIGHT_2, 0x1d1008ff), gsSPVertex(goomba_seg8_vertex_0801BDC0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), @@ -910,8 +882,8 @@ const Gfx goomba_seg8_dl_0801D0D0[] = { // 0x0801D360 - 0x0801D760 const Gfx goomba_seg8_dl_0801D360[] = { - gsSPLight(&goomba_seg8_lights_08019518.l, 1), - gsSPLight(&goomba_seg8_lights_08019518.a, 2), + gsSPLightColor(LIGHT_1, 0xdeb44eff), + gsSPLightColor(LIGHT_2, 0x372d13ff), gsSPVertex(goomba_seg8_vertex_0801C620, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 1, 0x0, 4, 1, 0, 0x0), diff --git a/actors/haunted_cage/model.inc.c b/actors/haunted_cage/model.inc.c index e38e0b5a..b1ec0f05 100644 --- a/actors/haunted_cage/model.inc.c +++ b/actors/haunted_cage/model.inc.c @@ -1,16 +1,8 @@ // Haunted Cage // 0x0500C258 -static const Lights1 haunted_cage_seg5_lights_0500C258 = gdSPDefLights1( - 0x39, 0x0c, 0x0e, - 0x90, 0x1e, 0x25, 0x28, 0x28, 0x28 -); // 0x0500C270 -static const Lights1 haunted_cage_seg5_lights_0500C270 = gdSPDefLights1( - 0x47, 0x47, 0x47, - 0xb2, 0xb2, 0xb2, 0x28, 0x28, 0x28 -); // 0x0500C288 ALIGNED8 static const Texture haunted_cage_seg5_texture_0500C288[] = { @@ -254,8 +246,8 @@ const Gfx haunted_cage_seg5_dl_0500F4C8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, haunted_cage_seg5_texture_0500D288), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&haunted_cage_seg5_lights_0500C258.l, 1), - gsSPLight(&haunted_cage_seg5_lights_0500C258.a, 2), + gsSPLightColor(LIGHT_1, 0x901e25ff), + gsSPLightColor(LIGHT_2, 0x390c0eff), gsSPVertex(haunted_cage_seg5_vertex_0500EA88, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), @@ -266,8 +258,8 @@ const Gfx haunted_cage_seg5_dl_0500F4C8[] = { gsSP1Triangle(12, 13, 14, 0x0), gsSPVertex(haunted_cage_seg5_vertex_0500EC68, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), - gsSPLight(&haunted_cage_seg5_lights_0500C270.l, 1), - gsSPLight(&haunted_cage_seg5_lights_0500C270.a, 2), + gsSPLightColor(LIGHT_1, 0xb2b2b2ff), + gsSPLightColor(LIGHT_2, 0x474747ff), gsSPVertex(haunted_cage_seg5_vertex_0500ECC8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 3, 9, 4, 0x0), @@ -353,10 +345,6 @@ const Gfx haunted_cage_seg5_dl_0500F7D8[] = { }; // 0x0500F888 -static const Lights1 haunted_cage_seg5_lights_0500F888 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0500F8A0 static const Vtx haunted_cage_seg5_vertex_0500F8A0[] = { @@ -417,8 +405,8 @@ const Gfx haunted_cage_seg5_dl_0500FB40[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, haunted_cage_seg5_texture_0500D688), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&haunted_cage_seg5_lights_0500F888.l, 1), - gsSPLight(&haunted_cage_seg5_lights_0500F888.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(haunted_cage_seg5_vertex_0500F8A0, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), @@ -455,10 +443,6 @@ const Gfx haunted_cage_seg5_dl_0500FC28[] = { }; // 0x0500FC98 -static const Lights1 haunted_cage_seg5_lights_0500FC98 = gdSPDefLights1( - 0x2c, 0x2c, 0x2c, - 0xb2, 0xb2, 0xb2, 0x28, 0x28, 0x28 -); // 0x0500FCB0 static const Vtx haunted_cage_seg5_vertex_0500FCB0[] = { @@ -533,8 +517,8 @@ const Gfx haunted_cage_seg5_dl_0500FFF0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, haunted_cage_seg5_texture_0500DA88), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&haunted_cage_seg5_lights_0500FC98.l, 1), - gsSPLight(&haunted_cage_seg5_lights_0500FC98.a, 2), + gsSPLightColor(LIGHT_1, 0xb2b2b2ff), + gsSPLightColor(LIGHT_2, 0x2c2c2cff), gsSPVertex(haunted_cage_seg5_vertex_0500FCB0, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), diff --git a/actors/heave_ho/model.inc.c b/actors/heave_ho/model.inc.c index 36f97f23..a7e37153 100644 --- a/actors/heave_ho/model.inc.c +++ b/actors/heave_ho/model.inc.c @@ -1,46 +1,18 @@ // Heave Ho // Unreferenced light group -UNUSED static const Lights1 heave_ho_lights_unused1 = gdSPDefLights1( - 0x2c, 0x2c, 0x2c, - 0xb2, 0xb2, 0xb2, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 heave_ho_lights_unused2 = gdSPDefLights1( - 0x3f, 0x38, 0x00, - 0xff, 0xe3, 0x00, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 heave_ho_lights_unused3 = gdSPDefLights1( - 0x3f, 0x00, 0x00, - 0xff, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x0500E968 -static const Lights1 heave_ho_seg5_lights_0500E968 = gdSPDefLights1( - 0x14, 0x14, 0x15, - 0x50, 0x50, 0x54, 0x28, 0x28, 0x28 -); // 0x0500E980 -static const Lights1 heave_ho_seg5_lights_0500E980 = gdSPDefLights1( - 0x73, 0x3f, 0x32, - 0xff, 0xe0, 0x85, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 heave_ho_lights_unused4 = gdSPDefLights1( - 0x3b, 0x38, 0x21, - 0xec, 0xe3, 0x84, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 heave_ho_lights_unused5 = gdSPDefLights1( - 0x32, 0x32, 0x32, - 0xc8, 0xc8, 0xc8, 0x28, 0x28, 0x28 -); // 0x0500E9C8 ALIGNED8 static const Texture heave_ho_seg5_texture_0500E9C8[] = { @@ -73,16 +45,8 @@ ALIGNED8 static const Texture heave_ho_seg5_texture_050113C8[] = { }; // 0x05011BC8 -static const Lights1 heave_ho_seg5_lights_05011BC8 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05011BE0 -static const Lights1 heave_ho_seg5_lights_05011BE0 = gdSPDefLights1( - 0x40, 0x00, 0x0d, - 0x81, 0x01, 0x1a, 0x28, 0x28, 0x28 -); // 0x05011BF8 static const Vtx heave_ho_seg5_vertex_05011BF8[] = { @@ -131,8 +95,8 @@ const Gfx heave_ho_seg5_dl_05011D98[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, heave_ho_seg5_texture_0500E9C8), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&heave_ho_seg5_lights_05011BC8.l, 1), - gsSPLight(&heave_ho_seg5_lights_05011BC8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(heave_ho_seg5_vertex_05011BF8, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), @@ -163,8 +127,8 @@ const Gfx heave_ho_seg5_dl_05011E28[] = { // 0x05011E80 - 0x05011EC0 const Gfx heave_ho_seg5_dl_05011E80[] = { - gsSPLight(&heave_ho_seg5_lights_05011BE0.l, 1), - gsSPLight(&heave_ho_seg5_lights_05011BE0.a, 2), + gsSPLightColor(LIGHT_1, 0x81011aff), + gsSPLightColor(LIGHT_2, 0x40000dff), gsSPVertex(heave_ho_seg5_vertex_05011D38, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 3, 4, 5, 0x0, 3, 5, 1, 0x0), @@ -194,16 +158,8 @@ const Gfx heave_ho_seg5_dl_05011EC0[] = { }; // 0x05011F50 -static const Lights1 heave_ho_seg5_lights_05011F50 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05011F68 -static const Lights1 heave_ho_seg5_lights_05011F68 = gdSPDefLights1( - 0x4c, 0x00, 0x16, - 0x99, 0x00, 0x2d, 0x28, 0x28, 0x28 -); // 0x05011F80 static const Vtx heave_ho_seg5_vertex_05011F80[] = { @@ -236,8 +192,8 @@ const Gfx heave_ho_seg5_dl_050120A0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, heave_ho_seg5_texture_050109C8), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&heave_ho_seg5_lights_05011F50.l, 1), - gsSPLight(&heave_ho_seg5_lights_05011F50.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(heave_ho_seg5_vertex_05011F80, 11, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 5, 6, 3, 0x0, 7, 8, 9, 0x0), @@ -247,8 +203,8 @@ const Gfx heave_ho_seg5_dl_050120A0[] = { // 0x05012100 - 0x05012148 const Gfx heave_ho_seg5_dl_05012100[] = { - gsSPLight(&heave_ho_seg5_lights_05011F68.l, 1), - gsSPLight(&heave_ho_seg5_lights_05011F68.a, 2), + gsSPLightColor(LIGHT_1, 0x99002dff), + gsSPLightColor(LIGHT_2, 0x4c0016ff), gsSPVertex(heave_ho_seg5_vertex_05012030, 7, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0), gsSP2Triangles( 4, 0, 3, 0x0, 3, 5, 4, 0x0), @@ -274,16 +230,8 @@ const Gfx heave_ho_seg5_dl_05012148[] = { }; // 0x050121B0 -static const Lights1 heave_ho_seg5_lights_050121B0 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x050121C8 -static const Lights1 heave_ho_seg5_lights_050121C8 = gdSPDefLights1( - 0x4c, 0x00, 0x16, - 0x99, 0x00, 0x2d, 0x28, 0x28, 0x28 -); // 0x050121E0 static const Vtx heave_ho_seg5_vertex_050121E0[] = { @@ -316,8 +264,8 @@ const Gfx heave_ho_seg5_dl_05012300[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, heave_ho_seg5_texture_050109C8), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&heave_ho_seg5_lights_050121B0.l, 1), - gsSPLight(&heave_ho_seg5_lights_050121B0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(heave_ho_seg5_vertex_050121E0, 11, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 5, 6, 3, 0x0, 7, 8, 9, 0x0), @@ -327,8 +275,8 @@ const Gfx heave_ho_seg5_dl_05012300[] = { // 0x05012360 - 0x050123A8 const Gfx heave_ho_seg5_dl_05012360[] = { - gsSPLight(&heave_ho_seg5_lights_050121C8.l, 1), - gsSPLight(&heave_ho_seg5_lights_050121C8.a, 2), + gsSPLightColor(LIGHT_1, 0x99002dff), + gsSPLightColor(LIGHT_2, 0x4c0016ff), gsSPVertex(heave_ho_seg5_vertex_05012290, 7, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 2, 4, 0x0, 4, 3, 6, 0x0), @@ -354,16 +302,8 @@ const Gfx heave_ho_seg5_dl_050123A8[] = { }; // 0x05012410 -static const Lights1 heave_ho_seg5_lights_05012410 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05012428 -static const Lights1 heave_ho_seg5_lights_05012428 = gdSPDefLights1( - 0x5d, 0x6d, 0x65, - 0xbb, 0xda, 0xcb, 0x28, 0x28, 0x28 -); // 0x05012440 static const Vtx heave_ho_seg5_vertex_05012440[] = { @@ -396,8 +336,8 @@ const Gfx heave_ho_seg5_dl_05012560[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, heave_ho_seg5_texture_0500F1C8), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&heave_ho_seg5_lights_05012410.l, 1), - gsSPLight(&heave_ho_seg5_lights_05012410.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(heave_ho_seg5_vertex_05012440, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), @@ -405,8 +345,8 @@ const Gfx heave_ho_seg5_dl_05012560[] = { // 0x050125A8 - 0x050125F8 const Gfx heave_ho_seg5_dl_050125A8[] = { - gsSPLight(&heave_ho_seg5_lights_05012428.l, 1), - gsSPLight(&heave_ho_seg5_lights_05012428.a, 2), + gsSPLightColor(LIGHT_1, 0xbbdacbff), + gsSPLightColor(LIGHT_2, 0x5d6d65ff), gsSPVertex(heave_ho_seg5_vertex_05012480, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 6, 9, 7, 0x0), @@ -470,10 +410,6 @@ const Gfx heave_ho_seg5_dl_050126E8[] = { }; // 0x05012758 -static const Lights1 heave_ho_seg5_lights_05012758 = gdSPDefLights1( - 0x93, 0x73, 0x7c, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05012770 static const Vtx heave_ho_seg5_vertex_05012770[] = { @@ -488,8 +424,8 @@ const Gfx heave_ho_seg5_dl_050127B0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, heave_ho_seg5_texture_050113C8), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&heave_ho_seg5_lights_05012758.l, 1), - gsSPLight(&heave_ho_seg5_lights_05012758.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x93737cff), gsSPVertex(heave_ho_seg5_vertex_05012770, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 1, 3, 0x0), gsSPEndDisplayList(), @@ -1021,8 +957,8 @@ static const Vtx heave_ho_seg5_vertex_05014128[] = { // 0x05014188 - 0x05014560 const Gfx heave_ho_seg5_dl_05014188[] = { - gsSPLight(&heave_ho_seg5_lights_0500E968.l, 1), - gsSPLight(&heave_ho_seg5_lights_0500E968.a, 2), + gsSPLightColor(LIGHT_1, 0x505054ff), + gsSPLightColor(LIGHT_2, 0x141415ff), gsSPVertex(heave_ho_seg5_vertex_05012868, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 0, 3, 0x0), gsSP2Triangles( 1, 3, 4, 0x0, 4, 3, 5, 0x0), @@ -1092,8 +1028,8 @@ const Gfx heave_ho_seg5_dl_05014188[] = { // 0x05014560 - 0x050145D0 const Gfx heave_ho_seg5_dl_05014560[] = { - gsSPLight(&heave_ho_seg5_lights_0500E980.l, 1), - gsSPLight(&heave_ho_seg5_lights_0500E980.a, 2), + gsSPLightColor(LIGHT_1, 0xffe085ff), + gsSPLightColor(LIGHT_2, 0x733f32ff), gsSPVertex(heave_ho_seg5_vertex_05013068, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 3, 6, 0x0, 5, 7, 3, 0x0), @@ -1105,8 +1041,8 @@ const Gfx heave_ho_seg5_dl_05014560[] = { // 0x050145D0 - 0x050149A8 const Gfx heave_ho_seg5_dl_050145D0[] = { - gsSPLight(&heave_ho_seg5_lights_0500E968.l, 1), - gsSPLight(&heave_ho_seg5_lights_0500E968.a, 2), + gsSPLightColor(LIGHT_1, 0x505054ff), + gsSPLightColor(LIGHT_2, 0x141415ff), gsSPVertex(heave_ho_seg5_vertex_05013128, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 0, 3, 0x0), gsSP2Triangles( 1, 3, 4, 0x0, 4, 3, 5, 0x0), @@ -1176,8 +1112,8 @@ const Gfx heave_ho_seg5_dl_050145D0[] = { // 0x050149A8 - 0x05014D80 const Gfx heave_ho_seg5_dl_050149A8[] = { - gsSPLight(&heave_ho_seg5_lights_0500E968.l, 1), - gsSPLight(&heave_ho_seg5_lights_0500E968.a, 2), + gsSPLightColor(LIGHT_1, 0x505054ff), + gsSPLightColor(LIGHT_2, 0x141415ff), gsSPVertex(heave_ho_seg5_vertex_05013928, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 0, 3, 0x0), gsSP2Triangles( 1, 3, 4, 0x0, 4, 3, 5, 0x0), @@ -1247,8 +1183,8 @@ const Gfx heave_ho_seg5_dl_050149A8[] = { // 0x05014D80 - 0x05014DD0 const Gfx heave_ho_seg5_dl_05014D80[] = { - gsSPLight(&heave_ho_seg5_lights_0500E980.l, 1), - gsSPLight(&heave_ho_seg5_lights_0500E980.a, 2), + gsSPLightColor(LIGHT_1, 0xffe085ff), + gsSPLightColor(LIGHT_2, 0x733f32ff), gsSPVertex(heave_ho_seg5_vertex_05014128, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 4, 0x0), gsSP2Triangles( 4, 3, 5, 0x0, 0, 2, 5, 0x0), diff --git a/actors/hoot/model.inc.c b/actors/hoot/model.inc.c index 9565fd0f..ef41730b 100644 --- a/actors/hoot/model.inc.c +++ b/actors/hoot/model.inc.c @@ -1,76 +1,28 @@ // Hoot // 0x05000900 -static const Lights1 hoot_seg5_lights_05000900 = gdSPDefLights1( - 0x30, 0x1b, 0x0f, - 0xc0, 0x6e, 0x3d, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 hoot_lights_unused1 = gdSPDefLights1( - 0x37, 0x27, 0x0b, - 0xdd, 0x9d, 0x2d, 0x28, 0x28, 0x28 -); // 0x05000930 -static const Lights1 hoot_seg5_lights_05000930 = gdSPDefLights1( - 0x36, 0x26, 0x11, - 0xdb, 0x99, 0x46, 0x28, 0x28, 0x28 -); // 0x05000948 -static const Lights1 hoot_seg5_lights_05000948 = gdSPDefLights1( - 0x06, 0x06, 0x06, - 0x19, 0x19, 0x19, 0x28, 0x28, 0x28 -); // 0x05000960 -static const Lights1 hoot_seg5_lights_05000960 = gdSPDefLights1( - 0x1d, 0x0a, 0x05, - 0x77, 0x2a, 0x16, 0x28, 0x28, 0x28 -); // 0x05000978 -static const Lights1 hoot_seg5_lights_05000978 = gdSPDefLights1( - 0x06, 0x06, 0x06, - 0x19, 0x19, 0x19, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 hoot_lights_unused2 = gdSPDefLights1( - 0x39, 0x27, 0x0a, - 0xe6, 0x9d, 0x29, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 hoot_lights_unused3 = gdSPDefLights1( - 0x1d, 0x06, 0x3b, - 0x75, 0x18, 0xef, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 hoot_lights_unused4 = gdSPDefLights1( - 0x3a, 0x29, 0x09, - 0xeb, 0xa6, 0x27, 0x28, 0x28, 0x28 -); // 0x050009D8 -static const Lights1 hoot_seg5_lights_050009D8 = gdSPDefLights1( - 0x18, 0x07, 0x03, - 0x63, 0x1e, 0x0f, 0x28, 0x28, 0x28 -); // 0x050009F0 -static const Lights1 hoot_seg5_lights_050009F0 = gdSPDefLights1( - 0x3f, 0x3a, 0x09, - 0xfe, 0xea, 0x26, 0x28, 0x28, 0x28 -); // 0x05000A08 -static const Lights1 hoot_seg5_lights_05000A08 = gdSPDefLights1( - 0x13, 0x0d, 0x0b, - 0x4d, 0x35, 0x2e, 0x28, 0x28, 0x28 -); // 0x05000A20 ALIGNED8 static const Texture hoot_seg5_texture_05000A20[] = { @@ -274,8 +226,8 @@ static const Vtx hoot_seg5_vertex_05001A90[] = { // 0x05001B80 - 0x05001C00 const Gfx hoot_seg5_dl_05001B80[] = { gsDPLoadTextureBlock(hoot_seg5_texture_05000A20, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_WRAP | G_TX_NOMIRROR, 5, 5, G_TX_NOLOD, G_TX_NOLOD), - gsSPLight(&hoot_seg5_lights_050009D8.l, 1), - gsSPLight(&hoot_seg5_lights_050009D8.a, 2), + gsSPLightColor(LIGHT_1, 0x631e0fff), + gsSPLightColor(LIGHT_2, 0x180703ff), gsSPVertex(hoot_seg5_vertex_05001220, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), @@ -285,17 +237,17 @@ const Gfx hoot_seg5_dl_05001B80[] = { // 0x05001C00 - 0x05001DF0 const Gfx hoot_seg5_dl_05001C00[] = { - gsSPLight(&hoot_seg5_lights_050009F0.l, 1), - gsSPLight(&hoot_seg5_lights_050009F0.a, 2), + gsSPLightColor(LIGHT_1, 0xfeea26ff), + gsSPLightColor(LIGHT_2, 0x3f3a09ff), gsSPVertex(hoot_seg5_vertex_05001310, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), - gsSPLight(&hoot_seg5_lights_05000A08.l, 1), - gsSPLight(&hoot_seg5_lights_05000A08.a, 2), + gsSPLightColor(LIGHT_1, 0x4d352eff), + gsSPLightColor(LIGHT_2, 0x130d0bff), gsSPVertex(hoot_seg5_vertex_050013D0, 3, 0), gsSP1Triangle( 0, 1, 2, 0x0), - gsSPLight(&hoot_seg5_lights_050009D8.l, 1), - gsSPLight(&hoot_seg5_lights_050009D8.a, 2), + gsSPLightColor(LIGHT_1, 0x631e0fff), + gsSPLightColor(LIGHT_2, 0x180703ff), gsSPVertex(hoot_seg5_vertex_05001400, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), @@ -345,10 +297,6 @@ const Gfx hoot_seg5_dl_05001DF0[] = { }; // 0x05001E38 -static const Lights1 hoot_seg5_lights_05001E38 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05001E50 ALIGNED8 static const Texture hoot_seg5_texture_05001E50[] = { @@ -378,8 +326,8 @@ const Gfx hoot_seg5_dl_05002EB0[] = { gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD), gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC), - gsSPLight(&hoot_seg5_lights_05001E38.l, 1), - gsSPLight(&hoot_seg5_lights_05001E38.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(hoot_seg5_vertex_05002E50, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSPEndDisplayList(), @@ -400,10 +348,6 @@ const Gfx hoot_seg5_dl_05002F10[] = { }; // 0x05002F60 -static const Lights1 hoot_seg5_lights_05002F60 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05002F78 static const Vtx hoot_seg5_vertex_05002F78[] = { @@ -423,8 +367,8 @@ const Gfx hoot_seg5_dl_05002FD8[] = { gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD), gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC), - gsSPLight(&hoot_seg5_lights_05002F60.l, 1), - gsSPLight(&hoot_seg5_lights_05002F60.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(hoot_seg5_vertex_05002F78, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSPEndDisplayList(), @@ -445,10 +389,6 @@ const Gfx hoot_seg5_dl_05003038[] = { }; // 0x05003088 -static const Lights1 hoot_seg5_lights_05003088 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x050030A0 static const Vtx hoot_seg5_vertex_050030A0[] = { @@ -468,8 +408,8 @@ const Gfx hoot_seg5_dl_05003100[] = { gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD), gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC), - gsSPLight(&hoot_seg5_lights_05003088.l, 1), - gsSPLight(&hoot_seg5_lights_05003088.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(hoot_seg5_vertex_050030A0, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSPEndDisplayList(), @@ -490,10 +430,6 @@ const Gfx hoot_seg5_dl_05003160[] = { }; // 0x050031B0 -static const Lights1 hoot_seg5_lights_050031B0 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x050031C8 static const Vtx hoot_seg5_vertex_050031C8[] = { @@ -513,8 +449,8 @@ const Gfx hoot_seg5_dl_05003228[] = { gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD), gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC), - gsSPLight(&hoot_seg5_lights_050031B0.l, 1), - gsSPLight(&hoot_seg5_lights_050031B0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(hoot_seg5_vertex_050031C8, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSPEndDisplayList(), @@ -535,10 +471,6 @@ const Gfx hoot_seg5_dl_05003288[] = { }; // 0x050032D8 -static const Lights1 hoot_seg5_lights_050032D8 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x050032F0 static const Vtx hoot_seg5_vertex_050032F0[] = { @@ -558,8 +490,8 @@ const Gfx hoot_seg5_dl_05003350[] = { gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD), gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC), - gsSPLight(&hoot_seg5_lights_050032D8.l, 1), - gsSPLight(&hoot_seg5_lights_050032D8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(hoot_seg5_vertex_050032F0, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSPEndDisplayList(), @@ -580,10 +512,6 @@ const Gfx hoot_seg5_dl_050033B0[] = { }; // 0x05003400 -static const Lights1 hoot_seg5_lights_05003400 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05003418 static const Vtx hoot_seg5_vertex_05003418[] = { @@ -603,8 +531,8 @@ const Gfx hoot_seg5_dl_05003478[] = { gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD), gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC), - gsSPLight(&hoot_seg5_lights_05003400.l, 1), - gsSPLight(&hoot_seg5_lights_05003400.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(hoot_seg5_vertex_05003418, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSPEndDisplayList(), @@ -625,10 +553,6 @@ const Gfx hoot_seg5_dl_050034D8[] = { }; // 0x05003528 -static const Lights1 hoot_seg5_lights_05003528 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05003540 static const Vtx hoot_seg5_vertex_05003540[] = { @@ -648,8 +572,8 @@ const Gfx hoot_seg5_dl_050035A0[] = { gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD), gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC), - gsSPLight(&hoot_seg5_lights_05003528.l, 1), - gsSPLight(&hoot_seg5_lights_05003528.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(hoot_seg5_vertex_05003540, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSPEndDisplayList(), @@ -670,10 +594,6 @@ const Gfx hoot_seg5_dl_05003600[] = { }; // 0x05003650 -static const Lights1 hoot_seg5_lights_05003650 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05003668 static const Vtx hoot_seg5_vertex_05003668[] = { @@ -693,8 +613,8 @@ const Gfx hoot_seg5_dl_050036C8[] = { gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD), gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC), - gsSPLight(&hoot_seg5_lights_05003650.l, 1), - gsSPLight(&hoot_seg5_lights_05003650.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(hoot_seg5_vertex_05003668, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSPEndDisplayList(), @@ -1087,8 +1007,8 @@ static const Vtx hoot_seg5_vertex_05004828[] = { // 0x05004928 - 0x05004A98 const Gfx hoot_seg5_dl_05004928[] = { - gsSPLight(&hoot_seg5_lights_05000930.l, 1), - gsSPLight(&hoot_seg5_lights_05000930.a, 2), + gsSPLightColor(LIGHT_1, 0xdb9946ff), + gsSPLightColor(LIGHT_2, 0x362611ff), gsSPVertex(hoot_seg5_vertex_05003778, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), @@ -1108,8 +1028,8 @@ const Gfx hoot_seg5_dl_05004928[] = { gsSP1Triangle(12, 13, 14, 0x0), gsSPVertex(hoot_seg5_vertex_05003B48, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), - gsSPLight(&hoot_seg5_lights_05000948.l, 1), - gsSPLight(&hoot_seg5_lights_05000948.a, 2), + gsSPLightColor(LIGHT_1, 0x191919ff), + gsSPLightColor(LIGHT_2, 0x60606ff), gsSPVertex(hoot_seg5_vertex_05003BA8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), @@ -1122,8 +1042,8 @@ const Gfx hoot_seg5_dl_05004928[] = { // 0x05004A98 - 0x05004B38 const Gfx hoot_seg5_dl_05004A98[] = { - gsSPLight(&hoot_seg5_lights_05000960.l, 1), - gsSPLight(&hoot_seg5_lights_05000960.a, 2), + gsSPLightColor(LIGHT_1, 0x772a16ff), + gsSPLightColor(LIGHT_2, 0x1d0a05ff), gsSPVertex(hoot_seg5_vertex_05003D58, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), @@ -1131,8 +1051,8 @@ const Gfx hoot_seg5_dl_05004A98[] = { gsSPVertex(hoot_seg5_vertex_05003E58, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), - gsSPLight(&hoot_seg5_lights_05000978.l, 1), - gsSPLight(&hoot_seg5_lights_05000978.a, 2), + gsSPLightColor(LIGHT_1, 0x191919ff), + gsSPLightColor(LIGHT_2, 0x60606ff), gsSPVertex(hoot_seg5_vertex_05003F18, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), @@ -1140,8 +1060,8 @@ const Gfx hoot_seg5_dl_05004A98[] = { // 0x05004B38 - 0x05004CA8 const Gfx hoot_seg5_dl_05004B38[] = { - gsSPLight(&hoot_seg5_lights_05000948.l, 1), - gsSPLight(&hoot_seg5_lights_05000948.a, 2), + gsSPLightColor(LIGHT_1, 0x191919ff), + gsSPLightColor(LIGHT_2, 0x60606ff), gsSPVertex(hoot_seg5_vertex_05003F58, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), @@ -1149,8 +1069,8 @@ const Gfx hoot_seg5_dl_05004B38[] = { gsSPVertex(hoot_seg5_vertex_05004048, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), - gsSPLight(&hoot_seg5_lights_05000930.l, 1), - gsSPLight(&hoot_seg5_lights_05000930.a, 2), + gsSPLightColor(LIGHT_1, 0xdb9946ff), + gsSPLightColor(LIGHT_2, 0x362611ff), gsSPVertex(hoot_seg5_vertex_05004108, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), @@ -1175,8 +1095,8 @@ const Gfx hoot_seg5_dl_05004B38[] = { // 0x05004CA8 - 0x05004D48 const Gfx hoot_seg5_dl_05004CA8[] = { - gsSPLight(&hoot_seg5_lights_05000960.l, 1), - gsSPLight(&hoot_seg5_lights_05000960.a, 2), + gsSPLightColor(LIGHT_1, 0x772a16ff), + gsSPLightColor(LIGHT_2, 0x1d0a05ff), gsSPVertex(hoot_seg5_vertex_05004548, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), @@ -1184,8 +1104,8 @@ const Gfx hoot_seg5_dl_05004CA8[] = { gsSPVertex(hoot_seg5_vertex_05004648, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), - gsSPLight(&hoot_seg5_lights_05000978.l, 1), - gsSPLight(&hoot_seg5_lights_05000978.a, 2), + gsSPLightColor(LIGHT_1, 0x191919ff), + gsSPLightColor(LIGHT_2, 0x60606ff), gsSPVertex(hoot_seg5_vertex_05004708, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), gsSPEndDisplayList(), @@ -1193,8 +1113,8 @@ const Gfx hoot_seg5_dl_05004CA8[] = { // 0x05004D48 - 0x05004EC0 const Gfx hoot_seg5_dl_05004D48[] = { - gsSPLight(&hoot_seg5_lights_05000900.l, 1), - gsSPLight(&hoot_seg5_lights_05000900.a, 2), + gsSPLightColor(LIGHT_1, 0xc06e3dff), + gsSPLightColor(LIGHT_2, 0x301b0fff), gsSPVertex(hoot_seg5_vertex_05004748, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 1, 4, 0x0, 7, 8, 9, 0x0), @@ -1206,8 +1126,8 @@ const Gfx hoot_seg5_dl_05004D48[] = { gsSP2Triangles( 2, 10, 12, 0x0, 6, 9, 8, 0x0), gsSP2Triangles(11, 13, 7, 0x0, 5, 4, 1, 0x0), gsSP1Triangle( 1, 8, 2, 0x0), - gsSPLight(&hoot_seg5_lights_05000960.l, 1), - gsSPLight(&hoot_seg5_lights_05000960.a, 2), + gsSPLightColor(LIGHT_1, 0x772a16ff), + gsSPLightColor(LIGHT_2, 0x1d0a05ff), gsSPVertex(hoot_seg5_vertex_05004828, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 8, 4, 3, 0x0), diff --git a/actors/king_bobomb/model.inc.c b/actors/king_bobomb/model.inc.c index 8614a53d..c527c526 100644 --- a/actors/king_bobomb/model.inc.c +++ b/actors/king_bobomb/model.inc.c @@ -2,34 +2,14 @@ // // 0x05000078 // Unreferenced light group -// UNUSED static const Lights1 king_bobomb_lights_unused1 = gdSPDefLights1( -// 0x36, 0x1e, 0x00, -// 0xd9, 0x7a, 0x00, 0x28, 0x28, 0x28 -// ); // // Unreferenced light group -// UNUSED static const Lights1 king_bobomb_lights_unused2 = gdSPDefLights1( -// 0x00, 0x00, 0x3f, -// 0x00, 0x00, 0xff, 0x28, 0x28, 0x28 -// ); // // Unreferenced light group -// UNUSED static const Lights1 king_bobomb_lights_unused3 = gdSPDefLights1( -// 0x3c, 0x28, 0x00, -// 0xf1, 0xa2, 0x00, 0x28, 0x28, 0x28 -// ); // // Unreferenced light group -// UNUSED static const Lights1 king_bobomb_lights_unused4 = gdSPDefLights1( -// 0x2c, 0x2c, 0x2c, -// 0xb2, 0xb2, 0xb2, 0x28, 0x28, 0x28 -// ); // // Unreferenced light group -// UNUSED static const Lights1 king_bobomb_lights_unused5 = gdSPDefLights1( -// 0x06, 0x06, 0x06, -// 0x19, 0x19, 0x19, 0x28, 0x28, 0x28 -// ); // // 0x05000078 // ALIGNED8 static const Texture king_bobomb_seg5_texture_05000078[] = { @@ -303,10 +283,6 @@ const Gfx king_bobomb_seg5_dl_0500A978[] = { }; // 0x0500A9E8 -static const Lights1 king_bobomb_seg5_lights_0500A9E8 = gdSPDefLights1( - 0x6f, 0x56, 0x11, - 0xde, 0xad, 0x23, 0x28, 0x28, 0x28 -); // 0x0500AA00 static const Vtx king_bobomb_seg5_vertex_0500AA00[] = { @@ -346,8 +322,8 @@ static const Vtx king_bobomb_seg5_vertex_0500AB00[] = { // 0x0500ABC0 - 0x0500AD08 const Gfx king_bobomb_seg5_dl_0500ABC0[] = { - gsSPLight(&king_bobomb_seg5_lights_0500A9E8.l, 1), - gsSPLight(&king_bobomb_seg5_lights_0500A9E8.a, 2), + gsSPLightColor(LIGHT_1, 0xdead23ff), + gsSPLightColor(LIGHT_2, 0x6f5611ff), gsSPVertex(king_bobomb_seg5_vertex_0500AA00, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 1, 4, 5, 0x0, 1, 5, 6, 0x0), @@ -382,10 +358,6 @@ const Gfx king_bobomb_seg5_dl_0500AD08[] = { }; // 0x0500AD38 -static const Lights1 king_bobomb_seg5_lights_0500AD38 = gdSPDefLights1( - 0x6f, 0x4f, 0x10, - 0xde, 0x9e, 0x20, 0x28, 0x28, 0x28 -); // 0x0500AD50 static const Vtx king_bobomb_seg5_vertex_0500AD50[] = { @@ -426,8 +398,8 @@ static const Vtx king_bobomb_seg5_vertex_0500AE50[] = { // 0x0500AF20 - 0x0500B068 const Gfx king_bobomb_seg5_dl_0500AF20[] = { - gsSPLight(&king_bobomb_seg5_lights_0500AD38.l, 1), - gsSPLight(&king_bobomb_seg5_lights_0500AD38.a, 2), + gsSPLightColor(LIGHT_1, 0xde9e20ff), + gsSPLightColor(LIGHT_2, 0x6f4f10ff), gsSPVertex(king_bobomb_seg5_vertex_0500AD50, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 1, 4, 5, 0x0, 1, 5, 2, 0x0), @@ -518,10 +490,6 @@ const Gfx king_bobomb_seg5_dl_body[] = { }; // 0x0500B200 -static const Lights1 king_bobomb_seg5_lights_eyes = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0500B218 static const Vtx king_bobomb_seg5_vertex_eyes[] = { @@ -546,8 +514,8 @@ const Gfx king_bobomb_seg5_dl_eyes_start_dl[] = { }; const Gfx king_bobomb_seg5_dl_eyes_end_dl[] = { - gsSPLight(&king_bobomb_seg5_lights_eyes.l, 1), - gsSPLight(&king_bobomb_seg5_lights_eyes.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(king_bobomb_seg5_vertex_eyes, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 2, 4, 0x0), gsSP2Triangles( 2, 3, 0, 0x0, 4, 5, 3, 0x0), @@ -577,10 +545,6 @@ const Gfx king_bobomb_seg5_dl_eyes_blink[] = { }; // 0x0500B330 -static const Lights1 king_bobomb_seg5_lights_0500B330 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0500B348 static const Vtx king_bobomb_seg5_vertex_0500B348[] = { @@ -596,8 +560,8 @@ static const Vtx king_bobomb_seg5_vertex_0500B348[] = { // 0x0500B3C8 - 0x0500B418 const Gfx king_bobomb_seg5_dl_0500B3C8[] = { - gsSPLight(&king_bobomb_seg5_lights_0500B330.l, 1), - gsSPLight(&king_bobomb_seg5_lights_0500B330.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(king_bobomb_seg5_vertex_0500B348, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 4, 0x0), gsSP2Triangles( 2, 4, 5, 0x0, 2, 5, 0, 0x0), @@ -618,10 +582,6 @@ const Gfx king_bobomb_seg5_dl_0500B418[] = { }; // 0x0500B458 -static const Lights1 king_bobomb_seg5_lights_0500B458 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0500B470 static const Vtx king_bobomb_seg5_vertex_0500B470[] = { @@ -660,8 +620,8 @@ const Gfx king_bobomb_seg5_dl_0500B5F0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, king_bobomb_seg5_texture_crown_rim), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 32 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)), - gsSPLight(&king_bobomb_seg5_lights_0500B458.l, 1), - gsSPLight(&king_bobomb_seg5_lights_0500B458.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(king_bobomb_seg5_vertex_0500B470, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 0, 0x0), gsSP2Triangles( 0, 2, 3, 0x0, 5, 4, 3, 0x0), diff --git a/actors/klepto/model.inc.c b/actors/klepto/model.inc.c index 3b2eec96..fa4b608d 100644 --- a/actors/klepto/model.inc.c +++ b/actors/klepto/model.inc.c @@ -31,16 +31,8 @@ ALIGNED8 static const Texture klepto_seg5_texture_05003008[] = { }; // 0x05003808 -static const Lights1 klepto_seg5_lights_05003808 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05003820 -static const Lights1 klepto_seg5_lights_05003820 = gdSPDefLights1( - 0x3f, 0x1d, 0x08, - 0xff, 0x75, 0x21, 0x28, 0x28, 0x28 -); // 0x05003838 static const Vtx klepto_seg5_vertex_05003838[] = { @@ -98,8 +90,8 @@ const Gfx klepto_seg5_dl_05003A68[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, klepto_seg5_texture_05000808), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&klepto_seg5_lights_05003808.l, 1), - gsSPLight(&klepto_seg5_lights_05003808.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(klepto_seg5_vertex_05003838, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0), gsSP2Triangles( 2, 1, 4, 0x0, 4, 5, 2, 0x0), @@ -124,8 +116,8 @@ const Gfx klepto_seg5_dl_05003AC0[] = { // 0x05003B40 - 0x05003BD0 const Gfx klepto_seg5_dl_05003B40[] = { - gsSPLight(&klepto_seg5_lights_05003820.l, 1), - gsSPLight(&klepto_seg5_lights_05003820.a, 2), + gsSPLightColor(LIGHT_1, 0xff7521ff), + gsSPLightColor(LIGHT_2, 0x3f1d08ff), gsSPVertex(klepto_seg5_vertex_050039B8, 11, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), gsSP2Triangles( 4, 5, 3, 0x0, 3, 6, 4, 0x0), @@ -159,10 +151,6 @@ const Gfx klepto_seg5_dl_05003BD0[] = { }; // 0x05003C58 -static const Lights1 klepto_seg5_lights_05003C58 = gdSPDefLights1( - 0x3f, 0x1d, 0x08, - 0xff, 0x75, 0x21, 0x28, 0x28, 0x28 -); // 0x05003C70 static const Vtx klepto_seg5_vertex_05003C70[] = { @@ -179,8 +167,8 @@ static const Vtx klepto_seg5_vertex_05003C70[] = { // 0x05003D00 - 0x05003D80 const Gfx klepto_seg5_dl_05003D00[] = { - gsSPLight(&klepto_seg5_lights_05003C58.l, 1), - gsSPLight(&klepto_seg5_lights_05003C58.a, 2), + gsSPLightColor(LIGHT_1, 0xff7521ff), + gsSPLightColor(LIGHT_2, 0x3f1d08ff), gsSPVertex(klepto_seg5_vertex_05003C70, 9, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0), gsSP2Triangles( 4, 2, 5, 0x0, 2, 4, 3, 0x0), @@ -202,10 +190,6 @@ const Gfx klepto_seg5_dl_05003D80[] = { }; // 0x05003DB0 -static const Lights1 klepto_seg5_lights_05003DB0 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05003DC8 static const Vtx klepto_seg5_vertex_05003DC8[] = { @@ -226,8 +210,8 @@ const Gfx klepto_seg5_dl_05003E68[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, klepto_seg5_texture_05000008), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&klepto_seg5_lights_05003DB0.l, 1), - gsSPLight(&klepto_seg5_lights_05003DB0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(klepto_seg5_vertex_05003DC8, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 2, 0x0), gsSP2Triangles( 5, 2, 1, 0x0, 2, 5, 3, 0x0), @@ -257,10 +241,6 @@ const Gfx klepto_seg5_dl_05003F20[] = { }; // 0x05003F80 -static const Lights1 klepto_seg5_lights_05003F80 = gdSPDefLights1( - 0x07, 0x01, 0x01, - 0x1e, 0x05, 0x04, 0x28, 0x28, 0x28 -); // 0x05003F98 static const Vtx klepto_seg5_vertex_05003F98[] = { @@ -280,8 +260,8 @@ static const Vtx klepto_seg5_vertex_05003F98[] = { // 0x05004058 - 0x05004118 const Gfx klepto_seg5_dl_05004058[] = { - gsSPLight(&klepto_seg5_lights_05003F80.l, 1), - gsSPLight(&klepto_seg5_lights_05003F80.a, 2), + gsSPLightColor(LIGHT_1, 0x1e0504ff), + gsSPLightColor(LIGHT_2, 0x70101ff), gsSPVertex(klepto_seg5_vertex_05003F98, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 1, 3, 0x0), gsSP2Triangles( 2, 4, 5, 0x0, 2, 5, 0, 0x0), @@ -307,10 +287,6 @@ const Gfx klepto_seg5_dl_05004118[] = { }; // 0x05004148 -static const Lights1 klepto_seg5_lights_05004148 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05004160 static const Vtx klepto_seg5_vertex_05004160[] = { @@ -325,8 +301,8 @@ const Gfx klepto_seg5_dl_050041A0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, klepto_seg5_texture_05003008), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&klepto_seg5_lights_05004148.l, 1), - gsSPLight(&klepto_seg5_lights_05004148.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(klepto_seg5_vertex_05004160, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 0, 0x0), gsSPEndDisplayList(), @@ -351,10 +327,6 @@ const Gfx klepto_seg5_dl_050041E8[] = { }; // 0x05004258 -static const Lights1 klepto_seg5_lights_05004258 = gdSPDefLights1( - 0x3f, 0x1d, 0x08, - 0xff, 0x75, 0x21, 0x28, 0x28, 0x28 -); // 0x05004270 static const Vtx klepto_seg5_vertex_05004270[] = { @@ -368,8 +340,8 @@ static const Vtx klepto_seg5_vertex_05004270[] = { // 0x050042D0 - 0x05004330 const Gfx klepto_seg5_dl_050042D0[] = { - gsSPLight(&klepto_seg5_lights_05004258.l, 1), - gsSPLight(&klepto_seg5_lights_05004258.a, 2), + gsSPLightColor(LIGHT_1, 0xff7521ff), + gsSPLightColor(LIGHT_2, 0x3f1d08ff), gsSPVertex(klepto_seg5_vertex_05004270, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 0, 3, 0x0), gsSP2Triangles( 4, 0, 2, 0x0, 0, 4, 3, 0x0), @@ -389,10 +361,6 @@ const Gfx klepto_seg5_dl_05004330[] = { }; // 0x05004360 -static const Lights1 klepto_seg5_lights_05004360 = gdSPDefLights1( - 0x3f, 0x1d, 0x08, - 0xff, 0x75, 0x21, 0x28, 0x28, 0x28 -); // 0x05004378 static const Vtx klepto_seg5_vertex_05004378[] = { @@ -406,8 +374,8 @@ static const Vtx klepto_seg5_vertex_05004378[] = { // 0x050043D8 - 0x05004438 const Gfx klepto_seg5_dl_050043D8[] = { - gsSPLight(&klepto_seg5_lights_05004360.l, 1), - gsSPLight(&klepto_seg5_lights_05004360.a, 2), + gsSPLightColor(LIGHT_1, 0xff7521ff), + gsSPLightColor(LIGHT_2, 0x3f1d08ff), gsSPVertex(klepto_seg5_vertex_05004378, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 0, 3, 0x0), gsSP2Triangles( 4, 0, 2, 0x0, 0, 4, 3, 0x0), @@ -427,16 +395,8 @@ const Gfx klepto_seg5_dl_05004438[] = { }; // 0x05004468 -static const Lights1 klepto_seg5_lights_05004468 = gdSPDefLights1( - 0x02, 0x00, 0x00, - 0x08, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x05004480 -static const Lights1 klepto_seg5_lights_05004480 = gdSPDefLights1( - 0x3f, 0x1d, 0x08, - 0xff, 0x75, 0x21, 0x28, 0x28, 0x28 -); // 0x05004498 static const Vtx klepto_seg5_vertex_05004498[] = { @@ -484,16 +444,16 @@ static const Vtx klepto_seg5_vertex_05004648[] = { // 0x05004698 - 0x050047C8 const Gfx klepto_seg5_dl_05004698[] = { - gsSPLight(&klepto_seg5_lights_05004468.l, 1), - gsSPLight(&klepto_seg5_lights_05004468.a, 2), + gsSPLightColor(LIGHT_1, 0x80000ff), + gsSPLightColor(LIGHT_2, 0x20000ff), gsSPVertex(klepto_seg5_vertex_05004498, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 3, 6, 0x0, 3, 5, 6, 0x0), gsSP2Triangles( 7, 8, 9, 0x0, 8, 7, 10, 0x0), gsSP2Triangles( 8, 10, 9, 0x0, 0, 11, 1, 0x0), gsSP1Triangle(11, 0, 2, 0x0), - gsSPLight(&klepto_seg5_lights_05004480.l, 1), - gsSPLight(&klepto_seg5_lights_05004480.a, 2), + gsSPLightColor(LIGHT_1, 0xff7521ff), + gsSPLightColor(LIGHT_2, 0x3f1d08ff), gsSPVertex(klepto_seg5_vertex_05004558, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 3, 0x0, 7, 4, 3, 0x0), @@ -521,16 +481,8 @@ const Gfx klepto_seg5_dl_050047C8[] = { }; // 0x050047F8 -static const Lights1 klepto_seg5_lights_050047F8 = gdSPDefLights1( - 0x02, 0x00, 0x00, - 0x08, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x05004810 -static const Lights1 klepto_seg5_lights_05004810 = gdSPDefLights1( - 0x3f, 0x1d, 0x08, - 0xff, 0x75, 0x21, 0x28, 0x28, 0x28 -); // 0x05004828 static const Vtx klepto_seg5_vertex_05004828[] = { @@ -578,16 +530,16 @@ static const Vtx klepto_seg5_vertex_050049D8[] = { // 0x05004A28 - 0x05004B58 const Gfx klepto_seg5_dl_05004A28[] = { - gsSPLight(&klepto_seg5_lights_050047F8.l, 1), - gsSPLight(&klepto_seg5_lights_050047F8.a, 2), + gsSPLightColor(LIGHT_1, 0x80000ff), + gsSPLightColor(LIGHT_2, 0x20000ff), gsSPVertex(klepto_seg5_vertex_05004828, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 3, 6, 0x0, 3, 5, 6, 0x0), gsSP2Triangles( 7, 8, 9, 0x0, 8, 7, 10, 0x0), gsSP2Triangles( 8, 10, 9, 0x0, 0, 11, 1, 0x0), gsSP1Triangle(11, 0, 2, 0x0), - gsSPLight(&klepto_seg5_lights_05004810.l, 1), - gsSPLight(&klepto_seg5_lights_05004810.a, 2), + gsSPLightColor(LIGHT_1, 0xff7521ff), + gsSPLightColor(LIGHT_2, 0x3f1d08ff), gsSPVertex(klepto_seg5_vertex_050048E8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 3, 0x0, 7, 4, 3, 0x0), @@ -615,10 +567,6 @@ const Gfx klepto_seg5_dl_05004B58[] = { }; // 0x05004B88 -static const Lights1 klepto_seg5_lights_05004B88 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05004BA0 static const Vtx klepto_seg5_vertex_05004BA0[] = { @@ -633,8 +581,8 @@ const Gfx klepto_seg5_dl_05004BE0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, klepto_seg5_texture_05002008), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPLight(&klepto_seg5_lights_05004B88.l, 1), - gsSPLight(&klepto_seg5_lights_05004B88.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(klepto_seg5_vertex_05004BA0, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), @@ -659,10 +607,6 @@ const Gfx klepto_seg5_dl_05004C28[] = { }; // 0x05004C98 -static const Lights1 klepto_seg5_lights_05004C98 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05004CB0 static const Vtx klepto_seg5_vertex_05004CB0[] = { @@ -677,8 +621,8 @@ const Gfx klepto_seg5_dl_05004CF0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, klepto_seg5_texture_05002008), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPLight(&klepto_seg5_lights_05004C98.l, 1), - gsSPLight(&klepto_seg5_lights_05004C98.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(klepto_seg5_vertex_05004CB0, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), gsSPEndDisplayList(), @@ -703,10 +647,6 @@ const Gfx klepto_seg5_dl_05004D38[] = { }; // 0x05004DA8 -static const Lights1 klepto_seg5_lights_05004DA8 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05004DC0 static const Vtx klepto_seg5_vertex_05004DC0[] = { @@ -721,8 +661,8 @@ const Gfx klepto_seg5_dl_05004E00[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, klepto_seg5_texture_05002008), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPLight(&klepto_seg5_lights_05004DA8.l, 1), - gsSPLight(&klepto_seg5_lights_05004DA8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(klepto_seg5_vertex_05004DC0, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), @@ -747,10 +687,6 @@ const Gfx klepto_seg5_dl_05004E48[] = { }; // 0x05004EB8 -static const Lights1 klepto_seg5_lights_05004EB8 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05004ED0 static const Vtx klepto_seg5_vertex_05004ED0[] = { @@ -765,8 +701,8 @@ const Gfx klepto_seg5_dl_05004F10[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, klepto_seg5_texture_05002008), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPLight(&klepto_seg5_lights_05004EB8.l, 1), - gsSPLight(&klepto_seg5_lights_05004EB8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(klepto_seg5_vertex_05004ED0, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), gsSPEndDisplayList(), @@ -791,10 +727,6 @@ const Gfx klepto_seg5_dl_05004F58[] = { }; // 0x05004FC8 -static const Lights1 klepto_seg5_lights_05004FC8 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05004FE0 static const Vtx klepto_seg5_vertex_05004FE0[] = { @@ -809,8 +741,8 @@ const Gfx klepto_seg5_dl_05005020[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, klepto_seg5_texture_05002008), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPLight(&klepto_seg5_lights_05004FC8.l, 1), - gsSPLight(&klepto_seg5_lights_05004FC8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(klepto_seg5_vertex_05004FE0, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), @@ -835,10 +767,6 @@ const Gfx klepto_seg5_dl_05005068[] = { }; // 0x050050D8 -static const Lights1 klepto_seg5_lights_050050D8 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x050050F0 static const Vtx klepto_seg5_vertex_050050F0[] = { @@ -853,8 +781,8 @@ const Gfx klepto_seg5_dl_05005130[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, klepto_seg5_texture_05002008), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPLight(&klepto_seg5_lights_050050D8.l, 1), - gsSPLight(&klepto_seg5_lights_050050D8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(klepto_seg5_vertex_050050F0, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), gsSPEndDisplayList(), diff --git a/actors/koopa/model.inc.c b/actors/koopa/model.inc.c index 7dc67c6d..22d3f91c 100644 --- a/actors/koopa/model.inc.c +++ b/actors/koopa/model.inc.c @@ -2,58 +2,25 @@ // Unreferenced light group -UNUSED static const Lights1 koopa_lights_unused1 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x060025A0 -static const Lights1 koopa_seg6_lights_060025A0 = gdSPDefLights1( - 0x00, 0x59, 0x00, - 0x00, 0xb2, 0x00, 0x28, 0x28, 0x28 -); // 0x060025B8 -static const Lights1 koopa_seg6_lights_060025B8 = gdSPDefLights1( - 0x70, 0x57, 0x00, - 0xe0, 0xae, 0x00, 0x28, 0x28, 0x28 -); // 0x060025D0 -static const Lights1 koopa_seg6_lights_060025D0 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 koopa_lights_unused2 = gdSPDefLights1( - 0x59, 0x59, 0x59, - 0xb2, 0xb2, 0xb2, 0x28, 0x28, 0x28 -); // 0x06002600 -static const Lights1 koopa_seg6_lights_06002600 = gdSPDefLights1( - 0x00, 0x54, 0x00, - 0x00, 0xa9, 0x00, 0x28, 0x28, 0x28 -); // 0x06002618 -static const Lights1 koopa_seg6_lights_06002618 = gdSPDefLights1( - 0x59, 0x59, 0x59, - 0xb2, 0xb2, 0xb2, 0x28, 0x28, 0x28 -); // 0x06002630 -static const Lights1 koopa_seg6_lights_06002630 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); -// //! There is a malformed light entry here pointing to this texture + 0x18. -// It results in the koopa actor 'wearing' what appears to be pink shorts -// beneath its shell, despite the fact it was intended to be white like -// the rest of its body. This is evident because once the mistake is corrected -// it turns back to being white like the other polygons. +// This light approximates the pink shorts that Koopas have, but is not exact +// because the original light had two different values for ambient and diffuse. +// However, defining it this way allows the light converter to run correctly. + // 0x06002648 ALIGNED8 static const Texture koopa_seg6_texture_06002648[] = { #include "actors/koopa/koopa_shell_front.rgba16.inc.c" @@ -95,16 +62,8 @@ ALIGNED8 static const Texture koopa_seg6_texture_06005E48[] = { }; // 0x06006E48 -static const Lights1 koopa_seg6_lights_06006E48 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x06006E60 -static const Lights1 koopa_seg6_lights_06006E60 = gdSPDefLights1( - 0x67, 0x0b, 0x1a, - 0xce, 0x16, 0x35, 0x28, 0x28, 0x28 -); // 0x06006E78 static const Vtx koopa_seg6_vertex_06006E78[] = { @@ -278,8 +237,8 @@ static const Vtx koopa_seg6_vertex_060075B8[] = { // 0x06007658 - 0x060076B0 const Gfx koopa_seg6_dl_06007658[] = { - gsSPLight(&koopa_seg6_lights_06006E48.l, 1), - gsSPLight(&koopa_seg6_lights_06006E48.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(koopa_seg6_vertex_06006E78, 9, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 0, 0x0), gsSP2Triangles( 0, 5, 3, 0x0, 4, 6, 0, 0x0), @@ -352,12 +311,12 @@ const Gfx koopa_seg6_dl_06007850[] = { // 0x06007970 - 0x06007A60 const Gfx koopa_seg6_dl_06007970[] = { - gsSPLight(&koopa_seg6_lights_06006E60.l, 1), - gsSPLight(&koopa_seg6_lights_06006E60.a, 2), + gsSPLightColor(LIGHT_1, 0xce1635ff), + gsSPLightColor(LIGHT_2, 0x670b1aff), gsSPVertex(koopa_seg6_vertex_06007488, 3, 0), gsSP1Triangle( 0, 1, 2, 0x0), - gsSPLight(&koopa_seg6_lights_06006E48.l, 1), - gsSPLight(&koopa_seg6_lights_06006E48.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(koopa_seg6_vertex_060074B8, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 4, 7, 0x0, 4, 6, 5, 0x0), @@ -420,16 +379,8 @@ const Gfx koopa_seg6_dl_06007B20[] = { }; // 0x06007B48 -static const Lights1 koopa_seg6_lights_06007B48 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x06007B60 -static const Lights1 koopa_seg6_lights_06007B60 = gdSPDefLights1( - 0x70, 0x57, 0x00, - 0xe0, 0xae, 0x00, 0x28, 0x28, 0x28 -); // 0x06007B78 static const Vtx koopa_seg6_vertex_06007B78[] = { @@ -528,8 +479,8 @@ const Gfx koopa_seg6_dl_06007FB8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, koopa_seg6_texture_06002E48), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&koopa_seg6_lights_06007B48.l, 1), - gsSPLight(&koopa_seg6_lights_06007B48.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(koopa_seg6_vertex_06007B78, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0), gsSP2Triangles( 0, 4, 1, 0x0, 0, 5, 4, 0x0), @@ -559,13 +510,13 @@ const Gfx koopa_seg6_dl_06008050[] = { // 0x060080F8 - 0x06008250 const Gfx koopa_seg6_dl_060080F8[] = { - gsSPLight(&koopa_seg6_lights_06007B60.l, 1), - gsSPLight(&koopa_seg6_lights_06007B60.a, 2), + gsSPLightColor(LIGHT_1, 0xe0ae00ff), + gsSPLightColor(LIGHT_2, 0x705700ff), gsSPVertex(koopa_seg6_vertex_06007CF8, 5, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0), gsSP1Triangle( 2, 4, 3, 0x0), - gsSPLight(&koopa_seg6_lights_06007B48.l, 1), - gsSPLight(&koopa_seg6_lights_06007B48.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(koopa_seg6_vertex_06007D48, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 0, 0x0), gsSP2Triangles( 4, 1, 3, 0x0, 2, 1, 5, 0x0), @@ -607,16 +558,8 @@ const Gfx koopa_seg6_dl_06008250[] = { }; // 0x060082C0 -static const Lights1 koopa_seg6_lights_060082C0 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x060082D8 -static const Lights1 koopa_seg6_lights_060082D8 = gdSPDefLights1( - 0x00, 0x64, 0x00, - 0x00, 0xc8, 0x00, 0x28, 0x28, 0x28 -); // 0x060082F0 static const Vtx koopa_seg6_vertex_060082F0[] = { @@ -671,8 +614,8 @@ const Gfx koopa_seg6_dl_06008530[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, koopa_seg6_texture_06003648), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&koopa_seg6_lights_060082C0.l, 1), - gsSPLight(&koopa_seg6_lights_060082C0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(koopa_seg6_vertex_060082F0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), gsSP2Triangles( 1, 4, 3, 0x0, 4, 5, 3, 0x0), @@ -699,8 +642,8 @@ const Gfx koopa_seg6_dl_060085E8[] = { // 0x06008640 - 0x060086D0 const Gfx koopa_seg6_dl_06008640[] = { - gsSPLight(&koopa_seg6_lights_060082D8.l, 1), - gsSPLight(&koopa_seg6_lights_060082D8.a, 2), + gsSPLightColor(LIGHT_1, 0xc800ff), + gsSPLightColor(LIGHT_2, 0x6400ff), gsSPVertex(koopa_seg6_vertex_06008470, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 3, 4, 0, 0x0, 1, 5, 2, 0x0), @@ -731,16 +674,8 @@ const Gfx koopa_seg6_dl_060086D0[] = { }; // 0x06008740 -static const Lights1 koopa_seg6_lights_06008740 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x06008758 -static const Lights1 koopa_seg6_lights_06008758 = gdSPDefLights1( - 0x00, 0x64, 0x00, - 0x00, 0xc8, 0x00, 0x28, 0x28, 0x28 -); // 0x06008770 static const Vtx koopa_seg6_vertex_06008770[] = { @@ -795,8 +730,8 @@ const Gfx koopa_seg6_dl_060089B0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, koopa_seg6_texture_06003648), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&koopa_seg6_lights_06008740.l, 1), - gsSPLight(&koopa_seg6_lights_06008740.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(koopa_seg6_vertex_06008770, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), gsSP2Triangles( 1, 4, 3, 0x0, 4, 5, 3, 0x0), @@ -823,8 +758,8 @@ const Gfx koopa_seg6_dl_06008A68[] = { // 0x06008AC0 - 0x06008B50 const Gfx koopa_seg6_dl_06008AC0[] = { - gsSPLight(&koopa_seg6_lights_06008758.l, 1), - gsSPLight(&koopa_seg6_lights_06008758.a, 2), + gsSPLightColor(LIGHT_1, 0xc800ff), + gsSPLightColor(LIGHT_2, 0x6400ff), gsSPVertex(koopa_seg6_vertex_060088F0, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 0, 0x0), gsSP2Triangles( 0, 2, 4, 0x0, 5, 0, 6, 0x0), @@ -1742,8 +1677,8 @@ static const Vtx koopa_seg6_vertex_0600B5F0[] = { // 0x0600B6E0 - 0x0600B838 const Gfx koopa_seg6_dl_0600B6E0[] = { - gsSPLight(&koopa_seg6_lights_060025A0.l, 1), - gsSPLight(&koopa_seg6_lights_060025A0.a, 2), + gsSPLightColor(LIGHT_1, 0xb200ff), + gsSPLightColor(LIGHT_2, 0x5900ff), gsSPVertex(koopa_seg6_vertex_06008BC0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), @@ -1771,8 +1706,8 @@ const Gfx koopa_seg6_dl_0600B6E0[] = { // 0x0600B838 - 0x0600B8B8 const Gfx koopa_seg6_dl_0600B838[] = { - gsSPLight(&koopa_seg6_lights_060025B8.l, 1), - gsSPLight(&koopa_seg6_lights_060025B8.a, 2), + gsSPLightColor(LIGHT_1, 0xe0ae00ff), + gsSPLightColor(LIGHT_2, 0x705700ff), gsSPVertex(koopa_seg6_vertex_06008F60, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -1785,8 +1720,8 @@ const Gfx koopa_seg6_dl_0600B838[] = { // 0x0600B8B8 - 0x0600BA10 const Gfx koopa_seg6_dl_0600B8B8[] = { - gsSPLight(&koopa_seg6_lights_060025A0.l, 1), - gsSPLight(&koopa_seg6_lights_060025A0.a, 2), + gsSPLightColor(LIGHT_1, 0xb200ff), + gsSPLightColor(LIGHT_2, 0x5900ff), gsSPVertex(koopa_seg6_vertex_06009040, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), @@ -1815,8 +1750,8 @@ const Gfx koopa_seg6_dl_0600B8B8[] = { // 0x0600BA10 - 0x0600BA90 const Gfx koopa_seg6_dl_0600BA10[] = { - gsSPLight(&koopa_seg6_lights_060025B8.l, 1), - gsSPLight(&koopa_seg6_lights_060025B8.a, 2), + gsSPLightColor(LIGHT_1, 0xe0ae00ff), + gsSPLightColor(LIGHT_2, 0x705700ff), gsSPVertex(koopa_seg6_vertex_06009410, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -1829,8 +1764,8 @@ const Gfx koopa_seg6_dl_0600BA10[] = { // 0x0600BA90 - 0x0600BC18 const Gfx koopa_seg6_dl_0600BA90[] = { - gsSPLight(&koopa_seg6_lights_060025B8.l, 1), - gsSPLight(&koopa_seg6_lights_060025B8.a, 2), + gsSPLightColor(LIGHT_1, 0xe0ae00ff), + gsSPLightColor(LIGHT_2, 0x705700ff), gsSPVertex(koopa_seg6_vertex_060094F0, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -1864,8 +1799,8 @@ const Gfx koopa_seg6_dl_0600BA90[] = { // 0x0600BC18 - 0x0600BC88 const Gfx koopa_seg6_dl_0600BC18[] = { - gsSPLight(&koopa_seg6_lights_060025B8.l, 1), - gsSPLight(&koopa_seg6_lights_060025B8.a, 2), + gsSPLightColor(LIGHT_1, 0xe0ae00ff), + gsSPLightColor(LIGHT_2, 0x705700ff), gsSPVertex(koopa_seg6_vertex_06009A30, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 1, 4, 5, 0x0, 1, 5, 2, 0x0), @@ -1877,8 +1812,8 @@ const Gfx koopa_seg6_dl_0600BC18[] = { // 0x0600BC88 - 0x0600BE10 const Gfx koopa_seg6_dl_0600BC88[] = { - gsSPLight(&koopa_seg6_lights_060025B8.l, 1), - gsSPLight(&koopa_seg6_lights_060025B8.a, 2), + gsSPLightColor(LIGHT_1, 0xe0ae00ff), + gsSPLightColor(LIGHT_2, 0x705700ff), gsSPVertex(koopa_seg6_vertex_06009AD0, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -1912,8 +1847,8 @@ const Gfx koopa_seg6_dl_0600BC88[] = { // 0x0600BE10 - 0x0600BE80 const Gfx koopa_seg6_dl_0600BE10[] = { - gsSPLight(&koopa_seg6_lights_060025B8.l, 1), - gsSPLight(&koopa_seg6_lights_060025B8.a, 2), + gsSPLightColor(LIGHT_1, 0xe0ae00ff), + gsSPLightColor(LIGHT_2, 0x705700ff), gsSPVertex(koopa_seg6_vertex_0600A010, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 1, 4, 5, 0x0, 1, 5, 2, 0x0), @@ -1925,8 +1860,8 @@ const Gfx koopa_seg6_dl_0600BE10[] = { // 0x0600BE80 - 0x0600C240 const Gfx koopa_seg6_dl_0600BE80[] = { - gsSPLight(&koopa_seg6_lights_060025B8.l, 1), - gsSPLight(&koopa_seg6_lights_060025B8.a, 2), + gsSPLightColor(LIGHT_1, 0xe0ae00ff), + gsSPLightColor(LIGHT_2, 0x705700ff), gsSPVertex(koopa_seg6_vertex_0600A0B0, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 1, 4, 5, 0x0, 6, 7, 8, 0x0), @@ -1977,8 +1912,8 @@ const Gfx koopa_seg6_dl_0600BE80[] = { gsSP1Triangle(13, 14, 15, 0x0), gsSPVertex(koopa_seg6_vertex_0600A990, 3, 0), gsSP1Triangle( 0, 1, 2, 0x0), - gsSPLight(&koopa_seg6_lights_060025D0.l, 1), - gsSPLight(&koopa_seg6_lights_060025D0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(koopa_seg6_vertex_0600A9C0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 2, 9, 10, 0x0), @@ -2001,8 +1936,8 @@ const Gfx koopa_seg6_dl_0600BE80[] = { // 0x0600C240 - 0x0600C498 const Gfx koopa_seg6_dl_0600C240[] = { - gsSPLight(&koopa_seg6_lights_06002618.l, 1), - gsSPLight(&koopa_seg6_lights_06002618.a, 2), + gsSPLightColor(LIGHT_1, 0xb2b2b2ff), + gsSPLightColor(LIGHT_2, 0x595959ff), gsSPVertex(koopa_seg6_vertex_0600AC90, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 7, 5, 4, 0x0), @@ -2023,8 +1958,8 @@ const Gfx koopa_seg6_dl_0600C240[] = { gsSP2Triangles( 4, 7, 8, 0x0, 4, 8, 9, 0x0), gsSP2Triangles( 3, 4, 9, 0x0, 0, 3, 10, 0x0), gsSP1Triangle(11, 12, 7, 0x0), - gsSPLight(&koopa_seg6_lights_06002600.l, 1), - gsSPLight(&koopa_seg6_lights_06002600.a, 2), + gsSPLightColor(LIGHT_1, 0xa900ff), + gsSPLightColor(LIGHT_2, 0x5400ff), gsSPVertex(koopa_seg6_vertex_0600AF60, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 3, 5, 0x0, 6, 5, 1, 0x0), @@ -2032,8 +1967,8 @@ const Gfx koopa_seg6_dl_0600C240[] = { gsSP2Triangles( 3, 8, 9, 0x0, 4, 3, 9, 0x0), gsSP2Triangles( 7, 2, 5, 0x0, 6, 0, 8, 0x0), gsSP2Triangles( 8, 3, 6, 0x0, 6, 1, 0, 0x0), - gsSPLight(&koopa_seg6_lights_060025B8.l, 1), - gsSPLight(&koopa_seg6_lights_060025B8.a, 2), + gsSPLightColor(LIGHT_1, 0xe0ae00ff), + gsSPLightColor(LIGHT_2, 0x705700ff), gsSPVertex(koopa_seg6_vertex_0600B000, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 3, 6, 0x0, 7, 8, 9, 0x0), @@ -2051,8 +1986,8 @@ const Gfx koopa_seg6_dl_0600C240[] = { // 0x0600C498 - 0x0600C6A0 const Gfx koopa_seg6_dl_0600C498[] = { - gsSPLight(&koopa_seg6_lights_06002630.l, 1), - gsSPLight(&koopa_seg6_lights_06002630.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(koopa_seg6_vertex_0600B190, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -2078,8 +2013,8 @@ const Gfx koopa_seg6_dl_0600C498[] = { gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP1Triangle( 6, 7, 8, 0x0), #ifdef KOOPA_KEEP_PINK_SHORTS - gsSPLight((Texture*)koopa_seg6_texture_06002648 + 0x20, 1), // this malformed light results in a - gsSPLight((Texture*)koopa_seg6_texture_06002648 + 0x18, 2), // koopa appearing to wear pink shorts. + gsSPLightColor(LIGHT_1, 0xde01deff), + gsSPLightColor(LIGHT_2, 0xdec1deff), #endif gsSPVertex(koopa_seg6_vertex_0600B5F0, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), diff --git a/actors/koopa_flag/model.inc.c b/actors/koopa_flag/model.inc.c index 7840c95c..7cde915f 100644 --- a/actors/koopa_flag/model.inc.c +++ b/actors/koopa_flag/model.inc.c @@ -1,22 +1,10 @@ // Koopa Flag // 0x06000000 -UNUSED static const Lights1 koopa_flag_seg6_lights_06000000 = gdSPDefLights1( - 0x00, 0x1b, 0x00, - 0x00, 0x6e, 0x00, 0x28, 0x28, 0x28 -); // 0x06000018 -UNUSED static const Lights1 koopa_flag_seg6_lights_06000018 = gdSPDefLights1( - 0x3f, 0x39, 0x15, - 0xff, 0xe6, 0x57, 0x28, 0x28, 0x28 -); // 0x06000030 -UNUSED static const Lights1 koopa_flag_seg6_lights_06000030 = gdSPDefLights1( - 0x2b, 0x15, 0x01, - 0xac, 0x54, 0x05, 0x28, 0x28, 0x28 -); // 0x06000048 ALIGNED8 static const Texture koopa_flag_seg6_texture_06000048[] = { @@ -24,16 +12,8 @@ ALIGNED8 static const Texture koopa_flag_seg6_texture_06000048[] = { }; // 0x06000848 -static const Lights1 koopa_flag_seg6_lights_06000848 = gdSPDefLights1( - 0x37, 0x27, 0x07, - 0xdf, 0x9f, 0x1f, 0x28, 0x28, 0x28 -); // 0x06000860 -static const Lights1 koopa_flag_seg6_lights_06000860 = gdSPDefLights1( - 0x14, 0x0a, 0x00, - 0x50, 0x28, 0x00, 0x28, 0x28, 0x28 -); // 0x06000878 static const Vtx koopa_flag_seg6_vertex_06000878[] = { @@ -60,13 +40,13 @@ static const Vtx koopa_flag_seg6_vertex_060008C8[] = { // 0x06000968 - 0x06000A08 const Gfx koopa_flag_seg6_dl_06000968[] = { - gsSPLight(&koopa_flag_seg6_lights_06000848.l, 1), - gsSPLight(&koopa_flag_seg6_lights_06000848.a, 2), + gsSPLightColor(LIGHT_1, 0xdf9f1fff), + gsSPLightColor(LIGHT_2, 0x372707ff), gsSPVertex(koopa_flag_seg6_vertex_06000878, 5, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 0, 0x0), gsSP1Triangle( 3, 0, 2, 0x0), - gsSPLight(&koopa_flag_seg6_lights_06000860.l, 1), - gsSPLight(&koopa_flag_seg6_lights_06000860.a, 2), + gsSPLightColor(LIGHT_1, 0x502800ff), + gsSPLightColor(LIGHT_2, 0x140a00ff), gsSPVertex(koopa_flag_seg6_vertex_060008C8, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0), gsSP2Triangles( 4, 2, 1, 0x0, 5, 0, 3, 0x0), diff --git a/actors/koopa_shell/model.inc.c b/actors/koopa_shell/model.inc.c index 56708e6f..06ee1cdd 100644 --- a/actors/koopa_shell/model.inc.c +++ b/actors/koopa_shell/model.inc.c @@ -1,28 +1,12 @@ // Koopa Shell // 0x08026388 -static const Lights1 koopa_shell_seg8_lights_08026388 = gdSPDefLights1( - 0x11, 0x33, 0x06, - 0x45, 0xcd, 0x1a, 0x28, 0x28, 0x28 -); // 0x080263A0 -static const Lights1 koopa_shell_seg8_lights_080263A0 = gdSPDefLights1( - 0x39, 0x0a, 0x07, - 0xe4, 0x29, 0x1d, 0x28, 0x28, 0x28 -); // 0x080263B8 -static const Lights1 koopa_shell_seg8_lights_080263B8 = gdSPDefLights1( - 0x21, 0x30, 0x39, - 0x84, 0xc3, 0xe5, 0x28, 0x28, 0x28 -); // 0x080263D0 -static const Lights1 koopa_shell_seg8_lights_080263D0 = gdSPDefLights1( - 0x3e, 0x3f, 0x3e, - 0xfa, 0xff, 0xf8, 0x28, 0x28, 0x28 -); // 0x080263E8 static const Vtx koopa_shell_seg8_vertex_080263E8[] = { @@ -370,42 +354,34 @@ const Gfx koopa_shell_seg8_dl_08027258[] = { const Gfx koopa_shell_seg8_dl_080273C8[] = { gsDPPipeSync(), gsSPNumLights(NUMLIGHTS_1), - gsSPLight(&koopa_shell_seg8_lights_08026388.l, 1), - gsSPLight(&koopa_shell_seg8_lights_08026388.a, 2), + gsSPLightColor(LIGHT_1, 0x45cd1aff), + gsSPLightColor(LIGHT_2, 0x113306ff), gsSPDisplayList(koopa_shell_seg8_dl_08027108), - gsSPLight(&koopa_shell_seg8_lights_080263B8.l, 1), - gsSPLight(&koopa_shell_seg8_lights_080263B8.a, 2), + gsSPLightColor(LIGHT_1, 0x84c3e5ff), + gsSPLightColor(LIGHT_2, 0x213039ff), gsSPDisplayList(koopa_shell_seg8_dl_08027170), - gsSPLight(&koopa_shell_seg8_lights_080263D0.l, 1), - gsSPLight(&koopa_shell_seg8_lights_080263D0.a, 2), + gsSPLightColor(LIGHT_1, 0xfafff8ff), + gsSPLightColor(LIGHT_2, 0x3e3f3eff), gsSPBranchList(koopa_shell_seg8_dl_08027258), }; // 0x08027420 - 0x08027470 const Gfx koopa_shell_seg8_dl_08027420[] = { gsDPPipeSync(), - gsSPLight(&koopa_shell_seg8_lights_080263A0.l, 1), - gsSPLight(&koopa_shell_seg8_lights_080263A0.a, 2), + gsSPLightColor(LIGHT_1, 0xe4291dff), + gsSPLightColor(LIGHT_2, 0x390a07ff), gsSPDisplayList(koopa_shell_seg8_dl_08027108), - gsSPLight(&koopa_shell_seg8_lights_080263B8.l, 1), - gsSPLight(&koopa_shell_seg8_lights_080263B8.a, 2), + gsSPLightColor(LIGHT_1, 0x84c3e5ff), + gsSPLightColor(LIGHT_2, 0x213039ff), gsSPDisplayList(koopa_shell_seg8_dl_08027170), - gsSPLight(&koopa_shell_seg8_lights_080263D0.l, 1), - gsSPLight(&koopa_shell_seg8_lights_080263D0.a, 2), + gsSPLightColor(LIGHT_1, 0xfafff8ff), + gsSPLightColor(LIGHT_2, 0x3e3f3eff), gsSPBranchList(koopa_shell_seg8_dl_08027258), }; // 0x08027470 -static const Lights1 koopa_shell_seg8_lights_08027470 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x08027488 -static const Lights1 koopa_shell_seg8_lights_08027488 = gdSPDefLights1( - 0x38, 0x2b, 0x00, - 0xe0, 0xae, 0x00, 0x28, 0x28, 0x28 -); // 0x080274A0 ALIGNED8 static const Texture koopa_shell_seg8_texture_080274A0[] = { @@ -514,8 +490,8 @@ const Gfx koopa_shell_seg8_dl_080288E0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, koopa_shell_seg8_texture_08027CA0), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&koopa_shell_seg8_lights_08027470.l, 1), - gsSPLight(&koopa_shell_seg8_lights_08027470.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(koopa_shell_seg8_vertex_080284A0, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0), gsSP2Triangles( 0, 4, 1, 0x0, 0, 5, 4, 0x0), @@ -545,13 +521,13 @@ const Gfx koopa_shell_seg8_dl_08028978[] = { // 0x08028A20 - 0x08028B78 const Gfx koopa_shell_seg8_dl_08028A20[] = { - gsSPLight(&koopa_shell_seg8_lights_08027488.l, 1), - gsSPLight(&koopa_shell_seg8_lights_08027488.a, 2), + gsSPLightColor(LIGHT_1, 0xe0ae00ff), + gsSPLightColor(LIGHT_2, 0x382b00ff), gsSPVertex(koopa_shell_seg8_vertex_08028620, 5, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0), gsSP1Triangle( 2, 4, 3, 0x0), - gsSPLight(&koopa_shell_seg8_lights_08027470.l, 1), - gsSPLight(&koopa_shell_seg8_lights_08027470.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(koopa_shell_seg8_vertex_08028670, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 0, 0x0), gsSP2Triangles( 4, 1, 3, 0x0, 2, 1, 5, 0x0), diff --git a/actors/lakitu_cameraman/model.inc.c b/actors/lakitu_cameraman/model.inc.c index a83d34f9..aef62a6e 100644 --- a/actors/lakitu_cameraman/model.inc.c +++ b/actors/lakitu_cameraman/model.inc.c @@ -31,16 +31,8 @@ ALIGNED8 static const Texture lakitu_seg6_texture_06003800[] = { }; // 0x06003A00 -static const Lights1 lakitu_seg6_lights_06003A00 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x06003A18 -static const Lights1 lakitu_seg6_lights_06003A18 = gdSPDefLights1( - 0x79, 0x55, 0x00, - 0xf2, 0xab, 0x00, 0x28, 0x28, 0x28 -); // 0x06003A30 static const Vtx lakitu_seg6_vertex_06003A30[] = { @@ -96,8 +88,8 @@ const Gfx lakitu_seg6_dl_06003C80[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, lakitu_seg6_texture_06002800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&lakitu_seg6_lights_06003A00.l, 1), - gsSPLight(&lakitu_seg6_lights_06003A00.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(lakitu_seg6_vertex_06003A30, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 6, 7, 0x0, 4, 7, 5, 0x0), @@ -120,8 +112,8 @@ const Gfx lakitu_seg6_dl_06003C80[] = { // 0x06003DB0 - 0x06003E30 const Gfx lakitu_seg6_dl_06003DB0[] = { - gsSPLight(&lakitu_seg6_lights_06003A18.l, 1), - gsSPLight(&lakitu_seg6_lights_06003A18.a, 2), + gsSPLightColor(LIGHT_1, 0xf2ab00ff), + gsSPLightColor(LIGHT_2, 0x795500ff), gsSPVertex(lakitu_seg6_vertex_06003BD0, 11, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 4, 0x0), gsSP2Triangles( 1, 5, 2, 0x0, 4, 0, 2, 0x0), @@ -150,10 +142,6 @@ const Gfx lakitu_seg6_dl_06003E30[] = { }; // 0x06003E98 -static const Lights1 lakitu_seg6_lights_06003E98 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x06003EB0 static const Vtx lakitu_seg6_vertex_06003EB0[] = { @@ -270,8 +258,8 @@ const Gfx lakitu_seg6_dl_06004410[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, lakitu_seg6_texture_06003000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&lakitu_seg6_lights_06003E98.l, 1), - gsSPLight(&lakitu_seg6_lights_06003E98.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(lakitu_seg6_vertex_06003EB0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 4, 0x0), gsSP2Triangles( 3, 5, 1, 0x0, 1, 6, 7, 0x0), @@ -333,10 +321,6 @@ const Gfx lakitu_seg6_dl_06004680[] = { }; // 0x060046E0 -static const Lights1 lakitu_seg6_lights_060046E0 = gdSPDefLights1( - 0x79, 0x55, 0x00, - 0xf2, 0xab, 0x00, 0x28, 0x28, 0x28 -); // 0x060046F8 static const Vtx lakitu_seg6_vertex_060046F8[] = { @@ -359,8 +343,8 @@ static const Vtx lakitu_seg6_vertex_060046F8[] = { // 0x060047E8 - 0x060048D8 const Gfx lakitu_seg6_dl_060047E8[] = { - gsSPLight(&lakitu_seg6_lights_060046E0.l, 1), - gsSPLight(&lakitu_seg6_lights_060046E0.a, 2), + gsSPLightColor(LIGHT_1, 0xf2ab00ff), + gsSPLightColor(LIGHT_2, 0x795500ff), gsSPVertex(lakitu_seg6_vertex_060046F8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 6, 7, 0x0, 4, 7, 5, 0x0), @@ -379,10 +363,6 @@ const Gfx lakitu_seg6_dl_060047E8[] = { }; // 0x060048D8 -static const Lights1 lakitu_seg6_lights_060048D8 = gdSPDefLights1( - 0x79, 0x55, 0x00, - 0xf2, 0xab, 0x00, 0x28, 0x28, 0x28 -); // 0x060048F0 static const Vtx lakitu_seg6_vertex_060048F0[] = { @@ -405,8 +385,8 @@ static const Vtx lakitu_seg6_vertex_060048F0[] = { // 0x060049E0 - 0x06004AD0 const Gfx lakitu_seg6_dl_060049E0[] = { - gsSPLight(&lakitu_seg6_lights_060048D8.l, 1), - gsSPLight(&lakitu_seg6_lights_060048D8.a, 2), + gsSPLightColor(LIGHT_1, 0xf2ab00ff), + gsSPLightColor(LIGHT_2, 0x795500ff), gsSPVertex(lakitu_seg6_vertex_060048F0, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 3, 5, 0x0, 3, 7, 4, 0x0), @@ -425,10 +405,6 @@ const Gfx lakitu_seg6_dl_060049E0[] = { }; // 0x06004AD0 -static const Lights1 lakitu_seg6_lights_06004AD0 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x06004AE8 static const Vtx lakitu_seg6_vertex_06004AE8[] = { @@ -448,8 +424,8 @@ static const Vtx lakitu_seg6_vertex_06004AE8[] = { // 0x06004BA8 - 0x06004BE8 const Gfx lakitu_seg6_dl_06004BA8[] = { - gsSPLight(&lakitu_seg6_lights_06004AD0.l, 1), - gsSPLight(&lakitu_seg6_lights_06004AD0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(lakitu_seg6_vertex_06004AE8, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), @@ -498,28 +474,12 @@ const Gfx lakitu_seg6_dl_06004C88[] = { }; // 0x06004CB0 -static const Lights1 lakitu_seg6_lights_06004CB0 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x06004CC8 -static const Lights1 lakitu_seg6_lights_06004CC8 = gdSPDefLights1( - 0x0c, 0x0c, 0x0c, - 0x19, 0x19, 0x19, 0x28, 0x28, 0x28 -); // 0x06004CE0 -static const Lights1 lakitu_seg6_lights_06004CE0 = gdSPDefLights1( - 0x19, 0x22, 0x20, - 0x32, 0x44, 0x40, 0x28, 0x28, 0x28 -); // 0x06004CF8 -static const Lights1 lakitu_seg6_lights_06004CF8 = gdSPDefLights1( - 0x18, 0x18, 0x18, - 0x30, 0x30, 0x30, 0x28, 0x28, 0x28 -); // 0x06004D10 static const Vtx lakitu_seg6_vertex_06004D10[] = { @@ -630,8 +590,8 @@ const Gfx lakitu_seg6_dl_060051D0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, lakitu_seg6_texture_06003800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 16 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)), - gsSPLight(&lakitu_seg6_lights_06004CB0.l, 1), - gsSPLight(&lakitu_seg6_lights_06004CB0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(lakitu_seg6_vertex_06004D10, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSPEndDisplayList(), @@ -639,8 +599,8 @@ const Gfx lakitu_seg6_dl_060051D0[] = { // 0x06005218 - 0x06005360 const Gfx lakitu_seg6_dl_06005218[] = { - gsSPLight(&lakitu_seg6_lights_06004CC8.l, 1), - gsSPLight(&lakitu_seg6_lights_06004CC8.a, 2), + gsSPLightColor(LIGHT_1, 0x191919ff), + gsSPLightColor(LIGHT_2, 0xc0c0cff), gsSPVertex(lakitu_seg6_vertex_06004D50, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), @@ -651,8 +611,8 @@ const Gfx lakitu_seg6_dl_06005218[] = { gsSP1Triangle(12, 13, 14, 0x0), gsSPVertex(lakitu_seg6_vertex_06004F30, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), - gsSPLight(&lakitu_seg6_lights_06004CE0.l, 1), - gsSPLight(&lakitu_seg6_lights_06004CE0.a, 2), + gsSPLightColor(LIGHT_1, 0x324440ff), + gsSPLightColor(LIGHT_2, 0x192220ff), gsSPVertex(lakitu_seg6_vertex_06004F90, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 0, 7, 1, 0x0), @@ -661,8 +621,8 @@ const Gfx lakitu_seg6_dl_06005218[] = { gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 7, 8, 9, 0x0), gsSP2Triangles(10, 11, 12, 0x0, 10, 13, 11, 0x0), - gsSPLight(&lakitu_seg6_lights_06004CF8.l, 1), - gsSPLight(&lakitu_seg6_lights_06004CF8.a, 2), + gsSPLightColor(LIGHT_1, 0x303030ff), + gsSPLightColor(LIGHT_2, 0x181818ff), gsSPVertex(lakitu_seg6_vertex_06005150, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 4, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 7, 1, 6, 0x0), @@ -689,40 +649,16 @@ const Gfx lakitu_seg6_dl_06005360[] = { }; // Unreferenced light group -UNUSED static const Lights1 lakitu_cameraman_lights_unused1 = gdSPDefLights1( - 0x33, 0x1f, 0x0c, - 0xcc, 0x7f, 0x33, 0x28, 0x28, 0x28 -); // 0x060053F0 -static const Lights1 lakitu_seg6_lights_060053F0 = gdSPDefLights1( - 0x29, 0x13, 0x06, - 0xa5, 0x4f, 0x1b, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 lakitu_cameraman_lights_unused2 = gdSPDefLights1( - 0x06, 0x06, 0x06, - 0x19, 0x19, 0x19, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 lakitu_cameraman_lights_unused3 = gdSPDefLights1( - 0x2c, 0x2c, 0x2c, - 0xb2, 0xb2, 0xb2, 0x28, 0x28, 0x28 -); // 0x06005438 -static const Lights1 lakitu_seg6_lights_06005438 = gdSPDefLights1( - 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 lakitu_cameraman_lights_unused4 = gdSPDefLights1( - 0x0d, 0x2c, 0x0b, - 0x34, 0xb2, 0x2c, 0x28, 0x28, 0x28 -); // 0x06005468 static const Vtx lakitu_seg6_vertex_06005468[] = { @@ -757,8 +693,8 @@ static const Vtx lakitu_seg6_vertex_06005568[] = { // 0x06005598 - 0x060055E8 const Gfx lakitu_seg6_dl_06005598[] = { - gsSPLight(&lakitu_seg6_lights_060053F0.l, 1), - gsSPLight(&lakitu_seg6_lights_060053F0.a, 2), + gsSPLightColor(LIGHT_1, 0xa54f1bff), + gsSPLightColor(LIGHT_2, 0x291306ff), gsSPVertex(lakitu_seg6_vertex_06005468, 13, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 0, 2, 0x0, 7, 8, 9, 0x0), @@ -768,8 +704,8 @@ const Gfx lakitu_seg6_dl_06005598[] = { // 0x060055E8 - 0x06005610 const Gfx lakitu_seg6_dl_060055E8[] = { - gsSPLight(&lakitu_seg6_lights_06005438.l, 1), - gsSPLight(&lakitu_seg6_lights_06005438.a, 2), + gsSPLightColor(LIGHT_1, 0xff), + gsSPLightColor(LIGHT_2, 0xff), gsSPVertex(lakitu_seg6_vertex_06005538, 3, 0), gsSP1Triangle( 0, 1, 2, 0x0), gsSPEndDisplayList(), @@ -777,8 +713,8 @@ const Gfx lakitu_seg6_dl_060055E8[] = { // 0x06005610 - 0x06005638 const Gfx lakitu_seg6_dl_06005610[] = { - gsSPLight(&lakitu_seg6_lights_06005438.l, 1), - gsSPLight(&lakitu_seg6_lights_06005438.a, 2), + gsSPLightColor(LIGHT_1, 0xff), + gsSPLightColor(LIGHT_2, 0xff), gsSPVertex(lakitu_seg6_vertex_06005568, 3, 0), gsSP1Triangle( 0, 1, 2, 0x0), gsSPEndDisplayList(), diff --git a/actors/lakitu_enemy/model.inc.c b/actors/lakitu_enemy/model.inc.c index b8613994..5cbbc658 100644 --- a/actors/lakitu_enemy/model.inc.c +++ b/actors/lakitu_enemy/model.inc.c @@ -1,22 +1,10 @@ // Lakitu Enemy // Unreferenced light group -UNUSED static const Lights1 lakitu_enemy_lights_unused1 = gdSPDefLights1( - 0x33, 0x1f, 0x0c, - 0xcc, 0x7f, 0x33, 0x28, 0x28, 0x28 -); // 0x0500ECB0 -static const Lights1 lakitu_enemy_seg5_lights_0500ECB0 = gdSPDefLights1( - 0x29, 0x13, 0x06, - 0xa5, 0x4f, 0x1b, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 lakitu_enemy_lights_unused2 = gdSPDefLights1( - 0x0d, 0x2c, 0x0b, - 0x34, 0xb2, 0x2c, 0x28, 0x28, 0x28 -); // Unreferenced texture // 0x0500ECE0 @@ -45,16 +33,8 @@ ALIGNED8 static const Texture lakitu_enemy_seg5_texture_05011CE0[] = { }; // 0x050124E0 -static const Lights1 lakitu_enemy_seg5_lights_050124E0 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x050124F8 -static const Lights1 lakitu_enemy_seg5_lights_050124F8 = gdSPDefLights1( - 0x79, 0x55, 0x00, - 0xf2, 0xab, 0x00, 0x28, 0x28, 0x28 -); // 0x05012510 static const Vtx lakitu_enemy_seg5_vertex_05012510[] = { @@ -110,8 +90,8 @@ const Gfx lakitu_enemy_seg5_dl_05012760[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, lakitu_enemy_seg5_texture_050114E0), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&lakitu_enemy_seg5_lights_050124E0.l, 1), - gsSPLight(&lakitu_enemy_seg5_lights_050124E0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(lakitu_enemy_seg5_vertex_05012510, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 6, 7, 0x0, 4, 7, 5, 0x0), @@ -134,8 +114,8 @@ const Gfx lakitu_enemy_seg5_dl_05012760[] = { // 0x05012890 - 0x05012910 const Gfx lakitu_enemy_seg5_dl_05012890[] = { - gsSPLight(&lakitu_enemy_seg5_lights_050124F8.l, 1), - gsSPLight(&lakitu_enemy_seg5_lights_050124F8.a, 2), + gsSPLightColor(LIGHT_1, 0xf2ab00ff), + gsSPLightColor(LIGHT_2, 0x795500ff), gsSPVertex(lakitu_enemy_seg5_vertex_050126B0, 11, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 4, 0x0), gsSP2Triangles( 1, 5, 2, 0x0, 4, 0, 2, 0x0), @@ -164,10 +144,6 @@ const Gfx lakitu_enemy_seg5_dl_05012910[] = { }; // 0x05012978 -static const Lights1 lakitu_enemy_seg5_lights_05012978 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05012990 static const Vtx lakitu_enemy_seg5_vertex_05012990[] = { @@ -284,8 +260,8 @@ const Gfx lakitu_enemy_seg5_dl_05012EF0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, lakitu_enemy_seg5_texture_05011CE0), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&lakitu_enemy_seg5_lights_05012978.l, 1), - gsSPLight(&lakitu_enemy_seg5_lights_05012978.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(lakitu_enemy_seg5_vertex_05012990, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 4, 0x0), gsSP2Triangles( 3, 5, 1, 0x0, 1, 6, 7, 0x0), @@ -347,10 +323,6 @@ const Gfx lakitu_enemy_seg5_dl_05013160[] = { }; // 0x050131C0 -static const Lights1 lakitu_enemy_seg5_lights_050131C0 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x050131D8 static const Vtx lakitu_enemy_seg5_vertex_050131D8[] = { @@ -370,8 +342,8 @@ static const Vtx lakitu_enemy_seg5_vertex_050131D8[] = { // 0x05013298 - 0x050132D8 const Gfx lakitu_enemy_seg5_dl_05013298[] = { - gsSPLight(&lakitu_enemy_seg5_lights_050131C0.l, 1), - gsSPLight(&lakitu_enemy_seg5_lights_050131C0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(lakitu_enemy_seg5_vertex_050131D8, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), @@ -420,10 +392,6 @@ const Gfx lakitu_enemy_seg5_dl_05013378[] = { }; // 0x050133A0 -static const Lights1 lakitu_enemy_seg5_lights_050133A0 = gdSPDefLights1( - 0x79, 0x55, 0x00, - 0xf2, 0xab, 0x00, 0x28, 0x28, 0x28 -); // 0x050133B8 static const Vtx lakitu_enemy_seg5_vertex_050133B8[] = { @@ -446,8 +414,8 @@ static const Vtx lakitu_enemy_seg5_vertex_050133B8[] = { // 0x050134A8 - 0x05013598 const Gfx lakitu_enemy_seg5_dl_050134A8[] = { - gsSPLight(&lakitu_enemy_seg5_lights_050133A0.l, 1), - gsSPLight(&lakitu_enemy_seg5_lights_050133A0.a, 2), + gsSPLightColor(LIGHT_1, 0xf2ab00ff), + gsSPLightColor(LIGHT_2, 0x795500ff), gsSPVertex(lakitu_enemy_seg5_vertex_050133B8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 3, 5, 0x0, 3, 7, 4, 0x0), @@ -466,10 +434,6 @@ const Gfx lakitu_enemy_seg5_dl_050134A8[] = { }; // 0x05013598 -static const Lights1 lakitu_enemy_seg5_lights_05013598 = gdSPDefLights1( - 0x79, 0x55, 0x00, - 0xf2, 0xab, 0x00, 0x28, 0x28, 0x28 -); // 0x050135B0 static const Vtx lakitu_enemy_seg5_vertex_050135B0[] = { @@ -492,8 +456,8 @@ static const Vtx lakitu_enemy_seg5_vertex_050135B0[] = { // 0x050136A0 - 0x05013790 const Gfx lakitu_enemy_seg5_dl_050136A0[] = { - gsSPLight(&lakitu_enemy_seg5_lights_05013598.l, 1), - gsSPLight(&lakitu_enemy_seg5_lights_05013598.a, 2), + gsSPLightColor(LIGHT_1, 0xf2ab00ff), + gsSPLightColor(LIGHT_2, 0x795500ff), gsSPVertex(lakitu_enemy_seg5_vertex_050135B0, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 6, 7, 0x0, 4, 7, 5, 0x0), @@ -530,8 +494,8 @@ static const Vtx lakitu_enemy_seg5_vertex_05013790[] = { // 0x05013860 - 0x050138B0 const Gfx lakitu_enemy_seg5_dl_05013860[] = { - gsSPLight(&lakitu_enemy_seg5_lights_0500ECB0.l, 1), - gsSPLight(&lakitu_enemy_seg5_lights_0500ECB0.a, 2), + gsSPLightColor(LIGHT_1, 0xa54f1bff), + gsSPLightColor(LIGHT_2, 0x291306ff), gsSPVertex(lakitu_enemy_seg5_vertex_05013790, 13, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 0, 2, 0x0, 7, 8, 9, 0x0), diff --git a/actors/mad_piano/model.inc.c b/actors/mad_piano/model.inc.c index da3c9fd4..d5232367 100644 --- a/actors/mad_piano/model.inc.c +++ b/actors/mad_piano/model.inc.c @@ -1,28 +1,12 @@ // Mad Piano // Unreferenced light group -UNUSED static const Lights1 mad_piano_lights_unused1 = gdSPDefLights1( - 0x05, 0x04, 0x08, - 0x14, 0x13, 0x20, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 mad_piano_lights_unused2 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 mad_piano_lights_unused3 = gdSPDefLights1( - 0x2c, 0x2c, 0x2c, - 0xb2, 0xb2, 0xb2, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 mad_piano_lights_unused4 = gdSPDefLights1( - 0x30, 0x00, 0x00, - 0xc3, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x05006AF0 ALIGNED8 static const Texture mad_piano_seg5_texture_05006AF0[] = { @@ -55,10 +39,6 @@ ALIGNED8 static const Texture mad_piano_seg5_texture_050082F0[] = { }; // 0x050086F0 -static const Lights1 mad_piano_seg5_lights_050086F0 = gdSPDefLights1( - 0x4c, 0x4c, 0x4c, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05008708 static const Vtx mad_piano_seg5_vertex_05008708[] = { @@ -155,8 +135,8 @@ const Gfx mad_piano_seg5_dl_05008B68[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mad_piano_seg5_texture_050072F0), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 32 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)), - gsSPLight(&mad_piano_seg5_lights_050086F0.l, 1), - gsSPLight(&mad_piano_seg5_lights_050086F0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(mad_piano_seg5_vertex_05008708, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 0, 2, 6, 0x0, 0, 7, 8, 0x0), @@ -211,28 +191,12 @@ const Gfx mad_piano_seg5_dl_05008CB0[] = { }; // 0x05008D40 -static const Lights1 mad_piano_seg5_lights_05008D40 = gdSPDefLights1( - 0x3d, 0x3d, 0x3d, - 0xcc, 0xcc, 0xcc, 0x28, 0x28, 0x28 -); // 0x05008D58 -static const Lights1 mad_piano_seg5_lights_05008D58 = gdSPDefLights1( - 0x4c, 0x4c, 0x4c, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05008D70 -static const Lights1 mad_piano_seg5_lights_05008D70 = gdSPDefLights1( - 0x26, 0x26, 0x26, - 0x7f, 0x7f, 0x7f, 0x28, 0x28, 0x28 -); // 0x05008D88 -static const Lights1 mad_piano_seg5_lights_05008D88 = gdSPDefLights1( - 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x05008DA0 static const Vtx mad_piano_seg5_vertex_05008DA0[] = { @@ -410,16 +374,16 @@ const Gfx mad_piano_seg5_dl_05009590[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mad_piano_seg5_texture_050072F0), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 32 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)), - gsSPLight(&mad_piano_seg5_lights_05008D40.l, 1), - gsSPLight(&mad_piano_seg5_lights_05008D40.a, 2), + gsSPLightColor(LIGHT_1, 0xccccccff), + gsSPLightColor(LIGHT_2, 0x3d3d3dff), gsSPVertex(mad_piano_seg5_vertex_05008DA0, 13, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), gsSP2Triangles( 7, 10, 8, 0x0, 11, 7, 9, 0x0), gsSP2Triangles(11, 9, 1, 0x0, 0, 12, 11, 0x0), gsSP1Triangle( 0, 11, 1, 0x0), - gsSPLight(&mad_piano_seg5_lights_05008D58.l, 1), - gsSPLight(&mad_piano_seg5_lights_05008D58.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(mad_piano_seg5_vertex_05008E70, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), @@ -464,8 +428,8 @@ const Gfx mad_piano_seg5_dl_050097B0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mad_piano_seg5_texture_050082F0), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&mad_piano_seg5_lights_05008D70.l, 1), - gsSPLight(&mad_piano_seg5_lights_05008D70.a, 2), + gsSPLightColor(LIGHT_1, 0x7f7f7fff), + gsSPLightColor(LIGHT_2, 0x262626ff), gsSPVertex(mad_piano_seg5_vertex_050093F0, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSPEndDisplayList(), @@ -476,8 +440,8 @@ const Gfx mad_piano_seg5_dl_050097F8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mad_piano_seg5_texture_05007EF0), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&mad_piano_seg5_lights_05008D40.l, 1), - gsSPLight(&mad_piano_seg5_lights_05008D40.a, 2), + gsSPLightColor(LIGHT_1, 0xccccccff), + gsSPLightColor(LIGHT_2, 0x3d3d3dff), gsSPVertex(mad_piano_seg5_vertex_05009430, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSPEndDisplayList(), @@ -496,8 +460,8 @@ const Gfx mad_piano_seg5_dl_05009840[] = { // 0x05009888 - 0x050098E8 const Gfx mad_piano_seg5_dl_05009888[] = { - gsSPLight(&mad_piano_seg5_lights_05008D88.l, 1), - gsSPLight(&mad_piano_seg5_lights_05008D88.a, 2), + gsSPLightColor(LIGHT_1, 0xff), + gsSPLightColor(LIGHT_2, 0xff), gsSPVertex(mad_piano_seg5_vertex_050094F0, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 2, 4, 3, 0x0, 2, 5, 4, 0x0), diff --git a/actors/manta/model.inc.c b/actors/manta/model.inc.c index f0efc467..6bf50c49 100644 --- a/actors/manta/model.inc.c +++ b/actors/manta/model.inc.c @@ -1,22 +1,10 @@ // Manta Ray // 0x05001758 -static const Lights1 manta_seg5_lights_05001758 = gdSPDefLights1( - 0x31, 0x3b, 0x3b, - 0xc6, 0xee, 0xed, 0x28, 0x28, 0x28 -); // 0x05001770 -static const Lights1 manta_seg5_lights_05001770 = gdSPDefLights1( - 0x00, 0x16, 0x18, - 0x03, 0x5b, 0x63, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 manta_lights_unused = gdSPDefLights1( - 0x3f, 0x3f, 0x35, - 0xff, 0xff, 0xd7, 0x28, 0x28, 0x28 -); // 0x050017A0 ALIGNED8 static const Texture manta_seg5_texture_050017A0[] = { @@ -1037,13 +1025,13 @@ static const Vtx manta_seg5_vertex_05006A88[] = { // 0x05006B08 - 0x05006B70 const Gfx manta_seg5_dl_05006B08[] = { - gsSPLight(&manta_seg5_lights_05001770.l, 1), - gsSPLight(&manta_seg5_lights_05001770.a, 2), + gsSPLightColor(LIGHT_1, 0x35b63ff), + gsSPLightColor(LIGHT_2, 0x1618ff), gsSPVertex(manta_seg5_vertex_05006808, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 1, 0x0), gsSP2Triangles( 1, 4, 2, 0x0, 1, 0, 5, 0x0), - gsSPLight(&manta_seg5_lights_05001758.l, 1), - gsSPLight(&manta_seg5_lights_05001758.a, 2), + gsSPLightColor(LIGHT_1, 0xc6eeedff), + gsSPLightColor(LIGHT_2, 0x313b3bff), gsSPVertex(manta_seg5_vertex_05006868, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSPEndDisplayList(), @@ -1051,15 +1039,15 @@ const Gfx manta_seg5_dl_05006B08[] = { // 0x05006B70 - 0x05006C08 const Gfx manta_seg5_dl_05006B70[] = { - gsSPLight(&manta_seg5_lights_05001770.l, 1), - gsSPLight(&manta_seg5_lights_05001770.a, 2), + gsSPLightColor(LIGHT_1, 0x35b63ff), + gsSPLightColor(LIGHT_2, 0x1618ff), gsSPVertex(manta_seg5_vertex_050068C8, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 5, 4, 6, 0x0, 1, 7, 2, 0x0), gsSP2Triangles( 5, 1, 0, 0x0, 5, 0, 3, 0x0), gsSP2Triangles( 6, 7, 1, 0x0, 6, 1, 5, 0x0), - gsSPLight(&manta_seg5_lights_05001758.l, 1), - gsSPLight(&manta_seg5_lights_05001758.a, 2), + gsSPLightColor(LIGHT_1, 0xc6eeedff), + gsSPLightColor(LIGHT_2, 0x313b3bff), gsSPVertex(manta_seg5_vertex_05006948, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 5, 6, 7, 0x0, 5, 7, 3, 0x0), @@ -1068,15 +1056,15 @@ const Gfx manta_seg5_dl_05006B70[] = { // 0x05006C08 - 0x05006CA0 const Gfx manta_seg5_dl_05006C08[] = { - gsSPLight(&manta_seg5_lights_05001770.l, 1), - gsSPLight(&manta_seg5_lights_05001770.a, 2), + gsSPLightColor(LIGHT_1, 0x35b63ff), + gsSPLightColor(LIGHT_2, 0x1618ff), gsSPVertex(manta_seg5_vertex_050069C8, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 5, 4, 6, 0x0, 1, 7, 2, 0x0), gsSP2Triangles( 5, 8, 9, 0x0, 5, 9, 3, 0x0), gsSP2Triangles( 6, 10, 11, 0x0, 6, 11, 5, 0x0), - gsSPLight(&manta_seg5_lights_05001758.l, 1), - gsSPLight(&manta_seg5_lights_05001758.a, 2), + gsSPLightColor(LIGHT_1, 0xc6eeedff), + gsSPLightColor(LIGHT_2, 0x313b3bff), gsSPVertex(manta_seg5_vertex_05006A88, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 5, 6, 7, 0x0, 5, 7, 3, 0x0), diff --git a/actors/mario/model.inc.c b/actors/mario/model.inc.c index a25a3b7f..28da06dd 100644 --- a/actors/mario/model.inc.c +++ b/actors/mario/model.inc.c @@ -1,40 +1,16 @@ // Mario // 0x04000000 # solid color blue - butt, left thigh, right thigh - all poly types -const Lights1 mario_blue_lights_group = gdSPDefLights1( - 0x00, 0x00, 0x7f, - 0x00, 0x00, 0xff, 0x28, 0x28, 0x28 -); // 0x04000018 # solid color red - left & right arm, torso (tshirt part), caps - all poly types -const Lights1 mario_red_lights_group = gdSPDefLights1( - 0x7f, 0x00, 0x00, - 0xff, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x04000030 # solid color white - metal butt & left thigh - normal left & right hand closed & open (with cap too) and all wings - all poly types -const Lights1 mario_white_lights_group = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x04000048 # solid color brown 1 - foot - all poly types -const Lights1 mario_brown1_lights_group = gdSPDefLights1( - 0x39, 0x0e, 0x07, - 0x72, 0x1c, 0x0e, 0x28, 0x28, 0x28 -); // 0x04000060 # solid color beige skin - face (cap on and off dls) - all poly types -const Lights1 mario_beige_lights_group = gdSPDefLights1( - 0x7f, 0x60, 0x3c, - 0xfe, 0xc1, 0x79, 0x28, 0x28, 0x28 -); // 0x04000078 # solid color brown 2 - hair - all poly types -const Lights1 mario_brown2_lights_group = gdSPDefLights1( - 0x39, 0x03, 0x00, - 0x73, 0x06, 0x00, 0x28, 0x28, 0x28 -); // 0x04000090 ALIGNED8 static const Texture mario_texture_metal[] = { @@ -381,8 +357,8 @@ const Gfx mario_butt_dl[] = { const Gfx mario_butt[] = { gsDPPipeSync(), gsDPSetCombineMode(G_CC_SHADEFADEA, G_CC_SHADEFADEA), - gsSPLight(&mario_blue_lights_group.l, 1), - gsSPLight(&mario_blue_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xffff), + gsSPLightColor(LIGHT_2, 0x7fff), gsSPDisplayList(mario_butt_dl), gsSPEndDisplayList(), }; @@ -394,8 +370,8 @@ const Gfx mario_metal_butt[] = { gsDPSetCombineMode(G_CC_DECALFADE, G_CC_DECALFADE), gsDPLoadTextureBlock(mario_texture_metal, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_WRAP | G_TX_NOMIRROR, 6, 5, G_TX_NOLOD, G_TX_NOLOD), gsSPTexture(0x0F80, 0x07C0, 0, G_TX_RENDERTILE, G_ON), - gsSPLight(&mario_white_lights_group.l, 1), - gsSPLight(&mario_white_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPDisplayList(mario_butt_dl), gsSPEndDisplayList(), }; @@ -499,8 +475,8 @@ const Gfx mario_left_arm_shared_dl[] = { // 0x0400D1D8 - 0x0400D1F8 const Gfx mario_left_arm[] = { - gsSPLight(&mario_red_lights_group.l, 1), - gsSPLight(&mario_red_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xff0000ff), + gsSPLightColor(LIGHT_2, 0x7f0000ff), gsSPDisplayList(mario_left_arm_shared_dl), gsSPEndDisplayList(), }; @@ -651,8 +627,8 @@ const Gfx mario_left_hand_closed_shared_dl[] = { // 0x0400D8F0 - 0x0400D910 const Gfx mario_left_hand_closed[] = { - gsSPLight(&mario_white_lights_group.l, 1), - gsSPLight(&mario_white_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPDisplayList(mario_left_hand_closed_shared_dl), gsSPEndDisplayList(), }; @@ -760,8 +736,8 @@ const Gfx mario_right_arm_shared_dl[] = { // 0x0400DDE8 - 0x0400DE08 const Gfx mario_right_arm[] = { - gsSPLight(&mario_red_lights_group.l, 1), - gsSPLight(&mario_red_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xff0000ff), + gsSPLightColor(LIGHT_2, 0x7f0000ff), gsSPDisplayList(mario_right_arm_shared_dl), gsSPEndDisplayList(), }; @@ -897,8 +873,8 @@ const Gfx mario_right_hand_closed_dl[] = { // 0x0400E458 - 0x0400E478 const Gfx mario_right_hand_closed[] = { - gsSPLight(&mario_white_lights_group.l, 1), - gsSPLight(&mario_white_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPDisplayList(mario_right_hand_closed_dl), gsSPEndDisplayList(), }; @@ -979,8 +955,8 @@ const Gfx mario_left_thigh_dl[] = { const Gfx mario_left_thigh[] = { gsDPPipeSync(), gsDPSetCombineMode(G_CC_SHADEFADEA, G_CC_SHADEFADEA), - gsSPLight(&mario_blue_lights_group.l, 1), - gsSPLight(&mario_blue_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xffff), + gsSPLightColor(LIGHT_2, 0x7fff), gsSPDisplayList(mario_left_thigh_dl), gsSPEndDisplayList(), }; @@ -992,8 +968,8 @@ const Gfx mario_metal_left_thigh[] = { gsDPSetCombineMode(G_CC_DECALFADE, G_CC_DECALFADE), gsDPLoadTextureBlock(mario_texture_metal, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_WRAP | G_TX_NOMIRROR, 6, 5, G_TX_NOLOD, G_TX_NOLOD), gsSPTexture(0x0F80, 0x07C0, 0, G_TX_RENDERTILE, G_ON), - gsSPLight(&mario_white_lights_group.l, 1), - gsSPLight(&mario_white_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPDisplayList(mario_left_thigh_dl), gsSPEndDisplayList(), }; @@ -1091,8 +1067,8 @@ const Gfx mario_left_foot_shared_dl[] = { // 0x0400ECA0 - 0x0400ECC0 const Gfx mario_left_foot[] = { - gsSPLight(&mario_brown1_lights_group.l, 1), - gsSPLight(&mario_brown1_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0x721c0eff), + gsSPLightColor(LIGHT_2, 0x390e07ff), gsSPDisplayList(mario_left_foot_shared_dl), gsSPEndDisplayList(), }; @@ -1160,8 +1136,8 @@ const Gfx mario_right_thigh_shared_dl[] = { // 0x0400EFB8 - 0x0400EFD8 const Gfx mario_right_thigh[] = { - gsSPLight(&mario_blue_lights_group.l, 1), - gsSPLight(&mario_blue_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xffff), + gsSPLightColor(LIGHT_2, 0x7fff), gsSPDisplayList(mario_right_thigh_shared_dl), gsSPEndDisplayList(), }; @@ -1276,8 +1252,8 @@ const Gfx mario_right_foot_dl[] = { // 0x0400F4E8 - 0x0400F528 const Gfx mario_right_foot[] = { - gsSPLight(&mario_brown1_lights_group.l, 1), - gsSPLight(&mario_brown1_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0x721c0eff), + gsSPLightColor(LIGHT_2, 0x390e07ff), gsSPDisplayList(mario_right_foot_dl), gsDPPipeSync(), gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), @@ -1589,8 +1565,8 @@ const Gfx mario_tshirt_shared_dl[] = { // 0x04010348 - 0x04010370 const Gfx mario_torso_dl[] = { gsSPDisplayList(mario_pants_overalls_shared_dl), - gsSPLight(&mario_red_lights_group.l, 1), - gsSPLight(&mario_red_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xff0000ff), + gsSPLightColor(LIGHT_2, 0x7f0000ff), gsSPDisplayList(mario_tshirt_shared_dl), gsSPEndDisplayList(), }; @@ -2080,11 +2056,11 @@ const Gfx mario_face_back_hair_cap_on_dl[] = { // 0x04011960 - 0x040119A0 const Gfx mario_face_cap_on_dl[] = { gsSPDisplayList(mario_face_part_cap_on_dl), - gsSPLight(&mario_red_lights_group.l, 1), - gsSPLight(&mario_red_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xff0000ff), + gsSPLightColor(LIGHT_2, 0x7f0000ff), gsSPDisplayList(mario_face_cap_dl), - gsSPLight(&mario_brown2_lights_group.l, 1), - gsSPLight(&mario_brown2_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0x730600ff), + gsSPLightColor(LIGHT_2, 0x390300ff), gsSPDisplayList(mario_face_back_hair_cap_on_dl), gsSPEndDisplayList(), }; @@ -2105,8 +2081,8 @@ const Gfx mario_cap_on_eyes_front[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_front), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&mario_beige_lights_group.l, 1), - gsSPLight(&mario_beige_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xfec179ff), + gsSPLightColor(LIGHT_2, 0x7f603cff), gsSPDisplayList(mario_eyes_cap_on_dl), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_hair_sideburn), gsDPLoadSync(), @@ -2139,8 +2115,8 @@ const Gfx mario_cap_on_eyes_half_closed[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_half_closed), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&mario_beige_lights_group.l, 1), - gsSPLight(&mario_beige_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xfec179ff), + gsSPLightColor(LIGHT_2, 0x7f603cff), gsSPDisplayList(mario_eyes_cap_on_dl), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_hair_sideburn), gsDPLoadSync(), @@ -2173,8 +2149,8 @@ const Gfx mario_cap_on_eyes_closed[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_closed), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&mario_beige_lights_group.l, 1), - gsSPLight(&mario_beige_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xfec179ff), + gsSPLightColor(LIGHT_2, 0x7f603cff), gsSPDisplayList(mario_eyes_cap_on_dl), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_hair_sideburn), gsDPLoadSync(), @@ -2207,8 +2183,8 @@ const Gfx mario_cap_on_eyes_right[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_right), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&mario_beige_lights_group.l, 1), - gsSPLight(&mario_beige_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xfec179ff), + gsSPLightColor(LIGHT_2, 0x7f603cff), gsSPDisplayList(mario_eyes_cap_on_dl), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_hair_sideburn), gsDPLoadSync(), @@ -2241,8 +2217,8 @@ const Gfx mario_cap_on_eyes_left[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_left), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&mario_beige_lights_group.l, 1), - gsSPLight(&mario_beige_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xfec179ff), + gsSPLightColor(LIGHT_2, 0x7f603cff), gsSPDisplayList(mario_eyes_cap_on_dl), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_hair_sideburn), gsDPLoadSync(), @@ -2275,8 +2251,8 @@ const Gfx mario_cap_on_eyes_up[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_up), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&mario_beige_lights_group.l, 1), - gsSPLight(&mario_beige_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xfec179ff), + gsSPLightColor(LIGHT_2, 0x7f603cff), gsSPDisplayList(mario_eyes_cap_on_dl), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_hair_sideburn), gsDPLoadSync(), @@ -2309,8 +2285,8 @@ const Gfx mario_cap_on_eyes_down[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_down), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&mario_beige_lights_group.l, 1), - gsSPLight(&mario_beige_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xfec179ff), + gsSPLightColor(LIGHT_2, 0x7f603cff), gsSPDisplayList(mario_eyes_cap_on_dl), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_hair_sideburn), gsDPLoadSync(), @@ -2343,8 +2319,8 @@ const Gfx mario_cap_on_eyes_dead[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_dead), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&mario_beige_lights_group.l, 1), - gsSPLight(&mario_beige_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xfec179ff), + gsSPLightColor(LIGHT_2, 0x7f603cff), gsSPDisplayList(mario_eyes_cap_on_dl), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_hair_sideburn), gsDPLoadSync(), @@ -2374,16 +2350,8 @@ const Gfx mario_metal_cap_on_shared_dl[] = { }; // Unreferenced light group -UNUSED static const Lights1 mario_lights_unused1 = gdSPDefLights1( - 0x3f, 0x30, 0x1e, - 0xfe, 0xc1, 0x79, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 mario_lights_unused2 = gdSPDefLights1( - 0x1c, 0x01, 0x00, - 0x73, 0x06, 0x00, 0x28, 0x28, 0x28 -); // 0x04012190 static const Vtx mario_eyes_cap_off_dl_vertex[] = { @@ -2892,8 +2860,8 @@ const Gfx mario_face_hair_cap_off_dl[] = { // 0x040139C0 - 0x040139E8 const Gfx mario_face_cap_off_dl[] = { gsSPDisplayList(mario_face_part_cap_off_dl), - gsSPLight(&mario_brown2_lights_group.l, 1), - gsSPLight(&mario_brown2_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0x730600ff), + gsSPLightColor(LIGHT_2, 0x390300ff), gsSPDisplayList(mario_face_hair_cap_off_dl), gsSPEndDisplayList(), }; @@ -2910,8 +2878,8 @@ const Gfx mario_cap_off_eyes_front[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_front), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&mario_beige_lights_group.l, 1), - gsSPLight(&mario_beige_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xfec179ff), + gsSPLightColor(LIGHT_2, 0x7f603cff), gsSPDisplayList(mario_eyes_cap_off_dl), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_mustache), gsDPLoadSync(), @@ -2940,8 +2908,8 @@ const Gfx mario_cap_off_eyes_half_closed[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_half_closed), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&mario_beige_lights_group.l, 1), - gsSPLight(&mario_beige_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xfec179ff), + gsSPLightColor(LIGHT_2, 0x7f603cff), gsSPDisplayList(mario_eyes_cap_off_dl), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_mustache), gsDPLoadSync(), @@ -2970,8 +2938,8 @@ const Gfx mario_cap_off_eyes_closed[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_closed), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&mario_beige_lights_group.l, 1), - gsSPLight(&mario_beige_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xfec179ff), + gsSPLightColor(LIGHT_2, 0x7f603cff), gsSPDisplayList(mario_eyes_cap_off_dl), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_mustache), gsDPLoadSync(), @@ -3000,8 +2968,8 @@ const Gfx mario_cap_off_eyes_right[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_right), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&mario_beige_lights_group.l, 1), - gsSPLight(&mario_beige_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xfec179ff), + gsSPLightColor(LIGHT_2, 0x7f603cff), gsSPDisplayList(mario_eyes_cap_off_dl), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_mustache), gsDPLoadSync(), @@ -3030,8 +2998,8 @@ const Gfx mario_cap_off_eyes_left[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_left), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&mario_beige_lights_group.l, 1), - gsSPLight(&mario_beige_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xfec179ff), + gsSPLightColor(LIGHT_2, 0x7f603cff), gsSPDisplayList(mario_eyes_cap_off_dl), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_mustache), gsDPLoadSync(), @@ -3060,8 +3028,8 @@ const Gfx mario_cap_off_eyes_up[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_up), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&mario_beige_lights_group.l, 1), - gsSPLight(&mario_beige_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xfec179ff), + gsSPLightColor(LIGHT_2, 0x7f603cff), gsSPDisplayList(mario_eyes_cap_off_dl), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_mustache), gsDPLoadSync(), @@ -3090,8 +3058,8 @@ const Gfx mario_cap_off_eyes_down[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_down), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&mario_beige_lights_group.l, 1), - gsSPLight(&mario_beige_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xfec179ff), + gsSPLightColor(LIGHT_2, 0x7f603cff), gsSPDisplayList(mario_eyes_cap_off_dl), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_mustache), gsDPLoadSync(), @@ -3120,8 +3088,8 @@ const Gfx mario_cap_off_eyes_dead[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_dead), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&mario_beige_lights_group.l, 1), - gsSPLight(&mario_beige_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xfec179ff), + gsSPLightColor(LIGHT_2, 0x7f603cff), gsSPDisplayList(mario_eyes_cap_off_dl), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_mustache), gsDPLoadSync(), @@ -3270,8 +3238,8 @@ const Gfx mario_medium_poly_butt_dl[] = { const Gfx mario_medium_poly_butt[] = { gsDPPipeSync(), gsDPSetCombineMode(G_CC_SHADEFADEA, G_CC_SHADEFADEA), - gsSPLight(&mario_blue_lights_group.l, 1), - gsSPLight(&mario_blue_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xffff), + gsSPLightColor(LIGHT_2, 0x7fff), gsSPDisplayList(mario_medium_poly_butt_dl), gsSPEndDisplayList(), }; @@ -3283,8 +3251,8 @@ const Gfx mario_metal_medium_poly_butt[] = { gsDPSetCombineMode(G_CC_DECALFADE, G_CC_DECALFADE), gsDPLoadTextureBlock(mario_texture_metal, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_WRAP | G_TX_NOMIRROR, 6, 5, G_TX_NOLOD, G_TX_NOLOD), gsSPTexture(0x0F80, 0x07C0, 0, G_TX_RENDERTILE, G_ON), - gsSPLight(&mario_white_lights_group.l, 1), - gsSPLight(&mario_white_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPDisplayList(mario_medium_poly_butt_dl), gsSPEndDisplayList(), }; @@ -3322,8 +3290,8 @@ const Gfx mario_medium_poly_left_arm_shared_dl[] = { // 0x04014840 - 0x04014860 const Gfx mario_medium_poly_left_arm[] = { - gsSPLight(&mario_red_lights_group.l, 1), - gsSPLight(&mario_red_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xff0000ff), + gsSPLightColor(LIGHT_2, 0x7f0000ff), gsSPDisplayList(mario_medium_poly_left_arm_shared_dl), gsSPEndDisplayList(), }; @@ -3444,8 +3412,8 @@ const Gfx mario_medium_poly_left_hand_closed_shared_dl[] = { // 0x04014DC0 - 0x04014DE0 const Gfx mario_medium_poly_left_hand_closed[] = { - gsSPLight(&mario_white_lights_group.l, 1), - gsSPLight(&mario_white_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPDisplayList(mario_medium_poly_left_hand_closed_shared_dl), gsSPEndDisplayList(), }; @@ -3483,8 +3451,8 @@ const Gfx mario_medium_poly_right_arm_shared_dl[] = { // 0x04014F40 - 0x04014F60 const Gfx mario_medium_poly_right_arm[] = { - gsSPLight(&mario_red_lights_group.l, 1), - gsSPLight(&mario_red_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xff0000ff), + gsSPLightColor(LIGHT_2, 0x7f0000ff), gsSPDisplayList(mario_medium_poly_right_arm_shared_dl), gsSPEndDisplayList(), }; @@ -3606,8 +3574,8 @@ const Gfx mario_medium_poly_right_hand_closed_dl[] = { // 0x040154E0 - 0x04015500 const Gfx mario_medium_poly_right_hand_closed[] = { - gsSPLight(&mario_white_lights_group.l, 1), - gsSPLight(&mario_white_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPDisplayList(mario_medium_poly_right_hand_closed_dl), gsSPEndDisplayList(), }; @@ -3659,8 +3627,8 @@ const Gfx mario_medium_poly_left_thigh_dl[] = { const Gfx mario_medium_poly_left_thigh[] = { gsDPPipeSync(), gsDPSetCombineMode(G_CC_SHADEFADEA, G_CC_SHADEFADEA), - gsSPLight(&mario_blue_lights_group.l, 1), - gsSPLight(&mario_blue_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xffff), + gsSPLightColor(LIGHT_2, 0x7fff), gsSPDisplayList(mario_medium_poly_left_thigh_dl), gsSPEndDisplayList(), }; @@ -3672,8 +3640,8 @@ const Gfx mario_metal_medium_poly_left_thigh[] = { gsDPSetCombineMode(G_CC_DECALFADE, G_CC_DECALFADE), gsDPLoadTextureBlock(mario_texture_metal, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_WRAP | G_TX_NOMIRROR, 6, 5, G_TX_NOLOD, G_TX_NOLOD), gsSPTexture(0x0F80, 0x07C0, 0, G_TX_RENDERTILE, G_ON), - gsSPLight(&mario_white_lights_group.l, 1), - gsSPLight(&mario_white_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPDisplayList(mario_medium_poly_left_thigh_dl), gsSPEndDisplayList(), }; @@ -3767,8 +3735,8 @@ const Gfx mario_medium_poly_left_foot_shared_dl[] = { // 0x04015B60 - 0x04015B80 const Gfx mario_medium_poly_left_foot[] = { - gsSPLight(&mario_brown1_lights_group.l, 1), - gsSPLight(&mario_brown1_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0x721c0eff), + gsSPLightColor(LIGHT_2, 0x390e07ff), gsSPDisplayList(mario_medium_poly_left_foot_shared_dl), gsSPEndDisplayList(), }; @@ -3808,8 +3776,8 @@ const Gfx mario_medium_poly_right_thigh_shared_dl[] = { // 0x04015D00 - 0x04015D20 const Gfx mario_medium_poly_right_thigh[] = { - gsSPLight(&mario_blue_lights_group.l, 1), - gsSPLight(&mario_blue_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xffff), + gsSPLightColor(LIGHT_2, 0x7fff), gsSPDisplayList(mario_medium_poly_right_thigh_shared_dl), gsSPEndDisplayList(), }; @@ -3897,8 +3865,8 @@ const Gfx mario_medium_poly_right_foot_dl[] = { // 0x040160C8 - 0x04016108 const Gfx mario_medium_poly_right_foot[] = { - gsSPLight(&mario_brown1_lights_group.l, 1), - gsSPLight(&mario_brown1_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0x721c0eff), + gsSPLightColor(LIGHT_2, 0x390e07ff), gsSPDisplayList(mario_medium_poly_right_foot_dl), gsDPPipeSync(), gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), @@ -4081,8 +4049,8 @@ const Gfx mario_medium_poly_tshirt_shared_dl[] = { // 0x040168A0 - 0x040168C8 const Gfx mario_medium_poly_torso_dl[] = { gsSPDisplayList(mario_medium_poly_pants_overalls_shared_dl), - gsSPLight(&mario_red_lights_group.l, 1), - gsSPLight(&mario_red_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xff0000ff), + gsSPLightColor(LIGHT_2, 0x7f0000ff), gsSPDisplayList(mario_medium_poly_tshirt_shared_dl), gsSPEndDisplayList(), }; @@ -4149,8 +4117,8 @@ const Gfx mario_low_poly_butt_dl[] = { const Gfx mario_low_poly_butt[] = { gsDPPipeSync(), gsDPSetCombineMode(G_CC_SHADEFADEA, G_CC_SHADEFADEA), - gsSPLight(&mario_blue_lights_group.l, 1), - gsSPLight(&mario_blue_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xffff), + gsSPLightColor(LIGHT_2, 0x7fff), gsSPDisplayList(mario_low_poly_butt_dl), gsSPEndDisplayList(), }; @@ -4162,8 +4130,8 @@ const Gfx mario_metal_low_poly_butt[] = { gsDPSetCombineMode(G_CC_DECALFADE, G_CC_DECALFADE), gsDPLoadTextureBlock(mario_texture_metal, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_WRAP | G_TX_NOMIRROR, 6, 5, G_TX_NOLOD, G_TX_NOLOD), gsSPTexture(0x0F80, 0x07C0, 0, G_TX_RENDERTILE, G_ON), - gsSPLight(&mario_white_lights_group.l, 1), - gsSPLight(&mario_white_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPDisplayList(mario_low_poly_butt_dl), gsSPEndDisplayList(), }; @@ -4196,8 +4164,8 @@ const Gfx mario_low_poly_left_arm_shared_dl[] = { // 0x04016C70 - 0x04016C90 const Gfx mario_low_poly_left_arm[] = { - gsSPLight(&mario_red_lights_group.l, 1), - gsSPLight(&mario_red_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xff0000ff), + gsSPLightColor(LIGHT_2, 0x7f0000ff), gsSPDisplayList(mario_low_poly_left_arm_shared_dl), gsSPEndDisplayList(), }; @@ -4253,8 +4221,8 @@ const Gfx mario_low_poly_left_hand_closed_shared_dl[] = { // 0x04016E80 - 0x04016EA0 const Gfx mario_low_poly_left_hand_closed[] = { - gsSPLight(&mario_white_lights_group.l, 1), - gsSPLight(&mario_white_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPDisplayList(mario_low_poly_left_hand_closed_shared_dl), gsSPEndDisplayList(), }; @@ -4287,8 +4255,8 @@ const Gfx mario_low_poly_right_arm_shared_dl[] = { // 0x04016FB0 - 0x04016FD0 const Gfx mario_low_poly_right_arm[] = { - gsSPLight(&mario_red_lights_group.l, 1), - gsSPLight(&mario_red_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xff0000ff), + gsSPLightColor(LIGHT_2, 0x7f0000ff), gsSPDisplayList(mario_low_poly_right_arm_shared_dl), gsSPEndDisplayList(), }; @@ -4344,8 +4312,8 @@ const Gfx mario_low_poly_right_hand_closed_dl[] = { // 0x040171C0 - 0x040171E0 const Gfx mario_low_poly_right_hand_closed[] = { - gsSPLight(&mario_white_lights_group.l, 1), - gsSPLight(&mario_white_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPDisplayList(mario_low_poly_right_hand_closed_dl), gsSPEndDisplayList(), }; @@ -4394,8 +4362,8 @@ const Gfx mario_low_poly_left_thigh_dl[] = { const Gfx mario_low_poly_left_thigh[] = { gsDPPipeSync(), gsDPSetCombineMode(G_CC_SHADEFADEA, G_CC_SHADEFADEA), - gsSPLight(&mario_blue_lights_group.l, 1), - gsSPLight(&mario_blue_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xffff), + gsSPLightColor(LIGHT_2, 0x7fff), gsSPDisplayList(mario_low_poly_left_thigh_dl), gsSPEndDisplayList(), }; @@ -4407,8 +4375,8 @@ const Gfx mario_metal_low_poly_left_thigh[] = { gsDPSetCombineMode(G_CC_DECALFADE, G_CC_DECALFADE), gsDPLoadTextureBlock(mario_texture_metal, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_WRAP | G_TX_NOMIRROR, 6, 5, G_TX_NOLOD, G_TX_NOLOD), gsSPTexture(0x0F80, 0x07C0, 0, G_TX_RENDERTILE, G_ON), - gsSPLight(&mario_white_lights_group.l, 1), - gsSPLight(&mario_white_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPDisplayList(mario_low_poly_left_thigh_dl), gsSPEndDisplayList(), }; @@ -4475,8 +4443,8 @@ const Gfx mario_low_poly_left_foot_shared_dl[] = { // 0x040176A8 - 0x040176C8 const Gfx mario_low_poly_left_foot[] = { - gsSPLight(&mario_brown1_lights_group.l, 1), - gsSPLight(&mario_brown1_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0x721c0eff), + gsSPLightColor(LIGHT_2, 0x390e07ff), gsSPDisplayList(mario_low_poly_left_foot_shared_dl), gsSPEndDisplayList(), }; @@ -4513,8 +4481,8 @@ const Gfx mario_low_poly_right_thigh_shared_dl[] = { // 0x04017818 - 0x04017838 const Gfx mario_low_poly_right_thigh[] = { - gsSPLight(&mario_blue_lights_group.l, 1), - gsSPLight(&mario_blue_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xffff), + gsSPLightColor(LIGHT_2, 0x7fff), gsSPDisplayList(mario_low_poly_right_thigh_shared_dl), gsSPEndDisplayList(), }; @@ -4581,8 +4549,8 @@ const Gfx mario_low_poly_right_foot_dl[] = { // 0x04017AD8 - 0x04017B18 const Gfx mario_low_poly_right_foot[] = { - gsSPLight(&mario_brown1_lights_group.l, 1), - gsSPLight(&mario_brown1_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0x721c0eff), + gsSPLightColor(LIGHT_2, 0x390e07ff), gsSPDisplayList(mario_low_poly_right_foot_dl), gsDPPipeSync(), gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), @@ -4684,8 +4652,8 @@ const Gfx mario_low_poly_tshirt_shared_dl[] = { // 0x04017E78 - 0x04017EA0 const Gfx mario_low_poly_torso_dl[] = { gsSPDisplayList(mario_low_poly_pants_overalls_shared_dl), - gsSPLight(&mario_red_lights_group.l, 1), - gsSPLight(&mario_red_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xff0000ff), + gsSPLightColor(LIGHT_2, 0x7f0000ff), gsSPDisplayList(mario_low_poly_tshirt_shared_dl), gsSPEndDisplayList(), }; @@ -4854,11 +4822,11 @@ const Gfx mario_low_poly_face_back_hair_cap_on_dl[] = { // 0x04018420 - 0x04018460 const Gfx mario_low_poly_face_cap_on_dl[] = { gsSPDisplayList(mario_low_poly_face_part_cap_on_dl), - gsSPLight(&mario_red_lights_group.l, 1), - gsSPLight(&mario_red_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xff0000ff), + gsSPLightColor(LIGHT_2, 0x7f0000ff), gsSPDisplayList(mario_low_poly_face_cap_dl), - gsSPLight(&mario_brown2_lights_group.l, 1), - gsSPLight(&mario_brown2_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0x730600ff), + gsSPLightColor(LIGHT_2, 0x390300ff), gsSPDisplayList(mario_low_poly_face_back_hair_cap_on_dl), gsSPEndDisplayList(), }; @@ -4879,8 +4847,8 @@ const Gfx mario_low_poly_cap_on_eyes_front[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_front), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&mario_beige_lights_group.l, 1), - gsSPLight(&mario_beige_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xfec179ff), + gsSPLightColor(LIGHT_2, 0x7f603cff), gsSPDisplayList(mario_low_poly_eyes_cap_on_dl), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_mustache), gsDPLoadSync(), @@ -4909,8 +4877,8 @@ const Gfx mario_low_poly_cap_on_eyes_half_closed[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_half_closed), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&mario_beige_lights_group.l, 1), - gsSPLight(&mario_beige_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xfec179ff), + gsSPLightColor(LIGHT_2, 0x7f603cff), gsSPDisplayList(mario_low_poly_eyes_cap_on_dl), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_mustache), gsDPLoadSync(), @@ -4939,8 +4907,8 @@ const Gfx mario_low_poly_cap_on_eyes_closed[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_closed), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&mario_beige_lights_group.l, 1), - gsSPLight(&mario_beige_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xfec179ff), + gsSPLightColor(LIGHT_2, 0x7f603cff), gsSPDisplayList(mario_low_poly_eyes_cap_on_dl), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_mustache), gsDPLoadSync(), @@ -4969,8 +4937,8 @@ const Gfx mario_low_poly_cap_on_eyes_right[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_right), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&mario_beige_lights_group.l, 1), - gsSPLight(&mario_beige_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xfec179ff), + gsSPLightColor(LIGHT_2, 0x7f603cff), gsSPDisplayList(mario_low_poly_eyes_cap_on_dl), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_mustache), gsDPLoadSync(), @@ -4999,8 +4967,8 @@ const Gfx mario_low_poly_cap_on_eyes_left[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_left), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&mario_beige_lights_group.l, 1), - gsSPLight(&mario_beige_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xfec179ff), + gsSPLightColor(LIGHT_2, 0x7f603cff), gsSPDisplayList(mario_low_poly_eyes_cap_on_dl), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_mustache), gsDPLoadSync(), @@ -5029,8 +4997,8 @@ const Gfx mario_low_poly_cap_on_eyes_up[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_up), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&mario_beige_lights_group.l, 1), - gsSPLight(&mario_beige_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xfec179ff), + gsSPLightColor(LIGHT_2, 0x7f603cff), gsSPDisplayList(mario_low_poly_eyes_cap_on_dl), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_mustache), gsDPLoadSync(), @@ -5059,8 +5027,8 @@ const Gfx mario_low_poly_cap_on_eyes_down[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_down), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&mario_beige_lights_group.l, 1), - gsSPLight(&mario_beige_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xfec179ff), + gsSPLightColor(LIGHT_2, 0x7f603cff), gsSPDisplayList(mario_low_poly_eyes_cap_on_dl), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_mustache), gsDPLoadSync(), @@ -5089,8 +5057,8 @@ const Gfx mario_low_poly_cap_on_eyes_dead[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_dead), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&mario_beige_lights_group.l, 1), - gsSPLight(&mario_beige_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xfec179ff), + gsSPLightColor(LIGHT_2, 0x7f603cff), gsSPDisplayList(mario_low_poly_eyes_cap_on_dl), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_mustache), gsDPLoadSync(), @@ -5223,8 +5191,8 @@ const Gfx mario_low_poly_face_hair_cap_off_dl[] = { // 0x04018F68 - 0x04018F90 const Gfx mario_low_poly_face_cap_off_dl[] = { gsSPDisplayList(mario_low_poly_face_part_cap_off_dl), - gsSPLight(&mario_brown2_lights_group.l, 1), - gsSPLight(&mario_brown2_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0x730600ff), + gsSPLightColor(LIGHT_2, 0x390300ff), gsSPDisplayList(mario_low_poly_face_hair_cap_off_dl), gsSPEndDisplayList(), }; @@ -5241,8 +5209,8 @@ const Gfx mario_low_poly_cap_off_eyes_front[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_front), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&mario_beige_lights_group.l, 1), - gsSPLight(&mario_beige_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xfec179ff), + gsSPLightColor(LIGHT_2, 0x7f603cff), gsSPDisplayList(mario_low_poly_mario_eyes_cap_off_dl), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_mustache), gsDPLoadSync(), @@ -5267,8 +5235,8 @@ const Gfx mario_low_poly_cap_off_eyes_half_closed[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_half_closed), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&mario_beige_lights_group.l, 1), - gsSPLight(&mario_beige_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xfec179ff), + gsSPLightColor(LIGHT_2, 0x7f603cff), gsSPDisplayList(mario_low_poly_mario_eyes_cap_off_dl), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_mustache), gsDPLoadSync(), @@ -5293,8 +5261,8 @@ const Gfx mario_low_poly_cap_off_eyes_closed[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_closed), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&mario_beige_lights_group.l, 1), - gsSPLight(&mario_beige_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xfec179ff), + gsSPLightColor(LIGHT_2, 0x7f603cff), gsSPDisplayList(mario_low_poly_mario_eyes_cap_off_dl), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_mustache), gsDPLoadSync(), @@ -5319,8 +5287,8 @@ const Gfx mario_low_poly_cap_off_eyes_right[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_right), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&mario_beige_lights_group.l, 1), - gsSPLight(&mario_beige_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xfec179ff), + gsSPLightColor(LIGHT_2, 0x7f603cff), gsSPDisplayList(mario_low_poly_mario_eyes_cap_off_dl), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_mustache), gsDPLoadSync(), @@ -5345,8 +5313,8 @@ const Gfx mario_low_poly_cap_off_eyes_left[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_left), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&mario_beige_lights_group.l, 1), - gsSPLight(&mario_beige_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xfec179ff), + gsSPLightColor(LIGHT_2, 0x7f603cff), gsSPDisplayList(mario_low_poly_mario_eyes_cap_off_dl), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_mustache), gsDPLoadSync(), @@ -5371,8 +5339,8 @@ const Gfx mario_low_poly_cap_off_eyes_up[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_up), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&mario_beige_lights_group.l, 1), - gsSPLight(&mario_beige_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xfec179ff), + gsSPLightColor(LIGHT_2, 0x7f603cff), gsSPDisplayList(mario_low_poly_mario_eyes_cap_off_dl), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_mustache), gsDPLoadSync(), @@ -5397,8 +5365,8 @@ const Gfx mario_low_poly_cap_off_eyes_down[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_down), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&mario_beige_lights_group.l, 1), - gsSPLight(&mario_beige_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xfec179ff), + gsSPLightColor(LIGHT_2, 0x7f603cff), gsSPDisplayList(mario_low_poly_mario_eyes_cap_off_dl), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_mustache), gsDPLoadSync(), @@ -5423,8 +5391,8 @@ const Gfx mario_low_poly_cap_off_eyes_dead[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_eyes_dead), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&mario_beige_lights_group.l, 1), - gsSPLight(&mario_beige_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xfec179ff), + gsSPLightColor(LIGHT_2, 0x7f603cff), gsSPDisplayList(mario_low_poly_mario_eyes_cap_off_dl), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_mustache), gsDPLoadSync(), @@ -5599,8 +5567,8 @@ const Gfx mario_left_hand_open_shared_dl[] = { // 0x04019CA0 - 0x04019CC0 const Gfx mario_left_hand_open[] = { - gsSPLight(&mario_white_lights_group.l, 1), - gsSPLight(&mario_white_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPDisplayList(mario_left_hand_open_shared_dl), gsSPEndDisplayList(), }; @@ -5758,8 +5726,8 @@ const Gfx mario_right_hand_open_dl[] = { // 0x0401A428 - 0x0401A448 const Gfx mario_right_hand_open[] = { - gsSPLight(&mario_white_lights_group.l, 1), - gsSPLight(&mario_white_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPDisplayList(mario_right_hand_open_dl), gsSPEndDisplayList(), }; @@ -6008,11 +5976,11 @@ const Gfx mario_right_hand_cap_bottom_dl[] = { // 0x0401AF20 - 0x0401AF60 const Gfx mario_right_hand_cap_dl[] = { gsSPDisplayList(mario_right_hand_cap_top_dl), - gsSPLight(&mario_white_lights_group.l, 1), - gsSPLight(&mario_white_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPDisplayList(mario_right_hand_cap_hand_position_dl), - gsSPLight(&mario_brown2_lights_group.l, 1), - gsSPLight(&mario_brown2_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0x730600ff), + gsSPLightColor(LIGHT_2, 0x390300ff), gsSPDisplayList(mario_right_hand_cap_bottom_dl), gsSPEndDisplayList(), }; @@ -6066,8 +6034,8 @@ const Gfx mario_right_hand_cap_wings_initial_dl[] = { gsSPClearGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD), gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), - gsSPLight(&mario_white_lights_group.l, 1), - gsSPLight(&mario_white_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsDPTileSync(), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 6, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD), gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (64 - 1) << G_TEXTURE_IMAGE_FRAC), @@ -6401,8 +6369,8 @@ const Gfx mario_right_hand_peace_shared_dl[] = { // 0x0401BF30 - 0x0401BF50 const Gfx mario_right_hand_peace[] = { - gsSPLight(&mario_white_lights_group.l, 1), - gsSPLight(&mario_white_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPDisplayList(mario_right_hand_peace_shared_dl), gsSPEndDisplayList(), }; @@ -6539,8 +6507,8 @@ const Gfx mario_cap_unused_base_bottom_dl[] = { // 0x0401C510 - 0x0401C538 const Gfx mario_cap_unused_base_dl[] = { gsSPDisplayList(mario_cap_unused_base_top_dl), - gsSPLight(&mario_brown2_lights_group.l, 1), - gsSPLight(&mario_brown2_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0x730600ff), + gsSPLightColor(LIGHT_2, 0x390300ff), gsSPDisplayList(mario_cap_unused_base_bottom_dl), gsSPEndDisplayList(), }; @@ -6599,8 +6567,8 @@ const Gfx mario_cap_wings_unused_initial_dl[] = { gsDPTileSync(), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 6, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD), gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (64 - 1) << G_TEXTURE_IMAGE_FRAC), - gsSPLight(&mario_white_lights_group.l, 1), - gsSPLight(&mario_white_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPEndDisplayList(), }; @@ -6625,8 +6593,8 @@ const Gfx mario_cap_unused_dl[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_m_logo), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&mario_red_lights_group.l, 1), - gsSPLight(&mario_red_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xff0000ff), + gsSPLightColor(LIGHT_2, 0x7f0000ff), gsSPDisplayList(mario_cap_unused_m_logo_dl), gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), gsDPPipeSync(), @@ -6642,8 +6610,8 @@ const Gfx mario_metal_cap_unused_dl[] = { gsDPSetCombineMode(G_CC_MODULATERGB, G_CC_MODULATERGB), gsDPLoadTextureBlock(mario_texture_metal, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_WRAP | G_TX_NOMIRROR, 6, 5, G_TX_NOLOD, G_TX_NOLOD), gsSPTexture(0x0F80, 0x07C0, 0, G_TX_RENDERTILE, G_ON), - gsSPLight(&mario_white_lights_group.l, 1), - gsSPLight(&mario_white_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPDisplayList(mario_cap_unused_m_logo_dl), gsSPDisplayList(mario_cap_unused_base_top_dl), gsSPDisplayList(mario_cap_unused_base_bottom_dl), @@ -6724,8 +6692,8 @@ const Gfx mario_cap_wings[] = { gsDPTileSync(), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 6, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD), gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (64 - 1) << G_TEXTURE_IMAGE_FRAC), - gsSPLight(&mario_white_lights_group.l, 1), - gsSPLight(&mario_white_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_wings_half_1), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), @@ -6751,8 +6719,8 @@ const Gfx mario_cap_wings_transparent[] = { gsDPTileSync(), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 6, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD), gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (64 - 1) << G_TEXTURE_IMAGE_FRAC), - gsSPLight(&mario_white_lights_group.l, 1), - gsSPLight(&mario_white_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_wings_half_1), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), @@ -6778,8 +6746,8 @@ const Gfx mario_metal_cap_wings[] = { gsDPTileSync(), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 6, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD), gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (64 - 1) << G_TEXTURE_IMAGE_FRAC), - gsSPLight(&mario_white_lights_group.l, 1), - gsSPLight(&mario_white_lights_group.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_texture_metal_wings_half_1), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), diff --git a/actors/mario_cap/model.inc.c b/actors/mario_cap/model.inc.c index f4d05126..b6e9b2f9 100644 --- a/actors/mario_cap/model.inc.c +++ b/actors/mario_cap/model.inc.c @@ -1,22 +1,10 @@ // Mario Cap (Normal Cap, Metal, Winged, etc) // 0x0301CF08 -static const Lights1 mario_cap_seg3_lights_0301CF08 = gdSPDefLights1( - 0x39, 0x03, 0x00, - 0x73, 0x06, 0x00, 0x28, 0x28, 0x28 -); // 0x0301CF20 -static const Lights1 mario_cap_seg3_lights_0301CF20 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0301CF38 -static const Lights1 mario_cap_seg3_lights_0301CF38 = gdSPDefLights1( - 0x7f, 0x00, 0x00, - 0xff, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x0301CF50 ALIGNED8 static const Texture mario_cap_seg3_texture_0301CF50[] = { @@ -180,8 +168,8 @@ const Gfx mario_cap_seg3_dl_03022CC8[] = { // 0x03022D10 - 0x03022D38 const Gfx mario_cap_seg3_dl_03022D10[] = { gsSPDisplayList(mario_cap_seg3_dl_03022B68), - gsSPLight(&mario_cap_seg3_lights_0301CF08.l, 1), - gsSPLight(&mario_cap_seg3_lights_0301CF08.a, 2), + gsSPLightColor(LIGHT_1, 0x730600ff), + gsSPLightColor(LIGHT_2, 0x390300ff), gsSPDisplayList(mario_cap_seg3_dl_03022CC8), gsSPEndDisplayList(), }; @@ -264,8 +252,8 @@ const Gfx mario_cap_seg3_dl_03022F48[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_cap_seg3_texture_0301DF50), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&mario_cap_seg3_lights_0301CF38.l, 1), - gsSPLight(&mario_cap_seg3_lights_0301CF38.a, 2), + gsSPLightColor(LIGHT_1, 0xff0000ff), + gsSPLightColor(LIGHT_2, 0x7f0000ff), gsSPDisplayList(mario_cap_seg3_dl_03022B30), gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), gsDPPipeSync(), @@ -285,8 +273,8 @@ const Gfx mario_cap_seg3_dl_03022FF8[] = { gsDPSetCombineMode(G_CC_MODULATERGBFADE, G_CC_MODULATERGBFADE), gsDPLoadTextureBlock(mario_cap_seg3_texture_0301CF50, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_WRAP | G_TX_NOMIRROR, 6, 5, G_TX_NOLOD, G_TX_NOLOD), gsSPTexture(0x0F80, 0x07C0, 0, G_TX_RENDERTILE, G_ON), - gsSPLight(&mario_cap_seg3_lights_0301CF20.l, 1), - gsSPLight(&mario_cap_seg3_lights_0301CF20.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPDisplayList(mario_cap_seg3_dl_03022B30), gsSPDisplayList(mario_cap_seg3_dl_03022B68), gsSPDisplayList(mario_cap_seg3_dl_03022CC8), @@ -341,8 +329,8 @@ const Gfx mario_cap_seg3_dl_03023160[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mario_cap_seg3_texture_0301DF50), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&mario_cap_seg3_lights_0301CF38.l, 1), - gsSPLight(&mario_cap_seg3_lights_0301CF38.a, 2), + gsSPLightColor(LIGHT_1, 0xff0000ff), + gsSPLightColor(LIGHT_2, 0x7f0000ff), gsSPDisplayList(mario_cap_seg3_dl_03022B30), gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), gsDPPipeSync(), @@ -385,8 +373,8 @@ const Gfx mario_cap_seg3_dl_03023298[] = { gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0, G_TX_RENDERTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, 5, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, 6, G_TX_NOLOD), gsDPSetTileSize(0, 0, 0, (64 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC), gsSPTexture(0x0F80, 0x07C0, 0, G_TX_RENDERTILE, G_ON), - gsSPLight(&mario_cap_seg3_lights_0301CF20.l, 1), - gsSPLight(&mario_cap_seg3_lights_0301CF20.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPDisplayList(mario_cap_seg3_dl_03022B30), gsSPDisplayList(mario_cap_seg3_dl_03022B68), gsSPDisplayList(mario_cap_seg3_dl_03022CC8), diff --git a/actors/metal_box/model.inc.c b/actors/metal_box/model.inc.c index a19761a4..16338671 100644 --- a/actors/metal_box/model.inc.c +++ b/actors/metal_box/model.inc.c @@ -1,10 +1,6 @@ // Metal Box // 0x08023980 -static const Lights1 metal_box_seg8_lights_08023980 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x08023998 ALIGNED8 static const Texture metal_box_seg8_texture_08023998[] = { @@ -48,8 +44,8 @@ const Gfx metal_box_seg8_dl_08024B18[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, metal_box_seg8_texture_08023998), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&metal_box_seg8_lights_08023980.l, 1), - gsSPLight(&metal_box_seg8_lights_08023980.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(metal_box_seg8_vertex_08024998, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), diff --git a/actors/mips/model.inc.c b/actors/mips/model.inc.c index 3be4c12e..e81cf56a 100644 --- a/actors/mips/model.inc.c +++ b/actors/mips/model.inc.c @@ -6,16 +6,8 @@ ALIGNED8 static const Texture mips_seg6_texture_0600FB80[] = { }; // 0x06010380 -static const Lights1 mips_seg6_lights_06010380 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x06010398 -static const Lights1 mips_seg6_lights_06010398 = gdSPDefLights1( - 0x0f, 0x0d, 0x04, - 0x27, 0x21, 0x0b, 0x28, 0x28, 0x28 -); // 0x060103B0 static const Vtx mips_seg6_vertex_060103B0[] = { @@ -75,8 +67,8 @@ const Gfx mips_seg6_dl_06010600[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mips_seg6_texture_0600FB80), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&mips_seg6_lights_06010380.l, 1), - gsSPLight(&mips_seg6_lights_06010380.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(mips_seg6_vertex_060103B0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0), gsSP2Triangles( 2, 1, 4, 0x0, 2, 5, 3, 0x0), @@ -101,13 +93,13 @@ const Gfx mips_seg6_dl_06010600[] = { // 0x06010748 - 0x060107B8 const Gfx mips_seg6_dl_06010748[] = { - gsSPLight(&mips_seg6_lights_06010398.l, 1), - gsSPLight(&mips_seg6_lights_06010398.a, 2), + gsSPLightColor(LIGHT_1, 0x27210bff), + gsSPLightColor(LIGHT_2, 0xf0d04ff), gsSPVertex(mips_seg6_vertex_06010580, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0), gsSP1Triangle( 3, 2, 1, 0x0), - gsSPLight(&mips_seg6_lights_06010380.l, 1), - gsSPLight(&mips_seg6_lights_06010380.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(mips_seg6_vertex_060105C0, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 3, 2, 0, 0x0, 2, 1, 0, 0x0), @@ -133,10 +125,6 @@ const Gfx mips_seg6_dl_060107B8[] = { }; // 0x06010820 -static const Lights1 mips_seg6_lights_06010820 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x06010838 static const Vtx mips_seg6_vertex_06010838[] = { @@ -193,8 +181,8 @@ const Gfx mips_seg6_dl_06010A98[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mips_seg6_texture_0600FB80), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&mips_seg6_lights_06010820.l, 1), - gsSPLight(&mips_seg6_lights_06010820.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(mips_seg6_vertex_06010838, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 4, 0x0), gsSP2Triangles( 0, 5, 1, 0x0, 1, 6, 3, 0x0), @@ -241,16 +229,8 @@ const Gfx mips_seg6_dl_06010C40[] = { }; // 0x06010CA0 -static const Lights1 mips_seg6_lights_06010CA0 = gdSPDefLights1( - 0x3c, 0x3c, 0x00, - 0x96, 0x96, 0x00, 0x28, 0x28, 0x28 -); // 0x06010CB8 -static const Lights1 mips_seg6_lights_06010CB8 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x06010CD0 static const Vtx mips_seg6_vertex_06010CD0[] = { @@ -279,13 +259,13 @@ const Gfx mips_seg6_dl_06010DB0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mips_seg6_texture_0600FB80), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&mips_seg6_lights_06010CA0.l, 1), - gsSPLight(&mips_seg6_lights_06010CA0.a, 2), + gsSPLightColor(LIGHT_1, 0x969600ff), + gsSPLightColor(LIGHT_2, 0x3c3c00ff), gsSPVertex(mips_seg6_vertex_06010CD0, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), gsSP2Triangles( 0, 4, 1, 0x0, 4, 0, 5, 0x0), - gsSPLight(&mips_seg6_lights_06010CB8.l, 1), - gsSPLight(&mips_seg6_lights_06010CB8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(mips_seg6_vertex_06010D30, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 0, 3, 0x0), gsSP2Triangles( 0, 2, 4, 0x0, 5, 6, 0, 0x0), @@ -311,22 +291,10 @@ const Gfx mips_seg6_dl_06010E60[] = { }; // 0x06010EC0 -static const Lights1 mips_seg6_lights_06010EC0 = gdSPDefLights1( - 0x3c, 0x3c, 0x00, - 0x96, 0x96, 0x00, 0x28, 0x28, 0x28 -); // 0x06010ED8 -static const Lights1 mips_seg6_lights_06010ED8 = gdSPDefLights1( - 0x35, 0x38, 0x00, - 0x85, 0x8e, 0x00, 0x28, 0x28, 0x28 -); // 0x06010EF0 -static const Lights1 mips_seg6_lights_06010EF0 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x06010F08 static const Vtx mips_seg6_vertex_06010F08[] = { @@ -360,17 +328,17 @@ const Gfx mips_seg6_dl_06010FF8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mips_seg6_texture_0600FB80), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&mips_seg6_lights_06010EC0.l, 1), - gsSPLight(&mips_seg6_lights_06010EC0.a, 2), + gsSPLightColor(LIGHT_1, 0x969600ff), + gsSPLightColor(LIGHT_2, 0x3c3c00ff), gsSPVertex(mips_seg6_vertex_06010F08, 5, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP1Triangle( 3, 2, 4, 0x0), - gsSPLight(&mips_seg6_lights_06010ED8.l, 1), - gsSPLight(&mips_seg6_lights_06010ED8.a, 2), + gsSPLightColor(LIGHT_1, 0x858e00ff), + gsSPLightColor(LIGHT_2, 0x353800ff), gsSPVertex(mips_seg6_vertex_06010F58, 3, 0), gsSP1Triangle( 0, 1, 2, 0x0), - gsSPLight(&mips_seg6_lights_06010EF0.l, 1), - gsSPLight(&mips_seg6_lights_06010EF0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(mips_seg6_vertex_06010F88, 7, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 3, 2, 4, 0x0, 2, 1, 4, 0x0), @@ -395,16 +363,8 @@ const Gfx mips_seg6_dl_060110B0[] = { }; // 0x06011110 -static const Lights1 mips_seg6_lights_06011110 = gdSPDefLights1( - 0x3c, 0x3c, 0x00, - 0x96, 0x96, 0x00, 0x28, 0x28, 0x28 -); // 0x06011128 -static const Lights1 mips_seg6_lights_06011128 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x06011140 static const Vtx mips_seg6_vertex_06011140[] = { @@ -435,13 +395,13 @@ const Gfx mips_seg6_dl_06011240[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mips_seg6_texture_0600FB80), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&mips_seg6_lights_06011110.l, 1), - gsSPLight(&mips_seg6_lights_06011110.a, 2), + gsSPLightColor(LIGHT_1, 0x969600ff), + gsSPLightColor(LIGHT_2, 0x3c3c00ff), gsSPVertex(mips_seg6_vertex_06011140, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0), gsSP2Triangles( 2, 4, 3, 0x0, 3, 4, 5, 0x0), - gsSPLight(&mips_seg6_lights_06011128.l, 1), - gsSPLight(&mips_seg6_lights_06011128.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(mips_seg6_vertex_060111A0, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 0, 0x0), gsSP2Triangles( 0, 4, 3, 0x0, 5, 6, 1, 0x0), @@ -469,16 +429,8 @@ const Gfx mips_seg6_dl_06011310[] = { }; // 0x06011370 -static const Lights1 mips_seg6_lights_06011370 = gdSPDefLights1( - 0x3c, 0x3c, 0x00, - 0x96, 0x96, 0x00, 0x28, 0x28, 0x28 -); // 0x06011388 -static const Lights1 mips_seg6_lights_06011388 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x060113A0 static const Vtx mips_seg6_vertex_060113A0[] = { @@ -506,13 +458,13 @@ const Gfx mips_seg6_dl_06011470[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mips_seg6_texture_0600FB80), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&mips_seg6_lights_06011370.l, 1), - gsSPLight(&mips_seg6_lights_06011370.a, 2), + gsSPLightColor(LIGHT_1, 0x969600ff), + gsSPLightColor(LIGHT_2, 0x3c3c00ff), gsSPVertex(mips_seg6_vertex_060113A0, 5, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 0, 3, 0x0), gsSP1Triangle( 3, 4, 1, 0x0), - gsSPLight(&mips_seg6_lights_06011388.l, 1), - gsSPLight(&mips_seg6_lights_06011388.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(mips_seg6_vertex_060113F0, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 4, 0x0), gsSP2Triangles( 3, 2, 1, 0x0, 3, 5, 6, 0x0), @@ -539,16 +491,8 @@ const Gfx mips_seg6_dl_06011520[] = { }; // 0x06011580 -static const Lights1 mips_seg6_lights_06011580 = gdSPDefLights1( - 0x3c, 0x3c, 0x00, - 0x96, 0x96, 0x00, 0x28, 0x28, 0x28 -); // 0x06011598 -static const Lights1 mips_seg6_lights_06011598 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x060115B0 static const Vtx mips_seg6_vertex_060115B0[] = { @@ -579,13 +523,13 @@ const Gfx mips_seg6_dl_060116B0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mips_seg6_texture_0600FB80), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&mips_seg6_lights_06011580.l, 1), - gsSPLight(&mips_seg6_lights_06011580.a, 2), + gsSPLightColor(LIGHT_1, 0x969600ff), + gsSPLightColor(LIGHT_2, 0x3c3c00ff), gsSPVertex(mips_seg6_vertex_060115B0, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), gsSP2Triangles( 4, 3, 1, 0x0, 2, 5, 0, 0x0), - gsSPLight(&mips_seg6_lights_06011598.l, 1), - gsSPLight(&mips_seg6_lights_06011598.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(mips_seg6_vertex_06011610, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 4, 0x0), gsSP2Triangles( 2, 3, 0, 0x0, 3, 2, 5, 0x0), @@ -613,16 +557,8 @@ const Gfx mips_seg6_dl_06011780[] = { }; // 0x060117E0 -static const Lights1 mips_seg6_lights_060117E0 = gdSPDefLights1( - 0x3c, 0x3c, 0x00, - 0x96, 0x96, 0x00, 0x28, 0x28, 0x28 -); // 0x060117F8 -static const Lights1 mips_seg6_lights_060117F8 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x06011810 static const Vtx mips_seg6_vertex_06011810[] = { @@ -650,13 +586,13 @@ const Gfx mips_seg6_dl_060118E0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mips_seg6_texture_0600FB80), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&mips_seg6_lights_060117E0.l, 1), - gsSPLight(&mips_seg6_lights_060117E0.a, 2), + gsSPLightColor(LIGHT_1, 0x969600ff), + gsSPLightColor(LIGHT_2, 0x3c3c00ff), gsSPVertex(mips_seg6_vertex_06011810, 5, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 2, 1, 0x0), gsSP1Triangle( 1, 4, 3, 0x0), - gsSPLight(&mips_seg6_lights_060117F8.l, 1), - gsSPLight(&mips_seg6_lights_060117F8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(mips_seg6_vertex_06011860, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 5, 6, 3, 0x0, 6, 7, 3, 0x0), @@ -683,16 +619,8 @@ const Gfx mips_seg6_dl_06011990[] = { }; // 0x060119F0 -static const Lights1 mips_seg6_lights_060119F0 = gdSPDefLights1( - 0x3c, 0x3c, 0x00, - 0x96, 0x96, 0x00, 0x28, 0x28, 0x28 -); // 0x06011A08 -static const Lights1 mips_seg6_lights_06011A08 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x06011A20 static const Vtx mips_seg6_vertex_06011A20[] = { @@ -721,13 +649,13 @@ const Gfx mips_seg6_dl_06011B00[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mips_seg6_texture_0600FB80), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&mips_seg6_lights_060119F0.l, 1), - gsSPLight(&mips_seg6_lights_060119F0.a, 2), + gsSPLightColor(LIGHT_1, 0x969600ff), + gsSPLightColor(LIGHT_2, 0x3c3c00ff), gsSPVertex(mips_seg6_vertex_06011A20, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 1, 4, 2, 0x0, 5, 2, 4, 0x0), - gsSPLight(&mips_seg6_lights_06011A08.l, 1), - gsSPLight(&mips_seg6_lights_06011A08.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(mips_seg6_vertex_06011A80, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 1, 0x0, 1, 3, 6, 0x0), @@ -753,16 +681,8 @@ const Gfx mips_seg6_dl_06011BB0[] = { }; // 0x06011C10 -static const Lights1 mips_seg6_lights_06011C10 = gdSPDefLights1( - 0x3c, 0x3c, 0x00, - 0x96, 0x96, 0x00, 0x28, 0x28, 0x28 -); // 0x06011C28 -static const Lights1 mips_seg6_lights_06011C28 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x06011C40 static const Vtx mips_seg6_vertex_06011C40[] = { @@ -790,13 +710,13 @@ const Gfx mips_seg6_dl_06011D10[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mips_seg6_texture_0600FB80), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&mips_seg6_lights_06011C10.l, 1), - gsSPLight(&mips_seg6_lights_06011C10.a, 2), + gsSPLightColor(LIGHT_1, 0x969600ff), + gsSPLightColor(LIGHT_2, 0x3c3c00ff), gsSPVertex(mips_seg6_vertex_06011C40, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 1, 3, 0x0), gsSP2Triangles( 1, 4, 3, 0x0, 3, 4, 5, 0x0), - gsSPLight(&mips_seg6_lights_06011C28.l, 1), - gsSPLight(&mips_seg6_lights_06011C28.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(mips_seg6_vertex_06011CA0, 7, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 3, 4, 5, 0x0, 1, 3, 5, 0x0), @@ -821,10 +741,6 @@ const Gfx mips_seg6_dl_06011DB0[] = { }; // 0x06011E10 -static const Lights1 mips_seg6_lights_06011E10 = gdSPDefLights1( - 0x34, 0x2c, 0x0f, - 0x82, 0x6e, 0x26, 0x28, 0x28, 0x28 -); // 0x06011E28 static const Vtx mips_seg6_vertex_06011E28[] = { @@ -838,8 +754,8 @@ static const Vtx mips_seg6_vertex_06011E28[] = { // 0x06011E88 - 0x06011ED8 const Gfx mips_seg6_dl_06011E88[] = { - gsSPLight(&mips_seg6_lights_06011E10.l, 1), - gsSPLight(&mips_seg6_lights_06011E10.a, 2), + gsSPLightColor(LIGHT_1, 0x826e26ff), + gsSPLightColor(LIGHT_2, 0x342c0fff), gsSPVertex(mips_seg6_vertex_06011E28, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), gsSP2Triangles( 4, 0, 2, 0x0, 2, 5, 4, 0x0), @@ -856,10 +772,6 @@ const Gfx mips_seg6_dl_06011ED8[] = { }; // 0x06011EF8 -static const Lights1 mips_seg6_lights_06011EF8 = gdSPDefLights1( - 0x34, 0x2c, 0x0f, - 0x82, 0x6e, 0x26, 0x28, 0x28, 0x28 -); // 0x06011F10 static const Vtx mips_seg6_vertex_06011F10[] = { @@ -873,8 +785,8 @@ static const Vtx mips_seg6_vertex_06011F10[] = { // 0x06011F70 - 0x06011FC0 const Gfx mips_seg6_dl_06011F70[] = { - gsSPLight(&mips_seg6_lights_06011EF8.l, 1), - gsSPLight(&mips_seg6_lights_06011EF8.a, 2), + gsSPLightColor(LIGHT_1, 0x826e26ff), + gsSPLightColor(LIGHT_2, 0x342c0fff), gsSPVertex(mips_seg6_vertex_06011F10, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 2, 0x0, 2, 1, 4, 0x0), diff --git a/actors/moneybag/model.inc.c b/actors/moneybag/model.inc.c index fa3505bc..9f0a5314 100644 --- a/actors/moneybag/model.inc.c +++ b/actors/moneybag/model.inc.c @@ -11,16 +11,8 @@ ALIGNED8 static const Texture moneybag_seg6_texture_060049B0[] = { }; // 0x060051B0 -static const Lights1 moneybag_seg6_lights_060051B0 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x060051C8 -static const Lights1 moneybag_seg6_lights_060051C8 = gdSPDefLights1( - 0x00, 0x3f, 0x23, - 0x00, 0x7f, 0x47, 0x28, 0x28, 0x28 -); // 0x060051E0 static const Vtx moneybag_seg6_vertex_060051E0[] = { @@ -53,8 +45,8 @@ const Gfx moneybag_seg6_dl_06005300[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, moneybag_seg6_texture_060039B0), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPLight(&moneybag_seg6_lights_060051B0.l, 1), - gsSPLight(&moneybag_seg6_lights_060051B0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(moneybag_seg6_vertex_060051E0, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 0, 0x0, 8, 4, 9, 0x0), @@ -63,8 +55,8 @@ const Gfx moneybag_seg6_dl_06005300[] = { // 0x06005358 - 0x060053B8 const Gfx moneybag_seg6_dl_06005358[] = { - gsSPLight(&moneybag_seg6_lights_060051C8.l, 1), - gsSPLight(&moneybag_seg6_lights_060051C8.a, 2), + gsSPLightColor(LIGHT_1, 0x7f47ff), + gsSPLightColor(LIGHT_2, 0x3f23ff), gsSPVertex(moneybag_seg6_vertex_06005280, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 0, 3, 0x0), gsSP2Triangles( 3, 0, 4, 0x0, 3, 5, 1, 0x0), @@ -92,10 +84,6 @@ const Gfx moneybag_seg6_dl_060053B8[] = { }; // 0x06005428 -static const Lights1 moneybag_seg6_lights_06005428 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x06005440 static const Vtx moneybag_seg6_vertex_06005440[] = { @@ -131,8 +119,8 @@ const Gfx moneybag_seg6_dl_06005590[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, moneybag_seg6_texture_060039B0), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPLight(&moneybag_seg6_lights_06005428.l, 1), - gsSPLight(&moneybag_seg6_lights_06005428.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(moneybag_seg6_vertex_06005440, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 7, 0x0), @@ -209,28 +197,12 @@ const Gfx moneybag_seg6_dl_06005750[] = { }; // Unreferenced light group -UNUSED static const Lights1 moneybag_lights_unused1 = gdSPDefLights1( - 0x0c, 0x20, 0x06, - 0x30, 0x83, 0x1a, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 moneybag_lights_unused2 = gdSPDefLights1( - 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x060057F0 -static const Lights1 moneybag_seg6_lights_060057F0 = gdSPDefLights1( - 0x3f, 0x3f, 0x00, - 0xff, 0xff, 0x00, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 moneybag_lights_unused3 = gdSPDefLights1( - 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x06005820 static const Vtx moneybag_seg6_vertex_06005820[] = { @@ -265,8 +237,8 @@ static const Vtx moneybag_seg6_vertex_060058D0[] = { // 0x06005980 - 0x060059F0 const Gfx moneybag_seg6_dl_06005980[] = { gsDPSetCombineMode(G_CC_SHADEFADEA, G_CC_SHADEFADEA), - gsSPLight(&moneybag_seg6_lights_060057F0.l, 1), - gsSPLight(&moneybag_seg6_lights_060057F0.a, 2), + gsSPLightColor(LIGHT_1, 0xffff00ff), + gsSPLightColor(LIGHT_2, 0x3f3f00ff), gsSPVertex(moneybag_seg6_vertex_06005820, 11, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 4, 0x0), gsSP2Triangles( 5, 6, 7, 0x0, 5, 7, 8, 0x0), @@ -279,8 +251,8 @@ const Gfx moneybag_seg6_dl_06005980[] = { // 0x060059F0 - 0x06005A60 const Gfx moneybag_seg6_dl_060059F0[] = { gsDPSetCombineMode(G_CC_SHADEFADEA, G_CC_SHADEFADEA), - gsSPLight(&moneybag_seg6_lights_060057F0.l, 1), - gsSPLight(&moneybag_seg6_lights_060057F0.a, 2), + gsSPLightColor(LIGHT_1, 0xffff00ff), + gsSPLightColor(LIGHT_2, 0x3f3f00ff), gsSPVertex(moneybag_seg6_vertex_060058D0, 11, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 2, 0x0), gsSP2Triangles( 5, 6, 7, 0x0, 8, 5, 7, 0x0), diff --git a/actors/monty_mole/model.inc.c b/actors/monty_mole/model.inc.c index c9f0c129..c9b020ce 100644 --- a/actors/monty_mole/model.inc.c +++ b/actors/monty_mole/model.inc.c @@ -1,40 +1,16 @@ // Monty Mole // Unreferenced light group -UNUSED static const Lights1 monty_mole_lights_unused1 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 monty_mole_lights_unused2 = gdSPDefLights1( - 0x30, 0x1f, 0x00, - 0xc3, 0x7e, 0x00, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 monty_mole_lights_unused3 = gdSPDefLights1( - 0x05, 0x04, 0x05, - 0x16, 0x13, 0x14, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 monty_mole_lights_unused4 = gdSPDefLights1( - 0x07, 0x08, 0x07, - 0x1f, 0x20, 0x1f, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 monty_mole_lights_unused5 = gdSPDefLights1( - 0x14, 0x0b, 0x0a, - 0x53, 0x2e, 0x28, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 monty_mole_lights_unused6 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05000970 ALIGNED8 static const Texture monty_mole_seg5_texture_05000970[] = { @@ -62,10 +38,6 @@ ALIGNED8 static const Texture monty_mole_seg5_texture_05002970[] = { }; // 0x05003170 -static const Lights1 monty_mole_seg5_lights_05003170 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05003188 static const Vtx monty_mole_seg5_vertex_05003188[] = { @@ -84,8 +56,8 @@ const Gfx monty_mole_seg5_dl_05003208[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, monty_mole_seg5_texture_05001170), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&monty_mole_seg5_lights_05003170.l, 1), - gsSPLight(&monty_mole_seg5_lights_05003170.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(monty_mole_seg5_vertex_05003188, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 4, 0x0), gsSP2Triangles( 2, 1, 3, 0x0, 5, 2, 4, 0x0), @@ -113,10 +85,6 @@ const Gfx monty_mole_seg5_dl_050032A0[] = { }; // 0x05003300 -static const Lights1 monty_mole_seg5_lights_05003300 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05003318 static const Vtx monty_mole_seg5_vertex_05003318[] = { @@ -149,8 +117,8 @@ const Gfx monty_mole_seg5_dl_05003438[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, monty_mole_seg5_texture_05002970), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&monty_mole_seg5_lights_05003300.l, 1), - gsSPLight(&monty_mole_seg5_lights_05003300.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(monty_mole_seg5_vertex_05003318, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 6, 5, 7, 0x0), @@ -193,10 +161,6 @@ const Gfx monty_mole_seg5_dl_05003518[] = { }; // 0x05003598 -static const Lights1 monty_mole_seg5_lights_05003598 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x050035B0 static const Vtx monty_mole_seg5_vertex_050035B0[] = { @@ -235,8 +199,8 @@ const Gfx monty_mole_seg5_dl_05003730[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, monty_mole_seg5_texture_05002970), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&monty_mole_seg5_lights_05003598.l, 1), - gsSPLight(&monty_mole_seg5_lights_05003598.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(monty_mole_seg5_vertex_050035B0, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 1, 3, 4, 0x0, 1, 4, 5, 0x0), @@ -280,10 +244,6 @@ const Gfx monty_mole_seg5_dl_05003820[] = { }; // 0x050038A0 -static const Lights1 monty_mole_seg5_lights_050038A0 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x050038B8 static const Vtx monty_mole_seg5_vertex_050038B8[] = { @@ -302,8 +262,8 @@ const Gfx monty_mole_seg5_dl_05003938[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, monty_mole_seg5_texture_05001170), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&monty_mole_seg5_lights_050038A0.l, 1), - gsSPLight(&monty_mole_seg5_lights_050038A0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(monty_mole_seg5_vertex_050038B8, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 4, 0x0), gsSP2Triangles( 1, 0, 3, 0x0, 1, 5, 2, 0x0), @@ -331,10 +291,6 @@ const Gfx monty_mole_seg5_dl_050039D0[] = { }; // 0x05003A30 -static const Lights1 monty_mole_seg5_lights_05003A30 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05003A48 static const Vtx monty_mole_seg5_vertex_05003A48[] = { @@ -367,8 +323,8 @@ const Gfx monty_mole_seg5_dl_05003B68[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, monty_mole_seg5_texture_05002970), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&monty_mole_seg5_lights_05003A30.l, 1), - gsSPLight(&monty_mole_seg5_lights_05003A30.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(monty_mole_seg5_vertex_05003A48, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 6, 5, 7, 0x0), @@ -411,10 +367,6 @@ const Gfx monty_mole_seg5_dl_05003C48[] = { }; // 0x05003CC8 -static const Lights1 monty_mole_seg5_lights_05003CC8 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05003CE0 static const Vtx monty_mole_seg5_vertex_05003CE0[] = { @@ -453,8 +405,8 @@ const Gfx monty_mole_seg5_dl_05003E60[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, monty_mole_seg5_texture_05002970), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&monty_mole_seg5_lights_05003CC8.l, 1), - gsSPLight(&monty_mole_seg5_lights_05003CC8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(monty_mole_seg5_vertex_05003CE0, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), gsSP2Triangles( 4, 2, 5, 0x0, 2, 3, 5, 0x0), @@ -498,10 +450,6 @@ const Gfx monty_mole_seg5_dl_05003F50[] = { }; // 0x05003FD0 -static const Lights1 monty_mole_seg5_lights_05003FD0 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05003FE8 static const Vtx monty_mole_seg5_vertex_05003FE8[] = { @@ -565,8 +513,8 @@ const Gfx monty_mole_seg5_dl_050042B8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, monty_mole_seg5_texture_05000970), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&monty_mole_seg5_lights_05003FD0.l, 1), - gsSPLight(&monty_mole_seg5_lights_05003FD0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(monty_mole_seg5_vertex_05003FE8, 13, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 5, 6, 3, 0x0, 7, 5, 4, 0x0), @@ -625,10 +573,6 @@ const Gfx monty_mole_seg5_dl_050044B0[] = { }; // 0x05004518 -static const Lights1 monty_mole_seg5_lights_05004518 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05004530 static const Vtx monty_mole_seg5_vertex_05004530[] = { @@ -735,8 +679,8 @@ const Gfx monty_mole_seg5_dl_050049B0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, monty_mole_seg5_texture_05001970), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&monty_mole_seg5_lights_05004518.l, 1), - gsSPLight(&monty_mole_seg5_lights_05004518.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(monty_mole_seg5_vertex_05004530, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 4, 0x0), gsSP2Triangles( 0, 3, 5, 0x0, 5, 1, 0, 0x0), @@ -818,10 +762,6 @@ const Gfx monty_mole_seg5_dl_05004C00[] = { }; // 0x05004C90 -static const Lights1 monty_mole_seg5_lights_05004C90 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05004CA8 static const Vtx monty_mole_seg5_vertex_05004CA8[] = { @@ -836,8 +776,8 @@ const Gfx monty_mole_seg5_dl_05004CE8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, monty_mole_seg5_texture_05002170), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&monty_mole_seg5_lights_05004C90.l, 1), - gsSPLight(&monty_mole_seg5_lights_05004C90.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(monty_mole_seg5_vertex_05004CA8, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), diff --git a/actors/peach/model.inc.c b/actors/peach/model.inc.c index 6bc3448e..147887f4 100644 --- a/actors/peach/model.inc.c +++ b/actors/peach/model.inc.c @@ -1,16 +1,8 @@ // Peach // 0x050009F8 -static const Lights1 peach_seg5_lights_050009F8 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05000A10 -static const Lights1 peach_seg5_lights_05000A10 = gdSPDefLights1( - 0x7f, 0x5f, 0x0c, - 0xff, 0xbf, 0x18, 0x28, 0x28, 0x28 -); // 0x05000A28 ALIGNED8 static const Texture peach_seg5_texture_05000A28[] = { @@ -361,8 +353,8 @@ const Gfx peach_seg5_dl_05005648[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, peach_seg5_texture_05002A28), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 16 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)), - gsSPLight(&peach_seg5_lights_050009F8.l, 1), - gsSPLight(&peach_seg5_lights_050009F8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(peach_seg5_vertex_05004828, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 0, 0x0), gsSP2Triangles( 4, 1, 5, 0x0, 5, 1, 6, 0x0), @@ -429,8 +421,8 @@ const Gfx peach_seg5_dl_050058B8[] = { // 0x050058E0 - 0x05005C48 const Gfx peach_seg5_dl_050058E0[] = { - gsSPLight(&peach_seg5_lights_05000A10.l, 1), - gsSPLight(&peach_seg5_lights_05000A10.a, 2), + gsSPLightColor(LIGHT_1, 0xffbf18ff), + gsSPLightColor(LIGHT_2, 0x7f5f0cff), gsSPVertex(peach_seg5_vertex_05004E88, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 4, 0x0), gsSP2Triangles( 3, 5, 0, 0x0, 6, 4, 0, 0x0), @@ -641,10 +633,6 @@ const Gfx peach_seg5_dl_05005F48[] = { }; // 0x05005FA0 -static const Lights1 peach_seg5_lights_05005FA0 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05005FB8 static const Vtx peach_seg5_vertex_05005FB8[] = { @@ -665,8 +653,8 @@ const Gfx peach_seg5_dl_05006058[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, peach_seg5_texture_05000A28), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&peach_seg5_lights_05005FA0.l, 1), - gsSPLight(&peach_seg5_lights_05005FA0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(peach_seg5_vertex_05005FB8, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), gsSP2Triangles( 1, 4, 3, 0x0, 4, 5, 3, 0x0), @@ -692,16 +680,8 @@ const Gfx peach_seg5_dl_050060E0[] = { }; // 0x05006138 -static const Lights1 peach_seg5_lights_05006138 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05006150 -static const Lights1 peach_seg5_lights_05006150 = gdSPDefLights1( - 0x6c, 0x54, 0x5f, - 0xd9, 0xa9, 0xbe, 0x28, 0x28, 0x28 -); // 0x05006168 static const Vtx peach_seg5_vertex_05006168[] = { @@ -832,8 +812,8 @@ const Gfx peach_seg5_dl_05006728[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, peach_seg5_texture_05002C28), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 16 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)), - gsSPLight(&peach_seg5_lights_05006138.l, 1), - gsSPLight(&peach_seg5_lights_05006138.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(peach_seg5_vertex_05006168, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 4, 0x0), gsSP2Triangles( 4, 1, 5, 0x0, 6, 1, 3, 0x0), @@ -847,13 +827,13 @@ const Gfx peach_seg5_dl_05006798[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, peach_seg5_texture_05004028), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&peach_seg5_lights_05006150.l, 1), - gsSPLight(&peach_seg5_lights_05006150.a, 2), + gsSPLightColor(LIGHT_1, 0xd9a9beff), + gsSPLightColor(LIGHT_2, 0x6c545fff), gsSPVertex(peach_seg5_vertex_050061E8, 5, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 0, 0x0), gsSP1Triangle( 3, 0, 2, 0x0), - gsSPLight(&peach_seg5_lights_05006138.l, 1), - gsSPLight(&peach_seg5_lights_05006138.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(peach_seg5_vertex_05006238, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 0, 0x0, 0, 6, 7, 0x0), @@ -916,10 +896,6 @@ const Gfx peach_seg5_dl_05006A18[] = { }; // 0x05006A90 -static const Lights1 peach_seg5_lights_05006A90 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05006AA8 static const Vtx peach_seg5_vertex_05006AA8[] = { @@ -1026,8 +1002,8 @@ const Gfx peach_seg5_dl_05006FA8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, peach_seg5_texture_05004028), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&peach_seg5_lights_05006A90.l, 1), - gsSPLight(&peach_seg5_lights_05006A90.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(peach_seg5_vertex_05006AA8, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 3, 7, 0x0, 3, 8, 9, 0x0), @@ -1104,10 +1080,6 @@ const Gfx peach_seg5_us_dl_05007288[] = { }; // 0x05007288 -static const Lights1 peach_seg5_lights_05007288 = gdSPDefLights1( - 0x7f, 0x5f, 0x0c, - 0xff, 0xbf, 0x18, 0x28, 0x28, 0x28 -); // 0x050072A0 static const Vtx peach_seg5_vertex_050072A0[] = { @@ -1222,8 +1194,8 @@ static const Vtx peach_seg5_vertex_05007780[] = { // 0x05007810 - 0x05007AB8 const Gfx peach_seg5_dl_05007810[] = { - gsSPLight(&peach_seg5_lights_05007288.l, 1), - gsSPLight(&peach_seg5_lights_05007288.a, 2), + gsSPLightColor(LIGHT_1, 0xffbf18ff), + gsSPLightColor(LIGHT_2, 0x7f5f0cff), gsSPVertex(peach_seg5_vertex_050072A0, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 2, 4, 0x0), gsSP2Triangles( 2, 1, 4, 0x0, 2, 3, 0, 0x0), @@ -1282,10 +1254,6 @@ const Gfx peach_seg5_dl_05007AB8[] = { }; // 0x05007AE0 -static const Lights1 peach_seg5_lights_05007AE0 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05007AF8 static const Vtx peach_seg5_vertex_05007AF8[] = { @@ -1331,8 +1299,8 @@ const Gfx peach_seg5_dl_05007CE8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, peach_seg5_texture_05004028), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&peach_seg5_lights_05007AE0.l, 1), - gsSPLight(&peach_seg5_lights_05007AE0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(peach_seg5_vertex_05007AF8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 0, 0x0), gsSP2Triangles( 5, 3, 0, 0x0, 4, 6, 0, 0x0), @@ -1373,10 +1341,6 @@ const Gfx peach_seg5_dl_05007E58[] = { }; // 0x05007EB0 -static const Lights1 peach_seg5_lights_05007EB0 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05007EC8 static const Vtx peach_seg5_vertex_05007EC8[] = { @@ -1422,8 +1386,8 @@ const Gfx peach_seg5_dl_050080B8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, peach_seg5_texture_05004028), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&peach_seg5_lights_05007EB0.l, 1), - gsSPLight(&peach_seg5_lights_05007EB0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(peach_seg5_vertex_05007EC8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0), gsSP2Triangles( 2, 1, 4, 0x0, 4, 3, 2, 0x0), @@ -1465,10 +1429,6 @@ const Gfx peach_seg5_dl_05008228[] = { }; // 0x05008280 -static const Lights1 peach_seg5_lights_05008280 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05008298 static const Vtx peach_seg5_vertex_05008298[] = { @@ -1508,8 +1468,8 @@ const Gfx peach_seg5_dl_05008428[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, peach_seg5_texture_05000A28), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&peach_seg5_lights_05008280.l, 1), - gsSPLight(&peach_seg5_lights_05008280.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(peach_seg5_vertex_05008298, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 3, 0, 0x0, 1, 5, 6, 0x0), @@ -1554,10 +1514,6 @@ const Gfx peach_seg5_dl_05008560[] = { }; // 0x050085D0 -static const Lights1 peach_seg5_lights_050085D0 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x050085E8 static const Vtx peach_seg5_vertex_050085E8[] = { @@ -1579,8 +1535,8 @@ static const Vtx peach_seg5_vertex_050085E8[] = { // 0x050086C8 - 0x050087A8 const Gfx peach_seg5_dl_050086C8[] = { - gsSPLight(&peach_seg5_lights_050085D0.l, 1), - gsSPLight(&peach_seg5_lights_050085D0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(peach_seg5_vertex_050085E8, 14, 0), gsSP1Triangle( 0, 1, 2, 0x0), gsSP2Triangles( 3, 4, 2, 0x0, 2, 5, 3, 0x0), @@ -1608,10 +1564,6 @@ const Gfx peach_seg5_dl_050087A8[] = { }; // 0x050087D0 -static const Lights1 peach_seg5_lights_050087D0 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x050087E8 static const Vtx peach_seg5_vertex_050087E8[] = { @@ -1651,8 +1603,8 @@ const Gfx peach_seg5_dl_05008978[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, peach_seg5_texture_05000A28), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&peach_seg5_lights_050087D0.l, 1), - gsSPLight(&peach_seg5_lights_050087D0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(peach_seg5_vertex_050087E8, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 0, 3, 0x0), gsSP2Triangles( 2, 4, 0, 0x0, 0, 5, 3, 0x0), @@ -1697,10 +1649,6 @@ const Gfx peach_seg5_dl_05008AB0[] = { }; // 0x05008B20 -static const Lights1 peach_seg5_lights_05008B20 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05008B38 static const Vtx peach_seg5_vertex_05008B38[] = { @@ -1722,8 +1670,8 @@ static const Vtx peach_seg5_vertex_05008B38[] = { // 0x05008C18 - 0x05008CF8 const Gfx peach_seg5_dl_05008C18[] = { - gsSPLight(&peach_seg5_lights_05008B20.l, 1), - gsSPLight(&peach_seg5_lights_05008B20.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(peach_seg5_vertex_05008B38, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 4, 0x0), gsSP2Triangles( 2, 5, 0, 0x0, 5, 2, 6, 0x0), @@ -1750,10 +1698,6 @@ const Gfx peach_seg5_dl_05008CF8[] = { }; // 0x05008D20 -static const Lights1 peach_seg5_lights_05008D20 = gdSPDefLights1( - 0x0b, 0x1a, 0x67, - 0x16, 0x35, 0xce, 0x28, 0x28, 0x28 -); // 0x05008D38 static const Vtx peach_seg5_vertex_05008D38[] = { @@ -1777,8 +1721,8 @@ static const Vtx peach_seg5_vertex_05008D38[] = { // 0x05008E38 - 0x05008F20 const Gfx peach_seg5_dl_05008E38[] = { - gsSPLight(&peach_seg5_lights_05008D20.l, 1), - gsSPLight(&peach_seg5_lights_05008D20.a, 2), + gsSPLightColor(LIGHT_1, 0x1635ceff), + gsSPLightColor(LIGHT_2, 0xb1a67ff), gsSPVertex(peach_seg5_vertex_05008D38, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 0, 0x0), gsSP2Triangles( 3, 4, 5, 0x0, 3, 0, 4, 0x0), @@ -1806,10 +1750,6 @@ const Gfx peach_seg5_dl_05008F20[] = { }; // 0x05008F48 -static const Lights1 peach_seg5_lights_05008F48 = gdSPDefLights1( - 0x0b, 0x1a, 0x67, - 0x16, 0x35, 0xce, 0x28, 0x28, 0x28 -); // 0x05008F60 static const Vtx peach_seg5_vertex_05008F60[] = { @@ -1833,8 +1773,8 @@ static const Vtx peach_seg5_vertex_05008F60[] = { // 0x05009060 - 0x05009148 const Gfx peach_seg5_dl_05009060[] = { - gsSPLight(&peach_seg5_lights_05008F48.l, 1), - gsSPLight(&peach_seg5_lights_05008F48.a, 2), + gsSPLightColor(LIGHT_1, 0x1635ceff), + gsSPLightColor(LIGHT_2, 0xb1a67ff), gsSPVertex(peach_seg5_vertex_05008F60, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 5, 4, 6, 0x0, 7, 3, 5, 0x0), @@ -1862,10 +1802,6 @@ const Gfx peach_seg5_dl_05009148[] = { }; // 0x05009170 -static const Lights1 peach_seg5_lights_05009170 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05009188 static const Vtx peach_seg5_vertex_05009188[] = { @@ -1909,8 +1845,8 @@ static const Vtx peach_seg5_vertex_05009288[] = { // 0x05009388 - 0x05009500 const Gfx peach_seg5_dl_05009388[] = { - gsSPLight(&peach_seg5_lights_05009170.l, 1), - gsSPLight(&peach_seg5_lights_05009170.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(peach_seg5_vertex_05009188, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0), gsSP2Triangles( 4, 5, 0, 0x0, 0, 5, 6, 0x0), @@ -1948,10 +1884,6 @@ const Gfx peach_seg5_dl_05009500[] = { }; // 0x05009528 -static const Lights1 peach_seg5_lights_05009528 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05009540 static const Vtx peach_seg5_vertex_05009540[] = { @@ -2007,8 +1939,8 @@ static const Vtx peach_seg5_vertex_05009740[] = { // 0x050097C0 - 0x05009940 const Gfx peach_seg5_dl_050097C0[] = { - gsSPLight(&peach_seg5_lights_05009528.l, 1), - gsSPLight(&peach_seg5_lights_05009528.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(peach_seg5_vertex_05009540, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 2, 4, 0x0), gsSP2Triangles( 5, 0, 2, 0x0, 2, 3, 5, 0x0), @@ -2047,10 +1979,6 @@ const Gfx peach_seg5_dl_05009940[] = { }; // 0x05009968 -static const Lights1 peach_seg5_lights_05009968 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05009980 static const Vtx peach_seg5_vertex_05009980[] = { @@ -2151,8 +2079,8 @@ const Gfx peach_seg5_dl_05009E20[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, peach_seg5_texture_05004028), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&peach_seg5_lights_05009968.l, 1), - gsSPLight(&peach_seg5_lights_05009968.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(peach_seg5_vertex_05009980, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0), gsSP2Triangles( 4, 2, 1, 0x0, 5, 2, 4, 0x0), diff --git a/actors/penguin/model.inc.c b/actors/penguin/model.inc.c index af69322c..4ee18b52 100644 --- a/actors/penguin/model.inc.c +++ b/actors/penguin/model.inc.c @@ -1,28 +1,12 @@ // Penguin // 0x05002D80 -static const Lights1 penguin_seg5_lights_05002D80 = gdSPDefLights1( - 0x06, 0x06, 0x39, - 0x0f, 0x0f, 0x90, 0x28, 0x28, 0x28 -); // 0x05002D98 -static const Lights1 penguin_seg5_lights_05002D98 = gdSPDefLights1( - 0x52, 0x34, 0x0a, - 0xce, 0x84, 0x1a, 0x28, 0x28, 0x28 -); // 0x05002DB0 -static const Lights1 penguin_seg5_lights_05002DB0 = gdSPDefLights1( - 0x59, 0x42, 0x14, - 0xdf, 0xa7, 0x34, 0x28, 0x28, 0x28 -); // 0x05002DC8 -static const Lights1 penguin_seg5_lights_05002DC8 = gdSPDefLights1( - 0x66, 0x66, 0x65, - 0xff, 0xff, 0xfd, 0x28, 0x28, 0x28 -); // 0x05002DE0 ALIGNED8 static const Texture penguin_seg5_texture_eye_open[] = { @@ -55,22 +39,10 @@ ALIGNED8 static const Texture penguin_seg5_texture_beak[] = { }; // 0x05005DE0 -static const Lights1 penguin_seg5_lights_head = gdSPDefLights1( - 0x04, 0x0f, 0x41, - 0x0b, 0x26, 0xa4, 0x28, 0x28, 0x28 -); // 0x05005DF8 -static const Lights1 penguin_seg5_lights_beak_top = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05005E10 -static const Lights1 penguin_seg5_lights_beak_bottom = gdSPDefLights1( - 0x60, 0x55, 0x0b, - 0xf2, 0xd5, 0x1c, 0x28, 0x28, 0x28 -); // 0x05005E28 static const Vtx penguin_seg5_vertex_eyes[] = { @@ -152,8 +124,8 @@ static const Vtx penguin_seg5_vertex_beak_bottom[] = { // 0x05006188 - 0x050061C8 const Gfx penguin_seg5_sub_dl_eyes_model[] = { - gsSPLight(&penguin_seg5_lights_head.l, 1), - gsSPLight(&penguin_seg5_lights_head.a, 2), + gsSPLightColor(LIGHT_1, 0xb26a4ff), + gsSPLightColor(LIGHT_2, 0x40f41ff), gsSPVertex(penguin_seg5_vertex_eyes, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 0, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 7, 6, 5, 0x0), @@ -162,8 +134,8 @@ const Gfx penguin_seg5_sub_dl_eyes_model[] = { // 0x050061C8 - 0x050061F8 const Gfx penguin_seg5_sub_dl_beak_model[] = { - gsSPLight(&penguin_seg5_lights_beak_top.l, 1), - gsSPLight(&penguin_seg5_lights_beak_top.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(penguin_seg5_vertex_beak_top, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0), gsSPEndDisplayList(), @@ -171,8 +143,8 @@ const Gfx penguin_seg5_sub_dl_beak_model[] = { // 0x050061F8 - 0x05006380 const Gfx penguin_seg5_sub_dl_head_model[] = { - gsSPLight(&penguin_seg5_lights_head.l, 1), - gsSPLight(&penguin_seg5_lights_head.a, 2), + gsSPLightColor(LIGHT_1, 0xb26a4ff), + gsSPLightColor(LIGHT_2, 0x40f41ff), gsSPVertex(penguin_seg5_vertex_05005EE8, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), gsSP2Triangles( 4, 1, 5, 0x0, 1, 4, 6, 0x0), @@ -196,8 +168,8 @@ const Gfx penguin_seg5_sub_dl_head_model[] = { gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), gsSP2Triangles( 4, 0, 2, 0x0, 5, 2, 3, 0x0), gsSP2Triangles( 2, 5, 4, 0x0, 4, 5, 6, 0x0), - gsSPLight(&penguin_seg5_lights_beak_bottom.l, 1), - gsSPLight(&penguin_seg5_lights_beak_bottom.a, 2), + gsSPLightColor(LIGHT_1, 0xf2d51cff), + gsSPLightColor(LIGHT_2, 0x60550bff), gsSPVertex(penguin_seg5_vertex_beak_bottom, 3, 0), gsSP1Triangle( 0, 1, 2, 0x0), gsSPEndDisplayList(), @@ -549,8 +521,8 @@ static const Vtx penguin_seg5_vertex_050070A8[] = { // 0x05007198 - 0x050071E8 const Gfx penguin_seg5_dl_05007198[] = { - gsSPLight(&penguin_seg5_lights_05002D80.l, 1), - gsSPLight(&penguin_seg5_lights_05002D80.a, 2), + gsSPLightColor(LIGHT_1, 0xf0f90ff), + gsSPLightColor(LIGHT_2, 0x60639ff), gsSPVertex(penguin_seg5_vertex_05006518, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 5, 6, 3, 0x0, 3, 6, 7, 0x0), @@ -560,8 +532,8 @@ const Gfx penguin_seg5_dl_05007198[] = { // 0x050071E8 - 0x05007238 const Gfx penguin_seg5_dl_050071E8[] = { - gsSPLight(&penguin_seg5_lights_05002D80.l, 1), - gsSPLight(&penguin_seg5_lights_05002D80.a, 2), + gsSPLightColor(LIGHT_1, 0xf0f90ff), + gsSPLightColor(LIGHT_2, 0x60639ff), gsSPVertex(penguin_seg5_vertex_050065B8, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 2, 4, 0x0), gsSP2Triangles( 5, 6, 7, 0x0, 7, 6, 8, 0x0), @@ -571,8 +543,8 @@ const Gfx penguin_seg5_dl_050071E8[] = { // 0x05007238 - 0x050072C8 const Gfx penguin_seg5_dl_05007238[] = { - gsSPLight(&penguin_seg5_lights_05002D98.l, 1), - gsSPLight(&penguin_seg5_lights_05002D98.a, 2), + gsSPLightColor(LIGHT_1, 0xce841aff), + gsSPLightColor(LIGHT_2, 0x52340aff), gsSPVertex(penguin_seg5_vertex_05006658, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 4, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 6, 7, 2, 0x0), @@ -586,8 +558,8 @@ const Gfx penguin_seg5_dl_05007238[] = { // 0x050072C8 - 0x05007358 const Gfx penguin_seg5_dl_050072C8[] = { - gsSPLight(&penguin_seg5_lights_05002D98.l, 1), - gsSPLight(&penguin_seg5_lights_05002D98.a, 2), + gsSPLightColor(LIGHT_1, 0xce841aff), + gsSPLightColor(LIGHT_2, 0x52340aff), gsSPVertex(penguin_seg5_vertex_05006748, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 5, 4, 6, 0x0, 7, 8, 9, 0x0), @@ -601,13 +573,13 @@ const Gfx penguin_seg5_dl_050072C8[] = { // 0x05007358 - 0x05007540 const Gfx penguin_seg5_dl_05007358[] = { - gsSPLight(&penguin_seg5_lights_05002DB0.l, 1), - gsSPLight(&penguin_seg5_lights_05002DB0.a, 2), + gsSPLightColor(LIGHT_1, 0xdfa734ff), + gsSPLightColor(LIGHT_2, 0x594214ff), gsSPVertex(penguin_seg5_vertex_05006838, 5, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0), gsSP1Triangle( 1, 4, 3, 0x0), - gsSPLight(&penguin_seg5_lights_05002D80.l, 1), - gsSPLight(&penguin_seg5_lights_05002D80.a, 2), + gsSPLightColor(LIGHT_1, 0xf0f90ff), + gsSPLightColor(LIGHT_2, 0x60639ff), gsSPVertex(penguin_seg5_vertex_05006888, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 6, 9, 0, 0x0), @@ -635,8 +607,8 @@ const Gfx penguin_seg5_dl_05007358[] = { gsSPVertex(penguin_seg5_vertex_05006D68, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 1, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 6, 7, 4, 0x0), - gsSPLight(&penguin_seg5_lights_05002D80.l, 1), - gsSPLight(&penguin_seg5_lights_05002D80.a, 2), + gsSPLightColor(LIGHT_1, 0xf0f90ff), + gsSPLightColor(LIGHT_2, 0x60639ff), gsSPVertex(penguin_seg5_vertex_05006DE8, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0), gsSPEndDisplayList(), @@ -644,8 +616,8 @@ const Gfx penguin_seg5_dl_05007358[] = { // 0x05007540 - 0x05007708 const Gfx penguin_seg5_dl_05007540[] = { - gsSPLight(&penguin_seg5_lights_05002D80.l, 1), - gsSPLight(&penguin_seg5_lights_05002D80.a, 2), + gsSPLightColor(LIGHT_1, 0xf0f90ff), + gsSPLightColor(LIGHT_2, 0x60639ff), gsSPVertex(penguin_seg5_vertex_05006E28, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 2, 9, 6, 0x0), @@ -664,8 +636,8 @@ const Gfx penguin_seg5_dl_05007540[] = { gsSPVertex(penguin_seg5_vertex_05007018, 9, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 0, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 7, 2, 8, 0x0), - gsSPLight(&penguin_seg5_lights_05002DC8.l, 1), - gsSPLight(&penguin_seg5_lights_05002DC8.a, 2), + gsSPLightColor(LIGHT_1, 0xfffffdff), + gsSPLightColor(LIGHT_2, 0x666665ff), gsSPVertex(penguin_seg5_vertex_050070A8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 4, 0x0), gsSP2Triangles( 5, 2, 6, 0x0, 7, 8, 9, 0x0), diff --git a/actors/piranha_plant/model.inc.c b/actors/piranha_plant/model.inc.c index 9d6a8f46..dd8063e4 100644 --- a/actors/piranha_plant/model.inc.c +++ b/actors/piranha_plant/model.inc.c @@ -1,22 +1,10 @@ // Piranha Plant // 0x060113B0 -static const Lights1 piranha_plant_seg6_lights_060113B0 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x060113C8 -static const Lights1 piranha_plant_seg6_lights_060113C8 = gdSPDefLights1( - 0x0a, 0x2b, 0x02, - 0x2b, 0xae, 0x0a, 0x28, 0x28, 0x28 -); // 0x060113E0 -static const Lights1 piranha_plant_seg6_lights_060113E0 = gdSPDefLights1( - 0x3f, 0x00, 0x00, - 0xff, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x060113F8 ALIGNED8 static const Texture piranha_plant_seg6_texture_060113F8[] = { @@ -61,8 +49,8 @@ const Gfx piranha_plant_seg6_dl_06015438[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, piranha_plant_seg6_texture_060143F8), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&piranha_plant_seg6_lights_060113B0.l, 1), - gsSPLight(&piranha_plant_seg6_lights_060113B0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(piranha_plant_seg6_vertex_060153F8, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSPEndDisplayList(), @@ -99,8 +87,8 @@ const Gfx piranha_plant_seg6_dl_06015530[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, piranha_plant_seg6_texture_060143F8), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&piranha_plant_seg6_lights_060113B0.l, 1), - gsSPLight(&piranha_plant_seg6_lights_060113B0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(piranha_plant_seg6_vertex_060154F0, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), @@ -164,8 +152,8 @@ const Gfx piranha_plant_seg6_dl_06015798[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, piranha_plant_seg6_texture_06012BF8), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&piranha_plant_seg6_lights_060113B0.l, 1), - gsSPLight(&piranha_plant_seg6_lights_060113B0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(piranha_plant_seg6_vertex_060155E8, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 0, 0x0), gsSP2Triangles( 3, 4, 1, 0x0, 5, 6, 7, 0x0), @@ -317,8 +305,8 @@ const Gfx piranha_plant_seg6_dl_06015E40[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, piranha_plant_seg6_texture_06013BF8), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&piranha_plant_seg6_lights_060113B0.l, 1), - gsSPLight(&piranha_plant_seg6_lights_060113B0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(piranha_plant_seg6_vertex_060158B0, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 5, 7, 6, 0x0), @@ -331,8 +319,8 @@ const Gfx piranha_plant_seg6_dl_06015EA8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, piranha_plant_seg6_texture_060133F8), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&piranha_plant_seg6_lights_060113C8.l, 1), - gsSPLight(&piranha_plant_seg6_lights_060113C8.a, 2), + gsSPLightColor(LIGHT_1, 0x2bae0aff), + gsSPLightColor(LIGHT_2, 0xa2b02ff), gsSPVertex(piranha_plant_seg6_vertex_06015990, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 3, 0x0, 3, 5, 8, 0x0), @@ -352,8 +340,8 @@ const Gfx piranha_plant_seg6_dl_06015F68[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, piranha_plant_seg6_texture_060123F8), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&piranha_plant_seg6_lights_060113B0.l, 1), - gsSPLight(&piranha_plant_seg6_lights_060113B0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(piranha_plant_seg6_vertex_06015B40, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 7, 0x0, 3, 7, 8, 0x0), @@ -373,8 +361,8 @@ const Gfx piranha_plant_seg6_dl_06015F68[] = { // 0x06016060 - 0x060160B0 const Gfx piranha_plant_seg6_dl_06016060[] = { - gsSPLight(&piranha_plant_seg6_lights_060113E0.l, 1), - gsSPLight(&piranha_plant_seg6_lights_060113E0.a, 2), + gsSPLightColor(LIGHT_1, 0xff0000ff), + gsSPLightColor(LIGHT_2, 0x3f0000ff), gsSPVertex(piranha_plant_seg6_vertex_06015DC0, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 4, 0x0), gsSP2Triangles( 0, 5, 3, 0x0, 0, 4, 1, 0x0), @@ -547,8 +535,8 @@ const Gfx piranha_plant_seg6_dl_06016750[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, piranha_plant_seg6_texture_06013BF8), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&piranha_plant_seg6_lights_060113B0.l, 1), - gsSPLight(&piranha_plant_seg6_lights_060113B0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(piranha_plant_seg6_vertex_06016190, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 6, 9, 7, 0x0), @@ -561,8 +549,8 @@ const Gfx piranha_plant_seg6_dl_060167B8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, piranha_plant_seg6_texture_060133F8), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&piranha_plant_seg6_lights_060113C8.l, 1), - gsSPLight(&piranha_plant_seg6_lights_060113C8.a, 2), + gsSPLightColor(LIGHT_1, 0x2bae0aff), + gsSPLightColor(LIGHT_2, 0xa2b02ff), gsSPVertex(piranha_plant_seg6_vertex_06016270, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 5, 6, 3, 0x0, 7, 6, 5, 0x0), @@ -584,8 +572,8 @@ const Gfx piranha_plant_seg6_dl_06016890[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, piranha_plant_seg6_texture_060123F8), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&piranha_plant_seg6_lights_060113B0.l, 1), - gsSPLight(&piranha_plant_seg6_lights_060113B0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(piranha_plant_seg6_vertex_06016490, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 0, 4, 5, 0x0, 0, 3, 4, 0x0), @@ -613,8 +601,8 @@ const Gfx piranha_plant_seg6_dl_06016960[] = { // 0x060169A8 - 0x060169E8 const Gfx piranha_plant_seg6_dl_060169A8[] = { - gsSPLight(&piranha_plant_seg6_lights_060113C8.l, 1), - gsSPLight(&piranha_plant_seg6_lights_060113C8.a, 2), + gsSPLightColor(LIGHT_1, 0x2bae0aff), + gsSPLightColor(LIGHT_2, 0xa2b02ff), gsSPVertex(piranha_plant_seg6_vertex_060166E0, 7, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 1, 3, 0x0), gsSP2Triangles( 3, 4, 5, 0x0, 5, 4, 6, 0x0), @@ -682,8 +670,8 @@ const Gfx piranha_plant_seg6_dl_06016BA8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, piranha_plant_seg6_texture_06012BF8), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&piranha_plant_seg6_lights_060113B0.l, 1), - gsSPLight(&piranha_plant_seg6_lights_060113B0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(piranha_plant_seg6_vertex_06016AE8, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), @@ -728,8 +716,8 @@ const Gfx piranha_plant_seg6_dl_06016D30[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, piranha_plant_seg6_texture_06012BF8), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&piranha_plant_seg6_lights_060113B0.l, 1), - gsSPLight(&piranha_plant_seg6_lights_060113B0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(piranha_plant_seg6_vertex_06016C70, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), @@ -774,8 +762,8 @@ const Gfx piranha_plant_seg6_dl_06016EB8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, piranha_plant_seg6_texture_06012BF8), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&piranha_plant_seg6_lights_060113B0.l, 1), - gsSPLight(&piranha_plant_seg6_lights_060113B0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(piranha_plant_seg6_vertex_06016DF8, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), diff --git a/actors/poundable_pole/model.inc.c b/actors/poundable_pole/model.inc.c index 2268e858..69dead0d 100644 --- a/actors/poundable_pole/model.inc.c +++ b/actors/poundable_pole/model.inc.c @@ -1,10 +1,6 @@ // Poundable Pole // 0x06001038 -static const Lights1 poundable_pole_seg6_lights_06001038 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x06001050 ALIGNED8 static const Texture poundable_pole_seg6_texture_06001050[] = { @@ -79,8 +75,8 @@ const Gfx poundable_pole_seg6_dl_060022F0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, poundable_pole_seg6_texture_06001050), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(£able_pole_seg6_lights_06001038.l, 1), - gsSPLight(£able_pole_seg6_lights_06001038.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(poundable_pole_seg6_vertex_06002050, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 4, 0x0), gsSP2Triangles( 0, 2, 3, 0x0, 2, 1, 5, 0x0), diff --git a/actors/purple_switch/model.inc.c b/actors/purple_switch/model.inc.c index 25b41250..c1152ae8 100644 --- a/actors/purple_switch/model.inc.c +++ b/actors/purple_switch/model.inc.c @@ -1,10 +1,6 @@ // Purple Switch // 0x0800C090 -static const Lights1 purple_switch_seg8_lights_0800C090 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0800C0A8 ALIGNED8 static const Texture purple_switch_seg8_texture_0800C0A8[] = { @@ -49,8 +45,8 @@ const Gfx purple_switch_seg8_dl_0800C668[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, purple_switch_seg8_texture_0800C0A8), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 4 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)), - gsSPLight(&purple_switch_seg8_lights_0800C090.l, 1), - gsSPLight(&purple_switch_seg8_lights_0800C090.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(purple_switch_seg8_vertex_0800C528, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), diff --git a/actors/scuttlebug/model.inc.c b/actors/scuttlebug/model.inc.c index d53a250e..d452606d 100644 --- a/actors/scuttlebug/model.inc.c +++ b/actors/scuttlebug/model.inc.c @@ -1,16 +1,8 @@ // Scuttlebug // Unreferenced light group -UNUSED static const Lights1 scuttlebug_lights_unused1 = gdSPDefLights1( - 0x2c, 0x00, 0x00, - 0xb2, 0x00, 0x00, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 scuttlebug_lights_unused2 = gdSPDefLights1( - 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x06010108 ALIGNED8 static const Texture scuttlebug_seg6_texture_06010108[] = { @@ -237,10 +229,6 @@ const Gfx scuttlebug_seg6_dl_06013DA0[] = { }; // 0x06013E10 -static const Lights1 scuttlebug_seg6_lights_06013E10 = gdSPDefLights1( - 0x33, 0x22, 0x01, - 0xcf, 0x89, 0x06, 0x28, 0x28, 0x28 -); // 0x06013E28 static const Vtx scuttlebug_seg6_vertex_06013E28[] = { @@ -278,8 +266,8 @@ static const Vtx scuttlebug_seg6_vertex_06013F28[] = { // 0x06013FC8 - 0x060140F0 const Gfx scuttlebug_seg6_dl_06013FC8[] = { - gsSPLight(&scuttlebug_seg6_lights_06013E10.l, 1), - gsSPLight(&scuttlebug_seg6_lights_06013E10.a, 2), + gsSPLightColor(LIGHT_1, 0xcf8906ff), + gsSPLightColor(LIGHT_2, 0x332201ff), gsSPVertex(scuttlebug_seg6_vertex_06013E28, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 5, 6, 7, 0x0, 5, 4, 6, 0x0), @@ -382,10 +370,6 @@ const Gfx scuttlebug_seg6_dl_06014270[] = { }; // 0x060142E0 -static const Lights1 scuttlebug_seg6_lights_060142E0 = gdSPDefLights1( - 0x26, 0x05, 0x05, - 0x99, 0x16, 0x16, 0x28, 0x28, 0x28 -); // 0x060142F8 static const Vtx scuttlebug_seg6_vertex_060142F8[] = { @@ -397,8 +381,8 @@ static const Vtx scuttlebug_seg6_vertex_060142F8[] = { // 0x06014338 - 0x06014378 const Gfx scuttlebug_seg6_dl_06014338[] = { - gsSPLight(&scuttlebug_seg6_lights_060142E0.l, 1), - gsSPLight(&scuttlebug_seg6_lights_060142E0.a, 2), + gsSPLightColor(LIGHT_1, 0x991616ff), + gsSPLightColor(LIGHT_2, 0x260505ff), gsSPVertex(scuttlebug_seg6_vertex_060142F8, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 2, 1, 0x0), gsSP2Triangles( 2, 3, 0, 0x0, 1, 0, 3, 0x0), diff --git a/actors/seaweed/model.inc.c b/actors/seaweed/model.inc.c index c3c074c5..e379b7fc 100644 --- a/actors/seaweed/model.inc.c +++ b/actors/seaweed/model.inc.c @@ -1,10 +1,6 @@ // Seaweed // 0x06007DF8 -static const Lights1 seaweed_seg6_lights_06007DF8 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x06007E10 ALIGNED8 static const Texture seaweed_seg6_texture_06007E10[] = { @@ -39,8 +35,8 @@ const Gfx seaweed_seg6_dl_06009E50[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, seaweed_seg6_texture_06007E10), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&seaweed_seg6_lights_06007DF8.l, 1), - gsSPLight(&seaweed_seg6_lights_06007DF8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(seaweed_seg6_vertex_06009E10, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSPEndDisplayList(), @@ -77,8 +73,8 @@ const Gfx seaweed_seg6_dl_06009F48[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, seaweed_seg6_texture_06008610), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&seaweed_seg6_lights_06007DF8.l, 1), - gsSPLight(&seaweed_seg6_lights_06007DF8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(seaweed_seg6_vertex_06009F08, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), @@ -115,8 +111,8 @@ const Gfx seaweed_seg6_dl_0600A040[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, seaweed_seg6_texture_06008E10), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&seaweed_seg6_lights_06007DF8.l, 1), - gsSPLight(&seaweed_seg6_lights_06007DF8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(seaweed_seg6_vertex_0600A000, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSPEndDisplayList(), @@ -153,8 +149,8 @@ const Gfx seaweed_seg6_dl_0600A138[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, seaweed_seg6_texture_06009610), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&seaweed_seg6_lights_06007DF8.l, 1), - gsSPLight(&seaweed_seg6_lights_06007DF8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(seaweed_seg6_vertex_0600A0F8, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSPEndDisplayList(), diff --git a/actors/skeeter/model.inc.c b/actors/skeeter/model.inc.c index 104b3a31..eab70ed8 100644 --- a/actors/skeeter/model.inc.c +++ b/actors/skeeter/model.inc.c @@ -1,40 +1,16 @@ // Skeeter // Unreferenced light group -UNUSED static const Lights1 skeeter_lights_unused1 = gdSPDefLights1( - 0x3f, 0x20, 0x02, - 0xfc, 0x80, 0x08, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 skeeter_lights_unused2 = gdSPDefLights1( - 0x05, 0x05, 0x02, - 0x15, 0x15, 0x08, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 skeeter_lights_unused3 = gdSPDefLights1( - 0x03, 0x10, 0x29, - 0x0e, 0x40, 0xa4, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 skeeter_lights_unused4 = gdSPDefLights1( - 0x3b, 0x3a, 0x36, - 0xef, 0xea, 0xd9, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 skeeter_lights_unused5 = gdSPDefLights1( - 0x33, 0x0c, 0x00, - 0xcf, 0x32, 0x00, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 skeeter_lights_unused6 = gdSPDefLights1( - 0x10, 0x29, 0x20, - 0x42, 0xa5, 0x81, 0x28, 0x28, 0x28 -); // 0x06000090 ALIGNED8 static const Texture skeeter_seg6_texture_06000090[] = { @@ -225,10 +201,6 @@ const Gfx skeeter_seg6_dl_06000D78[] = { }; // 0x06000DE8 -static const Lights1 skeeter_seg6_lights_06000DE8 = gdSPDefLights1( - 0x7f, 0x55, 0x00, - 0xff, 0xaa, 0x00, 0x28, 0x28, 0x28 -); // 0x06000E00 static const Vtx skeeter_seg6_vertex_06000E00[] = { @@ -242,8 +214,8 @@ static const Vtx skeeter_seg6_vertex_06000E00[] = { // 0x06000E60 - 0x06000EC0 const Gfx skeeter_seg6_dl_06000E60[] = { - gsSPLight(&skeeter_seg6_lights_06000DE8.l, 1), - gsSPLight(&skeeter_seg6_lights_06000DE8.a, 2), + gsSPLightColor(LIGHT_1, 0xffaa00ff), + gsSPLightColor(LIGHT_2, 0x7f5500ff), gsSPVertex(skeeter_seg6_vertex_06000E00, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 2, 1, 4, 0x0, 1, 3, 4, 0x0), diff --git a/actors/small_key/model.inc.c b/actors/small_key/model.inc.c index d6493eb7..f378fed8 100644 --- a/actors/small_key/model.inc.c +++ b/actors/small_key/model.inc.c @@ -4,28 +4,12 @@ UNUSED static const u64 small_key_unused_1 = 0; // 0x05005798 -static const Lights1 small_key_seg5_lights_05005798 = gdSPDefLights1( - 0x3f, 0x19, 0x0c, - 0xff, 0x64, 0x32, 0x28, 0x28, 0x28 -); // 0x050057B0 -static const Lights1 small_key_seg5_lights_050057B0 = gdSPDefLights1( - 0x0c, 0x3f, 0x19, - 0x32, 0xff, 0x64, 0x28, 0x28, 0x28 -); // 0x050057C8 -static const Lights1 small_key_seg5_lights_050057C8 = gdSPDefLights1( - 0x0c, 0x19, 0x3f, - 0x32, 0x64, 0xff, 0x28, 0x28, 0x28 -); // 0x050057E0 -static const Lights1 small_key_seg5_lights_050057E0 = gdSPDefLights1( - 0x33, 0x3f, 0x00, - 0xcc, 0xff, 0x00, 0x28, 0x28, 0x28 -); // align UNUSED static const u64 small_key_unused_2 = 0; @@ -404,24 +388,28 @@ const Gfx small_key_seg5_dl_05006700[] = { // 0x05006A08 - 0x05006A28 const Gfx small_key_seg5_dl_05006A08[] = { - gsSPSetLights1(small_key_seg5_lights_050057C8), + gsSPLightColor(LIGHT_1, 0x3264ffff), + gsSPLightColor(LIGHT_2, 0xc193fff), gsSPBranchList(small_key_seg5_dl_05006700), }; // 0x05006A28 - 0x05006A48 const Gfx small_key_seg5_dl_05006A28[] = { - gsSPSetLights1(small_key_seg5_lights_050057B0), + gsSPLightColor(LIGHT_1, 0x32ff64ff), + gsSPLightColor(LIGHT_2, 0xc3f19ff), gsSPBranchList(small_key_seg5_dl_05006700), }; // 0x05006A48 - 0x05006A68 const Gfx small_key_seg5_dl_05006A48[] = { - gsSPSetLights1(small_key_seg5_lights_05005798), + gsSPLightColor(LIGHT_1, 0xff6432ff), + gsSPLightColor(LIGHT_2, 0x3f190cff), gsSPBranchList(small_key_seg5_dl_05006700), }; // 0x05006A68 - 0x05006A88 const Gfx small_key_seg5_dl_05006A68[] = { - gsSPSetLights1(small_key_seg5_lights_050057E0), + gsSPLightColor(LIGHT_1, 0xccff00ff), + gsSPLightColor(LIGHT_2, 0x333f00ff), gsSPBranchList(small_key_seg5_dl_05006700), }; diff --git a/actors/snowman/model.inc.c b/actors/snowman/model.inc.c index ada671f0..e8ae8c76 100644 --- a/actors/snowman/model.inc.c +++ b/actors/snowman/model.inc.c @@ -4,28 +4,12 @@ UNUSED static const u64 snowman_unused_1 = 1; // Unreferenced light group -UNUSED static const Lights1 snowman_lights_unused1 = gdSPDefLights1( - 0x0d, 0x0c, 0x28, - 0x35, 0x32, 0xa2, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 snowman_lights_unused2 = gdSPDefLights1( - 0x3f, 0x00, 0x00, - 0xff, 0x00, 0x00, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 snowman_lights_unused3 = gdSPDefLights1( - 0x08, 0x07, 0x04, - 0x23, 0x1c, 0x12, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 snowman_lights_unused4 = gdSPDefLights1( - 0x03, 0x03, 0x02, - 0x0e, 0x0d, 0x0b, 0x28, 0x28, 0x28 -); // 0x05008C70 ALIGNED8 static const Texture snowman_seg5_texture_05008C70[] = { @@ -53,10 +37,6 @@ ALIGNED8 static const Texture snowman_seg5_texture_0500BC70[] = { }; // 0x0500C470 -static const Lights1 snowman_seg5_lights_0500C470 = gdSPDefLights1( - 0x1c, 0x0f, 0x07, - 0x38, 0x1e, 0x0e, 0x28, 0x28, 0x28 -); // 0x0500C488 static const Vtx snowman_seg5_vertex_0500C488[] = { @@ -68,8 +48,8 @@ static const Vtx snowman_seg5_vertex_0500C488[] = { // 0x0500C4C8 - 0x0500C500 const Gfx snowman_seg5_dl_0500C4C8[] = { - gsSPLight(&snowman_seg5_lights_0500C470.l, 1), - gsSPLight(&snowman_seg5_lights_0500C470.a, 2), + gsSPLightColor(LIGHT_1, 0x381e0eff), + gsSPLightColor(LIGHT_2, 0x1c0f07ff), gsSPVertex(snowman_seg5_vertex_0500C488, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP1Triangle( 0, 3, 1, 0x0), @@ -183,10 +163,6 @@ const Gfx snowman_seg5_dl_0500C760[] = { }; // 0x0500C7D0 -static const Lights1 snowman_seg5_lights_0500C7D0 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0500C7E8 static const Vtx snowman_seg5_vertex_0500C7E8[] = { @@ -226,8 +202,8 @@ const Gfx snowman_seg5_dl_0500C978[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, snowman_seg5_texture_05008C70), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&snowman_seg5_lights_0500C7D0.l, 1), - gsSPLight(&snowman_seg5_lights_0500C7D0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(snowman_seg5_vertex_0500C7E8, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 4, 0x0), gsSP2Triangles( 4, 1, 0, 0x0, 5, 4, 3, 0x0), diff --git a/actors/snufit/model.inc.c b/actors/snufit/model.inc.c index 0a4ea3b2..39bbc63b 100644 --- a/actors/snufit/model.inc.c +++ b/actors/snufit/model.inc.c @@ -21,16 +21,8 @@ ALIGNED8 static const Texture snufit_seg6_texture_060084E0[] = { }; // 0x06008CE0 -static const Lights1 snufit_seg6_lights_06008CE0 = gdSPDefLights1( - 0x47, 0x47, 0x47, - 0xb2, 0xb2, 0xb2, 0x28, 0x28, 0x28 -); // 0x06008CF8 -static const Lights1 snufit_seg6_lights_06008CF8 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x06008D10 static const Vtx snufit_seg6_vertex_06008D10[] = { @@ -138,8 +130,8 @@ const Gfx snufit_seg6_dl_060091E0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, snufit_seg6_texture_060080E0), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 32 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)), - gsSPLight(&snufit_seg6_lights_06008CE0.l, 1), - gsSPLight(&snufit_seg6_lights_06008CE0.a, 2), + gsSPLightColor(LIGHT_1, 0xb2b2b2ff), + gsSPLightColor(LIGHT_2, 0x474747ff), gsSPVertex(snufit_seg6_vertex_06008D10, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 0, 2, 0x0, 3, 5, 1, 0x0), @@ -155,8 +147,8 @@ const Gfx snufit_seg6_dl_06009278[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, snufit_seg6_texture_060078E0), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&snufit_seg6_lights_06008CF8.l, 1), - gsSPLight(&snufit_seg6_lights_06008CF8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(snufit_seg6_vertex_06008DF0, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 1, 3, 0x0), gsSP2Triangles( 2, 3, 4, 0x0, 4, 3, 5, 0x0), @@ -223,10 +215,6 @@ const Gfx snufit_seg6_dl_06009498[] = { }; // 0x06009530 -static const Lights1 snufit_seg6_lights_06009530 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x06009548 static const Vtx snufit_seg6_vertex_06009548[] = { @@ -259,8 +247,8 @@ const Gfx snufit_seg6_dl_06009668[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, snufit_seg6_texture_060080E0), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 32 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)), - gsSPLight(&snufit_seg6_lights_06009530.l, 1), - gsSPLight(&snufit_seg6_lights_06009530.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(snufit_seg6_vertex_06009548, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 0, 3, 0x0, 1, 5, 2, 0x0), @@ -303,10 +291,6 @@ const Gfx snufit_seg6_dl_06009748[] = { }; // 0x060097C8 -static const Lights1 snufit_seg6_lights_060097C8 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x060097E0 static const Vtx snufit_seg6_vertex_060097E0[] = { @@ -329,8 +313,8 @@ const Gfx snufit_seg6_dl_060098A0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, snufit_seg6_texture_060080E0), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 32 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)), - gsSPLight(&snufit_seg6_lights_060097C8.l, 1), - gsSPLight(&snufit_seg6_lights_060097C8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(snufit_seg6_vertex_060097E0, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 4, 0x0), gsSP2Triangles( 1, 4, 2, 0x0, 3, 5, 6, 0x0), @@ -394,10 +378,6 @@ const Gfx snufit_seg6_dl_06009A10[] = { }; // 0x06009A80 -static const Lights1 snufit_seg6_lights_06009A80 = gdSPDefLights1( - 0x65, 0x08, 0x08, - 0xfe, 0x14, 0x14, 0x28, 0x28, 0x28 -); // 0x06009A98 static const Vtx snufit_seg6_vertex_06009A98[] = { @@ -413,8 +393,8 @@ static const Vtx snufit_seg6_vertex_06009A98[] = { // 0x06009B18 - 0x06009B68 const Gfx snufit_seg6_dl_06009B18[] = { - gsSPLight(&snufit_seg6_lights_06009A80.l, 1), - gsSPLight(&snufit_seg6_lights_06009A80.a, 2), + gsSPLightColor(LIGHT_1, 0xfe1414ff), + gsSPLightColor(LIGHT_2, 0x650808ff), gsSPVertex(snufit_seg6_vertex_06009A98, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0), gsSP2Triangles( 1, 0, 3, 0x0, 4, 5, 6, 0x0), diff --git a/actors/spindrift/model.inc.c b/actors/spindrift/model.inc.c index 4675f7da..44660e79 100644 --- a/actors/spindrift/model.inc.c +++ b/actors/spindrift/model.inc.c @@ -128,10 +128,6 @@ const Gfx spindrift_seg5_dl_05002900[] = { }; // 0x05002970 -static const Lights1 spindrift_seg5_lights_05002970 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05002988 static const Vtx spindrift_seg5_vertex_05002988[] = { @@ -147,8 +143,8 @@ const Gfx spindrift_seg5_dl_050029C8[] = { gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), gsSPClearGeometryMode(G_CULL_BACK), - gsSPLight(&spindrift_seg5_lights_05002970.l, 1), - gsSPLight(&spindrift_seg5_lights_05002970.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(spindrift_seg5_vertex_05002988, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPSetGeometryMode(G_CULL_BACK), @@ -172,10 +168,6 @@ const Gfx spindrift_seg5_dl_05002A20[] = { }; // 0x05002A80 -static const Lights1 spindrift_seg5_lights_05002A80 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05002A98 static const Vtx spindrift_seg5_vertex_05002A98[] = { @@ -191,8 +183,8 @@ const Gfx spindrift_seg5_dl_05002AD8[] = { gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), gsSPClearGeometryMode(G_CULL_BACK), - gsSPLight(&spindrift_seg5_lights_05002A80.l, 1), - gsSPLight(&spindrift_seg5_lights_05002A80.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(spindrift_seg5_vertex_05002A98, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0), gsSPSetGeometryMode(G_CULL_BACK), @@ -216,10 +208,6 @@ const Gfx spindrift_seg5_dl_05002B30[] = { }; // 0x05002B90 -static const Lights1 spindrift_seg5_lights_05002B90 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05002BA8 static const Vtx spindrift_seg5_vertex_05002BA8[] = { @@ -246,8 +234,8 @@ const Gfx spindrift_seg5_dl_05002C98[] = { gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), gsSPClearGeometryMode(G_CULL_BACK), - gsSPLight(&spindrift_seg5_lights_05002B90.l, 1), - gsSPLight(&spindrift_seg5_lights_05002B90.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(spindrift_seg5_vertex_05002BA8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), @@ -273,28 +261,12 @@ const Gfx spindrift_seg5_dl_05002D08[] = { }; // 0x05000030 -static const Lights1 spindrift_seg5_lights_05000030 = gdSPDefLights1( - 0x12, 0x2c, 0x00, - 0x49, 0xb2, 0x00, 0x28, 0x28, 0x28 -); // 0x05000048 -static const Lights1 spindrift_seg5_lights_05000048 = gdSPDefLights1( - 0x37, 0x3f, 0x00, - 0xdd, 0xff, 0x01, 0x28, 0x28, 0x28 -); // 0x05000078 -static const Lights1 spindrift_seg5_lights_05000078 = gdSPDefLights1( - 0x3f, 0x38, 0x00, - 0xff, 0xe2, 0x00, 0x28, 0x28, 0x28 -); // 0x05000090 -static const Lights1 spindrift_seg5_lights_05000090 = gdSPDefLights1( - 0x00, 0x0f, 0x00, - 0x00, 0x3f, 0x00, 0x28, 0x28, 0x28 -); // 0x050000C0 static const Vtx spindrift_seg5_vertex_050000C0[] = { @@ -344,14 +316,14 @@ static const Vtx spindrift_seg5_vertex_05000210[] = { // 0x050002A0 - 0x05000328 const Gfx spindrift_seg5_dl_050002A0[] = { - gsSPLight(&spindrift_seg5_lights_05000048.l, 1), - gsSPLight(&spindrift_seg5_lights_05000048.a, 2), + gsSPLightColor(LIGHT_1, 0xddff01ff), + gsSPLightColor(LIGHT_2, 0x373f00ff), gsSPVertex(spindrift_seg5_vertex_050000C0, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 2, 0x0), gsSP2Triangles( 1, 3, 2, 0x0, 4, 5, 2, 0x0), gsSP1Triangle( 5, 0, 2, 0x0), - gsSPLight(&spindrift_seg5_lights_05000030.l, 1), - gsSPLight(&spindrift_seg5_lights_05000030.a, 2), + gsSPLightColor(LIGHT_1, 0x49b200ff), + gsSPLightColor(LIGHT_2, 0x122c00ff), gsSPVertex(spindrift_seg5_vertex_05000120, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 1, 0, 4, 0x0, 4, 0, 5, 0x0), @@ -362,15 +334,15 @@ const Gfx spindrift_seg5_dl_050002A0[] = { // 0x05000328 - 0x050003D8 const Gfx spindrift_seg5_dl_05000328[] = { gsSPClearGeometryMode(G_CULL_BACK), - gsSPLight(&spindrift_seg5_lights_05000090.l, 1), - gsSPLight(&spindrift_seg5_lights_05000090.a, 2), + gsSPLightColor(LIGHT_1, 0x3f00ff), + gsSPLightColor(LIGHT_2, 0xf00ff), gsSPVertex(spindrift_seg5_vertex_05000180, 9, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 0, 3, 0x0), gsSP2Triangles( 0, 4, 3, 0x0, 1, 5, 6, 0x0), gsSP2Triangles( 7, 4, 0, 0x0, 5, 4, 8, 0x0), gsSP2Triangles( 5, 1, 3, 0x0, 4, 5, 3, 0x0), - gsSPLight(&spindrift_seg5_lights_05000078.l, 1), - gsSPLight(&spindrift_seg5_lights_05000078.a, 2), + gsSPLightColor(LIGHT_1, 0xffe200ff), + gsSPLightColor(LIGHT_2, 0x3f3800ff), gsSPVertex(spindrift_seg5_vertex_05000210, 9, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 4, 0x0), gsSP2Triangles( 1, 5, 6, 0x0, 5, 7, 8, 0x0), diff --git a/actors/spiny/model.inc.c b/actors/spiny/model.inc.c index b03daf13..94504f4e 100644 --- a/actors/spiny/model.inc.c +++ b/actors/spiny/model.inc.c @@ -1,40 +1,16 @@ // Spiny // 0x050157F8 -static const Lights1 spiny_seg5_lights_050157F8 = gdSPDefLights1( - 0x32, 0x23, 0x0a, - 0xca, 0x8d, 0x29, 0x28, 0x28, 0x28 -); // 0x05015810 -static const Lights1 spiny_seg5_lights_05015810 = gdSPDefLights1( - 0x3a, 0x2c, 0x1f, - 0xeb, 0xb0, 0x7f, 0x28, 0x28, 0x28 -); // 0x05015828 -static const Lights1 spiny_seg5_lights_05015828 = gdSPDefLights1( - 0x2c, 0x2c, 0x2c, - 0xb2, 0xb2, 0xb2, 0x28, 0x28, 0x28 -); // 0x05015840 -static const Lights1 spiny_seg5_lights_05015840 = gdSPDefLights1( - 0x3f, 0x00, 0x00, - 0xff, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x05015858 -static const Lights1 spiny_seg5_lights_05015858 = gdSPDefLights1( - 0x3d, 0x25, 0x01, - 0xf4, 0x96, 0x07, 0x28, 0x28, 0x28 -); // 0x05015870 -static const Lights1 spiny_seg5_lights_05015870 = gdSPDefLights1( - 0x3c, 0x2c, 0x09, - 0xf1, 0xb2, 0x25, 0x28, 0x28, 0x28 -); // 0x05015888 static const Vtx spiny_seg5_vertex_05015888[] = { @@ -287,8 +263,8 @@ static const Vtx spiny_seg5_vertex_05016328[] = { // 0x05016418 - 0x050164E0 const Gfx spiny_seg5_dl_05016418[] = { - gsSPLight(&spiny_seg5_lights_050157F8.l, 1), - gsSPLight(&spiny_seg5_lights_050157F8.a, 2), + gsSPLightColor(LIGHT_1, 0xca8d29ff), + gsSPLightColor(LIGHT_2, 0x32230aff), gsSPVertex(spiny_seg5_vertex_05015888, 13, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 7, 0x0, 8, 7, 9, 0x0), @@ -297,8 +273,8 @@ const Gfx spiny_seg5_dl_05016418[] = { gsSP2Triangles( 3, 5, 11, 0x0, 11, 5, 0, 0x0), gsSP2Triangles( 7, 8, 3, 0x0, 9, 12, 8, 0x0), gsSP2Triangles( 9, 2, 1, 0x0, 2, 10, 0, 0x0), - gsSPLight(&spiny_seg5_lights_05015810.l, 1), - gsSPLight(&spiny_seg5_lights_05015810.a, 2), + gsSPLightColor(LIGHT_1, 0xebb07fff), + gsSPLightColor(LIGHT_2, 0x3a2c1fff), gsSPVertex(spiny_seg5_vertex_05015958, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0), gsSP2Triangles( 3, 4, 0, 0x0, 1, 5, 2, 0x0), @@ -307,8 +283,8 @@ const Gfx spiny_seg5_dl_05016418[] = { // 0x050164E0 - 0x050165A8 const Gfx spiny_seg5_dl_050164E0[] = { - gsSPLight(&spiny_seg5_lights_050157F8.l, 1), - gsSPLight(&spiny_seg5_lights_050157F8.a, 2), + gsSPLightColor(LIGHT_1, 0xca8d29ff), + gsSPLightColor(LIGHT_2, 0x32230aff), gsSPVertex(spiny_seg5_vertex_050159B8, 13, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 7, 0x0, 8, 7, 9, 0x0), @@ -317,8 +293,8 @@ const Gfx spiny_seg5_dl_050164E0[] = { gsSP2Triangles( 3, 5, 11, 0x0, 11, 5, 0, 0x0), gsSP2Triangles( 7, 8, 3, 0x0, 9, 12, 8, 0x0), gsSP2Triangles( 9, 2, 1, 0x0, 2, 10, 0, 0x0), - gsSPLight(&spiny_seg5_lights_05015810.l, 1), - gsSPLight(&spiny_seg5_lights_05015810.a, 2), + gsSPLightColor(LIGHT_1, 0xebb07fff), + gsSPLightColor(LIGHT_2, 0x3a2c1fff), gsSPVertex(spiny_seg5_vertex_05015A88, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0), gsSP2Triangles( 3, 4, 0, 0x0, 1, 5, 2, 0x0), @@ -327,8 +303,8 @@ const Gfx spiny_seg5_dl_050164E0[] = { // 0x050165A8 - 0x05016670 const Gfx spiny_seg5_dl_050165A8[] = { - gsSPLight(&spiny_seg5_lights_050157F8.l, 1), - gsSPLight(&spiny_seg5_lights_050157F8.a, 2), + gsSPLightColor(LIGHT_1, 0xca8d29ff), + gsSPLightColor(LIGHT_2, 0x32230aff), gsSPVertex(spiny_seg5_vertex_05015AE8, 13, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 5, 0x0, 8, 6, 9, 0x0), @@ -337,8 +313,8 @@ const Gfx spiny_seg5_dl_050165A8[] = { gsSP2Triangles(10, 3, 5, 0x0, 2, 3, 10, 0x0), gsSP2Triangles( 5, 9, 6, 0x0, 9, 12, 8, 0x0), gsSP2Triangles( 1, 0, 8, 0x0, 2, 11, 0, 0x0), - gsSPLight(&spiny_seg5_lights_05015810.l, 1), - gsSPLight(&spiny_seg5_lights_05015810.a, 2), + gsSPLightColor(LIGHT_1, 0xebb07fff), + gsSPLightColor(LIGHT_2, 0x3a2c1fff), gsSPVertex(spiny_seg5_vertex_05015BB8, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0), gsSP2Triangles( 2, 4, 3, 0x0, 0, 5, 1, 0x0), @@ -347,8 +323,8 @@ const Gfx spiny_seg5_dl_050165A8[] = { // 0x05016670 - 0x05016738 const Gfx spiny_seg5_dl_05016670[] = { - gsSPLight(&spiny_seg5_lights_050157F8.l, 1), - gsSPLight(&spiny_seg5_lights_050157F8.a, 2), + gsSPLightColor(LIGHT_1, 0xca8d29ff), + gsSPLightColor(LIGHT_2, 0x32230aff), gsSPVertex(spiny_seg5_vertex_05015C18, 13, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 5, 0x0, 8, 6, 9, 0x0), @@ -357,8 +333,8 @@ const Gfx spiny_seg5_dl_05016670[] = { gsSP2Triangles(10, 3, 5, 0x0, 2, 3, 10, 0x0), gsSP2Triangles( 5, 9, 6, 0x0, 9, 12, 8, 0x0), gsSP2Triangles( 1, 0, 8, 0x0, 2, 11, 0, 0x0), - gsSPLight(&spiny_seg5_lights_05015810.l, 1), - gsSPLight(&spiny_seg5_lights_05015810.a, 2), + gsSPLightColor(LIGHT_1, 0xebb07fff), + gsSPLightColor(LIGHT_2, 0x3a2c1fff), gsSPVertex(spiny_seg5_vertex_05015CE8, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0), gsSP2Triangles( 2, 4, 3, 0x0, 0, 5, 1, 0x0), @@ -367,8 +343,8 @@ const Gfx spiny_seg5_dl_05016670[] = { // 0x05016738 - 0x05016A48 const Gfx spiny_seg5_dl_05016738[] = { - gsSPLight(&spiny_seg5_lights_05015828.l, 1), - gsSPLight(&spiny_seg5_lights_05015828.a, 2), + gsSPLightColor(LIGHT_1, 0xb2b2b2ff), + gsSPLightColor(LIGHT_2, 0x2c2c2cff), gsSPVertex(spiny_seg5_vertex_05015D48, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 1, 3, 0x0), gsSP2Triangles( 3, 4, 2, 0x0, 1, 0, 5, 0x0), @@ -389,8 +365,8 @@ const Gfx spiny_seg5_dl_05016738[] = { gsSPVertex(spiny_seg5_vertex_05015F48, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 4, 0x0), gsSP2Triangles( 5, 2, 4, 0x0, 4, 2, 1, 0x0), - gsSPLight(&spiny_seg5_lights_05015858.l, 1), - gsSPLight(&spiny_seg5_lights_05015858.a, 2), + gsSPLightColor(LIGHT_1, 0xf49607ff), + gsSPLightColor(LIGHT_2, 0x3d2501ff), gsSPVertex(spiny_seg5_vertex_05015FA8, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 2, 1, 0x0), gsSP2Triangles( 0, 2, 4, 0x0, 5, 6, 7, 0x0), @@ -402,8 +378,8 @@ const Gfx spiny_seg5_dl_05016738[] = { gsSP2Triangles( 0, 9, 10, 0x0, 0, 10, 1, 0x0), gsSP2Triangles( 6, 5, 0, 0x0, 15, 10, 13, 0x0), gsSP2Triangles( 3, 1, 15, 0x0, 10, 15, 1, 0x0), - gsSPLight(&spiny_seg5_lights_05015840.l, 1), - gsSPLight(&spiny_seg5_lights_05015840.a, 2), + gsSPLightColor(LIGHT_1, 0xff0000ff), + gsSPLightColor(LIGHT_2, 0x3f0000ff), gsSPVertex(spiny_seg5_vertex_050160A8, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 0, 8, 1, 0x0), @@ -411,8 +387,8 @@ const Gfx spiny_seg5_dl_05016738[] = { gsSP2Triangles( 3, 5, 9, 0x0, 1, 8, 7, 0x0), gsSP2Triangles( 3, 9, 2, 0x0, 3, 7, 4, 0x0), gsSP2Triangles( 4, 7, 6, 0x0, 4, 6, 5, 0x0), - gsSPLight(&spiny_seg5_lights_05015870.l, 1), - gsSPLight(&spiny_seg5_lights_05015870.a, 2), + gsSPLightColor(LIGHT_1, 0xf1b225ff), + gsSPLightColor(LIGHT_2, 0x3c2c09ff), gsSPVertex(spiny_seg5_vertex_05016148, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), diff --git a/actors/spiny_egg/model.inc.c b/actors/spiny_egg/model.inc.c index ddab31bb..75ac3749 100644 --- a/actors/spiny_egg/model.inc.c +++ b/actors/spiny_egg/model.inc.c @@ -1,16 +1,8 @@ // Spiny Egg // 0x050144F8 -static const Lights1 spiny_egg_seg5_lights_050144F8 = gdSPDefLights1( - 0x3f, 0x3f, 0x00, - 0xff, 0xff, 0x00, 0x28, 0x28, 0x28 -); // 0x05014510 -static const Lights1 spiny_egg_seg5_lights_05014510 = gdSPDefLights1( - 0x3f, 0x00, 0x00, - 0xff, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x05014528 static const Vtx spiny_egg_seg5_vertex_05014528[] = { @@ -278,8 +270,8 @@ static const Vtx spiny_egg_seg5_vertex_050150A8[] = { // 0x050151A8 - 0x050151E0 const Gfx spiny_egg_seg5_dl_050151A8[] = { - gsSPLight(&spiny_egg_seg5_lights_050144F8.l, 1), - gsSPLight(&spiny_egg_seg5_lights_050144F8.a, 2), + gsSPLightColor(LIGHT_1, 0xffff00ff), + gsSPLightColor(LIGHT_2, 0x3f3f00ff), gsSPVertex(spiny_egg_seg5_vertex_05014528, 9, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP1Triangle( 6, 7, 8, 0x0), @@ -288,8 +280,8 @@ const Gfx spiny_egg_seg5_dl_050151A8[] = { // 0x050151E0 - 0x05015218 const Gfx spiny_egg_seg5_dl_050151E0[] = { - gsSPLight(&spiny_egg_seg5_lights_050144F8.l, 1), - gsSPLight(&spiny_egg_seg5_lights_050144F8.a, 2), + gsSPLightColor(LIGHT_1, 0xffff00ff), + gsSPLightColor(LIGHT_2, 0x3f3f00ff), gsSPVertex(spiny_egg_seg5_vertex_050145B8, 9, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP1Triangle( 6, 7, 8, 0x0), @@ -298,8 +290,8 @@ const Gfx spiny_egg_seg5_dl_050151E0[] = { // 0x05015218 - 0x05015250 const Gfx spiny_egg_seg5_dl_05015218[] = { - gsSPLight(&spiny_egg_seg5_lights_050144F8.l, 1), - gsSPLight(&spiny_egg_seg5_lights_050144F8.a, 2), + gsSPLightColor(LIGHT_1, 0xffff00ff), + gsSPLightColor(LIGHT_2, 0x3f3f00ff), gsSPVertex(spiny_egg_seg5_vertex_05014648, 9, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP1Triangle( 6, 7, 8, 0x0), @@ -308,8 +300,8 @@ const Gfx spiny_egg_seg5_dl_05015218[] = { // 0x05015250 - 0x05015288 const Gfx spiny_egg_seg5_dl_05015250[] = { - gsSPLight(&spiny_egg_seg5_lights_050144F8.l, 1), - gsSPLight(&spiny_egg_seg5_lights_050144F8.a, 2), + gsSPLightColor(LIGHT_1, 0xffff00ff), + gsSPLightColor(LIGHT_2, 0x3f3f00ff), gsSPVertex(spiny_egg_seg5_vertex_050146D8, 9, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP1Triangle( 6, 7, 8, 0x0), @@ -318,8 +310,8 @@ const Gfx spiny_egg_seg5_dl_05015250[] = { // 0x05015288 - 0x050152C0 const Gfx spiny_egg_seg5_dl_05015288[] = { - gsSPLight(&spiny_egg_seg5_lights_050144F8.l, 1), - gsSPLight(&spiny_egg_seg5_lights_050144F8.a, 2), + gsSPLightColor(LIGHT_1, 0xffff00ff), + gsSPLightColor(LIGHT_2, 0x3f3f00ff), gsSPVertex(spiny_egg_seg5_vertex_05014768, 9, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP1Triangle( 6, 7, 8, 0x0), @@ -328,8 +320,8 @@ const Gfx spiny_egg_seg5_dl_05015288[] = { // 0x050152C0 - 0x050152F8 const Gfx spiny_egg_seg5_dl_050152C0[] = { - gsSPLight(&spiny_egg_seg5_lights_050144F8.l, 1), - gsSPLight(&spiny_egg_seg5_lights_050144F8.a, 2), + gsSPLightColor(LIGHT_1, 0xffff00ff), + gsSPLightColor(LIGHT_2, 0x3f3f00ff), gsSPVertex(spiny_egg_seg5_vertex_050147F8, 9, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP1Triangle( 6, 7, 8, 0x0), @@ -338,8 +330,8 @@ const Gfx spiny_egg_seg5_dl_050152C0[] = { // 0x050152F8 - 0x05015330 const Gfx spiny_egg_seg5_dl_050152F8[] = { - gsSPLight(&spiny_egg_seg5_lights_050144F8.l, 1), - gsSPLight(&spiny_egg_seg5_lights_050144F8.a, 2), + gsSPLightColor(LIGHT_1, 0xffff00ff), + gsSPLightColor(LIGHT_2, 0x3f3f00ff), gsSPVertex(spiny_egg_seg5_vertex_05014888, 9, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP1Triangle( 6, 7, 8, 0x0), @@ -348,8 +340,8 @@ const Gfx spiny_egg_seg5_dl_050152F8[] = { // 0x05015330 - 0x05015368 const Gfx spiny_egg_seg5_dl_05015330[] = { - gsSPLight(&spiny_egg_seg5_lights_050144F8.l, 1), - gsSPLight(&spiny_egg_seg5_lights_050144F8.a, 2), + gsSPLightColor(LIGHT_1, 0xffff00ff), + gsSPLightColor(LIGHT_2, 0x3f3f00ff), gsSPVertex(spiny_egg_seg5_vertex_05014918, 9, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP1Triangle( 6, 7, 8, 0x0), @@ -358,8 +350,8 @@ const Gfx spiny_egg_seg5_dl_05015330[] = { // 0x05015368 - 0x05015740 const Gfx spiny_egg_seg5_dl_05015368[] = { - gsSPLight(&spiny_egg_seg5_lights_05014510.l, 1), - gsSPLight(&spiny_egg_seg5_lights_05014510.a, 2), + gsSPLightColor(LIGHT_1, 0xff0000ff), + gsSPLightColor(LIGHT_2, 0x3f0000ff), gsSPVertex(spiny_egg_seg5_vertex_050149A8, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 0, 3, 0x0), gsSP2Triangles( 1, 3, 4, 0x0, 4, 3, 5, 0x0), diff --git a/actors/springboard/model.inc.c b/actors/springboard/model.inc.c index 61a7a06c..675de04c 100644 --- a/actors/springboard/model.inc.c +++ b/actors/springboard/model.inc.c @@ -1,10 +1,6 @@ // Springboard (unused) // 0x05000000 -static const Lights1 springboard_seg5_lights_05000000 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05000018 ALIGNED8 static const Texture springboard_seg5_texture_05000018[] = { @@ -167,8 +163,8 @@ const Gfx springboard_checkerboard_seg5_dl_050016B8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, springboard_seg5_texture_05000018), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&springboard_seg5_lights_05000000.l, 1), - gsSPLight(&springboard_seg5_lights_05000000.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(springboard_seg5_vertex_05001018, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 6, 9, 7, 0x0), @@ -203,8 +199,8 @@ const Gfx springboard_spring_seg5_dl_05001800[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, springboard_seg5_texture_05000818), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&springboard_seg5_lights_05000000.l, 1), - gsSPLight(&springboard_seg5_lights_05000000.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(springboard_seg5_vertex_050012B8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -234,8 +230,8 @@ const Gfx springboard_checkerboard_seg5_dl_05001900[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, springboard_seg5_texture_05000018), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&springboard_seg5_lights_05000000.l, 1), - gsSPLight(&springboard_seg5_lights_05000000.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(springboard_seg5_vertex_05001458, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 5, 7, 6, 0x0), diff --git a/actors/star/model.inc.c b/actors/star/model.inc.c index 8ead89af..096a38a9 100644 --- a/actors/star/model.inc.c +++ b/actors/star/model.inc.c @@ -1,10 +1,6 @@ // Star // 0x0302A6D8 -static const Lights1 star_seg3_lights = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0302A6F0 ALIGNED8 static const Texture star_seg3_texture_0302A6F0[] = { @@ -34,8 +30,8 @@ static const Vtx star_seg3_vertex_body[] = { // 0x0302B7B0 - 0x0302B870 const Gfx star_seg3_sub_dl_body[] = { - gsSPLight(&star_seg3_lights.l, 1), - gsSPLight(&star_seg3_lights.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(star_seg3_vertex_body, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 2, 1, 4, 0x0, 1, 3, 4, 0x0), @@ -86,8 +82,8 @@ const Gfx star_seg3_sub_dl_eyes[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, star_seg3_texture_0302AEF0), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&star_seg3_lights.l, 1), - gsSPLight(&star_seg3_lights.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(star_seg3_vertex_eyes, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 7, 8, 9, 0x0), diff --git a/actors/swoop/model.inc.c b/actors/swoop/model.inc.c index d1a3a29c..f7a58ce6 100644 --- a/actors/swoop/model.inc.c +++ b/actors/swoop/model.inc.c @@ -1,16 +1,8 @@ // Swoop // Unreferenced light group -UNUSED static const Lights1 swoop_lights_unused1 = gdSPDefLights1( - 0x0a, 0x00, 0x25, - 0x2a, 0x00, 0x95, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 swoop_lights_unused2 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x06004270 ALIGNED8 static const Texture swoop_seg6_texture_06004270[] = { @@ -33,10 +25,6 @@ ALIGNED8 static const Texture swoop_seg6_texture_06005A70[] = { }; // 0x06006270 -static const Lights1 swoop_seg6_lights_06006270 = gdSPDefLights1( - 0x79, 0x79, 0x79, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x06006288 static const Vtx swoop_seg6_vertex_06006288[] = { @@ -110,8 +98,8 @@ const Gfx swoop_seg6_dl_060065B8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, swoop_seg6_texture_06004A70), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&swoop_seg6_lights_06006270.l, 1), - gsSPLight(&swoop_seg6_lights_06006270.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x797979ff), gsSPVertex(swoop_seg6_vertex_06006288, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 5, 6, 3, 0x0, 3, 7, 4, 0x0), @@ -219,10 +207,6 @@ const Gfx swoop_seg6_dl_06006880[] = { }; // 0x06006938 -static const Lights1 swoop_seg6_lights_06006938 = gdSPDefLights1( - 0x79, 0x79, 0x79, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x06006950 static const Vtx swoop_seg6_vertex_06006950[] = { @@ -249,8 +233,8 @@ const Gfx swoop_seg6_dl_06006A10[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, swoop_seg6_texture_06005270), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&swoop_seg6_lights_06006938.l, 1), - gsSPLight(&swoop_seg6_lights_06006938.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x797979ff), gsSPVertex(swoop_seg6_vertex_06006950, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), diff --git a/actors/test_platform/model.inc.c b/actors/test_platform/model.inc.c index b0111608..76bca485 100644 --- a/actors/test_platform/model.inc.c +++ b/actors/test_platform/model.inc.c @@ -1,10 +1,6 @@ // Test Platform (small tiny platform 1/4th the size of a box. Probably used in early modeling tests?) // 0x08026008 -static const Lights1 unknown_seg8_lights_08026008 = gdSPDefLights1( - 0x32, 0x32, 0x07, - 0xc8, 0xc8, 0x1e, 0x28, 0x28, 0x28 -); // 0x08026020 static const Vtx unknown_seg8_vertex_08026020[] = { @@ -56,7 +52,8 @@ static const Vtx unknown_seg8_vertex_08026200[] = { // 0x08026260 - 0x080262F8 const Gfx unknown_seg8_dl_08026260[] = { - gsSPSetLights1(unknown_seg8_lights_08026008), + gsSPLightColor(LIGHT_1, 0xc8c81eff), + gsSPLightColor(LIGHT_2, 0x323207ff), gsSPVertex(unknown_seg8_vertex_08026020, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), diff --git a/actors/thwomp/model.inc.c b/actors/thwomp/model.inc.c index 2dee226e..7e72ec17 100644 --- a/actors/thwomp/model.inc.c +++ b/actors/thwomp/model.inc.c @@ -1,10 +1,6 @@ // Thwomp // 0x050098E8 -static const Lights1 thwomp_seg5_lights_050098E8 = gdSPDefLights1( - 0x4c, 0x4c, 0x4c, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x05009900 ALIGNED8 static const Texture thwomp_seg5_texture_05009900[] = { @@ -116,8 +112,8 @@ const Gfx thwomp_seg5_dl_0500B570[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, thwomp_seg5_texture_0500A900), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&thwomp_seg5_lights_050098E8.l, 1), - gsSPLight(&thwomp_seg5_lights_050098E8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(thwomp_seg5_vertex_0500B100, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0), gsSP2Triangles( 0, 3, 4, 0x0, 0, 4, 5, 0x0), diff --git a/actors/toad/model.inc.c b/actors/toad/model.inc.c index b9c0ddd3..714019e9 100644 --- a/actors/toad/model.inc.c +++ b/actors/toad/model.inc.c @@ -1,10 +1,6 @@ // Toad // 0x06005908 -static const Lights1 toad_seg6_lights_06005908 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x06005920 ALIGNED8 static const Texture toad_seg6_texture_06005920[] = { @@ -223,8 +219,8 @@ const Gfx toad_seg6_dl_06007300[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, toad_seg6_texture_06005920), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&toad_seg6_lights_06005908.l, 1), - gsSPLight(&toad_seg6_lights_06005908.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(toad_seg6_vertex_06006920, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 4, 0x0), gsSP2Triangles( 2, 4, 0, 0x0, 0, 5, 6, 0x0), @@ -348,10 +344,6 @@ const Gfx toad_seg6_us_dl_06007788[] = { }; // 0x06007788 -static const Lights1 toad_seg6_lights_06007788 = gdSPDefLights1( - 0x21, 0x13, 0x5a, - 0x42, 0x27, 0xb5, 0x28, 0x28, 0x28 -); // 0x060077A0 static const Vtx toad_seg6_vertex_060077A0[] = { @@ -391,8 +383,8 @@ static const Vtx toad_seg6_vertex_060078A0[] = { // 0x06007960 - 0x06007A48 const Gfx toad_seg6_dl_06007960[] = { - gsSPLight(&toad_seg6_lights_06007788.l, 1), - gsSPLight(&toad_seg6_lights_06007788.a, 2), + gsSPLightColor(LIGHT_1, 0x4227b5ff), + gsSPLightColor(LIGHT_2, 0x21135aff), gsSPVertex(toad_seg6_vertex_060077A0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 6, 7, 0x0, 4, 7, 8, 0x0), @@ -431,16 +423,8 @@ const Gfx toad_seg6_us_dl_06007B00[] = { }; // 0x06007A80 -static const Lights1 toad_seg6_lights_06007A80 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x06007A98 -static const Lights1 toad_seg6_lights_06007A98 = gdSPDefLights1( - 0x7f, 0x6a, 0x50, - 0xfe, 0xd5, 0xa1, 0x28, 0x28, 0x28 -); // 0x06007AB0 static const Vtx toad_seg6_vertex_06007AB0[] = { @@ -494,8 +478,8 @@ static const Vtx toad_seg6_vertex_06007C50[] = { // 0x06007D10 - 0x06007EB0 const Gfx toad_seg6_dl_06007D10[] = { - gsSPLight(&toad_seg6_lights_06007A80.l, 1), - gsSPLight(&toad_seg6_lights_06007A80.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(toad_seg6_vertex_06007AB0, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 3, 6, 7, 0x0), @@ -514,8 +498,8 @@ const Gfx toad_seg6_dl_06007D10[] = { gsSP2Triangles( 5, 9, 0, 0x0, 0, 9, 1, 0x0), gsSP2Triangles(11, 6, 0, 0x0, 11, 0, 2, 0x0), gsSP1Triangle( 0, 6, 5, 0x0), - gsSPLight(&toad_seg6_lights_06007A98.l, 1), - gsSPLight(&toad_seg6_lights_06007A98.a, 2), + gsSPLightColor(LIGHT_1, 0xfed5a1ff), + gsSPLightColor(LIGHT_2, 0x7f6a50ff), gsSPVertex(toad_seg6_vertex_06007C50, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0), gsSP2Triangles( 4, 2, 1, 0x0, 4, 1, 5, 0x0), @@ -537,10 +521,6 @@ const Gfx toad_seg6_dl_06007EB0[] = { }; // 0x06007ED8 -static const Lights1 toad_seg6_lights_06007ED8 = gdSPDefLights1( - 0x7f, 0x6a, 0x50, - 0xfe, 0xd5, 0xa1, 0x28, 0x28, 0x28 -); // 0x06007EF0 static const Vtx toad_seg6_vertex_06007EF0[] = { @@ -581,8 +561,8 @@ static const Vtx toad_seg6_vertex_06007FF0[] = { // 0x060080C0 - 0x060081F8 const Gfx toad_seg6_dl_060080C0[] = { - gsSPLight(&toad_seg6_lights_06007ED8.l, 1), - gsSPLight(&toad_seg6_lights_06007ED8.a, 2), + gsSPLightColor(LIGHT_1, 0xfed5a1ff), + gsSPLightColor(LIGHT_2, 0x7f6a50ff), gsSPVertex(toad_seg6_vertex_06007EF0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 0, 3, 0x0), gsSP2Triangles( 0, 2, 4, 0x0, 4, 3, 0, 0x0), @@ -615,10 +595,6 @@ const Gfx toad_seg6_dl_060081F8[] = { }; // 0x06008220 -static const Lights1 toad_seg6_lights_06008220 = gdSPDefLights1( - 0x7f, 0x6a, 0x50, - 0xfe, 0xd5, 0xa1, 0x28, 0x28, 0x28 -); // 0x06008238 static const Vtx toad_seg6_vertex_06008238[] = { @@ -657,8 +633,8 @@ static const Vtx toad_seg6_vertex_06008338[] = { // 0x060083E8 - 0x06008520 const Gfx toad_seg6_dl_060083E8[] = { - gsSPLight(&toad_seg6_lights_06008220.l, 1), - gsSPLight(&toad_seg6_lights_06008220.a, 2), + gsSPLightColor(LIGHT_1, 0xfed5a1ff), + gsSPLightColor(LIGHT_2, 0x7f6a50ff), gsSPVertex(toad_seg6_vertex_06008238, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 0, 0x0), gsSP2Triangles( 5, 1, 0, 0x0, 0, 4, 6, 0x0), @@ -708,10 +684,6 @@ const Gfx toad_seg6_us_dl_06008608[] = { }; // 0x06008560 -static const Lights1 toad_seg6_lights_06008560 = gdSPDefLights1( - 0x34, 0x20, 0x0d, - 0x68, 0x40, 0x1b, 0x28, 0x28, 0x28 -); // 0x06008578 static const Vtx toad_seg6_vertex_06008578[] = { @@ -752,8 +724,8 @@ static const Vtx toad_seg6_vertex_06008678[] = { // 0x06008748 - 0x06008890 const Gfx toad_seg6_dl_06008748[] = { - gsSPLight(&toad_seg6_lights_06008560.l, 1), - gsSPLight(&toad_seg6_lights_06008560.a, 2), + gsSPLightColor(LIGHT_1, 0x68401bff), + gsSPLightColor(LIGHT_2, 0x34200dff), gsSPVertex(toad_seg6_vertex_06008578, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 2, 4, 5, 0x0, 2, 5, 6, 0x0), @@ -788,10 +760,6 @@ const Gfx toad_seg6_dl_06008890[] = { }; // 0x060088B8 -static const Lights1 toad_seg6_lights_060088B8 = gdSPDefLights1( - 0x34, 0x20, 0x0d, - 0x68, 0x40, 0x1b, 0x28, 0x28, 0x28 -); // 0x060088D0 static const Vtx toad_seg6_vertex_060088D0[] = { @@ -831,8 +799,8 @@ static const Vtx toad_seg6_vertex_060089D0[] = { // 0x06008A90 - 0x06008BD8 const Gfx toad_seg6_dl_06008A90[] = { - gsSPLight(&toad_seg6_lights_060088B8.l, 1), - gsSPLight(&toad_seg6_lights_060088B8.a, 2), + gsSPLightColor(LIGHT_1, 0x68401bff), + gsSPLightColor(LIGHT_2, 0x34200dff), gsSPVertex(toad_seg6_vertex_060088D0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 4, 0x0), gsSP2Triangles( 0, 4, 1, 0x0, 0, 2, 5, 0x0), diff --git a/actors/tornado/model.inc.c b/actors/tornado/model.inc.c index 42f3dad0..9d92f397 100644 --- a/actors/tornado/model.inc.c +++ b/actors/tornado/model.inc.c @@ -6,10 +6,6 @@ ALIGNED8 static const Texture tornado_seg5_texture_05013128[] = { }; // 0x05014128 -static const Lights1 tornado_seg5_lights_05014128 = gdSPDefLights1( - 0x3b, 0x34, 0x23, - 0xee, 0xd0, 0x8d, 0x28, 0x28, 0x28 -); // 0x05014140 static const Vtx tornado_seg5_vertex_05014140[] = { @@ -81,8 +77,8 @@ const Gfx tornado_seg5_dl_05014450[] = { gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, tornado_seg5_texture_05013128), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&tornado_seg5_lights_05014128.l, 1), - gsSPLight(&tornado_seg5_lights_05014128.a, 2), + gsSPLightColor(LIGHT_1, 0xeed08dff), + gsSPLightColor(LIGHT_2, 0x3b3423ff), gsSPVertex(tornado_seg5_vertex_05014140, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 4, 0x0), gsSP2Triangles( 0, 5, 6, 0x0, 0, 6, 1, 0x0), diff --git a/actors/transparent_star/model.inc.c b/actors/transparent_star/model.inc.c index 86b5bdb1..753667c5 100644 --- a/actors/transparent_star/model.inc.c +++ b/actors/transparent_star/model.inc.c @@ -1,10 +1,6 @@ // Transparent Star // 0x0302C488 -static const Lights1 transparent_star_seg3_lights_body = gdSPDefLights1( - 0x03, 0x05, 0x17, - 0x1e, 0x32, 0xe6, 0x28, 0x28, 0x28 -); // 0x0302C4A0 static const Vtx transparent_star_seg3_vertex_body[] = { @@ -24,8 +20,8 @@ static const Vtx transparent_star_seg3_vertex_body[] = { // 0x0302C560 - 0x0302C620 const Gfx transparent_star_seg3_sub_dl_body[] = { - gsSPLight(&transparent_star_seg3_lights_body.l, 1), - gsSPLight(&transparent_star_seg3_lights_body.a, 2), + gsSPLightColor(LIGHT_1, 0x1e32e6ff), + gsSPLightColor(LIGHT_2, 0x30517ff), gsSPVertex(transparent_star_seg3_vertex_body, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 2, 1, 4, 0x0, 1, 3, 4, 0x0), diff --git a/actors/treasure_chest/model.inc.c b/actors/treasure_chest/model.inc.c index 3b0bb9e4..9b98c1bd 100644 --- a/actors/treasure_chest/model.inc.c +++ b/actors/treasure_chest/model.inc.c @@ -1,10 +1,6 @@ // Treasure Chest // 0x06013F90 -static const Lights1 treasure_chest_seg6_lights_06013F90 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x06013FA8 ALIGNED8 static const Texture treasure_chest_seg6_texture_06013FA8[] = { @@ -154,8 +150,8 @@ const Gfx treasure_chest_seg6_dl_06016D58[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, treasure_chest_seg6_texture_06013FA8), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&treasure_chest_seg6_lights_06013F90.l, 1), - gsSPLight(&treasure_chest_seg6_lights_06013F90.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(treasure_chest_seg6_vertex_060167A8, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSPEndDisplayList(), @@ -377,8 +373,8 @@ const Gfx treasure_chest_seg6_dl_06017680[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, treasure_chest_seg6_texture_060147A8), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&treasure_chest_seg6_lights_06013F90.l, 1), - gsSPLight(&treasure_chest_seg6_lights_06013F90.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(treasure_chest_seg6_vertex_06017030, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 0, 3, 4, 0x0, 5, 6, 7, 0x0), diff --git a/actors/tree/model.inc.c b/actors/tree/model.inc.c index 3f89db26..914eb126 100644 --- a/actors/tree/model.inc.c +++ b/actors/tree/model.inc.c @@ -1,10 +1,6 @@ // Tree // 0x0302DE10 -static const Lights1 tree_seg3_lights_0302DE10 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0302DE28 ALIGNED8 static const Texture tree_seg3_texture_bubbly_left_side[] = { @@ -103,8 +99,8 @@ const Gfx tree_seg3_sub_dl_spiky[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, tree_seg3_texture_pine), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&tree_seg3_lights_0302DE10.l, 1), - gsSPLight(&tree_seg3_lights_0302DE10.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(tree_seg3_vertex_spiky, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), @@ -142,8 +138,8 @@ const Gfx tree_seg3_sub_dl_snowy_pine[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, tree_seg3_texture_snowy_pine), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&tree_seg3_lights_0302DE10.l, 1), - gsSPLight(&tree_seg3_lights_0302DE10.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(tree_seg3_vertex_spiky, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), @@ -189,8 +185,8 @@ const Gfx tree_seg3_sub_dl_palm[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, tree_seg3_texture_palm), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&tree_seg3_lights_0302DE10.l, 1), - gsSPLight(&tree_seg3_lights_0302DE10.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(tree_seg3_vertex_palm, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), diff --git a/actors/ukiki/model.inc.c b/actors/ukiki/model.inc.c index fdc22c14..d7730d8c 100644 --- a/actors/ukiki/model.inc.c +++ b/actors/ukiki/model.inc.c @@ -1,22 +1,10 @@ // Ukiki // Unreferenced light group -UNUSED static const Lights1 ukiki_lights_unused1 = gdSPDefLights1( - 0x1d, 0x12, 0x07, - 0x77, 0x48, 0x1f, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 ukiki_lights_unused2 = gdSPDefLights1( - 0x39, 0x24, 0x18, - 0xe7, 0x93, 0x61, 0x28, 0x28, 0x28 -); // 0x05007BA0 -static const Lights1 ukiki_seg5_lights_05007BA0 = gdSPDefLights1( - 0x39, 0x24, 0x18, - 0xe7, 0x93, 0x61, 0x28, 0x28, 0x28 -); // The hell? UNUSED static const u64 ukiki_unused_1 = 1; @@ -42,16 +30,8 @@ ALIGNED8 static const Texture ukiki_seg5_texture_0500A3C0[] = { }; // 0x0500ABC0 -static const Lights1 ukiki_seg5_lights_0500ABC0 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0500ABD8 -static const Lights1 ukiki_seg5_lights_0500ABD8 = gdSPDefLights1( - 0x77, 0x66, 0x45, - 0xee, 0xcd, 0x8a, 0x28, 0x28, 0x28 -); // 0x0500ABF0 static const Vtx ukiki_seg5_vertex_0500ABF0[] = { @@ -144,8 +124,8 @@ static const Vtx ukiki_seg5_vertex_0500AF60[] = { // 0x0500B040 - 0x0500B1D8 const Gfx ukiki_seg5_dl_0500B040[] = { - gsSPLight(&ukiki_seg5_lights_0500ABC0.l, 1), - gsSPLight(&ukiki_seg5_lights_0500ABC0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ukiki_seg5_vertex_0500ABF0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 0, 0x0), gsSP2Triangles( 1, 4, 2, 0x0, 5, 2, 4, 0x0), @@ -178,8 +158,8 @@ const Gfx ukiki_seg5_dl_0500B040[] = { // 0x0500B1D8 - 0x0500B278 const Gfx ukiki_seg5_dl_0500B1D8[] = { - gsSPLight(&ukiki_seg5_lights_0500ABD8.l, 1), - gsSPLight(&ukiki_seg5_lights_0500ABD8.a, 2), + gsSPLightColor(LIGHT_1, 0xeecd8aff), + gsSPLightColor(LIGHT_2, 0x776645ff), gsSPVertex(ukiki_seg5_vertex_0500AF60, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 1, 3, 0x0), gsSP2Triangles( 2, 4, 0, 0x0, 5, 6, 4, 0x0), @@ -233,10 +213,6 @@ const Gfx ukiki_seg5_dl_0500B310[] = { }; // 0x0500B338 -static const Lights1 ukiki_seg5_lights_0500B338 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0500B350 static const Vtx ukiki_seg5_vertex_0500B350[] = { @@ -308,8 +284,8 @@ const Gfx ukiki_seg5_dl_0500B660[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, ukiki_seg5_texture_0500A3C0), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ukiki_seg5_lights_0500B338.l, 1), - gsSPLight(&ukiki_seg5_lights_0500B338.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ukiki_seg5_vertex_0500B350, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 0, 0x0), gsSP2Triangles( 3, 0, 4, 0x0, 3, 5, 6, 0x0), @@ -365,10 +341,6 @@ const Gfx ukiki_seg5_dl_0500B820[] = { }; // 0x0500B888 -static const Lights1 ukiki_seg5_lights_0500B888 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0500B8A0 static const Vtx ukiki_seg5_vertex_0500B8A0[] = { @@ -387,8 +359,8 @@ const Gfx ukiki_seg5_dl_0500B920[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, ukiki_seg5_texture_0500A3C0), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ukiki_seg5_lights_0500B888.l, 1), - gsSPLight(&ukiki_seg5_lights_0500B888.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ukiki_seg5_vertex_0500B8A0, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 1, 4, 5, 0x0, 4, 6, 5, 0x0), @@ -413,10 +385,6 @@ const Gfx ukiki_seg5_dl_0500B988[] = { }; // 0x0500B9E8 -static const Lights1 ukiki_seg5_lights_0500B9E8 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0500BA00 static const Vtx ukiki_seg5_vertex_0500BA00[] = { @@ -436,8 +404,8 @@ const Gfx ukiki_seg5_dl_0500BA90[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, ukiki_seg5_texture_0500A3C0), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ukiki_seg5_lights_0500B9E8.l, 1), - gsSPLight(&ukiki_seg5_lights_0500B9E8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ukiki_seg5_vertex_0500BA00, 9, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 4, 0x0), gsSP2Triangles( 1, 5, 6, 0x0, 1, 6, 2, 0x0), @@ -465,10 +433,6 @@ const Gfx ukiki_seg5_dl_0500BB28[] = { }; // 0x0500BB88 -static const Lights1 ukiki_seg5_lights_0500BB88 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0500BBA0 static const Vtx ukiki_seg5_vertex_0500BBA0[] = { @@ -486,8 +450,8 @@ const Gfx ukiki_seg5_dl_0500BC10[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, ukiki_seg5_texture_0500A3C0), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ukiki_seg5_lights_0500BB88.l, 1), - gsSPLight(&ukiki_seg5_lights_0500BB88.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ukiki_seg5_vertex_0500BBA0, 7, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 2, 4, 3, 0x0, 2, 5, 4, 0x0), @@ -512,10 +476,6 @@ const Gfx ukiki_seg5_dl_0500BC78[] = { }; // 0x0500BCD8 -static const Lights1 ukiki_seg5_lights_0500BCD8 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0500BCF0 static const Vtx ukiki_seg5_vertex_0500BCF0[] = { @@ -537,8 +497,8 @@ const Gfx ukiki_seg5_dl_0500BDA0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, ukiki_seg5_texture_0500A3C0), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ukiki_seg5_lights_0500BCD8.l, 1), - gsSPLight(&ukiki_seg5_lights_0500BCD8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ukiki_seg5_vertex_0500BCF0, 11, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 4, 0x0), gsSP2Triangles( 0, 3, 5, 0x0, 0, 2, 6, 0x0), @@ -566,10 +526,6 @@ const Gfx ukiki_seg5_dl_0500BE38[] = { }; // 0x0500BE98 -static const Lights1 ukiki_seg5_lights_0500BE98 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0500BEB0 static const Vtx ukiki_seg5_vertex_0500BEB0[] = { @@ -591,8 +547,8 @@ const Gfx ukiki_seg5_dl_0500BF60[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, ukiki_seg5_texture_0500A3C0), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ukiki_seg5_lights_0500BE98.l, 1), - gsSPLight(&ukiki_seg5_lights_0500BE98.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ukiki_seg5_vertex_0500BEB0, 11, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 2, 4, 5, 0x0, 2, 5, 3, 0x0), @@ -620,10 +576,6 @@ const Gfx ukiki_seg5_dl_0500BFF8[] = { }; // 0x0500C058 -static const Lights1 ukiki_seg5_lights_0500C058 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0500C070 static const Vtx ukiki_seg5_vertex_0500C070[] = { @@ -645,8 +597,8 @@ const Gfx ukiki_seg5_dl_0500C120[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, ukiki_seg5_texture_0500A3C0), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ukiki_seg5_lights_0500C058.l, 1), - gsSPLight(&ukiki_seg5_lights_0500C058.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ukiki_seg5_vertex_0500C070, 11, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 2, 4, 0x0), gsSP2Triangles( 2, 1, 5, 0x0, 2, 5, 4, 0x0), @@ -674,10 +626,6 @@ const Gfx ukiki_seg5_dl_0500C1B8[] = { }; // 0x0500C218 -static const Lights1 ukiki_seg5_lights_0500C218 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0500C230 static const Vtx ukiki_seg5_vertex_0500C230[] = { @@ -698,8 +646,8 @@ const Gfx ukiki_seg5_dl_0500C2D0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, ukiki_seg5_texture_0500A3C0), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ukiki_seg5_lights_0500C218.l, 1), - gsSPLight(&ukiki_seg5_lights_0500C218.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ukiki_seg5_vertex_0500C230, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 4, 0x0), gsSP2Triangles( 0, 3, 1, 0x0, 0, 2, 5, 0x0), @@ -727,10 +675,6 @@ const Gfx ukiki_seg5_dl_0500C368[] = { }; // 0x0500C3C8 -static const Lights1 ukiki_seg5_lights_0500C3C8 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0500C3E0 static const Vtx ukiki_seg5_vertex_0500C3E0[] = { @@ -752,8 +696,8 @@ const Gfx ukiki_seg5_dl_0500C490[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, ukiki_seg5_texture_0500A3C0), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ukiki_seg5_lights_0500C3C8.l, 1), - gsSPLight(&ukiki_seg5_lights_0500C3C8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ukiki_seg5_vertex_0500C3E0, 11, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 0, 3, 4, 0x0, 2, 1, 5, 0x0), @@ -781,10 +725,6 @@ const Gfx ukiki_seg5_dl_0500C528[] = { }; // 0x0500C588 -static const Lights1 ukiki_seg5_lights_0500C588 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0500C5A0 static const Vtx ukiki_seg5_vertex_0500C5A0[] = { @@ -806,8 +746,8 @@ const Gfx ukiki_seg5_dl_0500C650[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, ukiki_seg5_texture_0500A3C0), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ukiki_seg5_lights_0500C588.l, 1), - gsSPLight(&ukiki_seg5_lights_0500C588.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ukiki_seg5_vertex_0500C5A0, 11, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 1, 3, 0x0), gsSP2Triangles( 2, 3, 4, 0x0, 0, 5, 1, 0x0), @@ -835,10 +775,6 @@ const Gfx ukiki_seg5_dl_0500C6E8[] = { }; // 0x0500C748 -static const Lights1 ukiki_seg5_lights_0500C748 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0500C760 static const Vtx ukiki_seg5_vertex_0500C760[] = { @@ -859,8 +795,8 @@ const Gfx ukiki_seg5_dl_0500C800[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, ukiki_seg5_texture_0500A3C0), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ukiki_seg5_lights_0500C748.l, 1), - gsSPLight(&ukiki_seg5_lights_0500C748.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ukiki_seg5_vertex_0500C760, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 2, 1, 4, 0x0, 2, 4, 3, 0x0), @@ -888,10 +824,6 @@ const Gfx ukiki_seg5_dl_0500C898[] = { }; // 0x0500C8F8 -static const Lights1 ukiki_seg5_lights_0500C8F8 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0500C910 static const Vtx ukiki_seg5_vertex_0500C910[] = { @@ -912,8 +844,8 @@ const Gfx ukiki_seg5_dl_0500C9B0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, ukiki_seg5_texture_0500A3C0), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ukiki_seg5_lights_0500C8F8.l, 1), - gsSPLight(&ukiki_seg5_lights_0500C8F8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ukiki_seg5_vertex_0500C910, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 2, 4, 5, 0x0, 2, 5, 3, 0x0), @@ -1042,8 +974,8 @@ static const Vtx ukiki_seg5_vertex_0500CE98[] = { // 0x0500CF68 - 0x0500CFF0 const Gfx ukiki_seg5_dl_0500CF68[] = { - gsSPLight(&ukiki_seg5_lights_05007BA0.l, 1), - gsSPLight(&ukiki_seg5_lights_05007BA0.a, 2), + gsSPLightColor(LIGHT_1, 0xe79361ff), + gsSPLightColor(LIGHT_2, 0x392418ff), gsSPVertex(ukiki_seg5_vertex_0500CAA8, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), @@ -1057,8 +989,8 @@ const Gfx ukiki_seg5_dl_0500CF68[] = { // 0x0500CFF0 - 0x0500D078 const Gfx ukiki_seg5_dl_0500CFF0[] = { - gsSPLight(&ukiki_seg5_lights_05007BA0.l, 1), - gsSPLight(&ukiki_seg5_lights_05007BA0.a, 2), + gsSPLightColor(LIGHT_1, 0xe79361ff), + gsSPLightColor(LIGHT_2, 0x392418ff), gsSPVertex(ukiki_seg5_vertex_0500CC28, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), @@ -1072,8 +1004,8 @@ const Gfx ukiki_seg5_dl_0500CFF0[] = { // 0x0500D078 - 0x0500D108 const Gfx ukiki_seg5_dl_0500D078[] = { - gsSPLight(&ukiki_seg5_lights_05007BA0.l, 1), - gsSPLight(&ukiki_seg5_lights_05007BA0.a, 2), + gsSPLightColor(LIGHT_1, 0xe79361ff), + gsSPLightColor(LIGHT_2, 0x392418ff), gsSPVertex(ukiki_seg5_vertex_0500CDA8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 2, 7, 6, 0x0), @@ -1087,8 +1019,8 @@ const Gfx ukiki_seg5_dl_0500D078[] = { // 0x0500D108 - 0x0500D198 const Gfx ukiki_seg5_dl_0500D108[] = { - gsSPLight(&ukiki_seg5_lights_05007BA0.l, 1), - gsSPLight(&ukiki_seg5_lights_05007BA0.a, 2), + gsSPLightColor(LIGHT_1, 0xe79361ff), + gsSPLightColor(LIGHT_2, 0x392418ff), gsSPVertex(ukiki_seg5_vertex_0500CE98, 13, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 0, 5, 0x0, 4, 5, 6, 0x0), diff --git a/actors/unagi/model.inc.c b/actors/unagi/model.inc.c index 6d0eda36..f6ce026e 100644 --- a/actors/unagi/model.inc.c +++ b/actors/unagi/model.inc.c @@ -1,52 +1,20 @@ // Unagi (Eel) // Unreferenced light group -UNUSED static const Lights1 unagi_lights_unused1 = gdSPDefLights1( - 0x2c, 0x25, 0x00, - 0xb2, 0x94, 0x00, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 unagi_lights_unused2 = gdSPDefLights1( - 0x35, 0x00, 0x00, - 0xd5, 0x00, 0x00, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 unagi_lights_unused3 = gdSPDefLights1( - 0x37, 0x00, 0x00, - 0xdd, 0x00, 0x00, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 unagi_lights_unused4 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 unagi_lights_unused5 = gdSPDefLights1( - 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 unagi_lights_unused6 = gdSPDefLights1( - 0x34, 0x00, 0x00, - 0xd2, 0x00, 0x00, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 unagi_lights_unused7 = gdSPDefLights1( - 0x34, 0x00, 0x00, - 0xd3, 0x00, 0x00, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 unagi_lights_unused8 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0500AF20 ALIGNED8 static const Texture unagi_seg5_texture_0500AF20[] = { diff --git a/actors/warp_pipe/model.inc.c b/actors/warp_pipe/model.inc.c index 6e6ec952..25a593eb 100644 --- a/actors/warp_pipe/model.inc.c +++ b/actors/warp_pipe/model.inc.c @@ -1,10 +1,6 @@ // Warp Pipe // 0x030079E8 -static const Lights1 warp_pipe_seg3_lights_030079E8 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x03007A00 static const Vtx warp_pipe_seg3_vertex_03007A00[] = { @@ -104,8 +100,8 @@ const Gfx warp_pipe_seg3_dl_03008E40[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, warp_pipe_seg3_texture_03007E40), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&warp_pipe_seg3_lights_030079E8.l, 1), - gsSPLight(&warp_pipe_seg3_lights_030079E8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(warp_pipe_seg3_vertex_03007A00, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -149,16 +145,8 @@ const Gfx warp_pipe_seg3_dl_03008F98[] = { }; // 0x03008FF8 -static const Lights1 warp_pipe_seg3_lights_03008FF8 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x03009010 -static const Lights1 warp_pipe_seg3_lights_03009010 = gdSPDefLights1( - 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x03009028 static const Vtx warp_pipe_seg3_vertex_03009028[] = { @@ -198,8 +186,8 @@ const Gfx warp_pipe_seg3_dl_03009968[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, warp_pipe_seg3_texture_03009168), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&warp_pipe_seg3_lights_03008FF8.l, 1), - gsSPLight(&warp_pipe_seg3_lights_03008FF8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(warp_pipe_seg3_vertex_03009028, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 3, 5, 0x0), @@ -214,8 +202,8 @@ const Gfx warp_pipe_seg3_dl_03009968[] = { // 0x03009A20 - 0x03009A50 const Gfx warp_pipe_seg3_dl_03009A20[] = { - gsSPLight(&warp_pipe_seg3_lights_03009010.l, 1), - gsSPLight(&warp_pipe_seg3_lights_03009010.a, 2), + gsSPLightColor(LIGHT_1, 0xff), + gsSPLightColor(LIGHT_2, 0xff), gsSPVertex(warp_pipe_seg3_vertex_03009128, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSPEndDisplayList(), diff --git a/actors/water_bubble/model.inc.c b/actors/water_bubble/model.inc.c index 512551f2..5c217334 100644 --- a/actors/water_bubble/model.inc.c +++ b/actors/water_bubble/model.inc.c @@ -1,10 +1,6 @@ // Water Bubble // 0x0500FE68 -static const Lights1 water_bubble_seg5_lights_0500FE68 = gdSPDefLights1( - 0xbf, 0xbf, 0xbf, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0500FE80 ALIGNED8 static const Texture water_bubble_seg5_texture_0500FE80[] = { @@ -148,8 +144,8 @@ static const Vtx water_bubble_seg5_vertex_05010C50[] = { // 0x05010D30 - 0x05011000 const Gfx water_bubble_seg5_dl_05010D30[] = { - gsSPLight(&water_bubble_seg5_lights_0500FE68.l, 1), - gsSPLight(&water_bubble_seg5_lights_0500FE68.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0xbfbfbfff), gsSPVertex(water_bubble_seg5_vertex_05010680, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), gsSP2Triangles( 2, 3, 4, 0x0, 1, 5, 3, 0x0), diff --git a/actors/water_mine/model.inc.c b/actors/water_mine/model.inc.c index 182d8e29..715ba3e9 100644 --- a/actors/water_mine/model.inc.c +++ b/actors/water_mine/model.inc.c @@ -1,10 +1,6 @@ // Water Mine (unused) // 0x0600A4E0 -static const Lights1 water_mine_seg6_lights_0600A4E0 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0600A4F8 ALIGNED8 static const Texture water_mine_seg6_texture_0600A4F8[] = { @@ -173,8 +169,8 @@ const Gfx water_mine_seg6_dl_0600D2E0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, water_mine_seg6_texture_0600C4F8), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&water_mine_seg6_lights_0600A4E0.l, 1), - gsSPLight(&water_mine_seg6_lights_0600A4E0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(water_mine_seg6_vertex_0600CD78, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), diff --git a/actors/water_ring/model.inc.c b/actors/water_ring/model.inc.c index 3c772931..2c710132 100644 --- a/actors/water_ring/model.inc.c +++ b/actors/water_ring/model.inc.c @@ -1,10 +1,6 @@ // Water Ring // 0x06012368 -static const Lights1 water_ring_seg6_lights_06012368 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x06012380 ALIGNED8 static const Texture water_ring_seg6_texture_06012380[] = { @@ -166,8 +162,8 @@ const Gfx water_ring_seg6_dl_06013AC0[] = { gsDPSetCombineMode(G_CC_DECALFADE, G_CC_DECALFADE), gsDPLoadTextureBlock(water_ring_seg6_texture_06012380, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_WRAP | G_TX_NOMIRROR, 6, 5, G_TX_NOLOD, G_TX_NOLOD), gsSPTexture(0x1800, 0x07C0, 0, G_TX_RENDERTILE, G_ON), - gsSPLight(&water_ring_seg6_lights_06012368.l, 1), - gsSPLight(&water_ring_seg6_lights_06012368.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(water_ring_seg6_vertex_06013380, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), diff --git a/actors/whomp/model.inc.c b/actors/whomp/model.inc.c index a359d0f3..a883d108 100644 --- a/actors/whomp/model.inc.c +++ b/actors/whomp/model.inc.c @@ -25,10 +25,6 @@ ALIGNED8 static const Texture whomp_seg6_texture_0601EB60[] = { }; // 0x0601F360 -static const Lights1 whomp_seg6_lights_0601F360 = gdSPDefLights1( - 0x4c, 0x4c, 0x4c, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0601F378 static const Vtx whomp_seg6_vertex_0601F378[] = { @@ -71,8 +67,8 @@ const Gfx whomp_seg6_dl_0601F4F8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, whomp_seg6_texture_0601EB60), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&whomp_seg6_lights_0601F360.l, 1), - gsSPLight(&whomp_seg6_lights_0601F360.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(whomp_seg6_vertex_0601F378, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), @@ -125,10 +121,6 @@ const Gfx whomp_seg6_dl_0601F5E0[] = { }; // 0x0601F678 -static const Lights1 whomp_seg6_lights_0601F678 = gdSPDefLights1( - 0x4c, 0x4c, 0x4c, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0601F690 static const Vtx whomp_seg6_vertex_0601F690[] = { @@ -165,8 +157,8 @@ const Gfx whomp_seg6_dl_0601F7F0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, whomp_seg6_texture_0601EB60), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&whomp_seg6_lights_0601F678.l, 1), - gsSPLight(&whomp_seg6_lights_0601F678.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(whomp_seg6_vertex_0601F690, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), @@ -195,10 +187,6 @@ const Gfx whomp_seg6_dl_0601F880[] = { }; // 0x0601F8E0 -static const Lights1 whomp_seg6_lights_0601F8E0 = gdSPDefLights1( - 0x4c, 0x4c, 0x4c, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0601F8F8 static const Vtx whomp_seg6_vertex_0601F8F8[] = { @@ -235,8 +223,8 @@ const Gfx whomp_seg6_dl_0601FA58[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, whomp_seg6_texture_0601EB60), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&whomp_seg6_lights_0601F8E0.l, 1), - gsSPLight(&whomp_seg6_lights_0601F8E0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(whomp_seg6_vertex_0601F8F8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), @@ -337,10 +325,6 @@ const Gfx whomp_seg6_dl_0601FCA8[] = { }; // 0x0601FD18 -static const Lights1 whomp_seg6_lights_0601FD18 = gdSPDefLights1( - 0x4c, 0x4c, 0x4c, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0601FD30 static const Vtx whomp_seg6_vertex_0601FD30[] = { @@ -365,8 +349,8 @@ const Gfx whomp_seg6_dl_0601FE10[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, whomp_seg6_texture_0601EB60), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&whomp_seg6_lights_0601FD18.l, 1), - gsSPLight(&whomp_seg6_lights_0601FD18.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(whomp_seg6_vertex_0601FD30, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0), gsSP2Triangles( 2, 1, 4, 0x0, 4, 3, 2, 0x0), @@ -394,10 +378,6 @@ const Gfx whomp_seg6_dl_0601FEA8[] = { }; // 0x0601FF08 -static const Lights1 whomp_seg6_lights_0601FF08 = gdSPDefLights1( - 0x4c, 0x4c, 0x4c, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0601FF20 static const Vtx whomp_seg6_vertex_0601FF20[] = { @@ -416,8 +396,8 @@ const Gfx whomp_seg6_dl_0601FFA0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, whomp_seg6_texture_0601EB60), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&whomp_seg6_lights_0601FF08.l, 1), - gsSPLight(&whomp_seg6_lights_0601FF08.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(whomp_seg6_vertex_0601FF20, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 2, 1, 0x0, 1, 5, 4, 0x0), diff --git a/actors/wiggler_body/model.inc.c b/actors/wiggler_body/model.inc.c index ed1efc8e..87d997f5 100644 --- a/actors/wiggler_body/model.inc.c +++ b/actors/wiggler_body/model.inc.c @@ -36,22 +36,10 @@ ALIGNED8 static const Texture wiggler_seg5_texture_0500A230[] = { }; // 0x0500B230 -static const Lights1 wiggler_seg5_lights_0500B230 = gdSPDefLights1( - 0x37, 0x00, 0x00, - 0xdf, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x0500B248 -static const Lights1 wiggler_seg5_lights_0500B248 = gdSPDefLights1( - 0x39, 0x11, 0x00, - 0xe7, 0x47, 0x00, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 wiggler_body_lights_unused = gdSPDefLights1( - 0x3a, 0x22, 0x05, - 0xea, 0x8b, 0x16, 0x28, 0x28, 0x28 -); // 0x0500B278 static const Vtx wiggler_seg5_vertex_0500B278[] = { @@ -267,8 +255,8 @@ static const Vtx wiggler_seg5_vertex_0500BBC8[] = { // 0x0500BCB8 - 0x0500BE10 const Gfx wiggler_seg5_dl_0500BCB8[] = { - gsSPLight(&wiggler_seg5_lights_0500B230.l, 1), - gsSPLight(&wiggler_seg5_lights_0500B230.a, 2), + gsSPLightColor(LIGHT_1, 0xdf0000ff), + gsSPLightColor(LIGHT_2, 0x370000ff), gsSPVertex(wiggler_seg5_vertex_0500B278, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), @@ -296,8 +284,8 @@ const Gfx wiggler_seg5_dl_0500BCB8[] = { // 0x0500BE10 - 0x0500BE98 const Gfx wiggler_seg5_dl_0500BE10[] = { - gsSPLight(&wiggler_seg5_lights_0500B248.l, 1), - gsSPLight(&wiggler_seg5_lights_0500B248.a, 2), + gsSPLightColor(LIGHT_1, 0xe74700ff), + gsSPLightColor(LIGHT_2, 0x391100ff), gsSPVertex(wiggler_seg5_vertex_0500B5B8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), @@ -311,8 +299,8 @@ const Gfx wiggler_seg5_dl_0500BE10[] = { // 0x0500BE98 - 0x0500BF20 const Gfx wiggler_seg5_dl_0500BE98[] = { - gsSPLight(&wiggler_seg5_lights_0500B248.l, 1), - gsSPLight(&wiggler_seg5_lights_0500B248.a, 2), + gsSPLightColor(LIGHT_1, 0xe74700ff), + gsSPLightColor(LIGHT_2, 0x391100ff), gsSPVertex(wiggler_seg5_vertex_0500B6A8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), @@ -326,8 +314,8 @@ const Gfx wiggler_seg5_dl_0500BE98[] = { // 0x0500BF20 - 0x0500C078 const Gfx wiggler_seg5_dl_0500BF20[] = { - gsSPLight(&wiggler_seg5_lights_0500B230.l, 1), - gsSPLight(&wiggler_seg5_lights_0500B230.a, 2), + gsSPLightColor(LIGHT_1, 0xdf0000ff), + gsSPLightColor(LIGHT_2, 0x370000ff), gsSPVertex(wiggler_seg5_vertex_0500B798, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), @@ -355,8 +343,8 @@ const Gfx wiggler_seg5_dl_0500BF20[] = { // 0x0500C078 - 0x0500C100 const Gfx wiggler_seg5_dl_0500C078[] = { - gsSPLight(&wiggler_seg5_lights_0500B248.l, 1), - gsSPLight(&wiggler_seg5_lights_0500B248.a, 2), + gsSPLightColor(LIGHT_1, 0xe74700ff), + gsSPLightColor(LIGHT_2, 0x391100ff), gsSPVertex(wiggler_seg5_vertex_0500BAD8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), @@ -370,8 +358,8 @@ const Gfx wiggler_seg5_dl_0500C078[] = { // 0x0500C100 - 0x0500C188 const Gfx wiggler_seg5_dl_0500C100[] = { - gsSPLight(&wiggler_seg5_lights_0500B248.l, 1), - gsSPLight(&wiggler_seg5_lights_0500B248.a, 2), + gsSPLightColor(LIGHT_1, 0xe74700ff), + gsSPLightColor(LIGHT_2, 0x391100ff), gsSPVertex(wiggler_seg5_vertex_0500BBC8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), diff --git a/actors/wiggler_head/model.inc.c b/actors/wiggler_head/model.inc.c index 99f93b48..2462baa9 100644 --- a/actors/wiggler_head/model.inc.c +++ b/actors/wiggler_head/model.inc.c @@ -1,28 +1,12 @@ // Wiggler Head // 0x0500C878 -static const Lights1 wiggler_seg5_lights_0500C878 = gdSPDefLights1( - 0x37, 0x00, 0x00, - 0xdf, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x0500C890 -static const Lights1 wiggler_seg5_lights_0500C890 = gdSPDefLights1( - 0x39, 0x11, 0x00, - 0xe7, 0x47, 0x00, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 wiggler_head_lights_unused1 = gdSPDefLights1( - 0x1b, 0x06, 0x00, - 0x6d, 0x1a, 0x00, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 wiggler_head_lights_unused2 = gdSPDefLights1( - 0x3a, 0x22, 0x05, - 0xea, 0x8b, 0x16, 0x28, 0x28, 0x28 -); // 0x0500C8D8 static const Vtx wiggler_seg5_vertex_0500C8D8[] = { @@ -238,8 +222,8 @@ static const Vtx wiggler_seg5_vertex_0500D228[] = { // 0x0500DC18 - 0x0500DD70 const Gfx wiggler_seg5_dl_0500DC18[] = { - gsSPLight(&wiggler_seg5_lights_0500C878.l, 1), - gsSPLight(&wiggler_seg5_lights_0500C878.a, 2), + gsSPLightColor(LIGHT_1, 0xdf0000ff), + gsSPLightColor(LIGHT_2, 0x370000ff), gsSPVertex(wiggler_seg5_vertex_0500C8D8, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), @@ -267,8 +251,8 @@ const Gfx wiggler_seg5_dl_0500DC18[] = { // 0x0500DD70 - 0x0500DDF8 const Gfx wiggler_seg5_dl_0500DD70[] = { - gsSPLight(&wiggler_seg5_lights_0500C890.l, 1), - gsSPLight(&wiggler_seg5_lights_0500C890.a, 2), + gsSPLightColor(LIGHT_1, 0xe74700ff), + gsSPLightColor(LIGHT_2, 0x391100ff), gsSPVertex(wiggler_seg5_vertex_0500CC18, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), @@ -282,8 +266,8 @@ const Gfx wiggler_seg5_dl_0500DD70[] = { // 0x0500DDF8 - 0x0500DE80 const Gfx wiggler_seg5_dl_0500DDF8[] = { - gsSPLight(&wiggler_seg5_lights_0500C890.l, 1), - gsSPLight(&wiggler_seg5_lights_0500C890.a, 2), + gsSPLightColor(LIGHT_1, 0xe74700ff), + gsSPLightColor(LIGHT_2, 0x391100ff), gsSPVertex(wiggler_seg5_vertex_0500CD08, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), @@ -297,8 +281,8 @@ const Gfx wiggler_seg5_dl_0500DDF8[] = { // 0x0500DE80 - 0x0500DFD8 const Gfx wiggler_seg5_dl_0500DE80[] = { - gsSPLight(&wiggler_seg5_lights_0500C878.l, 1), - gsSPLight(&wiggler_seg5_lights_0500C878.a, 2), + gsSPLightColor(LIGHT_1, 0xdf0000ff), + gsSPLightColor(LIGHT_2, 0x370000ff), gsSPVertex(wiggler_seg5_vertex_0500CDF8, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), @@ -326,8 +310,8 @@ const Gfx wiggler_seg5_dl_0500DE80[] = { // 0x0500DFD8 - 0x0500E060 const Gfx wiggler_seg5_dl_0500DFD8[] = { - gsSPLight(&wiggler_seg5_lights_0500C890.l, 1), - gsSPLight(&wiggler_seg5_lights_0500C890.a, 2), + gsSPLightColor(LIGHT_1, 0xe74700ff), + gsSPLightColor(LIGHT_2, 0x391100ff), gsSPVertex(wiggler_seg5_vertex_0500D138, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), @@ -341,8 +325,8 @@ const Gfx wiggler_seg5_dl_0500DFD8[] = { // 0x0500E060 - 0x0500E0E8 const Gfx wiggler_seg5_dl_0500E060[] = { - gsSPLight(&wiggler_seg5_lights_0500C890.l, 1), - gsSPLight(&wiggler_seg5_lights_0500C890.a, 2), + gsSPLightColor(LIGHT_1, 0xe74700ff), + gsSPLightColor(LIGHT_2, 0x391100ff), gsSPVertex(wiggler_seg5_vertex_0500D228, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), diff --git a/actors/wooden_signpost/model.inc.c b/actors/wooden_signpost/model.inc.c index a0889e81..c6b3d72f 100644 --- a/actors/wooden_signpost/model.inc.c +++ b/actors/wooden_signpost/model.inc.c @@ -1,10 +1,6 @@ // Signpost // 0x0302C940 -static const Lights1 wooden_signpost_seg3_lights_0302C940 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0302C958 static const Vtx wooden_signpost_seg3_vertex_0302C958[] = { @@ -32,8 +28,8 @@ const Gfx wooden_signpost_seg3_dl_0302D9C8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wooden_signpost_seg3_texture_0302C9C8), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wooden_signpost_seg3_lights_0302C940.l, 1), - gsSPLight(&wooden_signpost_seg3_lights_0302C940.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(wooden_signpost_seg3_vertex_0302C958, 7, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0), gsSP2Triangles( 0, 3, 1, 0x0, 4, 1, 3, 0x0), @@ -60,10 +56,6 @@ const Gfx wooden_signpost_seg3_dl_0302DA48[] = { }; // 0x0302DAA8 -static const Lights1 wooden_signpost_seg3_lights_0302DAA8 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0302DAC0 static const Vtx wooden_signpost_seg3_vertex_0302DAC0[] = { @@ -106,8 +98,8 @@ const Gfx wooden_signpost_seg3_dl_0302DC40[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wooden_signpost_seg3_texture_0302C9C8), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wooden_signpost_seg3_lights_0302DAA8.l, 1), - gsSPLight(&wooden_signpost_seg3_lights_0302DAA8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(wooden_signpost_seg3_vertex_0302DAC0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 6, 8, 9, 0x0), diff --git a/actors/yoshi/model.inc.c b/actors/yoshi/model.inc.c index f5c9514e..601e6ef6 100644 --- a/actors/yoshi/model.inc.c +++ b/actors/yoshi/model.inc.c @@ -1,22 +1,10 @@ // Yoshi // 0x0501C458 -static const Lights1 yoshi_seg5_lights_0501C458 = gdSPDefLights1( - 0x00, 0x7c, 0x00, - 0x00, 0xf9, 0x00, 0x28, 0x28, 0x28 -); // 0x0501C470 -static const Lights1 yoshi_seg5_lights_0501C470 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0501C488 -static const Lights1 yoshi_seg5_lights_0501C488 = gdSPDefLights1( - 0x7f, 0x00, 0x00, - 0xff, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x0501C4A0 ALIGNED8 static const Texture yoshi_seg5_texture_0501C4A0[] = { @@ -244,8 +232,8 @@ const Gfx yoshi_seg5_dl_0501D440[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, yoshi_seg5_texture_0501C8A0), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 16 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)), - gsSPLight(&yoshi_seg5_lights_0501C458.l, 1), - gsSPLight(&yoshi_seg5_lights_0501C458.a, 2), + gsSPLightColor(LIGHT_1, 0xf900ff), + gsSPLightColor(LIGHT_2, 0x7c00ff), gsSPVertex(yoshi_seg5_vertex_0501CAA0, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSPEndDisplayList(), @@ -253,8 +241,8 @@ const Gfx yoshi_seg5_dl_0501D440[] = { // 0x0501D488 - 0x0501D4E0 const Gfx yoshi_seg5_dl_0501D488[] = { - gsSPLight(&yoshi_seg5_lights_0501C470.l, 1), - gsSPLight(&yoshi_seg5_lights_0501C470.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(yoshi_seg5_vertex_0501CB00, 11, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 3, 4, 5, 0x0, 5, 0, 3, 0x0), @@ -265,13 +253,13 @@ const Gfx yoshi_seg5_dl_0501D488[] = { // 0x0501D4E0 - 0x0501D8F8 const Gfx yoshi_seg5_dl_0501D4E0[] = { - gsSPLight(&yoshi_seg5_lights_0501C488.l, 1), - gsSPLight(&yoshi_seg5_lights_0501C488.a, 2), + gsSPLightColor(LIGHT_1, 0xff0000ff), + gsSPLightColor(LIGHT_2, 0x7f0000ff), gsSPVertex(yoshi_seg5_vertex_0501CBB0, 5, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 0, 0x0), gsSP2Triangles( 4, 1, 3, 0x0, 2, 1, 4, 0x0), - gsSPLight(&yoshi_seg5_lights_0501C458.l, 1), - gsSPLight(&yoshi_seg5_lights_0501C458.a, 2), + gsSPLightColor(LIGHT_1, 0xf900ff), + gsSPLightColor(LIGHT_2, 0x7c00ff), gsSPVertex(yoshi_seg5_vertex_0501CC00, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 3, 0x0, 3, 5, 6, 0x0), @@ -331,8 +319,8 @@ const Gfx yoshi_seg5_dl_0501D4E0[] = { gsSPVertex(yoshi_seg5_vertex_0501D2C0, 7, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0), gsSP2Triangles( 2, 4, 5, 0x0, 3, 5, 6, 0x0), - gsSPLight(&yoshi_seg5_lights_0501C470.l, 1), - gsSPLight(&yoshi_seg5_lights_0501C470.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(yoshi_seg5_vertex_0501D330, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 7, 4, 8, 0x0), @@ -386,40 +374,16 @@ const Gfx yoshi_seg5_dl_0501D998[] = { }; // 0x0501D9C0 -static const Lights1 yoshi_seg5_lights_0501D9C0 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0501D9D8 -static const Lights1 yoshi_seg5_lights_0501D9D8 = gdSPDefLights1( - 0x00, 0x7b, 0x00, - 0x00, 0xf7, 0x00, 0x28, 0x28, 0x28 -); // 0x0501D9F0 -static const Lights1 yoshi_seg5_lights_0501D9F0 = gdSPDefLights1( - 0x7f, 0x00, 0x00, - 0xff, 0x00, 0x00, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 yoshi_lights_unused1 = gdSPDefLights1( - 0x59, 0x59, 0x59, - 0xb2, 0xb2, 0xb2, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 yoshi_lights_unused2 = gdSPDefLights1( - 0x7f, 0x00, 0x00, - 0xff, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x0501DA38 -static const Lights1 yoshi_seg5_lights_0501DA38 = gdSPDefLights1( - 0x45, 0x00, 0x00, - 0x8b, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x0501DA50 static const Vtx yoshi_seg5_vertex_0501DA50[] = { @@ -1585,8 +1549,8 @@ static const Vtx yoshi_seg5_vertex_050211D0[] = { // 0x050212B0 - 0x05021490 const Gfx yoshi_seg5_dl_050212B0[] = { - gsSPLight(&yoshi_seg5_lights_0501D9C0.l, 1), - gsSPLight(&yoshi_seg5_lights_0501D9C0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(yoshi_seg5_vertex_0501DA50, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), @@ -1628,8 +1592,8 @@ const Gfx yoshi_seg5_dl_050212B0[] = { // 0x05021490 - 0x050215D8 const Gfx yoshi_seg5_dl_05021490[] = { - gsSPLight(&yoshi_seg5_lights_0501D9D8.l, 1), - gsSPLight(&yoshi_seg5_lights_0501D9D8.a, 2), + gsSPLightColor(LIGHT_1, 0xf700ff), + gsSPLightColor(LIGHT_2, 0x7b00ff), gsSPVertex(yoshi_seg5_vertex_0501E1E0, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), @@ -1658,8 +1622,8 @@ const Gfx yoshi_seg5_dl_05021490[] = { // 0x050215D8 - 0x05021678 const Gfx yoshi_seg5_dl_050215D8[] = { - gsSPLight(&yoshi_seg5_lights_0501D9D8.l, 1), - gsSPLight(&yoshi_seg5_lights_0501D9D8.a, 2), + gsSPLightColor(LIGHT_1, 0xf700ff), + gsSPLightColor(LIGHT_2, 0x7b00ff), gsSPVertex(yoshi_seg5_vertex_0501E530, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 0, 0x0), gsSP2Triangles( 1, 4, 5, 0x0, 2, 6, 7, 0x0), @@ -1674,8 +1638,8 @@ const Gfx yoshi_seg5_dl_050215D8[] = { // 0x05021678 - 0x05021718 const Gfx yoshi_seg5_dl_05021678[] = { - gsSPLight(&yoshi_seg5_lights_0501D9D8.l, 1), - gsSPLight(&yoshi_seg5_lights_0501D9D8.a, 2), + gsSPLightColor(LIGHT_1, 0xf700ff), + gsSPLightColor(LIGHT_2, 0x7b00ff), gsSPVertex(yoshi_seg5_vertex_0501E5D0, 11, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 0, 6, 7, 0x0, 4, 8, 1, 0x0), @@ -1690,8 +1654,8 @@ const Gfx yoshi_seg5_dl_05021678[] = { // 0x05021718 - 0x05021860 const Gfx yoshi_seg5_dl_05021718[] = { - gsSPLight(&yoshi_seg5_lights_0501D9D8.l, 1), - gsSPLight(&yoshi_seg5_lights_0501D9D8.a, 2), + gsSPLightColor(LIGHT_1, 0xf700ff), + gsSPLightColor(LIGHT_2, 0x7b00ff), gsSPVertex(yoshi_seg5_vertex_0501E680, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), @@ -1720,8 +1684,8 @@ const Gfx yoshi_seg5_dl_05021718[] = { // 0x05021860 - 0x05021900 const Gfx yoshi_seg5_dl_05021860[] = { - gsSPLight(&yoshi_seg5_lights_0501D9D8.l, 1), - gsSPLight(&yoshi_seg5_lights_0501D9D8.a, 2), + gsSPLightColor(LIGHT_1, 0xf700ff), + gsSPLightColor(LIGHT_2, 0x7b00ff), gsSPVertex(yoshi_seg5_vertex_0501E9D0, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 1, 3, 0x0), gsSP2Triangles( 4, 5, 1, 0x0, 6, 7, 0, 0x0), @@ -1736,8 +1700,8 @@ const Gfx yoshi_seg5_dl_05021860[] = { // 0x05021900 - 0x050219A0 const Gfx yoshi_seg5_dl_05021900[] = { - gsSPLight(&yoshi_seg5_lights_0501D9D8.l, 1), - gsSPLight(&yoshi_seg5_lights_0501D9D8.a, 2), + gsSPLightColor(LIGHT_1, 0xf700ff), + gsSPLightColor(LIGHT_2, 0x7b00ff), gsSPVertex(yoshi_seg5_vertex_0501EA70, 11, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 2, 0x0, 1, 8, 4, 0x0), @@ -1752,8 +1716,8 @@ const Gfx yoshi_seg5_dl_05021900[] = { // 0x050219A0 - 0x05021B90 const Gfx yoshi_seg5_dl_050219A0[] = { - gsSPLight(&yoshi_seg5_lights_0501D9F0.l, 1), - gsSPLight(&yoshi_seg5_lights_0501D9F0.a, 2), + gsSPLightColor(LIGHT_1, 0xff0000ff), + gsSPLightColor(LIGHT_2, 0x7f0000ff), gsSPVertex(yoshi_seg5_vertex_0501EB20, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 5, 7, 6, 0x0), @@ -1794,8 +1758,8 @@ const Gfx yoshi_seg5_dl_050219A0[] = { // 0x05021B90 - 0x05021CD8 const Gfx yoshi_seg5_dl_05021B90[] = { - gsSPLight(&yoshi_seg5_lights_0501D9D8.l, 1), - gsSPLight(&yoshi_seg5_lights_0501D9D8.a, 2), + gsSPLightColor(LIGHT_1, 0xf700ff), + gsSPLightColor(LIGHT_2, 0x7b00ff), gsSPVertex(yoshi_seg5_vertex_0501F180, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 0, 6, 1, 0x0, 3, 7, 4, 0x0), @@ -1823,8 +1787,8 @@ const Gfx yoshi_seg5_dl_05021B90[] = { // 0x05021CD8 - 0x05021E38 const Gfx yoshi_seg5_dl_05021CD8[] = { - gsSPLight(&yoshi_seg5_lights_0501D9D8.l, 1), - gsSPLight(&yoshi_seg5_lights_0501D9D8.a, 2), + gsSPLightColor(LIGHT_1, 0xf700ff), + gsSPLightColor(LIGHT_2, 0x7b00ff), gsSPVertex(yoshi_seg5_vertex_0501F540, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), @@ -1854,8 +1818,8 @@ const Gfx yoshi_seg5_dl_05021CD8[] = { // 0x05021E38 - 0x05021F70 const Gfx yoshi_seg5_dl_05021E38[] = { - gsSPLight(&yoshi_seg5_lights_0501D9D8.l, 1), - gsSPLight(&yoshi_seg5_lights_0501D9D8.a, 2), + gsSPLightColor(LIGHT_1, 0xf700ff), + gsSPLightColor(LIGHT_2, 0x7b00ff), gsSPVertex(yoshi_seg5_vertex_0501FA00, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0), gsSP2Triangles( 4, 5, 3, 0x0, 6, 7, 8, 0x0), @@ -1867,8 +1831,8 @@ const Gfx yoshi_seg5_dl_05021E38[] = { gsSP2Triangles(10, 8, 7, 0x0, 3, 9, 12, 0x0), gsSP2Triangles( 2, 1, 11, 0x0, 8, 11, 6, 0x0), gsSP1Triangle( 5, 0, 3, 0x0), - gsSPLight(&yoshi_seg5_lights_0501D9C0.l, 1), - gsSPLight(&yoshi_seg5_lights_0501D9C0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(yoshi_seg5_vertex_0501FAF0, 11, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 4, 0x0), gsSP2Triangles( 5, 6, 7, 0x0, 7, 6, 8, 0x0), @@ -1882,8 +1846,8 @@ const Gfx yoshi_seg5_dl_05021E38[] = { // 0x05021F70 - 0x05022160 const Gfx yoshi_seg5_dl_05021F70[] = { - gsSPLight(&yoshi_seg5_lights_0501D9F0.l, 1), - gsSPLight(&yoshi_seg5_lights_0501D9F0.a, 2), + gsSPLightColor(LIGHT_1, 0xff0000ff), + gsSPLightColor(LIGHT_2, 0x7f0000ff), gsSPVertex(yoshi_seg5_vertex_0501FBA0, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), @@ -1924,8 +1888,8 @@ const Gfx yoshi_seg5_dl_05021F70[] = { // 0x05022160 - 0x050222A8 const Gfx yoshi_seg5_dl_05022160[] = { - gsSPLight(&yoshi_seg5_lights_0501D9D8.l, 1), - gsSPLight(&yoshi_seg5_lights_0501D9D8.a, 2), + gsSPLightColor(LIGHT_1, 0xf700ff), + gsSPLightColor(LIGHT_2, 0x7b00ff), gsSPVertex(yoshi_seg5_vertex_05020200, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 1, 6, 2, 0x0, 4, 7, 5, 0x0), @@ -1953,8 +1917,8 @@ const Gfx yoshi_seg5_dl_05022160[] = { // 0x050222A8 - 0x05022408 const Gfx yoshi_seg5_dl_050222A8[] = { - gsSPLight(&yoshi_seg5_lights_0501D9D8.l, 1), - gsSPLight(&yoshi_seg5_lights_0501D9D8.a, 2), + gsSPLightColor(LIGHT_1, 0xf700ff), + gsSPLightColor(LIGHT_2, 0x7b00ff), gsSPVertex(yoshi_seg5_vertex_050205C0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), @@ -1984,8 +1948,8 @@ const Gfx yoshi_seg5_dl_050222A8[] = { // 0x05022408 - 0x05022608 const Gfx yoshi_seg5_dl_05022408[] = { - gsSPLight(&yoshi_seg5_lights_0501D9D8.l, 1), - gsSPLight(&yoshi_seg5_lights_0501D9D8.a, 2), + gsSPLightColor(LIGHT_1, 0xf700ff), + gsSPLightColor(LIGHT_2, 0x7b00ff), gsSPVertex(yoshi_seg5_vertex_05020A80, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), @@ -2006,8 +1970,8 @@ const Gfx yoshi_seg5_dl_05022408[] = { gsSP1Triangle( 4, 14, 15, 0x0), gsSPVertex(yoshi_seg5_vertex_05020E60, 3, 0), gsSP1Triangle( 0, 1, 2, 0x0), - gsSPLight(&yoshi_seg5_lights_0501D9C0.l, 1), - gsSPLight(&yoshi_seg5_lights_0501D9C0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(yoshi_seg5_vertex_05020E90, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 5, 9, 3, 0x0), @@ -2018,8 +1982,8 @@ const Gfx yoshi_seg5_dl_05022408[] = { gsSP2Triangles(14, 15, 8, 0x0, 3, 10, 12, 0x0), gsSP2Triangles(12, 4, 3, 0x0, 12, 14, 7, 0x0), gsSP2Triangles( 8, 7, 14, 0x0, 7, 4, 12, 0x0), - gsSPLight(&yoshi_seg5_lights_0501D9F0.l, 1), - gsSPLight(&yoshi_seg5_lights_0501D9F0.a, 2), + gsSPLightColor(LIGHT_1, 0xff0000ff), + gsSPLightColor(LIGHT_2, 0x7f0000ff), gsSPVertex(yoshi_seg5_vertex_05020F90, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 3, 5, 0x0, 7, 6, 5, 0x0), @@ -2028,8 +1992,8 @@ const Gfx yoshi_seg5_dl_05022408[] = { // 0x05022608 - 0x050227D8 const Gfx yoshi_seg5_dl_05022608[] = { - gsSPLight(&yoshi_seg5_lights_0501D9D8.l, 1), - gsSPLight(&yoshi_seg5_lights_0501D9D8.a, 2), + gsSPLightColor(LIGHT_1, 0xf700ff), + gsSPLightColor(LIGHT_2, 0x7b00ff), gsSPVertex(yoshi_seg5_vertex_05021010, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), @@ -2039,8 +2003,8 @@ const Gfx yoshi_seg5_dl_05022608[] = { gsSP2Triangles(14, 7, 3, 0x0, 13, 9, 12, 0x0), gsSP2Triangles(11, 12, 9, 0x0, 7, 14, 8, 0x0), gsSP2Triangles( 3, 13, 4, 0x0, 1, 15, 2, 0x0), - gsSPLight(&yoshi_seg5_lights_0501DA38.l, 1), - gsSPLight(&yoshi_seg5_lights_0501DA38.a, 2), + gsSPLightColor(LIGHT_1, 0x8b0000ff), + gsSPLightColor(LIGHT_2, 0x450000ff), gsSPVertex(yoshi_seg5_vertex_05021110, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 2, 1, 0x0, 6, 7, 4, 0x0), @@ -2049,8 +2013,8 @@ const Gfx yoshi_seg5_dl_05022608[] = { gsSP2Triangles( 4, 1, 6, 0x0, 2, 9, 10, 0x0), gsSP2Triangles( 5, 11, 3, 0x0, 2, 10, 0, 0x0), gsSP2Triangles(11, 8, 3, 0x0, 1, 4, 3, 0x0), - gsSPLight(&yoshi_seg5_lights_0501D9C0.l, 1), - gsSPLight(&yoshi_seg5_lights_0501D9C0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(yoshi_seg5_vertex_050211D0, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 7, 6, 0x0), diff --git a/bin/debug_level_select.c b/bin/debug_level_select.c index 345203a6..8e58b4c3 100644 --- a/bin/debug_level_select.c +++ b/bin/debug_level_select.c @@ -4,10 +4,6 @@ #include "make_const_nonconst.h" // 0x07000000 - 0x07000018 -static const Lights1 debug_level_select_lights_07000000 = gdSPDefLights1( - 0x7f, 0x00, 0x00, - 0xff, 0x00, 0x00, 0x00, 0x00, 0x50 -); // 0x07000018 - 0x07000108 static const Vtx debug_level_select_vertex_07000018[] = { @@ -180,7 +176,8 @@ static const Vtx debug_level_select_vertex_07000798[] = { // 0x07000858 - 0x07000A28 const Gfx debug_level_select_dl_07000858[] = { gsDPPipeSync(), - gsSPSetLights1(debug_level_select_lights_07000000), + gsSPLightColor(LIGHT_1, 0xff0000ff), + gsSPLightColor(LIGHT_2, 0x7f0000ff), gsSPVertex(debug_level_select_vertex_07000018, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), @@ -220,10 +217,6 @@ const Gfx debug_level_select_dl_07000858[] = { }; // 0x07000A28 - 0x07000A40 -static const Lights1 debug_level_select_lights_07000A28 = gdSPDefLights1( - 0x00, 0x00, 0x7f, - 0x00, 0x00, 0xff, 0x00, 0x00, 0x50 -); // 0x07000A40 - 0x07000B30 static const Vtx debug_level_select_vertex_07000A40[] = { @@ -368,7 +361,8 @@ static const Vtx debug_level_select_vertex_070010D0[] = { // 0x07001100 - 0x07001288 const Gfx debug_level_select_dl_07001100[] = { gsDPPipeSync(), - gsSPSetLights1(debug_level_select_lights_07000A28), + gsSPLightColor(LIGHT_1, 0xffff), + gsSPLightColor(LIGHT_2, 0x7fff), gsSPVertex(debug_level_select_vertex_07000A40, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), @@ -403,10 +397,6 @@ const Gfx debug_level_select_dl_07001100[] = { }; // 0x07001288 - 0x070012A0 -static const Lights1 debug_level_select_lights_07001288 = gdSPDefLights1( - 0x00, 0x56, 0x00, - 0x00, 0xad, 0x00, 0x00, 0x00, 0x50 -); // 0x070012A0 - 0x07001390 static const Vtx debug_level_select_vertex_070012A0[] = { @@ -595,7 +585,8 @@ static const Vtx debug_level_select_vertex_07001B10[] = { // 0x07001BA0 - 0x07001D98 const Gfx debug_level_select_dl_07001BA0[] = { gsDPPipeSync(), - gsSPSetLights1(debug_level_select_lights_07001288), + gsSPLightColor(LIGHT_1, 0xad00ff), + gsSPLightColor(LIGHT_2, 0x5600ff), gsSPVertex(debug_level_select_vertex_070012A0, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), @@ -639,10 +630,6 @@ const Gfx debug_level_select_dl_07001BA0[] = { }; // 0x07001D98 - 0x07001DB0 -static const Lights1 debug_level_select_lights_07001D98 = gdSPDefLights1( - 0x7f, 0x00, 0x00, - 0xff, 0x00, 0x00, 0x00, 0x00, 0x50 -); // 0x07001DB0 - 0x07001EA0 static const Vtx debug_level_select_vertex_07001DB0[] = { @@ -815,7 +802,8 @@ static const Vtx debug_level_select_vertex_07002530[] = { // 0x070025F0 - 0x070027C0 const Gfx debug_level_select_dl_070025F0[] = { gsDPPipeSync(), - gsSPSetLights1(debug_level_select_lights_07001D98), + gsSPLightColor(LIGHT_1, 0xff0000ff), + gsSPLightColor(LIGHT_2, 0x7f0000ff), gsSPVertex(debug_level_select_vertex_07001DB0, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), @@ -855,10 +843,6 @@ const Gfx debug_level_select_dl_070025F0[] = { }; // 0x070027C0 - 0x070027D8 -static const Lights1 debug_level_select_lights_070027C0 = gdSPDefLights1( - 0x00, 0x00, 0x7f, - 0x00, 0x00, 0xff, 0x00, 0x00, 0x50 -); // 0x070027D8 - 0x070028C8 static const Vtx debug_level_select_vertex_070027D8[] = { @@ -1079,7 +1063,8 @@ static const Vtx debug_level_select_vertex_07003228[] = { // 0x07003258 - 0x070034A0 const Gfx debug_level_select_dl_07003258[] = { gsDPPipeSync(), - gsSPSetLights1(debug_level_select_lights_070027C0), + gsSPLightColor(LIGHT_1, 0xffff), + gsSPLightColor(LIGHT_2, 0x7fff), gsSPVertex(debug_level_select_vertex_070027D8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), @@ -1130,10 +1115,6 @@ const Gfx debug_level_select_dl_07003258[] = { }; // 0x070034A0 - 0x070034B8 -static const Lights1 debug_level_select_lights_070034A0 = gdSPDefLights1( - 0x7f, 0x00, 0x00, - 0xff, 0x00, 0x00, 0x00, 0x00, 0x50 -); // 0x070034B8 - 0x070035A8 static const Vtx debug_level_select_vertex_070034B8[] = { @@ -1322,7 +1303,8 @@ static const Vtx debug_level_select_vertex_07003D28[] = { // 0x07003DB8 - 0x07003FB0 const Gfx debug_level_select_dl_07003DB8[] = { gsDPPipeSync(), - gsSPSetLights1(debug_level_select_lights_070034A0), + gsSPLightColor(LIGHT_1, 0xff0000ff), + gsSPLightColor(LIGHT_2, 0x7f0000ff), gsSPVertex(debug_level_select_vertex_070034B8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), @@ -1366,10 +1348,6 @@ const Gfx debug_level_select_dl_07003DB8[] = { }; // 0x07003FB0 - 0x07003FC8 -static const Lights1 debug_level_select_lights_07003FB0 = gdSPDefLights1( - 0x00, 0x00, 0x7f, - 0x00, 0x00, 0xff, 0x00, 0x00, 0x50 -); // 0x07003FC8 - 0x070040B8 static const Vtx debug_level_select_vertex_07003FC8[] = { @@ -1558,7 +1536,8 @@ static const Vtx debug_level_select_vertex_07004838[] = { // 0x070048C8 - 0x07004AC0 const Gfx debug_level_select_dl_070048C8[] = { gsDPPipeSync(), - gsSPSetLights1(debug_level_select_lights_07003FB0), + gsSPLightColor(LIGHT_1, 0xffff), + gsSPLightColor(LIGHT_2, 0x7fff), gsSPVertex(debug_level_select_vertex_07003FC8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), @@ -1602,10 +1581,6 @@ const Gfx debug_level_select_dl_070048C8[] = { }; // 0x07004AC0 - 0x07004AD8 -static const Lights1 debug_level_select_lights_07004AC0 = gdSPDefLights1( - 0x00, 0x59, 0x00, - 0x00, 0xb2, 0x00, 0x00, 0x00, 0x50 -); // 0x07004AD8 - 0x07004BC8 static const Vtx debug_level_select_vertex_07004AD8[] = { @@ -1826,7 +1801,8 @@ static const Vtx debug_level_select_vertex_07005528[] = { // 0x07005558 - 0x070057A0 const Gfx debug_level_select_dl_07005558[] = { gsDPPipeSync(), - gsSPSetLights1(debug_level_select_lights_07004AC0), + gsSPLightColor(LIGHT_1, 0xb200ff), + gsSPLightColor(LIGHT_2, 0x5900ff), gsSPVertex(debug_level_select_vertex_07004AD8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), @@ -1877,10 +1853,6 @@ const Gfx debug_level_select_dl_07005558[] = { }; // 0x070057A0 - 0x070057B8 -static const Lights1 debug_level_select_lights_070057A0 = gdSPDefLights1( - 0x7f, 0x00, 0x00, - 0xff, 0x00, 0x00, 0x00, 0x00, 0x50 -); // 0x070057B8 - 0x070058A8 static const Vtx debug_level_select_vertex_070057B8[] = { @@ -1933,7 +1905,8 @@ static const Vtx debug_level_select_vertex_07005998[] = { // 0x070059F8 - 0x07005A98 const Gfx debug_level_select_dl_070059F8[] = { gsDPPipeSync(), - gsSPSetLights1(debug_level_select_lights_070057A0), + gsSPLightColor(LIGHT_1, 0xff0000ff), + gsSPLightColor(LIGHT_2, 0x7f0000ff), gsSPVertex(debug_level_select_vertex_070057B8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), @@ -1948,10 +1921,6 @@ const Gfx debug_level_select_dl_070059F8[] = { }; // 0x07005A98 - 0x07005AB0 -static const Lights1 debug_level_select_lights_07005A98 = gdSPDefLights1( - 0x00, 0x00, 0x7f, - 0x00, 0x00, 0xff, 0x00, 0x00, 0x50 -); // 0x07005AB0 - 0x07005BA0 static const Vtx debug_level_select_vertex_07005AB0[] = { @@ -2140,7 +2109,8 @@ static const Vtx debug_level_select_vertex_07006320[] = { // 0x070063B0 - 0x070065A8 const Gfx debug_level_select_dl_070063B0[] = { gsDPPipeSync(), - gsSPSetLights1(debug_level_select_lights_07005A98), + gsSPLightColor(LIGHT_1, 0xffff), + gsSPLightColor(LIGHT_2, 0x7fff), gsSPVertex(debug_level_select_vertex_07005AB0, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), diff --git a/bin/segment2.c b/bin/segment2.c index ba72215c..203109c7 100644 --- a/bin/segment2.c +++ b/bin/segment2.c @@ -2581,10 +2581,6 @@ const Texture texture_waterbox_lava[] = { }; // Unreferenced light group -UNUSED static const Lights1 segment2_lights_unused = gdSPDefLights1( - 0x40, 0x40, 0x40, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x02014470 - 0x020144B0 static const Mtx matrix_identity = { @@ -2835,18 +2831,14 @@ const Gfx dl_ia8_up_arrow_end[] = { }; // 0x02014958 - 0x02014960 -static const Lights1 seg2_lights_02014958 = gdSPDefLights1( - 0x50, 0x50, 0x50, - 0xff, 0xff, 0xff, 0x32, 0x32, 0x32 -); // 0x02014970 - 0x020149A8 const Gfx dl_paintings_rippling_begin[] = { gsDPPipeSync(), gsSPSetGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), gsDPSetCombineMode(G_CC_MODULATERGBA, G_CC_MODULATERGBA), - gsSPLight(&seg2_lights_02014958.l, 1), - gsSPLight(&seg2_lights_02014958.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x505050ff), gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), gsSPEndDisplayList(), }; @@ -2864,8 +2856,8 @@ const Gfx dl_paintings_env_mapped_begin[] = { gsDPPipeSync(), gsSPSetGeometryMode(G_LIGHTING | G_TEXTURE_GEN), gsDPSetCombineMode(G_CC_DECALRGB, G_CC_DECALRGB), - gsSPLight(&seg2_lights_02014958.l, 1), - gsSPLight(&seg2_lights_02014958.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x505050ff), gsSPTexture(0x4000, 0x4000, 0, G_TX_RENDERTILE, G_ON), gsSPEndDisplayList(), }; diff --git a/include/color_presets.h b/include/color_presets.h index 3c01189f..fd033f7a 100644 --- a/include/color_presets.h +++ b/include/color_presets.h @@ -157,12 +157,12 @@ // Debug box #define COLOR_RGBA32_DEBUG_DEFAULT 0x00FF0000 // 0 255 0 0 #define COLOR_RGBA32_DEBUG_ALPHA 0x0000007F // 0 0 0 127 -#define COLOR_RGBA32_DEBUG_POSITION 0x80FFFFFF // 128 255 255 255 -#define COLOR_RGBA32_DEBUG_HITBOX 0x800000FF // 128 0 0 255 -#define COLOR_RGBA32_DEBUG_HURTBOX 0x8FF00000 // 143 240 0 0 -#define COLOR_RGBA32_DEBUG_WARP 0x80FFA500 // 128 255 165 0 -#define COLOR_RGBA32_DEBUG_PUPPYVOLUME 0x0000FF00 // 0 0 255 0 -#define COLOR_RGBA32_DEBUG_LIGHT 0x08FF00FF // 8 255 0 255 +#define COLOR_RGBA32_DEBUG_POSITION 0xFFFFFF80 // 255 255 255 128 +#define COLOR_RGBA32_DEBUG_HITBOX 0x0000FF80 // 0 0 255 128 +#define COLOR_RGBA32_DEBUG_HURTBOX 0xF000008F // 240 0 0 143 +#define COLOR_RGBA32_DEBUG_WARP 0xFFA50080 // 255 165 0 128 +#define COLOR_RGBA32_DEBUG_PUPPYVOLUME 0x00FF0000 // 0 255 0 0 +#define COLOR_RGBA32_DEBUG_LIGHT 0xFF00FF08 // 255 0 255 8 // Color RGB(A) Arrays: diff --git a/include/config/config_debug.h b/include/config/config_debug.h index fc5ac8e9..376c66bd 100644 --- a/include/config/config_debug.h +++ b/include/config/config_debug.h @@ -12,7 +12,7 @@ // Enables a comprehensive standalone profiler. Automatically enabled by PUPPYPRINT_DEBUG. // If not using PUPPYPRINT_DEBUG, press L to toggle the profiler. -// #define USE_PROFILER +#define USE_PROFILER // TEST LEVEL // Uncomment this define and set a test level in order to boot straight into said level. diff --git a/levels/bbh/areas/1/1/model.inc.c b/levels/bbh/areas/1/1/model.inc.c index f504896a..33c20824 100644 --- a/levels/bbh/areas/1/1/model.inc.c +++ b/levels/bbh/areas/1/1/model.inc.c @@ -1,14 +1,6 @@ // 0x07004800 - 0x07004818 -static const Lights1 bbh_seg7_lights_07004800 = gdSPDefLights1( - 0x20, 0x20, 0x20, - 0x50, 0x50, 0x50, 0x28, 0x28, 0x28 -); // 0x07004818 - 0x07004830 -static const Lights1 bbh_seg7_lights_07004818 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07004830 - 0x07004920 static const Vtx bbh_seg7_vertex_07004830[] = { @@ -731,8 +723,8 @@ static const Gfx bbh_seg7_dl_07006AF0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09008800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bbh_seg7_lights_07004800.l, 1), - gsSPLight(&bbh_seg7_lights_07004800.a, 2), + gsSPLightColor(LIGHT_1, 0x505050ff), + gsSPLightColor(LIGHT_2, 0x202020ff), gsSPVertex(bbh_seg7_vertex_07004830, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -742,8 +734,8 @@ static const Gfx bbh_seg7_dl_07006AF0[] = { gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 6, 8, 9, 0x0), gsSP1Triangle( 0, 10, 1, 0x0), - gsSPLight(&bbh_seg7_lights_07004818.l, 1), - gsSPLight(&bbh_seg7_lights_07004818.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(bbh_seg7_vertex_070049D0, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 4, 0x0), gsSP2Triangles( 2, 4, 0, 0x0, 4, 3, 5, 0x0), diff --git a/levels/bbh/areas/1/12/model.inc.c b/levels/bbh/areas/1/12/model.inc.c index 5474a878..a384ce53 100644 --- a/levels/bbh/areas/1/12/model.inc.c +++ b/levels/bbh/areas/1/12/model.inc.c @@ -1,14 +1,6 @@ // 0x0700BC68 - 0x0700BC80 -static const Lights1 bbh_seg7_lights_0700BC68 = gdSPDefLights1( - 0x20, 0x20, 0x20, - 0x50, 0x50, 0x50, 0x28, 0x28, 0x28 -); // 0x0700BC80 - 0x0700BC98 -static const Lights1 bbh_seg7_lights_0700BC80 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700BC98 - 0x0700BD18 static const Vtx bbh_seg7_vertex_0700BC98[] = { @@ -323,13 +315,13 @@ static const Gfx bbh_seg7_dl_0700CB58[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09008800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bbh_seg7_lights_0700BC68.l, 1), - gsSPLight(&bbh_seg7_lights_0700BC68.a, 2), + gsSPLightColor(LIGHT_1, 0x505050ff), + gsSPLightColor(LIGHT_2, 0x202020ff), gsSPVertex(bbh_seg7_vertex_0700BC98, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), - gsSPLight(&bbh_seg7_lights_0700BC80.l, 1), - gsSPLight(&bbh_seg7_lights_0700BC80.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(bbh_seg7_vertex_0700BD18, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 4, 0x0), gsSP2Triangles( 2, 5, 3, 0x0, 6, 7, 8, 0x0), diff --git a/levels/bbh/areas/1/14/model.inc.c b/levels/bbh/areas/1/14/model.inc.c index d93eb547..d4dd74bf 100644 --- a/levels/bbh/areas/1/14/model.inc.c +++ b/levels/bbh/areas/1/14/model.inc.c @@ -1,8 +1,4 @@ // 0x0700D350 - 0x0700D368 -static const Lights1 bbh_seg7_lights_0700D350 = gdSPDefLights1( - 0x3f, 0x51, 0x66, - 0x9e, 0xcc, 0xff, 0x28, 0x28, 0x28 -); // 0x0700D368 - 0x0700D428 static const Vtx bbh_seg7_vertex_0700D368[] = { @@ -25,8 +21,8 @@ static const Gfx bbh_seg7_dl_0700D428[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09006000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bbh_seg7_lights_0700D350.l, 1), - gsSPLight(&bbh_seg7_lights_0700D350.a, 2), + gsSPLightColor(LIGHT_1, 0x9eccffff), + gsSPLightColor(LIGHT_2, 0x3f5166ff), gsSPVertex(bbh_seg7_vertex_0700D368, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), diff --git a/levels/bbh/areas/1/16/model.inc.c b/levels/bbh/areas/1/16/model.inc.c index 0b1c055b..3a9d0a91 100644 --- a/levels/bbh/areas/1/16/model.inc.c +++ b/levels/bbh/areas/1/16/model.inc.c @@ -1,20 +1,8 @@ // 0x0700D850 - 0x0700D868 -static const Lights1 bbh_seg7_lights_0700D850 = gdSPDefLights1( - 0x20, 0x20, 0x20, - 0x50, 0x50, 0x50, 0x28, 0x28, 0x28 -); // 0x0700D868 - 0x0700D880 -static const Lights1 bbh_seg7_lights_0700D868 = gdSPDefLights1( - 0x3c, 0x3c, 0x3c, - 0x96, 0x96, 0x96, 0x28, 0x28, 0x28 -); // 0x0700D880 - 0x0700D898 -static const Lights1 bbh_seg7_lights_0700D880 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700D898 - 0x0700D918 static const Vtx bbh_seg7_vertex_0700D898[] = { @@ -473,19 +461,19 @@ static const Gfx bbh_seg7_dl_0700EE98[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09008800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bbh_seg7_lights_0700D850.l, 1), - gsSPLight(&bbh_seg7_lights_0700D850.a, 2), + gsSPLightColor(LIGHT_1, 0x505050ff), + gsSPLightColor(LIGHT_2, 0x202020ff), gsSPVertex(bbh_seg7_vertex_0700D898, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), - gsSPLight(&bbh_seg7_lights_0700D868.l, 1), - gsSPLight(&bbh_seg7_lights_0700D868.a, 2), + gsSPLightColor(LIGHT_1, 0x969696ff), + gsSPLightColor(LIGHT_2, 0x3c3c3cff), gsSPVertex(bbh_seg7_vertex_0700D918, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 4, 0x0), gsSP2Triangles( 0, 5, 3, 0x0, 0, 2, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 6, 9, 7, 0x0), - gsSPLight(&bbh_seg7_lights_0700D880.l, 1), - gsSPLight(&bbh_seg7_lights_0700D880.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(bbh_seg7_vertex_0700D9B8, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 4, 0x0), gsSP2Triangles( 4, 5, 0, 0x0, 0, 2, 3, 0x0), diff --git a/levels/bbh/areas/1/18/model.inc.c b/levels/bbh/areas/1/18/model.inc.c index dd7b78e8..5e2a08e7 100644 --- a/levels/bbh/areas/1/18/model.inc.c +++ b/levels/bbh/areas/1/18/model.inc.c @@ -1,26 +1,10 @@ // 0x0700F8B8 - 0x0700F8D0 -static const Lights1 bbh_seg7_lights_0700F8B8 = gdSPDefLights1( - 0x65, 0x65, 0x38, - 0xfe, 0xfe, 0x8c, 0x28, 0x28, 0x28 -); // 0x0700F8D0 - 0x0700F8E8 -static const Lights1 bbh_seg7_lights_0700F8D0 = gdSPDefLights1( - 0x20, 0x20, 0x20, - 0x50, 0x50, 0x50, 0x28, 0x28, 0x28 -); // 0x0700F8E8 - 0x0700F900 -static const Lights1 bbh_seg7_lights_0700F8E8 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700F900 - 0x0700F918 -static const Lights1 bbh_seg7_lights_0700F900 = gdSPDefLights1( - 0x33, 0x2c, 0x20, - 0x80, 0x70, 0x52, 0x28, 0x28, 0x28 -); // 0x0700F918 - 0x0700F9F8 static const Vtx bbh_seg7_vertex_0700F918[] = { @@ -394,8 +378,8 @@ static const Gfx bbh_seg7_dl_07010A48[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09008800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bbh_seg7_lights_0700F8B8.l, 1), - gsSPLight(&bbh_seg7_lights_0700F8B8.a, 2), + gsSPLightColor(LIGHT_1, 0xfefe8cff), + gsSPLightColor(LIGHT_2, 0x656538ff), gsSPVertex(bbh_seg7_vertex_0700F918, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 5, 6, 3, 0x0, 5, 7, 8, 0x0), @@ -404,13 +388,13 @@ static const Gfx bbh_seg7_dl_07010A48[] = { gsSPVertex(bbh_seg7_vertex_0700F9F8, 7, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP1Triangle( 0, 6, 1, 0x0), - gsSPLight(&bbh_seg7_lights_0700F8D0.l, 1), - gsSPLight(&bbh_seg7_lights_0700F8D0.a, 2), + gsSPLightColor(LIGHT_1, 0x505050ff), + gsSPLightColor(LIGHT_2, 0x202020ff), gsSPVertex(bbh_seg7_vertex_0700FA68, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), - gsSPLight(&bbh_seg7_lights_0700F8E8.l, 1), - gsSPLight(&bbh_seg7_lights_0700F8E8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(bbh_seg7_vertex_0700FAE8, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), @@ -423,18 +407,18 @@ static const Gfx bbh_seg7_dl_07010B58[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09003800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bbh_seg7_lights_0700F8B8.l, 1), - gsSPLight(&bbh_seg7_lights_0700F8B8.a, 2), + gsSPLightColor(LIGHT_1, 0xfefe8cff), + gsSPLightColor(LIGHT_2, 0x656538ff), gsSPVertex(bbh_seg7_vertex_0700FBA8, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), - gsSPLight(&bbh_seg7_lights_0700F8E8.l, 1), - gsSPLight(&bbh_seg7_lights_0700F8E8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(bbh_seg7_vertex_0700FBE8, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), gsSP2Triangles( 8, 9, 10, 0x0, 8, 10, 11, 0x0), - gsSPLight(&bbh_seg7_lights_0700F900.l, 1), - gsSPLight(&bbh_seg7_lights_0700F900.a, 2), + gsSPLightColor(LIGHT_1, 0x807052ff), + gsSPLightColor(LIGHT_2, 0x332c20ff), gsSPVertex(bbh_seg7_vertex_0700FCA8, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), @@ -447,14 +431,14 @@ static const Gfx bbh_seg7_dl_07010C30[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bbh_seg7_texture_07000000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bbh_seg7_lights_0700F8B8.l, 1), - gsSPLight(&bbh_seg7_lights_0700F8B8.a, 2), + gsSPLightColor(LIGHT_1, 0xfefe8cff), + gsSPLightColor(LIGHT_2, 0x656538ff), gsSPVertex(bbh_seg7_vertex_0700FD68, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), gsSP2Triangles( 8, 9, 10, 0x0, 8, 10, 11, 0x0), - gsSPLight(&bbh_seg7_lights_0700F8E8.l, 1), - gsSPLight(&bbh_seg7_lights_0700F8E8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(bbh_seg7_vertex_0700FE28, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 4, 0x0), gsSP2Triangles( 0, 5, 3, 0x0, 0, 4, 1, 0x0), diff --git a/levels/bbh/areas/1/19/model.inc.c b/levels/bbh/areas/1/19/model.inc.c index 577f5337..ff84af20 100644 --- a/levels/bbh/areas/1/19/model.inc.c +++ b/levels/bbh/areas/1/19/model.inc.c @@ -1,8 +1,4 @@ // 0x07011228 - 0x07011240 -static const Lights1 bbh_seg7_lights_07011228 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07011240 - 0x070112C0 static const Vtx bbh_seg7_vertex_07011240[] = { @@ -252,8 +248,8 @@ static const Gfx bbh_seg7_dl_07011DF0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_0900A000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bbh_seg7_lights_07011228.l, 1), - gsSPLight(&bbh_seg7_lights_07011228.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(bbh_seg7_vertex_07011240, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), diff --git a/levels/bbh/areas/1/20/model.inc.c b/levels/bbh/areas/1/20/model.inc.c index be26cd06..ff63cd51 100644 --- a/levels/bbh/areas/1/20/model.inc.c +++ b/levels/bbh/areas/1/20/model.inc.c @@ -1,8 +1,4 @@ // 0x07012318 - 0x07012330 -static const Lights1 bbh_seg7_lights_07012318 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07012330 - 0x07012430 static const Vtx bbh_seg7_vertex_07012330[] = { @@ -37,8 +33,8 @@ static const Gfx bbh_seg7_dl_07012470[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bbh_seg7_texture_07000000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bbh_seg7_lights_07012318.l, 1), - gsSPLight(&bbh_seg7_lights_07012318.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(bbh_seg7_vertex_07012330, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 3, 6, 2, 0x0), diff --git a/levels/bbh/areas/1/22/model.inc.c b/levels/bbh/areas/1/22/model.inc.c index f20a6871..45d9b3c6 100644 --- a/levels/bbh/areas/1/22/model.inc.c +++ b/levels/bbh/areas/1/22/model.inc.c @@ -1,14 +1,6 @@ // 0x07012758 - 0x07012770 -static const Lights1 bbh_seg7_lights_07012758 = gdSPDefLights1( - 0x3c, 0x3c, 0x3c, - 0x96, 0x96, 0x96, 0x28, 0x28, 0x28 -); // 0x07012770 - 0x07012788 -static const Lights1 bbh_seg7_lights_07012770 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07012788 - 0x070127C8 static const Vtx bbh_seg7_vertex_07012788[] = { @@ -303,8 +295,8 @@ static const Gfx bbh_seg7_dl_07013508[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_0900A000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bbh_seg7_lights_07012758.l, 1), - gsSPLight(&bbh_seg7_lights_07012758.a, 2), + gsSPLightColor(LIGHT_1, 0x969696ff), + gsSPLightColor(LIGHT_2, 0x3c3c3cff), gsSPVertex(bbh_seg7_vertex_07012788, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), @@ -315,8 +307,8 @@ static const Gfx bbh_seg7_dl_07013550[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09008800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bbh_seg7_lights_07012770.l, 1), - gsSPLight(&bbh_seg7_lights_07012770.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(bbh_seg7_vertex_070127C8, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), diff --git a/levels/bbh/areas/1/24/model.inc.c b/levels/bbh/areas/1/24/model.inc.c index 4692f501..254cb93a 100644 --- a/levels/bbh/areas/1/24/model.inc.c +++ b/levels/bbh/areas/1/24/model.inc.c @@ -1,14 +1,6 @@ // 0x07013C58 - 0x07013C70 -static const Lights1 bbh_seg7_lights_07013C58 = gdSPDefLights1( - 0x20, 0x20, 0x20, - 0x50, 0x50, 0x50, 0x28, 0x28, 0x28 -); // 0x07013C70 - 0x07013C88 -static const Lights1 bbh_seg7_lights_07013C70 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07013C88 - 0x07013D08 static const Vtx bbh_seg7_vertex_07013C88[] = { @@ -321,13 +313,13 @@ static const Gfx bbh_seg7_dl_07014B28[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09008800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bbh_seg7_lights_07013C58.l, 1), - gsSPLight(&bbh_seg7_lights_07013C58.a, 2), + gsSPLightColor(LIGHT_1, 0x505050ff), + gsSPLightColor(LIGHT_2, 0x202020ff), gsSPVertex(bbh_seg7_vertex_07013C88, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), - gsSPLight(&bbh_seg7_lights_07013C70.l, 1), - gsSPLight(&bbh_seg7_lights_07013C70.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(bbh_seg7_vertex_07013D08, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), @@ -340,8 +332,8 @@ static const Gfx bbh_seg7_dl_07014BC8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_0900A000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bbh_seg7_lights_07013C58.l, 1), - gsSPLight(&bbh_seg7_lights_07013C58.a, 2), + gsSPLightColor(LIGHT_1, 0x505050ff), + gsSPLightColor(LIGHT_2, 0x202020ff), gsSPVertex(bbh_seg7_vertex_07013DC8, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), @@ -352,8 +344,8 @@ static const Gfx bbh_seg7_dl_07014C10[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09004800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bbh_seg7_lights_07013C70.l, 1), - gsSPLight(&bbh_seg7_lights_07013C70.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(bbh_seg7_vertex_07013E08, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSPEndDisplayList(), diff --git a/levels/bbh/areas/1/28/model.inc.c b/levels/bbh/areas/1/28/model.inc.c index 437165eb..d6800bcf 100644 --- a/levels/bbh/areas/1/28/model.inc.c +++ b/levels/bbh/areas/1/28/model.inc.c @@ -1,8 +1,4 @@ // 0x07015A90 - 0x07015AA8 -static const Lights1 bbh_seg7_lights_07015A90 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07015AA8 - 0x07015B98 static const Vtx bbh_seg7_vertex_07015AA8[] = { @@ -394,8 +390,8 @@ static const Gfx bbh_seg7_dl_07016D38[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09004800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bbh_seg7_lights_07015A90.l, 1), - gsSPLight(&bbh_seg7_lights_07015A90.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(bbh_seg7_vertex_07015AA8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), diff --git a/levels/bbh/areas/1/29/model.inc.c b/levels/bbh/areas/1/29/model.inc.c index f76f7fc9..447a9f8a 100644 --- a/levels/bbh/areas/1/29/model.inc.c +++ b/levels/bbh/areas/1/29/model.inc.c @@ -1,8 +1,4 @@ // 0x07017480 - 0x07017498 -static const Lights1 bbh_seg7_lights_07017480 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07017498 - 0x07017518 static const Vtx bbh_seg7_vertex_07017498[] = { @@ -21,8 +17,8 @@ static const Gfx bbh_seg7_dl_07017518[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09006000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bbh_seg7_lights_07017480.l, 1), - gsSPLight(&bbh_seg7_lights_07017480.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(bbh_seg7_vertex_07017498, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), diff --git a/levels/bbh/areas/1/3/model.inc.c b/levels/bbh/areas/1/3/model.inc.c index 7bcc13f8..63e110ef 100644 --- a/levels/bbh/areas/1/3/model.inc.c +++ b/levels/bbh/areas/1/3/model.inc.c @@ -1,14 +1,6 @@ // 0x070079B0 - 0x070079C8 -static const Lights1 bbh_seg7_lights_070079B0 = gdSPDefLights1( - 0x3f, 0x51, 0x66, - 0x9e, 0xcc, 0xff, 0x28, 0x28, 0x28 -); // 0x070079C8 - 0x070079E0 -static const Lights1 bbh_seg7_lights_070079C8 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x070079E0 - 0x07007AA0 static const Vtx bbh_seg7_vertex_070079E0[] = { @@ -39,8 +31,8 @@ static const Gfx bbh_seg7_dl_07007AE0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09006000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bbh_seg7_lights_070079B0.l, 1), - gsSPLight(&bbh_seg7_lights_070079B0.a, 2), + gsSPLightColor(LIGHT_1, 0x9eccffff), + gsSPLightColor(LIGHT_2, 0x3f5166ff), gsSPVertex(bbh_seg7_vertex_070079E0, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), @@ -53,8 +45,8 @@ static const Gfx bbh_seg7_dl_07007B48[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bbh_seg7_texture_07001000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bbh_seg7_lights_070079C8.l, 1), - gsSPLight(&bbh_seg7_lights_070079C8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(bbh_seg7_vertex_07007AA0, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSPEndDisplayList(), diff --git a/levels/bbh/areas/1/31/model.inc.c b/levels/bbh/areas/1/31/model.inc.c index fb295fd5..5324aac5 100644 --- a/levels/bbh/areas/1/31/model.inc.c +++ b/levels/bbh/areas/1/31/model.inc.c @@ -1,14 +1,6 @@ // 0x070177F8 - 0x07017810 -static const Lights1 bbh_seg7_lights_070177F8 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07017810 - 0x07017828 -static const Lights1 bbh_seg7_lights_07017810 = gdSPDefLights1( - 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x07017828 - 0x07017918 static const Vtx bbh_seg7_vertex_07017828[] = { @@ -623,8 +615,8 @@ static const Gfx bbh_seg7_dl_070195A8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_0900A000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bbh_seg7_lights_070177F8.l, 1), - gsSPLight(&bbh_seg7_lights_070177F8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(bbh_seg7_vertex_07017828, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), @@ -836,8 +828,8 @@ static const Gfx bbh_seg7_dl_07019E60[] = { // 0x07019EA8 - 0x07019EF8 static const Gfx bbh_seg7_dl_07019EA8[] = { - gsSPLight(&bbh_seg7_lights_07017810.l, 1), - gsSPLight(&bbh_seg7_lights_07017810.a, 2), + gsSPLightColor(LIGHT_1, 0xff), + gsSPLightColor(LIGHT_2, 0xff), gsSPVertex(bbh_seg7_vertex_07019508, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 1, 5, 0x0, 6, 7, 2, 0x0), diff --git a/levels/bbh/areas/1/33/model.inc.c b/levels/bbh/areas/1/33/model.inc.c index 1330cb53..ab7fdab4 100644 --- a/levels/bbh/areas/1/33/model.inc.c +++ b/levels/bbh/areas/1/33/model.inc.c @@ -1,14 +1,6 @@ // 0x0701A0F0 - 0x0701A108 -static const Lights1 bbh_seg7_lights_0701A0F0 = gdSPDefLights1( - 0x20, 0x20, 0x20, - 0x50, 0x50, 0x50, 0x28, 0x28, 0x28 -); // 0x0701A108 - 0x0701A120 -static const Lights1 bbh_seg7_lights_0701A108 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0701A120 - 0x0701A160 static const Vtx bbh_seg7_vertex_0701A120[] = { @@ -119,8 +111,8 @@ static const Gfx bbh_seg7_dl_0701A620[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_0900A000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bbh_seg7_lights_0701A0F0.l, 1), - gsSPLight(&bbh_seg7_lights_0701A0F0.a, 2), + gsSPLightColor(LIGHT_1, 0x505050ff), + gsSPLightColor(LIGHT_2, 0x202020ff), gsSPVertex(bbh_seg7_vertex_0701A120, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSPEndDisplayList(), @@ -131,8 +123,8 @@ static const Gfx bbh_seg7_dl_0701A668[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09008800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bbh_seg7_lights_0701A108.l, 1), - gsSPLight(&bbh_seg7_lights_0701A108.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(bbh_seg7_vertex_0701A160, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), diff --git a/levels/bbh/areas/1/34/model.inc.c b/levels/bbh/areas/1/34/model.inc.c index d4e7e57e..bd579a1e 100644 --- a/levels/bbh/areas/1/34/model.inc.c +++ b/levels/bbh/areas/1/34/model.inc.c @@ -1,20 +1,8 @@ // 0x0701A920 - 0x0701A938 -static const Lights1 bbh_seg7_lights_0701A920 = gdSPDefLights1( - 0x10, 0x11, 0x16, - 0x2a, 0x2c, 0x37, 0x28, 0x28, 0x28 -); // 0x0701A938 - 0x0701A950 -static const Lights1 bbh_seg7_lights_0701A938 = gdSPDefLights1( - 0x3c, 0x3c, 0x3c, - 0x96, 0x96, 0x96, 0x28, 0x28, 0x28 -); // 0x0701A950 - 0x0701A968 -static const Lights1 bbh_seg7_lights_0701A950 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0701A968 - 0x0701A9C8 static const Vtx bbh_seg7_vertex_0701A968[] = { @@ -229,8 +217,8 @@ static const Gfx bbh_seg7_dl_0701B328[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09004800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bbh_seg7_lights_0701A920.l, 1), - gsSPLight(&bbh_seg7_lights_0701A920.a, 2), + gsSPLightColor(LIGHT_1, 0x2a2c37ff), + gsSPLightColor(LIGHT_2, 0x101116ff), gsSPVertex(bbh_seg7_vertex_0701A968, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 1, 4, 5, 0x0, 1, 5, 2, 0x0), @@ -242,12 +230,12 @@ static const Gfx bbh_seg7_dl_0701B380[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09008800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bbh_seg7_lights_0701A938.l, 1), - gsSPLight(&bbh_seg7_lights_0701A938.a, 2), + gsSPLightColor(LIGHT_1, 0x969696ff), + gsSPLightColor(LIGHT_2, 0x3c3c3cff), gsSPVertex(bbh_seg7_vertex_0701A9C8, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), - gsSPLight(&bbh_seg7_lights_0701A950.l, 1), - gsSPLight(&bbh_seg7_lights_0701A950.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(bbh_seg7_vertex_0701AA08, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), diff --git a/levels/bbh/areas/1/35/model.inc.c b/levels/bbh/areas/1/35/model.inc.c index a1394160..a28b7dc4 100644 --- a/levels/bbh/areas/1/35/model.inc.c +++ b/levels/bbh/areas/1/35/model.inc.c @@ -1,44 +1,16 @@ // 0x0701B7A8 - 0x0701B7C0 -static const Lights1 bbh_seg7_lights_0701B7A8 = gdSPDefLights1( - 0x24, 0x11, 0x0b, - 0x5a, 0x2c, 0x1d, 0x28, 0x28, 0x28 -); // 0x0701B7C0 - 0x0701B7D8 -static const Lights1 bbh_seg7_lights_0701B7C0 = gdSPDefLights1( - 0x20, 0x20, 0x20, - 0x50, 0x50, 0x50, 0x28, 0x28, 0x28 -); // 0x0701B7D8 - 0x0701B7F0 -static const Lights1 bbh_seg7_lights_0701B7D8 = gdSPDefLights1( - 0x3c, 0x3c, 0x3c, - 0x96, 0x96, 0x96, 0x28, 0x28, 0x28 -); // 0x0701B7F0 - 0x0701B808 -static const Lights1 bbh_seg7_lights_0701B7F0 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0701B808 - 0x0701B820 -static const Lights1 bbh_seg7_lights_0701B808 = gdSPDefLights1( - 0x24, 0x07, 0x00, - 0x5a, 0x13, 0x00, 0x28, 0x28, 0x28 -); // 0x0701B820 - 0x0701B838 -static const Lights1 bbh_seg7_lights_0701B820 = gdSPDefLights1( - 0x44, 0x1c, 0x0c, - 0xaa, 0x46, 0x1e, 0x28, 0x28, 0x28 -); // 0x0701B838 - 0x0701B850 -static const Lights1 bbh_seg7_lights_0701B838 = gdSPDefLights1( - 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x0701B850 - 0x0701B940 static const Vtx bbh_seg7_vertex_0701B850[] = { @@ -736,8 +708,8 @@ static const Gfx bbh_seg7_dl_0701D9C0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09004800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bbh_seg7_lights_0701B7A8.l, 1), - gsSPLight(&bbh_seg7_lights_0701B7A8.a, 2), + gsSPLightColor(LIGHT_1, 0x5a2c1dff), + gsSPLightColor(LIGHT_2, 0x24110bff), gsSPVertex(bbh_seg7_vertex_0701B850, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), @@ -754,8 +726,8 @@ static const Gfx bbh_seg7_dl_0701DA50[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_0900A000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bbh_seg7_lights_0701B7C0.l, 1), - gsSPLight(&bbh_seg7_lights_0701B7C0.a, 2), + gsSPLightColor(LIGHT_1, 0x505050ff), + gsSPLightColor(LIGHT_2, 0x202020ff), gsSPVertex(bbh_seg7_vertex_0701B9B0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 6, 7, 0x0, 4, 8, 9, 0x0), @@ -775,15 +747,15 @@ static const Gfx bbh_seg7_dl_0701DB20[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09008800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bbh_seg7_lights_0701B7D8.l, 1), - gsSPLight(&bbh_seg7_lights_0701B7D8.a, 2), + gsSPLightColor(LIGHT_1, 0x969696ff), + gsSPLightColor(LIGHT_2, 0x3c3c3cff), gsSPVertex(bbh_seg7_vertex_0701BAF0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 6, 5, 0x0, 7, 8, 9, 0x0), gsSP2Triangles( 7, 9, 10, 0x0, 11, 12, 13, 0x0), gsSP2Triangles(11, 13, 14, 0x0, 0, 15, 1, 0x0), - gsSPLight(&bbh_seg7_lights_0701B7F0.l, 1), - gsSPLight(&bbh_seg7_lights_0701B7F0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(bbh_seg7_vertex_0701BBF0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), @@ -797,15 +769,15 @@ static const Gfx bbh_seg7_dl_0701DBF0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09003800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bbh_seg7_lights_0701B7A8.l, 1), - gsSPLight(&bbh_seg7_lights_0701B7A8.a, 2), + gsSPLightColor(LIGHT_1, 0x5a2c1dff), + gsSPLightColor(LIGHT_2, 0x24110bff), gsSPVertex(bbh_seg7_vertex_0701BCF0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), gsSP2Triangles( 7, 9, 10, 0x0, 11, 12, 13, 0x0), gsSP2Triangles(12, 14, 13, 0x0, 0, 15, 1, 0x0), - gsSPLight(&bbh_seg7_lights_0701B808.l, 1), - gsSPLight(&bbh_seg7_lights_0701B808.a, 2), + gsSPLightColor(LIGHT_1, 0x5a1300ff), + gsSPLightColor(LIGHT_2, 0x240700ff), gsSPVertex(bbh_seg7_vertex_0701BDF0, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 6, 5, 0x0, 7, 8, 9, 0x0), @@ -851,8 +823,8 @@ static const Gfx bbh_seg7_dl_0701DBF0[] = { gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), gsSP2Triangles(10, 11, 12, 0x0, 10, 12, 13, 0x0), - gsSPLight(&bbh_seg7_lights_0701B7F0.l, 1), - gsSPLight(&bbh_seg7_lights_0701B7F0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(bbh_seg7_vertex_0701C730, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), @@ -862,8 +834,8 @@ static const Gfx bbh_seg7_dl_0701DBF0[] = { gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 6, 8, 9, 0x0), gsSP1Triangle( 0, 2, 10, 0x0), - gsSPLight(&bbh_seg7_lights_0701B820.l, 1), - gsSPLight(&bbh_seg7_lights_0701B820.a, 2), + gsSPLightColor(LIGHT_1, 0xaa461eff), + gsSPLightColor(LIGHT_2, 0x441c0cff), gsSPVertex(bbh_seg7_vertex_0701C8D0, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), @@ -876,8 +848,8 @@ static const Gfx bbh_seg7_dl_0701DFA0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09005000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bbh_seg7_lights_0701B7C0.l, 1), - gsSPLight(&bbh_seg7_lights_0701B7C0.a, 2), + gsSPLightColor(LIGHT_1, 0x505050ff), + gsSPLightColor(LIGHT_2, 0x202020ff), gsSPVertex(bbh_seg7_vertex_0701C990, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), @@ -920,8 +892,8 @@ static const Gfx bbh_seg7_dl_0701E188[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bbh_seg7_texture_07000000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bbh_seg7_lights_0701B7F0.l, 1), - gsSPLight(&bbh_seg7_lights_0701B7F0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(bbh_seg7_vertex_0701D030, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 3, 8, 0x0), @@ -936,13 +908,13 @@ static const Gfx bbh_seg7_dl_0701E210[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09007000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bbh_seg7_lights_0701B7D8.l, 1), - gsSPLight(&bbh_seg7_lights_0701B7D8.a, 2), + gsSPLightColor(LIGHT_1, 0x969696ff), + gsSPLightColor(LIGHT_2, 0x3c3c3cff), gsSPVertex(bbh_seg7_vertex_0701D130, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), - gsSPLight(&bbh_seg7_lights_0701B7F0.l, 1), - gsSPLight(&bbh_seg7_lights_0701B7F0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(bbh_seg7_vertex_0701D1B0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 3, 9, 4, 0x0), @@ -996,8 +968,8 @@ static const Gfx bbh_seg7_dl_0701E430[] = { // 0x0701E4B0 - 0x0701E4E0 static const Gfx bbh_seg7_dl_0701E4B0[] = { - gsSPLight(&bbh_seg7_lights_0701B838.l, 1), - gsSPLight(&bbh_seg7_lights_0701B838.a, 2), + gsSPLightColor(LIGHT_1, 0xff), + gsSPLightColor(LIGHT_2, 0xff), gsSPVertex(bbh_seg7_vertex_0701D980, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSPEndDisplayList(), diff --git a/levels/bbh/areas/1/36/model.inc.c b/levels/bbh/areas/1/36/model.inc.c index d6501ead..da18bff9 100644 --- a/levels/bbh/areas/1/36/model.inc.c +++ b/levels/bbh/areas/1/36/model.inc.c @@ -1,8 +1,4 @@ // 0x0701E5D8 - 0x0701E5F0 -static const Lights1 bbh_seg7_lights_0701E5D8 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0701E5F0 - 0x0701E6E0 static const Vtx bbh_seg7_vertex_0701E5F0[] = { @@ -55,8 +51,8 @@ static const Gfx bbh_seg7_dl_0701E810[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bbh_seg7_texture_07001800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bbh_seg7_lights_0701E5D8.l, 1), - gsSPLight(&bbh_seg7_lights_0701E5D8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(bbh_seg7_vertex_0701E5F0, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), diff --git a/levels/bbh/areas/1/37/model.inc.c b/levels/bbh/areas/1/37/model.inc.c index 3810ed45..0b7ed4c3 100644 --- a/levels/bbh/areas/1/37/model.inc.c +++ b/levels/bbh/areas/1/37/model.inc.c @@ -1,14 +1,6 @@ // 0x0701E948 - 0x0701E960 -static const Lights1 bbh_seg7_lights_0701E948 = gdSPDefLights1( - 0x24, 0x11, 0x0b, - 0x5a, 0x2c, 0x1d, 0x28, 0x28, 0x28 -); // 0x0701E960 - 0x0701E978 -static const Lights1 bbh_seg7_lights_0701E960 = gdSPDefLights1( - 0x3c, 0x3c, 0x3c, - 0x96, 0x96, 0x96, 0x28, 0x28, 0x28 -); // 0x0701E978 - 0x0701E9F8 static const Vtx bbh_seg7_vertex_0701E978[] = { @@ -73,13 +65,13 @@ static const Gfx bbh_seg7_dl_0701EC18[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09006000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bbh_seg7_lights_0701E948.l, 1), - gsSPLight(&bbh_seg7_lights_0701E948.a, 2), + gsSPLightColor(LIGHT_1, 0x5a2c1dff), + gsSPLightColor(LIGHT_2, 0x24110bff), gsSPVertex(bbh_seg7_vertex_0701E978, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), - gsSPLight(&bbh_seg7_lights_0701E960.l, 1), - gsSPLight(&bbh_seg7_lights_0701E960.a, 2), + gsSPLightColor(LIGHT_1, 0x969696ff), + gsSPLightColor(LIGHT_2, 0x3c3c3cff), gsSPVertex(bbh_seg7_vertex_0701E9F8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), diff --git a/levels/bbh/areas/1/7/model.inc.c b/levels/bbh/areas/1/7/model.inc.c index af6faf5c..cbb05621 100644 --- a/levels/bbh/areas/1/7/model.inc.c +++ b/levels/bbh/areas/1/7/model.inc.c @@ -1,20 +1,8 @@ // 0x07008F18 - 0x07008F30 -static const Lights1 bbh_seg7_lights_07008F18 = gdSPDefLights1( - 0x20, 0x20, 0x20, - 0x50, 0x50, 0x50, 0x28, 0x28, 0x28 -); // 0x07008F30 - 0x07008F48 -static const Lights1 bbh_seg7_lights_07008F30 = gdSPDefLights1( - 0x3c, 0x3c, 0x3c, - 0x96, 0x96, 0x96, 0x28, 0x28, 0x28 -); // 0x07008F48 - 0x07008F60 -static const Lights1 bbh_seg7_lights_07008F48 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07008F60 - 0x07008FE0 static const Vtx bbh_seg7_vertex_07008F60[] = { @@ -531,21 +519,21 @@ static const Gfx bbh_seg7_dl_0700A800[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09008800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bbh_seg7_lights_07008F18.l, 1), - gsSPLight(&bbh_seg7_lights_07008F18.a, 2), + gsSPLightColor(LIGHT_1, 0x505050ff), + gsSPLightColor(LIGHT_2, 0x202020ff), gsSPVertex(bbh_seg7_vertex_07008F60, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), - gsSPLight(&bbh_seg7_lights_07008F30.l, 1), - gsSPLight(&bbh_seg7_lights_07008F30.a, 2), + gsSPLightColor(LIGHT_1, 0x969696ff), + gsSPLightColor(LIGHT_2, 0x3c3c3cff), gsSPVertex(bbh_seg7_vertex_07008FE0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 4, 0x0), gsSP2Triangles( 9, 10, 8, 0x0, 10, 0, 8, 0x0), gsSP2Triangles( 0, 2, 11, 0x0, 12, 5, 13, 0x0), gsSP2Triangles( 7, 14, 8, 0x0, 12, 13, 15, 0x0), - gsSPLight(&bbh_seg7_lights_07008F48.l, 1), - gsSPLight(&bbh_seg7_lights_07008F48.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(bbh_seg7_vertex_070090E0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), diff --git a/levels/bbh/areas/1/8/model.inc.c b/levels/bbh/areas/1/8/model.inc.c index abc5a6ab..d47f4e9d 100644 --- a/levels/bbh/areas/1/8/model.inc.c +++ b/levels/bbh/areas/1/8/model.inc.c @@ -1,8 +1,4 @@ // 0x0700B0D8 - 0x0700B0F0 -static const Lights1 bbh_seg7_lights_0700B0D8 = gdSPDefLights1( - 0x3f, 0x51, 0x66, - 0x9e, 0xcc, 0xff, 0x28, 0x28, 0x28 -); // 0x0700B0F0 - 0x0700B170 static const Vtx bbh_seg7_vertex_0700B0F0[] = { @@ -21,8 +17,8 @@ static const Gfx bbh_seg7_dl_0700B170[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09006000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bbh_seg7_lights_0700B0D8.l, 1), - gsSPLight(&bbh_seg7_lights_0700B0D8.a, 2), + gsSPLightColor(LIGHT_1, 0x9eccffff), + gsSPLightColor(LIGHT_2, 0x3f5166ff), gsSPVertex(bbh_seg7_vertex_0700B0F0, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), diff --git a/levels/bbh/coffin/model.inc.c b/levels/bbh/coffin/model.inc.c index 147b833c..069406fc 100644 --- a/levels/bbh/coffin/model.inc.c +++ b/levels/bbh/coffin/model.inc.c @@ -1,8 +1,4 @@ // 0x07020368 - 0x07020380 -static const Lights1 bbh_seg7_lights_07020368 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07020380 - 0x07020480 static const Vtx bbh_seg7_vertex_07020380[] = { @@ -61,8 +57,8 @@ static const Gfx bbh_seg7_dl_070205C0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bbh_seg7_texture_07004400), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 16 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bbh_seg7_lights_07020368.l, 1), - gsSPLight(&bbh_seg7_lights_07020368.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(bbh_seg7_vertex_07020380, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), diff --git a/levels/bbh/merry_go_round/model.inc.c b/levels/bbh/merry_go_round/model.inc.c index 0647beca..d1a0f69d 100644 --- a/levels/bbh/merry_go_round/model.inc.c +++ b/levels/bbh/merry_go_round/model.inc.c @@ -1,8 +1,4 @@ // 0x07020058 - 0x07020070 -static const Lights1 bbh_seg7_lights_07020058 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07020070 - 0x07020130 static const Vtx bbh_seg7_vertex_07020070[] = { @@ -45,8 +41,8 @@ static const Gfx bbh_seg7_dl_07020230[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09005000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bbh_seg7_lights_07020058.l, 1), - gsSPLight(&bbh_seg7_lights_07020058.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(bbh_seg7_vertex_07020070, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), diff --git a/levels/bbh/moving_bookshelf/model.inc.c b/levels/bbh/moving_bookshelf/model.inc.c index f20df1eb..b293bdb0 100644 --- a/levels/bbh/moving_bookshelf/model.inc.c +++ b/levels/bbh/moving_bookshelf/model.inc.c @@ -1,8 +1,4 @@ // 0x0701FB20 - 0x0701FB38 -static const Lights1 bbh_seg7_lights_0701FB20 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0701FB38 - 0x0701FB78 static const Vtx bbh_seg7_vertex_0701FB38[] = { @@ -37,8 +33,8 @@ static const Gfx bbh_seg7_dl_0701FC78[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09003800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bbh_seg7_lights_0701FB20.l, 1), - gsSPLight(&bbh_seg7_lights_0701FB20.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(bbh_seg7_vertex_0701FB38, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), diff --git a/levels/bbh/staircase_step/model.inc.c b/levels/bbh/staircase_step/model.inc.c index 9b0a917b..fbf7914c 100644 --- a/levels/bbh/staircase_step/model.inc.c +++ b/levels/bbh/staircase_step/model.inc.c @@ -1,8 +1,4 @@ // 0x0701F0E0 - 0x0701F0F8 -static const Lights1 bbh_seg7_lights_0701F0E0 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0701F0F8 - 0x0701F138 static const Vtx bbh_seg7_vertex_0701F0F8[] = { @@ -37,8 +33,8 @@ static const Gfx bbh_seg7_dl_0701F238[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_0900A000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bbh_seg7_lights_0701F0E0.l, 1), - gsSPLight(&bbh_seg7_lights_0701F0E0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(bbh_seg7_vertex_0701F0F8, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), diff --git a/levels/bbh/tilting_trap_platform/model.inc.c b/levels/bbh/tilting_trap_platform/model.inc.c index 5d07d918..e7ba1889 100644 --- a/levels/bbh/tilting_trap_platform/model.inc.c +++ b/levels/bbh/tilting_trap_platform/model.inc.c @@ -1,8 +1,4 @@ // 0x0701F378 - 0x0701F390 -static const Lights1 bbh_seg7_lights_0701F378 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0701F390 - 0x0701F3D0 static const Vtx bbh_seg7_vertex_0701F390[] = { @@ -45,8 +41,8 @@ static const Gfx bbh_seg7_dl_0701F510[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09008800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bbh_seg7_lights_0701F378.l, 1), - gsSPLight(&bbh_seg7_lights_0701F378.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(bbh_seg7_vertex_0701F390, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), diff --git a/levels/bbh/tumbling_platform_far/model.inc.c b/levels/bbh/tumbling_platform_far/model.inc.c index 9e523ee7..8d5f7acc 100644 --- a/levels/bbh/tumbling_platform_far/model.inc.c +++ b/levels/bbh/tumbling_platform_far/model.inc.c @@ -1,8 +1,4 @@ // 0x0701F6A8 - 0x0701F6C0 -static const Lights1 bbh_seg7_lights_0701F6A8 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0701F6C0 - 0x0701F780 static const Vtx bbh_seg7_vertex_0701F6C0[] = { @@ -25,8 +21,8 @@ static const Gfx bbh_seg7_dl_0701F780[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09004800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bbh_seg7_lights_0701F6A8.l, 1), - gsSPLight(&bbh_seg7_lights_0701F6A8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(bbh_seg7_vertex_0701F6C0, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), diff --git a/levels/bbh/tumbling_platform_near/model.inc.c b/levels/bbh/tumbling_platform_near/model.inc.c index f5ab8dcb..119beb77 100644 --- a/levels/bbh/tumbling_platform_near/model.inc.c +++ b/levels/bbh/tumbling_platform_near/model.inc.c @@ -1,8 +1,4 @@ // 0x0701F858 - 0x0701F870 -static const Lights1 bbh_seg7_lights_0701F858 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0701F870 - 0x0701F960 static const Vtx bbh_seg7_vertex_0701F870[] = { @@ -43,8 +39,8 @@ static const Gfx bbh_seg7_dl_0701FA10[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09004800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bbh_seg7_lights_0701F858.l, 1), - gsSPLight(&bbh_seg7_lights_0701F858.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(bbh_seg7_vertex_0701F870, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), diff --git a/levels/bitdw/ferris_wheel_axle/model.inc.c b/levels/bitdw/ferris_wheel_axle/model.inc.c index 9370404d..cb065b6f 100644 --- a/levels/bitdw/ferris_wheel_axle/model.inc.c +++ b/levels/bitdw/ferris_wheel_axle/model.inc.c @@ -1,8 +1,4 @@ // 0x0700B4F0 - 0x0700B508 -static const Lights1 bitdw_seg7_lights_0700B4F0 = gdSPDefLights1( - 0x39, 0x6f, 0x5d, - 0x79, 0xeb, 0xc5, 0x28, 0x28, 0x28 -); // 0x0700B508 - 0x0700B5F8 static const Vtx bitdw_seg7_vertex_0700B508[] = { @@ -73,8 +69,8 @@ static const Gfx bitdw_seg7_dl_0700B808[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, sky_09000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bitdw_seg7_lights_0700B4F0.l, 1), - gsSPLight(&bitdw_seg7_lights_0700B4F0.a, 2), + gsSPLightColor(LIGHT_1, 0x79ebc5ff), + gsSPLightColor(LIGHT_2, 0x396f5dff), gsSPVertex(bitdw_seg7_vertex_0700B508, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), diff --git a/levels/bitfs/areas/1/18/model.inc.c b/levels/bitfs/areas/1/18/model.inc.c index 44b913db..86b99477 100644 --- a/levels/bitfs/areas/1/18/model.inc.c +++ b/levels/bitfs/areas/1/18/model.inc.c @@ -1,38 +1,14 @@ // 0x0700C430 - 0x0700C448 -static const Lights1 bitfs_seg7_lights_0700C430 = gdSPDefLights1( - 0x46, 0x46, 0x46, - 0x8c, 0x8c, 0x8c, 0x28, 0x28, 0x28 -); // 0x0700C448 - 0x0700C460 -static const Lights1 bitfs_seg7_lights_0700C448 = gdSPDefLights1( - 0x64, 0x64, 0x64, - 0xc8, 0xc8, 0xc8, 0x28, 0x28, 0x28 -); // 0x0700C460 - 0x0700C478 -static const Lights1 bitfs_seg7_lights_0700C460 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700C478 - 0x0700C490 -static const Lights1 bitfs_seg7_lights_0700C478 = gdSPDefLights1( - 0x32, 0x32, 0x32, - 0x64, 0x64, 0x64, 0x28, 0x28, 0x28 -); // 0x0700C490 - 0x0700C4A8 -static const Lights1 bitfs_seg7_lights_0700C490 = gdSPDefLights1( - 0x62, 0x7f, 0x7f, - 0xc4, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700C4A8 - 0x0700C4C0 -static const Lights1 bitfs_seg7_lights_0700C4A8 = gdSPDefLights1( - 0x32, 0x7f, 0x59, - 0x65, 0xff, 0xb2, 0x28, 0x28, 0x28 -); // 0x0700C4C0 - 0x0700C540 static const Vtx bitfs_seg7_vertex_0700C4C0[] = { @@ -693,21 +669,21 @@ static const Gfx bitfs_seg7_dl_0700E460[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, sky_09001800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bitfs_seg7_lights_0700C430.l, 1), - gsSPLight(&bitfs_seg7_lights_0700C430.a, 2), + gsSPLightColor(LIGHT_1, 0x8c8c8cff), + gsSPLightColor(LIGHT_2, 0x464646ff), gsSPVertex(bitfs_seg7_vertex_0700C4C0, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), - gsSPLight(&bitfs_seg7_lights_0700C448.l, 1), - gsSPLight(&bitfs_seg7_lights_0700C448.a, 2), + gsSPLightColor(LIGHT_1, 0xc8c8c8ff), + gsSPLightColor(LIGHT_2, 0x646464ff), gsSPVertex(bitfs_seg7_vertex_0700C540, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - gsSPLight(&bitfs_seg7_lights_0700C460.l, 1), - gsSPLight(&bitfs_seg7_lights_0700C460.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(bitfs_seg7_vertex_0700C580, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - gsSPLight(&bitfs_seg7_lights_0700C478.l, 1), - gsSPLight(&bitfs_seg7_lights_0700C478.a, 2), + gsSPLightColor(LIGHT_1, 0x646464ff), + gsSPLightColor(LIGHT_2, 0x323232ff), gsSPVertex(bitfs_seg7_vertex_0700C5C0, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), @@ -718,8 +694,8 @@ static const Gfx bitfs_seg7_dl_0700E530[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, sky_09000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bitfs_seg7_lights_0700C490.l, 1), - gsSPLight(&bitfs_seg7_lights_0700C490.a, 2), + gsSPLightColor(LIGHT_1, 0xc4ffffff), + gsSPLightColor(LIGHT_2, 0x627f7fff), gsSPVertex(bitfs_seg7_vertex_0700C600, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 6, 8, 9, 0x0), @@ -818,8 +794,8 @@ static const Gfx bitfs_seg7_dl_0700E530[] = { gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), gsSP2Triangles( 9, 12, 10, 0x0, 6, 13, 7, 0x0), gsSP1Triangle( 3, 14, 4, 0x0), - gsSPLight(&bitfs_seg7_lights_0700C4A8.l, 1), - gsSPLight(&bitfs_seg7_lights_0700C4A8.a, 2), + gsSPLightColor(LIGHT_1, 0x65ffb2ff), + gsSPLightColor(LIGHT_2, 0x327f59ff), gsSPVertex(bitfs_seg7_vertex_0700DCE0, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 0, 2, 9, 0x0), diff --git a/levels/bits/areas/1/22/model.inc.c b/levels/bits/areas/1/22/model.inc.c index 9d0b8964..7d5b973b 100644 --- a/levels/bits/areas/1/22/model.inc.c +++ b/levels/bits/areas/1/22/model.inc.c @@ -1,20 +1,8 @@ // 0x07012DB0 - 0x07012DC8 -static const Lights1 bits_seg7_lights_07012DB0 = gdSPDefLights1( - 0x58, 0x5f, 0x7d, - 0xb1, 0xbf, 0xfa, 0x28, 0x28, 0x28 -); // 0x07012DC8 - 0x07012DE0 -static const Lights1 bits_seg7_lights_07012DC8 = gdSPDefLights1( - 0x4c, 0x46, 0x6c, - 0x98, 0x8c, 0xd8, 0x28, 0x28, 0x28 -); // 0x07012DE0 - 0x07012DF8 -static const Lights1 bits_seg7_lights_07012DE0 = gdSPDefLights1( - 0x59, 0x32, 0x7f, - 0xb2, 0x65, 0xff, 0x28, 0x28, 0x28 -); // 0x07012DF8 - 0x07012E78 static const Vtx bits_seg7_vertex_07012DF8[] = { @@ -141,14 +129,14 @@ static const Gfx bits_seg7_dl_070133B8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, sky_09001800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bits_seg7_lights_07012DB0.l, 1), - gsSPLight(&bits_seg7_lights_07012DB0.a, 2), + gsSPLightColor(LIGHT_1, 0xb1bffaff), + gsSPLightColor(LIGHT_2, 0x585f7dff), gsSPVertex(bits_seg7_vertex_07012DF8, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 0, 3, 4, 0x0, 0, 5, 6, 0x0), gsSP2Triangles( 0, 7, 1, 0x0, 0, 4, 5, 0x0), - gsSPLight(&bits_seg7_lights_07012DC8.l, 1), - gsSPLight(&bits_seg7_lights_07012DC8.a, 2), + gsSPLightColor(LIGHT_1, 0x988cd8ff), + gsSPLightColor(LIGHT_2, 0x4c466cff), gsSPVertex(bits_seg7_vertex_07012E78, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 3, 5, 9, 0x0), @@ -160,8 +148,8 @@ static const Gfx bits_seg7_dl_070133B8[] = { gsSPVertex(bits_seg7_vertex_07013058, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 6, 8, 9, 0x0), - gsSPLight(&bits_seg7_lights_07012DE0.l, 1), - gsSPLight(&bits_seg7_lights_07012DE0.a, 2), + gsSPLightColor(LIGHT_1, 0xb265ffff), + gsSPLightColor(LIGHT_2, 0x59327fff), gsSPVertex(bits_seg7_vertex_070130F8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 3, 5, 0x0, 7, 8, 9, 0x0), diff --git a/levels/bits/areas/1/24/model.inc.c b/levels/bits/areas/1/24/model.inc.c index 0e0d2ac8..fb13ef3c 100644 --- a/levels/bits/areas/1/24/model.inc.c +++ b/levels/bits/areas/1/24/model.inc.c @@ -1,8 +1,4 @@ // 0x07013890 - 0x070138A8 -static const Lights1 bits_seg7_lights_07013890 = gdSPDefLights1( - 0x14, 0x2f, 0x29, - 0x50, 0xbf, 0xa7, 0x28, 0x28, 0x28 -); // 0x070138A8 - 0x07013998 static const Vtx bits_seg7_vertex_070138A8[] = { @@ -73,8 +69,8 @@ static const Gfx bits_seg7_dl_07013BA8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, sky_09007000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bits_seg7_lights_07013890.l, 1), - gsSPLight(&bits_seg7_lights_07013890.a, 2), + gsSPLightColor(LIGHT_1, 0x50bfa7ff), + gsSPLightColor(LIGHT_2, 0x142f29ff), gsSPVertex(bits_seg7_vertex_070138A8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), diff --git a/levels/bob/areas/1/1/model.inc.c b/levels/bob/areas/1/1/model.inc.c index 97807418..498fa948 100644 --- a/levels/bob/areas/1/1/model.inc.c +++ b/levels/bob/areas/1/1/model.inc.c @@ -1,8 +1,4 @@ // 0x07002800 - 0x07002818 -static const Lights1 bob_seg7_lights_07002800 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07002818 - 0x07002908 static const Vtx bob_seg7_vertex_07002818[] = { @@ -430,8 +426,8 @@ static const Gfx bob_seg7_dl_07003CA8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, generic_09005800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bob_seg7_lights_07002800.l, 1), - gsSPLight(&bob_seg7_lights_07002800.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(bob_seg7_vertex_07002818, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 2, 4, 0x0), gsSP2Triangles( 3, 0, 2, 0x0, 2, 1, 4, 0x0), diff --git a/levels/bob/areas/1/2/model.inc.c b/levels/bob/areas/1/2/model.inc.c index ac0ed4b9..019659b3 100644 --- a/levels/bob/areas/1/2/model.inc.c +++ b/levels/bob/areas/1/2/model.inc.c @@ -1,8 +1,4 @@ // 0x07004478 - 0x07004490 -static const Lights1 bob_seg7_lights_07004478 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07004490 - 0x07004590 static const Vtx bob_seg7_vertex_07004490[] = { @@ -1451,8 +1447,8 @@ static const Gfx bob_seg7_dl_07008AF0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, generic_09003800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bob_seg7_lights_07004478.l, 1), - gsSPLight(&bob_seg7_lights_07004478.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(bob_seg7_vertex_07004490, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 3, 5, 0x0, 7, 8, 9, 0x0), diff --git a/levels/bob/areas/1/5/model.inc.c b/levels/bob/areas/1/5/model.inc.c index 48a9dcdf..53793c9b 100644 --- a/levels/bob/areas/1/5/model.inc.c +++ b/levels/bob/areas/1/5/model.inc.c @@ -1,14 +1,6 @@ // 0x0700A9E0 - 0x0700A9F8 -static const Lights1 bob_seg7_lights_0700A9E0 = gdSPDefLights1( - 0x33, 0x33, 0x33, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700A9F8 - 0x0700AA10 -static const Lights1 bob_seg7_lights_0700A9F8 = gdSPDefLights1( - 0x14, 0x14, 0x14, - 0x64, 0x64, 0x64, 0x28, 0x28, 0x28 -); // 0x0700AA10 - 0x0700AAF0 static const Vtx bob_seg7_vertex_0700AA10[] = { @@ -790,8 +782,8 @@ static const Gfx bob_seg7_dl_0700CFC0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, generic_09009000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bob_seg7_lights_0700A9E0.l, 1), - gsSPLight(&bob_seg7_lights_0700A9E0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x333333ff), gsSPVertex(bob_seg7_vertex_0700AA10, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0), gsSP2Triangles( 0, 4, 1, 0x0, 1, 5, 2, 0x0), @@ -925,8 +917,8 @@ static const Gfx bob_seg7_dl_0700CFC0[] = { gsSPVertex(bob_seg7_vertex_0700BF30, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 0, 3, 0x0, 4, 3, 5, 0x0), - gsSPLight(&bob_seg7_lights_0700A9F8.l, 1), - gsSPLight(&bob_seg7_lights_0700A9F8.a, 2), + gsSPLightColor(LIGHT_1, 0x646464ff), + gsSPLightColor(LIGHT_2, 0x141414ff), gsSPVertex(bob_seg7_vertex_0700BF90, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -945,8 +937,8 @@ static const Gfx bob_seg7_dl_0700D7D8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, generic_09005800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bob_seg7_lights_0700A9E0.l, 1), - gsSPLight(&bob_seg7_lights_0700A9E0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x333333ff), gsSPVertex(bob_seg7_vertex_0700C170, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0), gsSP2Triangles( 0, 3, 4, 0x0, 5, 6, 3, 0x0), diff --git a/levels/bob/areas/1/6/model.inc.c b/levels/bob/areas/1/6/model.inc.c index ca18c57b..c1d0781e 100644 --- a/levels/bob/areas/1/6/model.inc.c +++ b/levels/bob/areas/1/6/model.inc.c @@ -1,8 +1,4 @@ // 0x0700DE30 - 0x0700DE48 -static const Lights1 bob_seg7_lights_0700DE30 = gdSPDefLights1( - 0x33, 0x33, 0x33, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700DE48 - 0x0700DF38 static const Vtx bob_seg7_vertex_0700DE48[] = { @@ -83,8 +79,8 @@ static const Gfx bob_seg7_dl_0700E1E8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, generic_09009000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bob_seg7_lights_0700DE30.l, 1), - gsSPLight(&bob_seg7_lights_0700DE30.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x333333ff), gsSPVertex(bob_seg7_vertex_0700DE48, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 5, 4, 7, 0x0), diff --git a/levels/bob/seesaw_platform/model.inc.c b/levels/bob/seesaw_platform/model.inc.c index 0271ad42..afe0b79e 100644 --- a/levels/bob/seesaw_platform/model.inc.c +++ b/levels/bob/seesaw_platform/model.inc.c @@ -1,8 +1,4 @@ // 0x0700E510 - 0x0700E528 -static const Lights1 bob_seg7_lights_0700E510 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700E528 - 0x0700E628 static const Vtx bob_seg7_vertex_0700E528[] = { @@ -43,8 +39,8 @@ static const Gfx bob_seg7_dl_0700E6C8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, generic_09006000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bob_seg7_lights_0700E510.l, 1), - gsSPLight(&bob_seg7_lights_0700E510.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(bob_seg7_vertex_0700E528, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 3, 5, 0x0, 7, 0, 2, 0x0), diff --git a/levels/bowser_1/areas/1/1/model.inc.c b/levels/bowser_1/areas/1/1/model.inc.c index a5a85e2d..52ca0f29 100644 --- a/levels/bowser_1/areas/1/1/model.inc.c +++ b/levels/bowser_1/areas/1/1/model.inc.c @@ -1,8 +1,4 @@ // 0x07002000 - 0x07002018 -static const Lights1 bowser_1_seg7_lights_07002000 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07002018 - 0x07002108 static const Vtx bowser_1_seg7_vertex_07002018[] = { @@ -127,8 +123,8 @@ static const Gfx bowser_1_seg7_dl_07002578[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bowser_1_seg7_texture_07001800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bowser_1_seg7_lights_07002000.l, 1), - gsSPLight(&bowser_1_seg7_lights_07002000.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(bowser_1_seg7_vertex_07002018, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 4, 0x0), gsSP2Triangles( 5, 1, 6, 0x0, 7, 1, 8, 0x0), diff --git a/levels/bowser_3/areas/1/1/model.inc.c b/levels/bowser_3/areas/1/1/model.inc.c index 1947ba51..7abf36d6 100644 --- a/levels/bowser_3/areas/1/1/model.inc.c +++ b/levels/bowser_3/areas/1/1/model.inc.c @@ -1,14 +1,6 @@ // 0x07004030 - 0x07004048 -static const Lights1 bowser_3_seg7_lights_07004030 = gdSPDefLights1( - 0x22, 0x22, 0x22, - 0x89, 0x89, 0x8a, 0x28, 0x28, 0x28 -); // 0x07004048 - 0x07004060 -static const Lights1 bowser_3_seg7_lights_07004048 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07004060 - 0x07004160 static const Vtx bowser_3_seg7_vertex_07004060[] = { @@ -113,16 +105,16 @@ static const Gfx bowser_3_seg7_dl_07004500[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bowser_3_seg7_texture_07000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bowser_3_seg7_lights_07004030.l, 1), - gsSPLight(&bowser_3_seg7_lights_07004030.a, 2), + gsSPLightColor(LIGHT_1, 0x89898aff), + gsSPLightColor(LIGHT_2, 0x222222ff), gsSPVertex(bowser_3_seg7_vertex_07004060, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), gsSP2Triangles( 6, 8, 12, 0x0, 13, 14, 15, 0x0), gsSPVertex(bowser_3_seg7_vertex_07004160, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), - gsSPLight(&bowser_3_seg7_lights_07004048.l, 1), - gsSPLight(&bowser_3_seg7_lights_07004048.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(bowser_3_seg7_vertex_070041C0, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 1, 3, 0x0), gsSP2Triangles( 1, 4, 3, 0x0, 2, 3, 5, 0x0), diff --git a/levels/bowser_3/areas/1/bomb_stand/model.inc.c b/levels/bowser_3/areas/1/bomb_stand/model.inc.c index ca9e8a67..612a1446 100644 --- a/levels/bowser_3/areas/1/bomb_stand/model.inc.c +++ b/levels/bowser_3/areas/1/bomb_stand/model.inc.c @@ -1,8 +1,4 @@ // 0x07004740 - 0x07004758 -static const Lights1 bowser_3_seg7_lights_07004740 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07004758 - 0x07004848 static const Vtx bowser_3_seg7_vertex_07004758[] = { @@ -41,8 +37,8 @@ static const Gfx bowser_3_seg7_dl_070048D8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bowser_3_seg7_texture_07000000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bowser_3_seg7_lights_07004740.l, 1), - gsSPLight(&bowser_3_seg7_lights_07004740.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(bowser_3_seg7_vertex_07004758, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), diff --git a/levels/bowser_3/falling_platform_1/model.inc.c b/levels/bowser_3/falling_platform_1/model.inc.c index 10fe587c..630f8e0c 100644 --- a/levels/bowser_3/falling_platform_1/model.inc.c +++ b/levels/bowser_3/falling_platform_1/model.inc.c @@ -1,14 +1,6 @@ // 0x07002000 - 0x07002018 -static const Lights1 bowser_3_seg7_lights_07002000 = gdSPDefLights1( - 0x22, 0x22, 0x22, - 0x89, 0x89, 0x8a, 0x28, 0x28, 0x28 -); // 0x07002018 - 0x07002030 -static const Lights1 bowser_3_seg7_lights_07002018 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07002030 - 0x07002090 static const Vtx bowser_3_seg7_vertex_07002030[] = { @@ -53,12 +45,12 @@ static const Gfx bowser_3_seg7_dl_070021D0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bowser_3_seg7_texture_07000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bowser_3_seg7_lights_07002000.l, 1), - gsSPLight(&bowser_3_seg7_lights_07002000.a, 2), + gsSPLightColor(LIGHT_1, 0x89898aff), + gsSPLightColor(LIGHT_2, 0x222222ff), gsSPVertex(bowser_3_seg7_vertex_07002030, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), - gsSPLight(&bowser_3_seg7_lights_07002018.l, 1), - gsSPLight(&bowser_3_seg7_lights_07002018.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(bowser_3_seg7_vertex_07002090, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSPEndDisplayList(), diff --git a/levels/bowser_3/falling_platform_10/model.inc.c b/levels/bowser_3/falling_platform_10/model.inc.c index 9d0ebe1b..2d951f87 100644 --- a/levels/bowser_3/falling_platform_10/model.inc.c +++ b/levels/bowser_3/falling_platform_10/model.inc.c @@ -1,14 +1,6 @@ // 0x07003CF8 - 0x07003D10 -static const Lights1 bowser_3_seg7_lights_07003CF8 = gdSPDefLights1( - 0x22, 0x22, 0x22, - 0x89, 0x89, 0x8a, 0x28, 0x28, 0x28 -); // 0x07003D10 - 0x07003D28 -static const Lights1 bowser_3_seg7_lights_07003D10 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07003D28 - 0x07003D88 static const Vtx bowser_3_seg7_vertex_07003D28[] = { @@ -53,12 +45,12 @@ static const Gfx bowser_3_seg7_dl_07003EC8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bowser_3_seg7_texture_07000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bowser_3_seg7_lights_07003CF8.l, 1), - gsSPLight(&bowser_3_seg7_lights_07003CF8.a, 2), + gsSPLightColor(LIGHT_1, 0x89898aff), + gsSPLightColor(LIGHT_2, 0x222222ff), gsSPVertex(bowser_3_seg7_vertex_07003D28, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), - gsSPLight(&bowser_3_seg7_lights_07003D10.l, 1), - gsSPLight(&bowser_3_seg7_lights_07003D10.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(bowser_3_seg7_vertex_07003D88, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), diff --git a/levels/bowser_3/falling_platform_2/model.inc.c b/levels/bowser_3/falling_platform_2/model.inc.c index 70a4f916..27139ada 100644 --- a/levels/bowser_3/falling_platform_2/model.inc.c +++ b/levels/bowser_3/falling_platform_2/model.inc.c @@ -1,14 +1,6 @@ // 0x07002338 - 0x07002350 -static const Lights1 bowser_3_seg7_lights_07002338 = gdSPDefLights1( - 0x22, 0x22, 0x22, - 0x89, 0x89, 0x8a, 0x28, 0x28, 0x28 -); // 0x07002350 - 0x07002368 -static const Lights1 bowser_3_seg7_lights_07002350 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07002368 - 0x070023C8 static const Vtx bowser_3_seg7_vertex_07002368[] = { @@ -53,12 +45,12 @@ static const Gfx bowser_3_seg7_dl_07002508[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bowser_3_seg7_texture_07000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bowser_3_seg7_lights_07002338.l, 1), - gsSPLight(&bowser_3_seg7_lights_07002338.a, 2), + gsSPLightColor(LIGHT_1, 0x89898aff), + gsSPLightColor(LIGHT_2, 0x222222ff), gsSPVertex(bowser_3_seg7_vertex_07002368, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), - gsSPLight(&bowser_3_seg7_lights_07002350.l, 1), - gsSPLight(&bowser_3_seg7_lights_07002350.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(bowser_3_seg7_vertex_070023C8, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), diff --git a/levels/bowser_3/falling_platform_3/model.inc.c b/levels/bowser_3/falling_platform_3/model.inc.c index bd14560b..0d986035 100644 --- a/levels/bowser_3/falling_platform_3/model.inc.c +++ b/levels/bowser_3/falling_platform_3/model.inc.c @@ -1,14 +1,6 @@ // 0x07002670 - 0x07002688 -static const Lights1 bowser_3_seg7_lights_07002670 = gdSPDefLights1( - 0x22, 0x22, 0x22, - 0x89, 0x89, 0x8a, 0x28, 0x28, 0x28 -); // 0x07002688 - 0x070026A0 -static const Lights1 bowser_3_seg7_lights_07002688 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x070026A0 - 0x07002700 static const Vtx bowser_3_seg7_vertex_070026A0[] = { @@ -53,12 +45,12 @@ static const Gfx bowser_3_seg7_dl_07002840[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bowser_3_seg7_texture_07000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bowser_3_seg7_lights_07002670.l, 1), - gsSPLight(&bowser_3_seg7_lights_07002670.a, 2), + gsSPLightColor(LIGHT_1, 0x89898aff), + gsSPLightColor(LIGHT_2, 0x222222ff), gsSPVertex(bowser_3_seg7_vertex_070026A0, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), - gsSPLight(&bowser_3_seg7_lights_07002688.l, 1), - gsSPLight(&bowser_3_seg7_lights_07002688.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(bowser_3_seg7_vertex_07002700, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSPEndDisplayList(), diff --git a/levels/bowser_3/falling_platform_4/model.inc.c b/levels/bowser_3/falling_platform_4/model.inc.c index fad8f63c..1fae2442 100644 --- a/levels/bowser_3/falling_platform_4/model.inc.c +++ b/levels/bowser_3/falling_platform_4/model.inc.c @@ -1,14 +1,6 @@ // 0x070029A8 - 0x070029C0 -static const Lights1 bowser_3_seg7_lights_070029A8 = gdSPDefLights1( - 0x22, 0x22, 0x22, - 0x89, 0x89, 0x8a, 0x28, 0x28, 0x28 -); // 0x070029C0 - 0x070029D8 -static const Lights1 bowser_3_seg7_lights_070029C0 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x070029D8 - 0x07002A38 static const Vtx bowser_3_seg7_vertex_070029D8[] = { @@ -53,12 +45,12 @@ static const Gfx bowser_3_seg7_dl_07002B78[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bowser_3_seg7_texture_07000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bowser_3_seg7_lights_070029A8.l, 1), - gsSPLight(&bowser_3_seg7_lights_070029A8.a, 2), + gsSPLightColor(LIGHT_1, 0x89898aff), + gsSPLightColor(LIGHT_2, 0x222222ff), gsSPVertex(bowser_3_seg7_vertex_070029D8, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), - gsSPLight(&bowser_3_seg7_lights_070029C0.l, 1), - gsSPLight(&bowser_3_seg7_lights_070029C0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(bowser_3_seg7_vertex_07002A38, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), diff --git a/levels/bowser_3/falling_platform_5/model.inc.c b/levels/bowser_3/falling_platform_5/model.inc.c index c4b34905..b300f72a 100644 --- a/levels/bowser_3/falling_platform_5/model.inc.c +++ b/levels/bowser_3/falling_platform_5/model.inc.c @@ -1,14 +1,6 @@ // 0x07002CE0 - 0x07002CF8 -static const Lights1 bowser_3_seg7_lights_07002CE0 = gdSPDefLights1( - 0x22, 0x22, 0x22, - 0x89, 0x89, 0x8a, 0x28, 0x28, 0x28 -); // 0x07002CF8 - 0x07002D10 -static const Lights1 bowser_3_seg7_lights_07002CF8 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07002D10 - 0x07002D70 static const Vtx bowser_3_seg7_vertex_07002D10[] = { @@ -53,12 +45,12 @@ static const Gfx bowser_3_seg7_dl_07002EB0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bowser_3_seg7_texture_07000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bowser_3_seg7_lights_07002CE0.l, 1), - gsSPLight(&bowser_3_seg7_lights_07002CE0.a, 2), + gsSPLightColor(LIGHT_1, 0x89898aff), + gsSPLightColor(LIGHT_2, 0x222222ff), gsSPVertex(bowser_3_seg7_vertex_07002D10, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), - gsSPLight(&bowser_3_seg7_lights_07002CF8.l, 1), - gsSPLight(&bowser_3_seg7_lights_07002CF8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(bowser_3_seg7_vertex_07002D70, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), diff --git a/levels/bowser_3/falling_platform_6/model.inc.c b/levels/bowser_3/falling_platform_6/model.inc.c index 4238aaeb..70dd6b41 100644 --- a/levels/bowser_3/falling_platform_6/model.inc.c +++ b/levels/bowser_3/falling_platform_6/model.inc.c @@ -1,14 +1,6 @@ // 0x07003018 - 0x07003030 -static const Lights1 bowser_3_seg7_lights_07003018 = gdSPDefLights1( - 0x22, 0x22, 0x22, - 0x89, 0x89, 0x8a, 0x28, 0x28, 0x28 -); // 0x07003030 - 0x07003048 -static const Lights1 bowser_3_seg7_lights_07003030 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07003048 - 0x070030A8 static const Vtx bowser_3_seg7_vertex_07003048[] = { @@ -53,12 +45,12 @@ static const Gfx bowser_3_seg7_dl_070031E8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bowser_3_seg7_texture_07000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bowser_3_seg7_lights_07003018.l, 1), - gsSPLight(&bowser_3_seg7_lights_07003018.a, 2), + gsSPLightColor(LIGHT_1, 0x89898aff), + gsSPLightColor(LIGHT_2, 0x222222ff), gsSPVertex(bowser_3_seg7_vertex_07003048, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), - gsSPLight(&bowser_3_seg7_lights_07003030.l, 1), - gsSPLight(&bowser_3_seg7_lights_07003030.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(bowser_3_seg7_vertex_070030A8, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), diff --git a/levels/bowser_3/falling_platform_7/model.inc.c b/levels/bowser_3/falling_platform_7/model.inc.c index fd2802a5..1aac9670 100644 --- a/levels/bowser_3/falling_platform_7/model.inc.c +++ b/levels/bowser_3/falling_platform_7/model.inc.c @@ -1,14 +1,6 @@ // 0x07003350 - 0x07003368 -static const Lights1 bowser_3_seg7_lights_07003350 = gdSPDefLights1( - 0x22, 0x22, 0x22, - 0x89, 0x89, 0x8a, 0x28, 0x28, 0x28 -); // 0x07003368 - 0x07003380 -static const Lights1 bowser_3_seg7_lights_07003368 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07003380 - 0x070033E0 static const Vtx bowser_3_seg7_vertex_07003380[] = { @@ -53,12 +45,12 @@ static const Gfx bowser_3_seg7_dl_07003520[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bowser_3_seg7_texture_07000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bowser_3_seg7_lights_07003350.l, 1), - gsSPLight(&bowser_3_seg7_lights_07003350.a, 2), + gsSPLightColor(LIGHT_1, 0x89898aff), + gsSPLightColor(LIGHT_2, 0x222222ff), gsSPVertex(bowser_3_seg7_vertex_07003380, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), - gsSPLight(&bowser_3_seg7_lights_07003368.l, 1), - gsSPLight(&bowser_3_seg7_lights_07003368.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(bowser_3_seg7_vertex_070033E0, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSPEndDisplayList(), diff --git a/levels/bowser_3/falling_platform_8/model.inc.c b/levels/bowser_3/falling_platform_8/model.inc.c index 7d4364b5..f3226dec 100644 --- a/levels/bowser_3/falling_platform_8/model.inc.c +++ b/levels/bowser_3/falling_platform_8/model.inc.c @@ -1,14 +1,6 @@ // 0x07003688 - 0x070036A0 -static const Lights1 bowser_3_seg7_lights_07003688 = gdSPDefLights1( - 0x22, 0x22, 0x22, - 0x89, 0x89, 0x8a, 0x28, 0x28, 0x28 -); // 0x070036A0 - 0x070036B8 -static const Lights1 bowser_3_seg7_lights_070036A0 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x070036B8 - 0x07003718 static const Vtx bowser_3_seg7_vertex_070036B8[] = { @@ -53,12 +45,12 @@ static const Gfx bowser_3_seg7_dl_07003858[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bowser_3_seg7_texture_07000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bowser_3_seg7_lights_07003688.l, 1), - gsSPLight(&bowser_3_seg7_lights_07003688.a, 2), + gsSPLightColor(LIGHT_1, 0x89898aff), + gsSPLightColor(LIGHT_2, 0x222222ff), gsSPVertex(bowser_3_seg7_vertex_070036B8, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), - gsSPLight(&bowser_3_seg7_lights_070036A0.l, 1), - gsSPLight(&bowser_3_seg7_lights_070036A0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(bowser_3_seg7_vertex_07003718, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSPEndDisplayList(), diff --git a/levels/bowser_3/falling_platform_9/model.inc.c b/levels/bowser_3/falling_platform_9/model.inc.c index e64104fa..e3ea1251 100644 --- a/levels/bowser_3/falling_platform_9/model.inc.c +++ b/levels/bowser_3/falling_platform_9/model.inc.c @@ -1,14 +1,6 @@ // 0x070039C0 - 0x070039D8 -static const Lights1 bowser_3_seg7_lights_070039C0 = gdSPDefLights1( - 0x22, 0x22, 0x22, - 0x89, 0x89, 0x8a, 0x28, 0x28, 0x28 -); // 0x070039D8 - 0x070039F0 -static const Lights1 bowser_3_seg7_lights_070039D8 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x070039F0 - 0x07003A50 static const Vtx bowser_3_seg7_vertex_070039F0[] = { @@ -53,12 +45,12 @@ static const Gfx bowser_3_seg7_dl_07003B90[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bowser_3_seg7_texture_07000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&bowser_3_seg7_lights_070039C0.l, 1), - gsSPLight(&bowser_3_seg7_lights_070039C0.a, 2), + gsSPLightColor(LIGHT_1, 0x89898aff), + gsSPLightColor(LIGHT_2, 0x222222ff), gsSPVertex(bowser_3_seg7_vertex_070039F0, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), - gsSPLight(&bowser_3_seg7_lights_070039D8.l, 1), - gsSPLight(&bowser_3_seg7_lights_070039D8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(bowser_3_seg7_vertex_07003A50, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), diff --git a/levels/castle_grounds/areas/1/11/model.inc.c b/levels/castle_grounds/areas/1/11/model.inc.c index a1b3a81b..c441943f 100644 --- a/levels/castle_grounds/areas/1/11/model.inc.c +++ b/levels/castle_grounds/areas/1/11/model.inc.c @@ -2,16 +2,8 @@ UNUSED static const u64 castle_grounds_unused_0 = 0; // 0x0700C4C8 - 0x0700C4E0 -static const Lights1 castle_grounds_seg7_lights_0700C4C8 = gdSPDefLights1( - 0x66, 0x00, 0x00, - 0xff, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x0700C4E0 - 0x0700C4F8 -static const Lights1 castle_grounds_seg7_lights_0700C4E0 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // TODO: what is this? 0700C4F8-0700C500 [8,8] UNUSED static const u64 castle_grounds_unused_1 = 0; @@ -66,8 +58,8 @@ static const Vtx castle_grounds_seg7_vertex_0700C640[] = { // 0x0700C670 - 0x0700C6A8 const Gfx castle_grounds_seg7_dl_0700C670[] = { gsSPClearGeometryMode(G_CULL_BACK), - gsSPLight(&castle_grounds_seg7_lights_0700C4C8.l, 1), - gsSPLight(&castle_grounds_seg7_lights_0700C4C8.a, 2), + gsSPLightColor(LIGHT_1, 0xff0000ff), + gsSPLightColor(LIGHT_2, 0x660000ff), gsSPVertex(castle_grounds_seg7_vertex_0700C500, 3, 0), gsSP1Triangle( 0, 1, 2, 0x0), gsSPSetGeometryMode(G_CULL_BACK), @@ -77,8 +69,8 @@ const Gfx castle_grounds_seg7_dl_0700C670[] = { // 0x0700C6A8 - 0x0700C6E8 const Gfx castle_grounds_seg7_dl_0700C6A8[] = { gsSPClearGeometryMode(G_CULL_BACK), - gsSPLight(&castle_grounds_seg7_lights_0700C4C8.l, 1), - gsSPLight(&castle_grounds_seg7_lights_0700C4C8.a, 2), + gsSPLightColor(LIGHT_1, 0xff0000ff), + gsSPLightColor(LIGHT_2, 0x660000ff), gsSPVertex(castle_grounds_seg7_vertex_0700C530, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPSetGeometryMode(G_CULL_BACK), @@ -88,8 +80,8 @@ const Gfx castle_grounds_seg7_dl_0700C6A8[] = { // 0x0700C6E8 - 0x0700C728 const Gfx castle_grounds_seg7_dl_0700C6E8[] = { gsSPClearGeometryMode(G_CULL_BACK), - gsSPLight(&castle_grounds_seg7_lights_0700C4C8.l, 1), - gsSPLight(&castle_grounds_seg7_lights_0700C4C8.a, 2), + gsSPLightColor(LIGHT_1, 0xff0000ff), + gsSPLightColor(LIGHT_2, 0x660000ff), gsSPVertex(castle_grounds_seg7_vertex_0700C570, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPSetGeometryMode(G_CULL_BACK), @@ -99,8 +91,8 @@ const Gfx castle_grounds_seg7_dl_0700C6E8[] = { // 0x0700C728 - 0x0700C768 const Gfx castle_grounds_seg7_dl_0700C728[] = { gsSPClearGeometryMode(G_CULL_BACK), - gsSPLight(&castle_grounds_seg7_lights_0700C4C8.l, 1), - gsSPLight(&castle_grounds_seg7_lights_0700C4C8.a, 2), + gsSPLightColor(LIGHT_1, 0xff0000ff), + gsSPLightColor(LIGHT_2, 0x660000ff), gsSPVertex(castle_grounds_seg7_vertex_0700C5B0, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPSetGeometryMode(G_CULL_BACK), @@ -110,12 +102,12 @@ const Gfx castle_grounds_seg7_dl_0700C728[] = { // 0x0700C768 - 0x0700C7C8 const Gfx castle_grounds_seg7_dl_0700C768[] = { gsSPClearGeometryMode(G_CULL_BACK), - gsSPLight(&castle_grounds_seg7_lights_0700C4E0.l, 1), - gsSPLight(&castle_grounds_seg7_lights_0700C4E0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(castle_grounds_seg7_vertex_0700C5F0, 5, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 4, 0x0), - gsSPLight(&castle_grounds_seg7_lights_0700C4C8.l, 1), - gsSPLight(&castle_grounds_seg7_lights_0700C4C8.a, 2), + gsSPLightColor(LIGHT_1, 0xff0000ff), + gsSPLightColor(LIGHT_2, 0x660000ff), gsSPVertex(castle_grounds_seg7_vertex_0700C640, 3, 0), gsSP1Triangle( 0, 1, 2, 0x0), gsSPSetGeometryMode(G_CULL_BACK), diff --git a/levels/castle_grounds/areas/1/2/model.inc.c b/levels/castle_grounds/areas/1/2/model.inc.c index d778edd3..4b7805e7 100644 --- a/levels/castle_grounds/areas/1/2/model.inc.c +++ b/levels/castle_grounds/areas/1/2/model.inc.c @@ -1,50 +1,18 @@ // 0x07006ED8 - 0x07006EF0 -static const Lights1 castle_grounds_seg7_lights_07006ED8 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07006EF0 - 0x07006F08 -static const Lights1 castle_grounds_seg7_lights_07006EF0 = gdSPDefLights1( - 0x4e, 0x4e, 0x53, - 0xc4, 0xc4, 0xd0, 0x28, 0x28, 0x28 -); // 0x07006F08 - 0x07006F20 -static const Lights1 castle_grounds_seg7_lights_07006F08 = gdSPDefLights1( - 0x36, 0x36, 0x37, - 0x89, 0x89, 0x8a, 0x28, 0x28, 0x28 -); // 0x07006F20 - 0x07006F38 -static const Lights1 castle_grounds_seg7_lights_07006F20 = gdSPDefLights1( - 0x2d, 0x2d, 0x38, - 0x72, 0x72, 0x8c, 0x28, 0x28, 0x28 -); // 0x07006F38 - 0x07006F50 -static const Lights1 castle_grounds_seg7_lights_07006F38 = gdSPDefLights1( - 0x29, 0x29, 0x2a, - 0x67, 0x67, 0x69, 0x28, 0x28, 0x28 -); // 0x07006F50 - 0x07006F68 -static const Lights1 castle_grounds_seg7_lights_07006F50 = gdSPDefLights1( - 0x56, 0x56, 0x56, - 0xd8, 0xd8, 0xd8, 0x28, 0x28, 0x28 -); // 0x07006F68 - 0x07006F80 -static const Lights1 castle_grounds_seg7_lights_07006F68 = gdSPDefLights1( - 0x23, 0x23, 0x27, - 0x58, 0x58, 0x62, 0x28, 0x28, 0x28 -); // 0x07006F80 - 0x07006F98 -static const Lights1 castle_grounds_seg7_lights_07006F80 = gdSPDefLights1( - 0x13, 0x57, 0x00, - 0x30, 0xdb, 0x02, 0x28, 0x28, 0x28 -); // 0x07006F98 - 0x07006FD8 static const Vtx castle_grounds_seg7_vertex_07006F98[] = { @@ -625,12 +593,12 @@ static const Gfx castle_grounds_seg7_dl_070089F8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, outside_0900B000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 16 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&castle_grounds_seg7_lights_07006ED8.l, 1), - gsSPLight(&castle_grounds_seg7_lights_07006ED8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(castle_grounds_seg7_vertex_07006F98, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 2, 1, 0x0), - gsSPLight(&castle_grounds_seg7_lights_07006EF0.l, 1), - gsSPLight(&castle_grounds_seg7_lights_07006EF0.a, 2), + gsSPLightColor(LIGHT_1, 0xc4c4d0ff), + gsSPLightColor(LIGHT_2, 0x4e4e53ff), gsSPVertex(castle_grounds_seg7_vertex_07006FD8, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 2, 1, 0x0), gsSPEndDisplayList(), @@ -641,8 +609,8 @@ static const Gfx castle_grounds_seg7_dl_07008A68[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, outside_09004000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&castle_grounds_seg7_lights_07006ED8.l, 1), - gsSPLight(&castle_grounds_seg7_lights_07006ED8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(castle_grounds_seg7_vertex_07007018, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 6, 0x0), @@ -709,8 +677,8 @@ static const Gfx castle_grounds_seg7_dl_07008D70[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, outside_09009000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&castle_grounds_seg7_lights_07006F08.l, 1), - gsSPLight(&castle_grounds_seg7_lights_07006F08.a, 2), + gsSPLightColor(LIGHT_1, 0x89898aff), + gsSPLightColor(LIGHT_2, 0x363637ff), gsSPVertex(castle_grounds_seg7_vertex_070077B8, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), gsSP2Triangles( 3, 4, 2, 0x0, 5, 0, 2, 0x0), @@ -724,8 +692,8 @@ static const Gfx castle_grounds_seg7_dl_07008DE8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, outside_09009800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&castle_grounds_seg7_lights_07006ED8.l, 1), - gsSPLight(&castle_grounds_seg7_lights_07006ED8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(castle_grounds_seg7_vertex_07007858, 13, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 0, 2, 4, 0x0, 1, 3, 5, 0x0), @@ -734,12 +702,12 @@ static const Gfx castle_grounds_seg7_dl_07008DE8[] = { gsSP2Triangles( 8, 9, 10, 0x0, 10, 11, 3, 0x0), gsSP2Triangles( 3, 8, 10, 0x0, 8, 3, 0, 0x0), gsSP1Triangle( 4, 7, 12, 0x0), - gsSPLight(&castle_grounds_seg7_lights_07006F08.l, 1), - gsSPLight(&castle_grounds_seg7_lights_07006F08.a, 2), + gsSPLightColor(LIGHT_1, 0x89898aff), + gsSPLightColor(LIGHT_2, 0x363637ff), gsSPVertex(castle_grounds_seg7_vertex_07007928, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), - gsSPLight(&castle_grounds_seg7_lights_07006ED8.l, 1), - gsSPLight(&castle_grounds_seg7_lights_07006ED8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(castle_grounds_seg7_vertex_07007968, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), gsSP2Triangles( 3, 1, 4, 0x0, 3, 4, 5, 0x0), @@ -753,8 +721,8 @@ static const Gfx castle_grounds_seg7_dl_07008EE8[] = { gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), gsSPVertex(castle_grounds_seg7_vertex_070079C8, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 2, 1, 0x0), - gsSPLight(&castle_grounds_seg7_lights_07006F20.l, 1), - gsSPLight(&castle_grounds_seg7_lights_07006F20.a, 2), + gsSPLightColor(LIGHT_1, 0x72728cff), + gsSPLightColor(LIGHT_2, 0x2d2d38ff), gsSPVertex(castle_grounds_seg7_vertex_07007A08, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 1, 3, 0x0), gsSPEndDisplayList(), @@ -765,8 +733,8 @@ static const Gfx castle_grounds_seg7_dl_07008F48[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, outside_09003800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&castle_grounds_seg7_lights_07006ED8.l, 1), - gsSPLight(&castle_grounds_seg7_lights_07006ED8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(castle_grounds_seg7_vertex_07007A48, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 1, 4, 2, 0x0, 4, 5, 2, 0x0), @@ -791,19 +759,19 @@ static const Gfx castle_grounds_seg7_dl_07009010[] = { gsSP2Triangles( 4, 5, 6, 0x0, 5, 4, 7, 0x0), gsSP2Triangles( 8, 5, 7, 0x0, 9, 10, 11, 0x0), gsSP1Triangle(10, 12, 11, 0x0), - gsSPLight(&castle_grounds_seg7_lights_07006F38.l, 1), - gsSPLight(&castle_grounds_seg7_lights_07006F38.a, 2), + gsSPLightColor(LIGHT_1, 0x676769ff), + gsSPLightColor(LIGHT_2, 0x29292aff), gsSPVertex(castle_grounds_seg7_vertex_07007C98, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 1, 3, 0x0), gsSP2Triangles( 2, 3, 4, 0x0, 5, 6, 7, 0x0), gsSP2Triangles( 5, 7, 8, 0x0, 7, 9, 8, 0x0), gsSP2Triangles( 3, 10, 4, 0x0, 8, 9, 11, 0x0), - gsSPLight(&castle_grounds_seg7_lights_07006F50.l, 1), - gsSPLight(&castle_grounds_seg7_lights_07006F50.a, 2), + gsSPLightColor(LIGHT_1, 0xd8d8d8ff), + gsSPLightColor(LIGHT_2, 0x565656ff), gsSPVertex(castle_grounds_seg7_vertex_07007D58, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0), - gsSPLight(&castle_grounds_seg7_lights_07006ED8.l, 1), - gsSPLight(&castle_grounds_seg7_lights_07006ED8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(castle_grounds_seg7_vertex_07007D98, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 4, 3, 0x0, 4, 7, 5, 0x0), @@ -835,18 +803,18 @@ static const Gfx castle_grounds_seg7_dl_07009010[] = { gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), gsSP2Triangles( 7, 10, 8, 0x0, 11, 12, 13, 0x0), gsSP2Triangles( 8, 14, 13, 0x0, 12, 8, 13, 0x0), - gsSPLight(&castle_grounds_seg7_lights_07006F68.l, 1), - gsSPLight(&castle_grounds_seg7_lights_07006F68.a, 2), + gsSPLightColor(LIGHT_1, 0x585862ff), + gsSPLightColor(LIGHT_2, 0x232327ff), gsSPVertex(castle_grounds_seg7_vertex_07008268, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 2, 4, 3, 0x0, 3, 4, 5, 0x0), - gsSPLight(&castle_grounds_seg7_lights_07006F08.l, 1), - gsSPLight(&castle_grounds_seg7_lights_07006F08.a, 2), + gsSPLightColor(LIGHT_1, 0x89898aff), + gsSPLightColor(LIGHT_2, 0x363637ff), gsSPVertex(castle_grounds_seg7_vertex_070082C8, 7, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP1Triangle( 5, 4, 6, 0x0), - gsSPLight(&castle_grounds_seg7_lights_07006ED8.l, 1), - gsSPLight(&castle_grounds_seg7_lights_07006ED8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(castle_grounds_seg7_vertex_07008338, 3, 0), gsSP1Triangle( 0, 1, 2, 0x0), gsSPEndDisplayList(), @@ -857,8 +825,8 @@ static const Gfx castle_grounds_seg7_dl_07009330[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, outside_09004800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&castle_grounds_seg7_lights_07006F80.l, 1), - gsSPLight(&castle_grounds_seg7_lights_07006F80.a, 2), + gsSPLightColor(LIGHT_1, 0x30db02ff), + gsSPLightColor(LIGHT_2, 0x135700ff), gsSPVertex(castle_grounds_seg7_vertex_07008368, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 3, 7, 4, 0x0), @@ -904,14 +872,14 @@ static const Gfx castle_grounds_seg7_dl_07009568[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, outside_09006800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPLight(&castle_grounds_seg7_lights_07006F38.l, 1), - gsSPLight(&castle_grounds_seg7_lights_07006F38.a, 2), + gsSPLightColor(LIGHT_1, 0x676769ff), + gsSPLightColor(LIGHT_2, 0x29292aff), gsSPVertex(castle_grounds_seg7_vertex_07008908, 11, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), gsSP1Triangle( 0, 2, 10, 0x0), - gsSPLight(&castle_grounds_seg7_lights_07006F08.l, 1), - gsSPLight(&castle_grounds_seg7_lights_07006F08.a, 2), + gsSPLightColor(LIGHT_1, 0x89898aff), + gsSPLightColor(LIGHT_2, 0x363637ff), gsSPVertex(castle_grounds_seg7_vertex_070089B8, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 1, 3, 0x0), gsSPEndDisplayList(), diff --git a/levels/castle_grounds/areas/1/9/model.inc.c b/levels/castle_grounds/areas/1/9/model.inc.c index 7a70ade9..143ccf4c 100644 --- a/levels/castle_grounds/areas/1/9/model.inc.c +++ b/levels/castle_grounds/areas/1/9/model.inc.c @@ -1,32 +1,12 @@ // 0x0700BCD8 - 0x0700BCE0 -static const Lights1 castle_grounds_seg7_lights_0700BCD8 = gdSPDefLights1( - 0x3d, 0x3d, 0x44, - 0x99, 0x99, 0xac, 0x28, 0x28, 0x28 -); // 0x0700BCF0 - 0x0700BD08 -static const Lights1 castle_grounds_seg7_lights_0700BCF0 = gdSPDefLights1( - 0x58, 0x58, 0x5a, - 0xdc, 0xdc, 0xe3, 0x28, 0x28, 0x28 -); // 0x0700BD08 - 0x0700BD20 -static const Lights1 castle_grounds_seg7_lights_0700BD08 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700BD20 - 0x0700BD38 -static const Lights1 castle_grounds_seg7_lights_0700BD20 = gdSPDefLights1( - 0x4e, 0x4e, 0x53, - 0xc4, 0xc4, 0xd0, 0x28, 0x28, 0x28 -); // 0x0700BD38 - 0x0700BD50 -static const Lights1 castle_grounds_seg7_lights_0700BD38 = gdSPDefLights1( - 0x45, 0x45, 0x4b, - 0xad, 0xad, 0xbc, 0x28, 0x28, 0x28 -); // 0x0700BD50 - 0x0700BE10 static const Vtx castle_grounds_seg7_vertex_0700BD50[] = { @@ -107,14 +87,14 @@ static const Gfx castle_grounds_seg7_dl_0700C070[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, outside_09004800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&castle_grounds_seg7_lights_0700BCD8.l, 1), - gsSPLight(&castle_grounds_seg7_lights_0700BCD8.a, 2), + gsSPLightColor(LIGHT_1, 0x9999acff), + gsSPLightColor(LIGHT_2, 0x3d3d44ff), gsSPVertex(castle_grounds_seg7_vertex_0700BD50, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), gsSP2Triangles( 8, 9, 10, 0x0, 8, 11, 9, 0x0), - gsSPLight(&castle_grounds_seg7_lights_0700BCF0.l, 1), - gsSPLight(&castle_grounds_seg7_lights_0700BCF0.a, 2), + gsSPLightColor(LIGHT_1, 0xdcdce3ff), + gsSPLightColor(LIGHT_2, 0x58585aff), gsSPVertex(castle_grounds_seg7_vertex_0700BE10, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), @@ -126,24 +106,24 @@ static const Gfx castle_grounds_seg7_dl_0700C110[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, outside_09001000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPLight(&castle_grounds_seg7_lights_0700BD08.l, 1), - gsSPLight(&castle_grounds_seg7_lights_0700BD08.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(castle_grounds_seg7_vertex_0700BE90, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 0, 4, 3, 0x0, 0, 2, 5, 0x0), gsSP2Triangles( 6, 4, 7, 0x0, 6, 3, 4, 0x0), gsSP2Triangles( 2, 6, 7, 0x0, 5, 2, 7, 0x0), gsSP2Triangles( 8, 9, 10, 0x0, 9, 11, 10, 0x0), - gsSPLight(&castle_grounds_seg7_lights_0700BD20.l, 1), - gsSPLight(&castle_grounds_seg7_lights_0700BD20.a, 2), + gsSPLightColor(LIGHT_1, 0xc4c4d0ff), + gsSPLightColor(LIGHT_2, 0x4e4e53ff), gsSPVertex(castle_grounds_seg7_vertex_0700BF50, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), - gsSPLight(&castle_grounds_seg7_lights_0700BD38.l, 1), - gsSPLight(&castle_grounds_seg7_lights_0700BD38.a, 2), + gsSPLightColor(LIGHT_1, 0xadadbcff), + gsSPLightColor(LIGHT_2, 0x45454bff), gsSPVertex(castle_grounds_seg7_vertex_0700BFB0, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), - gsSPLight(&castle_grounds_seg7_lights_0700BCF0.l, 1), - gsSPLight(&castle_grounds_seg7_lights_0700BCF0.a, 2), + gsSPLightColor(LIGHT_1, 0xdcdce3ff), + gsSPLightColor(LIGHT_2, 0x58585aff), gsSPVertex(castle_grounds_seg7_vertex_0700C010, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSPEndDisplayList(), diff --git a/levels/castle_inside/areas/1/10/model.inc.c b/levels/castle_inside/areas/1/10/model.inc.c index 319bcbb4..83859a63 100644 --- a/levels/castle_inside/areas/1/10/model.inc.c +++ b/levels/castle_inside/areas/1/10/model.inc.c @@ -1,8 +1,4 @@ // 0x0702FDD8 - 0x0702FDF0 -static const Lights1 inside_castle_seg7_lights_0702FDD8 = gdSPDefLights1( - 0x5f, 0x5f, 0x5f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0702FDF0 - 0x0702FE70 static const Vtx inside_castle_seg7_vertex_0702FDF0[] = { @@ -389,8 +385,8 @@ static const Gfx inside_castle_seg7_dl_07031070[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_09004000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_0702FDD8.l, 1), - gsSPLight(&inside_castle_seg7_lights_0702FDD8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x5f5f5fff), gsSPVertex(inside_castle_seg7_vertex_0702FDF0, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 4, 0x0), gsSP2Triangles( 0, 5, 3, 0x0, 0, 2, 6, 0x0), diff --git a/levels/castle_inside/areas/1/12/model.inc.c b/levels/castle_inside/areas/1/12/model.inc.c index 0dbcfe05..20a90e78 100644 --- a/levels/castle_inside/areas/1/12/model.inc.c +++ b/levels/castle_inside/areas/1/12/model.inc.c @@ -1,8 +1,4 @@ // 0x07031790 - 0x070317A8 -static const Lights1 inside_castle_seg7_lights_07031790 = gdSPDefLights1( - 0x5f, 0x5f, 0x5f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x070317A8 - 0x070317E8 static const Vtx inside_castle_seg7_vertex_070317A8[] = { @@ -17,8 +13,8 @@ static const Gfx inside_castle_seg7_dl_070317E8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_castle_seg7_texture_07003000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_07031790.l, 1), - gsSPLight(&inside_castle_seg7_lights_07031790.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x5f5f5fff), gsSPVertex(inside_castle_seg7_vertex_070317A8, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), diff --git a/levels/castle_inside/areas/1/13/model.inc.c b/levels/castle_inside/areas/1/13/model.inc.c index 334d0f57..770b79d5 100644 --- a/levels/castle_inside/areas/1/13/model.inc.c +++ b/levels/castle_inside/areas/1/13/model.inc.c @@ -1,14 +1,6 @@ // 0x070318A0 - 0x070318B8 -static const Lights1 inside_castle_seg7_lights_070318A0 = gdSPDefLights1( - 0x52, 0x52, 0x52, - 0xdd, 0xdd, 0xdd, 0x28, 0x28, 0x28 -); // 0x070318B8 - 0x070318D0 -static const Lights1 inside_castle_seg7_lights_070318B8 = gdSPDefLights1( - 0x5f, 0x5f, 0x5f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x070318D0 - 0x070319D0 static const Vtx inside_castle_seg7_vertex_070318D0[] = { @@ -370,15 +362,15 @@ static const Gfx inside_castle_seg7_dl_07032A00[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_09005000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_070318A0.l, 1), - gsSPLight(&inside_castle_seg7_lights_070318A0.a, 2), + gsSPLightColor(LIGHT_1, 0xddddddff), + gsSPLightColor(LIGHT_2, 0x525252ff), gsSPVertex(inside_castle_seg7_vertex_070318D0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), gsSP2Triangles( 7, 10, 8, 0x0, 11, 12, 13, 0x0), gsSP2Triangles(11, 13, 14, 0x0, 0, 2, 15, 0x0), - gsSPLight(&inside_castle_seg7_lights_070318B8.l, 1), - gsSPLight(&inside_castle_seg7_lights_070318B8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x5f5f5fff), gsSPVertex(inside_castle_seg7_vertex_070319D0, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0), gsSP2Triangles( 3, 2, 4, 0x0, 5, 3, 4, 0x0), diff --git a/levels/castle_inside/areas/1/14/model.inc.c b/levels/castle_inside/areas/1/14/model.inc.c index 1401bd72..98fc2349 100644 --- a/levels/castle_inside/areas/1/14/model.inc.c +++ b/levels/castle_inside/areas/1/14/model.inc.c @@ -1,8 +1,4 @@ // 0x07033068 - 0x07033080 -static const Lights1 inside_castle_seg7_lights_07033068 = gdSPDefLights1( - 0x5f, 0x5f, 0x5f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07033080 - 0x07033100 static const Vtx inside_castle_seg7_vertex_07033080[] = { @@ -21,8 +17,8 @@ static const Gfx inside_castle_seg7_dl_07033100[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_castle_seg7_texture_07003000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_07033068.l, 1), - gsSPLight(&inside_castle_seg7_lights_07033068.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x5f5f5fff), gsSPVertex(inside_castle_seg7_vertex_07033080, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), diff --git a/levels/castle_inside/areas/1/15/model.inc.c b/levels/castle_inside/areas/1/15/model.inc.c index 34e10852..d80879a5 100644 --- a/levels/castle_inside/areas/1/15/model.inc.c +++ b/levels/castle_inside/areas/1/15/model.inc.c @@ -1,14 +1,6 @@ // 0x070331C8 - 0x070331E0 -static const Lights1 inside_castle_seg7_lights_070331C8 = gdSPDefLights1( - 0x52, 0x52, 0x52, - 0xdd, 0xdd, 0xdd, 0x28, 0x28, 0x28 -); // 0x070331E0 - 0x070331F8 -static const Lights1 inside_castle_seg7_lights_070331E0 = gdSPDefLights1( - 0x5f, 0x5f, 0x5f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x070331F8 - 0x070332F8 static const Vtx inside_castle_seg7_vertex_070331F8[] = { @@ -440,15 +432,15 @@ static const Gfx inside_castle_seg7_dl_07034688[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_09005000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_070331C8.l, 1), - gsSPLight(&inside_castle_seg7_lights_070331C8.a, 2), + gsSPLightColor(LIGHT_1, 0xddddddff), + gsSPLightColor(LIGHT_2, 0x525252ff), gsSPVertex(inside_castle_seg7_vertex_070331F8, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), gsSP2Triangles( 7, 10, 8, 0x0, 11, 12, 13, 0x0), gsSP2Triangles(11, 14, 12, 0x0, 0, 2, 15, 0x0), - gsSPLight(&inside_castle_seg7_lights_070331E0.l, 1), - gsSPLight(&inside_castle_seg7_lights_070331E0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x5f5f5fff), gsSPVertex(inside_castle_seg7_vertex_070332F8, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), diff --git a/levels/castle_inside/areas/1/17/model.inc.c b/levels/castle_inside/areas/1/17/model.inc.c index 7a280e59..4e38dc25 100644 --- a/levels/castle_inside/areas/1/17/model.inc.c +++ b/levels/castle_inside/areas/1/17/model.inc.c @@ -1,8 +1,4 @@ // 0x070351E8 - 0x07035200 -static const Lights1 inside_castle_seg7_lights_070351E8 = gdSPDefLights1( - 0x5f, 0x5f, 0x5f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07035200 - 0x07035240 static const Vtx inside_castle_seg7_vertex_07035200[] = { @@ -17,8 +13,8 @@ static const Gfx inside_castle_seg7_dl_07035240[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_castle_seg7_texture_07003000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_070351E8.l, 1), - gsSPLight(&inside_castle_seg7_lights_070351E8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x5f5f5fff), gsSPVertex(inside_castle_seg7_vertex_07035200, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), diff --git a/levels/castle_inside/areas/1/18/model.inc.c b/levels/castle_inside/areas/1/18/model.inc.c index ebddea09..1c384f13 100644 --- a/levels/castle_inside/areas/1/18/model.inc.c +++ b/levels/castle_inside/areas/1/18/model.inc.c @@ -1,26 +1,10 @@ // 0x070352F8 - 0x07035310 -static const Lights1 inside_castle_seg7_lights_070352F8 = gdSPDefLights1( - 0x19, 0x19, 0x19, - 0x44, 0x44, 0x44, 0x28, 0x28, 0x28 -); // 0x07035310 - 0x07035328 -static const Lights1 inside_castle_seg7_lights_07035310 = gdSPDefLights1( - 0x26, 0x26, 0x26, - 0x66, 0x66, 0x66, 0x28, 0x28, 0x28 -); // 0x07035328 - 0x07035340 -static const Lights1 inside_castle_seg7_lights_07035328 = gdSPDefLights1( - 0x1f, 0x1f, 0x1f, - 0x55, 0x55, 0x55, 0x28, 0x28, 0x28 -); // 0x07035340 - 0x07035358 -static const Lights1 inside_castle_seg7_lights_07035340 = gdSPDefLights1( - 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x07035358 - 0x07035458 static const Vtx inside_castle_seg7_vertex_07035358[] = { @@ -427,15 +411,15 @@ static const Gfx inside_castle_seg7_dl_07036698[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_09005000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_070352F8.l, 1), - gsSPLight(&inside_castle_seg7_lights_070352F8.a, 2), + gsSPLightColor(LIGHT_1, 0x444444ff), + gsSPLightColor(LIGHT_2, 0x191919ff), gsSPVertex(inside_castle_seg7_vertex_07035358, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), gsSP2Triangles( 7, 9, 10, 0x0, 11, 12, 13, 0x0), gsSP2Triangles(11, 13, 14, 0x0, 0, 2, 15, 0x0), - gsSPLight(&inside_castle_seg7_lights_07035310.l, 1), - gsSPLight(&inside_castle_seg7_lights_07035310.a, 2), + gsSPLightColor(LIGHT_1, 0x666666ff), + gsSPLightColor(LIGHT_2, 0x262626ff), gsSPVertex(inside_castle_seg7_vertex_07035458, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), @@ -452,8 +436,8 @@ static const Gfx inside_castle_seg7_dl_07036780[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_09008000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_07035328.l, 1), - gsSPLight(&inside_castle_seg7_lights_07035328.a, 2), + gsSPLightColor(LIGHT_1, 0x555555ff), + gsSPLightColor(LIGHT_2, 0x1f1f1fff), gsSPVertex(inside_castle_seg7_vertex_070355B8, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), @@ -464,8 +448,8 @@ static const Gfx inside_castle_seg7_dl_070367C8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_09004000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_07035310.l, 1), - gsSPLight(&inside_castle_seg7_lights_07035310.a, 2), + gsSPLightColor(LIGHT_1, 0x666666ff), + gsSPLightColor(LIGHT_2, 0x262626ff), gsSPVertex(inside_castle_seg7_vertex_070355F8, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0), gsSP2Triangles( 4, 3, 2, 0x0, 5, 4, 2, 0x0), @@ -512,14 +496,14 @@ static const Gfx inside_castle_seg7_dl_070369B8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_09001000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_07035328.l, 1), - gsSPLight(&inside_castle_seg7_lights_07035328.a, 2), + gsSPLightColor(LIGHT_1, 0x555555ff), + gsSPLightColor(LIGHT_2, 0x1f1f1fff), gsSPVertex(inside_castle_seg7_vertex_07035AF8, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 4, 0x0), gsSP2Triangles( 0, 2, 3, 0x0, 5, 6, 7, 0x0), gsSP2Triangles( 5, 8, 6, 0x0, 5, 7, 9, 0x0), - gsSPLight(&inside_castle_seg7_lights_07035310.l, 1), - gsSPLight(&inside_castle_seg7_lights_07035310.a, 2), + gsSPLightColor(LIGHT_1, 0x666666ff), + gsSPLightColor(LIGHT_2, 0x262626ff), gsSPVertex(inside_castle_seg7_vertex_07035B98, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), @@ -572,8 +556,8 @@ static const Gfx inside_castle_seg7_dl_070369B8[] = { // 0x07036CB8 - 0x07036D88 static const Gfx inside_castle_seg7_dl_07036CB8[] = { - gsSPLight(&inside_castle_seg7_lights_07035340.l, 1), - gsSPLight(&inside_castle_seg7_lights_07035340.a, 2), + gsSPLightColor(LIGHT_1, 0xff), + gsSPLightColor(LIGHT_2, 0xff), gsSPVertex(inside_castle_seg7_vertex_070363D8, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), diff --git a/levels/castle_inside/areas/1/19/model.inc.c b/levels/castle_inside/areas/1/19/model.inc.c index 73e6bcc8..9cb1e640 100644 --- a/levels/castle_inside/areas/1/19/model.inc.c +++ b/levels/castle_inside/areas/1/19/model.inc.c @@ -1,8 +1,4 @@ // 0x07036E68 - 0x07036E80 -static const Lights1 inside_castle_seg7_lights_07036E68 = gdSPDefLights1( - 0xcc, 0xcc, 0xcc, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07036E80 - 0x07036F70 static const Vtx inside_castle_seg7_vertex_07036E80[] = { @@ -182,8 +178,8 @@ static const Gfx inside_castle_seg7_dl_07037710[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_09003000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_07036E68.l, 1), - gsSPLight(&inside_castle_seg7_lights_07036E68.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0xccccccff), gsSPVertex(inside_castle_seg7_vertex_07036E80, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), diff --git a/levels/castle_inside/areas/1/2/model.inc.c b/levels/castle_inside/areas/1/2/model.inc.c index 3c52d6d6..ffcea005 100644 --- a/levels/castle_inside/areas/1/2/model.inc.c +++ b/levels/castle_inside/areas/1/2/model.inc.c @@ -1,20 +1,8 @@ // 0x07023FE0 - 0x07023FF8 -static const Lights1 inside_castle_seg7_lights_07023FE0 = gdSPDefLights1( - 0x52, 0x52, 0x52, - 0xdd, 0xdd, 0xdd, 0x28, 0x28, 0x28 -); // 0x07023FF8 - 0x07024010 -static const Lights1 inside_castle_seg7_lights_07023FF8 = gdSPDefLights1( - 0x5f, 0x5f, 0x5f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07024010 - 0x07024028 -static const Lights1 inside_castle_seg7_lights_07024010 = gdSPDefLights1( - 0x2c, 0x2c, 0x2c, - 0x77, 0x77, 0x77, 0x28, 0x28, 0x28 -); // 0x07024028 - 0x07024118 static const Vtx inside_castle_seg7_vertex_07024028[] = { @@ -1285,8 +1273,8 @@ static const Gfx inside_castle_seg7_dl_07027DE8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_09005000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_07023FE0.l, 1), - gsSPLight(&inside_castle_seg7_lights_07023FE0.a, 2), + gsSPLightColor(LIGHT_1, 0xddddddff), + gsSPLightColor(LIGHT_2, 0x525252ff), gsSPVertex(inside_castle_seg7_vertex_07024028, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -1339,8 +1327,8 @@ static const Gfx inside_castle_seg7_dl_07027DE8[] = { gsSP1Triangle( 0, 14, 1, 0x0), gsSPVertex(inside_castle_seg7_vertex_07024988, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), - gsSPLight(&inside_castle_seg7_lights_07023FF8.l, 1), - gsSPLight(&inside_castle_seg7_lights_07023FF8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x5f5f5fff), gsSPVertex(inside_castle_seg7_vertex_070249C8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -1493,13 +1481,13 @@ static const Gfx inside_castle_seg7_dl_070287C0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_09001000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_07024010.l, 1), - gsSPLight(&inside_castle_seg7_lights_07024010.a, 2), + gsSPLightColor(LIGHT_1, 0x777777ff), + gsSPLightColor(LIGHT_2, 0x2c2c2cff), gsSPVertex(inside_castle_seg7_vertex_07026108, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), - gsSPLight(&inside_castle_seg7_lights_07023FF8.l, 1), - gsSPLight(&inside_castle_seg7_lights_07023FF8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x5f5f5fff), gsSPVertex(inside_castle_seg7_vertex_07026188, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -1548,14 +1536,14 @@ static const Gfx inside_castle_seg7_dl_07028A38[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_09000000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_07024010.l, 1), - gsSPLight(&inside_castle_seg7_lights_07024010.a, 2), + gsSPLightColor(LIGHT_1, 0x777777ff), + gsSPLightColor(LIGHT_2, 0x2c2c2cff), gsSPVertex(inside_castle_seg7_vertex_070269E8, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 0, 4, 1, 0x0, 5, 6, 7, 0x0), gsSP2Triangles( 5, 8, 9, 0x0, 5, 9, 6, 0x0), - gsSPLight(&inside_castle_seg7_lights_07023FF8.l, 1), - gsSPLight(&inside_castle_seg7_lights_07023FF8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x5f5f5fff), gsSPVertex(inside_castle_seg7_vertex_07026A88, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), diff --git a/levels/castle_inside/areas/1/20/model.inc.c b/levels/castle_inside/areas/1/20/model.inc.c index a55d2238..13734b98 100644 --- a/levels/castle_inside/areas/1/20/model.inc.c +++ b/levels/castle_inside/areas/1/20/model.inc.c @@ -1,8 +1,4 @@ // 0x070379F8 - 0x07037A10 -static const Lights1 inside_castle_seg7_lights_070379F8 = gdSPDefLights1( - 0x5f, 0x5f, 0x5f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07037A10 - 0x07037B10 static const Vtx inside_castle_seg7_vertex_07037A10[] = { @@ -29,8 +25,8 @@ static const Gfx inside_castle_seg7_dl_07037B10[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_09008000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_070379F8.l, 1), - gsSPLight(&inside_castle_seg7_lights_070379F8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x5f5f5fff), gsSPVertex(inside_castle_seg7_vertex_07037A10, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 4, 3, 0x0, 6, 7, 4, 0x0), diff --git a/levels/castle_inside/areas/1/21/model.inc.c b/levels/castle_inside/areas/1/21/model.inc.c index 3346e8ce..9eeb026a 100644 --- a/levels/castle_inside/areas/1/21/model.inc.c +++ b/levels/castle_inside/areas/1/21/model.inc.c @@ -1,8 +1,4 @@ // 0x07037C58 - 0x07037C70 -static const Lights1 inside_castle_seg7_lights_07037C58 = gdSPDefLights1( - 0x37, 0x37, 0x37, - 0xdd, 0xdd, 0xdd, 0x28, 0x28, 0x28 -); // 0x07037C70 - 0x07037D70 static const Vtx inside_castle_seg7_vertex_07037C70[] = { @@ -29,8 +25,8 @@ static const Gfx inside_castle_seg7_dl_07037D70[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_0900B000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_07037C58.l, 1), - gsSPLight(&inside_castle_seg7_lights_07037C58.a, 2), + gsSPLightColor(LIGHT_1, 0xddddddff), + gsSPLightColor(LIGHT_2, 0x373737ff), gsSPVertex(inside_castle_seg7_vertex_07037C70, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 3, 5, 0x0, 7, 8, 9, 0x0), diff --git a/levels/castle_inside/areas/1/23/model.inc.c b/levels/castle_inside/areas/1/23/model.inc.c index 692d7757..6e188c13 100644 --- a/levels/castle_inside/areas/1/23/model.inc.c +++ b/levels/castle_inside/areas/1/23/model.inc.c @@ -1,8 +1,4 @@ // 0x070382B0 - 0x070382C8 -static const Lights1 inside_castle_seg7_lights_070382B0 = gdSPDefLights1( - 0x5f, 0x5f, 0x5f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x070382C8 - 0x07038308 static const Vtx inside_castle_seg7_vertex_070382C8[] = { @@ -17,8 +13,8 @@ static const Gfx inside_castle_seg7_dl_07038308[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_castle_seg7_texture_07003000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_070382B0.l, 1), - gsSPLight(&inside_castle_seg7_lights_070382B0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x5f5f5fff), gsSPVertex(inside_castle_seg7_vertex_070382C8, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0), gsSPEndDisplayList(), diff --git a/levels/castle_inside/areas/1/24/model.inc.c b/levels/castle_inside/areas/1/24/model.inc.c index e6ffdb1a..606bb338 100644 --- a/levels/castle_inside/areas/1/24/model.inc.c +++ b/levels/castle_inside/areas/1/24/model.inc.c @@ -1,20 +1,8 @@ // 0x070383C0 - 0x070383D8 -static const Lights1 inside_castle_seg7_lights_070383C0 = gdSPDefLights1( - 0x52, 0x52, 0x52, - 0xdd, 0xdd, 0xdd, 0x28, 0x28, 0x28 -); // 0x070383D8 - 0x070383F0 -static const Lights1 inside_castle_seg7_lights_070383D8 = gdSPDefLights1( - 0x5f, 0x5f, 0x5f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x070383F0 - 0x07038408 -static const Lights1 inside_castle_seg7_lights_070383F0 = gdSPDefLights1( - 0x46, 0x46, 0x46, - 0xbb, 0xbb, 0xbb, 0x28, 0x28, 0x28 -); // 0x07038408 - 0x070384F8 static const Vtx inside_castle_seg7_vertex_07038408[] = { @@ -569,8 +557,8 @@ static const Gfx inside_castle_seg7_dl_07039EC8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_09005000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_070383C0.l, 1), - gsSPLight(&inside_castle_seg7_lights_070383C0.a, 2), + gsSPLightColor(LIGHT_1, 0xddddddff), + gsSPLightColor(LIGHT_2, 0x525252ff), gsSPVertex(inside_castle_seg7_vertex_07038408, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), @@ -583,8 +571,8 @@ static const Gfx inside_castle_seg7_dl_07039EC8[] = { gsSP1Triangle( 0, 14, 1, 0x0), gsSPVertex(inside_castle_seg7_vertex_070385E8, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - gsSPLight(&inside_castle_seg7_lights_070383D8.l, 1), - gsSPLight(&inside_castle_seg7_lights_070383D8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x5f5f5fff), gsSPVertex(inside_castle_seg7_vertex_07038628, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), @@ -711,8 +699,8 @@ static const Gfx inside_castle_seg7_dl_0703A540[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_0900A000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_070383F0.l, 1), - gsSPLight(&inside_castle_seg7_lights_070383F0.a, 2), + gsSPLightColor(LIGHT_1, 0xbbbbbbff), + gsSPLightColor(LIGHT_2, 0x464646ff), gsSPVertex(inside_castle_seg7_vertex_070399F8, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 3, 8, 0x0), diff --git a/levels/castle_inside/areas/1/25/model.inc.c b/levels/castle_inside/areas/1/25/model.inc.c index 1fc3b944..ab5ad5c6 100644 --- a/levels/castle_inside/areas/1/25/model.inc.c +++ b/levels/castle_inside/areas/1/25/model.inc.c @@ -1,8 +1,4 @@ // 0x0703A768 - 0x0703A780 -static const Lights1 inside_castle_seg7_lights_0703A768 = gdSPDefLights1( - 0x5f, 0x5f, 0x5f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0703A780 - 0x0703A7C0 static const Vtx inside_castle_seg7_vertex_0703A780[] = { @@ -17,8 +13,8 @@ static const Gfx inside_castle_seg7_dl_0703A7C0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_castle_seg7_texture_07003000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_0703A768.l, 1), - gsSPLight(&inside_castle_seg7_lights_0703A768.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x5f5f5fff), gsSPVertex(inside_castle_seg7_vertex_0703A780, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), diff --git a/levels/castle_inside/areas/1/26/model.inc.c b/levels/castle_inside/areas/1/26/model.inc.c index 2785f003..6a66eb14 100644 --- a/levels/castle_inside/areas/1/26/model.inc.c +++ b/levels/castle_inside/areas/1/26/model.inc.c @@ -1,14 +1,6 @@ // 0x0703A878 - 0x0703A890 -static const Lights1 inside_castle_seg7_lights_0703A878 = gdSPDefLights1( - 0x4c, 0x4c, 0x4c, - 0xcc, 0xcc, 0xcc, 0x28, 0x28, 0x28 -); // 0x0703A890 - 0x0703A8A8 -static const Lights1 inside_castle_seg7_lights_0703A890 = gdSPDefLights1( - 0x5f, 0x5f, 0x5f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0703A8A8 - 0x0703A998 static const Vtx inside_castle_seg7_vertex_0703A8A8[] = { @@ -284,8 +276,8 @@ static const Gfx inside_castle_seg7_dl_0703B5B8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_0900B000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_0703A878.l, 1), - gsSPLight(&inside_castle_seg7_lights_0703A878.a, 2), + gsSPLightColor(LIGHT_1, 0xccccccff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(inside_castle_seg7_vertex_0703A8A8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -300,8 +292,8 @@ static const Gfx inside_castle_seg7_dl_0703B5B8[] = { gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), gsSP2Triangles( 7, 9, 10, 0x0, 11, 12, 13, 0x0), gsSP1Triangle(11, 13, 14, 0x0), - gsSPLight(&inside_castle_seg7_lights_0703A890.l, 1), - gsSPLight(&inside_castle_seg7_lights_0703A890.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x5f5f5fff), gsSPVertex(inside_castle_seg7_vertex_0703AB88, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), diff --git a/levels/castle_inside/areas/1/4/model.inc.c b/levels/castle_inside/areas/1/4/model.inc.c index c0cbb997..9f5fa2d5 100644 --- a/levels/castle_inside/areas/1/4/model.inc.c +++ b/levels/castle_inside/areas/1/4/model.inc.c @@ -1,38 +1,14 @@ // 0x070295E8 - 0x07029600 -static const Lights1 inside_castle_seg7_lights_070295E8 = gdSPDefLights1( - 0x26, 0x26, 0x26, - 0x66, 0x66, 0x66, 0x28, 0x28, 0x28 -); // 0x07029600 - 0x07029618 -static const Lights1 inside_castle_seg7_lights_07029600 = gdSPDefLights1( - 0x33, 0x33, 0x33, - 0x88, 0x88, 0x88, 0x28, 0x28, 0x28 -); // 0x07029618 - 0x07029630 -static const Lights1 inside_castle_seg7_lights_07029618 = gdSPDefLights1( - 0x5f, 0x5f, 0x5f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07029630 - 0x07029648 -static const Lights1 inside_castle_seg7_lights_07029630 = gdSPDefLights1( - 0x1f, 0x1f, 0x1f, - 0x55, 0x55, 0x55, 0x28, 0x28, 0x28 -); // 0x07029648 - 0x07029660 -static const Lights1 inside_castle_seg7_lights_07029648 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xaa, 0xaa, 0xaa, 0x28, 0x28, 0x28 -); // 0x07029660 - 0x07029678 -static const Lights1 inside_castle_seg7_lights_07029660 = gdSPDefLights1( - 0x4c, 0x4c, 0x4c, - 0xcc, 0xcc, 0xcc, 0x28, 0x28, 0x28 -); // 0x07029678 - 0x070296D8 static const Vtx inside_castle_seg7_vertex_07029678[] = { @@ -288,16 +264,16 @@ static const Gfx inside_castle_seg7_dl_0702A188[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_09008000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_070295E8.l, 1), - gsSPLight(&inside_castle_seg7_lights_070295E8.a, 2), + gsSPLightColor(LIGHT_1, 0x666666ff), + gsSPLightColor(LIGHT_2, 0x262626ff), gsSPVertex(inside_castle_seg7_vertex_07029678, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), - gsSPLight(&inside_castle_seg7_lights_07029600.l, 1), - gsSPLight(&inside_castle_seg7_lights_07029600.a, 2), + gsSPLightColor(LIGHT_1, 0x888888ff), + gsSPLightColor(LIGHT_2, 0x333333ff), gsSPVertex(inside_castle_seg7_vertex_070296D8, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - gsSPLight(&inside_castle_seg7_lights_07029618.l, 1), - gsSPLight(&inside_castle_seg7_lights_07029618.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x5f5f5fff), gsSPVertex(inside_castle_seg7_vertex_07029718, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 3, 7, 6, 0x0), @@ -324,28 +300,28 @@ static const Gfx inside_castle_seg7_dl_0702A300[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_09001000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_07029630.l, 1), - gsSPLight(&inside_castle_seg7_lights_07029630.a, 2), + gsSPLightColor(LIGHT_1, 0x555555ff), + gsSPLightColor(LIGHT_2, 0x1f1f1fff), gsSPVertex(inside_castle_seg7_vertex_07029938, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), - gsSPLight(&inside_castle_seg7_lights_070295E8.l, 1), - gsSPLight(&inside_castle_seg7_lights_070295E8.a, 2), + gsSPLightColor(LIGHT_1, 0x666666ff), + gsSPLightColor(LIGHT_2, 0x262626ff), gsSPVertex(inside_castle_seg7_vertex_07029978, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - gsSPLight(&inside_castle_seg7_lights_07029600.l, 1), - gsSPLight(&inside_castle_seg7_lights_07029600.a, 2), + gsSPLightColor(LIGHT_1, 0x888888ff), + gsSPLightColor(LIGHT_2, 0x333333ff), gsSPVertex(inside_castle_seg7_vertex_070299B8, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - gsSPLight(&inside_castle_seg7_lights_07029648.l, 1), - gsSPLight(&inside_castle_seg7_lights_07029648.a, 2), + gsSPLightColor(LIGHT_1, 0xaaaaaaff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(inside_castle_seg7_vertex_070299F8, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - gsSPLight(&inside_castle_seg7_lights_07029660.l, 1), - gsSPLight(&inside_castle_seg7_lights_07029660.a, 2), + gsSPLightColor(LIGHT_1, 0xccccccff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(inside_castle_seg7_vertex_07029A38, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), - gsSPLight(&inside_castle_seg7_lights_07029618.l, 1), - gsSPLight(&inside_castle_seg7_lights_07029618.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x5f5f5fff), gsSPVertex(inside_castle_seg7_vertex_07029A78, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 0, 2, 0x0, 4, 2, 5, 0x0), diff --git a/levels/castle_inside/areas/1/6/model.inc.c b/levels/castle_inside/areas/1/6/model.inc.c index 1f4c7b97..3668518b 100644 --- a/levels/castle_inside/areas/1/6/model.inc.c +++ b/levels/castle_inside/areas/1/6/model.inc.c @@ -1,8 +1,4 @@ // 0x0702A8F0 - 0x0702A908 -static const Lights1 inside_castle_seg7_lights_0702A8F0 = gdSPDefLights1( - 0x5f, 0x5f, 0x5f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0702A908 - 0x0702A998 static const Vtx inside_castle_seg7_vertex_0702A908[] = { @@ -22,8 +18,8 @@ static const Gfx inside_castle_seg7_dl_0702A998[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_castle_seg7_texture_07000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_0702A8F0.l, 1), - gsSPLight(&inside_castle_seg7_lights_0702A8F0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x5f5f5fff), gsSPVertex(inside_castle_seg7_vertex_0702A908, 9, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 3, 6, 0x0), diff --git a/levels/castle_inside/areas/1/7/model.inc.c b/levels/castle_inside/areas/1/7/model.inc.c index c1730b38..d9376300 100644 --- a/levels/castle_inside/areas/1/7/model.inc.c +++ b/levels/castle_inside/areas/1/7/model.inc.c @@ -1,8 +1,4 @@ // 0x0702AA80 - 0x0702AA98 -static const Lights1 inside_castle_seg7_lights_0702AA80 = gdSPDefLights1( - 0x5f, 0x5f, 0x5f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0702AA98 - 0x0702AAD8 static const Vtx inside_castle_seg7_vertex_0702AA98[] = { @@ -17,8 +13,8 @@ static const Gfx inside_castle_seg7_dl_0702AAD8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_castle_seg7_texture_07002000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_0702AA80.l, 1), - gsSPLight(&inside_castle_seg7_lights_0702AA80.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x5f5f5fff), gsSPVertex(inside_castle_seg7_vertex_0702AA98, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), diff --git a/levels/castle_inside/areas/1/8/model.inc.c b/levels/castle_inside/areas/1/8/model.inc.c index 04021e8f..77e240d5 100644 --- a/levels/castle_inside/areas/1/8/model.inc.c +++ b/levels/castle_inside/areas/1/8/model.inc.c @@ -1,14 +1,6 @@ // 0x0702AB90 - 0x0702ABA8 -static const Lights1 inside_castle_seg7_lights_0702AB90 = gdSPDefLights1( - 0x46, 0x46, 0x46, - 0xbb, 0xbb, 0xbb, 0x28, 0x28, 0x28 -); // 0x0702ABA8 - 0x0702ABC0 -static const Lights1 inside_castle_seg7_lights_0702ABA8 = gdSPDefLights1( - 0x5f, 0x5f, 0x5f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0702ABC0 - 0x0702ACB0 static const Vtx inside_castle_seg7_vertex_0702ABC0[] = { @@ -906,8 +898,8 @@ static const Gfx inside_castle_seg7_dl_0702D770[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_09005000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_0702AB90.l, 1), - gsSPLight(&inside_castle_seg7_lights_0702AB90.a, 2), + gsSPLightColor(LIGHT_1, 0xbbbbbbff), + gsSPLightColor(LIGHT_2, 0x464646ff), gsSPVertex(inside_castle_seg7_vertex_0702ABC0, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), @@ -962,8 +954,8 @@ static const Gfx inside_castle_seg7_dl_0702D770[] = { gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), gsSP2Triangles( 8, 9, 10, 0x0, 8, 11, 9, 0x0), - gsSPLight(&inside_castle_seg7_lights_0702ABA8.l, 1), - gsSPLight(&inside_castle_seg7_lights_0702ABA8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x5f5f5fff), gsSPVertex(inside_castle_seg7_vertex_0702B5E0, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), diff --git a/levels/castle_inside/areas/1/9/model.inc.c b/levels/castle_inside/areas/1/9/model.inc.c index a83ef7c7..d232256a 100644 --- a/levels/castle_inside/areas/1/9/model.inc.c +++ b/levels/castle_inside/areas/1/9/model.inc.c @@ -1,32 +1,12 @@ // 0x0702E490 - 0x0702E4A8 -static const Lights1 inside_castle_seg7_lights_0702E490 = gdSPDefLights1( - 0x52, 0x52, 0x52, - 0xdd, 0xdd, 0xdd, 0x28, 0x28, 0x28 -); // 0x0702E4A8 - 0x0702E4C0 -static const Lights1 inside_castle_seg7_lights_0702E4A8 = gdSPDefLights1( - 0x5f, 0x5f, 0x5f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0702E4C0 - 0x0702E4D8 -static const Lights1 inside_castle_seg7_lights_0702E4C0 = gdSPDefLights1( - 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x0702E4D8 - 0x0702E4F0 -static const Lights1 inside_castle_seg7_lights_0702E4D8 = gdSPDefLights1( - 0x07, 0x07, 0x07, - 0x13, 0x13, 0x13, 0x28, 0x28, 0x28 -); // 0x0702E4F0 - 0x0702E508 -static const Lights1 inside_castle_seg7_lights_0702E4F0 = gdSPDefLights1( - 0x0f, 0x0f, 0x0f, - 0x29, 0x29, 0x29, 0x28, 0x28, 0x28 -); // 0x0702E508 - 0x0702E608 static const Vtx inside_castle_seg7_vertex_0702E508[] = { @@ -412,8 +392,8 @@ static const Gfx inside_castle_seg7_dl_0702F738[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_09005000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_0702E490.l, 1), - gsSPLight(&inside_castle_seg7_lights_0702E490.a, 2), + gsSPLightColor(LIGHT_1, 0xddddddff), + gsSPLightColor(LIGHT_2, 0x525252ff), gsSPVertex(inside_castle_seg7_vertex_0702E508, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -424,8 +404,8 @@ static const Gfx inside_castle_seg7_dl_0702F738[] = { gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), gsSP2Triangles( 8, 9, 10, 0x0, 11, 12, 13, 0x0), gsSP2Triangles(10, 9, 14, 0x0, 15, 12, 11, 0x0), - gsSPLight(&inside_castle_seg7_lights_0702E4A8.l, 1), - gsSPLight(&inside_castle_seg7_lights_0702E4A8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x5f5f5fff), gsSPVertex(inside_castle_seg7_vertex_0702E708, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 3, 5, 0x0, 7, 8, 9, 0x0), @@ -536,17 +516,17 @@ static const Gfx inside_castle_seg7_dl_0702FA80[] = { // 0x0702FC90 - 0x0702FD30 static const Gfx inside_castle_seg7_dl_0702FC90[] = { - gsSPLight(&inside_castle_seg7_lights_0702E4C0.l, 1), - gsSPLight(&inside_castle_seg7_lights_0702E4C0.a, 2), + gsSPLightColor(LIGHT_1, 0xff), + gsSPLightColor(LIGHT_2, 0xff), gsSPVertex(inside_castle_seg7_vertex_0702F5F8, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - gsSPLight(&inside_castle_seg7_lights_0702E4D8.l, 1), - gsSPLight(&inside_castle_seg7_lights_0702E4D8.a, 2), + gsSPLightColor(LIGHT_1, 0x131313ff), + gsSPLightColor(LIGHT_2, 0x70707ff), gsSPVertex(inside_castle_seg7_vertex_0702F638, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), - gsSPLight(&inside_castle_seg7_lights_0702E4F0.l, 1), - gsSPLight(&inside_castle_seg7_lights_0702E4F0.a, 2), + gsSPLightColor(LIGHT_1, 0x292929ff), + gsSPLightColor(LIGHT_2, 0xf0f0fff), gsSPVertex(inside_castle_seg7_vertex_0702F6B8, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), diff --git a/levels/castle_inside/areas/2/1/model.inc.c b/levels/castle_inside/areas/2/1/model.inc.c index 00f456d4..689ed74e 100644 --- a/levels/castle_inside/areas/2/1/model.inc.c +++ b/levels/castle_inside/areas/2/1/model.inc.c @@ -1,14 +1,6 @@ // 0x0703C040 - 0x0703C058 -static const Lights1 inside_castle_seg7_lights_0703C040 = gdSPDefLights1( - 0x4c, 0x4c, 0x4c, - 0xcc, 0xcc, 0xcc, 0x28, 0x28, 0x28 -); // 0x0703C058 - 0x0703C070 -static const Lights1 inside_castle_seg7_lights_0703C058 = gdSPDefLights1( - 0x5f, 0x5f, 0x5f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0703C070 - 0x0703C160 static const Vtx inside_castle_seg7_vertex_0703C070[] = { @@ -624,8 +616,8 @@ static const Gfx inside_castle_seg7_dl_0703DE40[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_0900B000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_0703C040.l, 1), - gsSPLight(&inside_castle_seg7_lights_0703C040.a, 2), + gsSPLightColor(LIGHT_1, 0xccccccff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(inside_castle_seg7_vertex_0703C070, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 0, 6, 1, 0x0, 3, 5, 7, 0x0), @@ -640,8 +632,8 @@ static const Gfx inside_castle_seg7_dl_0703DE40[] = { gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), gsSP2Triangles( 7, 9, 10, 0x0, 11, 12, 13, 0x0), gsSP1Triangle(11, 13, 14, 0x0), - gsSPLight(&inside_castle_seg7_lights_0703C058.l, 1), - gsSPLight(&inside_castle_seg7_lights_0703C058.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x5f5f5fff), gsSPVertex(inside_castle_seg7_vertex_0703C350, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0), gsSP2Triangles( 4, 3, 2, 0x0, 4, 5, 3, 0x0), diff --git a/levels/castle_inside/areas/2/12/model.inc.c b/levels/castle_inside/areas/2/12/model.inc.c index 04346e17..3a707233 100644 --- a/levels/castle_inside/areas/2/12/model.inc.c +++ b/levels/castle_inside/areas/2/12/model.inc.c @@ -1,8 +1,4 @@ // 0x07051A38 - 0x07051A50 -static const Lights1 inside_castle_seg7_lights_07051A38 = gdSPDefLights1( - 0x47, 0x3f, 0x17, - 0xbf, 0xaa, 0x3f, 0x28, 0x28, 0x28 -); // 0x07051A50 - 0x07051B10 static const Vtx inside_castle_seg7_vertex_07051A50[] = { @@ -22,8 +18,8 @@ static const Vtx inside_castle_seg7_vertex_07051A50[] = { // 0x07051B10 - 0x07051B60 static const Gfx inside_castle_seg7_dl_07051B10[] = { - gsSPLight(&inside_castle_seg7_lights_07051A38.l, 1), - gsSPLight(&inside_castle_seg7_lights_07051A38.a, 2), + gsSPLightColor(LIGHT_1, 0xbfaa3fff), + gsSPLightColor(LIGHT_2, 0x473f17ff), gsSPVertex(inside_castle_seg7_vertex_07051A50, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), diff --git a/levels/castle_inside/areas/2/13/model.inc.c b/levels/castle_inside/areas/2/13/model.inc.c index e8eac082..38572cd2 100644 --- a/levels/castle_inside/areas/2/13/model.inc.c +++ b/levels/castle_inside/areas/2/13/model.inc.c @@ -1,20 +1,8 @@ // 0x07051B88 - 0x07051BA0 -static const Lights1 inside_castle_seg7_lights_07051B88 = gdSPDefLights1( - 0x51, 0x34, 0x42, - 0xd8, 0x8c, 0xb2, 0x28, 0x28, 0x28 -); // 0x07051BA0 - 0x07051BB8 -static const Lights1 inside_castle_seg7_lights_07051BA0 = gdSPDefLights1( - 0x40, 0x1e, 0x2f, - 0xac, 0x52, 0x7f, 0x28, 0x28, 0x28 -); // 0x07051BB8 - 0x07051BD0 -static const Lights1 inside_castle_seg7_lights_07051BB8 = gdSPDefLights1( - 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x07051BD0 - 0x07051C70 static const Vtx inside_castle_seg7_vertex_07051BD0[] = { @@ -987,8 +975,8 @@ static const Gfx inside_castle_seg7_dl_07054AF0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_09004000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_07051B88.l, 1), - gsSPLight(&inside_castle_seg7_lights_07051B88.a, 2), + gsSPLightColor(LIGHT_1, 0xd88cb2ff), + gsSPLightColor(LIGHT_2, 0x513442ff), gsSPVertex(inside_castle_seg7_vertex_07051BD0, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 4, 0x0), gsSP2Triangles( 0, 2, 4, 0x0, 5, 2, 1, 0x0), @@ -1105,8 +1093,8 @@ static const Gfx inside_castle_seg7_dl_07054B78[] = { gsSP1Triangle( 0, 14, 1, 0x0), gsSPVertex(inside_castle_seg7_vertex_07052F30, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - gsSPLight(&inside_castle_seg7_lights_07051BA0.l, 1), - gsSPLight(&inside_castle_seg7_lights_07051BA0.a, 2), + gsSPLightColor(LIGHT_1, 0xac527fff), + gsSPLightColor(LIGHT_2, 0x401e2fff), gsSPVertex(inside_castle_seg7_vertex_07052F70, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -1218,8 +1206,8 @@ static const Gfx inside_castle_seg7_dl_070555E8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_09003000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_07051B88.l, 1), - gsSPLight(&inside_castle_seg7_lights_07051B88.a, 2), + gsSPLightColor(LIGHT_1, 0xd88cb2ff), + gsSPLightColor(LIGHT_2, 0x513442ff), gsSPVertex(inside_castle_seg7_vertex_070542B0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), @@ -1277,8 +1265,8 @@ static const Gfx inside_castle_seg7_dl_070557A8[] = { // 0x070558A0 - 0x070558D0 static const Gfx inside_castle_seg7_dl_070558A0[] = { - gsSPLight(&inside_castle_seg7_lights_07051BB8.l, 1), - gsSPLight(&inside_castle_seg7_lights_07051BB8.a, 2), + gsSPLightColor(LIGHT_1, 0xff), + gsSPLightColor(LIGHT_2, 0xff), gsSPVertex(inside_castle_seg7_vertex_07054AB0, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), diff --git a/levels/castle_inside/areas/2/14/model.inc.c b/levels/castle_inside/areas/2/14/model.inc.c index 0e564b5e..32d9e0ed 100644 --- a/levels/castle_inside/areas/2/14/model.inc.c +++ b/levels/castle_inside/areas/2/14/model.inc.c @@ -1,14 +1,6 @@ // 0x070559C0 - 0x070559D8 -static const Lights1 inside_castle_seg7_lights_070559C0 = gdSPDefLights1( - 0x40, 0x24, 0x1e, - 0xac, 0x61, 0x52, 0x28, 0x28, 0x28 -); // 0x070559D8 - 0x070559F0 -static const Lights1 inside_castle_seg7_lights_070559D8 = gdSPDefLights1( - 0x5f, 0x5f, 0x5f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x070559F0 - 0x07055AE0 static const Vtx inside_castle_seg7_vertex_070559F0[] = { @@ -415,8 +407,8 @@ static const Gfx inside_castle_seg7_dl_07056BF0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_castle_seg7_texture_bowser_top_left), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_070559C0.l, 1), - gsSPLight(&inside_castle_seg7_lights_070559C0.a, 2), + gsSPLightColor(LIGHT_1, 0xac6152ff), + gsSPLightColor(LIGHT_2, 0x40241eff), gsSPVertex(inside_castle_seg7_vertex_070559F0, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -429,8 +421,8 @@ static const Gfx inside_castle_seg7_dl_07056BF0[] = { gsSP1Triangle( 0, 2, 14, 0x0), gsSPVertex(inside_castle_seg7_vertex_07055BD0, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), - gsSPLight(&inside_castle_seg7_lights_070559D8.l, 1), - gsSPLight(&inside_castle_seg7_lights_070559D8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x5f5f5fff), gsSPVertex(inside_castle_seg7_vertex_07055C10, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), @@ -441,8 +433,8 @@ static const Gfx inside_castle_seg7_dl_07056CE0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_castle_seg7_texture_bowser_top_right), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_070559C0.l, 1), - gsSPLight(&inside_castle_seg7_lights_070559C0.a, 2), + gsSPLightColor(LIGHT_1, 0xac6152ff), + gsSPLightColor(LIGHT_2, 0x40241eff), gsSPVertex(inside_castle_seg7_vertex_07055C50, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), @@ -455,8 +447,8 @@ static const Gfx inside_castle_seg7_dl_07056CE0[] = { gsSP1Triangle( 0, 2, 14, 0x0), gsSPVertex(inside_castle_seg7_vertex_07055E30, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - gsSPLight(&inside_castle_seg7_lights_070559D8.l, 1), - gsSPLight(&inside_castle_seg7_lights_070559D8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x5f5f5fff), gsSPVertex(inside_castle_seg7_vertex_07055E70, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), @@ -467,8 +459,8 @@ static const Gfx inside_castle_seg7_dl_07056DD0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_castle_seg7_texture_bowser_bottom_left), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_070559C0.l, 1), - gsSPLight(&inside_castle_seg7_lights_070559C0.a, 2), + gsSPLightColor(LIGHT_1, 0xac6152ff), + gsSPLightColor(LIGHT_2, 0x40241eff), gsSPVertex(inside_castle_seg7_vertex_07055EB0, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), @@ -481,8 +473,8 @@ static const Gfx inside_castle_seg7_dl_07056DD0[] = { gsSP1Triangle( 0, 2, 14, 0x0), gsSPVertex(inside_castle_seg7_vertex_07056090, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), - gsSPLight(&inside_castle_seg7_lights_070559D8.l, 1), - gsSPLight(&inside_castle_seg7_lights_070559D8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x5f5f5fff), gsSPVertex(inside_castle_seg7_vertex_070560D0, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), @@ -493,8 +485,8 @@ static const Gfx inside_castle_seg7_dl_07056EC0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_castle_seg7_texture_bowser_bottom_right), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_070559C0.l, 1), - gsSPLight(&inside_castle_seg7_lights_070559C0.a, 2), + gsSPLightColor(LIGHT_1, 0xac6152ff), + gsSPLightColor(LIGHT_2, 0x40241eff), gsSPVertex(inside_castle_seg7_vertex_07056110, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), @@ -507,8 +499,8 @@ static const Gfx inside_castle_seg7_dl_07056EC0[] = { gsSP1Triangle( 0, 2, 14, 0x0), gsSPVertex(inside_castle_seg7_vertex_070562F0, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), - gsSPLight(&inside_castle_seg7_lights_070559D8.l, 1), - gsSPLight(&inside_castle_seg7_lights_070559D8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x5f5f5fff), gsSPVertex(inside_castle_seg7_vertex_07056330, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSPEndDisplayList(), @@ -519,8 +511,8 @@ static const Gfx inside_castle_seg7_dl_07056FB0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_castle_seg7_texture_peach_top_left), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_070559C0.l, 1), - gsSPLight(&inside_castle_seg7_lights_070559C0.a, 2), + gsSPLightColor(LIGHT_1, 0xac6152ff), + gsSPLightColor(LIGHT_2, 0x40241eff), gsSPVertex(inside_castle_seg7_vertex_07056370, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), diff --git a/levels/castle_inside/areas/2/15/model.inc.c b/levels/castle_inside/areas/2/15/model.inc.c index 7baf47c5..3ae6baad 100644 --- a/levels/castle_inside/areas/2/15/model.inc.c +++ b/levels/castle_inside/areas/2/15/model.inc.c @@ -1,14 +1,6 @@ // 0x07057380 - 0x07057398 -static const Lights1 inside_castle_seg7_lights_07057380 = gdSPDefLights1( - 0x51, 0x34, 0x42, - 0xd8, 0x8c, 0xb2, 0x28, 0x28, 0x28 -); // 0x07057398 - 0x070573B0 -static const Lights1 inside_castle_seg7_lights_07057398 = gdSPDefLights1( - 0x40, 0x24, 0x1e, - 0xac, 0x61, 0x52, 0x28, 0x28, 0x28 -); // 0x070573B0 - 0x070573F0 static const Vtx inside_castle_seg7_vertex_070573B0[] = { @@ -187,8 +179,8 @@ static const Gfx inside_castle_seg7_dl_07057B70[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_0900B000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_07057380.l, 1), - gsSPLight(&inside_castle_seg7_lights_07057380.a, 2), + gsSPLightColor(LIGHT_1, 0xd88cb2ff), + gsSPLightColor(LIGHT_2, 0x513442ff), gsSPVertex(inside_castle_seg7_vertex_070573B0, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), @@ -238,8 +230,8 @@ static const Gfx inside_castle_seg7_dl_07057D30[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_castle_seg7_texture_bowser_top_left), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_07057398.l, 1), - gsSPLight(&inside_castle_seg7_lights_07057398.a, 2), + gsSPLightColor(LIGHT_1, 0xac6152ff), + gsSPLightColor(LIGHT_2, 0x40241eff), gsSPVertex(inside_castle_seg7_vertex_070577D0, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), @@ -284,8 +276,8 @@ static const Gfx inside_castle_seg7_dl_07057E60[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_09007000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_07057380.l, 1), - gsSPLight(&inside_castle_seg7_lights_07057380.a, 2), + gsSPLightColor(LIGHT_1, 0xd88cb2ff), + gsSPLightColor(LIGHT_2, 0x513442ff), gsSPVertex(inside_castle_seg7_vertex_070579D0, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 6, 9, 7, 0x0), diff --git a/levels/castle_inside/areas/2/2/model.inc.c b/levels/castle_inside/areas/2/2/model.inc.c index 57fffda7..8cdcc932 100644 --- a/levels/castle_inside/areas/2/2/model.inc.c +++ b/levels/castle_inside/areas/2/2/model.inc.c @@ -1,8 +1,4 @@ // 0x0703E798 - 0x0703E7B0 -static const Lights1 inside_castle_seg7_lights_0703E798 = gdSPDefLights1( - 0x5f, 0x5f, 0x5f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0703E7B0 - 0x0703E8A0 static const Vtx inside_castle_seg7_vertex_0703E7B0[] = { @@ -1137,8 +1133,8 @@ static const Gfx inside_castle_seg7_dl_07041F30[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_0900B000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_0703E798.l, 1), - gsSPLight(&inside_castle_seg7_lights_0703E798.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x5f5f5fff), gsSPVertex(inside_castle_seg7_vertex_0703E7B0, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), diff --git a/levels/castle_inside/areas/2/3/model.inc.c b/levels/castle_inside/areas/2/3/model.inc.c index bbcc3e62..7298a77f 100644 --- a/levels/castle_inside/areas/2/3/model.inc.c +++ b/levels/castle_inside/areas/2/3/model.inc.c @@ -1,14 +1,6 @@ // 0x070430F8 - 0x07043110 -static const Lights1 inside_castle_seg7_lights_070430F8 = gdSPDefLights1( - 0x5f, 0x5f, 0x5f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07043110 - 0x07043128 -static const Lights1 inside_castle_seg7_lights_07043110 = gdSPDefLights1( - 0x40, 0x3a, 0x1e, - 0xac, 0x9d, 0x52, 0x28, 0x28, 0x28 -); // 0x07043128 - 0x070431A8 static const Vtx inside_castle_seg7_vertex_07043128[] = { @@ -177,8 +169,8 @@ static const Gfx inside_castle_seg7_dl_070437C8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_09008000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_070430F8.l, 1), - gsSPLight(&inside_castle_seg7_lights_070430F8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x5f5f5fff), gsSPVertex(inside_castle_seg7_vertex_07043128, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 7, 4, 6, 0x0), @@ -190,8 +182,8 @@ static const Gfx inside_castle_seg7_dl_07043820[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_09007000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_07043110.l, 1), - gsSPLight(&inside_castle_seg7_lights_07043110.a, 2), + gsSPLightColor(LIGHT_1, 0xac9d52ff), + gsSPLightColor(LIGHT_2, 0x403a1eff), gsSPVertex(inside_castle_seg7_vertex_070431A8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), @@ -217,8 +209,8 @@ static const Gfx inside_castle_seg7_dl_07043930[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_09002000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_070430F8.l, 1), - gsSPLight(&inside_castle_seg7_lights_070430F8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x5f5f5fff), gsSPVertex(inside_castle_seg7_vertex_07043568, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 3, 0, 0x0, 4, 5, 3, 0x0), diff --git a/levels/castle_inside/areas/2/4/model.inc.c b/levels/castle_inside/areas/2/4/model.inc.c index c4e958ce..2e4338fa 100644 --- a/levels/castle_inside/areas/2/4/model.inc.c +++ b/levels/castle_inside/areas/2/4/model.inc.c @@ -1,8 +1,4 @@ // 0x07043C38 - 0x07043C50 -static const Lights1 inside_castle_seg7_lights_07043C38 = gdSPDefLights1( - 0x5f, 0x5f, 0x5f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07043C50 - 0x07043C90 static const Vtx inside_castle_seg7_vertex_07043C50[] = { @@ -17,8 +13,8 @@ static const Gfx inside_castle_seg7_dl_07043C90[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_castle_seg7_texture_07003000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_07043C38.l, 1), - gsSPLight(&inside_castle_seg7_lights_07043C38.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x5f5f5fff), gsSPVertex(inside_castle_seg7_vertex_07043C50, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), diff --git a/levels/castle_inside/areas/2/6/model.inc.c b/levels/castle_inside/areas/2/6/model.inc.c index e28c39b5..f63e93c5 100644 --- a/levels/castle_inside/areas/2/6/model.inc.c +++ b/levels/castle_inside/areas/2/6/model.inc.c @@ -1,8 +1,4 @@ // 0x0704A1B8 - 0x0704A1D0 -static const Lights1 inside_castle_seg7_lights_0704A1B8 = gdSPDefLights1( - 0x3d, 0x3d, 0x3f, - 0xf5, 0xf5, 0xff, 0x28, 0x28, 0x28 -); // 0x0704A1D0 - 0x0704A290 static const Vtx inside_castle_seg7_vertex_0704A1D0[] = { @@ -22,8 +18,8 @@ static const Vtx inside_castle_seg7_vertex_0704A1D0[] = { // 0x0704A290 - 0x0704A2E0 static const Gfx inside_castle_seg7_dl_0704A290[] = { - gsSPLight(&inside_castle_seg7_lights_0704A1B8.l, 1), - gsSPLight(&inside_castle_seg7_lights_0704A1B8.a, 2), + gsSPLightColor(LIGHT_1, 0xf5f5ffff), + gsSPLightColor(LIGHT_2, 0x3d3d3fff), gsSPVertex(inside_castle_seg7_vertex_0704A1D0, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), diff --git a/levels/castle_inside/areas/2/8/model.inc.c b/levels/castle_inside/areas/2/8/model.inc.c index d84a05ec..b96288b8 100644 --- a/levels/castle_inside/areas/2/8/model.inc.c +++ b/levels/castle_inside/areas/2/8/model.inc.c @@ -1,20 +1,8 @@ // 0x0704AB80 - 0x0704AB98 -static const Lights1 inside_castle_seg7_lights_0704AB80 = gdSPDefLights1( - 0x38, 0x3c, 0x4c, - 0x97, 0xa0, 0xcd, 0x28, 0x28, 0x28 -); // 0x0704AB98 - 0x0704ABB0 -static const Lights1 inside_castle_seg7_lights_0704AB98 = gdSPDefLights1( - 0x5f, 0x5f, 0x5f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0704ABB0 - 0x0704ABC8 -static const Lights1 inside_castle_seg7_lights_0704ABB0 = gdSPDefLights1( - 0x52, 0x52, 0x52, - 0xdd, 0xdd, 0xdd, 0x28, 0x28, 0x28 -); // 0x0704ABC8 - 0x0704ACA8 static const Vtx inside_castle_seg7_vertex_0704ABC8[] = { @@ -456,8 +444,8 @@ static const Gfx inside_castle_seg7_dl_0704C078[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_09004800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_0704AB80.l, 1), - gsSPLight(&inside_castle_seg7_lights_0704AB80.a, 2), + gsSPLightColor(LIGHT_1, 0x97a0cdff), + gsSPLightColor(LIGHT_2, 0x383c4cff), gsSPVertex(inside_castle_seg7_vertex_0704ABC8, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 4, 0x0), gsSP2Triangles( 5, 0, 2, 0x0, 0, 5, 4, 0x0), @@ -480,8 +468,8 @@ static const Gfx inside_castle_seg7_dl_0704C078[] = { gsSP2Triangles( 4, 5, 6, 0x0, 5, 7, 6, 0x0), gsSP2Triangles( 8, 9, 10, 0x0, 8, 10, 11, 0x0), gsSP2Triangles(12, 13, 14, 0x0, 12, 14, 15, 0x0), - gsSPLight(&inside_castle_seg7_lights_0704AB98.l, 1), - gsSPLight(&inside_castle_seg7_lights_0704AB98.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x5f5f5fff), gsSPVertex(inside_castle_seg7_vertex_0704AF88, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 4, 7, 8, 0x0), @@ -520,8 +508,8 @@ static const Gfx inside_castle_seg7_dl_0704C378[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_09005000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_0704ABB0.l, 1), - gsSPLight(&inside_castle_seg7_lights_0704ABB0.a, 2), + gsSPLightColor(LIGHT_1, 0xddddddff), + gsSPLightColor(LIGHT_2, 0x525252ff), gsSPVertex(inside_castle_seg7_vertex_0704B498, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -531,8 +519,8 @@ static const Gfx inside_castle_seg7_dl_0704C378[] = { gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 6, 9, 7, 0x0), gsSP1Triangle( 0, 10, 1, 0x0), - gsSPLight(&inside_castle_seg7_lights_0704AB98.l, 1), - gsSPLight(&inside_castle_seg7_lights_0704AB98.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x5f5f5fff), gsSPVertex(inside_castle_seg7_vertex_0704B638, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 2, 1, 4, 0x0, 1, 5, 4, 0x0), diff --git a/levels/castle_inside/areas/2/9/model.inc.c b/levels/castle_inside/areas/2/9/model.inc.c index b62fc80a..3535f3ee 100644 --- a/levels/castle_inside/areas/2/9/model.inc.c +++ b/levels/castle_inside/areas/2/9/model.inc.c @@ -1,68 +1,24 @@ // 0x0704C8B0 - 0x0704C8C8 -static const Lights1 inside_castle_seg7_lights_0704C8B0 = gdSPDefLights1( - 0x2d, 0x3b, 0x58, - 0x79, 0x9f, 0xeb, 0x28, 0x28, 0x28 -); // 0x0704C8C8 - 0x0704C8E0 -static const Lights1 inside_castle_seg7_lights_0704C8C8 = gdSPDefLights1( - 0x25, 0x39, 0x5f, - 0x65, 0x98, 0xff, 0x28, 0x28, 0x28 -); // 0x0704C8E0 - 0x0704C8F8 -static const Lights1 inside_castle_seg7_lights_0704C8E0 = gdSPDefLights1( - 0x1e, 0x2a, 0x40, - 0x52, 0x70, 0xac, 0x28, 0x28, 0x28 -); // 0x0704C8F8 - 0x0704C910 -static const Lights1 inside_castle_seg7_lights_0704C8F8 = gdSPDefLights1( - 0x17, 0x27, 0x47, - 0x3f, 0x6a, 0xbf, 0x28, 0x28, 0x28 -); // 0x0704C910 - 0x0704C928 -static const Lights1 inside_castle_seg7_lights_0704C910 = gdSPDefLights1( - 0x0b, 0x23, 0x53, - 0x1f, 0x5f, 0xdf, 0x28, 0x28, 0x28 -); // 0x0704C928 - 0x0704C940 -static const Lights1 inside_castle_seg7_lights_0704C928 = gdSPDefLights1( - 0x00, 0x1f, 0x5f, - 0x00, 0x55, 0xff, 0x28, 0x28, 0x28 -); // 0x0704C940 - 0x0704C958 -static const Lights1 inside_castle_seg7_lights_0704C940 = gdSPDefLights1( - 0x5f, 0x5f, 0x5f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0704C958 - 0x0704C970 -static const Lights1 inside_castle_seg7_lights_0704C958 = gdSPDefLights1( - 0x4c, 0x4c, 0x4c, - 0xcc, 0xcc, 0xcc, 0x28, 0x28, 0x28 -); // 0x0704C970 - 0x0704C988 -static const Lights1 inside_castle_seg7_lights_0704C970 = gdSPDefLights1( - 0x13, 0x09, 0x00, - 0x35, 0x1a, 0x00, 0x28, 0x28, 0x28 -); // 0x0704C988 - 0x0704C9A0 -static const Lights1 inside_castle_seg7_lights_0704C988 = gdSPDefLights1( - 0x19, 0x0c, 0x00, - 0x43, 0x21, 0x00, 0x28, 0x28, 0x28 -); // 0x0704C9A0 - 0x0704C9B8 -static const Lights1 inside_castle_seg7_lights_0704C9A0 = gdSPDefLights1( - 0x2d, 0x16, 0x00, - 0x78, 0x3c, 0x00, 0x28, 0x28, 0x28 -); // 0x0704C9B8 - 0x0704CA98 static const Vtx inside_castle_seg7_vertex_0704C9B8[] = { @@ -1060,39 +1016,39 @@ static const Gfx inside_castle_seg7_dl_0704F928[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_09004000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_0704C8B0.l, 1), - gsSPLight(&inside_castle_seg7_lights_0704C8B0.a, 2), + gsSPLightColor(LIGHT_1, 0x799febff), + gsSPLightColor(LIGHT_2, 0x2d3b58ff), gsSPVertex(inside_castle_seg7_vertex_0704C9B8, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 0, 2, 4, 0x0, 5, 6, 7, 0x0), gsSP2Triangles( 5, 8, 6, 0x0, 5, 9, 8, 0x0), gsSP2Triangles(10, 11, 12, 0x0, 10, 13, 11, 0x0), - gsSPLight(&inside_castle_seg7_lights_0704C8C8.l, 1), - gsSPLight(&inside_castle_seg7_lights_0704C8C8.a, 2), + gsSPLightColor(LIGHT_1, 0x6598ffff), + gsSPLightColor(LIGHT_2, 0x25395fff), gsSPVertex(inside_castle_seg7_vertex_0704CA98, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), - gsSPLight(&inside_castle_seg7_lights_0704C8E0.l, 1), - gsSPLight(&inside_castle_seg7_lights_0704C8E0.a, 2), + gsSPLightColor(LIGHT_1, 0x5270acff), + gsSPLightColor(LIGHT_2, 0x1e2a40ff), gsSPVertex(inside_castle_seg7_vertex_0704CB18, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), - gsSPLight(&inside_castle_seg7_lights_0704C8F8.l, 1), - gsSPLight(&inside_castle_seg7_lights_0704C8F8.a, 2), + gsSPLightColor(LIGHT_1, 0x3f6abfff), + gsSPLightColor(LIGHT_2, 0x172747ff), gsSPVertex(inside_castle_seg7_vertex_0704CB98, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), - gsSPLight(&inside_castle_seg7_lights_0704C910.l, 1), - gsSPLight(&inside_castle_seg7_lights_0704C910.a, 2), + gsSPLightColor(LIGHT_1, 0x1f5fdfff), + gsSPLightColor(LIGHT_2, 0xb2353ff), gsSPVertex(inside_castle_seg7_vertex_0704CC18, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), - gsSPLight(&inside_castle_seg7_lights_0704C928.l, 1), - gsSPLight(&inside_castle_seg7_lights_0704C928.a, 2), + gsSPLightColor(LIGHT_1, 0x55ffff), + gsSPLightColor(LIGHT_2, 0x1f5fff), gsSPVertex(inside_castle_seg7_vertex_0704CC98, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), - gsSPLight(&inside_castle_seg7_lights_0704C940.l, 1), - gsSPLight(&inside_castle_seg7_lights_0704C940.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x5f5f5fff), gsSPVertex(inside_castle_seg7_vertex_0704CCD8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 3, 7, 6, 0x0), @@ -1117,8 +1073,8 @@ static const Gfx inside_castle_seg7_dl_0704FB98[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_09003000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_0704C958.l, 1), - gsSPLight(&inside_castle_seg7_lights_0704C958.a, 2), + gsSPLightColor(LIGHT_1, 0xccccccff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(inside_castle_seg7_vertex_0704CEC8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -1133,8 +1089,8 @@ static const Gfx inside_castle_seg7_dl_0704FB98[] = { gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), gsSP2Triangles( 8, 9, 10, 0x0, 8, 11, 9, 0x0), - gsSPLight(&inside_castle_seg7_lights_0704C940.l, 1), - gsSPLight(&inside_castle_seg7_lights_0704C940.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x5f5f5fff), gsSPVertex(inside_castle_seg7_vertex_0704D168, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), @@ -1335,19 +1291,19 @@ static const Gfx inside_castle_seg7_dl_07050308[] = { gsSPVertex(inside_castle_seg7_vertex_0704E848, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), - gsSPLight(&inside_castle_seg7_lights_0704C970.l, 1), - gsSPLight(&inside_castle_seg7_lights_0704C970.a, 2), + gsSPLightColor(LIGHT_1, 0x351a00ff), + gsSPLightColor(LIGHT_2, 0x130900ff), gsSPVertex(inside_castle_seg7_vertex_0704E8C8, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), gsSP2Triangles( 8, 9, 10, 0x0, 8, 10, 11, 0x0), - gsSPLight(&inside_castle_seg7_lights_0704C988.l, 1), - gsSPLight(&inside_castle_seg7_lights_0704C988.a, 2), + gsSPLightColor(LIGHT_1, 0x432100ff), + gsSPLightColor(LIGHT_2, 0x190c00ff), gsSPVertex(inside_castle_seg7_vertex_0704E988, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 0, 0x0), gsSP2Triangles( 0, 2, 3, 0x0, 3, 5, 4, 0x0), - gsSPLight(&inside_castle_seg7_lights_0704C9A0.l, 1), - gsSPLight(&inside_castle_seg7_lights_0704C9A0.a, 2), + gsSPLightColor(LIGHT_1, 0x783c00ff), + gsSPLightColor(LIGHT_2, 0x2d1600ff), gsSPVertex(inside_castle_seg7_vertex_0704E9E8, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -1373,8 +1329,8 @@ static const Gfx inside_castle_seg7_dl_070505D0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_09002000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_0704C940.l, 1), - gsSPLight(&inside_castle_seg7_lights_0704C940.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x5f5f5fff), gsSPVertex(inside_castle_seg7_vertex_0704ED28, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 7, 8, 9, 0x0), diff --git a/levels/castle_inside/areas/2/pendulum/model.inc.c b/levels/castle_inside/areas/2/pendulum/model.inc.c index 6bcaf0b6..e0359d4d 100644 --- a/levels/castle_inside/areas/2/pendulum/model.inc.c +++ b/levels/castle_inside/areas/2/pendulum/model.inc.c @@ -1,14 +1,6 @@ // 0x07050A78 - 0x07050A90 -static const Lights1 inside_castle_seg7_lights_07050A78 = gdSPDefLights1( - 0x40, 0x2f, 0x1e, - 0xac, 0x7f, 0x52, 0x28, 0x28, 0x28 -); // 0x07050A90 - 0x07050AA8 -static const Lights1 inside_castle_seg7_lights_07050A90 = gdSPDefLights1( - 0x40, 0x3a, 0x1e, - 0xac, 0x9d, 0x52, 0x28, 0x28, 0x28 -); // 0x07050AA8 - 0x07050B68 static const Vtx inside_castle_seg7_vertex_07050AA8[] = { @@ -145,8 +137,8 @@ static const Gfx inside_castle_seg7_dl_07051108[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_09007000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_07050A78.l, 1), - gsSPLight(&inside_castle_seg7_lights_07050A78.a, 2), + gsSPLightColor(LIGHT_1, 0xac7f52ff), + gsSPLightColor(LIGHT_2, 0x402f1eff), gsSPVertex(inside_castle_seg7_vertex_07050AA8, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), @@ -156,8 +148,8 @@ static const Gfx inside_castle_seg7_dl_07051108[] = { // 0x07051170 - 0x070512F8 static const Gfx inside_castle_seg7_dl_07051170[] = { - gsSPLight(&inside_castle_seg7_lights_07050A90.l, 1), - gsSPLight(&inside_castle_seg7_lights_07050A90.a, 2), + gsSPLightColor(LIGHT_1, 0xac9d52ff), + gsSPLightColor(LIGHT_2, 0x403a1eff), gsSPVertex(inside_castle_seg7_vertex_07050B68, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 0, 6, 7, 0x0, 0, 2, 8, 0x0), diff --git a/levels/castle_inside/areas/3/1/model.inc.c b/levels/castle_inside/areas/3/1/model.inc.c index 2210f407..64983e71 100644 --- a/levels/castle_inside/areas/3/1/model.inc.c +++ b/levels/castle_inside/areas/3/1/model.inc.c @@ -1,50 +1,18 @@ // 0x07059200 - 0x07059218 -static const Lights1 inside_castle_seg7_lights_07059200 = gdSPDefLights1( - 0x33, 0x33, 0x33, - 0x88, 0x88, 0x88, 0x28, 0x28, 0x28 -); // 0x07059218 - 0x07059230 -static const Lights1 inside_castle_seg7_lights_07059218 = gdSPDefLights1( - 0x39, 0x39, 0x39, - 0x99, 0x99, 0x99, 0x28, 0x28, 0x28 -); // 0x07059230 - 0x07059248 -static const Lights1 inside_castle_seg7_lights_07059230 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xaa, 0xaa, 0xaa, 0x28, 0x28, 0x28 -); // 0x07059248 - 0x07059260 -static const Lights1 inside_castle_seg7_lights_07059248 = gdSPDefLights1( - 0x46, 0x46, 0x46, - 0xbb, 0xbb, 0xbb, 0x28, 0x28, 0x28 -); // 0x07059260 - 0x07059278 -static const Lights1 inside_castle_seg7_lights_07059260 = gdSPDefLights1( - 0x4c, 0x4c, 0x4c, - 0xcc, 0xcc, 0xcc, 0x28, 0x28, 0x28 -); // 0x07059278 - 0x07059290 -static const Lights1 inside_castle_seg7_lights_07059278 = gdSPDefLights1( - 0x52, 0x52, 0x52, - 0xdd, 0xdd, 0xdd, 0x28, 0x28, 0x28 -); // 0x07059290 - 0x070592A8 -static const Lights1 inside_castle_seg7_lights_07059290 = gdSPDefLights1( - 0x59, 0x59, 0x59, - 0xee, 0xee, 0xee, 0x28, 0x28, 0x28 -); // 0x070592A8 - 0x070592C0 -static const Lights1 inside_castle_seg7_lights_070592A8 = gdSPDefLights1( - 0x5f, 0x5f, 0x5f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x070592C0 - 0x07059340 static const Vtx inside_castle_seg7_vertex_070592C0[] = { @@ -1293,37 +1261,37 @@ static const Gfx inside_castle_seg7_dl_0705CEA0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_0900B000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_07059200.l, 1), - gsSPLight(&inside_castle_seg7_lights_07059200.a, 2), + gsSPLightColor(LIGHT_1, 0x888888ff), + gsSPLightColor(LIGHT_2, 0x333333ff), gsSPVertex(inside_castle_seg7_vertex_070592C0, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), - gsSPLight(&inside_castle_seg7_lights_07059218.l, 1), - gsSPLight(&inside_castle_seg7_lights_07059218.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x393939ff), gsSPVertex(inside_castle_seg7_vertex_07059340, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), - gsSPLight(&inside_castle_seg7_lights_07059230.l, 1), - gsSPLight(&inside_castle_seg7_lights_07059230.a, 2), + gsSPLightColor(LIGHT_1, 0xaaaaaaff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(inside_castle_seg7_vertex_07059380, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), - gsSPLight(&inside_castle_seg7_lights_07059248.l, 1), - gsSPLight(&inside_castle_seg7_lights_07059248.a, 2), + gsSPLightColor(LIGHT_1, 0xbbbbbbff), + gsSPLightColor(LIGHT_2, 0x464646ff), gsSPVertex(inside_castle_seg7_vertex_070593C0, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - gsSPLight(&inside_castle_seg7_lights_07059260.l, 1), - gsSPLight(&inside_castle_seg7_lights_07059260.a, 2), + gsSPLightColor(LIGHT_1, 0xccccccff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(inside_castle_seg7_vertex_07059400, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), - gsSPLight(&inside_castle_seg7_lights_07059278.l, 1), - gsSPLight(&inside_castle_seg7_lights_07059278.a, 2), + gsSPLightColor(LIGHT_1, 0xddddddff), + gsSPLightColor(LIGHT_2, 0x525252ff), gsSPVertex(inside_castle_seg7_vertex_07059440, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - gsSPLight(&inside_castle_seg7_lights_07059290.l, 1), - gsSPLight(&inside_castle_seg7_lights_07059290.a, 2), + gsSPLightColor(LIGHT_1, 0xeeeeeeff), + gsSPLightColor(LIGHT_2, 0x595959ff), gsSPVertex(inside_castle_seg7_vertex_07059480, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), - gsSPLight(&inside_castle_seg7_lights_070592A8.l, 1), - gsSPLight(&inside_castle_seg7_lights_070592A8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x5f5f5fff), gsSPVertex(inside_castle_seg7_vertex_070594C0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), @@ -1344,8 +1312,8 @@ static const Gfx inside_castle_seg7_dl_0705D098[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_09005000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_07059248.l, 1), - gsSPLight(&inside_castle_seg7_lights_07059248.a, 2), + gsSPLightColor(LIGHT_1, 0xbbbbbbff), + gsSPLightColor(LIGHT_2, 0x464646ff), gsSPVertex(inside_castle_seg7_vertex_070596F0, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -1384,8 +1352,8 @@ static const Gfx inside_castle_seg7_dl_0705D098[] = { gsSPVertex(inside_castle_seg7_vertex_07059D80, 7, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP1Triangle( 0, 6, 1, 0x0), - gsSPLight(&inside_castle_seg7_lights_070592A8.l, 1), - gsSPLight(&inside_castle_seg7_lights_070592A8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x5f5f5fff), gsSPVertex(inside_castle_seg7_vertex_07059DF0, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), diff --git a/levels/castle_inside/areas/3/10/model.inc.c b/levels/castle_inside/areas/3/10/model.inc.c index c8baf2e7..0b730eb1 100644 --- a/levels/castle_inside/areas/3/10/model.inc.c +++ b/levels/castle_inside/areas/3/10/model.inc.c @@ -1,8 +1,4 @@ // 0x07066F00 - 0x07066F18 -static const Lights1 inside_castle_seg7_lights_07066F00 = gdSPDefLights1( - 0x5f, 0x5f, 0x5f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07066F18 - 0x07066F58 static const Vtx inside_castle_seg7_vertex_07066F18[] = { @@ -17,8 +13,8 @@ static const Gfx inside_castle_seg7_dl_07066F58[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_castle_seg7_texture_07003000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_07066F00.l, 1), - gsSPLight(&inside_castle_seg7_lights_07066F00.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x5f5f5fff), gsSPVertex(inside_castle_seg7_vertex_07066F18, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), diff --git a/levels/castle_inside/areas/3/11/model.inc.c b/levels/castle_inside/areas/3/11/model.inc.c index 7404b60f..d358a2ae 100644 --- a/levels/castle_inside/areas/3/11/model.inc.c +++ b/levels/castle_inside/areas/3/11/model.inc.c @@ -1,26 +1,10 @@ // 0x07067010 - 0x07067028 -static const Lights1 inside_castle_seg7_lights_07067010 = gdSPDefLights1( - 0x39, 0x39, 0x39, - 0x99, 0x99, 0x99, 0x28, 0x28, 0x28 -); // 0x07067028 - 0x07067040 -static const Lights1 inside_castle_seg7_lights_07067028 = gdSPDefLights1( - 0x5f, 0x5f, 0x5f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07067040 - 0x07067058 -static const Lights1 inside_castle_seg7_lights_07067040 = gdSPDefLights1( - 0x4c, 0x42, 0x38, - 0xcd, 0xb2, 0x97, 0x28, 0x28, 0x28 -); // 0x07067058 - 0x07067070 -static const Lights1 inside_castle_seg7_lights_07067058 = gdSPDefLights1( - 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x07067070 - 0x070670F0 static const Vtx inside_castle_seg7_vertex_07067070[] = { @@ -393,8 +377,8 @@ static const Gfx inside_castle_seg7_dl_07068210[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_0900B000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_07067010.l, 1), - gsSPLight(&inside_castle_seg7_lights_07067010.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x393939ff), gsSPVertex(inside_castle_seg7_vertex_07067070, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 4, 0x0), gsSP2Triangles( 2, 1, 3, 0x0, 0, 5, 1, 0x0), @@ -408,8 +392,8 @@ static const Gfx inside_castle_seg7_dl_07068288[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_09004000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_07067028.l, 1), - gsSPLight(&inside_castle_seg7_lights_07067028.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x5f5f5fff), gsSPVertex(inside_castle_seg7_vertex_070670F0, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 8, 0x0), @@ -471,8 +455,8 @@ static const Gfx inside_castle_seg7_dl_070684E8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_09007000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_07067040.l, 1), - gsSPLight(&inside_castle_seg7_lights_07067040.a, 2), + gsSPLightColor(LIGHT_1, 0xcdb297ff), + gsSPLightColor(LIGHT_2, 0x4c4238ff), gsSPVertex(inside_castle_seg7_vertex_070677B0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -528,8 +512,8 @@ static const Gfx inside_castle_seg7_dl_070687A8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_09009000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_07067028.l, 1), - gsSPLight(&inside_castle_seg7_lights_07067028.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x5f5f5fff), gsSPVertex(inside_castle_seg7_vertex_070680D0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), @@ -540,8 +524,8 @@ static const Gfx inside_castle_seg7_dl_070687A8[] = { // 0x07068820 - 0x07068850 static const Gfx inside_castle_seg7_dl_07068820[] = { - gsSPLight(&inside_castle_seg7_lights_07067058.l, 1), - gsSPLight(&inside_castle_seg7_lights_07067058.a, 2), + gsSPLightColor(LIGHT_1, 0xff), + gsSPLightColor(LIGHT_2, 0xff), gsSPVertex(inside_castle_seg7_vertex_070681D0, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSPEndDisplayList(), diff --git a/levels/castle_inside/areas/3/3/model.inc.c b/levels/castle_inside/areas/3/3/model.inc.c index 9461fcac..ec39c3e0 100644 --- a/levels/castle_inside/areas/3/3/model.inc.c +++ b/levels/castle_inside/areas/3/3/model.inc.c @@ -1,8 +1,4 @@ // 0x0705E310 - 0x0705E328 -static const Lights1 inside_castle_seg7_lights_0705E310 = gdSPDefLights1( - 0x00, 0x5f, 0x5f, - 0x00, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0705E328 - 0x0705E3E8 static const Vtx inside_castle_seg7_vertex_0705E328[] = { @@ -25,8 +21,8 @@ static const Gfx inside_castle_seg7_dl_0705E3E8[] = { gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, texture_castle_light), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_0705E310.l, 1), - gsSPLight(&inside_castle_seg7_lights_0705E310.a, 2), + gsSPLightColor(LIGHT_1, 0xffffff), + gsSPLightColor(LIGHT_2, 0x5f5fff), gsSPVertex(inside_castle_seg7_vertex_0705E328, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), diff --git a/levels/castle_inside/areas/3/4/model.inc.c b/levels/castle_inside/areas/3/4/model.inc.c index 8dc3f3e2..b6d2a6c4 100644 --- a/levels/castle_inside/areas/3/4/model.inc.c +++ b/levels/castle_inside/areas/3/4/model.inc.c @@ -1,32 +1,12 @@ // 0x0705E4C0 - 0x0705E4D8 -static const Lights1 inside_castle_seg7_lights_0705E4C0 = gdSPDefLights1( - 0x1e, 0x35, 0x40, - 0x52, 0x8e, 0xac, 0x28, 0x28, 0x28 -); // 0x0705E4D8 - 0x0705E4F0 -static const Lights1 inside_castle_seg7_lights_0705E4D8 = gdSPDefLights1( - 0x5f, 0x5f, 0x5f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0705E4F0 - 0x0705E508 -static const Lights1 inside_castle_seg7_lights_0705E4F0 = gdSPDefLights1( - 0x26, 0x26, 0x26, - 0x66, 0x66, 0x66, 0x28, 0x28, 0x28 -); // 0x0705E508 - 0x0705E520 -static const Lights1 inside_castle_seg7_lights_0705E508 = gdSPDefLights1( - 0x33, 0x33, 0x33, - 0x88, 0x88, 0x88, 0x28, 0x28, 0x28 -); // 0x0705E520 - 0x0705E538 -static const Lights1 inside_castle_seg7_lights_0705E520 = gdSPDefLights1( - 0x38, 0x4c, 0x3c, - 0x97, 0xcd, 0xa0, 0x28, 0x28, 0x28 -); // 0x0705E538 - 0x0705E628 static const Vtx inside_castle_seg7_vertex_0705E538[] = { @@ -815,8 +795,8 @@ static const Gfx inside_castle_seg7_dl_07060B58[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_09003000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_0705E4C0.l, 1), - gsSPLight(&inside_castle_seg7_lights_0705E4C0.a, 2), + gsSPLightColor(LIGHT_1, 0x528eacff), + gsSPLightColor(LIGHT_2, 0x1e3540ff), gsSPVertex(inside_castle_seg7_vertex_0705E538, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -829,8 +809,8 @@ static const Gfx inside_castle_seg7_dl_07060B58[] = { gsSPVertex(inside_castle_seg7_vertex_0705E728, 9, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP1Triangle( 6, 7, 8, 0x0), - gsSPLight(&inside_castle_seg7_lights_0705E4D8.l, 1), - gsSPLight(&inside_castle_seg7_lights_0705E4D8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x5f5f5fff), gsSPVertex(inside_castle_seg7_vertex_0705E7B8, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -843,12 +823,12 @@ static const Gfx inside_castle_seg7_dl_07060C68[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_0900B000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_0705E4F0.l, 1), - gsSPLight(&inside_castle_seg7_lights_0705E4F0.a, 2), + gsSPLightColor(LIGHT_1, 0x666666ff), + gsSPLightColor(LIGHT_2, 0x262626ff), gsSPVertex(inside_castle_seg7_vertex_0705E878, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), - gsSPLight(&inside_castle_seg7_lights_0705E508.l, 1), - gsSPLight(&inside_castle_seg7_lights_0705E508.a, 2), + gsSPLightColor(LIGHT_1, 0x888888ff), + gsSPLightColor(LIGHT_2, 0x333333ff), gsSPVertex(inside_castle_seg7_vertex_0705E8B8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), @@ -888,8 +868,8 @@ static const Gfx inside_castle_seg7_dl_07060E70[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_09004000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_0705E4D8.l, 1), - gsSPLight(&inside_castle_seg7_lights_0705E4D8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x5f5f5fff), gsSPVertex(inside_castle_seg7_vertex_0705EE68, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), @@ -904,8 +884,8 @@ static const Gfx inside_castle_seg7_dl_07060EF8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_09007000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_0705E520.l, 1), - gsSPLight(&inside_castle_seg7_lights_0705E520.a, 2), + gsSPLightColor(LIGHT_1, 0x97cda0ff), + gsSPLightColor(LIGHT_2, 0x384c3cff), gsSPVertex(inside_castle_seg7_vertex_0705EF68, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), @@ -959,12 +939,12 @@ static const Gfx inside_castle_seg7_dl_07061188[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_09009000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_0705E508.l, 1), - gsSPLight(&inside_castle_seg7_lights_0705E508.a, 2), + gsSPLightColor(LIGHT_1, 0x888888ff), + gsSPLightColor(LIGHT_2, 0x333333ff), gsSPVertex(inside_castle_seg7_vertex_0705F888, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - gsSPLight(&inside_castle_seg7_lights_0705E4D8.l, 1), - gsSPLight(&inside_castle_seg7_lights_0705E4D8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x5f5f5fff), gsSPVertex(inside_castle_seg7_vertex_0705F8C8, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), diff --git a/levels/castle_inside/areas/3/6/model.inc.c b/levels/castle_inside/areas/3/6/model.inc.c index 469f5fcb..c82d7531 100644 --- a/levels/castle_inside/areas/3/6/model.inc.c +++ b/levels/castle_inside/areas/3/6/model.inc.c @@ -1,20 +1,8 @@ // 0x07061C90 - 0x07061CA8 -static const Lights1 inside_castle_seg7_lights_07061C90 = gdSPDefLights1( - 0x5f, 0x5f, 0x5f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07061CA8 - 0x07061CC0 -static const Lights1 inside_castle_seg7_lights_07061CA8 = gdSPDefLights1( - 0x52, 0x52, 0x52, - 0xdd, 0xdd, 0xdd, 0x28, 0x28, 0x28 -); // 0x07061CC0 - 0x07061CD8 -static const Lights1 inside_castle_seg7_lights_07061CC0 = gdSPDefLights1( - 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x07061CD8 - 0x07061DC8 static const Vtx inside_castle_seg7_vertex_07061CD8[] = { @@ -755,8 +743,8 @@ static const Gfx inside_castle_seg7_dl_07064078[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_09004000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_07061C90.l, 1), - gsSPLight(&inside_castle_seg7_lights_07061C90.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x5f5f5fff), gsSPVertex(inside_castle_seg7_vertex_07061CD8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), @@ -873,8 +861,8 @@ static const Gfx inside_castle_seg7_dl_07064618[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_09007000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_07061CA8.l, 1), - gsSPLight(&inside_castle_seg7_lights_07061CA8.a, 2), + gsSPLightColor(LIGHT_1, 0xddddddff), + gsSPLightColor(LIGHT_2, 0x525252ff), gsSPVertex(inside_castle_seg7_vertex_07062ED8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), @@ -887,8 +875,8 @@ static const Gfx inside_castle_seg7_dl_07064618[] = { gsSP1Triangle( 0, 14, 1, 0x0), gsSPVertex(inside_castle_seg7_vertex_070630B8, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - gsSPLight(&inside_castle_seg7_lights_07061C90.l, 1), - gsSPLight(&inside_castle_seg7_lights_07061C90.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x5f5f5fff), gsSPVertex(inside_castle_seg7_vertex_070630F8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), @@ -986,8 +974,8 @@ static const Gfx inside_castle_seg7_dl_07064A88[] = { // 0x07064B28 - 0x07064B78 static const Gfx inside_castle_seg7_dl_07064B28[] = { - gsSPLight(&inside_castle_seg7_lights_07061CC0.l, 1), - gsSPLight(&inside_castle_seg7_lights_07061CC0.a, 2), + gsSPLightColor(LIGHT_1, 0xff), + gsSPLightColor(LIGHT_2, 0xff), gsSPVertex(inside_castle_seg7_vertex_07063FF8, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 4, 0x0), gsSP2Triangles( 0, 5, 3, 0x0, 0, 4, 6, 0x0), diff --git a/levels/castle_inside/areas/3/8/model.inc.c b/levels/castle_inside/areas/3/8/model.inc.c index e74bc5d0..2085f286 100644 --- a/levels/castle_inside/areas/3/8/model.inc.c +++ b/levels/castle_inside/areas/3/8/model.inc.c @@ -1,8 +1,4 @@ // 0x07064DC8 - 0x07064DE0 -static const Lights1 inside_castle_seg7_lights_07064DC8 = gdSPDefLights1( - 0x5f, 0x5f, 0x5f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07064DE0 - 0x07064EE0 static const Vtx inside_castle_seg7_vertex_07064DE0[] = { @@ -489,8 +485,8 @@ static const Gfx inside_castle_seg7_dl_07066560[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_0900B000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_07064DC8.l, 1), - gsSPLight(&inside_castle_seg7_lights_07064DC8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x5f5f5fff), gsSPVertex(inside_castle_seg7_vertex_07064DE0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 5, 4, 0x0), diff --git a/levels/castle_inside/clock_hour_hand/model.inc.c b/levels/castle_inside/clock_hour_hand/model.inc.c index d812d9b4..10a0db48 100644 --- a/levels/castle_inside/clock_hour_hand/model.inc.c +++ b/levels/castle_inside/clock_hour_hand/model.inc.c @@ -1,14 +1,6 @@ // 0x070589C0 - 0x070589D8 -static const Lights1 inside_castle_seg7_lights_070589C0 = gdSPDefLights1( - 0x3f, 0x33, 0x19, - 0xff, 0xcc, 0x65, 0x28, 0x28, 0x28 -); // 0x070589D8 - 0x070589F0 -static const Lights1 inside_castle_seg7_lights_070589D8 = gdSPDefLights1( - 0x3f, 0x00, 0x00, - 0xff, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x070589F0 - 0x07058AF0 static const Vtx inside_castle_seg7_vertex_070589F0[] = { @@ -136,8 +128,8 @@ static const Gfx inside_castle_seg7_dl_07058FC0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_09004800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_070589C0.l, 1), - gsSPLight(&inside_castle_seg7_lights_070589C0.a, 2), + gsSPLightColor(LIGHT_1, 0xffcc65ff), + gsSPLightColor(LIGHT_2, 0x3f3319ff), gsSPVertex(inside_castle_seg7_vertex_070589F0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 5, 6, 7, 0x0, 5, 4, 6, 0x0), @@ -159,8 +151,8 @@ static const Gfx inside_castle_seg7_dl_07058FC0[] = { gsSPVertex(inside_castle_seg7_vertex_07058DB0, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 0, 6, 1, 0x0, 7, 8, 9, 0x0), - gsSPLight(&inside_castle_seg7_lights_070589D8.l, 1), - gsSPLight(&inside_castle_seg7_lights_070589D8.a, 2), + gsSPLightColor(LIGHT_1, 0xff0000ff), + gsSPLightColor(LIGHT_2, 0x3f0000ff), gsSPVertex(inside_castle_seg7_vertex_07058E50, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 5, 6, 3, 0x0, 3, 7, 4, 0x0), diff --git a/levels/castle_inside/clock_minute_hand/model.inc.c b/levels/castle_inside/clock_minute_hand/model.inc.c index b9cb7ee2..db056043 100644 --- a/levels/castle_inside/clock_minute_hand/model.inc.c +++ b/levels/castle_inside/clock_minute_hand/model.inc.c @@ -1,14 +1,6 @@ // 0x07057FD8 - 0x07057FF0 -static const Lights1 inside_castle_seg7_lights_07057FD8 = gdSPDefLights1( - 0x3f, 0x33, 0x19, - 0xff, 0xcc, 0x65, 0x28, 0x28, 0x28 -); // 0x07057FF0 - 0x07058008 -static const Lights1 inside_castle_seg7_lights_07057FF0 = gdSPDefLights1( - 0x3f, 0x00, 0x00, - 0xff, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x07058008 - 0x07058108 static const Vtx inside_castle_seg7_vertex_07058008[] = { @@ -160,8 +152,8 @@ static const Gfx inside_castle_seg7_dl_07058718[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_09004800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_07057FD8.l, 1), - gsSPLight(&inside_castle_seg7_lights_07057FD8.a, 2), + gsSPLightColor(LIGHT_1, 0xffcc65ff), + gsSPLightColor(LIGHT_2, 0x3f3319ff), gsSPVertex(inside_castle_seg7_vertex_07058008, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 4, 0x0, 6, 4, 3, 0x0), @@ -191,8 +183,8 @@ static const Gfx inside_castle_seg7_dl_07058718[] = { gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), gsSP2Triangles( 0, 10, 1, 0x0, 7, 11, 8, 0x0), - gsSPLight(&inside_castle_seg7_lights_07057FF0.l, 1), - gsSPLight(&inside_castle_seg7_lights_07057FF0.a, 2), + gsSPLightColor(LIGHT_1, 0xff0000ff), + gsSPLightColor(LIGHT_2, 0x3f0000ff), gsSPVertex(inside_castle_seg7_vertex_070585A8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), diff --git a/levels/castle_inside/painting.inc.c b/levels/castle_inside/painting.inc.c index d668820f..a428f2a9 100644 --- a/levels/castle_inside/painting.inc.c +++ b/levels/castle_inside/painting.inc.c @@ -1,10 +1,6 @@ #include "game/paintings.h" // 0x07021800 - 0x07021818 -static const Lights1 inside_castle_seg7_lights_07021800 = gdSPDefLights1( - 0x50, 0x50, 0x50, - 0xff, 0xff, 0xff, 0x32, 0x32, 0x32 -); // 0x07021818 - 0x07021898 static const Vtx inside_castle_seg7_vertex_07021818[] = { @@ -71,8 +67,8 @@ static const Gfx inside_castle_seg7_dl_07021A48[] = { gsDPPipeSync(), gsSPSetGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), gsDPSetCombineMode(G_CC_MODULATERGB, G_CC_MODULATERGB), - gsSPLight(&inside_castle_seg7_lights_07021800.l, 1), - gsSPLight(&inside_castle_seg7_lights_07021800.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x505050ff), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD), gsDPTileSync(), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_CLAMP, 6, G_TX_NOLOD), @@ -565,17 +561,8 @@ UNUSED static const u64 castle_inside_unused_0 = 0x0; // 0x07022528 - 0x07022540 -static const Lights1 inside_castle_seg7_lights_07022528 = gdSPDefLights1( - 0x50, 0x50, 0x50, - 0xff, 0xff, 0xff, 0x32, 0x32, 0x32 -); // 0x07022540 - 0x07022558 -// No gdSPDefLights1 macro defined because of odd different light value (0xff and 0xfa) -static const Lights1 inside_castle_seg7_lights_07022540 = { - {{ {0x40, 0x40, 0x80}, 0, {0x40, 0x40, 0x80}, 0} }, - {{{ {0x64, 0x64, 0xff}, 0, {0x64, 0x64, 0xfa}, 0, {0x28, 0x28, 0x28},0} }} -}; // 0x07022558 - 0x07022598 static const Vtx inside_castle_seg7_vertex_07022558[] = { @@ -598,8 +585,8 @@ static const Vtx inside_castle_seg7_vertex_07022598[] = { const Gfx inside_castle_seg7_dl_070225D8[] = { gsDPPipeSync(), gsDPSetCombineMode(G_CC_MODULATERGB, G_CC_MODULATERGB), - gsSPLight(&inside_castle_seg7_lights_07022528.l, 1), - gsSPLight(&inside_castle_seg7_lights_07022528.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x505050ff), gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), gsSPVertex(inside_castle_seg7_vertex_07022558, 4, 0), gsSPEndDisplayList(), @@ -1287,8 +1274,8 @@ const Gfx inside_castle_seg7_dl_07023520[] = { // 0x07023580 - 0x070235B8 static const Gfx inside_castle_seg7_painting_dl_07023580[] = { gsDPPipeSync(), - gsSPLight(&inside_castle_seg7_lights_07022540.l, 1), - gsSPLight(&inside_castle_seg7_lights_07022540.a, 2), + gsSPLightColor(LIGHT_1, 0x6464ffff), + gsSPLightColor(LIGHT_2, 0x404080ff), gsSPVertex(inside_castle_seg7_vertex_07022598, 4, 0), gsSP1Triangle( 0, 1, 2, 0x0), gsSP1Triangle( 0, 2, 3, 0x0), diff --git a/levels/castle_inside/star_door/model.inc.c b/levels/castle_inside/star_door/model.inc.c index 4a74aad1..07c4b3fa 100644 --- a/levels/castle_inside/star_door/model.inc.c +++ b/levels/castle_inside/star_door/model.inc.c @@ -1,8 +1,4 @@ // 0x0703BD28 - 0x0703BD40 -static const Lights1 inside_castle_seg7_lights_0703BD28 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0703BD40 - 0x0703BE40 static const Vtx inside_castle_seg7_vertex_0703BD40[] = { @@ -45,8 +41,8 @@ static const Gfx inside_castle_seg7_dl_0703BEC0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_castle_seg7_texture_07005800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_0703BD28.l, 1), - gsSPLight(&inside_castle_seg7_lights_0703BD28.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(inside_castle_seg7_vertex_0703BD40, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), diff --git a/levels/castle_inside/trap_door/model.inc.c b/levels/castle_inside/trap_door/model.inc.c index 8a6ad8fc..4740d20e 100644 --- a/levels/castle_inside/trap_door/model.inc.c +++ b/levels/castle_inside/trap_door/model.inc.c @@ -1,8 +1,4 @@ // 0x0703BAB0 - 0x0703BAC8 -static const Lights1 inside_castle_seg7_lights_0703BAB0 = gdSPDefLights1( - 0x5f, 0x5f, 0x5f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0703BAC8 - 0x0703BBB8 static const Vtx inside_castle_seg7_vertex_0703BAC8[] = { @@ -39,8 +35,8 @@ static const Gfx inside_castle_seg7_dl_0703BC28[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_09005000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_0703BAB0.l, 1), - gsSPLight(&inside_castle_seg7_lights_0703BAB0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x5f5f5fff), gsSPVertex(inside_castle_seg7_vertex_0703BAC8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), diff --git a/levels/castle_inside/water_level_pillar/model.inc.c b/levels/castle_inside/water_level_pillar/model.inc.c index 3c5203db..30012e02 100644 --- a/levels/castle_inside/water_level_pillar/model.inc.c +++ b/levels/castle_inside/water_level_pillar/model.inc.c @@ -1,8 +1,4 @@ // 0x07068908 - 0x07068920 -static const Lights1 inside_castle_seg7_lights_07068908 = gdSPDefLights1( - 0x5f, 0x5f, 0x5f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07068920 - 0x07068960 static const Vtx inside_castle_seg7_vertex_07068920[] = { @@ -37,8 +33,8 @@ static const Gfx inside_castle_seg7_dl_07068A60[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_0900B000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&inside_castle_seg7_lights_07068908.l, 1), - gsSPLight(&inside_castle_seg7_lights_07068908.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x5f5f5fff), gsSPVertex(inside_castle_seg7_vertex_07068920, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), diff --git a/levels/ccm/areas/1/1/model.inc.c b/levels/ccm/areas/1/1/model.inc.c index fb83ffcc..7d0981e1 100644 --- a/levels/ccm/areas/1/1/model.inc.c +++ b/levels/ccm/areas/1/1/model.inc.c @@ -1,26 +1,10 @@ // 0x07005300 - 0x07005318 -static const Lights1 ccm_seg7_lights_07005300 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07005318 - 0x07005330 -static const Lights1 ccm_seg7_lights_07005318 = gdSPDefLights1( - 0x4c, 0x4c, 0x4c, - 0x99, 0x99, 0x99, 0x28, 0x28, 0x28 -); // 0x07005330 - 0x07005348 -static const Lights1 ccm_seg7_lights_07005330 = gdSPDefLights1( - 0x5d, 0x5d, 0x5d, - 0xbb, 0xbb, 0xbb, 0x28, 0x28, 0x28 -); // 0x07005348 - 0x07005360 -static const Lights1 ccm_seg7_lights_07005348 = gdSPDefLights1( - 0x33, 0x33, 0x33, - 0x66, 0x66, 0x66, 0x28, 0x28, 0x28 -); // 0x07005360 - 0x07005460 static const Vtx ccm_seg7_vertex_07005360[] = { @@ -1435,8 +1419,8 @@ static const Gfx ccm_seg7_dl_07009820[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, snow_09008800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ccm_seg7_lights_07005300.l, 1), - gsSPLight(&ccm_seg7_lights_07005300.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ccm_seg7_vertex_07005360, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 3, 7, 6, 0x0), @@ -1534,8 +1518,8 @@ static const Gfx ccm_seg7_dl_07009820[] = { gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 2, 0x0), gsSP2Triangles( 5, 6, 7, 0x0, 6, 5, 8, 0x0), gsSP2Triangles( 4, 5, 7, 0x0, 8, 3, 2, 0x0), - gsSPLight(&ccm_seg7_lights_07005318.l, 1), - gsSPLight(&ccm_seg7_lights_07005318.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(ccm_seg7_vertex_07006250, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 0, 4, 5, 0x0, 0, 3, 4, 0x0), @@ -1547,8 +1531,8 @@ static const Gfx ccm_seg7_dl_07009DD0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, snow_09006000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ccm_seg7_lights_07005300.l, 1), - gsSPLight(&ccm_seg7_lights_07005300.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ccm_seg7_vertex_070062B0, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 6, 8, 9, 0x0), @@ -1558,8 +1542,8 @@ static const Gfx ccm_seg7_dl_07009DD0[] = { gsSPVertex(ccm_seg7_vertex_070063A0, 7, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP1Triangle( 4, 6, 5, 0x0), - gsSPLight(&ccm_seg7_lights_07005330.l, 1), - gsSPLight(&ccm_seg7_lights_07005330.a, 2), + gsSPLightColor(LIGHT_1, 0xbbbbbbff), + gsSPLightColor(LIGHT_2, 0x5d5d5dff), gsSPVertex(ccm_seg7_vertex_07006410, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 5, 0, 3, 0x0, 6, 7, 3, 0x0), @@ -1579,8 +1563,8 @@ static const Gfx ccm_seg7_dl_07009F28[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, snow_09002000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ccm_seg7_lights_07005300.l, 1), - gsSPLight(&ccm_seg7_lights_07005300.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ccm_seg7_vertex_070065B0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 0, 0x0), gsSP2Triangles( 4, 5, 0, 0x0, 2, 6, 0, 0x0), @@ -1614,8 +1598,8 @@ static const Gfx ccm_seg7_dl_07009F28[] = { gsSP2Triangles( 3, 5, 6, 0x0, 7, 5, 4, 0x0), gsSP2Triangles( 8, 9, 10, 0x0, 11, 8, 10, 0x0), gsSP1Triangle(12, 11, 10, 0x0), - gsSPLight(&ccm_seg7_lights_07005318.l, 1), - gsSPLight(&ccm_seg7_lights_07005318.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(ccm_seg7_vertex_07006B70, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 6, 3, 0x0), @@ -1627,8 +1611,8 @@ static const Gfx ccm_seg7_dl_07009F28[] = { gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), gsSP2Triangles(10, 11, 12, 0x0, 10, 8, 7, 0x0), gsSP2Triangles(10, 7, 11, 0x0, 10, 12, 13, 0x0), - gsSPLight(&ccm_seg7_lights_07005330.l, 1), - gsSPLight(&ccm_seg7_lights_07005330.a, 2), + gsSPLightColor(LIGHT_1, 0xbbbbbbff), + gsSPLightColor(LIGHT_2, 0x5d5d5dff), gsSPVertex(ccm_seg7_vertex_07006D50, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), @@ -1645,8 +1629,8 @@ static const Gfx ccm_seg7_dl_0700A248[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, snow_09003000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ccm_seg7_lights_07005300.l, 1), - gsSPLight(&ccm_seg7_lights_07005300.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ccm_seg7_vertex_07006F10, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 6, 5, 0x0, 7, 8, 9, 0x0), @@ -1752,8 +1736,8 @@ static const Gfx ccm_seg7_dl_0700A248[] = { gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), gsSP2Triangles( 8, 9, 10, 0x0, 11, 12, 8, 0x0), gsSP2Triangles(11, 8, 10, 0x0, 13, 14, 15, 0x0), - gsSPLight(&ccm_seg7_lights_07005348.l, 1), - gsSPLight(&ccm_seg7_lights_07005348.a, 2), + gsSPLightColor(LIGHT_1, 0x666666ff), + gsSPLightColor(LIGHT_2, 0x333333ff), gsSPVertex(ccm_seg7_vertex_07008130, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 0, 3, 0x0), gsSP2Triangles( 1, 3, 4, 0x0, 5, 1, 4, 0x0), @@ -1762,8 +1746,8 @@ static const Gfx ccm_seg7_dl_0700A248[] = { gsSP2Triangles(11, 12, 13, 0x0, 14, 7, 15, 0x0), gsSPVertex(ccm_seg7_vertex_07008230, 3, 0), gsSP1Triangle( 0, 1, 2, 0x0), - gsSPLight(&ccm_seg7_lights_07005318.l, 1), - gsSPLight(&ccm_seg7_lights_07005318.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(ccm_seg7_vertex_07008260, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 3, 6, 0x0, 7, 5, 8, 0x0), @@ -1790,8 +1774,8 @@ static const Gfx ccm_seg7_dl_0700A248[] = { gsSPVertex(ccm_seg7_vertex_07008630, 7, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP1Triangle( 3, 5, 6, 0x0), - gsSPLight(&ccm_seg7_lights_07005330.l, 1), - gsSPLight(&ccm_seg7_lights_07005330.a, 2), + gsSPLightColor(LIGHT_1, 0xbbbbbbff), + gsSPLightColor(LIGHT_2, 0x5d5d5dff), gsSPVertex(ccm_seg7_vertex_070086A0, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 6, 5, 0x0, 7, 8, 9, 0x0), @@ -1820,22 +1804,22 @@ static const Gfx ccm_seg7_dl_0700AB00[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, snow_09002800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ccm_seg7_lights_07005300.l, 1), - gsSPLight(&ccm_seg7_lights_07005300.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ccm_seg7_vertex_07008A20, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 6, 7, 8, 0x0), gsSP2Triangles( 6, 8, 3, 0x0, 8, 7, 9, 0x0), gsSP2Triangles(10, 0, 2, 0x0, 7, 11, 9, 0x0), gsSP2Triangles( 1, 12, 2, 0x0, 7, 13, 11, 0x0), - gsSPLight(&ccm_seg7_lights_07005318.l, 1), - gsSPLight(&ccm_seg7_lights_07005318.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(ccm_seg7_vertex_07008B00, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 5, 7, 0x0, 0, 6, 7, 0x0), gsSP1Triangle( 0, 2, 6, 0x0), - gsSPLight(&ccm_seg7_lights_07005330.l, 1), - gsSPLight(&ccm_seg7_lights_07005330.a, 2), + gsSPLightColor(LIGHT_1, 0xbbbbbbff), + gsSPLightColor(LIGHT_2, 0x5d5d5dff), gsSPVertex(ccm_seg7_vertex_07008B80, 7, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP1Triangle( 2, 6, 0, 0x0), @@ -1847,8 +1831,8 @@ static const Gfx ccm_seg7_dl_0700ABF8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, snow_09004800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ccm_seg7_lights_07005300.l, 1), - gsSPLight(&ccm_seg7_lights_07005300.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ccm_seg7_vertex_07008BF0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 2, 4, 3, 0x0), diff --git a/levels/ccm/areas/1/10/1.inc.c b/levels/ccm/areas/1/10/1.inc.c index c0f5bf67..74695837 100644 --- a/levels/ccm/areas/1/10/1.inc.c +++ b/levels/ccm/areas/1/10/1.inc.c @@ -1,20 +1,8 @@ // 0x0700FD88 - 0x0700FDA0 -static const Lights1 ccm_seg7_lights_0700FD88 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700FDA0 - 0x0700FDB8 -static const Lights1 ccm_seg7_lights_0700FDA0 = gdSPDefLights1( - 0x4c, 0x4c, 0x4c, - 0x99, 0x99, 0x99, 0x28, 0x28, 0x28 -); // 0x0700FDB8 - 0x0700FDD0 -static const Lights1 ccm_seg7_lights_0700FDB8 = gdSPDefLights1( - 0x5d, 0x5d, 0x5d, - 0xbb, 0xbb, 0xbb, 0x28, 0x28, 0x28 -); // 0x0700FDD0 - 0x0700FE10 static const Vtx ccm_seg7_vertex_0700FDD0[] = { @@ -153,20 +141,20 @@ static const Gfx ccm_seg7_dl_07010390[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, snow_09003000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ccm_seg7_lights_0700FD88.l, 1), - gsSPLight(&ccm_seg7_lights_0700FD88.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ccm_seg7_vertex_0700FDD0, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), - gsSPLight(&ccm_seg7_lights_0700FDA0.l, 1), - gsSPLight(&ccm_seg7_lights_0700FDA0.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(ccm_seg7_vertex_0700FE10, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), gsSP2Triangles( 7, 9, 10, 0x0, 11, 10, 2, 0x0), gsSP2Triangles( 2, 10, 0, 0x0, 12, 2, 13, 0x0), gsSP2Triangles(13, 2, 1, 0x0, 12, 11, 2, 0x0), - gsSPLight(&ccm_seg7_lights_0700FDB8.l, 1), - gsSPLight(&ccm_seg7_lights_0700FDB8.a, 2), + gsSPLightColor(LIGHT_1, 0xbbbbbbff), + gsSPLightColor(LIGHT_2, 0x5d5d5dff), gsSPVertex(ccm_seg7_vertex_0700FEF0, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 0, 4, 3, 0x0, 3, 1, 0, 0x0), @@ -179,12 +167,12 @@ static const Gfx ccm_seg7_dl_07010480[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, snow_09006000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ccm_seg7_lights_0700FDA0.l, 1), - gsSPLight(&ccm_seg7_lights_0700FDA0.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(ccm_seg7_vertex_0700FF70, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0), - gsSPLight(&ccm_seg7_lights_0700FDB8.l, 1), - gsSPLight(&ccm_seg7_lights_0700FDB8.a, 2), + gsSPLightColor(LIGHT_1, 0xbbbbbbff), + gsSPLightColor(LIGHT_2, 0x5d5d5dff), gsSPVertex(ccm_seg7_vertex_0700FFB0, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 6, 4, 7, 0x0), @@ -198,8 +186,8 @@ static const Gfx ccm_seg7_dl_07010518[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, snow_09002000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ccm_seg7_lights_0700FDA0.l, 1), - gsSPLight(&ccm_seg7_lights_0700FDA0.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(ccm_seg7_vertex_07010070, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 6, 7, 4, 0x0), @@ -207,8 +195,8 @@ static const Gfx ccm_seg7_dl_07010518[] = { gsSP1Triangle(12, 13, 14, 0x0), gsSPVertex(ccm_seg7_vertex_07010160, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 2, 1, 0x0), - gsSPLight(&ccm_seg7_lights_0700FDB8.l, 1), - gsSPLight(&ccm_seg7_lights_0700FDB8.a, 2), + gsSPLightColor(LIGHT_1, 0xbbbbbbff), + gsSPLightColor(LIGHT_2, 0x5d5d5dff), gsSPVertex(ccm_seg7_vertex_070101A0, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 5, 7, 6, 0x0), diff --git a/levels/ccm/areas/1/10/3.inc.c b/levels/ccm/areas/1/10/3.inc.c index 1b35549a..62dd4642 100644 --- a/levels/ccm/areas/1/10/3.inc.c +++ b/levels/ccm/areas/1/10/3.inc.c @@ -1,8 +1,4 @@ // 0x07010A60 - 0x07010A78 -static const Lights1 ccm_seg7_lights_07010A60 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07010A78 - 0x07010AF8 static const Vtx ccm_seg7_vertex_07010A78[] = { @@ -21,8 +17,8 @@ static const Gfx ccm_seg7_dl_07010AF8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, snow_09000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ccm_seg7_lights_07010A60.l, 1), - gsSPLight(&ccm_seg7_lights_07010A60.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ccm_seg7_vertex_07010A78, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), diff --git a/levels/ccm/areas/1/2/model.inc.c b/levels/ccm/areas/1/2/model.inc.c index f1650ec7..8e45f3e8 100644 --- a/levels/ccm/areas/1/2/model.inc.c +++ b/levels/ccm/areas/1/2/model.inc.c @@ -1,8 +1,4 @@ // 0x0700B118 - 0x0700B130 -static const Lights1 ccm_seg7_lights_0700B118 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700B130 - 0x0700B190 static const Vtx ccm_seg7_vertex_0700B130[] = { @@ -19,8 +15,8 @@ static const Gfx ccm_seg7_dl_0700B190[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, snow_09008000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ccm_seg7_lights_0700B118.l, 1), - gsSPLight(&ccm_seg7_lights_0700B118.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ccm_seg7_vertex_0700B130, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSPEndDisplayList(), diff --git a/levels/ccm/areas/1/3/model.inc.c b/levels/ccm/areas/1/3/model.inc.c index f827b153..2429f4ac 100644 --- a/levels/ccm/areas/1/3/model.inc.c +++ b/levels/ccm/areas/1/3/model.inc.c @@ -1,26 +1,10 @@ // 0x0700B248 - 0x0700B260 -static const Lights1 ccm_seg7_lights_0700B248 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700B260 - 0x0700B278 -static const Lights1 ccm_seg7_lights_0700B260 = gdSPDefLights1( - 0x4c, 0x4c, 0x4c, - 0x99, 0x99, 0x99, 0x28, 0x28, 0x28 -); // 0x0700B278 - 0x0700B290 -static const Lights1 ccm_seg7_lights_0700B278 = gdSPDefLights1( - 0x5d, 0x5d, 0x5d, - 0xbb, 0xbb, 0xbb, 0x28, 0x28, 0x28 -); // 0x0700B290 - 0x0700B2A8 -static const Lights1 ccm_seg7_lights_0700B290 = gdSPDefLights1( - 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x0700B2A8 - 0x0700B3A8 static const Vtx ccm_seg7_vertex_0700B2A8[] = { @@ -297,8 +281,8 @@ static const Gfx ccm_seg7_dl_0700BF88[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, ccm_seg7_texture_07000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 4 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ccm_seg7_lights_0700B248.l, 1), - gsSPLight(&ccm_seg7_lights_0700B248.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ccm_seg7_vertex_0700B2A8, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -339,16 +323,16 @@ static const Gfx ccm_seg7_dl_0700C000[] = { gsSPVertex(ccm_seg7_vertex_0700B988, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), - gsSPLight(&ccm_seg7_lights_0700B260.l, 1), - gsSPLight(&ccm_seg7_lights_0700B260.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(ccm_seg7_vertex_0700BA08, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 7, 9, 8, 0x0), gsSP2Triangles(10, 11, 12, 0x0, 13, 14, 15, 0x0), gsSPVertex(ccm_seg7_vertex_0700BB08, 3, 0), gsSP1Triangle( 0, 1, 2, 0x0), - gsSPLight(&ccm_seg7_lights_0700B278.l, 1), - gsSPLight(&ccm_seg7_lights_0700B278.a, 2), + gsSPLightColor(LIGHT_1, 0xbbbbbbff), + gsSPLightColor(LIGHT_2, 0x5d5d5dff), gsSPVertex(ccm_seg7_vertex_0700BB38, 5, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP1Triangle( 0, 4, 3, 0x0), @@ -360,8 +344,8 @@ static const Gfx ccm_seg7_dl_0700C220[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, snow_09001000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ccm_seg7_lights_0700B248.l, 1), - gsSPLight(&ccm_seg7_lights_0700B248.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ccm_seg7_vertex_0700BB88, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -385,8 +369,8 @@ static const Gfx ccm_seg7_dl_0700C220[] = { // 0x0700C330 - 0x0700C380 static const Gfx ccm_seg7_dl_0700C330[] = { - gsSPLight(&ccm_seg7_lights_0700B290.l, 1), - gsSPLight(&ccm_seg7_lights_0700B290.a, 2), + gsSPLightColor(LIGHT_1, 0xff), + gsSPLightColor(LIGHT_2, 0xff), gsSPVertex(ccm_seg7_vertex_0700BEC8, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), diff --git a/levels/ccm/areas/1/6/1.inc.c b/levels/ccm/areas/1/6/1.inc.c index 62a7d625..e6796835 100644 --- a/levels/ccm/areas/1/6/1.inc.c +++ b/levels/ccm/areas/1/6/1.inc.c @@ -1,26 +1,10 @@ // 0x0700DE68 - 0x0700DE80 -static const Lights1 ccm_seg7_lights_0700DE68 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700DE80 - 0x0700DE98 -static const Lights1 ccm_seg7_lights_0700DE80 = gdSPDefLights1( - 0x4c, 0x4c, 0x4c, - 0x99, 0x99, 0x99, 0x28, 0x28, 0x28 -); // 0x0700DE98 - 0x0700DEB0 -static const Lights1 ccm_seg7_lights_0700DE98 = gdSPDefLights1( - 0x5d, 0x5d, 0x5d, - 0xbb, 0xbb, 0xbb, 0x28, 0x28, 0x28 -); // 0x0700DEB0 - 0x0700DEC8 -static const Lights1 ccm_seg7_lights_0700DEB0 = gdSPDefLights1( - 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x0700DEC8 - 0x0700DF88 static const Vtx ccm_seg7_vertex_0700DEC8[] = { @@ -157,8 +141,8 @@ static const Gfx ccm_seg7_dl_0700E4A8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, snow_09008800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ccm_seg7_lights_0700DE68.l, 1), - gsSPLight(&ccm_seg7_lights_0700DE68.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ccm_seg7_vertex_0700DEC8, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 5, 7, 6, 0x0), @@ -177,8 +161,8 @@ static const Gfx ccm_seg7_dl_0700E530[] = { gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 6, 9, 7, 0x0), gsSP2Triangles(10, 11, 12, 0x0, 11, 13, 12, 0x0), - gsSPLight(&ccm_seg7_lights_0700DE80.l, 1), - gsSPLight(&ccm_seg7_lights_0700DE80.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(ccm_seg7_vertex_0700E068, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), @@ -189,8 +173,8 @@ static const Gfx ccm_seg7_dl_0700E530[] = { gsSP2Triangles(10, 11, 12, 0x0, 13, 14, 15, 0x0), gsSPVertex(ccm_seg7_vertex_0700E268, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), - gsSPLight(&ccm_seg7_lights_0700DE98.l, 1), - gsSPLight(&ccm_seg7_lights_0700DE98.a, 2), + gsSPLightColor(LIGHT_1, 0xbbbbbbff), + gsSPLightColor(LIGHT_2, 0x5d5d5dff), gsSPVertex(ccm_seg7_vertex_0700E2C8, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -203,8 +187,8 @@ static const Gfx ccm_seg7_dl_0700E668[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, snow_09008000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ccm_seg7_lights_0700DE68.l, 1), - gsSPLight(&ccm_seg7_lights_0700DE68.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ccm_seg7_vertex_0700E3A8, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), @@ -215,8 +199,8 @@ static const Gfx ccm_seg7_dl_0700E668[] = { static const Gfx ccm_seg7_dl_0700E6C0[] = { gsSPVertex(ccm_seg7_vertex_0700E428, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0), - gsSPLight(&ccm_seg7_lights_0700DEB0.l, 1), - gsSPLight(&ccm_seg7_lights_0700DEB0.a, 2), + gsSPLightColor(LIGHT_1, 0xff), + gsSPLightColor(LIGHT_2, 0xff), gsSPVertex(ccm_seg7_vertex_0700E468, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 2, 1, 0x0), gsSPEndDisplayList(), diff --git a/levels/ccm/areas/1/7/1.inc.c b/levels/ccm/areas/1/7/1.inc.c index 420bfd07..ea2b9daf 100644 --- a/levels/ccm/areas/1/7/1.inc.c +++ b/levels/ccm/areas/1/7/1.inc.c @@ -1,20 +1,8 @@ // 0x0700EA00 - 0x0700EA18 -static const Lights1 ccm_seg7_lights_0700EA00 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700EA18 - 0x0700EA30 -static const Lights1 ccm_seg7_lights_0700EA18 = gdSPDefLights1( - 0x33, 0x33, 0x33, - 0x66, 0x66, 0x66, 0x28, 0x28, 0x28 -); // 0x0700EA30 - 0x0700EA48 -static const Lights1 ccm_seg7_lights_0700EA30 = gdSPDefLights1( - 0x5d, 0x5d, 0x5d, - 0xbb, 0xbb, 0xbb, 0x28, 0x28, 0x28 -); // 0x0700EA48 - 0x0700EAE8 static const Vtx ccm_seg7_vertex_0700EA48[] = { @@ -180,8 +168,8 @@ static const Gfx ccm_seg7_dl_0700F1B8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, snow_09008800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ccm_seg7_lights_0700EA00.l, 1), - gsSPLight(&ccm_seg7_lights_0700EA00.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ccm_seg7_vertex_0700EA48, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 6, 9, 7, 0x0), @@ -210,16 +198,16 @@ static const Gfx ccm_seg7_dl_0700F210[] = { gsSPVertex(ccm_seg7_vertex_0700ED98, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 7, 8, 9, 0x0), - gsSPLight(&ccm_seg7_lights_0700EA18.l, 1), - gsSPLight(&ccm_seg7_lights_0700EA18.a, 2), + gsSPLightColor(LIGHT_1, 0x666666ff), + gsSPLightColor(LIGHT_2, 0x333333ff), gsSPVertex(ccm_seg7_vertex_0700EE38, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 7, 9, 8, 0x0), gsSP2Triangles(10, 11, 12, 0x0, 13, 14, 15, 0x0), gsSPVertex(ccm_seg7_vertex_0700EF38, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), - gsSPLight(&ccm_seg7_lights_0700EA30.l, 1), - gsSPLight(&ccm_seg7_lights_0700EA30.a, 2), + gsSPLightColor(LIGHT_1, 0xbbbbbbff), + gsSPLightColor(LIGHT_2, 0x5d5d5dff), gsSPVertex(ccm_seg7_vertex_0700EF98, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), @@ -231,8 +219,8 @@ static const Gfx ccm_seg7_dl_0700F3B0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, snow_09008000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ccm_seg7_lights_0700EA18.l, 1), - gsSPLight(&ccm_seg7_lights_0700EA18.a, 2), + gsSPLightColor(LIGHT_1, 0x666666ff), + gsSPLightColor(LIGHT_2, 0x333333ff), gsSPVertex(ccm_seg7_vertex_0700F058, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), diff --git a/levels/ccm/areas/1/7/3.inc.c b/levels/ccm/areas/1/7/3.inc.c index f5761660..ea53b2e1 100644 --- a/levels/ccm/areas/1/7/3.inc.c +++ b/levels/ccm/areas/1/7/3.inc.c @@ -1,8 +1,4 @@ // 0x0700F6E0 - 0x0700F6F8 -static const Lights1 ccm_seg7_lights_0700F6E0 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700F6F8 - 0x0700F738 static const Vtx ccm_seg7_vertex_0700F6F8[] = { @@ -17,8 +13,8 @@ static const Gfx ccm_seg7_dl_0700F738[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, snow_09000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ccm_seg7_lights_0700F6E0.l, 1), - gsSPLight(&ccm_seg7_lights_0700F6E0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ccm_seg7_vertex_0700F6F8, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0), gsSPEndDisplayList(), diff --git a/levels/ccm/areas/1/8/model.inc.c b/levels/ccm/areas/1/8/model.inc.c index 6be88a90..93bbaaf2 100644 --- a/levels/ccm/areas/1/8/model.inc.c +++ b/levels/ccm/areas/1/8/model.inc.c @@ -1,8 +1,4 @@ // 0x0700F800 - 0x0700F818 -static const Lights1 ccm_seg7_lights_0700F800 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700F818 - 0x0700F878 static const Vtx ccm_seg7_vertex_0700F818[] = { @@ -53,8 +49,8 @@ static const Gfx ccm_seg7_dl_0700FA18[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, snow_09008000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ccm_seg7_lights_0700F800.l, 1), - gsSPLight(&ccm_seg7_lights_0700F800.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ccm_seg7_vertex_0700F818, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 0, 2, 4, 0x0, 0, 4, 5, 0x0), diff --git a/levels/ccm/areas/1/9/model.inc.c b/levels/ccm/areas/1/9/model.inc.c index 3b7856e0..fbca5d86 100644 --- a/levels/ccm/areas/1/9/model.inc.c +++ b/levels/ccm/areas/1/9/model.inc.c @@ -1,8 +1,4 @@ // 0x0700FB78 - 0x0700FB90 -static const Lights1 ccm_seg7_lights_0700FB78 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700FB90 - 0x0700FC90 static const Vtx ccm_seg7_vertex_0700FB90[] = { @@ -29,8 +25,8 @@ static const Gfx ccm_seg7_dl_0700FC90[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, snow_09000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ccm_seg7_lights_0700FB78.l, 1), - gsSPLight(&ccm_seg7_lights_0700FB78.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ccm_seg7_vertex_0700FB90, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), diff --git a/levels/ccm/areas/2/1/model.inc.c b/levels/ccm/areas/2/1/model.inc.c index 22aa91d9..2ddfd1da 100644 --- a/levels/ccm/areas/2/1/model.inc.c +++ b/levels/ccm/areas/2/1/model.inc.c @@ -1,8 +1,4 @@ // 0x07016718 - 0x07016730 -static const Lights1 ccm_seg7_lights_07016718 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07016730 - 0x07016770 static const Vtx ccm_seg7_vertex_07016730[] = { @@ -1500,8 +1496,8 @@ static const Gfx ccm_seg7_dl_0701B0E0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, snow_09005000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ccm_seg7_lights_07016718.l, 1), - gsSPLight(&ccm_seg7_lights_07016718.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(ccm_seg7_vertex_07016730, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSPEndDisplayList(), diff --git a/levels/ccm/areas/2/2/model.inc.c b/levels/ccm/areas/2/2/model.inc.c index 5c39f86f..27509935 100644 --- a/levels/ccm/areas/2/2/model.inc.c +++ b/levels/ccm/areas/2/2/model.inc.c @@ -1,26 +1,10 @@ // 0x0701CED8 - 0x0701CEF0 -static const Lights1 ccm_seg7_lights_0701CED8 = gdSPDefLights1( - 0x15, 0x15, 0x15, - 0x55, 0x55, 0x55, 0x28, 0x28, 0x28 -); // 0x0701CEF0 - 0x0701CF08 -static const Lights1 ccm_seg7_lights_0701CEF0 = gdSPDefLights1( - 0x26, 0x26, 0x26, - 0x99, 0x99, 0x99, 0x28, 0x28, 0x28 -); // 0x0701CF08 - 0x0701CF20 -static const Lights1 ccm_seg7_lights_0701CF08 = gdSPDefLights1( - 0x33, 0x33, 0x33, - 0xcc, 0xcc, 0xcc, 0x28, 0x28, 0x28 -); // 0x0701CF20 - 0x0701CF38 -static const Lights1 ccm_seg7_lights_0701CF20 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0701CF38 - 0x0701D028 static const Vtx ccm_seg7_vertex_0701CF38[] = { @@ -366,8 +350,8 @@ static const Gfx ccm_seg7_dl_0701DF68[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, snow_09005000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ccm_seg7_lights_0701CED8.l, 1), - gsSPLight(&ccm_seg7_lights_0701CED8.a, 2), + gsSPLightColor(LIGHT_1, 0x555555ff), + gsSPLightColor(LIGHT_2, 0x151515ff), gsSPVertex(ccm_seg7_vertex_0701CF38, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), @@ -378,8 +362,8 @@ static const Gfx ccm_seg7_dl_0701DF68[] = { gsSP2Triangles( 6, 7, 8, 0x0, 6, 8, 9, 0x0), gsSP2Triangles(10, 11, 12, 0x0, 10, 13, 11, 0x0), gsSP1Triangle( 0, 2, 14, 0x0), - gsSPLight(&ccm_seg7_lights_0701CEF0.l, 1), - gsSPLight(&ccm_seg7_lights_0701CEF0.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x262626ff), gsSPVertex(ccm_seg7_vertex_0701D118, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 8, 0x0), @@ -435,14 +419,14 @@ static const Gfx ccm_seg7_dl_0701DF68[] = { gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 7, 9, 8, 0x0), gsSP1Triangle(10, 0, 2, 0x0), - gsSPLight(&ccm_seg7_lights_0701CF08.l, 1), - gsSPLight(&ccm_seg7_lights_0701CF08.a, 2), + gsSPLightColor(LIGHT_1, 0xccccccff), + gsSPLightColor(LIGHT_2, 0x333333ff), gsSPVertex(ccm_seg7_vertex_0701DA58, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 4, 0x0), gsSP2Triangles( 0, 2, 4, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 3, 0x0, 6, 3, 5, 0x0), - gsSPLight(&ccm_seg7_lights_0701CF20.l, 1), - gsSPLight(&ccm_seg7_lights_0701CF20.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(ccm_seg7_vertex_0701DAD8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -461,14 +445,14 @@ static const Gfx ccm_seg7_dl_0701E3F8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, snow_09008000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ccm_seg7_lights_0701CEF0.l, 1), - gsSPLight(&ccm_seg7_lights_0701CEF0.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x262626ff), gsSPVertex(ccm_seg7_vertex_0701DC78, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), gsSP2Triangles( 8, 9, 10, 0x0, 8, 10, 11, 0x0), - gsSPLight(&ccm_seg7_lights_0701CF20.l, 1), - gsSPLight(&ccm_seg7_lights_0701CF20.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(ccm_seg7_vertex_0701DD38, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 6, 5, 0x0, 7, 8, 9, 0x0), diff --git a/levels/ccm/areas/2/3/model.inc.c b/levels/ccm/areas/2/3/model.inc.c index 68ae861b..a062f58a 100644 --- a/levels/ccm/areas/2/3/model.inc.c +++ b/levels/ccm/areas/2/3/model.inc.c @@ -1,8 +1,4 @@ // 0x0701E610 - 0x0701E628 -static const Lights1 ccm_seg7_lights_0701E610 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0701E628 - 0x0701E668 static const Vtx ccm_seg7_vertex_0701E628[] = { @@ -17,8 +13,8 @@ static const Gfx ccm_seg7_dl_0701E668[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, ccm_seg7_texture_07004B00), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ccm_seg7_lights_0701E610.l, 1), - gsSPLight(&ccm_seg7_lights_0701E610.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(ccm_seg7_vertex_0701E628, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSPEndDisplayList(), diff --git a/levels/ccm/areas/2/4/model.inc.c b/levels/ccm/areas/2/4/model.inc.c index 17dc6cbb..5e9e39c1 100644 --- a/levels/ccm/areas/2/4/model.inc.c +++ b/levels/ccm/areas/2/4/model.inc.c @@ -1,8 +1,4 @@ // 0x0701E720 - 0x0701E738 -static const Lights1 ccm_seg7_lights_0701E720 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0701E738 - 0x0701E828 static const Vtx ccm_seg7_vertex_0701E738[] = { @@ -346,8 +342,8 @@ static const Gfx ccm_seg7_dl_0701F7C8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, snow_09007000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ccm_seg7_lights_0701E720.l, 1), - gsSPLight(&ccm_seg7_lights_0701E720.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ccm_seg7_vertex_0701E738, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 6, 5, 0x0, 4, 7, 6, 0x0), diff --git a/levels/ccm/areas/2/5/model.inc.c b/levels/ccm/areas/2/5/model.inc.c index 61fda435..1f276756 100644 --- a/levels/ccm/areas/2/5/model.inc.c +++ b/levels/ccm/areas/2/5/model.inc.c @@ -1,8 +1,4 @@ // 0x0701FCD8 - 0x0701FCF0 -static const Lights1 ccm_seg7_lights_0701FCD8 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0701FCF0 - 0x0701FD30 static const Vtx ccm_seg7_vertex_0701FCF0[] = { @@ -17,8 +13,8 @@ static const Gfx ccm_seg7_dl_0701FD30[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, snow_09004000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ccm_seg7_lights_0701FCD8.l, 1), - gsSPLight(&ccm_seg7_lights_0701FCD8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(ccm_seg7_vertex_0701FCF0, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), diff --git a/levels/ccm/areas/2/7/model.inc.c b/levels/ccm/areas/2/7/model.inc.c index 432a280c..f1b6a81f 100644 --- a/levels/ccm/areas/2/7/model.inc.c +++ b/levels/ccm/areas/2/7/model.inc.c @@ -1,14 +1,6 @@ // 0x0701FEE0 - 0x0701FEF8 -static const Lights1 ccm_seg7_lights_0701FEE0 = gdSPDefLights1( - 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x0701FEF8 - 0x0701FF10 -static const Lights1 ccm_seg7_lights_0701FEF8 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0701FF10 - 0x0701FF70 static const Vtx ccm_seg7_vertex_0701FF10[] = { @@ -151,8 +143,8 @@ static const Gfx ccm_seg7_dl_07020590[] = { gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, ccm_seg7_texture_07003900), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 16 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ccm_seg7_lights_0701FEE0.l, 1), - gsSPLight(&ccm_seg7_lights_0701FEE0.a, 2), + gsSPLightColor(LIGHT_1, 0xff), + gsSPLightColor(LIGHT_2, 0xff), gsSPVertex(ccm_seg7_vertex_0701FF10, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), gsSP2Triangles( 0, 2, 4, 0x0, 5, 0, 4, 0x0), @@ -164,8 +156,8 @@ static const Gfx ccm_seg7_dl_070205E8[] = { gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, ccm_seg7_texture_07003B00), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ccm_seg7_lights_0701FEF8.l, 1), - gsSPLight(&ccm_seg7_lights_0701FEF8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(ccm_seg7_vertex_0701FF70, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), diff --git a/levels/ccm/ropeway_lift/2.inc.c b/levels/ccm/ropeway_lift/2.inc.c index a22ebf0c..8b915311 100644 --- a/levels/ccm/ropeway_lift/2.inc.c +++ b/levels/ccm/ropeway_lift/2.inc.c @@ -1,8 +1,4 @@ // 0x07010FB8 - 0x07010FD0 -static const Lights1 ccm_seg7_lights_07010FB8 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07010FD0 - 0x070110C0 static const Vtx ccm_seg7_vertex_07010FD0[] = { @@ -146,8 +142,8 @@ static const Gfx ccm_seg7_dl_07011660[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, ccm_seg7_texture_07000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 4 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ccm_seg7_lights_07010FB8.l, 1), - gsSPLight(&ccm_seg7_lights_07010FB8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ccm_seg7_vertex_07010FD0, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), diff --git a/levels/ccm/snowman_base/model.inc.c b/levels/ccm/snowman_base/model.inc.c index 6b41acd2..ce56ce6b 100644 --- a/levels/ccm/snowman_base/model.inc.c +++ b/levels/ccm/snowman_base/model.inc.c @@ -1,8 +1,4 @@ // 0x07011940 - 0x07011958 -static const Lights1 ccm_seg7_lights_07011940 = gdSPDefLights1( - 0xcc, 0xcc, 0xcc, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07011958 - 0x07012158 ALIGNED8 static const Texture ccm_seg7_texture_07011958[] = { @@ -167,8 +163,8 @@ static const Gfx ccm_seg7_dl_070128E8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, ccm_seg7_texture_07011958), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ccm_seg7_lights_07011940.l, 1), - gsSPLight(&ccm_seg7_lights_07011940.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0xccccccff), gsSPVertex(ccm_seg7_vertex_07012158, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 6, 5, 0x0, 4, 7, 6, 0x0), diff --git a/levels/ccm/snowman_head/1.inc.c b/levels/ccm/snowman_head/1.inc.c index e4aec363..27f9abfb 100644 --- a/levels/ccm/snowman_head/1.inc.c +++ b/levels/ccm/snowman_head/1.inc.c @@ -1,8 +1,4 @@ // 0x07012C38 - 0x07012C50 -static const Lights1 ccm_seg7_lights_07012C38 = gdSPDefLights1( - 0xcc, 0xcc, 0xcc, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07012C50 - 0x07012D50 static const Vtx ccm_seg7_vertex_07012C50[] = { @@ -162,8 +158,8 @@ static const Gfx ccm_seg7_dl_070133E0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, ccm_seg7_texture_07011958), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ccm_seg7_lights_07012C38.l, 1), - gsSPLight(&ccm_seg7_lights_07012C38.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0xccccccff), gsSPVertex(ccm_seg7_vertex_07012C50, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 6, 5, 0x0, 4, 7, 6, 0x0), diff --git a/levels/cotmc/areas/1/1/model.inc.c b/levels/cotmc/areas/1/1/model.inc.c index ec10dc01..4230f685 100644 --- a/levels/cotmc/areas/1/1/model.inc.c +++ b/levels/cotmc/areas/1/1/model.inc.c @@ -1,44 +1,16 @@ // 0x07003000 - 0x07003018 -static const Lights1 cotmc_seg7_lights_07003000 = gdSPDefLights1( - 0x4b, 0x78, 0x70, - 0x96, 0xf0, 0xe1, 0x28, 0x28, 0x28 -); // 0x07003018 - 0x07003030 -static const Lights1 cotmc_seg7_lights_07003018 = gdSPDefLights1( - 0x44, 0x44, 0x44, - 0x88, 0x88, 0x88, 0x28, 0x28, 0x28 -); // 0x07003030 - 0x07003048 -static const Lights1 cotmc_seg7_lights_07003030 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07003048 - 0x07003060 -static const Lights1 cotmc_seg7_lights_07003048 = gdSPDefLights1( - 0x00, 0x3c, 0x3c, - 0x00, 0x78, 0x78, 0x28, 0x28, 0x28 -); // 0x07003060 - 0x07003078 -static const Lights1 cotmc_seg7_lights_07003060 = gdSPDefLights1( - 0x3b, 0x3b, 0x3b, - 0x77, 0x77, 0x77, 0x28, 0x28, 0x28 -); // 0x07003078 - 0x07003090 -static const Lights1 cotmc_seg7_lights_07003078 = gdSPDefLights1( - 0x4c, 0x4c, 0x4c, - 0x99, 0x99, 0x99, 0x28, 0x28, 0x28 -); // 0x07003090 - 0x070030A8 -static const Lights1 cotmc_seg7_lights_07003090 = gdSPDefLights1( - 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x070030A8 - 0x070031A8 static const Vtx cotmc_seg7_vertex_070030A8[] = { @@ -1169,8 +1141,8 @@ static const Gfx cotmc_seg7_dl_070066E8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cave_09006800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&cotmc_seg7_lights_07003000.l, 1), - gsSPLight(&cotmc_seg7_lights_07003000.a, 2), + gsSPLightColor(LIGHT_1, 0x96f0e1ff), + gsSPLightColor(LIGHT_2, 0x4b7870ff), gsSPVertex(cotmc_seg7_vertex_070030A8, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 5, 4, 6, 0x0, 6, 7, 5, 0x0), @@ -1238,8 +1210,8 @@ static const Gfx cotmc_seg7_dl_070066E8[] = { gsSP2Triangles( 4, 1, 3, 0x0, 5, 6, 7, 0x0), gsSP2Triangles( 5, 8, 6, 0x0, 5, 9, 8, 0x0), gsSP2Triangles(10, 11, 12, 0x0, 10, 13, 11, 0x0), - gsSPLight(&cotmc_seg7_lights_07003018.l, 1), - gsSPLight(&cotmc_seg7_lights_07003018.a, 2), + gsSPLightColor(LIGHT_1, 0x888888ff), + gsSPLightColor(LIGHT_2, 0x444444ff), gsSPVertex(cotmc_seg7_vertex_07003A48, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 0, 0x0), gsSP2Triangles( 0, 2, 4, 0x0, 4, 2, 5, 0x0), @@ -1247,14 +1219,14 @@ static const Gfx cotmc_seg7_dl_070066E8[] = { gsSP2Triangles( 6, 5, 8, 0x0, 6, 8, 9, 0x0), gsSP2Triangles( 8, 10, 11, 0x0, 9, 8, 11, 0x0), gsSP2Triangles(11, 10, 7, 0x0, 11, 7, 3, 0x0), - gsSPLight(&cotmc_seg7_lights_07003030.l, 1), - gsSPLight(&cotmc_seg7_lights_07003030.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(cotmc_seg7_vertex_07003B08, 7, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 2, 4, 3, 0x0, 1, 5, 2, 0x0), gsSP2Triangles( 5, 6, 2, 0x0, 2, 6, 4, 0x0), - gsSPLight(&cotmc_seg7_lights_07003048.l, 1), - gsSPLight(&cotmc_seg7_lights_07003048.a, 2), + gsSPLightColor(LIGHT_1, 0x7878ff), + gsSPLightColor(LIGHT_2, 0x3c3cff), gsSPVertex(cotmc_seg7_vertex_07003B78, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 3, 5, 7, 0x0), @@ -1270,22 +1242,22 @@ static const Gfx cotmc_seg7_dl_07006C18[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cotmc_seg7_texture_07002000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&cotmc_seg7_lights_07003060.l, 1), - gsSPLight(&cotmc_seg7_lights_07003060.a, 2), + gsSPLightColor(LIGHT_1, 0x777777ff), + gsSPLightColor(LIGHT_2, 0x3b3b3bff), gsSPVertex(cotmc_seg7_vertex_07003C38, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 0, 3, 0x0, 1, 5, 2, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 7, 4, 9, 0x0), gsSP2Triangles( 7, 9, 8, 0x0, 4, 3, 9, 0x0), - gsSPLight(&cotmc_seg7_lights_07003018.l, 1), - gsSPLight(&cotmc_seg7_lights_07003018.a, 2), + gsSPLightColor(LIGHT_1, 0x888888ff), + gsSPLightColor(LIGHT_2, 0x444444ff), gsSPVertex(cotmc_seg7_vertex_07003CD8, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), gsSP2Triangles( 4, 2, 5, 0x0, 4, 0, 2, 0x0), gsSP2Triangles( 5, 6, 4, 0x0, 7, 4, 6, 0x0), gsSP2Triangles( 7, 8, 4, 0x0, 8, 9, 4, 0x0), - gsSPLight(&cotmc_seg7_lights_07003030.l, 1), - gsSPLight(&cotmc_seg7_lights_07003030.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(cotmc_seg7_vertex_07003D78, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 4, 7, 5, 0x0), @@ -1341,8 +1313,8 @@ static const Gfx cotmc_seg7_dl_07006F88[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cotmc_seg7_texture_07001000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&cotmc_seg7_lights_07003018.l, 1), - gsSPLight(&cotmc_seg7_lights_07003018.a, 2), + gsSPLightColor(LIGHT_1, 0x888888ff), + gsSPLightColor(LIGHT_2, 0x444444ff), gsSPVertex(cotmc_seg7_vertex_070043E8, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 5, 6, 7, 0x0, 5, 7, 8, 0x0), @@ -1354,8 +1326,8 @@ static const Gfx cotmc_seg7_dl_07006F88[] = { gsSPVertex(cotmc_seg7_vertex_070044E8, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 1, 3, 0x0), gsSP2Triangles( 2, 3, 4, 0x0, 4, 3, 5, 0x0), - gsSPLight(&cotmc_seg7_lights_07003030.l, 1), - gsSPLight(&cotmc_seg7_lights_07003030.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(cotmc_seg7_vertex_07004548, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 2, 3, 5, 0x0, 2, 6, 3, 0x0), @@ -1379,8 +1351,8 @@ static const Gfx cotmc_seg7_dl_07006F88[] = { gsSPVertex(cotmc_seg7_vertex_07004838, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 0, 3, 0x0), gsSP2Triangles( 3, 4, 1, 0x0, 5, 6, 7, 0x0), - gsSPLight(&cotmc_seg7_lights_07003048.l, 1), - gsSPLight(&cotmc_seg7_lights_07003048.a, 2), + gsSPLightColor(LIGHT_1, 0x7878ff), + gsSPLightColor(LIGHT_2, 0x3c3cff), gsSPVertex(cotmc_seg7_vertex_070048B8, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 0, 4, 3, 0x0, 0, 5, 4, 0x0), @@ -1398,8 +1370,8 @@ static const Gfx cotmc_seg7_dl_07007248[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cave_09003800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&cotmc_seg7_lights_07003030.l, 1), - gsSPLight(&cotmc_seg7_lights_07003030.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(cotmc_seg7_vertex_070049B8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 2, 4, 3, 0x0, 4, 2, 5, 0x0), @@ -1498,8 +1470,8 @@ static const Gfx cotmc_seg7_dl_07007688[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cotmc_seg7_texture_07002800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 16 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPLight(&cotmc_seg7_lights_07003000.l, 1), - gsSPLight(&cotmc_seg7_lights_07003000.a, 2), + gsSPLightColor(LIGHT_1, 0x96f0e1ff), + gsSPLightColor(LIGHT_2, 0x4b7870ff), gsSPVertex(cotmc_seg7_vertex_07005668, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -1513,8 +1485,8 @@ static const Gfx cotmc_seg7_dl_07007688[] = { gsSPVertex(cotmc_seg7_vertex_07005848, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), - gsSPLight(&cotmc_seg7_lights_07003060.l, 1), - gsSPLight(&cotmc_seg7_lights_07003060.a, 2), + gsSPLightColor(LIGHT_1, 0x777777ff), + gsSPLightColor(LIGHT_2, 0x3b3b3bff), gsSPVertex(cotmc_seg7_vertex_070058C8, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 1, 4, 5, 0x0, 1, 3, 4, 0x0), @@ -1535,15 +1507,15 @@ static const Gfx cotmc_seg7_dl_07007688[] = { gsSP2Triangles( 4, 5, 6, 0x0, 6, 7, 8, 0x0), gsSP2Triangles( 6, 5, 7, 0x0, 5, 9, 7, 0x0), gsSP2Triangles(10, 11, 2, 0x0, 3, 10, 2, 0x0), - gsSPLight(&cotmc_seg7_lights_07003018.l, 1), - gsSPLight(&cotmc_seg7_lights_07003018.a, 2), + gsSPLightColor(LIGHT_1, 0x888888ff), + gsSPLightColor(LIGHT_2, 0x444444ff), gsSPVertex(cotmc_seg7_vertex_07005C48, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 3, 2, 0x0, 4, 5, 3, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 6, 0x0), gsSP2Triangles( 6, 10, 7, 0x0, 9, 11, 10, 0x0), - gsSPLight(&cotmc_seg7_lights_07003078.l, 1), - gsSPLight(&cotmc_seg7_lights_07003078.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(cotmc_seg7_vertex_07005D08, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 1, 3, 0x0), gsSP2Triangles( 2, 3, 4, 0x0, 2, 4, 5, 0x0), @@ -1556,12 +1528,12 @@ static const Gfx cotmc_seg7_dl_07007920[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cotmc_seg7_texture_07000000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPLight(&cotmc_seg7_lights_07003090.l, 1), - gsSPLight(&cotmc_seg7_lights_07003090.a, 2), + gsSPLightColor(LIGHT_1, 0xff), + gsSPLightColor(LIGHT_2, 0xff), gsSPVertex(cotmc_seg7_vertex_07005DA8, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), - gsSPLight(&cotmc_seg7_lights_07003018.l, 1), - gsSPLight(&cotmc_seg7_lights_07003018.a, 2), + gsSPLightColor(LIGHT_1, 0x888888ff), + gsSPLightColor(LIGHT_2, 0x444444ff), gsSPVertex(cotmc_seg7_vertex_07005DE8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0), gsSP2Triangles( 4, 3, 2, 0x0, 5, 4, 2, 0x0), @@ -1584,8 +1556,8 @@ static const Gfx cotmc_seg7_dl_07007920[] = { gsSP2Triangles(11, 8, 7, 0x0, 9, 12, 10, 0x0), gsSP2Triangles( 7, 13, 11, 0x0, 14, 11, 13, 0x0), gsSP2Triangles(14, 12, 11, 0x0, 12, 14, 10, 0x0), - gsSPLight(&cotmc_seg7_lights_07003030.l, 1), - gsSPLight(&cotmc_seg7_lights_07003030.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(cotmc_seg7_vertex_070060C8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 3, 0x0, 4, 3, 7, 0x0), @@ -1606,8 +1578,8 @@ static const Gfx cotmc_seg7_dl_07007920[] = { // 0x07007B90 - 0x07007D48 static const Gfx cotmc_seg7_dl_07007B90[] = { - gsSPLight(&cotmc_seg7_lights_07003090.l, 1), - gsSPLight(&cotmc_seg7_lights_07003090.a, 2), + gsSPLightColor(LIGHT_1, 0xff), + gsSPLightColor(LIGHT_2, 0xff), gsSPVertex(cotmc_seg7_vertex_07006358, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 0, 4, 3, 0x0, 0, 2, 5, 0x0), @@ -1635,8 +1607,8 @@ static const Gfx cotmc_seg7_dl_07007B90[] = { gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 0, 0x0), gsSP2Triangles( 3, 4, 1, 0x0, 5, 4, 3, 0x0), gsSP1Triangle( 5, 6, 4, 0x0), - gsSPLight(&cotmc_seg7_lights_07003030.l, 1), - gsSPLight(&cotmc_seg7_lights_07003030.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(cotmc_seg7_vertex_070066A8, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSPEndDisplayList(), diff --git a/levels/cotmc/areas/1/2/model.inc.c b/levels/cotmc/areas/1/2/model.inc.c index 8583d216..4646f9c5 100644 --- a/levels/cotmc/areas/1/2/model.inc.c +++ b/levels/cotmc/areas/1/2/model.inc.c @@ -1,8 +1,4 @@ // 0x07007E88 - 0x07007EA0 -static const Lights1 cotmc_seg7_lights_07007E88 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07007EA0 - 0x07007F90 static const Vtx cotmc_seg7_vertex_07007EA0[] = { @@ -592,8 +588,8 @@ static const Gfx cotmc_seg7_dl_07009B50[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cotmc_seg7_texture_07001800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&cotmc_seg7_lights_07007E88.l, 1), - gsSPLight(&cotmc_seg7_lights_07007E88.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(cotmc_seg7_vertex_07007EA0, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), diff --git a/levels/ddd/areas/1/1/model.inc.c b/levels/ddd/areas/1/1/model.inc.c index 9fdf2de4..fe5fd809 100644 --- a/levels/ddd/areas/1/1/model.inc.c +++ b/levels/ddd/areas/1/1/model.inc.c @@ -1,26 +1,10 @@ // 0x07003800 - 0x07003818 -static const Lights1 ddd_seg7_lights_07003800 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07003818 - 0x07003830 -static const Lights1 ddd_seg7_lights_07003818 = gdSPDefLights1( - 0x1a, 0x1a, 0x3f, - 0x69, 0x69, 0xfe, 0x28, 0x28, 0x28 -); // 0x07003830 - 0x07003848 -static const Lights1 ddd_seg7_lights_07003830 = gdSPDefLights1( - 0x26, 0x26, 0x3f, - 0x9b, 0x9b, 0xff, 0x28, 0x28, 0x28 -); // 0x07003848 - 0x07003860 -static const Lights1 ddd_seg7_lights_07003848 = gdSPDefLights1( - 0x32, 0x32, 0x3f, - 0xc8, 0xc8, 0xff, 0x28, 0x28, 0x28 -); // 0x07003860 - 0x07003960 static const Vtx ddd_seg7_vertex_07003860[] = { @@ -329,8 +313,8 @@ static const Gfx ddd_seg7_dl_07004700[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, water_09003800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ddd_seg7_lights_07003800.l, 1), - gsSPLight(&ddd_seg7_lights_07003800.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(ddd_seg7_vertex_07003860, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 5, 4, 6, 0x0, 5, 6, 7, 0x0), @@ -351,12 +335,12 @@ static const Gfx ddd_seg7_dl_07004700[] = { gsSP2Triangles( 2, 3, 4, 0x0, 4, 3, 5, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 6, 5, 7, 0x0), gsSP1Triangle( 5, 8, 7, 0x0), - gsSPLight(&ddd_seg7_lights_07003818.l, 1), - gsSPLight(&ddd_seg7_lights_07003818.a, 2), + gsSPLightColor(LIGHT_1, 0x6969feff), + gsSPLightColor(LIGHT_2, 0x1a1a3fff), gsSPVertex(ddd_seg7_vertex_07003AF0, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), - gsSPLight(&ddd_seg7_lights_07003830.l, 1), - gsSPLight(&ddd_seg7_lights_07003830.a, 2), + gsSPLightColor(LIGHT_1, 0x9b9bffff), + gsSPLightColor(LIGHT_2, 0x26263fff), gsSPVertex(ddd_seg7_vertex_07003B30, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 4, 6, 0x0), @@ -402,8 +386,8 @@ static const Gfx ddd_seg7_dl_07004700[] = { gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 0, 4, 1, 0x0, 5, 6, 3, 0x0), gsSP2Triangles( 5, 7, 6, 0x0, 6, 7, 8, 0x0), - gsSPLight(&ddd_seg7_lights_07003848.l, 1), - gsSPLight(&ddd_seg7_lights_07003848.a, 2), + gsSPLightColor(LIGHT_1, 0xc8c8ffff), + gsSPLightColor(LIGHT_2, 0x32323fff), gsSPVertex(ddd_seg7_vertex_070041C0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 0, 0x0), gsSP2Triangles( 1, 4, 5, 0x0, 4, 1, 6, 0x0), diff --git a/levels/ddd/areas/1/2/model.inc.c b/levels/ddd/areas/1/2/model.inc.c index 2bf152b9..d3eaec70 100644 --- a/levels/ddd/areas/1/2/model.inc.c +++ b/levels/ddd/areas/1/2/model.inc.c @@ -1,8 +1,4 @@ // 0x07004DA8 - 0x07004DC0 -static const Lights1 ddd_seg7_lights_07004DA8 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07004DC0 - 0x07004EC0 static const Vtx ddd_seg7_vertex_07004DC0[] = { @@ -168,8 +164,8 @@ static const Gfx ddd_seg7_dl_07005570[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, water_09007800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ddd_seg7_lights_07004DA8.l, 1), - gsSPLight(&ddd_seg7_lights_07004DA8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(ddd_seg7_vertex_07004DC0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), diff --git a/levels/ddd/areas/1/3/model.inc.c b/levels/ddd/areas/1/3/model.inc.c index 80f180c9..b9f921f1 100644 --- a/levels/ddd/areas/1/3/model.inc.c +++ b/levels/ddd/areas/1/3/model.inc.c @@ -1,8 +1,4 @@ // 0x07005850 - 0x07005868 -static const Lights1 ddd_seg7_lights_07005850 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07005868 - 0x07005968 static const Vtx ddd_seg7_vertex_07005868[] = { @@ -62,8 +58,8 @@ static const Gfx ddd_seg7_dl_07005AF8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, water_0900B800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ddd_seg7_lights_07005850.l, 1), - gsSPLight(&ddd_seg7_lights_07005850.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(ddd_seg7_vertex_07005868, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 5, 6, 7, 0x0, 5, 4, 6, 0x0), diff --git a/levels/ddd/areas/2/1/model.inc.c b/levels/ddd/areas/2/1/model.inc.c index 2c519620..51c32bd2 100644 --- a/levels/ddd/areas/2/1/model.inc.c +++ b/levels/ddd/areas/2/1/model.inc.c @@ -1,32 +1,12 @@ // 0x07005FC8 - 0x07005FE0 -static const Lights1 ddd_seg7_lights_07005FC8 = gdSPDefLights1( - 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x07005FE0 - 0x07005FF8 -static const Lights1 ddd_seg7_lights_07005FE0 = gdSPDefLights1( - 0x1b, 0x1b, 0x1b, - 0x44, 0x44, 0x44, 0x28, 0x28, 0x28 -); // 0x07005FF8 - 0x07006010 -static const Lights1 ddd_seg7_lights_07005FF8 = gdSPDefLights1( - 0x2f, 0x2f, 0x2f, - 0x77, 0x77, 0x77, 0x28, 0x28, 0x28 -); // 0x07006010 - 0x07006028 -static const Lights1 ddd_seg7_lights_07006010 = gdSPDefLights1( - 0x44, 0x44, 0x44, - 0xaa, 0xaa, 0xaa, 0x28, 0x28, 0x28 -); // 0x07006028 - 0x07006040 -static const Lights1 ddd_seg7_lights_07006028 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07006040 - 0x07006080 static const Vtx ddd_seg7_vertex_07006040[] = { @@ -343,20 +323,20 @@ static const Gfx ddd_seg7_dl_07006E20[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, water_09007800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ddd_seg7_lights_07005FC8.l, 1), - gsSPLight(&ddd_seg7_lights_07005FC8.a, 2), + gsSPLightColor(LIGHT_1, 0xff), + gsSPLightColor(LIGHT_2, 0xff), gsSPVertex(ddd_seg7_vertex_07006040, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - gsSPLight(&ddd_seg7_lights_07005FE0.l, 1), - gsSPLight(&ddd_seg7_lights_07005FE0.a, 2), + gsSPLightColor(LIGHT_1, 0x444444ff), + gsSPLightColor(LIGHT_2, 0x1b1b1bff), gsSPVertex(ddd_seg7_vertex_07006080, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - gsSPLight(&ddd_seg7_lights_07005FF8.l, 1), - gsSPLight(&ddd_seg7_lights_07005FF8.a, 2), + gsSPLightColor(LIGHT_1, 0x777777ff), + gsSPLightColor(LIGHT_2, 0x2f2f2fff), gsSPVertex(ddd_seg7_vertex_070060C0, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), - gsSPLight(&ddd_seg7_lights_07006010.l, 1), - gsSPLight(&ddd_seg7_lights_07006010.a, 2), + gsSPLightColor(LIGHT_1, 0xaaaaaaff), + gsSPLightColor(LIGHT_2, 0x444444ff), gsSPVertex(ddd_seg7_vertex_07006100, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), @@ -367,23 +347,23 @@ static const Gfx ddd_seg7_dl_07006EE0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, water_09006800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ddd_seg7_lights_07005FE0.l, 1), - gsSPLight(&ddd_seg7_lights_07005FE0.a, 2), + gsSPLightColor(LIGHT_1, 0x444444ff), + gsSPLightColor(LIGHT_2, 0x1b1b1bff), gsSPVertex(ddd_seg7_vertex_07006140, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), - gsSPLight(&ddd_seg7_lights_07005FF8.l, 1), - gsSPLight(&ddd_seg7_lights_07005FF8.a, 2), + gsSPLightColor(LIGHT_1, 0x777777ff), + gsSPLightColor(LIGHT_2, 0x2f2f2fff), gsSPVertex(ddd_seg7_vertex_070061C0, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), - gsSPLight(&ddd_seg7_lights_07006010.l, 1), - gsSPLight(&ddd_seg7_lights_07006010.a, 2), + gsSPLightColor(LIGHT_1, 0xaaaaaaff), + gsSPLightColor(LIGHT_2, 0x444444ff), gsSPVertex(ddd_seg7_vertex_07006240, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), - gsSPLight(&ddd_seg7_lights_07006028.l, 1), - gsSPLight(&ddd_seg7_lights_07006028.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(ddd_seg7_vertex_070062C0, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 4, 3, 0x0, 3, 5, 7, 0x0), @@ -407,20 +387,20 @@ static const Gfx ddd_seg7_dl_07007080[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, water_09003800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ddd_seg7_lights_07005FE0.l, 1), - gsSPLight(&ddd_seg7_lights_07005FE0.a, 2), + gsSPLightColor(LIGHT_1, 0x444444ff), + gsSPLightColor(LIGHT_2, 0x1b1b1bff), gsSPVertex(ddd_seg7_vertex_07006520, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - gsSPLight(&ddd_seg7_lights_07005FF8.l, 1), - gsSPLight(&ddd_seg7_lights_07005FF8.a, 2), + gsSPLightColor(LIGHT_1, 0x777777ff), + gsSPLightColor(LIGHT_2, 0x2f2f2fff), gsSPVertex(ddd_seg7_vertex_07006560, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - gsSPLight(&ddd_seg7_lights_07006010.l, 1), - gsSPLight(&ddd_seg7_lights_07006010.a, 2), + gsSPLightColor(LIGHT_1, 0xaaaaaaff), + gsSPLightColor(LIGHT_2, 0x444444ff), gsSPVertex(ddd_seg7_vertex_070065A0, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), - gsSPLight(&ddd_seg7_lights_07006028.l, 1), - gsSPLight(&ddd_seg7_lights_07006028.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(ddd_seg7_vertex_070065E0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 6, 5, 0x0, 7, 6, 8, 0x0), diff --git a/levels/ddd/areas/2/2/model.inc.c b/levels/ddd/areas/2/2/model.inc.c index 68fb7264..496ada56 100644 --- a/levels/ddd/areas/2/2/model.inc.c +++ b/levels/ddd/areas/2/2/model.inc.c @@ -1,8 +1,4 @@ // 0x070074C8 - 0x070074E0 -static const Lights1 ddd_seg7_lights_070074C8 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x070074E0 - 0x070075E0 static const Vtx ddd_seg7_vertex_070074E0[] = { @@ -134,8 +130,8 @@ static const Gfx ddd_seg7_dl_07007AF0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, water_09007800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ddd_seg7_lights_070074C8.l, 1), - gsSPLight(&ddd_seg7_lights_070074C8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(ddd_seg7_vertex_070074E0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), diff --git a/levels/ddd/areas/2/3/model.inc.c b/levels/ddd/areas/2/3/model.inc.c index 80af2861..0a8b2396 100644 --- a/levels/ddd/areas/2/3/model.inc.c +++ b/levels/ddd/areas/2/3/model.inc.c @@ -1,8 +1,4 @@ // 0x07007D18 - 0x07007D30 -static const Lights1 ddd_seg7_lights_07007D18 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07007D30 - 0x07007E20 static const Vtx ddd_seg7_vertex_07007D30[] = { @@ -249,8 +245,8 @@ static const Gfx ddd_seg7_dl_070088F0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, ddd_seg7_texture_07001000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ddd_seg7_lights_07007D18.l, 1), - gsSPLight(&ddd_seg7_lights_07007D18.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(ddd_seg7_vertex_07007D30, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), diff --git a/levels/ddd/areas/2/5/model.inc.c b/levels/ddd/areas/2/5/model.inc.c index 0db444c6..4a6bdcc3 100644 --- a/levels/ddd/areas/2/5/model.inc.c +++ b/levels/ddd/areas/2/5/model.inc.c @@ -1,8 +1,4 @@ // 0x0700B0D8 - 0x0700B0F0 -static const Lights1 ddd_seg7_lights_0700B0D8 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700B0F0 - 0x0700B1D0 static const Vtx ddd_seg7_vertex_0700B0F0[] = { @@ -163,8 +159,8 @@ static const Gfx ddd_seg7_dl_0700B890[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, ddd_seg7_texture_07002000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ddd_seg7_lights_0700B0D8.l, 1), - gsSPLight(&ddd_seg7_lights_0700B0D8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(ddd_seg7_vertex_0700B0F0, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 0, 5, 0x0, 6, 7, 8, 0x0), diff --git a/levels/ddd/areas/2/6/model.inc.c b/levels/ddd/areas/2/6/model.inc.c index 5fe61e4d..aa0ef47d 100644 --- a/levels/ddd/areas/2/6/model.inc.c +++ b/levels/ddd/areas/2/6/model.inc.c @@ -1,8 +1,4 @@ // 0x0700BB50 - 0x0700BB68 -static const Lights1 ddd_seg7_lights_0700BB50 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700BB68 - 0x0700BC58 static const Vtx ddd_seg7_vertex_0700BB68[] = { @@ -308,8 +304,8 @@ static const Gfx ddd_seg7_dl_0700C9D8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, water_0900A000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ddd_seg7_lights_0700BB50.l, 1), - gsSPLight(&ddd_seg7_lights_0700BB50.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(ddd_seg7_vertex_0700BB68, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 6, 5, 0x0, 7, 8, 9, 0x0), diff --git a/levels/ddd/pole/model.inc.c b/levels/ddd/pole/model.inc.c index 82c89e9f..e6a4f181 100644 --- a/levels/ddd/pole/model.inc.c +++ b/levels/ddd/pole/model.inc.c @@ -1,8 +1,4 @@ // 0x0700CEE0 - 0x0700CEF8 -static const Lights1 ddd_seg7_lights_0700CEE0 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700CEF8 - 0x0700CFE8 static const Vtx ddd_seg7_vertex_0700CEF8[] = { @@ -65,8 +61,8 @@ static const Gfx ddd_seg7_dl_0700D1B8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, ddd_seg7_texture_07003000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ddd_seg7_lights_0700CEE0.l, 1), - gsSPLight(&ddd_seg7_lights_0700CEE0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(ddd_seg7_vertex_0700CEF8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), diff --git a/levels/ddd/sub_door/2.inc.c b/levels/ddd/sub_door/2.inc.c index 5562b03d..0009ddb9 100644 --- a/levels/ddd/sub_door/2.inc.c +++ b/levels/ddd/sub_door/2.inc.c @@ -1,8 +1,4 @@ // 0x07009080 - 0x07009098 -static const Lights1 ddd_seg7_lights_07009080 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07009098 - 0x070090D8 static const Vtx ddd_seg7_vertex_07009098[] = { @@ -17,8 +13,8 @@ static const Gfx ddd_seg7_dl_070090D8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, ddd_seg7_texture_07001800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ddd_seg7_lights_07009080.l, 1), - gsSPLight(&ddd_seg7_lights_07009080.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(ddd_seg7_vertex_07009098, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), diff --git a/levels/ddd/submarine/1.inc.c b/levels/ddd/submarine/1.inc.c index 63c4b4a1..ac16586b 100644 --- a/levels/ddd/submarine/1.inc.c +++ b/levels/ddd/submarine/1.inc.c @@ -1,32 +1,12 @@ // 0x07009288 - 0x070092A0 -static const Lights1 ddd_seg7_lights_07009288 = gdSPDefLights1( - 0x3f, 0x1f, 0x19, - 0xff, 0x7f, 0x65, 0x28, 0x28, 0x28 -); // 0x070092A0 - 0x070092B8 -static const Lights1 ddd_seg7_lights_070092A0 = gdSPDefLights1( - 0x2f, 0x1a, 0x0f, - 0xbf, 0x6a, 0x3f, 0x28, 0x28, 0x28 -); // 0x070092B8 - 0x070092D0 -static const Lights1 ddd_seg7_lights_070092B8 = gdSPDefLights1( - 0x0c, 0x0c, 0x0c, - 0x33, 0x33, 0x33, 0x28, 0x28, 0x28 -); // 0x070092D0 - 0x070092E8 -static const Lights1 ddd_seg7_lights_070092D0 = gdSPDefLights1( - 0x1d, 0x1d, 0x1d, - 0x77, 0x77, 0x77, 0x28, 0x28, 0x28 -); // 0x070092E8 - 0x07009300 -static const Lights1 ddd_seg7_lights_070092E8 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07009300 - 0x07009400 static const Vtx ddd_seg7_vertex_07009300[] = { @@ -425,8 +405,8 @@ static const Gfx ddd_seg7_dl_0700A600[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, ddd_seg7_texture_07001800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ddd_seg7_lights_07009288.l, 1), - gsSPLight(&ddd_seg7_lights_07009288.a, 2), + gsSPLightColor(LIGHT_1, 0xff7f65ff), + gsSPLightColor(LIGHT_2, 0x3f1f19ff), gsSPVertex(ddd_seg7_vertex_07009300, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 3, 5, 0x0, 5, 4, 7, 0x0), @@ -441,8 +421,8 @@ static const Gfx ddd_seg7_dl_0700A600[] = { gsSP2Triangles( 1, 3, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 5, 4, 6, 0x0, 4, 7, 6, 0x0), gsSP1Triangle( 8, 7, 4, 0x0), - gsSPLight(&ddd_seg7_lights_070092A0.l, 1), - gsSPLight(&ddd_seg7_lights_070092A0.a, 2), + gsSPLightColor(LIGHT_1, 0xbf6a3fff), + gsSPLightColor(LIGHT_2, 0x2f1a0fff), gsSPVertex(ddd_seg7_vertex_07009490, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 4, 0x0), gsSP2Triangles( 4, 3, 5, 0x0, 5, 3, 0, 0x0), @@ -458,14 +438,14 @@ static const Gfx ddd_seg7_dl_0700A600[] = { gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 0, 0x0), gsSP2Triangles( 0, 2, 3, 0x0, 4, 1, 0, 0x0), gsSP1Triangle( 2, 1, 3, 0x0), - gsSPLight(&ddd_seg7_lights_070092B8.l, 1), - gsSPLight(&ddd_seg7_lights_070092B8.a, 2), + gsSPLightColor(LIGHT_1, 0x333333ff), + gsSPLightColor(LIGHT_2, 0xc0c0cff), gsSPVertex(ddd_seg7_vertex_070095E0, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 4, 0x0), gsSP2Triangles( 0, 5, 3, 0x0, 0, 2, 5, 0x0), gsSP2Triangles( 0, 6, 1, 0x0, 0, 4, 7, 0x0), - gsSPLight(&ddd_seg7_lights_070092D0.l, 1), - gsSPLight(&ddd_seg7_lights_070092D0.a, 2), + gsSPLightColor(LIGHT_1, 0x777777ff), + gsSPLightColor(LIGHT_2, 0x1d1d1dff), gsSPVertex(ddd_seg7_vertex_07009660, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 6, 5, 0x0, 7, 8, 5, 0x0), @@ -478,8 +458,8 @@ static const Gfx ddd_seg7_dl_0700A600[] = { gsSP2Triangles( 6, 7, 2, 0x0, 7, 8, 2, 0x0), gsSP2Triangles( 8, 9, 2, 0x0, 9, 10, 2, 0x0), gsSP1Triangle(10, 0, 2, 0x0), - gsSPLight(&ddd_seg7_lights_070092E8.l, 1), - gsSPLight(&ddd_seg7_lights_070092E8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(ddd_seg7_vertex_07009800, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 1, 4, 2, 0x0, 3, 5, 1, 0x0), diff --git a/levels/ddd/submarine/2.inc.c b/levels/ddd/submarine/2.inc.c index c0d8d71b..9999686d 100644 --- a/levels/ddd/submarine/2.inc.c +++ b/levels/ddd/submarine/2.inc.c @@ -1,8 +1,4 @@ // 0x0700AF78 - 0x0700AF90 -static const Lights1 ddd_seg7_lights_0700AF78 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700AF90 - 0x0700B010 static const Vtx ddd_seg7_vertex_0700AF90[] = { @@ -21,8 +17,8 @@ static const Gfx ddd_seg7_dl_0700B010[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, ddd_seg7_texture_07000000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ddd_seg7_lights_0700AF78.l, 1), - gsSPLight(&ddd_seg7_lights_0700AF78.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(ddd_seg7_vertex_0700AF90, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), diff --git a/levels/hmc/areas/1/1/model.inc.c b/levels/hmc/areas/1/1/model.inc.c index 746fc205..ad3c9664 100644 --- a/levels/hmc/areas/1/1/model.inc.c +++ b/levels/hmc/areas/1/1/model.inc.c @@ -1,20 +1,8 @@ // 0x07005800 - 0x07005818 -static const Lights1 hmc_seg7_lights_07005800 = gdSPDefLights1( - 0x48, 0x48, 0x48, - 0x99, 0x99, 0x99, 0x28, 0x28, 0x28 -); // 0x07005818 - 0x07005830 -static const Lights1 hmc_seg7_lights_07005818 = gdSPDefLights1( - 0x79, 0x00, 0x00, - 0xff, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x07005830 - 0x07005848 -static const Lights1 hmc_seg7_lights_07005830 = gdSPDefLights1( - 0x79, 0x79, 0x79, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07005848 - 0x070058A8 static const Vtx hmc_seg7_vertex_07005848[] = { @@ -516,13 +504,13 @@ static const Gfx hmc_seg7_dl_07006FF8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cave_09009800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&hmc_seg7_lights_07005800.l, 1), - gsSPLight(&hmc_seg7_lights_07005800.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x484848ff), gsSPVertex(hmc_seg7_vertex_07005848, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 0, 2, 4, 0x0, 0, 4, 5, 0x0), - gsSPLight(&hmc_seg7_lights_07005818.l, 1), - gsSPLight(&hmc_seg7_lights_07005818.a, 2), + gsSPLightColor(LIGHT_1, 0xff0000ff), + gsSPLightColor(LIGHT_2, 0x790000ff), gsSPVertex(hmc_seg7_vertex_070058A8, 7, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP1Triangle( 3, 5, 6, 0x0), @@ -534,8 +522,8 @@ static const Gfx hmc_seg7_dl_07007080[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cave_09006800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&hmc_seg7_lights_07005830.l, 1), - gsSPLight(&hmc_seg7_lights_07005830.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x797979ff), gsSPVertex(hmc_seg7_vertex_07005918, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), diff --git a/levels/hmc/areas/1/10/model.inc.c b/levels/hmc/areas/1/10/model.inc.c index 3f665c59..a2601024 100644 --- a/levels/hmc/areas/1/10/model.inc.c +++ b/levels/hmc/areas/1/10/model.inc.c @@ -1,8 +1,4 @@ // 0x0700FF70 - 0x0700FF88 -static const Lights1 hmc_seg7_lights_0700FF70 = gdSPDefLights1( - 0x79, 0x79, 0x79, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700FF88 - 0x07010008 static const Vtx hmc_seg7_vertex_0700FF88[] = { @@ -21,8 +17,8 @@ static const Gfx hmc_seg7_dl_07010008[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cave_09006800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&hmc_seg7_lights_0700FF70.l, 1), - gsSPLight(&hmc_seg7_lights_0700FF70.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x797979ff), gsSPVertex(hmc_seg7_vertex_0700FF88, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 0, 4, 3, 0x0, 0, 5, 4, 0x0), diff --git a/levels/hmc/areas/1/11/model.inc.c b/levels/hmc/areas/1/11/model.inc.c index 4982813a..84148707 100644 --- a/levels/hmc/areas/1/11/model.inc.c +++ b/levels/hmc/areas/1/11/model.inc.c @@ -1,14 +1,6 @@ // 0x07010118 - 0x07010130 -static const Lights1 hmc_seg7_lights_07010118 = gdSPDefLights1( - 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x07010130 - 0x07010148 -static const Lights1 hmc_seg7_lights_07010130 = gdSPDefLights1( - 0x79, 0x79, 0x79, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07010148 - 0x07010248 static const Vtx hmc_seg7_vertex_07010148[] = { @@ -902,8 +894,8 @@ static const Gfx hmc_seg7_dl_07012C78[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cave_09006800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&hmc_seg7_lights_07010118.l, 1), - gsSPLight(&hmc_seg7_lights_07010118.a, 2), + gsSPLightColor(LIGHT_1, 0xff), + gsSPLightColor(LIGHT_2, 0xff), gsSPVertex(hmc_seg7_vertex_07010148, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 3, 6, 0x0), @@ -923,8 +915,8 @@ static const Gfx hmc_seg7_dl_07012C78[] = { gsSP2Triangles(12, 9, 13, 0x0, 11, 10, 14, 0x0), gsSP2Triangles(11, 15, 0, 0x0, 11, 14, 15, 0x0), gsSP1Triangle(12, 10, 9, 0x0), - gsSPLight(&hmc_seg7_lights_07010130.l, 1), - gsSPLight(&hmc_seg7_lights_07010130.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x797979ff), gsSPVertex(hmc_seg7_vertex_07010448, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 6, 7, 0x0, 4, 7, 5, 0x0), @@ -1240,8 +1232,8 @@ static const Gfx hmc_seg7_dl_07013BC8[] = { // 0x07013C78 - 0x07013CA8 static const Gfx hmc_seg7_dl_07013C78[] = { - gsSPLight(&hmc_seg7_lights_07010118.l, 1), - gsSPLight(&hmc_seg7_lights_07010118.a, 2), + gsSPLightColor(LIGHT_1, 0xff), + gsSPLightColor(LIGHT_2, 0xff), gsSPVertex(hmc_seg7_vertex_07012C38, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), diff --git a/levels/hmc/areas/1/16/model.inc.c b/levels/hmc/areas/1/16/model.inc.c index 9f0a71ed..110da630 100644 --- a/levels/hmc/areas/1/16/model.inc.c +++ b/levels/hmc/areas/1/16/model.inc.c @@ -1,8 +1,4 @@ // 0x07014CB8 - 0x07014CD0 -static const Lights1 hmc_seg7_lights_07014CB8 = gdSPDefLights1( - 0x23, 0x2b, 0x14, - 0x8e, 0xac, 0x52, 0x28, 0x28, 0x28 -); // 0x07014CD0 - 0x07014DD0 static const Vtx hmc_seg7_vertex_07014CD0[] = { @@ -29,8 +25,8 @@ static const Gfx hmc_seg7_dl_07014DD0[] = { gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, cave_0900C000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&hmc_seg7_lights_07014CB8.l, 1), - gsSPLight(&hmc_seg7_lights_07014CB8.a, 2), + gsSPLightColor(LIGHT_1, 0x8eac52ff), + gsSPLightColor(LIGHT_2, 0x232b14ff), gsSPVertex(hmc_seg7_vertex_07014CD0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), diff --git a/levels/hmc/areas/1/17/model.inc.c b/levels/hmc/areas/1/17/model.inc.c index c2f3e6ae..240abaa5 100644 --- a/levels/hmc/areas/1/17/model.inc.c +++ b/levels/hmc/areas/1/17/model.inc.c @@ -1,14 +1,6 @@ // 0x07014EB8 - 0x07014ED0 -static const Lights1 hmc_seg7_lights_07014EB8 = gdSPDefLights1( - 0x79, 0x79, 0x79, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07014ED0 - 0x07014EE8 -static const Lights1 hmc_seg7_lights_07014ED0 = gdSPDefLights1( - 0x79, 0x00, 0x00, - 0xff, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x07014EE8 - 0x07014FE8 static const Vtx hmc_seg7_vertex_07014EE8[] = { @@ -554,8 +546,8 @@ static const Gfx hmc_seg7_dl_07016918[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cave_09006800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&hmc_seg7_lights_07014EB8.l, 1), - gsSPLight(&hmc_seg7_lights_07014EB8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x797979ff), gsSPVertex(hmc_seg7_vertex_07014EE8, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -601,8 +593,8 @@ static const Gfx hmc_seg7_dl_07016A90[] = { gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), gsSP2Triangles( 4, 8, 9, 0x0, 4, 6, 8, 0x0), - gsSPLight(&hmc_seg7_lights_07014ED0.l, 1), - gsSPLight(&hmc_seg7_lights_07014ED0.a, 2), + gsSPLightColor(LIGHT_1, 0xff0000ff), + gsSPLightColor(LIGHT_2, 0x790000ff), gsSPVertex(hmc_seg7_vertex_07015558, 7, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP1Triangle( 0, 2, 6, 0x0), @@ -614,8 +606,8 @@ static const Gfx hmc_seg7_dl_07016BA8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cave_09008800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&hmc_seg7_lights_07014EB8.l, 1), - gsSPLight(&hmc_seg7_lights_07014EB8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x797979ff), gsSPVertex(hmc_seg7_vertex_070155C8, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 6, 3, 0x0), diff --git a/levels/hmc/areas/1/22/model.inc.c b/levels/hmc/areas/1/22/model.inc.c index 9196839a..310189b7 100644 --- a/levels/hmc/areas/1/22/model.inc.c +++ b/levels/hmc/areas/1/22/model.inc.c @@ -1,8 +1,4 @@ // 0x07019430 - 0x07019448 -static const Lights1 hmc_seg7_lights_07019430 = gdSPDefLights1( - 0x79, 0x79, 0x79, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07019448 - 0x07019548 static const Vtx hmc_seg7_vertex_07019448[] = { @@ -194,8 +190,8 @@ static const Gfx hmc_seg7_dl_07019D18[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cave_09009800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&hmc_seg7_lights_07019430.l, 1), - gsSPLight(&hmc_seg7_lights_07019430.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x797979ff), gsSPVertex(hmc_seg7_vertex_07019448, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), diff --git a/levels/hmc/areas/1/24/model.inc.c b/levels/hmc/areas/1/24/model.inc.c index 8367deeb..94c3edff 100644 --- a/levels/hmc/areas/1/24/model.inc.c +++ b/levels/hmc/areas/1/24/model.inc.c @@ -1,32 +1,12 @@ // 0x0701A4B8 - 0x0701A4D0 -static const Lights1 hmc_seg7_lights_0701A4B8 = gdSPDefLights1( - 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x0701A4D0 - 0x0701A4E8 -static const Lights1 hmc_seg7_lights_0701A4D0 = gdSPDefLights1( - 0x79, 0x79, 0x79, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0701A4E8 - 0x0701A500 -static const Lights1 hmc_seg7_lights_0701A4E8 = gdSPDefLights1( - 0x79, 0x00, 0x00, - 0xff, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x0701A500 - 0x0701A518 -static const Lights1 hmc_seg7_lights_0701A500 = gdSPDefLights1( - 0x51, 0x43, 0x26, - 0xac, 0x8e, 0x52, 0x28, 0x28, 0x28 -); // 0x0701A518 - 0x0701A530 -static const Lights1 hmc_seg7_lights_0701A518 = gdSPDefLights1( - 0x5a, 0x46, 0x1d, - 0xbf, 0x94, 0x3f, 0x28, 0x28, 0x28 -); // 0x0701A530 - 0x0701A610 static const Vtx hmc_seg7_vertex_0701A530[] = { @@ -1028,8 +1008,8 @@ static const Gfx hmc_seg7_dl_0701D5A0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cave_09006800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&hmc_seg7_lights_0701A4B8.l, 1), - gsSPLight(&hmc_seg7_lights_0701A4B8.a, 2), + gsSPLightColor(LIGHT_1, 0xff), + gsSPLightColor(LIGHT_2, 0xff), gsSPVertex(hmc_seg7_vertex_0701A530, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 6, 5, 0x0, 4, 7, 6, 0x0), @@ -1037,8 +1017,8 @@ static const Gfx hmc_seg7_dl_0701D5A0[] = { gsSP2Triangles( 3, 5, 10, 0x0, 8, 3, 10, 0x0), gsSP2Triangles( 8, 10, 9, 0x0, 11, 1, 0, 0x0), gsSP2Triangles(11, 12, 1, 0x0, 0, 2, 13, 0x0), - gsSPLight(&hmc_seg7_lights_0701A4D0.l, 1), - gsSPLight(&hmc_seg7_lights_0701A4D0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x797979ff), gsSPVertex(hmc_seg7_vertex_0701A610, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 3, 4, 5, 0x0, 3, 5, 1, 0x0), @@ -1083,8 +1063,8 @@ static const Gfx hmc_seg7_dl_0701D708[] = { gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 0, 3, 0x0, 4, 3, 5, 0x0), gsSP1Triangle( 6, 4, 5, 0x0), - gsSPLight(&hmc_seg7_lights_0701A4E8.l, 1), - gsSPLight(&hmc_seg7_lights_0701A4E8.a, 2), + gsSPLightColor(LIGHT_1, 0xff0000ff), + gsSPLightColor(LIGHT_2, 0x790000ff), gsSPVertex(hmc_seg7_vertex_0701AB50, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -1097,8 +1077,8 @@ static const Gfx hmc_seg7_dl_0701D8B0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cave_09000000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&hmc_seg7_lights_0701A500.l, 1), - gsSPLight(&hmc_seg7_lights_0701A500.a, 2), + gsSPLightColor(LIGHT_1, 0xac8e52ff), + gsSPLightColor(LIGHT_2, 0x514326ff), gsSPVertex(hmc_seg7_vertex_0701AC30, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 4, 0x0), gsSP2Triangles( 0, 2, 5, 0x0, 0, 5, 4, 0x0), @@ -1107,8 +1087,8 @@ static const Gfx hmc_seg7_dl_0701D8B0[] = { gsSP2Triangles( 8, 10, 13, 0x0, 9, 11, 10, 0x0), gsSP2Triangles( 6, 14, 15, 0x0, 6, 15, 7, 0x0), gsSP2Triangles(14, 13, 15, 0x0, 14, 8, 13, 0x0), - gsSPLight(&hmc_seg7_lights_0701A518.l, 1), - gsSPLight(&hmc_seg7_lights_0701A518.a, 2), + gsSPLightColor(LIGHT_1, 0xbf943fff), + gsSPLightColor(LIGHT_2, 0x5a461dff), gsSPVertex(hmc_seg7_vertex_0701AD30, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0), gsSP2Triangles( 4, 3, 5, 0x0, 3, 2, 5, 0x0), @@ -1117,15 +1097,15 @@ static const Gfx hmc_seg7_dl_0701D8B0[] = { gsSPVertex(hmc_seg7_vertex_0701AE10, 7, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP1Triangle( 0, 6, 1, 0x0), - gsSPLight(&hmc_seg7_lights_0701A4B8.l, 1), - gsSPLight(&hmc_seg7_lights_0701A4B8.a, 2), + gsSPLightColor(LIGHT_1, 0xff), + gsSPLightColor(LIGHT_2, 0xff), gsSPVertex(hmc_seg7_vertex_0701AE80, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 6, 5, 7, 0x0), gsSP2Triangles( 5, 8, 9, 0x0, 5, 9, 7, 0x0), gsSP2Triangles( 5, 10, 8, 0x0, 10, 11, 8, 0x0), - gsSPLight(&hmc_seg7_lights_0701A4D0.l, 1), - gsSPLight(&hmc_seg7_lights_0701A4D0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x797979ff), gsSPVertex(hmc_seg7_vertex_0701AF40, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 5, 7, 0x0, 5, 4, 7, 0x0), diff --git a/levels/hmc/areas/1/29/model.inc.c b/levels/hmc/areas/1/29/model.inc.c index 9a3fb1e6..993e4405 100644 --- a/levels/hmc/areas/1/29/model.inc.c +++ b/levels/hmc/areas/1/29/model.inc.c @@ -1,8 +1,4 @@ // 0x070200B0 - 0x070200C8 -static const Lights1 hmc_seg7_lights_070200B0 = gdSPDefLights1( - 0x79, 0x79, 0x79, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x070200C8 - 0x070201C8 static const Vtx hmc_seg7_vertex_070200C8[] = { @@ -222,8 +218,8 @@ static const Gfx hmc_seg7_dl_07020B18[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cave_09006800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&hmc_seg7_lights_070200B0.l, 1), - gsSPLight(&hmc_seg7_lights_070200B0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x797979ff), gsSPVertex(hmc_seg7_vertex_070200C8, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 5, 6, 7, 0x0, 5, 7, 3, 0x0), diff --git a/levels/hmc/areas/1/30/model.inc.c b/levels/hmc/areas/1/30/model.inc.c index 42fb2e02..96866ebf 100644 --- a/levels/hmc/areas/1/30/model.inc.c +++ b/levels/hmc/areas/1/30/model.inc.c @@ -1,8 +1,4 @@ // 0x070210E0 - 0x070210F8 -static const Lights1 hmc_seg7_lights_070210E0 = gdSPDefLights1( - 0x79, 0x79, 0x79, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x070210F8 - 0x070211F8 static const Vtx hmc_seg7_vertex_070210F8[] = { @@ -105,8 +101,8 @@ static const Gfx hmc_seg7_dl_070215B8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cave_09009800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&hmc_seg7_lights_070210E0.l, 1), - gsSPLight(&hmc_seg7_lights_070210E0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x797979ff), gsSPVertex(hmc_seg7_vertex_070210F8, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), diff --git a/levels/hmc/areas/1/5/model.inc.c b/levels/hmc/areas/1/5/model.inc.c index 23481086..e7d1e57b 100644 --- a/levels/hmc/areas/1/5/model.inc.c +++ b/levels/hmc/areas/1/5/model.inc.c @@ -1,20 +1,8 @@ // 0x07009460 - 0x07009478 -static const Lights1 hmc_seg7_lights_07009460 = gdSPDefLights1( - 0x79, 0x79, 0x79, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07009478 - 0x07009490 -static const Lights1 hmc_seg7_lights_07009478 = gdSPDefLights1( - 0x79, 0x00, 0x00, - 0xff, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x07009490 - 0x070094A8 -static const Lights1 hmc_seg7_lights_07009490 = gdSPDefLights1( - 0x50, 0x50, 0x50, - 0xaa, 0xaa, 0xaa, 0x28, 0x28, 0x28 -); // 0x070094A8 - 0x07009588 static const Vtx hmc_seg7_vertex_070094A8[] = { @@ -1238,8 +1226,8 @@ static const Gfx hmc_seg7_dl_0700CF78[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cave_09006800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&hmc_seg7_lights_07009460.l, 1), - gsSPLight(&hmc_seg7_lights_07009460.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x797979ff), gsSPVertex(hmc_seg7_vertex_070094A8, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), @@ -1321,8 +1309,8 @@ static const Gfx hmc_seg7_dl_0700D1C8[] = { gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 1, 7, 0x0, 6, 7, 8, 0x0), gsSP1Triangle( 0, 7, 1, 0x0), - gsSPLight(&hmc_seg7_lights_07009478.l, 1), - gsSPLight(&hmc_seg7_lights_07009478.a, 2), + gsSPLightColor(LIGHT_1, 0xff0000ff), + gsSPLightColor(LIGHT_2, 0x790000ff), gsSPVertex(hmc_seg7_vertex_0700A148, 7, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP1Triangle( 3, 5, 6, 0x0), @@ -1334,8 +1322,8 @@ static const Gfx hmc_seg7_dl_0700D3D8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cave_09000000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&hmc_seg7_lights_07009490.l, 1), - gsSPLight(&hmc_seg7_lights_07009490.a, 2), + gsSPLightColor(LIGHT_1, 0xaaaaaaff), + gsSPLightColor(LIGHT_2, 0x505050ff), gsSPVertex(hmc_seg7_vertex_0700A1B8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 3, 5, 0x0, 7, 8, 9, 0x0), @@ -1345,8 +1333,8 @@ static const Gfx hmc_seg7_dl_0700D3D8[] = { gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 6, 8, 9, 0x0), gsSP1Triangle( 0, 10, 1, 0x0), - gsSPLight(&hmc_seg7_lights_07009460.l, 1), - gsSPLight(&hmc_seg7_lights_07009460.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x797979ff), gsSPVertex(hmc_seg7_vertex_0700A358, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 3, 7, 0x0, 3, 5, 7, 0x0), diff --git a/levels/hmc/areas/1/painting.inc.c b/levels/hmc/areas/1/painting.inc.c index da95de86..b408067a 100644 --- a/levels/hmc/areas/1/painting.inc.c +++ b/levels/hmc/areas/1/painting.inc.c @@ -1,17 +1,8 @@ #include "game/paintings.h" // 0x070241B8 - 0x070241D0 -static const Lights1 hmc_seg7_lights_070241B8 = gdSPDefLights1( - 0x50, 0x50, 0x50, - 0xff, 0xff, 0xff, 0x32, 0x32, 0x32 -); // 0x070241D0 - 0x070241E8 -// No gdSPDefLights1 macro defined because of odd different light value (0xff and 0xfa) -static const Lights1 hmc_seg7_lights_070241D0 = { - {{ {0x40, 0x40, 0x80}, 0, {0x40, 0x40, 0x80}, 0} }, - {{{ {0x64, 0x64, 0xff}, 0, {0x64, 0x64, 0xfa}, 0, {0x28, 0x28, 0x28},0} }} -}; // Appears to lock 4 of the sides when shimmering and in use. Unused. // 0x070241E8 - 0x07024228 @@ -35,8 +26,8 @@ static const Vtx hmc_seg7_vertex_07024228[] = { const Gfx hmc_seg7_dl_07024268[] = { gsDPPipeSync(), gsDPSetCombineMode(G_CC_MODULATERGB, G_CC_MODULATERGB), - gsSPLight(&hmc_seg7_lights_070241B8.l, 1), - gsSPLight(&hmc_seg7_lights_070241B8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x505050ff), gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), gsSPVertex(hmc_seg7_vertex_070241E8, 4, 0), gsSPEndDisplayList(), @@ -505,8 +496,8 @@ ALIGNED8 static const Texture hmc_seg7_texture_07024CE0[] = { // 0x070254E0 - 0x07025518 static const Gfx hmc_seg7_painting_dl_070254E0[] = { gsDPPipeSync(), - gsSPLight(&hmc_seg7_lights_070241D0.l, 1), - gsSPLight(&hmc_seg7_lights_070241D0.a, 2), + gsSPLightColor(LIGHT_1, 0x6464ffff), + gsSPLightColor(LIGHT_2, 0x404080ff), gsSPVertex(hmc_seg7_vertex_07024228, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), diff --git a/levels/hmc/arrow_platform/model.inc.c b/levels/hmc/arrow_platform/model.inc.c index 1c8ec154..440c007b 100644 --- a/levels/hmc/arrow_platform/model.inc.c +++ b/levels/hmc/arrow_platform/model.inc.c @@ -1,8 +1,4 @@ // 0x07022B48 - 0x07022B60 -static const Lights1 hmc_seg7_lights_07022B48 = gdSPDefLights1( - 0x79, 0x79, 0x79, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07022B60 - 0x07022C60 static const Vtx hmc_seg7_vertex_07022B60[] = { @@ -41,8 +37,8 @@ static const Gfx hmc_seg7_dl_07022CE0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, hmc_seg7_texture_07004000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&hmc_seg7_lights_07022B48.l, 1), - gsSPLight(&hmc_seg7_lights_07022B48.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x797979ff), gsSPVertex(hmc_seg7_vertex_07022B60, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), diff --git a/levels/hmc/arrow_platform_button/model.inc.c b/levels/hmc/arrow_platform_button/model.inc.c index f10089db..ca1f22f8 100644 --- a/levels/hmc/arrow_platform_button/model.inc.c +++ b/levels/hmc/arrow_platform_button/model.inc.c @@ -1,14 +1,6 @@ // 0x07022E78 - 0x07022E90 -static const Lights1 hmc_seg7_lights_07022E78 = gdSPDefLights1( - 0x79, 0x79, 0x79, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07022E90 - 0x07022EA8 -static const Lights1 hmc_seg7_lights_07022E90 = gdSPDefLights1( - 0x4f, 0x64, 0x5b, - 0xa8, 0xd3, 0xc0, 0x28, 0x28, 0x28 -); // 0x07022EA8 - 0x07022EE8 static const Vtx hmc_seg7_vertex_07022EA8[] = { @@ -43,8 +35,8 @@ static const Gfx hmc_seg7_dl_07022FE8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, hmc_seg7_texture_07003800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&hmc_seg7_lights_07022E78.l, 1), - gsSPLight(&hmc_seg7_lights_07022E78.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x797979ff), gsSPVertex(hmc_seg7_vertex_07022EA8, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0), gsSPEndDisplayList(), @@ -52,8 +44,8 @@ static const Gfx hmc_seg7_dl_07022FE8[] = { // 0x07023030 - 0x07023090 static const Gfx hmc_seg7_dl_07023030[] = { - gsSPLight(&hmc_seg7_lights_07022E90.l, 1), - gsSPLight(&hmc_seg7_lights_07022E90.a, 2), + gsSPLightColor(LIGHT_1, 0xa8d3c0ff), + gsSPLightColor(LIGHT_2, 0x4f645bff), gsSPVertex(hmc_seg7_vertex_07022EE8, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 5, 7, 6, 0x0), diff --git a/levels/hmc/elevator_platform/model.inc.c b/levels/hmc/elevator_platform/model.inc.c index 56c11654..dbccb55d 100644 --- a/levels/hmc/elevator_platform/model.inc.c +++ b/levels/hmc/elevator_platform/model.inc.c @@ -1,8 +1,4 @@ // 0x07022910 - 0x07022928 -static const Lights1 hmc_seg7_lights_07022910 = gdSPDefLights1( - 0x79, 0x79, 0x79, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07022928 - 0x07022A08 static const Vtx hmc_seg7_vertex_07022928[] = { @@ -27,8 +23,8 @@ static const Gfx hmc_seg7_dl_07022A08[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cave_09002800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&hmc_seg7_lights_07022910.l, 1), - gsSPLight(&hmc_seg7_lights_07022910.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x797979ff), gsSPVertex(hmc_seg7_vertex_07022928, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 1, 0x0), diff --git a/levels/hmc/rolling_rock/model.inc.c b/levels/hmc/rolling_rock/model.inc.c index 3d3e204e..99fe59eb 100644 --- a/levels/hmc/rolling_rock/model.inc.c +++ b/levels/hmc/rolling_rock/model.inc.c @@ -1,8 +1,4 @@ // 0x07023160 - 0x07023178 -static const Lights1 hmc_seg7_lights_07023160 = gdSPDefLights1( - 0x79, 0x79, 0x79, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07023178 - 0x07023278 static const Vtx hmc_seg7_vertex_07023178[] = { @@ -159,8 +155,8 @@ static const Gfx hmc_seg7_dl_070238D8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, hmc_seg7_texture_07004800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&hmc_seg7_lights_07023160.l, 1), - gsSPLight(&hmc_seg7_lights_07023160.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x797979ff), gsSPVertex(hmc_seg7_vertex_07023178, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 3, 4, 1, 0x0, 3, 5, 4, 0x0), diff --git a/levels/hmc/rolling_rock_fragment_1/model.inc.c b/levels/hmc/rolling_rock_fragment_1/model.inc.c index aca8c903..711052ae 100644 --- a/levels/hmc/rolling_rock_fragment_1/model.inc.c +++ b/levels/hmc/rolling_rock_fragment_1/model.inc.c @@ -1,8 +1,4 @@ // 0x07023C70 - 0x07023C88 -static const Lights1 hmc_seg7_lights_07023C70 = gdSPDefLights1( - 0x79, 0x79, 0x79, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07023C88 - 0x07023D48 static const Vtx hmc_seg7_vertex_07023C88[] = { @@ -25,8 +21,8 @@ static const Gfx hmc_seg7_dl_07023D48[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, hmc_seg7_texture_07004800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&hmc_seg7_lights_07023C70.l, 1), - gsSPLight(&hmc_seg7_lights_07023C70.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x797979ff), gsSPVertex(hmc_seg7_vertex_07023C88, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0), gsSP2Triangles( 2, 4, 3, 0x0, 5, 6, 4, 0x0), diff --git a/levels/hmc/rolling_rock_fragment_2/model.inc.c b/levels/hmc/rolling_rock_fragment_2/model.inc.c index d06dcd22..c2ff75be 100644 --- a/levels/hmc/rolling_rock_fragment_2/model.inc.c +++ b/levels/hmc/rolling_rock_fragment_2/model.inc.c @@ -1,8 +1,4 @@ // 0x07023EB8 - 0x07023ED0 -static const Lights1 hmc_seg7_lights_07023EB8 = gdSPDefLights1( - 0x79, 0x79, 0x79, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07023ED0 - 0x07023FD0 static const Vtx hmc_seg7_vertex_07023ED0[] = { @@ -44,8 +40,8 @@ static const Gfx hmc_seg7_dl_07024080[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, hmc_seg7_texture_07004800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&hmc_seg7_lights_07023EB8.l, 1), - gsSPLight(&hmc_seg7_lights_07023EB8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x797979ff), gsSPVertex(hmc_seg7_vertex_07023ED0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), diff --git a/levels/intro/geo.c b/levels/intro/geo.c index cde8161f..0285b524 100644 --- a/levels/intro/geo.c +++ b/levels/intro/geo.c @@ -63,16 +63,19 @@ const GeoLayout intro_geo_mario_head_regular[] = { #endif GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), +#ifdef KEEP_MARIO_HEAD GEO_ZBUFFER(1), GEO_OPEN_NODE(), GEO_CAMERA_FRUSTUM(45, 128, 16384), -#ifdef KEEP_MARIO_HEAD GEO_OPEN_NODE(), - GEO_ASM(2, geo_draw_mario_head_goddard), + GEO_CAMERA(CAMERA_MODE_NONE, 0, 0, 1000, 0, 0, 0, 0x00000000), + GEO_OPEN_NODE(), + GEO_ASM(2, geo_draw_mario_head_goddard), + GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), -#endif GEO_CLOSE_NODE(), -#if defined(ENABLE_RUMBLE) +#endif +#ifdef ENABLE_RUMBLE GEO_ZBUFFER(0), GEO_OPEN_NODE(), GEO_ASM(INTRO_CONTEXT_NORMAL, geo_intro_rumble_pak_graphic), @@ -96,16 +99,19 @@ const GeoLayout intro_geo_mario_head_dizzy[] = { #endif GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), +#ifdef KEEP_MARIO_HEAD GEO_ZBUFFER(1), GEO_OPEN_NODE(), GEO_CAMERA_FRUSTUM(45, 128, 16384), -#ifdef KEEP_MARIO_HEAD GEO_OPEN_NODE(), - GEO_ASM(3, geo_draw_mario_head_goddard), + GEO_CAMERA(CAMERA_MODE_NONE, 0, 0, 1000, 0, 0, 0, 0x00000000), + GEO_OPEN_NODE(), + GEO_ASM(3, geo_draw_mario_head_goddard), + GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), -#endif GEO_CLOSE_NODE(), -#if defined(ENABLE_RUMBLE) +#endif +#ifdef ENABLE_RUMBLE GEO_ZBUFFER(0), GEO_OPEN_NODE(), GEO_ASM(INTRO_CONTEXT_GAME_OVER, geo_intro_rumble_pak_graphic), diff --git a/levels/jrb/areas/1/2/model.inc.c b/levels/jrb/areas/1/2/model.inc.c index c97e16d6..2447579a 100644 --- a/levels/jrb/areas/1/2/model.inc.c +++ b/levels/jrb/areas/1/2/model.inc.c @@ -1,20 +1,8 @@ // 0x070030A8 - 0x070030C0 -static const Lights1 jrb_seg7_lights_070030A8 = gdSPDefLights1( - 0x10, 0x25, 0x1e, - 0x41, 0x96, 0x78, 0x28, 0x28, 0x28 -); // 0x070030C0 - 0x070030D8 -static const Lights1 jrb_seg7_lights_070030C0 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x070030D8 - 0x070030F0 -static const Lights1 jrb_seg7_lights_070030D8 = gdSPDefLights1( - 0x1e, 0x27, 0x3a, - 0x79, 0x9f, 0xeb, 0x28, 0x28, 0x28 -); // 0x070030F0 - 0x070031F0 static const Vtx jrb_seg7_vertex_070030F0[] = { @@ -373,8 +361,8 @@ static const Gfx jrb_seg7_dl_070041F0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, water_09003800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPLight(&jrb_seg7_lights_070030A8.l, 1), - gsSPLight(&jrb_seg7_lights_070030A8.a, 2), + gsSPLightColor(LIGHT_1, 0x419678ff), + gsSPLightColor(LIGHT_2, 0x10251eff), gsSPVertex(jrb_seg7_vertex_070030F0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 4, 0x0), gsSP2Triangles( 5, 3, 2, 0x0, 4, 3, 6, 0x0), @@ -389,8 +377,8 @@ static const Gfx jrb_seg7_dl_070041F0[] = { gsSPVertex(jrb_seg7_vertex_070031F0, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 0, 3, 0x0, 4, 3, 5, 0x0), - gsSPLight(&jrb_seg7_lights_070030C0.l, 1), - gsSPLight(&jrb_seg7_lights_070030C0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(jrb_seg7_vertex_07003250, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 4, 0x0), gsSP2Triangles( 1, 4, 2, 0x0, 2, 4, 5, 0x0), @@ -432,8 +420,8 @@ static const Gfx jrb_seg7_dl_070044C8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, water_09001800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPLight(&jrb_seg7_lights_070030D8.l, 1), - gsSPLight(&jrb_seg7_lights_070030D8.a, 2), + gsSPLightColor(LIGHT_1, 0x799febff), + gsSPLightColor(LIGHT_2, 0x1e273aff), gsSPVertex(jrb_seg7_vertex_07003700, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 5, 4, 0x0), @@ -480,8 +468,8 @@ static const Gfx jrb_seg7_dl_070046C0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, water_09004800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPLight(&jrb_seg7_lights_070030C0.l, 1), - gsSPLight(&jrb_seg7_lights_070030C0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(jrb_seg7_vertex_07003B10, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0), gsSP2Triangles( 4, 0, 3, 0x0, 1, 5, 2, 0x0), diff --git a/levels/jrb/areas/1/3/model.inc.c b/levels/jrb/areas/1/3/model.inc.c index 5b2878f3..7f6f8783 100644 --- a/levels/jrb/areas/1/3/model.inc.c +++ b/levels/jrb/areas/1/3/model.inc.c @@ -1,14 +1,6 @@ // 0x07004A18 - 0x07004A30 -static const Lights1 jrb_seg7_lights_07004A18 = gdSPDefLights1( - 0x1e, 0x27, 0x3a, - 0x79, 0x9f, 0xeb, 0x28, 0x28, 0x28 -); // 0x07004A30 - 0x07004A48 -static const Lights1 jrb_seg7_lights_07004A30 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07004A48 - 0x07004AC8 static const Vtx jrb_seg7_vertex_07004A48[] = { @@ -43,8 +35,8 @@ static const Gfx jrb_seg7_dl_07004B88[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, water_09001800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPLight(&jrb_seg7_lights_07004A18.l, 1), - gsSPLight(&jrb_seg7_lights_07004A18.a, 2), + gsSPLightColor(LIGHT_1, 0x799febff), + gsSPLightColor(LIGHT_2, 0x1e273aff), gsSPVertex(jrb_seg7_vertex_07004A48, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 2, 1, 4, 0x0, 2, 4, 5, 0x0), @@ -57,8 +49,8 @@ static const Gfx jrb_seg7_dl_07004BF0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, water_09004800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPLight(&jrb_seg7_lights_07004A30.l, 1), - gsSPLight(&jrb_seg7_lights_07004A30.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(jrb_seg7_vertex_07004AC8, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 6, 7, 4, 0x0), diff --git a/levels/jrb/areas/1/4/model.inc.c b/levels/jrb/areas/1/4/model.inc.c index aba35fa7..332befb4 100644 --- a/levels/jrb/areas/1/4/model.inc.c +++ b/levels/jrb/areas/1/4/model.inc.c @@ -1,14 +1,6 @@ // 0x07004D40 - 0x07004D58 -static const Lights1 jrb_seg7_lights_07004D40 = gdSPDefLights1( - 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x07004D58 - 0x07004D70 -static const Lights1 jrb_seg7_lights_07004D58 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07004D70 - 0x07004DF0 static const Vtx jrb_seg7_vertex_07004D70[] = { @@ -178,14 +170,14 @@ static const Gfx jrb_seg7_dl_07005560[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, water_09004800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPLight(&jrb_seg7_lights_07004D40.l, 1), - gsSPLight(&jrb_seg7_lights_07004D40.a, 2), + gsSPLightColor(LIGHT_1, 0xff), + gsSPLightColor(LIGHT_2, 0xff), gsSPVertex(jrb_seg7_vertex_07004D70, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 4, 0x0), gsSP2Triangles( 0, 2, 3, 0x0, 0, 5, 6, 0x0), gsSP2Triangles( 0, 6, 7, 0x0, 0, 4, 5, 0x0), - gsSPLight(&jrb_seg7_lights_07004D58.l, 1), - gsSPLight(&jrb_seg7_lights_07004D58.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(jrb_seg7_vertex_07004DF0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 4, 0x0), gsSP2Triangles( 2, 1, 3, 0x0, 0, 5, 1, 0x0), diff --git a/levels/jrb/areas/1/5/model.inc.c b/levels/jrb/areas/1/5/model.inc.c index 0ad116c9..dbcfea58 100644 --- a/levels/jrb/areas/1/5/model.inc.c +++ b/levels/jrb/areas/1/5/model.inc.c @@ -1,20 +1,8 @@ // 0x07005990 - 0x070059A8 -static const Lights1 jrb_seg7_lights_07005990 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x070059A8 - 0x070059C0 -static const Lights1 jrb_seg7_lights_070059A8 = gdSPDefLights1( - 0x26, 0x26, 0x26, - 0x99, 0x99, 0x99, 0x28, 0x28, 0x28 -); // 0x070059C0 - 0x070059D8 -static const Lights1 jrb_seg7_lights_070059C0 = gdSPDefLights1( - 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x070059D8 - 0x07005AC8 static const Vtx jrb_seg7_vertex_070059D8[] = { @@ -256,8 +244,8 @@ static const Gfx jrb_seg7_dl_07006508[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, water_0900A000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&jrb_seg7_lights_07005990.l, 1), - gsSPLight(&jrb_seg7_lights_07005990.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(jrb_seg7_vertex_070059D8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), @@ -275,15 +263,15 @@ static const Gfx jrb_seg7_dl_070065A8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, water_09001800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPLight(&jrb_seg7_lights_070059A8.l, 1), - gsSPLight(&jrb_seg7_lights_070059A8.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x262626ff), gsSPVertex(jrb_seg7_vertex_07005B78, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 1, 3, 0x0), gsSP2Triangles( 2, 3, 4, 0x0, 0, 5, 1, 0x0), gsSP2Triangles( 4, 3, 6, 0x0, 4, 6, 7, 0x0), gsSP2Triangles( 7, 6, 5, 0x0, 7, 5, 0, 0x0), - gsSPLight(&jrb_seg7_lights_07005990.l, 1), - gsSPLight(&jrb_seg7_lights_07005990.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(jrb_seg7_vertex_07005BF8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -356,8 +344,8 @@ static const Gfx jrb_seg7_dl_070067F0[] = { // 0x07006980 - 0x070069B0 static const Gfx jrb_seg7_dl_07006980[] = { - gsSPLight(&jrb_seg7_lights_070059C0.l, 1), - gsSPLight(&jrb_seg7_lights_070059C0.a, 2), + gsSPLightColor(LIGHT_1, 0xff), + gsSPLightColor(LIGHT_2, 0xff), gsSPVertex(jrb_seg7_vertex_070064C8, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSPEndDisplayList(), diff --git a/levels/jrb/areas/1/6/model.inc.c b/levels/jrb/areas/1/6/model.inc.c index bdf3e042..390e25db 100644 --- a/levels/jrb/areas/1/6/model.inc.c +++ b/levels/jrb/areas/1/6/model.inc.c @@ -1,8 +1,4 @@ // 0x07006A98 - 0x07006AB0 -static const Lights1 jrb_seg7_lights_07006A98 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07006AB0 - 0x07006BA0 static const Vtx jrb_seg7_vertex_07006AB0[] = { @@ -172,8 +168,8 @@ static const Gfx jrb_seg7_dl_070072A0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, water_09003800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPLight(&jrb_seg7_lights_07006A98.l, 1), - gsSPLight(&jrb_seg7_lights_07006A98.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(jrb_seg7_vertex_07006AB0, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), diff --git a/levels/jrb/areas/2/1/model.inc.c b/levels/jrb/areas/2/1/model.inc.c index 41e60ba8..95128ad0 100644 --- a/levels/jrb/areas/2/1/model.inc.c +++ b/levels/jrb/areas/2/1/model.inc.c @@ -1,26 +1,10 @@ // 0x0700D318 - 0x0700D330 -static const Lights1 jrb_seg7_lights_0700D318 = gdSPDefLights1( - 0x14, 0x30, 0x2c, - 0x32, 0x78, 0x6e, 0x28, 0x28, 0x28 -); // 0x0700D330 - 0x0700D348 -static const Lights1 jrb_seg7_lights_0700D330 = gdSPDefLights1( - 0x3c, 0x52, 0x4a, - 0x97, 0xcd, 0xbb, 0x28, 0x28, 0x28 -); // 0x0700D348 - 0x0700D360 -static const Lights1 jrb_seg7_lights_0700D348 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700D360 - 0x0700D378 -static const Lights1 jrb_seg7_lights_0700D360 = gdSPDefLights1( - 0x50, 0x66, 0x58, - 0xc8, 0xff, 0xdc, 0x28, 0x28, 0x28 -); // 0x0700D378 - 0x0700D3F8 static const Vtx jrb_seg7_vertex_0700D378[] = { @@ -434,15 +418,15 @@ static const Gfx jrb_seg7_dl_0700E6E8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, water_09005800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&jrb_seg7_lights_0700D318.l, 1), - gsSPLight(&jrb_seg7_lights_0700D318.a, 2), + gsSPLightColor(LIGHT_1, 0x32786eff), + gsSPLightColor(LIGHT_2, 0x14302cff), gsSPVertex(jrb_seg7_vertex_0700D378, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0), gsSP2Triangles( 3, 2, 4, 0x0, 5, 3, 4, 0x0), gsSP2Triangles( 5, 4, 6, 0x0, 7, 6, 1, 0x0), gsSP2Triangles( 7, 5, 6, 0x0, 0, 7, 1, 0x0), - gsSPLight(&jrb_seg7_lights_0700D330.l, 1), - gsSPLight(&jrb_seg7_lights_0700D330.a, 2), + gsSPLightColor(LIGHT_1, 0x97cdbbff), + gsSPLightColor(LIGHT_2, 0x3c524aff), gsSPVertex(jrb_seg7_vertex_0700D3F8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 4, 3, 0x0, 4, 7, 5, 0x0), @@ -477,18 +461,18 @@ static const Gfx jrb_seg7_dl_0700E8C8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, water_0900A000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&jrb_seg7_lights_0700D318.l, 1), - gsSPLight(&jrb_seg7_lights_0700D318.a, 2), + gsSPLightColor(LIGHT_1, 0x32786eff), + gsSPLightColor(LIGHT_2, 0x14302cff), gsSPVertex(jrb_seg7_vertex_0700D878, 11, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 6, 8, 9, 0x0), gsSP1Triangle(10, 0, 2, 0x0), - gsSPLight(&jrb_seg7_lights_0700D330.l, 1), - gsSPLight(&jrb_seg7_lights_0700D330.a, 2), + gsSPLightColor(LIGHT_1, 0x97cdbbff), + gsSPLightColor(LIGHT_2, 0x3c524aff), gsSPVertex(jrb_seg7_vertex_0700D928, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), - gsSPLight(&jrb_seg7_lights_0700D348.l, 1), - gsSPLight(&jrb_seg7_lights_0700D348.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(jrb_seg7_vertex_0700D968, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), @@ -501,8 +485,8 @@ static const Gfx jrb_seg7_dl_0700E998[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, water_09000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPLight(&jrb_seg7_lights_0700D360.l, 1), - gsSPLight(&jrb_seg7_lights_0700D360.a, 2), + gsSPLightColor(LIGHT_1, 0xc8ffdcff), + gsSPLightColor(LIGHT_2, 0x506658ff), gsSPVertex(jrb_seg7_vertex_0700DA28, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 1, 0x0), gsSP2Triangles( 1, 4, 5, 0x0, 5, 2, 1, 0x0), @@ -578,16 +562,16 @@ static const Gfx jrb_seg7_dl_0700ECB8[] = { gsSP2Triangles( 4, 5, 6, 0x0, 5, 4, 7, 0x0), gsSP2Triangles( 8, 9, 6, 0x0, 10, 8, 6, 0x0), gsSP2Triangles( 9, 4, 6, 0x0, 11, 5, 7, 0x0), - gsSPLight(&jrb_seg7_lights_0700D318.l, 1), - gsSPLight(&jrb_seg7_lights_0700D318.a, 2), + gsSPLightColor(LIGHT_1, 0x32786eff), + gsSPLightColor(LIGHT_2, 0x14302cff), gsSPVertex(jrb_seg7_vertex_0700E458, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 1, 4, 2, 0x0, 2, 4, 5, 0x0), gsSP2Triangles( 2, 5, 6, 0x0, 7, 8, 9, 0x0), gsSP2Triangles(10, 7, 9, 0x0, 3, 10, 9, 0x0), gsSP2Triangles( 3, 11, 10, 0x0, 0, 11, 3, 0x0), - gsSPLight(&jrb_seg7_lights_0700D348.l, 1), - gsSPLight(&jrb_seg7_lights_0700D348.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(jrb_seg7_vertex_0700E518, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSPEndDisplayList(), @@ -598,8 +582,8 @@ static const Gfx jrb_seg7_dl_0700EE28[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, water_09002800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPLight(&jrb_seg7_lights_0700D360.l, 1), - gsSPLight(&jrb_seg7_lights_0700D360.a, 2), + gsSPLightColor(LIGHT_1, 0xc8ffdcff), + gsSPLightColor(LIGHT_2, 0x506658ff), gsSPVertex(jrb_seg7_vertex_0700E558, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 4, 0x0), gsSP2Triangles( 0, 5, 3, 0x0, 0, 6, 5, 0x0), diff --git a/levels/jrb/areas/2/2/model.inc.c b/levels/jrb/areas/2/2/model.inc.c index 74b2c07b..563c00e2 100644 --- a/levels/jrb/areas/2/2/model.inc.c +++ b/levels/jrb/areas/2/2/model.inc.c @@ -1,8 +1,4 @@ // 0x0700EF98 - 0x0700EFB0 -static const Lights1 jrb_seg7_lights_0700EF98 = gdSPDefLights1( - 0x3c, 0x66, 0x66, - 0x96, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700EFB0 - 0x0700F0B0 static const Vtx jrb_seg7_vertex_0700EFB0[] = { @@ -245,8 +241,8 @@ static const Gfx jrb_seg7_dl_0700FB30[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, water_09006000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&jrb_seg7_lights_0700EF98.l, 1), - gsSPLight(&jrb_seg7_lights_0700EF98.a, 2), + gsSPLightColor(LIGHT_1, 0x96ffffff), + gsSPLightColor(LIGHT_2, 0x3c6666ff), gsSPVertex(jrb_seg7_vertex_0700EFB0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 6, 8, 9, 0x0), diff --git a/levels/jrb/areas/2/3/model.inc.c b/levels/jrb/areas/2/3/model.inc.c index 00c6bfac..db15c326 100644 --- a/levels/jrb/areas/2/3/model.inc.c +++ b/levels/jrb/areas/2/3/model.inc.c @@ -1,8 +1,4 @@ // 0x0700FEB8 - 0x0700FED0 -static const Lights1 jrb_seg7_lights_0700FEB8 = gdSPDefLights1( - 0x50, 0x66, 0x58, - 0xc8, 0xff, 0xdc, 0x28, 0x28, 0x28 -); // 0x0700FED0 - 0x0700FFC0 static const Vtx jrb_seg7_vertex_0700FED0[] = { @@ -105,8 +101,8 @@ static const Gfx jrb_seg7_dl_07010390[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, water_09008800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&jrb_seg7_lights_0700FEB8.l, 1), - gsSPLight(&jrb_seg7_lights_0700FEB8.a, 2), + gsSPLightColor(LIGHT_1, 0xc8ffdcff), + gsSPLightColor(LIGHT_2, 0x506658ff), gsSPVertex(jrb_seg7_vertex_0700FED0, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 3, 7, 6, 0x0), diff --git a/levels/jrb/falling_pillar/model.inc.c b/levels/jrb/falling_pillar/model.inc.c index e84c31d2..13b108b4 100644 --- a/levels/jrb/falling_pillar/model.inc.c +++ b/levels/jrb/falling_pillar/model.inc.c @@ -1,8 +1,4 @@ // 0x0700AD38 - 0x0700AD50 -static const Lights1 jrb_seg7_lights_0700AD38 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700AD50 - 0x0700ADD0 static const Vtx jrb_seg7_vertex_0700AD50[] = { @@ -21,8 +17,8 @@ static const Gfx jrb_seg7_dl_0700ADD0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, water_09001800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPLight(&jrb_seg7_lights_0700AD38.l, 1), - gsSPLight(&jrb_seg7_lights_0700AD38.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(jrb_seg7_vertex_0700AD50, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 0, 0x0), gsSP2Triangles( 5, 4, 6, 0x0, 6, 4, 7, 0x0), diff --git a/levels/jrb/falling_pillar_base/model.inc.c b/levels/jrb/falling_pillar_base/model.inc.c index 2d525203..aa989cd5 100644 --- a/levels/jrb/falling_pillar_base/model.inc.c +++ b/levels/jrb/falling_pillar_base/model.inc.c @@ -1,8 +1,4 @@ // 0x0700AEF0 - 0x0700AF08 -static const Lights1 jrb_seg7_lights_0700AEF0 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700AF08 - 0x0700AF58 static const Vtx jrb_seg7_vertex_0700AF08[] = { @@ -18,8 +14,8 @@ static const Gfx jrb_seg7_dl_0700AF58[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, water_09001800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPLight(&jrb_seg7_lights_0700AEF0.l, 1), - gsSPLight(&jrb_seg7_lights_0700AEF0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(jrb_seg7_vertex_0700AF08, 5, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 1, 0x0), gsSP2Triangles( 2, 1, 4, 0x0, 1, 0, 3, 0x0), diff --git a/levels/jrb/floating_platform/model.inc.c b/levels/jrb/floating_platform/model.inc.c index 48ef2d50..71ac4c9d 100644 --- a/levels/jrb/floating_platform/model.inc.c +++ b/levels/jrb/floating_platform/model.inc.c @@ -1,8 +1,4 @@ // 0x07007B70 - 0x07007B88 -static const Lights1 jrb_seg7_lights_07007B70 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07007B88 - 0x07007C88 static const Vtx jrb_seg7_vertex_07007B88[] = { @@ -41,8 +37,8 @@ static const Gfx jrb_seg7_dl_07007D08[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, water_0900A000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&jrb_seg7_lights_07007B70.l, 1), - gsSPLight(&jrb_seg7_lights_07007B70.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(jrb_seg7_vertex_07007B88, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), diff --git a/levels/jrb/rock/model.inc.c b/levels/jrb/rock/model.inc.c index fb217ac1..4d3e0ad9 100644 --- a/levels/jrb/rock/model.inc.c +++ b/levels/jrb/rock/model.inc.c @@ -1,8 +1,4 @@ // 0x070077F0 - 0x07007808 -static const Lights1 jrb_seg7_lights_070077F0 = gdSPDefLights1( - 0x32, 0x38, 0x3f, - 0xc8, 0xe1, 0xff, 0x28, 0x28, 0x28 -); // 0x07007808 - 0x07007908 static const Vtx jrb_seg7_vertex_07007808[] = { @@ -47,8 +43,8 @@ static const Gfx jrb_seg7_dl_070079E8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, water_09001800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPLight(&jrb_seg7_lights_070077F0.l, 1), - gsSPLight(&jrb_seg7_lights_070077F0.a, 2), + gsSPLightColor(LIGHT_1, 0xc8e1ffff), + gsSPLightColor(LIGHT_2, 0x32383fff), gsSPVertex(jrb_seg7_vertex_07007808, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 0, 4, 3, 0x0, 3, 6, 0, 0x0), diff --git a/levels/jrb/sliding_box/model.inc.c b/levels/jrb/sliding_box/model.inc.c index afb7fa40..3137dbb5 100644 --- a/levels/jrb/sliding_box/model.inc.c +++ b/levels/jrb/sliding_box/model.inc.c @@ -1,8 +1,4 @@ // 0x07007EA0 - 0x07007EB8 -static const Lights1 jrb_seg7_lights_07007EA0 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07007EB8 - 0x07007FB8 static const Vtx jrb_seg7_vertex_07007EB8[] = { @@ -41,8 +37,8 @@ static const Gfx jrb_seg7_dl_07008038[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, jrb_seg7_texture_07001800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&jrb_seg7_lights_07007EA0.l, 1), - gsSPLight(&jrb_seg7_lights_07007EA0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(jrb_seg7_vertex_07007EB8, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), diff --git a/levels/jrb/wooden_ship/model.inc.c b/levels/jrb/wooden_ship/model.inc.c index b01ee12c..bda872ca 100644 --- a/levels/jrb/wooden_ship/model.inc.c +++ b/levels/jrb/wooden_ship/model.inc.c @@ -1,14 +1,6 @@ // 0x070081A8 - 0x070081C0 -static const Lights1 jrb_seg7_lights_070081A8 = gdSPDefLights1( - 0x1e, 0x2c, 0x3a, - 0x79, 0xb2, 0xeb, 0x28, 0x28, 0x28 -); // 0x070081C0 - 0x070081D8 -static const Lights1 jrb_seg7_lights_070081C0 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x070081D8 - 0x070082C8 static const Vtx jrb_seg7_vertex_070081D8[] = { @@ -218,8 +210,8 @@ static const Gfx jrb_seg7_dl_07008B88[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, water_09005800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&jrb_seg7_lights_070081A8.l, 1), - gsSPLight(&jrb_seg7_lights_070081A8.a, 2), + gsSPLightColor(LIGHT_1, 0x79b2ebff), + gsSPLightColor(LIGHT_2, 0x1e2c3aff), gsSPVertex(jrb_seg7_vertex_070081D8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), @@ -244,8 +236,8 @@ static const Gfx jrb_seg7_dl_07008C90[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, water_09000000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&jrb_seg7_lights_070081C0.l, 1), - gsSPLight(&jrb_seg7_lights_070081C0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(jrb_seg7_vertex_07008478, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0), gsSP2Triangles( 2, 4, 3, 0x0, 5, 6, 7, 0x0), @@ -381,22 +373,10 @@ const Gfx jrb_seg7_dl_070090B0[] = { }; // 0x07009190 - 0x070091A8 -static const Lights1 jrb_seg7_lights_07009190 = gdSPDefLights1( - 0x1e, 0x2c, 0x3a, - 0x79, 0xb2, 0xeb, 0x28, 0x28, 0x28 -); // 0x070091A8 - 0x070091C0 -static const Lights1 jrb_seg7_lights_070091A8 = gdSPDefLights1( - 0x19, 0x2c, 0x3f, - 0x65, 0xb2, 0xff, 0x28, 0x28, 0x28 -); // 0x070091C0 - 0x070091D8 -static const Lights1 jrb_seg7_lights_070091C0 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x070091D8 - 0x07009218 static const Vtx jrb_seg7_vertex_070091D8[] = { @@ -531,12 +511,12 @@ static const Gfx jrb_seg7_dl_07009798[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, water_09005800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&jrb_seg7_lights_07009190.l, 1), - gsSPLight(&jrb_seg7_lights_07009190.a, 2), + gsSPLightColor(LIGHT_1, 0x79b2ebff), + gsSPLightColor(LIGHT_2, 0x1e2c3aff), gsSPVertex(jrb_seg7_vertex_070091D8, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), - gsSPLight(&jrb_seg7_lights_070091A8.l, 1), - gsSPLight(&jrb_seg7_lights_070091A8.a, 2), + gsSPLightColor(LIGHT_1, 0x65b2ffff), + gsSPLightColor(LIGHT_2, 0x192c3fff), gsSPVertex(jrb_seg7_vertex_07009218, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), @@ -547,8 +527,8 @@ static const Gfx jrb_seg7_dl_07009808[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, water_09000000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&jrb_seg7_lights_070091C0.l, 1), - gsSPLight(&jrb_seg7_lights_070091C0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(jrb_seg7_vertex_07009258, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 3, 7, 0x0, 3, 5, 7, 0x0), @@ -667,22 +647,10 @@ const Gfx jrb_seg7_dl_07009B30[] = { }; // 0x07009C10 - 0x07009C28 -static const Lights1 jrb_seg7_lights_07009C10 = gdSPDefLights1( - 0x1e, 0x2c, 0x3a, - 0x79, 0xb2, 0xeb, 0x28, 0x28, 0x28 -); // 0x07009C28 - 0x07009C40 -static const Lights1 jrb_seg7_lights_07009C28 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07009C40 - 0x07009C58 -static const Lights1 jrb_seg7_lights_07009C40 = gdSPDefLights1( - 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x07009C58 - 0x07009D48 static const Vtx jrb_seg7_vertex_07009C58[] = { @@ -827,8 +795,8 @@ static const Gfx jrb_seg7_dl_0700A2F8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, water_09005800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&jrb_seg7_lights_07009C10.l, 1), - gsSPLight(&jrb_seg7_lights_07009C10.a, 2), + gsSPLightColor(LIGHT_1, 0x79b2ebff), + gsSPLightColor(LIGHT_2, 0x1e2c3aff), gsSPVertex(jrb_seg7_vertex_07009C58, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -847,8 +815,8 @@ static const Gfx jrb_seg7_dl_0700A3A8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, water_09000000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&jrb_seg7_lights_07009C28.l, 1), - gsSPLight(&jrb_seg7_lights_07009C28.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(jrb_seg7_vertex_07009E38, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 3, 5, 0x0, 6, 5, 7, 0x0), @@ -868,16 +836,16 @@ static const Gfx jrb_seg7_dl_0700A470[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, water_09000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPLight(&jrb_seg7_lights_07009C40.l, 1), - gsSPLight(&jrb_seg7_lights_07009C40.a, 2), + gsSPLightColor(LIGHT_1, 0xff), + gsSPLightColor(LIGHT_2, 0xff), gsSPVertex(jrb_seg7_vertex_07009FC8, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 0, 4, 3, 0x0, 4, 5, 6, 0x0), gsSP2Triangles( 4, 0, 5, 0x0, 7, 1, 3, 0x0), gsSP2Triangles( 7, 2, 1, 0x0, 6, 7, 3, 0x0), gsSP2Triangles( 0, 2, 5, 0x0, 6, 3, 4, 0x0), - gsSPLight(&jrb_seg7_lights_07009C28.l, 1), - gsSPLight(&jrb_seg7_lights_07009C28.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(jrb_seg7_vertex_0700A048, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), @@ -930,16 +898,8 @@ const Gfx jrb_seg7_dl_0700A608[] = { }; // 0x0700A6D8 - 0x0700A6F0 -static const Lights1 jrb_seg7_lights_0700A6D8 = gdSPDefLights1( - 0x1e, 0x2c, 0x3a, - 0x79, 0xb2, 0xeb, 0x28, 0x28, 0x28 -); // 0x0700A6F0 - 0x0700A708 -static const Lights1 jrb_seg7_lights_0700A6F0 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700A708 - 0x0700A748 static const Vtx jrb_seg7_vertex_0700A708[] = { @@ -1023,8 +983,8 @@ static const Gfx jrb_seg7_dl_0700AA98[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, water_09005800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&jrb_seg7_lights_0700A6D8.l, 1), - gsSPLight(&jrb_seg7_lights_0700A6D8.a, 2), + gsSPLightColor(LIGHT_1, 0x79b2ebff), + gsSPLightColor(LIGHT_2, 0x1e2c3aff), gsSPVertex(jrb_seg7_vertex_0700A708, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), gsSPEndDisplayList(), @@ -1035,8 +995,8 @@ static const Gfx jrb_seg7_dl_0700AAE0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, water_09000000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&jrb_seg7_lights_0700A6F0.l, 1), - gsSPLight(&jrb_seg7_lights_0700A6F0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(jrb_seg7_vertex_0700A748, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 6, 5, 0x0, 4, 7, 6, 0x0), diff --git a/levels/lll/areas/1/1/model.inc.c b/levels/lll/areas/1/1/model.inc.c index 9ec904f4..4eb004f7 100644 --- a/levels/lll/areas/1/1/model.inc.c +++ b/levels/lll/areas/1/1/model.inc.c @@ -895,8 +895,8 @@ static const Gfx lll_seg7_dl_070127D0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, fire_09001800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&lll_seg7_lights_0700FC78.l, 1), - gsSPLight(&lll_seg7_lights_0700FC78.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(lll_seg7_vertex_0700FC90, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), diff --git a/levels/lll/areas/1/10/model.inc.c b/levels/lll/areas/1/10/model.inc.c index 5bc2cb93..86ab2579 100644 --- a/levels/lll/areas/1/10/model.inc.c +++ b/levels/lll/areas/1/10/model.inc.c @@ -47,8 +47,8 @@ static const Gfx lll_seg7_dl_070164E0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, lll_seg7_texture_07005800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&lll_seg7_lights_0700FC00.l, 1), - gsSPLight(&lll_seg7_lights_0700FC00.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(lll_seg7_vertex_070162E0, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 0, 2, 4, 0x0, 0, 4, 5, 0x0), diff --git a/levels/lll/areas/1/11/model.inc.c b/levels/lll/areas/1/11/model.inc.c index 407a1d83..be154fc4 100644 --- a/levels/lll/areas/1/11/model.inc.c +++ b/levels/lll/areas/1/11/model.inc.c @@ -1,8 +1,4 @@ // 0x07016658 - 0x07016670 -static const Lights1 lll_seg7_lights_07016658 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07016670 - 0x07016770 static const Vtx lll_seg7_vertex_07016670[] = { @@ -69,8 +65,8 @@ static const Gfx lll_seg7_dl_07016930[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, fire_09003000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&lll_seg7_lights_07016658.l, 1), - gsSPLight(&lll_seg7_lights_07016658.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(lll_seg7_vertex_07016670, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 2, 0x0), gsSP2Triangles( 5, 0, 2, 0x0, 5, 2, 6, 0x0), diff --git a/levels/lll/areas/1/12/model.inc.c b/levels/lll/areas/1/12/model.inc.c index d01eca46..2961292f 100644 --- a/levels/lll/areas/1/12/model.inc.c +++ b/levels/lll/areas/1/12/model.inc.c @@ -145,8 +145,8 @@ static const Gfx lll_seg7_dl_07017250[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, fire_09004800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&lll_seg7_lights_0700FC00.l, 1), - gsSPLight(&lll_seg7_lights_0700FC00.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(lll_seg7_vertex_07016B70, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 4, 0x0), gsSP2Triangles( 0, 4, 1, 0x0, 0, 5, 6, 0x0), diff --git a/levels/lll/areas/1/13/model.inc.c b/levels/lll/areas/1/13/model.inc.c index b503acaf..0d9c94f8 100644 --- a/levels/lll/areas/1/13/model.inc.c +++ b/levels/lll/areas/1/13/model.inc.c @@ -1,8 +1,4 @@ // 0x07017578 - 0x07017590 -static const Lights1 lll_seg7_lights_07017578 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xfe, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07017590 - 0x07017650 static const Vtx lll_seg7_vertex_07017590[] = { @@ -55,8 +51,8 @@ static const Gfx lll_seg7_dl_070177B0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, fire_0900B800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&lll_seg7_lights_07017578.l, 1), - gsSPLight(&lll_seg7_lights_07017578.a, 2), + gsSPLightColor(LIGHT_1, 0xfeffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(lll_seg7_vertex_07017590, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), diff --git a/levels/lll/areas/1/14/model.inc.c b/levels/lll/areas/1/14/model.inc.c index e1dfc82e..5ea07f45 100644 --- a/levels/lll/areas/1/14/model.inc.c +++ b/levels/lll/areas/1/14/model.inc.c @@ -35,8 +35,8 @@ static const Gfx lll_seg7_dl_07017A78[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, fire_09006800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&lll_seg7_lights_0700FC00.l, 1), - gsSPLight(&lll_seg7_lights_0700FC00.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(lll_seg7_vertex_07017938, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), diff --git a/levels/lll/areas/1/2/model.inc.c b/levels/lll/areas/1/2/model.inc.c index 591b8270..18b591d1 100644 --- a/levels/lll/areas/1/2/model.inc.c +++ b/levels/lll/areas/1/2/model.inc.c @@ -1,8 +1,4 @@ // 0x07013620 - 0x07013638 -static const Lights1 lll_seg7_lights_07013620 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07013638 - 0x07013738 static const Vtx lll_seg7_vertex_07013638[] = { @@ -29,8 +25,8 @@ static const Gfx lll_seg7_dl_07013738[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, fire_09000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&lll_seg7_lights_07013620.l, 1), - gsSPLight(&lll_seg7_lights_07013620.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(lll_seg7_vertex_07013638, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 8, 0x0), diff --git a/levels/lll/areas/1/4/model.inc.c b/levels/lll/areas/1/4/model.inc.c index 1c4b9364..9b5259dd 100644 --- a/levels/lll/areas/1/4/model.inc.c +++ b/levels/lll/areas/1/4/model.inc.c @@ -61,8 +61,8 @@ static const Gfx lll_seg7_dl_07013C08[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, fire_0900A800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&lll_seg7_lights_0700FC00.l, 1), - gsSPLight(&lll_seg7_lights_0700FC00.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(lll_seg7_vertex_07013968, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 0, 2, 4, 0x0, 0, 5, 6, 0x0), diff --git a/levels/lll/areas/1/5/model.inc.c b/levels/lll/areas/1/5/model.inc.c index e01df248..c0b4fe1d 100644 --- a/levels/lll/areas/1/5/model.inc.c +++ b/levels/lll/areas/1/5/model.inc.c @@ -151,8 +151,8 @@ static const Gfx lll_seg7_dl_070144F8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, fire_09007800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&lll_seg7_lights_0700FC00.l, 1), - gsSPLight(&lll_seg7_lights_0700FC00.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(lll_seg7_vertex_07013DB8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), diff --git a/levels/lll/areas/1/6/model.inc.c b/levels/lll/areas/1/6/model.inc.c index 0d2ec803..6ad3e447 100644 --- a/levels/lll/areas/1/6/model.inc.c +++ b/levels/lll/areas/1/6/model.inc.c @@ -61,8 +61,8 @@ static const Gfx lll_seg7_dl_07014AB8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, fire_09007800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&lll_seg7_lights_0700FC00.l, 1), - gsSPLight(&lll_seg7_lights_0700FC00.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(lll_seg7_vertex_07014818, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), diff --git a/levels/lll/areas/1/7/model.inc.c b/levels/lll/areas/1/7/model.inc.c index 9523f6e4..875c9303 100644 --- a/levels/lll/areas/1/7/model.inc.c +++ b/levels/lll/areas/1/7/model.inc.c @@ -125,8 +125,8 @@ static const Gfx lll_seg7_dl_07015208[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, lll_seg7_texture_07004800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&lll_seg7_lights_0700FC00.l, 1), - gsSPLight(&lll_seg7_lights_0700FC00.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(lll_seg7_vertex_07014C68, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 0, 2, 4, 0x0, 0, 5, 6, 0x0), diff --git a/levels/lll/areas/1/8/model.inc.c b/levels/lll/areas/1/8/model.inc.c index 5bf9ac08..e5d06b56 100644 --- a/levels/lll/areas/1/8/model.inc.c +++ b/levels/lll/areas/1/8/model.inc.c @@ -133,8 +133,8 @@ static const Gfx lll_seg7_dl_07015B38[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, fire_09006800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&lll_seg7_lights_0700FC00.l, 1), - gsSPLight(&lll_seg7_lights_0700FC00.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(lll_seg7_vertex_070154F8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 3, 5, 7, 0x0), @@ -192,8 +192,8 @@ static const Gfx lll_seg7_dl_07015D18[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, fire_09000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&lll_seg7_lights_0700FC00.l, 1), - gsSPLight(&lll_seg7_lights_0700FC00.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(lll_seg7_vertex_07015858, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), diff --git a/levels/lll/areas/1/9/model.inc.c b/levels/lll/areas/1/9/model.inc.c index 632e9252..320585e1 100644 --- a/levels/lll/areas/1/9/model.inc.c +++ b/levels/lll/areas/1/9/model.inc.c @@ -61,8 +61,8 @@ static const Gfx lll_seg7_dl_07016130[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, fire_09005000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&lll_seg7_lights_0700FC00.l, 1), - gsSPLight(&lll_seg7_lights_0700FC00.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(lll_seg7_vertex_07015E90, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 0, 4, 1, 0x0, 0, 5, 6, 0x0), diff --git a/levels/lll/areas/1/light.inc.c b/levels/lll/areas/1/light.inc.c index bcd1d0ef..4a2526d3 100644 --- a/levels/lll/areas/1/light.inc.c +++ b/levels/lll/areas/1/light.inc.c @@ -1,35 +1,11 @@ // 0x0700FC00 - 0x0700FC18 -static const Lights1 lll_seg7_lights_0700FC00 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 lll_lights_unused1 = gdSPDefLights1( - 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x28, 0x28 -); // Unreferenced light group -UNUSED static const Lights1 lll_lights_unused2 = gdSPDefLights1( - 0x3f, 0x00, 0x00, - 0xff, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x0700FC48 - 0x0700FC60 -static const Lights1 lll_seg7_lights_0700FC48 = gdSPDefLights1( - 0x19, 0x19, 0x19, - 0x64, 0x64, 0x64, 0x28, 0x28, 0x28 -); // 0x0700FC60 - 0x0700FC78 -static const Lights1 lll_seg7_lights_0700FC60 = gdSPDefLights1( - 0x32, 0x32, 0x32, - 0xc8, 0xc8, 0xc8, 0x28, 0x28, 0x28 -); // 0x0700FC78 - 0x0700FC90 -static const Lights1 lll_seg7_lights_0700FC78 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); diff --git a/levels/lll/areas/2/2/model.inc.c b/levels/lll/areas/2/2/model.inc.c index cb781ef2..88e80d9a 100644 --- a/levels/lll/areas/2/2/model.inc.c +++ b/levels/lll/areas/2/2/model.inc.c @@ -1,8 +1,4 @@ // 0x070236E8 - 0x07023700 -static const Lights1 lll_seg7_lights_070236E8 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07023700 - 0x070237E0 static const Vtx lll_seg7_vertex_07023700[] = { @@ -320,8 +316,8 @@ static const Gfx lll_seg7_dl_07024630[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, lll_seg7_texture_0700D400), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&lll_seg7_lights_070236E8.l, 1), - gsSPLight(&lll_seg7_lights_070236E8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(lll_seg7_vertex_07023700, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), gsSP2Triangles( 0, 2, 4, 0x0, 0, 4, 5, 0x0), diff --git a/levels/lll/collapsing_wooden_platform/model.inc.c b/levels/lll/collapsing_wooden_platform/model.inc.c index fd5753b8..53718f58 100644 --- a/levels/lll/collapsing_wooden_platform/model.inc.c +++ b/levels/lll/collapsing_wooden_platform/model.inc.c @@ -31,8 +31,8 @@ static const Gfx lll_seg7_dl_070190B0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, fire_0900B800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&lll_seg7_lights_0700FC00.l, 1), - gsSPLight(&lll_seg7_lights_0700FC00.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(lll_seg7_vertex_07018F70, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), diff --git a/levels/lll/drawbridge_part/model.inc.c b/levels/lll/drawbridge_part/model.inc.c index 3541a741..e0277af8 100644 --- a/levels/lll/drawbridge_part/model.inc.c +++ b/levels/lll/drawbridge_part/model.inc.c @@ -43,8 +43,8 @@ static const Gfx lll_seg7_dl_07018570[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, lll_seg7_texture_07005000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&lll_seg7_lights_0700FC00.l, 1), - gsSPLight(&lll_seg7_lights_0700FC00.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(lll_seg7_vertex_070183F0, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), diff --git a/levels/lll/long_wooden_bridge/model.inc.c b/levels/lll/long_wooden_bridge/model.inc.c index 8fb4c82c..1eb80367 100644 --- a/levels/lll/long_wooden_bridge/model.inc.c +++ b/levels/lll/long_wooden_bridge/model.inc.c @@ -31,8 +31,8 @@ static const Gfx lll_seg7_dl_07019330[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, fire_0900B800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&lll_seg7_lights_0700FC00.l, 1), - gsSPLight(&lll_seg7_lights_0700FC00.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(lll_seg7_vertex_070191F0, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), diff --git a/levels/lll/moving_octagonal_mesh_platform/model.inc.c b/levels/lll/moving_octagonal_mesh_platform/model.inc.c index 839ee420..396262e8 100644 --- a/levels/lll/moving_octagonal_mesh_platform/model.inc.c +++ b/levels/lll/moving_octagonal_mesh_platform/model.inc.c @@ -60,8 +60,8 @@ static const Gfx lll_seg7_dl_07018280[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, fire_09000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&lll_seg7_lights_0700FC00.l, 1), - gsSPLight(&lll_seg7_lights_0700FC00.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(lll_seg7_vertex_07017FB0, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 3, 7, 6, 0x0), diff --git a/levels/lll/puzzle_piece/model.inc.c b/levels/lll/puzzle_piece/model.inc.c index ae934bdf..ac99d8bb 100644 --- a/levels/lll/puzzle_piece/model.inc.c +++ b/levels/lll/puzzle_piece/model.inc.c @@ -29,8 +29,8 @@ static const Gfx lll_seg7_sub_dl_bowser_puzzle_piece_begin[] = { // 0x0701A338 - 0x0701A388 static const Gfx lll_seg7_sub_dl_bowser_puzzle_piece_end[] = { - gsSPLight(&lll_seg7_lights_0700FC00.l, 1), - gsSPLight(&lll_seg7_lights_0700FC00.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(lll_seg7_vertex_puzzle_piece, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), diff --git a/levels/lll/rolling_log/model.inc.c b/levels/lll/rolling_log/model.inc.c index dd0e83c0..301594fe 100644 --- a/levels/lll/rolling_log/model.inc.c +++ b/levels/lll/rolling_log/model.inc.c @@ -1,8 +1,4 @@ // 0x0701A8E8 - 0x0701A900 -static const Lights1 lll_seg7_lights_0701A8E8 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xfe, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0701A900 - 0x0701A9F0 static const Vtx lll_seg7_vertex_0701A900[] = { @@ -75,8 +71,8 @@ static const Gfx lll_seg7_dl_0701AC20[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, fire_0900A800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&lll_seg7_lights_0701A8E8.l, 1), - gsSPLight(&lll_seg7_lights_0701A8E8.a, 2), + gsSPLightColor(LIGHT_1, 0xfeffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(lll_seg7_vertex_0701A900, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), diff --git a/levels/lll/rotating_block_fire_bars/model.inc.c b/levels/lll/rotating_block_fire_bars/model.inc.c index b02ed04e..83519fdc 100644 --- a/levels/lll/rotating_block_fire_bars/model.inc.c +++ b/levels/lll/rotating_block_fire_bars/model.inc.c @@ -53,8 +53,8 @@ static const Gfx lll_seg7_dl_07018968[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, lll_seg7_texture_07004000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&lll_seg7_lights_0700FC00.l, 1), - gsSPLight(&lll_seg7_lights_0700FC00.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(lll_seg7_vertex_07018708, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), diff --git a/levels/lll/rotating_hexagonal_ring/model.inc.c b/levels/lll/rotating_hexagonal_ring/model.inc.c index ede9e129..1c6bd1b4 100644 --- a/levels/lll/rotating_hexagonal_ring/model.inc.c +++ b/levels/lll/rotating_hexagonal_ring/model.inc.c @@ -87,8 +87,8 @@ static const Gfx lll_seg7_dl_07019870[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, lll_seg7_texture_07003000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&lll_seg7_lights_0700FC00.l, 1), - gsSPLight(&lll_seg7_lights_0700FC00.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(lll_seg7_vertex_07019470, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 1, 0x0), gsSP2Triangles( 3, 1, 0, 0x0, 5, 6, 7, 0x0), diff --git a/levels/lll/sinking_rectangular_platform/model.inc.c b/levels/lll/sinking_rectangular_platform/model.inc.c index d2d621e7..e94983e9 100644 --- a/levels/lll/sinking_rectangular_platform/model.inc.c +++ b/levels/lll/sinking_rectangular_platform/model.inc.c @@ -25,8 +25,8 @@ static const Gfx lll_seg7_dl_07019B78[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, fire_09004000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&lll_seg7_lights_0700FC00.l, 1), - gsSPLight(&lll_seg7_lights_0700FC00.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(lll_seg7_vertex_07019A98, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), diff --git a/levels/lll/sinking_rock_block/model.inc.c b/levels/lll/sinking_rock_block/model.inc.c index 5c07ae5b..d2c504df 100644 --- a/levels/lll/sinking_rock_block/model.inc.c +++ b/levels/lll/sinking_rock_block/model.inc.c @@ -1,8 +1,4 @@ // 0x0701A670 - 0x0701A688 -static const Lights1 lll_seg7_lights_0701A670 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xfe, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0701A688 - 0x0701A778 static const Vtx lll_seg7_vertex_0701A688[] = { @@ -39,8 +35,8 @@ static const Gfx lll_seg7_dl_0701A7E8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, fire_09002000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&lll_seg7_lights_0701A670.l, 1), - gsSPLight(&lll_seg7_lights_0701A670.a, 2), + gsSPLightColor(LIGHT_1, 0xfeffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(lll_seg7_vertex_0701A688, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), diff --git a/levels/lll/sinking_square_platform/model.inc.c b/levels/lll/sinking_square_platform/model.inc.c index ac18445d..9ed3d103 100644 --- a/levels/lll/sinking_square_platform/model.inc.c +++ b/levels/lll/sinking_square_platform/model.inc.c @@ -61,21 +61,21 @@ static const Gfx lll_seg7_dl_07019F20[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, fire_09004000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&lll_seg7_lights_0700FC48.l, 1), - gsSPLight(&lll_seg7_lights_0700FC48.a, 2), + gsSPLightColor(LIGHT_1, 0x646464ff), + gsSPLightColor(LIGHT_2, 0x191919ff), gsSPVertex(lll_seg7_vertex_07019C80, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 6, 7, 0x0, 2, 8, 9, 0x0), - gsSPLight(&lll_seg7_lights_0700FC60.l, 1), - gsSPLight(&lll_seg7_lights_0700FC60.a, 2), + gsSPLightColor(LIGHT_1, 0xc8c8c8ff), + gsSPLightColor(LIGHT_2, 0x323232ff), gsSPVertex(lll_seg7_vertex_07019D20, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 5, 7, 0x0, 8, 9, 10, 0x0), gsSP2Triangles( 9, 11, 12, 0x0, 13, 14, 15, 0x0), gsSPVertex(lll_seg7_vertex_07019E20, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), - gsSPLight(&lll_seg7_lights_0700FC00.l, 1), - gsSPLight(&lll_seg7_lights_0700FC00.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(lll_seg7_vertex_07019E80, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 4, 0x0), gsSP2Triangles( 5, 6, 7, 0x0, 8, 9, 7, 0x0), diff --git a/levels/lll/tilting_square_platform/model.inc.c b/levels/lll/tilting_square_platform/model.inc.c index 231bcb60..9c272c0a 100644 --- a/levels/lll/tilting_square_platform/model.inc.c +++ b/levels/lll/tilting_square_platform/model.inc.c @@ -36,8 +36,8 @@ static const Gfx lll_seg7_dl_0701A1A8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, fire_09004000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&lll_seg7_lights_0700FC00.l, 1), - gsSPLight(&lll_seg7_lights_0700FC00.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(lll_seg7_vertex_0701A120, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSPEndDisplayList(), diff --git a/levels/lll/wooden_float_large/model.inc.c b/levels/lll/wooden_float_large/model.inc.c index 516c8674..9bcfc525 100644 --- a/levels/lll/wooden_float_large/model.inc.c +++ b/levels/lll/wooden_float_large/model.inc.c @@ -31,8 +31,8 @@ static const Gfx lll_seg7_dl_07018E48[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, lll_seg7_texture_07000000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&lll_seg7_lights_0700FC00.l, 1), - gsSPLight(&lll_seg7_lights_0700FC00.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(lll_seg7_vertex_07018D08, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), diff --git a/levels/lll/wooden_float_small/model.inc.c b/levels/lll/wooden_float_small/model.inc.c index 28fbf6b3..b70b9e16 100644 --- a/levels/lll/wooden_float_small/model.inc.c +++ b/levels/lll/wooden_float_small/model.inc.c @@ -31,8 +31,8 @@ static const Gfx lll_seg7_dl_07018BE0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, lll_seg7_texture_07000000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&lll_seg7_lights_0700FC00.l, 1), - gsSPLight(&lll_seg7_lights_0700FC00.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(lll_seg7_vertex_07018AA0, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), diff --git a/levels/menu/leveldata.c b/levels/menu/leveldata.c index 56893d28..73643c0d 100644 --- a/levels/menu/leveldata.c +++ b/levels/menu/leveldata.c @@ -11,10 +11,6 @@ #include "make_const_nonconst.h" // 0x07000000 - 0x07000018 -static const Lights1 lights_menu_save_button = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07000018 - 0x07000818 ALIGNED8 static const Texture texture_menu_stone[] = { @@ -79,8 +75,8 @@ static const Gfx dl_tex_block_menu_save_button_base[] = { // 0x070031A0 - 0x07003218 static const Gfx dl_vertex_menu_save_button_borders[] = { - gsSPLight(&lights_menu_save_button.l, 1), - gsSPLight(&lights_menu_save_button.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), 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), @@ -126,8 +122,8 @@ static const Gfx dl_tex_block_menu_save_button_back[] = { // 0x070032E0 - 0x07003330 static const Gfx dl_vertex_menu_save_button_back[] = { - gsSPLight(&lights_menu_save_button.l, 1), - gsSPLight(&lights_menu_save_button.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), 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), @@ -179,8 +175,8 @@ const Gfx dl_menu_save_button_back[] = { const Gfx dl_menu_save_button_fade_back[] = { gsDPPipeSync(), gsSPClearGeometryMode(G_SHADING_SMOOTH), - gsSPLight(&lights_menu_save_button.l, 1), - gsSPLight(&lights_menu_save_button.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(vertex_menu_save_button_back, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), gsDPPipeSync(), @@ -189,10 +185,6 @@ const Gfx dl_menu_save_button_fade_back[] = { }; // 0x07003450 - 0x07003468 -static const Lights1 lights_menu_main_button = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07003468 - 0x07003468 ALIGNED8 static const Texture texture_menu_erase[] = { @@ -298,8 +290,8 @@ static const Vtx vertex_menu_main_button_group4[] = { // 0x07006038 - 0x07006150 static const Gfx dl_vertex_menu_main_button[] = { - gsSPLight(&lights_menu_main_button.l, 1), - gsSPLight(&lights_menu_main_button.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), 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), diff --git a/levels/pss/areas/1/1/model.inc.c b/levels/pss/areas/1/1/model.inc.c index f75d7164..1a561058 100644 --- a/levels/pss/areas/1/1/model.inc.c +++ b/levels/pss/areas/1/1/model.inc.c @@ -1,14 +1,6 @@ // 0x07001800 - 0x07001818 -static const Lights1 pss_seg7_lights_07001800 = gdSPDefLights1( - 0x23, 0x23, 0x23, - 0x8c, 0x8c, 0x8c, 0x28, 0x28, 0x28 -); // 0x07001818 - 0x07001830 -static const Lights1 pss_seg7_lights_07001818 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07001830 - 0x07001930 static const Vtx pss_seg7_vertex_07001830[] = { @@ -2199,8 +2191,8 @@ static const Gfx pss_seg7_dl_070083B0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mountain_0900C000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&pss_seg7_lights_07001800.l, 1), - gsSPLight(&pss_seg7_lights_07001800.a, 2), + gsSPLightColor(LIGHT_1, 0x8c8c8cff), + gsSPLightColor(LIGHT_2, 0x232323ff), gsSPVertex(pss_seg7_vertex_07001830, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), @@ -2218,8 +2210,8 @@ static const Gfx pss_seg7_dl_070083B0[] = { gsSPVertex(pss_seg7_vertex_07001A30, 5, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 1, 3, 0x0), gsSP1Triangle( 2, 3, 4, 0x0), - gsSPLight(&pss_seg7_lights_07001818.l, 1), - gsSPLight(&pss_seg7_lights_07001818.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(pss_seg7_vertex_07001A80, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 5, 4, 6, 0x0, 4, 0, 6, 0x0), diff --git a/levels/pss/areas/1/7/model.inc.c b/levels/pss/areas/1/7/model.inc.c index 0eee0ccd..90674c22 100644 --- a/levels/pss/areas/1/7/model.inc.c +++ b/levels/pss/areas/1/7/model.inc.c @@ -1,8 +1,4 @@ // 0x0700E348 - 0x0700E360 -static const Lights1 pss_seg7_lights_0700E348 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700E360 - 0x0700E3A0 static const Vtx pss_seg7_vertex_0700E360[] = { @@ -17,8 +13,8 @@ static const Gfx pss_seg7_dl_0700E3A0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, pss_seg7_texture_07001000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&pss_seg7_lights_0700E348.l, 1), - gsSPLight(&pss_seg7_lights_0700E348.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(pss_seg7_vertex_0700E360, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0), gsSPEndDisplayList(), diff --git a/levels/rr/flying_carpet/model.inc.c b/levels/rr/flying_carpet/model.inc.c index 42291134..bbe82085 100644 --- a/levels/rr/flying_carpet/model.inc.c +++ b/levels/rr/flying_carpet/model.inc.c @@ -1,10 +1,6 @@ // Not a traditional model file. The vertexes are generated in src/geo_misc.c. // 0x07019230 - 0x07019248 -static const Lights1 rr_seg7_lights_07019230 = gdSPDefLights1( - 0x5f, 0x5f, 0x5f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07019248 - 0x070192F0 const s16 flying_carpet_static_vertex_data[] = { @@ -45,8 +41,8 @@ const Gfx dl_flying_carpet_begin[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, texture_quarter_flying_carpet), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&rr_seg7_lights_07019230.l, 1), - gsSPLight(&rr_seg7_lights_07019230.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x5f5f5fff), gsSPEndDisplayList(), }; diff --git a/levels/rr/octagonal_platform/model.inc.c b/levels/rr/octagonal_platform/model.inc.c index b32a9398..b4b1fda3 100644 --- a/levels/rr/octagonal_platform/model.inc.c +++ b/levels/rr/octagonal_platform/model.inc.c @@ -1,8 +1,4 @@ // 0x0701A6F0 - 0x0701A708 -static const Lights1 rr_seg7_lights_0701A6F0 = gdSPDefLights1( - 0x55, 0x5f, 0x53, - 0xe3, 0xfe, 0xdf, 0x28, 0x28, 0x28 -); // 0x0701A708 - 0x0701A7F8 static const Vtx rr_seg7_vertex_0701A708[] = { @@ -77,8 +73,8 @@ static const Gfx rr_seg7_dl_0701AA48[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, sky_09001800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&rr_seg7_lights_0701A6F0.l, 1), - gsSPLight(&rr_seg7_lights_0701A6F0.a, 2), + gsSPLightColor(LIGHT_1, 0xe3fedfff), + gsSPLightColor(LIGHT_2, 0x555f53ff), gsSPVertex(rr_seg7_vertex_0701A708, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), diff --git a/levels/rr/rotating_bridge_platform/model.inc.c b/levels/rr/rotating_bridge_platform/model.inc.c index ff53998a..4e1fef2f 100644 --- a/levels/rr/rotating_bridge_platform/model.inc.c +++ b/levels/rr/rotating_bridge_platform/model.inc.c @@ -1,32 +1,12 @@ // 0x07019B68 - 0x07019B80 -static const Lights1 rr_seg7_lights_07019B68 = gdSPDefLights1( - 0x32, 0x32, 0x32, - 0xc8, 0xc8, 0xc8, 0x28, 0x28, 0x28 -); // 0x07019B80 - 0x07019B98 -static const Lights1 rr_seg7_lights_07019B80 = gdSPDefLights1( - 0x23, 0x2b, 0x14, - 0x8e, 0xac, 0x52, 0x28, 0x28, 0x28 -); // 0x07019B98 - 0x07019BB0 -static const Lights1 rr_seg7_lights_07019B98 = gdSPDefLights1( - 0x1f, 0x2b, 0x14, - 0x7f, 0xac, 0x52, 0x28, 0x28, 0x28 -); // 0x07019BB0 - 0x07019BC8 -static const Lights1 rr_seg7_lights_07019BB0 = gdSPDefLights1( - 0x2f, 0x2a, 0x0f, - 0xbf, 0xaa, 0x3f, 0x28, 0x28, 0x28 -); // 0x07019BC8 - 0x07019BE0 -static const Lights1 rr_seg7_lights_07019BC8 = gdSPDefLights1( - 0x14, 0x23, 0x2b, - 0x52, 0x8e, 0xac, 0x28, 0x28, 0x28 -); // 0x07019BE0 - 0x07019CD0 static const Vtx rr_seg7_vertex_07019BE0[] = { @@ -179,8 +159,8 @@ static const Gfx rr_seg7_dl_0701A2C0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, sky_09001800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&rr_seg7_lights_07019B68.l, 1), - gsSPLight(&rr_seg7_lights_07019B68.a, 2), + gsSPLightColor(LIGHT_1, 0xc8c8c8ff), + gsSPLightColor(LIGHT_2, 0x323232ff), gsSPVertex(rr_seg7_vertex_07019BE0, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -213,20 +193,20 @@ static const Gfx rr_seg7_dl_0701A3E0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, sky_09003000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&rr_seg7_lights_07019B80.l, 1), - gsSPLight(&rr_seg7_lights_07019B80.a, 2), + gsSPLightColor(LIGHT_1, 0x8eac52ff), + gsSPLightColor(LIGHT_2, 0x232b14ff), gsSPVertex(rr_seg7_vertex_07019EC0, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), - gsSPLight(&rr_seg7_lights_07019B98.l, 1), - gsSPLight(&rr_seg7_lights_07019B98.a, 2), + gsSPLightColor(LIGHT_1, 0x7fac52ff), + gsSPLightColor(LIGHT_2, 0x1f2b14ff), gsSPVertex(rr_seg7_vertex_07019F40, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), gsSP2Triangles( 7, 9, 10, 0x0, 11, 12, 13, 0x0), gsSP2Triangles(11, 13, 14, 0x0, 0, 2, 15, 0x0), - gsSPLight(&rr_seg7_lights_07019BB0.l, 1), - gsSPLight(&rr_seg7_lights_07019BB0.a, 2), + gsSPLightColor(LIGHT_1, 0xbfaa3fff), + gsSPLightColor(LIGHT_2, 0x2f2a0fff), gsSPVertex(rr_seg7_vertex_0701A040, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -240,8 +220,8 @@ static const Gfx rr_seg7_dl_0701A4E8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, sky_09002000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&rr_seg7_lights_07019BC8.l, 1), - gsSPLight(&rr_seg7_lights_07019BC8.a, 2), + gsSPLightColor(LIGHT_1, 0x528eacff), + gsSPLightColor(LIGHT_2, 0x14232bff), gsSPVertex(rr_seg7_vertex_0701A140, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), diff --git a/levels/sa/areas/1/1/model.inc.c b/levels/sa/areas/1/1/model.inc.c index e095828d..91cf719d 100644 --- a/levels/sa/areas/1/1/model.inc.c +++ b/levels/sa/areas/1/1/model.inc.c @@ -1,8 +1,4 @@ // 0x07000000 - 0x07000018 -static const Lights1 sa_lights = gdSPDefLights1( - 0x00, 0x7f, 0x99, - 0x00, 0xd4, 0xff, 0x28, 0x28, 0x28 -); // 0x07000018 - 0x070000D8 static const Vtx sa_vertex_07000018[] = { @@ -734,8 +730,8 @@ static const Gfx sa_dl_070023E8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, inside_0900B000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&sa_lights.l, 1), - gsSPLight(&sa_lights.a, 2), + gsSPLightColor(LIGHT_1, 0xd4ffff), + gsSPLightColor(LIGHT_2, 0x7f99ff), gsSPVertex(sa_vertex_07000018, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 0, 4, 5, 0x0, 0, 5, 1, 0x0), diff --git a/levels/sl/areas/1/1/model.inc.c b/levels/sl/areas/1/1/model.inc.c index 76e7404c..100055f5 100644 --- a/levels/sl/areas/1/1/model.inc.c +++ b/levels/sl/areas/1/1/model.inc.c @@ -1,14 +1,6 @@ // 0x07002800 - 0x07002818 -static const Lights1 sl_seg7_lights_07002800 = gdSPDefLights1( - 0x59, 0x59, 0x59, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07002818 - 0x07002830 -static const Lights1 sl_seg7_lights_07002818 = gdSPDefLights1( - 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x07002830 - 0x07002910 static const Vtx sl_seg7_vertex_07002830[] = { @@ -671,8 +663,8 @@ static const Gfx sl_seg7_dl_07004830[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, snow_09008800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&sl_seg7_lights_07002800.l, 1), - gsSPLight(&sl_seg7_lights_07002800.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x595959ff), gsSPVertex(sl_seg7_vertex_07002830, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 6, 5, 0x0, 7, 3, 8, 0x0), @@ -873,8 +865,8 @@ static const Gfx sl_seg7_dl_07004830[] = { gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 5, 4, 7, 0x0), gsSP1Triangle( 4, 8, 7, 0x0), - gsSPLight(&sl_seg7_lights_07002818.l, 1), - gsSPLight(&sl_seg7_lights_07002818.a, 2), + gsSPLightColor(LIGHT_1, 0xff), + gsSPLightColor(LIGHT_2, 0xff), gsSPVertex(sl_seg7_vertex_07004620, 5, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0), gsSP1Triangle( 3, 4, 0, 0x0), @@ -886,8 +878,8 @@ static const Gfx sl_seg7_dl_07005370[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, sl_seg7_texture_07000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&sl_seg7_lights_07002800.l, 1), - gsSPLight(&sl_seg7_lights_07002800.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x595959ff), gsSPVertex(sl_seg7_vertex_07004670, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), diff --git a/levels/sl/areas/1/2/model.inc.c b/levels/sl/areas/1/2/model.inc.c index 66e19e57..604633ae 100644 --- a/levels/sl/areas/1/2/model.inc.c +++ b/levels/sl/areas/1/2/model.inc.c @@ -1,8 +1,4 @@ // 0x07005520 - 0x07005538 -static const Lights1 sl_seg7_lights_07005520 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07005538 - 0x07005638 static const Vtx sl_seg7_vertex_07005538[] = { @@ -29,8 +25,8 @@ static const Gfx sl_seg7_dl_07005638[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, snow_09000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&sl_seg7_lights_07005520.l, 1), - gsSPLight(&sl_seg7_lights_07005520.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(sl_seg7_vertex_07005538, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), diff --git a/levels/sl/areas/1/3/model.inc.c b/levels/sl/areas/1/3/model.inc.c index c44cdd43..e28ed924 100644 --- a/levels/sl/areas/1/3/model.inc.c +++ b/levels/sl/areas/1/3/model.inc.c @@ -1,14 +1,6 @@ // 0x07005730 - 0x07005748 -static const Lights1 sl_seg7_lights_07005730 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07005748 - 0x07005760 -static const Lights1 sl_seg7_lights_07005748 = gdSPDefLights1( - 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x07005760 - 0x070057D0 static const Vtx sl_seg7_vertex_07005760[] = { @@ -476,13 +468,13 @@ static const Gfx sl_seg7_dl_07006D70[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, snow_09008800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&sl_seg7_lights_07005730.l, 1), - gsSPLight(&sl_seg7_lights_07005730.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(sl_seg7_vertex_07005760, 7, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP1Triangle( 3, 6, 4, 0x0), - gsSPLight(&sl_seg7_lights_07005748.l, 1), - gsSPLight(&sl_seg7_lights_07005748.a, 2), + gsSPLightColor(LIGHT_1, 0xff), + gsSPLightColor(LIGHT_2, 0xff), gsSPVertex(sl_seg7_vertex_070057D0, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSPEndDisplayList(), @@ -493,8 +485,8 @@ static const Gfx sl_seg7_dl_07006DE8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, snow_09005000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&sl_seg7_lights_07005730.l, 1), - gsSPLight(&sl_seg7_lights_07005730.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(sl_seg7_vertex_07005810, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), diff --git a/levels/sl/areas/1/5/model.inc.c b/levels/sl/areas/1/5/model.inc.c index 3ddc86d2..474ac66e 100644 --- a/levels/sl/areas/1/5/model.inc.c +++ b/levels/sl/areas/1/5/model.inc.c @@ -1,8 +1,4 @@ // 0x07007910 - 0x07007928 -static const Lights1 sl_seg7_lights_07007910 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07007928 - 0x07007A18 static const Vtx sl_seg7_vertex_07007928[] = { @@ -253,8 +249,8 @@ static const Gfx sl_seg7_dl_07008528[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, snow_09000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&sl_seg7_lights_07007910.l, 1), - gsSPLight(&sl_seg7_lights_07007910.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(sl_seg7_vertex_07007928, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), diff --git a/levels/sl/areas/1/6/model.inc.c b/levels/sl/areas/1/6/model.inc.c index 05d87a6f..6122f2c5 100644 --- a/levels/sl/areas/1/6/model.inc.c +++ b/levels/sl/areas/1/6/model.inc.c @@ -1,14 +1,6 @@ // 0x07008930 - 0x07008948 -static const Lights1 sl_seg7_lights_07008930 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07008948 - 0x07008960 -static const Lights1 sl_seg7_lights_07008948 = gdSPDefLights1( - 0x22, 0x17, 0x00, - 0x44, 0x2f, 0x00, 0x28, 0x28, 0x28 -); // 0x07008960 - 0x07008A60 static const Vtx sl_seg7_vertex_07008960[] = { @@ -76,8 +68,8 @@ static const Gfx sl_seg7_dl_07008C30[] = { gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, snow_09009800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&sl_seg7_lights_07008930.l, 1), - gsSPLight(&sl_seg7_lights_07008930.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(sl_seg7_vertex_07008960, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 3, 6, 7, 0x0), @@ -99,8 +91,8 @@ static const Gfx sl_seg7_dl_07008D10[] = { gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, snow_09009000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&sl_seg7_lights_07008948.l, 1), - gsSPLight(&sl_seg7_lights_07008948.a, 2), + gsSPLightColor(LIGHT_1, 0x442f00ff), + gsSPLightColor(LIGHT_2, 0x221700ff), gsSPVertex(sl_seg7_vertex_07008BF0, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSPEndDisplayList(), diff --git a/levels/sl/areas/1/7/model.inc.c b/levels/sl/areas/1/7/model.inc.c index 3f279607..b5b0f92e 100644 --- a/levels/sl/areas/1/7/model.inc.c +++ b/levels/sl/areas/1/7/model.inc.c @@ -1,8 +1,4 @@ // 0x07008DE8 - 0x07008E00 -static const Lights1 sl_seg7_lights_07008DE8 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07008E00 - 0x07008F00 static const Vtx sl_seg7_vertex_07008E00[] = { @@ -364,8 +360,8 @@ static const Gfx sl_seg7_dl_07009F30[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, snow_09003000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&sl_seg7_lights_07008DE8.l, 1), - gsSPLight(&sl_seg7_lights_07008DE8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(sl_seg7_vertex_07008E00, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 1, 0x0), gsSP2Triangles( 1, 4, 5, 0x0, 6, 1, 5, 0x0), diff --git a/levels/sl/areas/2/1/model.inc.c b/levels/sl/areas/2/1/model.inc.c index eb61d61e..ae51f0b4 100644 --- a/levels/sl/areas/2/1/model.inc.c +++ b/levels/sl/areas/2/1/model.inc.c @@ -1,14 +1,6 @@ // 0x0700A9B0 - 0x0700A9C8 -static const Lights1 sl_seg7_lights_0700A9B0 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700A9C8 - 0x0700A9E0 -static const Lights1 sl_seg7_lights_0700A9C8 = gdSPDefLights1( - 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x0700A9E0 - 0x0700AAE0 static const Vtx sl_seg7_vertex_0700A9E0[] = { @@ -281,8 +273,8 @@ static const Gfx sl_seg7_dl_0700B6C0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, snow_09008800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&sl_seg7_lights_0700A9B0.l, 1), - gsSPLight(&sl_seg7_lights_0700A9B0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(sl_seg7_vertex_0700A9E0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), @@ -346,8 +338,8 @@ static const Gfx sl_seg7_dl_0700B6C0[] = { gsSP2Triangles( 3, 6, 7, 0x0, 3, 7, 8, 0x0), gsSP2Triangles( 0, 9, 10, 0x0, 0, 11, 9, 0x0), gsSP1Triangle( 0, 2, 11, 0x0), - gsSPLight(&sl_seg7_lights_0700A9C8.l, 1), - gsSPLight(&sl_seg7_lights_0700A9C8.a, 2), + gsSPLightColor(LIGHT_1, 0xff), + gsSPLightColor(LIGHT_2, 0xff), gsSPVertex(sl_seg7_vertex_0700B5D0, 5, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 4, 0x0), gsSP1Triangle( 0, 4, 1, 0x0), @@ -359,8 +351,8 @@ static const Gfx sl_seg7_dl_0700BA70[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, snow_09001000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&sl_seg7_lights_0700A9B0.l, 1), - gsSPLight(&sl_seg7_lights_0700A9B0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(sl_seg7_vertex_0700B620, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 2, 1, 0x0, 4, 1, 5, 0x0), diff --git a/levels/sl/areas/2/2/model.inc.c b/levels/sl/areas/2/2/model.inc.c index cf76e3a4..5d1135bc 100644 --- a/levels/sl/areas/2/2/model.inc.c +++ b/levels/sl/areas/2/2/model.inc.c @@ -1,8 +1,4 @@ // 0x0700BB68 - 0x0700BB80 -static const Lights1 sl_seg7_lights_0700BB68 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700BB80 - 0x0700BC80 static const Vtx sl_seg7_vertex_0700BB80[] = { @@ -29,8 +25,8 @@ static const Gfx sl_seg7_dl_0700BC80[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, snow_09008000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&sl_seg7_lights_0700BB68.l, 1), - gsSPLight(&sl_seg7_lights_0700BB68.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(sl_seg7_vertex_0700BB80, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), diff --git a/levels/sl/areas/2/3/model.inc.c b/levels/sl/areas/2/3/model.inc.c index 780216d5..c14658ec 100644 --- a/levels/sl/areas/2/3/model.inc.c +++ b/levels/sl/areas/2/3/model.inc.c @@ -1,8 +1,4 @@ // 0x0700BD68 - 0x0700BD80 -static const Lights1 sl_seg7_lights_0700BD68 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700BD80 - 0x0700BE70 static const Vtx sl_seg7_vertex_0700BD80[] = { @@ -207,8 +203,8 @@ static const Gfx sl_seg7_dl_0700C720[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, snow_09000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&sl_seg7_lights_0700BD68.l, 1), - gsSPLight(&sl_seg7_lights_0700BD68.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(sl_seg7_vertex_0700BD80, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), diff --git a/levels/sl/areas/2/4/model.inc.c b/levels/sl/areas/2/4/model.inc.c index b4651412..126906cc 100644 --- a/levels/sl/areas/2/4/model.inc.c +++ b/levels/sl/areas/2/4/model.inc.c @@ -1,8 +1,4 @@ // 0x0700CA68 - 0x0700CA80 -static const Lights1 sl_seg7_lights_0700CA68 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700CA80 - 0x0700CB00 static const Vtx sl_seg7_vertex_0700CA80[] = { @@ -21,8 +17,8 @@ static const Gfx sl_seg7_dl_0700CB00[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, snow_09000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&sl_seg7_lights_0700CA68.l, 1), - gsSPLight(&sl_seg7_lights_0700CA68.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(sl_seg7_vertex_0700CA80, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), diff --git a/levels/sl/snow_mound/model.inc.c b/levels/sl/snow_mound/model.inc.c index e8ae22a3..8a25ce35 100644 --- a/levels/sl/snow_mound/model.inc.c +++ b/levels/sl/snow_mound/model.inc.c @@ -1,8 +1,4 @@ // 0x0700A620 - 0x0700A638 -static const Lights1 sl_seg7_lights_0700A620 = gdSPDefLights1( - 0x73, 0x73, 0x73, - 0xe6, 0xe6, 0xe6, 0x28, 0x28, 0x28 -); // 0x0700A638 - 0x0700A718 static const Vtx sl_seg7_vertex_0700A638[] = { @@ -27,8 +23,8 @@ static const Gfx sl_seg7_dl_0700A718[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, snow_09008800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&sl_seg7_lights_0700A620.l, 1), - gsSPLight(&sl_seg7_lights_0700A620.a, 2), + gsSPLightColor(LIGHT_1, 0xe6e6e6ff), + gsSPLightColor(LIGHT_2, 0x737373ff), gsSPVertex(sl_seg7_vertex_0700A638, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), diff --git a/levels/sl/unused_cracked_ice/model.inc.c b/levels/sl/unused_cracked_ice/model.inc.c index a63b6546..689901d6 100644 --- a/levels/sl/unused_cracked_ice/model.inc.c +++ b/levels/sl/unused_cracked_ice/model.inc.c @@ -1,8 +1,4 @@ // 0x0700A7F0 - 0x0700A808 -static const Lights1 sl_seg7_lights_0700A7F0 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700A808 - 0x0700A848 static const Vtx sl_seg7_vertex_0700A808[] = { @@ -17,8 +13,8 @@ static const Gfx sl_seg7_dl_0700A848[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, sl_seg7_texture_07001000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&sl_seg7_lights_0700A7F0.l, 1), - gsSPLight(&sl_seg7_lights_0700A7F0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(sl_seg7_vertex_0700A808, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), gsSPEndDisplayList(), diff --git a/levels/sl/unused_ice_shard/model.inc.c b/levels/sl/unused_ice_shard/model.inc.c index ea45f50d..d7ce5f38 100644 --- a/levels/sl/unused_ice_shard/model.inc.c +++ b/levels/sl/unused_ice_shard/model.inc.c @@ -1,8 +1,4 @@ // 0x0700A910 - 0x0700A928 -static const Lights1 sl_seg7_lights_0700A910 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700A928 - 0x0700A958 static const Vtx sl_seg7_vertex_0700A928[] = { @@ -13,8 +9,8 @@ static const Vtx sl_seg7_vertex_0700A928[] = { // 0x0700A958 - 0x0700A980 static const Gfx sl_seg7_dl_0700A958[] = { - gsSPLight(&sl_seg7_lights_0700A910.l, 1), - gsSPLight(&sl_seg7_lights_0700A910.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(sl_seg7_vertex_0700A928, 3, 0), gsSP1Triangle( 0, 1, 2, 0x0), gsSPEndDisplayList(), diff --git a/levels/ssl/areas/1/1/model.inc.c b/levels/ssl/areas/1/1/model.inc.c index 34af24ff..a06e0029 100644 --- a/levels/ssl/areas/1/1/model.inc.c +++ b/levels/ssl/areas/1/1/model.inc.c @@ -1,26 +1,10 @@ // 0x07004BE0 - 0x07004BF8 -static const Lights1 ssl_seg7_lights_07004BE0 = gdSPDefLights1( - 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x07004BF8 - 0x07004C10 -static const Lights1 ssl_seg7_lights_07004BF8 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07004C10 - 0x07004C28 -static const Lights1 ssl_seg7_lights_07004C10 = gdSPDefLights1( - 0x0c, 0x0c, 0x0c, - 0x32, 0x32, 0x32, 0x28, 0x28, 0x28 -); // 0x07004C28 - 0x07004C40 -static const Lights1 ssl_seg7_lights_07004C28 = gdSPDefLights1( - 0x19, 0x19, 0x19, - 0x64, 0x64, 0x64, 0x28, 0x28, 0x28 -); // 0x07004C40 - 0x07004C80 static const Vtx ssl_seg7_vertex_07004C40[] = { @@ -1343,12 +1327,12 @@ static const Gfx ssl_seg7_dl_07008C40[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, generic_0900A800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ssl_seg7_lights_07004BE0.l, 1), - gsSPLight(&ssl_seg7_lights_07004BE0.a, 2), + gsSPLightColor(LIGHT_1, 0xff), + gsSPLightColor(LIGHT_2, 0xff), gsSPVertex(ssl_seg7_vertex_07004C40, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - gsSPLight(&ssl_seg7_lights_07004BF8.l, 1), - gsSPLight(&ssl_seg7_lights_07004BF8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(ssl_seg7_vertex_07004C80, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), @@ -1367,12 +1351,12 @@ static const Gfx ssl_seg7_dl_07008C40[] = { gsSP2Triangles(10, 9, 3, 0x0, 10, 7, 9, 0x0), gsSP2Triangles(10, 11, 5, 0x0, 7, 10, 5, 0x0), gsSP2Triangles(12, 13, 14, 0x0, 12, 14, 15, 0x0), - gsSPLight(&ssl_seg7_lights_07004C10.l, 1), - gsSPLight(&ssl_seg7_lights_07004C10.a, 2), + gsSPLightColor(LIGHT_1, 0x323232ff), + gsSPLightColor(LIGHT_2, 0xc0c0cff), gsSPVertex(ssl_seg7_vertex_07004F60, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), - gsSPLight(&ssl_seg7_lights_07004C28.l, 1), - gsSPLight(&ssl_seg7_lights_07004C28.a, 2), + gsSPLightColor(LIGHT_1, 0x646464ff), + gsSPLightColor(LIGHT_2, 0x191919ff), gsSPVertex(ssl_seg7_vertex_07004FA0, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), @@ -1383,8 +1367,8 @@ static const Gfx ssl_seg7_dl_07008DE0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, generic_09003000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ssl_seg7_lights_07004BF8.l, 1), - gsSPLight(&ssl_seg7_lights_07004BF8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(ssl_seg7_vertex_07004FE0, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -1500,8 +1484,8 @@ static const Gfx ssl_seg7_dl_07009170[] = { gsSPVertex(ssl_seg7_vertex_070063F0, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), - gsSPLight(&ssl_seg7_lights_07004C10.l, 1), - gsSPLight(&ssl_seg7_lights_07004C10.a, 2), + gsSPLightColor(LIGHT_1, 0x323232ff), + gsSPLightColor(LIGHT_2, 0xc0c0cff), gsSPVertex(ssl_seg7_vertex_07006470, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), @@ -1518,8 +1502,8 @@ static const Gfx ssl_seg7_dl_07009410[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, generic_09004000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ssl_seg7_lights_07004BF8.l, 1), - gsSPLight(&ssl_seg7_lights_07004BF8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(ssl_seg7_vertex_070065D0, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), diff --git a/levels/ssl/areas/1/2/model.inc.c b/levels/ssl/areas/1/2/model.inc.c index a24d4141..29acf4fe 100644 --- a/levels/ssl/areas/1/2/model.inc.c +++ b/levels/ssl/areas/1/2/model.inc.c @@ -1,8 +1,4 @@ // 0x0700A020 - 0x0700A038 -static const Lights1 ssl_seg7_lights_0700A020 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700A038 - 0x0700A138 static const Vtx ssl_seg7_vertex_0700A038[] = { @@ -388,8 +384,8 @@ static const Gfx ssl_seg7_dl_0700B2E8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, generic_09008000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ssl_seg7_lights_0700A020.l, 1), - gsSPLight(&ssl_seg7_lights_0700A020.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(ssl_seg7_vertex_0700A038, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 0, 2, 4, 0x0, 0, 5, 3, 0x0), diff --git a/levels/ssl/areas/1/3/model.inc.c b/levels/ssl/areas/1/3/model.inc.c index 92b831d4..a32e66a3 100644 --- a/levels/ssl/areas/1/3/model.inc.c +++ b/levels/ssl/areas/1/3/model.inc.c @@ -1,8 +1,4 @@ // 0x0700BAD8 - 0x0700BAF0 -static const Lights1 ssl_seg7_lights_0700BAD8 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700BAF0 - 0x0700BBB0 static const Vtx ssl_seg7_vertex_0700BAF0[] = { @@ -25,8 +21,8 @@ static const Gfx ssl_seg7_dl_0700BBB0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, generic_09000000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ssl_seg7_lights_0700BAD8.l, 1), - gsSPLight(&ssl_seg7_lights_0700BAD8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(ssl_seg7_vertex_0700BAF0, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), diff --git a/levels/ssl/areas/2/1/model.inc.c b/levels/ssl/areas/2/1/model.inc.c index 5db0c6a2..077c429a 100644 --- a/levels/ssl/areas/2/1/model.inc.c +++ b/levels/ssl/areas/2/1/model.inc.c @@ -1,32 +1,12 @@ // 0x07012BD0 - 0x07012BE8 -static const Lights1 ssl_seg7_lights_07012BD0 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07012BE8 - 0x07012C00 -static const Lights1 ssl_seg7_lights_07012BE8 = gdSPDefLights1( - 0x46, 0x46, 0x46, - 0x8c, 0x8c, 0x8c, 0x28, 0x28, 0x28 -); // 0x07012C00 - 0x07012C18 -static const Lights1 ssl_seg7_lights_07012C00 = gdSPDefLights1( - 0x33, 0x33, 0x33, - 0x66, 0x66, 0x66, 0x28, 0x28, 0x28 -); // 0x07012C18 - 0x07012C30 -static const Lights1 ssl_seg7_lights_07012C18 = gdSPDefLights1( - 0x4b, 0x4b, 0x4b, - 0x96, 0x96, 0x96, 0x28, 0x28, 0x28 -); // 0x07012C30 - 0x07012C48 -static const Lights1 ssl_seg7_lights_07012C30 = gdSPDefLights1( - 0x64, 0x64, 0x64, - 0xc8, 0xc8, 0xc8, 0x28, 0x28, 0x28 -); // 0x07012C48 - 0x07012CC8 static const Vtx ssl_seg7_vertex_07012C48[] = { @@ -3074,20 +3054,20 @@ static const Gfx ssl_seg7_dl_0701C198[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, generic_0900A800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ssl_seg7_lights_07012BD0.l, 1), - gsSPLight(&ssl_seg7_lights_07012BD0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ssl_seg7_vertex_07012C48, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), - gsSPLight(&ssl_seg7_lights_07012BE8.l, 1), - gsSPLight(&ssl_seg7_lights_07012BE8.a, 2), + gsSPLightColor(LIGHT_1, 0x8c8c8cff), + gsSPLightColor(LIGHT_2, 0x464646ff), gsSPVertex(ssl_seg7_vertex_07012CC8, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 4, 0x0), gsSP2Triangles( 0, 3, 1, 0x0, 1, 5, 2, 0x0), gsSP2Triangles( 1, 6, 5, 0x0, 3, 4, 7, 0x0), gsSP2Triangles( 5, 7, 4, 0x0, 5, 6, 7, 0x0), - gsSPLight(&ssl_seg7_lights_07012BD0.l, 1), - gsSPLight(&ssl_seg7_lights_07012BD0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ssl_seg7_vertex_07012D48, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0), gsSP2Triangles( 3, 4, 0, 0x0, 3, 5, 4, 0x0), @@ -3097,8 +3077,8 @@ static const Gfx ssl_seg7_dl_0701C198[] = { gsSP2Triangles(12, 13, 14, 0x0, 12, 15, 13, 0x0), gsSPVertex(ssl_seg7_vertex_07012E48, 3, 0), gsSP1Triangle( 0, 1, 2, 0x0), - gsSPLight(&ssl_seg7_lights_07012C00.l, 1), - gsSPLight(&ssl_seg7_lights_07012C00.a, 2), + gsSPLightColor(LIGHT_1, 0x666666ff), + gsSPLightColor(LIGHT_2, 0x333333ff), gsSPVertex(ssl_seg7_vertex_07012E78, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -3112,8 +3092,8 @@ static const Gfx ssl_seg7_dl_0701C198[] = { gsSP2Triangles(11, 10, 9, 0x0, 11, 4, 10, 0x0), gsSP2Triangles( 0, 2, 12, 0x0, 13, 14, 15, 0x0), gsSP2Triangles(12, 2, 14, 0x0, 13, 12, 14, 0x0), - gsSPLight(&ssl_seg7_lights_07012C18.l, 1), - gsSPLight(&ssl_seg7_lights_07012C18.a, 2), + gsSPLightColor(LIGHT_1, 0x969696ff), + gsSPLightColor(LIGHT_2, 0x4b4b4bff), gsSPVertex(ssl_seg7_vertex_07013068, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 4, 7, 8, 0x0), @@ -3211,8 +3191,8 @@ static const Gfx ssl_seg7_dl_0701C198[] = { gsSP2Triangles( 2, 5, 0, 0x0, 6, 1, 4, 0x0), gsSP2Triangles( 6, 4, 7, 0x0, 8, 9, 10, 0x0), gsSP2Triangles( 8, 11, 9, 0x0, 12, 11, 8, 0x0), - gsSPLight(&ssl_seg7_lights_07012BD0.l, 1), - gsSPLight(&ssl_seg7_lights_07012BD0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ssl_seg7_vertex_07014098, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -3371,21 +3351,21 @@ static const Gfx ssl_seg7_dl_0701D060[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, generic_09000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ssl_seg7_lights_07012C00.l, 1), - gsSPLight(&ssl_seg7_lights_07012C00.a, 2), + gsSPLightColor(LIGHT_1, 0x666666ff), + gsSPLightColor(LIGHT_2, 0x333333ff), gsSPVertex(ssl_seg7_vertex_07015B48, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 3, 4, 1, 0x0, 3, 5, 4, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 6, 9, 7, 0x0), - gsSPLight(&ssl_seg7_lights_07012C30.l, 1), - gsSPLight(&ssl_seg7_lights_07012C30.a, 2), + gsSPLightColor(LIGHT_1, 0xc8c8c8ff), + gsSPLightColor(LIGHT_2, 0x646464ff), gsSPVertex(ssl_seg7_vertex_07015BE8, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 6, 5, 0x0, 7, 8, 9, 0x0), gsSP2Triangles( 7, 10, 8, 0x0, 11, 12, 13, 0x0), gsSP2Triangles(11, 14, 12, 0x0, 1, 15, 2, 0x0), - gsSPLight(&ssl_seg7_lights_07012C18.l, 1), - gsSPLight(&ssl_seg7_lights_07012C18.a, 2), + gsSPLightColor(LIGHT_1, 0x969696ff), + gsSPLightColor(LIGHT_2, 0x4b4b4bff), gsSPVertex(ssl_seg7_vertex_07015CE8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -3487,8 +3467,8 @@ static const Gfx ssl_seg7_dl_0701D060[] = { gsSP1Triangle( 0, 2, 14, 0x0), gsSPVertex(ssl_seg7_vertex_07016FB8, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - gsSPLight(&ssl_seg7_lights_07012BD0.l, 1), - gsSPLight(&ssl_seg7_lights_07012BD0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ssl_seg7_vertex_07016FF8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), diff --git a/levels/ssl/areas/2/4/model.inc.c b/levels/ssl/areas/2/4/model.inc.c index d733fbc5..f7960f71 100644 --- a/levels/ssl/areas/2/4/model.inc.c +++ b/levels/ssl/areas/2/4/model.inc.c @@ -1,10 +1,6 @@ // Quicksand Pit // 0x07004000 - 0x07004018 -static const Lights1 ssl_lights_quicksand_pit = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07004018 - 0x07004818 ALIGNED8 const Texture ssl_quicksand[] = { @@ -15,8 +11,8 @@ ALIGNED8 const Texture ssl_quicksand[] = { const Gfx ssl_dl_quicksand_pit_begin[] = { gsDPPipeSync(), gsDPSetCombineMode(G_CC_MODULATERGB, G_CC_MODULATERGB), - gsSPLight(&ssl_lights_quicksand_pit.l, 1), - gsSPLight(&ssl_lights_quicksand_pit.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), gsDPTileSync(), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, 5, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, 5, G_TX_NOLOD), @@ -42,8 +38,8 @@ const Gfx ssl_dl_pyramid_quicksand_pit_begin[] = { gsSPFogFactor(0x0E49, 0xF2B7), // This isn't gsSPFogPosition since there is no valid min/max pair that corresponds to 0x0E49F2B7 gsSPSetGeometryMode(G_FOG), gsDPSetCombineMode(G_CC_MODULATERGB, G_CC_PASS2), - gsSPLight(&ssl_lights_quicksand_pit.l, 1), - gsSPLight(&ssl_lights_quicksand_pit.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), gsDPTileSync(), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, 5, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, 5, G_TX_NOLOD), @@ -119,8 +115,8 @@ const Gfx ssl_dl_pyramid_quicksand_pit_static[] = { gsSPFogFactor(0x0E49, 0xF2B7), // This isn't gsSPFogPosition since there is no valid min/max pair that corresponds to 0x0E49F2B7 gsSPSetGeometryMode(G_FOG), gsDPSetCombineMode(G_CC_MODULATERGB, G_CC_PASS2), - gsSPLight(&ssl_lights_quicksand_pit.l, 1), - gsSPLight(&ssl_lights_quicksand_pit.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), gsDPLoadTextureBlock(ssl_pyramid_sand, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_WRAP | G_TX_NOMIRROR, 5, 5, G_TX_NOLOD, G_TX_NOLOD), gsSPVertex(ssl_seg7_vertex_07004A70, 7, 0), diff --git a/levels/ssl/areas/3/1/model.inc.c b/levels/ssl/areas/3/1/model.inc.c index eaa234c3..fd063ac4 100644 --- a/levels/ssl/areas/3/1/model.inc.c +++ b/levels/ssl/areas/3/1/model.inc.c @@ -1,14 +1,6 @@ // 0x0701FD60 - 0x0701FD78 -static const Lights1 ssl_seg7_lights_0701FD60 = gdSPDefLights1( - 0x46, 0x46, 0x46, - 0x8c, 0x8c, 0x8c, 0x28, 0x28, 0x28 -); // 0x0701FD78 - 0x0701FD90 -static const Lights1 ssl_seg7_lights_0701FD78 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0701FD90 - 0x0701FE50 static const Vtx ssl_seg7_vertex_0701FD90[] = { @@ -451,14 +443,14 @@ static const Gfx ssl_seg7_dl_07021290[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, generic_09000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ssl_seg7_lights_0701FD60.l, 1), - gsSPLight(&ssl_seg7_lights_0701FD60.a, 2), + gsSPLightColor(LIGHT_1, 0x8c8c8cff), + gsSPLightColor(LIGHT_2, 0x464646ff), gsSPVertex(ssl_seg7_vertex_0701FD90, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), gsSP2Triangles( 8, 9, 10, 0x0, 8, 11, 9, 0x0), - gsSPLight(&ssl_seg7_lights_0701FD78.l, 1), - gsSPLight(&ssl_seg7_lights_0701FD78.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ssl_seg7_vertex_0701FE50, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), @@ -505,15 +497,15 @@ static const Gfx ssl_seg7_dl_070214E8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, generic_0900A800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ssl_seg7_lights_0701FD60.l, 1), - gsSPLight(&ssl_seg7_lights_0701FD60.a, 2), + gsSPLightColor(LIGHT_1, 0x8c8c8cff), + gsSPLightColor(LIGHT_2, 0x464646ff), gsSPVertex(ssl_seg7_vertex_07020550, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 4, 0x0), gsSP2Triangles( 0, 3, 1, 0x0, 1, 5, 2, 0x0), gsSP2Triangles( 1, 6, 5, 0x0, 3, 4, 7, 0x0), gsSP2Triangles( 5, 7, 4, 0x0, 5, 6, 7, 0x0), - gsSPLight(&ssl_seg7_lights_0701FD78.l, 1), - gsSPLight(&ssl_seg7_lights_0701FD78.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ssl_seg7_vertex_070205D0, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), @@ -537,8 +529,8 @@ static const Gfx ssl_seg7_dl_07021638[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, generic_09001000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ssl_seg7_lights_0701FD60.l, 1), - gsSPLight(&ssl_seg7_lights_0701FD60.a, 2), + gsSPLightColor(LIGHT_1, 0x8c8c8cff), + gsSPLightColor(LIGHT_2, 0x464646ff), gsSPVertex(ssl_seg7_vertex_07020870, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -550,8 +542,8 @@ static const Gfx ssl_seg7_dl_07021638[] = { gsSP2Triangles( 3, 6, 4, 0x0, 6, 7, 4, 0x0), gsSP2Triangles( 8, 9, 10, 0x0, 8, 10, 11, 0x0), gsSP1Triangle( 0, 2, 12, 0x0), - gsSPLight(&ssl_seg7_lights_0701FD78.l, 1), - gsSPLight(&ssl_seg7_lights_0701FD78.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ssl_seg7_vertex_07020A20, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 4, 7, 8, 0x0), diff --git a/levels/ssl/areas/3/2/model.inc.c b/levels/ssl/areas/3/2/model.inc.c index e93fb42a..e5968b87 100644 --- a/levels/ssl/areas/3/2/model.inc.c +++ b/levels/ssl/areas/3/2/model.inc.c @@ -1,8 +1,4 @@ // 0x07021AC8 - 0x07021AE0 -static const Lights1 ssl_seg7_lights_07021AC8 = gdSPDefLights1( - 0x46, 0x46, 0x46, - 0x8c, 0x8c, 0x8c, 0x28, 0x28, 0x28 -); // 0x07021AE0 - 0x07021BA0 static const Vtx ssl_seg7_vertex_07021AE0[] = { @@ -55,8 +51,8 @@ static const Gfx ssl_seg7_dl_07021D00[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, generic_09000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ssl_seg7_lights_07021AC8.l, 1), - gsSPLight(&ssl_seg7_lights_07021AC8.a, 2), + gsSPLightColor(LIGHT_1, 0x8c8c8cff), + gsSPLightColor(LIGHT_2, 0x464646ff), gsSPVertex(ssl_seg7_vertex_07021AE0, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), diff --git a/levels/ssl/grindel/model.inc.c b/levels/ssl/grindel/model.inc.c index f59bead7..fcf974d1 100644 --- a/levels/ssl/grindel/model.inc.c +++ b/levels/ssl/grindel/model.inc.c @@ -1,8 +1,4 @@ // 0x07021E50 - 0x07021E68 -static const Lights1 ssl_seg7_lights_07021E50 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07021E68 - 0x07021EE8 static const Vtx ssl_seg7_vertex_07021E68[] = { @@ -41,8 +37,8 @@ static const Gfx ssl_seg7_dl_07021FE8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, generic_09002000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ssl_seg7_lights_07021E50.l, 1), - gsSPLight(&ssl_seg7_lights_07021E50.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ssl_seg7_vertex_07021E68, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), diff --git a/levels/ssl/moving_pyramid_wall/model.inc.c b/levels/ssl/moving_pyramid_wall/model.inc.c index 385e1fad..7bc92032 100644 --- a/levels/ssl/moving_pyramid_wall/model.inc.c +++ b/levels/ssl/moving_pyramid_wall/model.inc.c @@ -1,8 +1,4 @@ // 0x07022AA0 - 0x07022AB8 -static const Lights1 ssl_seg7_lights_07022AA0 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07022AB8 - 0x07022BB8 static const Vtx ssl_seg7_vertex_07022AB8[] = { @@ -41,8 +37,8 @@ static const Gfx ssl_seg7_dl_07022C38[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, generic_09000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ssl_seg7_lights_07022AA0.l, 1), - gsSPLight(&ssl_seg7_lights_07022AA0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ssl_seg7_vertex_07022AB8, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), diff --git a/levels/ssl/pyramid_elevator/model.inc.c b/levels/ssl/pyramid_elevator/model.inc.c index 89a40498..ff57e592 100644 --- a/levels/ssl/pyramid_elevator/model.inc.c +++ b/levels/ssl/pyramid_elevator/model.inc.c @@ -1,8 +1,4 @@ // 0x07022DA8 - 0x07022DC0 -static const Lights1 ssl_seg7_lights_07022DA8 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07022DC0 - 0x07022E80 static const Vtx ssl_seg7_vertex_07022DC0[] = { @@ -94,8 +90,8 @@ static const Gfx ssl_seg7_dl_070231D0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, generic_0900A800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ssl_seg7_lights_07022DA8.l, 1), - gsSPLight(&ssl_seg7_lights_07022DA8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ssl_seg7_vertex_07022DC0, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 3, 0, 0x0, 1, 3, 5, 0x0), diff --git a/levels/ssl/pyramid_top/model.inc.c b/levels/ssl/pyramid_top/model.inc.c index c2210c66..74bc4524 100644 --- a/levels/ssl/pyramid_top/model.inc.c +++ b/levels/ssl/pyramid_top/model.inc.c @@ -1,8 +1,4 @@ // 0x0700BD70 - 0x0700BD88 -static const Lights1 ssl_seg7_lights_0700BD70 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700BD88 - 0x0700BE48 static const Vtx ssl_seg7_vertex_0700BD88[] = { @@ -33,8 +29,8 @@ static const Gfx ssl_seg7_dl_0700BE88[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, generic_09000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ssl_seg7_lights_0700BD70.l, 1), - gsSPLight(&ssl_seg7_lights_0700BD70.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(ssl_seg7_vertex_0700BD88, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), diff --git a/levels/ssl/spindel/model.inc.c b/levels/ssl/spindel/model.inc.c index e08aa155..1043ee5a 100644 --- a/levels/ssl/spindel/model.inc.c +++ b/levels/ssl/spindel/model.inc.c @@ -1,8 +1,4 @@ // 0x070222A0 - 0x070222B8 -static const Lights1 ssl_seg7_lights_070222A0 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x070222B8 - 0x070223B8 static const Vtx ssl_seg7_vertex_070222B8[] = { @@ -104,8 +100,8 @@ static const Gfx ssl_seg7_dl_07022728[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, generic_09002000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ssl_seg7_lights_070222A0.l, 1), - gsSPLight(&ssl_seg7_lights_070222A0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ssl_seg7_vertex_070222B8, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 4, 0x0), gsSP2Triangles( 0, 5, 6, 0x0, 0, 7, 8, 0x0), diff --git a/levels/ssl/tox_box/model.inc.c b/levels/ssl/tox_box/model.inc.c index d2a1f50f..487ebfbc 100644 --- a/levels/ssl/tox_box/model.inc.c +++ b/levels/ssl/tox_box/model.inc.c @@ -1,8 +1,4 @@ // 0x0700BF90 - 0x0700BFA8 -static const Lights1 ssl_seg7_lights_0700BF90 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700BFA8 - 0x0700C7A8 ALIGNED8 static const Texture ssl_seg7_texture_0700BFA8[] = { @@ -107,8 +103,8 @@ static const Gfx ssl_seg7_dl_0700FB48[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, ssl_seg7_texture_0700BFA8), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ssl_seg7_lights_0700BF90.l, 1), - gsSPLight(&ssl_seg7_lights_0700BF90.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(ssl_seg7_vertex_0700F7A8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), diff --git a/levels/thi/areas/1/1/model.inc.c b/levels/thi/areas/1/1/model.inc.c index 16558177..55fea2e8 100644 --- a/levels/thi/areas/1/1/model.inc.c +++ b/levels/thi/areas/1/1/model.inc.c @@ -1,26 +1,10 @@ // 0x07001000 - 0x07001018 -static const Lights1 thi_seg7_lights_07001000 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07001018 - 0x07001030 -static const Lights1 thi_seg7_lights_07001018 = gdSPDefLights1( - 0x4c, 0x4c, 0x4c, - 0x99, 0x99, 0x99, 0x28, 0x28, 0x28 -); // 0x07001030 - 0x07001048 -static const Lights1 thi_seg7_lights_07001030 = gdSPDefLights1( - 0x5d, 0x5d, 0x5d, - 0xbb, 0xbb, 0xbb, 0x28, 0x28, 0x28 -); // 0x07001048 - 0x07001060 -static const Lights1 thi_seg7_lights_07001048 = gdSPDefLights1( - 0x7f, 0x7f, 0x3c, - 0xff, 0xff, 0x78, 0x28, 0x28, 0x28 -); // 0x07001060 - 0x07001140 static const Vtx thi_seg7_vertex_07001060[] = { @@ -1044,8 +1028,8 @@ static const Gfx thi_seg7_dl_07004130[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09003800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&thi_seg7_lights_07001000.l, 1), - gsSPLight(&thi_seg7_lights_07001000.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(thi_seg7_vertex_07001060, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), @@ -1092,8 +1076,8 @@ static const Gfx thi_seg7_dl_07004130[] = { gsSP2Triangles(11, 14, 12, 0x0, 11, 10, 15, 0x0), gsSPVertex(thi_seg7_vertex_070017D0, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), - gsSPLight(&thi_seg7_lights_07001018.l, 1), - gsSPLight(&thi_seg7_lights_07001018.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(thi_seg7_vertex_07001830, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0), gsSP2Triangles( 0, 4, 1, 0x0, 5, 1, 4, 0x0), @@ -1108,18 +1092,18 @@ static const Gfx thi_seg7_dl_07004440[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09004800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&thi_seg7_lights_07001000.l, 1), - gsSPLight(&thi_seg7_lights_07001000.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(thi_seg7_vertex_07001920, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), - gsSPLight(&thi_seg7_lights_07001018.l, 1), - gsSPLight(&thi_seg7_lights_07001018.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(thi_seg7_vertex_07001960, 9, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 3, 7, 4, 0x0), gsSP1Triangle( 0, 2, 8, 0x0), - gsSPLight(&thi_seg7_lights_07001030.l, 1), - gsSPLight(&thi_seg7_lights_07001030.a, 2), + gsSPLightColor(LIGHT_1, 0xbbbbbbff), + gsSPLightColor(LIGHT_2, 0x5d5d5dff), gsSPVertex(thi_seg7_vertex_070019F0, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSPEndDisplayList(), @@ -1130,8 +1114,8 @@ static const Gfx thi_seg7_dl_070044F0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09005000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&thi_seg7_lights_07001000.l, 1), - gsSPLight(&thi_seg7_lights_07001000.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(thi_seg7_vertex_07001A50, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), @@ -1169,13 +1153,13 @@ static const Gfx thi_seg7_dl_070044F0[] = { gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), gsSP2Triangles( 8, 9, 10, 0x0, 11, 12, 13, 0x0), gsSP1Triangle( 8, 10, 14, 0x0), - gsSPLight(&thi_seg7_lights_07001018.l, 1), - gsSPLight(&thi_seg7_lights_07001018.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(thi_seg7_vertex_070021C0, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0), gsSP2Triangles( 2, 4, 3, 0x0, 5, 4, 2, 0x0), - gsSPLight(&thi_seg7_lights_07001030.l, 1), - gsSPLight(&thi_seg7_lights_07001030.a, 2), + gsSPLightColor(LIGHT_1, 0xbbbbbbff), + gsSPLightColor(LIGHT_2, 0x5d5d5dff), gsSPVertex(thi_seg7_vertex_07002220, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0), gsSPEndDisplayList(), @@ -1188,8 +1172,8 @@ static const Gfx thi_seg7_dl_07004788[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09005800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&thi_seg7_lights_07001000.l, 1), - gsSPLight(&thi_seg7_lights_07001000.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(thi_seg7_vertex_07002260, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 7, 4, 6, 0x0), @@ -1264,8 +1248,8 @@ static const Gfx thi_seg7_dl_07004788[] = { gsSP2Triangles(12, 13, 14, 0x0, 13, 15, 14, 0x0), gsSPVertex(thi_seg7_vertex_07002F00, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), - gsSPLight(&thi_seg7_lights_07001018.l, 1), - gsSPLight(&thi_seg7_lights_07001018.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(thi_seg7_vertex_07002F40, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), @@ -1278,8 +1262,8 @@ static const Gfx thi_seg7_dl_07004BF0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09003000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&thi_seg7_lights_07001000.l, 1), - gsSPLight(&thi_seg7_lights_07001000.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(thi_seg7_vertex_07002F80, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 4, 3, 0x0), @@ -1355,8 +1339,8 @@ static const Gfx thi_seg7_dl_07004BF0[] = { gsSP2Triangles(11, 12, 0, 0x0, 13, 14, 15, 0x0), gsSPVertex(thi_seg7_vertex_07003D00, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), - gsSPLight(&thi_seg7_lights_07001018.l, 1), - gsSPLight(&thi_seg7_lights_07001018.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(thi_seg7_vertex_07003D60, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -1374,8 +1358,8 @@ static const Gfx thi_seg7_dl_070050C0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, thi_seg7_texture_07000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&thi_seg7_lights_07001000.l, 1), - gsSPLight(&thi_seg7_lights_07001000.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(thi_seg7_vertex_07003EE0, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 1, 3, 4, 0x0, 2, 1, 5, 0x0), @@ -1407,8 +1391,8 @@ static const Gfx thi_seg7_dl_070051E8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_0900A800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&thi_seg7_lights_07001048.l, 1), - gsSPLight(&thi_seg7_lights_07001048.a, 2), + gsSPLightColor(LIGHT_1, 0xffff78ff), + gsSPLightColor(LIGHT_2, 0x7f7f3cff), gsSPVertex(thi_seg7_vertex_07004090, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 0, 3, 0x0), gsSP2Triangles( 4, 1, 5, 0x0, 3, 5, 1, 0x0), diff --git a/levels/thi/areas/1/2/model.inc.c b/levels/thi/areas/1/2/model.inc.c index e410beb3..043a3343 100644 --- a/levels/thi/areas/1/2/model.inc.c +++ b/levels/thi/areas/1/2/model.inc.c @@ -1,26 +1,10 @@ // 0x07005330 - 0x07005348 -static const Lights1 thi_seg7_lights_07005330 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07005348 - 0x07005360 -static const Lights1 thi_seg7_lights_07005348 = gdSPDefLights1( - 0x4c, 0x4c, 0x4c, - 0x99, 0x99, 0x99, 0x28, 0x28, 0x28 -); // 0x07005360 - 0x07005378 -static const Lights1 thi_seg7_lights_07005360 = gdSPDefLights1( - 0x33, 0x33, 0x33, - 0x66, 0x66, 0x66, 0x28, 0x28, 0x28 -); // 0x07005378 - 0x07005390 -static const Lights1 thi_seg7_lights_07005378 = gdSPDefLights1( - 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x07005390 - 0x07005470 static const Vtx thi_seg7_vertex_07005390[] = { @@ -362,8 +346,8 @@ static const Gfx thi_seg7_dl_070063C0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09006800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&thi_seg7_lights_07005330.l, 1), - gsSPLight(&thi_seg7_lights_07005330.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(thi_seg7_vertex_07005390, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -375,8 +359,8 @@ static const Gfx thi_seg7_dl_070063C0[] = { gsSPVertex(thi_seg7_vertex_07005550, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), - gsSPLight(&thi_seg7_lights_07005348.l, 1), - gsSPLight(&thi_seg7_lights_07005348.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(thi_seg7_vertex_070055D0, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), @@ -419,8 +403,8 @@ static const Gfx thi_seg7_dl_07006660[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09008000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&thi_seg7_lights_07005330.l, 1), - gsSPLight(&thi_seg7_lights_07005330.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(thi_seg7_vertex_07005C30, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 3, 0x0), @@ -431,8 +415,8 @@ static const Gfx thi_seg7_dl_07006660[] = { gsSPVertex(thi_seg7_vertex_07005D30, 7, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP1Triangle( 6, 3, 5, 0x0), - gsSPLight(&thi_seg7_lights_07005360.l, 1), - gsSPLight(&thi_seg7_lights_07005360.a, 2), + gsSPLightColor(LIGHT_1, 0x666666ff), + gsSPLightColor(LIGHT_2, 0x333333ff), gsSPVertex(thi_seg7_vertex_07005DA0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), @@ -446,8 +430,8 @@ static const Gfx thi_seg7_dl_07006770[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09003800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&thi_seg7_lights_07005348.l, 1), - gsSPLight(&thi_seg7_lights_07005348.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(thi_seg7_vertex_07005EA0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 0, 6, 1, 0x0, 3, 5, 7, 0x0), @@ -491,8 +475,8 @@ static const Gfx thi_seg7_dl_07006868[] = { // 0x07006908 - 0x07006968 static const Gfx thi_seg7_dl_07006908[] = { - gsSPLight(&thi_seg7_lights_07005378.l, 1), - gsSPLight(&thi_seg7_lights_07005378.a, 2), + gsSPLightColor(LIGHT_1, 0xff), + gsSPLightColor(LIGHT_2, 0xff), gsSPVertex(thi_seg7_vertex_070062C0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), diff --git a/levels/thi/areas/1/4/model.inc.c b/levels/thi/areas/1/4/model.inc.c index 2095cf9f..53605746 100644 --- a/levels/thi/areas/1/4/model.inc.c +++ b/levels/thi/areas/1/4/model.inc.c @@ -1,8 +1,4 @@ // 0x07007078 - 0x07007090 -static const Lights1 thi_seg7_lights_07007078 = gdSPDefLights1( - 0x7f, 0x7f, 0x3c, - 0xff, 0xff, 0x78, 0x28, 0x28, 0x28 -); // 0x07007090 - 0x07007180 static const Vtx thi_seg7_vertex_07007090[] = { @@ -44,8 +40,8 @@ static const Gfx thi_seg7_dl_07007240[] = { gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, grass_0900B800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&thi_seg7_lights_07007078.l, 1), - gsSPLight(&thi_seg7_lights_07007078.a, 2), + gsSPLightColor(LIGHT_1, 0xffff78ff), + gsSPLightColor(LIGHT_2, 0x7f7f3cff), gsSPVertex(thi_seg7_vertex_07007090, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 6, 8, 9, 0x0), diff --git a/levels/thi/areas/1/6/model.inc.c b/levels/thi/areas/1/6/model.inc.c index b2a7958e..a7b78f0b 100644 --- a/levels/thi/areas/1/6/model.inc.c +++ b/levels/thi/areas/1/6/model.inc.c @@ -1,8 +1,4 @@ // 0x070075A8 - 0x070075C0 -static const Lights1 thi_seg7_lights_070075A8 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x070075C0 - 0x07007600 static const Vtx thi_seg7_vertex_070075C0[] = { @@ -17,8 +13,8 @@ static const Gfx thi_seg7_dl_07007600[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, thi_seg7_texture_07000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&thi_seg7_lights_070075A8.l, 1), - gsSPLight(&thi_seg7_lights_070075A8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(thi_seg7_vertex_070075C0, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), gsSPEndDisplayList(), diff --git a/levels/thi/areas/1/7/model.inc.c b/levels/thi/areas/1/7/model.inc.c index fe60fd50..e5cf572b 100644 --- a/levels/thi/areas/1/7/model.inc.c +++ b/levels/thi/areas/1/7/model.inc.c @@ -1,14 +1,6 @@ // 0x070076A8 - 0x070076C0 -static const Lights1 thi_seg7_lights_070076A8 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x070076C0 - 0x070076D8 -static const Lights1 thi_seg7_lights_070076C0 = gdSPDefLights1( - 0x4c, 0x4c, 0x4c, - 0x99, 0x99, 0x99, 0x28, 0x28, 0x28 -); // 0x070076D8 - 0x07007718 static const Vtx thi_seg7_vertex_070076D8[] = { @@ -48,8 +40,8 @@ static const Gfx thi_seg7_dl_07007828[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09005800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&thi_seg7_lights_070076A8.l, 1), - gsSPLight(&thi_seg7_lights_070076A8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(thi_seg7_vertex_070076D8, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSPEndDisplayList(), @@ -73,8 +65,8 @@ static const Gfx thi_seg7_dl_070078D8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09004800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&thi_seg7_lights_070076C0.l, 1), - gsSPLight(&thi_seg7_lights_070076C0.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(thi_seg7_vertex_070077D8, 5, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), gsSP2Triangles( 3, 4, 2, 0x0, 4, 0, 2, 0x0), diff --git a/levels/thi/areas/3/2/model.inc.c b/levels/thi/areas/3/2/model.inc.c index b4b2dd71..728d949a 100644 --- a/levels/thi/areas/3/2/model.inc.c +++ b/levels/thi/areas/3/2/model.inc.c @@ -1,32 +1,12 @@ // 0x07007C90 - 0x07007CA8 -static const Lights1 thi_seg7_lights_07007C90 = gdSPDefLights1( - 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x07007CA8 - 0x07007CC0 -static const Lights1 thi_seg7_lights_07007CA8 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07007CC0 - 0x07007CD8 -static const Lights1 thi_seg7_lights_07007CC0 = gdSPDefLights1( - 0x4c, 0x4c, 0x4c, - 0x99, 0x99, 0x99, 0x28, 0x28, 0x28 -); // 0x07007CD8 - 0x07007CF0 -static const Lights1 thi_seg7_lights_07007CD8 = gdSPDefLights1( - 0x33, 0x33, 0x33, - 0x66, 0x66, 0x66, 0x28, 0x28, 0x28 -); // 0x07007CF0 - 0x07007D08 -static const Lights1 thi_seg7_lights_07007CF0 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xcc, 0xcc, 0xcc, 0x28, 0x28, 0x28 -); // 0x07007D08 - 0x07007D88 static const Vtx thi_seg7_vertex_07007D08[] = { @@ -426,8 +406,8 @@ static const Gfx thi_seg7_dl_07008F98[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_0900B800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&thi_seg7_lights_07007C90.l, 1), - gsSPLight(&thi_seg7_lights_07007C90.a, 2), + gsSPLightColor(LIGHT_1, 0xff), + gsSPLightColor(LIGHT_2, 0xff), gsSPVertex(thi_seg7_vertex_07007D08, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 4, 0x0), gsSP2Triangles( 0, 2, 5, 0x0, 3, 1, 0, 0x0), @@ -441,12 +421,12 @@ static const Gfx thi_seg7_dl_07009010[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09005800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&thi_seg7_lights_07007CA8.l, 1), - gsSPLight(&thi_seg7_lights_07007CA8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(thi_seg7_vertex_07007D88, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - gsSPLight(&thi_seg7_lights_07007CC0.l, 1), - gsSPLight(&thi_seg7_lights_07007CC0.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(thi_seg7_vertex_07007DC8, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), @@ -457,15 +437,15 @@ static const Gfx thi_seg7_dl_07009080[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09001800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&thi_seg7_lights_07007CA8.l, 1), - gsSPLight(&thi_seg7_lights_07007CA8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(thi_seg7_vertex_07007E08, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 3, 7, 6, 0x0), gsSP2Triangles( 8, 6, 7, 0x0, 8, 7, 9, 0x0), gsSP2Triangles( 0, 10, 1, 0x0, 11, 12, 13, 0x0), - gsSPLight(&thi_seg7_lights_07007CD8.l, 1), - gsSPLight(&thi_seg7_lights_07007CD8.a, 2), + gsSPLightColor(LIGHT_1, 0x666666ff), + gsSPLightColor(LIGHT_2, 0x333333ff), gsSPVertex(thi_seg7_vertex_07007EE8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -533,8 +513,8 @@ static const Gfx thi_seg7_dl_07009080[] = { gsSP1Triangle(12, 13, 14, 0x0), gsSPVertex(thi_seg7_vertex_07008B18, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), - gsSPLight(&thi_seg7_lights_07007CF0.l, 1), - gsSPLight(&thi_seg7_lights_07007CF0.a, 2), + gsSPLightColor(LIGHT_1, 0xccccccff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(thi_seg7_vertex_07008B78, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 0, 2, 4, 0x0, 0, 4, 5, 0x0), @@ -555,8 +535,8 @@ static const Gfx thi_seg7_dl_07009530[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09005000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&thi_seg7_lights_07007CC0.l, 1), - gsSPLight(&thi_seg7_lights_07007CC0.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(thi_seg7_vertex_07008D78, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 3, 4, 5, 0x0, 3, 2, 4, 0x0), @@ -580,8 +560,8 @@ static const Gfx thi_seg7_dl_070095A8[] = { // 0x07009610 - 0x07009670 static const Gfx thi_seg7_dl_07009610[] = { - gsSPLight(&thi_seg7_lights_07007C90.l, 1), - gsSPLight(&thi_seg7_lights_07007C90.a, 2), + gsSPLightColor(LIGHT_1, 0xff), + gsSPLightColor(LIGHT_2, 0xff), gsSPVertex(thi_seg7_vertex_07008F18, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 0, 4, 1, 0x0, 0, 3, 5, 0x0), diff --git a/levels/ttc/areas/1/1/model.inc.c b/levels/ttc/areas/1/1/model.inc.c index d538b8c1..43db2ef3 100644 --- a/levels/ttc/areas/1/1/model.inc.c +++ b/levels/ttc/areas/1/1/model.inc.c @@ -1,32 +1,12 @@ // 0x07001000 - 0x07001018 -static const Lights1 ttc_seg7_lights_07001000 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07001018 - 0x07001030 -static const Lights1 ttc_seg7_lights_07001018 = gdSPDefLights1( - 0x19, 0x19, 0x19, - 0x66, 0x66, 0x66, 0x28, 0x28, 0x28 -); // 0x07001030 - 0x07001048 -static const Lights1 ttc_seg7_lights_07001030 = gdSPDefLights1( - 0x26, 0x26, 0x26, - 0x99, 0x99, 0x99, 0x28, 0x28, 0x28 -); // 0x07001048 - 0x07001060 -static const Lights1 ttc_seg7_lights_07001048 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07001060 - 0x07001078 -static const Lights1 ttc_seg7_lights_07001060 = gdSPDefLights1( - 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x07001078 - 0x07001168 static const Vtx ttc_seg7_vertex_07001078[] = { @@ -2508,8 +2488,8 @@ static const Gfx ttc_seg7_dl_070089A8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, ttc_seg7_texture_07000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 64 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttc_seg7_lights_07001000.l, 1), - gsSPLight(&ttc_seg7_lights_07001000.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(ttc_seg7_vertex_07001078, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -2602,12 +2582,12 @@ static const Gfx ttc_seg7_dl_07008DD0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, machine_09007000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttc_seg7_lights_07001018.l, 1), - gsSPLight(&ttc_seg7_lights_07001018.a, 2), + gsSPLightColor(LIGHT_1, 0x666666ff), + gsSPLightColor(LIGHT_2, 0x191919ff), gsSPVertex(ttc_seg7_vertex_07001E38, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - gsSPLight(&ttc_seg7_lights_07001000.l, 1), - gsSPLight(&ttc_seg7_lights_07001000.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(ttc_seg7_vertex_07001E78, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -2697,13 +2677,13 @@ static const Gfx ttc_seg7_dl_07009278[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, machine_09008400), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttc_seg7_lights_07001030.l, 1), - gsSPLight(&ttc_seg7_lights_07001030.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x262626ff), gsSPVertex(ttc_seg7_vertex_07002D08, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), - gsSPLight(&ttc_seg7_lights_07001000.l, 1), - gsSPLight(&ttc_seg7_lights_07001000.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(ttc_seg7_vertex_07002D88, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), @@ -3221,8 +3201,8 @@ static const Gfx ttc_seg7_dl_0700A700[] = { gsSPVertex(ttc_seg7_vertex_070082F8, 7, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP1Triangle( 0, 2, 6, 0x0), - gsSPLight(&ttc_seg7_lights_07001048.l, 1), - gsSPLight(&ttc_seg7_lights_07001048.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(ttc_seg7_vertex_07008368, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -3252,8 +3232,8 @@ static const Gfx ttc_seg7_dl_0700A700[] = { // 0x0700ACD8 - 0x0700AD38 static const Gfx ttc_seg7_dl_0700ACD8[] = { - gsSPLight(&ttc_seg7_lights_07001060.l, 1), - gsSPLight(&ttc_seg7_lights_07001060.a, 2), + gsSPLightColor(LIGHT_1, 0xff), + gsSPLightColor(LIGHT_2, 0xff), gsSPVertex(ttc_seg7_vertex_070088A8, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), diff --git a/levels/ttc/areas/1/2/model.inc.c b/levels/ttc/areas/1/2/model.inc.c index 9cf65876..3121b573 100644 --- a/levels/ttc/areas/1/2/model.inc.c +++ b/levels/ttc/areas/1/2/model.inc.c @@ -1,8 +1,4 @@ // 0x0700AED8 - 0x0700AEF0 -static const Lights1 ttc_seg7_lights_0700AED8 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700AEF0 - 0x0700AFE0 static const Vtx ttc_seg7_vertex_0700AEF0[] = { @@ -55,8 +51,8 @@ static const Gfx ttc_seg7_dl_0700B110[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, machine_09002800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttc_seg7_lights_0700AED8.l, 1), - gsSPLight(&ttc_seg7_lights_0700AED8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ttc_seg7_vertex_0700AEF0, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), diff --git a/levels/ttc/areas/1/movtext.inc.c b/levels/ttc/areas/1/movtext.inc.c index b96bc92d..776391d0 100644 --- a/levels/ttc/areas/1/movtext.inc.c +++ b/levels/ttc/areas/1/movtext.inc.c @@ -1,8 +1,4 @@ // 0x07015F78 - 0x07015F90 -static const Lights1 ttc_lights_surface_treadmill = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07015F90 - 0x07016790 ALIGNED8 const Texture ttc_yellow_triangle[] = { @@ -19,8 +15,8 @@ const Gfx ttc_dl_surface_treadmill_begin[] = { gsSPFogPosition(900, 1000), gsSPSetGeometryMode(G_FOG), gsDPSetCombineMode(G_CC_MODULATERGB, G_CC_PASS2), - gsSPLight(&ttc_lights_surface_treadmill.l, 1), - gsSPLight(&ttc_lights_surface_treadmill.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), gsDPTileSync(), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, 5, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, 5, G_TX_NOLOD), diff --git a/levels/ttc/clock_hand/model.inc.c b/levels/ttc/clock_hand/model.inc.c index 3e390642..682de10f 100644 --- a/levels/ttc/clock_hand/model.inc.c +++ b/levels/ttc/clock_hand/model.inc.c @@ -1,26 +1,10 @@ // 0x07011758 - 0x07011770 -static const Lights1 ttc_seg7_lights_07011758 = gdSPDefLights1( - 0x5a, 0x41, 0x23, - 0xb4, 0x82, 0x46, 0x28, 0x28, 0x28 -); // 0x07011770 - 0x07011788 -static const Lights1 ttc_seg7_lights_07011770 = gdSPDefLights1( - 0x7f, 0x66, 0x32, - 0xff, 0xcc, 0x65, 0x28, 0x28, 0x28 -); // 0x07011788 - 0x070117A0 -static const Lights1 ttc_seg7_lights_07011788 = gdSPDefLights1( - 0x49, 0x00, 0x00, - 0x93, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x070117A0 - 0x070117B8 -static const Lights1 ttc_seg7_lights_070117A0 = gdSPDefLights1( - 0x7f, 0x00, 0x00, - 0xff, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x070117B8 - 0x07011838 static const Vtx ttc_seg7_vertex_070117B8[] = { @@ -79,26 +63,26 @@ static const Gfx ttc_seg7_dl_070119F8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, machine_09000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttc_seg7_lights_07011758.l, 1), - gsSPLight(&ttc_seg7_lights_07011758.a, 2), + gsSPLightColor(LIGHT_1, 0xb48246ff), + gsSPLightColor(LIGHT_2, 0x5a4123ff), gsSPVertex(ttc_seg7_vertex_070117B8, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 1, 0x0, 4, 1, 3, 0x0), gsSP2Triangles( 0, 2, 6, 0x0, 0, 6, 7, 0x0), - gsSPLight(&ttc_seg7_lights_07011770.l, 1), - gsSPLight(&ttc_seg7_lights_07011770.a, 2), + gsSPLightColor(LIGHT_1, 0xffcc65ff), + gsSPLightColor(LIGHT_2, 0x7f6632ff), gsSPVertex(ttc_seg7_vertex_07011838, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), - gsSPLight(&ttc_seg7_lights_07011788.l, 1), - gsSPLight(&ttc_seg7_lights_07011788.a, 2), + gsSPLightColor(LIGHT_1, 0x930000ff), + gsSPLightColor(LIGHT_2, 0x490000ff), gsSPVertex(ttc_seg7_vertex_070118B8, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 3, 2, 4, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 5, 4, 6, 0x0, 5, 6, 7, 0x0), gsSP2Triangles( 7, 6, 8, 0x0, 7, 8, 9, 0x0), - gsSPLight(&ttc_seg7_lights_070117A0.l, 1), - gsSPLight(&ttc_seg7_lights_070117A0.a, 2), + gsSPLightColor(LIGHT_1, 0xff0000ff), + gsSPLightColor(LIGHT_2, 0x7f0000ff), gsSPVertex(ttc_seg7_vertex_07011958, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0), gsSP2Triangles( 0, 4, 1, 0x0, 5, 6, 7, 0x0), diff --git a/levels/ttc/elevator_platform/model.inc.c b/levels/ttc/elevator_platform/model.inc.c index e03e462c..35965ef5 100644 --- a/levels/ttc/elevator_platform/model.inc.c +++ b/levels/ttc/elevator_platform/model.inc.c @@ -1,8 +1,4 @@ // 0x07011428 - 0x07011440 -static const Lights1 ttc_seg7_lights_07011428 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07011440 - 0x07011530 static const Vtx ttc_seg7_vertex_07011440[] = { @@ -47,8 +43,8 @@ static const Gfx ttc_seg7_dl_070115E0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, machine_09003800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttc_seg7_lights_07011428.l, 1), - gsSPLight(&ttc_seg7_lights_07011428.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ttc_seg7_vertex_07011440, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), diff --git a/levels/ttc/large_treadmill/model.inc.c b/levels/ttc/large_treadmill/model.inc.c index 5cabf7d4..e12e4b9a 100644 --- a/levels/ttc/large_treadmill/model.inc.c +++ b/levels/ttc/large_treadmill/model.inc.c @@ -1,14 +1,6 @@ // 0x0700F830 - 0x0700F848 -static const Lights1 ttc_seg7_lights_0700F830 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700F848 - 0x0700F860 -static const Lights1 ttc_seg7_lights_0700F848 = gdSPDefLights1( - 0x46, 0x46, 0x46, - 0x8c, 0x8c, 0x8c, 0x28, 0x28, 0x28 -); // 0x0700F860 - 0x0700F8E0 static const Vtx ttc_seg7_vertex_0700F860[] = { @@ -67,8 +59,8 @@ static const Gfx ttc_seg7_dl_0700FAA0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, machine_09005800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttc_seg7_lights_0700F830.l, 1), - gsSPLight(&ttc_seg7_lights_0700F830.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ttc_seg7_vertex_0700F860, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), @@ -94,8 +86,8 @@ static const Gfx ttc_seg7_dl_0700FAF8[] = { // 0x0700FB88 - 0x0700FBB8 static const Gfx ttc_seg7_dl_0700FB88[] = { - gsSPLight(&ttc_seg7_lights_0700F848.l, 1), - gsSPLight(&ttc_seg7_lights_0700F848.a, 2), + gsSPLightColor(LIGHT_1, 0x8c8c8cff), + gsSPLightColor(LIGHT_2, 0x464646ff), gsSPVertex(ttc_seg7_vertex_0700FA60, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), diff --git a/levels/ttc/pendulum/model.inc.c b/levels/ttc/pendulum/model.inc.c index 8a80af7a..5b05a3c8 100644 --- a/levels/ttc/pendulum/model.inc.c +++ b/levels/ttc/pendulum/model.inc.c @@ -1,8 +1,4 @@ // 0x0700F090 - 0x0700F0A8 -static const Lights1 ttc_seg7_lights_0700F090 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700F0A8 - 0x0700F188 static const Vtx ttc_seg7_vertex_0700F0A8[] = { @@ -101,8 +97,8 @@ static const Gfx ttc_seg7_dl_0700F528[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, ttc_seg7_texture_07000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 64 - 1, CALC_DXT(16, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttc_seg7_lights_0700F090.l, 1), - gsSPLight(&ttc_seg7_lights_0700F090.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ttc_seg7_vertex_0700F0A8, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), diff --git a/levels/ttc/pit_block/model.inc.c b/levels/ttc/pit_block/model.inc.c index ae65e377..0eb2d570 100644 --- a/levels/ttc/pit_block/model.inc.c +++ b/levels/ttc/pit_block/model.inc.c @@ -1,8 +1,4 @@ // 0x07010DE8 - 0x07010E00 -static const Lights1 ttc_seg7_lights_07010DE8 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07010E00 - 0x07010E80 static const Vtx ttc_seg7_vertex_07010E00[] = { @@ -41,8 +37,8 @@ static const Gfx ttc_seg7_dl_07010F80[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, machine_09007000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttc_seg7_lights_07010DE8.l, 1), - gsSPLight(&ttc_seg7_lights_07010DE8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ttc_seg7_vertex_07010E00, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), diff --git a/levels/ttc/pit_block_2/model.inc.c b/levels/ttc/pit_block_2/model.inc.c index 175629d8..025f5384 100644 --- a/levels/ttc/pit_block_2/model.inc.c +++ b/levels/ttc/pit_block_2/model.inc.c @@ -1,8 +1,4 @@ // 0x07011108 - 0x07011120 -static const Lights1 ttc_seg7_lights_07011108 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07011120 - 0x070111A0 static const Vtx ttc_seg7_vertex_07011120[] = { @@ -41,8 +37,8 @@ static const Gfx ttc_seg7_dl_070112A0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, machine_09007000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttc_seg7_lights_07011108.l, 1), - gsSPLight(&ttc_seg7_lights_07011108.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ttc_seg7_vertex_07011120, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), diff --git a/levels/ttc/push_block/model.inc.c b/levels/ttc/push_block/model.inc.c index a1530d33..6a85f7f7 100644 --- a/levels/ttc/push_block/model.inc.c +++ b/levels/ttc/push_block/model.inc.c @@ -1,8 +1,4 @@ // 0x070100B0 - 0x070100C8 -static const Lights1 ttc_seg7_lights_070100B0 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x070100C8 - 0x070101C8 static const Vtx ttc_seg7_vertex_070100C8[] = { @@ -37,8 +33,8 @@ static const Gfx ttc_seg7_dl_07010208[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, machine_09003800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttc_seg7_lights_070100B0.l, 1), - gsSPLight(&ttc_seg7_lights_070100B0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ttc_seg7_vertex_070100C8, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), diff --git a/levels/ttc/rotating_cube/model.inc.c b/levels/ttc/rotating_cube/model.inc.c index 2de1c703..91f143b9 100644 --- a/levels/ttc/rotating_cube/model.inc.c +++ b/levels/ttc/rotating_cube/model.inc.c @@ -1,14 +1,6 @@ // 0x0700E950 - 0x0700E968 -static const Lights1 ttc_seg7_lights_0700E950 = gdSPDefLights1( - 0x55, 0x55, 0x55, - 0xaa, 0xaa, 0xaa, 0x28, 0x28, 0x28 -); // 0x0700E968 - 0x0700E980 -static const Lights1 ttc_seg7_lights_0700E968 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700E980 - 0x0700EA20 static const Vtx ttc_seg7_vertex_0700E980[] = { @@ -63,13 +55,13 @@ static const Gfx ttc_seg7_dl_0700EBC0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, machine_09001000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttc_seg7_lights_0700E950.l, 1), - gsSPLight(&ttc_seg7_lights_0700E950.a, 2), + gsSPLightColor(LIGHT_1, 0xaaaaaaff), + gsSPLightColor(LIGHT_2, 0x555555ff), gsSPVertex(ttc_seg7_vertex_0700E980, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 4, 0x0), gsSP2Triangles( 5, 6, 7, 0x0, 8, 6, 9, 0x0), - gsSPLight(&ttc_seg7_lights_0700E968.l, 1), - gsSPLight(&ttc_seg7_lights_0700E968.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ttc_seg7_vertex_0700EA20, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 4, 0x0), gsSP2Triangles( 5, 6, 7, 0x0, 8, 6, 9, 0x0), diff --git a/levels/ttc/rotating_hexagon/model.inc.c b/levels/ttc/rotating_hexagon/model.inc.c index d19a7953..1e59c55b 100644 --- a/levels/ttc/rotating_hexagon/model.inc.c +++ b/levels/ttc/rotating_hexagon/model.inc.c @@ -1,8 +1,4 @@ // 0x07010380 - 0x07010398 -static const Lights1 ttc_seg7_lights_07010380 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07010398 - 0x07010488 static const Vtx ttc_seg7_vertex_07010398[] = { @@ -83,8 +79,8 @@ static const Gfx ttc_seg7_dl_07010738[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, machine_09003800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttc_seg7_lights_07010380.l, 1), - gsSPLight(&ttc_seg7_lights_07010380.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ttc_seg7_vertex_07010398, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), diff --git a/levels/ttc/rotating_prism/model.inc.c b/levels/ttc/rotating_prism/model.inc.c index fce629a2..a972e6bc 100644 --- a/levels/ttc/rotating_prism/model.inc.c +++ b/levels/ttc/rotating_prism/model.inc.c @@ -1,8 +1,4 @@ // 0x0700ED68 - 0x0700ED80 -static const Lights1 ttc_seg7_lights_0700ED68 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700ED80 - 0x0700EE60 static const Vtx ttc_seg7_vertex_0700ED80[] = { @@ -43,8 +39,8 @@ static const Gfx ttc_seg7_dl_0700EF20[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, machine_09001000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttc_seg7_lights_0700ED68.l, 1), - gsSPLight(&ttc_seg7_lights_0700ED68.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ttc_seg7_vertex_0700ED80, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 4, 7, 0x0, 8, 4, 9, 0x0), diff --git a/levels/ttc/rotating_triangle/model.inc.c b/levels/ttc/rotating_triangle/model.inc.c index 5ac22eca..ce13cbcd 100644 --- a/levels/ttc/rotating_triangle/model.inc.c +++ b/levels/ttc/rotating_triangle/model.inc.c @@ -1,8 +1,4 @@ // 0x07010930 - 0x07010948 -static const Lights1 ttc_seg7_lights_07010930 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07010948 - 0x07010A28 static const Vtx ttc_seg7_vertex_07010948[] = { @@ -68,8 +64,8 @@ static const Gfx ttc_seg7_dl_07010BF8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, machine_09003800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttc_seg7_lights_07010930.l, 1), - gsSPLight(&ttc_seg7_lights_07010930.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ttc_seg7_vertex_07010948, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 6, 5, 0x0, 3, 5, 7, 0x0), diff --git a/levels/ttc/small_treadmill/model.inc.c b/levels/ttc/small_treadmill/model.inc.c index 8eb61c4e..9cfb5790 100644 --- a/levels/ttc/small_treadmill/model.inc.c +++ b/levels/ttc/small_treadmill/model.inc.c @@ -1,14 +1,6 @@ // 0x0700FC80 - 0x0700FC98 -static const Lights1 ttc_seg7_lights_0700FC80 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700FC98 - 0x0700FCB0 -static const Lights1 ttc_seg7_lights_0700FC98 = gdSPDefLights1( - 0x46, 0x46, 0x46, - 0x8c, 0x8c, 0x8c, 0x28, 0x28, 0x28 -); // 0x0700FCB0 - 0x0700FD30 static const Vtx ttc_seg7_vertex_0700FCB0[] = { @@ -65,8 +57,8 @@ static const Gfx ttc_seg7_dl_0700FED0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, machine_09005800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttc_seg7_lights_0700FC80.l, 1), - gsSPLight(&ttc_seg7_lights_0700FC80.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ttc_seg7_vertex_0700FCB0, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), @@ -92,8 +84,8 @@ static const Gfx ttc_seg7_dl_0700FF28[] = { // 0x0700FFB8 - 0x0700FFE8 static const Gfx ttc_seg7_dl_0700FFB8[] = { - gsSPLight(&ttc_seg7_lights_0700FC98.l, 1), - gsSPLight(&ttc_seg7_lights_0700FC98.a, 2), + gsSPLightColor(LIGHT_1, 0x8c8c8cff), + gsSPLightColor(LIGHT_2, 0x464646ff), gsSPVertex(ttc_seg7_vertex_0700FE90, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSPEndDisplayList(), diff --git a/levels/ttc/spinner/model.inc.c b/levels/ttc/spinner/model.inc.c index 6d11606b..be13d164 100644 --- a/levels/ttc/spinner/model.inc.c +++ b/levels/ttc/spinner/model.inc.c @@ -1,14 +1,6 @@ // 0x07011BE0 - 0x07011BF8 -static const Lights1 ttc_seg7_lights_07011BE0 = gdSPDefLights1( - 0x46, 0x46, 0x46, - 0x8c, 0x8c, 0x8c, 0x28, 0x28, 0x28 -); // 0x07011BF8 - 0x07011C10 -static const Lights1 ttc_seg7_lights_07011BF8 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07011C10 - 0x07011D10 static const Vtx ttc_seg7_vertex_07011C10[] = { @@ -70,8 +62,8 @@ static const Gfx ttc_seg7_dl_07011EC0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, machine_09006800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttc_seg7_lights_07011BE0.l, 1), - gsSPLight(&ttc_seg7_lights_07011BE0.a, 2), + gsSPLightColor(LIGHT_1, 0x8c8c8cff), + gsSPLightColor(LIGHT_2, 0x464646ff), gsSPVertex(ttc_seg7_vertex_07011C10, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 2, 6, 3, 0x0), @@ -87,8 +79,8 @@ static const Gfx ttc_seg7_dl_07011EC0[] = { gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), gsSP2Triangles( 8, 7, 4, 0x0, 8, 4, 9, 0x0), gsSP2Triangles( 8, 10, 3, 0x0, 8, 3, 2, 0x0), - gsSPLight(&ttc_seg7_lights_07011BF8.l, 1), - gsSPLight(&ttc_seg7_lights_07011BF8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ttc_seg7_vertex_07011DC0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), diff --git a/levels/ttm/areas/1/1/model.inc.c b/levels/ttm/areas/1/1/model.inc.c index cd150d79..c8f4f1b7 100644 --- a/levels/ttm/areas/1/1/model.inc.c +++ b/levels/ttm/areas/1/1/model.inc.c @@ -1,26 +1,10 @@ // 0x07005000 - 0x07005018 -static const Lights1 ttm_seg7_lights_07005000 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07005018 - 0x07005030 -static const Lights1 ttm_seg7_lights_07005018 = gdSPDefLights1( - 0x4c, 0x4c, 0x4c, - 0x99, 0x99, 0x99, 0x28, 0x28, 0x28 -); // 0x07005030 - 0x07005048 -static const Lights1 ttm_seg7_lights_07005030 = gdSPDefLights1( - 0x5d, 0x5d, 0x5d, - 0xbb, 0xbb, 0xbb, 0x28, 0x28, 0x28 -); // 0x07005048 - 0x07005060 -static const Lights1 ttm_seg7_lights_07005048 = gdSPDefLights1( - 0x37, 0x29, 0x22, - 0x6e, 0x52, 0x44, 0x28, 0x28, 0x28 -); // 0x07005060 - 0x07005160 static const Vtx ttm_seg7_vertex_07005060[] = { @@ -1346,8 +1330,8 @@ static const Gfx ttm_seg7_dl_070090D0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mountain_09004000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttm_seg7_lights_07005000.l, 1), - gsSPLight(&ttm_seg7_lights_07005000.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ttm_seg7_vertex_07005060, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -1440,8 +1424,8 @@ static const Gfx ttm_seg7_dl_070090D0[] = { gsSPVertex(ttm_seg7_vertex_07006430, 9, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP1Triangle( 6, 7, 8, 0x0), - gsSPLight(&ttm_seg7_lights_07005018.l, 1), - gsSPLight(&ttm_seg7_lights_07005018.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(ttm_seg7_vertex_070064C0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 2, 4, 3, 0x0, 5, 0, 3, 0x0), @@ -1505,8 +1489,8 @@ static const Gfx ttm_seg7_dl_070090D0[] = { gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 6, 9, 7, 0x0), gsSP2Triangles(10, 11, 12, 0x0, 10, 13, 11, 0x0), - gsSPLight(&ttm_seg7_lights_07005030.l, 1), - gsSPLight(&ttm_seg7_lights_07005030.a, 2), + gsSPLightColor(LIGHT_1, 0xbbbbbbff), + gsSPLightColor(LIGHT_2, 0x5d5d5dff), gsSPVertex(ttm_seg7_vertex_07007200, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 3, 6, 0x0, 3, 7, 6, 0x0), @@ -1581,8 +1565,8 @@ static const Gfx ttm_seg7_dl_07009C98[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mountain_09005000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttm_seg7_lights_07005000.l, 1), - gsSPLight(&ttm_seg7_lights_07005000.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ttm_seg7_vertex_07007FC0, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0), gsSPEndDisplayList(), @@ -1631,8 +1615,8 @@ static const Gfx ttm_seg7_dl_07009CE0[] = { gsSP1Triangle(12, 13, 14, 0x0), gsSPVertex(ttm_seg7_vertex_07008880, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), - gsSPLight(&ttm_seg7_lights_07005018.l, 1), - gsSPLight(&ttm_seg7_lights_07005018.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(ttm_seg7_vertex_070088E0, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), @@ -1642,8 +1626,8 @@ static const Gfx ttm_seg7_dl_07009CE0[] = { gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), gsSP1Triangle( 0, 10, 1, 0x0), - gsSPLight(&ttm_seg7_lights_07005030.l, 1), - gsSPLight(&ttm_seg7_lights_07005030.a, 2), + gsSPLightColor(LIGHT_1, 0xbbbbbbff), + gsSPLightColor(LIGHT_2, 0x5d5d5dff), gsSPVertex(ttm_seg7_vertex_07008A80, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), @@ -1670,8 +1654,8 @@ static const Gfx ttm_seg7_dl_0700A038[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, ttm_seg7_texture_07002800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttm_seg7_lights_07005000.l, 1), - gsSPLight(&ttm_seg7_lights_07005000.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ttm_seg7_vertex_07008E60, 13, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -1681,8 +1665,8 @@ static const Gfx ttm_seg7_dl_0700A038[] = { // 0x0700A098 - 0x0700A120 static const Gfx ttm_seg7_dl_0700A098[] = { - gsSPLight(&ttm_seg7_lights_07005048.l, 1), - gsSPLight(&ttm_seg7_lights_07005048.a, 2), + gsSPLightColor(LIGHT_1, 0x6e5244ff), + gsSPLightColor(LIGHT_2, 0x372922ff), gsSPVertex(ttm_seg7_vertex_07008F30, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 6, 8, 9, 0x0), diff --git a/levels/ttm/areas/1/10/model.inc.c b/levels/ttm/areas/1/10/model.inc.c index 056d924e..28372d8f 100644 --- a/levels/ttm/areas/1/10/model.inc.c +++ b/levels/ttm/areas/1/10/model.inc.c @@ -1,20 +1,8 @@ // 0x0700C488 - 0x0700C4A0 -static const Lights1 ttm_seg7_lights_0700C488 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700C4A0 - 0x0700C4B8 -static const Lights1 ttm_seg7_lights_0700C4A0 = gdSPDefLights1( - 0x4c, 0x4c, 0x4c, - 0x99, 0x99, 0x99, 0x28, 0x28, 0x28 -); // 0x0700C4B8 - 0x0700C4D0 -static const Lights1 ttm_seg7_lights_0700C4B8 = gdSPDefLights1( - 0x5d, 0x5d, 0x5d, - 0xbb, 0xbb, 0xbb, 0x28, 0x28, 0x28 -); // 0x0700C4D0 - 0x0700C5D0 static const Vtx ttm_seg7_vertex_0700C4D0[] = { @@ -124,21 +112,21 @@ static const Gfx ttm_seg7_dl_0700C900[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mountain_09004000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttm_seg7_lights_0700C488.l, 1), - gsSPLight(&ttm_seg7_lights_0700C488.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ttm_seg7_vertex_0700C4D0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), gsSP2Triangles(12, 13, 14, 0x0, 14, 13, 15, 0x0), gsSPVertex(ttm_seg7_vertex_0700C5D0, 3, 0), gsSP1Triangle( 0, 1, 2, 0x0), - gsSPLight(&ttm_seg7_lights_0700C4A0.l, 1), - gsSPLight(&ttm_seg7_lights_0700C4A0.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(ttm_seg7_vertex_0700C600, 9, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP1Triangle( 6, 7, 8, 0x0), - gsSPLight(&ttm_seg7_lights_0700C4B8.l, 1), - gsSPLight(&ttm_seg7_lights_0700C4B8.a, 2), + gsSPLightColor(LIGHT_1, 0xbbbbbbff), + gsSPLightColor(LIGHT_2, 0x5d5d5dff), gsSPVertex(ttm_seg7_vertex_0700C690, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), @@ -153,13 +141,13 @@ static const Gfx ttm_seg7_dl_0700C9F8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mountain_09003800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttm_seg7_lights_0700C488.l, 1), - gsSPLight(&ttm_seg7_lights_0700C488.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ttm_seg7_vertex_0700C7B0, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 4, 0x0), gsSP2Triangles( 0, 5, 3, 0x0, 0, 2, 5, 0x0), - gsSPLight(&ttm_seg7_lights_0700C4B8.l, 1), - gsSPLight(&ttm_seg7_lights_0700C4B8.a, 2), + gsSPLightColor(LIGHT_1, 0xbbbbbbff), + gsSPLightColor(LIGHT_2, 0x5d5d5dff), gsSPVertex(ttm_seg7_vertex_0700C810, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), @@ -173,8 +161,8 @@ static const Gfx ttm_seg7_dl_0700CA78[] = { gsSPVertex(ttm_seg7_vertex_0700C850, 7, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP1Triangle( 3, 6, 4, 0x0), - gsSPLight(&ttm_seg7_lights_0700C488.l, 1), - gsSPLight(&ttm_seg7_lights_0700C488.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ttm_seg7_vertex_0700C8C0, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSPEndDisplayList(), diff --git a/levels/ttm/areas/1/11/model.inc.c b/levels/ttm/areas/1/11/model.inc.c index 38aff457..451203b3 100644 --- a/levels/ttm/areas/1/11/model.inc.c +++ b/levels/ttm/areas/1/11/model.inc.c @@ -1,14 +1,6 @@ // 0x0700CB60 - 0x0700CB78 -static const Lights1 ttm_seg7_lights_0700CB60 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700CB78 - 0x0700CB90 -static const Lights1 ttm_seg7_lights_0700CB78 = gdSPDefLights1( - 0x5d, 0x5d, 0x5d, - 0xbb, 0xbb, 0xbb, 0x28, 0x28, 0x28 -); // 0x0700CB90 - 0x0700CBF0 static const Vtx ttm_seg7_vertex_0700CB90[] = { @@ -40,12 +32,12 @@ static const Gfx ttm_seg7_dl_0700CC60[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mountain_09004000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttm_seg7_lights_0700CB60.l, 1), - gsSPLight(&ttm_seg7_lights_0700CB60.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ttm_seg7_vertex_0700CB90, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), - gsSPLight(&ttm_seg7_lights_0700CB78.l, 1), - gsSPLight(&ttm_seg7_lights_0700CB78.a, 2), + gsSPLightColor(LIGHT_1, 0xbbbbbbff), + gsSPLightColor(LIGHT_2, 0x5d5d5dff), gsSPVertex(ttm_seg7_vertex_0700CBF0, 3, 0), gsSP1Triangle( 0, 1, 2, 0x0), gsSPEndDisplayList(), @@ -56,8 +48,8 @@ static const Gfx ttm_seg7_dl_0700CCC8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mountain_09003800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttm_seg7_lights_0700CB60.l, 1), - gsSPLight(&ttm_seg7_lights_0700CB60.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ttm_seg7_vertex_0700CC20, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSPEndDisplayList(), diff --git a/levels/ttm/areas/1/12/model.inc.c b/levels/ttm/areas/1/12/model.inc.c index a50ae241..d9216b7a 100644 --- a/levels/ttm/areas/1/12/model.inc.c +++ b/levels/ttm/areas/1/12/model.inc.c @@ -1,20 +1,8 @@ // 0x0700CD88 - 0x0700CDA0 -static const Lights1 ttm_seg7_lights_0700CD88 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700CDA0 - 0x0700CDB8 -static const Lights1 ttm_seg7_lights_0700CDA0 = gdSPDefLights1( - 0x4c, 0x4c, 0x4c, - 0x99, 0x99, 0x99, 0x28, 0x28, 0x28 -); // 0x0700CDB8 - 0x0700CDD0 -static const Lights1 ttm_seg7_lights_0700CDB8 = gdSPDefLights1( - 0x5d, 0x5d, 0x5d, - 0xbb, 0xbb, 0xbb, 0x28, 0x28, 0x28 -); // 0x0700CDD0 - 0x0700CEC0 static const Vtx ttm_seg7_vertex_0700CDD0[] = { @@ -85,19 +73,19 @@ static const Gfx ttm_seg7_dl_0700D090[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mountain_09004000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttm_seg7_lights_0700CD88.l, 1), - gsSPLight(&ttm_seg7_lights_0700CD88.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ttm_seg7_vertex_0700CDD0, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), gsSP2Triangles( 9, 10, 7, 0x0, 11, 12, 13, 0x0), gsSP1Triangle( 0, 2, 14, 0x0), - gsSPLight(&ttm_seg7_lights_0700CDA0.l, 1), - gsSPLight(&ttm_seg7_lights_0700CDA0.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(ttm_seg7_vertex_0700CEC0, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0), - gsSPLight(&ttm_seg7_lights_0700CDB8.l, 1), - gsSPLight(&ttm_seg7_lights_0700CDB8.a, 2), + gsSPLightColor(LIGHT_1, 0xbbbbbbff), + gsSPLightColor(LIGHT_2, 0x5d5d5dff), gsSPVertex(ttm_seg7_vertex_0700CF00, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 3, 5, 0x0, 7, 8, 9, 0x0), @@ -112,8 +100,8 @@ static const Gfx ttm_seg7_dl_0700D180[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mountain_09003800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttm_seg7_lights_0700CD88.l, 1), - gsSPLight(&ttm_seg7_lights_0700CD88.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ttm_seg7_vertex_0700D030, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 4, 0x0), gsSP2Triangles( 2, 1, 4, 0x0, 2, 5, 0, 0x0), diff --git a/levels/ttm/areas/1/13/model.inc.c b/levels/ttm/areas/1/13/model.inc.c index d8880d28..6b94d4e9 100644 --- a/levels/ttm/areas/1/13/model.inc.c +++ b/levels/ttm/areas/1/13/model.inc.c @@ -1,20 +1,8 @@ // 0x0700D250 - 0x0700D268 -static const Lights1 ttm_seg7_lights_0700D250 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700D268 - 0x0700D280 -static const Lights1 ttm_seg7_lights_0700D268 = gdSPDefLights1( - 0x4c, 0x4c, 0x4c, - 0x99, 0x99, 0x99, 0x28, 0x28, 0x28 -); // 0x0700D280 - 0x0700D298 -static const Lights1 ttm_seg7_lights_0700D280 = gdSPDefLights1( - 0x5d, 0x5d, 0x5d, - 0xbb, 0xbb, 0xbb, 0x28, 0x28, 0x28 -); // 0x0700D298 - 0x0700D398 static const Vtx ttm_seg7_vertex_0700D298[] = { @@ -84,8 +72,8 @@ static const Gfx ttm_seg7_dl_0700D548[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mountain_09004000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttm_seg7_lights_0700D250.l, 1), - gsSPLight(&ttm_seg7_lights_0700D250.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ttm_seg7_vertex_0700D298, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), @@ -93,13 +81,13 @@ static const Gfx ttm_seg7_dl_0700D548[] = { gsSPVertex(ttm_seg7_vertex_0700D398, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 3, 5, 9, 0x0), - gsSPLight(&ttm_seg7_lights_0700D268.l, 1), - gsSPLight(&ttm_seg7_lights_0700D268.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(ttm_seg7_vertex_0700D438, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), gsSP2Triangles( 1, 4, 3, 0x0, 0, 2, 5, 0x0), - gsSPLight(&ttm_seg7_lights_0700D280.l, 1), - gsSPLight(&ttm_seg7_lights_0700D280.a, 2), + gsSPLightColor(LIGHT_1, 0xbbbbbbff), + gsSPLightColor(LIGHT_2, 0x5d5d5dff), gsSPVertex(ttm_seg7_vertex_0700D498, 7, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP1Triangle( 0, 2, 6, 0x0), @@ -111,8 +99,8 @@ static const Gfx ttm_seg7_dl_0700D640[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mountain_09003800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttm_seg7_lights_0700D250.l, 1), - gsSPLight(&ttm_seg7_lights_0700D250.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ttm_seg7_vertex_0700D508, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSPEndDisplayList(), diff --git a/levels/ttm/areas/1/14/model.inc.c b/levels/ttm/areas/1/14/model.inc.c index 641d7727..87ce80ee 100644 --- a/levels/ttm/areas/1/14/model.inc.c +++ b/levels/ttm/areas/1/14/model.inc.c @@ -1,20 +1,8 @@ // 0x0700D700 - 0x0700D718 -static const Lights1 ttm_seg7_lights_0700D700 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700D718 - 0x0700D730 -static const Lights1 ttm_seg7_lights_0700D718 = gdSPDefLights1( - 0x4c, 0x4c, 0x4c, - 0x99, 0x99, 0x99, 0x28, 0x28, 0x28 -); // 0x0700D730 - 0x0700D748 -static const Lights1 ttm_seg7_lights_0700D730 = gdSPDefLights1( - 0x5d, 0x5d, 0x5d, - 0xbb, 0xbb, 0xbb, 0x28, 0x28, 0x28 -); // 0x0700D748 - 0x0700D848 static const Vtx ttm_seg7_vertex_0700D748[] = { @@ -160,8 +148,8 @@ static const Gfx ttm_seg7_dl_0700DDB8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mountain_09004000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttm_seg7_lights_0700D700.l, 1), - gsSPLight(&ttm_seg7_lights_0700D700.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ttm_seg7_vertex_0700D748, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 0, 6, 1, 0x0, 7, 8, 9, 0x0), @@ -173,8 +161,8 @@ static const Gfx ttm_seg7_dl_0700DDB8[] = { gsSPVertex(ttm_seg7_vertex_0700D938, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), - gsSPLight(&ttm_seg7_lights_0700D718.l, 1), - gsSPLight(&ttm_seg7_lights_0700D718.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(ttm_seg7_vertex_0700D9F8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), @@ -189,12 +177,12 @@ static const Gfx ttm_seg7_dl_0700DDB8[] = { gsSP1Triangle(12, 13, 14, 0x0), gsSPVertex(ttm_seg7_vertex_0700DCC8, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), - gsSPLight(&ttm_seg7_lights_0700D730.l, 1), - gsSPLight(&ttm_seg7_lights_0700D730.a, 2), + gsSPLightColor(LIGHT_1, 0xbbbbbbff), + gsSPLightColor(LIGHT_2, 0x5d5d5dff), gsSPVertex(ttm_seg7_vertex_0700DD28, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), - gsSPLight(&ttm_seg7_lights_0700D700.l, 1), - gsSPLight(&ttm_seg7_lights_0700D700.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ttm_seg7_vertex_0700DD88, 3, 0), gsSP1Triangle( 0, 1, 2, 0x0), gsSPEndDisplayList(), diff --git a/levels/ttm/areas/1/15/model.inc.c b/levels/ttm/areas/1/15/model.inc.c index af98a8a6..02f3f6f5 100644 --- a/levels/ttm/areas/1/15/model.inc.c +++ b/levels/ttm/areas/1/15/model.inc.c @@ -1,8 +1,4 @@ // 0x0700DFE8 - 0x0700E000 -static const Lights1 ttm_seg7_lights_0700DFE8 = gdSPDefLights1( - 0x4c, 0x4c, 0x4c, - 0x99, 0x99, 0x99, 0x28, 0x28, 0x28 -); // 0x0700E000 - 0x0700E100 static const Vtx ttm_seg7_vertex_0700E000[] = { @@ -57,8 +53,8 @@ static const Gfx ttm_seg7_dl_0700E240[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mountain_09004000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttm_seg7_lights_0700DFE8.l, 1), - gsSPLight(&ttm_seg7_lights_0700DFE8.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(ttm_seg7_vertex_0700E000, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 3, 5, 0x0, 7, 8, 9, 0x0), diff --git a/levels/ttm/areas/1/16/1.inc.c b/levels/ttm/areas/1/16/1.inc.c index 2cfaaf9f..fa9bcaf5 100644 --- a/levels/ttm/areas/1/16/1.inc.c +++ b/levels/ttm/areas/1/16/1.inc.c @@ -1,20 +1,8 @@ // 0x0700E378 - 0x0700E390 -static const Lights1 ttm_seg7_lights_0700E378 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700E390 - 0x0700E3A8 -static const Lights1 ttm_seg7_lights_0700E390 = gdSPDefLights1( - 0x5d, 0x5d, 0x5d, - 0xbb, 0xbb, 0xbb, 0x28, 0x28, 0x28 -); // 0x0700E3A8 - 0x0700E3C0 -static const Lights1 ttm_seg7_lights_0700E3A8 = gdSPDefLights1( - 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x0700E3C0 - 0x0700E4B0 static const Vtx ttm_seg7_vertex_0700E3C0[] = { @@ -138,8 +126,8 @@ static const Gfx ttm_seg7_dl_0700E910[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mountain_09004000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttm_seg7_lights_0700E378.l, 1), - gsSPLight(&ttm_seg7_lights_0700E378.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ttm_seg7_vertex_0700E3C0, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), @@ -152,12 +140,12 @@ static const Gfx ttm_seg7_dl_0700E910[] = { gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), gsSP1Triangle(12, 13, 14, 0x0), - gsSPLight(&ttm_seg7_lights_0700E390.l, 1), - gsSPLight(&ttm_seg7_lights_0700E390.a, 2), + gsSPLightColor(LIGHT_1, 0xbbbbbbff), + gsSPLightColor(LIGHT_2, 0x5d5d5dff), gsSPVertex(ttm_seg7_vertex_0700E680, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), - gsSPLight(&ttm_seg7_lights_0700E378.l, 1), - gsSPLight(&ttm_seg7_lights_0700E378.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ttm_seg7_vertex_0700E6E0, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), @@ -175,8 +163,8 @@ static const Gfx ttm_seg7_dl_0700EA28[] = { gsSPVertex(ttm_seg7_vertex_0700E820, 9, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP1Triangle( 6, 7, 8, 0x0), - gsSPLight(&ttm_seg7_lights_0700E3A8.l, 1), - gsSPLight(&ttm_seg7_lights_0700E3A8.a, 2), + gsSPLightColor(LIGHT_1, 0xff), + gsSPLightColor(LIGHT_2, 0xff), gsSPVertex(ttm_seg7_vertex_0700E8B0, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSPEndDisplayList(), diff --git a/levels/ttm/areas/1/17/2.inc.c b/levels/ttm/areas/1/17/2.inc.c index a2a26305..8cdacc40 100644 --- a/levels/ttm/areas/1/17/2.inc.c +++ b/levels/ttm/areas/1/17/2.inc.c @@ -1,8 +1,4 @@ // 0x0700F300 - 0x0700F318 -static const Lights1 ttm_seg7_lights_0700F300 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700F318 - 0x0700F418 static const Vtx ttm_seg7_vertex_0700F318[] = { @@ -117,8 +113,8 @@ static const Gfx ttm_seg7_dl_0700F858[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, ttm_seg7_texture_07001800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttm_seg7_lights_0700F300.l, 1), - gsSPLight(&ttm_seg7_lights_0700F300.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ttm_seg7_vertex_0700F318, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), diff --git a/levels/ttm/areas/1/18/1.inc.c b/levels/ttm/areas/1/18/1.inc.c index f369470b..f79951e4 100644 --- a/levels/ttm/areas/1/18/1.inc.c +++ b/levels/ttm/areas/1/18/1.inc.c @@ -1,20 +1,8 @@ // 0x0700FA90 - 0x0700FAA8 -static const Lights1 ttm_seg7_lights_0700FA90 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700FAA8 - 0x0700FAC0 -static const Lights1 ttm_seg7_lights_0700FAA8 = gdSPDefLights1( - 0x4c, 0x4c, 0x4c, - 0x99, 0x99, 0x99, 0x28, 0x28, 0x28 -); // 0x0700FAC0 - 0x0700FAD8 -static const Lights1 ttm_seg7_lights_0700FAC0 = gdSPDefLights1( - 0x5d, 0x5d, 0x5d, - 0xbb, 0xbb, 0xbb, 0x28, 0x28, 0x28 -); // 0x0700FAD8 - 0x0700FBB8 static const Vtx ttm_seg7_vertex_0700FAD8[] = { @@ -259,8 +247,8 @@ static const Gfx ttm_seg7_dl_07010638[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mountain_09004000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttm_seg7_lights_0700FA90.l, 1), - gsSPLight(&ttm_seg7_lights_0700FA90.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ttm_seg7_vertex_0700FAD8, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), @@ -272,8 +260,8 @@ static const Gfx ttm_seg7_dl_07010638[] = { gsSPVertex(ttm_seg7_vertex_0700FCB8, 9, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP1Triangle( 6, 7, 8, 0x0), - gsSPLight(&ttm_seg7_lights_0700FAA8.l, 1), - gsSPLight(&ttm_seg7_lights_0700FAA8.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(ttm_seg7_vertex_0700FD48, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), @@ -285,8 +273,8 @@ static const Gfx ttm_seg7_dl_07010638[] = { gsSPVertex(ttm_seg7_vertex_0700FF38, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), - gsSPLight(&ttm_seg7_lights_0700FAC0.l, 1), - gsSPLight(&ttm_seg7_lights_0700FAC0.a, 2), + gsSPLightColor(LIGHT_1, 0xbbbbbbff), + gsSPLightColor(LIGHT_2, 0x5d5d5dff), gsSPVertex(ttm_seg7_vertex_0700FFF8, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), @@ -306,8 +294,8 @@ static const Gfx ttm_seg7_dl_07010830[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mountain_09003800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttm_seg7_lights_0700FA90.l, 1), - gsSPLight(&ttm_seg7_lights_0700FA90.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ttm_seg7_vertex_07010278, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), gsSP2Triangles( 0, 2, 4, 0x0, 5, 6, 7, 0x0), @@ -320,13 +308,13 @@ static const Gfx ttm_seg7_dl_07010830[] = { gsSP1Triangle(14, 0, 2, 0x0), gsSPVertex(ttm_seg7_vertex_07010468, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), - gsSPLight(&ttm_seg7_lights_0700FAA8.l, 1), - gsSPLight(&ttm_seg7_lights_0700FAA8.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(ttm_seg7_vertex_070104A8, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), - gsSPLight(&ttm_seg7_lights_0700FAC0.l, 1), - gsSPLight(&ttm_seg7_lights_0700FAC0.a, 2), + gsSPLightColor(LIGHT_1, 0xbbbbbbff), + gsSPLightColor(LIGHT_2, 0x5d5d5dff), gsSPVertex(ttm_seg7_vertex_07010568, 13, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), diff --git a/levels/ttm/areas/1/19/model.inc.c b/levels/ttm/areas/1/19/model.inc.c index 2262b372..0f4e2612 100644 --- a/levels/ttm/areas/1/19/model.inc.c +++ b/levels/ttm/areas/1/19/model.inc.c @@ -1,20 +1,8 @@ // 0x07010AD8 - 0x07010AF0 -static const Lights1 ttm_seg7_lights_07010AD8 = gdSPDefLights1( - 0x4c, 0x4c, 0x4c, - 0x99, 0x99, 0x99, 0x28, 0x28, 0x28 -); // 0x07010AF0 - 0x07010B08 -static const Lights1 ttm_seg7_lights_07010AF0 = gdSPDefLights1( - 0x5d, 0x5d, 0x5d, - 0xbb, 0xbb, 0xbb, 0x28, 0x28, 0x28 -); // 0x07010B08 - 0x07010B20 -static const Lights1 ttm_seg7_lights_07010B08 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07010B20 - 0x07010C10 static const Vtx ttm_seg7_vertex_07010B20[] = { @@ -124,24 +112,24 @@ static const Gfx ttm_seg7_dl_07010F90[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mountain_09004000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttm_seg7_lights_07010AD8.l, 1), - gsSPLight(&ttm_seg7_lights_07010AD8.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(ttm_seg7_vertex_07010B20, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), gsSP1Triangle(12, 13, 14, 0x0), gsSPVertex(ttm_seg7_vertex_07010C10, 3, 0), gsSP1Triangle( 0, 1, 2, 0x0), - gsSPLight(&ttm_seg7_lights_07010AF0.l, 1), - gsSPLight(&ttm_seg7_lights_07010AF0.a, 2), + gsSPLightColor(LIGHT_1, 0xbbbbbbff), + gsSPLightColor(LIGHT_2, 0x5d5d5dff), gsSPVertex(ttm_seg7_vertex_07010C40, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), gsSP1Triangle(12, 13, 14, 0x0), gsSPVertex(ttm_seg7_vertex_07010D30, 3, 0), gsSP1Triangle( 0, 1, 2, 0x0), - gsSPLight(&ttm_seg7_lights_07010B08.l, 1), - gsSPLight(&ttm_seg7_lights_07010B08.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ttm_seg7_vertex_07010D60, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSPEndDisplayList(), @@ -152,12 +140,12 @@ static const Gfx ttm_seg7_dl_07011078[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mountain_09003800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttm_seg7_lights_07010AD8.l, 1), - gsSPLight(&ttm_seg7_lights_07010AD8.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(ttm_seg7_vertex_07010DA0, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), - gsSPLight(&ttm_seg7_lights_07010B08.l, 1), - gsSPLight(&ttm_seg7_lights_07010B08.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ttm_seg7_vertex_07010E00, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), diff --git a/levels/ttm/areas/1/2/model.inc.c b/levels/ttm/areas/1/2/model.inc.c index d8adff28..423a8105 100644 --- a/levels/ttm/areas/1/2/model.inc.c +++ b/levels/ttm/areas/1/2/model.inc.c @@ -1,8 +1,4 @@ // 0x0700A1B0 - 0x0700A1C8 -static const Lights1 ttm_seg7_lights_0700A1B0 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700A1C8 - 0x0700A268 static const Vtx ttm_seg7_vertex_0700A1C8[] = { @@ -23,8 +19,8 @@ static const Gfx ttm_seg7_dl_0700A268[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mountain_09005000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttm_seg7_lights_0700A1B0.l, 1), - gsSPLight(&ttm_seg7_lights_0700A1B0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ttm_seg7_vertex_0700A1C8, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 5, 4, 0x0), diff --git a/levels/ttm/areas/1/20/model.inc.c b/levels/ttm/areas/1/20/model.inc.c index 00bcf939..1dccc83e 100644 --- a/levels/ttm/areas/1/20/model.inc.c +++ b/levels/ttm/areas/1/20/model.inc.c @@ -1,20 +1,8 @@ // 0x070111A0 - 0x070111B8 -static const Lights1 ttm_seg7_lights_070111A0 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x070111B8 - 0x070111D0 -static const Lights1 ttm_seg7_lights_070111B8 = gdSPDefLights1( - 0x4c, 0x4c, 0x4c, - 0x99, 0x99, 0x99, 0x28, 0x28, 0x28 -); // 0x070111D0 - 0x070111E8 -static const Lights1 ttm_seg7_lights_070111D0 = gdSPDefLights1( - 0x5d, 0x5d, 0x5d, - 0xbb, 0xbb, 0xbb, 0x28, 0x28, 0x28 -); // 0x070111E8 - 0x07011228 static const Vtx ttm_seg7_vertex_070111E8[] = { @@ -86,23 +74,23 @@ static const Gfx ttm_seg7_dl_070114B8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mountain_09004000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttm_seg7_lights_070111A0.l, 1), - gsSPLight(&ttm_seg7_lights_070111A0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ttm_seg7_vertex_070111E8, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), - gsSPLight(&ttm_seg7_lights_070111B8.l, 1), - gsSPLight(&ttm_seg7_lights_070111B8.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(ttm_seg7_vertex_07011228, 13, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), gsSP1Triangle( 0, 2, 12, 0x0), - gsSPLight(&ttm_seg7_lights_070111D0.l, 1), - gsSPLight(&ttm_seg7_lights_070111D0.a, 2), + gsSPLightColor(LIGHT_1, 0xbbbbbbff), + gsSPLightColor(LIGHT_2, 0x5d5d5dff), gsSPVertex(ttm_seg7_vertex_070112F8, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), - gsSPLight(&ttm_seg7_lights_070111A0.l, 1), - gsSPLight(&ttm_seg7_lights_070111A0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ttm_seg7_vertex_07011378, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), diff --git a/levels/ttm/areas/1/21/1.inc.c b/levels/ttm/areas/1/21/1.inc.c index 6e139955..6096b8e8 100644 --- a/levels/ttm/areas/1/21/1.inc.c +++ b/levels/ttm/areas/1/21/1.inc.c @@ -1,20 +1,8 @@ // 0x07011680 - 0x07011698 -static const Lights1 ttm_seg7_lights_07011680 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07011698 - 0x070116B0 -static const Lights1 ttm_seg7_lights_07011698 = gdSPDefLights1( - 0x5d, 0x5d, 0x5d, - 0xbb, 0xbb, 0xbb, 0x28, 0x28, 0x28 -); // 0x070116B0 - 0x070116C8 -static const Lights1 ttm_seg7_lights_070116B0 = gdSPDefLights1( - 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x070116C8 - 0x070117C8 static const Vtx ttm_seg7_vertex_070116C8[] = { @@ -111,8 +99,8 @@ static const Gfx ttm_seg7_dl_07011AA8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mountain_09000000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttm_seg7_lights_07011680.l, 1), - gsSPLight(&ttm_seg7_lights_07011680.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ttm_seg7_vertex_070116C8, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -128,8 +116,8 @@ static const Gfx ttm_seg7_dl_07011B20[] = { gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), gsSPVertex(ttm_seg7_vertex_070117C8, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), - gsSPLight(&ttm_seg7_lights_07011698.l, 1), - gsSPLight(&ttm_seg7_lights_07011698.a, 2), + gsSPLightColor(LIGHT_1, 0xbbbbbbff), + gsSPLightColor(LIGHT_2, 0x5d5d5dff), gsSPVertex(ttm_seg7_vertex_07011808, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -158,8 +146,8 @@ static const Gfx ttm_seg7_dl_07011C10[] = { // 0x07011C48 - 0x07011C78 static const Gfx ttm_seg7_dl_07011C48[] = { - gsSPLight(&ttm_seg7_lights_070116B0.l, 1), - gsSPLight(&ttm_seg7_lights_070116B0.a, 2), + gsSPLightColor(LIGHT_1, 0xff), + gsSPLightColor(LIGHT_2, 0xff), gsSPVertex(ttm_seg7_vertex_07011A68, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), diff --git a/levels/ttm/areas/1/3/1.inc.c b/levels/ttm/areas/1/3/1.inc.c index cc65c588..de5524a5 100644 --- a/levels/ttm/areas/1/3/1.inc.c +++ b/levels/ttm/areas/1/3/1.inc.c @@ -1,14 +1,6 @@ // 0x0700A340 - 0x0700A358 -static const Lights1 ttm_seg7_lights_0700A340 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700A358 - 0x0700A370 -static const Lights1 ttm_seg7_lights_0700A358 = gdSPDefLights1( - 0x7f, 0x7f, 0x64, - 0xff, 0xff, 0xc9, 0x28, 0x28, 0x28 -); // 0x0700A370 - 0x0700A460 static const Vtx ttm_seg7_vertex_0700A370[] = { @@ -89,8 +81,8 @@ static const Gfx ttm_seg7_dl_0700A710[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mountain_09004800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttm_seg7_lights_0700A340.l, 1), - gsSPLight(&ttm_seg7_lights_0700A340.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ttm_seg7_vertex_0700A370, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 5, 4, 6, 0x0, 5, 6, 7, 0x0), @@ -117,8 +109,8 @@ static const Gfx ttm_seg7_dl_0700A848[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, ttm_seg7_texture_07000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttm_seg7_lights_0700A358.l, 1), - gsSPLight(&ttm_seg7_lights_0700A358.a, 2), + gsSPLightColor(LIGHT_1, 0xffffc9ff), + gsSPLightColor(LIGHT_2, 0x7f7f64ff), gsSPVertex(ttm_seg7_vertex_0700A640, 13, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 4, 0x0), gsSP2Triangles( 0, 5, 3, 0x0, 0, 6, 7, 0x0), diff --git a/levels/ttm/areas/1/3/2.inc.c b/levels/ttm/areas/1/3/2.inc.c index 20d2ca14..5b78d171 100644 --- a/levels/ttm/areas/1/3/2.inc.c +++ b/levels/ttm/areas/1/3/2.inc.c @@ -1,8 +1,4 @@ // 0x0700A928 - 0x0700A940 -static const Lights1 ttm_seg7_lights_0700A928 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700A940 - 0x0700A9C0 static const Vtx ttm_seg7_vertex_0700A940[] = { @@ -33,8 +29,8 @@ static const Gfx ttm_seg7_dl_0700AA40[] = { gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, ttm_seg7_texture_07000000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttm_seg7_lights_0700A928.l, 1), - gsSPLight(&ttm_seg7_lights_0700A928.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ttm_seg7_vertex_0700A940, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0), gsSP2Triangles( 4, 0, 3, 0x0, 2, 1, 5, 0x0), diff --git a/levels/ttm/areas/1/4/1.inc.c b/levels/ttm/areas/1/4/1.inc.c index 82b9a3b3..90d7b13e 100644 --- a/levels/ttm/areas/1/4/1.inc.c +++ b/levels/ttm/areas/1/4/1.inc.c @@ -1,8 +1,4 @@ // 0x0700AB70 - 0x0700AB88 -static const Lights1 ttm_seg7_lights_0700AB70 = gdSPDefLights1( - 0x4c, 0x4c, 0x4c, - 0x99, 0x99, 0x99, 0x28, 0x28, 0x28 -); // 0x0700AB88 - 0x0700AC78 static const Vtx ttm_seg7_vertex_0700AB88[] = { @@ -66,8 +62,8 @@ static const Gfx ttm_seg7_dl_0700AE58[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mountain_09004800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttm_seg7_lights_0700AB70.l, 1), - gsSPLight(&ttm_seg7_lights_0700AB70.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(ttm_seg7_vertex_0700AB88, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 5, 4, 6, 0x0, 5, 6, 7, 0x0), diff --git a/levels/ttm/areas/1/4/2.inc.c b/levels/ttm/areas/1/4/2.inc.c index 9b4ab5c2..41235d2f 100644 --- a/levels/ttm/areas/1/4/2.inc.c +++ b/levels/ttm/areas/1/4/2.inc.c @@ -1,8 +1,4 @@ // 0x0700AFF0 - 0x0700B008 -static const Lights1 ttm_seg7_lights_0700AFF0 = gdSPDefLights1( - 0x4c, 0x4c, 0x4c, - 0x99, 0x99, 0x99, 0x28, 0x28, 0x28 -); // 0x0700B008 - 0x0700B068 static const Vtx ttm_seg7_vertex_0700B008[] = { @@ -19,8 +15,8 @@ static const Gfx ttm_seg7_dl_0700B068[] = { gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, ttm_seg7_texture_07000000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttm_seg7_lights_0700AFF0.l, 1), - gsSPLight(&ttm_seg7_lights_0700AFF0.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(ttm_seg7_vertex_0700B008, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 1, 3, 0x0), gsSP2Triangles( 1, 4, 3, 0x0, 3, 4, 0, 0x0), diff --git a/levels/ttm/areas/1/5/1.inc.c b/levels/ttm/areas/1/5/1.inc.c index ae548cec..135dddc0 100644 --- a/levels/ttm/areas/1/5/1.inc.c +++ b/levels/ttm/areas/1/5/1.inc.c @@ -1,8 +1,4 @@ // 0x0700B130 - 0x0700B148 -static const Lights1 ttm_seg7_lights_0700B130 = gdSPDefLights1( - 0x4c, 0x4c, 0x4c, - 0x99, 0x99, 0x99, 0x28, 0x28, 0x28 -); // 0x0700B148 - 0x0700B248 static const Vtx ttm_seg7_vertex_0700B148[] = { @@ -64,8 +60,8 @@ static const Gfx ttm_seg7_dl_0700B3F8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mountain_09004800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttm_seg7_lights_0700B130.l, 1), - gsSPLight(&ttm_seg7_lights_0700B130.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(ttm_seg7_vertex_0700B148, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), diff --git a/levels/ttm/areas/1/5/2.inc.c b/levels/ttm/areas/1/5/2.inc.c index d12065f4..c42ec90f 100644 --- a/levels/ttm/areas/1/5/2.inc.c +++ b/levels/ttm/areas/1/5/2.inc.c @@ -1,8 +1,4 @@ // 0x0700B590 - 0x0700B5A8 -static const Lights1 ttm_seg7_lights_0700B590 = gdSPDefLights1( - 0x4c, 0x4c, 0x4c, - 0x99, 0x99, 0x99, 0x28, 0x28, 0x28 -); // 0x0700B5A8 - 0x0700B608 static const Vtx ttm_seg7_vertex_0700B5A8[] = { @@ -19,8 +15,8 @@ static const Gfx ttm_seg7_dl_0700B608[] = { gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, ttm_seg7_texture_07000000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttm_seg7_lights_0700B590.l, 1), - gsSPLight(&ttm_seg7_lights_0700B590.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(ttm_seg7_vertex_0700B5A8, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 4, 0x0), gsSP2Triangles( 2, 1, 3, 0x0, 0, 5, 1, 0x0), diff --git a/levels/ttm/areas/1/6/1.inc.c b/levels/ttm/areas/1/6/1.inc.c index 109de67d..615a3a67 100644 --- a/levels/ttm/areas/1/6/1.inc.c +++ b/levels/ttm/areas/1/6/1.inc.c @@ -1,8 +1,4 @@ // 0x0700B6D0 - 0x0700B6E8 -static const Lights1 ttm_seg7_lights_0700B6D0 = gdSPDefLights1( - 0x4c, 0x4c, 0x4c, - 0x99, 0x99, 0x99, 0x28, 0x28, 0x28 -); // 0x0700B6E8 - 0x0700B7D8 static const Vtx ttm_seg7_vertex_0700B6E8[] = { @@ -64,8 +60,8 @@ static const Gfx ttm_seg7_dl_0700B998[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mountain_09004800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttm_seg7_lights_0700B6D0.l, 1), - gsSPLight(&ttm_seg7_lights_0700B6D0.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(ttm_seg7_vertex_0700B6E8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 5, 4, 6, 0x0, 5, 6, 7, 0x0), diff --git a/levels/ttm/areas/1/6/2.inc.c b/levels/ttm/areas/1/6/2.inc.c index e898bcea..ddc4bb9c 100644 --- a/levels/ttm/areas/1/6/2.inc.c +++ b/levels/ttm/areas/1/6/2.inc.c @@ -1,8 +1,4 @@ // 0x0700BB30 - 0x0700BB48 -static const Lights1 ttm_seg7_lights_0700BB30 = gdSPDefLights1( - 0x4c, 0x4c, 0x4c, - 0x99, 0x99, 0x99, 0x28, 0x28, 0x28 -); // 0x0700BB48 - 0x0700BBA8 static const Vtx ttm_seg7_vertex_0700BB48[] = { @@ -19,8 +15,8 @@ static const Gfx ttm_seg7_dl_0700BBA8[] = { gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, ttm_seg7_texture_07000000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttm_seg7_lights_0700BB30.l, 1), - gsSPLight(&ttm_seg7_lights_0700BB30.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(ttm_seg7_vertex_0700BB48, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 2, 1, 4, 0x0, 1, 5, 4, 0x0), diff --git a/levels/ttm/areas/1/7/model.inc.c b/levels/ttm/areas/1/7/model.inc.c index e9669b95..ebb986c8 100644 --- a/levels/ttm/areas/1/7/model.inc.c +++ b/levels/ttm/areas/1/7/model.inc.c @@ -1,14 +1,6 @@ // 0x0700BC70 - 0x0700BC88 -static const Lights1 ttm_seg7_lights_0700BC70 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700BC88 - 0x0700BCA0 -static const Lights1 ttm_seg7_lights_0700BC88 = gdSPDefLights1( - 0x5d, 0x5d, 0x5d, - 0xbb, 0xbb, 0xbb, 0x28, 0x28, 0x28 -); // 0x0700BCA0 - 0x0700BCE0 static const Vtx ttm_seg7_vertex_0700BCA0[] = { @@ -39,12 +31,12 @@ static const Gfx ttm_seg7_dl_0700BDA0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mountain_09004000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttm_seg7_lights_0700BC70.l, 1), - gsSPLight(&ttm_seg7_lights_0700BC70.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ttm_seg7_vertex_0700BCA0, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0), - gsSPLight(&ttm_seg7_lights_0700BC88.l, 1), - gsSPLight(&ttm_seg7_lights_0700BC88.a, 2), + gsSPLightColor(LIGHT_1, 0xbbbbbbff), + gsSPLightColor(LIGHT_2, 0x5d5d5dff), gsSPVertex(ttm_seg7_vertex_0700BCE0, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), diff --git a/levels/ttm/areas/1/8/model.inc.c b/levels/ttm/areas/1/8/model.inc.c index f3350d0f..d58b5e15 100644 --- a/levels/ttm/areas/1/8/model.inc.c +++ b/levels/ttm/areas/1/8/model.inc.c @@ -1,14 +1,6 @@ // 0x0700BE90 - 0x0700BEA8 -static const Lights1 ttm_seg7_lights_0700BE90 = gdSPDefLights1( - 0x4c, 0x4c, 0x4c, - 0x99, 0x99, 0x99, 0x28, 0x28, 0x28 -); // 0x0700BEA8 - 0x0700BEC0 -static const Lights1 ttm_seg7_lights_0700BEA8 = gdSPDefLights1( - 0x5d, 0x5d, 0x5d, - 0xbb, 0xbb, 0xbb, 0x28, 0x28, 0x28 -); // 0x0700BEC0 - 0x0700BF40 static const Vtx ttm_seg7_vertex_0700BEC0[] = { @@ -41,13 +33,13 @@ static const Gfx ttm_seg7_dl_0700BFE0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mountain_09004000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttm_seg7_lights_0700BE90.l, 1), - gsSPLight(&ttm_seg7_lights_0700BE90.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(ttm_seg7_vertex_0700BEC0, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 6, 7, 4, 0x0), - gsSPLight(&ttm_seg7_lights_0700BEA8.l, 1), - gsSPLight(&ttm_seg7_lights_0700BEA8.a, 2), + gsSPLightColor(LIGHT_1, 0xbbbbbbff), + gsSPLightColor(LIGHT_2, 0x5d5d5dff), gsSPVertex(ttm_seg7_vertex_0700BF40, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 7, 8, 9, 0x0), diff --git a/levels/ttm/areas/1/9/model.inc.c b/levels/ttm/areas/1/9/model.inc.c index d0c3bbb6..edf5584c 100644 --- a/levels/ttm/areas/1/9/model.inc.c +++ b/levels/ttm/areas/1/9/model.inc.c @@ -1,20 +1,8 @@ // 0x0700C0E0 - 0x0700C0F8 -static const Lights1 ttm_seg7_lights_0700C0E0 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700C0F8 - 0x0700C110 -static const Lights1 ttm_seg7_lights_0700C0F8 = gdSPDefLights1( - 0x4c, 0x4c, 0x4c, - 0x99, 0x99, 0x99, 0x28, 0x28, 0x28 -); // 0x0700C110 - 0x0700C128 -static const Lights1 ttm_seg7_lights_0700C110 = gdSPDefLights1( - 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x0700C128 - 0x0700C228 static const Vtx ttm_seg7_vertex_0700C128[] = { @@ -61,8 +49,8 @@ static const Gfx ttm_seg7_dl_0700C2E8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mountain_09000000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttm_seg7_lights_0700C0E0.l, 1), - gsSPLight(&ttm_seg7_lights_0700C0E0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ttm_seg7_vertex_0700C128, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -76,8 +64,8 @@ static const Gfx ttm_seg7_dl_0700C360[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mountain_09003800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttm_seg7_lights_0700C0F8.l, 1), - gsSPLight(&ttm_seg7_lights_0700C0F8.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x4c4c4cff), gsSPVertex(ttm_seg7_vertex_0700C228, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), gsSP2Triangles( 4, 3, 1, 0x0, 4, 1, 5, 0x0), @@ -88,8 +76,8 @@ static const Gfx ttm_seg7_dl_0700C360[] = { // 0x0700C3D8 - 0x0700C408 static const Gfx ttm_seg7_dl_0700C3D8[] = { - gsSPLight(&ttm_seg7_lights_0700C110.l, 1), - gsSPLight(&ttm_seg7_lights_0700C110.a, 2), + gsSPLightColor(LIGHT_1, 0xff), + gsSPLightColor(LIGHT_2, 0xff), gsSPVertex(ttm_seg7_vertex_0700C2A8, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), diff --git a/levels/ttm/areas/1/painting.inc.c b/levels/ttm/areas/1/painting.inc.c index 2477f654..e83bc73b 100644 --- a/levels/ttm/areas/1/painting.inc.c +++ b/levels/ttm/areas/1/painting.inc.c @@ -1,10 +1,6 @@ #include "game/paintings.h" // 0x070122F0 - 0x07012308 -static const Lights1 ttm_seg7_lights_070122F0 = gdSPDefLights1( - 0x50, 0x50, 0x50, - 0xff, 0xff, 0xff, 0x32, 0x32, 0x32 -); // 0x07012308 - 0x07012388 static const Vtx ttm_seg7_vertex_07012308[] = { @@ -35,8 +31,8 @@ const Gfx ttm_seg7_dl_070123B8[] = { gsDPPipeSync(), gsSPSetGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), gsDPSetCombineMode(G_CC_MODULATERGB, G_CC_MODULATERGB), - gsSPLight(&ttm_seg7_lights_070122F0.l, 1), - gsSPLight(&ttm_seg7_lights_070122F0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x505050ff), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD), gsDPTileSync(), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_CLAMP, 6, G_TX_NOLOD), diff --git a/levels/ttm/areas/2/1/model.inc.c b/levels/ttm/areas/2/1/model.inc.c index f0fef251..5cc967af 100644 --- a/levels/ttm/areas/2/1/model.inc.c +++ b/levels/ttm/areas/2/1/model.inc.c @@ -1,80 +1,28 @@ // 0x070172D8 - 0x070172F0 -static const Lights1 ttm_seg7_lights_070172D8 = gdSPDefLights1( - 0x08, 0x08, 0x08, - 0x22, 0x22, 0x22, 0x28, 0x28, 0x28 -); // 0x070172F0 - 0x07017308 -static const Lights1 ttm_seg7_lights_070172F0 = gdSPDefLights1( - 0x0c, 0x0c, 0x0c, - 0x33, 0x33, 0x33, 0x28, 0x28, 0x28 -); // 0x07017308 - 0x07017320 -static const Lights1 ttm_seg7_lights_07017308 = gdSPDefLights1( - 0x11, 0x11, 0x11, - 0x44, 0x44, 0x44, 0x28, 0x28, 0x28 -); // 0x07017320 - 0x07017338 -static const Lights1 ttm_seg7_lights_07017320 = gdSPDefLights1( - 0x15, 0x15, 0x15, - 0x55, 0x55, 0x55, 0x28, 0x28, 0x28 -); // 0x07017338 - 0x07017350 -static const Lights1 ttm_seg7_lights_07017338 = gdSPDefLights1( - 0x19, 0x19, 0x19, - 0x66, 0x66, 0x66, 0x28, 0x28, 0x28 -); // 0x07017350 - 0x07017368 -static const Lights1 ttm_seg7_lights_07017350 = gdSPDefLights1( - 0x1d, 0x1d, 0x1d, - 0x77, 0x77, 0x77, 0x28, 0x28, 0x28 -); // 0x07017368 - 0x07017380 -static const Lights1 ttm_seg7_lights_07017368 = gdSPDefLights1( - 0x2a, 0x2a, 0x2a, - 0xaa, 0xaa, 0xaa, 0x28, 0x28, 0x28 -); // 0x07017380 - 0x07017398 -static const Lights1 ttm_seg7_lights_07017380 = gdSPDefLights1( - 0x2e, 0x2e, 0x2e, - 0xbb, 0xbb, 0xbb, 0x28, 0x28, 0x28 -); // 0x07017398 - 0x070173B0 -static const Lights1 ttm_seg7_lights_07017398 = gdSPDefLights1( - 0x33, 0x33, 0x33, - 0xcc, 0xcc, 0xcc, 0x28, 0x28, 0x28 -); // 0x070173B0 - 0x070173C8 -static const Lights1 ttm_seg7_lights_070173B0 = gdSPDefLights1( - 0x37, 0x37, 0x37, - 0xdd, 0xdd, 0xdd, 0x28, 0x28, 0x28 -); // 0x070173C8 - 0x070173E0 -static const Lights1 ttm_seg7_lights_070173C8 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x070173E0 - 0x070173F8 -static const Lights1 ttm_seg7_lights_070173E0 = gdSPDefLights1( - 0x22, 0x22, 0x22, - 0x88, 0x88, 0x88, 0x28, 0x28, 0x28 -); // 0x070173F8 - 0x07017410 -static const Lights1 ttm_seg7_lights_070173F8 = gdSPDefLights1( - 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x07017410 - 0x07017450 static const Vtx ttm_seg7_vertex_07017410[] = { @@ -1634,27 +1582,27 @@ static const Gfx ttm_seg7_dl_0701BEE0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mountain_09006800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttm_seg7_lights_070172D8.l, 1), - gsSPLight(&ttm_seg7_lights_070172D8.a, 2), + gsSPLightColor(LIGHT_1, 0x222222ff), + gsSPLightColor(LIGHT_2, 0x80808ff), gsSPVertex(ttm_seg7_vertex_07017410, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - gsSPLight(&ttm_seg7_lights_070172F0.l, 1), - gsSPLight(&ttm_seg7_lights_070172F0.a, 2), + gsSPLightColor(LIGHT_1, 0x333333ff), + gsSPLightColor(LIGHT_2, 0xc0c0cff), gsSPVertex(ttm_seg7_vertex_07017450, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), - gsSPLight(&ttm_seg7_lights_07017308.l, 1), - gsSPLight(&ttm_seg7_lights_07017308.a, 2), + gsSPLightColor(LIGHT_1, 0x444444ff), + gsSPLightColor(LIGHT_2, 0x111111ff), gsSPVertex(ttm_seg7_vertex_070174D0, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), - gsSPLight(&ttm_seg7_lights_07017320.l, 1), - gsSPLight(&ttm_seg7_lights_07017320.a, 2), + gsSPLightColor(LIGHT_1, 0x555555ff), + gsSPLightColor(LIGHT_2, 0x151515ff), gsSPVertex(ttm_seg7_vertex_07017550, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), - gsSPLight(&ttm_seg7_lights_07017338.l, 1), - gsSPLight(&ttm_seg7_lights_07017338.a, 2), + gsSPLightColor(LIGHT_1, 0x666666ff), + gsSPLightColor(LIGHT_2, 0x191919ff), gsSPVertex(ttm_seg7_vertex_070175D0, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), @@ -1666,12 +1614,12 @@ static const Gfx ttm_seg7_dl_0701C008[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mountain_0900B800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttm_seg7_lights_07017350.l, 1), - gsSPLight(&ttm_seg7_lights_07017350.a, 2), + gsSPLightColor(LIGHT_1, 0x777777ff), + gsSPLightColor(LIGHT_2, 0x1d1d1dff), gsSPVertex(ttm_seg7_vertex_07017650, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - gsSPLight(&ttm_seg7_lights_07017368.l, 1), - gsSPLight(&ttm_seg7_lights_07017368.a, 2), + gsSPLightColor(LIGHT_1, 0xaaaaaaff), + gsSPLightColor(LIGHT_2, 0x2a2a2aff), gsSPVertex(ttm_seg7_vertex_07017690, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 6, 7, 4, 0x0), @@ -1684,8 +1632,8 @@ static const Gfx ttm_seg7_dl_0701C008[] = { gsSP2Triangles( 8, 9, 10, 0x0, 8, 11, 9, 0x0), gsSP2Triangles(12, 9, 11, 0x0, 1, 13, 2, 0x0), gsSP1Triangle(13, 14, 2, 0x0), - gsSPLight(&ttm_seg7_lights_07017380.l, 1), - gsSPLight(&ttm_seg7_lights_07017380.a, 2), + gsSPLightColor(LIGHT_1, 0xbbbbbbff), + gsSPLightColor(LIGHT_2, 0x2e2e2eff), gsSPVertex(ttm_seg7_vertex_07017870, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 6, 7, 4, 0x0), @@ -1700,8 +1648,8 @@ static const Gfx ttm_seg7_dl_0701C008[] = { gsSPVertex(ttm_seg7_vertex_07017A60, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 2, 4, 0x0), gsSP1Triangle( 5, 6, 7, 0x0), - gsSPLight(&ttm_seg7_lights_07017398.l, 1), - gsSPLight(&ttm_seg7_lights_07017398.a, 2), + gsSPLightColor(LIGHT_1, 0xccccccff), + gsSPLightColor(LIGHT_2, 0x333333ff), gsSPVertex(ttm_seg7_vertex_07017AE0, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 4, 7, 8, 0x0), @@ -1717,8 +1665,8 @@ static const Gfx ttm_seg7_dl_0701C008[] = { gsSPVertex(ttm_seg7_vertex_07017CC0, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 7, 8, 9, 0x0), - gsSPLight(&ttm_seg7_lights_070173B0.l, 1), - gsSPLight(&ttm_seg7_lights_070173B0.a, 2), + gsSPLightColor(LIGHT_1, 0xddddddff), + gsSPLightColor(LIGHT_2, 0x373737ff), gsSPVertex(ttm_seg7_vertex_07017D60, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 6, 7, 4, 0x0), @@ -1734,8 +1682,8 @@ static const Gfx ttm_seg7_dl_0701C008[] = { gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 6, 7, 4, 0x0), gsSP1Triangle( 6, 8, 7, 0x0), - gsSPLight(&ttm_seg7_lights_070173C8.l, 1), - gsSPLight(&ttm_seg7_lights_070173C8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(ttm_seg7_vertex_07017FC0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), @@ -1799,12 +1747,12 @@ static const Gfx ttm_seg7_dl_0701C688[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mountain_0900A800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttm_seg7_lights_07017398.l, 1), - gsSPLight(&ttm_seg7_lights_07017398.a, 2), + gsSPLightColor(LIGHT_1, 0xccccccff), + gsSPLightColor(LIGHT_2, 0x333333ff), gsSPVertex(ttm_seg7_vertex_070187F0, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - gsSPLight(&ttm_seg7_lights_070173C8.l, 1), - gsSPLight(&ttm_seg7_lights_070173C8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(ttm_seg7_vertex_07018830, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), @@ -1815,15 +1763,15 @@ static const Gfx ttm_seg7_dl_0701C6F8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mountain_09008800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttm_seg7_lights_07017308.l, 1), - gsSPLight(&ttm_seg7_lights_07017308.a, 2), + gsSPLightColor(LIGHT_1, 0x444444ff), + gsSPLightColor(LIGHT_2, 0x111111ff), gsSPVertex(ttm_seg7_vertex_07018870, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), gsSP2Triangles( 7, 10, 8, 0x0, 11, 12, 13, 0x0), gsSP2Triangles(11, 13, 14, 0x0, 0, 15, 1, 0x0), - gsSPLight(&ttm_seg7_lights_07017320.l, 1), - gsSPLight(&ttm_seg7_lights_07017320.a, 2), + gsSPLightColor(LIGHT_1, 0x555555ff), + gsSPLightColor(LIGHT_2, 0x151515ff), gsSPVertex(ttm_seg7_vertex_07018970, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -1833,8 +1781,8 @@ static const Gfx ttm_seg7_dl_0701C6F8[] = { gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 6, 8, 9, 0x0), gsSP1Triangle( 0, 10, 1, 0x0), - gsSPLight(&ttm_seg7_lights_07017338.l, 1), - gsSPLight(&ttm_seg7_lights_07017338.a, 2), + gsSPLightColor(LIGHT_1, 0x666666ff), + gsSPLightColor(LIGHT_2, 0x191919ff), gsSPVertex(ttm_seg7_vertex_07018B10, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -1847,8 +1795,8 @@ static const Gfx ttm_seg7_dl_0701C6F8[] = { gsSP1Triangle( 0, 2, 14, 0x0), gsSPVertex(ttm_seg7_vertex_07018CF0, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), - gsSPLight(&ttm_seg7_lights_07017350.l, 1), - gsSPLight(&ttm_seg7_lights_07017350.a, 2), + gsSPLightColor(LIGHT_1, 0x777777ff), + gsSPLightColor(LIGHT_2, 0x1d1d1dff), gsSPVertex(ttm_seg7_vertex_07018D30, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -1858,8 +1806,8 @@ static const Gfx ttm_seg7_dl_0701C6F8[] = { gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 6, 8, 9, 0x0), gsSP1Triangle( 0, 10, 1, 0x0), - gsSPLight(&ttm_seg7_lights_070173E0.l, 1), - gsSPLight(&ttm_seg7_lights_070173E0.a, 2), + gsSPLightColor(LIGHT_1, 0x888888ff), + gsSPLightColor(LIGHT_2, 0x222222ff), gsSPVertex(ttm_seg7_vertex_07018ED0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), @@ -1965,12 +1913,12 @@ static const Gfx ttm_seg7_dl_0701C6F8[] = { gsSPVertex(ttm_seg7_vertex_0701A270, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 5, 7, 6, 0x0), - gsSPLight(&ttm_seg7_lights_07017368.l, 1), - gsSPLight(&ttm_seg7_lights_07017368.a, 2), + gsSPLightColor(LIGHT_1, 0xaaaaaaff), + gsSPLightColor(LIGHT_2, 0x2a2a2aff), gsSPVertex(ttm_seg7_vertex_0701A2F0, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - gsSPLight(&ttm_seg7_lights_07017380.l, 1), - gsSPLight(&ttm_seg7_lights_07017380.a, 2), + gsSPLightColor(LIGHT_1, 0xbbbbbbff), + gsSPLightColor(LIGHT_2, 0x2e2e2eff), gsSPVertex(ttm_seg7_vertex_0701A330, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0), gsSP2Triangles( 2, 4, 3, 0x0, 4, 5, 3, 0x0), @@ -2010,8 +1958,8 @@ static const Gfx ttm_seg7_dl_0701C6F8[] = { gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 5, 7, 6, 0x0), gsSP2Triangles( 8, 9, 10, 0x0, 8, 10, 11, 0x0), - gsSPLight(&ttm_seg7_lights_07017398.l, 1), - gsSPLight(&ttm_seg7_lights_07017398.a, 2), + gsSPLightColor(LIGHT_1, 0xccccccff), + gsSPLightColor(LIGHT_2, 0x333333ff), gsSPVertex(ttm_seg7_vertex_0701AA70, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 4, 0x0), gsSP2Triangles( 1, 4, 5, 0x0, 1, 5, 6, 0x0), @@ -2021,8 +1969,8 @@ static const Gfx ttm_seg7_dl_0701C6F8[] = { gsSPVertex(ttm_seg7_vertex_0701AB50, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), - gsSPLight(&ttm_seg7_lights_070173C8.l, 1), - gsSPLight(&ttm_seg7_lights_070173C8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(ttm_seg7_vertex_0701ABD0, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -2134,8 +2082,8 @@ static const Gfx ttm_seg7_dl_0701C6F8[] = { // 0x0701D708 - 0x0701D798 static const Gfx ttm_seg7_dl_0701D708[] = { - gsSPLight(&ttm_seg7_lights_070173F8.l, 1), - gsSPLight(&ttm_seg7_lights_070173F8.a, 2), + gsSPLightColor(LIGHT_1, 0xff), + gsSPLightColor(LIGHT_2, 0xff), gsSPVertex(ttm_seg7_vertex_0701BE00, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 3, 0, 0x0, 4, 0, 5, 0x0), diff --git a/levels/ttm/areas/2/2/model.inc.c b/levels/ttm/areas/2/2/model.inc.c index f2f0d43e..45a82d8f 100644 --- a/levels/ttm/areas/2/2/model.inc.c +++ b/levels/ttm/areas/2/2/model.inc.c @@ -1,8 +1,4 @@ // 0x0701D888 - 0x0701D8A0 -static const Lights1 ttm_seg7_lights_0701D888 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0701D8A0 - 0x0701D9A0 static const Vtx ttm_seg7_vertex_0701D8A0[] = { @@ -57,8 +53,8 @@ static const Gfx ttm_seg7_dl_0701DAE0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mountain_09000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttm_seg7_lights_0701D888.l, 1), - gsSPLight(&ttm_seg7_lights_0701D888.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(ttm_seg7_vertex_0701D8A0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), gsSP2Triangles( 1, 4, 3, 0x0, 0, 2, 5, 0x0), diff --git a/levels/ttm/areas/3/1/model.inc.c b/levels/ttm/areas/3/1/model.inc.c index fe9e6b96..18c1a4c8 100644 --- a/levels/ttm/areas/3/1/model.inc.c +++ b/levels/ttm/areas/3/1/model.inc.c @@ -1,92 +1,32 @@ // 0x0701DC60 - 0x0701DC78 -static const Lights1 ttm_seg7_lights_0701DC60 = gdSPDefLights1( - 0x08, 0x08, 0x08, - 0x22, 0x22, 0x22, 0x28, 0x28, 0x28 -); // 0x0701DC78 - 0x0701DC90 -static const Lights1 ttm_seg7_lights_0701DC78 = gdSPDefLights1( - 0x0c, 0x0c, 0x0c, - 0x33, 0x33, 0x33, 0x28, 0x28, 0x28 -); // 0x0701DC90 - 0x0701DCA8 -static const Lights1 ttm_seg7_lights_0701DC90 = gdSPDefLights1( - 0x11, 0x11, 0x11, - 0x44, 0x44, 0x44, 0x28, 0x28, 0x28 -); // 0x0701DCA8 - 0x0701DCC0 -static const Lights1 ttm_seg7_lights_0701DCA8 = gdSPDefLights1( - 0x15, 0x15, 0x15, - 0x55, 0x55, 0x55, 0x28, 0x28, 0x28 -); // 0x0701DCC0 - 0x0701DCD8 -static const Lights1 ttm_seg7_lights_0701DCC0 = gdSPDefLights1( - 0x19, 0x19, 0x19, - 0x66, 0x66, 0x66, 0x28, 0x28, 0x28 -); // 0x0701DCD8 - 0x0701DCF0 -static const Lights1 ttm_seg7_lights_0701DCD8 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0701DCF0 - 0x0701DD08 -static const Lights1 ttm_seg7_lights_0701DCF0 = gdSPDefLights1( - 0x1d, 0x1d, 0x1d, - 0x77, 0x77, 0x77, 0x28, 0x28, 0x28 -); // 0x0701DD08 - 0x0701DD20 -static const Lights1 ttm_seg7_lights_0701DD08 = gdSPDefLights1( - 0x22, 0x22, 0x22, - 0x88, 0x88, 0x88, 0x28, 0x28, 0x28 -); // 0x0701DD20 - 0x0701DD38 -static const Lights1 ttm_seg7_lights_0701DD20 = gdSPDefLights1( - 0x26, 0x26, 0x26, - 0x99, 0x99, 0x99, 0x28, 0x28, 0x28 -); // 0x0701DD38 - 0x0701DD50 -static const Lights1 ttm_seg7_lights_0701DD38 = gdSPDefLights1( - 0x2a, 0x2a, 0x2a, - 0xaa, 0xaa, 0xaa, 0x28, 0x28, 0x28 -); // 0x0701DD50 - 0x0701DD68 -static const Lights1 ttm_seg7_lights_0701DD50 = gdSPDefLights1( - 0x2e, 0x2e, 0x2e, - 0xbb, 0xbb, 0xbb, 0x28, 0x28, 0x28 -); // 0x0701DD68 - 0x0701DD80 -static const Lights1 ttm_seg7_lights_0701DD68 = gdSPDefLights1( - 0x33, 0x33, 0x33, - 0xcc, 0xcc, 0xcc, 0x28, 0x28, 0x28 -); // 0x0701DD80 - 0x0701DD98 -static const Lights1 ttm_seg7_lights_0701DD80 = gdSPDefLights1( - 0x37, 0x37, 0x37, - 0xdd, 0xdd, 0xdd, 0x28, 0x28, 0x28 -); // 0x0701DD98 - 0x0701DDB0 -static const Lights1 ttm_seg7_lights_0701DD98 = gdSPDefLights1( - 0x3b, 0x3b, 0x3b, - 0xee, 0xee, 0xee, 0x28, 0x28, 0x28 -); // 0x0701DDB0 - 0x0701DDC8 -static const Lights1 ttm_seg7_lights_0701DDB0 = gdSPDefLights1( - 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x0701DDC8 - 0x0701DE08 static const Vtx ttm_seg7_vertex_0701DDC8[] = { @@ -1777,32 +1717,32 @@ static const Gfx ttm_seg7_dl_07022F08[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mountain_09006800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttm_seg7_lights_0701DC60.l, 1), - gsSPLight(&ttm_seg7_lights_0701DC60.a, 2), + gsSPLightColor(LIGHT_1, 0x222222ff), + gsSPLightColor(LIGHT_2, 0x80808ff), gsSPVertex(ttm_seg7_vertex_0701DDC8, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), - gsSPLight(&ttm_seg7_lights_0701DC78.l, 1), - gsSPLight(&ttm_seg7_lights_0701DC78.a, 2), + gsSPLightColor(LIGHT_1, 0x333333ff), + gsSPLightColor(LIGHT_2, 0xc0c0cff), gsSPVertex(ttm_seg7_vertex_0701DE08, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), - gsSPLight(&ttm_seg7_lights_0701DC90.l, 1), - gsSPLight(&ttm_seg7_lights_0701DC90.a, 2), + gsSPLightColor(LIGHT_1, 0x444444ff), + gsSPLightColor(LIGHT_2, 0x111111ff), gsSPVertex(ttm_seg7_vertex_0701DE88, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), - gsSPLight(&ttm_seg7_lights_0701DCA8.l, 1), - gsSPLight(&ttm_seg7_lights_0701DCA8.a, 2), + gsSPLightColor(LIGHT_1, 0x555555ff), + gsSPLightColor(LIGHT_2, 0x151515ff), gsSPVertex(ttm_seg7_vertex_0701DF08, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), - gsSPLight(&ttm_seg7_lights_0701DCC0.l, 1), - gsSPLight(&ttm_seg7_lights_0701DCC0.a, 2), + gsSPLightColor(LIGHT_1, 0x666666ff), + gsSPLightColor(LIGHT_2, 0x191919ff), gsSPVertex(ttm_seg7_vertex_0701DF88, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), - gsSPLight(&ttm_seg7_lights_0701DCD8.l, 1), - gsSPLight(&ttm_seg7_lights_0701DCD8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(ttm_seg7_vertex_0701E008, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -1826,8 +1766,8 @@ static const Gfx ttm_seg7_dl_07023108[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mountain_0900B800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttm_seg7_lights_0701DCA8.l, 1), - gsSPLight(&ttm_seg7_lights_0701DCA8.a, 2), + gsSPLightColor(LIGHT_1, 0x555555ff), + gsSPLightColor(LIGHT_2, 0x151515ff), gsSPVertex(ttm_seg7_vertex_0701E2E8, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 6, 5, 0x0, 7, 8, 9, 0x0), @@ -1846,14 +1786,14 @@ static const Gfx ttm_seg7_dl_07023108[] = { gsSPVertex(ttm_seg7_vertex_0701E5E8, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 1, 6, 2, 0x0, 7, 3, 5, 0x0), - gsSPLight(&ttm_seg7_lights_0701DCC0.l, 1), - gsSPLight(&ttm_seg7_lights_0701DCC0.a, 2), + gsSPLightColor(LIGHT_1, 0x666666ff), + gsSPLightColor(LIGHT_2, 0x191919ff), gsSPVertex(ttm_seg7_vertex_0701E668, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 1, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 5, 7, 6, 0x0), gsSP2Triangles( 8, 9, 10, 0x0, 9, 11, 10, 0x0), - gsSPLight(&ttm_seg7_lights_0701DCF0.l, 1), - gsSPLight(&ttm_seg7_lights_0701DCF0.a, 2), + gsSPLightColor(LIGHT_1, 0x777777ff), + gsSPLightColor(LIGHT_2, 0x1d1d1dff), gsSPVertex(ttm_seg7_vertex_0701E728, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), @@ -1871,8 +1811,8 @@ static const Gfx ttm_seg7_dl_07023108[] = { gsSP1Triangle(12, 14, 13, 0x0), gsSPVertex(ttm_seg7_vertex_0701EA08, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), - gsSPLight(&ttm_seg7_lights_0701DD08.l, 1), - gsSPLight(&ttm_seg7_lights_0701DD08.a, 2), + gsSPLightColor(LIGHT_1, 0x888888ff), + gsSPLightColor(LIGHT_2, 0x222222ff), gsSPVertex(ttm_seg7_vertex_0701EA48, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -1880,14 +1820,14 @@ static const Gfx ttm_seg7_dl_07023108[] = { gsSPVertex(ttm_seg7_vertex_0701EB28, 7, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP1Triangle( 1, 6, 2, 0x0), - gsSPLight(&ttm_seg7_lights_0701DD20.l, 1), - gsSPLight(&ttm_seg7_lights_0701DD20.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x262626ff), gsSPVertex(ttm_seg7_vertex_0701EB98, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 1, 3, 0x0), gsSP2Triangles( 3, 1, 4, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 6, 8, 0x0), - gsSPLight(&ttm_seg7_lights_0701DD38.l, 1), - gsSPLight(&ttm_seg7_lights_0701DD38.a, 2), + gsSPLightColor(LIGHT_1, 0xaaaaaaff), + gsSPLightColor(LIGHT_2, 0x2a2a2aff), gsSPVertex(ttm_seg7_vertex_0701EC38, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 6, 7, 8, 0x0), @@ -1903,8 +1843,8 @@ static const Gfx ttm_seg7_dl_07023108[] = { gsSPVertex(ttm_seg7_vertex_0701EE18, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 5, 7, 6, 0x0), - gsSPLight(&ttm_seg7_lights_0701DD50.l, 1), - gsSPLight(&ttm_seg7_lights_0701DD50.a, 2), + gsSPLightColor(LIGHT_1, 0xbbbbbbff), + gsSPLightColor(LIGHT_2, 0x2e2e2eff), gsSPVertex(ttm_seg7_vertex_0701EE98, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 6, 7, 4, 0x0), @@ -1920,8 +1860,8 @@ static const Gfx ttm_seg7_dl_07023108[] = { gsSPVertex(ttm_seg7_vertex_0701F088, 7, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP1Triangle( 5, 4, 6, 0x0), - gsSPLight(&ttm_seg7_lights_0701DD68.l, 1), - gsSPLight(&ttm_seg7_lights_0701DD68.a, 2), + gsSPLightColor(LIGHT_1, 0xccccccff), + gsSPLightColor(LIGHT_2, 0x333333ff), gsSPVertex(ttm_seg7_vertex_0701F0F8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 6, 7, 4, 0x0), @@ -1984,8 +1924,8 @@ static const Gfx ttm_seg7_dl_07023108[] = { gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 7, 8, 9, 0x0), gsSP1Triangle(10, 4, 6, 0x0), - gsSPLight(&ttm_seg7_lights_0701DD80.l, 1), - gsSPLight(&ttm_seg7_lights_0701DD80.a, 2), + gsSPLightColor(LIGHT_1, 0xddddddff), + gsSPLightColor(LIGHT_2, 0x373737ff), gsSPVertex(ttm_seg7_vertex_0701FCE8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 4, 7, 5, 0x0), @@ -2050,8 +1990,8 @@ static const Gfx ttm_seg7_dl_07023108[] = { gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 7, 8, 9, 0x0), gsSP2Triangles(10, 7, 9, 0x0, 11, 12, 13, 0x0), - gsSPLight(&ttm_seg7_lights_0701DCD8.l, 1), - gsSPLight(&ttm_seg7_lights_0701DCD8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(ttm_seg7_vertex_07020908, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 4, 7, 8, 0x0), @@ -2161,8 +2101,8 @@ static const Gfx ttm_seg7_dl_07024178[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mountain_09008800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttm_seg7_lights_0701DC90.l, 1), - gsSPLight(&ttm_seg7_lights_0701DC90.a, 2), + gsSPLightColor(LIGHT_1, 0x444444ff), + gsSPLightColor(LIGHT_2, 0x111111ff), gsSPVertex(ttm_seg7_vertex_070219C8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 6, 5, 0x0, 7, 8, 9, 0x0), @@ -2173,23 +2113,23 @@ static const Gfx ttm_seg7_dl_07024178[] = { gsSP2Triangles( 6, 7, 4, 0x0, 8, 3, 5, 0x0), gsSP2Triangles( 9, 10, 11, 0x0, 10, 0, 2, 0x0), gsSP1Triangle(10, 2, 11, 0x0), - gsSPLight(&ttm_seg7_lights_0701DCA8.l, 1), - gsSPLight(&ttm_seg7_lights_0701DCA8.a, 2), + gsSPLightColor(LIGHT_1, 0x555555ff), + gsSPLightColor(LIGHT_2, 0x151515ff), gsSPVertex(ttm_seg7_vertex_07021B78, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 5, 7, 6, 0x0), - gsSPLight(&ttm_seg7_lights_0701DCC0.l, 1), - gsSPLight(&ttm_seg7_lights_0701DCC0.a, 2), + gsSPLightColor(LIGHT_1, 0x666666ff), + gsSPLightColor(LIGHT_2, 0x191919ff), gsSPVertex(ttm_seg7_vertex_07021BF8, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 5, 7, 6, 0x0), - gsSPLight(&ttm_seg7_lights_0701DCF0.l, 1), - gsSPLight(&ttm_seg7_lights_0701DCF0.a, 2), + gsSPLightColor(LIGHT_1, 0x777777ff), + gsSPLightColor(LIGHT_2, 0x1d1d1dff), gsSPVertex(ttm_seg7_vertex_07021C78, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), - gsSPLight(&ttm_seg7_lights_0701DD08.l, 1), - gsSPLight(&ttm_seg7_lights_0701DD08.a, 2), + gsSPLightColor(LIGHT_1, 0x888888ff), + gsSPLightColor(LIGHT_2, 0x222222ff), gsSPVertex(ttm_seg7_vertex_07021CF8, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -2209,29 +2149,29 @@ static const Gfx ttm_seg7_dl_07024178[] = { gsSP2Triangles( 6, 7, 8, 0x0, 9, 6, 8, 0x0), gsSP2Triangles(10, 0, 2, 0x0, 10, 2, 11, 0x0), gsSP1Triangle(12, 10, 11, 0x0), - gsSPLight(&ttm_seg7_lights_0701DD20.l, 1), - gsSPLight(&ttm_seg7_lights_0701DD20.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x262626ff), gsSPVertex(ttm_seg7_vertex_07022098, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 4, 3, 0x0, 7, 8, 9, 0x0), gsSP2Triangles(10, 8, 7, 0x0, 11, 12, 13, 0x0), gsSP2Triangles(12, 14, 13, 0x0, 1, 15, 2, 0x0), - gsSPLight(&ttm_seg7_lights_0701DD38.l, 1), - gsSPLight(&ttm_seg7_lights_0701DD38.a, 2), + gsSPLightColor(LIGHT_1, 0xaaaaaaff), + gsSPLightColor(LIGHT_2, 0x2a2a2aff), gsSPVertex(ttm_seg7_vertex_07022198, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 4, 3, 0x0, 7, 8, 9, 0x0), gsSP2Triangles(10, 8, 7, 0x0, 11, 12, 13, 0x0), gsSP2Triangles(12, 14, 13, 0x0, 1, 15, 2, 0x0), - gsSPLight(&ttm_seg7_lights_0701DD50.l, 1), - gsSPLight(&ttm_seg7_lights_0701DD50.a, 2), + gsSPLightColor(LIGHT_1, 0xbbbbbbff), + gsSPLightColor(LIGHT_2, 0x2e2e2eff), gsSPVertex(ttm_seg7_vertex_07022298, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 5, 4, 6, 0x0, 7, 8, 9, 0x0), gsSP2Triangles(10, 8, 7, 0x0, 11, 12, 13, 0x0), gsSP2Triangles(11, 13, 14, 0x0, 0, 2, 15, 0x0), - gsSPLight(&ttm_seg7_lights_0701DD68.l, 1), - gsSPLight(&ttm_seg7_lights_0701DD68.a, 2), + gsSPLightColor(LIGHT_1, 0xccccccff), + gsSPLightColor(LIGHT_2, 0x333333ff), gsSPVertex(ttm_seg7_vertex_07022398, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -2251,22 +2191,22 @@ static const Gfx ttm_seg7_dl_07024178[] = { gsSPVertex(ttm_seg7_vertex_07022678, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 3, 5, 0x0), - gsSPLight(&ttm_seg7_lights_0701DD80.l, 1), - gsSPLight(&ttm_seg7_lights_0701DD80.a, 2), + gsSPLightColor(LIGHT_1, 0xddddddff), + gsSPLightColor(LIGHT_2, 0x373737ff), gsSPVertex(ttm_seg7_vertex_070226F8, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), gsSP2Triangles( 7, 10, 8, 0x0, 11, 12, 13, 0x0), gsSP2Triangles(11, 14, 12, 0x0, 0, 15, 1, 0x0), - gsSPLight(&ttm_seg7_lights_0701DD98.l, 1), - gsSPLight(&ttm_seg7_lights_0701DD98.a, 2), + gsSPLightColor(LIGHT_1, 0xeeeeeeff), + gsSPLightColor(LIGHT_2, 0x3b3b3bff), gsSPVertex(ttm_seg7_vertex_070227F8, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), gsSP2Triangles( 7, 9, 10, 0x0, 11, 12, 13, 0x0), gsSP2Triangles(11, 13, 14, 0x0, 0, 2, 15, 0x0), - gsSPLight(&ttm_seg7_lights_0701DCD8.l, 1), - gsSPLight(&ttm_seg7_lights_0701DCD8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(ttm_seg7_vertex_070228F8, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), @@ -2298,8 +2238,8 @@ static const Gfx ttm_seg7_dl_07024708[] = { // 0x070247F0 - 0x070249A0 static const Gfx ttm_seg7_dl_070247F0[] = { - gsSPLight(&ttm_seg7_lights_0701DDB0.l, 1), - gsSPLight(&ttm_seg7_lights_0701DDB0.a, 2), + gsSPLightColor(LIGHT_1, 0xff), + gsSPLightColor(LIGHT_2, 0xff), gsSPVertex(ttm_seg7_vertex_07022AF8, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), gsSP2Triangles( 2, 4, 5, 0x0, 2, 5, 6, 0x0), diff --git a/levels/ttm/areas/3/3/model.inc.c b/levels/ttm/areas/3/3/model.inc.c index aebf0499..b8cbe847 100644 --- a/levels/ttm/areas/3/3/model.inc.c +++ b/levels/ttm/areas/3/3/model.inc.c @@ -1,8 +1,4 @@ // 0x07024CA8 - 0x07024CC0 -static const Lights1 ttm_seg7_lights_07024CA8 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07024CC0 - 0x07024DC0 static const Vtx ttm_seg7_vertex_07024CC0[] = { @@ -304,8 +300,8 @@ static const Gfx ttm_seg7_dl_07025B30[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mountain_09000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttm_seg7_lights_07024CA8.l, 1), - gsSPLight(&ttm_seg7_lights_07024CA8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(ttm_seg7_vertex_07024CC0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), gsSP2Triangles( 1, 4, 3, 0x0, 5, 0, 6, 0x0), diff --git a/levels/ttm/areas/4/1/model.inc.c b/levels/ttm/areas/4/1/model.inc.c index f43e12b0..4ce16f7f 100644 --- a/levels/ttm/areas/4/1/model.inc.c +++ b/levels/ttm/areas/4/1/model.inc.c @@ -1,80 +1,28 @@ // 0x07025FF0 - 0x07026008 -static const Lights1 ttm_seg7_lights_07025FF0 = gdSPDefLights1( - 0x15, 0x15, 0x15, - 0x55, 0x55, 0x55, 0x28, 0x28, 0x28 -); // 0x07026008 - 0x07026020 -static const Lights1 ttm_seg7_lights_07026008 = gdSPDefLights1( - 0x19, 0x19, 0x19, - 0x66, 0x66, 0x66, 0x28, 0x28, 0x28 -); // 0x07026020 - 0x07026038 -static const Lights1 ttm_seg7_lights_07026020 = gdSPDefLights1( - 0x1d, 0x1d, 0x1d, - 0x77, 0x77, 0x77, 0x28, 0x28, 0x28 -); // 0x07026038 - 0x07026050 -static const Lights1 ttm_seg7_lights_07026038 = gdSPDefLights1( - 0x22, 0x22, 0x22, - 0x88, 0x88, 0x88, 0x28, 0x28, 0x28 -); // 0x07026050 - 0x07026068 -static const Lights1 ttm_seg7_lights_07026050 = gdSPDefLights1( - 0x26, 0x26, 0x26, - 0x99, 0x99, 0x99, 0x28, 0x28, 0x28 -); // 0x07026068 - 0x07026080 -static const Lights1 ttm_seg7_lights_07026068 = gdSPDefLights1( - 0x2a, 0x2a, 0x2a, - 0xaa, 0xaa, 0xaa, 0x28, 0x28, 0x28 -); // 0x07026080 - 0x07026098 -static const Lights1 ttm_seg7_lights_07026080 = gdSPDefLights1( - 0x2e, 0x2e, 0x2e, - 0xbb, 0xbb, 0xbb, 0x28, 0x28, 0x28 -); // 0x07026098 - 0x070260B0 -static const Lights1 ttm_seg7_lights_07026098 = gdSPDefLights1( - 0x33, 0x33, 0x33, - 0xcc, 0xcc, 0xcc, 0x28, 0x28, 0x28 -); // 0x070260B0 - 0x070260C8 -static const Lights1 ttm_seg7_lights_070260B0 = gdSPDefLights1( - 0x37, 0x37, 0x37, - 0xdd, 0xdd, 0xdd, 0x28, 0x28, 0x28 -); // 0x070260C8 - 0x070260E0 -static const Lights1 ttm_seg7_lights_070260C8 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x070260E0 - 0x070260F8 -static const Lights1 ttm_seg7_lights_070260E0 = gdSPDefLights1( - 0x11, 0x11, 0x11, - 0x44, 0x44, 0x44, 0x28, 0x28, 0x28 -); // 0x070260F8 - 0x07026110 -static const Lights1 ttm_seg7_lights_070260F8 = gdSPDefLights1( - 0x3b, 0x3b, 0x3b, - 0xee, 0xee, 0xee, 0x28, 0x28, 0x28 -); // 0x07026110 - 0x07026128 -static const Lights1 ttm_seg7_lights_07026110 = gdSPDefLights1( - 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x07026128 - 0x07026228 static const Vtx ttm_seg7_vertex_07026128[] = { @@ -1090,8 +1038,8 @@ static const Gfx ttm_seg7_dl_070291B8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mountain_0900B800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttm_seg7_lights_07025FF0.l, 1), - gsSPLight(&ttm_seg7_lights_07025FF0.a, 2), + gsSPLightColor(LIGHT_1, 0x555555ff), + gsSPLightColor(LIGHT_2, 0x151515ff), gsSPVertex(ttm_seg7_vertex_07026128, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 6, 5, 0x0, 7, 8, 9, 0x0), @@ -1110,14 +1058,14 @@ static const Gfx ttm_seg7_dl_070291B8[] = { gsSPVertex(ttm_seg7_vertex_07026428, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 1, 6, 2, 0x0, 7, 3, 5, 0x0), - gsSPLight(&ttm_seg7_lights_07026008.l, 1), - gsSPLight(&ttm_seg7_lights_07026008.a, 2), + gsSPLightColor(LIGHT_1, 0x666666ff), + gsSPLightColor(LIGHT_2, 0x191919ff), gsSPVertex(ttm_seg7_vertex_070264A8, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 0, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 5, 7, 6, 0x0), gsSP2Triangles( 8, 9, 10, 0x0, 9, 11, 10, 0x0), - gsSPLight(&ttm_seg7_lights_07026020.l, 1), - gsSPLight(&ttm_seg7_lights_07026020.a, 2), + gsSPLightColor(LIGHT_1, 0x777777ff), + gsSPLightColor(LIGHT_2, 0x1d1d1dff), gsSPVertex(ttm_seg7_vertex_07026568, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 6, 5, 0x0, 7, 8, 9, 0x0), @@ -1133,8 +1081,8 @@ static const Gfx ttm_seg7_dl_070291B8[] = { gsSP2Triangles( 4, 5, 6, 0x0, 5, 7, 6, 0x0), gsSP2Triangles( 8, 9, 10, 0x0, 11, 12, 13, 0x0), gsSP1Triangle(14, 11, 13, 0x0), - gsSPLight(&ttm_seg7_lights_07026038.l, 1), - gsSPLight(&ttm_seg7_lights_07026038.a, 2), + gsSPLightColor(LIGHT_1, 0x888888ff), + gsSPLightColor(LIGHT_2, 0x222222ff), gsSPVertex(ttm_seg7_vertex_07026848, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -1142,19 +1090,19 @@ static const Gfx ttm_seg7_dl_070291B8[] = { gsSPVertex(ttm_seg7_vertex_07026928, 7, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP1Triangle( 1, 6, 2, 0x0), - gsSPLight(&ttm_seg7_lights_07026050.l, 1), - gsSPLight(&ttm_seg7_lights_07026050.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x262626ff), gsSPVertex(ttm_seg7_vertex_07026998, 10, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 4, 0x0), gsSP2Triangles( 2, 1, 3, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 6, 8, 0x0), - gsSPLight(&ttm_seg7_lights_07026068.l, 1), - gsSPLight(&ttm_seg7_lights_07026068.a, 2), + gsSPLightColor(LIGHT_1, 0xaaaaaaff), + gsSPLightColor(LIGHT_2, 0x2a2a2aff), gsSPVertex(ttm_seg7_vertex_07026A38, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 5, 7, 6, 0x0), - gsSPLight(&ttm_seg7_lights_07026080.l, 1), - gsSPLight(&ttm_seg7_lights_07026080.a, 2), + gsSPLightColor(LIGHT_1, 0xbbbbbbff), + gsSPLightColor(LIGHT_2, 0x2e2e2eff), gsSPVertex(ttm_seg7_vertex_07026AB8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 5, 4, 6, 0x0, 7, 8, 9, 0x0), @@ -1176,8 +1124,8 @@ static const Gfx ttm_seg7_dl_070291B8[] = { gsSP2Triangles( 7, 9, 10, 0x0, 11, 12, 13, 0x0), gsSPVertex(ttm_seg7_vertex_07026E78, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), - gsSPLight(&ttm_seg7_lights_07026098.l, 1), - gsSPLight(&ttm_seg7_lights_07026098.a, 2), + gsSPLightColor(LIGHT_1, 0xccccccff), + gsSPLightColor(LIGHT_2, 0x333333ff), gsSPVertex(ttm_seg7_vertex_07026EB8, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 6, 5, 0x0, 7, 8, 9, 0x0), @@ -1197,8 +1145,8 @@ static const Gfx ttm_seg7_dl_070291B8[] = { gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 7, 8, 9, 0x0), gsSP2Triangles(10, 11, 12, 0x0, 10, 12, 13, 0x0), - gsSPLight(&ttm_seg7_lights_070260B0.l, 1), - gsSPLight(&ttm_seg7_lights_070260B0.a, 2), + gsSPLightColor(LIGHT_1, 0xddddddff), + gsSPLightColor(LIGHT_2, 0x373737ff), gsSPVertex(ttm_seg7_vertex_07027288, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 6, 5, 0x0, 7, 8, 9, 0x0), @@ -1218,8 +1166,8 @@ static const Gfx ttm_seg7_dl_070291B8[] = { gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 6, 9, 7, 0x0), gsSP2Triangles(10, 11, 12, 0x0, 10, 13, 11, 0x0), - gsSPLight(&ttm_seg7_lights_070260C8.l, 1), - gsSPLight(&ttm_seg7_lights_070260C8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(ttm_seg7_vertex_07027668, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 6, 5, 0x0, 7, 8, 9, 0x0), @@ -1256,8 +1204,8 @@ static const Gfx ttm_seg7_dl_070299D0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mountain_0900A800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttm_seg7_lights_07026080.l, 1), - gsSPLight(&ttm_seg7_lights_07026080.a, 2), + gsSPLightColor(LIGHT_1, 0xbbbbbbff), + gsSPLightColor(LIGHT_2, 0x2e2e2eff), gsSPVertex(ttm_seg7_vertex_07027BA8, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSPEndDisplayList(), @@ -1268,8 +1216,8 @@ static const Gfx ttm_seg7_dl_07029A18[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mountain_09008800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttm_seg7_lights_070260E0.l, 1), - gsSPLight(&ttm_seg7_lights_070260E0.a, 2), + gsSPLightColor(LIGHT_1, 0x444444ff), + gsSPLightColor(LIGHT_2, 0x111111ff), gsSPVertex(ttm_seg7_vertex_07027BE8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 6, 5, 0x0, 7, 8, 9, 0x0), @@ -1283,20 +1231,20 @@ static const Gfx ttm_seg7_dl_07029A18[] = { gsSPVertex(ttm_seg7_vertex_07027DC8, 7, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP1Triangle( 0, 6, 1, 0x0), - gsSPLight(&ttm_seg7_lights_07025FF0.l, 1), - gsSPLight(&ttm_seg7_lights_07025FF0.a, 2), + gsSPLightColor(LIGHT_1, 0x555555ff), + gsSPLightColor(LIGHT_2, 0x151515ff), gsSPVertex(ttm_seg7_vertex_07027E38, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 5, 7, 6, 0x0), - gsSPLight(&ttm_seg7_lights_07026008.l, 1), - gsSPLight(&ttm_seg7_lights_07026008.a, 2), + gsSPLightColor(LIGHT_1, 0x666666ff), + gsSPLightColor(LIGHT_2, 0x191919ff), gsSPVertex(ttm_seg7_vertex_07027EB8, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), gsSP2Triangles( 8, 10, 9, 0x0, 11, 12, 13, 0x0), gsSP2Triangles(11, 13, 14, 0x0, 0, 15, 1, 0x0), - gsSPLight(&ttm_seg7_lights_07026020.l, 1), - gsSPLight(&ttm_seg7_lights_07026020.a, 2), + gsSPLightColor(LIGHT_1, 0x777777ff), + gsSPLightColor(LIGHT_2, 0x1d1d1dff), gsSPVertex(ttm_seg7_vertex_07027FB8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), @@ -1307,8 +1255,8 @@ static const Gfx ttm_seg7_dl_07029A18[] = { gsSP2Triangles( 3, 6, 4, 0x0, 3, 7, 8, 0x0), gsSP2Triangles( 3, 5, 7, 0x0, 2, 8, 0, 0x0), gsSP1Triangle( 0, 9, 1, 0x0), - gsSPLight(&ttm_seg7_lights_07026038.l, 1), - gsSPLight(&ttm_seg7_lights_07026038.a, 2), + gsSPLightColor(LIGHT_1, 0x888888ff), + gsSPLightColor(LIGHT_2, 0x222222ff), gsSPVertex(ttm_seg7_vertex_07028148, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), @@ -1331,8 +1279,8 @@ static const Gfx ttm_seg7_dl_07029A18[] = { gsSPVertex(ttm_seg7_vertex_07028508, 7, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP1Triangle( 3, 6, 4, 0x0), - gsSPLight(&ttm_seg7_lights_07026050.l, 1), - gsSPLight(&ttm_seg7_lights_07026050.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x262626ff), gsSPVertex(ttm_seg7_vertex_07028578, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 5, 4, 6, 0x0, 7, 8, 9, 0x0), @@ -1342,22 +1290,22 @@ static const Gfx ttm_seg7_dl_07029A18[] = { gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 6, 9, 7, 0x0), gsSP1Triangle( 0, 10, 1, 0x0), - gsSPLight(&ttm_seg7_lights_07026068.l, 1), - gsSPLight(&ttm_seg7_lights_07026068.a, 2), + gsSPLightColor(LIGHT_1, 0xaaaaaaff), + gsSPLightColor(LIGHT_2, 0x2a2a2aff), gsSPVertex(ttm_seg7_vertex_07028718, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 4, 3, 0x0, 7, 8, 9, 0x0), gsSP2Triangles(10, 8, 7, 0x0, 11, 12, 13, 0x0), gsSP2Triangles(12, 14, 13, 0x0, 1, 15, 2, 0x0), - gsSPLight(&ttm_seg7_lights_07026080.l, 1), - gsSPLight(&ttm_seg7_lights_07026080.a, 2), + gsSPLightColor(LIGHT_1, 0xbbbbbbff), + gsSPLightColor(LIGHT_2, 0x2e2e2eff), gsSPVertex(ttm_seg7_vertex_07028818, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 5, 4, 6, 0x0, 7, 8, 9, 0x0), gsSP2Triangles(10, 8, 7, 0x0, 11, 12, 13, 0x0), gsSP2Triangles(11, 14, 12, 0x0, 0, 15, 1, 0x0), - gsSPLight(&ttm_seg7_lights_07026098.l, 1), - gsSPLight(&ttm_seg7_lights_07026098.a, 2), + gsSPLightColor(LIGHT_1, 0xccccccff), + gsSPLightColor(LIGHT_2, 0x333333ff), gsSPVertex(ttm_seg7_vertex_07028918, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -1377,22 +1325,22 @@ static const Gfx ttm_seg7_dl_07029A18[] = { gsSPVertex(ttm_seg7_vertex_07028BF8, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 6, 7, 0x0, 4, 7, 5, 0x0), - gsSPLight(&ttm_seg7_lights_070260B0.l, 1), - gsSPLight(&ttm_seg7_lights_070260B0.a, 2), + gsSPLightColor(LIGHT_1, 0xddddddff), + gsSPLightColor(LIGHT_2, 0x373737ff), gsSPVertex(ttm_seg7_vertex_07028C78, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), gsSP2Triangles( 7, 10, 8, 0x0, 11, 12, 13, 0x0), gsSP2Triangles(11, 14, 12, 0x0, 0, 2, 15, 0x0), - gsSPLight(&ttm_seg7_lights_070260F8.l, 1), - gsSPLight(&ttm_seg7_lights_070260F8.a, 2), + gsSPLightColor(LIGHT_1, 0xeeeeeeff), + gsSPLightColor(LIGHT_2, 0x3b3b3bff), gsSPVertex(ttm_seg7_vertex_07028D78, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), gsSP2Triangles( 7, 9, 10, 0x0, 11, 12, 13, 0x0), gsSP2Triangles(11, 14, 12, 0x0, 0, 15, 1, 0x0), - gsSPLight(&ttm_seg7_lights_070260C8.l, 1), - gsSPLight(&ttm_seg7_lights_070260C8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(ttm_seg7_vertex_07028E78, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0), gsSP2Triangles( 1, 4, 2, 0x0, 2, 5, 6, 0x0), @@ -1408,8 +1356,8 @@ static const Gfx ttm_seg7_dl_07029A18[] = { // 0x0702A0D8 - 0x0702A1B8 static const Gfx ttm_seg7_dl_0702A0D8[] = { - gsSPLight(&ttm_seg7_lights_07026110.l, 1), - gsSPLight(&ttm_seg7_lights_07026110.a, 2), + gsSPLightColor(LIGHT_1, 0xff), + gsSPLightColor(LIGHT_2, 0xff), gsSPVertex(ttm_seg7_vertex_07029028, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 5, 6, 7, 0x0, 5, 7, 3, 0x0), diff --git a/levels/ttm/areas/4/2/model.inc.c b/levels/ttm/areas/4/2/model.inc.c index c992a01e..71ae6b84 100644 --- a/levels/ttm/areas/4/2/model.inc.c +++ b/levels/ttm/areas/4/2/model.inc.c @@ -1,8 +1,4 @@ // 0x0702A2A0 - 0x0702A2B8 -static const Lights1 ttm_seg7_lights_0702A2A0 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0702A2B8 - 0x0702A3A8 static const Vtx ttm_seg7_vertex_0702A2B8[] = { @@ -101,8 +97,8 @@ static const Gfx ttm_seg7_dl_0702A738[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mountain_09000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttm_seg7_lights_0702A2A0.l, 1), - gsSPLight(&ttm_seg7_lights_0702A2A0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(ttm_seg7_vertex_0702A2B8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), diff --git a/levels/ttm/rolling_log/model.inc.c b/levels/ttm/rolling_log/model.inc.c index 3d9e313e..ae787989 100644 --- a/levels/ttm/rolling_log/model.inc.c +++ b/levels/ttm/rolling_log/model.inc.c @@ -1,8 +1,4 @@ // 0x07011DE8 - 0x07011E00 -static const Lights1 ttm_seg7_lights_07011DE8 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07011E00 - 0x07011F00 static const Vtx ttm_seg7_vertex_07011E00[] = { @@ -75,8 +71,8 @@ static const Gfx ttm_seg7_dl_07012120[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, ttm_seg7_texture_07002000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttm_seg7_lights_07011DE8.l, 1), - gsSPLight(&ttm_seg7_lights_07011DE8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ttm_seg7_vertex_07011E00, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 3, 7, 8, 0x0), diff --git a/levels/ttm/slide_exit_podium/model.inc.c b/levels/ttm/slide_exit_podium/model.inc.c index 0ed6e4f0..247ace2e 100644 --- a/levels/ttm/slide_exit_podium/model.inc.c +++ b/levels/ttm/slide_exit_podium/model.inc.c @@ -1,20 +1,8 @@ // 0x0702ACE8 - 0x0702AD00 -static const Lights1 ttm_seg7_lights_0702ACE8 = gdSPDefLights1( - 0x0c, 0x0c, 0x0c, - 0x33, 0x33, 0x33, 0x28, 0x28, 0x28 -); // 0x0702AD00 - 0x0702AD18 -static const Lights1 ttm_seg7_lights_0702AD00 = gdSPDefLights1( - 0x1d, 0x1d, 0x1d, - 0x77, 0x77, 0x77, 0x28, 0x28, 0x28 -); // 0x0702AD18 - 0x0702AD30 -static const Lights1 ttm_seg7_lights_0702AD18 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0702AD30 - 0x0702B530 ALIGNED8 static const Texture ttm_seg7_texture_0702AD30[] = { @@ -124,19 +112,19 @@ static const Gfx ttm_seg7_dl_0702B9D0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, ttm_seg7_texture_0702AD30), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttm_seg7_lights_0702ACE8.l, 1), - gsSPLight(&ttm_seg7_lights_0702ACE8.a, 2), + gsSPLightColor(LIGHT_1, 0x333333ff), + gsSPLightColor(LIGHT_2, 0xc0c0cff), gsSPVertex(ttm_seg7_vertex_0702B530, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), - gsSPLight(&ttm_seg7_lights_0702AD00.l, 1), - gsSPLight(&ttm_seg7_lights_0702AD00.a, 2), + gsSPLightColor(LIGHT_1, 0x777777ff), + gsSPLightColor(LIGHT_2, 0x1d1d1dff), gsSPVertex(ttm_seg7_vertex_0702B570, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), gsSP2Triangles( 8, 9, 10, 0x0, 8, 11, 9, 0x0), gsSP2Triangles(12, 13, 14, 0x0, 12, 14, 15, 0x0), - gsSPLight(&ttm_seg7_lights_0702AD18.l, 1), - gsSPLight(&ttm_seg7_lights_0702AD18.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(ttm_seg7_vertex_0702B670, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 6, 8, 9, 0x0), diff --git a/levels/ttm/star_cage/1.inc.c b/levels/ttm/star_cage/1.inc.c index 10a99009..ad432be7 100644 --- a/levels/ttm/star_cage/1.inc.c +++ b/levels/ttm/star_cage/1.inc.c @@ -1,14 +1,6 @@ // 0x07012F78 - 0x07012F90 -static const Lights1 ttm_seg7_lights_07012F78 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xfe, 0xfe, 0xfe, 0x28, 0x28, 0x28 -); // 0x07012F90 - 0x07012FA8 -static const Lights1 ttm_seg7_lights_07012F90 = gdSPDefLights1( - 0x7f, 0x7f, 0x7f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07012FA8 - 0x07013028 static const Vtx ttm_seg7_vertex_07012FA8[] = { @@ -89,13 +81,13 @@ static const Gfx ttm_seg7_dl_07013308[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mountain_09007000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&ttm_seg7_lights_07012F78.l, 1), - gsSPLight(&ttm_seg7_lights_07012F78.a, 2), + gsSPLightColor(LIGHT_1, 0xfefefeff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ttm_seg7_vertex_07012FA8, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), - gsSPLight(&ttm_seg7_lights_07012F90.l, 1), - gsSPLight(&ttm_seg7_lights_07012F90.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x7f7f7fff), gsSPVertex(ttm_seg7_vertex_07013028, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 6, 9, 7, 0x0), diff --git a/levels/vcutm/areas/1/1/model.inc.c b/levels/vcutm/areas/1/1/model.inc.c index 14c036ed..02595c3e 100644 --- a/levels/vcutm/areas/1/1/model.inc.c +++ b/levels/vcutm/areas/1/1/model.inc.c @@ -1,20 +1,8 @@ // 0x07003000 - 0x07003018 -static const Lights1 vcutm_seg7_lights_07003000 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07003018 - 0x07003030 -static const Lights1 vcutm_seg7_lights_07003018 = gdSPDefLights1( - 0x32, 0x3f, 0x37, - 0xc8, 0xff, 0xdc, 0x28, 0x28, 0x28 -); // 0x07003030 - 0x07003048 -static const Lights1 vcutm_seg7_lights_07003030 = gdSPDefLights1( - 0x2a, 0x2a, 0x2a, - 0xaa, 0xaa, 0xaa, 0x28, 0x28, 0x28 -); // 0x07003048 - 0x07003128 static const Vtx vcutm_seg7_vertex_07003048[] = { @@ -1241,8 +1229,8 @@ static const Gfx vcutm_seg7_dl_07006C48[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, outside_0900B000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 16 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&vcutm_seg7_lights_07003000.l, 1), - gsSPLight(&vcutm_seg7_lights_07003000.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(vcutm_seg7_vertex_07003048, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 0, 3, 4, 0x0, 0, 4, 5, 0x0), @@ -1400,8 +1388,8 @@ static const Gfx vcutm_seg7_dl_070074A0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, outside_09009000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&vcutm_seg7_lights_07003018.l, 1), - gsSPLight(&vcutm_seg7_lights_07003018.a, 2), + gsSPLightColor(LIGHT_1, 0xc8ffdcff), + gsSPLightColor(LIGHT_2, 0x323f37ff), gsSPVertex(vcutm_seg7_vertex_07004FB8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 6, 5, 0x0, 7, 8, 9, 0x0), @@ -1412,8 +1400,8 @@ static const Gfx vcutm_seg7_dl_070074A0[] = { gsSP2Triangles( 6, 7, 8, 0x0, 7, 9, 8, 0x0), gsSP2Triangles(10, 11, 12, 0x0, 11, 13, 12, 0x0), gsSP1Triangle(14, 0, 2, 0x0), - gsSPLight(&vcutm_seg7_lights_07003000.l, 1), - gsSPLight(&vcutm_seg7_lights_07003000.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(vcutm_seg7_vertex_07005198, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), @@ -1442,8 +1430,8 @@ static const Gfx vcutm_seg7_dl_07007660[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, outside_09000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&vcutm_seg7_lights_07003030.l, 1), - gsSPLight(&vcutm_seg7_lights_07003030.a, 2), + gsSPLightColor(LIGHT_1, 0xaaaaaaff), + gsSPLightColor(LIGHT_2, 0x2a2a2aff), gsSPVertex(vcutm_seg7_vertex_07005558, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), @@ -1454,8 +1442,8 @@ static const Gfx vcutm_seg7_dl_07007660[] = { gsSP2Triangles( 6, 7, 8, 0x0, 6, 8, 9, 0x0), gsSP2Triangles(10, 11, 12, 0x0, 10, 12, 13, 0x0), gsSP1Triangle( 0, 2, 14, 0x0), - gsSPLight(&vcutm_seg7_lights_07003000.l, 1), - gsSPLight(&vcutm_seg7_lights_07003000.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(vcutm_seg7_vertex_07005738, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 4, 0x0), gsSP2Triangles( 4, 3, 5, 0x0, 3, 6, 5, 0x0), @@ -1503,15 +1491,15 @@ static const Gfx vcutm_seg7_dl_07007940[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, vcutm_seg7_texture_07002800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&vcutm_seg7_lights_07003030.l, 1), - gsSPLight(&vcutm_seg7_lights_07003030.a, 2), + gsSPLightColor(LIGHT_1, 0xaaaaaaff), + gsSPLightColor(LIGHT_2, 0x2a2a2aff), gsSPVertex(vcutm_seg7_vertex_07005D18, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 7, 8, 9, 0x0), gsSP2Triangles( 7, 9, 10, 0x0, 4, 11, 5, 0x0), gsSP2Triangles(12, 13, 14, 0x0, 12, 15, 13, 0x0), - gsSPLight(&vcutm_seg7_lights_07003000.l, 1), - gsSPLight(&vcutm_seg7_lights_07003000.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(vcutm_seg7_vertex_07005E18, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 6, 5, 0x0, 7, 8, 9, 0x0), @@ -1611,8 +1599,8 @@ static const Gfx vcutm_seg7_dl_07007D80[] = { // 0x07007E00 - 0x07007E88 static const Gfx vcutm_seg7_dl_07007E00[] = { - gsSPLight(&vcutm_seg7_lights_07003030.l, 1), - gsSPLight(&vcutm_seg7_lights_07003030.a, 2), + gsSPLightColor(LIGHT_1, 0xaaaaaaff), + gsSPLightColor(LIGHT_2, 0x2a2a2aff), gsSPVertex(vcutm_seg7_vertex_07006AD8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), diff --git a/levels/vcutm/areas/1/2/model.inc.c b/levels/vcutm/areas/1/2/model.inc.c index a5f2b857..9e893807 100644 --- a/levels/vcutm/areas/1/2/model.inc.c +++ b/levels/vcutm/areas/1/2/model.inc.c @@ -1,8 +1,4 @@ // 0x07007F90 - 0x07007FA8 -static const Lights1 vcutm_seg7_lights_07007F90 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07007FA8 - 0x07008068 static const Vtx vcutm_seg7_vertex_07007FA8[] = { @@ -25,8 +21,8 @@ static const Gfx vcutm_seg7_dl_07008068[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, vcutm_seg7_texture_07000000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&vcutm_seg7_lights_07007F90.l, 1), - gsSPLight(&vcutm_seg7_lights_07007F90.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(vcutm_seg7_vertex_07007FA8, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), diff --git a/levels/vcutm/seesaw/model.inc.c b/levels/vcutm/seesaw/model.inc.c index c7256672..b881bded 100644 --- a/levels/vcutm/seesaw/model.inc.c +++ b/levels/vcutm/seesaw/model.inc.c @@ -1,14 +1,6 @@ // 0x07009458 - 0x07009470 -static const Lights1 vcutm_seg7_lights_07009458 = gdSPDefLights1( - 0x22, 0x22, 0x22, - 0x88, 0x88, 0x88, 0x28, 0x28, 0x28 -); // 0x07009470 - 0x07009488 -static const Lights1 vcutm_seg7_lights_07009470 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07009488 - 0x07009578 static const Vtx vcutm_seg7_vertex_07009488[] = { @@ -53,8 +45,8 @@ static const Gfx vcutm_seg7_dl_07009628[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, vcutm_seg7_texture_07001800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&vcutm_seg7_lights_07009458.l, 1), - gsSPLight(&vcutm_seg7_lights_07009458.a, 2), + gsSPLightColor(LIGHT_1, 0x888888ff), + gsSPLightColor(LIGHT_2, 0x222222ff), gsSPVertex(vcutm_seg7_vertex_07009488, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), @@ -63,8 +55,8 @@ static const Gfx vcutm_seg7_dl_07009628[] = { gsSPVertex(vcutm_seg7_vertex_07009578, 7, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP1Triangle( 4, 5, 6, 0x0), - gsSPLight(&vcutm_seg7_lights_07009470.l, 1), - gsSPLight(&vcutm_seg7_lights_07009470.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(vcutm_seg7_vertex_070095E8, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), diff --git a/levels/wdw/areas/1/1/model.inc.c b/levels/wdw/areas/1/1/model.inc.c index 2093d096..21a87608 100644 --- a/levels/wdw/areas/1/1/model.inc.c +++ b/levels/wdw/areas/1/1/model.inc.c @@ -1,14 +1,6 @@ // 0x07002800 - 0x07002818 -static const Lights1 wdw_seg7_lights_07002800 = gdSPDefLights1( - 0x99, 0x99, 0x99, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07002818 - 0x07002830 -static const Lights1 wdw_seg7_lights_07002818 = gdSPDefLights1( - 0x3c, 0x3c, 0x3c, - 0x64, 0x64, 0x64, 0x28, 0x28, 0x28 -); // 0x07002830 - 0x07002920 static const Vtx wdw_seg7_vertex_07002830[] = { @@ -1842,8 +1834,8 @@ static const Gfx wdw_seg7_dl_07008160[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wdw_seg7_lights_07002800.l, 1), - gsSPLight(&wdw_seg7_lights_07002800.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x999999ff), gsSPVertex(wdw_seg7_vertex_07002830, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), @@ -1910,8 +1902,8 @@ static const Gfx wdw_seg7_dl_07008160[] = { gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), gsSP2Triangles( 7, 9, 10, 0x0, 11, 12, 13, 0x0), - gsSPLight(&wdw_seg7_lights_07002818.l, 1), - gsSPLight(&wdw_seg7_lights_07002818.a, 2), + gsSPLightColor(LIGHT_1, 0x646464ff), + gsSPLightColor(LIGHT_2, 0x3c3c3cff), gsSPVertex(wdw_seg7_vertex_07003630, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), @@ -1929,8 +1921,8 @@ static const Gfx wdw_seg7_dl_07008598[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09001000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wdw_seg7_lights_07002800.l, 1), - gsSPLight(&wdw_seg7_lights_07002800.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x999999ff), gsSPVertex(wdw_seg7_vertex_070037D0, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), @@ -1962,8 +1954,8 @@ static const Gfx wdw_seg7_dl_07008598[] = { gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 3, 7, 6, 0x0), gsSP2Triangles( 8, 9, 10, 0x0, 8, 11, 9, 0x0), - gsSPLight(&wdw_seg7_lights_07002818.l, 1), - gsSPLight(&wdw_seg7_lights_07002818.a, 2), + gsSPLightColor(LIGHT_1, 0x646464ff), + gsSPLightColor(LIGHT_2, 0x3c3c3cff), gsSPVertex(wdw_seg7_vertex_07003D70, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), @@ -1976,8 +1968,8 @@ static const Gfx wdw_seg7_dl_070087B8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09009000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wdw_seg7_lights_07002800.l, 1), - gsSPLight(&wdw_seg7_lights_07002800.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x999999ff), gsSPVertex(wdw_seg7_vertex_07003E30, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -2038,8 +2030,8 @@ static const Gfx wdw_seg7_dl_07008910[] = { gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 3, 7, 0, 0x0), gsSP2Triangles( 8, 9, 10, 0x0, 8, 10, 11, 0x0), - gsSPLight(&wdw_seg7_lights_07002818.l, 1), - gsSPLight(&wdw_seg7_lights_07002818.a, 2), + gsSPLightColor(LIGHT_1, 0x646464ff), + gsSPLightColor(LIGHT_2, 0x3c3c3cff), gsSPVertex(wdw_seg7_vertex_070047D0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -2053,8 +2045,8 @@ static const Gfx wdw_seg7_dl_07008B00[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09004000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wdw_seg7_lights_07002800.l, 1), - gsSPLight(&wdw_seg7_lights_07002800.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x999999ff), gsSPVertex(wdw_seg7_vertex_070048D0, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), @@ -2393,8 +2385,8 @@ static const Gfx wdw_seg7_dl_070099B0[] = { gsSP1Triangle(13, 14, 15, 0x0), gsSPVertex(wdw_seg7_vertex_070080F0, 3, 0), gsSP1Triangle( 0, 1, 2, 0x0), - gsSPLight(&wdw_seg7_lights_07002818.l, 1), - gsSPLight(&wdw_seg7_lights_07002818.a, 2), + gsSPLightColor(LIGHT_1, 0x646464ff), + gsSPLightColor(LIGHT_2, 0x3c3c3cff), gsSPVertex(wdw_seg7_vertex_07008120, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSPEndDisplayList(), diff --git a/levels/wdw/areas/1/2/model.inc.c b/levels/wdw/areas/1/2/model.inc.c index 2e58c036..e07b1bb2 100644 --- a/levels/wdw/areas/1/2/model.inc.c +++ b/levels/wdw/areas/1/2/model.inc.c @@ -1,8 +1,4 @@ // 0x07009B78 - 0x07009B90 -static const Lights1 wdw_seg7_lights_07009B78 = gdSPDefLights1( - 0x99, 0x99, 0x99, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07009B90 - 0x07009C70 static const Vtx wdw_seg7_vertex_07009B90[] = { @@ -95,8 +91,8 @@ static const Gfx wdw_seg7_dl_07009FB0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09000000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wdw_seg7_lights_07009B78.l, 1), - gsSPLight(&wdw_seg7_lights_07009B78.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x999999ff), gsSPVertex(wdw_seg7_vertex_07009B90, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), diff --git a/levels/wdw/areas/2/1/model.inc.c b/levels/wdw/areas/2/1/model.inc.c index a9d53385..25fd2998 100644 --- a/levels/wdw/areas/2/1/model.inc.c +++ b/levels/wdw/areas/2/1/model.inc.c @@ -1,26 +1,10 @@ // 0x0700A1B0 - 0x0700A1C8 -static const Lights1 wdw_seg7_lights_0700A1B0 = gdSPDefLights1( - 0x99, 0x99, 0x82, - 0xff, 0xff, 0xd9, 0x28, 0x28, 0x28 -); // 0x0700A1C8 - 0x0700A1E0 -static const Lights1 wdw_seg7_lights_0700A1C8 = gdSPDefLights1( - 0x99, 0x99, 0x99, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700A1E0 - 0x0700A1F8 -static const Lights1 wdw_seg7_lights_0700A1E0 = gdSPDefLights1( - 0x3c, 0x3c, 0x3c, - 0x64, 0x64, 0x64, 0x28, 0x28, 0x28 -); // 0x0700A1F8 - 0x0700A210 -static const Lights1 wdw_seg7_lights_0700A1F8 = gdSPDefLights1( - 0x7b, 0x0d, 0x1f, - 0xce, 0x16, 0x35, 0x28, 0x28, 0x28 -); // 0x0700A210 - 0x0700A270 static const Vtx wdw_seg7_vertex_0700A210[] = { @@ -1984,13 +1968,13 @@ static const Gfx wdw_seg7_dl_07010120[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09007000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wdw_seg7_lights_0700A1B0.l, 1), - gsSPLight(&wdw_seg7_lights_0700A1B0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffd9ff), + gsSPLightColor(LIGHT_2, 0x999982ff), gsSPVertex(wdw_seg7_vertex_0700A210, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 4, 0x0), gsSP2Triangles( 0, 4, 1, 0x0, 0, 2, 5, 0x0), - gsSPLight(&wdw_seg7_lights_0700A1C8.l, 1), - gsSPLight(&wdw_seg7_lights_0700A1C8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x999999ff), gsSPVertex(wdw_seg7_vertex_0700A270, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), @@ -2055,8 +2039,8 @@ static const Gfx wdw_seg7_dl_07010120[] = { gsSP2Triangles(10, 11, 12, 0x0, 10, 13, 11, 0x0), gsSPVertex(wdw_seg7_vertex_0700ACD0, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - gsSPLight(&wdw_seg7_lights_0700A1E0.l, 1), - gsSPLight(&wdw_seg7_lights_0700A1E0.a, 2), + gsSPLightColor(LIGHT_1, 0x646464ff), + gsSPLightColor(LIGHT_2, 0x3c3c3cff), gsSPVertex(wdw_seg7_vertex_0700AD10, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -2075,8 +2059,8 @@ static const Gfx wdw_seg7_dl_07010578[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wdw_seg7_texture_07000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wdw_seg7_lights_0700A1F8.l, 1), - gsSPLight(&wdw_seg7_lights_0700A1F8.a, 2), + gsSPLightColor(LIGHT_1, 0xce1635ff), + gsSPLightColor(LIGHT_2, 0x7b0d1fff), gsSPVertex(wdw_seg7_vertex_0700AED0, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -2086,8 +2070,8 @@ static const Gfx wdw_seg7_dl_07010578[] = { gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), gsSP2Triangles( 8, 9, 10, 0x0, 8, 11, 9, 0x0), gsSP2Triangles(12, 13, 14, 0x0, 12, 15, 13, 0x0), - gsSPLight(&wdw_seg7_lights_0700A1C8.l, 1), - gsSPLight(&wdw_seg7_lights_0700A1C8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x999999ff), gsSPVertex(wdw_seg7_vertex_0700B0B0, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), @@ -2341,8 +2325,8 @@ static const Gfx wdw_seg7_dl_07010EA0[] = { gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 6, 8, 9, 0x0), gsSP1Triangle( 0, 2, 10, 0x0), - gsSPLight(&wdw_seg7_lights_0700A1E0.l, 1), - gsSPLight(&wdw_seg7_lights_0700A1E0.a, 2), + gsSPLightColor(LIGHT_1, 0x646464ff), + gsSPLightColor(LIGHT_2, 0x3c3c3cff), gsSPVertex(wdw_seg7_vertex_0700D770, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSPEndDisplayList(), @@ -2353,8 +2337,8 @@ static const Gfx wdw_seg7_dl_07011208[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09007800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wdw_seg7_lights_0700A1C8.l, 1), - gsSPLight(&wdw_seg7_lights_0700A1C8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x999999ff), gsSPVertex(wdw_seg7_vertex_0700D7B0, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), diff --git a/levels/wdw/areas/2/2/model.inc.c b/levels/wdw/areas/2/2/model.inc.c index 4d414a86..cf6f04f3 100644 --- a/levels/wdw/areas/2/2/model.inc.c +++ b/levels/wdw/areas/2/2/model.inc.c @@ -1,20 +1,8 @@ // 0x07011F58 - 0x07011F70 -static const Lights1 wdw_seg7_lights_07011F58 = gdSPDefLights1( - 0x54, 0x90, 0x88, - 0x8d, 0xf0, 0xe3, 0x28, 0x28, 0x28 -); // 0x07011F70 - 0x07011F88 -static const Lights1 wdw_seg7_lights_07011F70 = gdSPDefLights1( - 0x56, 0x57, 0x8e, - 0x90, 0x92, 0xee, 0x28, 0x28, 0x28 -); // 0x07011F88 - 0x07011FA0 -static const Lights1 wdw_seg7_lights_07011F88 = gdSPDefLights1( - 0x99, 0x99, 0x99, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07011FA0 - 0x07012020 static const Vtx wdw_seg7_vertex_07011FA0[] = { @@ -61,20 +49,20 @@ static const Gfx wdw_seg7_dl_07012160[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09000000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wdw_seg7_lights_07011F58.l, 1), - gsSPLight(&wdw_seg7_lights_07011F58.a, 2), + gsSPLightColor(LIGHT_1, 0x8df0e3ff), + gsSPLightColor(LIGHT_2, 0x549088ff), gsSPVertex(wdw_seg7_vertex_07011FA0, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 0, 3, 4, 0x0, 0, 5, 6, 0x0), gsSP2Triangles( 0, 6, 7, 0x0, 0, 4, 5, 0x0), - gsSPLight(&wdw_seg7_lights_07011F70.l, 1), - gsSPLight(&wdw_seg7_lights_07011F70.a, 2), + gsSPLightColor(LIGHT_1, 0x9092eeff), + gsSPLightColor(LIGHT_2, 0x56578eff), gsSPVertex(wdw_seg7_vertex_07012020, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 4, 0x0), gsSP2Triangles( 0, 4, 5, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 0, 5, 6, 0x0, 0, 6, 7, 0x0), - gsSPLight(&wdw_seg7_lights_07011F88.l, 1), - gsSPLight(&wdw_seg7_lights_07011F88.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x999999ff), gsSPVertex(wdw_seg7_vertex_070120A0, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 0, 7, 1, 0x0), diff --git a/levels/wdw/arrow_lift/model.inc.c b/levels/wdw/arrow_lift/model.inc.c index 4648ec31..7becfcb8 100644 --- a/levels/wdw/arrow_lift/model.inc.c +++ b/levels/wdw/arrow_lift/model.inc.c @@ -1,8 +1,4 @@ // 0x07012C08 - 0x07012C20 -static const Lights1 wdw_seg7_lights_07012C08 = gdSPDefLights1( - 0x99, 0x99, 0x99, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07012C20 - 0x07012C60 static const Vtx wdw_seg7_vertex_07012C20[] = { @@ -47,8 +43,8 @@ static const Gfx wdw_seg7_dl_07012DC0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wdw_seg7_texture_07001800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wdw_seg7_lights_07012C08.l, 1), - gsSPLight(&wdw_seg7_lights_07012C08.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x999999ff), gsSPVertex(wdw_seg7_vertex_07012C20, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSPEndDisplayList(), diff --git a/levels/wdw/express_elevator/model.inc.c b/levels/wdw/express_elevator/model.inc.c index 0e886fd8..6a0d35ef 100644 --- a/levels/wdw/express_elevator/model.inc.c +++ b/levels/wdw/express_elevator/model.inc.c @@ -1,8 +1,4 @@ // 0x07013500 - 0x07013518 -static const Lights1 wdw_seg7_lights_07013500 = gdSPDefLights1( - 0x99, 0x99, 0x99, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07013518 - 0x07013618 static const Vtx wdw_seg7_vertex_07013518[] = { @@ -105,8 +101,8 @@ static const Gfx wdw_seg7_dl_070139D8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09006800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wdw_seg7_lights_07013500.l, 1), - gsSPLight(&wdw_seg7_lights_07013500.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x999999ff), gsSPVertex(wdw_seg7_vertex_07013518, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), diff --git a/levels/wdw/hidden_platform/model.inc.c b/levels/wdw/hidden_platform/model.inc.c index 3bd79d21..c2d8f364 100644 --- a/levels/wdw/hidden_platform/model.inc.c +++ b/levels/wdw/hidden_platform/model.inc.c @@ -1,8 +1,4 @@ // 0x07013238 - 0x07013250 -static const Lights1 wdw_seg7_lights_07013238 = gdSPDefLights1( - 0x99, 0x99, 0x99, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07013250 - 0x07013340 static const Vtx wdw_seg7_vertex_07013250[] = { @@ -43,8 +39,8 @@ static const Gfx wdw_seg7_dl_070133F0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09006800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wdw_seg7_lights_07013238.l, 1), - gsSPLight(&wdw_seg7_lights_07013238.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x999999ff), gsSPVertex(wdw_seg7_vertex_07013250, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), diff --git a/levels/wdw/rectangular_floating_platform/model.inc.c b/levels/wdw/rectangular_floating_platform/model.inc.c index fc0a2cfc..74d07d97 100644 --- a/levels/wdw/rectangular_floating_platform/model.inc.c +++ b/levels/wdw/rectangular_floating_platform/model.inc.c @@ -1,8 +1,4 @@ // 0x07013BE8 - 0x07013C00 -static const Lights1 wdw_seg7_lights_07013BE8 = gdSPDefLights1( - 0x99, 0x99, 0x99, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07013C00 - 0x07013D00 static const Vtx wdw_seg7_vertex_07013C00[] = { @@ -41,8 +37,8 @@ static const Gfx wdw_seg7_dl_07013D80[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wdw_seg7_texture_07000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wdw_seg7_lights_07013BE8.l, 1), - gsSPLight(&wdw_seg7_lights_07013BE8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x999999ff), gsSPVertex(wdw_seg7_vertex_07013C00, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), diff --git a/levels/wdw/rotating_platform/model.inc.c b/levels/wdw/rotating_platform/model.inc.c index b97a6602..2ca99b6d 100644 --- a/levels/wdw/rotating_platform/model.inc.c +++ b/levels/wdw/rotating_platform/model.inc.c @@ -1,8 +1,4 @@ // 0x07013EB8 - 0x07013ED0 -static const Lights1 wdw_seg7_lights_07013EB8 = gdSPDefLights1( - 0x99, 0x99, 0x99, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07013ED0 - 0x07013FC0 static const Vtx wdw_seg7_vertex_07013ED0[] = { @@ -41,8 +37,8 @@ static const Gfx wdw_seg7_dl_07014050[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09008000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wdw_seg7_lights_07013EB8.l, 1), - gsSPLight(&wdw_seg7_lights_07013EB8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x999999ff), gsSPVertex(wdw_seg7_vertex_07013ED0, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 3, 6, 7, 0x0), diff --git a/levels/wdw/square_floating_platform/model.inc.c b/levels/wdw/square_floating_platform/model.inc.c index f2c03063..27be035c 100644 --- a/levels/wdw/square_floating_platform/model.inc.c +++ b/levels/wdw/square_floating_platform/model.inc.c @@ -1,8 +1,4 @@ // 0x07012938 - 0x07012950 -static const Lights1 wdw_seg7_lights_07012938 = gdSPDefLights1( - 0x99, 0x99, 0x99, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07012950 - 0x07012A50 static const Vtx wdw_seg7_vertex_07012950[] = { @@ -41,8 +37,8 @@ static const Gfx wdw_seg7_dl_07012AD0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wdw_seg7_texture_07000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wdw_seg7_lights_07012938.l, 1), - gsSPLight(&wdw_seg7_lights_07012938.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x999999ff), gsSPVertex(wdw_seg7_vertex_07012950, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), diff --git a/levels/wdw/water_level_diamond/model.inc.c b/levels/wdw/water_level_diamond/model.inc.c index 8ecc4442..74dfc482 100644 --- a/levels/wdw/water_level_diamond/model.inc.c +++ b/levels/wdw/water_level_diamond/model.inc.c @@ -1,26 +1,10 @@ // 0x07012F18 - 0x07012F30 -static const Lights1 wdw_seg7_lights_07012F18 = gdSPDefLights1( - 0x99, 0x99, 0x00, - 0xff, 0xff, 0x00, 0x28, 0x28, 0x28 -); // 0x07012F30 - 0x07012F48 -static const Lights1 wdw_seg7_lights_07012F30 = gdSPDefLights1( - 0x00, 0x00, 0x99, - 0x00, 0x00, 0xff, 0x28, 0x28, 0x28 -); // 0x07012F48 - 0x07012F60 -static const Lights1 wdw_seg7_lights_07012F48 = gdSPDefLights1( - 0x00, 0x99, 0x00, - 0x00, 0xff, 0x00, 0x28, 0x28, 0x28 -); // 0x07012F60 - 0x07012F78 -static const Lights1 wdw_seg7_lights_07012F60 = gdSPDefLights1( - 0x99, 0x00, 0x00, - 0xff, 0x00, 0x00, 0x28, 0x28, 0x28 -); // 0x07012F78 - 0x07012FD8 static const Vtx wdw_seg7_vertex_07012F78[] = { @@ -67,20 +51,20 @@ static const Gfx wdw_seg7_dl_070130F8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wdw_seg7_texture_07001000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wdw_seg7_lights_07012F18.l, 1), - gsSPLight(&wdw_seg7_lights_07012F18.a, 2), + gsSPLightColor(LIGHT_1, 0xffff00ff), + gsSPLightColor(LIGHT_2, 0x999900ff), gsSPVertex(wdw_seg7_vertex_07012F78, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), - gsSPLight(&wdw_seg7_lights_07012F30.l, 1), - gsSPLight(&wdw_seg7_lights_07012F30.a, 2), + gsSPLightColor(LIGHT_1, 0xffff), + gsSPLightColor(LIGHT_2, 0x99ff), gsSPVertex(wdw_seg7_vertex_07012FD8, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), - gsSPLight(&wdw_seg7_lights_07012F48.l, 1), - gsSPLight(&wdw_seg7_lights_07012F48.a, 2), + gsSPLightColor(LIGHT_1, 0xff00ff), + gsSPLightColor(LIGHT_2, 0x9900ff), gsSPVertex(wdw_seg7_vertex_07013038, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), - gsSPLight(&wdw_seg7_lights_07012F60.l, 1), - gsSPLight(&wdw_seg7_lights_07012F60.a, 2), + gsSPLightColor(LIGHT_1, 0xff0000ff), + gsSPLightColor(LIGHT_2, 0x990000ff), gsSPVertex(wdw_seg7_vertex_07013098, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSPEndDisplayList(), diff --git a/levels/wf/areas/1/1/model.inc.c b/levels/wf/areas/1/1/model.inc.c index 0d72b97b..e3461ec6 100644 --- a/levels/wf/areas/1/1/model.inc.c +++ b/levels/wf/areas/1/1/model.inc.c @@ -1,8 +1,4 @@ // 0x07002900 - 0x07002918 -static const Lights1 wf_seg7_lights_07002900 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07002918 - 0x07002A18 static const Vtx wf_seg7_vertex_07002918[] = { @@ -631,8 +627,8 @@ static const Gfx wf_seg7_dl_070046B8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09004800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wf_seg7_lights_07002900.l, 1), - gsSPLight(&wf_seg7_lights_07002900.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(wf_seg7_vertex_07002918, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), diff --git a/levels/wf/areas/1/10/1.inc.c b/levels/wf/areas/1/10/1.inc.c index 5f34d8ea..71248011 100644 --- a/levels/wf/areas/1/10/1.inc.c +++ b/levels/wf/areas/1/10/1.inc.c @@ -1,8 +1,4 @@ // 0x07007590 - 0x070075A8 -static const Lights1 wf_seg7_lights_07007590 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x070075A8 - 0x070076A8 static const Vtx wf_seg7_vertex_070075A8[] = { @@ -289,8 +285,8 @@ static const Gfx wf_seg7_dl_07008368[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wf_seg7_texture_07001800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wf_seg7_lights_07007590.l, 1), - gsSPLight(&wf_seg7_lights_07007590.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(wf_seg7_vertex_070075A8, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), diff --git a/levels/wf/areas/1/10/2.inc.c b/levels/wf/areas/1/10/2.inc.c index 21e0a25f..7578150f 100644 --- a/levels/wf/areas/1/10/2.inc.c +++ b/levels/wf/areas/1/10/2.inc.c @@ -1,8 +1,4 @@ // 0x07008838 - 0x07008850 -static const Lights1 wf_seg7_lights_07008838 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07008850 - 0x07008950 static const Vtx wf_seg7_vertex_07008850[] = { @@ -125,8 +121,8 @@ static const Gfx wf_seg7_dl_07008DD0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wf_seg7_texture_07001800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wf_seg7_lights_07008838.l, 1), - gsSPLight(&wf_seg7_lights_07008838.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(wf_seg7_vertex_07008850, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), diff --git a/levels/wf/areas/1/11/model.inc.c b/levels/wf/areas/1/11/model.inc.c index bf1433a8..7d7c63a7 100644 --- a/levels/wf/areas/1/11/model.inc.c +++ b/levels/wf/areas/1/11/model.inc.c @@ -1,8 +1,4 @@ // 0x07009070 - 0x07009088 -static const Lights1 wf_seg7_lights_07009070 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07009088 - 0x070090C8 static const Vtx wf_seg7_vertex_07009088[] = { @@ -37,8 +33,8 @@ static const Gfx wf_seg7_dl_070091C8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wf_seg7_texture_07000000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wf_seg7_lights_07009070.l, 1), - gsSPLight(&wf_seg7_lights_07009070.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(wf_seg7_vertex_07009088, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSPEndDisplayList(), diff --git a/levels/wf/areas/1/12/1.inc.c b/levels/wf/areas/1/12/1.inc.c index 9cc7938d..f842056d 100644 --- a/levels/wf/areas/1/12/1.inc.c +++ b/levels/wf/areas/1/12/1.inc.c @@ -1,8 +1,4 @@ // 0x070092F0 - 0x07009308 -static const Lights1 wf_seg7_lights_070092F0 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07009308 - 0x070093F8 static const Vtx wf_seg7_vertex_07009308[] = { @@ -82,8 +78,8 @@ static const Gfx wf_seg7_dl_07009698[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09004800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wf_seg7_lights_070092F0.l, 1), - gsSPLight(&wf_seg7_lights_070092F0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(wf_seg7_vertex_07009308, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), diff --git a/levels/wf/areas/1/12/2.inc.c b/levels/wf/areas/1/12/2.inc.c index a5ced5ed..ee8b5741 100644 --- a/levels/wf/areas/1/12/2.inc.c +++ b/levels/wf/areas/1/12/2.inc.c @@ -1,8 +1,4 @@ // 0x070097F0 - 0x07009808 -static const Lights1 wf_seg7_lights_070097F0 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07009808 - 0x07009848 static const Vtx wf_seg7_vertex_07009808[] = { @@ -17,8 +13,8 @@ static const Gfx wf_seg7_dl_07009848[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09004800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wf_seg7_lights_070097F0.l, 1), - gsSPLight(&wf_seg7_lights_070097F0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(wf_seg7_vertex_07009808, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSPEndDisplayList(), diff --git a/levels/wf/areas/1/13/model.inc.c b/levels/wf/areas/1/13/model.inc.c index 6a2e7c87..180f3e8e 100644 --- a/levels/wf/areas/1/13/model.inc.c +++ b/levels/wf/areas/1/13/model.inc.c @@ -1,8 +1,4 @@ // 0x07009900 - 0x07009918 -static const Lights1 wf_seg7_lights_07009900 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07009918 - 0x07009958 static const Vtx wf_seg7_vertex_07009918[] = { @@ -81,8 +77,8 @@ static const Gfx wf_seg7_dl_07009C58[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09001000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wf_seg7_lights_07009900.l, 1), - gsSPLight(&wf_seg7_lights_07009900.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(wf_seg7_vertex_07009918, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), diff --git a/levels/wf/areas/1/14/model.inc.c b/levels/wf/areas/1/14/model.inc.c index a773faeb..246b3c72 100644 --- a/levels/wf/areas/1/14/model.inc.c +++ b/levels/wf/areas/1/14/model.inc.c @@ -1,8 +1,4 @@ // 0x07009E30 - 0x07009E48 -static const Lights1 wf_seg7_lights_07009E30 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07009E48 - 0x07009F48 static const Vtx wf_seg7_vertex_07009E48[] = { @@ -59,8 +55,8 @@ static const Gfx wf_seg7_dl_0700A0A8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09007800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wf_seg7_lights_07009E30.l, 1), - gsSPLight(&wf_seg7_lights_07009E30.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(wf_seg7_vertex_07009E48, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 3, 6, 7, 0x0), diff --git a/levels/wf/areas/1/15/1.inc.c b/levels/wf/areas/1/15/1.inc.c index 5c39a336..47934d88 100644 --- a/levels/wf/areas/1/15/1.inc.c +++ b/levels/wf/areas/1/15/1.inc.c @@ -1,8 +1,4 @@ // 0x0700A1E0 - 0x0700A1F8 -static const Lights1 wf_seg7_lights_0700A1E0 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700A1F8 - 0x0700A2E8 static const Vtx wf_seg7_vertex_0700A1F8[] = { @@ -157,8 +153,8 @@ static const Gfx wf_seg7_dl_0700A8F8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09005000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wf_seg7_lights_0700A1E0.l, 1), - gsSPLight(&wf_seg7_lights_0700A1E0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(wf_seg7_vertex_0700A1F8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), diff --git a/levels/wf/areas/1/15/2.inc.c b/levels/wf/areas/1/15/2.inc.c index 791de576..18a55f18 100644 --- a/levels/wf/areas/1/15/2.inc.c +++ b/levels/wf/areas/1/15/2.inc.c @@ -1,8 +1,4 @@ // 0x0700AC70 - 0x0700AC88 -static const Lights1 wf_seg7_lights_0700AC70 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700AC88 - 0x0700ACE8 static const Vtx wf_seg7_vertex_0700AC88[] = { @@ -39,8 +35,8 @@ static const Gfx wf_seg7_dl_0700ADE8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09005800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wf_seg7_lights_0700AC70.l, 1), - gsSPLight(&wf_seg7_lights_0700AC70.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(wf_seg7_vertex_0700AC88, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 0, 2, 4, 0x0, 0, 5, 3, 0x0), diff --git a/levels/wf/areas/1/16/model.inc.c b/levels/wf/areas/1/16/model.inc.c index d544df98..3014abf2 100644 --- a/levels/wf/areas/1/16/model.inc.c +++ b/levels/wf/areas/1/16/model.inc.c @@ -1,8 +1,4 @@ // 0x0700B028 - 0x0700B040 -static const Lights1 wf_seg7_lights_0700B028 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700B040 - 0x0700B070 static const Vtx wf_seg7_vertex_0700B040[] = { @@ -162,8 +158,8 @@ static const Gfx wf_seg7_dl_0700B750[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09004800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wf_seg7_lights_0700B028.l, 1), - gsSPLight(&wf_seg7_lights_0700B028.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(wf_seg7_vertex_0700B040, 3, 0), gsSP1Triangle( 0, 1, 2, 0x0), gsSPEndDisplayList(), diff --git a/levels/wf/areas/1/17/model.inc.c b/levels/wf/areas/1/17/model.inc.c index 4ab4cac8..7cdcfc8b 100644 --- a/levels/wf/areas/1/17/model.inc.c +++ b/levels/wf/areas/1/17/model.inc.c @@ -1,8 +1,4 @@ // 0x0700BB18 - 0x0700BB30 -static const Lights1 wf_seg7_lights_0700BB18 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700BB30 - 0x0700BC20 static const Vtx wf_seg7_vertex_0700BB30[] = { @@ -73,8 +69,8 @@ static const Gfx wf_seg7_dl_0700BE30[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09005000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wf_seg7_lights_0700BB18.l, 1), - gsSPLight(&wf_seg7_lights_0700BB18.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(wf_seg7_vertex_0700BB30, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), diff --git a/levels/wf/areas/1/18/model.inc.c b/levels/wf/areas/1/18/model.inc.c index 4cf54bde..55c1a08f 100644 --- a/levels/wf/areas/1/18/model.inc.c +++ b/levels/wf/areas/1/18/model.inc.c @@ -1,8 +1,4 @@ // 0x0700BFE0 - 0x0700BFF8 -static const Lights1 wf_seg7_lights_0700BFE0 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700BFF8 - 0x0700C0E8 static const Vtx wf_seg7_vertex_0700BFF8[] = { @@ -261,8 +257,8 @@ static const Gfx wf_seg7_dl_0700CC38[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09007800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wf_seg7_lights_0700BFE0.l, 1), - gsSPLight(&wf_seg7_lights_0700BFE0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(wf_seg7_vertex_0700BFF8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 3, 5, 0x0, 7, 8, 9, 0x0), diff --git a/levels/wf/areas/1/19/model.inc.c b/levels/wf/areas/1/19/model.inc.c index d3371e7d..b3738758 100644 --- a/levels/wf/areas/1/19/model.inc.c +++ b/levels/wf/areas/1/19/model.inc.c @@ -1,8 +1,4 @@ // 0x0700D0A8 - 0x0700D0C0 -static const Lights1 wf_seg7_lights_0700D0A8 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700D0C0 - 0x0700D1B0 static const Vtx wf_seg7_vertex_0700D0C0[] = { @@ -43,8 +39,8 @@ static const Gfx wf_seg7_dl_0700D260[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09008000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wf_seg7_lights_0700D0A8.l, 1), - gsSPLight(&wf_seg7_lights_0700D0A8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(wf_seg7_vertex_0700D0C0, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 3, 5, 0x0, 7, 8, 9, 0x0), diff --git a/levels/wf/areas/1/2/model.inc.c b/levels/wf/areas/1/2/model.inc.c index 7ca0c7f9..eab1c03d 100644 --- a/levels/wf/areas/1/2/model.inc.c +++ b/levels/wf/areas/1/2/model.inc.c @@ -1,8 +1,4 @@ // 0x070051C8 - 0x070051E0 -static const Lights1 wf_seg7_lights_070051C8 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x070051E0 - 0x07005260 static const Vtx wf_seg7_vertex_070051E0[] = { @@ -21,8 +17,8 @@ static const Gfx wf_seg7_dl_07005260[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wf_seg7_texture_07000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wf_seg7_lights_070051C8.l, 1), - gsSPLight(&wf_seg7_lights_070051C8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(wf_seg7_vertex_070051E0, 8, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), diff --git a/levels/wf/areas/1/5/1.inc.c b/levels/wf/areas/1/5/1.inc.c index 57d8fccd..454128d7 100644 --- a/levels/wf/areas/1/5/1.inc.c +++ b/levels/wf/areas/1/5/1.inc.c @@ -1,8 +1,4 @@ // 0x070056C0 - 0x070056D8 -static const Lights1 wf_seg7_lights_070056C0 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x070056D8 - 0x070057C8 static const Vtx wf_seg7_vertex_070056D8[] = { @@ -119,8 +115,8 @@ static const Gfx wf_seg7_dl_07005C38[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09009800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wf_seg7_lights_070056C0.l, 1), - gsSPLight(&wf_seg7_lights_070056C0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(wf_seg7_vertex_070056D8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 5, 4, 6, 0x0, 7, 8, 9, 0x0), diff --git a/levels/wf/areas/1/5/2.inc.c b/levels/wf/areas/1/5/2.inc.c index 853874b3..3aee9de9 100644 --- a/levels/wf/areas/1/5/2.inc.c +++ b/levels/wf/areas/1/5/2.inc.c @@ -1,8 +1,4 @@ // 0x07005E48 - 0x07005E60 -static const Lights1 wf_seg7_lights_07005E48 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07005E60 - 0x07005EA0 static const Vtx wf_seg7_vertex_07005E60[] = { @@ -17,8 +13,8 @@ static const Gfx wf_seg7_dl_07005EA0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09009800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wf_seg7_lights_07005E48.l, 1), - gsSPLight(&wf_seg7_lights_07005E48.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(wf_seg7_vertex_07005E60, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSPEndDisplayList(), diff --git a/levels/wf/areas/1/6/1.inc.c b/levels/wf/areas/1/6/1.inc.c index c94c56d7..5a4aaf35 100644 --- a/levels/wf/areas/1/6/1.inc.c +++ b/levels/wf/areas/1/6/1.inc.c @@ -1,8 +1,4 @@ // 0x07005F58 - 0x07005F70 -static const Lights1 wf_seg7_lights_07005F58 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07005F70 - 0x07006060 static const Vtx wf_seg7_vertex_07005F70[] = { @@ -96,8 +92,8 @@ static const Gfx wf_seg7_dl_070063A0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09008000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wf_seg7_lights_07005F58.l, 1), - gsSPLight(&wf_seg7_lights_07005F58.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(wf_seg7_vertex_07005F70, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 4, 6, 5, 0x0, 7, 8, 9, 0x0), diff --git a/levels/wf/areas/1/6/2.inc.c b/levels/wf/areas/1/6/2.inc.c index 345689b8..e985a3e8 100644 --- a/levels/wf/areas/1/6/2.inc.c +++ b/levels/wf/areas/1/6/2.inc.c @@ -1,8 +1,4 @@ // 0x07006558 - 0x07006570 -static const Lights1 wf_seg7_lights_07006558 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07006570 - 0x070065B0 static const Vtx wf_seg7_vertex_07006570[] = { @@ -17,8 +13,8 @@ static const Gfx wf_seg7_dl_070065B0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09008000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wf_seg7_lights_07006558.l, 1), - gsSPLight(&wf_seg7_lights_07006558.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(wf_seg7_vertex_07006570, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), diff --git a/levels/wf/areas/1/7/model.inc.c b/levels/wf/areas/1/7/model.inc.c index 23349c1b..1d3f76ff 100644 --- a/levels/wf/areas/1/7/model.inc.c +++ b/levels/wf/areas/1/7/model.inc.c @@ -1,8 +1,4 @@ // 0x07006668 - 0x07006680 -static const Lights1 wf_seg7_lights_07006668 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07006680 - 0x070066C0 static const Vtx wf_seg7_vertex_07006680[] = { @@ -33,8 +29,8 @@ static const Gfx wf_seg7_dl_07006780[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09001000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wf_seg7_lights_07006668.l, 1), - gsSPLight(&wf_seg7_lights_07006668.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(wf_seg7_vertex_07006680, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), diff --git a/levels/wf/areas/1/9/model.inc.c b/levels/wf/areas/1/9/model.inc.c index d4f9916f..e69151ab 100644 --- a/levels/wf/areas/1/9/model.inc.c +++ b/levels/wf/areas/1/9/model.inc.c @@ -1,8 +1,4 @@ // 0x07007298 - 0x070072B0 -static const Lights1 wf_seg7_lights_07007298 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x070072B0 - 0x070073A0 static const Vtx wf_seg7_vertex_070072B0[] = { @@ -47,8 +43,8 @@ static const Gfx wf_seg7_dl_07007450[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wf_seg7_lights_07007298.l, 1), - gsSPLight(&wf_seg7_lights_07007298.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(wf_seg7_vertex_070072B0, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), diff --git a/levels/wf/beta_extending_platform/model.inc.c b/levels/wf/beta_extending_platform/model.inc.c index 5780e3ee..2a61fb62 100644 --- a/levels/wf/beta_extending_platform/model.inc.c +++ b/levels/wf/beta_extending_platform/model.inc.c @@ -1,8 +1,4 @@ // 0x0700EBB8 - 0x0700EBD0 -static const Lights1 wf_seg7_lights_0700EBB8 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700EBD0 - 0x0700ECC0 static const Vtx wf_seg7_vertex_0700EBD0[] = { @@ -39,8 +35,8 @@ static const Gfx wf_seg7_dl_0700ED30[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09007000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wf_seg7_lights_0700EBB8.l, 1), - gsSPLight(&wf_seg7_lights_0700EBB8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(wf_seg7_vertex_0700EBD0, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), diff --git a/levels/wf/breakable_wall_left/model.inc.c b/levels/wf/breakable_wall_left/model.inc.c index df1b13de..66df6d85 100644 --- a/levels/wf/breakable_wall_left/model.inc.c +++ b/levels/wf/breakable_wall_left/model.inc.c @@ -1,8 +1,4 @@ // 0x0700F220 - 0x0700F238 -static const Lights1 wf_seg7_lights_0700F220 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700F238 - 0x0700F268 static const Vtx wf_seg7_vertex_0700F238[] = { @@ -26,8 +22,8 @@ static const Gfx wf_seg7_dl_0700F2C8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09001000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wf_seg7_lights_0700F220.l, 1), - gsSPLight(&wf_seg7_lights_0700F220.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(wf_seg7_vertex_0700F238, 3, 0), gsSP1Triangle( 0, 1, 2, 0x0), gsSPEndDisplayList(), diff --git a/levels/wf/breakable_wall_right/model.inc.c b/levels/wf/breakable_wall_right/model.inc.c index 16b8a4d7..7b131263 100644 --- a/levels/wf/breakable_wall_right/model.inc.c +++ b/levels/wf/breakable_wall_right/model.inc.c @@ -1,8 +1,4 @@ // 0x0700F088 - 0x0700F0A0 -static const Lights1 wf_seg7_lights_0700F088 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700F0A0 - 0x0700F0D0 static const Vtx wf_seg7_vertex_0700F0A0[] = { @@ -26,8 +22,8 @@ static const Gfx wf_seg7_dl_0700F130[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09001000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wf_seg7_lights_0700F088.l, 1), - gsSPLight(&wf_seg7_lights_0700F088.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(wf_seg7_vertex_0700F0A0, 3, 0), gsSP1Triangle( 0, 1, 2, 0x0), gsSPEndDisplayList(), diff --git a/levels/wf/extending_platform/model.inc.c b/levels/wf/extending_platform/model.inc.c index 0f129b32..38b116c8 100644 --- a/levels/wf/extending_platform/model.inc.c +++ b/levels/wf/extending_platform/model.inc.c @@ -1,8 +1,4 @@ // 0x0700EE30 - 0x0700EE48 -static const Lights1 wf_seg7_lights_0700EE30 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700EE48 - 0x0700EF48 static const Vtx wf_seg7_vertex_0700EE48[] = { @@ -37,8 +33,8 @@ static const Gfx wf_seg7_dl_0700EF88[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09007000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wf_seg7_lights_0700EE30.l, 1), - gsSPLight(&wf_seg7_lights_0700EE30.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(wf_seg7_vertex_0700EE48, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), diff --git a/levels/wf/kickable_board/1.inc.c b/levels/wf/kickable_board/1.inc.c index 0d70cb85..0a9025b2 100644 --- a/levels/wf/kickable_board/1.inc.c +++ b/levels/wf/kickable_board/1.inc.c @@ -1,8 +1,4 @@ // 0x0700F3B8 - 0x0700F3D0 -static const Lights1 wf_seg7_lights_0700F3B8 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700F3D0 - 0x0700F4C0 static const Vtx wf_seg7_vertex_0700F3D0[] = { @@ -43,8 +39,8 @@ static const Gfx wf_seg7_dl_0700F570[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09006800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wf_seg7_lights_0700F3B8.l, 1), - gsSPLight(&wf_seg7_lights_0700F3B8.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(wf_seg7_vertex_0700F3D0, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), diff --git a/levels/wf/large_bomp/model.inc.c b/levels/wf/large_bomp/model.inc.c index 0762cbdb..032ac58f 100644 --- a/levels/wf/large_bomp/model.inc.c +++ b/levels/wf/large_bomp/model.inc.c @@ -1,8 +1,4 @@ // 0x0700DA68 - 0x0700DA80 -static const Lights1 wf_seg7_lights_0700DA68 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700DA80 - 0x0700DB70 static const Vtx wf_seg7_vertex_0700DA80[] = { @@ -67,8 +63,8 @@ static const Gfx wf_seg7_dl_0700DD20[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09008000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wf_seg7_lights_0700DA68.l, 1), - gsSPLight(&wf_seg7_lights_0700DA68.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(wf_seg7_vertex_0700DA80, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), diff --git a/levels/wf/rotating_wooden_platform/1.inc.c b/levels/wf/rotating_wooden_platform/1.inc.c index 6eafd27a..31b4b348 100644 --- a/levels/wf/rotating_wooden_platform/1.inc.c +++ b/levels/wf/rotating_wooden_platform/1.inc.c @@ -1,8 +1,4 @@ // 0x0700E440 - 0x0700E458 -static const Lights1 wf_seg7_lights_0700E440 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700E458 - 0x0700E548 static const Vtx wf_seg7_vertex_0700E458[] = { @@ -57,8 +53,8 @@ static const Gfx wf_seg7_dl_0700E698[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09006800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wf_seg7_lights_0700E440.l, 1), - gsSPLight(&wf_seg7_lights_0700E440.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(wf_seg7_vertex_0700E458, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), diff --git a/levels/wf/rotating_wooden_platform/2.inc.c b/levels/wf/rotating_wooden_platform/2.inc.c index 40009697..2cb4faf2 100644 --- a/levels/wf/rotating_wooden_platform/2.inc.c +++ b/levels/wf/rotating_wooden_platform/2.inc.c @@ -1,8 +1,4 @@ // 0x0700E7D0 - 0x0700E7E8 -static const Lights1 wf_seg7_lights_0700E7D0 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700E7E8 - 0x0700E8E8 static const Vtx wf_seg7_vertex_0700E7E8[] = { @@ -36,8 +32,8 @@ static const Gfx wf_seg7_dl_0700E918[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09006800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wf_seg7_lights_0700E7D0.l, 1), - gsSPLight(&wf_seg7_lights_0700E7D0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(wf_seg7_vertex_0700E7E8, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), diff --git a/levels/wf/sliding_platform/model.inc.c b/levels/wf/sliding_platform/model.inc.c index d6f06de7..05132e86 100644 --- a/levels/wf/sliding_platform/model.inc.c +++ b/levels/wf/sliding_platform/model.inc.c @@ -1,8 +1,4 @@ // 0x0700EA28 - 0x0700EA40 -static const Lights1 wf_seg7_lights_0700EA28 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700EA40 - 0x0700EA80 static const Vtx wf_seg7_vertex_0700EA40[] = { @@ -25,8 +21,8 @@ static const Gfx wf_seg7_dl_0700EAC0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wf_seg7_lights_0700EA28.l, 1), - gsSPLight(&wf_seg7_lights_0700EA28.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(wf_seg7_vertex_0700EA40, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), diff --git a/levels/wf/small_bomp/1.inc.c b/levels/wf/small_bomp/1.inc.c index dd97bc10..421de3dc 100644 --- a/levels/wf/small_bomp/1.inc.c +++ b/levels/wf/small_bomp/1.inc.c @@ -1,8 +1,4 @@ // 0x0700D370 - 0x0700D388 -static const Lights1 wf_seg7_lights_0700D370 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700D388 - 0x0700D488 static const Vtx wf_seg7_vertex_0700D388[] = { @@ -65,8 +61,8 @@ static const Gfx wf_seg7_dl_0700D608[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09008000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wf_seg7_lights_0700D370.l, 1), - gsSPLight(&wf_seg7_lights_0700D370.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(wf_seg7_vertex_0700D388, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), diff --git a/levels/wf/small_bomp/2.inc.c b/levels/wf/small_bomp/2.inc.c index 973d9b63..7f88d21c 100644 --- a/levels/wf/small_bomp/2.inc.c +++ b/levels/wf/small_bomp/2.inc.c @@ -1,8 +1,4 @@ // 0x0700D780 - 0x0700D798 -static const Lights1 wf_seg7_lights_0700D780 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700D798 - 0x0700D898 static const Vtx wf_seg7_vertex_0700D798[] = { @@ -47,8 +43,8 @@ static const Gfx wf_seg7_dl_0700D938[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09008000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wf_seg7_lights_0700D780.l, 1), - gsSPLight(&wf_seg7_lights_0700D780.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(wf_seg7_vertex_0700D798, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 7, 8, 9, 0x0), diff --git a/levels/wf/tower_door/model.inc.c b/levels/wf/tower_door/model.inc.c index 74b4594e..1b1c319c 100644 --- a/levels/wf/tower_door/model.inc.c +++ b/levels/wf/tower_door/model.inc.c @@ -1,8 +1,4 @@ // 0x0700F758 - 0x0700F770 -static const Lights1 wf_seg7_lights_0700F758 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700F770 - 0x0700F7B0 static const Vtx wf_seg7_vertex_0700F770[] = { @@ -17,8 +13,8 @@ static const Gfx wf_seg7_dl_0700F7B0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09007000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wf_seg7_lights_0700F758.l, 1), - gsSPLight(&wf_seg7_lights_0700F758.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(wf_seg7_vertex_0700F770, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), diff --git a/levels/wf/tumbling_bridge_far/model.inc.c b/levels/wf/tumbling_bridge_far/model.inc.c index e79f3d58..5dec642c 100644 --- a/levels/wf/tumbling_bridge_far/model.inc.c +++ b/levels/wf/tumbling_bridge_far/model.inc.c @@ -1,8 +1,4 @@ // 0x0700E160 - 0x0700E178 -static const Lights1 wf_seg7_lights_0700E160 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700E178 - 0x0700E278 static const Vtx wf_seg7_vertex_0700E178[] = { @@ -44,8 +40,8 @@ static const Gfx wf_seg7_dl_0700E328[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09004000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wf_seg7_lights_0700E160.l, 1), - gsSPLight(&wf_seg7_lights_0700E160.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(wf_seg7_vertex_0700E178, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), diff --git a/levels/wf/tumbling_bridge_near/model.inc.c b/levels/wf/tumbling_bridge_near/model.inc.c index 581e4b89..9149aa97 100644 --- a/levels/wf/tumbling_bridge_near/model.inc.c +++ b/levels/wf/tumbling_bridge_near/model.inc.c @@ -1,8 +1,4 @@ // 0x0700DE98 - 0x0700DEB0 -static const Lights1 wf_seg7_lights_0700DE98 = gdSPDefLights1( - 0x66, 0x66, 0x66, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700DEB0 - 0x0700DFA0 static const Vtx wf_seg7_vertex_0700DEB0[] = { @@ -43,8 +39,8 @@ static const Gfx wf_seg7_dl_0700E050[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09004000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wf_seg7_lights_0700DE98.l, 1), - gsSPLight(&wf_seg7_lights_0700DE98.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x666666ff), gsSPVertex(wf_seg7_vertex_0700DEB0, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), diff --git a/levels/wmotr/areas/1/model.inc.c b/levels/wmotr/areas/1/model.inc.c index 7346c691..a6cc6110 100644 --- a/levels/wmotr/areas/1/model.inc.c +++ b/levels/wmotr/areas/1/model.inc.c @@ -1,14 +1,6 @@ // 0x07001800 - 0x07001818 -static const Lights1 wmotr_seg7_lights_07001800 = gdSPDefLights1( - 0xbf, 0xbf, 0xbf, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x07001818 - 0x07001830 -static const Lights1 wmotr_seg7_lights_07001818 = gdSPDefLights1( - 0x72, 0x72, 0x72, - 0x99, 0x99, 0x99, 0x28, 0x28, 0x28 -); // 0x07001830 - 0x07001920 static const Vtx wmotr_seg7_vertex_07001830[] = { @@ -2415,8 +2407,8 @@ static const Gfx wmotr_seg7_dl_07008EF0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wmotr_seg7_texture_07001600), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 8 * 32 - 1, CALC_DXT(8, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wmotr_seg7_lights_07001800.l, 1), - gsSPLight(&wmotr_seg7_lights_07001800.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0xbfbfbfff), gsSPVertex(wmotr_seg7_vertex_07001830, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), @@ -2468,8 +2460,8 @@ static const Gfx wmotr_seg7_dl_07009148[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wmotr_seg7_texture_07000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 16 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wmotr_seg7_lights_07001818.l, 1), - gsSPLight(&wmotr_seg7_lights_07001818.a, 2), + gsSPLightColor(LIGHT_1, 0x999999ff), + gsSPLightColor(LIGHT_2, 0x727272ff), gsSPVertex(wmotr_seg7_vertex_07002010, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), @@ -2513,8 +2505,8 @@ static const Gfx wmotr_seg7_dl_070092A0[] = { gsSP1Triangle( 0, 14, 1, 0x0), gsSPVertex(wmotr_seg7_vertex_07002630, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - gsSPLight(&wmotr_seg7_lights_07001800.l, 1), - gsSPLight(&wmotr_seg7_lights_07001800.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0xbfbfbfff), gsSPVertex(wmotr_seg7_vertex_07002670, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), @@ -3377,10 +3369,6 @@ const Gfx wmotr_seg7_dl_0700C1F8[] = { }; // 0x0700C2A0 - 0x0700C2B8 -static const Lights1 wmotr_seg7_lights_0700C2A0 = gdSPDefLights1( - 0x3f, 0x3f, 0x3f, - 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 -); // 0x0700C2B8 - 0x0700C3B8 static const Vtx wmotr_seg7_vertex_0700C2B8[] = { @@ -4008,8 +3996,8 @@ static const Gfx wmotr_seg7_dl_0700E188[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wmotr_seg7_texture_07000C00), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPLight(&wmotr_seg7_lights_0700C2A0.l, 1), - gsSPLight(&wmotr_seg7_lights_0700C2A0.a, 2), + gsSPLightColor(LIGHT_1, 0xffffffff), + gsSPLightColor(LIGHT_2, 0x3f3f3fff), gsSPVertex(wmotr_seg7_vertex_0700C2B8, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 2, 4, 5, 0x0, 2, 5, 6, 0x0), diff --git a/src/engine/graph_node.h b/src/engine/graph_node.h index fb6c0ea5..0fff4613 100644 --- a/src/engine/graph_node.h +++ b/src/engine/graph_node.h @@ -400,6 +400,7 @@ extern struct GraphNodePerspective *gCurGraphNodeCamFrustum; extern struct GraphNodeCamera *gCurGraphNodeCamera; extern struct GraphNodeHeldObject *gCurGraphNodeHeldObject; extern u16 gAreaUpdateCounter; +extern Mat4 gCameraTransform; extern struct GraphNode *gCurRootGraphNode; extern struct GraphNode *gCurGraphNodeList[]; diff --git a/src/engine/math_util.c b/src/engine/math_util.c index c410e558..8f6cb6a8 100644 --- a/src/engine/math_util.c +++ b/src/engine/math_util.c @@ -547,52 +547,50 @@ void mtxf_billboard(Mat4 dest, Mat4 mtx, Vec3f position, Vec3f scale, s32 angle) register s32 i; register f32 sx = scale[0]; register f32 sy = scale[1]; - register f32 sz = ((f32 *) scale)[2]; - register f32 *temp2, *temp = (f32 *)dest; - for (i = 0; i < 16; i++) { - *temp = 0; - temp++; - } - if (angle == 0x0) { - // ((u32 *) dest)[0] = FLOAT_ONE; - dest[0][0] = sx; // [0][0] - dest[0][1] = 0; - dest[1][0] = 0; - // ((u32 *) dest)[5] = FLOAT_ONE; - dest[1][1] = sy; // [1][1] - } else { - dest[0][0] = (coss(angle) * sx); - dest[0][1] = (sins(angle) * sx); - dest[1][0] = (-dest[0][1] * sy); - dest[1][1] = ( dest[0][0] * sy); - } - // ((u32 *) dest)[10] = FLOAT_ONE; - // dest[2][2] = sz; // [2][2] - ((f32 *) dest)[10] = sz; // [2][2] - dest[2][3] = 0; - ((u32 *) dest)[15] = FLOAT_ONE; // [3][3] - - temp = (f32 *)dest; - temp2 = (f32 *)mtx; + register f32 sz = scale[2]; + Mat4* cameraMat = &gCameraTransform; for (i = 0; i < 3; i++) { - temp[12] = ((temp2[ 0] * position[0]) - + (temp2[ 4] * position[1]) - + (temp2[ 8] * position[2]) - + temp2[12]); - temp++; - temp2++; + for (int j = 0; j < 3; j++) { + dest[i][j] = (*cameraMat)[j][i]; + } + dest[i][3] = 0.0f; } + if (angle != 0x0) { + float m00 = dest[0][0]; + float m01 = dest[0][1]; + float m02 = dest[0][2]; + float m10 = dest[1][0]; + float m11 = dest[1][1]; + float m12 = dest[1][2]; + float cosa = coss(angle); + float sina = sins(angle); + dest[0][0] = cosa * m00 + sina * m10; + dest[0][1] = cosa * m01 + sina * m11; + dest[0][2] = cosa * m02 + sina * m12; + dest[1][0] = -sina * m00 + cosa * m10; + dest[1][1] = -sina * m01 + cosa * m11; + dest[1][2] = -sina * m02 + cosa * m12; + } + for (i = 0; i < 3; i++) { + dest[0][i] *= sx; + dest[1][i] *= sy; + dest[2][i] *= sz; + } + + // Translation = input translation + position + vec3f_copy(dest[3], position); + vec3f_add(dest[3], mtx[3]); + dest[3][3] = 1.0f; } /** * Mostly the same as 'mtxf_align_terrain_normal', but also applies a scale and multiplication. - * 'src' is the matrix to multiply from * 'upDir' is the terrain normal * 'pos' is the object's position in the world * 'scale' is the scale of the shadow * 'yaw' is the angle which it should face */ -void mtxf_shadow(Mat4 dest, Mat4 src, Vec3f upDir, Vec3f pos, Vec3f scale, s32 yaw) { +void mtxf_shadow(Mat4 dest, Vec3f upDir, Vec3f pos, Vec3f scale, s32 yaw) { Vec3f lateralDir; Vec3f leftDir; Vec3f forwardDir; @@ -602,15 +600,11 @@ void mtxf_shadow(Mat4 dest, Mat4 src, Vec3f upDir, Vec3f pos, Vec3f scale, s32 y vec3f_normalize(leftDir); vec3f_cross(forwardDir, leftDir, upDir); vec3f_normalize(forwardDir); - Vec3f entry; - vec3f_prod(entry, leftDir, scale); - linear_mtxf_mul_vec3f(src, dest[0], entry); - vec3f_prod(entry, upDir, scale); - linear_mtxf_mul_vec3f(src, dest[1], entry); - vec3f_prod(entry, forwardDir, scale); - linear_mtxf_mul_vec3f(src, dest[2], entry); - linear_mtxf_mul_vec3f(src, dest[3], pos); - vec3f_add(dest[3], src[3]); + + vec3f_prod(dest[0], leftDir, scale); + vec3f_prod(dest[1], upDir, scale); + vec3f_prod(dest[2], forwardDir, scale); + vec3f_copy(dest[3], pos); MTXF_END(dest); } @@ -782,39 +776,6 @@ void mtxf_rotate_xy(Mtx *mtx, s32 angle) { ((s16 *) mtx)[15] = 1; } -/** - * Extract a position given an object's transformation matrix and a camera matrix. - * This is used for determining the world position of the held object: since objMtx - * inherits the transformation from both the camera and Mario, it calculates this - * by taking the camera matrix and inverting its transformation by first rotating - * objMtx back from screen orientation to world orientation, and then subtracting - * the camera position. - */ -void get_pos_from_transform_mtx(Vec3f dest, Mat4 objMtx, register Mat4 camMtx) { - register s32 i; - register f32 *temp1 = (f32 *)dest; - register f32 *temp2 = (f32 *)camMtx; - f32 y[3]; - register f32 *x = y; - register f32 *temp3 = (f32 *)objMtx; - - for (i = 0; i < 3; i++) { - *x = (temp3[12] - temp2[12]); - temp2++; - temp3++; - x = (f32 *)(((u32)x) + 4); - } - temp2 -= 3; - for (i = 0; i < 3; i++) { - *temp1 = ((x[-3] * temp2[0]) - + (x[-2] * temp2[1]) - + (x[-1] * temp2[2])); - temp1++; - temp2 += 4; - } -} - - /** * Take the vector starting at 'from' pointed at 'to' an retrieve the length * of that vector, as well as the yaw and pitch angles. diff --git a/src/engine/math_util.h b/src/engine/math_util.h index 2c131d1a..2ff4587d 100644 --- a/src/engine/math_util.h +++ b/src/engine/math_util.h @@ -544,7 +544,7 @@ void mtxf_rotate_xyz_and_translate(Mat4 dest, Vec3f trans, Vec3s rot); void mtxf_rotate_zxy_and_translate_and_mul(Vec3s rot, Vec3f trans, Mat4 dest, Mat4 src); void mtxf_rotate_xyz_and_translate_and_mul(Vec3s rot, Vec3f trans, Mat4 dest, Mat4 src); void mtxf_billboard(Mat4 dest, Mat4 mtx, Vec3f position, Vec3f scale, s32 angle); -void mtxf_shadow(Mat4 dest, Mat4 src, Vec3f upDir, Vec3f pos, Vec3f scale, s32 yaw); +void mtxf_shadow(Mat4 dest, Vec3f upDir, Vec3f pos, Vec3f scale, s32 yaw); void mtxf_align_terrain_normal(Mat4 dest, Vec3f upDir, Vec3f pos, s32 yaw); void mtxf_align_terrain_triangle(Mat4 mtx, Vec3f pos, s32 yaw, f32 radius); void mtxf_mul(Mat4 dest, Mat4 a, Mat4 b); @@ -561,7 +561,6 @@ void mtxf_rotate_xy(Mtx *mtx, s32 angle); void linear_mtxf_mul_vec3f(Mat4 m, Vec3f dst, Vec3f v); void linear_mtxf_mul_vec3f_and_translate(Mat4 m, Vec3f dst, Vec3f v); void linear_mtxf_transpose_mul_vec3f(Mat4 m, Vec3f dst, Vec3f v); -void get_pos_from_transform_mtx(Vec3f dest, Mat4 objMtx, Mat4 camMtx); void vec2f_get_lateral_dist( Vec2f from, Vec2f to, f32 *lateralDist ); void vec3f_get_lateral_dist( Vec3f from, Vec3f to, f32 *lateralDist ); diff --git a/src/game/area.c b/src/game/area.c index ea53b1ca..c0a49ee5 100644 --- a/src/game/area.c +++ b/src/game/area.c @@ -433,9 +433,10 @@ void render_game(void) { gViewportOverride = NULL; gViewportClip = NULL; - + profiler_update(PROFILER_TIME_GFX); profiler_print_times(); + #if PUPPYPRINT_DEBUG puppyprint_render_profiler(); #endif diff --git a/src/game/behavior_actions.c b/src/game/behavior_actions.c index 1fd7468e..d2f80578 100644 --- a/src/game/behavior_actions.c +++ b/src/game/behavior_actions.c @@ -129,13 +129,11 @@ void spawn_mist_particles_variable(s32 count, s32 offsetY, f32 size) { // not sure what this is doing here. not in a behavior file. Gfx *geo_move_mario_part_from_parent(s32 callContext, UNUSED struct GraphNode *node, Mat4 mtx) { - Mat4 mtx2; if (callContext == GEO_CONTEXT_RENDER) { struct Object *obj = (struct Object *) gCurGraphNodeObject; if (obj == gMarioObject && obj->prevObj != NULL) { - create_transformation_from_matrices(mtx2, mtx, *gCurGraphNodeCamera->matrixPtr); - obj_update_pos_from_parent_transformation(mtx2, obj->prevObj); + obj_update_pos_from_parent_transformation(mtx, obj->prevObj); obj_set_gfx_pos_from_pos(obj->prevObj); } } diff --git a/src/game/behaviors/bowser.inc.c b/src/game/behaviors/bowser.inc.c index f559adea..e801768a 100644 --- a/src/game/behaviors/bowser.inc.c +++ b/src/game/behaviors/bowser.inc.c @@ -1716,11 +1716,9 @@ void bhv_bowser_init(void) { Gfx *geo_update_body_rot_from_parent(s32 callContext, UNUSED struct GraphNode *node, Mat4 mtx) { if (callContext == GEO_CONTEXT_RENDER) { - Mat4 mtx2; struct Object *obj = (struct Object *) gCurGraphNodeObject; if (obj->prevObj != NULL) { - create_transformation_from_matrices(mtx2, mtx, *gCurGraphNodeCamera->matrixPtr); - obj_update_pos_from_parent_transformation(mtx2, obj->prevObj); + obj_update_pos_from_parent_transformation(mtx, obj->prevObj); obj_set_gfx_pos_from_pos(obj->prevObj); } } diff --git a/src/game/behaviors/king_bobomb.inc.c b/src/game/behaviors/king_bobomb.inc.c index 274ef48b..f70d0319 100644 --- a/src/game/behaviors/king_bobomb.inc.c +++ b/src/game/behaviors/king_bobomb.inc.c @@ -3,11 +3,9 @@ // Copy of geo_update_projectile_pos_from_parent Gfx *geo_update_held_mario_pos(s32 callContext, UNUSED struct GraphNode *node, Mat4 mtx) { if (callContext == GEO_CONTEXT_RENDER) { - Mat4 mtx2; struct Object *obj = (struct Object *) gCurGraphNodeObject; if (obj->prevObj != NULL) { - create_transformation_from_matrices(mtx2, mtx, *gCurGraphNodeCamera->matrixPtr); - obj_update_pos_from_parent_transformation(mtx2, obj->prevObj); + obj_update_pos_from_parent_transformation(mtx, obj->prevObj); obj_set_gfx_pos_from_pos(obj->prevObj); } } diff --git a/src/game/behaviors/ukiki.inc.c b/src/game/behaviors/ukiki.inc.c index ed844c01..293e0eb5 100644 --- a/src/game/behaviors/ukiki.inc.c +++ b/src/game/behaviors/ukiki.inc.c @@ -33,15 +33,13 @@ s32 is_cap_ukiki_and_mario_has_normal_cap_on_head(void) { * Unused copy of geo_update_projectile_pos_from_parent. Perhaps a copy paste mistake. */ Gfx *geo_update_projectile_pos_from_parent_copy(s32 callContext, UNUSED struct GraphNode *node, Mat4 mtx) { - Mat4 mtx2; if (callContext == GEO_CONTEXT_RENDER) { // TODO: change global type to Object pointer struct Object *obj = (struct Object *) gCurGraphNodeObject; if (obj->prevObj != NULL) { - create_transformation_from_matrices(mtx2, mtx, *gCurGraphNodeCamera->matrixPtr); - obj_update_pos_from_parent_transformation(mtx2, obj->prevObj); + obj_update_pos_from_parent_transformation(mtx, obj->prevObj); obj_set_gfx_pos_from_pos(obj->prevObj); } } diff --git a/src/game/debug_box.c b/src/game/debug_box.c index 4032cbe4..cd7a9e73 100644 --- a/src/game/debug_box.c +++ b/src/game/debug_box.c @@ -133,12 +133,12 @@ extern Mat4 gMatStack[32]; // XXX: Hack /** * The debug boxes' default color. sCurBoxColor is reset to this every frame. */ -#define DBG_BOX_DEF_COLOR 0xFF0000 +#define DBG_BOX_DEF_COLOR 0xFF000000 /** * The color that new boxes will be drawn with. */ -u32 sCurBoxColor = ((DBG_BOX_ALPHA << 24) | DBG_BOX_DEF_COLOR); +u32 sCurBoxColor = DBG_BOX_DEF_COLOR | DBG_BOX_ALPHA; /** * The allocated size of a rotated box's dl @@ -349,21 +349,17 @@ void visual_surface_loop(void) { || !gMarioState->marioObj) { return; } - Mtx *mtx = alloc_display_list(sizeof(Mtx)); Vtx *verts = alloc_display_list((iterate_surface_count(gMarioState->pos[0], gMarioState->pos[2]) * 3) * sizeof(Vtx)); gVisualSurfaceCount = 0; gVisualOffset = 0; - if ((mtx == NULL) || (verts == NULL)) { + if (verts == NULL) { return; } - mtxf_to_mtx(mtx, gMatStack[1]); gSPDisplayList(gDisplayListHead++, dl_visual_surface); - gSPMatrix(gDisplayListHead++, mtx, (G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH)); - iterate_surfaces_visual(gMarioState->pos[0], gMarioState->pos[2], verts); visual_surface_display(verts, 0); @@ -374,7 +370,6 @@ void visual_surface_loop(void) { visual_surface_display(verts, 1); - gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW); gSPDisplayList(gDisplayListHead++, dl_debug_box_end); } @@ -402,12 +397,12 @@ static void append_debug_box(Vec3f center, Vec3f bounds, s16 yaw, s32 type) { /** * Draw new boxes with the given color. - * Color format is 32-bit ARGB. + * Color format is 32-bit RGBA. * If the alpha component is zero, DBG_BOX_ALPHA (0x7f) will be used instead. - * Ex: 0xFF0000 becomes 0x7FFF0000 + * Ex: 0xFF000000 becomes 0xFF00007F */ void debug_box_color(u32 color) { - if ((color >> 24) == 0) color |= (DBG_BOX_ALPHA << 24); + if ((color & 0xFF) == 0) color |= (DBG_BOX_ALPHA); sCurBoxColor = color; } @@ -456,34 +451,36 @@ void debug_box_pos_rot(Vec3f pMin, Vec3f pMax, s16 yaw, s32 type) { static void render_box(int index) { struct DebugBox *box = &sBoxes[index]; s32 color = box->color; + Mat4 mtxFloat; - // Translate to the origin, rotate, then translate back, effectively rotating the box about its center - Mtx *mtx = alloc_display_list(sizeof(Mtx)); - Mtx *translate = alloc_display_list(sizeof(Mtx)); - Mtx *rotate = alloc_display_list(sizeof(Mtx)); - Mtx *scale = alloc_display_list(sizeof(Mtx)); + // Allocate the transformation matrix for this box + Mtx *mtx = alloc_display_list(sizeof(Mtx)); - if ((mtx == NULL) - || (translate == NULL) - || (rotate == NULL) - || (scale == NULL)) return; + if (mtx == NULL) return; - mtxf_to_mtx(mtx, gMatStack[1]); - guTranslate(translate, box->center[0], box->center[1], box->center[2]); - guRotate(rotate, ((box->yaw / (f32)0x10000) * 360.0f), 0, 1.0f, 0); - guScale(scale, ((f32) box->bounds[0] * 0.01f), - ((f32) box->bounds[1] * 0.01f), - ((f32) box->bounds[2] * 0.01f)); + // Calculate rotation matrix + guRotateF(mtxFloat, ((box->yaw / (f32)0x10000) * 360.0f), 0, 1.0f, 0); - gSPMatrix(gDisplayListHead++, mtx, (G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH)); - gSPMatrix(gDisplayListHead++, translate, (G_MTX_MODELVIEW | G_MTX_MUL | G_MTX_NOPUSH)); - gSPMatrix(gDisplayListHead++, rotate, (G_MTX_MODELVIEW | G_MTX_MUL | G_MTX_NOPUSH)); - gSPMatrix(gDisplayListHead++, scale, (G_MTX_MODELVIEW | G_MTX_MUL | G_MTX_NOPUSH)); + // Apply scale to column vectors of matrix + for (int i = 0; i < 3; i++) { + for (int j = 0; j < 3; j++) { + mtxFloat[i][j] *= box->bounds[j] * 0.01f; + } + } - gDPSetEnvColor(gDisplayListHead++, ((color >> 16) & 0xFF), - ((color >> 8) & 0xFF), - ((color ) & 0xFF), - ((color >> 24) & 0xFF)); + // Copy translation into matrix + for (int i = 0; i < 3; i++) { + mtxFloat[3][i] = box->center[i]; + } + + // Convert the matrix from floating-point to fixed-point + mtxf_to_mtx(mtx, mtxFloat); + + // Load the calculated matrix + gSPMatrix(gDisplayListHead++, mtx, G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH); + + // Set env color to the color of this box + gDPSetColor(gDisplayListHead++, G_SETENVCOLOR, color); if (box->type & DEBUG_SHAPE_BOX) { gSPDisplayList(gDisplayListHead++, dl_debug_box_verts); @@ -491,8 +488,6 @@ static void render_box(int index) { if (box->type & DEBUG_SHAPE_CYLINDER) { gSPDisplayList(gDisplayListHead++, dl_debug_cylinder_verts); } - - gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW); } void render_debug_boxes(s32 type) { diff --git a/src/game/game_init.c b/src/game/game_init.c index 7382d826..71c021cc 100644 --- a/src/game/game_init.c +++ b/src/game/game_init.c @@ -136,7 +136,6 @@ const Gfx init_rsp[] = { gsDPPipeSync(), gsSPClearGeometryMode(G_CULL_FRONT | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD), gsSPSetGeometryMode(G_SHADE | G_SHADING_SMOOTH | G_CULL_BACK | G_LIGHTING), - gsSPNumLights(NUMLIGHTS_1), gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_OFF), // @bug Failing to set the clip ratio will result in warped triangles in F3DEX2 // without this change: https://jrra.zone/n64/doc/n64man/gsp/gSPClipRatio.htm diff --git a/src/game/mario_misc.c b/src/game/mario_misc.c index 8c81465e..d4d4e7fe 100644 --- a/src/game/mario_misc.c +++ b/src/game/mario_misc.c @@ -571,8 +571,7 @@ Gfx *geo_switch_mario_hand_grab_pos(s32 callContext, struct GraphNode *node, Mat // ! The HOLP is set here, which is why it only updates when the held object is drawn. // This is why it won't update during a pause buffered hitstun or when the camera is very far // away. - get_pos_from_transform_mtx(marioState->marioBodyState->heldObjLastPosition, *curTransform, - *gCurGraphNodeCamera->matrixPtr); + vec3f_copy(marioState->marioBodyState->heldObjLastPosition, (*curTransform)[3]); } return NULL; } diff --git a/src/game/object_helpers.c b/src/game/object_helpers.c index c63dd3be..64d7cdf5 100644 --- a/src/game/object_helpers.c +++ b/src/game/object_helpers.c @@ -34,11 +34,9 @@ static s32 clear_move_flag(u32 *bitSet, s32 flag); Gfx *geo_update_projectile_pos_from_parent(s32 callContext, UNUSED struct GraphNode *node, Mat4 mtx) { if (callContext == GEO_CONTEXT_RENDER) { - Mat4 mtx2; struct Object *projObj = (struct Object *) gCurGraphNodeObject; // TODO: change global type to Object pointer if (projObj->prevObj) { - create_transformation_from_matrices(mtx2, mtx, *gCurGraphNodeCamera->matrixPtr); - obj_update_pos_from_parent_transformation(mtx2, projObj->prevObj); + obj_update_pos_from_parent_transformation(mtx, projObj->prevObj); obj_set_gfx_pos_from_pos(projObj->prevObj); } } diff --git a/src/game/puppycam2.c b/src/game/puppycam2.c index 5b072153..01fd5f3c 100644 --- a/src/game/puppycam2.c +++ b/src/game/puppycam2.c @@ -935,7 +935,7 @@ static s32 puppycam_check_volume_bounds(struct sPuppyVolume *volume, s32 index) Vec3f debugPos[2]; vec3f_set(debugPos[0], sPuppyVolumeStack[index]->pos[0], sPuppyVolumeStack[index]->pos[1], sPuppyVolumeStack[index]->pos[2]); vec3f_set(debugPos[1], sPuppyVolumeStack[index]->radius[0], sPuppyVolumeStack[index]->radius[1], sPuppyVolumeStack[index]->radius[2]); - debug_box_color(0x0000FF00); + debug_box_color(0x00FF0000); debug_box_rot(debugPos[0], debugPos[1], sPuppyVolumeStack[index]->rot, DEBUG_SHAPE_BOX | DEBUG_UCODE_DEFAULT); #endif // Now compare values. @@ -953,7 +953,7 @@ static s32 puppycam_check_volume_bounds(struct sPuppyVolume *volume, s32 index) Vec3f debugPos[2]; vec3f_set(debugPos[0], sPuppyVolumeStack[index]->pos[0], sPuppyVolumeStack[index]->pos[1], sPuppyVolumeStack[index]->pos[2]); vec3f_set(debugPos[1], sPuppyVolumeStack[index]->radius[0], sPuppyVolumeStack[index]->radius[1], sPuppyVolumeStack[index]->radius[2]); - debug_box_color(0x0000FF00); + debug_box_color(0x00FF0000); debug_box_rot(debugPos[0], debugPos[1], sPuppyVolumeStack[index]->rot, DEBUG_SHAPE_CYLINDER | DEBUG_UCODE_DEFAULT); #endif f32 distCheck = (dist < sqr(sPuppyVolumeStack[index]->radius[0])); diff --git a/src/game/puppylights.c b/src/game/puppylights.c index 8cdacaf6..ad01a4e2 100644 --- a/src/game/puppylights.c +++ b/src/game/puppylights.c @@ -117,7 +117,7 @@ void puppylights_iterate(struct PuppyLight *light, Lights1 *src, struct Object * #ifdef VISUAL_DEBUG vec3f_set(debugPos[0], light->pos[0][0], light->pos[0][1], light->pos[0][2]); vec3f_set(debugPos[1], light->pos[1][0], light->pos[1][1], light->pos[1][2]); - debug_box_color(0x08FF00FF); + debug_box_color(0xFF00FF08); if (light->flags & PUPPYLIGHT_SHAPE_CYLINDER) { debug_box_rot(debugPos[0], debugPos[1], light->yaw, DEBUG_SHAPE_CYLINDER | DEBUG_UCODE_DEFAULT); } else { diff --git a/src/game/rendering_graph_node.c b/src/game/rendering_graph_node.c index 6763218b..e4239179 100644 --- a/src/game/rendering_graph_node.c +++ b/src/game/rendering_graph_node.c @@ -163,10 +163,7 @@ ALIGNED16 struct GraphNodeCamera *gCurGraphNodeCamera = NULL; ALIGNED16 struct GraphNodeObject *gCurGraphNodeObject = NULL; ALIGNED16 struct GraphNodeHeldObject *gCurGraphNodeHeldObject = NULL; u16 gAreaUpdateCounter = 0; - -#ifdef F3DEX_GBI_2 -LookAt lookAt; -#endif +LookAt* gCurLookAt; #if SILHOUETTE // AA_EN Enable anti aliasing (not actually used for AA in this case). @@ -268,6 +265,21 @@ void switch_ucode(s32 ucode) { } #endif +#define UPPER_FIXED(x) ((int)((unsigned int)((x) * 0x10000) >> 16)) +#define LOWER_FIXED(x) ((int)((unsigned int)((x) * 0x10000) & 0xFFFF)) + +// Fixed-point identity matrix with the inverse of world scale +Mtx identityMatrixWorldScale = {{ + {UPPER_FIXED(1.0f / WORLD_SCALE) << 16, 0x00000000, + UPPER_FIXED(1.0f / WORLD_SCALE) << 0, 0x00000000}, + {0x00000000, UPPER_FIXED(1.0f / WORLD_SCALE) << 16, + 0x00000000, UPPER_FIXED(1.0f) << 0}, + {LOWER_FIXED(1.0f / WORLD_SCALE) << 16, 0x00000000, + LOWER_FIXED(1.0f / WORLD_SCALE) << 0, 0x00000000}, + {0x00000000, LOWER_FIXED(1.0f / WORLD_SCALE) << 16, + 0x00000000, LOWER_FIXED(1.0f) << 0} +}}; + /** * Process a master list node. This has been modified, so now it runs twice, for each microcode. * It iterates through the first 5 layers of if the first index using F3DLX2.Rej, then it switches @@ -287,18 +299,6 @@ void geo_process_master_list_sub(struct GraphNodeMasterList *node) { struct RenderModeContainer *mode1List = &renderModeTable_1Cycle[enableZBuffer]; struct RenderModeContainer *mode2List = &renderModeTable_2Cycle[enableZBuffer]; -#ifdef F3DEX_GBI_2 - // @bug This is where the LookAt values should be calculated but aren't. - // As a result, environment mapping is broken on Fast3DEX2 without the - // changes below. - Mtx lMtx; - #ifdef FIX_REFLECT_MTX - guLookAtReflect(&lMtx, &lookAt, 0.0f, 0.0f, 0.0f, /* eye */ 0.0f, 0.0f, 1.0f, /* at */ 0.0f, -1.0f, 0.0f /* up */); - #else - guLookAtReflect(&lMtx, &lookAt, 0.0f, 0.0f, 0.0f, /* eye */ 0.0f, 0.0f, 1.0f, /* at */ 1.0f, 0.0f, 0.0f /* up */); - #endif -#endif // F3DEX_GBI_2 - // Loop through the render phases for (phaseIndex = RENDER_PHASE_FIRST; phaseIndex < RENDER_PHASE_END; phaseIndex++) { // Get the render phase information. @@ -309,7 +309,7 @@ void geo_process_master_list_sub(struct GraphNodeMasterList *node) { ucode = renderPhase->ucode; // Set the ucode for the current render phase switch_ucode(ucode); - gSPLookAt(gDisplayListHead++, &lookAt); + gSPLookAt(gDisplayListHead++, gCurLookAt); #endif if (enableZBuffer) { // Enable z buffer. @@ -374,6 +374,8 @@ void geo_process_master_list_sub(struct GraphNodeMasterList *node) { #endif #ifdef VISUAL_DEBUG if ( hitboxView) render_debug_boxes(DEBUG_UCODE_DEFAULT | DEBUG_BOX_CLEAR); + // Load the world scale identity matrix + gSPMatrix(gDisplayListHead++, &identityMatrixWorldScale, G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH); if (surfaceView) visual_surface_loop(); #endif } @@ -386,7 +388,7 @@ void geo_process_master_list_sub(struct GraphNodeMasterList *node) { void geo_append_display_list(void *displayList, s32 layer) { s32 ucode = GRAPH_NODE_UCODE_DEFAULT; #ifdef F3DEX_GBI_2 - gSPLookAt(gDisplayListHead++, &lookAt); + gSPLookAt(gDisplayListHead++, gCurLookAt); #endif #if defined(OBJECTS_REJ) || SILHOUETTE if (gCurGraphNodeObject != NULL) { @@ -501,7 +503,7 @@ void geo_process_perspective(struct GraphNodePerspective *node) { sAspectRatio = 4.0f / 3.0f; // 1.33333f #endif - guPerspective(mtx, &perspNorm, node->fov, sAspectRatio, node->near / (f32)WORLD_SCALE, node->far / (f32)WORLD_SCALE, 1.0f); + guPerspective(mtx, &perspNorm, node->fov, sAspectRatio, node->near / WORLD_SCALE, node->far / WORLD_SCALE, 1.0f); gSPPerspNormalize(gDisplayListHead++, perspNorm); gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(mtx), G_MTX_PROJECTION | G_MTX_LOAD | G_MTX_NOPUSH); @@ -512,6 +514,13 @@ void geo_process_perspective(struct GraphNodePerspective *node) { } } +static f32 get_dist_from_camera(Vec3f pos) { + return -((gCameraTransform[0][2] * pos[0]) + + (gCameraTransform[1][2] * pos[1]) + + (gCameraTransform[2][2] * pos[2]) + + gCameraTransform[3][2]); +} + /** * Process a level of detail node. From the current transformation matrix, * the perpendicular distance to the camera is extracted and the children @@ -520,9 +529,9 @@ void geo_process_perspective(struct GraphNodePerspective *node) { */ void geo_process_level_of_detail(struct GraphNodeLevelOfDetail *node) { #ifdef AUTO_LOD - f32 distanceFromCam = gIsConsole ? -gMatStack[gMatStackIndex][3][2] : 50.0f; + f32 distanceFromCam = gIsConsole ? get_dist_from_camera(gMatStack[gMatStackIndex][3]) : 50.0f; #else - f32 distanceFromCam = -gMatStack[gMatStackIndex][3][2]; + f32 distanceFromCam = get_dist_from_camera(gMatStack[gMatStackIndex][3]); #endif if ((f32)node->minDistance <= distanceFromCam @@ -552,12 +561,34 @@ void geo_process_switch(struct GraphNodeSwitchCase *node) { } } +Mat4 gCameraTransform; + +Lights1 defaultLight = gdSPDefLights1( + 0x3F, 0x3F, 0x3F, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00 +); + +Vec3f globalLightDirection = { 0x28, 0x28, 0x28 }; + +void setup_global_light() { + Lights1* curLight = (Lights1*)alloc_display_list(sizeof(Lights1)); + bcopy(&defaultLight, curLight, sizeof(Lights1)); + + Vec3f transformedLightDirection; + + linear_mtxf_transpose_mul_vec3f(gCameraTransform, transformedLightDirection, globalLightDirection); + + curLight->l->l.dir[0] = (s8)(transformedLightDirection[0]); + curLight->l->l.dir[1] = (s8)(transformedLightDirection[1]); + curLight->l->l.dir[2] = (s8)(transformedLightDirection[2]); + gSPSetLights1(gDisplayListHead++, (*curLight)); +} + /** * Process a camera node. */ void geo_process_camera(struct GraphNodeCamera *node) { - Mat4 cameraTransform; Mtx *rollMtx = alloc_display_list(sizeof(*rollMtx)); + Mtx *viewMtx = alloc_display_list(sizeof(Mtx)); if (node->fnNode.func != NULL) { node->fnNode.func(GEO_CONTEXT_RENDER, &node->fnNode.node, gMatStack[gMatStackIndex]); @@ -566,13 +597,46 @@ void geo_process_camera(struct GraphNodeCamera *node) { gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(rollMtx), G_MTX_PROJECTION | G_MTX_MUL | G_MTX_NOPUSH); - mtxf_lookat(cameraTransform, node->pos, node->focus, node->roll); - mtxf_mul(gMatStack[gMatStackIndex + 1], cameraTransform, gMatStack[gMatStackIndex]); - inc_mat_stack(); + mtxf_lookat(gCameraTransform, node->pos, node->focus, node->roll); + + // Calculate the lookAt +#ifdef F3DEX_GBI_2 + // @bug This is where the LookAt values should be calculated but aren't. + // As a result, environment mapping is broken on Fast3DEX2 without the + // changes below. + Mat4* cameraMatrix = &gCameraTransform; + #ifdef FIX_REFLECT_MTX + gCurLookAt->l[0].l.dir[0] = (s8)(127.0f * (*cameraMatrix)[0][0]); + gCurLookAt->l[0].l.dir[1] = (s8)(127.0f * (*cameraMatrix)[1][0]); + gCurLookAt->l[0].l.dir[2] = (s8)(127.0f * (*cameraMatrix)[2][0]); + gCurLookAt->l[1].l.dir[0] = (s8)(127.0f * -(*cameraMatrix)[0][1]); + gCurLookAt->l[1].l.dir[1] = (s8)(127.0f * -(*cameraMatrix)[1][1]); + gCurLookAt->l[1].l.dir[2] = (s8)(127.0f * -(*cameraMatrix)[2][1]); + #else + gCurLookAt->l[0].l.dir[0] = (s8)(127.0f * (*cameraMatrix)[0][0]); + gCurLookAt->l[0].l.dir[1] = (s8)(127.0f * (*cameraMatrix)[1][0]); + gCurLookAt->l[0].l.dir[2] = (s8)(127.0f * (*cameraMatrix)[2][0]); + gCurLookAt->l[1].l.dir[0] = (s8)(127.0f * (*cameraMatrix)[0][1]); + gCurLookAt->l[1].l.dir[1] = (s8)(127.0f * (*cameraMatrix)[1][1]); + gCurLookAt->l[1].l.dir[2] = (s8)(127.0f * (*cameraMatrix)[2][1]); + #endif +#endif // F3DEX_GBI_2 + + // Make a copy of the view matrix and scale its translation based on WORLD_SCALE + Mat4 scaledCamera; + mtxf_copy(scaledCamera, gCameraTransform); + for (int i = 0; i < 3; i++) { + scaledCamera[3][i] /= WORLD_SCALE; + } + + // Convert the scaled matrix to fixed-point and integrate it into the projection matrix stack + guMtxF2L(scaledCamera, viewMtx); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(viewMtx), G_MTX_PROJECTION | G_MTX_MUL | G_MTX_NOPUSH); + setup_global_light(); if (node->fnNode.node.children != 0) { gCurGraphNodeCamera = node; - node->matrixPtr = &gMatStack[gMatStackIndex]; + node->matrixPtr = &gCameraTransform; geo_process_node_and_siblings(node->fnNode.node.children); gCurGraphNodeCamera = NULL; } @@ -877,8 +941,7 @@ void geo_process_shadow(struct GraphNodeShadow *node) { f32 shadowScale; if (gCurGraphNodeHeldObject != NULL) { - get_pos_from_transform_mtx(shadowPos, gMatStack[gMatStackIndex], - *gCurGraphNodeCamera->matrixPtr); + vec3f_copy(shadowPos, gMatStack[gMatStackIndex][3]); shadowScale = node->shadowScale * gCurGraphNodeHeldObject->objNode->header.gfx.scale[0]; } else { vec3f_copy(shadowPos, gCurGraphNodeObject->pos); @@ -917,7 +980,7 @@ void geo_process_shadow(struct GraphNodeShadow *node) { node->shadowSolidity, node->shadowType, shifted); if (shadowList != NULL) { - mtxf_shadow(gMatStack[gMatStackIndex + 1], *gCurGraphNodeCamera->matrixPtr, + mtxf_shadow(gMatStack[gMatStackIndex + 1], gCurrShadow.floorNormal, shadowPos, gCurrShadow.scale, gCurGraphNodeObject->angle[1]); inc_mat_stack(); @@ -966,7 +1029,7 @@ void geo_process_shadow(struct GraphNodeShadow *node) { * * Since (0,0,0) is unaffected by rotation, columns 0, 1 and 2 are ignored. */ -s32 obj_is_in_view(struct GraphNodeObject *node, Mat4 matrix) { +s32 obj_is_in_view(struct GraphNodeObject *node) { if (node->node.flags & GRAPH_RENDER_INVISIBLE) { return FALSE; } @@ -982,7 +1045,7 @@ s32 obj_is_in_view(struct GraphNodeObject *node, Mat4 matrix) { } // Don't render if the object is close to or behind the camera - if (matrix[3][2] > -100.0f + cullingRadius) { + if (node->cameraToObject[2] > -100.0f + cullingRadius) { return FALSE; } @@ -990,14 +1053,14 @@ s32 obj_is_in_view(struct GraphNodeObject *node, Mat4 matrix) { // makes PU travel safe when the camera is locked on the main map. // If Mario were rendered with a depth over 65536 it would cause overflow // when converting the transformation matrix to a fixed point matrix. - if (matrix[3][2] < -20000.0f - cullingRadius) { + if (node->cameraToObject[2] < -20000.0f - cullingRadius) { return FALSE; } // half of the fov in in-game angle units instead of degrees s16 halfFov = (((((gCurGraphNodeCamFrustum->fov * sAspectRatio) / 2.0f) + 1.0f) * 32768.0f) / 180.0f) + 0.5f; - f32 hScreenEdge = -matrix[3][2] * tans(halfFov); + f32 hScreenEdge = -node->cameraToObject[2] * tans(halfFov); // -matrix[3][2] is the depth, which gets multiplied by tan(halfFov) to get // the amount of units between the center of the screen and the horizontal edge // given the distance from the object to the camera. @@ -1008,10 +1071,10 @@ s32 obj_is_in_view(struct GraphNodeObject *node, Mat4 matrix) { // hScreenEdge *= GFX_DIMENSIONS_ASPECT_RATIO; // Check whether the object is horizontally in view - if (matrix[3][0] > hScreenEdge + cullingRadius) { + if (node->cameraToObject[0] > hScreenEdge + cullingRadius) { return FALSE; } - if (matrix[3][0] < -hScreenEdge - cullingRadius) { + if (node->cameraToObject[0] < -hScreenEdge - cullingRadius) { return FALSE; } @@ -1054,25 +1117,23 @@ void visualise_object_hitbox(struct Object *node) { void geo_process_object(struct Object *node) { if (node->header.gfx.areaIndex == gCurGraphNodeRoot->areaIndex) { if (node->header.gfx.throwMatrix != NULL) { - mtxf_mul(gMatStack[gMatStackIndex + 1], *node->header.gfx.throwMatrix, - gMatStack[gMatStackIndex]); - mtxf_scale_vec3f(gMatStack[gMatStackIndex + 1], gMatStack[gMatStackIndex + 1], node->header.gfx.scale); + mtxf_scale_vec3f(gMatStack[gMatStackIndex + 1], *node->header.gfx.throwMatrix, node->header.gfx.scale); } else if (node->header.gfx.node.flags & GRAPH_RENDER_BILLBOARD) { mtxf_billboard(gMatStack[gMatStackIndex + 1], gMatStack[gMatStackIndex], node->header.gfx.pos, node->header.gfx.scale, gCurGraphNodeCamera->roll); } else { - mtxf_rotate_zxy_and_translate_and_mul(node->header.gfx.angle, node->header.gfx.pos, gMatStack[gMatStackIndex + 1], gMatStack[gMatStackIndex]); + mtxf_rotate_zxy_and_translate(gMatStack[gMatStackIndex + 1], node->header.gfx.pos, node->header.gfx.angle); mtxf_scale_vec3f(gMatStack[gMatStackIndex + 1], gMatStack[gMatStackIndex + 1], node->header.gfx.scale); } node->header.gfx.throwMatrix = &gMatStack[++gMatStackIndex]; - vec3_copy(node->header.gfx.cameraToObject, gMatStack[gMatStackIndex][3]); + linear_mtxf_mul_vec3f_and_translate(gCameraTransform, node->header.gfx.cameraToObject, (*node->header.gfx.throwMatrix)[3]); // FIXME: correct types if (node->header.gfx.animInfo.curAnim != NULL) { geo_set_animation_globals(&node->header.gfx.animInfo, (node->header.gfx.node.flags & GRAPH_RENDER_HAS_ANIMATION) != 0); } - if (obj_is_in_view(&node->header.gfx, gMatStack[gMatStackIndex])) { + if (obj_is_in_view(&node->header.gfx)) { gMatStackIndex--; inc_mat_stack(); @@ -1122,7 +1183,7 @@ void geo_process_held_object(struct GraphNodeHeldObject *node) { Mat4 tempMtx; #ifdef F3DEX_GBI_2 - gSPLookAt(gDisplayListHead++, &lookAt); + gSPLookAt(gDisplayListHead++, gCurLookAt); #endif if (node->fnNode.func != NULL) { @@ -1245,6 +1306,9 @@ void geo_process_root(struct GraphNodeRoot *node, Vp *b, Vp *c, s32 clearColor) gDisplayListHeap = alloc_only_pool_init(main_pool_available() - sizeof(struct AllocOnlyPool), MEMORY_POOL_LEFT); initialMatrix = alloc_display_list(sizeof(*initialMatrix)); + gCurLookAt = (LookAt*)alloc_display_list(sizeof(LookAt)); + bzero(gCurLookAt, sizeof(LookAt)); + gMatStackIndex = 0; gCurrAnimType = ANIM_TYPE_NONE; vec3s_set(viewport->vp.vtrans, node->x * 4, node->y * 4, 511); diff --git a/tools/fixlights.py b/tools/fixlights.py new file mode 100755 index 00000000..87f12739 --- /dev/null +++ b/tools/fixlights.py @@ -0,0 +1,110 @@ +#!/usr/bin/python3 + +import sys, subprocess + +if len(sys.argv) != 2: + print(f"Usage: {sys.argv[0]} [folder to search]") + sys.exit() + +lightFiles = set() + +# The original command that was run across the entire repo to convert all assets +# cmds = ("grep -Rl \"gsSPSetLight\" levels actors bin","grep -Rl \"gsSPLight\" levels actors bin","grep -Rl \"Lights1\" levels actors bin") + +# Operate on the folder passed as an argument to this program +cmds = [f"grep -Rl \"gsSPSetLight\" {sys.argv[1]}",f"grep -Rl \"gsSPLight\" {sys.argv[1]}",f"grep -Rl \"Lights1\" {sys.argv[1]}"] + +for cmd in cmds: + try: + output = subprocess.check_output(cmd, shell=True).decode('UTF-8').split("\n")[:-1] + lightFiles = set.union(lightFiles,set(output)) + except subprocess.CalledProcessError: + continue + +lightStructs = {} +# FIRST PASS: COLLECT LIGHT STRUCT INFO, REMOVE LIGHT STRUCTS +for file in lightFiles: + changed = False + with open(file, "r") as f: + fileLines = f.readlines() + index = 0 + while index < len(fileLines): + curLine = fileLines[index].strip() + + if "const Lights1" in curLine and "gdSPDefLights1" in curLine: + structName = curLine.split("const Lights1")[1].strip().split(" ")[0] # Get string between Lights 1 and following space + del fileLines[index] # Remove beginning + args = "" + while not ")" in fileLines[index]: + args += fileLines[index].strip() + del fileLines[index] + del fileLines[index] # Remove ending line + args = args.strip(");") + args = [int(arg.strip()[2:],16) for arg in args.split(",")] + lightStructs[structName] = args + changed = True + elif "Lights1" in curLine and "gdSPDefLights1" in curLine: + structName = curLine.split("Lights1")[1].strip().split(" ")[0] # Get string between Lights 1 and following space + del fileLines[index] # Remove beginning + args = "" + while True: + args += fileLines[index].strip() + if ")" in fileLines[index]: + break + del fileLines[index] + del fileLines[index] # Remove ending line + args = args.strip(");") + args = [int(arg.strip()[2:],16) for arg in args.split(",")] + lightStructs[structName] = args + changed = True + + index += 1 + # Don't write to the file if the contents haven't been changed, as this will trigger a rebuild by Make + if changed: + with open(file, "w") as f: + f.writelines(fileLines) + +# SECOND PASS - CHANGE LIGHT COMMANDS +for file in lightFiles: + changed = False + with open(file, "r") as f: + fileLines = f.readlines() + index = 0 + while index < len(fileLines): + curLine = fileLines[index].strip() + + if curLine.startswith("gsSPSetLights1("): + structName = curLine.split("(")[1].split(")")[0] # Get string between ( and ) + if structName in lightStructs.keys(): + changed = True + args = lightStructs[structName] + light1Args = args[3]*0x1000000 + args[4]*0x10000 + args[5]*0x100 + 0xFF + light2Args = args[0]*0x1000000 + args[1]*0x10000 + args[2]*0x100 + 0xFF + fileLines[index] = " gsSPLightColor(LIGHT_1, 0x%x),\n" % light1Args + fileLines.insert(index+1," gsSPLightColor(LIGHT_2, 0x%x),\n" % light2Args) + index += 1 + else: + print("Missing light definition %s in file %s. Skipping..." % (structName, file)) + + elif curLine.startswith("gsSPLight("): + if not "&" in curLine or not "." in curLine: + print("Malformed gsSPLight command in file %s, line %d. Skipping..." % (file, index+1)) + index += 1 + continue + structName = curLine.split("&")[1].split(".")[0] # Get string between & and . (&lightname.l or &lightname.a) + if structName in lightStructs.keys(): + changed = True + args = lightStructs[structName] + lightNum = int(curLine.split(",")[1].strip()[0]) # , 1), + argIndex = (3 if lightNum == 1 else 0) + lightArgs = args[argIndex]*0x1000000 + args[argIndex+1]*0x10000 + args[argIndex+2]*0x100 + 0xFF + fileLines[index] = " gsSPLightColor(LIGHT_%d, 0x%x),\n" % (lightNum, lightArgs) + else: + print("Missing light definition %s in file %s, line %d. Skipping..." % (structName, file, index+1)) + + index += 1 + # Don't write to the file if the contents haven't been changed, as this will trigger a rebuild by Make + if changed: + with open(file, "w") as f: + f.writelines(fileLines) +