diff --git a/assets/ymls/jp/actors/bobomb.yml b/assets/ymls/jp/actors/bobomb.yml
index 4ae6d01a..9ae06419 100644
--- a/assets/ymls/jp/actors/bobomb.yml
+++ b/assets/ymls/jp/actors/bobomb.yml
@@ -5,42 +5,6 @@
   segments:
     - [0x08,  0x1F0530]
 
-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
-
 bob-omb_left_side:
   type: TEXTURE
   size: 4096
@@ -59,6 +23,42 @@ bob-omb_right_side:
   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
+
 bobomb_seg8_vertex_08022A60:
   type: VTX
   count: 6
@@ -132,7 +132,7 @@ bobomb_seg8_lights_08022E00:
 bobomb_lights_unused:
   type: LIGHTS
   size: 24
-  offset: 0x22E00
+  offset: 0x22E18
   symbol: bobomb_lights_unused
 
 bobomb_seg8_vertex_08022E30:
diff --git a/assets/ymls/jp/actors/bookend.yml b/assets/ymls/jp/actors/bookend.yml
index 56f48031..9971d2a5 100644
--- a/assets/ymls/jp/actors/bookend.yml
+++ b/assets/ymls/jp/actors/bookend.yml
@@ -5,6 +5,30 @@
   segments:
     - [0x05,  0x165060]
 
+bookend_lights_unused1:
+  type: LIGHTS
+  size: 24
+  offset: 0x0
+  symbol: bookend_lights_unused1
+
+bookend_lights_unused2:
+  type: LIGHTS
+  size: 24
+  offset: 0x18
+  symbol: bookend_lights_unused2
+
+bookend_lights_unused3:
+  type: LIGHTS
+  size: 24
+  offset: 0x30
+  symbol: bookend_lights_unused3
+
+bookend_lights_unused4:
+  type: LIGHTS
+  size: 24
+  offset: 0x48
+  symbol: bookend_lights_unused4
+
 bookend_spine:
   type: TEXTURE
   size: 1024
@@ -226,27 +250,3 @@ bookend_seg5_dl_050022E0:
   offset: 0x22E0
   symbol: bookend_seg5_dl_050022E0
 
-bookend_lights_unused1:
-  type: LIGHTS
-  size: 24
-  offset: 0x6C08
-  symbol: bookend_lights_unused1
-
-bookend_lights_unused2:
-  type: LIGHTS
-  size: 24
-  offset: 0x6C08
-  symbol: bookend_lights_unused2
-
-bookend_lights_unused3:
-  type: LIGHTS
-  size: 24
-  offset: 0x6C08
-  symbol: bookend_lights_unused3
-
-bookend_lights_unused4:
-  type: LIGHTS
-  size: 24
-  offset: 0x6C08
-  symbol: bookend_lights_unused4
-
diff --git a/assets/ymls/jp/actors/bub.yml b/assets/ymls/jp/actors/bub.yml
index 720919c7..debfd164 100644
--- a/assets/ymls/jp/actors/bub.yml
+++ b/assets/ymls/jp/actors/bub.yml
@@ -5,42 +5,6 @@
   segments:
     - [0x06,  0x1B8010]
 
-bub_eyes:
-  type: TEXTURE
-  size: 4096
-  width: 64
-  height: 32
-  offset: 0x408
-  format: RGBA16
-  symbol: bub_seg6_texture_0600F2A8
-
-bub_eye_border:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x1408
-  format: RGBA16
-  symbol: bub_seg6_texture_0600E2A8
-
-bub_fins:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x1C08
-  format: RGBA16
-  symbol: bub_seg6_texture_0600EAA8
-
-bub_scales:
-  type: TEXTURE
-  size: 4096
-  width: 64
-  height: 32
-  offset: 0x2408
-  format: RGBA16
-  symbol: bub_seg6_texture_060102A8
-
 bub_seg6_lights_0600E280:
   type: LIGHTS
   size: 24
@@ -53,6 +17,42 @@ bub_seg6_lights_0600E290:
   offset: 0xE290
   symbol: bub_seg6_lights_0600E290
 
+bub_eye_border:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0xE2A8
+  format: RGBA16
+  symbol: bub_seg6_texture_0600E2A8
+
+bub_fins:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0xEAA8
+  format: RGBA16
+  symbol: bub_seg6_texture_0600EAA8
+
+bub_eyes:
+  type: TEXTURE
+  size: 4096
+  width: 64
+  height: 32
+  offset: 0xF2A8
+  format: RGBA16
+  symbol: bub_seg6_texture_0600F2A8
+
+bub_scales:
+  type: TEXTURE
+  size: 4096
+  width: 64
+  height: 32
+  offset: 0x102A8
+  format: RGBA16
+  symbol: bub_seg6_texture_060102A8
+
 bub_seg6_vertex_060112A8:
   type: VTX
   count: 14
