From 1324ce83bee72a6d92296c3c5082c9101b3cd0d2 Mon Sep 17 00:00:00 2001
From: MysterD <myster@d>
Date: Sat, 5 Sep 2020 10:02:11 -0700
Subject: [PATCH] Fixed Luigi sideburns, renamed Luigi textures

---
 actors/luigi/custom_04002090.ci8.png          | Bin 694 -> 0 bytes
 ...ng => custom_luigi_eyes_center.rgba16.png} | Bin
 ...ng => custom_luigi_eyes_closed.rgba16.png} | Bin
 ...ia8.png => custom_luigi_eyes_dead.ia8.png} | Bin
 ... custom_luigi_eyes_half_closed.rgba16.png} | Bin
 ...gba16.png => custom_luigi_logo.rgba16.png} | Bin
 ...6.png => custom_luigi_mustache.rgba16.png} | Bin
 actors/luigi/custom_luigi_sideburn.rgba16.png | Bin 0 -> 3258 bytes
 actors/luigi/model.inc.c                      |  67 ++++++++----------
 9 files changed, 28 insertions(+), 39 deletions(-)
 delete mode 100644 actors/luigi/custom_04002090.ci8.png
 rename actors/luigi/{custom_04003090.rgba16.png => custom_luigi_eyes_center.rgba16.png} (100%)
 rename actors/luigi/{custom_04004090.rgba16.png => custom_luigi_eyes_closed.rgba16.png} (100%)
 rename actors/luigi/{custom_luigi_Eyes_Pain.ia8.png => custom_luigi_eyes_dead.ia8.png} (100%)
 rename actors/luigi/{custom_04003890.rgba16.png => custom_luigi_eyes_half_closed.rgba16.png} (100%)
 rename actors/luigi/{custom_0301DF50.rgba16.png => custom_luigi_logo.rgba16.png} (100%)
 rename actors/luigi/{custom_04002890.rgba16.png => custom_luigi_mustache.rgba16.png} (100%)
 create mode 100644 actors/luigi/custom_luigi_sideburn.rgba16.png

