Fix N163 instrument load clobbering Kxx state

Fixes #224. Iterates upon #156.
Dn-Programming-Core-Management · Feb 17, 2024 · d252309 · d252309
1 parent b52993e
commit d252309
Show file tree

Hide file tree

Showing 4 changed files with 352 additions and 345 deletions.
diff --git a/Source/drivers/asm/build/build_engine.lua b/Source/drivers/asm/build/build_engine.lua
@@ -15,7 +15,7 @@ end
 
 local build = function (chip)
   print("Building NSF driver for " .. chip .. "...")
-  os.execute([[ca65 ../driver.s -l out_]]..chip..[[.lst -D USE_]]..chip..[[ -D PACKAGE -D USE_BANKSWITCH -D USE_OLDVIBRATO -D USE_LINEARPITCH -o driver.o]])
+  os.execute([[ca65 ../driver.s -l out_]]..chip..[[.lst -D USE_]]..chip..[[ -D NAMCO_CHANNELS=8 -D PACKAGE -D RELOCATE_MUSIC -D USE_BANKSWITCH -D USE_OLDVIBRATO -D USE_LINEARPITCH -o driver.o]])
   os.execute([[ld65 -o c0_]] .. chip .. [[.bin driver.o -C c0.cfg]])
   os.execute([[ld65 -o c1_]] .. chip .. [[.bin driver.o -C c1.cfg]])
 

diff --git a/Source/drivers/asm/n163.s b/Source/drivers/asm/n163.s
@@ -47,6 +47,11 @@ ft_load_inst_extra_n163:
 	iny
 .endif
 @DoneParams:
+    ; check if non-N163 type
+	lda ft_channel_type, x
+	cmp #CHAN_N163
+	bne :++
+    ; check if N163 instrument is about to change
 	lda var_NamcoInstrument - N163_OFFSET, x
 	cmp var_Temp2
 	beq :+