diff --git a/assets/ymls/jp/actors/chain_chomp.yml b/assets/ymls/jp/actors/chain_chomp.yml
index 1e0b631a..116182bc 100644
--- a/assets/ymls/jp/actors/chain_chomp.yml
+++ b/assets/ymls/jp/actors/chain_chomp.yml
@@ -5,15 +5,6 @@
   segments:
     - [0x06,  0x1C2580]
 
-chain_chomp_tooth:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x6AF0
-  format: RGBA16
-  symbol: chain_chomp_seg6_texture_06022BD0
-
 chain_chomp_lights_unused1:
   type: LIGHTS
   size: 24
@@ -59,6 +50,15 @@ chain_chomp_tongue:
   format: RGBA16
   symbol: chain_chomp_seg6_texture_060223D0
 
+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
diff --git a/assets/ymls/jp/actors/chillychief.yml b/assets/ymls/jp/actors/chillychief.yml
index 372696f2..9f98611f 100644
--- a/assets/ymls/jp/actors/chillychief.yml
+++ b/assets/ymls/jp/actors/chillychief.yml
@@ -52,7 +52,7 @@ chill_bully_eye:
   size: 2048
   width: 32
   height: 32
-  offset: 0x2468
+  offset: 0x2060
   format: RGBA16
   symbol: chilly_chief_seg6_texture_06002060
 
diff --git a/assets/ymls/jp/actors/chuckya.yml b/assets/ymls/jp/actors/chuckya.yml
index 6e5eb8b8..985e2533 100644
--- a/assets/ymls/jp/actors/chuckya.yml
+++ b/assets/ymls/jp/actors/chuckya.yml
@@ -5,6 +5,48 @@
   segments:
     - [0x08,  0x1F0530]
 
+chuckya_lights_unused1:
+  type: LIGHTS
+  size: 24
+  offset: 0x66D0
+  symbol: chuckya_lights_unused1
+
+chuckya_lights_unused2:
+  type: LIGHTS
+  size: 24
+  offset: 0x66E8
+  symbol: chuckya_lights_unused2
+
+chuckya_lights_unused3:
+  type: LIGHTS
+  size: 24
+  offset: 0x6700
+  symbol: chuckya_lights_unused3
+
+chuckya_lights_unused4:
+  type: LIGHTS
+  size: 24
+  offset: 0x6718
+  symbol: chuckya_lights_unused4
+
+chuckya_lights_unused5:
+  type: LIGHTS
+  size: 24
+  offset: 0x6730
+  symbol: chuckya_lights_unused5
+
+chuckya_lights_unused6:
+  type: LIGHTS
+  size: 24
+  offset: 0x6748
+  symbol: chuckya_lights_unused6
+
+chuckya_lights_unused7:
+  type: LIGHTS
+  size: 24
+  offset: 0x6760
+  symbol: chuckya_lights_unused7
+
 chuckya_eyes:
   type: TEXTURE
   size: 4096
@@ -264,45 +306,3 @@ chuckya_seg8_dl_0800ABE8:
   offset: 0xABE8
   symbol: chuckya_seg8_dl_0800ABE8
 
-chuckya_lights_unused1:
-  type: LIGHTS
-  size: 24
-  offset: 0x1CB00
-  symbol: chuckya_lights_unused1
-
-chuckya_lights_unused2:
-  type: LIGHTS
-  size: 24
-  offset: 0x1CB00
-  symbol: chuckya_lights_unused2
-
-chuckya_lights_unused3:
-  type: LIGHTS
-  size: 24
-  offset: 0x1CB00
-  symbol: chuckya_lights_unused3
-
-chuckya_lights_unused4:
-  type: LIGHTS
-  size: 24
-  offset: 0x1CB00
-  symbol: chuckya_lights_unused4
-
-chuckya_lights_unused5:
-  type: LIGHTS
-  size: 24
-  offset: 0x1CB00
-  symbol: chuckya_lights_unused5
-
-chuckya_lights_unused6:
-  type: LIGHTS
-  size: 24
-  offset: 0x1CB00
-  symbol: chuckya_lights_unused6
-
-chuckya_lights_unused7:
-  type: LIGHTS
-  size: 24
-  offset: 0x1CB00
-  symbol: chuckya_lights_unused7
-
diff --git a/assets/ymls/jp/actors/clam_shell.yml b/assets/ymls/jp/actors/clam_shell.yml
index 256d90ef..3a39ae58 100644
--- a/assets/ymls/jp/actors/clam_shell.yml
+++ b/assets/ymls/jp/actors/clam_shell.yml
@@ -5,6 +5,18 @@
   segments:
     - [0x05,  0x139D10]
 
+clam_shell_lights_unused1:
+  type: LIGHTS
+  size: 24
+  offset: 0x0
+  symbol: clam_shell_lights_unused1
+
+clam_shell_lights_unused2:
+  type: LIGHTS
+  size: 24
+  offset: 0x18
+  symbol: clam_shell_lights_unused2
+
 clam_shell:
   type: TEXTURE
   size: 2048
@@ -89,15 +101,3 @@ clam_shell_seg5_dl_05001568:
   offset: 0x1568
   symbol: clam_shell_seg5_dl_05001568
 
