From 396d5c730bb79bcabd7115ccd92baff051873d03 Mon Sep 17 00:00:00 2001 From: Agent X <44549182+Agent-11@users.noreply.github.com> Date: Sat, 2 Mar 2024 11:42:26 -0500 Subject: [PATCH] Make Mario & Luigi cap emblems use the shirt color At best, some palettes look better and at worst some palettes look the same. --- actors/luigi/model.inc.c | 6 +++--- actors/luigi_cap/model.inc.c | 2 +- actors/mario/model.inc.c | 4 ++-- actors/mario_cap/model.inc.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/actors/luigi/model.inc.c b/actors/luigi/model.inc.c index b16e880c..ea7d4a93 100644 --- a/actors/luigi/model.inc.c +++ b/actors/luigi/model.inc.c @@ -1996,7 +1996,7 @@ const Gfx luigi_l_logo_decal[] = { gsSPTexture(65535, 65535, 0, 0, 1), gsDPSetPrimColor(0, 0, 127, 127, 127, 255), gsSPLight(&luigi_black_lights_group.l, 1), - gsSPCopyLightEXT(2, 15), + gsSPCopyLightEXT(2, 5), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_texture_l_logo), 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, 1023, 256), @@ -3519,7 +3519,7 @@ const Gfx luigi_right_hand_cap_decal[] = { gsSPTexture(65535, 65535, 0, 0, 1), gsDPSetPrimColor(0, 0, 127, 127, 127, 255), gsSPLight(&luigi_black_lights_group.l, 1), - gsSPCopyLightEXT(2, 15), + gsSPCopyLightEXT(2, 5), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_texture_l_logo), 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, 1023, 256), @@ -3554,7 +3554,7 @@ const Gfx luigi_right_hand_cap_decal[] = { const Gfx luigi_right_hand_cap_dl[] = { gsSPCopyLightsPlayerPart(CAP), gsSPDisplayList(luigi_right_hand_cap_top_dl), - gsSPCopyLightsPlayerPart(GLOVES), // glove light, set in luigi_misc.c + gsSPCopyLightsPlayerPart(GLOVES), // glove light, set in mario_misc.c gsSPDisplayList(luigi_right_hand_cap_hand_position_dl), gsDPSetCombineMode(G_CC_MODULATERGBFADEA, G_CC_MODULATERGBFADEA), 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), diff --git a/actors/luigi_cap/model.inc.c b/actors/luigi_cap/model.inc.c index 6cb07c22..08001449 100644 --- a/actors/luigi_cap/model.inc.c +++ b/actors/luigi_cap/model.inc.c @@ -258,7 +258,7 @@ const Gfx luigi_cap_l_logo_decal[] = { gsSPTexture(65535, 65535, 0, 0, 1), gsDPSetPrimColor(0, 0, 127, 127, 127, 255), gsSPLight(&luigi_cap_black_lights_group.l, 1), - gsSPCopyLightEXT(2, 15), + gsSPCopyLightEXT(2, 5), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, luigi_cap_texture_l_logo), 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, 1023, 256), diff --git a/actors/mario/model.inc.c b/actors/mario/model.inc.c index 1cdda54a..67483e35 100644 --- a/actors/mario/model.inc.c +++ b/actors/mario/model.inc.c @@ -2148,7 +2148,7 @@ const Gfx mario_m_logo_decal[] = { gsSPTexture(65535, 65535, 0, 0, 1), gsDPSetPrimColor(0, 0, 127, 127, 127, 255), gsSPLight(&mario_black_lights_group.l, 1), - gsSPCopyLightEXT(2, 15), + gsSPCopyLightEXT(2, 5), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_texture_m_logo), 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), @@ -3733,7 +3733,7 @@ const Gfx mario_right_hand_cap_decal[] = { gsSPTexture(65535, 65535, 0, 0, 1), gsDPSetPrimColor(0, 0, 127, 127, 127, 255), gsSPLight(&mario_black_lights_group.l, 1), - gsSPCopyLightEXT(2, 15), + gsSPCopyLightEXT(2, 5), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_texture_m_logo), 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, 1023, 256), diff --git a/actors/mario_cap/model.inc.c b/actors/mario_cap/model.inc.c index 465aa52f..e7d46b54 100644 --- a/actors/mario_cap/model.inc.c +++ b/actors/mario_cap/model.inc.c @@ -287,7 +287,7 @@ const Gfx mario_cap_m_logo_decal[] = { gsSPTexture(65535, 65535, 0, 0, 1), gsDPSetPrimColor(0, 0, 127, 127, 127, 255), gsSPLight(&mario_cap_black_lights_group.l, 1), - gsSPCopyLightEXT(2, 15), + gsSPCopyLightEXT(2, 5), gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, mario_cap_texture_m_logo), 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, 1023, 256),