Hri7566
/
sm64coopdx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make Mario & Luigi cap emblems use the shirt color 

At best, some palettes look better and at worst some palettes look the same.
This commit is contained in:
Agent X 2024-03-02 11:42:26 -05:00
parent 23a217fd77
commit 396d5c730b
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
actors/luigi/model.inc.c
View File

@ -1996,7 +1996,7 @@ const Gfx luigi_l_logo_decal[] = {
gsSPTexture(65535, 65535, 0, 0, 1), gsSPTexture(65535, 65535, 0, 0, 1),
gsDPSetPrimColor(0, 0, 127, 127, 127, 255), gsDPSetPrimColor(0, 0, 127, 127, 127, 255),
gsSPLight(&luigi_black_lights_group.l, 1), 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), 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), 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), gsDPLoadBlock(7, 0, 0, 1023, 256),
@ -3519,7 +3519,7 @@ const Gfx luigi_right_hand_cap_decal[] = {
gsSPTexture(65535, 65535, 0, 0, 1), gsSPTexture(65535, 65535, 0, 0, 1),
gsDPSetPrimColor(0, 0, 127, 127, 127, 255), gsDPSetPrimColor(0, 0, 127, 127, 127, 255),
gsSPLight(&luigi_black_lights_group.l, 1), 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), 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), 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), gsDPLoadBlock(7, 0, 0, 1023, 256),
@ -3554,7 +3554,7 @@ const Gfx luigi_right_hand_cap_decal[] = {
const Gfx luigi_right_hand_cap_dl[] = { const Gfx luigi_right_hand_cap_dl[] = {
gsSPCopyLightsPlayerPart(CAP), gsSPCopyLightsPlayerPart(CAP),
gsSPDisplayList(luigi_right_hand_cap_top_dl), 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), gsSPDisplayList(luigi_right_hand_cap_hand_position_dl),
gsDPSetCombineMode(G_CC_MODULATERGBFADEA, G_CC_MODULATERGBFADEA), 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), 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),

2
actors/luigi_cap/model.inc.c
View File

@ -258,7 +258,7 @@ const Gfx luigi_cap_l_logo_decal[] = {
gsSPTexture(65535, 65535, 0, 0, 1), gsSPTexture(65535, 65535, 0, 0, 1),
gsDPSetPrimColor(0, 0, 127, 127, 127, 255), gsDPSetPrimColor(0, 0, 127, 127, 127, 255),
gsSPLight(&luigi_cap_black_lights_group.l, 1), 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), 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), 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), gsDPLoadBlock(7, 0, 0, 1023, 256),

4
actors/mario/model.inc.c
View File

@ -2148,7 +2148,7 @@ const Gfx mario_m_logo_decal[] = {
gsSPTexture(65535, 65535, 0, 0, 1), gsSPTexture(65535, 65535, 0, 0, 1),
gsDPSetPrimColor(0, 0, 127, 127, 127, 255), gsDPSetPrimColor(0, 0, 127, 127, 127, 255),
gsSPLight(&mario_black_lights_group.l, 1), 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), 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), 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), gsSPTexture(65535, 65535, 0, 0, 1),
gsDPSetPrimColor(0, 0, 127, 127, 127, 255), gsDPSetPrimColor(0, 0, 127, 127, 127, 255),
gsSPLight(&mario_black_lights_group.l, 1), 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), 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), 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), gsDPLoadBlock(7, 0, 0, 1023, 256),

2
actors/mario_cap/model.inc.c
View File

@ -287,7 +287,7 @@ const Gfx mario_cap_m_logo_decal[] = {
gsSPTexture(65535, 65535, 0, 0, 1), gsSPTexture(65535, 65535, 0, 0, 1),
gsDPSetPrimColor(0, 0, 127, 127, 127, 255), gsDPSetPrimColor(0, 0, 127, 127, 127, 255),
gsSPLight(&mario_cap_black_lights_group.l, 1), 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), 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), 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), gsDPLoadBlock(7, 0, 0, 1023, 256),