diff --git a/games/peasant/Makefile b/games/peasant/Makefile index a6953727..7cb136e9 100644 --- a/games/peasant/Makefile +++ b/games/peasant/Makefile @@ -56,7 +56,8 @@ qboot_sector.o: qboot_sector.s qboot_stage2.s QLOAD: qload.o ld65 -o QLOAD qload.o -C $(LINKER_SCRIPTS)/apple2_b00.inc -qload.o: qload.s qboot.inc +qload.o: qload.s qboot.inc \ + decompress_fast_v2.s ca65 -o qload.o qload.s -l qload.lst ### @@ -77,6 +78,13 @@ generate_common.o: generate_common.c #### +qload.inc: generate_common QLOAD + ./generate_common -a 0xb00 -s load_file qload.lst > qload.inc + ./generate_common -a 0xb00 -s decompress_lzsa2_fast qload.lst >> qload.inc + ./generate_common -a 0xb00 -s getsrc_smc qload.lst >> qload.inc + +#### + music.inc: generate_common MUSIC ./generate_common -a 0xd000 -s pt3_init_song music.lst > music.inc ./generate_common -a 0xd000 -s mockingboard_init music.lst >> music.inc @@ -101,7 +109,7 @@ vid_logo.o: vid_logo.s decompress_fast_v2.s hgr_overlay.s speaker_beeps.s \ TITLE: title.o ld65 -o TITLE title.o -C $(LINKER_SCRIPTS)/apple2_6000.inc -title.o: title.s music.inc \ +title.o: title.s qload.inc music.inc \ graphics_title/title_graphics.inc \ graphics_title/altfire.inc \ directions.s \ diff --git a/games/peasant/copy_check.s b/games/peasant/copy_check.s index 13de7d35..aaff4665 100644 --- a/games/peasant/copy_check.s +++ b/games/peasant/copy_check.s @@ -12,6 +12,7 @@ .include "hardware.inc" .include "zp.inc" +.include "qload.inc" ;************************ ; Ending @@ -110,7 +111,7 @@ forever: jmp forever -.include "decompress_fast_v2.s" +;.include "decompress_fast_v2.s" .include "wait_keypress.s" .include "hgr_font.s" diff --git a/games/peasant/ending.s b/games/peasant/ending.s index fc5c6606..376b8821 100644 --- a/games/peasant/ending.s +++ b/games/peasant/ending.s @@ -535,7 +535,7 @@ peasant_text: .byte 25,2,"Peasant's Quest",0 -.include "decompress_fast_v2.s" +;.include "decompress_fast_v2.s" .include "wait_keypress.s" .include "hgr_font.s" diff --git a/games/peasant/intro.s b/games/peasant/intro.s index f2000635..a83ebf4a 100644 --- a/games/peasant/intro.s +++ b/games/peasant/intro.s @@ -151,7 +151,7 @@ escape_handler: rts -.include "decompress_fast_v2.s" +;.include "decompress_fast_v2.s" .include "wait_keypress.s" .include "intro_cottage.s" diff --git a/games/peasant/music.inc b/games/peasant/music.inc index 0264cc9a..856843d1 100644 --- a/games/peasant/music.inc +++ b/games/peasant/music.inc @@ -1,27 +1,16 @@ -;============================= -; external routines - -; pt3_init_song =$d8e9 -; mockingboard_init =$db21 -; reset_ay_both =$db30 -; clear_ay_both =$db72 -; mockingboard_setup_interrupt =$db7f -; mockingboard_disable_interrupt =$dbb9 -; done_pt3_irq_handler =$dc31 -; PT3_LOC =$dd00 diff --git a/games/peasant/peasant1.s b/games/peasant/peasant1.s index 733f7b79..a249345e 100644 --- a/games/peasant/peasant1.s +++ b/games/peasant/peasant1.s @@ -148,7 +148,7 @@ peasant_text: .byte 25,2,"Peasant's Quest",0 -.include "decompress_fast_v2.s" +;.include "decompress_fast_v2.s" .include "wait_keypress.s" .include "draw_peasant.s" diff --git a/games/peasant/peasant2.s b/games/peasant/peasant2.s index db2baa30..aaf47f41 100644 --- a/games/peasant/peasant2.s +++ b/games/peasant/peasant2.s @@ -149,7 +149,7 @@ peasant_text: -.include "decompress_fast_v2.s" +;.include "decompress_fast_v2.s" .include "wait_keypress.s" .include "draw_peasant.s" diff --git a/games/peasant/peasant3.s b/games/peasant/peasant3.s index 81891dfd..30e8294c 100644 --- a/games/peasant/peasant3.s +++ b/games/peasant/peasant3.s @@ -148,7 +148,7 @@ peasant_text: -.include "decompress_fast_v2.s" +;.include "decompress_fast_v2.s" .include "wait_keypress.s" .include "draw_peasant.s" diff --git a/games/peasant/peasant4.s b/games/peasant/peasant4.s index 42b1954f..4addf256 100644 --- a/games/peasant/peasant4.s +++ b/games/peasant/peasant4.s @@ -151,7 +151,7 @@ peasant_text: -.include "decompress_fast_v2.s" +;.include "decompress_fast_v2.s" .include "wait_keypress.s" .include "draw_peasant.s" diff --git a/games/peasant/qload.inc b/games/peasant/qload.inc index 99cf8010..342694b5 100644 --- a/games/peasant/qload.inc +++ b/games/peasant/qload.inc @@ -1,18 +1,6 @@ -; Danger: if you mess with QLOAD you'll have to update these +load_file =$0b20 -QLOAD_LOC=$B00 +decompress_lzsa2_fast =$0de6 -load_file = QLOAD_LOC+$20 - -;pt3_init_song=QLOAD_LOC+$BF9 -;mockingboard_init=QLOAD_LOC+$E31 -;reset_ay_both=QLOAD_LOC+$E40 -;clear_ay_both=QLOAD_LOC+$E82 -;mockingboard_setup_interrupt=QLOAD_LOC+$E8F -;mockingboard_disable_interrupt=QLOAD_LOC+$EC1 -;interrupt_handler=QLOAD_LOC+$ECD -;mockingboard_patch=QLOAD_LOC+$F4E -;mockingboard_detect=QLOAD_LOC+$F76 - -;PT3_LOC=QLOAD_LOC+$1000 +getsrc_smc =$0edc diff --git a/games/peasant/qload.s b/games/peasant/qload.s index 69c0145b..4a334c94 100644 --- a/games/peasant/qload.s +++ b/games/peasant/qload.s @@ -235,23 +235,7 @@ length_array: .include "qkumba_popwr.s" - ; pt3 player -; .include "pt3_lib_detect_model.s" -; .include "pt3_lib_core.s" -; .include "pt3_lib_init.s" -; .include "pt3_lib_mockingboard_setup.s" -; .include "interrupt_handler.s" -; .include "pt3_lib_mockingboard_patch.s" -; .include "pt3_lib_mockingboard_detect.s" - - -; only load one music track, self modify to make other - -;.align $100 -;PT3_LOC: -;peasant_pt3: -;.incbin "music/peasant.pt3" - +.include "decompress_fast_v2.s" qload_end: diff --git a/games/peasant/title.s b/games/peasant/title.s index 94234776..8bcdac51 100644 --- a/games/peasant/title.s +++ b/games/peasant/title.s @@ -241,7 +241,7 @@ altfire_good: -.include "decompress_fast_v2.s" +;.include "decompress_fast_v2.s" .include "wait_keypress.s" .include "directions.s" diff --git a/games/peasant/trogdor.s b/games/peasant/trogdor.s index bc00f607..d756ac63 100644 --- a/games/peasant/trogdor.s +++ b/games/peasant/trogdor.s @@ -311,7 +311,7 @@ peasant_text: .byte 25,2,"Peasant's Quest",0 -.include "decompress_fast_v2.s" +;.include "decompress_fast_v2.s" .include "wait_keypress.s"