Current Changes (#14)

* Couple minor fixes

* test

* OTR changes

* More otr stuff

* Some fixes

---------

Co-authored-by: MegaMech <7255464+MegaMech@users.noreply.github.com>

13 files changed, 167 insertions, 26 deletions

diff --git a/yamls/us/banshee_boardwalk_vertices.yml b/yamls/us/banshee_boardwalk_vertices.yml
new file mode 100644
index 000000000..7363e01e4
--- /dev/null
+++ b/yamls/us/banshee_boardwalk_vertices.yml
@@ -0,0 +1,15 @@
+:config:
+  segments:
+    - [0x0F, 0x8B9630]
+  no_compression: true
+  header:
+    code:
+      - '#include <libultraship.h>'
+    header:
+      - '#include <libultraship.h>'
+      - '#include <libultra/gbi.h>'
+d_course_banshee_boardwalk_vertex:
+  symbol: d_course_banshee_boardwalk_vertex
+  type: mk64:course_vtx
+  count: 9527
+  offset: 0x0
diff --git a/yamls/us/bowsers_castle_vertices.yml b/yamls/us/bowsers_castle_vertices.yml
new file mode 100644
index 000000000..dd92e83b9
--- /dev/null
+++ b/yamls/us/bowsers_castle_vertices.yml
@@ -0,0 +1,15 @@
+:config:
+  segments:
+    - [0x0F, 0x8A7640]
+  no_compression: true
+  header:
+    code:
+      - '#include <libultraship.h>'
+    header:
+      - '#include <libultraship.h>'
+      - '#include <libultra/gbi.h>'
+d_course_bowsers_castle_vertex:
+  symbol: d_course_bowsers_castle_vertex
+  type: mk64:course_vtx
+  count: 9527
+  offset: 0x0
diff --git a/yamls/us/choco_mountain_vertices.yml b/yamls/us/choco_mountain_vertices.yml
new file mode 100644
index 000000000..831d19e61
--- /dev/null
+++ b/yamls/us/choco_mountain_vertices.yml
@@ -0,0 +1,15 @@
+:config:
+  segments:
+    - [0x0F, 0x89B510]
+  no_compression: true
+  header:
+    code:
+      - '#include <libultraship.h>'
+    header:
+      - '#include <libultraship.h>'
+      - '#include <libultra/gbi.h>'
+d_course_choco_mountain_vertex:
+  symbol: d_course_choco_mountain_vertex
+  type: mk64:course_vtx
+  count: 5560
+  offset: 0x0
diff --git a/yamls/us/common_data.yml b/yamls/us/common_data.yml
index d2536b87e..b9ee6cbfd 100644
--- a/yamls/us/common_data.yml
+++ b/yamls/us/common_data.yml
@@ -948,7 +948,7 @@ D_0D009158:
   symbol: D_0D009158
   type: mk64:driving_behaviour
   offset: 0x9158
-D_0D009158:
+D_0D009188:
   symbol: D_0D009188
   type: mk64:driving_behaviour
   offset: 0x9188
@@ -984,31 +984,6 @@ D_0D0093C0:
   symbol: D_0D0093C0
   type: mk64:driving_behaviour
   offset: 0x93C0
-D_0D009418:
-  symbol: D_0D009418
-  type: inc
-  offset: 0x9418
-  ctype: Vec4f
-  offset: 0x9418
-  file_path: "assets/course_metadata/D_0D009418.inc.c"
-D_0D009568:
-  symbol: D_0D009568
-  type: inc
-  offset: 0x9568
-  ctype: Vec4f
-  file_path: "assets/course_metadata/D_0D009568.inc.c"
-D_0D0096B8:
-  symbol: D_0D0096B8
-  type: inc
-  offset: 0x96B8
-  ctype: Vec4f
-  file_path: "assets/course_metadata/D_0D0096B8.inc.c"
-D_0D009808:
-  symbol: D_0D009808
-  type: inc
-  offset: 0x9808
-  ctype: Vec4f
-  file_path: "assets/course_metadata/D_0D009808.inc.c"
 common_texture_speedometer:
   symbol: common_texture_speedometer
   type: texture
diff --git a/yamls/us/frappe_snowland_vertices.yml b/yamls/us/frappe_snowland_vertices.yml
new file mode 100644
index 000000000..25aa33016
--- /dev/null
+++ b/yamls/us/frappe_snowland_vertices.yml
@@ -0,0 +1,15 @@
+:config:
+  segments:
+    - [0x0F, 0x8CC900]
+  no_compression: true
+  header:
+    code:
+      - '#include <libultraship.h>'
+    header:
+      - '#include <libultraship.h>'
+      - '#include <libultra/gbi.h>'
+d_course_frappe_snowland_vertex:
+  symbol: d_course_frappe_snowland_vertex
+  type: mk64:course_vtx
+  count: 5529
+  offset: 0x0
diff --git a/yamls/us/koopa_troopa_beach_vertices.yml b/yamls/us/koopa_troopa_beach_vertices.yml
new file mode 100644
index 000000000..a56d33d26
--- /dev/null
+++ b/yamls/us/koopa_troopa_beach_vertices.yml
@@ -0,0 +1,15 @@
+:config:
+  segments:
+    - [0x0F, 0x8D8E50]
+  no_compression: true
+  header:
+    code:
+      - '#include <libultraship.h>'
+    header:
+      - '#include <libultraship.h>'
+      - '#include <libultra/gbi.h>'
+d_course_koopa_troopa_beach_vertex:
+  symbol: d_course_koopa_troopa_beach_vertex
+  type: mk64:course_vtx
+  count: 9376
+  offset: 0x0
diff --git a/yamls/us/luigi_raceway_vertices.yml b/yamls/us/luigi_raceway_vertices.yml
new file mode 100644
index 000000000..1d457de99
--- /dev/null
+++ b/yamls/us/luigi_raceway_vertices.yml
@@ -0,0 +1,15 @@
+:config:
+  segments:
+    - [0x0F, 0x8FE640]
+  no_compression: true
+  header:
+    code:
+      - '#include <libultraship.h>'
+    header:
+      - '#include <libultraship.h>'
+      - '#include <libultra/gbi.h>'
+d_course_luigi_raceway_vertex:
+  symbol: d_course_luigi_raceway_vertex
+  type: mk64:course_vtx
+  count: 5936
+  offset: 0x0
diff --git a/yamls/us/mario_raceway_vertices.yml b/yamls/us/mario_raceway_vertices.yml
new file mode 100644
index 000000000..36c4298e0
--- /dev/null
+++ b/yamls/us/mario_raceway_vertices.yml
@@ -0,0 +1,15 @@
+:config:
+  segments:
+    - [0x0F, 0x88FA10]
+  no_compression: true
+  header:
+    code:
+      - '#include <libultraship.h>'
+    header:
+      - '#include <libultraship.h>'
+      - '#include <libultra/gbi.h>'
+d_course_mario_raceway_vertex:
+  symbol: d_course_mario_raceway_vertex
+  type: mk64:course_vtx
+  count: 5757
+  offset: 0x0
diff --git a/yamls/us/moo_moo_farm_vertices.yml b/yamls/us/moo_moo_farm_vertices.yml
new file mode 100644
index 000000000..3d266d0eb
--- /dev/null
+++ b/yamls/us/moo_moo_farm_vertices.yml
@@ -0,0 +1,15 @@
+:config:
+  segments:
+    - [0x0F, 0x90B3E0]
+  no_compression: true
+  header:
+    code:
+      - '#include <libultraship.h>'
+    header:
+      - '#include <libultraship.h>'
+      - '#include <libultra/gbi.h>'
+d_course_moo_moo_farm_vertex:
+  symbol: d_course_moo_moo_farm_vertex
+  type: mk64:course_vtx
+  count: 7972
+  offset: 0x0
diff --git a/yamls/us/royal_raceway_vertices.yml b/yamls/us/royal_raceway_vertices.yml
new file mode 100644
index 000000000..477b8bce0
--- /dev/null
+++ b/yamls/us/royal_raceway_vertices.yml
@@ -0,0 +1,15 @@
+:config:
+  segments:
+    - [0x0F, 0x8EC390]
+  no_compression: true
+  header:
+    code:
+      - '#include <libultraship.h>'
+    header:
+      - '#include <libultraship.h>'
+      - '#include <libultra/gbi.h>'
+d_course_royal_raceway_vertex:
+  symbol: d_course_royal_raceway_vertex
+  type: mk64:course_vtx
+  count: 8306
+  offset: 0x0
diff --git a/yamls/us/toads_turnpike_vertices.yml b/yamls/us/toads_turnpike_vertices.yml
new file mode 100644
index 000000000..f4617da5e
--- /dev/null
+++ b/yamls/us/toads_turnpike_vertices.yml
@@ -0,0 +1,15 @@
+:config:
+  segments:
+    - [0x0F, 0x91B980]
+  no_compression: true
+  header:
+    code:
+      - '#include <libultraship.h>'
+    header:
+      - '#include <libultraship.h>'
+      - '#include <libultra/gbi.h>'
+d_course_toads_turnpike_vertex:
+  symbol: d_course_toads_turnpike_vertex
+  type: mk64:course_vtx
+  count: 6359
+  offset: 0x0
diff --git a/yamls/us/yoshi_kart.yml b/yamls/us/yoshi_kart.yml
index a2a0304b8..6b94ee634 100644
--- a/yamls/us/yoshi_kart.yml
+++ b/yamls/us/yoshi_kart.yml
@@ -12796,3 +12796,4 @@ yoshi_kart_palette:
   width: 16
   height: 12
   format: RGBA16
+
diff --git a/yamls/us/yoshi_valley_vertices.yml b/yamls/us/yoshi_valley_vertices.yml
new file mode 100644
index 000000000..7bb451419
--- /dev/null
+++ b/yamls/us/yoshi_valley_vertices.yml
@@ -0,0 +1,15 @@
+:config:
+  segments:
+    - [0x0F, 0x8C2510]
+  no_compression: true
+  header:
+    code:
+      - '#include <libultraship.h>'
+    header:
+      - '#include <libultraship.h>'
+      - '#include <libultra/gbi.h>'
+d_course_yoshi_valley_vertex:
+  symbol: d_course_yoshi_valley_vertex
+  type: mk64:course_vtx
+  count: 3720
+  offset: 0x0