ootw: intro: adjust timing on last scene

a bit blinky, hopefully not fast enough to need a warning

have a bunch disabled so it fits in memory to test
This commit is contained in:
Vince Weaver
2019-03-01 11:00:34 -05:00
parent 0a0645988f
commit 8a3b6df014

View File

@@ -83,7 +83,7 @@ intro:
jsr run_sequence jsr run_sequence
.if 0
;=============================== ;===============================
;=============================== ;===============================
; Walk into door ; Walk into door
@@ -1471,7 +1471,7 @@ particle_loop2:
; bpl collider_ui_loop ; bpl collider_ui_loop
; bit KEYRESET ; bit KEYRESET
.endif
;=============================== ;===============================
;=============================== ;===============================
; Thunderstorm Outside ; Thunderstorm Outside
@@ -1615,9 +1615,9 @@ tunnel1:
jsr gr_copy_to_current jsr gr_copy_to_current
jsr page_flip jsr page_flip
lda #<zappo_sequence lda #<gone_sequence
sta INTRO_LOOPL sta INTRO_LOOPL
lda #>zappo_sequence lda #>gone_sequence
sta INTRO_LOOPH sta INTRO_LOOPH
jsr run_sequence jsr run_sequence
@@ -1645,6 +1645,8 @@ gone_loop:
.include "intro_graphics/01_building/intro_building_car.inc" .include "intro_graphics/01_building/intro_building_car.inc"
.include "intro_graphics/01_building/intro_car.inc" .include "intro_graphics/01_building/intro_car.inc"
.if 0
.include "intro_graphics/02_outer_door/outer_door.inc" .include "intro_graphics/02_outer_door/outer_door.inc"
.include "intro_graphics/02_outer_door/feet.inc" .include "intro_graphics/02_outer_door/feet.inc"
@@ -1670,6 +1672,8 @@ gone_loop:
.include "intro_graphics/07_soda/intro_open_soda.inc" .include "intro_graphics/07_soda/intro_open_soda.inc"
.include "intro_graphics/07_soda/intro_drinking.inc" .include "intro_graphics/07_soda/intro_drinking.inc"
.endif
.include "intro_graphics/08_lightning/lightning.inc" .include "intro_graphics/08_lightning/lightning.inc"
.include "intro_graphics/09_tunnel/intro_tunnel1.inc" .include "intro_graphics/09_tunnel/intro_tunnel1.inc"
@@ -1746,7 +1750,7 @@ run_sequence_40x40_loop:
run_sequence_40x40_done: run_sequence_40x40_done:
rts rts
.if 0
;================================= ;=================================
; Display a sequence of images ; Display a sequence of images
@@ -1852,7 +1856,7 @@ no_dna:
jmp run_sequence_static_loop jmp run_sequence_static_loop
run_sequence_static_done: run_sequence_static_done:
rts rts
.endif
;===================== ;=====================
; long(er) wait ; long(er) wait
@@ -1905,6 +1909,8 @@ outtacar_sequence:
.word intro_car14 .word intro_car14
.byte 0 .byte 0
.if 0
; Getting out of car sequence ; Getting out of car sequence
feet_sequence: feet_sequence:
@@ -2608,7 +2614,7 @@ drinking_sequence:
.word drinking05_rle .word drinking05_rle
.byte 0 .byte 0
.endif
; Lightning sequence ; Lightning sequence
@@ -2964,59 +2970,59 @@ zappo_sequence:
.byte 50 .byte 50
.word white_rle .word white_rle
.byte 20 .byte 2
.word zappo01_rle ; B .word zappo01_rle ; B
.byte 20 .byte 2
.word zappo02_rle ; B .word zappo02_rle ; B
.byte 20 .byte 2
.word zappo03_rle ; A .word zappo03_rle ; A
.byte 20 .byte 2
.word zappo04_rle ; B .word zappo04_rle ; B
.byte 20 .byte 2
.word zappo05_rle ; B .word zappo05_rle ; B
.byte 20 .byte 2
.word zappo06_rle ; A .word zappo06_rle ; A
.byte 20 .byte 2
.word zappo07_rle ; B .word zappo07_rle ; B
.byte 20 .byte 2
.word zappo08_rle ; B .word zappo08_rle ; B
.byte 20 .byte 2
.word zappo09_rle ; A .word zappo09_rle ; A
.byte 20 .byte 2
.word zappo10_rle ; B .word zappo10_rle ; B
.byte 20 .byte 2
.word zappo11_rle ; A .word zappo11_rle ; A
.byte 20 .byte 2
.word zappo12_rle ; B .word zappo12_rle ; B
.byte 20 .byte 2
.word zappo13_rle ; B .word zappo13_rle ; B
.byte 20 .byte 2
.word zappo14_rle ; B .word zappo14_rle ; B
.byte 20 .byte 2
.word zappo15_rle ; A .word zappo15_rle ; A
.byte 20 .byte 2
.word zappo16_rle ; B .word zappo16_rle ; B
.byte 20 .byte 2
.word zappo17_rle ; B .word zappo17_rle ; B
.byte 20 .byte 2
.word white_rle .word white_rle
.byte 20 .byte 1
.word black_rle .word black_rle
.byte 20 .byte 1
.word white_rle .word white_rle
.byte 20 .byte 1
.word black_rle .word black_rle
.byte 20 .byte 1
.word white_rle .word white_rle
.byte 20 .byte 1
.word black_rle .word black_rle
.byte 20 .byte 1
.word white_rle .word white_rle
.byte 20 .byte 1
.word black_rle .word black_rle
.byte 20 .byte 1
.word white_rle .word white_rle
.byte 20 .byte 1
.word black_rle .word black_rle
.byte 0 .byte 0
.word nothing_rle .word nothing_rle
@@ -3030,93 +3036,93 @@ gone_sequence:
.byte 50 .byte 50
.word white_rle .word white_rle
.byte 20 .byte 7
.word gone01_rle ; B .word gone01_rle ; B
.byte 20 .byte 7
.word gone02_rle ; B .word gone02_rle ; B
.byte 20 .byte 7
.word gone03_rle ; B .word gone03_rle ; B
.byte 20 .byte 7
.word gone04_rle ; B .word gone04_rle ; B
.byte 20 .byte 7
.word gone05_rle ; B .word gone05_rle ; B
.byte 20 .byte 7
.word gone06_rle ; B .word gone06_rle ; B
.byte 20 .byte 7
.word gone07_rle ; B .word gone07_rle ; B
.byte 20 .byte 7
.word gone08_rle ; B .word gone08_rle ; B
.byte 20 .byte 7
.word gone09_rle ; LB .word gone09_rle ; LB
.byte 20 .byte 7
.word gone10_rle ; CY .word gone10_rle ; CY
.byte 20 .byte 7
.word gone11_rle ; LB .word gone11_rle ; LB
.byte 20 .byte 7
.word gone02_rle ; B (12 is dupe of 2) .word gone02_rle ; B (12 is dupe of 2)
.byte 20 .byte 7
.word gone13_rle ; B .word gone13_rle ; B
.byte 20 .byte 7
.word gone14_rle ; LB .word gone14_rle ; LB
.byte 20 .byte 7
.word nothing_rle ; B (plain?) .word nothing_rle ; B (plain?)
.byte 20 .byte 7
.word gone16_rle ; B .word gone16_rle ; B
.byte 20 .byte 7
.word nothing_rle ; B (plain?) .word nothing_rle ; B (plain?)
.byte 20 .byte 7
.word gone18_rle ; B .word gone18_rle ; B
.byte 20 .byte 7
.word gone19_rle ; B .word gone19_rle ; B
.byte 20 .byte 7
.word gone20_rle ; B .word gone20_rle ; B
.byte 20 .byte 7
.word gone21_rle ; B .word gone21_rle ; B
.byte 20 .byte 7
.word nothing_rle ; B (plain?) .word nothing_rle ; B (plain?)
.byte 20 .byte 7
.word gone23_rle ; B .word gone23_rle ; B
.byte 20 .byte 7
.word gone24_rle ; B .word gone24_rle ; B
.byte 20 .byte 7
.word gone25_rle ; B .word gone25_rle ; B
.byte 20 .byte 7
.word gone26_rle ; B .word gone26_rle ; B
.byte 20 .byte 7
.word gone27_rle ; B .word gone27_rle ; B
.byte 20 .byte 7
.word gone28_rle ; LB .word gone28_rle ; LB
.byte 20 .byte 7
.word gone29_rle ; CY .word gone29_rle ; CY
.byte 20 .byte 7
.word gone30_rle ; LB .word gone30_rle ; LB
.byte 20 .byte 7
.word gone31_rle ; B .word gone31_rle ; B
.byte 20 .byte 7
.word gone32_rle ; LB .word gone32_rle ; LB
.byte 20 .byte 7
.word nothing_rle ; B (plain?) .word nothing_rle ; B (plain?)
.byte 20 .byte 7
.word gone34_rle ; B .word gone34_rle ; B
.byte 20 .byte 7
.word gone35_rle ; B .word gone35_rle ; B
.byte 20 .byte 7
.word gone36_rle ; B .word gone36_rle ; B
.byte 20 .byte 7
.word gone37_rle ; B .word gone37_rle ; B
.byte 20 .byte 7
.word gone38_rle ; B .word gone38_rle ; B
.byte 20 .byte 7
.word gone39_rle ; LB .word gone39_rle ; LB
.byte 20 .byte 7
.word gone40_rle ; CY .word gone40_rle ; CY
.byte 20 .byte 7
.word gone41_rle ; CY .word gone41_rle ; CY
.byte 20 .byte 7
.word gone42_rle ; LB .word gone42_rle ; LB
.byte 20 .byte 7
.word gone43_rle ; B .word gone43_rle ; B
.byte 20 .byte 7
.word nothing_rle .word nothing_rle
.byte 0 .byte 0
.word nothing_rle .word nothing_rle