-clam_shell_lights_unused1:
-  type: LIGHTS
-  size: 24
-  offset: 0x130B0
-  symbol: clam_shell_lights_unused1
-
-clam_shell_lights_unused2:
-  type: LIGHTS
-  size: 24
-  offset: 0x130B0
-  symbol: clam_shell_lights_unused2
-
diff --git a/assets/ymls/jp/actors/cyan_fish.yml b/assets/ymls/jp/actors/cyan_fish.yml
index 9d5e449d..e36b739a 100644
--- a/assets/ymls/jp/actors/cyan_fish.yml
+++ b/assets/ymls/jp/actors/cyan_fish.yml
@@ -17,7 +17,7 @@ cyan_fish:
 cyan_fish_seg6_lights_0600DC68:
   type: LIGHTS
   size: 24
-  offset: 0xD468
+  offset: 0xDC68
   symbol: cyan_fish_seg6_lights_0600DC68
 
 cyan_fish_seg6_vertex_0600DC80:
diff --git a/assets/ymls/jp/actors/goomba.yml b/assets/ymls/jp/actors/goomba.yml
index 517030fa..b5047239 100644
--- a/assets/ymls/jp/actors/goomba.yml
+++ b/assets/ymls/jp/actors/goomba.yml
@@ -5,6 +5,18 @@
   segments:
     - [0x08,  0x1F0530]
 
+goomba_lights_unused1:
+  type: LIGHTS
+  size: 24
+  offset: 0x194A0
+  symbol: goomba_lights_unused1
+
+goomba_lights_unused2:
+  type: LIGHTS
+  size: 24
+  offset: 0x194B8
+  symbol: goomba_lights_unused2
+
 goomba_seg8_lights_080194D0:
   type: LIGHTS
   size: 24
@@ -320,15 +332,3 @@ goomba_seg8_dl_0801D760:
   offset: 0x1D760
   symbol: goomba_seg8_dl_0801D760
 
-goomba_lights_unused1:
-  type: LIGHTS
-  size: 24
-  offset: 0x22608
-  symbol: goomba_lights_unused1
-
-goomba_lights_unused2:
-  type: LIGHTS
-  size: 24
-  offset: 0x22608
-  symbol: goomba_lights_unused2
-
diff --git a/assets/ymls/jp/actors/koopa_shell.yml b/assets/ymls/jp/actors/koopa_shell.yml
index f01b497e..8f67b28f 100644
--- a/assets/ymls/jp/actors/koopa_shell.yml
+++ b/assets/ymls/jp/actors/koopa_shell.yml
@@ -5,24 +5,6 @@
   segments:
     - [0x08,  0x1F0530]
 
-koopa_shell_front:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x2648
-  format: RGBA16
-  symbol: koopa_shell_seg8_texture_080274A0
-
-koopa_shell_back:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x2E48
-  format: RGBA16
-  symbol: koopa_shell_seg8_texture_08027CA0
-
 koopa_shell_seg8_lights_08026388:
   type: LIGHTS
   size: 24
@@ -174,6 +156,24 @@ koopa_shell_seg8_lights_08027488:
   offset: 0x27488
   symbol: koopa_shell_seg8_lights_08027488
 
+koopa_shell_front:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x274A0
+  format: RGBA16
+  symbol: koopa_shell_seg8_texture_080274A0
+
+koopa_shell_back:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x27CA0
+  format: RGBA16
+  symbol: koopa_shell_seg8_texture_08027CA0
+
 koopa_shell_seg8_vertex_080284A0:
   type: VTX
   count: 10
diff --git a/assets/ymls/jp/actors/lakitu_cameraman.yml b/assets/ymls/jp/actors/lakitu_cameraman.yml
index 2b5c313e..43199559 100644
--- a/assets/ymls/jp/actors/lakitu_cameraman.yml
+++ b/assets/ymls/jp/actors/lakitu_cameraman.yml
@@ -5,6 +5,51 @@
   segments:
     - [0x06,  0x1D6660]
 
+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
@@ -332,47 +377,3 @@ lakitu_seg6_dl_06005610:
   offset: 0x5610
   symbol: lakitu_seg6_dl_06005610
 
-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_open:
-  type: TEXTURE
-  size: 4096
-  width: 64
-  height: 32
-  offset: 0xF4E0
-  format: RGBA16
-  symbol: lakitu_seg6_texture_06000800
-
-lakitu_cameraman_eyes_closed:
-  type: TEXTURE
-  size: 4096
-  width: 64
-  height: 32
-  offset: 0x104E0
-  format: RGBA16
-  symbol: lakitu_seg6_texture_06001800
-
-lakitu_cameraman_shell:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x114E0
-  format: RGBA16
-  symbol: lakitu_seg6_texture_06002800
-
-lakitu_cameraman_frown:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x11CE0
-  format: RGBA16
-  symbol: lakitu_seg6_texture_06003000
diff --git a/assets/ymls/jp/actors/lakitu_enemy.yml b/assets/ymls/jp/actors/lakitu_enemy.yml
index e6876cd7..2c260314 100644
--- a/assets/ymls/jp/actors/lakitu_enemy.yml
+++ b/assets/ymls/jp/actors/lakitu_enemy.yml
@@ -8,7 +8,7 @@
 lakitu_enemy_lights_unused1:
   type: LIGHTS
   size: 24
