Kalimari desert continuation (#40)

* wip kalimari desert

* fix offset

* Update kalimari_desert_data.yml

* Update kalimari_desert_data.yml

* fix issue

* Update kalimari_desert_data.yml

* add missing vtx and texture

* fix error of size

* Update kalimari_desert_displaylists.yml

---------

Co-authored-by: coco875 <pereira.jannin@gmail.com>
Co-authored-by: coco875 <59367621+coco875@users.noreply.github.com>

4 files changed, 832 insertions, 146 deletions

diff --git a/src/actors/railroad_crossing/render.inc.c b/src/actors/railroad_crossing/render.inc.c
index 61ad5b667..d93ec5c98 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++, d_course_kalimari_desert_dl_crossing_right_active);
+                    gSPDisplayList(gDisplayListHead++, segmented_gfx_to_virtual(0x07000000+0x10ae8));
                 } else {
-                    gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_crossing_left_active);
+                    gSPDisplayList(gDisplayListHead++, segmented_gfx_to_virtual(0x07000000+0x10c10));
                 }
             } else {
-                gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_crossing_both_inactive);
+                gSPDisplayList(gDisplayListHead++, segmented_gfx_to_virtual(0x07000000+0x10d38));
             }
             gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK);
         }
diff --git a/src/racing/memory.c b/src/racing/memory.c
index cee544bde..102f14b5e 100644
--- a/src/racing/memory.c
+++ b/src/racing/memory.c
@@ -1530,7 +1530,7 @@ NewCourseTable gNewCourseTable[] = {
         .vtxSize = 6393,
         .textures = kalimari_desert_textures,
         .displaylists = d_course_kalimari_desert_packed_dls,
-        .dlSize = 5670
+        .dlSize = 5328
     }
 };
 
