diff --git a/assets/xml/overlays/ovl_Demo_Kankyo.xml b/assets/xml/overlays/ovl_Demo_Kankyo.xml
new file mode 100644
index 0000000000..371263828c
--- /dev/null
+++ b/assets/xml/overlays/ovl_Demo_Kankyo.xml
@@ -0,0 +1,12 @@
+<Root>
+    <File Name="ovl_Demo_Kankyo">
+        <Cutscene Name="gAdultWarpInCS" Offset="0x0"/>
+        <Cutscene Name="gAdultWarpOutCS" Offset="0x110"/>
+        <Cutscene Name="gAdultWarpInToTCS" Offset="0x290"/>
+        <Cutscene Name="gAdultWarpOutToTCS" Offset="0x3A0"/>
+        <Cutscene Name="gChildWarpInCS" Offset="0x4C0"/>
+        <Cutscene Name="gChildWarpOutCS" Offset="0x5F0"/>
+        <Cutscene Name="gChildWarpInToTCS" Offset="0x770"/>
+        <Cutscene Name="gChildWarpOutToTCS" Offset="0x8A0"/>
+    </File>
+</Root>
diff --git a/assets/xml/overlays/ovl_En_Zl1.xml b/assets/xml/overlays/ovl_En_Zl1.xml
new file mode 100644
index 0000000000..78092a91c5
--- /dev/null
+++ b/assets/xml/overlays/ovl_En_Zl1.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="ovl_En_Zl1">
+        <Cutscene Name="gTriforceCreationStartCs" Offset="0x0"/>
+    </File>
+</Root>
diff --git a/baseroms/gc-eu-mq-dbg/config.yml b/baseroms/gc-eu-mq-dbg/config.yml
index e457028060..390c8913da 100644
--- a/baseroms/gc-eu-mq-dbg/config.yml
+++ b/baseroms/gc-eu-mq-dbg/config.yml
@@ -875,6 +875,10 @@ assets:
   xml_path: assets/xml/overlays/ovl_Boss_Sst.xml
   start_offset: 0xA3C0
   end_offset: 0xAD70
+- name: overlays/ovl_Demo_Kankyo
+  xml_path: assets/xml/overlays/ovl_Demo_Kankyo.xml
+  start_offset: 0x2A90
+  end_offset: 0x3450
 - name: overlays/ovl_Demo_Shd
   xml_path: assets/xml/overlays/ovl_Demo_Shd.xml
   start_offset: 0x450
@@ -935,6 +939,10 @@ assets:
   xml_path: assets/xml/overlays/ovl_En_Sth.xml
   start_offset: 0xEF0
   end_offset: 0x3EC4
+- name: overlays/ovl_En_Zl1
+  xml_path: assets/xml/overlays/ovl_En_Zl1.xml
+  start_offset: 0x1A90
+  end_offset: 0x2A80
 - name: overlays/ovl_End_Title
   xml_path: assets/xml/overlays/ovl_End_Title.xml
   start_offset: 0x780
diff --git a/baseroms/gc-eu-mq/config.yml b/baseroms/gc-eu-mq/config.yml
index 0093015d7e..7f5712fc05 100644
--- a/baseroms/gc-eu-mq/config.yml
+++ b/baseroms/gc-eu-mq/config.yml
@@ -867,6 +867,10 @@ assets:
   xml_path: assets/xml/overlays/ovl_Boss_Sst.xml
   start_offset: 0xA380
   end_offset: 0xAD30
+- name: overlays/ovl_Demo_Kankyo
+  xml_path: assets/xml/overlays/ovl_Demo_Kankyo.xml
+  start_offset: 0x28D0
+  end_offset: 0x3290
 - name: overlays/ovl_Demo_Shd
   xml_path: assets/xml/overlays/ovl_Demo_Shd.xml
   start_offset: 0x410
@@ -919,6 +923,10 @@ assets:
   xml_path: assets/xml/overlays/ovl_En_Sth.xml
   start_offset: 0xE70
   end_offset: 0x3E44
+- name: overlays/ovl_En_Zl1
+  xml_path: assets/xml/overlays/ovl_En_Zl1.xml
+  start_offset: 0x1A80
+  end_offset: 0x2A70
 - name: overlays/ovl_End_Title
   xml_path: assets/xml/overlays/ovl_End_Title.xml
   start_offset: 0x6E0
diff --git a/baseroms/gc-eu/config.yml b/baseroms/gc-eu/config.yml
index 9aef9891f9..40fe61eaad 100644
--- a/baseroms/gc-eu/config.yml
+++ b/baseroms/gc-eu/config.yml
@@ -867,6 +867,10 @@ assets:
   xml_path: assets/xml/overlays/ovl_Boss_Sst.xml
   start_offset: 0xA380
   end_offset: 0xAD30
+- name: overlays/ovl_Demo_Kankyo
+  xml_path: assets/xml/overlays/ovl_Demo_Kankyo.xml
+  start_offset: 0x28D0
+  end_offset: 0x3290
 - name: overlays/ovl_Demo_Shd
   xml_path: assets/xml/overlays/ovl_Demo_Shd.xml
   start_offset: 0x410
@@ -919,6 +923,10 @@ assets:
   xml_path: assets/xml/overlays/ovl_En_Sth.xml
   start_offset: 0xE70
   end_offset: 0x3E44
+- name: overlays/ovl_En_Zl1
+  xml_path: assets/xml/overlays/ovl_En_Zl1.xml
+  start_offset: 0x1A80
+  end_offset: 0x2A70
 - name: overlays/ovl_End_Title
   xml_path: assets/xml/overlays/ovl_End_Title.xml
   start_offset: 0x6E0
diff --git a/baseroms/gc-jp-ce/config.yml b/baseroms/gc-jp-ce/config.yml
index f3c0541a62..eee64bbe04 100644
--- a/baseroms/gc-jp-ce/config.yml
+++ b/baseroms/gc-jp-ce/config.yml
@@ -866,6 +866,10 @@ assets:
   xml_path: assets/xml/overlays/ovl_Boss_Sst.xml
   start_offset: 0xA380
   end_offset: 0xAD30
+- name: overlays/ovl_Demo_Kankyo
+  xml_path: assets/xml/overlays/ovl_Demo_Kankyo.xml
+  start_offset: 0x28D0
+  end_offset: 0x3290
 - name: overlays/ovl_Demo_Shd
   xml_path: assets/xml/overlays/ovl_Demo_Shd.xml
   start_offset: 0x410
@@ -918,6 +922,10 @@ assets:
   xml_path: assets/xml/overlays/ovl_En_Sth.xml
   start_offset: 0xE70
   end_offset: 0x3E44
+- name: overlays/ovl_En_Zl1
+  xml_path: assets/xml/overlays/ovl_En_Zl1.xml
+  start_offset: 0x1A80
+  end_offset: 0x2A70
 - name: overlays/ovl_End_Title
   xml_path: assets/xml/overlays/ovl_End_Title.xml
   start_offset: 0x6E0
diff --git a/baseroms/gc-jp-mq/config.yml b/baseroms/gc-jp-mq/config.yml
index 41d1721f3d..28fd413069 100644
--- a/baseroms/gc-jp-mq/config.yml
+++ b/baseroms/gc-jp-mq/config.yml
@@ -866,6 +866,10 @@ assets:
   xml_path: assets/xml/overlays/ovl_Boss_Sst.xml
   start_offset: 0xA380
   end_offset: 0xAD30
+- name: overlays/ovl_Demo_Kankyo
+  xml_path: assets/xml/overlays/ovl_Demo_Kankyo.xml
+  start_offset: 0x28D0
+  end_offset: 0x3290
 - name: overlays/ovl_Demo_Shd
   xml_path: assets/xml/overlays/ovl_Demo_Shd.xml
   start_offset: 0x410
@@ -918,6 +922,10 @@ assets:
   xml_path: assets/xml/overlays/ovl_En_Sth.xml
   start_offset: 0xE70
   end_offset: 0x3E44
+- name: overlays/ovl_En_Zl1
+  xml_path: assets/xml/overlays/ovl_En_Zl1.xml
+  start_offset: 0x1A80
+  end_offset: 0x2A70
 - name: overlays/ovl_End_Title
   xml_path: assets/xml/overlays/ovl_End_Title.xml
   start_offset: 0x6E0