diff --git a/actors/luigi/custom_04002090.ci8.png b/actors/luigi/custom_04002090.ci8.png
deleted file mode 100644
index 3f5d3487edfd9e9aaef7b2304f0183fca7a99130..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 694
zcmV;n0!jUeP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000id
z000id0mpBsWB>pHXh}ptR9Fe^R;zNuFc6G81%`%!fq{XA`GmrLYGFSmFwoG<-PP%&
z(@9C4+S8C~#+G%u+g+Vr?oPw*spaLV>>z*LQov#8=N^F5ga`G=7YeIAI<C{y1%r8Q
zmVuAsFmpC3pyw+V(J<{UPz6Er6%T9JXS!@A-~wdBtNf`}VMBCM-^~QXY=?B~6eM={
z5q-mSY$D*iA7t($krm^(LsLi3#%clYhXHds$;bhyqh~E8eS{|MSghK)P5{X-ajBDr
z;A5;yTG<I?r5%FPZuoH<zF})IkY&K~{=AMIiLW5`<SN3GOSHVr;De!SorG_g(=Z$x
z8NWTaC1o<oerc(V8QNnIn6P#RPVpeQMQ-&Flz^c&-`R&fWf9*@&fYWyN02L68CJFe
zEMDqM5iGHihG|*5Pd}ZLfVh?-!2K$aH;EZ%DKif7F-R`JY{XX((C>O4j}Mi$dug>T
zZalmCl`IIbj@t2fU82|)2Z!~=%cz2l0`wfu2SnxBG}M6JV#w3Vw@_&fh|!0)1bLqf
z=X*$g>l)UmB!JHKD)o>WR@UB2w<pO_nj=?)B!C7F)Ed7AdVfE?aWHqui4g>VsKXhK
z(@)^_hr$bz-ui9H8AEbn)}FN`-G&TO!jM8VEN~qv{nm%^T<uHAiRtcw9=}W~Lw>JX
z#I!L>>dJ^E^WDNq8IaDY!|j(ABZ0G=98Mb-Eo){D<V^RXlxGzAav3PQadU+eas(B4
z0wHVOXstioGJ09-u7G6_>%80)tONT^^uK_oXP`KW?HmsLz4ZlK;LF?4KDYMjLf`J(
c0Q^hSH|PlM#+fZ@0ssI207*qoM6N<$g6arG8vp<R

diff --git a/actors/luigi/custom_04003090.rgba16.png b/actors/luigi/custom_luigi_eyes_center.rgba16.png
similarity index 100%
rename from actors/luigi/custom_04003090.rgba16.png
rename to actors/luigi/custom_luigi_eyes_center.rgba16.png
diff --git a/actors/luigi/custom_04004090.rgba16.png b/actors/luigi/custom_luigi_eyes_closed.rgba16.png
similarity index 100%
rename from actors/luigi/custom_04004090.rgba16.png
rename to actors/luigi/custom_luigi_eyes_closed.rgba16.png
diff --git a/actors/luigi/custom_luigi_Eyes_Pain.ia8.png b/actors/luigi/custom_luigi_eyes_dead.ia8.png
similarity index 100%
rename from actors/luigi/custom_luigi_Eyes_Pain.ia8.png
rename to actors/luigi/custom_luigi_eyes_dead.ia8.png
diff --git a/actors/luigi/custom_04003890.rgba16.png b/actors/luigi/custom_luigi_eyes_half_closed.rgba16.png
similarity index 100%
rename from actors/luigi/custom_04003890.rgba16.png
rename to actors/luigi/custom_luigi_eyes_half_closed.rgba16.png
diff --git a/actors/luigi/custom_0301DF50.rgba16.png b/actors/luigi/custom_luigi_logo.rgba16.png
similarity index 100%
rename from actors/luigi/custom_0301DF50.rgba16.png
rename to actors/luigi/custom_luigi_logo.rgba16.png
diff --git a/actors/luigi/custom_04002890.rgba16.png b/actors/luigi/custom_luigi_mustache.rgba16.png
similarity index 100%
rename from actors/luigi/custom_04002890.rgba16.png
rename to actors/luigi/custom_luigi_mustache.rgba16.png
diff --git a/actors/luigi/custom_luigi_sideburn.rgba16.png b/actors/luigi/custom_luigi_sideburn.rgba16.png
new file mode 100644
index 0000000000000000000000000000000000000000..83b56c2eb275ec06c8fe415062160d16f802d010
GIT binary patch
literal 3258
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

literal 0
HcmV?d00001

diff --git a/actors/luigi/model.inc.c b/actors/luigi/model.inc.c
index c09b2309..dac16ab4 100644
--- a/actors/luigi/model.inc.c
+++ b/actors/luigi/model.inc.c
@@ -50,43 +50,39 @@ u8 luigi_metal_rgba16[] = {
 #include "actors/mario/mario_metal.rgba16.inc.c"
 };
 
-u8 luigi__0301DF50_rgba16[] = {
-#include "actors/luigi/custom_0301DF50.rgba16.inc.c"
+u8 luigi_logo_rgba16[] = {
+#include "actors/luigi/custom_luigi_logo.rgba16.inc.c"
 };
 
-u8 luigi__04003090_rgba16[] = {
-#include "actors/luigi/custom_04003090.rgba16.inc.c"
+u8 luigi_eyes_center_rgba16[] = {
+#include "actors/luigi/custom_luigi_eyes_center.rgba16.inc.c"
 };
 
-u8 luigi__04002090_ci8[] = {
-#include "actors/luigi/custom_04002090.ci8.inc.c"
+u8 luigi_sideburn_rgba16[] = {
+#include "actors/luigi/custom_luigi_sideburn.rgba16.inc.c"
 };
 
-u8 luigi__04002090_ci8_pal_rgba16[] = {
-#include "actors/luigi/custom_04002090.ci8.inc.c"
+u8 luigi_mustache_rgba16[] = {
+#include "actors/luigi/custom_luigi_mustache.rgba16.inc.c"
 };
 
-u8 luigi__04002890_rgba16[] = {
-#include "actors/luigi/custom_04002890.rgba16.inc.c"
+u8 luigi_eyes_half_closed_rgba16[] = {
+#include "actors/luigi/custom_luigi_eyes_half_closed.rgba16.inc.c"
 };
 
-u8 luigi__04003890_rgba16[] = {
-#include "actors/luigi/custom_04003890.rgba16.inc.c"
+u8 luigi_eyes_closed_rgba16[] = {
+#include "actors/luigi/custom_luigi_eyes_closed.rgba16.inc.c"
 };
 
-u8 luigi__04004090_rgba16[] = {
-#include "actors/luigi/custom_04004090.rgba16.inc.c"
+u8 luigi_eyes_dead_ia8[] = {
+#include "actors/luigi/custom_luigi_eyes_dead.ia8.inc.c"
 };
 
-u8 luigi_luigi_Eyes_Pain_ia8[] = {
-#include "actors/luigi/custom_luigi_Eyes_Pain.ia8.inc.c"
-};
-
-u8 luigi_wing_2_rgba16[] = {
+u8 luigi_wing_tip_rgba16[] = {
 #include "actors/mario/mario_wing_tip.rgba16.inc.c"
 };
 
-u8 luigi_wing1_rgba16[] = {
+u8 luigi_wing_rgba16[] = {
 #include "actors/mario/mario_wing.rgba16.inc.c"
 };
 
@@ -3262,7 +3258,7 @@ Gfx mat_luigi_cap[] = {
     gsDPSetCombineLERP(TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, 0, 0, 0, ENVIRONMENT, TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, 0, 0, 0, ENVIRONMENT),
     gsSPTexture(65535, 65535, 0, 0, 1),
     gsDPTileSync(),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, luigi__0301DF50_rgba16),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, luigi_logo_rgba16),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 7, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
     gsDPLoadSync(),
     gsDPLoadTile(7, 0, 0, 124, 124),
@@ -3279,7 +3275,7 @@ Gfx mat_luigi_face_0___eye_open[] = {
     gsDPSetCombineLERP(TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, 0, 0, 0, ENVIRONMENT, TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, 0, 0, 0, ENVIRONMENT),
     gsSPTexture(65535, 65535, 0, 0, 1),
     gsDPTileSync(),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, luigi__04003090_rgba16),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, luigi_eyes_center_rgba16),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 7, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
     gsDPLoadSync(),
     gsDPLoadTile(7, 0, 0, 124, 124),
@@ -3295,22 +3291,15 @@ Gfx mat_luigi_sideburns[] = {
     gsDPPipeSync(),
     gsDPSetCombineLERP(TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, 0, 0, 0, ENVIRONMENT, TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, 0, 0, 0, ENVIRONMENT),
     gsSPTexture(65535, 65535, 0, 0, 1),
-    gsDPSetTextureLUT(G_TT_RGBA16),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, luigi__04002090_ci8_pal_rgba16),
     gsDPTileSync(),
-    gsDPSetTile(0, 0, 0, 256, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-    gsDPLoadSync(),
-    gsDPLoadTLUTCmd(7, 19),
-    gsDPPipeSync(),
-    gsDPTileSync(),
-    gsDPSetTextureImage(G_IM_FMT_CI, G_IM_SIZ_8b, 32, luigi__04002090_ci8),
-    gsDPSetTile(G_IM_FMT_CI, G_IM_SIZ_8b, 4, 0, 7, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, luigi_sideburn_rgba16),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 7, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
     gsDPLoadSync(),
     gsDPLoadTile(7, 0, 0, 124, 124),
     gsDPPipeSync(),
-    gsDPSetTile(G_IM_FMT_CI, G_IM_SIZ_8b, 4, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
     gsDPSetTileSize(0, 0, 0, 124, 124),
-    gsSPSetLights1(luigi_sideburns_lights),
+    gsSPSetLights1(luigi_face_0___eye_open_lights),
     gsSPEndDisplayList(),
 };
 
@@ -3326,7 +3315,7 @@ Gfx mat_luigi_mustache[] = {
     gsDPSetCombineLERP(TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, 0, 0, 0, ENVIRONMENT, TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, 0, 0, 0, ENVIRONMENT),
     gsSPTexture(65535, 65535, 0, 0, 1),
     gsDPTileSync(),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, luigi__04002890_rgba16),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, luigi_mustache_rgba16),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 7, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
     gsDPLoadSync(),
     gsDPLoadTile(7, 0, 0, 124, 124),
@@ -3352,7 +3341,7 @@ Gfx mat_luigi_face_1___eye_half[] = {
     gsDPSetCombineLERP(TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, 0, 0, 0, ENVIRONMENT, TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, 0, 0, 0, ENVIRONMENT),
     gsSPTexture(65535, 65535, 0, 0, 1),
     gsDPTileSync(),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, luigi__04003890_rgba16),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, luigi_eyes_half_closed_rgba16),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 7, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
     gsDPLoadSync(),
     gsDPLoadTile(7, 0, 0, 124, 124),
@@ -3369,7 +3358,7 @@ Gfx mat_luigi_face_2___eye_closed[] = {
     gsDPSetCombineLERP(TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, 0, 0, 0, ENVIRONMENT, TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, 0, 0, 0, ENVIRONMENT),
     gsSPTexture(65535, 65535, 0, 0, 1),
     gsDPTileSync(),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, luigi__04004090_rgba16),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, luigi_eyes_closed_rgba16),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 7, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
     gsDPLoadSync(),
     gsDPLoadTile(7, 0, 0, 124, 124),
@@ -3386,7 +3375,7 @@ Gfx mat_luigi_face_7___eye_X[] = {
     gsDPSetCombineLERP(TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, 0, 0, 0, ENVIRONMENT, TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, 0, 0, 0, ENVIRONMENT),
     gsSPTexture(65535, 65535, 0, 0, 1),
     gsDPTileSync(),
-    gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_8b, 32, luigi_luigi_Eyes_Pain_ia8),
+    gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_8b, 32, luigi_eyes_dead_ia8),
     gsDPSetTile(G_IM_FMT_IA, G_IM_SIZ_8b, 4, 0, 7, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
     gsDPLoadSync(),
     gsDPLoadTile(7, 0, 0, 124, 124),
@@ -3404,7 +3393,7 @@ Gfx mat_luigi_wing_2[] = {
     gsSPClearGeometryMode(G_CULL_BACK),
     gsSPTexture(65535, 65535, 0, 0, 1),
     gsDPTileSync(),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, luigi_wing_2_rgba16),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, luigi_wing_tip_rgba16),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
     gsDPLoadSync(),
     gsDPLoadTile(7, 0, 0, 124, 252),
@@ -3427,7 +3416,7 @@ Gfx mat_luigi_wing_1[] = {
     gsSPClearGeometryMode(G_CULL_BACK),
     gsSPTexture(65535, 65535, 0, 0, 1),
     gsDPTileSync(),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, luigi_wing1_rgba16),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, luigi_wing_rgba16),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 6, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
     gsDPLoadSync(),
     gsDPLoadTile(7, 0, 0, 124, 252),