diff --git a/ootw/Makefile b/ootw/Makefile index 8acc09cf..66250349 100644 --- a/ootw/Makefile +++ b/ootw/Makefile @@ -93,7 +93,8 @@ intro.o: intro.s \ intro_graphics/10_gone/intro_zappo.inc \ intro_graphics/10_gone/intro_gone.inc \ intro_data_01.lz4 \ - intro_data_04.lz4 + intro_data_04.lz4 \ + intro_data_06.lz4 ca65 -o intro.o intro.s -l intro.lst #### @@ -120,6 +121,18 @@ intro_data_04.o: intro_data_04.s ca65 -o intro_data_04.o intro_data_04.s -l intro_data_04.lst +intro_data_06.lz4: intro_data_06 + lz4 -f -16 intro_data_06 + truncate -s-8 intro_data_06.lz4 + +intro_data_06: intro_data_06.o + ld65 -o intro_data_06 intro_data_06.o -C ../linker_scripts/apple2_8000.inc + +intro_data_06.o: intro_data_06.s + ca65 -o intro_data_06.o intro_data_06.s -l intro_data_06.lst + + + #### LOADER: loader.o diff --git a/ootw/intro.s b/ootw/intro.s index 9c98810d..64becfd7 100644 --- a/ootw/intro.s +++ b/ootw/intro.s @@ -694,12 +694,26 @@ spin_on_key: bne spin_on_key -.if 0 ;=============================== ; Sitting at Desk ;=============================== + ;================================== + ; Uncompress the data + ;================================== + lda #intro6_data_lz4 + sta LZ4_SRC+1 + + lda #$80 ; load to $8000 + + jsr lz4_decode + + ;====================== + ; load bg + lda #>(desktop_rle) sta GBASH lda #<(desktop_rle) @@ -1208,6 +1222,7 @@ particle_loop: jsr long_wait + ;=============================== ;=============================== ; Opening Soda @@ -1420,6 +1435,8 @@ particle_loop2: ; bit KEYRESET +.if 0 + ;=============================== ;=============================== ; Thunderstorm Outside @@ -1911,7 +1928,6 @@ no_good_message: no_ferrari_message: rts -.if 0 ;====================== ; Plot particle @@ -1937,8 +1953,6 @@ plot_particle: rts -.endif - ;.include "intro_data.s" @@ -1975,13 +1989,49 @@ ai_bg_rle = (DATA_LOCATION+$2747) scanning_sequence = (DATA_LOCATION+$2CF5) scanner_rle = (DATA_LOCATION+$2066) - - intro4_data_lz4: .word (intro4_data_lz4_end-intro4_data_lz4) .incbin "intro_data_04.lz4",11 intro4_data_lz4_end: +; intro6,intro7 + +experiment = (DATA_LOCATION+$0D2C) +practical_verification = (DATA_LOCATION+$0D0D) +result = (DATA_LOCATION+$0CA6) +analysis = (DATA_LOCATION+$0C8D) +shield_sequence = (DATA_LOCATION+$0D75) +phase2 = (DATA_LOCATION+$0C56) +phase1 = (DATA_LOCATION+$0C2F) +phase0 = (DATA_LOCATION+$0BF5) +particles = (DATA_LOCATION+$0D65) +theoretical_study = (DATA_LOCATION+$0BD9) +collider_rle = (DATA_LOCATION+$06D8) +run_blank = (DATA_LOCATION+$0BC6) +run_experiment = (DATA_LOCATION+$0BB3) +accel_paramaters = (DATA_LOCATION+$0B62) +accelerator = (DATA_LOCATION+$09C1) +project_23 = (DATA_LOCATION+$09B2) +peanut = (DATA_LOCATION+$0955) +cursor_sequence = (DATA_LOCATION+$0947) +desktop_bg_rle = (DATA_LOCATION+$0242) +powerup_sequence = (DATA_LOCATION+$093E) +desktop_rle = (DATA_LOCATION+$0000) + +times = (DATA_LOCATION+$0E0C) +message_list = (DATA_LOCATION+$0DE4) +five = (DATA_LOCATION+$0DEE) +drinking_sequence = (DATA_LOCATION+$1C29) +drinking02_rle = (DATA_LOCATION+$1705) +soda_sequence = (DATA_LOCATION+$1C1A) +soda_bg_rle = (DATA_LOCATION+$0E1A) + + +intro6_data_lz4: + .word (intro6_data_lz4_end-intro6_data_lz4) + .incbin "intro_data_06.lz4",11 +intro6_data_lz4_end: + diff --git a/ootw/intro_data_06.s b/ootw/intro_data_06.s index 817dbef0..6dfafb1b 100644 --- a/ootw/intro_data_06.s +++ b/ootw/intro_data_06.s @@ -1,4 +1,8 @@ -; background graphics +;================================= +;================================= +; Intro Segment 06 Data (Console) +;================================= +;================================= .include "intro_graphics/06_console/intro_desktop.inc" .include "intro_graphics/06_console/intro_cursor.inc" @@ -224,3 +228,38 @@ times: ; of 6 even though it is printed then erased (but never displayed) .word five,four,three,two,one,zero,zero + +;================================= +;================================= +; Intro Segment 07 Data (Soda) +;================================= +;================================= + +.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