From f1e1110d30de74c9ef156425797b67dbed8a64ef Mon Sep 17 00:00:00 2001 From: Nihilazo Date: Thu, 13 Jan 2022 20:59:06 +0000 Subject: [PATCH] this is broken but I need to show it --- engine.tal | 21 +++++++++++---------- player.tal | 2 ++ 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/engine.tal b/engine.tal index a9fa85c..709fad9 100644 --- a/engine.tal +++ b/engine.tal @@ -25,7 +25,7 @@ multiple channels ) .kalama/songpos STZ2 RTN &reset - POP + POP2 #0000 .kalama/songpos STZ2 RTN @@ -34,9 +34,8 @@ RTN &run DUP2 .kalama/module STZ2 ( store module address ) DUP2 LDA #0f AND .kalama/speed STZ ( set speed ) - #0001 ADD2 LDA ( get pattern count byte ) - ;k-get-pattern/run JSR2 ( get the "pattern" that is 1 over the pattern index numbers. This is the first byte of the instruments ) - .kalama/instruments STZ2 + #0001 ADD2 LDA ( stash pattern count byte ) + ;DEBUG-instruments .kalama/instruments STZ2 #ff .kalama/tick STZ #ff .kalama/line STZ #0000 .kalama/songpos STZ2 @@ -46,13 +45,13 @@ RTN ( gets the memory address of the given pattern in loaded module ) @k-get-pattern ( number -- addr* ) &run +( #00 #01 EQU ,&blank JCN ) #00 SWP #0030 MUL2 - .kalama/module LDZ2 - #0003 ADD2 ( skip header ) - DUP2 LDA2 ADD2 ( skip song table body ) - #0002 ADD2 ( skip song table size short ) - ADD2 - + ;module #0003 ADD2 DUP2 LDA2 ADD2 #0002 ADD2 ADD2 + RTN + &blank + POP + ;k-blank-pattern RTN ( gets the memory address of the given instrument in loaded module ) @@ -109,3 +108,5 @@ RTN POPr RTN + +@k-blank-pattern $30 diff --git a/player.tal b/player.tal index 2b3aaec..fcf33f4 100644 --- a/player.tal +++ b/player.tal @@ -91,6 +91,7 @@ RTN 0008 ( size ) 00 ff ff ff 01 ff ff ff ( song table, 2 rows ) +@DEBUG-patterns ( pattern 00 ) 54 02 00 ( C-3 I00 ) 52 00 00 @@ -125,6 +126,7 @@ ff 00 00 50 00 00 54 00 00 ff 00 00 +@DEBUG-instruments ( instrument 00 ) 0002 ( sample length ) ff ( volume )