riven_hgr: start setting up for movie2

This commit is contained in:
Vince Weaver 2024-05-23 00:18:53 -04:00
parent d8bdea7f1c
commit e1895fcf2d
3 changed files with 460 additions and 4 deletions

View File

@ -10,7 +10,8 @@ LINKER_SCRIPTS = ../../linker_scripts/
all: riven_hgr.dsk
riven_hgr.dsk: HELLO LOADER TITLE \
LEVEL_PROJECTOR LEVEL_MAGSTEPS LEVEL_MAGLEV LEVEL_OUTSIDE MOVIE1
LEVEL_PROJECTOR LEVEL_MAGSTEPS LEVEL_MAGLEV LEVEL_OUTSIDE \
MOVIE1 MOVIE2
cp $(EMPTY_DISK) riven_hgr.dsk
$(DOS33) -y riven_hgr.dsk SAVE A HELLO
$(DOS33) -y riven_hgr.dsk BSAVE -a 0x1000 LOADER
@ -20,6 +21,7 @@ riven_hgr.dsk: HELLO LOADER TITLE \
$(DOS33) -y riven_hgr.dsk BSAVE -a 0x4000 LEVEL_MAGLEV
$(DOS33) -y riven_hgr.dsk BSAVE -a 0x4000 LEVEL_OUTSIDE
$(DOS33) -y riven_hgr.dsk BSAVE -a 0x4000 MOVIE1
$(DOS33) -y riven_hgr.dsk BSAVE -a 0x4000 MOVIE2
###
@ -114,6 +116,16 @@ movie1.o: movie1.s \
movie1/movie1.inc
ca65 -o movie1.o movie1.s -l movie1.lst
####
MOVIE2: movie2.o
ld65 -o MOVIE2 movie2.o -C $(LINKER_SCRIPTS)/apple2_4000.inc
movie2.o: movie2.s \
movie1/movie1.inc
ca65 -o movie2.o movie2.s -l movie2.lst
####
@ -135,21 +147,28 @@ graphics_outside/outside_graphics.inc:
graphics_projector/projector_graphics.inc:
cd graphics_projector && make
movie1/movie1.inc:
cd movie1 && make
####
clean:
rm -f *~ *.o *.lst HELLO LOADER TITLE \
LEVEL_PROJECTOR LEVEL_MAGSTEPS LEVEL_MAGLEV LEVEL_OUTSIDE \
MOVIE1
MOVIE1 MOVIE2
####
distclean:
rm -f *~ *.o *.lst HELLO LOADER TITLE \
LEVEL_PROJECTOR LEVEL_MAGSTEPS LEVEL_MAGLEV LEVEL_OUTSIDE \
MOVIE1
MOVIE1 MOVIE2
cd graphics_title && make clean
cd graphics_projector && make clean
cd graphics_outside && make clean
cd graphics_magsteps && make clean
cd graphics_maglev && make clean
cd graphics_sprites && make clean
cd movie1 && make clean
# cd movie2 && make clean

View File

@ -11,6 +11,7 @@ movie1.inc: \
img058_bg.gr.zx02 img059_bg.gr.zx02 img060_bg.gr.zx02 \
img061_bg.gr.zx02 img062_bg.gr.zx02 img063_bg.gr.zx02 \
img064_bg.gr.zx02 img065_bg.gr.zx02 img066_bg.gr.zx02 \
img067_bg.gr.zx02 img068_bg.gr.zx02 img069_bg.gr.zx02 \
img070_bg.gr.zx02 img071_bg.gr.zx02 img072_bg.gr.zx02 \
img073_bg.gr.zx02 img074_bg.gr.zx02 img075_bg.gr.zx02 \
img076_bg.gr.zx02 img077_bg.gr.zx02 img078_bg.gr.zx02 \
@ -60,5 +61,5 @@ movie1.inc: \
####
clean:
rm -f *~ *.o *.lst *.zx02 *.gr
rm -f *~ *.o *.lst *.zx02 *.gr movie1.inc

436
games/riven_hgr/movie2.s Normal file
View File

