From 5b2fc1218d50ccc03151bcaacd0feb607fe22908 Mon Sep 17 00:00:00 2001
From: Eevee <eevee.git@veekun.com>
Date: Sat, 7 Jul 2018 19:24:07 -0700
Subject: [PATCH] Add a whole font and some real text, wahoo

---
 Makefile              |  15 +++++++-
 data/font.png         | Bin 0 -> 1085 bytes
 src/main.rgbasm       |  46 +++----------------------
 util/font-to-tiles.py |  77 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 96 insertions(+), 42 deletions(-)
 create mode 100644 data/font.png
 create mode 100644 util/font-to-tiles.py

diff --git a/Makefile b/Makefile
index 0a48dbf..216917b 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,7 @@ BUILD := build
 RGBASM := rgbasm
 RGBLINK := rgblink
 RGBFIX := rgbfix
+PYTHON := python
 
 NAME := anise-cheezball-rising
 TARGET := $(BUILD)/$(NAME).gbc
@@ -17,7 +18,17 @@ DEPS := $(foreach src,$(SOURCES),$(patsubst $(SRC)/%,$(BUILD)/%.deps,$(src)))
 
 all: $(TARGET)
 
-$(BUILD)/%.rgbasm.o: $(SRC)/%.rgbasm
+# Special intermediate targets
+
+$(BUILD)/font.inc: util/font-to-tiles.py data/font.png
+	$(PYTHON) util/font-to-tiles.py data/font.png > $(BUILD)/font.inc
+
+# The regular expected stuff
+# TODO: i've manually listed font.inc here because otherwise, on first build,
+# rgbasm will balk that it doesn't exist, so it'll never create the deps file,
+# so make will never know it needs to be built first.  this enforces build
+# order without supplying the explicit dependency.  is there a better fix?
+$(BUILD)/%.rgbasm.o: $(SRC)/%.rgbasm | $(BUILD)/font.inc
 	$(RGBASM) -i $(SRC)/ -i $(BUILD)/ -M $(BUILD)/$*.rgbasm.deps -o $@ $<
 
 $(TARGET): $(OBJECTS)
@@ -32,4 +43,6 @@ clean:
 	rm -f $(SYMFILE)
 
 # Include generated dependency files
+# TODO: if i remove a dep, make will be unable to recreate it, but these
+# lingering files will still say it's necessary.  is that fixable?
 -include $(DEPS)
