diff --git a/actors/luigi/model.inc.c b/actors/luigi/model.inc.c
index 0fd8772a5..d284081b1 100644
--- a/actors/luigi/model.inc.c
+++ b/actors/luigi/model.inc.c
@@ -253,7 +253,7 @@ const Gfx luigi_metal_butt[] = {
 	gsSPSetGeometryMode(G_TEXTURE_GEN),
 	gsSPTexture(4032, 1984, 0, 0, 1),
     gsSPLight(&luigi_black_lights_group.l, 1),
-    gsSPCopyLightEXT(2, 15),
+    gsSPCopyLightEXT(2, 17),
 	gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_texture_metal_shade),
 	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
 	gsDPLoadBlock(7, 0, 0, 2047, 128),
@@ -834,7 +834,7 @@ const Gfx luigi_metal_left_thigh[] = {
 	gsSPSetGeometryMode(G_TEXTURE_GEN),
 	gsSPTexture(4032, 1984, 0, 0, 1),
     gsSPLight(&luigi_black_lights_group.l, 1),
-    gsSPCopyLightEXT(2, 15),
+    gsSPCopyLightEXT(2, 17),
 	gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_texture_metal_shade),
 	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
 	gsDPLoadBlock(7, 0, 0, 2047, 128),
diff --git a/actors/luigi_cap/model.inc.c b/actors/luigi_cap/model.inc.c
index 1ff396508..6c54c2829 100644
--- a/actors/luigi_cap/model.inc.c
+++ b/actors/luigi_cap/model.inc.c
@@ -244,7 +244,7 @@ const Gfx luigi_cap_seg3_dl_03022FF8[] = {
 	gsSPSetGeometryMode(G_TEXTURE_GEN),
 	gsSPTexture(4032, 1984, 0, 0, 1),
     gsSPLight(&luigi_cap_black_lights_group.l, 1),
-    gsSPCopyLightEXT(2, 15),
+    gsSPCopyLightEXT(2, 17),
 	gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_cap_texture_metal_shade),
 	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
 	gsDPLoadBlock(7, 0, 0, 2047, 128),
@@ -334,7 +334,7 @@ const Gfx luigi_cap_seg3_dl_03023298[] = {
 	gsSPSetGeometryMode(G_TEXTURE_GEN),
 	gsSPTexture(4032, 1984, 0, 0, 1),
     gsSPLight(&luigi_cap_black_lights_group.l, 1),
-    gsSPCopyLightEXT(2, 15),
+    gsSPCopyLightEXT(2, 17),
 	gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_cap_texture_metal_shade),
 	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
 	gsDPLoadBlock(7, 0, 0, 2047, 128),
diff --git a/actors/mario/model.inc.c b/actors/mario/model.inc.c
index 85e4687e4..5d76880cc 100644
--- a/actors/mario/model.inc.c
+++ b/actors/mario/model.inc.c
@@ -207,7 +207,7 @@ const Gfx mario_metal_butt[] = {
 	gsSPSetGeometryMode(G_TEXTURE_GEN),
 	gsSPTexture(4032, 1984, 0, 0, 1),
     gsSPLight(&mario_black_lights_group.l, 1),
-    gsSPCopyLightEXT(2, 15),
+    gsSPCopyLightEXT(2, 17),
 	gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_texture_metal_shade),
 	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
 	gsDPLoadBlock(7, 0, 0, 2047, 128),
@@ -524,7 +524,7 @@ const Gfx mario_metal_left_thigh[] = {
 	gsSPSetGeometryMode(G_TEXTURE_GEN),
 	gsSPTexture(4032, 1984, 0, 0, 1),
     gsSPLight(&mario_black_lights_group.l, 1),
-    gsSPCopyLightEXT(2, 15),
+    gsSPCopyLightEXT(2, 17),
 	gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_texture_metal_shade),
 	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
 	gsDPLoadBlock(7, 0, 0, 2047, 128),
diff --git a/actors/mario_cap/model.inc.c b/actors/mario_cap/model.inc.c
index 1b85318dd..555875bd3 100644
--- a/actors/mario_cap/model.inc.c
+++ b/actors/mario_cap/model.inc.c
@@ -261,7 +261,7 @@ const Gfx mario_cap_seg3_dl_03022FF8[] = {
 	gsSPSetGeometryMode(G_TEXTURE_GEN),
 	gsSPTexture(4032, 1984, 0, 0, 1),
     gsSPLight(&mario_cap_black_lights_group.l, 1),
-    gsSPCopyLightEXT(2, 15),
+    gsSPCopyLightEXT(2, 17),
 	gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_cap_texture_metal_shade),
 	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
 	gsDPLoadBlock(7, 0, 0, 2047, 128),
@@ -351,7 +351,7 @@ const Gfx mario_cap_seg3_dl_03023298[] = {
 	gsSPSetGeometryMode(G_TEXTURE_GEN),
 	gsSPTexture(4032, 1984, 0, 0, 1),
     gsSPLight(&mario_cap_black_lights_group.l, 1),
-    gsSPCopyLightEXT(2, 15),
+    gsSPCopyLightEXT(2, 17),
 	gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_cap_texture_metal_shade),
 	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
 	gsDPLoadBlock(7, 0, 0, 2047, 128),