diff --git a/baseroms/gc-jp/config.yml b/baseroms/gc-jp/config.yml
index 73285664c6..3774fbfe11 100644
--- a/baseroms/gc-jp/config.yml
+++ b/baseroms/gc-jp/config.yml
@@ -866,6 +866,10 @@ assets:
   xml_path: assets/xml/overlays/ovl_Boss_Sst.xml
   start_offset: 0xA380
   end_offset: 0xAD30
+- name: overlays/ovl_Demo_Kankyo
+  xml_path: assets/xml/overlays/ovl_Demo_Kankyo.xml
+  start_offset: 0x28D0
+  end_offset: 0x3290
 - name: overlays/ovl_Demo_Shd
   xml_path: assets/xml/overlays/ovl_Demo_Shd.xml
   start_offset: 0x410
@@ -918,6 +922,10 @@ assets:
   xml_path: assets/xml/overlays/ovl_En_Sth.xml
   start_offset: 0xE70
   end_offset: 0x3E44
+- name: overlays/ovl_En_Zl1
+  xml_path: assets/xml/overlays/ovl_En_Zl1.xml
+  start_offset: 0x1A80
+  end_offset: 0x2A70
 - name: overlays/ovl_End_Title
   xml_path: assets/xml/overlays/ovl_End_Title.xml
   start_offset: 0x6E0
diff --git a/baseroms/gc-us-mq/config.yml b/baseroms/gc-us-mq/config.yml
index 1057e49b2e..59f062ff87 100644
--- a/baseroms/gc-us-mq/config.yml
+++ b/baseroms/gc-us-mq/config.yml
@@ -866,6 +866,10 @@ assets:
   xml_path: assets/xml/overlays/ovl_Boss_Sst.xml
   start_offset: 0xA380
   end_offset: 0xAD30
+- name: overlays/ovl_Demo_Kankyo
+  xml_path: assets/xml/overlays/ovl_Demo_Kankyo.xml
+  start_offset: 0x28D0
+  end_offset: 0x3290
 - name: overlays/ovl_Demo_Shd
   xml_path: assets/xml/overlays/ovl_Demo_Shd.xml
   start_offset: 0x410
@@ -918,6 +922,10 @@ assets:
   xml_path: assets/xml/overlays/ovl_En_Sth.xml
   start_offset: 0xE70
   end_offset: 0x3E44
+- name: overlays/ovl_En_Zl1
+  xml_path: assets/xml/overlays/ovl_En_Zl1.xml
+  start_offset: 0x1A80
+  end_offset: 0x2A70
 - name: overlays/ovl_End_Title
   xml_path: assets/xml/overlays/ovl_End_Title.xml
   start_offset: 0x6E0
diff --git a/baseroms/gc-us/config.yml b/baseroms/gc-us/config.yml
index 620d550631..2efb233b1e 100644
--- a/baseroms/gc-us/config.yml
+++ b/baseroms/gc-us/config.yml
@@ -866,6 +866,10 @@ assets:
   xml_path: assets/xml/overlays/ovl_Boss_Sst.xml
   start_offset: 0xA380
   end_offset: 0xAD30
+- name: overlays/ovl_Demo_Kankyo
+  xml_path: assets/xml/overlays/ovl_Demo_Kankyo.xml
+  start_offset: 0x28D0
+  end_offset: 0x3290
 - name: overlays/ovl_Demo_Shd
   xml_path: assets/xml/overlays/ovl_Demo_Shd.xml
   start_offset: 0x410
@@ -918,6 +922,10 @@ assets:
   xml_path: assets/xml/overlays/ovl_En_Sth.xml
   start_offset: 0xE70
   end_offset: 0x3E44
+- name: overlays/ovl_En_Zl1
+  xml_path: assets/xml/overlays/ovl_En_Zl1.xml
+  start_offset: 0x1A80
+  end_offset: 0x2A70
 - name: overlays/ovl_End_Title
   xml_path: assets/xml/overlays/ovl_End_Title.xml
   start_offset: 0x6E0
diff --git a/baseroms/ique-cn/config.yml b/baseroms/ique-cn/config.yml
index 6236b0cf51..4b5947f9d0 100644
--- a/baseroms/ique-cn/config.yml
+++ b/baseroms/ique-cn/config.yml
@@ -866,6 +866,10 @@ assets:
   xml_path: assets/xml/overlays/ovl_Boss_Sst.xml
   start_offset: 0xA380
   end_offset: 0xAD30
+- name: overlays/ovl_Demo_Kankyo
+  xml_path: assets/xml/overlays/ovl_Demo_Kankyo.xml
+  start_offset: 0x28D0
+  end_offset: 0x3290
 - name: overlays/ovl_Demo_Shd
   xml_path: assets/xml/overlays/ovl_Demo_Shd.xml
   start_offset: 0x410
@@ -922,6 +926,10 @@ assets:
   xml_path: assets/xml/overlays/ovl_En_Sth.xml
   start_offset: 0xE70
   end_offset: 0x3E44
+- name: overlays/ovl_En_Zl1
+  xml_path: assets/xml/overlays/ovl_En_Zl1.xml
+  start_offset: 0x1A80
+  end_offset: 0x2A70
 - name: overlays/ovl_End_Title
   xml_path: assets/xml/overlays/ovl_End_Title_ique.xml
   start_offset: 0x750
diff --git a/baseroms/ntsc-1.0/config.yml b/baseroms/ntsc-1.0/config.yml
index 948bbd179a..4539005f9f 100644
--- a/baseroms/ntsc-1.0/config.yml
+++ b/baseroms/ntsc-1.0/config.yml
@@ -873,6 +873,10 @@ assets:
   xml_path: assets/xml/overlays/ovl_Boss_Sst.xml
   start_offset: 0xA330
   end_offset: 0xACE0
+- name: overlays/ovl_Demo_Kankyo
+  xml_path: assets/xml/overlays/ovl_Demo_Kankyo.xml
+  start_offset: 0x28E0
+  end_offset: 0x32A0
 - name: overlays/ovl_Demo_Shd
   xml_path: assets/xml/overlays/ovl_Demo_Shd.xml
   start_offset: 0x410
@@ -925,6 +929,10 @@ assets:
   xml_path: assets/xml/overlays/ovl_En_Sth.xml
   start_offset: 0xE60
   end_offset: 0x3E34
+- name: overlays/ovl_En_Zl1
+  xml_path: assets/xml/overlays/ovl_En_Zl1.xml
+  start_offset: 0x1A70
+  end_offset: 0x2A60
 - name: overlays/ovl_End_Title
   xml_path: assets/xml/overlays/ovl_End_Title.xml
   start_offset: 0x6F0
diff --git a/baseroms/ntsc-1.1/config.yml b/baseroms/ntsc-1.1/config.yml
index 2317ae2dac..d589b6d336 100644
--- a/baseroms/ntsc-1.1/config.yml
+++ b/baseroms/ntsc-1.1/config.yml
@@ -873,6 +873,10 @@ assets:
   xml_path: assets/xml/overlays/ovl_Boss_Sst.xml
   start_offset: 0xA330
   end_offset: 0xACE0
+- name: overlays/ovl_Demo_Kankyo
+  xml_path: assets/xml/overlays/ovl_Demo_Kankyo.xml
+  start_offset: 0x28E0
+  end_offset: 0x32A0
 - name: overlays/ovl_Demo_Shd
   xml_path: assets/xml/overlays/ovl_Demo_Shd.xml
   start_offset: 0x410
@@ -925,6 +929,10 @@ assets:
   xml_path: assets/xml/overlays/ovl_En_Sth.xml
   start_offset: 0xE60
   end_offset: 0x3E34
+- name: overlays/ovl_En_Zl1
+  xml_path: assets/xml/overlays/ovl_En_Zl1.xml
+  start_offset: 0x1A70
+  end_offset: 0x2A60
 - name: overlays/ovl_End_Title
   xml_path: assets/xml/overlays/ovl_End_Title.xml
   start_offset: 0x6F0
