From 073768ba3be3e7274b6e3548ff8f8ea74c05d739 Mon Sep 17 00:00:00 2001 From: Devine Lu Linvega Date: Wed, 31 Aug 2022 11:17:03 -0700 Subject: [PATCH] Use drifblim include --- .build.yml | 3 +-- build.sh | 3 +-- src/main.tal | 3 +++ src/manifest.tal | 2 ++ 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.build.yml b/.build.yml index 9d0ea2e..70bf50b 100644 --- a/.build.yml +++ b/.build.yml @@ -9,8 +9,7 @@ tasks: curl -fsS https://rabbits.srht.site/uxn/uxn-lin64.tar.gz | tar -zx - build: | cd nasu - cat src/main.tal src/manifest.tal src/assets.tal > nasu.tal - ../uxn/uxnasm nasu.tal ../nasu.rom + ../uxn/uxnasm src/main.tal ../nasu.rom - upload: | tar -czf out.tar.gz nasu.rom acurl() { diff --git a/build.sh b/build.sh index bd09177..3e6650f 100755 --- a/build.sh +++ b/build.sh @@ -14,8 +14,7 @@ fi echo "Assembling.." uxncli ~/roms/drifblim.rom etc/nametable.tal bin/nametable.rom -cat src/main.tal src/manifest.tal src/assets.tal > bin/nasu.tal -uxncli ~/roms/drifblim.rom bin/nasu.tal bin/nasu.rom +uxncli ~/roms/drifblim.rom src/main.tal bin/nasu.rom if [ -d "$HOME/roms" ] && [ -e ./bin/nasu.rom ] then diff --git a/src/main.tal b/src/main.tal index d1f7291..0bc6009 100644 --- a/src/main.tal +++ b/src/main.tal @@ -1339,3 +1339,6 @@ JMP2r @untitled-txt "untitled10x10.chr $1 @nametable-ext ".nmt $1 + +~src/manifest.tal + diff --git a/src/manifest.tal b/src/manifest.tal index ee8cf23..bc7b447 100644 --- a/src/manifest.tal +++ b/src/manifest.tal @@ -373,3 +373,5 @@ JMP2r 2020 20b8 7c7c 3838 @blank-icn 0000 0000 0000 0000 + +~src/assets.tal