ootw: getting off the elevator

This commit is contained in:
Vince Weaver 2019-02-06 22:01:59 -05:00
parent ba9746fe14
commit 5282c30a20
15 changed files with 185 additions and 54 deletions

View File

@ -65,6 +65,7 @@ intro.o: intro.s \
intro_graphics/02_outer_door/feet.inc \
intro_graphics/03_elevator/intro_elevator.inc \
intro_graphics/03_elevator/intro_off_elevator.inc \
intro_graphics/03_elevator/intro_walking.inc \
intro_graphics/04_keypad/intro_scanner_door.inc \
intro_graphics/04_keypad/intro_keypad.inc
ca65 -o intro.o intro.s -l intro.lst

View File

@ -21,7 +21,7 @@ intro:
lda #0
sta DISP_PAGE
jmp elevator
jmp elevator_exit
;===============================
;===============================
@ -351,7 +351,7 @@ not_too_big:
jsr page_flip
ldx #10 ; pause
ldx #8 ; pause
jsr long_wait
inc ELEVATOR_COUNT
@ -413,7 +413,7 @@ gdb_smc:
jsr page_flip
ldx #10 ; pause
ldx #8 ; pause
jsr long_wait
inc ELEVATOR_COUNT
@ -452,7 +452,7 @@ going_down_black:
jsr page_flip
ldx #10 ; pause
ldx #8 ; pause
jsr long_wait
inc ELEVATOR_COUNT
@ -469,11 +469,15 @@ going_down_black:
; black, 2, blue, black about 20
; blue until hit bottom, doors open
elevator_exit:
ldx #100 ; pause
jsr long_wait
;===============================
;===============================
; Getting out of Elevator
@ -491,33 +495,23 @@ elevator_exit:
lda #$c ; load to off-screen $c00
jsr load_rle_gr
;=================================
; copy $c00 to both pages $400/$800
jsr gr_copy_to_current
lda #$22
sta COLOR
lda #40
sta V2
ldx #2
ldy #20
jsr vlin ; X, V2 at Y
lda #>(walking00_rle)
sta GBASH
lda #<(walking00_rle)
sta GBASL
lda #$10 ; load to off-screen $1000
jsr load_rle_gr
lda #10
sta ELEVATOR_COUNT
elevator_open_loop:
jsr gr_overlay ; note: overwrites color
lda #$00
sta COLOR
jmp skip_first
elevator_open_loop:
jsr gr_copy_to_current
skip_first:
; Would have liked to have a central purple stripe, but not easy
; 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30
@ -556,7 +550,15 @@ elevator_inner_loop:
dec ELEVATOR_COUNT
bne elevator_open_loop
;==================================
; draw walking off the elevator
lda #<walking_sequence
sta INTRO_LOOPL
lda #>walking_sequence
sta INTRO_LOOPH
jsr run_sequence
@ -882,6 +884,7 @@ gone_loop:
.include "intro_graphics/03_elevator/intro_elevator.inc"
.include "intro_graphics/03_elevator/intro_off_elevator.inc"
.include "intro_graphics/03_elevator/intro_walking.inc"
.include "intro_graphics/04_keypad/intro_scanner_door.inc"
.include "intro_graphics/04_keypad/intro_keypad.inc"
@ -1021,3 +1024,26 @@ feet_sequence:
.word blank_rle
.byte 0
; Walking off elevator sequence
walking_sequence:
.byte 20
.word walking01_rle
.byte 20
.word walking02_rle
.byte 20
.word walking03_rle
.byte 20
.word walking04_rle
.byte 20
.word walking05_rle
.byte 20
.word walking06_rle
.byte 20
.word walking07_rle
.byte 20
.word walking08_rle
.byte 0

View File