diff --git a/baseroms/ntsc-1.2/config.yml b/baseroms/ntsc-1.2/config.yml
index 6fc7896db0..19558c954e 100644
--- a/baseroms/ntsc-1.2/config.yml
+++ b/baseroms/ntsc-1.2/config.yml
@@ -873,6 +873,10 @@ assets:
   xml_path: assets/xml/overlays/ovl_Boss_Sst.xml
   start_offset: 0xA370
   end_offset: 0xAD20
+- name: overlays/ovl_Demo_Kankyo
+  xml_path: assets/xml/overlays/ovl_Demo_Kankyo.xml
+  start_offset: 0x28E0
+  end_offset: 0x32A0
 - name: overlays/ovl_Demo_Shd
   xml_path: assets/xml/overlays/ovl_Demo_Shd.xml
   start_offset: 0x410
@@ -925,6 +929,10 @@ assets:
   xml_path: assets/xml/overlays/ovl_En_Sth.xml
   start_offset: 0xE60
   end_offset: 0x3E34
+- name: overlays/ovl_En_Zl1
+  xml_path: assets/xml/overlays/ovl_En_Zl1.xml
+  start_offset: 0x1A70
+  end_offset: 0x2A60
 - name: overlays/ovl_End_Title
   xml_path: assets/xml/overlays/ovl_End_Title.xml
   start_offset: 0x6F0
diff --git a/baseroms/pal-1.0/config.yml b/baseroms/pal-1.0/config.yml
index 37ffb7500b..94c363e353 100644
--- a/baseroms/pal-1.0/config.yml
+++ b/baseroms/pal-1.0/config.yml
@@ -879,6 +879,10 @@ assets:
   xml_path: assets/xml/overlays/ovl_Boss_Sst.xml
   start_offset: 0xA330
   end_offset: 0xACE0
+- name: overlays/ovl_Demo_Kankyo
+  xml_path: assets/xml/overlays/ovl_Demo_Kankyo.xml
+  start_offset: 0x28E0
+  end_offset: 0x32A0
 - name: overlays/ovl_Demo_Shd
   xml_path: assets/xml/overlays/ovl_Demo_Shd.xml
   start_offset: 0x410
@@ -931,6 +935,10 @@ assets:
   xml_path: assets/xml/overlays/ovl_En_Sth.xml
   start_offset: 0xE60
   end_offset: 0x3E34
+- name: overlays/ovl_En_Zl1
+  xml_path: assets/xml/overlays/ovl_En_Zl1.xml
+  start_offset: 0x1A70
+  end_offset: 0x2A60
 - name: overlays/ovl_End_Title
   xml_path: assets/xml/overlays/ovl_End_Title.xml
   start_offset: 0x6F0
diff --git a/baseroms/pal-1.1/config.yml b/baseroms/pal-1.1/config.yml
index 45bf82b877..1321f72a20 100644
--- a/baseroms/pal-1.1/config.yml
+++ b/baseroms/pal-1.1/config.yml
@@ -879,6 +879,10 @@ assets:
   xml_path: assets/xml/overlays/ovl_Boss_Sst.xml
   start_offset: 0xA370
   end_offset: 0xAD20
+- name: overlays/ovl_Demo_Kankyo
+  xml_path: assets/xml/overlays/ovl_Demo_Kankyo.xml
+  start_offset: 0x28E0
+  end_offset: 0x32A0
 - name: overlays/ovl_Demo_Shd
   xml_path: assets/xml/overlays/ovl_Demo_Shd.xml
   start_offset: 0x410
@@ -931,6 +935,10 @@ assets:
   xml_path: assets/xml/overlays/ovl_En_Sth.xml
   start_offset: 0xE60
   end_offset: 0x3E34
+- name: overlays/ovl_En_Zl1
+  xml_path: assets/xml/overlays/ovl_En_Zl1.xml
+  start_offset: 0x1A70
+  end_offset: 0x2A60
 - name: overlays/ovl_End_Title
   xml_path: assets/xml/overlays/ovl_End_Title.xml
   start_offset: 0x6F0
diff --git a/spec/overlays_gc.inc b/spec/overlays_gc.inc
index 27bbb72b04..bf54292955 100644
--- a/spec/overlays_gc.inc
+++ b/spec/overlays_gc.inc
@@ -1048,14 +1048,7 @@ endseg
 beginseg
     name "ovl_Demo_Kankyo"
     compress
-    include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data1.o"
-    include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data2.o"
-    include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data3.o"
-    include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data4.o"
-    include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data5.o"
-    include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data6.o"
-    include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data7.o"
-    include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data8.o"
+    include "$(BUILD_DIR)/assets/overlays/ovl_Demo_Kankyo/ovl_Demo_Kankyo.o"
     include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.o"
     include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_Kankyo/ovl_Demo_Kankyo_reloc.o"
 endseg
@@ -2884,7 +2877,7 @@ endseg
 beginseg
     name "ovl_En_Zl1"
     compress
-    include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Zl1/z_en_zl1_cutscene_data.o"
+    include "$(BUILD_DIR)/assets/overlays/ovl_En_Zl1/ovl_En_Zl1.o"
     include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Zl1/z_en_zl1.o"
     include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Zl1/ovl_En_Zl1_reloc.o"
 endseg
diff --git a/spec/overlays_n64_ique.inc b/spec/overlays_n64_ique.inc
index 8c1905a5ad..e4451d668d 100644
--- a/spec/overlays_n64_ique.inc
+++ b/spec/overlays_n64_ique.inc
@@ -169,7 +169,7 @@ endseg
 beginseg
     name "ovl_En_Zl1"
     compress
-    include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Zl1/z_en_zl1_cutscene_data.o"
+    include "$(BUILD_DIR)/assets/overlays/ovl_En_Zl1/ovl_En_Zl1.o"
     include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Zl1/z_en_zl1.o"
     include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Zl1/ovl_En_Zl1_reloc.o"
 endseg
@@ -776,14 +776,7 @@ endseg
 beginseg
     name "ovl_Demo_Kankyo"
     compress
-    include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data1.o"
-    include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data2.o"
-    include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data3.o"
-    include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data4.o"
-    include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data5.o"
-    include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data6.o"
-    include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data7.o"
-    include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data8.o"
+    include "$(BUILD_DIR)/assets/overlays/ovl_Demo_Kankyo/ovl_Demo_Kankyo.o"
     include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.o"
     include "$(BUILD_DIR)/src/overlays/actors/ovl_Demo_Kankyo/ovl_Demo_Kankyo_reloc.o"
 endseg
diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c
index 5518ce754e..910ecdfeae 100644
--- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c
+++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c
@@ -21,6 +21,7 @@
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_efc_star_field/object_efc_star_field.h"
 #include "assets/objects/object_toki_objects/object_toki_objects.h"
+#include "assets/overlays/ovl_Demo_Kankyo/ovl_Demo_Kankyo.h"
 
 #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
                                "ique-cn:128 ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:0 pal-1.1:0"
@@ -48,19 +49,6 @@ void DemoKankyo_DrawLightPlane(Actor* thisx, PlayState* play);
 void DemoKankyo_DrawWarpSparkles(Actor* thisx, PlayState* play);
 void DemoKankyo_DrawSparkles(Actor* thisx, PlayState* play);
 
