diff --git a/demos/xmas_2024/Makefile b/demos/xmas_2024/Makefile index 74d746a2..0b69aff1 100644 --- a/demos/xmas_2024/Makefile +++ b/demos/xmas_2024/Makefile @@ -126,11 +126,11 @@ music.o: music.s zp.inc \ ### XMAS: xmas.o - ld65 -o XMAS xmas.o -C $(LINKER_SCRIPTS)/apple2_6000.inc + ld65 -o XMAS xmas.o -C $(LINKER_SCRIPTS)/apple2_6200.inc xmas.o: xmas.s \ zp.inc hardware.inc qload.inc \ - wipe_star.s \ + wipe_star.s horiz_scroll.s \ graphics/gp_hgr.zx02 ca65 -o xmas.o xmas.s -l xmas.lst diff --git a/demos/xmas_2024/qload.s b/demos/xmas_2024/qload.s index b5576d9d..3a744ae8 100644 --- a/demos/xmas_2024/qload.s +++ b/demos/xmas_2024/qload.s @@ -167,11 +167,11 @@ which_disk_array: .byte 1 ; GP load_address_array: - .byte $D0,$60,$81,$40 ; MUSIC, XMAS, WIPE_STAR_DATA, MERRY_XMAS + .byte $D0,$62,$81,$40 ; MUSIC, XMAS, WIPE_STAR_DATA, MERRY_XMAS .byte $40 ; GP start_address: - .byte $D0,$60,$81,$40 ; MUSIC, XMAS, WIPE_STAR_DATA, MERRY_XMAS + .byte $D0,$62,$81,$40 ; MUSIC, XMAS, WIPE_STAR_DATA, MERRY_XMAS .byte $40 ; GP track_array: @@ -183,7 +183,7 @@ sector_array: .byte 0 ; GP length_array: - .byte 32,32,60,32 ; MUSIC, XMAS, WIPE_STAR_DATA, MERRY_XMAS + .byte 32,30,60,32 ; MUSIC, XMAS, WIPE_STAR_DATA, MERRY_XMAS .byte 32 ; GP PT3_ENABLE_APPLE_IIC = 1 diff --git a/demos/xmas_2024/start.s b/demos/xmas_2024/start.s index 0ee73f0e..32f15080 100644 --- a/demos/xmas_2024/start.s +++ b/demos/xmas_2024/start.s @@ -164,7 +164,7 @@ load_xmas: ; start code - jsr $6000 + jsr $6200 forever: jmp forever diff --git a/linker_scripts/apple2_6200.inc b/linker_scripts/apple2_6200.inc new file mode 100644 index 00000000..c70ccd5f --- /dev/null +++ b/linker_scripts/apple2_6200.inc @@ -0,0 +1,12 @@ +MEMORY { + ZP: start = $00, size = $1A, type = rw; + RAM: start = $6200, size = $5c00, file = %O; +} + +SEGMENTS { +CODE: load = RAM, type = ro, align=$100; +RODATA: load = RAM, type = ro; +DATA: load = RAM, type = rw; +BSS: load = RAM, type = bss, define = yes; +ZEROPAGE: load = ZP, type = zp; +}