From b3435ffd66f08be7446409019b95a33dd7abcede Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Sun, 3 Mar 2019 11:36:51 -0500 Subject: [PATCH] ootw: intro: clean up the mess that accumulated when getting things to fit will have to clean out some of the mess in intro_graphics at some point --- ootw/Makefile | 97 +------- ootw/intro_data.s | 1 - ootw/intro_data_02.s | 35 --- ootw/intro_data_03.s | 39 ---- ootw/intro_data_05.s | 125 ---------- ootw/intro_data_07.s | 32 --- ootw/intro_data_10.s | 220 ------------------ .../01_building/intro_building_car.inc | 6 +- .../01_building/intro_building_car.png | Bin 12172 -> 12426 bytes .../01_building/intro_building_car_lz4.inc | 16 +- .../04_keypad/intro_opening.inc | 16 +- .../04_keypad/intro_opening_lz4.inc | 8 +- ootw/intro_graphics/04_keypad/opening12.png | Bin 3151 -> 7176 bytes ootw/{ => intro_graphics}/black.decode | 0 ootw/{ => intro_graphics}/id1.s | 0 ootw/{ => intro_graphics}/id10.s | 0 ootw/{ => intro_graphics}/id2.s | 0 ootw/{ => intro_graphics}/id3.s | 0 ootw/{ => intro_graphics}/id4.s | 0 ootw/{ => intro_graphics}/id5.s | 0 ootw/{ => intro_graphics}/id6.s | 0 ootw/{ => intro_graphics}/id7.s | 0 ootw/{ => intro_graphics}/id8.s | 0 ootw/{ => intro_graphics}/id9.s | 0 ootw/{ => intro_graphics}/intro_data_orig.s | 0 ootw/intro_graphics/lz4_size.s | 38 +++ ootw/intro_graphics/rle_size.s | 38 +++ 27 files changed, 103 insertions(+), 568 deletions(-) delete mode 100644 ootw/intro_data.s delete mode 100644 ootw/intro_data_02.s delete mode 100644 ootw/intro_data_03.s delete mode 100644 ootw/intro_data_05.s delete mode 100644 ootw/intro_data_07.s delete mode 100644 ootw/intro_data_10.s rename ootw/{ => intro_graphics}/black.decode (100%) rename ootw/{ => intro_graphics}/id1.s (100%) rename ootw/{ => intro_graphics}/id10.s (100%) rename ootw/{ => intro_graphics}/id2.s (100%) rename ootw/{ => intro_graphics}/id3.s (100%) rename ootw/{ => intro_graphics}/id4.s (100%) rename ootw/{ => intro_graphics}/id5.s (100%) rename ootw/{ => intro_graphics}/id6.s (100%) rename ootw/{ => intro_graphics}/id7.s (100%) rename ootw/{ => intro_graphics}/id8.s (100%) rename ootw/{ => intro_graphics}/id9.s (100%) rename ootw/{ => intro_graphics}/intro_data_orig.s (100%) create mode 100644 ootw/intro_graphics/lz4_size.s create mode 100644 ootw/intro_graphics/rle_size.s 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 2c261dd96ae489a5d5e5a4e663db265c69bda862..3ad6ab4ca098e8e8340b25638e3297919fa79fd3 100644 GIT binary patch delta 6714 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 Qh5!Hn07*qoM6N<$fRm-zk5 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 Xd0G?4+G3Wl00000NkvXXu0mjf_O*|7 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 c4824e2dd5e095cf7bca9fa5bcd4caf914e67f3f..a3cea1dd26b6782f63b763a39a0832a1523dbb3d 100644 GIT binary patch literal 7176 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 delta 2940 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 my|8j)u)f~>djAqAaH9vv3uC