fix incorrect offsets and move skyboxes around

assets/ymls/us/actors/bobomb/bobomb.yml

@@ -1,41 +1,3 @@
-:config:
-  compressed_offset: 0x134D20
-  segments:
-    seg5: 0x134D20
-
-bob-omb_buddy_left_side:
-  type: TEXTURE
-  size: 4096
-  width: 32
-  height: 64
-  offset: 0x78
-  format: RGBA16
-  symbol: bobomb_seg8_texture_0801FA60
-bob-omb_buddy_right_side:
-  type: TEXTURE
-  size: 4096
-  width: 32
-  height: 64
-  offset: 0x1078
-  format: RGBA16
-  symbol: bobomb_seg8_texture_08020A60
-bob-omb_eyes:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x4878
-  format: RGBA16
-  symbol: bobomb_seg8_texture_08021A60
-bob-omb_eyes_blink:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x5078
-  format: RGBA16
-  symbol: bobomb_seg8_texture_08022260
-
 :config:
   compressed_offset: 0x1F2200
   segments:
@@ -57,3 +19,35 @@ bob-omb_right_side:
   offset: 0x1EA60
   format: RGBA16
   symbol: bobomb_seg8_texture_0801EA60
+bob-omb_buddy_left_side:
+  type: TEXTURE
+  size: 4096
+  width: 32
+  height: 64
+  offset: 0x1FA60
+  format: RGBA16
+  symbol: bobomb_seg8_texture_0801FA60
+bob-omb_buddy_right_side:
+  type: TEXTURE
+  size: 4096
+  width: 32
+  height: 64
+  offset: 0x20A60
+  format: RGBA16
+  symbol: bobomb_seg8_texture_08020A60
+bob-omb_eyes:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x21A60
+  format: RGBA16
+  symbol: bobomb_seg8_texture_08021A60
+bob-omb_eyes_blink:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x22260
+  format: RGBA16
+  symbol: bobomb_seg8_texture_08022260

assets/ymls/us/actors/chain_chomp/chain_chomp.yml

@@ -19,6 +19,14 @@ chain_chomp_dull_shine:
   offset: 0x21BD0
   format: RGBA16
   symbol: chain_chomp_seg6_texture_06021BD0
+chain_chomp_tooth:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x22BD0
+  format: RGBA16
+  symbol: chain_chomp_seg6_texture_06022BD0
 chain_chomp_eye:
   type: TEXTURE
   size: 2048
@@ -36,16 +44,3 @@ chain_chomp_tongue:
   format: RGBA16
   symbol: chain_chomp_seg6_texture_060223D0
 
-:config:
-  compressed_offset: 0x166C60
-  segments:
-    seg5: 0x166C60
-
-chain_chomp_tooth:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x6AF0
-  format: RGBA16
-  symbol: chain_chomp_seg6_texture_06022BD0

assets/ymls/us/actors/chillychief/chillychief.yml

@@ -1,17 +1,3 @@
-:config:
-  compressed_offset: 0x132C60
-  segments:
-    seg5: 0x132C60
-
-chill_bully_eye:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x2468
-  format: RGBA16
-  symbol: chilly_chief_seg6_texture_06002060
-
 :config:
   compressed_offset: 0x1E51F0
   segments:
@@ -33,6 +19,14 @@ chill_bully_right_side:
   offset: 0x1060
   format: RGBA16
   symbol: chilly_chief_seg6_texture_06001060
+chill_bully_eye:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x2060
+  format: RGBA16
+  symbol: chilly_chief_seg6_texture_06002060
 
 chilly_chief_geo:
   type: SM64:GEO_LAYOUT

assets/ymls/us/actors/dorrie/dorrie.yml

@@ -19,17 +19,11 @@ dorrie_skin:
   offset: 0x9DA0
   format: RGBA16
   symbol: dorrie_seg6_texture_06009DA0
-
-:config:
-  compressed_offset: 0x1C4230
-  segments:
-    seg6: 0x1C4230
-
 dorrie_tongue:
   type: TEXTURE
   size: 2048
   width: 32
   height: 32
-  offset: 0x223D0
+  offset: 0xADA0
   format: RGBA16
   symbol: dorrie_seg6_texture_0600ADA0

