From c329224f2119411eb7f24836240f89619c0cabb4 Mon Sep 17 00:00:00 2001
From: Forest Belton <65484+forestbelton@users.noreply.github.com>
Date: Wed, 30 Jun 2021 21:29:25 -0400
Subject: [PATCH] Build intro map from file

---
 Makefile          |  25 +++++++++++-------
 png/map/intro.png | Bin 0 -> 1251 bytes
 src/bg.s          |  66 ++--------------------------------------------
 3 files changed, 17 insertions(+), 74 deletions(-)
 create mode 100644 png/map/intro.png

diff --git a/Makefile b/Makefile
index acb8fbc..a9affb9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,23 +1,28 @@
-PNGFILES := $(shell find png/sprite -type f -name '*.png')
-IMGFILES := $(PNGFILES:%.png=%.2bpp)
-
-COLLFILES := $(shell find png/map -type f -name '*_coll.png')
-BUILT_COLLFILES := $(COLLFILES:%_coll.png=%.s)
-
+# Graphics
+SPRITE_PNG := $(shell find png/sprite -type f -name '*.png')
+MAP_PNG    := $(shell find png/map -type f -name '*.png' -not -name '*_coll.png')
+MAP_COLL   := $(shell find png/map -type f -name '*_coll.png')
+MAP_ASM    := $(MAP_PNG:%.png:%.s)
+ALL_2BPP   := $(SPRITE_PNG:%.png=%.2bpp) $(MAP_PNG:%.png=%.map.2bpp) $(MAP_PNG:%.png=%.tiles.2bpp)
+
+# Code
 SFILES := $(shell find src -type f -name '*.s')
-OFILES := $(SFILES:%.s=%.o)
+OFILES := $(SFILES:%.s=%.o) $(MAP_ASM)
 
 .PHONY: clean
 
-is.gb is.gb.sym: $(IMGFILES) $(OFILES) $(BUILT_COLLFILES)
+is.gb is.gb.sym:$(OFILES) $(ALL_2BPP)
 	rgblink -o $@ -n $@.sym $(OFILES)
 	rgbfix -v $@
 
-$(OFILES): $(IMGFILES)
+$(OFILES): $(ALL_2BPP)
 
 %.o: %.s
 	rgbasm -i inc -o $@ $<
 
+png/map/%.tiles.2bpp png/map/%.map.2bpp: png/map/%.png
+	rgbgfx -u -t $(<:%.png=%.map.2bpp) -o $(<:%.png=%.tiles.2bpp) $<
+
 png/map/%.s: png/map/%_coll.png
 	python scripts/generate_coll_map.py -o $@ $<
 
@@ -25,4 +30,4 @@ png/sprite/%.2bpp: png/sprite/%.png
 	rgbgfx -o $@ $<
 
 clean:
-	rm -f is.gb is.gb.sym $(IMGFILES) $(OFILES) $(BUILT_COLLFILES)
\ No newline at end of file
+	rm -f is.gb is.gb.sym $(ALL_2BPP) $(OFILES) $(MAP_ASM)
\ No newline at end of file
diff --git a/png/map/intro.png b/png/map/intro.png
new file mode 100644
index 0000000000000000000000000000000000000000..f45d373e54bb3ef8201c32a575befd79529cd6a6
GIT binary patch
literal 1251
zcmeAS@N?(olHy`uVBq!ia0vp^3xIe62OE&=-<r?>q!^2X+?^QKos)S9<glbW`Z_W&
zZ0zU$lgJ9>a~60+7Beu&wt+BX>>}YtpqdI#7srr_xVLwCi*6YRv?ZQ6dg5ZymV!-Y
zv&$qEza$%cQ(t>OT`l;`ts`Cgyv%N#{CU1#SmD#h|M3n@3{G9dp;v!CtL~KxsI`3b
zGsm9kO3q#T{fvM9{j-bJn|}Fg)!*+q2X9rKy8idi9~q^F>Mil1+vjiGx_(L6=j*o?
z*XIQn?EAb;c%|vrd%KixZ2IdKoBwj}wP|)b52uwpw+_DD8UE^@MeYlZ#q)12{;OHK
z_sI3Hxo6}47VlP1d7r#c@X+)}5g+aW`QiskRDS&W_3Q5``RO*%+aLD{GVcigT^xNa
z`*{7iTXXXFr~eOO-r=(P;j*y#iVfa-Zq;pf-+O&oQ0@7Dl@;<Et}nQ9>#5+@Z-u$l
zp{K=GTng8_U&r6g^y2*0vJK(odw+3w{l1ZX|Hap(*Yf^%y;4_vd2UKsPHt^U_HFZ^
zz0YTs-hcbfTzN}hbB=nn^{v&`(!boT{}o4Xix1WJ-MVtm-s<n?53hf=!SBYU6%UJ}
zx7U{d1)LcKz2DnU+4Y+<p+M}wEt8zf>v#R$DZ?GaA`s+r@L+Ep&j}6=O(qV_We*-$
zaI;BqC@h)L)cjaSB155JLJ}8W-{yn`jlc-fw6HkW)W}9Fg>LrTY7LWL%RcVyWAHoY
zzT@=MqFr(8|Ie>A$(oydK;hH5t$hByQR)qoH*=opdpf5)=ibA-Empw=0-NQyg$^j_
zG`#ef@sIQWt@)qJPgybYDDgiK%5F-&7x-MlU`AZ~a<_;y7M?|>Oi}L7=gtqhCdt_B
zWxeOh&&5|H8JTAmil{UkJoBxLhp|QEc*6uGylB?H%@1zc)zpW5>3`+SQt<3|l6Ot)
z?k!qX42OLVRz8nXU*@*%`?cPjUktZ6CdReAoE!Q2h~VpgH?p4r6BlQ(ZNir1gUT)E
zTeuRegqBTjxUR=uzWD0f8Pgd2)PQb2&!)UR^sfga&v(0o^@oEO>&qWhbaQxpBkcLA
z*OqPv7%uVYm;QV4buouA(=3j~4<@?V3u`r`ecPVgCt@e8*D!-S{ICO&*$GYAsdo<^
z&J#HCht1&7`|FGC(*K&VK6kyX;5xVJRqR*(-P*=`XWr)i$<}98`gz^2xBDL4%ztrg
z&O0WFr{7;cUC|%Co~@wM^!|;2<^Mj|CFD1YoYq+$7rBnjAa>`Mm@ccYU+%}Ot}|!7
z{kw6i_{p19YfD!K#|Q0~W~^<#)b_JjXY-t@(#orz92>4(7FT}ac`k7Iy-C-*gEvHe
zx)Hei-MqE?ZCGz}Pu(|jv0ts{->2Uhy<Y=`r(N}5zW;CI)0=zKk1GNTCI(MeKbLh*
G2~7Z0%t>qj

literal 0
HcmV?d00001

diff --git a/src/bg.s b/src/bg.s
index c27de18..6dd8fba 100644
--- a/src/bg.s
+++ b/src/bg.s
@@ -22,71 +22,9 @@ sceneHeight EQU 18
 SECTION "BG0", ROM0
 
 bg:
-DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00
-DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00
-DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00
-DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00
-DB $01,$02,$02,$03,$00,$00,$00,$00,$01,$02
-DB $02,$02,$02,$02,$02,$0A,$03,$00,$00,$00
-DB $07,$09,$09,$08,$00,$00,$00,$00,$07,$09
-DB $09,$09,$09,$09,$09,$0B,$08,$00,$00,$00
-DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00
-DB $00,$00,$00,$00,$00,$0C,$00,$00,$00,$00
-DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00
-DB $00,$00,$00,$00,$00,$0A,$00,$00,$00,$00
-DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00
-DB $00,$00,$00,$00,$00,$0B,$00,$00,$00,$00
-DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00
-DB $00,$00,$00,$00,$00,$0C,$00,$00,$00,$00
-DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00
-DB $00,$00,$00,$00,$00,$0A,$00,$00,$00,$00
-DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00
-DB $00,$00,$00,$00,$01,$02,$02,$02,$02,$02
-DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00
-DB $00,$00,$00,$00,$07,$09,$09,$09,$09,$09
-DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00
-DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00
-DB $00,$00,$00,$00,$00,$00,$01,$02,$02,$02
-DB $02,$02,$03,$00,$00,$00,$00,$00,$00,$00
-DB $00,$00,$00,$00,$00,$00,$07,$09,$09,$09
-DB $09,$09,$08,$00,$00,$00,$00,$00,$00,$00
-DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00
-DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00
-DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00
-DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00
-DB $01,$02,$02,$02,$02,$02,$02,$02,$02,$02
-DB $02,$02,$02,$02,$02,$02,$02,$02,$02,$02
-DB $04,$06,$06,$06,$06,$06,$06,$06,$06,$06
-DB $06,$06,$06,$06,$06,$06,$06,$06,$06,$06
-bg_end:
-
+    INCBIN "png/map/intro.map.2bpp"
 bg_tiles:
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $FF,$FF,$DF,$80,$FD,$80,$77,$40
-    DB $3F,$3F,$22,$3D,$20,$3F,$28,$37
-    DB $FF,$FF,$DF,$00,$FD,$00,$F7,$00
-    DB $FF,$FF,$40,$BF,$01,$FE,$10,$EF
-    DB $FF,$FF,$FB,$01,$BF,$01,$EE,$02
-    DB $FC,$FC,$44,$BC,$04,$FC,$14,$EC
-    DB $22,$3D,$30,$2F,$24,$3B,$20,$3F
-    DB $20,$3F,$32,$2D,$20,$3F,$28,$37
-    DB $44,$BC,$0C,$F4,$24,$DC,$04,$FC
-    DB $04,$FC,$4C,$B4,$04,$FC,$14,$EC
-    DB $40,$BF,$02,$FD,$20,$DF,$00,$FF
-    DB $08,$F7,$40,$BF,$02,$FD,$10,$EF
-    DB $20,$3F,$22,$3D,$10,$1F,$0F,$0F
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $04,$FC,$44,$BC,$08,$F8,$F0,$F0
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $40,$BF,$02,$FD,$20,$DF,$FF,$FF
-    DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $FF,$FF,$FF,$81,$FF,$81,$FF,$81
-    DB $FF,$FF,$FF,$FF,$FF,$FF,$FF,$81
-    DB $FF,$81,$FF,$81,$FF,$FF,$FF,$FF
-    DB $FF,$FF,$FF,$81,$FF,$81,$FF,$81
-    DB $FF,$FF,$FF,$FF,$FF,$FF,$FF,$81
-    DB $FF,$81,$FF,$81,$FF,$FF,$FF,$FF
+    INCBIN "png/map/intro.tiles.2bpp"
 bg_tiles_end:
 
 BG_Init::