-// adult warp songs cutscenes
-extern CutsceneData gAdultWarpInCS[];
-extern CutsceneData gAdultWarpOutCS[];
-// adult warp songs cutscenes in temple of time
-extern CutsceneData gAdultWarpInToTCS[];
-extern CutsceneData gAdultWarpOutToTCS[];
-// child warp songs cutscenes
-extern CutsceneData gChildWarpInCS[];
-extern CutsceneData gChildWarpOutCS[];
-// child warp songs cutscenes in temple of time
-extern CutsceneData gChildWarpInToTCS[];
-extern CutsceneData gChildWarpOutToTCS[];
-
 ActorProfile Demo_Kankyo_Profile = {
     /**/ ACTOR_DEMO_KANKYO,
     /**/ ACTORCAT_BG,
diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data1.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data1.c
deleted file mode 100644
index 4e17a4a53c..0000000000
--- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data1.c
+++ /dev/null
@@ -1,24 +0,0 @@
-#include "z64cutscene_commands.h"
-
-// clang-format off
-CutsceneData gAdultWarpInCS[] = {
-    CS_HEADER(2, 164),
-    CS_CAM_EYE_SPLINE_REL_TO_PLAYER(0, 135),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42714CA7, 60.324856f), 31, 79, 59, 0x010F),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42714CA7, 60.324856f), 31, 78, 60, 0x0120),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42714CA7, 60.324856f), 32, 78, 60, 0x0131),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42714CA7, 60.324856f), 30, 79, 59, 0x01F4),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42714CA7, 60.324856f), 30, 78, 60, 0x01F6),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42714CA7, 60.324856f), 30, 78, 60, 0x0207),
-        CS_CAM_POINT(CS_CAM_STOP, 0x00, 0, CS_FLOAT(0x42714CA7, 60.324856f), 30, 78, 60, 0x0000),
-    CS_CAM_AT_SPLINE_REL_TO_PLAYER(0, 164),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42714CA7, 60.324856f), 11, 50, 23, 0x010F),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42714CA7, 60.324856f), 11, 48, 22, 0x0120),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 7, CS_FLOAT(0x42714CA7, 60.324856f), 11, 48, 22, 0x0131),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 7, CS_FLOAT(0x42714CA7, 60.324856f), 57, 101, 21, 0x01F4),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42714CA7, 60.324856f), 57, 101, 21, 0x01F6),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42714CA7, 60.324856f), 57, 101, 21, 0x0207),
-        CS_CAM_POINT(CS_CAM_STOP, 0x00, 30, CS_FLOAT(0x42714CA7, 60.324856f), 57, 101, 21, 0x0000),
-    CS_END_OF_SCRIPT(),
-};
-// clang-format on
diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data2.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data2.c
deleted file mode 100644
index 2a6e3f3e5d..0000000000
--- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data2.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include "z_demo_kankyo.h"
-#include "z64cutscene_commands.h"
-
-// clang-format off
-CutsceneData gAdultWarpOutCS[] = {
-    CS_HEADER(5, 1167),
-    CS_CAM_EYE_SPLINE_REL_TO_PLAYER(0, 1138),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42714CA8, 60.32486f), 31, 82, 61, 0x20BA),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42714CA8, 60.32486f), 31, 82, 61, 0xA1BC),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42714CA8, 60.32486f), 31, 82, 61, 0xA5E1),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42714CA8, 60.32486f), 31, 82, 61, 0xA5CB),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42714CA8, 60.32486f), 31, 82, 61, 0xA5EB),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42714CA8, 60.32486f), 31, 82, 61, 0x20BA),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42714CA8, 60.32486f), 31, 82, 61, 0xA1BC),
-        CS_CAM_POINT(CS_CAM_STOP, 0x00, 0, CS_FLOAT(0x42714CA8, 60.32486f), 31, 82, 61, 0xA5E1),
-    CS_CAM_AT_SPLINE_REL_TO_PLAYER(0, 1167),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42714CA8, 60.32486f), 55, 99, 31, 0x20BA),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42714CA8, 60.32486f), 55, 99, 31, 0xA1BC),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 10, CS_FLOAT(0x42714CA8, 60.32486f), 55, 99, 31, 0xA5E1),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 7, CS_FLOAT(0x42714CA8, 60.32486f), 17, 59, 31, 0xA5CB),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42714CA8, 60.32486f), 17, 59, 31, 0xA5EB),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 1000, CS_FLOAT(0x42714CA8, 60.32486f), 17, 59, 31, 0x20BA),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42714CA8, 60.32486f), 17, 59, 31, 0xA1BC),
-        CS_CAM_POINT(CS_CAM_STOP, 0x00, 30, CS_FLOAT(0x42714CA8, 60.32486f), 17, 59, 31, 0xA5E1),
-    CS_TRANSITION(CS_TRANS_GRAY_FILL_OUT, 36, 46),
-    CS_TRANSITION(CS_TRANS_GRAY_FILL_IN, 30, 35),
-    CS_MISC_LIST(1),
-        CS_MISC(CS_MISC_STOP_CUTSCENE, 95, 97, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFE3, 0xFFFFFFF9, 0x00000000, 0xFFFFFFE3, 0xFFFFFFF9, 0x00000000, 0x00000000, 0x00000000),
-    CS_END_OF_SCRIPT(),
-};
-// clang-format on
diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data3.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data3.c
deleted file mode 100644
index e742384ec2..0000000000
--- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data3.c
+++ /dev/null
@@ -1,25 +0,0 @@
-#include "z_demo_kankyo.h"
-#include "z64cutscene_commands.h"
-
-// clang-format off
-CutsceneData gAdultWarpInToTCS[] = {
-    CS_HEADER(2, 118),
-    CS_CAM_EYE_SPLINE_REL_TO_PLAYER(0, 89),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x428EA647, 71.32476f), 53, 53, 40, 0x010F),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), 53, 53, 40, 0x0120),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), 53, 53, 40, 0x0131),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x428D3328, 70.599915f), 58, 102, 48, 0x01F4),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x428D3328, 70.599915f), 58, 102, 48, 0x01F6),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x428D3328, 70.599915f), 58, 102, 48, 0x0207),
-        CS_CAM_POINT(CS_CAM_STOP, 0x00, 0, CS_FLOAT(0x428D3328, 70.599915f), 58, 102, 48, 0x0047),
-    CS_CAM_AT_SPLINE_REL_TO_PLAYER(0, 118),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 7, CS_FLOAT(0x428D0CAF, 70.52477f), 11, 29, 10, 0x010F),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 7, CS_FLOAT(0x428CCCC2, 70.39992f), 11, 29, 10, 0x0120),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 7, CS_FLOAT(0x428D3328, 70.599915f), 11, 29, 10, 0x0131),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 7, CS_FLOAT(0x428D3328, 70.599915f), 29, 71, 25, 0x01F4),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x428D3328, 70.599915f), 29, 71, 25, 0x01F6),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x428D3328, 70.599915f), 29, 71, 25, 0x0207),
-        CS_CAM_POINT(CS_CAM_STOP, 0x00, 30, CS_FLOAT(0x428D3328, 70.599915f), 29, 71, 25, 0x0047),
-    CS_END_OF_SCRIPT(),
-};
-// clang-format on
diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data4.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data4.c
deleted file mode 100644
index 53f2b5133a..0000000000
--- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data4.c
+++ /dev/null
@@ -1,25 +0,0 @@
-#include "z_demo_kankyo.h"
-#include "z64cutscene_commands.h"
-
-// clang-format off
-CutsceneData gAdultWarpOutToTCS[] = {
-    CS_HEADER(5, 1120),
-    CS_TRANSITION(CS_TRANS_GRAY_FILL_OUT, 36, 46),
-    CS_TRANSITION(CS_TRANS_GRAY_FILL_IN, 30, 35),
-    CS_CAM_EYE_SPLINE_REL_TO_PLAYER(0, 1091),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42714CA8, 60.32486f), 42, 89, 50, 0x0000),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42714CA8, 60.32486f), 42, 89, 50, 0x0000),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42714CA8, 60.32486f), 42, 89, 50, 0x0000),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42714CA8, 60.32486f), 42, 89, 50, 0x0000),
-        CS_CAM_POINT(CS_CAM_STOP, 0x00, 0, CS_FLOAT(0x42714CA8, 60.32486f), 42, 89, 50, 0x29D0),
-    CS_CAM_AT_SPLINE_REL_TO_PLAYER(0, 1120),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42714CA8, 60.32486f), 24, 66, 29, 0x0000),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42714CA8, 60.32486f), 24, 66, 29, 0x0000),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 1000, CS_FLOAT(0x42714CA8, 60.32486f), 24, 66, 29, 0x0000),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42714CA8, 60.32486f), 24, 66, 29, 0x0000),
-        CS_CAM_POINT(CS_CAM_STOP, 0x00, 30, CS_FLOAT(0x42714CA8, 60.32486f), 24, 66, 29, 0x29D0),
-    CS_MISC_LIST(1),
-        CS_MISC(CS_MISC_STOP_CUTSCENE, 95, 96, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFEE, 0xFFFFFFF3, 0x00000000, 0xFFFFFFEE, 0xFFFFFFF3, 0x00000000, 0x00000000, 0x00000000),
-    CS_END_OF_SCRIPT(),
-};
-// clang-format on
diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data5.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data5.c
deleted file mode 100644
index e1092b34dd..0000000000
--- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data5.c
+++ /dev/null
@@ -1,27 +0,0 @@
-#include "z_demo_kankyo.h"
-#include "z64cutscene_commands.h"
-
-// clang-format off
-CutsceneData gChildWarpInCS[] = {
-    CS_HEADER(2, 1164),
-    CS_CAM_EYE_SPLINE_REL_TO_PLAYER(0, 1135),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42714CA7, 60.324856f), 31, 68, 59, 0x010F),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42714CA7, 60.324856f), 32, 68, 60, 0x0120),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42714CA7, 60.324856f), 31, 69, 59, 0x0131),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42714CA7, 60.324856f), 31, 64, 59, 0x01F4),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42714CA7, 60.324856f), 31, 64, 59, 0x01F6),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42714CA7, 60.324856f), 31, 64, 59, 0x0207),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42714CA7, 60.324856f), 31, 64, 59, 0xB46C),
-        CS_CAM_POINT(CS_CAM_STOP, 0x00, 0, CS_FLOAT(0x42714CA7, 60.324856f), 31, 64, 59, 0x05BC),
-    CS_CAM_AT_SPLINE_REL_TO_PLAYER(0, 1164),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42714CA7, 60.324856f), 12, 40, 22, 0x010F),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42714CA7, 60.324856f), 11, 38, 22, 0x0120),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 7, CS_FLOAT(0x42714CA7, 60.324856f), 11, 39, 22, 0x0131),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 7, CS_FLOAT(0x42714CA7, 60.324856f), 57, 86, 21, 0x01F4),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42714CA7, 60.324856f), 57, 86, 21, 0x01F6),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 1000, CS_FLOAT(0x42714CA7, 60.324856f), 57, 86, 21, 0x0207),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42714CA7, 60.324856f), 57, 86, 21, 0xB46C),
-        CS_CAM_POINT(CS_CAM_STOP, 0x00, 30, CS_FLOAT(0x42714CA7, 60.324856f), 57, 86, 21, 0x05BC),
-    CS_END_OF_SCRIPT(),
-};
-// clang-format on
diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data6.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data6.c
deleted file mode 100644
index 9e8a7c6bc6..0000000000
--- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data6.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include "z_demo_kankyo.h"
-#include "z64cutscene_commands.h"
-
-// clang-format off
-CutsceneData gChildWarpOutCS[] = {
-    CS_HEADER(5, 1167),
-    CS_TRANSITION(CS_TRANS_GRAY_FILL_OUT, 36, 46),
-    CS_TRANSITION(CS_TRANS_GRAY_FILL_IN, 30, 35),
-    CS_CAM_EYE_SPLINE_REL_TO_PLAYER(0, 1138),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42714CA8, 60.32486f), 30, 63, 61, 0xA8A5),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42714CA8, 60.32486f), 30, 63, 61, 0xA3D9),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42714CA8, 60.32486f), 30, 63, 61, 0xF3A5),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42714CA9, 60.324863f), 29, 61, 59, 0xA5D5),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42714CA9, 60.324863f), 29, 61, 59, 0xA5E7),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42714CA9, 60.324863f), 29, 61, 59, 0xA5EC),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42714CA9, 60.324863f), 29, 61, 59, 0xBCA5),
-        CS_CAM_POINT(CS_CAM_STOP, 0x00, 0, CS_FLOAT(0x42714CA9, 60.324863f), 29, 61, 59, 0xEEC0),
-    CS_CAM_AT_SPLINE_REL_TO_PLAYER(0, 1167),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42714CA8, 60.32486f), 54, 79, 31, 0xA8A5),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42714CA8, 60.32486f), 54, 80, 31, 0xA3D9),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 10, CS_FLOAT(0x42714CA8, 60.32486f), 54, 79, 31, 0xF3A5),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 7, CS_FLOAT(0x42714CA9, 60.324863f), 15, 42, 30, 0xA5D5),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42714CA9, 60.324863f), 15, 42, 30, 0xA5E7),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 1000, CS_FLOAT(0x42714CA9, 60.324863f), 15, 42, 30, 0xA5EC),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42714CA9, 60.324863f), 15, 42, 30, 0xBCA5),
-        CS_CAM_POINT(CS_CAM_STOP, 0x00, 30, CS_FLOAT(0x42714CA9, 60.324863f), 15, 42, 30, 0xEEC0),
-    CS_MISC_LIST(1),
-        CS_MISC(CS_MISC_STOP_CUTSCENE, 95, 96, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFEF, 0xFFFFFFCD, 0x00000000, 0xFFFFFFEF, 0xFFFFFFCD, 0x00000000, 0x00000000, 0x00000000),
-    CS_END_OF_SCRIPT(),
-};
-// clang-format on
diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data7.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data7.c
deleted file mode 100644
index 3a718366c3..0000000000
--- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data7.c
+++ /dev/null
@@ -1,27 +0,0 @@
-#include "z_demo_kankyo.h"
-#include "z64cutscene_commands.h"
-
-// clang-format off
-CutsceneData gChildWarpInToTCS[] = {
-    CS_HEADER(2, 1118),
-    CS_CAM_EYE_SPLINE_REL_TO_PLAYER(0, 1089),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x428EA647, 71.32476f), 53, 53, 40, 0x010F),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), 53, 53, 40, 0x0120),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), 53, 53, 40, 0x0131),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x428D3328, 70.599915f), 58, 89, 47, 0x01F4),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x428D3328, 70.599915f), 58, 89, 47, 0x01F6),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x428D3328, 70.599915f), 58, 89, 47, 0x0207),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x428D3328, 70.599915f), 58, 89, 47, 0x0000),
-        CS_CAM_POINT(CS_CAM_STOP, 0x00, 0, CS_FLOAT(0x428D3328, 70.599915f), 58, 89, 47, 0x0000),
-    CS_CAM_AT_SPLINE_REL_TO_PLAYER(0, 1118),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 7, CS_FLOAT(0x428D0CAF, 70.52477f), 11, 29, 10, 0x010F),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 7, CS_FLOAT(0x428CCCC2, 70.39992f), 11, 29, 10, 0x0120),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 7, CS_FLOAT(0x428D3328, 70.599915f), 11, 29, 10, 0x0131),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 7, CS_FLOAT(0x428D3328, 70.599915f), 29, 58, 25, 0x01F4),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x428D3328, 70.599915f), 29, 58, 25, 0x01F6),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 1000, CS_FLOAT(0x428D3328, 70.599915f), 29, 58, 25, 0x0207),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x428D3328, 70.599915f), 29, 58, 25, 0x0000),
-        CS_CAM_POINT(CS_CAM_STOP, 0x00, 30, CS_FLOAT(0x428D3328, 70.599915f), 29, 58, 25, 0x0000),
-    CS_END_OF_SCRIPT(),
-};
-// clang-format on
diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data8.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data8.c
deleted file mode 100644
index 84e12ec7a8..0000000000
--- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data8.c
+++ /dev/null
@@ -1,25 +0,0 @@
-#include "z_demo_kankyo.h"
-#include "z64cutscene_commands.h"
-
-// clang-format off
-CutsceneData gChildWarpOutToTCS[] = {
-    CS_HEADER(5, 1120),
-    CS_TRANSITION(CS_TRANS_GRAY_FILL_OUT, 36, 46),
-    CS_TRANSITION(CS_TRANS_GRAY_FILL_IN, 30, 35),
-    CS_CAM_EYE_SPLINE_REL_TO_PLAYER(0, 1091),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42714CAA, 60.324867f), 41, 75, 49, 0x1F1C),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42714CAA, 60.324867f), 41, 75, 49, 0x1F8C),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42714CAA, 60.324867f), 41, 75, 49, 0x1FFC),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42714CAA, 60.324867f), 41, 75, 49, 0x206C),
-        CS_CAM_POINT(CS_CAM_STOP, 0x00, 0, CS_FLOAT(0x42714CAA, 60.324867f), 41, 75, 49, 0x20DC),
-    CS_CAM_AT_SPLINE_REL_TO_PLAYER(0, 1120),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42714CAA, 60.324867f), 24, 52, 29, 0x1F1C),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42714CAA, 60.324867f), 24, 52, 29, 0x1F8C),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 1000, CS_FLOAT(0x42714CAA, 60.324867f), 24, 52, 29, 0x1FFC),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42714CAA, 60.324867f), 24, 52, 29, 0x206C),
-        CS_CAM_POINT(CS_CAM_STOP, 0x00, 30, CS_FLOAT(0x42714CAA, 60.324867f), 24, 52, 29, 0x20DC),
-    CS_MISC_LIST(1),
-        CS_MISC(CS_MISC_STOP_CUTSCENE, 95, 96, 0x0000, 0x00000000, 0x00000000, 0xFFFFFFDF, 0x00000019, 0x00000000, 0xFFFFFFDF, 0x00000019, 0x00000000, 0x00000000, 0x00000000),
-    CS_END_OF_SCRIPT(),
-};
-// clang-format on
diff --git a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c
index 5c60653b4e..626386f48a 100644
--- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c
+++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c
@@ -20,6 +20,7 @@
 #include "z64save.h"
 
 #include "assets/objects/object_zl1/object_zl1.h"