assets/ymls/us/actors/lakitu_cameraman/lakitu_cameraman.yml

@@ -3,6 +3,46 @@
   segments:
     seg6: 0x1D8310
 
+lakitu_cameraman_cloud_face_unused:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x0
+  format: RGBA16
+  symbol: lakitu_seg6_texture_06000000
+lakitu_cameraman_eyes_open:
+  type: TEXTURE
+  size: 4096
+  width: 64
+  height: 32
+  offset: 0x800
+  format: RGBA16
+  symbol: lakitu_seg6_texture_06000800
+lakitu_cameraman_eyes_closed:
+  type: TEXTURE
+  size: 4096
+  width: 64
+  height: 32
+  offset: 0x1800
+  format: RGBA16
+  symbol: lakitu_seg6_texture_06001800
+lakitu_cameraman_shell:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x2800
+  format: RGBA16
+  symbol: lakitu_seg6_texture_06002800
+lakitu_cameraman_frown:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x3000
+  format: RGBA16
+  symbol: lakitu_seg6_texture_06003000
 lakitu_camera_lens:
   type: TEXTURE
   size: 512
@@ -12,48 +52,3 @@ lakitu_camera_lens:
   format: RGBA16
   symbol: lakitu_seg6_texture_06003800
 
-:config:
-  compressed_offset: 0x180BB0
-  segments:
-    seg5: 0x180BB0
-
-lakitu_cameraman_cloud_face_unused:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0xECE0
-  format: RGBA16
-  symbol: lakitu_seg6_texture_06000000
-lakitu_cameraman_eyes_closed:
-  type: TEXTURE
-  size: 4096
-  width: 64
-  height: 32
-  offset: 0x104E0
-  format: RGBA16
-  symbol: lakitu_seg6_texture_06001800
-lakitu_cameraman_eyes_open:
-  type: TEXTURE
-  size: 4096
-  width: 64
-  height: 32
-  offset: 0xF4E0
-  format: RGBA16
-  symbol: lakitu_seg6_texture_06000800
-lakitu_cameraman_frown:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x11CE0
-  format: RGBA16
-  symbol: lakitu_seg6_texture_06003000
-lakitu_cameraman_shell:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x114E0
-  format: RGBA16
-  symbol: lakitu_seg6_texture_06002800

assets/ymls/us/actors/piranha_plant/piranha_plant.yml

@@ -3,22 +3,14 @@
   segments:
     seg6: 0x1C4230
 
-piranha_plant_bottom_lip:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x133F8
-  format: RGBA16
-  symbol: piranha_plant_seg6_texture_060133F8
-piranha_plant_leaf:
+piranha_plant_tongue:
   type: TEXTURE
   size: 4096
   width: 32
   height: 64
-  offset: 0x143F8
+  offset: 0x113F8
   format: RGBA16
-  symbol: piranha_plant_seg6_texture_060143F8
+  symbol: piranha_plant_seg6_texture_060113F8
 piranha_plant_skin:
   type: TEXTURE
   size: 2048
@@ -35,7 +27,14 @@ piranha_plant_stem:
   offset: 0x12BF8
   format: RGBA16
   symbol: piranha_plant_seg6_texture_06012BF8
-
+piranha_plant_bottom_lip:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x133F8
+  format: RGBA16
+  symbol: piranha_plant_seg6_texture_060133F8
 piranha_plant_tooth:
   type: TEXTURE
   size: 2048
@@ -44,17 +43,11 @@ piranha_plant_tooth:
   offset: 0x13BF8
   format: RGBA16
   symbol: piranha_plant_seg6_texture_06013BF8
-
-:config:
-  compressed_offset: 0x188440
-  segments:
-    seg6: 0x188440
-
-piranha_plant_tongue:
+piranha_plant_leaf:
   type: TEXTURE
   size: 4096
   width: 32
   height: 64
-  offset: 0x24438
+  offset: 0x143F8
   format: RGBA16
-  symbol: piranha_plant_seg6_texture_060113F8
+  symbol: piranha_plant_seg6_texture_060143F8

assets/ymls/us/actors/star/star.yml

@@ -1,17 +1,3 @@
-:config:
-  compressed_offset: 0x180BB0
-  segments:
-    seg5: 0x180BB0
-
-star_eye:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x7A30
-  format: RGBA16
-  symbol: star_seg3_texture_0302AEF0
-
 :config:
   compressed_offset: 0x201410
   segments:
