From ccd5b70b9fa17e5702227fe2976baf14a9ae65d5 Mon Sep 17 00:00:00 2001
From: nmlgc <nmlgc@nmlgc.net>
Date: Mon, 7 Nov 2022 23:47:34 +0100
Subject: [PATCH] [Maintenance] [th03/th04/th05] Cutscenes: Move into a
 separate subdirectory

Thanks to TH03 having text-below-picture cutscenes before stages 8 and
9, the `/end/` directory is the wrong place to keep this code. And as
we're soon going to see, this feature did evolve during these three
games.

Part of P0223, funded by Blue Bolt and rosenrose.
---
 th04/{end => cutscene}/box.cpp                                | 0
 th04/{end => cutscene}/box[data].asm                          | 0
 .../cutscene_script[bss].asm => cutscene/cutscene[bss].asm}   | 0
 th04/maine011.cpp                                             | 2 +-
 th04_maine.asm                                                | 4 ++--
 th05/maine011.cpp                                             | 2 +-
 th05_maine.asm                                                | 4 ++--
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename th04/{end => cutscene}/box.cpp (100%)
 rename th04/{end => cutscene}/box[data].asm (100%)
 rename th04/{end/cutscene_script[bss].asm => cutscene/cutscene[bss].asm} (100%)

diff --git a/th04/end/box.cpp b/th04/cutscene/box.cpp
similarity index 100%
rename from th04/end/box.cpp
rename to th04/cutscene/box.cpp
diff --git a/th04/end/box[data].asm b/th04/cutscene/box[data].asm
similarity index 100%
rename from th04/end/box[data].asm
rename to th04/cutscene/box[data].asm
diff --git a/th04/end/cutscene_script[bss].asm b/th04/cutscene/cutscene[bss].asm
similarity index 100%
rename from th04/end/cutscene_script[bss].asm
rename to th04/cutscene/cutscene[bss].asm
diff --git a/th04/maine011.cpp b/th04/maine011.cpp
index 61240c8d..8c8aa710 100644
--- a/th04/maine011.cpp
+++ b/th04/maine011.cpp
@@ -5,4 +5,4 @@
 
 #pragma option -zCmaine_01_TEXT
 
-#include "th04/end/box.cpp"
+#include "th04/cutscene/box.cpp"
diff --git a/th04_maine.asm b/th04_maine.asm
index 2666ee7e..ca6dcd31 100644
--- a/th04_maine.asm
+++ b/th04_maine.asm
@@ -4665,7 +4665,7 @@ include th03/snd/se_state[data].asm
 include th04/hardware/bgimage[data].asm
 include th03/formats/cdg[data].asm
 include th03/formats/pi_put_masked[data].asm
-include th04/end/box[data].asm
+include th04/cutscene/box[data].asm
 asc_EB84	db '  ', 0
 	even
 aSff1_pi	db 'sff1.pi',0
@@ -4752,7 +4752,7 @@ include th02/snd/load[bss].asm
 include th04/mem[bss].asm
 include th04/hardware/input[bss].asm
 include th04/formats/cdg[bss].asm
-include th04/end/cutscene_script[bss].asm
+include th04/cutscene/cutscene[bss].asm
 dword_1247A	dd ?
 byte_1247E	db ?
 		db 61 dup(?)
diff --git a/th05/maine011.cpp b/th05/maine011.cpp
index d74d2b65..4d1f3026 100644
--- a/th05/maine011.cpp
+++ b/th05/maine011.cpp
@@ -5,7 +5,7 @@
 
 #pragma option -zCmaine_01_TEXT
 
-#include "th04/end/box.cpp"
+#include "th04/cutscene/box.cpp"
 #include "shiftjis.hpp"
 
 /// String-to-color map
diff --git a/th05_maine.asm b/th05_maine.asm
index faf7893b..d6d945a7 100644
--- a/th05_maine.asm
+++ b/th05_maine.asm
@@ -7604,7 +7604,7 @@ include th03/formats/cdg[data].asm
 public _colmap_count
 _colmap_count	db 0
 	evendata
-include th04/end/box[data].asm
+include th04/cutscene/box[data].asm
 asc_1085A	db '  ', 0
 	even
 byte_1085E	db 0
@@ -7886,7 +7886,7 @@ include th04/hardware/input[bss].asm
 include th04/formats/cdg[bss].asm
 include libs/master.lib/pfint21[bss].asm
 include th04/hardware/egcrect[bss].asm
-include th04/end/cutscene_script[bss].asm
+include th04/cutscene/cutscene[bss].asm
 		db 4 dup(?)
 byte_14F8E	db ?
 		db 60 dup(?)