+#include "assets/overlays/ovl_En_Zl1/ovl_En_Zl1.h"
 
 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED)
 
@@ -37,8 +38,6 @@ void func_80B4BBC4(EnZl1* this, PlayState* play);
 void func_80B4BC78(EnZl1* this, PlayState* play);
 void func_80B4BF2C(EnZl1* this, PlayState* play);
 
-extern CutsceneData gTriforceCreationStartCs[];
-
 #include "z_en_zl1_camera_data.inc.c"
 
 ActorProfile En_Zl1_Profile = {
diff --git a/src/overlays/actors/ovl_En_Zl1/z_en_zl1_cutscene_data.c b/src/overlays/actors/ovl_En_Zl1/z_en_zl1_cutscene_data.c
deleted file mode 100644
index 4a8622cbba..0000000000
--- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1_cutscene_data.c
+++ /dev/null
@@ -1,249 +0,0 @@
-#include "sequence.h"
-#include "z64cutscene_commands.h"
-#include "z64player.h"
-
-// clang-format off
-CutsceneData gTriforceCreationStartCs[] = {
-    CS_HEADER(28, 3000),
-    CS_PLAYER_CUE_LIST(3),
-        CS_PLAYER_CUE(PLAYER_CUEID_5, 400, 1211, 0x0000, 0xC000, 0x0000, -422, 84, 1, -422, 84, 1, CS_FLOAT(0xF6484E4, 1.1266862e-29f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x1, 1e-45f)),
-        CS_PLAYER_CUE(PLAYER_CUEID_1, 1211, 1241, 0x0000, 0xC000, 0x0000, -422, 84, 1, -483, 84, 0, CS_FLOAT(0xF6484E4, 1.1266862e-29f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x1, 1e-45f)),
-        CS_PLAYER_CUE(PLAYER_CUEID_41, 1241, 1311, 0x0000, 0xC000, 0x0000, -483, 84, 0, -483, 84, 0, CS_FLOAT(0xF6484E4, 1.1266862e-29f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x1, 1e-45f)),
-    CS_ACTOR_CUE_LIST(CS_CMD_ACTOR_CUE_0_2, 1),
-        CS_ACTOR_CUE(0x0007, 1170, 1316, 0x7477, 0x0000, 0x0000, -485, 84, 0, -469, 85, -55, CS_FLOAT(0x3DE07038, 0.10958904f), CS_FLOAT(0x3BE07038, 0.006849315f), CS_FLOAT(0xBDE07038, -0.10958904f)),
-    CS_UNK_DATA_LIST(0x00000049, 1),
-        CS_UNK_DATA(0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0xFFFFFFE8, 0x00000003, 0x00000000, 0xFFFFFFE8, 0x00000003, 0x00000000, 0x00000000, 0x00000000),
-    CS_ACTOR_CUE_LIST(CS_CMD_ACTOR_CUE_1_1, 3),
-        CS_ACTOR_CUE(0x0009, 1220, 1310, 0x8000, 0x0000, 0x0000, -890, 90, 150, -890, 90, 0, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)),
-        CS_ACTOR_CUE(0x000A, 1310, 1449, 0x0000, 0x0000, 0x0000, -890, 90, 0, -890, 90, 0, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)),
-        CS_ACTOR_CUE(0x0004, 1449, 1457, 0x0000, 0x0000, 0x0000, -890, 90, 0, -890, 90, 0, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)),
-    CS_MISC_LIST(1),
-        CS_MISC(CS_MISC_STOP_CUTSCENE, 1460, 1461, 0x0000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000002, 0xFFFFFFFF, 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000000),
-    CS_ACTOR_CUE_LIST(CS_CMD_ACTOR_CUE_3_0, 1),
-        CS_ACTOR_CUE(0x0002, 330, 763, 0x0000, 0x0000, 0x0000, -1250, 150, 0, -1250, 150, 0, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)),
-    CS_TRANSITION(CS_TRANS_GRAY_FILL_IN, 200, 231),
-    CS_TRANSITION(CS_TRANS_GRAY_FILL_OUT, 230, 271),
-    CS_TRANSITION(CS_TRANS_GRAY_FILL_IN, 860, 870),
-    CS_TRANSITION(CS_TRANS_GRAY_FILL_OUT, 875, 900),
-    CS_CAM_EYE_SPLINE(0, 331),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42733334, 60.800003f), -447, 128, 1, 0x2031),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42733334, 60.800003f), -447, 128, 1, 0x3533),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42733334, 60.800003f), -447, 128, 1, 0x3833),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42733334, 60.800003f), -447, 128, 1, 0x2C20),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42733334, 60.800003f), -392, 145, 1, 0x2032),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42733334, 60.800003f), -318, 168, 1, 0x3533),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42733334, 60.800003f), -222, 198, 1, 0x3639),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42733334, 60.800003f), -146, 221, 1, 0x392C),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42733334, 60.800003f), -132, 222, 1, 0x2032),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42733334, 60.800003f), -66, 267, 1, 0x3632),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42733334, 60.800003f), -66, 267, 1, 0x3639),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42733334, 60.800003f), -66, 267, 1, 0x392C),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42733334, 60.800003f), -66, 267, 1, 0x2031),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42733334, 60.800003f), -66, 267, 1, 0x3533),
-        CS_CAM_POINT(CS_CAM_STOP, 0x00, 0, CS_FLOAT(0x42733334, 60.800003f), -66, 267, 1, 0x3336),
-    CS_CAM_EYE_SPLINE(230, 1631),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), -1220, 445, 24, 0x2031),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), -1220, 445, 24, 0x3533),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), -1220, 445, 24, 0x3833),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), -1220, 445, 24, 0x2C20),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), -1220, 445, 24, 0x2032),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), -1220, 445, 24, 0x3533),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), -1220, 445, 24, 0x3639),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), -1220, 445, 24, 0x392C),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), -1220, 445, 24, 0x2032),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), -1220, 259, 24, 0x3632),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), -1220, 189, 24, 0x3639),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), -1135, 198, 81, 0x392C),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), -1132, 119, 84, 0x2031),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42726667, 60.600002f), -1199, 137, 36, 0x3533),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42726667, 60.600002f), -1218, 127, 22, 0x3336),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42726667, 60.600002f), -1218, 127, 22, 0x332C),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42726667, 60.600002f), -1218, 127, 22, 0x2032),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42726667, 60.600002f), -1218, 127, 22, 0x3231),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42726667, 60.600002f), -1218, 127, 22, 0x3232),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42726667, 60.600002f), -1218, 127, 22, 0x392C),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42726667, 60.600002f), -1218, 127, 22, 0x2034),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42726667, 60.600002f), -1218, 127, 22, 0x3331),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42726667, 60.600002f), -1218, 127, 22, 0x3434),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42726667, 60.600002f), -1218, 127, 22, 0x312C),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42726667, 60.600002f), -1218, 127, 22, 0x2032),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42726667, 60.600002f), -1218, 127, 22, 0x3136),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42726667, 60.600002f), -1218, 127, 22, 0x3336),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42726667, 60.600002f), -1218, 127, 22, 0x332C),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42726667, 60.600002f), -1218, 127, 22, 0x200A),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42726667, 60.600002f), -1218, 127, 22, 0x3136),
-        CS_CAM_POINT(CS_CAM_STOP, 0x00, 0, CS_FLOAT(0x42726667, 60.600002f), -1218, 127, 22, 0x3336),
-    CS_CAM_EYE_SPLINE(810, 1041),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42726668, 60.600006f), -1218, 127, 22, 0x2031),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42726668, 60.600006f), -1218, 127, 22, 0x3533),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42726668, 60.600006f), -1218, 127, 22, 0x3833),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42726668, 60.600006f), -1218, 88, 21, 0x2C20),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42726668, 60.600006f), -1208, -52, 23, 0x2032),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42726668, 60.600006f), -1201, -114, 26, 0x3533),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42726668, 60.600006f), -1201, -114, 26, 0x3639),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42726668, 60.600006f), -1201, -114, 26, 0x392C),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42726668, 60.600006f), -1201, -114, 26, 0x2032),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42726668, 60.600006f), -1201, -114, 26, 0x3632),
-        CS_CAM_POINT(CS_CAM_STOP, 0x00, 0, CS_FLOAT(0x42726668, 60.600006f), -1201, -114, 26, 0x3639),
-    CS_CAM_EYE_SPLINE(870, 1261),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42A08C84, 80.274445f), -59, 160, 320, 0x2031),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42704C78, 60.074677f), -59, 160, 320, 0x3533),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42704C78, 60.074677f), -59, 160, 320, 0x3833),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42704C78, 60.074677f), -59, 160, 320, 0x2C20),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42704C78, 60.074677f), -115, 148, 249, 0x2032),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42704C78, 60.074677f), -190, 126, 192, 0x3533),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42704C78, 60.074677f), -286, 105, 135, 0x3639),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42704C78, 60.074677f), -357, 108, 87, 0x392C),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42704C78, 60.074677f), -394, 104, 53, 0x2032),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42704C78, 60.074677f), -394, 104, 53, 0x3632),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42704C78, 60.074677f), -394, 104, 53, 0x3639),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42704C78, 60.074677f), -394, 104, 53, 0x392C),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42704C78, 60.074677f), -394, 104, 53, 0x2031),
-        CS_CAM_POINT(CS_CAM_STOP, 0x00, 0, CS_FLOAT(0x42704C78, 60.074677f), -394, 104, 53, 0x3533),
-    CS_CAM_EYE_SPLINE(1160, 1401),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), -459, 175, 80, 0x2031),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), -459, 175, 80, 0x3533),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), -459, 175, 80, 0x3833),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), -459, 175, 80, 0x2C20),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), -459, 175, 80, 0x2032),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), -459, 175, 80, 0x3533),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), -459, 175, 80, 0x3639),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), -459, 175, 80, 0x392C),
-        CS_CAM_POINT(CS_CAM_STOP, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), -459, 175, 80, 0x2032),
-    CS_CAM_EYE_SPLINE(1260, 1411),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x4234CCBE, 45.199944f), -461, 133, 0, 0x2031),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x4234CCBE, 45.199944f), -461, 133, 0, 0x3533),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x4234CCBE, 45.199944f), -461, 133, 0, 0x3833),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x4234CCBE, 45.199944f), -461, 133, 0, 0x2C20),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x4234CCBE, 45.199944f), -461, 133, 0, 0x2032),
-        CS_CAM_POINT(CS_CAM_STOP, 0x00, 0, CS_FLOAT(0x4234CCBE, 45.199944f), -461, 133, 0, 0x3533),
-    CS_CAM_EYE_SPLINE(1320, 1531),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x412FFF56, 10.999838f), -488, 124, -6, 0x2031),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x412FFF56, 10.999838f), -488, 124, -6, 0x3533),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x412FFF56, 10.999838f), -488, 124, -6, 0x3833),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x412FFF56, 10.999838f), -488, 124, -6, 0x2C20),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x412FFF56, 10.999838f), -488, 124, -6, 0x2032),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x412FFF56, 10.999838f), -488, 124, -6, 0x3533),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x412FFF56, 10.999838f), -488, 124, -6, 0x3639),
-        CS_CAM_POINT(CS_CAM_STOP, 0x00, 0, CS_FLOAT(0x412FFF56, 10.999838f), -488, 124, -6, 0x392C),
-    CS_CAM_AT_SPLINE(0, 360),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42726667, 60.600002f), -506, 110, 1, 0x2031),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42733334, 60.800003f), -506, 110, 1, 0x3533),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42733334, 60.800003f), -506, 110, 1, 0x3833),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42733334, 60.800003f), -506, 110, 1, 0x2C20),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 25, CS_FLOAT(0x42733334, 60.800003f), -451, 127, 1, 0x2032),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 25, CS_FLOAT(0x42733334, 60.800003f), -380, 149, 1, 0x3533),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 20, CS_FLOAT(0x42733334, 60.800003f), -291, 177, 1, 0x3639),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 20, CS_FLOAT(0x42733334, 60.800003f), -224, 210, 1, 0x392C),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 20, CS_FLOAT(0x42733334, 60.800003f), -213, 230, 1, 0x2032),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 20, CS_FLOAT(0x42733334, 60.800003f), -143, 291, 1, 0x3632),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 20, CS_FLOAT(0x42733334, 60.800003f), -135, 308, 1, 0x3639),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 20, CS_FLOAT(0x42733334, 60.800003f), -127, 319, 1, 0x392C),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 20, CS_FLOAT(0x42733334, 60.800003f), -120, 326, 1, 0x2031),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 20, CS_FLOAT(0x42733334, 60.800003f), -120, 326, 1, 0x3533),
-        CS_CAM_POINT(CS_CAM_STOP, 0x00, 30, CS_FLOAT(0x42733334, 60.800003f), -120, 326, 1, 0x3336),
-    CS_CAM_AT_SPLINE(230, 1710),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), -1246, 413, 5, 0x2031),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), -1246, 413, 5, 0x3533),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), -1246, 413, 5, 0x3833),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), -1246, 413, 5, 0x2C20),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), -1246, 413, 5, 0x2032),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), -1246, 413, 5, 0x3533),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), -1246, 413, 5, 0x3639),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), -1246, 413, 5, 0x392C),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), -1246, 413, 5, 0x2032),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), -1245, 227, 5, 0x3632),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), -1245, 158, 5, 0x3639),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), -1180, 178, 50, 0x392C),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 80, CS_FLOAT(0x42700000, 60.0f), -1178, 131, 51, 0x2031),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 80, CS_FLOAT(0x42726667, 60.600002f), -1240, 146, 6, 0x3533),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42726667, 60.600002f), -1253, 153, -3, 0x3336),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42726667, 60.600002f), -1253, 153, -3, 0x332C),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42726667, 60.600002f), -1253, 153, -3, 0x2032),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42726667, 60.600002f), -1253, 153, -3, 0x3231),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42726667, 60.600002f), -1253, 153, -3, 0x3232),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42726667, 60.600002f), -1252, 152, -2, 0x392C),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42726667, 60.600002f), -1252, 152, -2, 0x2034),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 80, CS_FLOAT(0x42726667, 60.600002f), -1252, 152, -2, 0x3331),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 80, CS_FLOAT(0x42726667, 60.600002f), -1252, 152, -2, 0x3434),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 80, CS_FLOAT(0x42726667, 60.600002f), -1252, 152, -2, 0x312C),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 80, CS_FLOAT(0x42726667, 60.600002f), -1251, 151, -1, 0x2032),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 80, CS_FLOAT(0x42726667, 60.600002f), -1251, 151, -1, 0x3136),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 80, CS_FLOAT(0x42726667, 60.600002f), -1251, 151, -1, 0x3336),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 80, CS_FLOAT(0x42726667, 60.600002f), -1251, 151, -1, 0x332C),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 80, CS_FLOAT(0x42726667, 60.600002f), -1251, 151, -1, 0x200A),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42726667, 60.600002f), -1251, 151, -1, 0x3136),
-        CS_CAM_POINT(CS_CAM_STOP, 0x00, 80, CS_FLOAT(0x42726667, 60.600002f), -1251, 151, -1, 0x3336),
-    CS_CAM_AT_SPLINE(810, 1070),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42726668, 60.600006f), -1251, 151, -1, 0x2031),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42726668, 60.600006f), -1251, 151, -1, 0x3533),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 20, CS_FLOAT(0x42726668, 60.600006f), -1250, 150, 0, 0x3833),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 10, CS_FLOAT(0x42726668, 60.600006f), -1241, 125, 5, 0x2C20),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 10, CS_FLOAT(0x42726668, 60.600006f), -1226, -13, 10, 0x2032),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 10, CS_FLOAT(0x42726668, 60.600006f), -1218, -73, 26, 0x3533),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42726668, 60.600006f), -1218, -73, 26, 0x3639),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42726668, 60.600006f), -1218, -73, 26, 0x392C),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42726668, 60.600006f), -1218, -73, 26, 0x2032),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42726668, 60.600006f), -1218, -73, 26, 0x3632),
-        CS_CAM_POINT(CS_CAM_STOP, 0x00, 30, CS_FLOAT(0x42726668, 60.600006f), -1218, -73, 26, 0x3639),
-    CS_CAM_AT_SPLINE(870, 1290),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42704C78, 60.074677f), -45, 240, 241, 0x2031),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42704C78, 60.074677f), -45, 240, 241, 0x3533),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42704C78, 60.074677f), -56, 219, 224, 0x3833),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42704C78, 60.074677f), -85, 183, 212, 0x2C20),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42704C78, 60.074677f), -204, 134, 183, 0x2032),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42704C78, 60.074677f), -280, 116, 125, 0x3533),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42704C78, 60.074677f), -376, 104, 69, 0x3639),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42704C78, 60.074677f), -440, 107, 13, 0x392C),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42704C78, 60.074677f), -467, 110, -25, 0x2032),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42704C78, 60.074677f), -467, 110, -25, 0x3632),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42704C78, 60.074677f), -467, 110, -25, 0x3639),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42704C78, 60.074677f), -467, 110, -25, 0x392C),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42704C78, 60.074677f), -467, 110, -25, 0x2031),
-        CS_CAM_POINT(CS_CAM_STOP, 0x00, 30, CS_FLOAT(0x42704C78, 60.074677f), -467, 110, -25, 0x3533),
-    CS_CAM_AT_SPLINE(1160, 1430),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), -456, 138, 16, 0x2031),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), -456, 138, 16, 0x3533),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), -456, 138, 16, 0x3833),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), -456, 138, 16, 0x2C20),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), -456, 138, 16, 0x2032),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), -456, 138, 16, 0x3533),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), -456, 138, 16, 0x3639),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), -456, 138, 16, 0x392C),
-        CS_CAM_POINT(CS_CAM_STOP, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), -456, 138, 16, 0x2032),
-    CS_CAM_AT_SPLINE(1260, 1440),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x4234CCBE, 45.199944f), -535, 133, 0, 0x2031),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x4234CCBE, 45.199944f), -535, 133, 0, 0x3533),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x4234CCBE, 45.199944f), -535, 133, 0, 0x3833),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x4234CCBE, 45.199944f), -535, 133, 0, 0x2C20),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x4234CCBE, 45.199944f), -535, 133, 0, 0x2032),
-        CS_CAM_POINT(CS_CAM_STOP, 0x00, 30, CS_FLOAT(0x4234CCBE, 45.199944f), -535, 133, 0, 0x3533),
-    CS_CAM_AT_SPLINE(1320, 1560),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x412FFF56, 10.999838f), -1349, 124, -6, 0x2031),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x412FFF56, 10.999838f), -1349, 124, -6, 0x3533),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x412FFF56, 10.999838f), -1349, 124, -6, 0x3833),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x412FFF56, 10.999838f), -1349, 124, -6, 0x2C20),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x412FFF56, 10.999838f), -1349, 124, -6, 0x2032),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x412FFF56, 10.999838f), -1349, 124, -6, 0x3533),
-        CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x412FFF56, 10.999838f), -1349, 124, -6, 0x3639),
-        CS_CAM_POINT(CS_CAM_STOP, 0x00, 30, CS_FLOAT(0x412FFF56, 10.999838f), -1349, 124, -6, 0x392C),
-    CS_TEXT_LIST(10),
-        CS_TEXT_NONE(0, 50),
-        CS_TEXT(0x7035, 50, 190, CS_TEXT_NORMAL, 0xFFFF, 0xFFFF),
-        CS_TEXT_NONE(190, 300),
-        CS_TEXT(0x7036, 300, 800, CS_TEXT_NORMAL, 0xFFFF, 0xFFFF),
-        CS_TEXT_NONE(800, 970),
-        CS_TEXT(0x7037, 970, 1150, CS_TEXT_NORMAL, 0xFFFF, 0x7038),
-        CS_TEXT_NONE(1150, 1190),
-        CS_TEXT(0x7005, 1190, 1200, CS_TEXT_NORMAL, 0xFFFF, 0x700B),
-        CS_TEXT_NONE(1200, 1340),
-        CS_TEXT(0x7009, 1340, 1420, CS_TEXT_NORMAL, 0xFFFF, 0xFFFF),
-    CS_START_SEQ_LIST(1),
-        CS_START_SEQ(NA_BGM_HYRULE_CS, 230, 231, 0x0000, 0x00000000, 0x00000003, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000000),
-    CS_START_SEQ_LIST(1),
-        CS_START_SEQ(NA_BGM_ZELDA_THEME, 870, 871, 0x0000, 0x00000000, 0xFFFFFFFE, 0x00000000, 0xFFFFFFFD, 0xFFFFFFFE, 0x00000000, 0xFFFFFFFD),
-    CS_STOP_SEQ_LIST(1),
-        CS_STOP_SEQ(NA_BGM_GENERAL_SFX, 110, 111, 0x0000, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000001, 0xFFFFFFFE, 0x00000000, 0x00000001),
-    CS_END_OF_SCRIPT(),
-};
-// clang-format on
diff --git a/tools/assets/extract/extract_xml_z64.py b/tools/assets/extract/extract_xml_z64.py
index 79756908fa..c896868e6b 100644
--- a/tools/assets/extract/extract_xml_z64.py
+++ b/tools/assets/extract/extract_xml_z64.py
@@ -88,7 +88,11 @@ def create_file_resources(rescoll: ResourcesDescCollection, file: File):
         # probably instead rework the "c declaration" system into a more opaque object
         # not that this is really a required long term feature as it's only relevant
         # for writing the source files (main .c/.h), not extracting