@@ -25,3 +11,11 @@ star_surface:
   offset: 0x2A6F0
   format: RGBA16
   symbol: star_seg3_texture_0302A6F0
+star_eye:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x2AEF0
+  format: RGBA16
+  symbol: star_seg3_texture_0302AEF0

assets/ymls/us/levels/castle_inside/castle_inside.yml

@@ -3,6 +3,14 @@
   segments:
     seg7: 0x396340
 
+castle_light:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x0
+  format: IA16
+  symbol: texture_castle_light
 1:
   type: TEXTURE
   size: 2048
@@ -11,6 +19,70 @@
   offset: 0x800
   format: RGBA16
   symbol: inside_castle_seg7_texture_07000800
+2:
+  type: TEXTURE
+  size: 4096
+  width: 32
+  height: 64
+  offset: 0x1000
+  format: IA16
+  symbol: inside_castle_seg7_texture_07001000
+3:
+  type: TEXTURE
+  size: 4096
+  width: 32
+  height: 64
+  offset: 0x2000
+  format: RGBA16
+  symbol: inside_castle_seg7_texture_07002000
+4:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x3000
+  format: RGBA16
+  symbol: inside_castle_seg7_texture_07003000
+5:
+  type: TEXTURE
+  size: 4096
+  width: 32
+  height: 64
+  offset: 0x3800
+  format: RGBA16
+  symbol: inside_castle_seg7_texture_07003800
+6:
+  type: TEXTURE
+  size: 4096
+  width: 32
+  height: 64
+  offset: 0x4800
+  format: RGBA16
+  symbol: inside_castle_seg7_texture_07004800
+7:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x5800
+  format: RGBA16
+  symbol: inside_castle_seg7_texture_07005800
+8:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x6000
+  format: RGBA16
+  symbol: inside_castle_seg7_texture_07006000
+9:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x6800
+  format: RGBA16
+  symbol: inside_castle_seg7_texture_07006800
 10:
   type: TEXTURE
   size: 2048
@@ -172,14 +244,6 @@
   offset: 0x16800
   format: RGBA16
   symbol: inside_castle_seg7_texture_07016800
-3:
-  type: TEXTURE
-  size: 4096
-  width: 32
-  height: 64
-  offset: 0x2000
-  format: RGBA16
-  symbol: inside_castle_seg7_texture_07002000
 30:
   type: TEXTURE
   size: 2048
@@ -260,14 +324,6 @@
   offset: 0x1F800
   format: RGBA16
   symbol: inside_castle_seg7_texture_0701F800
-4:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x3000
-  format: RGBA16
-  symbol: inside_castle_seg7_texture_07003000
 40:
   type: TEXTURE
   size: 4096
@@ -276,71 +332,3 @@
   offset: 0x20800
   format: RGBA16
   symbol: inside_castle_seg7_texture_07020800
-5:
-  type: TEXTURE
-  size: 4096
-  width: 32
-  height: 64
-  offset: 0x3800
-  format: RGBA16
-  symbol: inside_castle_seg7_texture_07003800
-6:
-  type: TEXTURE
-  size: 4096
-  width: 32
-  height: 64
-  offset: 0x4800
-  format: RGBA16
-  symbol: inside_castle_seg7_texture_07004800
-7:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x5800
-  format: RGBA16
-  symbol: inside_castle_seg7_texture_07005800
-8:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x6000
-  format: RGBA16
-  symbol: inside_castle_seg7_texture_07006000
-9:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x6800
-  format: RGBA16
-  symbol: inside_castle_seg7_texture_07006800
-
-:config:
-  compressed_offset: 0x347A50
-  segments:
-    seg9: 0x347A50
-
-castle_light:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0xB800
-  format: IA16
-  symbol: texture_castle_light
-
-:config:
-  compressed_offset: 0x326E40
-  segments:
-    seg9: 0x326E40
-
-2:
-  type: TEXTURE
-  size: 4096
-  width: 32
-  height: 64
-  offset: 0xB800
-  format: IA16
-  symbol: inside_castle_seg7_texture_07001000

assets/ymls/us/levels/ccm/ccm.yml

