Fix Course (#42)

* Fix menu bug

* Fix undefined behaviour

* Fix kart textures

* Fix boost texture

* Rename as per review

* Fix buffer overflows

* Fix lakitu progress

* Fix race starter character

* wip fixes to kart wheels

* Fix inaccuracy

* improve wheels

* Fix staff ghosts

* course stuff

* wip changes

* Fix course

* Update kalimari_desert_displaylists.yml

---------

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

7 files changed, 49 insertions, 110 deletions

diff --git a/src/actors/railroad_crossing/render.inc.c b/src/actors/railroad_crossing/render.inc.c
index d93ec5c98..61ad5b667 100644
--- a/src/actors/railroad_crossing/render.inc.c
+++ b/src/actors/railroad_crossing/render.inc.c
@@ -25,12 +25,12 @@ void render_actor_railroad_crossing(Camera *arg0, struct RailroadCrossing *rr_cr
             if (isCrossingTriggeredByIndex[rr_crossing->crossingId]) {
 
                 if (rr_crossing->someTimer < 20) {
-                    gSPDisplayList(gDisplayListHead++, segmented_gfx_to_virtual(0x07000000+0x10ae8));
+                    gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_crossing_right_active);
                 } else {
-                    gSPDisplayList(gDisplayListHead++, segmented_gfx_to_virtual(0x07000000+0x10c10));
+                    gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_crossing_left_active);
                 }
             } else {
-                gSPDisplayList(gDisplayListHead++, segmented_gfx_to_virtual(0x07000000+0x10d38));
+                gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_crossing_both_inactive);
             }
             gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK);
         }
diff --git a/src/actors/train/render.inc.c b/src/actors/train/render.inc.c
index df51f33cf..cd5698353 100644
--- a/src/actors/train/render.inc.c
+++ b/src/actors/train/render.inc.c
@@ -31,21 +31,21 @@ void render_actor_train_engine(Camera *camera, struct TrainCar *actor) {
 
     if (distance < 122500.0f) {
 
-        gSPDisplayList(gDisplayListHead++, segmented_gfx_to_virtual(0x07000000+0x1C0F0));
-        gSPDisplayList(gDisplayListHead++, segmented_gfx_to_virtual(0x07000000+0x1B978));
+        gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_1C0F0);
+        gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_1B978);
 
     } else if (distance < 640000.0f) {
 
-        gSPDisplayList(gDisplayListHead++, segmented_gfx_to_virtual(0x07000000+0x1D670));
-       gSPDisplayList(gDisplayListHead++, segmented_gfx_to_virtual(0x07000000+0x1D160));
+        gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_1D670);
+       gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_1D160);
     } else {
-       gSPDisplayList(gDisplayListHead++, segmented_gfx_to_virtual(0x07000000+0x1E910));
-       gSPDisplayList(gDisplayListHead++, segmented_gfx_to_virtual(0x07000000+0x1E480));
+       gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_1E910);
+       gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_1E480);
     }
     if (1440000.0f < distance) { return; }
 
     gSPClearGeometryMode(gDisplayListHead++, G_CULL_BACK);
-    gSPDisplayList(gDisplayListHead++, segmented_gfx_to_virtual(0x07000000+0x22D28));
+    gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22D28);
 
     mtxf_rotate_x(sp120, actor->wheelRot);
     vec3f_set(sp160, 17.0f, 6.0f, 32.0f);
@@ -55,7 +55,7 @@ void render_actor_train_engine(Camera *camera, struct TrainCar *actor) {
     maxObjectsReached = render_set_position(spA0, 3) == 0;
     if (maxObjectsReached) { return; }
 
-    gSPDisplayList(gDisplayListHead++, segmented_gfx_to_virtual(0x07000000+0x22DB8));
+    gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
     gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
 
     mtxf_rotate_x(sp120, actor->wheelRot);
@@ -66,7 +66,7 @@ void render_actor_train_engine(Camera *camera, struct TrainCar *actor) {
     maxObjectsReached = render_set_position(spA0, 3) == 0;
     if (maxObjectsReached) { return; }
 
-    gSPDisplayList(gDisplayListHead++, segmented_gfx_to_virtual(0x07000000+0x22DB8));
+    gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
     gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
 
     mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x16C));
