ootw: c14: more intro movie

games/ootw/Makefile

@@ -89,9 +89,9 @@ ootw_side3.dsk:	./qboot/QBOOT_DISK3 ./qboot/QLOAD \
 	$(DOS33_RAW) ootw_side3.dsk  2  0 ./ootw_c11/OOTW_C11	0   0	5
 	$(DOS33_RAW) ootw_side3.dsk  5  0 ./ootw_c12/OOTW_C12	0   0	8
 	$(DOS33_RAW) ootw_side3.dsk  8  0 ./ootw_c13/OOTW_C13	0   0	11
-	$(DOS33_RAW) ootw_side3.dsk  11 0 ./ootw_c14/OOTW_C14	0   0	15
-	$(DOS33_RAW) ootw_side3.dsk  15 0 ./ootw_c15/OOTW_C15	0   0	22
-	$(DOS33_RAW) ootw_side3.dsk  22 0 ./ending/ENDING	0   0	35
+	$(DOS33_RAW) ootw_side3.dsk  11 0 ./ootw_c14/OOTW_C14	0   0	17
+	$(DOS33_RAW) ootw_side3.dsk  17 0 ./ootw_c15/OOTW_C15	0   0	24
+	$(DOS33_RAW) ootw_side3.dsk  24 0 ./ending/ENDING	0   0	35
 
 ####
 

games/ootw/gr_run_sequence2.s

@@ -7,10 +7,11 @@
 	;	*after* showing the image
 
 	; pattern is TIME, PTR
-	; if time==0, then done
-	; if time==255, reload background $C00 with PTR, no delay
-	; if time==0..127 overlay PTR over $C00, then wait TIME
-	; if time==128..254, overlay current over $C00, then wait TIME-128
+	; if time==       0, then done
+	; if time==1 or 129, then no pause
+	; if time==     255, reload background $C00 with PTR, no delay
+	; if time==  2..127, overlay PTR over $C00, then wait TIME
+	; if time==130..254, overlay current over $C00, then wait TIME-128
 	;		assumes LZSA pointer points to image
 	;		basically after decoding one, input points to next
 

games/ootw/ootw_c14/graphics/l14_arena/Makefile

@@ -12,7 +12,21 @@ ootw_c14_arena.inc:	\
 	inside03.lzsa inside04.lzsa inside05.lzsa inside06.lzsa \
 	inside07.lzsa inside08.lzsa inside09.lzsa inside10.lzsa \
 	inside11.lzsa inside12.lzsa inside13.lzsa inside14.lzsa \
-	inside15.lzsa inside16.lzsa inside17.lzsa inside18.lzsa
+	inside15.lzsa inside16.lzsa inside17.lzsa inside18.lzsa \
+	inside19.lzsa inside20.lzsa inside21.lzsa inside22.lzsa \
+	inside23.lzsa inside24.lzsa inside25.lzsa inside26.lzsa \
+	inside27.lzsa inside28.lzsa inside29.lzsa inside30.lzsa \
+	inside31.lzsa inside32.lzsa inside33.lzsa inside34.lzsa \
+	inside35.lzsa inside36.lzsa inside37.lzsa inside38.lzsa \
+	inside39.lzsa inside40.lzsa inside41.lzsa inside42.lzsa \
+	inside43.lzsa inside44.lzsa inside45.lzsa \
+	lidclose_bg.lzsa \
+	lidclose01.lzsa lidclose02.lzsa lidclose03.lzsa lidclose04.lzsa \
+	lidclose05.lzsa lidclose06.lzsa lidclose07.lzsa lidclose08.lzsa \
+	lidclose09.lzsa lidclose10.lzsa lidclose11.lzsa lidclose12.lzsa \
+	lidclose13.lzsa lidclose14.lzsa lidclose15.lzsa lidclose16.lzsa \
+	lidclose17.lzsa \
+	door_open_bg.lzsa
 	echo "arena_lzsa: .incbin \"arena.lzsa\"" > ootw_c14_arena.inc
 	echo "inside_bg_lzsa: .incbin \"inside_bg.lzsa\"" >> ootw_c14_arena.inc
 	echo "inside03_lzsa: .incbin \"inside03.lzsa\"" >> ootw_c14_arena.inc
