From 72102aaec01215330f445b7eaa94b8875c4f92b5 Mon Sep 17 00:00:00 2001 From: neauoire Date: Fri, 10 Nov 2023 10:19:12 -0800 Subject: [PATCH] Fixed issue with about dialog redraw --- build.sh | 35 ----------------------------------- makefile | 28 ++++++++++++++++++++++++++++ src/manifest.tal | 2 ++ src/nasu.tal | 5 ++--- 4 files changed, 32 insertions(+), 38 deletions(-) delete mode 100755 build.sh create mode 100644 makefile diff --git a/build.sh b/build.sh deleted file mode 100755 index 063b502..0000000 --- a/build.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -e - -ID="nasu" -ASM="uxncli $HOME/roms/drifblim.rom" -EMU="uxnemu" -LIN="uxncli $HOME/roms/uxnlin.rom" -APP="$HOME/bin/butler push" -SRC="src/${ID}.tal" -DST="bin/${ID}.rom" - -CPY="$HOME/roms" -ARG="" -APPID="hundredrabbits/nasu:uxn" - -rm -rf bin -mkdir bin - -if [[ "$*" == *"--lint"* ]] -then - $LIN $SRC -fi - -$ASM $SRC $DST - -if [[ "$*" == *"--save"* ]] -then - cp $DST $CPY -fi - -if [[ "$*" == *"--push"* ]] -then - $APP $DST $APPID -fi - -$EMU $DST $ARG diff --git a/makefile b/makefile new file mode 100644 index 0000000..d5be150 --- /dev/null +++ b/makefile @@ -0,0 +1,28 @@ +ID=nasu +DIR=~/roms +ASM=uxncli ${DIR}/drifblim.rom +LIN=uxncli ${DIR}/uxnlin.rom +EMU=uxnemu +ROM=bin/${ID}.rom + +all: ${ROM} + +clean: + @ rm -f ${ROM} ${ROM}.sym +lint: + @ ${LIN} src/${ID}.tal +test: + @ ${EMU} ${ROM} ako10x10.chr +run: ${ROM} + @ ${EMU} ${ROM} +install: ${ROM} + @ cp ${ROM} ${DIR} +uninstall: + @ rm -f ${DIR}/${ID}.rom +push: ${ROM} + @ ~/bin/butler push ${ROM} hundredrabbits/${ID}:uxn + +.PHONY: all clean lint run install uninstall push + +${ROM}: src/* + @ mkdir -p bin && ${ASM} src/${ID}.tal ${ROM} diff --git a/src/manifest.tal b/src/manifest.tal index c45bf64..35689fd 100644 --- a/src/manifest.tal +++ b/src/manifest.tal @@ -393,6 +393,8 @@ JMP2r @clear-about ( -- ) + #0000 DUP2 .Screen/x DEO2 .Screen/y DEO2 + #80 .Screen/pixel DEO .Screen/width DEI2 #01 SFT2 #0088 SUB2 .Screen/x DEO2 .Screen/height DEI2 #01 SFT2 #0028 SUB2 .Screen/y DEO2 #22 #0091 draw-fill-fast/blank diff --git a/src/nasu.tal b/src/nasu.tal index 0a2b991..858edac 100644 --- a/src/nasu.tal +++ b/src/nasu.tal @@ -71,10 +71,9 @@ BRK ( name ) "Nasu 0a ( details ) "A 20 "Sprite 20 "Editor 0a ( author ) "By 20 "Hundred 20 "Rabbits 0a - ( date ) "June 20 "7, 20 "2023 00 - 02 + ( date ) "10 20 "Nov 20 "2023 00 + 01 ( icon ) 83 =appicon - ( mask ) 41 1705 @manifest