ootw: intro: segments 1-3 going

This commit is contained in:
Vince Weaver 2019-03-02 11:10:41 -05:00
parent 7acf18caa9
commit f21a8b8ecb
6 changed files with 116 additions and 18 deletions

View File

@ -1,5 +1,3 @@
.define HACK 1
;=====================================
; Intro
@ -56,8 +54,6 @@ intro:
jsr run_sequence
.if 0
;===============================
;===============================
; Walk into door
@ -75,7 +71,6 @@ intro:
jsr run_sequence
;===============================
;===============================
; Elevator going down
@ -514,6 +509,9 @@ elevator_inner_loop:
;===============================
;===============================
.if 0
keypad:
;=============================
; Load background to $c00
@ -1546,7 +1544,7 @@ tunnel1:
;======================
; gone
.if HACK
lda #>(gone_rle)
sta GBASH
lda #<(gone_rle)
@ -1564,7 +1562,7 @@ tunnel1:
jsr run_sequence
.endif
.endif
gone_loop:
@ -1938,8 +1936,14 @@ plot_particle:
DATA_LOCATION = $9000
; intro1
building_sequence = $9840
; intro1,intro2,intro3
building_sequence = (DATA_LOCATION+$0840)
feet_sequence = (DATA_LOCATION+$12D0)
walking_sequence = (DATA_LOCATION+$1A35)
walking00_rle = (DATA_LOCATION+$1597)
off_elevator_rle = (DATA_LOCATION+$1499)
indicators = (DATA_LOCATION+$1A2B)
elevator_rle = (DATA_LOCATION+$12EC)
intro1_data_lz4:
.word (intro1_data_lz4_end-intro1_data_lz4)

View File

@ -1,4 +1,8 @@
; background graphics
;=================================
;=================================
; Intro Segment 01 Data (Building)
;=================================
;=================================
.include "intro_graphics/01_building/intro_building.inc"
.include "intro_graphics/01_building/intro_car.inc"
@ -40,3 +44,81 @@ outtacar_sequence:
.word intro_car14
.byte 0
;=================================
;=================================
; Intro Segment 02 Data (Door)
;=================================
;=================================
; background graphics
.include "intro_graphics/02_outer_door/outer_door.inc"
.include "intro_graphics/02_outer_door/feet.inc"
.include "intro_graphics/08_lightning/nothing.inc"
;=============================
; Feet going in door sequence
feet_sequence:
.byte 255
.word outer_door_rle
.byte 1
.word outer_door_rle
.byte 128+100 ; .word feet01_rle
.byte 128+10 ; .word feet02_rle
.byte 128+10 ; .word feet03_rle
.byte 128+10 ; .word feet04_rle
.byte 128+10 ; .word feet05_rle
.byte 128+10 ; .word feet06_rle
.byte 128+10 ; .word feet07_rle
.byte 128+10 ; .word feet08_rle
.byte 128+30 ; .word feet09_rle
.byte 128+10 ; .word feet10_rle
.byte 128+10 ; .word feet11_rle
.byte 128+10 ; .word feet12_rle
.byte 128+10 ; .word feet13_rle
.byte 128+10 ; .word feet14_rle
.byte 128+10 ; .word feet15_rle
.byte 10
.word nothing_rle
.byte 100
.word nothing_rle
.byte 0
;=================================
;=================================
; Intro Segment 03 Data (Elevator)
;=================================
;=================================
.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"
; Elevator light co-ordinates
; we load them backwards
indicators:
.byte 18,4 ; 4
.byte 16,3 ; 3
.byte 14,2 ; 2
.byte 18,2 ; 1
.byte 16,1 ; 0
; Walking off elevator sequence
walking_sequence:
.byte 20
.word walking01_rle
.byte 128+20 ; .word walking02_rle
.byte 128+20 ; .word walking03_rle
.byte 128+20 ; .word walking04_rle
.byte 128+20 ; .word walking05_rle
.byte 128+20 ; .word walking06_rle
.byte 128+20 ; .word walking07_rle
.byte 128+20 ; .word walking08_rle
.byte 20
.word walking08_rle
.byte 0

View File

@ -4,13 +4,18 @@ PNG2RLE = ../../../gr-utils/png2rle
PNG2LZ4 = ../../../gr-utils/png2lz4
all: lightning.inc lightning_lz4.inc
all: nothing.inc lightning.inc nothing_lz4.inc lightning_lz4.inc
#####
nothing.inc: nothing.png $(PNG2RLE)
$(PNG2RLE) asm nothing.png nothing_rle > nothing.inc
#####
lightning.inc: $(PNG2RLE) \
bolt1.png bolt2.png bolt3.png bolt4.png bolt5.png bolt6.png bolt7.png \
flash.png white.png black.png nothing.png \
flash.png white.png black.png \
storm01.png storm02.png storm03.png storm04.png storm05.png \
storm06.png storm08.png storm09.png storm10.png storm11.png \
storm12.png storm13.png storm14.png storm15.png storm16.png \
@ -60,9 +65,13 @@ lightning.inc: $(PNG2RLE) \
#####
#####
nothing_lz4.inc: $(PNG2LZ4)
$(PNG2LZ4) asm nothing.png nothing_rle > nothing_lz4.inc
lightning_lz4.inc: $(PNG2LZ4) \
bolt1.png bolt2.png bolt3.png bolt4.png bolt5.png bolt6.png bolt7.png \
flash.png white.png black.png nothing.png \
flash.png white.png black.png \
storm01.png storm02.png storm03.png storm04.png storm05.png \
storm06.png storm08.png storm09.png storm10.png storm11.png \
storm12.png storm13.png storm14.png storm15.png storm16.png \
@ -79,7 +88,6 @@ lightning_lz4.inc: $(PNG2LZ4) \
$(PNG2LZ4) asm flash.png flash_rle >> lightning_lz4.inc
$(PNG2LZ4) asm white.png white_rle >> lightning_lz4.inc
$(PNG2LZ4) asm black.png black_rle >> lightning_lz4.inc
$(PNG2LZ4) asm nothing.png nothing_rle >> lightning_lz4.inc
$(PNG2LZ4) asm storm01.png storm01_rle >> lightning_lz4.inc
$(PNG2LZ4) asm storm02.png storm02_rle >> lightning_lz4.inc
$(PNG2LZ4) asm storm03.png storm03_rle >> lightning_lz4.inc

View File

@ -140,10 +140,6 @@ white_rle:
black_rle:
.byte $10,$00
.byte $1F,$00,$01,$00,$FF,$FF,$FF,$EA,$50,$00,$00,$00,$00,$00
nothing_rle:
.byte $17,$00
.byte $1F,$AA,$01,$00,$E4,$13,$00,$01,$00,$0F,$00,$01,$FF,$FF,$EA,$50
.byte $00,$00,$00,$00,$00
storm01_rle:
.byte $39,$00
.byte $15,$AA,$01,$00,$22,$66,$65,$01,$00,$1F,$AA,$01,$00,$64,$8F,$26

View File

@ -0,0 +1,3 @@
nothing_rle: .byte $28 ; ysize=48
.byte $A0,$FF,$AA, $A0,$FF,$AA, $A0,$FF,$AA, $A0,$C3,$AA
.byte $A1

View File

@ -0,0 +1,5 @@
nothing_rle:
.byte $17,$00
.byte $1F,$AA,$01,$00,$E4,$13,$00,$01,$00,$0F,$00,$01,$FF,$FF,$EA,$50
.byte $00,$00,$00,$00,$00