Apple-2-SW/dos33fsprogs
1
0
Fork 0
mirror of https://github.com/deater/dos33fsprogs.git synced 2025-02-27 15:29:47 +00:00
Code Issues Projects Releases Wiki Activity

ootw: add keypad approach

Browse Source
This commit is contained in:
Vince Weaver 2019-02-06 23:08:04 -05:00
parent 5282c30a20
commit 8ec46144a0
11 changed files with 151 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ootw/Makefile
View File

@ -67,7 +67,8 @@ intro.o: intro.s \
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
intro_graphics/04_keypad/intro_keypad.inc \
intro_graphics/04_keypad/intro_approach.inc
ca65 -o intro.o intro.s -l intro.lst
####

71
ootw/intro.s
View File

@ -21,7 +21,7 @@ intro:
lda #0
sta DISP_PAGE
jmp elevator_exit
; jmp elevator_exit
;===============================
;===============================
@ -544,8 +544,8 @@ elevator_inner_loop:
jsr page_flip
ldx #30
jsr long_wait
ldx #25
jsr long_wait ; pause
dec ELEVATOR_COUNT
bne elevator_open_loop
@ -560,14 +560,14 @@ elevator_inner_loop:
jsr run_sequence
;======================================
; make background black and pause a bit
jsr clear_all
jsr page_flip
off_elevator_loop:
lda KEYPRESS
bpl off_elevator_loop
bit KEYRESET
ldx #80
jsr long_wait
;===============================
;===============================
@ -575,6 +575,29 @@ off_elevator_loop:
;===============================
;===============================
;=============================
; Load background to $c00
lda #>(scanner_door_rle)
sta GBASH
lda #<(scanner_door_rle)
sta GBASL
lda #$c ; load to off-screen $c00
jsr load_rle_gr
; jsr gr_copy_to_current
; jsr page_flip
lda #<approach_sequence
sta INTRO_LOOPL
lda #>approach_sequence
sta INTRO_LOOPH
jsr run_sequence
;=============================
; Load background to $c00
@ -585,12 +608,10 @@ off_elevator_loop:
lda #$c ; load to off-screen $c00
jsr load_rle_gr
;=================================
; copy $c00 to both pages $400/$800
jsr gr_copy_to_current
jsr page_flip
jsr gr_copy_to_current
keypad_loop:
lda KEYPRESS
@ -888,6 +909,7 @@ gone_loop:
.include "intro_graphics/04_keypad/intro_scanner_door.inc"
.include "intro_graphics/04_keypad/intro_keypad.inc"
.include "intro_graphics/04_keypad/intro_approach.inc"
.include "intro_scanner.inc"
.include "intro_open_soda.inc"
@ -1043,7 +1065,32 @@ walking_sequence:
.word walking07_rle
.byte 20
.word walking08_rle
.byte 20
.word walking08_rle
.byte 0
; Approaching keypad sequence
approach_sequence:
.byte 20
.word approach01_rle
.byte 20
.word approach02_rle
.byte 20
.word approach03_rle
.byte 20
.word approach04_rle
.byte 20
.word approach05_rle
.byte 20
.word approach06_rle
.byte 20
.word approach07_rle
.byte 80
.word approach07_rle
.byte 0

13
ootw/intro_graphics/04_keypad/Makefile
View File

@ -3,7 +3,7 @@ include ../../../Makefile.inc
PNG2RLE = ../../../gr-utils/png2rle
all: intro_scanner_door.inc intro_keypad.inc
all: intro_scanner_door.inc intro_keypad.inc intro_approach.inc
#####
@ -13,6 +13,17 @@ intro_scanner_door.inc: $(PNG2RLE) intro_scanner_door.png
intro_keypad.inc: $(PNG2RLE) intro_keypad.png
$(PNG2RLE) asm intro_keypad.png keypad_rle > intro_keypad.inc
intro_approach.inc: $(PNG2RLE) approach01.png approach02.png \
approach03.png approach04.png approach05.png approach06.png \
approach07.png
$(PNG2RLE) asm approach01.png approach01_rle > intro_approach.inc
$(PNG2RLE) asm approach02.png approach02_rle >> intro_approach.inc
$(PNG2RLE) asm approach03.png approach03_rle >> intro_approach.inc
$(PNG2RLE) asm approach04.png approach04_rle >> intro_approach.inc
$(PNG2RLE) asm approach05.png approach05_rle >> intro_approach.inc
$(PNG2RLE) asm approach06.png approach06_rle >> intro_approach.inc
$(PNG2RLE) asm approach07.png approach07_rle >> intro_approach.inc
#####
clean:

BIN
ootw/intro_graphics/04_keypad/approach01.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
ootw/intro_graphics/04_keypad/approach02.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
ootw/intro_graphics/04_keypad/approach03.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
ootw/intro_graphics/04_keypad/approach04.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
ootw/intro_graphics/04_keypad/approach05.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
ootw/intro_graphics/04_keypad/approach06.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
ootw/intro_graphics/04_keypad/approach07.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

