diff --git a/NeutTower.dsk b/NeutTower.dsk index e5f9a4d..abf5934 100644 Binary files a/NeutTower.dsk and b/NeutTower.dsk differ diff --git a/ProDOS_Blank.dsk b/ProDOS_Blank.dsk index 25215fb..cf62e2f 100644 Binary files a/ProDOS_Blank.dsk and b/ProDOS_Blank.dsk differ diff --git a/asm/prodos.fnl b/asm/prodos.fnl index a02c3d6..c46560b 100644 --- a/asm/prodos.fnl +++ b/asm/prodos.fnl @@ -350,7 +350,6 @@ (local iblock self.next-free.iblock) (var block (self:block iblock)) (local file-entry (self:generate-file-entry iblock filename type aux bytes)) - (print (length file-entry) file-entry) (set block (splice block self.next-free.entry.entry-offset file-entry)) (self:set-block iblock block) (self:update-volume-header {:file-count (+ self.root.file-count 1)})) diff --git a/game/disk.fnl b/game/disk.fnl index 1b5fe58..8675eb8 100644 --- a/game/disk.fnl +++ b/game/disk.fnl @@ -11,7 +11,6 @@ ; never want to overlap with 0x2000 from lower memory, so either direction is safe (local dstpage-first (hi org.addr)) (local dstpage-last (hi (+ org.addr (length org.bytes) -1))) - (print srclabel dstpage-first dstpage-last) [:block [:computed :srchi #(+ ($1:lookup-addr :ld-src) 2)] [:computed :dsthi #(+ ($1:lookup-addr :st-dst) 2)] diff --git a/game/init.fnl b/game/init.fnl index 0e7dc54..061ebde 100644 --- a/game/init.fnl +++ b/game/init.fnl @@ -45,7 +45,7 @@ [:vm :hires :lit :level1 :load-level (vm:forever - (vm:hotswap-sync :reload-level) + (vm:hotswap-sync :lit :level6 :load-level) :interactive-eval-checkpoint :handle-key ) diff --git a/link/mame.fnl b/link/mame.fnl index 52de1f2..5b15eea 100644 --- a/link/mame.fnl +++ b/link/mame.fnl @@ -111,14 +111,13 @@ (coroutine.yield) (or result "")) (fn Machine.dbgcmd [self cmd ?handlers] - (print "dbgcmd??" cmd) (self:eval (.. "(manager.machine.debugger:command \"" cmd "\")")) ?handlers) (fn Machine.continue [self] (self:dbgcmd :go)) (fn Machine.step [self] (self:dbgcmd :s)) (fn Machine.set-bp [self addr ?action] ; todo: handle setting the same breakpoint more than once? (tset self.breakpoints addr {:action ?action}) - (self:eval (.. "(-> (. manager.machine.devices ::maincpu) (: :debug) (: :bpset " (tostring addr) "))") + (self:eval (.. "(-> (. manager.machine.devices ::maincpu :debug) (: :bpset " (tostring addr) "))") {:value #(tset (. self.breakpoints addr) :id (tonumber $2))})) (fn Machine.clear-bp [self addr] (local bpid (-?> self.breakpoints (. addr) (. :id)))