@ -0,0 +1,436 @@
; Lo-res movie player of sorts
; by deater (Vince Weaver) <vince@deater.net>
.include "zp.inc"
.include "hardware.inc"
overlays = $2000
;=================================
; so, movie. each frame is 1/5 second (200ms)
; 25..28 displays initial for 4 frames
; 29..35 displays handle moving (8 frames)
; 36..52 sits there ; 16 frames
; 53..87 rotates
; 88..97 sits there
; 98 control returns to user
; space?
; 188*8=overlays (1.5k)
; 35 rotations * 188 = (7k) not so bad?
;===================
; notes for movie2
; 103..109 = overlay animation
; 110..112 = sit there
; 113..270 = fun animation 157! = 30k???
; 271..285 = handle rotate
; 286..306 = sit there
; timing, want whole thing to finish in 200ms or so
;
; decompressing:
; ade2 = 44,514 cycles
; do_overlay:
; 9c78 = 40,056 cycles
movie1_start:
;===================
; Setup graphics
;===================
bit SET_GR
bit LORES
bit FULLGR
bit PAGE1
lda #0
sta SCENE_COUNT
lda #4
sta DRAW_PAGE
bit KEYRESET
;===============================
;===============================
; set up graphics
;===============================
;===============================
;=============================
; load overlay mask to $c00
;=============================
lda #<overlay_mask_zx02
sta ZX0_src
lda #>overlay_mask_zx02
sta ZX0_src+1
lda #$0c
jsr full_decomp
;=============================
; load overlays to $2000-$2FFF
;=============================
lda #0
sta WHICH_OVERLAY
load_overlay_loop:
ldx WHICH_OVERLAY
lda overlays_l,X
sta ZX0_src
lda overlays_h,X
sta ZX0_src+1
lda WHICH_OVERLAY
asl
asl
clc
adc #>overlays
jsr full_decomp
inc WHICH_OVERLAY
lda WHICH_OVERLAY
cmp #8
bne load_overlay_loop
;===============================
;===============================
; initial screen
;===============================
;===============================
lda #0
sta WHICH_OVERLAY
jsr draw_scene
jsr flip_pages
;===============================
; wait 4 frames (800ms)
ldx #16
jsr wait_50xms
;===============================
;===============================
; move the handle
;===============================
;===============================
; could save bytes going backwards?
lda #0
sta WHICH_OVERLAY
move_handle_loop:
jsr draw_scene
jsr flip_pages
; lda KEYPRESS
; bmi done_movie1
inc WHICH_OVERLAY
lda WHICH_OVERLAY
cmp #8
beq done_move_handle
overlay_good:
ldx #2
jsr wait_50xms
jmp move_handle_loop
done_move_handle:
lda #7 ; point to last one
sta WHICH_OVERLAY
;===============================
; wait 16 frames (3.2s?)
ldx #64
jsr wait_50xms
;===============================
;===============================
; play the movie
;===============================
;===============================
lda #1
sta SCENE_COUNT
movie1_loop:
jsr draw_scene
jsr flip_pages
inc SCENE_COUNT
lda SCENE_COUNT
cmp #31
beq done_play_movie1
ldx #2
jsr wait_50xms
jmp movie1_loop
done_play_movie1:
;===============================
; wait 9 frames (1.8s?)
ldx #36
jsr wait_50xms
done_movie1:
bit KEYRESET
jmp movie1_start
rts
;===============================
;===============================
; draw_scene
;===============================
;===============================
draw_scene:
;===============================
; decompress background
;===============================
before:
ldx SCENE_COUNT
lda frames_l,X
sta ZX0_src
lda frames_h,X
sta ZX0_src+1
clc
lda DRAW_PAGE
adc #$4
jsr full_decomp
after:
; jmp do_overlay
; fallthrough
;===============================
; do overlay
;===============================
; INL/H = overlay
; MASKL/H = mask
; OUTL/H = gr location
do_overlay:
lda DRAW_PAGE
clc
adc #$4
sta OUTH
lda WHICH_OVERLAY
asl
asl
clc
adc #$20
sta INH
lda #$c
sta MASKH
lda #0
sta OUTL
sta INL
sta MASKL
do_overlay_outer:
ldy #0
do_overlay_inner:
overlayin_smc:
lda (INL),Y
and (MASKL),Y
sta TEMP
lda (MASKL),Y
eor #$ff
and (OUTL),Y
ora TEMP
sta (OUTL),Y
skip_write:
dey
bne do_overlay_inner
inc OUTH
inc INH
inc MASKH
lda MASKH
cmp #$10
bne do_overlay_inner
rts
;============================
; 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
;===================================
; .include "../wait_keypress.s"
; .include "draw_boxes.s"
.include "zx02_optim.s"
.include "wait.s"
.include "movie1/movie1.inc"
frames_l:
.byte <img025_bg_zx02
.byte <img055_bg_zx02
.byte <img056_bg_zx02
.byte <img057_bg_zx02
.byte <img058_bg_zx02
.byte <img059_bg_zx02
.byte <img060_bg_zx02
.byte <img061_bg_zx02
.byte <img062_bg_zx02
.byte <img063_bg_zx02
.byte <img064_bg_zx02
.byte <img065_bg_zx02
.byte <img066_bg_zx02
.byte <img067_bg_zx02
.byte <img068_bg_zx02
.byte <img069_bg_zx02
.byte <img070_bg_zx02
.byte <img071_bg_zx02
.byte <img072_bg_zx02
.byte <img073_bg_zx02
.byte <img074_bg_zx02
.byte <img075_bg_zx02
.byte <img076_bg_zx02
.byte <img077_bg_zx02
.byte <img078_bg_zx02
.byte <img079_bg_zx02
.byte <img080_bg_zx02
.byte <img081_bg_zx02
.byte <img082_bg_zx02
.byte <img083_bg_zx02
.byte <img084_bg_zx02
frames_h:
.byte >img025_bg_zx02
.byte >img055_bg_zx02
.byte >img056_bg_zx02
.byte >img057_bg_zx02
.byte >img058_bg_zx02
.byte >img059_bg_zx02
.byte >img060_bg_zx02
.byte >img061_bg_zx02
.byte >img062_bg_zx02
.byte >img063_bg_zx02
.byte >img064_bg_zx02
.byte >img065_bg_zx02
.byte >img066_bg_zx02
.byte >img067_bg_zx02
.byte >img068_bg_zx02
.byte >img069_bg_zx02
.byte >img070_bg_zx02
.byte >img071_bg_zx02
.byte >img072_bg_zx02
.byte >img073_bg_zx02
.byte >img074_bg_zx02
.byte >img075_bg_zx02
.byte >img076_bg_zx02
.byte >img077_bg_zx02
.byte >img078_bg_zx02
.byte >img079_bg_zx02
.byte >img080_bg_zx02
.byte >img081_bg_zx02
.byte >img082_bg_zx02
.byte >img083_bg_zx02
.byte >img084_bg_zx02
overlays_l:
.byte <overlay25,<overlay29,<overlay30
.byte <overlay31,<overlay32,<overlay33
.byte <overlay34,<overlay35
overlays_h:
.byte >overlay25,>overlay29,>overlay30
.byte >overlay31,>overlay32,>overlay33
.byte >overlay34,>overlay35
overlay_mask_zx02:
.incbin "movie1/overlays/maglev_overlay_mask.gr.zx02"
overlay25:
.incbin "movie1/overlays/overlay25.gr.zx02"
overlay29:
.incbin "movie1/overlays/overlay29.gr.zx02"
overlay30:
.incbin "movie1/overlays/overlay30.gr.zx02"
overlay31:
.incbin "movie1/overlays/overlay31.gr.zx02"
overlay32:
.incbin "movie1/overlays/overlay32.gr.zx02"
overlay33:
.incbin "movie1/overlays/overlay33.gr.zx02"
overlay34:
.incbin "movie1/overlays/overlay34.gr.zx02"
overlay35:
.incbin "movie1/overlays/overlay35.gr.zx02"