From 737a87ac3fef5676baed060d920cbe88b06d09cd Mon Sep 17 00:00:00 2001 From: Devine Lu Linvega Date: Mon, 8 Nov 2021 11:21:23 -0500 Subject: [PATCH] Building boot on start --- README.md | 1 + build.sh | 4 ++-- projects/software/boot.tal | 8 ++++++-- src/uxnemu.c | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 790521f..0d98fa6 100644 --- a/README.md +++ b/README.md @@ -91,6 +91,7 @@ uxnemu orca.rom | shim - `F1` toggle zoom - `F2` toggle debug - `F3` capture screen +- `F4` load boot.rom ## Need a hand? diff --git a/build.sh b/build.sh index bf8c586..16b50ac 100755 --- a/build.sh +++ b/build.sh @@ -4,7 +4,7 @@ echo "Cleaning.." rm -f ./bin/uxnasm rm -f ./bin/uxnemu rm -f ./bin/uxncli -rm -f ./bin/boot.rom +rm -f ./boot.rom rm -f ./bin/asma.rom # When clang-format is present @@ -62,7 +62,7 @@ then fi echo "Assembling(boot).." -./bin/uxnasm projects/software/boot.tal bin/boot.rom +./bin/uxnasm projects/software/boot.tal boot.rom echo "Assembling(asma).." ./bin/uxnasm projects/software/asma.tal bin/asma.rom diff --git a/projects/software/boot.tal b/projects/software/boot.tal index b5df663..5e72e49 100644 --- a/projects/software/boot.tal +++ b/projects/software/boot.tal @@ -60,7 +60,7 @@ ;on-mouse .Mouse/vector DEO2 ( setup synth ) - #0110 .Audio0/adsr DEO2 + #0102 .Audio0/adsr DEO2 ;sin-pcm .Audio0/addr DEO2 #0100 .Audio0/length DEO2 #dd .Audio0/volume DEO ( TODO: turn ON ) @@ -151,13 +151,17 @@ RTN DUP .browser/sel STZ - #40 + .Audio0/pitch DEO + #30 + .Audio0/pitch DEO ;draw-browser JSR2 .browser/x LDZ2 #0018 -- .browser/y LDZ2 [ .browser/sel LDZ TOS 10** ++ ] #0010 #0010 ;hand-icn #02 ;draw-icn JSR2 + #0010 #0010 #0060 #0060 + ;mascot-icn [ .browser/sel LDZ #03 AND TOS #0480 ** ++ ] #01 + ;draw-icn JSR2 + RTN @run-file ( id -- ) diff --git a/src/uxnemu.c b/src/uxnemu.c index c69bb02..0da0b1f 100644 --- a/src/uxnemu.c +++ b/src/uxnemu.c @@ -461,7 +461,7 @@ void reboot(Uxn *u) { set_size(WIDTH, HEIGHT, 1); - boot(u, "bin/boot.rom"); + boot(u, "boot.rom"); } static void