From e7e8b0157b1c58ba53c535e46413cbb76d571fa9 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Tue, 12 Feb 2019 23:43:31 -0500 Subject: [PATCH] ootw: start work on scanner room --- ootw/Makefile | 8 +++----- ootw/intro.s | 2 +- ootw/intro_graphics/05_scanner/Makefile | 17 +++++++++++++++++ .../05_scanner}/intro_scanner.inc | 0 .../05_scanner}/intro_scanner.png | Bin 5 files changed, 21 insertions(+), 6 deletions(-) create mode 100644 ootw/intro_graphics/05_scanner/Makefile rename ootw/{ => intro_graphics/05_scanner}/intro_scanner.inc (100%) rename ootw/{ => intro_graphics/05_scanner}/intro_scanner.png (100%) diff --git a/ootw/Makefile b/ootw/Makefile index 0259c68f..5fb309de 100644 --- a/ootw/Makefile +++ b/ootw/Makefile @@ -55,7 +55,7 @@ intro.o: intro.s \ gr_copy.s gr_fast_clear.s gr_pageflip.s gr_unrle.s gr_putsprite.s \ gr_overlay.s \ keyboard.s random16.s \ - intro_scanner.inc intro_unzapped.inc \ + intro_unzapped.inc \ intro_open_soda.inc intro_drinking.inc intro_collider_ui.inc \ intro_tunnel1.inc intro_tunnel2.inc intro_gone.inc \ intro_graphics/01_building/intro_car.inc \ @@ -70,7 +70,8 @@ intro.o: intro.s \ intro_graphics/04_keypad/intro_approach.inc \ intro_graphics/04_keypad/intro_keypad_bg.inc \ intro_graphics/04_keypad/intro_hands.inc \ - intro_graphics/04_keypad/intro_opening.inc + intro_graphics/04_keypad/intro_opening.inc \ + intro_graphics/05_scanner/intro_scanner.inc ca65 -o intro.o intro.s -l intro.lst #### @@ -113,9 +114,6 @@ ootw_c2_cage.inc: $(PNG2RLE) ootw_c2_cage.png ##### -intro_scanner.inc: $(PNG2RLE) intro_scanner.png - $(PNG2RLE) asm intro_scanner.png scanner_rle > intro_scanner.inc - intro_open_soda.inc: $(PNG2RLE) intro_open_soda.png $(PNG2RLE) asm intro_open_soda.png open_soda_rle > intro_open_soda.inc diff --git a/ootw/intro.s b/ootw/intro.s index 282aa5c0..239406ae 100644 --- a/ootw/intro.s +++ b/ootw/intro.s @@ -940,8 +940,8 @@ gone_loop: .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_scanner.inc" .include "intro_open_soda.inc" .include "intro_drinking.inc" .include "intro_unzapped.inc" diff --git a/ootw/intro_graphics/05_scanner/Makefile b/ootw/intro_graphics/05_scanner/Makefile new file mode 100644 index 00000000..18657f11 --- /dev/null +++ b/ootw/intro_graphics/05_scanner/Makefile @@ -0,0 +1,17 @@ +include ../../../Makefile.inc + +PNG2RLE = ../../../gr-utils/png2rle + + +all: intro_scanner.inc + +##### + +intro_scanner.inc: $(PNG2RLE) intro_scanner.png + $(PNG2RLE) asm intro_scanner.png scanner_rle > intro_scanner.inc + +##### + + +clean: + rm -f *~ *.inc diff --git a/ootw/intro_scanner.inc b/ootw/intro_graphics/05_scanner/intro_scanner.inc similarity index 100% rename from ootw/intro_scanner.inc rename to ootw/intro_graphics/05_scanner/intro_scanner.inc diff --git a/ootw/intro_scanner.png b/ootw/intro_graphics/05_scanner/intro_scanner.png similarity index 100% rename from ootw/intro_scanner.png rename to ootw/intro_graphics/05_scanner/intro_scanner.png