@@ -77,7 +77,7 @@ void render_actor_train_engine(Camera *camera, struct TrainCar *actor) {
     maxObjectsReached = render_set_position(spA0, 3) == 0;
     if (maxObjectsReached) { return; }
 
-    gSPDisplayList(gDisplayListHead++, segmented_gfx_to_virtual(0x07000000+0x22DB8));
+    gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
     gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
 
     mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x16C));
@@ -88,7 +88,7 @@ void render_actor_train_engine(Camera *camera, struct TrainCar *actor) {
     maxObjectsReached = render_set_position(spA0, 3) == 0;
     if (maxObjectsReached) { return; }
 
-    gSPDisplayList(gDisplayListHead++, segmented_gfx_to_virtual(0x07000000+0x22DB8));
+    gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
     gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
 
     mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x444));
@@ -99,7 +99,7 @@ void render_actor_train_engine(Camera *camera, struct TrainCar *actor) {
     maxObjectsReached = render_set_position(spA0, 3) == 0;
     if (maxObjectsReached) { return; }
 
-    gSPDisplayList(gDisplayListHead++, segmented_gfx_to_virtual(0x07000000+0x22D70));
+    gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22D70);
     gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
 
     mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x444));
@@ -110,7 +110,7 @@ void render_actor_train_engine(Camera *camera, struct TrainCar *actor) {
     maxObjectsReached = render_set_position(spA0, 3) == 0;
     if (maxObjectsReached) { return; }
 
-    gSPDisplayList(gDisplayListHead++, segmented_gfx_to_virtual(0x07000000+0x22D70));
+    gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22D70);
     gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
 
     mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x2D8));
@@ -121,7 +121,7 @@ void render_actor_train_engine(Camera *camera, struct TrainCar *actor) {
     maxObjectsReached = render_set_position(spA0, 3) == 0;
     if (maxObjectsReached) { return; }
 
-    gSPDisplayList(gDisplayListHead++, segmented_gfx_to_virtual(0x07000000+0x22D70));
+    gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22D70);
     gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
 
     mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x2D8));
@@ -132,7 +132,7 @@ void render_actor_train_engine(Camera *camera, struct TrainCar *actor) {
     maxObjectsReached = render_set_position(spA0, 3) == 0;
     if (maxObjectsReached) { return; }
 
-    gSPDisplayList(gDisplayListHead++, segmented_gfx_to_virtual(0x07000000+0x22D70));
+    gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22D70);
     gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
     gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK);
 }
@@ -154,17 +154,17 @@ void render_actor_train_tender(Camera *camera, struct TrainCar *actor) {
 
     if (temp_f0 < 250000.0f) {
 
-        gSPDisplayList(gDisplayListHead++, segmented_gfx_to_virtual(0x07000000+0x1F228));
+        gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_1F228);
 
     } else if (temp_f0 < 1000000.0f) {
-        gSPDisplayList(gDisplayListHead++, segmented_gfx_to_virtual(0x07000000+0x1F708));
+        gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_1F708);
     } else {
-        gSPDisplayList(gDisplayListHead++, segmented_gfx_to_virtual(0x07000000+0x1FAF8));
+        gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_1FAF8);
     }
     if (1440000.0f < temp_f0) { return; }
 
     gSPClearGeometryMode(gDisplayListHead++, G_CULL_BACK);
-    gSPDisplayList(gDisplayListHead++, segmented_gfx_to_virtual(0x07000000+0x22D28));
+    gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22D28);
 
     mtxf_rotate_x(sp120, actor->wheelRot);
     vec3f_set(sp160, 17.0f, 6.0f, 8.0f);