-  offset: 0xE38
+  offset: 0xEC98
   symbol: lakitu_enemy_lights_unused1
 
 lakitu_enemy_seg5_lights_0500ECB0:
diff --git a/assets/ymls/jp/actors/monty_mole.yml b/assets/ymls/jp/actors/monty_mole.yml
index 868aa975..bea7cbf8 100644
--- a/assets/ymls/jp/actors/monty_mole.yml
+++ b/assets/ymls/jp/actors/monty_mole.yml
@@ -5,6 +5,42 @@
   segments:
     - [0x05,  0x1505D0]
 
+monty_mole_lights_unused1:
+  type: LIGHTS
+  size: 24
+  offset: 0x8E0
+  symbol: monty_mole_lights_unused1
+
+monty_mole_lights_unused2:
+  type: LIGHTS
+  size: 24
+  offset: 0x8F8
+  symbol: monty_mole_lights_unused2
+
+monty_mole_lights_unused3:
+  type: LIGHTS
+  size: 24
+  offset: 0x910
+  symbol: monty_mole_lights_unused3
+
+monty_mole_lights_unused4:
+  type: LIGHTS
+  size: 24
+  offset: 0x928
+  symbol: monty_mole_lights_unused4
+
+monty_mole_lights_unused5:
+  type: LIGHTS
+  size: 24
+  offset: 0x940
+  symbol: monty_mole_lights_unused5
+
+monty_mole_lights_unused6:
+  type: LIGHTS
+  size: 24
+  offset: 0x958
+  symbol: monty_mole_lights_unused6
+
 monty_mole_cheek:
   type: TEXTURE
   size: 2048
@@ -360,39 +396,3 @@ monty_mole_seg5_dl_05004D30:
   offset: 0x4D30
   symbol: monty_mole_seg5_dl_05004D30
 
-monty_mole_lights_unused1:
-  type: LIGHTS
-  size: 24
-  offset: 0x1D760
-  symbol: monty_mole_lights_unused1
-
-monty_mole_lights_unused2:
-  type: LIGHTS
-  size: 24
-  offset: 0x1D760
-  symbol: monty_mole_lights_unused2
-
-monty_mole_lights_unused3:
-  type: LIGHTS
-  size: 24
-  offset: 0x1D760
-  symbol: monty_mole_lights_unused3
-
-monty_mole_lights_unused4:
-  type: LIGHTS
-  size: 24
-  offset: 0x1D760
-  symbol: monty_mole_lights_unused4
-
-monty_mole_lights_unused5:
-  type: LIGHTS
-  size: 24
-  offset: 0x1D760
-  symbol: monty_mole_lights_unused5
-
-monty_mole_lights_unused6:
-  type: LIGHTS
-  size: 24
-  offset: 0x1D760
-  symbol: monty_mole_lights_unused6
-
diff --git a/assets/ymls/jp/actors/piranha_plant.yml b/assets/ymls/jp/actors/piranha_plant.yml
index 8b501f87..289d8a5b 100644
--- a/assets/ymls/jp/actors/piranha_plant.yml
+++ b/assets/ymls/jp/actors/piranha_plant.yml
@@ -23,6 +23,15 @@ piranha_plant_seg6_lights_060113E0:
   offset: 0x113E0
   symbol: piranha_plant_seg6_lights_060113E0
 
+piranha_plant_tongue:
+  type: TEXTURE
+  size: 4096
+  width: 32
+  height: 64
+  offset: 0x113F8
+  format: RGBA16
+  symbol: piranha_plant_seg6_texture_060113F8
+
 piranha_plant_skin:
   type: TEXTURE
   size: 2048
@@ -325,11 +334,3 @@ piranha_plant_seg6_dl_06016F20:
   offset: 0x16F20
   symbol: piranha_plant_seg6_dl_06016F20
 
-piranha_plant_tongue:
-  type: TEXTURE
-  size: 4096
-  width: 32
-  height: 64
-  offset: 0x24438
-  format: RGBA16
-  symbol: piranha_plant_seg6_texture_060113F8
diff --git a/assets/ymls/jp/actors/scuttlebug.yml b/assets/ymls/jp/actors/scuttlebug.yml
index e40ef70a..b0f762bb 100644
--- a/assets/ymls/jp/actors/scuttlebug.yml
+++ b/assets/ymls/jp/actors/scuttlebug.yml
@@ -8,13 +8,13 @@
 scuttlebug_lights_unused1:
   type: LIGHTS
   size: 24
-  offset: 0x10100
+  offset: 0x100D8
   symbol: scuttlebug_lights_unused1
 
 scuttlebug_lights_unused2:
   type: LIGHTS
   size: 24
-  offset: 0x10100
+  offset: 0x100F0
   symbol: scuttlebug_lights_unused2
 
 scuttlebug_eye:
