From b49f61292f271d244ab423e50521abcfb42b37e9 Mon Sep 17 00:00:00 2001
From: Zack Buhman <zack@buhman.org>
Date: Wed, 11 Sep 2024 12:16:03 -0500
Subject: [PATCH] model: enable 4-color and 16-color modes

---
 Makefile                        |   2 +-
 arm9/examples/ulala.c           |   4 ++--
 gen/color_convert.py            |  24 ++++++++++++++++++++++--
 gen/render_material_textures.py |   1 -
 model/ulala/material.h          |   4 ++--
 model/ulala/p_ref_or.data       | Bin 4096 -> 1024 bytes
 6 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index f20a19f..da0abb4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-OPT = -Os
+OPT = -O3
 
 all: cartridge.bin
 
diff --git a/arm9/examples/ulala.c b/arm9/examples/ulala.c
index 2b11f66..9f0c9bb 100644
--- a/arm9/examples/ulala.c
+++ b/arm9/examples/ulala.c
@@ -461,8 +461,8 @@ void main()
     while (io_registers.a.GXSTAT & GXSTAT__geometry_engine_busy);
 
     // wait for the end of the current frame
-    while (io_registers.a.VCOUNT != 262);
-    while (io_registers.a.VCOUNT == 262);
+    //while (io_registers.a.VCOUNT != 262);
+    //while (io_registers.a.VCOUNT == 262);
 
     // swap buffers
     io_registers.a.SWAP_BUFFERS = 0;
diff --git a/gen/color_convert.py b/gen/color_convert.py
index c70fde2..13924da 100644
--- a/gen/color_convert.py
+++ b/gen/color_convert.py
@@ -66,7 +66,27 @@ if palette is None:
         convert_colors(f, pixels)
 else:
     with open(out_file, 'wb') as f:
-        for pixel in pixels:
-            f.write(struct.pack("<B", pixel))
+        if len(palette) <= 4:
+            for i in range(len(pixels) // 4):
+                a = pixels[i * 4 + 0]
+                b = pixels[i * 4 + 1]
+                c = pixels[i * 4 + 2]
+                d = pixels[i * 4 + 3]
+                assert a <= 3 and b <= 3 and c <= 3 and d <= 3, (a, b, c, d)
+                pixel = (d << 6) | (c << 4) | (b << 2) | (a << 0)
+                f.write(struct.pack("<B", pixel))
+        elif len(palette) <= 16:
+            for i in range(len(pixels) // 2):
+                a = pixels[i * 2 + 0]
+                b = pixels[i * 2 + 1]
+                assert a <= 15 and b <= 15, (a, b)
+                pixel = (b << 4) | (a << 0)
+                f.write(struct.pack("<B", pixel))
+        elif len(palette) <= 256:
+            for pixel in pixels:
+                assert pixel <= 255
+                f.write(struct.pack("<B", pixel))
+        else:
+            assert False, len(palette)
     with open(out_file + '.pal', 'wb') as f:
         convert_colors(f, [(*c, 255) for c in palette])
diff --git a/gen/render_material_textures.py b/gen/render_material_textures.py
index fae18eb..f7ae804 100644
--- a/gen/render_material_textures.py
+++ b/gen/render_material_textures.py
@@ -45,7 +45,6 @@ class Offset:
 
 def round_up_colors(name, colors):
     assert colors != 0, (name, colors)
-    return 256
     if colors <= 4:
         return 4
     if colors <= 16:
diff --git a/model/ulala/material.h b/model/ulala/material.h
index 4d2bcef..f3ade22 100644
--- a/model/ulala/material.h
+++ b/model/ulala/material.h
@@ -102,14 +102,14 @@ struct material_descriptor material[] = {
       .start = (uint8_t *)&_binary_p_ref_or_data_pal_start,
       .size = (int)&_binary_p_ref_or_data_pal_size,
       .vram_offset = 1472,
-      .palette_size = 256,
+      .palette_size = 4,
     },
   },
   [u_lb] = {
     .pixel = {
       .start = (uint8_t *)&_binary_u_lb_data_start,
       .size = (int)&_binary_u_lb_data_size,
-      .vram_offset = 95232,
+      .vram_offset = 92160,
       .width = 64,
       .height = 64,
     },
diff --git a/model/ulala/p_ref_or.data b/model/ulala/p_ref_or.data
index b11aac17798d361ae7b1a0cacacd02d5d34e26bc..4d61471a1816b0aee57fd8667cb3fc6bf3de6f98 100644
GIT binary patch
literal 1024
zcmcJNyK%!X5JZofkpkvUSOTj+2@FI9E&)}r1SZZI&@%w4)b4#CjmD`jAn|~^y${gZ
zf7oM4^-cF%MA91%VA=b|L=@=}H{&B547-B6ixhKk_pYewjPaBnj-UF^%WCEV<K20X
zlMXk>b+8gIFWz`Q1bYH;{;~ww`pD}QjF#qLmW7Ht1Id$R%|tFo%W6$x1fytHYf@PS
ztx033Sh#@U2o;|ZW(>A3_4ii65cC-Zd$^yc2xsKTHZ8kQ|4+V99Coy-=PxdwjLK4r
z^D~zjVV%o-Do4ID9~tK?TCGk;!{R5NKpQu<vU2vYM27Z#H72m&;De0V1$Rq3A;tod
za{+TtoN-xb34%%eH)`oeqjAK#=ww#tiaQN%x;kTeyLoPLS(S1yy(7J)s48>2hA=K6
iUl%;3J_SBQ7`<q4pv6!`eu*k#4hb9C#BBp_))!BS;V4xA

literal 4096
zcmeH}-FCzv2!xw`|A#K}qYQ$Wp0jt&MG}>77%*%5`TSpB>A*wR4`0voI)R}gK=)S?
zns>tTax0P3L*q)J#z~=Xgm^9QjfG=!5j|PBz)xMc!Vdyv)nTD1fuhDoS6@>m6=?DG
zQD(b9#n+j2Wg18XF4DXHZWWBRF8@rQ?7>)Tc!zIaGFwZk8a`w3tP^6hIjd24$W8-W
zm1oOG9C__*Fr_J6+nox;+B{4iaV)@ibj1RBb^=tMACuqCs1h%Dn5Mm3%JI$R_fgOS
zzYuvB2w~NH&T};Is{)*U&7X1Ybdp~SXmHpm@FskRuQF*PzQBWIHjw=nv#_2_!MYBF
zmoi}e4?HyMj+dxM+Xx2O8O$UDwXfR<0lWm3U|9ynivfscYcR9(X5Y>MA3+Bush<UA
zdKK`|>4EJN%)cKz>7+EM7XStZL!#w{u+LsbFDj7c8D6xIOlUdV1Jh$SG?+`+K$(cR
z8CZrmuFAjTg+QKO@laeQn(`VLyk0w~@Oc~tU+6(ME*y9oW74I<q&M@TU;_D1XVDi4
zwva^^$=QO7;{Th*Bz;NK7`<%D;@$2L>p6Y5xcYfgXp*Za8lEQZV9^Lg)BljQ;c|t4
KgLEqcXyF&&b`ARg