Merge branch 'master' into base/lighting-engine

* Fix level enum conflict with 99+ levels (#307)

* Set oDrawingDistance to 4500 for WF breakable walls (#304)

* Downgraded from F3DZEX2.08J to F3DZEX2.08I so that point lighting works on Jabo (#313)

* Downgraded from F3DZEX2.08J to F3DZEX2.08I so that point lighting works on Jabo

* Swapped to MM's rspboot to fix bug caused by MM's F3DZEX2

Co-authored-by: Arceveti <73617174+Arceveti@users.noreply.github.com>

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
@@ -323,11 +326,25 @@ ifeq ($(filter clean distclean print-%,$(MAKECMDGOALS)),)
   ifeq ($(NOEXTRACT),0)
     DUMMY != $(PYTHON) extract_assets.py $(VERSION) >&2 || echo FAIL
     ifeq ($(DUMMY),FAIL)
-      $(error Failed to extract assets)
+      $(error Failed to extract assets from US ROM)
     endif
-    DUMMY != $(PYTHON) extract_assets.py jp >&2 || echo FAIL
-    ifeq ($(DUMMY),FAIL)
-      $(error Failed to extract assets)
+    ifneq (,$(wildcard baserom.jp.z64))
+      DUMMY != $(PYTHON) extract_assets.py jp >&2 || echo FAIL
+      ifeq ($(DUMMY),FAIL)
+        $(error Failed to extract assets from JP ROM)
+      endif
+    endif
+    ifneq (,$(wildcard baserom.eu.z64))
+      DUMMY != $(PYTHON) extract_assets.py eu >&2 || echo FAIL
+      ifeq ($(DUMMY),FAIL)
+        $(error Failed to extract assets from EU ROM)
+      endif
+    endif
+    ifneq (,$(wildcard baserom.sh.z64))
+      DUMMY != $(PYTHON) extract_assets.py sh >&2 || echo FAIL
+      ifeq ($(DUMMY),FAIL)
+        $(error Failed to extract assets from SH ROM)
+      endif
     endif
   endif
 
@@ -409,8 +426,8 @@ 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,mips-n64-ld),)
+#   CROSS := mips-n64-
 else ifneq ($(call find-command,mips64-ld),)
   CROSS := mips64-
 else ifneq ($(call find-command,mips-linux-gnu-ld),)
@@ -499,6 +516,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
@@ -799,6 +817,11 @@ $(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
+DUMMY != $(FIXLIGHTS_PY) levels
+endif
 $(BUILD_DIR)/%.o: %.c
 	$(call print,Compiling:,$<,$@)
 	$(V)$(CC) -c $(CFLAGS) -MMD -MF $(BUILD_DIR)/$*.d  -o $@ $<

README.md

@@ -33,8 +33,18 @@ This is a fork of the ultrasm64 repo by CrashOveride which includes the followin
 Thanks to Frame#5375 and AloXado320 for also helping with silhouette stuff
 
 **Lighting Engine by Wiseguy**
-- Lighting Engine is available on a separate branch ([base/lighting-engine](https://github.com/Reonu/HackerSM64/tree/base/lighting-engine)). Instructions on how to use it are in the readme of that branch.
-- Alternatively, the main repo has `Puppylights` available, which is a more lightweight, but limited lighting library intended to be used to modify existing light properties. You can look at `puppylights.c` to find out how to use it.
+- Lighting Engine is NOT finished. It's a WIP. Expect issues and expect it to be somewhat hard to use. Point lights in particular are extremely finnicky. 
+- In order for lighting engine to work, your materials must have Shade Color in the combiner, **but you have to DISABLE Shade Color in sources**. If you leave Shade Color ticked for even a single material, the lighting will break **for the entire mesh**. Until Fast64 gets some sort of Lighting Engine support, it's recommended you create some custom presets to make this less annoying. 
+  - You can intentionally make a material fullbright by leaving Shade Color out of the combiner for that material. Useful for, say, a lamp.
+- Use the function `set_directional_light` to set the directional light for the current area. It takes a `Vec3f` for the direction and three `s32` for the RGB values.
+- Use the function `set_ambient_light` to set the ambient light for the current area. It takes three `s32` for the RGB values.
+- You can use the function `emit_light` to emit a point light via code. It takes a `Vec3f` for the position, three `s32` for the RGB values and three `u32` for each one of the falloff types. The falloff is basically how strong the light is: the HIGHER the falloff is, the DIMMER the light will be. The three types of falloffs can be stacked, and work like this:
+  - 2 for constant falloff = the point light is half as bright always.
+  - 2 for linear falloff = the point light is half as bright when you double the distance
+  - 2 for quadratic falloff = the point is half as bright when you double the square of the distance
+- Important note regarding point lights: They are affected by WORLD_SCALE, which is set based on your extended bounds mode. Esentially, at 2x bounds lights will be twice as bright as in 1x bounds, and with 4x bounds they will be twice as bright as that. This can be dealt with simply by using high falloffs, but it can be annoying if you decide to change the extended bounds mode mid-development.
+- You can also make an object emit light by using the `OBJ_FLAG_EMIT_LIGHT` object flag, as well as `SET_LIGHT_COLOR` and `SET_LIGHT_FALLOFF` in the script.
+
 
 **Puppycam**
 - Puppycam is available on the master branch now, you can toggle it in `config/config_camera.h`. *

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),

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),

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),

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),

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),

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),

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),

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),

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),

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),

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),

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),

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,6 @@ 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),
     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),

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),

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),

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),