@@ -173,7 +173,7 @@ void render_actor_train_tender(Camera *camera, struct TrainCar *actor) {
 
     if (render_set_position(spA0, 3) == 0) { return; }
 
-    gSPDisplayList(gDisplayListHead++, segmented_gfx_to_virtual(0x07000000+0x22DB8));
+    gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
     gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
 
     mtxf_rotate_x(sp120, actor->wheelRot);
@@ -183,7 +183,7 @@ void render_actor_train_tender(Camera *camera, struct TrainCar *actor) {
 
     if (render_set_position(spA0, 3) == 0) { return; }
 
-    gSPDisplayList(gDisplayListHead++, segmented_gfx_to_virtual(0x07000000+0x22DB8));
+    gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
     gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
 
     mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x444));
@@ -193,7 +193,7 @@ void render_actor_train_tender(Camera *camera, struct TrainCar *actor) {
 
     if (render_set_position(spA0, 3) == 0) { return; }
 
-    gSPDisplayList(gDisplayListHead++, segmented_gfx_to_virtual(0x07000000+0x22DB8));
+    gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
     gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
 
     mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x444));
@@ -202,7 +202,7 @@ void render_actor_train_tender(Camera *camera, struct TrainCar *actor) {
     mtxf_multiplication(spA0, sp120, spE0);
 
     if (render_set_position(spA0, 3) == 0) { return; }
-    gSPDisplayList(gDisplayListHead++, segmented_gfx_to_virtual(0x07000000+0x22DB8));
+    gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
     gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
     gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK);
 }
@@ -225,21 +225,21 @@ void render_actor_train_passenger_car(Camera *camera, struct TrainCar *actor) {
 
     if (temp_f0 < 250000.0f) {
 
-        gSPDisplayList(gDisplayListHead++, segmented_gfx_to_virtual(0x07000000+0x20A20));
-        gSPDisplayList(gDisplayListHead++, segmented_gfx_to_virtual(0x07000000+0x20A08));
+        gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_20A20);
+        gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_20A08);
 
     } else if (temp_f0 < 1000000.0f) {
 
-        gSPDisplayList(gDisplayListHead++, segmented_gfx_to_virtual(0x07000000+0x21550));
-        gSPDisplayList(gDisplayListHead++, segmented_gfx_to_virtual(0x07000000+0x21220));
+        gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_21550);
+        gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_21220);
     } else {
-        gSPDisplayList(gDisplayListHead++, segmented_gfx_to_virtual(0x07000000+0x21C90));
-        gSPDisplayList(gDisplayListHead++, segmented_gfx_to_virtual(0x07000000+0x21A80));
+        gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_21C90);
+        gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_21A80);
     }
     if (1440000.0f < temp_f0) { return; }
 
     gSPClearGeometryMode(gDisplayListHead++, G_CULL_BACK);
-    gSPDisplayList(gDisplayListHead++, segmented_gfx_to_virtual(0x07000000+0x22D28));
+    gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22D28);
 
     mtxf_rotate_x(sp120, actor->wheelRot);
     vec3f_set(sp160, 17.0f, 6.0f, 28.0f);
@@ -248,7 +248,7 @@ void render_actor_train_passenger_car(Camera *camera, struct TrainCar *actor) {
 
     if (render_set_position(spA0, 3) == 0) { return; }
 
-    gSPDisplayList(gDisplayListHead++, segmented_gfx_to_virtual(0x07000000+0x22DB8));
+    gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
     gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
 
     mtxf_rotate_x(sp120, actor->wheelRot);
@@ -258,7 +258,7 @@ void render_actor_train_passenger_car(Camera *camera, struct TrainCar *actor) {
 
     if (render_set_position(spA0, 3) == 0) { return; }
 
-    gSPDisplayList(gDisplayListHead++, segmented_gfx_to_virtual(0x07000000+0x22DB8));
+    gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
     gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
 
     mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x222));
@@ -268,7 +268,7 @@ void render_actor_train_passenger_car(Camera *camera, struct TrainCar *actor) {
 
     if (render_set_position(spA0, 3) == 0) { return; }
 
-    gSPDisplayList(gDisplayListHead++, segmented_gfx_to_virtual(0x07000000+0x22DB8));
+    gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
     gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
 
     mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x222));