diff --git a/assets/ymls/jp/actors/spindrift.yml b/assets/ymls/jp/actors/spindrift.yml
index 63b42b48..126a9434 100644
--- a/assets/ymls/jp/actors/spindrift.yml
+++ b/assets/ymls/jp/actors/spindrift.yml
@@ -5,6 +5,18 @@
   segments:
     - [0x05,  0x15EA70]
 
+spindrift_lights_unused1:
+  type: LIGHTS
+  size: 24
+  offset: 0x0
+  symbol: spindrift_lights_unused1
+
+spindrift_lights_unused2:
+  type: LIGHTS
+  size: 24
+  offset: 0x18
+  symbol: spindrift_lights_unused2
+
 spindrift_seg5_lights_05000030:
   type: LIGHTS
   size: 24
@@ -141,15 +153,3 @@ spindrift_seg5_dl_05002D08:
   offset: 0x2D08
   symbol: spindrift_seg5_dl_05002D08
 
-spindrift_lights_unused1:
-  type: LIGHTS
-  size: 24
-  offset: 0x6D00
-  symbol: spindrift_lights_unused1
-
-spindrift_lights_unused2:
-  type: LIGHTS
-  size: 24
-  offset: 0x6D00
-  symbol: spindrift_lights_unused2
-
diff --git a/assets/ymls/jp/actors/star.yml b/assets/ymls/jp/actors/star.yml
index e232c1fd..f24e0de8 100644
--- a/assets/ymls/jp/actors/star.yml
+++ b/assets/ymls/jp/actors/star.yml
@@ -5,15 +5,6 @@
   segments:
     - [0x03,  0x1FF740]
 
-star_eye:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x7A30
-  format: RGBA16
-  symbol: star_seg3_texture_0302AEF0
-
 star_seg3_lights_0302A6D8:
   type: LIGHTS
   size: 24
@@ -29,6 +20,15 @@ star_surface:
   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
+
 star_seg3_vertex_0302B6F0:
   type: VTX
   count: 12
diff --git a/assets/ymls/jp/actors/swoop.yml b/assets/ymls/jp/actors/swoop.yml
index e68321da..348242a9 100644
--- a/assets/ymls/jp/actors/swoop.yml
+++ b/assets/ymls/jp/actors/swoop.yml
@@ -8,13 +8,13 @@
 swoop_lights_unused1:
   type: LIGHTS
   size: 24
-  offset: 0xE08
+  offset: 0x4240
   symbol: swoop_lights_unused1
 
 swoop_lights_unused2:
   type: LIGHTS
   size: 24
-  offset: 0xE08
+  offset: 0x4258
   symbol: swoop_lights_unused2
 
 swoop_body:
diff --git a/assets/ymls/jp/actors/tornado.yml b/assets/ymls/jp/actors/tornado.yml
index 6c0b25fd..01306e56 100644
--- a/assets/ymls/jp/actors/tornado.yml
+++ b/assets/ymls/jp/actors/tornado.yml
@@ -10,7 +10,7 @@ tornado:
   size: 4096
   width: 32
   height: 64
-  offset: 0x12848
+  offset: 0x13128
   format: IA16
   symbol: tornado_seg5_texture_05013128
 
diff --git a/assets/ymls/jp/actors/ukiki.yml b/assets/ymls/jp/actors/ukiki.yml
index 1443b0c2..5c4f6cba 100644
--- a/assets/ymls/jp/actors/ukiki.yml
+++ b/assets/ymls/jp/actors/ukiki.yml
@@ -5,6 +5,18 @@
   segments:
     - [0x05,  0x1505D0]
 
+ukiki_lights_unused1:
+  type: LIGHTS
+  size: 24
+  offset: 0x7B70
+  symbol: ukiki_lights_unused1
+
+ukiki_lights_unused2:
+  type: LIGHTS
+  size: 24
+  offset: 0x7B88
+  symbol: ukiki_lights_unused2
+
 ukiki_seg5_lights_05007BA0:
   type: LIGHTS
   size: 24
@@ -462,15 +474,3 @@ ukiki_seg5_dl_0500D108:
   offset: 0xD108
   symbol: ukiki_seg5_dl_0500D108
 
-ukiki_lights_unused1:
-  type: LIGHTS
-  size: 24
-  offset: 0x326E8
-  symbol: ukiki_lights_unused1
-
-ukiki_lights_unused2:
-  type: LIGHTS
-  size: 24
-  offset: 0x326E8
-  symbol: ukiki_lights_unused2
-
diff --git a/assets/ymls/jp/actors/unagi.yml b/assets/ymls/jp/actors/unagi.yml
index 5058890f..884d8ad4 100644
--- a/assets/ymls/jp/actors/unagi.yml
+++ b/assets/ymls/jp/actors/unagi.yml
@@ -8,49 +8,49 @@
 unagi_lights_unused1:
   type: LIGHTS
   size: 24
-  offset: 0x2410
+  offset: 0xAE60
   symbol: unagi_lights_unused1
 
 unagi_lights_unused2:
   type: LIGHTS
   size: 24