actors/bully/model.inc.c

@@ -44,8 +44,7 @@ const Gfx bully_seg5_dl_050002E0[] = {
 // 0x05000398 - 0x05000408
 const Gfx bully_seg5_dl_05000398[] = {
     gsDPPipeSync(),
-    gsDPSetCombineMode(G_CC_DECALRGB, G_CC_DECALRGB),
-    gsSPClearGeometryMode(G_LIGHTING),
+    gsDPSetCombineMode(G_CC_MODULATEI, G_CC_MODULATEI),
     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),
     gsDPTileSync(),
@@ -55,33 +54,16 @@ const Gfx bully_seg5_dl_05000398[] = {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
     gsDPPipeSync(),
     gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
-    gsSPSetGeometryMode(G_LIGHTING),
     gsSPEndDisplayList(),
 };
 
 // 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,9 +294,10 @@ 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),
     gsSPVertex(bully_seg5_vertex_05002C68, 14, 0),
+    gsDPPipeSync(),
+    gsDPSetPrimColor(0, 0, 0, 227, 00, 255),
+    gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, 0, 0, 0, 1, PRIMITIVE, 0, SHADE, 0, 0, 0, 0, 1),
     gsSP2Triangles( 0,  1,  2, 0x0,  2,  1,  3, 0x0),
     gsSP2Triangles( 2,  3,  4, 0x0,  1,  5,  6, 0x0),
     gsSP2Triangles( 1,  6,  7, 0x0,  0,  5,  1, 0x0),
@@ -328,8 +311,6 @@ 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),
     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 +325,6 @@ 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),
     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),
@@ -452,8 +431,7 @@ const Gfx bully_seg5_dl_05003D08[] = {
 // 0x05003D40 - 0x05003DB8
 const Gfx bully_seg5_dl_05003D40[] = {
     gsDPPipeSync(),
-    gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA),
-    gsSPClearGeometryMode(G_LIGHTING),
+    gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
     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),
     gsDPTileSync(),
@@ -464,7 +442,6 @@ const Gfx bully_seg5_dl_05003D40[] = {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
     gsDPPipeSync(),
     gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
-    gsSPSetGeometryMode(G_LIGHTING),
     gsSPEndDisplayList(),
 };
 
@@ -507,8 +484,7 @@ const Gfx bully_seg5_dl_05003E70[] = {
 // 0x05003EA8 - 0x05003F20
 const Gfx bully_seg5_dl_05003EA8[] = {
     gsDPPipeSync(),
-    gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA),
-    gsSPClearGeometryMode(G_LIGHTING),
+    gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
     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),
     gsDPTileSync(),
@@ -519,7 +495,6 @@ const Gfx bully_seg5_dl_05003EA8[] = {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
     gsDPPipeSync(),
     gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
-    gsSPSetGeometryMode(G_LIGHTING),
     gsSPEndDisplayList(),
 };
 
@@ -547,8 +522,7 @@ const Gfx bully_seg5_dl_05003F80[] = {
 // 0x05003FC8 - 0x05004038
 const Gfx bully_seg5_dl_05003FC8[] = {
     gsDPPipeSync(),
-    gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA),
-    gsSPClearGeometryMode(G_LIGHTING),
+    gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
     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),
     gsDPTileSync(),
@@ -558,6 +532,5 @@ const Gfx bully_seg5_dl_05003FC8[] = {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
     gsDPPipeSync(),
     gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
-    gsSPSetGeometryMode(G_LIGHTING),
     gsSPEndDisplayList(),
 };

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),