@@ -278,7 +278,7 @@ void render_actor_train_passenger_car(Camera *camera, struct TrainCar *actor) {
 
     if (render_set_position(spA0, 3) == 0) { return; }
 
-    gSPDisplayList(gDisplayListHead++, segmented_gfx_to_virtual(0x07000000+0x22DB8));
+    gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
     gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
 
     mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x5B0));
@@ -288,7 +288,7 @@ void render_actor_train_passenger_car(Camera *camera, struct TrainCar *actor) {
 
     if (render_set_position(spA0, 3) == 0) { return; }
 
-    gSPDisplayList(gDisplayListHead++, segmented_gfx_to_virtual(0x07000000+0x22DB8));
+    gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
     gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
 
     mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x5B0));
@@ -298,7 +298,7 @@ void render_actor_train_passenger_car(Camera *camera, struct TrainCar *actor) {
 
     if (render_set_position(spA0, 3) == 0) { return; }
 
-    gSPDisplayList(gDisplayListHead++, segmented_gfx_to_virtual(0x07000000+0x22DB8));
+    gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
     gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
 
     mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x16C));
@@ -308,7 +308,7 @@ void render_actor_train_passenger_car(Camera *camera, struct TrainCar *actor) {
 
     if (render_set_position(spA0, 3) == 0) { return; }
 
-    gSPDisplayList(gDisplayListHead++, segmented_gfx_to_virtual(0x07000000+0x22DB8));
+    gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
     gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
 
     mtxf_rotate_x(sp120, (s16) (actor->wheelRot + 0x16C));
@@ -318,7 +318,7 @@ void render_actor_train_passenger_car(Camera *camera, struct TrainCar *actor) {
 
     if (render_set_position(spA0, 3) == 0) { return; }
 
-    gSPDisplayList(gDisplayListHead++, segmented_gfx_to_virtual(0x07000000+0x22DB8));
+    gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22DB8);
     gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
     gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK);
 }
diff --git a/src/actors/trees/render.inc.c b/src/actors/trees/render.inc.c
index 1c08b763e..7e6416fa5 100644
--- a/src/actors/trees/render.inc.c
+++ b/src/actors/trees/render.inc.c
@@ -3,6 +3,7 @@
 #include <main.h>
 #include <assets/common_data.h>
 #include "courses/all_course_data.h"
