diff --git a/demos/l/music_256/Makefile b/demos/l/music_256/Makefile index 71976def..8b94c027 100644 --- a/demos/l/music_256/Makefile +++ b/demos/l/music_256/Makefile @@ -15,7 +15,7 @@ submit: hgr_d2_1k.zip hgr_d2.dsk: HELLO D2 cp $(EMPTY_DISK)/empty.dsk ./hgr_d2.dsk $(DOS33) -y hgr_d2.dsk SAVE A HELLO - $(DOS33) -y hgr_d2.dsk -t BIN -a 0x60 BSAVE D2 + $(DOS33) -y hgr_d2.dsk -t BIN -a 0x80 BSAVE D2 #### @@ -37,7 +37,7 @@ mA2E_2.s: mA2E_2.txt text_to_tiny #### D2: d2.o - ld65 -o D2 d2.o -C ./apple2_60_zp.inc + ld65 -o D2 d2.o -C ./apple2_80_zp.inc d2.o: d2.s \ zp.inc hardware.inc \ diff --git a/demos/l/music_256/apple2_60_zp.inc b/demos/l/music_256/apple2_80_zp.inc similarity index 83% rename from demos/l/music_256/apple2_60_zp.inc rename to demos/l/music_256/apple2_80_zp.inc index 35f4313d..a911b240 100644 --- a/demos/l/music_256/apple2_60_zp.inc +++ b/demos/l/music_256/apple2_80_zp.inc @@ -1,5 +1,5 @@ MEMORY { - ZP: start = $60, size = $120, type = rw; + ZP: start = $80, size = $120, type = rw; RAM: start = $100, size = $8E00, file = %O; } diff --git a/demos/l/music_256/d2.s b/demos/l/music_256/d2.s index db4f209a..563324ed 100644 --- a/demos/l/music_256/d2.s +++ b/demos/l/music_256/d2.s @@ -33,10 +33,11 @@ ; 238 bytes -- can use Y to save note value in play_frame now ; 237 bytes -- make song terminator #$FF so we don't have to load it ; 235 bytes -- note X is $FF on entry to mockingboard entry +; 234 bytes -- qkumba noticed we can execute the AY config .zeropage -.globalzp frequencies_low -.globalzp frequencies_high +;.globalzp frequencies_low +;.globalzp frequencies_high d2: @@ -50,16 +51,16 @@ d2: ; A=$D0, Z=1 ldx #$FF ; set stack offset - bmi skip_const - - .byte $38,$e,$e,$e ; mixer, A, B, C volume - -.include "notes.inc" - -skip_const: +; bmi skip_const txs ; write 0 to stack pointer + nop + + ; we can execute these... (as qkumba noticed) + + .byte $38,$e,$e,$e ; mixer, A, B, C volume + ;=================== ; music Player Setup @@ -106,7 +107,8 @@ inner_wait: .byte $00,$00,$00,$00 .byte $00,$00,$00,$00,$00 .byte $00,$00,$00 -.byte $00,$00,$00 +.byte $00,$00,$00,$00 ; music .include "mA2E_2.s" +.include "notes.inc" diff --git a/demos/l/music_256/zp.inc b/demos/l/music_256/zp.inc index 91b010bb..4ccb02e1 100644 --- a/demos/l/music_256/zp.inc +++ b/demos/l/music_256/zp.inc @@ -9,7 +9,7 @@ GBASH = $27 BASL = $28 BASH = $29 -AY_REGS = $60 +AY_REGS = $80 HGR_Y = $E2 HGR_COLOR = $E4