@ -3,7 +3,7 @@ include ../../../Makefile.inc
PNG2RLE = ../../../gr-utils/png2rle
all: intro_elevator.inc intro_off_elevator.inc
all: intro_elevator.inc intro_off_elevator.inc intro_walking.inc
#####
@ -11,7 +11,20 @@ intro_elevator.inc: $(PNG2RLE) intro_elevator.png
$(PNG2RLE) asm intro_elevator.png elevator_rle > intro_elevator.inc
intro_off_elevator.inc: $(PNG2RLE) intro_off_elevator.png
$(PNG2RLE) asm intro_off_elevator.png elevator_rle > intro_off_elevator.inc
$(PNG2RLE) asm intro_off_elevator.png off_elevator_rle > intro_off_elevator.inc
intro_walking.inc: $(PNG2RLE) walking00.png walking01.png walking02.png \
walking03.png walking04.png walking05.png walking06.png \
walking07.png walking08.png
$(PNG2RLE) asm walking01.png walking00_rle > intro_walking.inc
$(PNG2RLE) asm walking01.png walking01_rle >> intro_walking.inc
$(PNG2RLE) asm walking02.png walking02_rle >> intro_walking.inc
$(PNG2RLE) asm walking03.png walking03_rle >> intro_walking.inc
$(PNG2RLE) asm walking04.png walking04_rle >> intro_walking.inc
$(PNG2RLE) asm walking05.png walking05_rle >> intro_walking.inc
$(PNG2RLE) asm walking06.png walking06_rle >> intro_walking.inc
$(PNG2RLE) asm walking07.png walking07_rle >> intro_walking.inc
$(PNG2RLE) asm walking08.png walking08_rle >> intro_walking.inc
#####

View File

@ -1,33 +1,24 @@
off_elevator_rle: .byte $28 ; ysize=50
off_elevator_rle: .byte $28 ; ysize=48
.byte $A8,$22, $55, $00, $22, $28, $A0,$10,$88, $28
.byte $22, $00, $A0,$11,$22, $55, $00, $A3,$22, $AE,$66
.byte $A3,$22, $00, $A0,$11,$22, $55, $00, $A3,$22, $AE,$66
.byte $A3,$22, $00, $A0,$11,$22, $55, $00, $A3,$22, $A5,$66
.byte $A3,$99, $96, $A5,$66, $A3,$22, $00, $A0,$11,$22, $55
.byte $00, $A3,$22, $A4,$66, $88, $B8, $BB,$BB, $99
.byte $A5,$66, $A3,$22, $00, $A0,$11,$22, $55, $00, $A3,$22
.byte $A4,$66, $88, $FB, $BB, $FB, $99, $A5,$66
.byte $A3,$22, $00, $A0,$11,$22, $55, $00, $A3,$22, $AE,$66
.byte $A3,$22, $00, $A0,$11,$22, $55, $00, $A3,$22, $AE,$66
.byte $A3,$22, $00, $A0,$11,$22, $55, $00, $A3,$22, $AE,$66
.byte $A3,$22, $00, $A9,$22, $A8,$02, $05, $00, $A3,$22
.byte $A4,$66, $6B, $BB, $3B, $BB, $6B, $A5,$66
.byte $A3,$22, $00, $A0,$11,$02, $05, $00, $A3,$22, $A5,$66
.byte $BB, $3B, $BB, $A6,$66, $A3,$22, $00, $A9,$02
.byte $A8,$22, $55, $00, $A3,$22, $A5,$66, $3B, $BB
.byte $3B, $A6,$66, $A3,$22, $00, $A0,$11,$22, $55, $00
.byte $A3,$22, $A5,$66, $A3,$33, $A6,$66, $A3,$22, $00, $A0,$11,$22
.byte $55, $00, $A3,$22, $A3,$66, $06, $A5,$00, $06
.byte $A4,$66, $A3,$22, $00, $A0,$11,$22, $55, $00, $A3,$22
.byte $66,$66, $A9,$00, $06, $66,$66, $A3,$22, $00, $A0,$11,$22
.byte $55, $00, $A3,$22, $66, $AB,$00, $66,$66, $A3,$22
.byte $00, $A0,$11,$22, $55, $00, $A3,$22, $AD,$00, $66
.byte $A3,$22, $00, $A0,$11,$22, $55, $00, $A3,$22, $AD,$00
.byte $66, $A3,$22, $00, $A0,$11,$22, $55, $00, $A3,$22
.byte $60, $AB,$00, $60, $66, $A3,$22, $00, $A0,$11,$22
.byte $55, $00, $A3,$22, $66, $B0,$B0, $A8,$00, $BB
.byte $66,$66, $A3,$22, $00, $A0,$11,$22, $55, $00, $A3,$22
.byte $66, $BB,$BB, $A7,$00, $B0, $BB, $66,$66, $A3,$22
.byte $00, $A9,$22, $A8,$02, $05, $00, $A3,$22, $66
.byte $BB,$BB, $A7,$00, $BB,$BB, $66,$66, $A3,$22, $00, $A9,$02
.byte $A8,$22, $55, $00, $A3,$22, $66, $BB,$BB, $A7,$00
.byte $BB,$BB, $66,$66, $A3,$22, $00, $22,$22, $55, $A6,$22
.byte $A0,$C8,$00
.byte $AE,$66, $A3,$22, $00, $A0,$11,$02, $05, $00, $A3,$22
.byte $AE,$66, $A3,$22, $00, $A9,$02, $A8,$22, $55, $00
.byte $A3,$22, $AE,$66, $A3,$22, $00, $A0,$11,$22, $55, $00
.byte $A3,$22, $AE,$66, $A3,$22, $00, $A0,$11,$22, $55, $00
.byte $A3,$22, $AE,$66, $A3,$22, $00, $A0,$11,$22, $55, $00
.byte $A3,$22, $AE,$66, $A3,$22, $00, $A0,$11,$22, $55, $00
.byte $A3,$22, $AE,$66, $A3,$22, $00, $A0,$11,$22, $55, $00
.byte $A3,$22, $AE,$66, $A3,$22, $00, $A0,$11,$22, $55, $00
.byte $A3,$22, $AE,$66, $A3,$22, $00, $A0,$11,$22, $55, $00
.byte $A3,$22, $AE,$66, $A3,$22, $00, $A0,$11,$22, $55, $00
.byte $A3,$22, $AE,$66, $A3,$22, $00, $A0,$11,$22, $55, $00
.byte $A3,$22, $AE,$66, $A3,$22, $00, $A9,$22, $A8,$02, $05
.byte $00, $A3,$22, $AE,$66, $A3,$22, $00, $A9,$02, $A8,$22
.byte $55, $00, $A3,$22, $AE,$66, $A3,$22, $00, $22,$22
.byte $55, $A6,$22, $A0,$A0,$00
.byte $A1

