diff --git a/games/riven_hgr/Makefile b/games/riven_hgr/Makefile index e83c32d1..ffb37ef7 100644 --- a/games/riven_hgr/Makefile +++ b/games/riven_hgr/Makefile @@ -148,7 +148,8 @@ riven_disk43.dsk: QBOOT QLOAD TITLE_43 \ disk43_files/LEVEL_CART \ disk43_files/LEVEL_BRIDGE \ disk43_files/LEVEL_LOGGED \ - disk43_files/LEVEL_LOGGED2 + disk43_files/LEVEL_LOGGED2 \ + disk43_files/MOVIE_CART_RIDE cp $(EMPTY_DISK)/empty.dsk riven_disk43.dsk $(DOS33_RAW) riven_disk43.dsk 0 0 QBOOT 0 1 $(DOS33_RAW) riven_disk43.dsk 0 2 QBOOT 1 1 @@ -160,10 +161,11 @@ riven_disk43.dsk: QBOOT QLOAD TITLE_43 \ $(DOS33_RAW) riven_disk43.dsk 9 0 disk43_files/LEVEL_BRIDGE 0 0 $(DOS33_RAW) riven_disk43.dsk 16 0 disk43_files/LEVEL_LOGGED 0 0 $(DOS33_RAW) riven_disk43.dsk 22 0 disk43_files/LEVEL_LOGGED2 0 0 + $(DOS33_RAW) riven_disk43.dsk 27 0 disk43_files/MOVIE_CART_RIDE 0 0 riven_disk50.dsk: QBOOT QLOAD TITLE_50 \ disk50_files/DISK50 \ - disk50_files/LEVEL_START + disk50_files/LEVEL_CHIPPER cp $(EMPTY_DISK)/empty.dsk riven_disk50.dsk $(DOS33_RAW) riven_disk50.dsk 0 0 QBOOT 0 1 $(DOS33_RAW) riven_disk50.dsk 0 2 QBOOT 1 1 @@ -171,7 +173,7 @@ riven_disk50.dsk: QBOOT QLOAD TITLE_50 \ $(DOS33_RAW) riven_disk50.dsk 0 1 disk50_files/DISK50 0 0 $(DOS33_RAW) riven_disk50.dsk 0 8 TITLE_50 0 0 $(DOS33_RAW) riven_disk50.dsk 1 0 QLOAD 0 0 - $(DOS33_RAW) riven_disk50.dsk 2 0 disk50_files/LEVEL_START 0 0 + $(DOS33_RAW) riven_disk50.dsk 2 0 disk50_files/LEVEL_CHIPPER 0 0 ### @@ -380,7 +382,7 @@ disk43_files/LEVEL_CART: #### -disk50_files/LEVEL_START: +disk50_files/LEVEL_CHIPPER: cd disk50_files && make @@ -512,8 +514,9 @@ riven_hgr.2mg: dts_block PROBOOTHD QLOAD_HD \ disk43_files/LEVEL_BRIDGE \ disk43_files/LEVEL_LOGGED \ disk43_files/LEVEL_LOGGED2 \ + disk43_files/MOVIE_CART_RIDE \ disk50_files/DISK50 \ - disk50_files/LEVEL_START + disk50_files/LEVEL_CHIPPER $(PRODOSDIR)/mkprodosfs riven_hgr.2mg -n Riven -b 65535 -2 $(PRODOS_RAW) riven_hgr.2mg 0 PROBOOTHD 0 0 $(PRODOS_RAW) riven_hgr.2mg `./dts_block 0 1 0` QLOAD_HD 0 0 @@ -556,8 +559,9 @@ riven_hgr.2mg: dts_block PROBOOTHD QLOAD_HD \ $(PRODOS_RAW) riven_hgr.2mg `./dts_block 43 9 0` disk43_files/LEVEL_BRIDGE 0 0 $(PRODOS_RAW) riven_hgr.2mg `./dts_block 43 16 0` disk43_files/LEVEL_LOGGED 0 0 $(PRODOS_RAW) riven_hgr.2mg `./dts_block 43 22 0` disk43_files/LEVEL_LOGGED2 0 0 + $(PRODOS_RAW) riven_hgr.2mg `./dts_block 43 27 0` disk43_files/MOVIE_CART_RIDE 0 0 $(PRODOS_RAW) riven_hgr.2mg `./dts_block 50 0 2` disk50_files/DISK50 0 0 - $(PRODOS_RAW) riven_hgr.2mg `./dts_block 50 2 0` disk50_files/LEVEL_START 0 0 + $(PRODOS_RAW) riven_hgr.2mg `./dts_block 50 2 0` disk50_files/LEVEL_CHIPPER 0 0 ### diff --git a/games/riven_hgr/disk39_files/Makefile b/games/riven_hgr/disk39_files/Makefile index 5e909554..80cf478c 100644 --- a/games/riven_hgr/disk39_files/Makefile +++ b/games/riven_hgr/disk39_files/Makefile @@ -59,7 +59,7 @@ LEVEL_MAGLEV: level_maglev.o ld65 -o LEVEL_MAGLEV level_maglev.o -C $(LINKER_SCRIPTS)/apple2_4000.inc level_maglev.o: level_maglev.s \ - flip_pages.s \ + ../flip_pages.s \ ../zp.inc ../hardware.inc ../qload.inc \ ../common_defines.inc disk39_defines.inc \ leveldata_maglev.inc \ @@ -72,7 +72,7 @@ MOVIE_MAGLEV_FLIP: movie_maglev_flip.o ld65 -o MOVIE_MAGLEV_FLIP movie_maglev_flip.o -C $(LINKER_SCRIPTS)/apple2_4000.inc movie_maglev_flip.o: movie_maglev_flip.s \ - flip_pages.s \ + ../flip_pages.s \ ../zp.inc ../hardware.inc ../qload.inc \ ../common_defines.inc disk39_defines.inc \ movie_maglev_flip/movie_maglev_flip.inc \ diff --git a/games/riven_hgr/disk39_files/movie_maglev_flip.s b/games/riven_hgr/disk39_files/movie_maglev_flip.s index 3c15e966..183ad464 100644 --- a/games/riven_hgr/disk39_files/movie_maglev_flip.s +++ b/games/riven_hgr/disk39_files/movie_maglev_flip.s @@ -435,7 +435,7 @@ skip_write: rts - .include "flip_pages.s" + .include "../flip_pages.s" ;=================================== diff --git a/games/riven_hgr/disk39_files/movie_maglev_ride.s b/games/riven_hgr/disk39_files/movie_maglev_ride.s index 2e9a7978..76f8c6d9 100644 --- a/games/riven_hgr/disk39_files/movie_maglev_ride.s +++ b/games/riven_hgr/disk39_files/movie_maglev_ride.s @@ -307,7 +307,7 @@ skip_write: rts - .include "flip_pages.s" + .include "../flip_pages.s" ;=================================== diff --git a/games/riven_hgr/disk40_files/Makefile b/games/riven_hgr/disk40_files/Makefile index c492d3bd..a01c5d61 100644 --- a/games/riven_hgr/disk40_files/Makefile +++ b/games/riven_hgr/disk40_files/Makefile @@ -70,7 +70,7 @@ MOVIE_MAGLEV_FLIP: movie_maglev_flip.o ld65 -o MOVIE_MAGLEV_FLIP movie_maglev_flip.o -C $(LINKER_SCRIPTS)/apple2_4000.inc movie_maglev_flip.o: movie_maglev_flip.s \ - flip_pages.s \ + ../flip_pages.s \ ../zp.inc ../hardware.inc ../qload.inc \ ../common_defines.inc disk40_defines.inc \ movie_maglev_flip/movie_maglev_flip.inc \ diff --git a/games/riven_hgr/disk40_files/flip_pages.s b/games/riven_hgr/disk40_files/flip_pages.s deleted file mode 100644 index dfcda9fd..00000000 --- a/games/riven_hgr/disk40_files/flip_pages.s +++ /dev/null @@ -1,17 +0,0 @@ - ;============================ - ; flip pages - ;============================ -flip_pages: - lda DRAW_PAGE ; 3 - beq was_page1 ; 2/3 -was_page2: - bit PAGE2 ; 4 - lda #$0 ; 2 - beq done_pageflip ; 2/3 -was_page1: - bit PAGE1 ; 4 - lda #$4 ; 2 -done_pageflip: - sta DRAW_PAGE ; 3 - - rts diff --git a/games/riven_hgr/disk40_files/movie_maglev_flip.s b/games/riven_hgr/disk40_files/movie_maglev_flip.s index dfd765e2..4a53a9c3 100644 --- a/games/riven_hgr/disk40_files/movie_maglev_flip.s +++ b/games/riven_hgr/disk40_files/movie_maglev_flip.s @@ -437,7 +437,7 @@ skip_write: rts - .include "flip_pages.s" + .include "../flip_pages.s" ;=================================== diff --git a/games/riven_hgr/disk40_files/movie_maglev_ride.s b/games/riven_hgr/disk40_files/movie_maglev_ride.s index 227d36fc..383ff3a1 100644 --- a/games/riven_hgr/disk40_files/movie_maglev_ride.s +++ b/games/riven_hgr/disk40_files/movie_maglev_ride.s @@ -286,7 +286,7 @@ skip_write: rts - .include "flip_pages.s" + .include "../flip_pages.s" ;=================================== diff --git a/games/riven_hgr/disk43_files/Makefile b/games/riven_hgr/disk43_files/Makefile index 4675fe80..921f0d89 100644 --- a/games/riven_hgr/disk43_files/Makefile +++ b/games/riven_hgr/disk43_files/Makefile @@ -3,7 +3,8 @@ include ../../../Makefile.inc LINKER_SCRIPTS = ../../../linker_scripts/ -all: DISK43 LEVEL_CART LEVEL_BRIDGE LEVEL_LOGGED LEVEL_LOGGED2 +all: DISK43 LEVEL_CART LEVEL_BRIDGE LEVEL_LOGGED LEVEL_LOGGED2 \ + MOVIE_CART_RIDE #### @@ -61,22 +62,17 @@ level_logged2.o: level_logged2.s \ graphics_logged2/logged2_graphics.inc ca65 -o level_logged2.o level_logged2.s -l level_logged2.lst - - - #### -MOVIE_MAGLEV_RIDE: movie_maglev_ride.o - ld65 -o MOVIE_MAGLEV_RIDE movie_maglev_ride.o -C $(LINKER_SCRIPTS)/apple2_4000.inc +MOVIE_CART_RIDE: movie_cart_ride.o + ld65 -o MOVIE_CART_RIDE movie_cart_ride.o -C $(LINKER_SCRIPTS)/apple2_4000.inc -movie_maglev_ride.o: movie_maglev_ride.s \ +movie_cart_ride.o: movie_cart_ride.s \ ../zp.inc ../hardware.inc ../qload.inc \ - ../common_defines.inc disk43_defines.inc \ - end_message/end_message.gr.zx02 \ - movie_maglev_ride/movie_maglev_ride.inc - ca65 -o movie_maglev_ride.o movie_maglev_ride.s -l movie_maglev_ride.lst - - + ../common_defines.inc ../flip_pages.s disk43_defines.inc \ + movie_cart_ride/movie_cart_ride.inc \ + ../disk39_files/movie_maglev_ride/overlays/overlay_combined.zx02 + ca65 -o movie_cart_ride.o movie_cart_ride.s -l movie_cart_ride.lst #### @@ -92,6 +88,10 @@ graphics_logged/logged_graphics.inc: graphics_logged2/logged2_graphics.inc: cd graphics_logged2 && make +movie_cart_ride/movie_cart_ride.inc: + cd movie_cart_ride && make + + #### clean: diff --git a/games/riven_hgr/disk43_files/disk43.s b/games/riven_hgr/disk43_files/disk43.s index 38aacd41..318d310a 100644 --- a/games/riven_hgr/disk43_files/disk43.s +++ b/games/riven_hgr/disk43_files/disk43.s @@ -1,5 +1,6 @@ .include "../zp.inc" .include "../disk41_files/disk41_defines.inc" +.include "../disk50_files/disk50_defines.inc" .include "../disk00_files/disk00_defines.inc" which_disk_bcd: @@ -10,59 +11,59 @@ which_disk_bin: load_address_array: .byte $40,$40,$40,$40 ; TITLE, CART, BRIDGE,LOGGED - .byte $40,$00,$00,$00 ; LOGGED2 + .byte $40,$40,$00,$00 ; LOGGED2, MOVIE_CART track_array: .byte 0, 2, 9,16 ; TITLE, CART, BRIDGE,LOGGED - .byte 22,0,0,0 ; LOGGED2 + .byte 22,27,0,0 ; LOGGED2, MOVIE_CART sector_array: .byte 8, 0, 0, 0 ; TITLE, CART, BRIDGE,LOGGED - .byte 0,0,0,0 ; LOGGED2 + .byte 0,0,0,0 ; LOGGED2, MOVIE_CART length_array: .byte 8, 96,84, 96 ; TITLE, CART, BRIDGE,LOGGED - .byte 80,0,0,0 + .byte 80,127,0,0 ; MOVIE_CART ; disk 41 disk_exit_disk: ; note: not BCD anymore .byte 41 - .byte 0 + .byte 50 .byte 0 .byte 0 -disk_exit_disk_bcd: ; note: not BCD anymore +disk_exit_disk_bcd: .byte $41 - .byte 0 + .byte $50 .byte 0 .byte 0 disk_exit_dni_h: .byte $01 ; 41 = 1*25 + 3*5 + 1 - .byte 0 + .byte $02 ; 50 = 2*25 + 0 .byte 0 .byte 0 disk_exit_dni_l: .byte $31 - .byte 0 + .byte $00 .byte 0 .byte 0 ; STAIRS2, RIVEN_UP4, E disk_exit_load: .byte LOAD_STAIRS2 - .byte 0 + .byte LOAD_CHIPPER .byte 0 .byte LOAD_CYAN disk_exit_level: .byte RIVEN_UP4 - .byte 0 + .byte RIVEN_CHIPPER .byte 0 .byte 0 disk_exit_direction: .byte DIRECTION_E - .byte 0 + .byte DIRECTION_N .byte 0 .byte 0 diff --git a/games/riven_hgr/disk43_files/disk43_defines.inc b/games/riven_hgr/disk43_files/disk43_defines.inc index 872647f8..8622bb33 100644 --- a/games/riven_hgr/disk43_files/disk43_defines.inc +++ b/games/riven_hgr/disk43_files/disk43_defines.inc @@ -3,6 +3,7 @@ LOAD_CART = 1 LOAD_BRIDGE = 2 LOAD_LOGGED = 3 LOAD_LOGGED2 = 4 +LOAD_CART_MOVIE = 5 ;================================ ; Level definitions diff --git a/games/riven_hgr/disk43_files/level_cart.s b/games/riven_hgr/disk43_files/level_cart.s index f27c8599..218524aa 100644 --- a/games/riven_hgr/disk43_files/level_cart.s +++ b/games/riven_hgr/disk43_files/level_cart.s @@ -109,6 +109,13 @@ really_exit: cart_button_clicked: bit SPEAKER + + lda #LOAD_CART_MOVIE + sta WHICH_LOAD + + lda #1 + sta LEVEL_OVER + rts diff --git a/games/riven_hgr/disk43_files/movie_cart_ride/Makefile b/games/riven_hgr/disk43_files/movie_cart_ride/Makefile new file mode 100644 index 00000000..1162873c --- /dev/null +++ b/games/riven_hgr/disk43_files/movie_cart_ride/Makefile @@ -0,0 +1,212 @@ +include ../../../../Makefile.inc + +ZX02 = ~/research/6502_compression/zx02.git/build/zx02 +PNG2GR = ../../../../utils/gr-utils/png2gr + +all: movie_cart_ride.inc + +movie_cart_ride.inc: \ + img096_bg.gr.zx02 \ + img114_bg.gr.zx02 +# img115_bg.gr.zx02 img116_bg.gr.zx02 \ +# img117_bg.gr.zx02 img118_bg.gr.zx02 img119_bg.gr.zx02 \ +# img120_bg.gr.zx02 img121_bg.gr.zx02 img122_bg.gr.zx02 \ +# img123_bg.gr.zx02 img124_bg.gr.zx02 img125_bg.gr.zx02 \ +# img126_bg.gr.zx02 img127_bg.gr.zx02 img128_bg.gr.zx02 \ +# img129_bg.gr.zx02 img130_bg.gr.zx02 img131_bg.gr.zx02 \ +# img132_bg.gr.zx02 img133_bg.gr.zx02 img134_bg.gr.zx02 \ +# img135_bg.gr.zx02 img136_bg.gr.zx02 img137_bg.gr.zx02 \ +# img138_bg.gr.zx02 img139_bg.gr.zx02 img140_bg.gr.zx02 \ +# img141_bg.gr.zx02 img142_bg.gr.zx02 img143_bg.gr.zx02 \ +# img144_bg.gr.zx02 img145_bg.gr.zx02 img146_bg.gr.zx02 \ +# img147_bg.gr.zx02 img148_bg.gr.zx02 img149_bg.gr.zx02 \ +# img150_bg.gr.zx02 img151_bg.gr.zx02 img152_bg.gr.zx02 \ +# img153_bg.gr.zx02 img154_bg.gr.zx02 img155_bg.gr.zx02 \ +# img156_bg.gr.zx02 img157_bg.gr.zx02 img158_bg.gr.zx02 \ +# img159_bg.gr.zx02 img160_bg.gr.zx02 img161_bg.gr.zx02 \ +# img162_bg.gr.zx02 img163_bg.gr.zx02 img164_bg.gr.zx02 \ +# img165_bg.gr.zx02 img166_bg.gr.zx02 img167_bg.gr.zx02 \ +# img168_bg.gr.zx02 img169_bg.gr.zx02 img170_bg.gr.zx02 \ +# img171_bg.gr.zx02 img172_bg.gr.zx02 img173_bg.gr.zx02 \ +# img174_bg.gr.zx02 img175_bg.gr.zx02 img176_bg.gr.zx02 \ +# img177_bg.gr.zx02 img178_bg.gr.zx02 img179_bg.gr.zx02 \ +# img180_bg.gr.zx02 img181_bg.gr.zx02 img182_bg.gr.zx02 \ +# img183_bg.gr.zx02 img184_bg.gr.zx02 img185_bg.gr.zx02 \ +# img186_bg.gr.zx02 img187_bg.gr.zx02 img188_bg.gr.zx02 \ +# img189_bg.gr.zx02 img190_bg.gr.zx02 img191_bg.gr.zx02 \ +# img192_bg.gr.zx02 img193_bg.gr.zx02 img194_bg.gr.zx02 \ +# img195_bg.gr.zx02 img196_bg.gr.zx02 img197_bg.gr.zx02 \ +# img198_bg.gr.zx02 img199_bg.gr.zx02 img200_bg.gr.zx02 \ +# img201_bg.gr.zx02 img202_bg.gr.zx02 img203_bg.gr.zx02 \ +# img204_bg.gr.zx02 img205_bg.gr.zx02 img206_bg.gr.zx02 \ +# img207_bg.gr.zx02 img208_bg.gr.zx02 img209_bg.gr.zx02 \ +# img210_bg.gr.zx02 img211_bg.gr.zx02 img212_bg.gr.zx02 \ +# img213_bg.gr.zx02 img214_bg.gr.zx02 img215_bg.gr.zx02 \ +# img216_bg.gr.zx02 img217_bg.gr.zx02 img218_bg.gr.zx02 \ +# img219_bg.gr.zx02 img220_bg.gr.zx02 img221_bg.gr.zx02 \ +# img222_bg.gr.zx02 img223_bg.gr.zx02 img224_bg.gr.zx02 \ +# img225_bg.gr.zx02 img226_bg.gr.zx02 img227_bg.gr.zx02 \ +# img228_bg.gr.zx02 img229_bg.gr.zx02 img230_bg.gr.zx02 \ +# img231_bg.gr.zx02 img232_bg.gr.zx02 img233_bg.gr.zx02 \ +## img234_bg.gr.zx02 img235_bg.gr.zx02 img236_bg.gr.zx02 \ +# img237_bg.gr.zx02 img238_bg.gr.zx02 img239_bg.gr.zx02 \ +# img240_bg.gr.zx02 img241_bg.gr.zx02 img242_bg.gr.zx02 \ +# img243_bg.gr.zx02 img244_bg.gr.zx02 img245_bg.gr.zx02 \ +# img246_bg.gr.zx02 img247_bg.gr.zx02 img248_bg.gr.zx02 \ +# img249_bg.gr.zx02 + echo "img096_bg_zx02: .incbin \"img096_bg.gr.zx02\"" > movie_cart_ride.inc + echo "img114_bg_zx02: .incbin \"img114_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img115_bg_zx02: .incbin \"img115_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img116_bg_zx02: .incbin \"img116_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img117_bg_zx02: .incbin \"img117_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img118_bg_zx02: .incbin \"img118_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img119_bg_zx02: .incbin \"img119_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img120_bg_zx02: .incbin \"img120_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img121_bg_zx02: .incbin \"img121_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img122_bg_zx02: .incbin \"img122_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img123_bg_zx02: .incbin \"img123_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img124_bg_zx02: .incbin \"img124_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img125_bg_zx02: .incbin \"img125_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img126_bg_zx02: .incbin \"img126_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img127_bg_zx02: .incbin \"img127_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img128_bg_zx02: .incbin \"img128_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img129_bg_zx02: .incbin \"img129_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img130_bg_zx02: .incbin \"img130_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img131_bg_zx02: .incbin \"img131_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img132_bg_zx02: .incbin \"img132_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img133_bg_zx02: .incbin \"img133_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img134_bg_zx02: .incbin \"img134_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img135_bg_zx02: .incbin \"img135_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img136_bg_zx02: .incbin \"img136_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img137_bg_zx02: .incbin \"img137_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img138_bg_zx02: .incbin \"img138_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img139_bg_zx02: .incbin \"img139_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img140_bg_zx02: .incbin \"img140_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img141_bg_zx02: .incbin \"img141_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img142_bg_zx02: .incbin \"img142_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img143_bg_zx02: .incbin \"img143_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img144_bg_zx02: .incbin \"img144_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img145_bg_zx02: .incbin \"img145_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img146_bg_zx02: .incbin \"img146_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img147_bg_zx02: .incbin \"img147_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img148_bg_zx02: .incbin \"img148_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img149_bg_zx02: .incbin \"img149_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img150_bg_zx02: .incbin \"img150_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img151_bg_zx02: .incbin \"img151_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img152_bg_zx02: .incbin \"img152_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img153_bg_zx02: .incbin \"img153_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img154_bg_zx02: .incbin \"img154_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img155_bg_zx02: .incbin \"img155_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img156_bg_zx02: .incbin \"img156_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img157_bg_zx02: .incbin \"img157_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img158_bg_zx02: .incbin \"img158_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img159_bg_zx02: .incbin \"img159_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img160_bg_zx02: .incbin \"img160_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img161_bg_zx02: .incbin \"img161_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img162_bg_zx02: .incbin \"img162_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img163_bg_zx02: .incbin \"img163_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img164_bg_zx02: .incbin \"img164_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img165_bg_zx02: .incbin \"img165_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img166_bg_zx02: .incbin \"img166_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img167_bg_zx02: .incbin \"img167_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img168_bg_zx02: .incbin \"img168_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img169_bg_zx02: .incbin \"img169_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img170_bg_zx02: .incbin \"img170_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img171_bg_zx02: .incbin \"img171_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img172_bg_zx02: .incbin \"img172_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img173_bg_zx02: .incbin \"img173_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img174_bg_zx02: .incbin \"img174_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img175_bg_zx02: .incbin \"img175_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img176_bg_zx02: .incbin \"img176_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img177_bg_zx02: .incbin \"img177_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img178_bg_zx02: .incbin \"img178_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img179_bg_zx02: .incbin \"img179_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img180_bg_zx02: .incbin \"img180_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img181_bg_zx02: .incbin \"img181_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img182_bg_zx02: .incbin \"img182_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img183_bg_zx02: .incbin \"img183_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img184_bg_zx02: .incbin \"img184_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img185_bg_zx02: .incbin \"img185_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img186_bg_zx02: .incbin \"img186_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img187_bg_zx02: .incbin \"img187_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img188_bg_zx02: .incbin \"img188_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img189_bg_zx02: .incbin \"img189_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img190_bg_zx02: .incbin \"img190_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img191_bg_zx02: .incbin \"img191_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img192_bg_zx02: .incbin \"img192_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img193_bg_zx02: .incbin \"img193_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img194_bg_zx02: .incbin \"img194_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img195_bg_zx02: .incbin \"img195_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img196_bg_zx02: .incbin \"img196_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img197_bg_zx02: .incbin \"img197_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img198_bg_zx02: .incbin \"img198_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img199_bg_zx02: .incbin \"img199_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img200_bg_zx02: .incbin \"img200_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img201_bg_zx02: .incbin \"img201_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img202_bg_zx02: .incbin \"img202_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img203_bg_zx02: .incbin \"img203_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img204_bg_zx02: .incbin \"img204_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img205_bg_zx02: .incbin \"img205_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img206_bg_zx02: .incbin \"img206_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img207_bg_zx02: .incbin \"img207_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img208_bg_zx02: .incbin \"img208_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img209_bg_zx02: .incbin \"img209_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img210_bg_zx02: .incbin \"img210_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img211_bg_zx02: .incbin \"img211_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img212_bg_zx02: .incbin \"img212_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img213_bg_zx02: .incbin \"img213_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img214_bg_zx02: .incbin \"img214_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img215_bg_zx02: .incbin \"img215_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img216_bg_zx02: .incbin \"img216_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img217_bg_zx02: .incbin \"img217_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img218_bg_zx02: .incbin \"img218_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img219_bg_zx02: .incbin \"img219_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img220_bg_zx02: .incbin \"img220_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img221_bg_zx02: .incbin \"img221_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img222_bg_zx02: .incbin \"img222_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img223_bg_zx02: .incbin \"img223_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img224_bg_zx02: .incbin \"img224_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img225_bg_zx02: .incbin \"img225_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img226_bg_zx02: .incbin \"img226_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img227_bg_zx02: .incbin \"img227_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img228_bg_zx02: .incbin \"img228_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img229_bg_zx02: .incbin \"img229_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img230_bg_zx02: .incbin \"img230_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img231_bg_zx02: .incbin \"img231_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img232_bg_zx02: .incbin \"img232_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img233_bg_zx02: .incbin \"img233_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img234_bg_zx02: .incbin \"img234_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img235_bg_zx02: .incbin \"img235_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img236_bg_zx02: .incbin \"img236_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img237_bg_zx02: .incbin \"img237_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img238_bg_zx02: .incbin \"img238_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img239_bg_zx02: .incbin \"img239_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img240_bg_zx02: .incbin \"img240_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img241_bg_zx02: .incbin \"img241_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img242_bg_zx02: .incbin \"img242_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img243_bg_zx02: .incbin \"img243_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img244_bg_zx02: .incbin \"img244_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img245_bg_zx02: .incbin \"img245_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img246_bg_zx02: .incbin \"img246_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img247_bg_zx02: .incbin \"img247_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img248_bg_zx02: .incbin \"img248_bg.gr.zx02\"" >> movie_cart_ride.inc +# echo "img249_bg_zx02: .incbin \"img249_bg.gr.zx02\"" >> movie_cart_ride.inc + + +#### + +%.gr: %.png + $(PNG2GR) $< $@ + +%.gr.zx02: %.gr + $(ZX02) -f $< $@ + +#### + +clean: + rm -f *~ *.o *.lst *.zx02 *.gr movie_cart_ride.inc + +distclean: + rm -f *~ *.o *.lst *.zx02 *.gr movie_cart_ride.inc + cd overlays && make clean + diff --git a/games/riven_hgr/disk43_files/movie_cart_ride/img096_bg.png b/games/riven_hgr/disk43_files/movie_cart_ride/img096_bg.png new file mode 100644 index 00000000..2821a5cb Binary files /dev/null and b/games/riven_hgr/disk43_files/movie_cart_ride/img096_bg.png differ diff --git a/games/riven_hgr/disk43_files/movie_cart_ride/img114_bg.png b/games/riven_hgr/disk43_files/movie_cart_ride/img114_bg.png new file mode 100644 index 00000000..30b99f69 Binary files /dev/null and b/games/riven_hgr/disk43_files/movie_cart_ride/img114_bg.png differ diff --git a/games/riven_hgr/disk50_files/Makefile b/games/riven_hgr/disk50_files/Makefile index fcd0edf6..5900a2d1 100644 --- a/games/riven_hgr/disk50_files/Makefile +++ b/games/riven_hgr/disk50_files/Makefile @@ -3,7 +3,7 @@ include ../../../Makefile.inc LINKER_SCRIPTS = ../../../linker_scripts/ -all: DISK50 LEVEL_START +all: DISK50 LEVEL_CHIPPER #### @@ -15,33 +15,33 @@ disk50.o: disk50.s ../zp.inc #### -LEVEL_START: level_start.o - ld65 -o LEVEL_START level_start.o -C $(LINKER_SCRIPTS)/apple2_4000.inc +LEVEL_CHIPPER: level_chipper.o + ld65 -o LEVEL_CHIPPER level_chipper.o -C $(LINKER_SCRIPTS)/apple2_4000.inc -level_start.o: level_start.s \ +level_chipper.o: level_chipper.s \ ../zp.inc ../hardware.inc ../qload.inc \ ../common_defines.inc disk50_defines.inc \ - leveldata_start.inc \ - graphics_start/start_graphics.inc - ca65 -o level_start.o level_start.s -l level_start.lst + leveldata_chipper.inc \ + graphics_chipper/chipper_graphics.inc + ca65 -o level_chipper.o level_chipper.s -l level_chipper.lst #### -graphics_start/start_graphics.inc: - cd graphics_start && make +graphics_chipper/start_graphics.inc: + cd graphics_chipper && make #### clean: rm -f *~ *.o *.lst \ - LEVEL_START + LEVEL_CHIPPER #### distclean: rm -f *~ *.o *.lst \ - LEVEL_START - cd graphics_start && make clean + LEVEL_CHIPPER + cd graphics_chipper && make clean diff --git a/games/riven_hgr/disk50_files/disk50_defines.inc b/games/riven_hgr/disk50_files/disk50_defines.inc index aeadf730..229c1c5d 100644 --- a/games/riven_hgr/disk50_files/disk50_defines.inc +++ b/games/riven_hgr/disk50_files/disk50_defines.inc @@ -1,10 +1,10 @@ LOAD_TITLE_50 = 0 -LOAD_START = 1 +LOAD_CHIPPER = 1 ;================================ ; Level definitions ; START -RIVEN_START_LOCATION = 0 +RIVEN_CHIPPER = 0 diff --git a/games/riven_hgr/disk50_files/graphics_chipper/Makefile b/games/riven_hgr/disk50_files/graphics_chipper/Makefile new file mode 100644 index 00000000..79e3e535 --- /dev/null +++ b/games/riven_hgr/disk50_files/graphics_chipper/Makefile @@ -0,0 +1,27 @@ +include ../../../../Makefile.inc + +ZX02 = ~/research/6502_compression/zx02.git/build/zx02 -f +PNG_TO_HGR = ../../../../utils/hgr-utils/png2hgr + +all: chipper_graphics.inc + +chipper_graphics.inc: \ + chipper_n.hgr.zx02 chipper_w.hgr.zx02 chipper_e.hgr.zx02 chipper_s.hgr.zx02 + echo "chipper_n_zx02: .incbin \"chipper_n.hgr.zx02\"" > chipper_graphics.inc + echo "chipper_w_zx02: .incbin \"chipper_w.hgr.zx02\"" >> chipper_graphics.inc + echo "chipper_e_zx02: .incbin \"chipper_e.hgr.zx02\"" >> chipper_graphics.inc + echo "chipper_s_zx02: .incbin \"chipper_s.hgr.zx02\"" >> chipper_graphics.inc + +#### + +%.hgr: %.png + $(PNG_TO_HGR) $< > $@ + +%.hgr.zx02: %.hgr + $(ZX02) -f $< $@ + +#### + +clean: + rm -f *~ *.o *.lst *.zx02 *.hgr chipper_graphics.inc + diff --git a/games/riven_hgr/disk50_files/graphics_start/start_e.png b/games/riven_hgr/disk50_files/graphics_chipper/chipper_e.png similarity index 100% rename from games/riven_hgr/disk50_files/graphics_start/start_e.png rename to games/riven_hgr/disk50_files/graphics_chipper/chipper_e.png diff --git a/games/riven_hgr/disk50_files/graphics_start/start_n.png b/games/riven_hgr/disk50_files/graphics_chipper/chipper_n.png similarity index 100% rename from games/riven_hgr/disk50_files/graphics_start/start_n.png rename to games/riven_hgr/disk50_files/graphics_chipper/chipper_n.png diff --git a/games/riven_hgr/disk50_files/graphics_start/start_s.png b/games/riven_hgr/disk50_files/graphics_chipper/chipper_s.png similarity index 100% rename from games/riven_hgr/disk50_files/graphics_start/start_s.png rename to games/riven_hgr/disk50_files/graphics_chipper/chipper_s.png diff --git a/games/riven_hgr/disk50_files/graphics_start/start_w.png b/games/riven_hgr/disk50_files/graphics_chipper/chipper_w.png similarity index 100% rename from games/riven_hgr/disk50_files/graphics_start/start_w.png rename to games/riven_hgr/disk50_files/graphics_chipper/chipper_w.png diff --git a/games/riven_hgr/disk50_files/graphics_start/Makefile b/games/riven_hgr/disk50_files/graphics_start/Makefile deleted file mode 100644 index a5587776..00000000 --- a/games/riven_hgr/disk50_files/graphics_start/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -include ../../../../Makefile.inc - -ZX02 = ~/research/6502_compression/zx02.git/build/zx02 -f -PNG_TO_HGR = ../../../../utils/hgr-utils/png2hgr - -all: start_graphics.inc - -start_graphics.inc: \ - start_n.hgr.zx02 start_w.hgr.zx02 start_e.hgr.zx02 start_s.hgr.zx02 - echo "start_n_zx02: .incbin \"start_n.hgr.zx02\"" > start_graphics.inc - echo "start_w_zx02: .incbin \"start_w.hgr.zx02\"" >> start_graphics.inc - echo "start_e_zx02: .incbin \"start_e.hgr.zx02\"" >> start_graphics.inc - echo "start_s_zx02: .incbin \"start_s.hgr.zx02\"" >> start_graphics.inc - -#### - -%.hgr: %.png - $(PNG_TO_HGR) $< > $@ - -%.hgr.zx02: %.hgr - $(ZX02) -f $< $@ - -#### - -clean: - rm -f *~ *.o *.lst *.zx02 *.hgr start_graphics.inc - diff --git a/games/riven_hgr/disk50_files/level_start.s b/games/riven_hgr/disk50_files/level_chipper.s similarity index 91% rename from games/riven_hgr/disk50_files/level_start.s rename to games/riven_hgr/disk50_files/level_chipper.s index a408d65f..b8af6d40 100644 --- a/games/riven_hgr/disk50_files/level_start.s +++ b/games/riven_hgr/disk50_files/level_chipper.s @@ -1,4 +1,4 @@ -; Riven -- Book Island, Arrival +; Riven -- Book Island, Arrival on Chipper ; by deater (Vince Weaver) @@ -9,7 +9,7 @@ .include "../qload.inc" .include "disk50_defines.inc" -riven_start: +chipper_start: ;=================== ; init screen @@ -108,6 +108,6 @@ really_exit: ;========================== -.include "graphics_start/start_graphics.inc" +.include "graphics_chipper/chipper_graphics.inc" -.include "leveldata_start.inc" +.include "leveldata_chipper.inc" diff --git a/games/riven_hgr/disk50_files/leveldata_start.inc b/games/riven_hgr/disk50_files/leveldata_chipper.inc similarity index 73% rename from games/riven_hgr/disk50_files/leveldata_start.inc rename to games/riven_hgr/disk50_files/leveldata_chipper.inc index adaf6a2c..9f1f3e90 100644 --- a/games/riven_hgr/disk50_files/leveldata_start.inc +++ b/games/riven_hgr/disk50_files/leveldata_chipper.inc @@ -5,7 +5,7 @@ locations: .word location0 -; RIVEN_START_LOCATION -- just arrived by cart +; RIVEN_CHIPPER -- just arrived by cart location0: .byte $FF ; north exit .byte $ff ; south exit @@ -15,9 +15,9 @@ location0: .byte DIRECTION_E ; south exit_dir .byte $ff ; east exit_dir .byte $ff ; west exit_dir - .word start_n_zx02 ; north bg - .word start_s_zx02 ; south bg - .word start_e_zx02 ; east bg - .word start_w_zx02 ; west bg + .word chipper_n_zx02 ; north bg + .word chipper_s_zx02 ; south bg + .word chipper_e_zx02 ; east bg + .word chipper_w_zx02 ; west bg .byte BG_EAST|BG_NORTH|BG_SOUTH|BG_WEST ; all bgs .byte $ff ; special exit diff --git a/games/riven_hgr/disk39_files/flip_pages.s b/games/riven_hgr/flip_pages.s similarity index 100% rename from games/riven_hgr/disk39_files/flip_pages.s rename to games/riven_hgr/flip_pages.s