-  offset: 0x2410
+  offset: 0xAE78
   symbol: unagi_lights_unused2
 
 unagi_lights_unused3:
   type: LIGHTS
   size: 24
-  offset: 0x2410
+  offset: 0xAE90
   symbol: unagi_lights_unused3
 
 unagi_lights_unused4:
   type: LIGHTS
   size: 24
-  offset: 0x2410
+  offset: 0xAEA8
   symbol: unagi_lights_unused4
 
 unagi_lights_unused5:
   type: LIGHTS
   size: 24
-  offset: 0x2410
+  offset: 0xAEC0
   symbol: unagi_lights_unused5
 
 unagi_lights_unused6:
   type: LIGHTS
   size: 24
-  offset: 0x2410
+  offset: 0xAED8
   symbol: unagi_lights_unused6
 
 unagi_lights_unused7:
   type: LIGHTS
   size: 24
-  offset: 0x2410
+  offset: 0xAEF0
   symbol: unagi_lights_unused7
 
 unagi_lights_unused8:
   type: LIGHTS
   size: 24
-  offset: 0x2410
+  offset: 0xAF08
   symbol: unagi_lights_unused8
 
 unagi_body:
diff --git a/assets/ymls/jp/levels/ccm.yml b/assets/ymls/jp/levels/ccm.yml
index e8e00e8b..ff923634 100644
--- a/assets/ymls/jp/levels/ccm.yml
+++ b/assets/ymls/jp/levels/ccm.yml
@@ -50,6 +50,24 @@
   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
@@ -674,15 +692,6 @@ ccm_seg7_vertex_0700B3A8:
   offset: 0xB3A8
   symbol: ccm_seg7_vertex_0700B3A8
 
-6:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0xB470
-  format: RGBA16
-  symbol: ccm_seg7_texture_07002900
-
 ccm_seg7_vertex_0700B4A8:
   type: VTX
   count: 16
@@ -743,15 +752,6 @@ ccm_seg7_vertex_0700BB88:
   offset: 0xBB88
   symbol: ccm_seg7_vertex_0700BB88
 
-5:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0xBC70
-  format: RGBA16
-  symbol: ccm_seg7_texture_07002100
-
 ccm_seg7_vertex_0700BC78:
   type: VTX
   count: 15
diff --git a/assets/ymls/jp/levels/jrb.yml b/assets/ymls/jp/levels/jrb.yml
index 61b6c48e..3397b753 100644
--- a/assets/ymls/jp/levels/jrb.yml
+++ b/assets/ymls/jp/levels/jrb.yml
@@ -5,6 +5,15 @@
   segments:
     - [0x07,  0x4187C0]
 
+0:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x0
+  format: RGBA16
+  symbol: jrb_seg7_texture_07000000
+
 1:
   type: TEXTURE
   size: 4096
@@ -14,15 +23,6 @@
   format: RGBA16
   symbol: jrb_seg7_texture_07000800
 
-0:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x1000
-  format: RGBA16
-  symbol: jrb_seg7_texture_07000000
-
 2:
   type: TEXTURE
   size: 2048
diff --git a/assets/ymls/jp/levels/lll.yml b/assets/ymls/jp/levels/lll.yml
index 0cccc149..96302693 100644
--- a/assets/ymls/jp/levels/lll.yml
+++ b/assets/ymls/jp/levels/lll.yml
@@ -41,15 +41,6 @@
   format: RGBA16
   symbol: lll_seg7_texture_07001800
 
-7:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x1800
-  format: RGBA16
-  symbol: lll_seg7_texture_07003800
-
 4:
   type: TEXTURE
   size: 2048
@@ -77,14 +68,14 @@
   format: RGBA16
   symbol: lll_seg7_texture_07003000
 
-27:
+7:
   type: TEXTURE
-  size: 512
-  width: 16
-  height: 16
-  offset: 0x3900
-  format: IA16
-  symbol: lll_seg7_texture_0700D200
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x3800
+  format: RGBA16
+  symbol: lll_seg7_texture_07003800
 
 8:
   type: TEXTURE
@@ -257,6 +248,15 @@
   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
diff --git a/assets/ymls/jp/levels/menu.yml b/assets/ymls/jp/levels/menu.yml
index eadd40e8..42fdf181 100644
--- a/assets/ymls/jp/levels/menu.yml
+++ b/assets/ymls/jp/levels/menu.yml
@@ -77,15 +77,6 @@ main_menu_seg7.04C68:
   format: RGBA16
   symbol: texture_menu_score
 
-main_menu_seg7.0A1D0:
-  type: TEXTURE
-  size: 512
-  width: 16
-  height: 16
-  offset: 0x5000
-  format: RGBA16
-  symbol: texture_menu_hud_char_question
-
 main_menu_seg7.05468:
   type: TEXTURE
   size: 2048
@@ -320,6 +311,15 @@ main_menu_seg7.09FD0:
   format: RGBA16
   symbol: texture_menu_hud_char_hiragana_no
 