@@ -19,30 +19,6 @@
   offset: 0x800
   format: RGBA16
   symbol: ccm_seg7_texture_07000800
-10:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x4300
-  format: RGBA16
-  symbol: ccm_seg7_texture_07004300
-11:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x4B00
-  format: RGBA16
-  symbol: ccm_seg7_texture_07004B00
-12:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x11958
-  format: RGBA16
-  symbol: ccm_seg7_texture_07011958
 2:
   type: TEXTURE
   size: 2048
@@ -67,7 +43,22 @@
   offset: 0x1900
   format: RGBA16
   symbol: ccm_seg7_texture_07001900
-
+5:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x2100
+  format: RGBA16
+  symbol: ccm_seg7_texture_07002100
+6:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x2900
+  format: RGBA16
+  symbol: ccm_seg7_texture_07002900
 7:
   type: TEXTURE
   size: 2048
@@ -92,25 +83,27 @@
   offset: 0x3B00
   format: IA16
   symbol: ccm_seg7_texture_07003B00
-
-:config:
-  compressed_offset: 0x160670
-  segments:
-    seg5: 0x160670
-
-5:
+10:
   type: TEXTURE
   size: 2048
   width: 32
   height: 32
-  offset: 0xBC70
+  offset: 0x4300
   format: RGBA16
-  symbol: ccm_seg7_texture_07002100
-6:
+  symbol: ccm_seg7_texture_07004300
+11:
   type: TEXTURE
   size: 2048
   width: 32
   height: 32
-  offset: 0xB470
+  offset: 0x4B00
   format: RGBA16
-  symbol: ccm_seg7_texture_07002900
+  symbol: ccm_seg7_texture_07004B00
+12:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x11958
+  format: RGBA16
+  symbol: ccm_seg7_texture_07011958

assets/ymls/us/levels/ddd/ddd.yml

@@ -11,7 +11,14 @@
   offset: 0x0
   format: RGBA16
   symbol: ddd_seg7_texture_07000000
-
+1:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x1000
+  format: RGBA16
+  symbol: ddd_seg7_texture_07001000
 2:
   type: TEXTURE
   size: 2048
@@ -37,16 +44,3 @@
   format: RGBA16
   symbol: ddd_seg7_texture_07003000
 
-:config:
-  compressed_offset: 0x347A50
-  segments:
-    seg9: 0x347A50
-
-1:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x1000
-  format: RGBA16
-  symbol: ddd_seg7_texture_07001000

assets/ymls/us/levels/hmc/hmc.yml

@@ -59,17 +59,11 @@
   offset: 0x4800
   format: RGBA16
   symbol: hmc_seg7_texture_07004800
-
-:config:
-  compressed_offset: 0x396340
-  segments:
-    seg7: 0x396340
-
 7:
   type: TEXTURE
   size: 2048
   width: 32
   height: 32
-  offset: 0x16800
+  offset: 0x24CE0
   format: RGBA16
   symbol: hmc_seg7_texture_07024CE0

assets/ymls/us/levels/jrb/jrb.yml

@@ -1,22 +1,16 @@
 :config:
-  compressed_offset: 0x347A50
+  compressed_offset: 0x41A760
   segments:
-    seg9: 0x347A50
+    seg7: 0x41A760
 
 0:
   type: TEXTURE
   size: 2048
   width: 32
   height: 32
-  offset: 0x1000
+  offset: 0x0
   format: RGBA16
   symbol: jrb_seg7_texture_07000000
-
-:config:
-  compressed_offset: 0x41A760
-  segments:
-    seg7: 0x41A760
-
 1:
   type: TEXTURE
   size: 4096

assets/ymls/us/levels/lll/lll.yml

@@ -19,6 +19,70 @@
   offset: 0x800
   format: RGBA16
   symbol: lll_seg7_texture_07000800
+2:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x1000
+  format: RGBA16
+  symbol: lll_seg7_texture_07001000
+3:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x1800
+  format: RGBA16
+  symbol: lll_seg7_texture_07001800
+4:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x2000
+  format: RGBA16
+  symbol: lll_seg7_texture_07002000
+5:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x2800
+  format: RGBA16
+  symbol: lll_seg7_texture_07002800
+6:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x3000
+  format: RGBA16
+  symbol: lll_seg7_texture_07003000
+7:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x3800
+  format: RGBA16
+  symbol: lll_seg7_texture_07003800
+8:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x4000
+  format: RGBA16
+  symbol: lll_seg7_texture_07004000
+9:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x4800
+  format: RGBA16
+  symbol: lll_seg7_texture_07004800
 10:
   type: TEXTURE
   size: 2048