Binary file not shown.

Before

Width:  |  Height:  |  Size: 372 B

After

Width:  |  Height:  |  Size: 3.5 KiB

View File

@ -0,0 +1,100 @@
walking00_rle: .byte $28 ; ysize=48
.byte $A0,$3A,$AA, $89, $99,$99, $9A, $A0,$23,$AA, $88,$88, $B9,$B9
.byte $99, $A0,$23,$AA, $88, $A3,$BB, $99, $A0,$23,$AA, $B8
.byte $BF, $BB, $BF, $B9, $A0,$23,$AA, $A0,$01,$AB, $BB
.byte $B3, $BB, $A0,$01,$AB, $A0,$24,$AA, $BB, $3B, $BB
.byte $A0,$25,$AA, $3B, $BB,$BB, $A0,$25,$AA, $A3,$33, $A0,$23,$AA, $0A
.byte $00, $A3,$03, $00, $0A, $A0,$20,$AA, $A9,$00, $0A
.byte $A0,$1D,$AA, $AB,$00, $0A, $A0,$1B,$AA, $AD,$00, $A0,$1B,$AA, $AE,$00
.byte $A0,$1A,$AA, $AE,$00, $A0,$1A,$AA, $AC,$00, $B0, $A0,$01,$A0, $A0,$1A,$AA
.byte $BB,$BB, $A9,$00, $B0, $BB, $A0,$1B,$AA, $BB,$BB, $A9,$00
.byte $BB,$BB, $A0,$1B,$AA, $BB,$BB, $A9,$00, $BB,$BB, $A0,$1B,$AA, $BB,$BB
.byte $A9,$00, $BB,$BB, $A0,$AE,$AA
.byte $A1
walking01_rle: .byte $28 ; ysize=48
.byte $A0,$3A,$AA, $89, $99,$99, $9A, $A0,$23,$AA, $88,$88, $B9,$B9
.byte $99, $A0,$23,$AA, $88, $A3,$BB, $99, $A0,$23,$AA, $B8
.byte $BF, $BB, $BF, $B9, $A0,$23,$AA, $A0,$01,$AB, $BB
.byte $B3, $BB, $A0,$01,$AB, $A0,$24,$AA, $BB, $3B, $BB
.byte $A0,$25,$AA, $3B, $BB,$BB, $A0,$25,$AA, $A3,$33, $A0,$23,$AA, $0A
.byte $00, $A3,$03, $00, $0A, $A0,$20,$AA, $A9,$00, $0A
.byte $A0,$1D,$AA, $AB,$00, $0A, $A0,$1B,$AA, $AD,$00, $A0,$1B,$AA, $AE,$00
.byte $A0,$1A,$AA, $AE,$00, $A0,$1A,$AA, $AC,$00, $B0, $A0,$01,$A0, $A0,$1A,$AA
.byte $BB,$BB, $A9,$00, $B0, $BB, $A0,$1B,$AA, $BB,$BB, $A9,$00
.byte $BB,$BB, $A0,$1B,$AA, $BB,$BB, $A9,$00, $BB,$BB, $A0,$1B,$AA, $BB,$BB
.byte $A9,$00, $BB,$BB, $A0,$AE,$AA
.byte $A1
walking02_rle: .byte $28 ; ysize=48
.byte $A0,$12,$AA, $89, $99, $B9,$B9, $99, $9A, $A0,$21,$AA
.byte $88, $A5,$BB, $99, $A0,$21,$AA, $88, $BB, $FB
.byte $BB, $FB, $BB, $99, $A0,$21,$AA, $A0,$01,$A8, $A5,$BB
.byte $A0,$01,$A9, $A0,$22,$AA, $BB,$BB, $B3, $BB,$BB, $A0,$23,$AA, $BB,$BB
.byte $B3, $BB,$BB, $A0,$24,$AA, $A3,$BB, $A0,$25,$AA, $A3,$33, $A0,$23,$AA
.byte $0A, $3A, $A3,$33, $3A, $0A, $A0,$1F,$AA, $0A
.byte $A9,$00, $0A, $A0,$1C,$AA, $AD,$00, $A0,$1A,$AA, $AF,$00, $A0,$18,$AA
.byte $0A, $AF,$00, $A0,$18,$AA, $A0,$11,$00, $A0,$16,$AA, $A0,$12,$00, $A0,$16,$AA
.byte $A0,$01,$A0, $A0,$11,$00, $A0,$17,$AA, $AE,$00, $B0,$B0, $A0,$19,$AA, $BB
.byte $B0, $AB,$00, $BB,$BB, $A0,$19,$AA, $BB,$BB, $AB,$00, $BB,$BB
.byte $A0,$19,$AA, $BB,$BB, $AB,$00, $BB,$BB, $A0,$AC,$AA
.byte $A1
walking03_rle: .byte $28 ; ysize=48
.byte $A0,$10,$AA, $99, $FB, $8B, $BB, $FB, $8B
.byte $99, $A0,$21,$AA, $A7,$BB, $A0,$21,$AA, $A3,$BB, $3B, $A3,$BB
.byte $A0,$21,$AA, $A0,$01,$AB, $A5,$BB, $A0,$01,$AB, $A0,$22,$AA, $BB, $A3,$B3
.byte $BB, $A0,$23,$AA, $A0,$01,$AB, $A3,$BB, $A0,$01,$AB, $A0,$24,$AA, $A3,$33
.byte $A0,$23,$AA, $0A, $A5,$33, $0A, $A0,$1F,$AA, $0A, $00,$00
.byte $A5,$03, $00,$00, $0A, $A0,$1C,$AA, $AD,$00, $0A, $A0,$19,$AA
.byte $AF,$00, $0A, $A0,$17,$AA, $A0,$11,$00, $A0,$16,$AA, $0A, $A0,$12,$00
.byte $A0,$15,$AA, $A0,$13,$00, $A0,$15,$AA, $A0,$13,$00, $A0,$15,$AA, $A0,$13,$00, $A0,$15,$AA
.byte $A0,$13,$00, $A0,$16,$AA, $BB,$BB, $AD,$00, $B0, $BB, $A0,$17,$AA
.byte $BB,$BB, $AD,$00, $BB,$BB, $A0,$17,$AA, $BB,$BB, $AD,$00, $BB,$BB
.byte $A0,$AC,$AA
.byte $A1
walking04_rle: .byte $28 ; ysize=48
.byte $AF,$AA, $A8,$BB, $A0,$21,$AA, $BB,$BB, $3B,$3B, $BB,$BB, $A0,$22,$AA
.byte $A6,$BB, $A0,$23,$AA, $A4,$3B, $A0,$23,$AA, $3A, $A4,$33, $3A
.byte $A0,$22,$AA, $A6,$33, $0A, $A0,$20,$AA, $0A, $03,$03, $33,$33
.byte $03,$03, $00, $0A, $A0,$1D,$AA, $0A, $AB,$00, $0A
.byte $A0,$19,$AA, $0A,$0A, $AE,$00, $0A, $A0,$16,$AA, $A0,$12,$00, $0A
.byte $A0,$14,$AA, $0A, $A0,$13,$00, $0A, $A0,$13,$AA, $A0,$15,$00, $A0,$12,$AA
.byte $0A, $A0,$15,$00, $0A, $A0,$11,$AA, $A0,$17,$00, $A0,$10,$AA, $0A
.byte $A0,$17,$00, $0A, $AF,$AA, $A0,$19,$00, $A0,$10,$AA, $A0,$16,$00, $A0,$01,$A0
.byte $A0,$11,$AA, $A0,$01,$A0, $A0,$14,$00, $B0, $A0,$13,$AA, $BB,$BB, $A0,$10,$00
.byte $B0, $BB,$BB, $A0,$13,$AA, $A3,$BB, $AF,$00, $A3,$BB, $A0,$AA,$AA
.byte $A1
walking05_rle: .byte $28 ; ysize=48
.byte $A0,$12,$AA, $A6,$BB, $A0,$01,$A5, $A0,$21,$AA, $3B, $A4,$BB, $3B
.byte $A0,$22,$AA, $A6,$33, $A0,$21,$AA, $3A, $A7,$33, $A0,$1F,$AA, $0A
.byte $A8,$33, $3A, $0A, $A0,$1B,$AA, $0A, $00,$00, $A8,$03
.byte $A3,$00, $0A, $A0,$17,$AA, $0A, $A0,$11,$00, $0A, $A0,$13,$AA
.byte $0A, $A0,$14,$00, $0A, $A0,$11,$AA, $A0,$17,$00, $0A, $A0,$10,$AA
.byte $A0,$18,$00, $AF,$AA, $0A, $A0,$19,$00, $AE,$AA, $A0,$1A,$00, $0A
.byte $AC,$AA, $A0,$1C,$00, $AC,$AA, $A0,$1C,$00, $AB,$AA, $A0,$1D,$00, $0A
.byte $A9,$AA, $0A, $A0,$1E,$00, $A9,$AA, $A0,$1F,$00, $AA,$AA, $A0,$1D,$00
.byte $AC,$AA, $A0,$18,$00, $B0,$B0, $A0,$02,$A0, $AC,$AA, $BB, $B0
.byte $A0,$15,$00, $A3,$BB, $A0,$A7,$AA
.byte $A1
walking06_rle: .byte $28 ; ysize=48
.byte $AE,$AA, $A9,$33, $A0,$1D,$AA, $0A, $AB,$33, $05, $A0,$19,$AA
.byte $0A, $A3,$00, $03, $A8,$33, $03, $00, $0A,$0A
.byte $A0,$16,$AA, $A0,$14,$00, $0A, $A0,$11,$AA, $0A, $A0,$16,$00, $A0,$10,$AA
.byte $A0,$19,$00, $0A, $AD,$AA, $A0,$1B,$00, $0A, $AA,$AA, $0A
.byte $A0,$1E,$00, $A9,$AA, $A0,$1F,$00, $0A, $A7,$AA, $0A, $A0,$20,$00
.byte $A7,$AA, $A0,$21,$00, $A7,$AA, $A0,$22,$00, $A5,$AA, $A0,$23,$00, $A5,$AA
.byte $A0,$24,$00, $A3,$AA, $A0,$25,$00, $A3,$AA, $A0,$26,$00, $A0,$02,$AA, $A0,$26,$00
.byte $A0,$02,$AA, $A0,$01,$A0, $A0,$24,$00, $A4,$AA, $A0,$01,$A0, $A0,$21,$00, $A0,$01,$A0
.byte $A6,$AA, $A0,$01,$A0, $A0,$1F,$00, $BB, $A0,$A5,$AA
.byte $A1
walking07_rle: .byte $28 ; ysize=48
.byte $A9,$AA, $A3,$0A, $AB,$33, $A0,$18,$AA, $0A, $A0,$12,$00, $A4,$0A
.byte $AF,$AA, $0A, $A0,$19,$00, $AC,$AA, $0A, $A0,$1C,$00, $0A
.byte $A9,$AA, $A0,$20,$00, $0A, $A6,$AA, $A0,$22,$00, $0A, $A4,$AA
.byte $A0,$24,$00, $A4,$AA, $A0,$25,$00, $A3,$AA, $A0,$25,$00, $A3,$AA, $A0,$26,$00
.byte $A0,$02,$AA, $A0,$26,$00, $A0,$02,$AA, $A0,$26,$00, $0A, $A0,$01,$AA, $A0,$27,$00
.byte $A0,$01,$AA, $A0,$27,$00, $A0,$01,$AA, $A0,$EF,$00, $A0,$01,$A0, $A0,$A0,$AA
.byte $A1
walking08_rle: .byte $28 ; ysize=48
.byte $A4,$AA, $0A, $A0,$20,$00, $0A, $A4,$AA, $0A, $A0,$23,$00
.byte $0A, $A0,$02,$AA, $0A, $A0,$26,$00, $0A, $A0,$FF,$00, $A0,$FF,$00
.byte $A0,$A9,$00, $A0,$A0,$AA
.byte $A1

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 330 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 258 B