@@ -1599,6 +1599,7 @@ void load_course(s32 courseId) {
     // Extract packed DLs
     u8 *packed = (u8 *) LOAD_ASSET(displaylists);
     Gfx *gfx = (Gfx *) allocate_memory(sizeof(Gfx) * dlSize); // Size of unpacked DLs
+    assert(gfx != NULL);
     gSegmentTable[7] = &gfx[0];
     displaylist_unpack(gfx, packed, 0);
     dlSegEnd = &gfx[dlSize];
diff --git a/yamls/us/kalimari_desert_data.yml b/yamls/us/kalimari_desert_data.yml
index 19cb74dde..0aa3dd441 100644
--- a/yamls/us/kalimari_desert_data.yml
+++ b/yamls/us/kalimari_desert_data.yml
@@ -33,12 +33,12 @@ d_course_kalimari_desert_dl_310:
 d_course_kalimari_desert_dl_4A0:
   symbol: d_course_kalimari_desert_dl_4A0
   type: gfx
-  offset: 0x4A0
+  offset: 0x4a0
   otr_mode: index
 d_course_kalimari_desert_dl_5C0:
   symbol: d_course_kalimari_desert_dl_5C0
   type: gfx
-  offset: 0x5C0
+  offset: 0x5c0
   otr_mode: index
 d_course_kalimari_desert_dl_778:
   symbol: d_course_kalimari_desert_dl_778
@@ -53,27 +53,27 @@ d_course_kalimari_desert_dl_858:
 d_course_kalimari_desert_dl_A58:
   symbol: d_course_kalimari_desert_dl_A58
   type: gfx
-  offset: 0xA58
+  offset: 0xa58
   otr_mode: index
 d_course_kalimari_desert_dl_B38:
   symbol: d_course_kalimari_desert_dl_B38
   type: gfx
-  offset: 0xB38
+  offset: 0xb38
   otr_mode: index
 d_course_kalimari_desert_dl_CD0:
   symbol: d_course_kalimari_desert_dl_CD0
   type: gfx
-  offset: 0xCD0
+  offset: 0xcd0
   otr_mode: index
 d_course_kalimari_desert_dl_DD0:
   symbol: d_course_kalimari_desert_dl_DD0
   type: gfx
-  offset: 0xDD0
+  offset: 0xdd0
   otr_mode: index
 d_course_kalimari_desert_dl_F68:
   symbol: d_course_kalimari_desert_dl_F68
   type: gfx
-  offset: 0xF68
+  offset: 0xf68
   otr_mode: index
 d_course_kalimari_desert_dl_1030:
   symbol: d_course_kalimari_desert_dl_1030
@@ -93,7 +93,7 @@ d_course_kalimari_desert_dl_1350:
 d_course_kalimari_desert_dl_14C0:
   symbol: d_course_kalimari_desert_dl_14C0
   type: gfx
-  offset: 0x14C0
+  offset: 0x14c0
   otr_mode: index
 d_course_kalimari_desert_dl_1588:
   symbol: d_course_kalimari_desert_dl_1588
@@ -103,32 +103,32 @@ d_course_kalimari_desert_dl_1588:
 d_course_kalimari_desert_dl_17C8:
   symbol: d_course_kalimari_desert_dl_17C8
   type: gfx
-  offset: 0x17C8
+  offset: 0x17c8
   otr_mode: index
 d_course_kalimari_desert_dl_18C8:
   symbol: d_course_kalimari_desert_dl_18C8
   type: gfx
-  offset: 0x18C8
+  offset: 0x18c8
   otr_mode: index
 d_course_kalimari_desert_dl_1A58:
   symbol: d_course_kalimari_desert_dl_1A58
   type: gfx
-  offset: 0x1A58
+  offset: 0x1a58
   otr_mode: index
 d_course_kalimari_desert_dl_1B38:
   symbol: d_course_kalimari_desert_dl_1B38
   type: gfx
-  offset: 0x1B38
+  offset: 0x1b38
   otr_mode: index
 d_course_kalimari_desert_dl_1D48:
   symbol: d_course_kalimari_desert_dl_1D48
   type: gfx
-  offset: 0x1D48
+  offset: 0x1d48
   otr_mode: index
 d_course_kalimari_desert_dl_1E80:
   symbol: d_course_kalimari_desert_dl_1E80
   type: gfx
-  offset: 0x1E80
+  offset: 0x1e80
   otr_mode: index
 d_course_kalimari_desert_dl_2000:
   symbol: d_course_kalimari_desert_dl_2000
@@ -138,12 +138,12 @@ d_course_kalimari_desert_dl_2000:
 d_course_kalimari_desert_dl_20E0:
   symbol: d_course_kalimari_desert_dl_20E0
   type: gfx
-  offset: 0x20E0
+  offset: 0x20e0
   otr_mode: index
 d_course_kalimari_desert_dl_22D8:
   symbol: d_course_kalimari_desert_dl_22D8
   type: gfx
-  offset: 0x22D8
+  offset: 0x22d8
   otr_mode: index
 d_course_kalimari_desert_dl_2458:
   symbol: d_course_kalimari_desert_dl_2458
@@ -153,12 +153,12 @@ d_course_kalimari_desert_dl_2458:
 d_course_kalimari_desert_dl_25D0:
   symbol: d_course_kalimari_desert_dl_25D0
   type: gfx
-  offset: 0x25D0
+  offset: 0x25d0
   otr_mode: index
 d_course_kalimari_desert_dl_26E8:
   symbol: d_course_kalimari_desert_dl_26E8
   type: gfx
-  offset: 0x26E8
+  offset: 0x26e8
   otr_mode: index
 d_course_kalimari_desert_dl_2868:
   symbol: d_course_kalimari_desert_dl_2868
@@ -168,27 +168,27 @@ d_course_kalimari_desert_dl_2868:
 d_course_kalimari_desert_dl_29C0:
   symbol: d_course_kalimari_desert_dl_29C0
   type: gfx
-  offset: 0x29C0
+  offset: 0x29c0
   otr_mode: index
 d_course_kalimari_desert_dl_2B40:
   symbol: d_course_kalimari_desert_dl_2B40
   type: gfx
-  offset: 0x2B40
+  offset: 0x2b40
   otr_mode: index
 d_course_kalimari_desert_dl_2C88:
   symbol: d_course_kalimari_desert_dl_2C88
   type: gfx
-  offset: 0x2C88
+  offset: 0x2c88
   otr_mode: index
 d_course_kalimari_desert_dl_2DE8:
   symbol: d_course_kalimari_desert_dl_2DE8
   type: gfx
-  offset: 0x2DE8
+  offset: 0x2de8
   otr_mode: index
 d_course_kalimari_desert_dl_2F30:
   symbol: d_course_kalimari_desert_dl_2F30
   type: gfx
-  offset: 0x2F30
+  offset: 0x2f30
   otr_mode: index
 d_course_kalimari_desert_dl_3068:
   symbol: d_course_kalimari_desert_dl_3068
@@ -198,12 +198,12 @@ d_course_kalimari_desert_dl_3068:
 d_course_kalimari_desert_dl_31C0:
   symbol: d_course_kalimari_desert_dl_31C0
   type: gfx
-  offset: 0x31C0
+  offset: 0x31c0
   otr_mode: index
 d_course_kalimari_desert_dl_32F8:
   symbol: d_course_kalimari_desert_dl_32F8
   type: gfx
-  offset: 0x32F8
+  offset: 0x32f8
   otr_mode: index
 d_course_kalimari_desert_dl_3460:
   symbol: d_course_kalimari_desert_dl_3460
@@ -233,27 +233,27 @@ d_course_kalimari_desert_dl_3998:
 d_course_kalimari_desert_dl_3AC0:
   symbol: d_course_kalimari_desert_dl_3AC0
   type: gfx
-  offset: 0x3AC0
+  offset: 0x3ac0
   otr_mode: index
 d_course_kalimari_desert_dl_3CA0:
   symbol: d_course_kalimari_desert_dl_3CA0
   type: gfx
-  offset: 0x3CA0
+  offset: 0x3ca0
   otr_mode: index
 d_course_kalimari_desert_dl_3DB8:
   symbol: d_course_kalimari_desert_dl_3DB8
   type: gfx
-  offset: 0x3DB8
+  offset: 0x3db8
   otr_mode: index
 d_course_kalimari_desert_dl_3FB0:
   symbol: d_course_kalimari_desert_dl_3FB0
   type: gfx
-  offset: 0x3FB0
+  offset: 0x3fb0
   otr_mode: index
 d_course_kalimari_desert_dl_40A8:
   symbol: d_course_kalimari_desert_dl_40A8
   type: gfx
-  offset: 0x40A8
+  offset: 0x40a8
   otr_mode: index
 d_course_kalimari_desert_dl_4280:
   symbol: d_course_kalimari_desert_dl_4280
@@ -283,27 +283,27 @@ d_course_kalimari_desert_dl_4908:
 d_course_kalimari_desert_dl_49E0:
   symbol: d_course_kalimari_desert_dl_49E0
   type: gfx
-  offset: 0x49E0
+  offset: 0x49e0
   otr_mode: index
 d_course_kalimari_desert_dl_4BA0:
   symbol: d_course_kalimari_desert_dl_4BA0
   type: gfx
-  offset: 0x4BA0
+  offset: 0x4ba0
   otr_mode: index
 d_course_kalimari_desert_dl_4CF0:
   symbol: d_course_kalimari_desert_dl_4CF0
   type: gfx
-  offset: 0x4CF0
+  offset: 0x4cf0
   otr_mode: index
 d_course_kalimari_desert_dl_4EF8:
   symbol: d_course_kalimari_desert_dl_4EF8
   type: gfx
-  offset: 0x4EF8
+  offset: 0x4ef8
   otr_mode: index
 d_course_kalimari_desert_dl_4FB0:
   symbol: d_course_kalimari_desert_dl_4FB0
   type: gfx
-  offset: 0x4FB0
+  offset: 0x4fb0
   otr_mode: index
 d_course_kalimari_desert_dl_5100:
   symbol: d_course_kalimari_desert_dl_5100
@@ -318,7 +318,7 @@ d_course_kalimari_desert_dl_5208:
 d_course_kalimari_desert_dl_53A0:
   symbol: d_course_kalimari_desert_dl_53A0
   type: gfx
-  offset: 0x53A0
+  offset: 0x53a0
   otr_mode: index
 d_course_kalimari_desert_dl_5470:
   symbol: d_course_kalimari_desert_dl_5470
@@ -328,7 +328,7 @@ d_course_kalimari_desert_dl_5470:
 d_course_kalimari_desert_dl_55C8:
   symbol: d_course_kalimari_desert_dl_55C8
   type: gfx
-  offset: 0x55C8
+  offset: 0x55c8
   otr_mode: index
 d_course_kalimari_desert_dl_5730:
   symbol: d_course_kalimari_desert_dl_5730
@@ -348,27 +348,27 @@ d_course_kalimari_desert_dl_5978:
 d_course_kalimari_desert_dl_5AD0:
   symbol: d_course_kalimari_desert_dl_5AD0
   type: gfx
-  offset: 0x5AD0
+  offset: 0x5ad0
   otr_mode: index
 d_course_kalimari_desert_dl_5BE8:
   symbol: d_course_kalimari_desert_dl_5BE8
   type: gfx
-  offset: 0x5BE8
+  offset: 0x5be8
   otr_mode: index
 d_course_kalimari_desert_dl_5D20:
   symbol: d_course_kalimari_desert_dl_5D20
   type: gfx
-  offset: 0x5D20
+  offset: 0x5d20
   otr_mode: index
 d_course_kalimari_desert_dl_5DF8:
   symbol: d_course_kalimari_desert_dl_5DF8
   type: gfx
-  offset: 0x5DF8
+  offset: 0x5df8
   otr_mode: index
 d_course_kalimari_desert_dl_5F20:
   symbol: d_course_kalimari_desert_dl_5F20
   type: gfx
-  offset: 0x5F20
+  offset: 0x5f20
   otr_mode: index
 d_course_kalimari_desert_dl_6028:
   symbol: d_course_kalimari_desert_dl_6028
@@ -378,27 +378,27 @@ d_course_kalimari_desert_dl_6028:
 d_course_kalimari_desert_dl_61B0:
   symbol: d_course_kalimari_desert_dl_61B0
   type: gfx
-  offset: 0x61B0
+  offset: 0x61b0
   otr_mode: index
 d_course_kalimari_desert_dl_62F8:
   symbol: d_course_kalimari_desert_dl_62F8
   type: gfx
-  offset: 0x62F8
+  offset: 0x62f8
   otr_mode: index
 d_course_kalimari_desert_dl_63E0:
   symbol: d_course_kalimari_desert_dl_63E0
   type: gfx
-  offset: 0x63E0
+  offset: 0x63e0
   otr_mode: index
 d_course_kalimari_desert_dl_65B0:
   symbol: d_course_kalimari_desert_dl_65B0
   type: gfx
-  offset: 0x65B0
+  offset: 0x65b0
   otr_mode: index
 d_course_kalimari_desert_dl_66F0:
   symbol: d_course_kalimari_desert_dl_66F0
   type: gfx
-  offset: 0x66F0
+  offset: 0x66f0
   otr_mode: index
 d_course_kalimari_desert_dl_6838:
   symbol: d_course_kalimari_desert_dl_6838
@@ -410,12 +410,11 @@ d_course_kalimari_desert_dl_6940:
   type: gfx
   offset: 0x6940
   otr_mode: index
-# todo need adjust count
 d_course_kalimari_desert_unknown_waypoints:
   symbol: d_course_kalimari_desert_unknown_waypoints
   type: mk64:TRACK_WAYPOINTS
   offset: 0x6ac8
-  count: 50
+  count: 51
 d_course_kalimari_desert_track_unknown_waypoints:
   symbol: d_course_kalimari_desert_track_unknown_waypoints
   type: mk64:TRACK_WAYPOINTS
@@ -426,7 +425,6 @@ d_course_kalimari_desert_track_waypoints:
   type: mk64:TRACK_WAYPOINTS
   offset: 0x6ec0
   count: 664
-# todo need adjust texture
 d_course_kalimari_desert_tree_tlut:
   symbol: d_course_kalimari_desert_tree_tlut
   type: texture
@@ -434,7 +432,17 @@ d_course_kalimari_desert_tree_tlut:
   width: 16
   height: 16
   format: rgba16
-  ctype: u16
+  ctype: u8
+d_course_kalimari_desert_cactus_model1:
+  symbol: d_course_kalimari_desert_cactus_model1
+  type: vtx
+  offset: 0x8468
+  count: 8
+d_course_kalimari_desert_cactus_model2:
+  symbol: d_course_kalimari_desert_cactus_model2
+  type: vtx
+  offset: 0x84e8
+  count: 4
 d_course_kalimari_desert_dl_cactus1:
   symbol: d_course_kalimari_desert_dl_cactus1
   type: gfx
@@ -450,6 +458,130 @@ d_course_kalimari_desert_dl_cactus3:
   type: gfx
   offset: 0x8728
   otr_mode: index
+d_course_kalimari_desert_crossing_sign_inactive_top_left:
+  symbol: d_course_kalimari_desert_crossing_sign_inactive_top_left
+  type: texture
+  offset: 0x87e8
+  width: 32
+  height: 64
+  format: rgba16
+  ctype: u8
+d_course_kalimari_desert_crossing_sign_inactive_top_right:
+  symbol: d_course_kalimari_desert_crossing_sign_inactive_top_right
+  type: texture
+  offset: 0x97e8
+  width: 32
+  height: 64
+  format: rgba16
+  ctype: u8
+d_course_kalimari_desert_crossing_sign_inactive_bottom_left:
+  symbol: d_course_kalimari_desert_crossing_sign_inactive_bottom_left
+  type: texture
+  offset: 0xa7e8
+  width: 32
+  height: 64
+  format: rgba16
+  ctype: u8
+d_course_kalimari_desert_crossing_sign_inactive_bottom_right:
+  symbol: d_course_kalimari_desert_crossing_sign_inactive_bottom_right
+  type: texture
+  offset: 0xb7e8
+  width: 32
+  height: 64
+  format: rgba16
+  ctype: u8
+d_course_kalimari_desert_crossing_sign_active_top_left:
+  symbol: d_course_kalimari_desert_crossing_sign_active_top_left
+  type: texture
+  offset: 0xc7e8
+  width: 32
+  height: 64
+  format: rgba16
+  ctype: u8
+d_course_kalimari_desert_crossing_sign_active_top_right:
+  symbol: d_course_kalimari_desert_crossing_sign_active_top_right
+  type: texture
+  offset: 0xd7e8
+  width: 32
+  height: 64
+  format: rgba16
+  ctype: u8
+d_course_kalimari_desert_crossing_sign_active_bottom_left:
+  symbol: d_course_kalimari_desert_crossing_sign_active_bottom_left
+  type: texture
+  offset: 0xe7e8
+  width: 32
+  height: 64
+  format: rgba16
+  ctype: u8
+d_course_kalimari_desert_crossing_sign_active_bottom_right:
+  symbol: d_course_kalimari_desert_crossing_sign_active_bottom_right
+  type: texture
+  offset: 0xf7e8
+  width: 32
+  height: 64
+  format: rgba16
+  ctype: u8
+d_course_kalimari_desert_crossing_signal_active_model:
+  symbol: d_course_kalimari_desert_crossing_signal_active_model
+  type: vtx
+  offset: 0x107e8
+  count: 4
+d_course_kalimari_desert_crossing_signal_unknown_model1:
+  symbol: d_course_kalimari_desert_crossing_signal_unknown_model1
+  type: vtx
+  offset: 0x10828
+  count: 4
+d_course_kalimari_desert_crossing_signal_unknown_model2:
+  symbol: d_course_kalimari_desert_crossing_signal_unknown_model2
+  type: vtx
+  offset: 0x10868
+  count: 4
+d_course_kalimari_desert_crossing_signal_unknown_model3:
+  symbol: d_course_kalimari_desert_crossing_signal_unknown_model3
+  type: vtx
+  offset: 0x108a8
+  count: 4
+d_course_kalimari_desert_crossing_signal_unknown_model4:
+  symbol: d_course_kalimari_desert_crossing_signal_unknown_model4
+  type: vtx
+  offset: 0x108e8
+  count: 4
+d_course_kalimari_desert_crossing_signal_unknown_model5:
+  symbol: d_course_kalimari_desert_crossing_signal_unknown_model5
+  type: vtx
+  offset: 0x10928
+  count: 4
+d_course_kalimari_desert_crossing_signal_unknown_model6:
+  symbol: d_course_kalimari_desert_crossing_signal_unknown_model6
+  type: vtx
+  offset: 0x10968
+  count: 4
+d_course_kalimari_desert_crossing_signal_unknown_model7:
+  symbol: d_course_kalimari_desert_crossing_signal_unknown_model7
+  type: vtx
+  offset: 0x109a8
+  count: 4
+d_course_kalimari_desert_crossing_signal_unknown_model8:
+  symbol: d_course_kalimari_desert_crossing_signal_unknown_model8
+  type: vtx
+  offset: 0x109e8
+  count: 4
+d_course_kalimari_desert_crossing_signal_unknown_model9:
+  symbol: d_course_kalimari_desert_crossing_signal_unknown_model9
+  type: vtx
+  offset: 0x10a28
+  count: 4
+d_course_kalimari_desert_crossing_signal_unknown_model10:
+  symbol: d_course_kalimari_desert_crossing_signal_unknown_model10
+  type: vtx
+  offset: 0x10a68
+  count: 4
+d_course_kalimari_desert_crossing_signal_unknown_model11:
+  symbol: d_course_kalimari_desert_crossing_signal_unknown_model11
+  type: vtx
+  offset: 0x10aa8
+  count: 4
 d_course_kalimari_desert_dl_crossing_right_active:
   symbol: d_course_kalimari_desert_dl_crossing_right_active
   type: gfx
@@ -465,291 +597,752 @@ 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
+  offset: 0x10e60
+  width: 32
+  height: 32
+  format: rgba16
+  ctype: u8
+d_course_kalimari_desert_locomotive_cab_window:
+  symbol: d_course_kalimari_desert_locomotive_cab_window
+  type: texture
+  offset: 0x11660
+  width: 64
+  height: 32
+  format: rgba16
+  ctype: u8
+d_course_kalimari_desert_locomotive_cab_window_front:
+  symbol: d_course_kalimari_desert_locomotive_cab_window_front
+  type: texture
+  offset: 0x12660
+  width: 32
+  height: 64
+  format: rgba16
+  ctype: u8
+d_course_kalimari_desert_locomotive_chassis:
+  symbol: d_course_kalimari_desert_locomotive_chassis
+  type: texture
+  offset: 0x13660
+  width: 32
+  height: 32
+  format: rgba16
+  ctype: u8
+d_course_kalimari_desert_locomotive_lamp:
+  symbol: d_course_kalimari_desert_locomotive_lamp
+  type: texture
+  offset: 0x13e60
+  width: 32
+  height: 32
+  format: rgba16
+  ctype: u8
+d_course_kalimari_desert_locomotive_boiler:
+  symbol: d_course_kalimari_desert_locomotive_boiler
+  type: texture
+  offset: 0x14660
+  width: 32
+  height: 32
+  format: rgba16
+  ctype: u8
+d_course_kalimari_desert_carriage_railing:
+  symbol: d_course_kalimari_desert_carriage_railing
+  type: texture
+  offset: 0x14e60
+  width: 32
+  height: 64
+  format: rgba16
+  ctype: u8
+d_course_kalimari_desert_locomotive_tender:
+  symbol: d_course_kalimari_desert_locomotive_tender
+  type: texture
+  offset: 0x15e60
+  width: 64
+  height: 32
+  format: rgba16
+  ctype: u8
+d_course_kalimari_desert_railway_ballast:
+  symbol: d_course_kalimari_desert_railway_ballast
+  type: texture
+  offset: 0x16e60
+  width: 32
+  height: 32
+  format: rgba16
+  ctype: u8
+d_course_kalimari_desert_carriage_lower:
+  symbol: d_course_kalimari_desert_carriage_lower
+  type: texture
+  offset: 0x17660
+  width: 32
+  height: 32
+  format: rgba16
+  ctype: u8
+d_course_kalimari_desert_carriage_door:
+  symbol: d_course_kalimari_desert_carriage_door
+  type: texture
+  offset: 0x17e60
+  width: 32
+  height: 64
+  format: rgba16
+  ctype: u8
+d_course_kalimari_desert_carriage_window:
+  symbol: d_course_kalimari_desert_carriage_window
+  type: texture
+  offset: 0x18e60
+  width: 32
+  height: 64
+  format: rgba16
+  ctype: u8
+d_course_kalimari_desert_locomotive_model_lod2:
+  symbol: d_course_kalimari_desert_locomotive_model_lod2
+  type: vtx
+  offset: 0x19e60
+  count: 10
+d_course_kalimari_desert_unknown_lod2_locomotive_model1:
+  symbol: d_course_kalimari_desert_unknown_lod2_locomotive_model1
+  type: vtx
+  offset: 0x19f00
+  count: 8
+d_course_kalimari_desert_unknown_lod2_locomotive_model2:
+  symbol: d_course_kalimari_desert_unknown_lod2_locomotive_model2
+  type: vtx
+  offset: 0x19f80
+  count: 8
+d_course_kalimari_desert_unknown_lod2_locomotive_model3:
+  symbol: d_course_kalimari_desert_unknown_lod2_locomotive_model3
+  type: vtx
+  offset: 0x1a000
+  count: 30
+d_course_kalimari_desert_unknown_lod2_locomotive_model4:
+  symbol: d_course_kalimari_desert_unknown_lod2_locomotive_model4
+  type: vtx
+  offset: 0x1a1e0
+  count: 32
+d_course_kalimari_desert_unknown_lod2_locomotive_model5:
+  symbol: d_course_kalimari_desert_unknown_lod2_locomotive_model5
+  type: vtx
+  offset: 0x1a3e0
+  count: 30
+d_course_kalimari_desert_unknown_lod2_locomotive_model6:
+  symbol: d_course_kalimari_desert_unknown_lod2_locomotive_model6
+  type: vtx
+  offset: 0x1a5c0
+  count: 4
+d_course_kalimari_desert_unknown_lod2_locomotive_model7:
+  symbol: d_course_kalimari_desert_unknown_lod2_locomotive_model7
+  type: vtx
+  offset: 0x1a600
+  count: 32
+d_course_kalimari_desert_unknown_lod2_locomotive_model8:
+  symbol: d_course_kalimari_desert_unknown_lod2_locomotive_model8
+  type: vtx
+  offset: 0x1a800
+  count: 6
+d_course_kalimari_desert_unknown_lod2_locomotive_model9:
+  symbol: d_course_kalimari_desert_unknown_lod2_locomotive_model9
+  type: vtx
+  offset: 0x1a860
+  count: 6
+d_course_kalimari_desert_unknown_lod2_locomotive_model10:
+  symbol: d_course_kalimari_desert_unknown_lod2_locomotive_model10
+  type: vtx
+  offset: 0x1a8c0
+  count: 4
+d_course_kalimari_desert_unknown_lod2_locomotive_model11:
+  symbol: d_course_kalimari_desert_unknown_lod2_locomotive_model11
+  type: vtx
+  offset: 0x1a900
+  count: 28
+d_course_kalimari_desert_unknown_lod2_locomotive_model12:
+  symbol: d_course_kalimari_desert_unknown_lod2_locomotive_model12
+  type: vtx
+  offset: 0x1aac0
+  count: 6
+d_course_kalimari_desert_unknown_lod2_locomotive_model13:
+  symbol: d_course_kalimari_desert_unknown_lod2_locomotive_model13
+  type: vtx
+  offset: 0x1ab20
+  count: 12
+d_course_kalimari_desert_unknown_lod2_locomotive_model14:
+  symbol: d_course_kalimari_desert_unknown_lod2_locomotive_model14
+  type: vtx
+  offset: 0x1abe0
+  count: 31
+d_course_kalimari_desert_unknown_lod2_locomotive_model15:
+  symbol: d_course_kalimari_desert_unknown_lod2_locomotive_model15
+  type: vtx
+  offset: 0x1add0
+  count: 32
+d_course_kalimari_desert_unknown_lod2_locomotive_model16:
+  symbol: d_course_kalimari_desert_unknown_lod2_locomotive_model16
+  type: vtx
+  offset: 0x1afd0
+  count: 16
+d_course_kalimari_desert_unknown_lod2_locomotive_model17:
+  symbol: d_course_kalimari_desert_unknown_lod2_locomotive_model17
+  type: vtx
+  offset: 0x1b0d0
+  count: 32
+d_course_kalimari_desert_unknown_lod2_locomotive_model18:
+  symbol: d_course_kalimari_desert_unknown_lod2_locomotive_model18
+  type: vtx
+  offset: 0x1b2d0
+  count: 12
+d_course_kalimari_desert_unknown_lod2_locomotive_model19:
+  symbol: d_course_kalimari_desert_unknown_lod2_locomotive_model19
+  type: vtx
+  offset: 0x1b390
+  count: 31
+d_course_kalimari_desert_unknown_lod2_locomotive_model20:
+  symbol: d_course_kalimari_desert_unknown_lod2_locomotive_model20
+  type: vtx
+  offset: 0x1b580
+  count: 32
+d_course_kalimari_desert_unknown_lod2_locomotive_model21:
+  symbol: d_course_kalimari_desert_unknown_lod2_locomotive_model21
+  type: vtx
+  offset: 0x1b780
+  count: 4
 d_course_kalimari_desert_dl_1B7C0:
   symbol: d_course_kalimari_desert_dl_1B7C0
   type: gfx
-  offset: 0x1B7C0
+  offset: 0x1b7c0
   otr_mode: index
 d_course_kalimari_desert_dl_1B850:
   symbol: d_course_kalimari_desert_dl_1B850
   type: gfx
-  offset: 0x1B850
+  offset: 0x1b850
   otr_mode: index
 d_course_kalimari_desert_dl_1B950:
   symbol: d_course_kalimari_desert_dl_1B950
   type: gfx
-  offset: 0x1B950
+  offset: 0x1b950
   otr_mode: index
 d_course_kalimari_desert_dl_1B968:
   symbol: d_course_kalimari_desert_dl_1B968
   type: gfx
-  offset: 0x1B968
+  offset: 0x1b968
   otr_mode: index
 d_course_kalimari_desert_dl_1B978:
   symbol: d_course_kalimari_desert_dl_1B978
   type: gfx
-  offset: 0x1B978
+  offset: 0x1b978
   otr_mode: index
 d_course_kalimari_desert_dl_1B990:
   symbol: d_course_kalimari_desert_dl_1B990
   type: gfx
-  offset: 0x1B990
+  offset: 0x1b990
   otr_mode: index
 d_course_kalimari_desert_dl_1BD18:
   symbol: d_course_kalimari_desert_dl_1BD18
   type: gfx
-  offset: 0x1BD18
+  offset: 0x1bd18
   otr_mode: index
 d_course_kalimari_desert_dl_1BD58:
   symbol: d_course_kalimari_desert_dl_1BD58
   type: gfx
-  offset: 0x1BD58
+  offset: 0x1bd58
   otr_mode: index
 d_course_kalimari_desert_dl_1BEF8:
   symbol: d_course_kalimari_desert_dl_1BEF8
   type: gfx
-  offset: 0x1BEF8
+  offset: 0x1bef8
   otr_mode: index
 d_course_kalimari_desert_dl_1BF90:
   symbol: d_course_kalimari_desert_dl_1BF90
   type: gfx
-  offset: 0x1BF90
+  offset: 0x1bf90
   otr_mode: index
 d_course_kalimari_desert_dl_1C0B0:
   symbol: d_course_kalimari_desert_dl_1C0B0
   type: gfx
-  offset: 0x1C0B0
+  offset: 0x1c0b0
   otr_mode: index
 d_course_kalimari_desert_dl_1C0E0:
   symbol: d_course_kalimari_desert_dl_1C0E0
   type: gfx
-  offset: 0x1C0E0
+  offset: 0x1c0e0
   otr_mode: index
 d_course_kalimari_desert_dl_1C0F0:
   symbol: d_course_kalimari_desert_dl_1C0F0
   type: gfx
-  offset: 0x1C0F0
-  otr_mode: index
+  offset: 0x1c0f0
+  otr_mode: index
+d_course_kalimari_desert_locomotive_model_lod1:
+  symbol: d_course_kalimari_desert_locomotive_model_lod1
+  type: vtx
+  offset: 0x1c108
+  count: 10
+d_course_kalimari_desert_unknown_lod1_locomotive_model1:
+  symbol: d_course_kalimari_desert_unknown_lod1_locomotive_model1
+  type: vtx
+  offset: 0x1c1a8
+  count: 8
+d_course_kalimari_desert_unknown_lod1_locomotive_model2:
+  symbol: d_course_kalimari_desert_unknown_lod1_locomotive_model2
+  type: vtx
+  offset: 0x1c228
+  count: 8
+d_course_kalimari_desert_unknown_lod1_locomotive_model3:
+  symbol: d_course_kalimari_desert_unknown_lod1_locomotive_model3
+  type: vtx
+  offset: 0x1c2a8
+  count: 32
+d_course_kalimari_desert_unknown_lod1_locomotive_model4:
+  symbol: d_course_kalimari_desert_unknown_lod1_locomotive_model4
+  type: vtx
+  offset: 0x1c4a8
+  count: 30
+d_course_kalimari_desert_unknown_lod1_locomotive_model5:
+  symbol: d_course_kalimari_desert_unknown_lod1_locomotive_model5
+  type: vtx
+  offset: 0x1c688
+  count: 20
+d_course_kalimari_desert_unknown_lod1_locomotive_model6:
+  symbol: d_course_kalimari_desert_unknown_lod1_locomotive_model6
+  type: vtx
+  offset: 0x1c7c8
+  count: 6
+d_course_kalimari_desert_unknown_lod1_locomotive_model7:
+  symbol: d_course_kalimari_desert_unknown_lod1_locomotive_model7
+  type: vtx
+  offset: 0x1c828
+  count: 4
+d_course_kalimari_desert_unknown_lod1_locomotive_model8:
+  symbol: d_course_kalimari_desert_unknown_lod1_locomotive_model8
+  type: vtx
+  offset: 0x1c868
+  count: 20
+d_course_kalimari_desert_unknown_lod1_locomotive_model9:
+  symbol: d_course_kalimari_desert_unknown_lod1_locomotive_model9
+  type: vtx
+  offset: 0x1c9a8
+  count: 4
+d_course_kalimari_desert_unknown_lod1_locomotive_model10:
+  symbol: d_course_kalimari_desert_unknown_lod1_locomotive_model10
+  type: vtx
+  offset: 0x1c9e8
+  count: 8
+d_course_kalimari_desert_unknown_lod1_locomotive_model11:
+  symbol: d_course_kalimari_desert_unknown_lod1_locomotive_model11
+  type: vtx
+  offset: 0x1ca68
+  count: 30
+d_course_kalimari_desert_unknown_lod1_locomotive_model12:
+  symbol: d_course_kalimari_desert_unknown_lod1_locomotive_model12
+  type: vtx
+  offset: 0x1cc48
+  count: 20
+d_course_kalimari_desert_unknown_lod1_locomotive_model13:
+  symbol: d_course_kalimari_desert_unknown_lod1_locomotive_model13
+  type: vtx
+  offset: 0x1cd88
+  count: 31
+d_course_kalimari_desert_unknown_lod1_locomotive_model14:
+  symbol: d_course_kalimari_desert_unknown_lod1_locomotive_model14
+  type: vtx
+  offset: 0x1cf78
+  count: 3
 d_course_kalimari_desert_dl_1CFA8:
   symbol: d_course_kalimari_desert_dl_1CFA8
   type: gfx
-  offset: 0x1CFA8
+  offset: 0x1cfa8
   otr_mode: index
 d_course_kalimari_desert_dl_1D038:
   symbol: d_course_kalimari_desert_dl_1D038
   type: gfx
-  offset: 0x1D038
+  offset: 0x1d038
   otr_mode: index
 d_course_kalimari_desert_dl_1D138:
   symbol: d_course_kalimari_desert_dl_1D138
   type: gfx
-  offset: 0x1D138
+  offset: 0x1d138
   otr_mode: index
 d_course_kalimari_desert_dl_1D150:
   symbol: d_course_kalimari_desert_dl_1D150
   type: gfx
-  offset: 0x1D150
+  offset: 0x1d150
   otr_mode: index
 d_course_kalimari_desert_dl_1D160:
   symbol: d_course_kalimari_desert_dl_1D160
   type: gfx
-  offset: 0x1D160
+  offset: 0x1d160
   otr_mode: index
 d_course_kalimari_desert_dl_1D178:
   symbol: d_course_kalimari_desert_dl_1D178
   type: gfx
-  offset: 0x1D178
+  offset: 0x1d178
   otr_mode: index
 d_course_kalimari_desert_dl_1D418:
   symbol: d_course_kalimari_desert_dl_1D418
   type: gfx
-  offset: 0x1D418
+  offset: 0x1d418
   otr_mode: index
 d_course_kalimari_desert_dl_1D450:
   symbol: d_course_kalimari_desert_dl_1D450
   type: gfx
-  offset: 0x1D450
+  offset: 0x1d450
   otr_mode: index
 d_course_kalimari_desert_dl_1D540:
   symbol: d_course_kalimari_desert_dl_1D540
   type: gfx
-  offset: 0x1D540
+  offset: 0x1d540
   otr_mode: index
 d_course_kalimari_desert_dl_1D598:
   symbol: d_course_kalimari_desert_dl_1D598
   type: gfx
-  offset: 0x1D598
+  offset: 0x1d598
   otr_mode: index
 d_course_kalimari_desert_dl_1D630:
   symbol: d_course_kalimari_desert_dl_1D630
   type: gfx
-  offset: 0x1D630
+  offset: 0x1d630
   otr_mode: index
 d_course_kalimari_desert_dl_1D660:
   symbol: d_course_kalimari_desert_dl_1D660
   type: gfx
-  offset: 0x1D660
+  offset: 0x1d660
   otr_mode: index
 d_course_kalimari_desert_dl_1D670:
   symbol: d_course_kalimari_desert_dl_1D670
   type: gfx
-  offset: 0x1D670
-  otr_mode: index
+  offset: 0x1d670
+  otr_mode: index
+d_course_kalimari_desert_locomotive_model_lod0:
+  symbol: d_course_kalimari_desert_locomotive_model_lod0
+  type: vtx
+  offset: 0x1d688
+  count: 10
+d_course_kalimari_desert_unknown_lod0_locomotive_model1:
+  symbol: d_course_kalimari_desert_unknown_lod0_locomotive_model1
+  type: vtx
+  offset: 0x1d728
+  count: 8
+d_course_kalimari_desert_unknown_lod0_locomotive_model2:
+  symbol: d_course_kalimari_desert_unknown_lod0_locomotive_model2
+  type: vtx
+  offset: 0x1d7a8
+  count: 8
+d_course_kalimari_desert_unknown_lod0_locomotive_model3:
+  symbol: d_course_kalimari_desert_unknown_lod0_locomotive_model3
+  type: vtx
+  offset: 0x1d828
+  count: 32
+d_course_kalimari_desert_unknown_lod0_locomotive_model4:
+  symbol: d_course_kalimari_desert_unknown_lod0_locomotive_model4
+  type: vtx
+  offset: 0x1da28
+  count: 14
+d_course_kalimari_desert_unknown_lod0_locomotive_model5:
+  symbol: d_course_kalimari_desert_unknown_lod0_locomotive_model5
+  type: vtx
+  offset: 0x1db08
+  count: 12
+d_course_kalimari_desert_unknown_lod0_locomotive_model6:
+  symbol: d_course_kalimari_desert_unknown_lod0_locomotive_model6
+  type: vtx
+  offset: 0x1dbc8
+  count: 4
+d_course_kalimari_desert_unknown_lod0_locomotive_model7:
+  symbol: d_course_kalimari_desert_unknown_lod0_locomotive_model7
+  type: vtx
+  offset: 0x1dc08
+  count: 4
+d_course_kalimari_desert_unknown_lod0_locomotive_model8:
+  symbol: d_course_kalimari_desert_unknown_lod0_locomotive_model8
+  type: vtx
+  offset: 0x1dc48
+  count: 16
+d_course_kalimari_desert_unknown_lod0_locomotive_model9:
+  symbol: d_course_kalimari_desert_unknown_lod0_locomotive_model9
+  type: vtx
+  offset: 0x1dd48
+  count: 4
+d_course_kalimari_desert_unknown_lod0_locomotive_model10:
+  symbol: d_course_kalimari_desert_unknown_lod0_locomotive_model10
+  type: vtx
+  offset: 0x1dd88
+  count: 8
+d_course_kalimari_desert_unknown_lod0_locomotive_model11:
+  symbol: d_course_kalimari_desert_unknown_lod0_locomotive_model11
+  type: vtx
+  offset: 0x1de08
+  count: 30
+d_course_kalimari_desert_unknown_lod0_locomotive_model12:
+  symbol: d_course_kalimari_desert_unknown_lod0_locomotive_model12
+  type: vtx
+  offset: 0x1dfe8
+  count: 19
+d_course_kalimari_desert_unknown_lod0_locomotive_model13:
+  symbol: d_course_kalimari_desert_unknown_lod0_locomotive_model13
+  type: vtx
+  offset: 0x1e118
+  count: 27
 d_course_kalimari_desert_dl_1E2C8:
   symbol: d_course_kalimari_desert_dl_1E2C8
   type: gfx
-  offset: 0x1E2C8
+  offset: 0x1e2c8
   otr_mode: index
 d_course_kalimari_desert_dl_1E358:
   symbol: d_course_kalimari_desert_dl_1E358
   type: gfx
-  offset: 0x1E358
+  offset: 0x1e358
   otr_mode: index
 d_course_kalimari_desert_dl_1E458:
   symbol: d_course_kalimari_desert_dl_1E458
   type: gfx
-  offset: 0x1E458
+  offset: 0x1e458
   otr_mode: index
 d_course_kalimari_desert_dl_1E470:
   symbol: d_course_kalimari_desert_dl_1E470
   type: gfx
-  offset: 0x1E470
+  offset: 0x1e470
   otr_mode: index
 d_course_kalimari_desert_dl_1E480:
   symbol: d_course_kalimari_desert_dl_1E480
   type: gfx
-  offset: 0x1E480
+  offset: 0x1e480
   otr_mode: index
 d_course_kalimari_desert_dl_1E498:
   symbol: d_course_kalimari_desert_dl_1E498
   type: gfx
-  offset: 0x1E498
+  offset: 0x1e498
   otr_mode: index
 d_course_kalimari_desert_dl_1E6D8:
   symbol: d_course_kalimari_desert_dl_1E6D8
   type: gfx
-  offset: 0x1E6D8
+  offset: 0x1e6d8
   otr_mode: index
 d_course_kalimari_desert_dl_1E710:
   symbol: d_course_kalimari_desert_dl_1E710
   type: gfx
-  offset: 0x1E710
+  offset: 0x1e710
   otr_mode: index
 d_course_kalimari_desert_dl_1E800:
   symbol: d_course_kalimari_desert_dl_1E800
   type: gfx
-  offset: 0x1E800
+  offset: 0x1e800
   otr_mode: index
 d_course_kalimari_desert_dl_1E858:
   symbol: d_course_kalimari_desert_dl_1E858
   type: gfx
-  offset: 0x1E858
+  offset: 0x1e858
   otr_mode: index
 d_course_kalimari_desert_dl_1E8D0:
   symbol: d_course_kalimari_desert_dl_1E8D0
   type: gfx
-  offset: 0x1E8D0
+  offset: 0x1e8d0
   otr_mode: index
 d_course_kalimari_desert_dl_1E900:
   symbol: d_course_kalimari_desert_dl_1E900
   type: gfx
-  offset: 0x1E900
+  offset: 0x1e900
   otr_mode: index
 d_course_kalimari_desert_dl_1E910:
   symbol: d_course_kalimari_desert_dl_1E910
   type: gfx
-  offset: 0x1E910
-  otr_mode: index
+  offset: 0x1e910
+  otr_mode: index
+d_course_kalimari_desert_tender_model_lod2:
+  symbol: d_course_kalimari_desert_tender_model_lod2
+  type: vtx
+  offset: 0x1e928
+  count: 28
+d_course_kalimari_desert_unknown_lod2_tender_model1:
+  symbol: d_course_kalimari_desert_unknown_lod2_tender_model1
+  type: vtx
+  offset: 0x1eae8
+  count: 32
+d_course_kalimari_desert_unknown_lod2_tender_model2:
+  symbol: d_course_kalimari_desert_unknown_lod2_tender_model2
+  type: vtx
+  offset: 0x1ece8
+  count: 4
+d_course_kalimari_desert_unknown_lod2_tender_model3:
+  symbol: d_course_kalimari_desert_unknown_lod2_tender_model3
+  type: vtx
+  offset: 0x1ed28
+  count: 27
+d_course_kalimari_desert_unknown_lod2_tender_model4:
+  symbol: d_course_kalimari_desert_unknown_lod2_tender_model4
+  type: vtx
+  offset: 0x1eed8
+  count: 16
 d_course_kalimari_desert_dl_1EFD8:
   symbol: d_course_kalimari_desert_dl_1EFD8
   type: gfx
-  offset: 0x1EFD8
+  offset: 0x1efd8
   otr_mode: index
 d_course_kalimari_desert_dl_1F050:
   symbol: d_course_kalimari_desert_dl_1F050
   type: gfx
-  offset: 0x1F050
+  offset: 0x1f050
   otr_mode: index
 d_course_kalimari_desert_dl_1F0D8:
   symbol: d_course_kalimari_desert_dl_1F0D8
   type: gfx
-  offset: 0x1F0D8
+  offset: 0x1f0d8
   otr_mode: index
 d_course_kalimari_desert_dl_1F1F8:
   symbol: d_course_kalimari_desert_dl_1F1F8
   type: gfx
-  offset: 0x1F1F8
+  offset: 0x1f1f8
   otr_mode: index
 d_course_kalimari_desert_dl_1F218:
   symbol: d_course_kalimari_desert_dl_1F218
   type: gfx
-  offset: 0x1F218
+  offset: 0x1f218
   otr_mode: index
 d_course_kalimari_desert_dl_1F228:
   symbol: d_course_kalimari_desert_dl_1F228
   type: gfx
-  offset: 0x1F228
-  otr_mode: index
+  offset: 0x1f228
+  otr_mode: index
+d_course_kalimari_desert_tender_model_lod1:
+  symbol: d_course_kalimari_desert_tender_model_lod1
+  type: vtx
+  offset: 0x1f240
+  count: 23
+d_course_kalimari_desert_unknown_lod1_tender_model1:
+  symbol: d_course_kalimari_desert_unknown_lod1_tender_model1
+  type: vtx
+  offset: 0x1f3b0
+  count: 12
+d_course_kalimari_desert_unknown_lod1_tender_model2:
+  symbol: d_course_kalimari_desert_unknown_lod1_tender_model2
+  type: vtx
+  offset: 0x1f470
+  count: 16
 d_course_kalimari_desert_dl_1F570:
   symbol: d_course_kalimari_desert_dl_1F570
   type: gfx
-  offset: 0x1F570
+  offset: 0x1f570
   otr_mode: index
 d_course_kalimari_desert_dl_1F5E0:
   symbol: d_course_kalimari_desert_dl_1F5E0
   type: gfx
-  offset: 0x1F5E0
+  offset: 0x1f5e0
   otr_mode: index
 d_course_kalimari_desert_dl_1F6E0:
   symbol: d_course_kalimari_desert_dl_1F6E0
   type: gfx
-  offset: 0x1F6E0
+  offset: 0x1f6e0
   otr_mode: index
 d_course_kalimari_desert_dl_1F6F8:
   symbol: d_course_kalimari_desert_dl_1F6F8
   type: gfx
-  offset: 0x1F6F8
+  offset: 0x1f6f8
   otr_mode: index
 d_course_kalimari_desert_dl_1F708:
   symbol: d_course_kalimari_desert_dl_1F708
   type: gfx
-  offset: 0x1F708
+  offset: 0x1f708
   otr_mode: index
 d_course_kalimari_desert_dl_1F720:
   symbol: d_course_kalimari_desert_dl_1F720
   type: gfx
-  offset: 0x1F720
-  otr_mode: index
+  offset: 0x1f720
+  otr_mode: index
+d_course_kalimari_desert_tender_model_lod0:
+  symbol: d_course_kalimari_desert_tender_model_lod0
+  type: vtx
+  offset: 0x1f728
+  count: 16
+d_course_kalimari_desert_unknown_lod0_tender_model1:
+  symbol: d_course_kalimari_desert_unknown_lod0_tender_model1
+  type: vtx
+  offset: 0x1f828
+  count: 6
+d_course_kalimari_desert_unknown_lod0_tender_model2:
+  symbol: d_course_kalimari_desert_unknown_lod0_tender_model2
+  type: vtx
+  offset: 0x1f888
+  count: 16
 d_course_kalimari_desert_dl_1F988:
   symbol: d_course_kalimari_desert_dl_1F988
   type: gfx
-  offset: 0x1F988
+  offset: 0x1f988
   otr_mode: index
 d_course_kalimari_desert_dl_1F9D8:
   symbol: d_course_kalimari_desert_dl_1F9D8
   type: gfx
-  offset: 0x1F9D8
+  offset: 0x1f9d8
   otr_mode: index
 d_course_kalimari_desert_dl_1FAD0:
   symbol: d_course_kalimari_desert_dl_1FAD0
   type: gfx
-  offset: 0x1FAD0
+  offset: 0x1fad0
   otr_mode: index
 d_course_kalimari_desert_dl_1FAE8:
   symbol: d_course_kalimari_desert_dl_1FAE8
   type: gfx
-  offset: 0x1FAE8
+  offset: 0x1fae8
   otr_mode: index
 d_course_kalimari_desert_dl_1FAF8:
   symbol: d_course_kalimari_desert_dl_1FAF8
   type: gfx
-  offset: 0x1FAF8
+  offset: 0x1faf8
   otr_mode: index
 d_course_kalimari_desert_dl_1FB10:
   symbol: d_course_kalimari_desert_dl_1FB10
   type: gfx
-  offset: 0x1FB10
-  otr_mode: index
+  offset: 0x1fb10
+  otr_mode: index
+d_course_kalimari_desert_carriage_chassis_model_lod2:
+  symbol: d_course_kalimari_desert_carriage_chassis_model_lod2
+  type: vtx
+  offset: 0x1fb18
+  count: 12
+d_course_kalimari_desert_unknown_lod2_carriage_chassis_model1:
+  symbol: d_course_kalimari_desert_unknown_lod2_carriage_chassis_model1
+  type: vtx
+  offset: 0x1fbd8
+  count: 20
+d_course_kalimari_desert_unknown_lod2_carriage_chassis_model2:
+  symbol: d_course_kalimari_desert_unknown_lod2_carriage_chassis_model2
+  type: vtx
+  offset: 0x1fd18
+  count: 32
+d_course_kalimari_desert_unknown_lod2_carriage_chassis_model3:
+  symbol: d_course_kalimari_desert_unknown_lod2_carriage_chassis_model3
+  type: vtx
+  offset: 0x1ff18
+  count: 15
+d_course_kalimari_desert_unknown_lod2_carriage_chassis_model4:
+  symbol: d_course_kalimari_desert_unknown_lod2_carriage_chassis_model4
+  type: vtx
+  offset: 0x20008
+  count: 8
+d_course_kalimari_desert_unknown_lod2_carriage_chassis_model5:
+  symbol: d_course_kalimari_desert_unknown_lod2_carriage_chassis_model5
+  type: vtx
+  offset: 0x20088
+  count: 4
+d_course_kalimari_desert_unknown_lod2_carriage_chassis_model6:
+  symbol: d_course_kalimari_desert_unknown_lod2_carriage_chassis_model6
+  type: vtx
+  offset: 0x200c8
+  count: 12
+d_course_kalimari_desert_unknown_lod2_carriage_chassis_model7:
+  symbol: d_course_kalimari_desert_unknown_lod2_carriage_chassis_model7
+  type: vtx
+  offset: 0x20188
+  count: 32
+d_course_kalimari_desert_unknown_lod2_carriage_chassis_model8:
+  symbol: d_course_kalimari_desert_unknown_lod2_carriage_chassis_model8
+  type: vtx
+  offset: 0x20388
+  count: 4
+d_course_kalimari_desert_unknown_lod2_carriage_chassis_model9:
+  symbol: d_course_kalimari_desert_unknown_lod2_carriage_chassis_model9
+  type: vtx
+  offset: 0x203c8
+  count: 20
+d_course_kalimari_desert_unknown_lod2_carriage_chassis_model10:
+  symbol: d_course_kalimari_desert_unknown_lod2_carriage_chassis_model10
+  type: vtx
+  offset: 0x20508
+  count: 7
 d_course_kalimari_desert_dl_20578:
   symbol: d_course_kalimari_desert_dl_20578
   type: gfx
@@ -778,7 +1371,7 @@ d_course_kalimari_desert_dl_20688:
 d_course_kalimari_desert_dl_208A0:
   symbol: d_course_kalimari_desert_dl_208A0
   type: gfx
-  offset: 0x208A0
+  offset: 0x208a0
   otr_mode: index
 d_course_kalimari_desert_dl_20928:
   symbol: d_course_kalimari_desert_dl_20928
@@ -793,23 +1386,68 @@ d_course_kalimari_desert_dl_20980:
 d_course_kalimari_desert_dl_209C8:
   symbol: d_course_kalimari_desert_dl_209C8
   type: gfx
-  offset: 0x209C8
+  offset: 0x209c8
   otr_mode: index
 d_course_kalimari_desert_dl_209F8:
   symbol: d_course_kalimari_desert_dl_209F8
   type: gfx
-  offset: 0x209F8
+  offset: 0x209f8
   otr_mode: index
 d_course_kalimari_desert_dl_20A08:
   symbol: d_course_kalimari_desert_dl_20A08
   type: gfx
-  offset: 0x20A08
+  offset: 0x20a08
   otr_mode: index
 d_course_kalimari_desert_dl_20A20:
   symbol: d_course_kalimari_desert_dl_20A20
   type: gfx
-  offset: 0x20A20
-  otr_mode: index
+  offset: 0x20a20
+  otr_mode: index
+d_course_kalimari_desert_carriage_chassis_model_lod1:
+  symbol: d_course_kalimari_desert_carriage_chassis_model_lod1
+  type: vtx
+  offset: 0x20a38
+  count: 4
+d_course_kalimari_desert_unknown_lod1_carriage_chassis_model1:
+  symbol: d_course_kalimari_desert_unknown_lod1_carriage_chassis_model1
+  type: vtx
+  offset: 0x20a78
+  count: 16
+d_course_kalimari_desert_unknown_lod1_carriage_chassis_model2:
+  symbol: d_course_kalimari_desert_unknown_lod1_carriage_chassis_model2
+  type: vtx
+  offset: 0x20b78
+  count: 32
+d_course_kalimari_desert_unknown_lod1_carriage_chassis_model3:
+  symbol: d_course_kalimari_desert_unknown_lod1_carriage_chassis_model3
+  type: vtx
+  offset: 0x20d78
+  count: 17
+d_course_kalimari_desert_unknown_lod1_carriage_chassis_model4:
+  symbol: d_course_kalimari_desert_unknown_lod1_carriage_chassis_model4
+  type: vtx
+  offset: 0x20e88
+  count: 8
+d_course_kalimari_desert_unknown_lod1_carriage_chassis_model5:
+  symbol: d_course_kalimari_desert_unknown_lod1_carriage_chassis_model5
+  type: vtx
+  offset: 0x20f08
+  count: 4
+d_course_kalimari_desert_unknown_lod1_carriage_chassis_model6:
+  symbol: d_course_kalimari_desert_unknown_lod1_carriage_chassis_model6
+  type: vtx
+  offset: 0x20f48
+  count: 12
+d_course_kalimari_desert_unknown_lod1_carriage_chassis_model7:
+  symbol: d_course_kalimari_desert_unknown_lod1_carriage_chassis_model7
+  type: vtx
+  offset: 0x21008
+  count: 16
+d_course_kalimari_desert_unknown_lod1_carriage_chassis_model8:
+  symbol: d_course_kalimari_desert_unknown_lod1_carriage_chassis_model8
+  type: vtx
+  offset: 0x21108
+  count: 7
 d_course_kalimari_desert_dl_21178:
   symbol: d_course_kalimari_desert_dl_21178
   type: gfx
@@ -848,7 +1486,7 @@ d_course_kalimari_desert_dl_21480:
 d_course_kalimari_desert_dl_214D0:
   symbol: d_course_kalimari_desert_dl_214D0
   type: gfx
-  offset: 0x214D0
+  offset: 0x214d0
   otr_mode: index
 d_course_kalimari_desert_dl_21518:
   symbol: d_course_kalimari_desert_dl_21518
@@ -865,94 +1503,141 @@ d_course_kalimari_desert_dl_21550:
   type: gfx
   offset: 0x21550
   otr_mode: index
+d_course_kalimari_desert_carriage_model_lod0:
+  symbol: d_course_kalimari_desert_carriage_model_lod0
+  type: vtx
+  offset: 0x21568
+  count: 4
+d_course_kalimari_desert_unknown_lod0_carriage_model1:
+  symbol: d_course_kalimari_desert_unknown_lod0_carriage_model1
+  type: vtx
+  offset: 0x215a8
+  count: 16
+d_course_kalimari_desert_unknown_lod0_carriage_model2:
+  symbol: d_course_kalimari_desert_unknown_lod0_carriage_model2
+  type: vtx
+  offset: 0x216a8
+  count: 16
+d_course_kalimari_desert_unknown_lod0_carriage_model3:
+  symbol: d_course_kalimari_desert_unknown_lod0_carriage_model3
+  type: vtx
+  offset: 0x217a8
+  count: 12
+d_course_kalimari_desert_unknown_lod0_carriage_model4:
+  symbol: d_course_kalimari_desert_unknown_lod0_carriage_model4
+  type: vtx
+  offset: 0x21868
+  count: 16
+d_course_kalimari_desert_unknown_lod0_carriage_model5:
+  symbol: d_course_kalimari_desert_unknown_lod0_carriage_model5
+  type: vtx
+  offset: 0x21968
+  count: 7
 d_course_kalimari_desert_dl_219D8:
   symbol: d_course_kalimari_desert_dl_219D8
   type: gfx
-  offset: 0x219D8
+  offset: 0x219d8
   otr_mode: index
 d_course_kalimari_desert_dl_21A60:
   symbol: d_course_kalimari_desert_dl_21A60
   type: gfx
-  offset: 0x21A60
+  offset: 0x21a60
   otr_mode: index
 d_course_kalimari_desert_dl_21A70:
   symbol: d_course_kalimari_desert_dl_21A70
   type: gfx
-  offset: 0x21A70
+  offset: 0x21a70
   otr_mode: index
 d_course_kalimari_desert_dl_21A80:
   symbol: d_course_kalimari_desert_dl_21A80
   type: gfx
-  offset: 0x21A80
+  offset: 0x21a80
   otr_mode: index
 d_course_kalimari_desert_dl_21A98:
   symbol: d_course_kalimari_desert_dl_21A98
   type: gfx
-  offset: 0x21A98
+  offset: 0x21a98
   otr_mode: index
 d_course_kalimari_desert_dl_21AE8:
   symbol: d_course_kalimari_desert_dl_21AE8
   type: gfx
-  offset: 0x21AE8
+  offset: 0x21ae8
   otr_mode: index
 d_course_kalimari_desert_dl_21BC0:
   symbol: d_course_kalimari_desert_dl_21BC0
   type: gfx
-  offset: 0x21BC0
+  offset: 0x21bc0
   otr_mode: index
 d_course_kalimari_desert_dl_21C10:
   symbol: d_course_kalimari_desert_dl_21C10
   type: gfx
-  offset: 0x21C10
+  offset: 0x21c10
   otr_mode: index
 d_course_kalimari_desert_dl_21C58:
   symbol: d_course_kalimari_desert_dl_21C58
   type: gfx
-  offset: 0x21C58
+  offset: 0x21c58
   otr_mode: index
 d_course_kalimari_desert_dl_21C80:
   symbol: d_course_kalimari_desert_dl_21C80
   type: gfx
-  offset: 0x21C80
+  offset: 0x21c80
   otr_mode: index
 d_course_kalimari_desert_dl_21C90:
   symbol: d_course_kalimari_desert_dl_21C90
   type: gfx
-  offset: 0x21C90
-  otr_mode: index
+  offset: 0x21c90
+  otr_mode: index
+d_course_kalimari_desert_unknown_model1:
+  symbol: d_course_kalimari_desert_unknown_model1
+  type: vtx
+  offset: 0x21ca8
+  count: 4
+d_course_kalimari_desert_unknown_model2:
+  symbol: d_course_kalimari_desert_unknown_model2
+  type: vtx
+  offset: 0x21ce8
+  count: 4
+d_course_kalimari_desert_train_bogie:
+  symbol: d_course_kalimari_desert_train_bogie
+  type: texture
+  offset: 0x21d28
+  width: 32
+  height: 64
+  format: rgba16
+  ctype: u8
 d_course_kalimari_desert_dl_22D28:
   symbol: d_course_kalimari_desert_dl_22D28
   type: gfx
-  offset: 0x22D28
+  offset: 0x22d28
   otr_mode: index
 d_course_kalimari_desert_dl_22D70:
   symbol: d_course_kalimari_desert_dl_22D70
   type: gfx
-  offset: 0x22D70
+  offset: 0x22d70
   otr_mode: index
 d_course_kalimari_desert_dl_22DB8:
   symbol: d_course_kalimari_desert_dl_22DB8
   type: gfx
-  offset: 0x22DB8
+  offset: 0x22db8
   otr_mode: index
 d_course_kalimari_desert_dl_22E00:
   symbol: d_course_kalimari_desert_dl_22E00
   type: gfx
-  offset: 0x22E00
+  offset: 0x22e00
   otr_mode: index
 d_course_kalimari_desert_item_box_spawns:
   symbol: d_course_kalimari_desert_item_box_spawns
   type: mk64:spawn_data
   offset: 0x22e88
-  count: 1
+  count: 16
 d_course_kalimari_desert_cactus_spawn:
   symbol: d_course_kalimari_desert_cactus_spawn
   type: mk64:spawn_data
   offset: 0x22f08
-  count: 1
-# todo need adjust count
+  count: 45
 d_course_kalimari_desert_addr:
   symbol: d_course_kalimari_desert_addr
   type: mk64:track_sections
   offset: 0x23070
-  count: 119
+  count: 102
diff --git a/yamls/us/kalimari_desert_displaylists.yml b/yamls/us/kalimari_desert_displaylists.yml
index 76c916fb9..e26c4fcbc 100644
--- a/yamls/us/kalimari_desert_displaylists.yml
+++ b/yamls/us/kalimari_desert_displaylists.yml
@@ -14,4 +14,4 @@ d_course_kalimari_desert_packed_dls:
   symbol: d_course_kalimari_desert_packed_dls
   type: blob
   offset: 0x934004
-  size: 0x2fbd
\ No newline at end of file
+  size: 0x2FC6
\ No newline at end of file