diff --git a/actors/toad_cap/model.inc.c b/actors/toad_cap/model.inc.c
index 5e9a4820a..ac9369a72 100644
--- a/actors/toad_cap/model.inc.c
+++ b/actors/toad_cap/model.inc.c
@@ -356,7 +356,7 @@ Gfx mat_toad_cap_metal[] = {
 	gsSPGeometryMode(0, G_TEXTURE_GEN),
 	gsSPTexture(4032, 1984, 0, 0, 1),
 	gsSPLight(&toad_cap_black_lights_group.l, 1),
-	gsSPCopyLightEXT(2, 15),
+	gsSPCopyLightEXT(2, 17),
 	gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, toad_cap_texture_metal_shade),
 	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
 	gsDPLoadBlock(7, 0, 0, 2047, 128),
diff --git a/actors/toad_player/model.inc.c b/actors/toad_player/model.inc.c
index 4803863f1..94a09f0f4 100644
--- a/actors/toad_player/model.inc.c
+++ b/actors/toad_player/model.inc.c
@@ -1950,7 +1950,7 @@ Gfx mat_toad_player_metal[] = {
 	gsSPGeometryMode(0, G_TEXTURE_GEN),
 	gsSPTexture(4032, 1984, 0, 0, 1),
     gsSPLight(&toad_player_black_lights_group.l, 1),
-    gsSPCopyLightEXT(2, 15),
+    gsSPCopyLightEXT(2, 17),
 	gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, toad_player_texture_metal_shade),
 	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
 	gsDPLoadBlock(7, 0, 0, 2047, 128),
@@ -1977,7 +1977,7 @@ Gfx mat_toad_player_metal_vest[] = {
 	gsSPGeometryMode(G_CULL_BACK, 0),
 	gsSPTexture(4032, 1984, 0, 0, 1),
     gsSPLight(&toad_player_black_lights_group.l, 1),
-    gsSPCopyLightEXT(2, 15),
+    gsSPCopyLightEXT(2, 17),
 	gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, toad_player_texture_metal_shade),
 	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
 	gsDPLoadBlock(7, 0, 0, 2047, 128),
diff --git a/actors/wario/model.inc.c b/actors/wario/model.inc.c
index ad79bd4e9..e96b077ce 100644
--- a/actors/wario/model.inc.c
+++ b/actors/wario/model.inc.c
@@ -281,7 +281,7 @@ const Gfx wario_metal_butt[] = {
 	gsSPSetGeometryMode(G_TEXTURE_GEN),
 	gsSPTexture(4032, 1984, 0, 0, 1),
     gsSPLight(&wario_black_lights_group.l, 1),
-    gsSPCopyLightEXT(2, 15),
+    gsSPCopyLightEXT(2, 17),
 	gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_texture_metal_shade),
 	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
 	gsDPLoadBlock(7, 0, 0, 2047, 128),
@@ -862,7 +862,7 @@ const Gfx wario_metal_left_thigh[] = {
 	gsSPSetGeometryMode(G_TEXTURE_GEN),
 	gsSPTexture(4032, 1984, 0, 0, 1),
     gsSPLight(&wario_black_lights_group.l, 1),
-    gsSPCopyLightEXT(2, 15),
+    gsSPCopyLightEXT(2, 17),
 	gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_texture_metal_shade),
 	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
 	gsDPLoadBlock(7, 0, 0, 2047, 128),
diff --git a/actors/wario_cap/model.inc.c b/actors/wario_cap/model.inc.c
index 298d4340f..297745d4c 100644
--- a/actors/wario_cap/model.inc.c
+++ b/actors/wario_cap/model.inc.c
@@ -215,7 +215,7 @@ const Gfx wario_cap_seg3_dl_03022FF8[] = {
 	gsSPSetGeometryMode(G_TEXTURE_GEN),
 	gsSPTexture(4032, 1984, 0, 0, 1),
     gsSPLight(&wario_cap_black_lights_group.l, 1),
-    gsSPCopyLightEXT(2, 15),
+    gsSPCopyLightEXT(2, 17),
 	gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_cap_texture_metal_shade),
 	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
 	gsDPLoadBlock(7, 0, 0, 2047, 128),
@@ -317,7 +317,7 @@ const Gfx wario_cap_seg3_dl_03023298[] = {
 	gsSPSetGeometryMode(G_TEXTURE_GEN),
 	gsSPTexture(4032, 1984, 0, 0, 1),
     gsSPLight(&wario_cap_black_lights_group.l, 1),
-    gsSPCopyLightEXT(2, 15),
+    gsSPCopyLightEXT(2, 17),
 	gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, wario_cap_texture_metal_shade),
 	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
 	gsDPLoadBlock(7, 0, 0, 2047, 128),