@@ -31,7 +45,52 @@ ootw_c14_arena.inc:	\
 	echo "inside16_lzsa: .incbin \"inside16.lzsa\"" >> ootw_c14_arena.inc
 	echo "inside17_lzsa: .incbin \"inside17.lzsa\"" >> ootw_c14_arena.inc
 	echo "inside18_lzsa: .incbin \"inside18.lzsa\"" >> ootw_c14_arena.inc
-
+	echo "inside19_lzsa: .incbin \"inside19.lzsa\"" >> ootw_c14_arena.inc
+	echo "inside20_lzsa: .incbin \"inside20.lzsa\"" >> ootw_c14_arena.inc
+	echo "inside21_lzsa: .incbin \"inside21.lzsa\"" >> ootw_c14_arena.inc
+	echo "inside22_lzsa: .incbin \"inside22.lzsa\"" >> ootw_c14_arena.inc
+	echo "inside23_lzsa: .incbin \"inside23.lzsa\"" >> ootw_c14_arena.inc
+	echo "inside24_lzsa: .incbin \"inside24.lzsa\"" >> ootw_c14_arena.inc
+	echo "inside25_lzsa: .incbin \"inside25.lzsa\"" >> ootw_c14_arena.inc
+	echo "inside26_lzsa: .incbin \"inside26.lzsa\"" >> ootw_c14_arena.inc
+	echo "inside27_lzsa: .incbin \"inside27.lzsa\"" >> ootw_c14_arena.inc
+	echo "inside28_lzsa: .incbin \"inside28.lzsa\"" >> ootw_c14_arena.inc
+	echo "inside29_lzsa: .incbin \"inside29.lzsa\"" >> ootw_c14_arena.inc
+	echo "inside30_lzsa: .incbin \"inside30.lzsa\"" >> ootw_c14_arena.inc
+	echo "inside31_lzsa: .incbin \"inside31.lzsa\"" >> ootw_c14_arena.inc
+	echo "inside32_lzsa: .incbin \"inside32.lzsa\"" >> ootw_c14_arena.inc
+	echo "inside33_lzsa: .incbin \"inside33.lzsa\"" >> ootw_c14_arena.inc
+	echo "inside34_lzsa: .incbin \"inside34.lzsa\"" >> ootw_c14_arena.inc
+	echo "inside35_lzsa: .incbin \"inside35.lzsa\"" >> ootw_c14_arena.inc
+	echo "inside36_lzsa: .incbin \"inside36.lzsa\"" >> ootw_c14_arena.inc
+	echo "inside37_lzsa: .incbin \"inside37.lzsa\"" >> ootw_c14_arena.inc
+	echo "inside38_lzsa: .incbin \"inside38.lzsa\"" >> ootw_c14_arena.inc
+	echo "inside39_lzsa: .incbin \"inside39.lzsa\"" >> ootw_c14_arena.inc
+	echo "inside40_lzsa: .incbin \"inside40.lzsa\"" >> ootw_c14_arena.inc
+	echo "inside41_lzsa: .incbin \"inside41.lzsa\"" >> ootw_c14_arena.inc
+	echo "inside42_lzsa: .incbin \"inside42.lzsa\"" >> ootw_c14_arena.inc
+	echo "inside43_lzsa: .incbin \"inside43.lzsa\"" >> ootw_c14_arena.inc
+	echo "inside44_lzsa: .incbin \"inside44.lzsa\"" >> ootw_c14_arena.inc
+	echo "inside45_lzsa: .incbin \"inside45.lzsa\"" >> ootw_c14_arena.inc
+	echo "lidclose_bg_lzsa: .incbin \"lidclose_bg.lzsa\"" >> ootw_c14_arena.inc
+	echo "lidclose01_lzsa: .incbin \"lidclose01.lzsa\"" >> ootw_c14_arena.inc
+	echo "lidclose02_lzsa: .incbin \"lidclose02.lzsa\"" >> ootw_c14_arena.inc
+	echo "lidclose03_lzsa: .incbin \"lidclose03.lzsa\"" >> ootw_c14_arena.inc
+	echo "lidclose04_lzsa: .incbin \"lidclose04.lzsa\"" >> ootw_c14_arena.inc
+	echo "lidclose05_lzsa: .incbin \"lidclose05.lzsa\"" >> ootw_c14_arena.inc
+	echo "lidclose06_lzsa: .incbin \"lidclose06.lzsa\"" >> ootw_c14_arena.inc
+	echo "lidclose07_lzsa: .incbin \"lidclose07.lzsa\"" >> ootw_c14_arena.inc
+	echo "lidclose08_lzsa: .incbin \"lidclose08.lzsa\"" >> ootw_c14_arena.inc
+	echo "lidclose09_lzsa: .incbin \"lidclose09.lzsa\"" >> ootw_c14_arena.inc
+	echo "lidclose10_lzsa: .incbin \"lidclose10.lzsa\"" >> ootw_c14_arena.inc
+	echo "lidclose11_lzsa: .incbin \"lidclose11.lzsa\"" >> ootw_c14_arena.inc
+	echo "lidclose12_lzsa: .incbin \"lidclose12.lzsa\"" >> ootw_c14_arena.inc
+	echo "lidclose13_lzsa: .incbin \"lidclose13.lzsa\"" >> ootw_c14_arena.inc
+	echo "lidclose14_lzsa: .incbin \"lidclose14.lzsa\"" >> ootw_c14_arena.inc
+	echo "lidclose15_lzsa: .incbin \"lidclose15.lzsa\"" >> ootw_c14_arena.inc
+	echo "lidclose16_lzsa: .incbin \"lidclose16.lzsa\"" >> ootw_c14_arena.inc
+	echo "lidclose17_lzsa: .incbin \"lidclose17.lzsa\"" >> ootw_c14_arena.inc
+	echo "door_open_bg_lzsa: .incbin \"door_open_bg.lzsa\"" >> ootw_c14_arena.inc
 
 
 #####