78
ootw/intro_graphics/04_keypad/intro_approach.inc Normal file
View File

@ -0,0 +1,78 @@
approach01_rle: .byte $28 ; ysize=48
.byte $AB,$AA, $AF,$00, $A0,$18,$AA, $0A, $A0,$10,$00, $0A, $A0,$14,$AA
.byte $0A, $A0,$14,$00, $0A, $A0,$11,$AA, $0A, $A0,$17,$00, $AE,$AA
.byte $0A, $A0,$1A,$00, $0A, $AB,$AA, $A0,$1E,$00, $0A, $A7,$AA
.byte $0A, $A0,$20,$00, $0A, $A4,$AA, $0A, $A0,$24,$00, $0A
.byte $A0,$02,$AA, $A0,$27,$00, $0A, $A0,$FF,$00, $A0,$B9,$00, $A0,$A0,$AA
.byte $A1
approach02_rle: .byte $28 ; ysize=48
.byte $AD,$AA, $A9,$33, $A0,$1F,$AA, $33, $A8,$03, $A0,$1D,$AA, $0A
.byte $AB,$00, $0A, $A0,$19,$AA, $0A, $AE,$00, $0A, $A0,$16,$AA
.byte $0A, $A0,$12,$00, $0A, $A0,$13,$AA, $0A, $A0,$14,$00, $0A
.byte $A0,$11,$AA, $A0,$18,$00, $0A, $AE,$AA, $A0,$1A,$00, $0A, $AC,$AA
.byte $0A, $A0,$1B,$00, $0A, $AA,$AA, $0A, $A0,$1E,$00, $A8,$AA
.byte $A0,$20,$00, $0A, $A6,$AA, $0A, $A0,$21,$00, $A6,$AA, $A0,$23,$00
.byte $A5,$AA, $A0,$23,$00, $0A, $A4,$AA, $A0,$24,$00, $A4,$AA, $A0,$24,$00
.byte $0A, $A3,$AA, $A0,$25,$00, $A3,$AA, $A0,$23,$00, $A0,$01,$A0, $A4,$AA
.byte $A0,$22,$00, $A6,$AA, $A0,$01,$A0, $A0,$1F,$00, $A0,$01,$A0, $A0,$A7,$AA
.byte $A1
approach03_rle: .byte $28 ; ysize=48
.byte $A0,$10,$AA, $A7,$33, $A0,$21,$AA, $A7,$33, $A0,$21,$AA, $A7,$33, $A0,$21,$AA
.byte $A7,$03, $A0,$1F,$AA, $AA,$00, $0A, $A0,$1B,$AA, $0A, $AD,$00
.byte $0A, $A0,$17,$AA, $0A, $A0,$11,$00, $0A, $A0,$14,$AA, $0A
.byte $A0,$13,$00, $0A, $A0,$12,$AA, $A0,$17,$00, $A0,$10,$AA, $A0,$19,$00, $AE,$AA
.byte $A0,$1A,$00, $AD,$AA, $0A, $A0,$1B,$00, $0A, $AB,$AA, $A0,$1D,$00
.byte $AB,$AA, $A0,$1D,$00, $0A, $A9,$AA, $A0,$1F,$00, $A9,$AA, $A0,$1E,$00
.byte $A0,$01,$A0, $A9,$AA, $A0,$1D,$00, $A0,$01,$A0, $AB,$AA, $A0,$1C,$00, $AC,$AA
.byte $A0,$01,$A0, $A0,$19,$00, $B0, $A0,$01,$A0, $AE,$AA, $B0, $A0,$16,$00
.byte $BB,$BB, $A0,$A8,$AA
.byte $A1
approach04_rle: .byte $28 ; ysize=48
.byte $A0,$11,$AA, $A0,$01,$A3, $88, $99,$99, $98,$98, $A0,$01,$A3, $A0,$22,$AA
.byte $88, $A3,$89, $88, $A0,$23,$AA, $A5,$33, $A0,$23,$AA, $A5,$33
.byte $A0,$23,$AA, $A5,$33, $A0,$21,$AA, $0A, $A7,$03, $0A, $A0,$1D,$AA
.byte $0A, $AB,$00, $0A, $A0,$1A,$AA, $0A, $AE,$00, $0A
.byte $A0,$17,$AA, $0A, $A0,$10,$00, $0A, $A0,$15,$AA, $A0,$14,$00, $A0,$13,$AA
.byte $A0,$16,$00, $A0,$12,$AA, $A0,$16,$00, $0A, $A0,$10,$AA, $A0,$19,$00, $AE,$AA
.byte $0A, $A0,$19,$00, $0A, $AD,$AA, $A0,$1B,$00, $AC,$AA, $A0,$1C,$00
.byte $AC,$AA, $A0,$1B,$00, $AC,$AA, $A0,$1B,$00, $AD,$AA, $A0,$01,$A0, $A0,$19,$00
.byte $AF,$AA, $A0,$02,$A0, $B0,$B0, $A0,$12,$00, $B0, $BB,$BB, $A0,$A8,$AA
.byte $A1
approach05_rle: .byte $28 ; ysize=48
.byte $A0,$10,$AA, $A4,$99, $88, $99, $88, $A0,$21,$AA, $A3,$99
.byte $88, $99, $89, $88, $A0,$21,$AA, $BB, $A4,$99
.byte $88, $BB, $A0,$22,$AA, $A0,$01,$A8, $A4,$38, $A0,$24,$AA, $A4,$33
.byte $A0,$24,$AA, $A4,$33, $A0,$22,$AA, $0A,$0A, $A4,$03, $0A, $A0,$20,$AA
.byte $0A, $A8,$00, $0A, $A0,$1D,$AA, $AC,$00, $0A, $A0,$19,$AA
.byte $0A, $AE,$00, $0A, $A0,$17,$AA, $A0,$11,$00, $0A, $A0,$15,$AA
.byte $A0,$13,$00, $A0,$14,$AA, $0A, $A0,$14,$00, $0A, $A0,$11,$AA, $0A
.byte $A0,$16,$00, $A0,$11,$AA, $A0,$18,$00, $A0,$10,$AA, $A0,$17,$00, $A0,$01,$A0, $A0,$10,$AA
.byte $A0,$01,$A0, $A0,$15,$00, $A0,$01,$A0, $A0,$12,$AA, $A0,$01,$A0, $A0,$12,$00, $B0
.byte $A0,$01,$A0, $A0,$14,$AA, $BB,$BB, $B0, $AD,$00, $B0, $BB,$BB
.byte $A0,$15,$AA, $A3,$BB, $AD,$00, $A3,$BB, $A0,$AB,$AA
.byte $A1
approach06_rle: .byte $28 ; ysize=48
.byte $AF,$AA, $A4,$99, $A3,$88, $A0,$21,$AA, $A4,$99, $98, $88,$88
.byte $A0,$21,$AA, $A0,$01,$A9, $99,$99, $89, $98, $88, $A0,$01,$A8
.byte $A0,$22,$AA, $99,$99, $98, $99, $88, $A0,$23,$AA, $A3,$99
.byte $89, $88, $A0,$23,$AA, $39, $A3,$38, $33, $A0,$23,$AA
.byte $A5,$33, $A0,$23,$AA, $A5,$03, $0A, $A0,$20,$AA, $0A, $A7,$00
.byte $0A, $A0,$1D,$AA, $0A, $AB,$00, $0A, $A0,$1A,$AA, $0A
.byte $AE,$00, $A0,$18,$AA, $0A, $A0,$10,$00, $A0,$17,$AA, $A0,$11,$00, $0A
.byte $A0,$15,$AA, $A0,$13,$00, $A0,$14,$AA, $A0,$15,$00, $A0,$13,$AA, $A0,$15,$00, $A0,$13,$AA
.byte $A0,$01,$A0, $A0,$12,$00, $A0,$01,$A0, $A0,$15,$AA, $A0,$01,$A0, $AF,$00, $B0
.byte $A0,$18,$AA, $BB,$BB, $AC,$00, $BB,$BB, $A0,$18,$AA, $BB,$BB, $AC,$00
.byte $A3,$BB, $A0,$AD,$AA
.byte $A1
approach07_rle: .byte $28 ; ysize=48
.byte $A0,$10,$AA, $A4,$99, $88,$88, $A0,$22,$AA, $A4,$99, $88,$88, $A0,$22,$AA
.byte $A4,$99, $88,$88, $A0,$22,$AA, $89, $99, $89, $98
.byte $88,$88, $A0,$23,$AA, $88, $99,$99, $88, $A0,$24,$AA, $39,$39
.byte $38,$38, $A0,$24,$AA, $A4,$33, $A0,$24,$AA, $A4,$03, $0A, $A0,$21,$AA
.byte $0A, $A7,$00, $A0,$1F,$AA, $AA,$00, $0A, $A0,$1B,$AA, $0A
.byte $AD,$00, $A0,$19,$AA, $0A, $AF,$00, $A0,$18,$AA, $A0,$10,$00, $0A
.byte $A0,$16,$AA, $A0,$12,$00, $A0,$16,$AA, $A0,$12,$00, $0A, $A0,$15,$AA, $A0,$13,$00
.byte $A0,$15,$AA, $A0,$01,$A0, $A0,$10,$00, $A0,$01,$A0, $A0,$17,$AA, $A3,$B0, $AB,$00
.byte $B0, $BB, $A0,$18,$AA, $A3,$BB, $AB,$00, $BB,$BB, $A0,$18,$AA
.byte $A3,$BB, $AB,$00, $BB,$BB, $A0,$AD,$AA
.byte $A1