Update lus (#16)

* Updates

4 files changed, 86 insertions, 9 deletions

diff --git a/yamls/us/common_data.yml b/yamls/us/common_data.yml
index 1e11151b5..8a90d43bf 100644
--- a/yamls/us/common_data.yml
+++ b/yamls/us/common_data.yml
@@ -47,7 +47,6 @@ common_tlut_finish_line_banner:
   type: texture
   ctype: u16
   offset: 0x0
-  size: 0x200
   width: 16
   height: 16
   format: RGBA16
diff --git a/yamls/us/data_segment2.yml b/yamls/us/data_segment2.yml
index d07c2f3b1..c998b2392 100644
--- a/yamls/us/data_segment2.yml
+++ b/yamls/us/data_segment2.yml
@@ -1,4 +1,7 @@
 :config:
+  external_files:
+    - "yamls/us\\startup_logo.yml"
+    - "yamls/us\\common_data.yml"
   segments:
     - [0x02, 0x12AAE0]
     - [0x0D, 0x132B50]
diff --git a/yamls/us/mario_raceway_data.yml b/yamls/us/mario_raceway_data.yml
index 83b13ee51..c536ad684 100644
--- a/yamls/us/mario_raceway_data.yml
+++ b/yamls/us/mario_raceway_data.yml
@@ -1,6 +1,7 @@
 :config:
   segments:
     - [0x06, 0x8284D0]
+    - [0x07, 0x800000]
   header:
     code:
       - '#include <libultraship.h>'
@@ -8,287 +9,352 @@
       - '#include <libultraship.h>'
       - '#include <libultra/gbi.h>'
       - '#include <align_asset_macro.h>'
-d_course_mario_raceway_vertex:
-  symbol: d_course_mario_raceway_data
-  type: blob
-  size: 0x13AD6
-  offset: 0x0
+    references_packed_displaylists: true
 d_course_mario_raceway_dl_0:
   symbol: d_course_mario_raceway_dl_0
   type: gfx
   offset: 0x0
+  otr_mode: index
 d_course_mario_raceway_dl_E8:
   symbol: d_course_mario_raceway_dl_E8
   type: gfx
   offset: 0xE8
+  otr_mode: index
 d_course_mario_raceway_dl_1D0:
   symbol: d_course_mario_raceway_dl_1D0
   type: gfx
   offset: 0x1D0
+  otr_mode: index
 d_course_mario_raceway_dl_2C8:
   symbol: d_course_mario_raceway_dl_2C8
   type: gfx
   offset: 0x2C8
+  otr_mode: index
 d_course_mario_raceway_dl_3A8:
   symbol: d_course_mario_raceway_dl_3A8
   type: gfx
   offset: 0x3A8
+  otr_mode: index
 d_course_mario_raceway_dl_478:
   symbol: d_course_mario_raceway_dl_478
   type: gfx
   offset: 0x478
+  otr_mode: index
 d_course_mario_raceway_dl_568:
   symbol: d_course_mario_raceway_dl_568
   type: gfx
   offset: 0x568
+  otr_mode: index
 d_course_mario_raceway_dl_668:
   symbol: d_course_mario_raceway_dl_668
   type: gfx
   offset: 0x668
+  otr_mode: index
 d_course_mario_raceway_dl_750:
   symbol: d_course_mario_raceway_dl_750
   type: gfx
   offset: 0x750
+  otr_mode: index
 d_course_mario_raceway_dl_828:
   symbol: d_course_mario_raceway_dl_828
   type: gfx
   offset: 0x828
+  otr_mode: index
 d_course_mario_raceway_dl_928:
   symbol: d_course_mario_raceway_dl_928
   type: gfx
   offset: 0x928
+  otr_mode: index
 d_course_mario_raceway_dl_A00:
   symbol: d_course_mario_raceway_dl_A00
   type: gfx
   offset: 0xA00
+  otr_mode: index
 d_course_mario_raceway_dl_B08:
   symbol: d_course_mario_raceway_dl_B08
   type: gfx
   offset: 0xB08
+  otr_mode: index
 d_course_mario_raceway_dl_C20:
   symbol: d_course_mario_raceway_dl_C20
   type: gfx
   offset: 0xC20
+  otr_mode: index
 d_course_mario_raceway_dl_DC8:
   symbol: d_course_mario_raceway_dl_DC8
   type: gfx
   offset: 0xDC8
+  otr_mode: index
 d_course_mario_raceway_dl_F60:
   symbol: d_course_mario_raceway_dl_F60
   type: gfx
   offset: 0xF60
+  otr_mode: index
 d_course_mario_raceway_dl_10A8:
   symbol: d_course_mario_raceway_dl_10A8
   type: gfx
   offset: 0x10A8
+  otr_mode: index
 d_course_mario_raceway_dl_1210:
   symbol: d_course_mario_raceway_dl_1210
   type: gfx
   offset: 0x1210
+  otr_mode: index
 d_course_mario_raceway_dl_1408:
   symbol: d_course_mario_raceway_dl_1408
   type: gfx
   offset: 0x1408
+  otr_mode: index
 d_course_mario_raceway_dl_15C8:
   symbol: d_course_mario_raceway_dl_15C8
   type: gfx
   offset: 0x15C8
+  otr_mode: index
 d_course_mario_raceway_dl_1740:
   symbol: d_course_mario_raceway_dl_1740
   type: gfx
   offset: 0x1740
+  otr_mode: index
 d_course_mario_raceway_dl_1850:
   symbol: d_course_mario_raceway_dl_1850
   type: gfx
   offset: 0x1850
+  otr_mode: index
 d_course_mario_raceway_dl_1A30:
   symbol: d_course_mario_raceway_dl_1A30
   type: gfx
   offset: 0x1A30
+  otr_mode: index
 d_course_mario_raceway_dl_1B70:
   symbol: d_course_mario_raceway_dl_1B70
   type: gfx
   offset: 0x1B70
+  otr_mode: index
 d_course_mario_raceway_dl_1CF8:
   symbol: d_course_mario_raceway_dl_1CF8
   type: gfx
   offset: 0x1CF8
+  otr_mode: index
 d_course_mario_raceway_dl_1DE0:
   symbol: d_course_mario_raceway_dl_1DE0
   type: gfx
   offset: 0x1DE0
+  otr_mode: index
 d_course_mario_raceway_dl_1F68:
   symbol: d_course_mario_raceway_dl_1F68
   type: gfx
   offset: 0x1F68
+  otr_mode: index
 d_course_mario_raceway_dl_20A0:
   symbol: d_course_mario_raceway_dl_20A0
   type: gfx
   offset: 0x20A0
+  otr_mode: index
 d_course_mario_raceway_dl_21E8:
   symbol: d_course_mario_raceway_dl_21E8
   type: gfx
   offset: 0x21E8
+  otr_mode: index
 d_course_mario_raceway_dl_22E0:
   symbol: d_course_mario_raceway_dl_22E0
   type: gfx
   offset: 0x22E0
+  otr_mode: index
 d_course_mario_raceway_dl_2418:
   symbol: d_course_mario_raceway_dl_2418
   type: gfx
   offset: 0x2418
+  otr_mode: index
 d_course_mario_raceway_dl_2558:
   symbol: d_course_mario_raceway_dl_2558
   type: gfx
   offset: 0x2558
+  otr_mode: index
 d_course_mario_raceway_dl_2680:
   symbol: d_course_mario_raceway_dl_2680
   type: gfx
   offset: 0x2680
+  otr_mode: index
 d_course_mario_raceway_dl_2790:
   symbol: d_course_mario_raceway_dl_2790
   type: gfx
   offset: 0x2790
+  otr_mode: index
 d_course_mario_raceway_dl_28B0:
   symbol: d_course_mario_raceway_dl_28B0
   type: gfx
   offset: 0x28B0
+  otr_mode: index
 d_course_mario_raceway_dl_2A10:
   symbol: d_course_mario_raceway_dl_2A10
   type: gfx
   offset: 0x2A10
+  otr_mode: index
 d_course_mario_raceway_dl_2B40:
   symbol: d_course_mario_raceway_dl_2B40
   type: gfx
   offset: 0x2B40
+  otr_mode: index
 d_course_mario_raceway_dl_2C98:
   symbol: d_course_mario_raceway_dl_2C98
   type: gfx
   offset: 0x2C98
+  otr_mode: index
 d_course_mario_raceway_dl_2DC0:
   symbol: d_course_mario_raceway_dl_2DC0
   type: gfx
   offset: 0x2DC0
+  otr_mode: index
 d_course_mario_raceway_dl_2EF8:
   symbol: d_course_mario_raceway_dl_2EF8
   type: gfx
   offset: 0x2EF8
+  otr_mode: index
 d_course_mario_raceway_dl_3038:
   symbol: d_course_mario_raceway_dl_3038
   type: gfx
   offset: 0x3038
+  otr_mode: index
 d_course_mario_raceway_dl_31F0:
   symbol: d_course_mario_raceway_dl_31F0
   type: gfx
   offset: 0x31F0
+  otr_mode: index
 d_course_mario_raceway_dl_32D8:
   symbol: d_course_mario_raceway_dl_32D8
   type: gfx
   offset: 0x32D8
+  otr_mode: index
 d_course_mario_raceway_dl_3458:
   symbol: d_course_mario_raceway_dl_3458
   type: gfx
   offset: 0x3458
+  otr_mode: index
 d_course_mario_raceway_dl_35D0:
   symbol: d_course_mario_raceway_dl_35D0
   type: gfx
   offset: 0x35D0
+  otr_mode: index
 d_course_mario_raceway_dl_3748:
   symbol: d_course_mario_raceway_dl_3748
   type: gfx
   offset: 0x3748
+  otr_mode: index
 d_course_mario_raceway_dl_3830:
   symbol: d_course_mario_raceway_dl_3830
   type: gfx
   offset: 0x3830
+  otr_mode: index
 d_course_mario_raceway_dl_3960:
   symbol: d_course_mario_raceway_dl_3960
   type: gfx
   offset: 0x3960
+  otr_mode: index
 d_course_mario_raceway_dl_3AA0:
   symbol: d_course_mario_raceway_dl_3AA0
   type: gfx
   offset: 0x3AA0
+  otr_mode: index
 d_course_mario_raceway_dl_3C08:
   symbol: d_course_mario_raceway_dl_3C08
   type: gfx
   offset: 0x3C08
+  otr_mode: index
 d_course_mario_raceway_dl_3D68:
   symbol: d_course_mario_raceway_dl_3D68
   type: gfx
   offset: 0x3D68
+  otr_mode: index
 d_course_mario_raceway_dl_3EB8:
   symbol: d_course_mario_raceway_dl_3EB8
   type: gfx
   offset: 0x3EB8
+  otr_mode: index
 d_course_mario_raceway_dl_4038:
   symbol: d_course_mario_raceway_dl_4038
   type: gfx
   offset: 0x4038
+  otr_mode: index
 d_course_mario_raceway_dl_4150:
   symbol: d_course_mario_raceway_dl_4150
   type: gfx
   offset: 0x4150
+  otr_mode: index
 d_course_mario_raceway_dl_42A0:
   symbol: d_course_mario_raceway_dl_42A0
   type: gfx
   offset: 0x42A0
+  otr_mode: index
 d_course_mario_raceway_dl_43D8:
   symbol: d_course_mario_raceway_dl_43D8
   type: gfx
   offset: 0x43D8
+  otr_mode: index
 d_course_mario_raceway_dl_44F8:
   symbol: d_course_mario_raceway_dl_44F8
   type: gfx
   offset: 0x44F8
+  otr_mode: index
 d_course_mario_raceway_dl_4610:
   symbol: d_course_mario_raceway_dl_4610
   type: gfx
   offset: 0x4610
+  otr_mode: index
 d_course_mario_raceway_dl_4738:
   symbol: d_course_mario_raceway_dl_4738
   type: gfx
   offset: 0x4738
+  otr_mode: index
 d_course_mario_raceway_dl_4840:
   symbol: d_course_mario_raceway_dl_4840
   type: gfx
   offset: 0x4840
+  otr_mode: index
 d_course_mario_raceway_dl_4910:
   symbol: d_course_mario_raceway_dl_4910
   type: gfx
   offset: 0x4910
+  otr_mode: index
 d_course_mario_raceway_dl_4A60:
   symbol: d_course_mario_raceway_dl_4A60
   type: gfx
   offset: 0x4A60
+  otr_mode: index
 d_course_mario_raceway_dl_4B78:
   symbol: d_course_mario_raceway_dl_4B78
   type: gfx
   offset: 0x4B78
+  otr_mode: index
 d_course_mario_raceway_dl_4CD8:
   symbol: d_course_mario_raceway_dl_4CD8
   type: gfx
   offset: 0x4CD8
+  otr_mode: index
 d_course_mario_raceway_dl_4DC8:
   symbol: d_course_mario_raceway_dl_4DC8
   type: gfx
   offset: 0x4DC8
+  otr_mode: index
 d_course_mario_raceway_dl_4ED0:
   symbol: d_course_mario_raceway_dl_4ED0
   type: gfx
   offset: 0x4ED0
+  otr_mode: index
 d_course_mario_raceway_dl_4FF0:
   symbol: d_course_mario_raceway_dl_4FF0
   type: gfx
   offset: 0x4FF0
+  otr_mode: index
 d_course_mario_raceway_dl_5150:
   symbol: d_course_mario_raceway_dl_5150
   type: gfx
   offset: 0x5150
+  otr_mode: index
 d_course_mario_raceway_dl_5228:
   symbol: d_course_mario_raceway_dl_5228
   type: gfx
   offset: 0x5228
+  otr_mode: index
 d_course_mario_raceway_unknown_waypoints:
   symbol: d_course_mario_raceway_unknown_waypoints
   offset: 0x5568
@@ -316,6 +382,7 @@ d_course_mario_raceway_dl_piranha_plant:
   symbol: d_course_mario_raceway_dl_piranha_plant
   type: gfx
   offset: 0x6990
+  otr_mode: index
 d_course_mario_raceway_tree_model:
   symbol: d_course_mario_raceway_tree_model
   type: vtx
@@ -325,6 +392,7 @@ d_course_mario_raceway_dl_tree:
   symbol: d_course_mario_raceway_dl_tree
   type: gfx
   offset: 0x6A68
+  otr_mode: index
 d_course_mario_sign_model:
   symbol: d_course_mario_sign_model
   type: vtx
@@ -380,34 +448,42 @@ d_course_mario_raceway_dl_9068:
   symbol: d_course_mario_raceway_dl_9068
   type: gfx
   offset: 0x9068
+  otr_mode: index
 d_course_mario_raceway_dl_90B0:
   symbol: d_course_mario_raceway_dl_90B0
   type: gfx
   offset: 0x90B0
+  otr_mode: index
 d_course_mario_raceway_dl_90C0:
   symbol: d_course_mario_raceway_dl_90C0
   type: gfx
   offset: 0x90C0
+  otr_mode: index
 d_course_mario_raceway_dl_9190:
   symbol: d_course_mario_raceway_dl_9190
   type: gfx
   offset: 0x9190
+  otr_mode: index
 d_course_mario_raceway_dl_9250:
   symbol: d_course_mario_raceway_dl_9250
   type: gfx
   offset: 0x9250
+  otr_mode: index
 d_course_mario_raceway_dl_9310:
   symbol: d_course_mario_raceway_dl_9310
   type: gfx
   offset: 0x9310
+  otr_mode: index
 d_course_mario_raceway_dl_sign:
   symbol: d_course_mario_raceway_dl_sign
   type: gfx
   offset: 0x9330
+  otr_mode: index
 d_course_mario_raceway_dl_9348:
   symbol: d_course_mario_raceway_dl_9348
   type: gfx
   offset: 0x9348
+  otr_mode: index
 d_course_mario_raceway_item_box_spawns:
   symbol: d_course_mario_raceway_item_box_spawns
   type: mk64:spawn_data
diff --git a/yamls/us/mario_raceway_vertices.yml b/yamls/us/mario_raceway_vertices.yml
index e673c5810..b716b96aa 100644
--- a/yamls/us/mario_raceway_vertices.yml
+++ b/yamls/us/mario_raceway_vertices.yml
@@ -1,7 +1,6 @@
 :config:
   segments:
     - [0x0F, 0x88FA10]
-  no_compression: true
   header:
     code:
       - '#include <libultraship.h>'
@@ -11,6 +10,6 @@
       - '#include <align_asset_macro.h>'
 d_course_mario_raceway_vertex:
   symbol: d_course_mario_raceway_vertex
-  type: blob
-  size: 0x13AD6
+  type: mk64:course_vtx
+  count: 5757
   offset: 0x0