diff --git a/data/font.png b/data/font.png
new file mode 100644
index 0000000000000000000000000000000000000000..cac23e24c3790d3658ecca211d25427dfe5738d9
GIT binary patch
literal 1085
zcmV-D1j74?P)<h;3K|Lk000e1NJLTq00LkD000mI0{{R3%(yG70000CP)t-s00030
z|NphMwL?QgHVX4}000B*Nkl<ZNXOOH!HU~f6b9h`pmWhiLcfVcHXi&6f{dAsgU`V;
zbW?~1WM<=#R}dtnn+|@pYn%trzznlV=qtF?AsY|Vh2n`rX}c<E&qi1GNa*99b9Lb=
zP!J|6Fo7y)gdJuN$#3qCE($xEILdq(8VM7Df&zt^KxxXu1O<G0#{>=oVd#VS4~BDq
z1`IGBoFcWLlm%GUr7WZlhfIk^>e5PSLQ~eINU(-Vn2Xe<l~`aA8qypzm(UCuV1PjY
zzz_ffD8~Xl9zP-A9LUGOv02+4VCikZYW^AZc)Lm-(%txwS@}b{8+R*zNcZFI$|a9G
zj)+V5bT{r+w(`f~mnT@U8!?v-=nk;)Kfp%pfWDIRYT?fUY0)VCL!!eR(MHk{22mw}
z01Od5sFJo81z~FuC|lyvU6nL52dszPY<|Fq6d_O@U<6F`uVEwsm;x|-T(f8=QR1mk
z0U*_P0$7`pFr+=~O=w;k{6v*B>0u%Q9Yo@1zx)$yfOC+ilAZ!Mh9%kG!U94QE&#(I
zX<#Q5XxT1I7EnDG$hrwlX$xq+oYdyqVxM%f9)zZBO(fK%xi19z+=z3(Q7v1u#ioIg
zHn;W+AJ9@o6~NGkVneITzzb2jUdT}F0+(8s!9|rc*RpP_)3N8v{0cA(@DcW`73fR*
z9FxZ$mL?Cyhgr9>QMxO-xT!-UZ7PFwH||U%-Hzkj9|St;h#$RF9Y?d3J;2DDcy1@4
zM5<&NfNQ@_yKCQ#$MqZ6!8-iv*J=00KZWfoU5hGtv({PLaa7$)9U35FVFS6PB{oVs
z1%Od_FBm~U(2S}e@Tu58kC~hum(oR`Bw;>LB`(ZNVB`SjHUI_8`>M@-t<~HcvTI$R
zOG;lWThCM6sz^Q>@Jv)9Nle3SSoS?OkRc7mtjb_e1{Jj5z|0C@3YDy1^(UApPYLs&
zO1!F{V0ZDYF$JZExx3PRPuAvoB1#u!?LqNUB?u?&i44=e`P0+qP2XczGM#kj+P*=R
z`7+qTufVdsi_DjyUB|vplZ9&8-mR}fL)@(;%$L-%HqY}Vakn+Uf=${poWP8s8A<@k
z8uxymxA*gglg?b9xzZ(Xf7-lOT;=oENt@c+`Ma_{Wea54bO%Jdz=s4yg(?D&h^$Js
zMSR@sQO)8ERkAH&(r=m!k6AX0vt(cFE6kFlh}$ZgZQ~|MwiRZGn>}I?GrT~IRk5EY
z1u)xUx|t?%8uwMfxY25pRhuM<ukc%jeG-31%wml1XWOibUp@o?sJ`yk<X=8$$fN&*
zLF{Wv^n0FwlNJ~q!Q#=HEWanLh(`sA-xg?#|3Ul#F03C6vP3Bv00000NkvXXu0mjf
DtWNc-

literal 0
HcmV?d00001

diff --git a/src/main.rgbasm b/src/main.rgbasm
index f7f65ec..93c82d9 100644
--- a/src/main.rgbasm
+++ b/src/main.rgbasm
@@ -527,47 +527,10 @@ include "tilesets/testmap.rgbasm"
 include "tilesets/testanise.rgbasm"
 
 SECTION "Font", ROMX
-; FONT
-font:
-; A
-    db 6
-    dw `00000000
-    dw `00000000
-    dw `01110000
-    dw `10001000
-    dw `10001000
-    dw `10001000
-    dw `11111000
-    dw `10001000
-    dw `10001000
-    dw `10001000
-    dw `10001000
-    dw `00000000
-    dw `00000000
-    dw `00000000
-    dw `00000000
-    dw `00000000
-; B
-    db 6
-    dw `00000000
-    dw `00000000
-    dw `11110000
-    dw `10001000
-    dw `10001000
-    dw `10001000
-    dw `11110000
-    dw `10001000
-    dw `10001000
-    dw `10001000
-    dw `11110000
-    dw `00000000
-    dw `00000000
-    dw `00000000
-    dw `00000000
-    dw `00000000
-
 text:
-    db "ABABAAA", 0
+    db "Hello, world!", 0
+; FONT
+font: include "font.inc"
 
 SECTION "Text buffer", WRAM0[$C200]
 text_buffer:
@@ -689,7 +652,7 @@ show_dialogue:
     ; character address in hl and /then/ put it in de.  But I
     ; already pushed de, so I can use that as scratch space.
     push hl
-    sub a, 65   ; TODO temporary
+    sub a, 32   ; TODO temporary...?
     ld hl, font
     ld de, 33                   ; 1 width byte + 16 * 2 tiles
     ; TODO can we speed striding up with long mult?
@@ -784,6 +747,7 @@ show_dialogue:
     ; right?  wait, no, it comes /before/...  well fuck
     ; TODO actually that might make something weird happen due
     ; to the inc b above, maybe...?
+    dec b
     add a, b                    ; a <- new x offset
     ld bc, -32                  ; move the VRAM pointer back...
     add hl, bc                  ; ...to the start of the tile
diff --git a/util/font-to-tiles.py b/util/font-to-tiles.py
new file mode 100644
index 0000000..838abb6
--- /dev/null
+++ b/util/font-to-tiles.py
@@ -0,0 +1,77 @@
+"""Converts a PNG containing a variable-width font into a source
+file for rgbasm.
+
+The image format is similar to the one LÖVE uses: the upper-left
+pixel of the whole image is considered to mark the start of a
+new letter whenever it appears in the top row.  Unlike LÖVE,
+that column is also part of the following letter, and is
+replaced with color zero.  Also, no letter may be wider than 8
+pixels (though the renderer includes a 1px gap after every
+character).
+
+The palette is ignored and indices are used directly, but
+generally color 0 should be the background and color 1 should be
+the primary text color.
+"""
+from pathlib import Path
+import sys
+
+import PIL.Image
+
+
+TILE_SIZE = 8
+METATILE_SIZE = 16
+
+
+def main(font_image_path):
+    im = PIL.Image.open(font_image_path)
+
+    width, height = im.size
+    if height != 16:
+        # TODO well, not necessarily!  in fact i'd like to cut
+        # it down to 12.  but for now, yes
+        raise RuntimeError("Font image must be exactly 16 pixels tall")
+
+    pixels = im.load()
+    indicator = pixels[0, 0]  # this color starts a new glyph
+    glyph_starts = []  # x-offsets of where glyphs begin
+    glyphs = []  # lists of rows of pixels
+
+    # Deal with the first row first, so we know where the
+    # divisions are
+    for x in range(width):
+        pixel = pixels[x, 0]
+        if pixel == indicator:
+            glyph_starts.append(x)
+            glyphs.append([[]])
+            pixel = 0
+        glyphs[-1][0].append(pixel)
+        # TODO enforce no more than 8 pixels
+
+    # Continue with subsequent rows
+    for y in range(1, height):
+        g = -1
+        for x in range(width):
+            if g + 1 < len(glyph_starts) and x == glyph_starts[g + 1]:
+                g += 1
+                glyphs[g].append([])
+            pixel = pixels[x, y]
+            glyphs[g][-1].append(pixel)
+
+    # Write it out
+    for g, glyph in enumerate(glyphs):
+        if g + 1 < len(glyphs):
+            glyph_width = glyph_starts[g + 1] - glyph_starts[g]
+        else:
+            glyph_width = width - glyph_starts[g]
+
+        print(f"; {chr(g + 32)}")
+        print(f"    db {glyph_width}")
+
+        for row in glyph:
+            row = (row + [0] * 8)[:8]
+            print('    dw `' + ''.join(map(str, row)))
+
+
+if __name__ == '__main__':
+    main(*sys.argv[1:])