ootw: intro: add cursor routine

This commit is contained in:
Vince Weaver 2019-02-16 00:24:24 -05:00
parent d84d84ee9f
commit 8ff2429777
15 changed files with 163 additions and 6 deletions

View File

@ -55,7 +55,6 @@ intro.o: intro.s \
gr_copy.s gr_fast_clear.s gr_pageflip.s gr_unrle.s gr_putsprite.s \
gr_overlay.s \
keyboard.s random16.s \
intro_unzapped.inc \
intro_open_soda.inc intro_drinking.inc intro_collider_ui.inc \
intro_tunnel1.inc intro_tunnel2.inc intro_gone.inc \
intro_graphics/01_building/intro_car.inc \
@ -74,7 +73,9 @@ intro.o: intro.s \
intro_graphics/05_scanner/intro_scanner.inc \
intro_graphics/05_scanner/intro_scanning.inc \
intro_graphics/05_scanner/intro_ai_bg.inc \
intro_graphics/05_scanner/intro_ai.inc
intro_graphics/05_scanner/intro_ai.inc \
intro_graphics/06_console/intro_desktop.inc \
intro_graphics/06_console/intro_cursor.inc
ca65 -o intro.o intro.s -l intro.lst
####

View File

@ -758,9 +758,9 @@ uz_loop:
;=============================
; Load background to $c00
lda #>(unzapped_rle)
lda #>(desktop_rle)
sta GBASH
lda #<(unzapped_rle)
lda #<(desktop_rle)
sta GBASL
lda #$c ; load to off-screen $c00
jsr load_rle_gr
@ -1109,9 +1109,11 @@ gone_loop:
.include "intro_graphics/05_scanner/intro_ai_bg.inc"
.include "intro_graphics/05_scanner/intro_ai.inc"
.include "intro_graphics/06_console/intro_desktop.inc"
.include "intro_graphics/06_console/intro_cursor.inc"
.include "intro_open_soda.inc"
.include "intro_drinking.inc"
.include "intro_unzapped.inc"
.include "intro_collider_ui.inc"
.include "intro_tunnel1.inc"
.include "intro_tunnel2.inc"

View File

@ -0,0 +1,30 @@
include ../../../Makefile.inc
PNG2RLE = ../../../gr-utils/png2rle
all: intro_desktop.inc intro_cursor.inc
#####
intro_desktop.inc: $(PNG2RLE) intro_desktop.png
$(PNG2RLE) asm intro_desktop.png desktop_rle > intro_desktop.inc
#####
intro_cursor.inc: $(PNG2RLE) desktop_bg.png \
cursor01.png cursor02.png cursor03.png cursor04.png \
cursor05.png cursor06.png cursor07.png cursor08.png
$(PNG2RLE) asm desktop_bg.png desktop_bg_rle > intro_cursor.inc
$(PNG2RLE) asm cursor01.png cursor01_rle >> intro_cursor.inc
$(PNG2RLE) asm cursor02.png cursor02_rle >> intro_cursor.inc
$(PNG2RLE) asm cursor03.png cursor03_rle >> intro_cursor.inc
$(PNG2RLE) asm cursor04.png cursor04_rle >> intro_cursor.inc
$(PNG2RLE) asm cursor05.png cursor05_rle >> intro_cursor.inc
$(PNG2RLE) asm cursor06.png cursor06_rle >> intro_cursor.inc
$(PNG2RLE) asm cursor07.png cursor07_rle >> intro_cursor.inc
$(PNG2RLE) asm cursor08.png cursor08_rle >> intro_cursor.inc
clean:
rm -f *~ *.inc

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 308 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 305 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 302 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 308 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 354 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 523 B

View File

