diff --git a/games/peasant/Makefile b/games/peasant/Makefile index 9adff3fd..71a82234 100644 --- a/games/peasant/Makefile +++ b/games/peasant/Makefile @@ -8,17 +8,17 @@ EMPTY_DISK = ../../empty_disk all: peasant.dsk -peasant.dsk: QBOOT QLOAD VID_LOGO TITLE PEASANT COPY_CHECK +peasant.dsk: QBOOT QLOAD VID_LOGO TITLE INTRO COPY_CHECK cp $(EMPTY_DISK)/empty.dsk peasant.dsk -# $(DOS33) -y peasant.dsk BSAVE -a 0x6000 PEASANT +# $(DOS33) -y peasant.dsk BSAVE -a 0x6000 INTRO $(DOS33_RAW) peasant.dsk 0 0 QBOOT 0 1 $(DOS33_RAW) peasant.dsk 0 2 QBOOT 1 1 $(DOS33_RAW) peasant.dsk 0 4 QBOOT 2 1 $(DOS33_RAW) peasant.dsk 1 0 QLOAD 0 0 $(DOS33_RAW) peasant.dsk 3 0 VID_LOGO 0 0 - $(DOS33_RAW) peasant.dsk 10 0 TITLE 0 0 - $(DOS33_RAW) peasant.dsk 17 0 PEASANT 0 0 - $(DOS33_RAW) peasant.dsk 24 0 COPY_CHECK 0 0 + $(DOS33_RAW) peasant.dsk 5 0 TITLE 0 0 + $(DOS33_RAW) peasant.dsk 8 0 INTRO 0 0 + $(DOS33_RAW) peasant.dsk 12 0 COPY_CHECK 0 0 ### @@ -45,12 +45,12 @@ qload.o: qload.s qboot.inc ### -VID_LOGO: intro.o - ld65 -o VID_LOGO intro.o -C $(LINKER_SCRIPTS)/apple2_6000.inc +VID_LOGO: vid_logo.o + ld65 -o VID_LOGO vid_logo.o -C $(LINKER_SCRIPTS)/apple2_6000.inc -intro.o: vid_logo.s decompress_fast_v2.s hgr_overlay.s \ +vid_logo.o: vid_logo.s decompress_fast_v2.s hgr_overlay.s \ graphics_vid/vid_graphics.inc - ca65 -o intro.o vid_logo.s -l intro.lst + ca65 -o vid_logo.o vid_logo.s -l vid_logo.lst ### @@ -65,16 +65,17 @@ title.o: title.s \ ### -PEASANT: peasant.o - ld65 -o PEASANT peasant.o -C $(LINKER_SCRIPTS)/apple2_6000.inc +INTRO: intro.o + ld65 -o INTRO intro.o -C $(LINKER_SCRIPTS)/apple2_6000.inc -peasant.o: peasant.s graphics/graphics.inc sprites/peasant_sprite.inc \ +intro.o: intro.s graphics/graphics.inc sprites/peasant_sprite.inc \ draw_box.s hgr_rectangle.s hgr_font.s hgr_input.s \ hgr_7x30_sprite.s hgr_1x5_sprite.s hgr_save_restore.s \ wait_a_bit.s draw_peasant.s \ title.s directions.s \ - cottage.s lake_w.s lake_e.s river.s knight.s - ca65 -o peasant.o peasant.s -l peasant.lst + intro_cottage.s intro_lake_w.s intro_lake_e.s \ + intro_river.s intro_knight.s + ca65 -o intro.o intro.s -l intro.lst ### @@ -116,5 +117,5 @@ graphics_copy/copy_graphics.inc: ### clean: - rm -f *~ *.o *.lst HELLO VID_LOGO TITLE PEASANT COPY_CHECK + rm -f *~ *.o *.lst HELLO VID_LOGO TITLE INTRO COPY_CHECK diff --git a/games/peasant/NOTES b/games/peasant/NOTES index 80bce656..b481cdff 100644 --- a/games/peasant/NOTES +++ b/games/peasant/NOTES @@ -1,6 +1,8 @@ Memory Map ~~~~~~~~~~ +; notes -- VID_LOGO loads title at $9000 - $AFFF + $00 Zero Page $01 ??? $02 ??? @@ -21,10 +23,10 @@ Disk Map (disk has 35 tracks, each 4k in size) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ T 0 = Qboot T 1 = QLOAD 4301 bytes 17S = 1T1S -T 3 = INTRO 6911 bytes 27S = 1T11S -T 10 = TITLE 9662 bytes 38S = 2T16S -T 17 = PEASANT 14265 bytes 56S = 3T8S -T 24 = ENDING 4642 bytes 18S = 1T2S +T 3 = VID_LOGO 6911 bytes 27S = 1T11S +T 5 = TITLE 9662 bytes 38S = 2T6S +T 8 = INTRO 14265 bytes 56S = 3T8S +T 12 = COPY_CHECK 4642 bytes 18S = 1T2S diff --git a/games/peasant/peasant.s b/games/peasant/intro.s similarity index 90% rename from games/peasant/peasant.s rename to games/peasant/intro.s index 0d4f051c..d300e61f 100644 --- a/games/peasant/peasant.s +++ b/games/peasant/intro.s @@ -72,7 +72,7 @@ peasant_quest: ; Ending ;************************ - lda #LOAD_ENDING + lda #LOAD_COPY_CHECK sta WHICH_LOAD rts @@ -81,11 +81,11 @@ peasant_quest: .include "decompress_fast_v2.s" .include "wait_keypress.s" -.include "cottage.s" -.include "lake_w.s" -.include "lake_e.s" -.include "river.s" -.include "knight.s" +.include "intro_cottage.s" +.include "intro_lake_w.s" +.include "intro_lake_e.s" +.include "intro_river.s" +.include "intro_knight.s" .include "draw_peasant.s" diff --git a/games/peasant/cottage.s b/games/peasant/intro_cottage.s similarity index 100% rename from games/peasant/cottage.s rename to games/peasant/intro_cottage.s diff --git a/games/peasant/knight.s b/games/peasant/intro_knight.s similarity index 100% rename from games/peasant/knight.s rename to games/peasant/intro_knight.s diff --git a/games/peasant/lake_e.s b/games/peasant/intro_lake_e.s similarity index 100% rename from games/peasant/lake_e.s rename to games/peasant/intro_lake_e.s diff --git a/games/peasant/lake_w.s b/games/peasant/intro_lake_w.s similarity index 100% rename from games/peasant/lake_w.s rename to games/peasant/intro_lake_w.s diff --git a/games/peasant/river.s b/games/peasant/intro_river.s similarity index 100% rename from games/peasant/river.s rename to games/peasant/intro_river.s diff --git a/games/peasant/qload.s b/games/peasant/qload.s index 42fe423b..590013d8 100644 --- a/games/peasant/qload.s +++ b/games/peasant/qload.s @@ -12,12 +12,6 @@ tmpsec = $3C ;OUTL = $FE ;OUTH = $FF - -;LOAD_INTRO = 0 -;LOAD_TITLE = 1 -;LOAD_PEASANT = 2 -;LOAD_ENDING = 3 - .include "hardware.inc" ;.include "common_defines.inc" @@ -32,7 +26,7 @@ qload_start: ; first time entry ; start by loading text title - lda #LOAD_INTRO ; load intro + lda #LOAD_VID_LOGO ; load intro sta WHICH_LOAD lda #1 @@ -194,8 +188,8 @@ error_string: which_disk_array: - .byte 1,1,1,1 ; INTRO, TITLE, PEASANT. ENDING - .byte 1,1,3,2 ; + .byte 1,1,1,1 ; VID_LOGO, TITLE, INTRO. COPY_CHECK + .byte 1,1,3,2 ; PEASANT .byte 2,1,2,2 ; .byte 1,1,1,3 ; .byte 1 ; @@ -203,8 +197,8 @@ which_disk_array: .byte $f ; load_address_array: - .byte $60,$60,$60,$60 ; INTRO, TITLE, PEASANT, ENDING - .byte $40,$40,$40,$40 ; + .byte $60,$60,$60,$60 ; VID_LOGO, TITLE, INTRO, COPY_CHECK + .byte $60,$40,$40,$40 ; PEASANT .byte $40,$40,$40,$40 ; .byte $40,$40,$40,$40 ; .byte $08 ; @@ -213,8 +207,8 @@ load_address_array: .byte $08 ; track_array: - .byte 3,10,17,24 ; INTRO, TITLE, PEASANT, ENDING - .byte 18,31,11, 1 ; + .byte 3, 5, 8,12 ; VID_LOGO, TITLE, INTRO, COPY_CHECK + .byte 18,31,11, 1 ; PEASANT .byte 27,26,10,20 ; .byte 30,32,28,30 ; .byte 0 ; @@ -222,8 +216,8 @@ track_array: .byte 0 ; sector_array: - .byte 0, 0, 0, 0 ; INTRO, TITLE, PEASANT, ENDING - .byte 0, 8, 0, 0 ; + .byte 0, 0, 0, 0 ; VID_LOGO, TITLE, INTRO, COPY_CHECK + .byte 0, 8, 0, 0 ; PEASANT .byte 0, 0, 0, 0 ; .byte 0,13, 0, 1 ; .byte 6 ; @@ -231,8 +225,8 @@ sector_array: .byte 0 ; length_array: - .byte 88, 88,88,88 ; INTRO, TITLE, PEASANT, ENDING - .byte 128, 20,158,135 ; + .byte 28, 50, 60, 20 ; VID_LOGO, TITLE, INTRO, COPY_CHECK + .byte 88, 20,158,135 ; PEASANT .byte 61, 31,159,109 ; .byte 20, 33, 27, 78 ; .byte 3 ; @@ -250,14 +244,13 @@ length_array: .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" -;.align $100 -;peasant2_pt3: -;.incbin "music/peasant2.pt3" + qload_end: diff --git a/games/peasant/title.s b/games/peasant/title.s index 3290223d..ab3bd214 100644 --- a/games/peasant/title.s +++ b/games/peasant/title.s @@ -225,7 +225,7 @@ altfire_good: jsr directions - lda #LOAD_PEASANT + lda #LOAD_INTRO sta WHICH_LOAD diff --git a/games/peasant/vid_logo.s b/games/peasant/vid_logo.s index 04e552f5..bd0082e8 100644 --- a/games/peasant/vid_logo.s +++ b/games/peasant/vid_logo.s @@ -1,5 +1,7 @@ ; Videlectrix Intro +; o/~ Make Good Graphics o/~ + ; HGR is a pain ; by Vince `deater` Weaver vince@deater.net diff --git a/games/peasant/zp.inc b/games/peasant/zp.inc index deefa56f..fb32b474 100644 --- a/games/peasant/zp.inc +++ b/games/peasant/zp.inc @@ -94,11 +94,13 @@ INH = $FD OUTL = $FE OUTH = $FF -LOAD_INTRO = 0 -LOAD_TITLE = 1 -LOAD_PEASANT = 2 -LOAD_ENDING = 3 +; constants +LOAD_VID_LOGO = 0 +LOAD_TITLE = 1 +LOAD_INTRO = 2 +LOAD_COPY_CHECK = 3 +LOAD_PEASANT = 4 VGI_RCOLOR = P0 VGI_RX1 = P1