From a5fdef7b650160529fe95ae11a478115cc27dffc Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Wed, 24 Mar 2021 11:33:54 -0400
Subject: [PATCH] ootw: move audio around

---
 games/ootw/ending/Makefile                          |   2 +-
 games/ootw/ending/ending.s                          |   2 +-
 games/ootw/ending/{audio => music}/ootw_outro.pt3   | Bin
 games/ootw/{ootw_audio => intro/music}/NOTES.mod    |   0
 games/ootw/{ootw_audio => intro/music}/NOTES.sample |   0
 .../ootw/{ootw_audio => intro/music}/ootw_intro.pt3 | Bin
 games/ootw/{ => ootw_c2}/audio.s                    |   2 +-
 games/ootw/{ootw_audio => ootw_c2/audio}/mytuba.btc | Bin
 games/ootw/ootw_c2/ootw_c2.s                        |   2 +-
 games/ootw/{ => title}/new_design.txt               |   0
 10 files changed, 4 insertions(+), 4 deletions(-)
 rename games/ootw/ending/{audio => music}/ootw_outro.pt3 (100%)
 rename games/ootw/{ootw_audio => intro/music}/NOTES.mod (100%)
 rename games/ootw/{ootw_audio => intro/music}/NOTES.sample (100%)
 rename games/ootw/{ootw_audio => intro/music}/ootw_intro.pt3 (100%)
 rename games/ootw/{ => ootw_c2}/audio.s (99%)
 rename games/ootw/{ootw_audio => ootw_c2/audio}/mytuba.btc (100%)
 rename games/ootw/{ => title}/new_design.txt (100%)

diff --git a/games/ootw/ending/Makefile b/games/ootw/ending/Makefile
index 47138da7..5834d3b1 100644
--- a/games/ootw/ending/Makefile
+++ b/games/ootw/ending/Makefile
@@ -19,7 +19,7 @@ ending.o:	ending.s \
 	$(PT3_PLAYER)/interrupt_handler.s \
 	../ootw_c15/graphics/l15_final/ootw_c15_final.inc \
 	graphics/ending/ootw_c16_end.inc \
-	audio/ootw_outro.pt3
+	music/ootw_outro.pt3
 	ca65 -o ending.o ending.s -l ending.lst
 
 #####
diff --git a/games/ootw/ending/ending.s b/games/ootw/ending/ending.s
index e87aa8ab..e8af68a9 100644
--- a/games/ootw/ending/ending.s
+++ b/games/ootw/ending/ending.s
@@ -864,4 +864,4 @@ PT3_LOC = song
 ; must be page aligned
 .align 256
 song:
-.incbin "audio/ootw_outro.pt3"
+.incbin "music/ootw_outro.pt3"
diff --git a/games/ootw/ending/audio/ootw_outro.pt3 b/games/ootw/ending/music/ootw_outro.pt3
similarity index 100%
rename from games/ootw/ending/audio/ootw_outro.pt3
rename to games/ootw/ending/music/ootw_outro.pt3
diff --git a/games/ootw/ootw_audio/NOTES.mod b/games/ootw/intro/music/NOTES.mod
similarity index 100%
rename from games/ootw/ootw_audio/NOTES.mod
rename to games/ootw/intro/music/NOTES.mod
diff --git a/games/ootw/ootw_audio/NOTES.sample b/games/ootw/intro/music/NOTES.sample
similarity index 100%
rename from games/ootw/ootw_audio/NOTES.sample
rename to games/ootw/intro/music/NOTES.sample
diff --git a/games/ootw/ootw_audio/ootw_intro.pt3 b/games/ootw/intro/music/ootw_intro.pt3
similarity index 100%
rename from games/ootw/ootw_audio/ootw_intro.pt3
rename to games/ootw/intro/music/ootw_intro.pt3
diff --git a/games/ootw/audio.s b/games/ootw/ootw_c2/audio.s
similarity index 99%
rename from games/ootw/audio.s
rename to games/ootw/ootw_c2/audio.s
index 3be04c87..823e1fc6 100644
--- a/games/ootw/audio.s
+++ b/games/ootw/ootw_c2/audio.s
@@ -194,4 +194,4 @@ delay:
 
 
 audio:
-.incbin "ootw_audio/mytuba.btc"
+.incbin "audio/mytuba.btc"
diff --git a/games/ootw/ootw_audio/mytuba.btc b/games/ootw/ootw_c2/audio/mytuba.btc
similarity index 100%
rename from games/ootw/ootw_audio/mytuba.btc
rename to games/ootw/ootw_c2/audio/mytuba.btc
diff --git a/games/ootw/ootw_c2/ootw_c2.s b/games/ootw/ootw_c2/ootw_c2.s
index 6610b4e7..139d66fe 100644
--- a/games/ootw/ootw_c2/ootw_c2.s
+++ b/games/ootw/ootw_c2/ootw_c2.s
@@ -157,5 +157,5 @@ end_message:
 ; laser movie
 .include "graphics/l2_laser/ootw_c2_laser.inc"
 
-.include "../audio.s"
+.include "audio.s"
 
diff --git a/games/ootw/new_design.txt b/games/ootw/title/new_design.txt
similarity index 100%
rename from games/ootw/new_design.txt
rename to games/ootw/title/new_design.txt