From 270244d02da159a10e30f867329ae5dc5c48bbce Mon Sep 17 00:00:00 2001
From: Agent X <44549182+AgentXLP@users.noreply.github.com>
Date: Fri, 21 Jun 2024 14:06:37 -0400
Subject: [PATCH] Make metal cap use EMBLEM on the models

---
 actors/luigi/model.inc.c       | 4 ++--
 actors/luigi_cap/model.inc.c   | 4 ++--
 actors/mario/model.inc.c       | 4 ++--
 actors/mario_cap/model.inc.c   | 4 ++--
 actors/toad_cap/model.inc.c    | 2 +-
 actors/toad_player/model.inc.c | 4 ++--
 actors/wario/model.inc.c       | 4 ++--
 actors/wario_cap/model.inc.c   | 4 ++--
 8 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/actors/luigi/model.inc.c b/actors/luigi/model.inc.c
index 0fd8772a..d284081b 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 1ff39650..6c54c282 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 85e4687e..5d76880c 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 1b85318d..555875bd 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 5e9a4820..ac9369a7 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 4803863f..94a09f0f 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 ad79bd4e..e96b077c 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 298d4340..297745d4 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),