games/ootw/ootw_c14/ootw_c14.s

@@ -561,21 +561,69 @@ tank_intro:
 tank_intro_sequence:
 	.byte	255                                     ; load to bg
 	.word	inside_bg_lzsa				; this
-	.byte	128+11	;       .word   inside03_lzsa	; (3)
-	.byte	128+11	;       .word   inside04_lzsa	; (3)
-	.byte	128+11	;       .word   inside05_lzsa	; (3)
-	.byte	128+11	;       .word   inside06_lzsa	; (3)
-	.byte	128+11	;       .word   inside07_lzsa	; (3)
-	.byte	128+11	;       .word   inside08_lzsa	; (3)
-	.byte	128+11	;       .word   inside09_lzsa	; (3)
-	.byte	128+11	;       .word   inside10_lzsa	; (3)
-	.byte	128+11	;       .word   inside11_lzsa	; (3)
-	.byte	128+11	;       .word   inside12_lzsa	; (3)
-	.byte	128+11	;       .word   inside13_lzsa	; (3)
-	.byte	128+11	;       .word   inside14_lzsa	; (3)
-	.byte	128+11	;       .word   inside15_lzsa	; (3)
-	.byte	128+11	;       .word   inside16_lzsa	; (3)
-	.byte	128+11	;       .word   inside17_lzsa	; (3)
-	.byte	128+11	;       .word   inside18_lzsa	; (3)
+	.byte	128+1	;       .word   inside03_lzsa	; (3)
+	.byte	128+1	;       .word   inside04_lzsa	; (3)
+	.byte	128+1	;       .word   inside05_lzsa	; (3)
+	.byte	128+1	;       .word   inside06_lzsa	; (3)
+	.byte	128+1	;       .word   inside07_lzsa	; (3)
+	.byte	128+1	;       .word   inside08_lzsa	; (3)
+	.byte	128+1	;       .word   inside09_lzsa	; (3)
+	.byte	128+1	;       .word   inside10_lzsa	; (3)
+	.byte	128+1	;       .word   inside11_lzsa	; (3)
+	.byte	128+1	;       .word   inside12_lzsa	; (3)
+	.byte	128+1	;       .word   inside13_lzsa	; (3)
+	.byte	128+1	;       .word   inside14_lzsa	; (3)
+	.byte	128+1	;       .word   inside15_lzsa	; (3)
+	.byte	128+1	;       .word   inside16_lzsa	; (3)
+	.byte	128+1	;       .word   inside17_lzsa	; (3)
+	.byte	128+1	;       .word   inside18_lzsa	; (3)
+	.byte	128+1	;       .word   inside19_lzsa	; (3)
+	.byte	128+1	;       .word   inside20_lzsa	; (3)
+	.byte	128+1	;       .word   inside21_lzsa	; (3)
+	.byte	128+1	;       .word   inside22_lzsa	; (3)
+	.byte	128+1	;       .word   inside23_lzsa	; (3)
+	.byte	128+1	;       .word   inside24_lzsa	; (3)
+	.byte	128+1	;       .word   inside25_lzsa	; (3)
+	.byte	128+1	;       .word   inside26_lzsa	; (3)
+	.byte	128+1	;       .word   inside27_lzsa	; (3)
+	.byte	128+1	;       .word   inside28_lzsa	; (3)
+	.byte	128+1	;       .word   inside29_lzsa	; (3)
+	.byte	128+1	;       .word   inside30_lzsa	; (3)
+	.byte	128+1	;       .word   inside31_lzsa	; (3)
+	.byte	128+1	;       .word   inside32_lzsa	; (3)
+	.byte	128+1	;       .word   inside33_lzsa	; (3)
+	.byte	128+1	;       .word   inside34_lzsa	; (3)
+	.byte	128+1	;       .word   inside35_lzsa	; (3)
+	.byte	128+1	;       .word   inside36_lzsa	; (3)
+	.byte	128+1	;       .word   inside37_lzsa	; (3)
+	.byte	128+1	;       .word   inside38_lzsa	; (3)
+	.byte	128+1	;       .word   inside39_lzsa	; (3)
+	.byte	128+1	;       .word   inside40_lzsa	; (3)
+	.byte	128+1	;       .word   inside41_lzsa	; (3)
+	.byte	128+1	;       .word   inside42_lzsa	; (3)
+	.byte	128+1	;       .word   inside43_lzsa	; (3)
+	.byte	128+1	;       .word   inside44_lzsa	; (3)
+	.byte	128+1	;       .word   inside45_lzsa	; (3)
+	.byte	255                                     ; load to bg
+	.word	lidclose_bg_lzsa			; this
+	.byte	128+2	;       .word   lidclose01_lzsa	; (3)
+	.byte	128+2	;       .word   lidclose02_lzsa	; (3)
+	.byte	128+2	;       .word   lidclose03_lzsa	; (3)
+	.byte	128+2	;       .word   lidclose04_lzsa	; (3)
+	.byte	128+2	;       .word   lidclose05_lzsa	; (3)
+	.byte	128+2	;       .word   lidclose06_lzsa	; (3)
+	.byte	128+2	;       .word   lidclose07_lzsa	; (3)
+	.byte	128+2	;       .word   lidclose08_lzsa	; (3)
+	.byte	128+2	;       .word   lidclose09_lzsa	; (3)
+	.byte	128+2	;       .word   lidclose10_lzsa	; (3)
+	.byte	128+2	;       .word   lidclose11_lzsa	; (3)
+	.byte	128+2	;       .word   lidclose12_lzsa	; (3)
+	.byte	128+2	;       .word   lidclose13_lzsa	; (3)
+	.byte	128+2	;       .word   lidclose14_lzsa	; (3)
+	.byte	128+2	;       .word   lidclose15_lzsa	; (3)
+	.byte	128+2	;       .word   lidclose16_lzsa	; (3)
+	.byte	128+2	;       .word   lidclose17_lzsa	; (3)
+	.byte	255                                     ; load to bg
+	.word	door_open_bg_lzsa			; this
 	.byte	0	; ending
 

games/ootw/qboot/qload.s

@@ -196,8 +196,8 @@ track_array:
         .byte  2,11,17,25	; INTRO,C1,C2,C3
 	.byte 26,30, 2, 5	; C4,C5,C6,C7
 	.byte  8,11,14, 2	; C8,C9,C10,C11
-	.byte  5, 8,11,15	; C12,C13,C14,C15
-	.byte 22		; ENDING
+	.byte  5, 8,11,17	; C12,C13,C14,C15
+	.byte 24		; ENDING
 	.byte 99,0		; TITLE,FIRST_SECTOR
 
 
@@ -214,7 +214,7 @@ length_array:
         .byte 137, 95,125, 14	; INTRO,C1,C2,C3
 	.byte  62, 41, 38, 38	; C4,C5,C6,C7
 	.byte  39, 38, 38, 38	; C8,C9,C10,C11
-	.byte  38, 39, 44, 97	; C12,C13,C14,C15
+	.byte  38, 39, 75, 97	; C12,C13,C14,C15
 	.byte  90		; ENDING
 	.byte   1,  1		; TITLE,FIRST_SECTOR