diff --git a/assets/yaml/us/ast_allies.yaml b/assets/yaml/us/ast_allies.yaml
index 671cf9f5..5dbe20b7 100644
--- a/assets/yaml/us/ast_allies.yaml
+++ b/assets/yaml/us/ast_allies.yaml
@@ -1,6 +1,6 @@
 :config:
   segments:
-    seg13: 0x955270
+    - [0x0D, 0x955270]
   header:
     code:
       - '#include "assets/ast_allies.h"'
diff --git a/assets/yaml/us/ast_bg_planet.yaml b/assets/yaml/us/ast_bg_planet.yaml
index 69a619d8..5e011ba5 100644
--- a/assets/yaml/us/ast_bg_planet.yaml
+++ b/assets/yaml/us/ast_bg_planet.yaml
@@ -1,6 +1,6 @@
 :config:
   segments:
-    seg2: 0x8AE0A0
+    - [0x02, 0x8AE0A0]
   header:
     code:
       - '#include "assets/ast_bg_planet.h"'
diff --git a/assets/yaml/us/ast_bg_space.yaml b/assets/yaml/us/ast_bg_space.yaml
index 4793f806..b3c23fe6 100644
--- a/assets/yaml/us/ast_bg_space.yaml
+++ b/assets/yaml/us/ast_bg_space.yaml
@@ -1,6 +1,6 @@
 :config:
   segments:
-    seg2: 0x8A68C0
+    - [0x02, 0x8A68C0]
   header:
     code:
       - '#include "assets/ast_bg_space.h"'
diff --git a/assets/yaml/us/ast_blue_marine.yaml b/assets/yaml/us/ast_blue_marine.yaml
index 77c6c687..b445660f 100644
--- a/assets/yaml/us/ast_blue_marine.yaml
+++ b/assets/yaml/us/ast_blue_marine.yaml
@@ -1,6 +1,6 @@
 :config:
   segments:
-    seg3: 0x8E1F80
+    - [0x03, 0x8E1F80]
   header:
     code:
       - '#include "assets/ast_blue_marine.h"'
diff --git a/assets/yaml/us/ast_ending_award_back.yaml b/assets/yaml/us/ast_ending_award_back.yaml
index 0ec750f3..2fd23278 100644
--- a/assets/yaml/us/ast_ending_award_back.yaml
+++ b/assets/yaml/us/ast_ending_award_back.yaml
@@ -1,6 +1,6 @@
 :config:
   segments:
-    seg8: 0xD68480
+    - [0x08, 0xD68480]
   header:
     code:
       - '#include "assets/ast_ending_award_back.h"'
diff --git a/assets/yaml/us/ast_ending_award_front.yaml b/assets/yaml/us/ast_ending_award_front.yaml
index 4cd5f018..0f8ac3ef 100644
--- a/assets/yaml/us/ast_ending_award_front.yaml
+++ b/assets/yaml/us/ast_ending_award_front.yaml
@@ -1,6 +1,6 @@
 :config:
   segments:
-    seg8: 0xD43400
+    - [0x08, 0xD43400]
   header:
     code:
       - '#include "assets/ast_ending_award_front.h"'
diff --git a/assets/yaml/us/ast_ending_expert.yaml b/assets/yaml/us/ast_ending_expert.yaml
index 1357e60e..f0458247 100644
--- a/assets/yaml/us/ast_ending_expert.yaml
+++ b/assets/yaml/us/ast_ending_expert.yaml
@@ -1,6 +1,6 @@
 :config:
   segments:
-    seg8: 0xD91F10
+    - [0x08, 0xD91F10]
   header:
     code:
       - '#include "assets/ast_ending_expert.h"'
diff --git a/assets/yaml/us/ast_font.yaml b/assets/yaml/us/ast_font.yaml
index 855a9192..5a266b25 100644
--- a/assets/yaml/us/ast_font.yaml
+++ b/assets/yaml/us/ast_font.yaml
@@ -1,6 +1,6 @@
 :config:
   segments:
-    seg5: 0xCD2410
+    - [0x05, 0xCD2410]
   header:
     code:
       - '#include "assets/ast_font.h"'
diff --git a/assets/yaml/us/ast_logo.yml b/assets/yaml/us/ast_logo.yml
index 0792954a..bbe5d5c7 100644
--- a/assets/yaml/us/ast_logo.yml
+++ b/assets/yaml/us/ast_logo.yml
@@ -1,6 +1,6 @@
 :config:
   segments:
-    seg15: 0xD25100
+    - [0x0F, 0xD25100]
   header:
     code:
       - '#include "assets/ast_logo.h"'
diff --git a/assets/yaml/us/ast_warp_zone.yaml b/assets/yaml/us/ast_warp_zone.yaml
index 083bb5f0..f5c38302 100644
--- a/assets/yaml/us/ast_warp_zone.yaml
+++ b/assets/yaml/us/ast_warp_zone.yaml
@@ -1,6 +1,6 @@
 :config:
   segments:
-    seg7: 0xBFA740
+    - [0x07, 0xBFA740]
   header:
     code:
       - '#include "assets/ast_warp_zone.h"'
diff --git a/tools/Torch b/tools/Torch
index cfd2ec35..f06ed738 160000
--- a/tools/Torch
+++ b/tools/Torch
@@ -1 +1 @@
-Subproject commit cfd2ec35ce03a36c10b005b952f765f035c8b836
+Subproject commit f06ed7388df76f09d8fbda765acea5d2923553d4