diff --git a/linker_scripts/apple2_1800.inc b/linker_scripts/apple2_1800.inc index 630ba7b9..70bff642 100644 --- a/linker_scripts/apple2_1800.inc +++ b/linker_scripts/apple2_1800.inc @@ -1,6 +1,6 @@ MEMORY { ZP: start = $00, size = $1A, type = rw; - RAM: start = $1800, size = $7E00, file = %O; + RAM: start = $1800, size = $A800, file = %O; } SEGMENTS { diff --git a/ootw/Makefile b/ootw/Makefile index 2217b953..9a86e4de 100644 --- a/ootw/Makefile +++ b/ootw/Makefile @@ -10,16 +10,16 @@ all: ootw.dsk ootw.dsk: HELLO LOADER INTRO OOTW OOTW_C2 COMPRESS-TEST $(DOS33) -y ootw.dsk SAVE A HELLO $(DOS33) -y ootw.dsk BSAVE -a 0x1400 LOADER - $(DOS33) -y ootw.dsk BSAVE -a 0x2000 INTRO - $(DOS33) -y ootw.dsk BSAVE -a 0x2000 OOTW - $(DOS33) -y ootw.dsk BSAVE -a 0x2000 OOTW_C2 + $(DOS33) -y ootw.dsk BSAVE -a 0x1800 INTRO + $(DOS33) -y ootw.dsk BSAVE -a 0x1800 OOTW + $(DOS33) -y ootw.dsk BSAVE -a 0x1800 OOTW_C2 $(DOS33) -y ootw.dsk BSAVE -a 0x2000 COMPRESS-TEST #### OOTW: ootw.o - ld65 -o OOTW ootw.o -C ../linker_scripts/apple2_2000.inc + ld65 -o OOTW ootw.o -C ../linker_scripts/apple2_1800.inc ootw.o: ootw.s \ gr_copy.s gr_fast_clear.s gr_pageflip.s gr_unrle.s gr_putsprite.s \ @@ -37,7 +37,7 @@ ootw.o: ootw.s \ #### OOTW_C2: ootw_c2.o - ld65 -o OOTW_C2 ootw_c2.o -C ../linker_scripts/apple2_2000.inc + ld65 -o OOTW_C2 ootw_c2.o -C ../linker_scripts/apple2_1800.inc ootw_c2.o: ootw_c2.s \ gr_copy.s gr_fast_clear.s gr_pageflip.s gr_unrle.s gr_putsprite.s \ @@ -51,7 +51,7 @@ ootw_c2.o: ootw_c2.s \ #### INTRO: intro.o - ld65 -o INTRO intro.o -C ../linker_scripts/apple2_2000.inc + ld65 -o INTRO intro.o -C ../linker_scripts/apple2_1800.inc intro.o: intro.s \ gr_copy.s gr_fast_clear.s gr_pageflip.s gr_unrle.s gr_putsprite.s \ diff --git a/ootw/loader.s b/ootw/loader.s index c685749b..6956f92a 100644 --- a/ootw/loader.s +++ b/ootw/loader.s @@ -84,7 +84,7 @@ load_done: jsr opendir ; open and read entire file into memory - jsr $2000 ; jump to common entry point + jsr $1800 ; jump to common entry point ; hope they updated the WHICH_LOAD value