From 2db9722a95d4cd755807102bdd1b8bf773a4ea38 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Sun, 27 Jan 2019 00:20:20 -0500 Subject: [PATCH] ootw: add more intro pictures --- ootw/Makefile | 19 +++- ootw/intro.s | 219 +++++++++++++++++++++++++++++++++--- ootw/intro1_building.png | Bin 473 -> 484 bytes ootw/intro_drinking.png | Bin 0 -> 448 bytes ootw/intro_elevator.inc | 47 ++++++++ ootw/intro_elevator.png | Bin 0 -> 412 bytes ootw/intro_gone.png | Bin 0 -> 555 bytes ootw/intro_off_elevator.png | Bin 0 -> 372 bytes ootw/intro_tunnel2.png | Bin 0 -> 576 bytes 9 files changed, 266 insertions(+), 19 deletions(-) create mode 100644 ootw/intro_drinking.png create mode 100644 ootw/intro_elevator.inc create mode 100644 ootw/intro_elevator.png create mode 100644 ootw/intro_gone.png create mode 100644 ootw/intro_off_elevator.png create mode 100644 ootw/intro_tunnel2.png diff --git a/ootw/Makefile b/ootw/Makefile index 69f98527..0eb7729c 100644 --- a/ootw/Makefile +++ b/ootw/Makefile @@ -36,7 +36,9 @@ INTRO: intro.o intro.o: intro.s \ gr_copy.s gr_fast_clear.s gr_pageflip.s gr_unrle.s gr_putsprite.s \ keyboard.s random16.s \ - intro_building.inc + intro_building.inc intro_elevator.inc intro_off_elevator.inc \ + intro_drinking.inc \ + intro_tunnel2.inc intro_gone.inc ca65 -o intro.o intro.s -l intro.lst #### @@ -71,6 +73,21 @@ ootw_underwater.inc: $(PNG2RLE) another_uboot.png intro_building.inc: $(PNG2RLE) intro1_building.png $(PNG2RLE) asm intro1_building.png building_rle > intro_building.inc +intro_elevator.inc: $(PNG2RLE) intro_elevator.png + $(PNG2RLE) asm intro_elevator.png elevator_rle > intro_elevator.inc + +intro_off_elevator.inc: $(PNG2RLE) intro_off_elevator.png + $(PNG2RLE) asm intro_off_elevator.png off_elevator_rle > intro_off_elevator.inc + +intro_drinking.inc: $(PNG2RLE) intro_drinking.png + $(PNG2RLE) asm intro_drinking.png drinking_rle > intro_drinking.inc + +intro_gone.inc: $(PNG2RLE) intro_gone.png + $(PNG2RLE) asm intro_gone.png gone_rle > intro_gone.inc + +intro_tunnel2.inc: $(PNG2RLE) intro_tunnel2.png + $(PNG2RLE) asm intro_tunnel2.png tunnel2_rle > intro_tunnel2.inc + ##### clean: diff --git a/ootw/intro.s b/ootw/intro.s index 1ee9fa39..f9f1491d 100644 --- a/ootw/intro.s +++ b/ootw/intro.s @@ -51,24 +51,104 @@ intro: building_loop: lda KEYPRESS bpl building_loop + bit KEYRESET - ;=============================== - ; Walk into door +;=============================== +;=============================== +; Walk into door +;=============================== +;=============================== - ;=============================== - ; Elevator going down - ;=============================== - ; Getting out of Elevator - ;=============================== - ; Keycode - ;=============================== - ; Scanner +;=============================== +;=============================== +; Elevator going down +;=============================== +;=============================== + + ;============================= + ; Load background to $c00 + + lda #$0c + sta BASH + lda #$00 + sta BASL ; load image off-screen $c00 + + lda #>(elevator_rle) + sta GBASH + lda #<(elevator_rle) + sta GBASL + jsr load_rle_gr + + ;================================= + ; copy $c00 to both pages $400/$800 + + jsr gr_copy_to_current + jsr page_flip + jsr gr_copy_to_current + +elevator_loop: + lda KEYPRESS + bpl elevator_loop + bit KEYRESET + + +;=============================== +;=============================== +; Getting out of Elevator +;=============================== +;=============================== + + + ;============================= + ; Load background to $c00 + + lda #$0c + sta BASH + lda #$00 + sta BASL ; load image off-screen $c00 + + lda #>(off_elevator_rle) + sta GBASH + lda #<(off_elevator_rle) + sta GBASL + jsr load_rle_gr + + ;================================= + ; copy $c00 to both pages $400/$800 + + jsr gr_copy_to_current + jsr page_flip + jsr gr_copy_to_current + +off_elevator_loop: + lda KEYPRESS + bpl off_elevator_loop + bit KEYRESET + + +;=============================== +;=============================== +; Keycode +;=============================== +;=============================== + + +;=============================== +;=============================== +; Scanner +;=============================== +;=============================== + + +;=============================== +;=============================== +; Spinny DNA / Key +;=============================== +;=============================== - ;=============================== - ; Spinny DNA / Key ;=============================== ; Sitting at Desk @@ -79,8 +159,46 @@ building_loop: ;=============================== ; Particle Accelerator Screen - ;=============================== - ; Soda +;=============================== +;=============================== +; Opening Soda +;=============================== +;=============================== + + + +;=============================== +;=============================== +; Drinking Soda +;=============================== +;=============================== + + + ;============================= + ; Load background to $c00 + + lda #$0c + sta BASH + lda #$00 + sta BASL ; load image off-screen $c00 + + lda #>(drinking_rle) + sta GBASH + lda #<(drinking_rle) + sta GBASL + jsr load_rle_gr + + ;================================= + ; copy $c00 to both pages $400/$800 + + jsr gr_copy_to_current + jsr page_flip + jsr gr_copy_to_current + +drinking_loop: + lda KEYPRESS + bpl drinking_loop + bit KEYRESET ;=============================== ; More crazy screen @@ -91,14 +209,73 @@ building_loop: ;=============================== ; Tunnel 1 - ;=============================== - ; Tunnel 2 - ;=============================== - ; Zappo +;=============================== +;=============================== +; Tunnel 2 +;=============================== +;=============================== + ;============================= + ; Load background to $c00 + lda #$0c + sta BASH + lda #$00 + sta BASL ; load image off-screen $c00 + + lda #>(tunnel2_rle) + sta GBASH + lda #<(tunnel2_rle) + sta GBASL + jsr load_rle_gr + + ;================================= + ; copy $c00 to both pages $400/$800 + + jsr gr_copy_to_current + jsr page_flip + jsr gr_copy_to_current + +tunnel2_loop: + lda KEYPRESS + bpl tunnel2_loop + bit KEYRESET + + +;=============================== +;=============================== +; Zappo / Gone +;=============================== +;=============================== + + + ;============================= + ; Load background to $c00 + + lda #$0c + sta BASH + lda #$00 + sta BASL ; load image off-screen $c00 + + lda #>(gone_rle) + sta GBASH + lda #<(gone_rle) + sta GBASL + jsr load_rle_gr + + ;================================= + ; copy $c00 to both pages $400/$800 + + jsr gr_copy_to_current + jsr page_flip + jsr gr_copy_to_current + +gone_loop: + lda KEYPRESS + bpl gone_loop + bit KEYRESET @@ -119,4 +296,10 @@ building_loop: .include "gr_copy.s" .include "gr_offsets.s" +; background graphics .include "intro_building.inc" +.include "intro_elevator.inc" +.include "intro_off_elevator.inc" +.include "intro_drinking.inc" +.include "intro_tunnel2.inc" +.include "intro_gone.inc" diff --git a/ootw/intro1_building.png b/ootw/intro1_building.png index c654cc97ba89c0bdd6b5c67ab0d6087003e76a57..92b945c34dc5824ac7c8d4e3cf4d54455249335f 100644 GIT binary patch delta 316 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 O0000