From a71cc5cd96eac2b66bc702046aea469392221461 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Mon, 4 Feb 2019 23:33:16 -0500
Subject: [PATCH] ootw: move elevator graphics to subdir

---
 ootw/Makefile                                   |   5 +++--
 ootw/intro.s                                    |   2 +-
 ootw/intro_graphics/03_elevator/Makefile        |  16 ++++++++++++++++
 .../03_elevator}/intro_elevator.inc             |   0
 .../03_elevator}/intro_elevator.png             | Bin
 5 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 ootw/intro_graphics/03_elevator/Makefile
 rename ootw/{ => intro_graphics/03_elevator}/intro_elevator.inc (100%)
 rename ootw/{ => intro_graphics/03_elevator}/intro_elevator.png (100%)

diff --git a/ootw/Makefile b/ootw/Makefile
index 8b01ae44..7fee394d 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_elevator.inc intro_off_elevator.inc \
+	intro_off_elevator.inc \
 	intro_keypad.inc intro_scanner.inc intro_unzapped.inc \
 	intro_open_soda.inc intro_drinking.inc intro_collider_ui.inc \
 	intro_tunnel1.inc intro_tunnel2.inc intro_gone.inc \
@@ -63,7 +63,8 @@ intro.o:	intro.s \
 	intro_graphics/01_building/intro_building_car.inc \
 	intro_graphics/01_building/intro_building.inc \
 	intro_graphics/02_outer_door/outer_door.inc \
-	intro_graphics/02_outer_door/feet.inc
+	intro_graphics/02_outer_door/feet.inc \
+	intro_graphics/03_elevator/intro_elevator.inc
 	ca65 -o intro.o intro.s -l intro.lst
 
 ####
diff --git a/ootw/intro.s b/ootw/intro.s
index 5fe3e65b..5eb51751 100644
--- a/ootw/intro.s
+++ b/ootw/intro.s
@@ -490,8 +490,8 @@ gone_loop:
 .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_elevator.inc"
 .include "intro_off_elevator.inc"
 .include "intro_keypad.inc"
 .include "intro_scanner.inc"
diff --git a/ootw/intro_graphics/03_elevator/Makefile b/ootw/intro_graphics/03_elevator/Makefile
new file mode 100644
index 00000000..1f2270e5
--- /dev/null
+++ b/ootw/intro_graphics/03_elevator/Makefile
@@ -0,0 +1,16 @@
+include ../../../Makefile.inc
+
+PNG2RLE = ../../../gr-utils/png2rle
+
+
+all:	intro_elevator.inc
+
+#####
+
+intro_elevator.inc:	$(PNG2RLE) intro_elevator.png
+	$(PNG2RLE) asm intro_elevator.png elevator_rle > intro_elevator.inc
+
+#####
+
+clean:		
+		rm -f *~ *.inc
diff --git a/ootw/intro_elevator.inc b/ootw/intro_graphics/03_elevator/intro_elevator.inc
similarity index 100%
rename from ootw/intro_elevator.inc
rename to ootw/intro_graphics/03_elevator/intro_elevator.inc
diff --git a/ootw/intro_elevator.png b/ootw/intro_graphics/03_elevator/intro_elevator.png
similarity index 100%
rename from ootw/intro_elevator.png
rename to ootw/intro_graphics/03_elevator/intro_elevator.png