Lots of matches in hud_renderer (#503)

Signed-off-by: Taggerung <tyler.taggerung@email.com>

3 files changed, 78 insertions, 83 deletions

diff --git a/src/data/common_textures.inc.c b/src/data/common_textures.inc.c
index da8748dc6..d74b6fe8d 100644
--- a/src/data/common_textures.inc.c
+++ b/src/data/common_textures.inc.c
@@ -2623,64 +2623,58 @@ u8 D_0D00C558[] = {
     #include "textures/common/132B50_0C558.rgba16.inc.c"
 };
 
-// first place
-s8 D_0D00D258[] = {
-    #include "textures/common/132B50_0D258.i4.inc.c"
-};
-
-// second place
-s8 D_0D00E258[] = {
-    #include "textures/common/132B50_0E258.i4.inc.c"
-};
-
-// third place
-s8 D_0D00F258[] = {
-    #include "textures/common/132B50_0F258.i4.inc.c"
-};
-
-// fourth place
-s8 D_0D010258[] = {
-    #include "textures/common/132B50_10258.i4.inc.c"
-};
-
-// fifth place
-s8 D_0D011258[] = {
-    #include "textures/common/132B50_11258.i4.inc.c"
-};
-
-// sixth place
-s8 D_0D012258[] = {
-    #include "textures/common/132B50_12258.i4.inc.c"
-};
-
-// seventh place
-s8 D_0D013258[] = {
-    #include "textures/common/132B50_13258.i4.inc.c"
-};
-
-// eighth place
-s8 D_0D014258[] = {
-    #include "textures/common/132B50_14258.i4.inc.c"
-};
-
-// First
-s8 D_0D015258[] = {
-    #include "textures/common/132B50_15258.i4.inc.c"
-};
-
-// Second
-s8 D_0D015A58[] = {
-    #include "textures/common/132B50_15A58.i4.inc.c"
-};
-
-// Third
-s8 D_0D016258[] = {
-    #include "textures/common/132B50_16258.i4.inc.c"
+u8 D_0D00D258[][4096] = {
+    // first place
+    {
+        #include "textures/common/132B50_0D258.i4.inc.c"
+    },
+    // second place
+    {
+        #include "textures/common/132B50_0E258.i4.inc.c"
+    },
+    // third place
+    {
+        #include "textures/common/132B50_0F258.i4.inc.c"
+    },
+    // fourth place
+    {
+        #include "textures/common/132B50_10258.i4.inc.c"
+    },
+    // fifth place
+    {
+        #include "textures/common/132B50_11258.i4.inc.c"
+    },
+    // sixth place
+    {
+        #include "textures/common/132B50_12258.i4.inc.c"
+    },
+    // seventh place
+    {
+        #include "textures/common/132B50_13258.i4.inc.c"
+    },
+    // eighth place
+    {
+        #include "textures/common/132B50_14258.i4.inc.c"
+    },
 };
 
-// Fourth
-s8 D_0D016A58[] = {
-    #include "textures/common/132B50_16A58.i4.inc.c"
+u8 D_0D015258[][2048] = {
+    // First
+    {
+        #include "textures/common/132B50_15258.i4.inc.c"
+    },
+    // Second
+    {
+        #include "textures/common/132B50_15A58.i4.inc.c"
+    },
+    // Third
+    {
+        #include "textures/common/132B50_16258.i4.inc.c"
+    },
+    // Fourth
+    {
+        #include "textures/common/132B50_16A58.i4.inc.c"
+    },
 };
 
 // tlut for 1p, 2p, 3p, 4p
diff --git a/src/data/data_800E45C0.c b/src/data/data_800E45C0.c
index 91f925ecb..c0139eb4e 100644
--- a/src/data/data_800E45C0.c
+++ b/src/data/data_800E45C0.c
@@ -1,26 +1,23 @@
-#include <ultra64.h>
 #include "data_800E45C0.h"
 
-// Lights
-Lights1 D_800E45C0 = gdSPDefLights1(
-    0x64, 0x00, 0x00,
-    0x64, 0x00, 0x00, 0x00, 0x88, 0x00
-);
-
-Lights1 D_800E45D8 = gdSPDefLights1(
-    0x64, 0x64, 0x00,
-    0xff, 0xff, 0x00, 0x00, 0x88, 0x00
-);
-
-Lights1 D_800E45F0 = gdSPDefLights1(
-    0x64, 0x64, 0x64,
-    0xff, 0xff, 0xff, 0x00, 0x88, 0x00
-);
-
-Lights1 D_800E4608 = gdSPDefLights1(
-    0x64, 0x00, 0x00,
-    0x64, 0x00, 0x00, 0x00, 0x88, 0x00
-);
+Lights1 D_800E45C0[] = {
+    gdSPDefLights1(
+        0x64, 0x00, 0x00,
+        0x64, 0x00, 0x00, 0x00, 0x88, 0x00
+    ),
+    gdSPDefLights1(
+        0x64, 0x64, 0x00,
+        0xff, 0xff, 0x00, 0x00, 0x88, 0x00
+    ),
+    gdSPDefLights1(
+        0x64, 0x64, 0x64,
+        0xff, 0xff, 0xff, 0x00, 0x88, 0x00
+    ),
+    gdSPDefLights1(
+        0x64, 0x00, 0x00,
+        0x64, 0x00, 0x00, 0x00, 0x88, 0x00
+    ),
+};
 
 Lights1 D_800E4620 = gdSPDefLights1(
     0x96, 0xb4, 0xfa,
@@ -67,10 +64,10 @@ Lights1 D_800E46E0 = gdSPDefLights1(
     0xff, 0xff, 0xff, 0x00, 0x00, 0x78
 );
 
-u32 D_800E46F8[] = {
-    0x000000ff, 0x000000ff, 0x000000ff,
-    0x000000ff, 0x000000ff, 0x00000000,
-    0x000000ff, 0x00000000, 0x00000000,
+Vec3u32 D_800E46F8[] = {
+    {0x000000ff, 0x000000ff, 0x000000ff},
+    {0x000000ff, 0x000000ff, 0x00000000},
+    {0x000000ff, 0x00000000, 0x00000000},
 };
 
 u8 D_800E471C[] = { 0x00, 0x01, 0x02, 0x03, 0x02, 0x01, 0x00 };
diff --git a/src/data/data_800E45C0.h b/src/data/data_800E45C0.h
index d28fc0dbe..2dd9421ab 100644
--- a/src/data/data_800E45C0.h
+++ b/src/data/data_800E45C0.h
@@ -1,7 +1,11 @@
 #ifndef DATA_800E45C0_H
 #define DATA_800E45C0_H
 
-extern Lights1 D_800E45C0;
+#include <ultra64.h>
+
+typedef u32 Vec3u32[3];
+
+extern Lights1 D_800E45C0[];
 extern Lights1 D_800E45D8;
 extern Lights1 D_800E45F0;
 extern Lights1 D_800E4608;
@@ -14,7 +18,7 @@ extern Lights1 D_800E4698;
 extern Lights1 D_800E46B0;
 extern Lights1 D_800E46C8;
 extern Lights1 D_800E46E0;
-extern u32 D_800E46F8[];
+extern Vec3u32 D_800E46F8[];
 extern u8 D_800E471C[];
 
 #endif