+#include <assets/kalimari_desert_data.h>
 
 /**
  * @brief Renders the tree actor in Mario rawceay.
@@ -281,7 +282,7 @@ void render_actor_tree_cactus1_kalimari_desert(Camera *camera, Mat4 arg1, struct
     arg1[3][2] = arg2->pos[2];
 
     if (render_set_position(arg1, 0) != 0) {
-        gSPDisplayList(gDisplayListHead++, segmented_gfx_to_virtual(0x07008528));
+        gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_cactus1);
     }
 }
 
@@ -310,7 +311,7 @@ void render_actor_tree_cactus2_kalimari_desert(Camera *camera, Mat4 arg1, struct
     arg1[3][2] = arg2->pos[2];
 
     if (render_set_position(arg1, 0) != 0) {
-        gSPDisplayList(gDisplayListHead++, segmented_gfx_to_virtual(0x07008628));
+        gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_cactus2);
     }
 }
 
@@ -339,6 +340,6 @@ void render_actor_tree_cactus3_kalimari_desert(Camera *camera, Mat4 arg1, struct
     arg1[3][2] = arg2->pos[2];
 
     if (render_set_position(arg1, 0) != 0) {
-        gSPDisplayList(gDisplayListHead++, segmented_gfx_to_virtual(0x07008728));
+        gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_cactus3);
     }
 }
diff --git a/src/racing/memory.c b/src/racing/memory.c
index 102f14b5e..837e6761c 100644
--- a/src/racing/memory.c
+++ b/src/racing/memory.c
@@ -1471,7 +1471,7 @@ NewCourseTable gNewCourseTable[] = {
     }, { // banshee_boardwalk
         .data = NULL,
         .vtx = NULL,
-        .vtxSize = 0,
+        .vtxSize = 4326,
         .textures = NULL,
         .displaylists = NULL,
         .dlSize = 0
diff --git a/src/racing/render_courses.c b/src/racing/render_courses.c
index 86ce1e71f..4149085e8 100644
--- a/src/racing/render_courses.c
+++ b/src/racing/render_courses.c
@@ -1297,7 +1297,7 @@ void func_8029569C(void) {
             gSPDisplayList(gDisplayListHead++, d_course_toads_turnpike_dl_23930);
             break;
         case COURSE_KALAMARI_DESERT:
-            gSPDisplayList(gDisplayListHead++, segmented_gfx_to_virtual(0x07000000+0x22E00));
+            gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_22E00);
             break;
         case COURSE_SHERBET_LAND:
             gSPDisplayList(gDisplayListHead++, d_course_sherbet_land_dl_9AE8);
diff --git a/yamls/us/banshee_boardwalk_vertices.yml b/yamls/us/banshee_boardwalk_vertices.yml
index 749f1d635..0193b31e7 100644
--- a/yamls/us/banshee_boardwalk_vertices.yml
+++ b/yamls/us/banshee_boardwalk_vertices.yml
@@ -11,5 +11,5 @@
 d_course_banshee_boardwalk_vertex:
   symbol: d_course_banshee_boardwalk_vertex
   type: mk64:course_vtx
-  count: 9527
+  count: 4326
   offset: 0x0
diff --git a/yamls/us/kalimari_desert_data.yml b/yamls/us/kalimari_desert_data.yml
index ee3e9f2db..f1f7a4321 100644
--- a/yamls/us/kalimari_desert_data.yml
+++ b/yamls/us/kalimari_desert_data.yml
@@ -583,17 +583,14 @@ d_course_kalimari_desert_dl_crossing_right_active:
   symbol: d_course_kalimari_desert_dl_crossing_right_active
   type: gfx
   offset: 0x10ae8
-  otr_mode: index
 d_course_kalimari_desert_dl_crossing_left_active:
   symbol: d_course_kalimari_desert_dl_crossing_left_active
   type: gfx
   offset: 0x10c10
-  otr_mode: index
 d_course_kalimari_desert_dl_crossing_both_inactive:
   symbol: d_course_kalimari_desert_dl_crossing_both_inactive
   type: gfx
   offset: 0x10d38
-  otr_mode: index
 d_course_kalimari_desert_locomotive_64:
   symbol: d_course_kalimari_desert_locomotive_64
   type: texture
@@ -804,52 +801,42 @@ d_course_kalimari_desert_dl_1B7C0:
   symbol: d_course_kalimari_desert_dl_1B7C0
   type: gfx
   offset: 0x1b7c0
-  otr_mode: index
 d_course_kalimari_desert_dl_1B850:
   symbol: d_course_kalimari_desert_dl_1B850
   type: gfx
   offset: 0x1b850
-  otr_mode: index
 d_course_kalimari_desert_dl_1B950:
   symbol: d_course_kalimari_desert_dl_1B950
   type: gfx
   offset: 0x1b950
-  otr_mode: index
 d_course_kalimari_desert_dl_1B968:
   symbol: d_course_kalimari_desert_dl_1B968
   type: gfx
   offset: 0x1b968
-  otr_mode: index
 d_course_kalimari_desert_dl_1B978:
   symbol: d_course_kalimari_desert_dl_1B978
   type: gfx
   offset: 0x1b978
-  otr_mode: index
 d_course_kalimari_desert_dl_1B990:
   symbol: d_course_kalimari_desert_dl_1B990
   type: gfx
   offset: 0x1b990
-  otr_mode: index
 d_course_kalimari_desert_dl_1BD18:
   symbol: d_course_kalimari_desert_dl_1BD18
   type: gfx
   offset: 0x1bd18
-  otr_mode: index
 d_course_kalimari_desert_dl_1BD58:
   symbol: d_course_kalimari_desert_dl_1BD58
   type: gfx
   offset: 0x1bd58
-  otr_mode: index
 d_course_kalimari_desert_dl_1BEF8:
   symbol: d_course_kalimari_desert_dl_1BEF8
   type: gfx
   offset: 0x1bef8
-  otr_mode: index
 d_course_kalimari_desert_dl_1BF90:
   symbol: d_course_kalimari_desert_dl_1BF90
   type: gfx
   offset: 0x1bf90
-  otr_mode: index
 d_course_kalimari_desert_dl_1C0B0:
   symbol: d_course_kalimari_desert_dl_1C0B0
   type: gfx
@@ -941,52 +928,42 @@ d_course_kalimari_desert_dl_1CFA8:
   symbol: d_course_kalimari_desert_dl_1CFA8
   type: gfx
   offset: 0x1cfa8
-  otr_mode: index
 d_course_kalimari_desert_dl_1D038:
   symbol: d_course_kalimari_desert_dl_1D038
   type: gfx
   offset: 0x1d038
-  otr_mode: index
 d_course_kalimari_desert_dl_1D138:
   symbol: d_course_kalimari_desert_dl_1D138
   type: gfx
   offset: 0x1d138
-  otr_mode: index
 d_course_kalimari_desert_dl_1D150:
   symbol: d_course_kalimari_desert_dl_1D150
   type: gfx
   offset: 0x1d150
-  otr_mode: index
 d_course_kalimari_desert_dl_1D160:
   symbol: d_course_kalimari_desert_dl_1D160
   type: gfx
   offset: 0x1d160
-  otr_mode: index
 d_course_kalimari_desert_dl_1D178:
   symbol: d_course_kalimari_desert_dl_1D178
   type: gfx
   offset: 0x1d178
-  otr_mode: index
 d_course_kalimari_desert_dl_1D418:
   symbol: d_course_kalimari_desert_dl_1D418
   type: gfx
   offset: 0x1d418
-  otr_mode: index
 d_course_kalimari_desert_dl_1D450:
   symbol: d_course_kalimari_desert_dl_1D450
   type: gfx
   offset: 0x1d450
-  otr_mode: index
 d_course_kalimari_desert_dl_1D540:
   symbol: d_course_kalimari_desert_dl_1D540
   type: gfx
   offset: 0x1d540
-  otr_mode: index
 d_course_kalimari_desert_dl_1D598:
   symbol: d_course_kalimari_desert_dl_1D598
   type: gfx
   offset: 0x1d598
-  otr_mode: index
 d_course_kalimari_desert_dl_1D630:
   symbol: d_course_kalimari_desert_dl_1D630
   type: gfx
@@ -1073,52 +1050,42 @@ d_course_kalimari_desert_dl_1E2C8:
   symbol: d_course_kalimari_desert_dl_1E2C8
   type: gfx
   offset: 0x1e2c8
-  otr_mode: index
 d_course_kalimari_desert_dl_1E358:
   symbol: d_course_kalimari_desert_dl_1E358
   type: gfx
   offset: 0x1e358
-  otr_mode: index
 d_course_kalimari_desert_dl_1E458:
   symbol: d_course_kalimari_desert_dl_1E458
   type: gfx
   offset: 0x1e458
-  otr_mode: index
 d_course_kalimari_desert_dl_1E470:
   symbol: d_course_kalimari_desert_dl_1E470
   type: gfx
   offset: 0x1e470
-  otr_mode: index
 d_course_kalimari_desert_dl_1E480:
   symbol: d_course_kalimari_desert_dl_1E480
   type: gfx
   offset: 0x1e480
-  otr_mode: index
 d_course_kalimari_desert_dl_1E498:
   symbol: d_course_kalimari_desert_dl_1E498
   type: gfx
   offset: 0x1e498
-  otr_mode: index
 d_course_kalimari_desert_dl_1E6D8:
   symbol: d_course_kalimari_desert_dl_1E6D8
   type: gfx
   offset: 0x1e6d8
-  otr_mode: index
 d_course_kalimari_desert_dl_1E710:
   symbol: d_course_kalimari_desert_dl_1E710
   type: gfx
   offset: 0x1e710
-  otr_mode: index
 d_course_kalimari_desert_dl_1E800:
   symbol: d_course_kalimari_desert_dl_1E800
   type: gfx
   offset: 0x1e800
-  otr_mode: index
 d_course_kalimari_desert_dl_1E858:
   symbol: d_course_kalimari_desert_dl_1E858
   type: gfx
   offset: 0x1e858
-  otr_mode: index
 d_course_kalimari_desert_dl_1E8D0:
   symbol: d_course_kalimari_desert_dl_1E8D0
   type: gfx
@@ -1160,17 +1127,14 @@ d_course_kalimari_desert_dl_1EFD8:
   symbol: d_course_kalimari_desert_dl_1EFD8
   type: gfx
   offset: 0x1efd8
-  otr_mode: index
 d_course_kalimari_desert_dl_1F050:
   symbol: d_course_kalimari_desert_dl_1F050
   type: gfx
   offset: 0x1f050
-  otr_mode: index
 d_course_kalimari_desert_dl_1F0D8:
   symbol: d_course_kalimari_desert_dl_1F0D8
   type: gfx
   offset: 0x1f0d8
-  otr_mode: index
 d_course_kalimari_desert_dl_1F1F8:
   symbol: d_course_kalimari_desert_dl_1F1F8
   type: gfx
@@ -1202,12 +1166,10 @@ d_course_kalimari_desert_dl_1F570:
   symbol: d_course_kalimari_desert_dl_1F570
   type: gfx
   offset: 0x1f570
-  otr_mode: index
 d_course_kalimari_desert_dl_1F5E0:
   symbol: d_course_kalimari_desert_dl_1F5E0
   type: gfx
   offset: 0x1f5e0
-  otr_mode: index
 d_course_kalimari_desert_dl_1F6E0:
   symbol: d_course_kalimari_desert_dl_1F6E0
   type: gfx
@@ -1224,7 +1186,6 @@ d_course_kalimari_desert_dl_1F720:
   symbol: d_course_kalimari_desert_dl_1F720
   type: gfx
   offset: 0x1f720
-  otr_mode: index
 d_course_kalimari_desert_tender_model_lod0:
   symbol: d_course_kalimari_desert_tender_model_lod0
   type: vtx
@@ -1244,12 +1205,10 @@ d_course_kalimari_desert_dl_1F988:
   symbol: d_course_kalimari_desert_dl_1F988
   type: gfx
   offset: 0x1f988
-  otr_mode: index
 d_course_kalimari_desert_dl_1F9D8:
   symbol: d_course_kalimari_desert_dl_1F9D8
   type: gfx
   offset: 0x1f9d8
-  otr_mode: index
 d_course_kalimari_desert_dl_1FAD0:
   symbol: d_course_kalimari_desert_dl_1FAD0
   type: gfx
@@ -1266,7 +1225,6 @@ d_course_kalimari_desert_dl_1FB10:
   symbol: d_course_kalimari_desert_dl_1FB10
   type: gfx
   offset: 0x1fb10
-  otr_mode: index
 d_course_kalimari_desert_carriage_chassis_model_lod2:
   symbol: d_course_kalimari_desert_carriage_chassis_model_lod2
   type: vtx
@@ -1326,42 +1284,34 @@ d_course_kalimari_desert_dl_20578:
   symbol: d_course_kalimari_desert_dl_20578
   type: gfx
   offset: 0x20578
-  otr_mode: index
 d_course_kalimari_desert_dl_20610:
   symbol: d_course_kalimari_desert_dl_20610
   type: gfx
   offset: 0x20610
-  otr_mode: index
 d_course_kalimari_desert_dl_20620:
   symbol: d_course_kalimari_desert_dl_20620
   type: gfx
   offset: 0x20620
-  otr_mode: index
 d_course_kalimari_desert_dl_20630:
   symbol: d_course_kalimari_desert_dl_20630
   type: gfx
   offset: 0x20630
-  otr_mode: index
 d_course_kalimari_desert_dl_20688:
   symbol: d_course_kalimari_desert_dl_20688
   type: gfx
   offset: 0x20688
-  otr_mode: index
 d_course_kalimari_desert_dl_208A0:
   symbol: d_course_kalimari_desert_dl_208A0
   type: gfx
   offset: 0x208a0
-  otr_mode: index
 d_course_kalimari_desert_dl_20928:
   symbol: d_course_kalimari_desert_dl_20928
   type: gfx
   offset: 0x20928
-  otr_mode: index
 d_course_kalimari_desert_dl_20980:
   symbol: d_course_kalimari_desert_dl_20980
   type: gfx
   offset: 0x20980
-  otr_mode: index
 d_course_kalimari_desert_dl_209C8:
   symbol: d_course_kalimari_desert_dl_209C8
   type: gfx
@@ -1427,7 +1377,6 @@ d_course_kalimari_desert_dl_21178:
   symbol: d_course_kalimari_desert_dl_21178
   type: gfx
   offset: 0x21178
-  otr_mode: index
 d_course_kalimari_desert_dl_21200:
   symbol: d_course_kalimari_desert_dl_21200
   type: gfx
@@ -1444,22 +1393,18 @@ d_course_kalimari_desert_dl_21238:
   symbol: d_course_kalimari_desert_dl_21238
   type: gfx
   offset: 0x21238
-  otr_mode: index
 d_course_kalimari_desert_dl_21288:
   symbol: d_course_kalimari_desert_dl_21288
   type: gfx
   offset: 0x21288
-  otr_mode: index
 d_course_kalimari_desert_dl_21480:
   symbol: d_course_kalimari_desert_dl_21480
   type: gfx
   offset: 0x21480
-  otr_mode: index
 d_course_kalimari_desert_dl_214D0:
   symbol: d_course_kalimari_desert_dl_214D0
   type: gfx
   offset: 0x214d0
-  otr_mode: index
 d_course_kalimari_desert_dl_21518:
   symbol: d_course_kalimari_desert_dl_21518
   type: gfx
@@ -1506,7 +1451,6 @@ d_course_kalimari_desert_dl_219D8:
   symbol: d_course_kalimari_desert_dl_219D8
   type: gfx
   offset: 0x219d8
-  otr_mode: index
 d_course_kalimari_desert_dl_21A60:
   symbol: d_course_kalimari_desert_dl_21A60
   type: gfx
@@ -1523,22 +1467,18 @@ d_course_kalimari_desert_dl_21A98:
   symbol: d_course_kalimari_desert_dl_21A98
   type: gfx
   offset: 0x21a98
-  otr_mode: index
 d_course_kalimari_desert_dl_21AE8:
   symbol: d_course_kalimari_desert_dl_21AE8
   type: gfx
   offset: 0x21ae8
-  otr_mode: index
 d_course_kalimari_desert_dl_21BC0:
   symbol: d_course_kalimari_desert_dl_21BC0
   type: gfx
   offset: 0x21bc0
-  otr_mode: index
 d_course_kalimari_desert_dl_21C10:
   symbol: d_course_kalimari_desert_dl_21C10
   type: gfx
   offset: 0x21c10
-  otr_mode: index
 d_course_kalimari_desert_dl_21C58:
   symbol: d_course_kalimari_desert_dl_21C58
   type: gfx
@@ -1577,12 +1517,10 @@ d_course_kalimari_desert_dl_22D70:
   symbol: d_course_kalimari_desert_dl_22D70
   type: gfx
   offset: 0x22d70
-  otr_mode: index
 d_course_kalimari_desert_dl_22DB8:
   symbol: d_course_kalimari_desert_dl_22DB8
   type: gfx
   offset: 0x22db8
-  otr_mode: index
 d_course_kalimari_desert_dl_22E00:
   symbol: d_course_kalimari_desert_dl_22E00
   type: gfx
@@ -1602,4 +1540,4 @@ d_course_kalimari_desert_addr:
   symbol: d_course_kalimari_desert_addr
   type: mk64:track_sections
   offset: 0x23070
-  count: 102
+  count: 102
\ No newline at end of file