@@ -99,14 +163,6 @@
   offset: 0x9800
   format: RGBA16
   symbol: lll_seg7_texture_07009800
-2:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x1000
-  format: RGBA16
-  symbol: lll_seg7_texture_07001000
 20:
   type: TEXTURE
   size: 2048
@@ -163,7 +219,14 @@
   offset: 0xD000
   format: RGBA16
   symbol: lll_seg7_texture_0700D000
-
+27:
+  type: TEXTURE
+  size: 512
+  width: 16
+  height: 16
+  offset: 0xD200
+  format: IA16
+  symbol: lll_seg7_texture_0700D200
 28:
   type: TEXTURE
   size: 2048
@@ -180,14 +243,6 @@
   offset: 0xDC00
   format: RGBA16
   symbol: lll_seg7_texture_0700DC00
-3:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x1800
-  format: RGBA16
-  symbol: lll_seg7_texture_07001800
 30:
   type: TEXTURE
   size: 2048
@@ -212,73 +267,3 @@
   offset: 0xF400
   format: RGBA16
   symbol: lll_seg7_texture_0700F400
-4:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x2000
-  format: RGBA16
-  symbol: lll_seg7_texture_07002000
-5:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x2800
-  format: RGBA16
-  symbol: lll_seg7_texture_07002800
-6:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x3000
-  format: RGBA16
-  symbol: lll_seg7_texture_07003000
-
-8:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x4000
-  format: RGBA16
-  symbol: lll_seg7_texture_07004000
-9:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x4800
-  format: RGBA16
-  symbol: lll_seg7_texture_07004800
-
-:config:
-  compressed_offset: 0x31E1D0
-  segments:
-    seg9: 0x31E1D0
-
-7:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x1800
-  format: RGBA16
-  symbol: lll_seg7_texture_07003800
-
-:config:
-  compressed_offset: 0x383950
-  segments:
-    seg7: 0x383950
-
-27:
-  type: TEXTURE
-  size: 512
-  width: 16
-  height: 16
-  offset: 0x383950
-  mio0: 0x3900
-  format: IA16
-  symbol: lll_seg7_texture_0700D200

assets/ymls/us/levels/ssl/ssl.yml

@@ -19,22 +19,6 @@
   offset: 0x800
   format: IA16
   symbol: ssl_seg7_texture_07000800
-10:
-  type: TEXTURE
-  size: 4096
-  width: 32
-  height: 64
-  offset: 0xD7A8
-  format: RGBA16
-  symbol: ssl_seg7_texture_0700D7A8
-11:
-  type: TEXTURE
-  size: 4096
-  width: 32
-  height: 64
-  offset: 0xE7A8
-  format: RGBA16
-  symbol: ssl_seg7_texture_0700E7A8
 2:
   type: TEXTURE
   size: 2048
@@ -75,7 +59,14 @@
   offset: 0x3800
   format: RGBA16
   symbol: ssl_seg7_texture_07003800
-
+7:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x4018
+  format: RGBA16
+  symbol: ssl_quicksand
 8:
   type: TEXTURE
   size: 2048
@@ -92,17 +83,20 @@
   offset: 0xC7A8
   format: RGBA16
   symbol: ssl_seg7_texture_0700C7A8
-
-:config:
-  compressed_offset: 0x32D070
-  segments:
-    seg9: 0x32D070
-
-7:
+10:
   type: TEXTURE
-  size: 2048
+  size: 4096
   width: 32
-  height: 32
-  offset: 0x8000
+  height: 64
+  offset: 0xD7A8
   format: RGBA16
-  symbol: ssl_quicksand
+  symbol: ssl_seg7_texture_0700D7A8
+11:
+  type: TEXTURE
+  size: 4096
+  width: 32
+  height: 64
+  offset: 0xE7A8
+  format: RGBA16
+  symbol: ssl_seg7_texture_0700E7A8
+

