From 9e375416d00434e75a028dbdb7b4b0cdeb7b00ca Mon Sep 17 00:00:00 2001
From: Devine Lu Linvega <aliceffekt@gmail.com>
Date: Mon, 15 Jul 2024 14:40:22 -0700
Subject: [PATCH] Improving makefile

---
 makefile | 86 ++++++++++++++++++++++++++++++--------------------------
 1 file changed, 46 insertions(+), 40 deletions(-)

diff --git a/makefile b/makefile
index ed6b0b6..ec8bbb8 100644
--- a/makefile
+++ b/makefile
@@ -7,9 +7,13 @@ ROM=bin/${ID}.rom
 
 all: ${ROM} bin/padder.rom bin/packer.rom
 
-run: all
-	@ cat bin/oquonie.rom bin/wm.rom bin/c.rom bin/c2.rom bin/b.rom bin/e.rom bin/pc.rom > bin/result.rom
-	@ mv bin/result.rom ${ROM}
+run: ${ROM} bin/assets.romx
+	# @ cat bin/oquonie.rom bin/wm.rom bin/c.rom bin/c2.rom bin/b.rom bin/e.rom bin/pc.rom > bin/result.rom
+	# @ mv bin/result.rom ${ROM}
+	uxncli bin/padder.rom ff00 ${ROM}
+
+	cat bin/oquonie.romx bin/disk1.romx > bin/result.rom
+	mv bin/result.rom bin/oquonie.rom
 	@ ${EMU} ${ROM}
 lint:
 	@ ${LIN} src/${ID}.tal
@@ -21,43 +25,6 @@ uninstall:
 	@ rm -f ${DIR}/${ID}.rom
 push: ${ROM}
 	@ ~/bin/butler push ${ROM} hundredrabbits/${ID}:uxn
-assets: all
-	echo "Build tools"
-	uxnasm tools/packer.tal bin/packer.rom
-	uxnasm tools/padder.tal bin/padder.rom
-	echo "Create characters"
-	cat etc/c.txt | uxncli bin/packer.rom bin/c.rom
-	echo "Create characters(2)"
-	cat etc/c2.txt | uxncli bin/packer.rom bin/c2.rom
-	echo "Create floors"
-	cat etc/f.txt | uxncli bin/packer.rom bin/f.rom
-	# Merge floors with c2
-	cat bin/c2.rom bin/f.rom > bin/c3.rom 
-	mv bin/c3.rom bin/c2.rom
-	echo "Create walls"
-	cat etc/w.txt | uxncli bin/packer.rom bin/w.rom
-	echo "Create maps"
-	cat etc/m.txt | uxncli bin/packer.rom bin/m.rom
-	# Merge walls and maps
-	cat bin/w.rom bin/m.rom > bin/wm.rom
-	echo "Create blockers"
-	cat etc/b.txt | uxncli bin/packer.rom bin/b.rom
-	echo "Create events"
-	cat etc/e.txt | uxncli bin/packer.rom bin/e.rom
-	echo "Create portraits"
-	cat etc/p.txt | uxncli bin/packer.rom bin/p.rom
-	echo "Create camilare"
-	cat etc/a.txt | uxncli bin/packer.rom bin/a.rom
-	# Merge portraits and camilare
-	cat bin/p.rom bin/a.rom > bin/pc.rom
-	echo "Padding assets"
-	uxncli bin/padder.rom 10000 bin/wm.rom
-	uxncli bin/padder.rom 10000 bin/c.rom
-	uxncli bin/padder.rom 10000 bin/c2.rom
-	uxncli bin/padder.rom 10000 bin/b.rom
-	uxncli bin/padder.rom 10000 bin/e.rom
-	uxncli bin/padder.rom 10000 bin/pc.rom
-	echo "Completed assets"
 
 .PHONY: all clean lint run install uninstall push assets all
 
@@ -72,3 +39,42 @@ bin/packer.rom: tools/packer.tal
 ${ROM}: src/*
 	@ mkdir -p bin
 	@ ${ASM} src/${ID}.tal ${ROM}
+
+bin/assets.romx: bin/padder.rom bin/packer.rom
+
+	echo "(Disc1)Walls & Maps"
+	@ cat etc/w.txt | uxncli bin/packer.rom bin/w.rom
+	@ cat etc/m.txt | uxncli bin/packer.rom bin/m.rom
+	@ cat bin/w.rom bin/m.rom > bin/wm.rom
+	@ uxncli bin/padder.rom 10000 bin/wm.rom
+	@ mv bin/wm.romx bin/disk1.romx
+
+
+	echo "Create characters"
+	cat etc/c.txt | uxncli bin/packer.rom bin/c.rom
+	echo "Create characters(2)"
+	cat etc/c2.txt | uxncli bin/packer.rom bin/c2.rom
+	echo "Create floors"
+	cat etc/f.txt | uxncli bin/packer.rom bin/f.rom
+	# Merge floors with c2
+	cat bin/c2.rom bin/f.rom > bin/c3.rom 
+	mv bin/c3.rom bin/c2.rom
+	
+	echo "Create blockers"
+	cat etc/b.txt | uxncli bin/packer.rom bin/b.rom
+	echo "Create events"
+	cat etc/e.txt | uxncli bin/packer.rom bin/e.rom
+	echo "Create portraits"
+	cat etc/p.txt | uxncli bin/packer.rom bin/p.rom
+	echo "Create camilare"
+	cat etc/a.txt | uxncli bin/packer.rom bin/a.rom
+	# Merge portraits and camilare
+	cat bin/p.rom bin/a.rom > bin/pc.rom
+	echo "Padding assets"
+	
+	uxncli bin/padder.rom 10000 bin/c.rom
+	uxncli bin/padder.rom 10000 bin/c2.rom
+	uxncli bin/padder.rom 10000 bin/b.rom
+	uxncli bin/padder.rom 10000 bin/e.rom
+	uxncli bin/padder.rom 10000 bin/pc.rom
+	echo "Completed assets"