-        if file.name.startswith("ovl_") and file.name != "ovl_file_choose":
+        if file.name.startswith("ovl_") and file.name not in {
+            "ovl_Demo_Kankyo",
+            "ovl_En_Zl1",
+            "ovl_file_choose",
+        }:
             resource.HACK_IS_STATIC_ON = ...
 
         file.add_resource(resource)
diff --git a/tools/assets/extract/write_source.txt b/tools/assets/extract/write_source.txt
index 66725e67d4..4e4e1ca518 100644
--- a/tools/assets/extract/write_source.txt
+++ b/tools/assets/extract/write_source.txt
@@ -391,6 +391,7 @@ assets/overlays/ovl_Boss_Dodongo/ovl_Boss_Dodongo.c
 assets/overlays/ovl_Boss_Ganon2/ovl_Boss_Ganon2.c
 assets/overlays/ovl_Boss_Ganon/ovl_Boss_Ganon.c
 assets/overlays/ovl_Boss_Sst/ovl_Boss_Sst.c
+assets/overlays/ovl_Demo_Kankyo/ovl_Demo_Kankyo.c
 assets/overlays/ovl_Demo_Shd/ovl_Demo_Shd.c
 assets/overlays/ovl_Effect_Ss_Fhg_Flash/ovl_Effect_Ss_Fhg_Flash.c
 assets/overlays/ovl_Elf_Msg2/ovl_Elf_Msg2.c
@@ -408,6 +409,7 @@ assets/overlays/ovl_En_Sda/ovl_En_Sda.c
 assets/overlays/ovl_En_Ssh/ovl_En_Ssh.c
 assets/overlays/ovl_En_Sth/ovl_En_Sth.c
 assets/overlays/ovl_En_St/ovl_En_St.c
+assets/overlays/ovl_En_Zl1/ovl_En_Zl1.c
 assets/overlays/ovl_file_choose/ovl_file_choose.c
 assets/overlays/ovl_Magic_Dark/ovl_Magic_Dark.c
 assets/overlays/ovl_Magic_Fire/ovl_Magic_Fire.c