diff --git a/linker_scripts/apple2_5900.inc b/linker_scripts/apple2_5900.inc new file mode 100644 index 00000000..8306616b --- /dev/null +++ b/linker_scripts/apple2_5900.inc @@ -0,0 +1,12 @@ +MEMORY { + ZP: start = $00, size = $1A, type = rw; + RAM: start = $5900, size = $5000, 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; +} diff --git a/still_alive/Makefile b/still_alive/Makefile index 6f470a94..78d5d1c6 100644 --- a/still_alive/Makefile +++ b/still_alive/Makefile @@ -6,14 +6,14 @@ TOKENIZE = ../asoft_basic-utils/tokenize_asoft all: still_alive.dsk still_alive.dsk: SA_COMPRESSED STILL_ALIVE TITLE.BAS ENDING - $(DOS33) -y still_alive.dsk BSAVE -a 0x5a00 SA_COMPRESSED + $(DOS33) -y still_alive.dsk BSAVE -a 0x5900 SA_COMPRESSED $(DOS33) -y still_alive.dsk BSAVE -a 0x0800 STILL_ALIVE $(DOS33) -y still_alive.dsk BSAVE -a 0x1800 ENDING $(DOS33) -y still_alive.dsk SAVE A TITLE.BAS # $(DOS33) -y still_alive.dsk SAVE B GLADOS.HGR SA_COMPRESSED: sa_compressed.o - ld65 -o SA_COMPRESSED sa_compressed.o -C ../linker_scripts/apple2_5a00.inc + ld65 -o SA_COMPRESSED sa_compressed.o -C ../linker_scripts/apple2_5900.inc sa_compressed.o: sa_compressed.s \ STILL_ALIVE.lz4 ENDING.lz4 SA.ED.lz4 SA.KR4.lz4 diff --git a/still_alive/mockingboard_a.s b/still_alive/mockingboard_a.s index fff7ca78..3f59db0e 100644 --- a/still_alive/mockingboard_a.s +++ b/still_alive/mockingboard_a.s @@ -121,6 +121,7 @@ clear_ay_left_loop: bpl clear_ay_left_loop rts +.if 0 ;======================================= ; Detect a Mockingboard card ;======================================= @@ -204,3 +205,4 @@ mb4_not_in_this_slot: ldx #00 beq done_mb4_detect +.endif diff --git a/still_alive/sa_mb.s b/still_alive/sa_mb.s index 8430f502..2c147d70 100644 --- a/still_alive/sa_mb.s +++ b/still_alive/sa_mb.s @@ -21,13 +21,15 @@ still_alive_mb: ; call mockingboard detect? - jsr mockingboard_detect_slot4 ; call detection routine - cpx #$1 - beq mockingboard_found + ; ASSUME FOUND TO SAVE ROOM + +; jsr mockingboard_detect_slot4 ; call detection routine +; cpx #$1 +; beq mockingboard_found ; Not found. ; Print a message for debugging? - jmp forever_loop ; and wait forever +; jmp forever_loop ; and wait forever mockingboard_found: diff --git a/still_alive/still_alive.dsk b/still_alive/still_alive.dsk index dd878c52..9ac98bce 100644 Binary files a/still_alive/still_alive.dsk and b/still_alive/still_alive.dsk differ