+main_menu_seg7.0A1D0:
+  type: TEXTURE
+  size: 512
+  width: 16
+  height: 16
+  offset: 0xA1D0
+  format: RGBA16
+  symbol: texture_menu_hud_char_question
+
 main_menu_seg7.0A3D0:
   type: TEXTURE
   size: 512
@@ -707,15 +707,6 @@ main_menu_seg7.0B5C8:
   format: IA8
   symbol: texture_menu_font_char_jp_hiragana_he
 
-main_menu_seg7.0C448:
-  type: TEXTURE
-  size: 64
-  width: 8
-  height: 8
-  offset: 0xB5C8
-  format: IA8
-  symbol: texture_menu_font_char_jp_katakana_he
-
 main_menu_seg7.0B608:
   type: TEXTURE
   size: 64
@@ -1229,6 +1220,15 @@ main_menu_seg7.0C408:
   format: IA8
   symbol: texture_menu_font_char_jp_katakana_hu
 
+main_menu_seg7.0C448:
+  type: TEXTURE
+  size: 64
+  width: 8
+  height: 8
+  offset: 0xC448
+  format: IA8
+  symbol: texture_menu_font_char_jp_katakana_he
+
 main_menu_seg7.0C488:
   type: TEXTURE
   size: 64
diff --git a/assets/ymls/jp/levels/ssl.yml b/assets/ymls/jp/levels/ssl.yml
index 6cbdd3c2..aee771ca 100644
--- a/assets/ymls/jp/levels/ssl.yml
+++ b/assets/ymls/jp/levels/ssl.yml
@@ -74,6 +74,15 @@ ssl_lights_quicksand_pit:
   offset: 0x4000
   symbol: ssl_lights_quicksand_pit
 
+7:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x4018
+  format: RGBA16
+  symbol: ssl_quicksand
+
 ssl_dl_quicksand_pit_begin:
   type: GFX
   offset: 0x4818
@@ -494,15 +503,6 @@ ssl_seg7_vertex_07007F50:
   offset: 0x7F50
   symbol: ssl_seg7_vertex_07007F50
 
-7:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x8000
-  format: RGBA16
-  symbol: ssl_quicksand
-
 ssl_seg7_vertex_07008040:
   type: VTX
   count: 15
diff --git a/assets/ymls/jp/levels/ttm.yml b/assets/ymls/jp/levels/ttm.yml
index af88566c..47ccce22 100644
--- a/assets/ymls/jp/levels/ttm.yml
+++ b/assets/ymls/jp/levels/ttm.yml
@@ -687,15 +687,6 @@ ttm_seg7_vertex_0700AC78:
   offset: 0xAC78
   symbol: ttm_seg7_vertex_0700AC78
 
-8:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0xAD30
-  format: RGBA16
-  symbol: ttm_seg7_texture_0702AD30
-
 ttm_seg7_vertex_0700AD78:
   type: VTX
   count: 14
@@ -4196,6 +4187,15 @@ ttm_seg7_lights_0702AD18:
   offset: 0x2AD18
   symbol: ttm_seg7_lights_0702AD18
 
+8:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x2AD30
+  format: RGBA16
+  symbol: ttm_seg7_texture_0702AD30
+
 ttm_seg7_vertex_0702B530:
   type: VTX
   count: 4
diff --git a/assets/ymls/jp/textures/cave.yml b/assets/ymls/jp/textures/cave.yml
index e95af561..2732f681 100644
--- a/assets/ymls/jp/textures/cave.yml
+++ b/assets/ymls/jp/textures/cave.yml
@@ -140,15 +140,6 @@ hmc_textures.0A800:
   format: RGBA16
   symbol: cave_0900A800
 
-hmc_textures.0C000:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0xA800
-  format: IA16
-  symbol: cave_0900C000
-
 hmc_textures.0B800:
   type: TEXTURE
   size: 2048
@@ -157,3 +148,13 @@ hmc_textures.0B800:
   offset: 0xB800
   format: IA16
   symbol: cave_0900B800
+
+hmc_textures.0C000:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0xC000
+  format: IA16
+  symbol: cave_0900C000
+
diff --git a/assets/ymls/jp/textures/generic.yml b/assets/ymls/jp/textures/generic.yml
index 0220e096..ed57c207 100644
--- a/assets/ymls/jp/textures/generic.yml
+++ b/assets/ymls/jp/textures/generic.yml
@@ -14,6 +14,15 @@ bob_textures.00000:
   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
@@ -149,15 +158,6 @@ bob_textures.08800:
   format: RGBA16
   symbol: generic_09008800
 
-bob_textures.00800:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x8D40
-  format: RGBA16
-  symbol: generic_09000800
-
 bob_textures.09000:
   type: TEXTURE
   size: 2048
diff --git a/assets/ymls/jp/textures/inside.yml b/assets/ymls/jp/textures/inside.yml
index 1d18fb73..4ce649fb 100644
--- a/assets/ymls/jp/textures/inside.yml
+++ b/assets/ymls/jp/textures/inside.yml
@@ -14,15 +14,6 @@ inside_castle_textures.00000:
   format: RGBA16
   symbol: inside_09000000
 