@ -0,0 +1,124 @@
desktop_bg_rle: .byte $28 ; ysize=48
.byte $A5,$00, $11, $00, $90, $10,$10, $A0,$23,$00, $11
.byte $90, $00, $09, $00, $19,$19, $A0,$22,$00, $19
.byte $A4,$00, $11, $19, $A0,$21,$00, $11, $00,$00, $30
.byte $00, $11, $00, $40, $50, $A6,$40, $A0,$19,$00
.byte $01, $00,$00, $33, $00, $A3,$04, $54, $A3,$04
.byte $AC,$44, $A6,$40, $AC,$00, $33, $99, $A0,$12,$00, $04,$04
.byte $54, $A4,$00, $55, $AA,$00, $33, $13, $33
.byte $99, $90, $A3,$00, $05, $AF,$00, $75, $AF,$00
.byte $11, $19, $33, $99,$99, $A0,$13,$00, $55, $A4,$00
.byte $07, $AA,$00, $01, $31, $33, $99,$99, $A3,$00
.byte $05, $AF,$00, $77, $A4,$00, $05, $AB,$00, $33,$33
.byte $99,$99, $A0,$13,$00, $05, $A4,$00, $50, $AB,$00, $03
.byte $33, $99,$99, $A0,$13,$00, $05, $A0,$11,$00, $33, $99
.byte $A4,$00, $05, $AF,$00, $05, $A4,$00, $50, $AB,$00
.byte $30, $33, $99, $A4,$00, $50, $AF,$00, $05
.byte $A4,$00, $05, $00, $19, $A8,$00, $A3,$33, $11
.byte $A0,$19,$00, $05, $A5,$00, $A5,$30, $33, $99, $A6,$00
.byte $05, $AF,$00, $55, $AA,$00, $A5,$33, $13, $99
.byte $A6,$00, $50, $AF,$00, $05, $A4,$00, $05, $A4,$00
.byte $A6,$33, $11, $99, $A4,$44, $40,$40, $50, $A4,$40
.byte $A0,$10,$00, $50, $AD,$00, $04, $40, $44, $40
.byte $44, $C5, $A8,$C4, $44,$44, $A5,$40, $45, $40
.byte $A3,$00, $50, $AF,$00, $04, $C4, $A0,$10,$CC, $C4
.byte $66, $A4,$C4, $C5, $22,$22, $20,$20, $AD,$00, $0C,$0C
.byte $AF,$CC, $66, $A4,$CC, $2C, $22,$22, $66,$66, $A0,$10,$00
.byte $0C, $AD,$CC, $6C, $CC,$CC, $2C, $22, $02
.byte $20, $A3,$22, $A0,$11,$00, $0C, $A4,$2C, $A8,$CC, $66
.byte $2C, $22, $02, $A3,$20, $22, $02, $A0,$13,$00
.byte $02, $22, $02, $00,$00, $02, $22,$22, $2C
.byte $0C, $2C,$2C, $26, $22,$22, $A4,$20, $22, $62
.byte $22, $A0,$13,$00, $22, $00,$00, $20,$20, $A3,$22, $20
.byte $02, $A8,$22, $12, $22,$22
.byte $A1
cursor01_rle: .byte $28 ; ysize=48
.byte $A0,$FF,$AA, $A0,$FF,$AA, $A0,$74,$AA, $A3,$6A, $A0,$25,$AA, $66, $A0,$01,$A6
.byte $6A, $A0,$FF,$AA, $A0,$24,$AA
.byte $A1
cursor02_rle: .byte $28 ; ysize=48
.byte $A0,$FF,$AA, $A0,$A1,$AA, $6A, $C6, $06, $66,$66, $A6,$AA
.byte $A4,$6A, $A0,$18,$AA, $66, $06, $C6, $66, $00
.byte $66, $A4,$AA, $6A, $66, $6C, $60, $06
.byte $66, $A0,$18,$AA, $66, $00, $CC, $66, $C0
.byte $66, $A4,$AA, $66, $00, $CC, $66, $00
.byte $66, $A0,$18,$AA, $66, $6C, $60, $66, $A0,$01,$A6
.byte $A5,$AA, $66, $C0, $0C, $66, $6C, $A0,$01,$A6
.byte $A0,$22,$AA, $A4,$A6, $A0,$24,$AA, $66,$66, $A0,$01,$A6, $A0,$25,$AA, $A0,$01,$A6
.byte $A0,$01,$AA, $A0,$01,$A6, $A0,$FF,$AA, $A0,$25,$AA
.byte $A1
cursor03_rle: .byte $28 ; ysize=48
.byte $A0,$FF,$AA, $A0,$A1,$AA, $6A, $C6, $06, $66,$66, $A6,$AA
.byte $A4,$6A, $A0,$18,$AA, $66, $06, $C6, $66, $00
.byte $66, $A4,$AA, $6A, $66, $6C, $60, $06
.byte $66, $A0,$18,$AA, $66, $00, $CC, $66, $C0
.byte $66, $A4,$AA, $66, $00, $CC, $66, $00
.byte $66, $A0,$18,$AA, $66, $6C, $60, $66, $A0,$01,$A6
.byte $A5,$AA, $66, $C0, $0C, $66, $6C, $A0,$01,$A6
.byte $A0,$22,$AA, $A4,$A6, $A0,$21,$AA, $66,$66, $A0,$01,$A6, $A0,$25,$AA, $A0,$01,$A6
.byte $A0,$01,$AA, $A0,$01,$A6, $A0,$FF,$AA, $A0,$28,$AA
.byte $A1
cursor04_rle: .byte $28 ; ysize=48
.byte $A0,$FF,$AA, $A0,$A1,$AA, $6A, $C6, $06, $66,$66, $A6,$AA
.byte $A4,$6A, $A0,$18,$AA, $66, $06, $C6, $66, $00
.byte $66, $A4,$AA, $6A, $66, $6C, $60, $06
.byte $66, $A0,$18,$AA, $66, $00, $CC, $66, $C0
.byte $66, $A4,$AA, $66, $00, $CC, $66, $00
.byte $66, $A0,$18,$AA, $66, $6C, $60, $66, $A0,$01,$A6
.byte $A5,$AA, $66, $C0, $0C, $66, $6C, $A0,$01,$A6
.byte $A0,$1E,$AA, $66,$66, $A0,$01,$A6, $A0,$01,$AA, $A4,$A6, $A0,$20,$AA, $A0,$01,$A6
.byte $A0,$01,$AA, $A0,$01,$A6, $A0,$FF,$AA, $A0,$51,$AA
.byte $A1
cursor05_rle: .byte $28 ; ysize=48
.byte $A0,$FF,$AA, $A0,$A1,$AA, $6A, $C6, $06, $66,$66, $A6,$AA
.byte $A4,$6A, $A0,$18,$AA, $66, $06, $C6, $66, $00
.byte $66, $A4,$AA, $6A, $66, $6C, $60, $06
.byte $66, $A0,$18,$AA, $66, $00, $CC, $66, $C0
.byte $66, $A4,$AA, $66, $00, $CC, $66, $00
.byte $66, $A0,$18,$AA, $66, $6C, $60, $66, $A0,$01,$A6
.byte $66,$66, $A0,$01,$A6, $A0,$02,$AA, $66, $C0, $0C, $66
.byte $6C, $A0,$01,$A6, $A0,$1D,$AA, $A0,$01,$A6, $A0,$01,$AA, $A0,$01,$A6, $A0,$02,$AA
.byte $A4,$A6, $A0,$FF,$AA, $A0,$74,$AA
.byte $A1
cursor06_rle: .byte $28 ; ysize=48
.byte $A0,$FF,$AA, $A0,$A1,$AA, $6A, $C6, $06, $66,$66, $A6,$AA
.byte $A4,$6A, $A0,$18,$AA, $66, $06, $C6, $66, $00
.byte $66, $A4,$AA, $6A, $66, $6C, $60, $06
.byte $66, $A0,$18,$AA, $66, $00, $CC, $66, $60
.byte $66, $6A, $A3,$AA, $66, $00, $CC, $66
.byte $00, $66, $A0,$18,$AA, $66, $6C, $60, $66,$66
.byte $A0,$01,$A6, $6A, $55, $A0,$02,$AA, $66, $C0, $0C
.byte $66, $6C, $A0,$01,$A6, $A0,$1D,$AA, $A3,$A5, $A0,$02,$AA, $A4,$A6
.byte $A0,$FF,$AA, $A0,$74,$AA
.byte $A1
cursor07_rle: .byte $28 ; ysize=48
.byte $A0,$FF,$AA, $A0,$2C,$AA, $A4,$CA, $A0,$1D,$AA, $CA, $A0,$01,$AC, $A6,$AA
.byte $CA, $A0,$01,$AC, $CC, $A0,$1C,$AA, $CC, $A3,$AC, $A7,$AA
.byte $CC, $A0,$1C,$AA, $CC, $A4,$AA, $CA, $CC, $0C
.byte $CC,$CC, $A6,$AA, $A4,$6A, $A0,$14,$AA, $A0,$01,$AC, $A3,$AA, $CC
.byte $0C, $CC,$CC, $00, $CC, $A4,$AA, $6A, $66
.byte $6C, $60, $06, $66, $A0,$18,$AA, $CC, $00
.byte $CC,$CC, $60, $6C, $6A, $A3,$AA, $66, $00
.byte $CC, $66, $00, $66, $A0,$18,$AA, $CC,$CC, $C0
.byte $CC, $66, $A0,$01,$A6, $6A, $55, $A0,$02,$AA, $66
.byte $C0, $0C, $66, $6C, $A0,$01,$A6, $A0,$18,$AA, $CA
.byte $A0,$01,$AC, $CA,$CA, $A0,$01,$AA, $A0,$01,$A5, $C5, $A0,$01,$A5, $A0,$02,$AA
.byte $A4,$A6, $A0,$19,$AA, $A0,$01,$AC, $A6,$AA, $CC, $A0,$01,$AA, $CA
.byte $A0,$23,$AA, $CA,$CA, $CC, $A0,$01,$AC, $A0,$FF,$AA, $A0,$2A,$AA
.byte $A1
cursor08_rle: .byte $28 ; ysize=48
.byte $A0,$FC,$AA, $CA, $A0,$01,$AC, $A0,$25,$AA, $CC, $A3,$AC, $A5,$AA
.byte $A0,$02,$AC, $CC,$CC, $A0,$1B,$AA, $CC, $A9,$AA, $A0,$01,$AC, $A0,$01,$AA
.byte $CC, $A0,$1B,$AA, $A0,$01,$AC, $AB,$AA, $A0,$01,$AC, $A0,$20,$AA, $CA
.byte $CC, $0C, $CC,$CC, $A6,$AA, $A4,$6A, $A0,$18,$AA, $CC
.byte $0C, $CC,$CC, $00, $CC, $A4,$AA, $6A, $66
.byte $6C, $60, $06, $66, $A0,$18,$AA, $CC, $00
.byte $CC,$CC, $60, $6C, $6A, $A3,$AA, $66, $00
.byte $CC, $66, $00, $66, $A0,$17,$AA, $CA, $CC,$CC
.byte $C0, $CC, $66, $A0,$01,$A6, $6A, $55, $A0,$02,$AA
.byte $66, $C0, $0C, $66, $6C, $A0,$01,$A6, $A0,$17,$AA
.byte $CC, $A5,$AA, $A3,$A5, $A0,$02,$AA, $A4,$A6, $A0,$18,$AA, $CA
.byte $A3,$AC, $A4,$AA, $CA, $A0,$1E,$AA, $A0,$01,$AC, $A8,$AA, $CC
.byte $A0,$01,$AA, $CA, $A0,$23,$AA, $CA,$CA, $CC, $A0,$01,$AC, $A0,$FF,$AA
.byte $A0,$02,$AA
.byte $A1

View File

@ -1,4 +1,4 @@
unzapped_rle: .byte $28 ; ysize=48
desktop_rle: .byte $28 ; ysize=48
.byte $A5,$22, $20, $22, $00, $02, $A5,$22, $02
.byte $A3,$00, $22, $A3,$00, $25, $22, $00, $A3,$22
.byte $00, $20, $50, $A3,$00, $62, $A5,$00, $A8,$22

View File

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB