diff --git a/ootw/Makefile b/ootw/Makefile index 65036a6a..b913a779 100644 --- a/ootw/Makefile +++ b/ootw/Makefile @@ -7,13 +7,6 @@ PNG2LZ4 = ../gr-utils/png2lz4 all: ootw.dsk -#later_data -#later_data: later_data.o -# ld65 -o later_data later_data.o -C ../linker_scripts/apple2_2000.inc -# -#later_data.o: later_data.s -# ca65 -o later_data.o later_data.s -l later_data.lst - ootw.dsk: HELLO LOADER INTRO OOTW OOTW_C2 #COMPRESS-TEST $(DOS33) -y ootw.dsk SAVE A HELLO $(DOS33) -y ootw.dsk BSAVE -a 0x1400 LOADER @@ -63,7 +56,7 @@ INTRO: intro.o intro.o: intro.s \ gr_copy.s gr_fast_clear.s gr_pageflip.s gr_unrle.s gr_putsprite.s \ - gr_overlay.s intro_data.s \ + gr_overlay.s \ keyboard.s random16.s text_print.s zp.inc \ intro_graphics/01_building/intro_car.inc \ intro_graphics/01_building/intro_building_car.inc \ @@ -207,92 +200,10 @@ COMPRESS-TEST: compress_test.o compress_test.o: compress_test.s lz4_decode.s compress_test.inc ca65 -o compress_test.o compress_test.s -l compress_test.lst -##### - -rle_size: rle_size.o - ld65 -o rle_size rle_size.o -C ../linker_scripts/apple2_2000.inc - -rle_size.o: rle_size.s - ca65 -o rle_size.o rle_size.s - -rle_size_all: rle_size_all.o - ld65 -o rle_size_all rle_size_all.o -C ../linker_scripts/apple2_1700.inc - -rle_size_all.o: rle_size_all.s - ca65 -o rle_size_all.o rle_size_all.s - - -lz4_size: lz4_size.o - ld65 -o lz4_size lz4_size.o -C ../linker_scripts/apple2_2000.inc - -lz4_size.o: lz4_size.s - ca65 -o lz4_size.o lz4_size.s - -##### - -id1: id1.o - ld65 -o id1 id1.o -C ../linker_scripts/apple2_2000.inc - -id1.o: id1.s - ca65 -o id1.o id1.s - -id2: id2.o - ld65 -o id2 id2.o -C ../linker_scripts/apple2_2000.inc - -id2.o: id2.s - ca65 -o id2.o id2.s - -id3: id3.o - ld65 -o id3 id3.o -C ../linker_scripts/apple2_2000.inc - -id3.o: id3.s - ca65 -o id3.o id3.s - -id4: id4.o - ld65 -o id4 id4.o -C ../linker_scripts/apple2_2000.inc - -id4.o: id4.s - ca65 -o id4.o id4.s - -id5: id5.o - ld65 -o id5 id5.o -C ../linker_scripts/apple2_2000.inc - -id5.o: id5.s - ca65 -o id5.o id5.s - -id6: id6.o - ld65 -o id6 id6.o -C ../linker_scripts/apple2_2000.inc - -id6.o: id6.s - ca65 -o id6.o id6.s - -id7: id7.o - ld65 -o id7 id7.o -C ../linker_scripts/apple2_2000.inc - -id7.o: id7.s - ca65 -o id7.o id7.s - -id8: id8.o - ld65 -o id8 id8.o -C ../linker_scripts/apple2_2000.inc - -id8.o: id8.s - ca65 -o id8.o id8.s - -id9: id9.o - ld65 -o id9 id9.o -C ../linker_scripts/apple2_2000.inc - -id9.o: id9.s - ca65 -o id9.o id9.s - -id10: id10.o - ld65 -o id10 id10.o -C ../linker_scripts/apple2_2000.inc - -id10.o: id10.s - ca65 -o id10.o id10.s - - ##### clean: - rm -f *~ *.o *.lst HELLO OOTW OOTW_C2 INTRO LOADER lz4_size rle_size + rm -f *~ *.o *.lst *.lz4 HELLO OOTW OOTW_C2 INTRO LOADER \ + intro_data_01 intro_data_04 intro_data_06 \ + intro_data_08 intro_data_09 diff --git a/ootw/intro_data.s b/ootw/intro_data.s deleted file mode 100644 index 6a461a94..00000000 --- a/ootw/intro_data.s +++ /dev/null @@ -1 +0,0 @@ -.include "intro_data_01.s" diff --git a/ootw/intro_data_02.s b/ootw/intro_data_02.s deleted file mode 100644 index 2a2eceaa..00000000 --- a/ootw/intro_data_02.s +++ /dev/null @@ -1,35 +0,0 @@ -; background graphics - -.include "intro_graphics/02_outer_door/outer_door.inc" -.include "intro_graphics/02_outer_door/feet.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 - - diff --git a/ootw/intro_data_03.s b/ootw/intro_data_03.s deleted file mode 100644 index cb3166ce..00000000 --- a/ootw/intro_data_03.s +++ /dev/null @@ -1,39 +0,0 @@ -; background graphics - -.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 1 - .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 - - diff --git a/ootw/intro_data_05.s b/ootw/intro_data_05.s deleted file mode 100644 index 26df9d6d..00000000 --- a/ootw/intro_data_05.s +++ /dev/null @@ -1,125 +0,0 @@ -; background graphics - -.include "intro_graphics/05_scanner/intro_scanner.inc" -.include "intro_graphics/05_scanner/intro_scanning.inc" -.include "intro_graphics/05_scanner/intro_ai_bg.inc" -.include "intro_graphics/05_scanner/intro_ai.inc" - - -; Scanning sequence - -scanning_sequence: - .byte 15 - .word scan01_rle - .byte 128+15 ; .word scan02_rle - .byte 128+15 ; .word scan03_rle - .byte 128+15 ; .word scan04_rle - .byte 128+15 ; .word scan05_rle - .byte 128+15 ; .word scan06_rle - .byte 128+15 ; .word scan07_rle - .byte 128+15 ; .word scan08_rle - .byte 128+15 ; .word scan09_rle - .byte 128+15 ; .word scan10_rle - .byte 128+20 ; .word scan11_rle - .byte 128+20 ; .word scan12_rle - .byte 128+20 ; .word scan13_rle - .byte 128+20 ; .word scan14_rle - .byte 128+20 ; .word scan15_rle - .byte 128+20 ; .word scan16_rle - .byte 128+40 ; .word scan17_rle - .byte 128+40 ; .word scan18_rle - .byte 128+40 ; .word scan19_rle - .byte 40 - .word scan19_rle - .byte 0 - - -; AI sequence - -ai_sequence: - .byte 0,50 ; pause at start, no dna - .word ai01_rle ; slices - - .byte 0,50 ; pause at start, no dna - .word ai02_rle ; slices_zoom - - .byte 0,50 ; pasue as start, no dna - .word ai03_rle ; little circle - - .byte 0,50 ; pause at start, no dna - .word ai04_rle ; big circle - - .byte 1,20 ; pause longer, yes dna - .word ai05_rle ; key - - .byte 0,0 -; .word ai05_rle ; key -; .byte 0 - -static_pattern: - .word nothing_rle ; 0 - .word nothing_rle ; 2 - .word static01_rle ; 4 - .word static03_rle ; 6 - .word static02_rle ; 8 - .word static01_rle ; 10 - - ; Scanning text - -good_evening: - .byte 2,21,"GOOD EVENING PROFESSOR.",0 -ferrari: - .byte 2,21,"I SEE YOU HAVE DRIVEN HERE IN YOUR",0 - .byte 2,22,"FERRARI.",0 - - -dna_list: - .word dna0_sprite - .word dna1_sprite - .word dna2_sprite - .word dna3_sprite - .word dna4_sprite - .word dna5_sprite - .word dna6_sprite - .word dna7_sprite - -dna0_sprite: - .byte $7,$2 - .byte $66,$40,$40,$40,$40,$40,$cc - .byte $06,$00,$00,$00,$00,$00,$0c - -dna1_sprite: - .byte $7,$2 - .byte $00,$66,$40,$40,$40,$cc,$00 - .byte $00,$06,$00,$00,$00,$0c,$00 - -dna2_sprite: - .byte $7,$2 - .byte $00,$00,$66,$40,$cc,$00,$00 - .byte $00,$00,$06,$00,$0c,$00,$00 - -dna3_sprite: - .byte $7,$2 - .byte $00,$00,$00,$66,$00,$00,$00 - .byte $00,$00,$00,$06,$00,$00,$00 - -dna4_sprite: - .byte $7,$2 - .byte $00,$00,$CC,$40,$66,$00,$00 - .byte $00,$00,$0C,$00,$06,$00,$00 - -dna5_sprite: - .byte $7,$2 - .byte $00,$CC,$40,$40,$40,$66,$00 - .byte $00,$0C,$00,$00,$00,$06,$00 - -dna6_sprite: - .byte $7,$2 - .byte $CC,$40,$40,$40,$40,$40,$66 - .byte $0C,$00,$00,$00,$00,$00,$06 - -dna7_sprite: - .byte $7,$2 - .byte $66,$40,$40,$40,$40,$40,$cc - .byte $06,$00,$00,$00,$00,$00,$0c - diff --git a/ootw/intro_data_07.s b/ootw/intro_data_07.s deleted file mode 100644 index ba573228..00000000 --- a/ootw/intro_data_07.s +++ /dev/null @@ -1,32 +0,0 @@ -; background graphics - -.include "intro_graphics/07_soda/intro_open_soda.inc" -.include "intro_graphics/07_soda/intro_drinking.inc" - -; Soda sequence - -soda_sequence: - .byte 1 - .word soda01_rle - .byte 128+30 ; .word soda02_rle - .byte 128+15 ; .word soda03_rle - .byte 128+15 ; .word soda04_rle - .byte 128+15 ; .word soda05_rle - .byte 128+15 ; .word soda06_rle - .byte 128+15 ; .word soda07_rle - .byte 128+15 ; .word soda08_rle - .byte 128+15 ; .word soda09_rle - .byte 20 - .word soda09_rle - .byte 0 - - -drinking_sequence: - .byte 30 - .word drinking02_rle - .byte 128+30 ; .word drinking03_rle - .byte 128+30 ; .word drinking04_rle - .byte 128+30 ; .word drinking05_rle - .byte 0 - - diff --git a/ootw/intro_data_10.s b/ootw/intro_data_10.s deleted file mode 100644 index b43dc3b4..00000000 --- a/ootw/intro_data_10.s +++ /dev/null @@ -1,220 +0,0 @@ -; background graphics - -.include "intro_graphics/10_gone/intro_zappo.inc" -.include "intro_graphics/10_gone/intro_gone.inc" - - ;======================= - ; Zappo Sequence - ;======================= -zappo_sequence: - - .byte 50 - .word white_rle - - .byte 2 - .word zappo01_rle ; B - - .byte 128+2 ; .word zappo02_rle ; B - .byte 128+2 ; .word zappo03_rle ; A - .byte 128+2 ; .word zappo04_rle ; B - .byte 128+2 ; .word zappo05_rle ; B - - .byte 255 - .word zappo03_rle ; load A - .byte 2 - .word zappo06_rle ; A - - .byte 255 - .word blue_zappo_rle ; load b - .byte 2 - .word zappo07_rle ; B - - .byte 2 - .word zappo08_rle ; B - - .byte 255 - .word zappo03_rle ; load A - .byte 2 - .word zappo09_rle ; A - - .byte 255 - .word blue_zappo_rle ; load b - .byte 2 - .word zappo10_rle ; B - - .byte 255 - .word zappo03_rle ; load A - .byte 2 - .word zappo11_rle ; A - - .byte 255 - .word blue_zappo_rle ; load b - .byte 2 - .word zappo12_rle ; B - .byte 128+2 ; .word zappo13_rle ; B - .byte 128+2 ; .word zappo14_rle ; B - - .byte 255 - .word zappo03_rle ; load A - .byte 2 - .word zappo15_rle ; A - - .byte 255 - .word blue_zappo_rle ; load b - .byte 2 - .word zappo16_rle ; B - .byte 128+2 ; .word zappo17_rle ; B - .byte 2 - .word white_rle - .byte 128+5 ; .word black_rle - .byte 5 - .word white_rle - .byte 128+5 ; .word black_rle -; .byte 5 -; .word white_rle -; .byte 1 -; .word black_rle -; .byte 1 -; .word white_rle -; .byte 1 -; .word black_rle -; .byte 1 -; .word white_rle -; .byte 1 -; .word black_rle - .byte 0 - .word nothing_rle - - - ;======================= - ; Gone Sequence - ;======================= -gone_sequence: - - .byte 50 - .word white_rle - - .byte 7 - .word gone01_rle ; B - - .byte 128+7 ; .word gone02_rle ; B - .byte 128+7 ; .word gone03_rle ; B - .byte 128+7 ; .word gone04_rle ; B - .byte 128+7 ; .word gone05_rle ; B - .byte 128+7 ; .word gone06_rle ; B - .byte 128+7 ; .word gone07_rle ; B - .byte 128+7 ; .word gone08_rle ; B - .byte 128+7 ; .word gone09_rle ; LB - .byte 128+7 ; .word gone10_rle ; CY - - .byte 255 - .word gone09_rle ; LB into $c00 - .byte 7 - .word gone11_rle ; LB - - .byte 255 - .word gone_rle ; B back into $c00 - .byte 7 - .word gone02_rle ; B (12 is dupe of 2) - - .byte 7 - .word gone13_rle ; B - - .byte 255 - .word gone09_rle ; LB into $c00 - .byte 7 - .word gone14_rle ; LB - - .byte 255 - .word gone_rle ; B back into $c00 + plain - .byte 7 - .word nothing_rle - - .byte 7 - .word gone16_rle ; B - - .byte 7 - .word nothing_rle ; B (plain?) - - .byte 7 - .word gone18_rle ; B - .byte 128+7 ; .word gone19_rle ; B - .byte 128+7 ; .word gone20_rle ; B - .byte 128+7 ; .word gone21_rle ; B - - .byte 7 - .word nothing_rle ; B (plain?) - - .byte 7 - .word gone23_rle ; B - .byte 128+7 ; .word gone24_rle ; B - .byte 128+7 ; .word gone25_rle ; B - .byte 128+7 ; .word gone26_rle ; B - .byte 128+7 ; .word gone27_rle ; B - - .byte 255 - .word gone09_rle ; LB into $c00 - .byte 7 - .word gone28_rle ; LB - -; .byte 255 -; .word gone10_rle ; CY into $c00 - .byte 7 - .word gone10_rle ; CY (same as 10) - - .byte 255 - .word gone09_rle ; LB into $c00 - .byte 7 - .word gone28_rle ; LB (30 same as 28) - - .byte 255 - .word gone_rle ; B back into $c00 + plain - .byte 7 - .word gone31_rle ; B - - .byte 255 - .word gone09_rle ; LB into $c00 - .byte 7 - .word gone32_rle ; LB - - .byte 255 - .word gone_rle ; B back into $c00 + plain - .byte 7 - .word nothing_rle ; B (plain?) - - .byte 7 - .word gone34_rle ; B - - .byte 128+7 ; .word gone35_rle ; B - .byte 128+7 ; .word gone36_rle ; B - .byte 128+7 ; .word gone37_rle ; B - .byte 128+7 ; .word gone38_rle ; B - - .byte 255 - .word gone09_rle ; LB into $c00 - .byte 7 - .word gone39_rle ; LB - - .byte 255 - .word gone10_rle ; CY into $c00 - .byte 7 - .word gone40_rle ; CY - - .byte 7 - .word gone10_rle ; CY (same as 10) - - .byte 255 - .word gone09_rle ; LB into $c00 - .byte 7 - .word gone42_rle ; LB - - .byte 255 - .word gone_rle ; B back into $c00 + plain - .byte 7 - .word gone43_rle ; B - - .byte 7 - .word nothing_rle - .byte 0 - - diff --git a/ootw/intro_graphics/01_building/intro_building_car.inc b/ootw/intro_graphics/01_building/intro_building_car.inc index 92335656..a97096f8 100644 --- a/ootw/intro_graphics/01_building/intro_building_car.inc +++ b/ootw/intro_graphics/01_building/intro_building_car.inc @@ -27,11 +27,11 @@ building_car_rle: .byte $28 ; ysize=48 .byte $A3,$22, $55, $66,$66, $22, $00, $22,$22, $02 .byte $00, $50, $A3,$00, $20, $00, $20,$20, $A5,$00 .byte $22, $55, $66,$66, $AE,$22, $05, $06,$06, $00 - .byte $A3,$02, $00,$00, $06, $A5,$00, $20,$20, $22, $A0,$01,$A2 + .byte $A3,$02, $00,$00, $06, $A5,$00, $20,$20, $22, $52 .byte $22, $00,$00, $22, $55, $66,$66, $22, $20 .byte $62, $A4,$60, $A3,$22, $02, $A0,$13,$00, $20, $22 - .byte $26,$26, $00,$00, $22, $A0,$01,$AA, $66,$66, $02, $A9,$22 - .byte $A0,$14,$00, $20, $A3,$02, $00,$00, $02, $0A, $06,$06 + .byte $26,$26, $00,$00, $22, $55, $66,$66, $02, $A9,$22 + .byte $A0,$14,$00, $20, $A3,$02, $00,$00, $02, $05, $06,$06 .byte $00,$00, $A3,$02, $00, $A5,$02, $A0,$10,$00, $20,$20, $A0,$1B,$00 .byte $02, $A0,$FE,$00 .byte $A1 diff --git a/ootw/intro_graphics/01_building/intro_building_car.png b/ootw/intro_graphics/01_building/intro_building_car.png index 2c261dd9..3ad6ab4c 100644 Binary files a/ootw/intro_graphics/01_building/intro_building_car.png and b/ootw/intro_graphics/01_building/intro_building_car.png differ diff --git a/ootw/intro_graphics/01_building/intro_building_car_lz4.inc b/ootw/intro_graphics/01_building/intro_building_car_lz4.inc index cb6ba1fd..6a8734af 100644 --- a/ootw/intro_graphics/01_building/intro_building_car_lz4.inc +++ b/ootw/intro_graphics/01_building/intro_building_car_lz4.inc @@ -1,10 +1,10 @@ building_car_rle: - .byte $62,$01 + .byte $5F,$01 .byte $70,$26,$26,$26,$00,$00,$26,$66,$01,$00,$13,$65,$01,$00,$11,$25 .byte $01,$00,$29,$65,$66,$01,$00,$61,$26,$22,$22,$00,$00,$22,$01,$00 .byte $49,$26,$22,$20,$22,$01,$00,$61,$55,$00,$20,$00,$20,$00,$03,$00 - .byte $C0,$20,$02,$02,$02,$00,$00,$02,$0A,$06,$06,$00,$00,$0B,$00,$21 + .byte $C0,$20,$02,$02,$02,$00,$00,$02,$05,$06,$06,$00,$00,$0B,$00,$21 .byte $02,$02,$11,$00,$0A,$01,$00,$26,$20,$20,$0C,$00,$30,$26,$26,$66 .byte $05,$00,$07,$01,$00,$06,$58,$00,$17,$20,$34,$00,$11,$22,$80,$00 .byte $33,$55,$66,$66,$1C,$00,$62,$52,$02,$02,$02,$22,$22,$11,$00,$23 @@ -17,9 +17,9 @@ building_car_rle: .byte $80,$00,$03,$AA,$01,$00,$11,$00,$61,$00,$22,$22,$02,$00,$50,$CA .byte $00,$1F,$20,$81,$00,$1E,$02,$D8,$00,$08,$01,$00,$01,$51,$00,$21 .byte $22,$66,$57,$02,$00,$12,$01,$07,$19,$01,$07,$80,$00,$03,$01,$00 - .byte $41,$05,$06,$06,$00,$9B,$00,$1D,$06,$5A,$02,$0F,$80,$00,$14,$16 - .byte $66,$80,$00,$25,$66,$00,$80,$00,$10,$66,$DC,$00,$01,$E8,$00,$01 - .byte $A3,$02,$44,$26,$26,$22,$A2,$80,$01,$9E,$20,$62,$60,$60,$60,$60 - .byte $22,$22,$22,$52,$02,$0F,$00,$02,$20,$16,$66,$00,$01,$2A,$66,$22 - .byte $09,$01,$22,$25,$50,$58,$03,$01,$58,$01,$10,$22,$A8,$03,$57,$22 - .byte $AA,$66,$66,$02,$90,$02,$0F,$80,$00,$2B,$50,$00,$00,$00,$00,$00 \ No newline at end of file + .byte $00,$69,$02,$01,$9B,$00,$1D,$06,$5A,$02,$0F,$80,$00,$14,$16,$66 + .byte $80,$00,$25,$66,$00,$80,$00,$10,$66,$DC,$00,$01,$E8,$00,$01,$A3 + .byte $02,$44,$26,$26,$22,$52,$80,$01,$9E,$20,$62,$60,$60,$60,$60,$22 + .byte $22,$22,$52,$02,$0F,$00,$02,$20,$16,$66,$00,$01,$2A,$66,$22,$09 + .byte $01,$22,$25,$50,$58,$03,$01,$58,$01,$32,$22,$26,$26,$80,$00,$17 + .byte $02,$90,$02,$0F,$80,$00,$2B,$50,$00,$00,$00,$00,$00 \ No newline at end of file diff --git a/ootw/intro_graphics/04_keypad/intro_opening.inc b/ootw/intro_graphics/04_keypad/intro_opening.inc index cfb7486a..abe6e795 100644 --- a/ootw/intro_graphics/04_keypad/intro_opening.inc +++ b/ootw/intro_graphics/04_keypad/intro_opening.inc @@ -292,12 +292,12 @@ opening12_rle: .byte $28 ; ysize=48 .byte $66, $A0,$10,$22, $00, $22, $A0,$14,$AA, $22, $66 .byte $A0,$10,$22, $00, $22, $A0,$14,$AA, $22, $66, $A0,$10,$22 .byte $00, $22, $A0,$14,$AA, $22, $66, $A0,$10,$22, $00 - .byte $22, $A0,$14,$AA, $22, $25,$25, $AC,$2A, $25,$25, $22 - .byte $20, $22, $A0,$14,$AA, $22, $A0,$12,$02, $22, $A0,$14,$AA - .byte $22, $A0,$12,$00, $22, $A0,$14,$AA, $22, $A4,$00, $B0 - .byte $AA,$00, $BB, $00,$00, $22, $A0,$14,$AA, $22, $A4,$00 - .byte $BB, $AA,$00, $BB, $00,$00, $22, $A0,$14,$AA, $22 - .byte $00,$00, $50, $05, $BB, $AA,$00, $BB, $00,$00 - .byte $22, $A0,$14,$AA, $22, $20, $25, $20,$20, $2B - .byte $AA,$20, $2B, $25, $20, $22, $A0,$AB,$AA + .byte $22, $A0,$14,$AA, $22, $A0,$10,$25, $22, $20, $22 + .byte $A0,$14,$AA, $22, $A0,$12,$02, $22, $A0,$14,$AA, $22, $A0,$12,$00 + .byte $22, $A0,$14,$AA, $22, $A4,$00, $B0, $AA,$00, $BB + .byte $00,$00, $22, $A0,$14,$AA, $22, $A4,$00, $BB, $AA,$00 + .byte $BB, $00,$00, $22, $A0,$14,$AA, $22, $00,$00, $50 + .byte $05, $BB, $AA,$00, $BB, $00,$00, $22, $A0,$14,$AA + .byte $22, $20, $25, $20,$20, $2B, $AA,$20, $2B + .byte $25, $20, $22, $A0,$AB,$AA .byte $A1 diff --git a/ootw/intro_graphics/04_keypad/intro_opening_lz4.inc b/ootw/intro_graphics/04_keypad/intro_opening_lz4.inc index 2e6cc952..9cdeacd7 100644 --- a/ootw/intro_graphics/04_keypad/intro_opening_lz4.inc +++ b/ootw/intro_graphics/04_keypad/intro_opening_lz4.inc @@ -163,12 +163,12 @@ opening11_rle: .byte $22,$AA,$01,$00,$30,$0F,$80,$00,$5C,$0F,$00,$01,$F0,$50,$00,$00 .byte $00,$00,$00 opening12_rle: - .byte $7C,$00 + .byte $78,$00 .byte $14,$AA,$01,$00,$3B,$22,$66,$22,$01,$00,$3E,$00,$22,$AA,$01,$00 .byte $0F,$28,$00,$17,$65,$00,$00,$00,$00,$B0,$00,$01,$00,$2F,$BB,$00 .byte $28,$00,$03,$0F,$80,$00,$4A,$1F,$BB,$80,$00,$06,$04,$17,$00,$0F .byte $80,$00,$49,$3F,$50,$05,$BB,$00,$01,$68,$65,$20,$25,$20,$20,$2B .byte $20,$01,$00,$3F,$2B,$25,$20,$00,$01,$5A,$0F,$01,$00,$1D,$0F,$80 - .byte $00,$16,$37,$25,$25,$2A,$01,$00,$4F,$25,$25,$22,$20,$80,$00,$21 - .byte $0F,$00,$01,$27,$1D,$02,$01,$00,$0F,$00,$01,$5B,$1D,$00,$01,$00 - .byte $0F,$00,$01,$24,$50,$00,$00,$00,$00,$00 \ No newline at end of file + .byte $00,$16,$1B,$25,$01,$00,$2F,$22,$20,$80,$00,$21,$0F,$00,$01,$27 + .byte $1D,$02,$01,$00,$0F,$00,$01,$5B,$1D,$00,$01,$00,$0F,$00,$01,$24 + .byte $50,$00,$00,$00,$00,$00 \ No newline at end of file diff --git a/ootw/intro_graphics/04_keypad/opening12.png b/ootw/intro_graphics/04_keypad/opening12.png index c4824e2d..a3cea1dd 100644 Binary files a/ootw/intro_graphics/04_keypad/opening12.png and b/ootw/intro_graphics/04_keypad/opening12.png differ diff --git a/ootw/black.decode b/ootw/intro_graphics/black.decode similarity index 100% rename from ootw/black.decode rename to ootw/intro_graphics/black.decode diff --git a/ootw/id1.s b/ootw/intro_graphics/id1.s similarity index 100% rename from ootw/id1.s rename to ootw/intro_graphics/id1.s diff --git a/ootw/id10.s b/ootw/intro_graphics/id10.s similarity index 100% rename from ootw/id10.s rename to ootw/intro_graphics/id10.s diff --git a/ootw/id2.s b/ootw/intro_graphics/id2.s similarity index 100% rename from ootw/id2.s rename to ootw/intro_graphics/id2.s diff --git a/ootw/id3.s b/ootw/intro_graphics/id3.s similarity index 100% rename from ootw/id3.s rename to ootw/intro_graphics/id3.s diff --git a/ootw/id4.s b/ootw/intro_graphics/id4.s similarity index 100% rename from ootw/id4.s rename to ootw/intro_graphics/id4.s diff --git a/ootw/id5.s b/ootw/intro_graphics/id5.s similarity index 100% rename from ootw/id5.s rename to ootw/intro_graphics/id5.s diff --git a/ootw/id6.s b/ootw/intro_graphics/id6.s similarity index 100% rename from ootw/id6.s rename to ootw/intro_graphics/id6.s diff --git a/ootw/id7.s b/ootw/intro_graphics/id7.s similarity index 100% rename from ootw/id7.s rename to ootw/intro_graphics/id7.s diff --git a/ootw/id8.s b/ootw/intro_graphics/id8.s similarity index 100% rename from ootw/id8.s rename to ootw/intro_graphics/id8.s diff --git a/ootw/id9.s b/ootw/intro_graphics/id9.s similarity index 100% rename from ootw/id9.s rename to ootw/intro_graphics/id9.s diff --git a/ootw/intro_data_orig.s b/ootw/intro_graphics/intro_data_orig.s similarity index 100% rename from ootw/intro_data_orig.s rename to ootw/intro_graphics/intro_data_orig.s diff --git a/ootw/intro_graphics/lz4_size.s b/ootw/intro_graphics/lz4_size.s new file mode 100644 index 00000000..2186cce4 --- /dev/null +++ b/ootw/intro_graphics/lz4_size.s @@ -0,0 +1,38 @@ +.include "intro_graphics/01_building/intro_building_car_lz4.inc" +.include "intro_graphics/01_building/intro_building_lz4.inc" +.include "intro_graphics/01_building/intro_car_lz4.inc" + +.include "intro_graphics/02_outer_door/outer_door_lz4.inc" +.include "intro_graphics/02_outer_door/feet_lz4.inc" + +.include "intro_graphics/03_elevator/intro_elevator_lz4.inc" +.include "intro_graphics/03_elevator/intro_off_elevator_lz4.inc" +.include "intro_graphics/03_elevator/intro_walking_lz4.inc" + +.include "intro_graphics/04_keypad/intro_scanner_door_lz4.inc" +.include "intro_graphics/04_keypad/intro_approach_lz4.inc" +.include "intro_graphics/04_keypad/intro_keypad_bg_lz4.inc" +.include "intro_graphics/04_keypad/intro_hands_lz4.inc" +.include "intro_graphics/04_keypad/intro_opening_lz4.inc" + +.include "intro_graphics/05_scanner/intro_scanner_lz4.inc" +.include "intro_graphics/05_scanner/intro_scanning_lz4.inc" +.include "intro_graphics/05_scanner/intro_ai_bg_lz4.inc" +.include "intro_graphics/05_scanner/intro_ai_lz4.inc" + +.include "intro_graphics/06_console/intro_desktop_lz4.inc" +.include "intro_graphics/06_console/intro_cursor_lz4.inc" +.include "intro_graphics/06_console/intro_collider_lz4.inc" + +.include "intro_graphics/07_soda/intro_open_soda_lz4.inc" +.include "intro_graphics/07_soda/intro_drinking_lz4.inc" + +.include "intro_graphics/08_lightning/lightning_lz4.inc" + +.include "intro_graphics/09_tunnel/intro_tunnel1_lz4.inc" +.include "intro_graphics/09_tunnel/intro_tunnel2_lz4.inc" + +.include "intro_graphics/10_gone/intro_zappo_lz4.inc" +.include "intro_graphics/10_gone/intro_gone_lz4.inc" + + diff --git a/ootw/intro_graphics/rle_size.s b/ootw/intro_graphics/rle_size.s new file mode 100644 index 00000000..0173a7c3 --- /dev/null +++ b/ootw/intro_graphics/rle_size.s @@ -0,0 +1,38 @@ +.include "intro_graphics/01_building/intro_building_car.inc" +.include "intro_graphics/01_building/intro_building.inc" +.include "intro_graphics/01_building/intro_car.inc" + +.include "intro_graphics/02_outer_door/outer_door.inc" +.include "intro_graphics/02_outer_door/feet.inc" + +.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" + +.include "intro_graphics/04_keypad/intro_scanner_door.inc" +.include "intro_graphics/04_keypad/intro_approach.inc" +.include "intro_graphics/04_keypad/intro_keypad_bg.inc" +.include "intro_graphics/04_keypad/intro_hands.inc" +.include "intro_graphics/04_keypad/intro_opening.inc" + +.include "intro_graphics/05_scanner/intro_scanner.inc" +.include "intro_graphics/05_scanner/intro_scanning.inc" +.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_graphics/06_console/intro_collider.inc" + +.include "intro_graphics/07_soda/intro_open_soda.inc" +.include "intro_graphics/07_soda/intro_drinking.inc" + +.include "intro_graphics/08_lightning/lightning.inc" + +.include "intro_graphics/09_tunnel/intro_tunnel1.inc" +.include "intro_graphics/09_tunnel/intro_tunnel2.inc" + +.include "intro_graphics/10_gone/intro_zappo.inc" +.include "intro_graphics/10_gone/intro_gone.inc" + +