-inside_castle_textures.04800:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x800
-  format: RGBA16
-  symbol: inside_09004800
-
 inside_castle_textures.01000:
   type: TEXTURE
   size: 4096
@@ -68,6 +59,15 @@ inside_castle_textures.04000:
   format: RGBA16
   symbol: inside_09004000
 
+inside_castle_textures.04800:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x4800
+  format: RGBA16
+  symbol: inside_09004800
+
 inside_castle_textures.05000:
   type: TEXTURE
   size: 2048
diff --git a/assets/ymls/jp/textures/mountain.yml b/assets/ymls/jp/textures/mountain.yml
index 2c928dd4..7ba1d444 100644
--- a/assets/ymls/jp/textures/mountain.yml
+++ b/assets/ymls/jp/textures/mountain.yml
@@ -95,15 +95,6 @@ ttm_textures.05800:
   format: RGBA16
   symbol: mountain_09005800
 
-ttm_textures.0A000:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x6000
-  format: RGBA16
-  symbol: mountain_0900A000
-
 ttm_textures.06800:
   type: TEXTURE
   size: 2048
@@ -158,6 +149,15 @@ ttm_textures.09800:
   format: RGBA16
   symbol: mountain_09009800
 
+ttm_textures.0A000:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0xA000
+  format: RGBA16
+  symbol: mountain_0900A000
+
 ttm_textures.0A800:
   type: TEXTURE
   size: 2048
diff --git a/assets/ymls/jp/textures/outside.yml b/assets/ymls/jp/textures/outside.yml
index 37407acf..430c8e58 100644
--- a/assets/ymls/jp/textures/outside.yml
+++ b/assets/ymls/jp/textures/outside.yml
@@ -176,15 +176,6 @@ castle_grounds_textures.0B000:
   format: RGBA16
   symbol: outside_0900B000
 
-castle_grounds_textures.0BC00:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0xB000
-  format: IA16
-  symbol: outside_0900BC00
-
 castle_grounds_textures.0B400:
   type: TEXTURE
   size: 2048
@@ -193,3 +184,13 @@ castle_grounds_textures.0B400:
   offset: 0xB400
   format: RGBA16
   symbol: outside_0900B400
+
+castle_grounds_textures.0BC00:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0xBC00
+  format: IA16
+  symbol: outside_0900BC00
+
diff --git a/assets/ymls/jp/textures/spooky.yml b/assets/ymls/jp/textures/spooky.yml
index 9d918b93..37d397ee 100644
--- a/assets/ymls/jp/textures/spooky.yml
+++ b/assets/ymls/jp/textures/spooky.yml
@@ -122,6 +122,15 @@ bbh_textures.09000:
   format: RGBA16
   symbol: spooky_09009000
 
+bbh_textures.0A000:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0xA000
+  format: RGBA16
+  symbol: spooky_0900A000
+
 bbh_textures.0A800:
   type: TEXTURE
   size: 2048
@@ -149,11 +158,3 @@ bbh_textures.0B800:
   format: IA16
   symbol: spooky_0900B800
 
-bbh_textures.0A000:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0xC288
-  format: RGBA16
-  symbol: spooky_0900A000
diff --git a/assets/ymls/us/actors/bookend.yml b/assets/ymls/us/actors/bookend.yml
index 7041dd52..9aa4fafc 100644
--- a/assets/ymls/us/actors/bookend.yml
+++ b/assets/ymls/us/actors/bookend.yml
@@ -5,6 +5,30 @@
   segments:
     - [0x05,  0x166C60]
 
+bookend_lights_unused1:
+  type: LIGHTS
+  size: 24
+  offset: 0x0
+  symbol: bookend_lights_unused1
+
+bookend_lights_unused2:
+  type: LIGHTS
+  size: 24
+  offset: 0x18
+  symbol: bookend_lights_unused2
+
+bookend_lights_unused3:
+  type: LIGHTS
+  size: 24
+  offset: 0x30
+  symbol: bookend_lights_unused3
+
+bookend_lights_unused4:
+  type: LIGHTS
+  size: 24
+  offset: 0x48
+  symbol: bookend_lights_unused4
+
 bookend_spine:
   type: TEXTURE
   size: 1024
@@ -50,30 +74,6 @@ bookend_cover:
   format: RGBA16
   symbol: bookend_seg5_texture_05001060
 
-bookend_lights_unused1:
-  type: LIGHTS
-  size: 24
-  offset: 0x1800
-  symbol: bookend_lights_unused1
-
-bookend_lights_unused2:
-  type: LIGHTS
-  size: 24
-  offset: 0x1818
-  symbol: bookend_lights_unused2
-
-bookend_lights_unused3:
-  type: LIGHTS
-  size: 24
-  offset: 0x1830
-  symbol: bookend_lights_unused3
-
-bookend_lights_unused4:
-  type: LIGHTS
-  size: 24
-  offset: 0x1848
-  symbol: bookend_lights_unused4
-
 bookend_seg5_lights_05001860:
   type: LIGHTS
   size: 24