assets/ymls/us/levels/ttm/ttm.yml

@@ -67,17 +67,11 @@
   offset: 0x4000
   format: RGBA16
   symbol: ttm_seg7_texture_07004000
-
-:config:
-  compressed_offset: 0x351960
-  segments:
-    seg9: 0x351960
-
 8:
   type: TEXTURE
   size: 2048
   width: 32
   height: 32
-  offset: 0xA800
+  offset: 0x2AD30
   format: RGBA16
   symbol: ttm_seg7_texture_0702AD30

assets/ymls/us/levels/wf/wf.yml

@@ -43,17 +43,11 @@
   offset: 0x2000
   format: RGBA16
   symbol: wf_seg7_texture_07002000
-
-:config:
-  compressed_offset: 0x108A40
-  segments:
-    seg2: 0x108A40
-
 5:
   type: TEXTURE
   size: 256
   width: 16
   height: 16
-  offset: 0x121B8
+  offset: 0x2800
   format: IA8
   symbol: wf_seg7_texture_07002800

assets/ymls/us/textures/cave.yml

@@ -131,17 +131,11 @@ hmc_textures.0B800:
   offset: 0xB800
   format: IA16
   symbol: cave_0900B800
-
-:config:
-  compressed_offset: 0x326E40
-  segments:
-    seg9: 0x326E40
-
 hmc_textures.0C000:
   type: TEXTURE
   size: 2048
   width: 32
   height: 32
-  offset: 0xA800
+  offset: 0xC000
   format: IA16
   symbol: cave_0900C000

assets/ymls/us/textures/fire.yml

@@ -147,7 +147,14 @@ lll_textures.08800:
   offset: 0x8800
   format: RGBA16
   symbol: fire_09008800
-
+lll_textures.09000:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x9000
+  format: RGBA16
+  symbol: fire_09009000
 lll_textures.09800:
   type: TEXTURE
   size: 2048
@@ -188,17 +195,3 @@ lll_textures.0B800:
   offset: 0xB800
   format: RGBA16
   symbol: fire_0900B800
-
-:config:
-  compressed_offset: 0x108A40
-  segments:
-    seg2: 0x108A40
-
-lll_textures.09000:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x16AB8
-  format: RGBA16
-  symbol: fire_09009000

assets/ymls/us/textures/generic.yml

@@ -11,7 +11,14 @@ bob_textures.00000:
   offset: 0x0
   format: RGBA16
   symbol: generic_09000000
-
+bob_textures.00800:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x800
+  format: RGBA16
+  symbol: generic_09000800
 bob_textures.01000:
   type: TEXTURE
   size: 2048
@@ -172,17 +179,3 @@ bob_textures.0B000:
   offset: 0xB000
   format: IA16
   symbol: generic_0900B000
-
-:config:
-  compressed_offset: 0x145E90
-  segments:
-    seg5: 0x145E90
-
-bob_textures.00800:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x8D40
-  format: RGBA16
-  symbol: generic_09000800

assets/ymls/us/textures/grass.yml

@@ -99,7 +99,14 @@ wf_textures.05800:
   offset: 0x5800
   format: RGBA16
   symbol: grass_09005800
-
+wf_textures.06000:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x6000
+  format: RGBA16
+  symbol: grass_09006000
 wf_textures.06800:
   type: TEXTURE
   size: 2048
@@ -172,35 +179,6 @@ wf_textures.0A800:
   offset: 0xA800
   format: RGBA16
   symbol: grass_0900A800
-
-wf_textures.0B800:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0xB800
-  format: IA16
-  symbol: grass_0900B800
-
-:config:
-  compressed_offset: 0x33D710
-  segments:
-    seg9: 0x33D710
-
-wf_textures.06000:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x5000
-  format: RGBA16
-  symbol: grass_09006000
-
-:config:
-  compressed_offset: 0x32D070
-  segments:
-    seg9: 0x32D070
-
 wf_textures.0B000:
   type: TEXTURE
   size: 2048
@@ -209,3 +187,11 @@ wf_textures.0B000:
   offset: 0xB000
   format: IA16
   symbol: grass_0900B000
+wf_textures.0B800:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0xB800
+  format: IA16
+  symbol: grass_0900B800