From 49c0676db3003c8bb01bca67a39dde3fc9327e98 Mon Sep 17 00:00:00 2001
From: inspectredc <78732756+inspectredc@users.noreply.github.com>
Date: Thu, 6 Jun 2024 19:51:54 +0100
Subject: [PATCH]  Fix Various Actor Yamls (#48)

---
 assets/ymls/jp/actors/boo_castle.yml    |  16 ++--
 assets/ymls/jp/actors/mario_cap.yml     | 108 ++++++++++++------------
 assets/ymls/jp/actors/water_mine.yml    |  54 ++++++------
 assets/ymls/jp/actors/yellow_sphere.yml |  18 ++--
 assets/ymls/us/actors/boo_castle.yml    |  16 ++--
 assets/ymls/us/actors/book.yml          |  18 ++--
 assets/ymls/us/actors/mario_cap.yml     | 108 ++++++++++++------------
 assets/ymls/us/actors/water_mine.yml    |  54 ++++++------
 assets/ymls/us/actors/yellow_sphere.yml |  18 ++--
 9 files changed, 205 insertions(+), 205 deletions(-)

diff --git a/assets/ymls/jp/actors/boo_castle.yml b/assets/ymls/jp/actors/boo_castle.yml
index 95994d18..8bcb896f 100644
--- a/assets/ymls/jp/actors/boo_castle.yml
+++ b/assets/ymls/jp/actors/boo_castle.yml
@@ -5,12 +5,18 @@
   segments:
     - [0x06,  0x1D6660]
 
+boo_castle_seg6_lights_06015658:
+  type: LIGHTS
+  size: 24
+  offset: 0x15658
+  symbol: boo_castle_seg6_lights_06015658
+
 bbh_boo_eyes:
   type: TEXTURE
   size: 4096
   width: 64
   height: 32
-  offset: 0x9B40
+  offset: 0x15670
   format: RGBA16
   symbol: boo_castle_seg6_texture_06015670
 
@@ -19,16 +25,10 @@ bbh_boo_mouth:
   size: 2048
   width: 32
   height: 32
-  offset: 0xAB40
+  offset: 0x16670
   format: RGBA16
   symbol: boo_castle_seg6_texture_06016670
 
-boo_castle_seg6_lights_06015658:
-  type: LIGHTS
-  size: 24
-  offset: 0x15658
-  symbol: boo_castle_seg6_lights_06015658
-
 boo_castle_seg6_vertex_06016E70:
   type: VTX
   count: 12
diff --git a/assets/ymls/jp/actors/mario_cap.yml b/assets/ymls/jp/actors/mario_cap.yml
index 716ab1de..6701483f 100644
--- a/assets/ymls/jp/actors/mario_cap.yml
+++ b/assets/ymls/jp/actors/mario_cap.yml
@@ -5,60 +5,6 @@
   segments:
     - [0x03,  0x112B50]
 
-mario_cap_metal:
-  type: TEXTURE
-  size: 4096
-  width: 64
-  height: 32
-  offset: 0x90
-  format: RGBA16
-  symbol: mario_cap_seg3_texture_0301CF50
-
-mario_cap_logo:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x1890
-  format: RGBA16
-  symbol: mario_cap_seg3_texture_0301DF50
-
-mario_cap_wing:
-  type: TEXTURE
-  size: 4096
-  width: 32
-  height: 64
-  offset: 0x8090
-  format: RGBA16
-  symbol: mario_cap_seg3_texture_0301E750
-
-mario_cap_wing_tip:
-  type: TEXTURE
-  size: 4096
-  width: 32
-  height: 64
-  offset: 0x9090
-  format: RGBA16
-  symbol: mario_cap_seg3_texture_0301F750
-
-mario_cap_metal_wing_unused:
-  type: TEXTURE
-  size: 4096
-  width: 32
-  height: 64
-  offset: 0xA090
-  format: RGBA16
-  symbol: mario_cap_seg3_texture_03020750
-
-mario_cap_metal_wing_tip_unused:
-  type: TEXTURE
-  size: 4096
-  width: 32
-  height: 64
-  offset: 0xB090
-  format: RGBA16
-  symbol: mario_cap_seg3_texture_03021750
-
 mario_cap_seg3_lights_0301CF08:
   type: LIGHTS
   size: 24
@@ -77,6 +23,60 @@ mario_cap_seg3_lights_0301CF38:
   offset: 0x1CF38
   symbol: mario_cap_seg3_lights_0301CF38
 
+mario_cap_metal:
+  type: TEXTURE
+  size: 4096
+  width: 64
+  height: 32
+  offset: 0x1CF50
+  format: RGBA16
+  symbol: mario_cap_seg3_texture_0301CF50
+
+mario_cap_logo:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x1DF50
+  format: RGBA16
+  symbol: mario_cap_seg3_texture_0301DF50
+
+mario_cap_wing:
+  type: TEXTURE
+  size: 4096
+  width: 32
+  height: 64
+  offset: 0x1E750
+  format: RGBA16
+  symbol: mario_cap_seg3_texture_0301E750
+
+mario_cap_wing_tip:
+  type: TEXTURE
+  size: 4096
+  width: 32
+  height: 64
+  offset: 0x1F750
+  format: RGBA16
+  symbol: mario_cap_seg3_texture_0301F750
+
+mario_cap_metal_wing_unused:
+  type: TEXTURE
+  size: 4096
+  width: 32
+  height: 64
+  offset: 0x20750
+  format: RGBA16
+  symbol: mario_cap_seg3_texture_03020750
+
+mario_cap_metal_wing_tip_unused:
+  type: TEXTURE
+  size: 4096
+  width: 32
+  height: 64
+  offset: 0x21750
+  format: RGBA16
+  symbol: mario_cap_seg3_texture_03021750
+
 mario_cap_seg3_vertex_03022750:
   type: VTX
   count: 7
diff --git a/assets/ymls/jp/actors/water_mine.yml b/assets/ymls/jp/actors/water_mine.yml
index d98c9607..7187b08f 100644
--- a/assets/ymls/jp/actors/water_mine.yml
+++ b/assets/ymls/jp/actors/water_mine.yml
@@ -11,6 +11,33 @@ water_mine_seg6_lights_0600A4E0:
   offset: 0xA4E0
   symbol: water_mine_seg6_lights_0600A4E0
 
+water_mine_left_side_unused:
+  type: TEXTURE
+  size: 4096
+  width: 32
+  height: 64
+  offset: 0xA4F8
+  format: RGBA16
+  symbol: water_mine_seg6_texture_0600A4F8
+
+water_mine_right_side_unused:
+  type: TEXTURE
+  size: 4096
+  width: 32
+  height: 64
+  offset: 0xB4F8
+  format: RGBA16
+  symbol: water_mine_seg6_texture_0600B4F8
+
+water_mine_spike_unused:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0xC4F8
+  format: RGBA16
+  symbol: water_mine_seg6_texture_0600C4F8
+
 water_mine_seg6_vertex_0600CCF8:
   type: VTX
   count: 4
@@ -78,30 +105,3 @@ water_mine_seg6_dl_0600D3F8:
   offset: 0xD3F8
   symbol: water_mine_seg6_dl_0600D3F8
 
-water_mine_left_side_unused:
-  type: TEXTURE
-  size: 4096
-  width: 32
-  height: 64
-  offset: 0x57AC0
-  format: RGBA16
-  symbol: water_mine_seg6_texture_0600A4F8
-
-water_mine_right_side_unused:
-  type: TEXTURE
-  size: 4096
-  width: 32
-  height: 64
-  offset: 0x58AC0
-  format: RGBA16
-  symbol: water_mine_seg6_texture_0600B4F8
-
-water_mine_spike_unused:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x59AC0
-  format: RGBA16
-  symbol: water_mine_seg6_texture_0600C4F8
-
diff --git a/assets/ymls/jp/actors/yellow_sphere.yml b/assets/ymls/jp/actors/yellow_sphere.yml
index 13b2de9d..0467e1b1 100644
--- a/assets/ymls/jp/actors/yellow_sphere.yml
+++ b/assets/ymls/jp/actors/yellow_sphere.yml
@@ -5,21 +5,21 @@
   segments:
     - [0x06,  0x186810]
 
-yellow_sphere:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x40
-  format: RGBA16
-  symbol: yellow_sphere_seg6_texture_0601EB88
-
 yellow_sphere_seg6_vertex_0601EB48:
   type: VTX
   count: 4
   offset: 0x1EB48
   symbol: yellow_sphere_seg6_vertex_0601EB48
 
+yellow_sphere:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x1EB88
+  format: RGBA16
+  symbol: yellow_sphere_seg6_texture_0601EB88
+
 yellow_sphere_seg6_dl_0601F388:
   type: GFX
   offset: 0x1F388
diff --git a/assets/ymls/us/actors/boo_castle.yml b/assets/ymls/us/actors/boo_castle.yml
index 5274030f..9d90162a 100644
--- a/assets/ymls/us/actors/boo_castle.yml
+++ b/assets/ymls/us/actors/boo_castle.yml
@@ -5,12 +5,18 @@
   segments:
     - [0x06,  0x1D8310]
 
+boo_castle_seg6_lights_06015658:
+  type: LIGHTS
+  size: 24
+  offset: 0x15658
+  symbol: boo_castle_seg6_lights_06015658
+
 bbh_boo_eyes:
   type: TEXTURE
   size: 4096
   width: 64
   height: 32
-  offset: 0x9B40
+  offset: 0x15670
   format: RGBA16
   symbol: boo_castle_seg6_texture_06015670
 
@@ -19,16 +25,10 @@ bbh_boo_mouth:
   size: 2048
   width: 32
   height: 32
-  offset: 0xAB40
+  offset: 0x16670
   format: RGBA16
   symbol: boo_castle_seg6_texture_06016670
 
-boo_castle_seg6_lights_06015658:
-  type: LIGHTS
-  size: 24
-  offset: 0x15658
-  symbol: boo_castle_seg6_lights_06015658
-
 boo_castle_seg6_vertex_06016E70:
   type: VTX
   count: 12
diff --git a/assets/ymls/us/actors/book.yml b/assets/ymls/us/actors/book.yml
index a6ff77b3..1929c9a2 100644
--- a/assets/ymls/us/actors/book.yml
+++ b/assets/ymls/us/actors/book.yml
@@ -5,21 +5,21 @@
   segments:
     - [0x05,  0x166C60]
 
-book_cover:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x1060
-  format: RGBA16
-  symbol: book_seg5_texture_05002570
-
 book_seg5_lights_05002558:
   type: LIGHTS
   size: 24
   offset: 0x2558
   symbol: book_seg5_lights_05002558
 
+book_cover:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x2570
+  format: RGBA16
+  symbol: book_seg5_texture_05002570
+
 book_seg5_vertex_05002D70:
   type: VTX
   count: 12
diff --git a/assets/ymls/us/actors/mario_cap.yml b/assets/ymls/us/actors/mario_cap.yml
index 4e4a657e..19f95bd5 100644
--- a/assets/ymls/us/actors/mario_cap.yml
+++ b/assets/ymls/us/actors/mario_cap.yml
@@ -5,60 +5,6 @@
   segments:
     - [0x03,  0x114750]
 
-mario_cap_metal:
-  type: TEXTURE
-  size: 4096
-  width: 64
-  height: 32
-  offset: 0x90
-  format: RGBA16
-  symbol: mario_cap_seg3_texture_0301CF50
-
-mario_cap_logo:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x1890
-  format: RGBA16
-  symbol: mario_cap_seg3_texture_0301DF50
-
-mario_cap_wing:
-  type: TEXTURE
-  size: 4096
-  width: 32
-  height: 64
-  offset: 0x8090
-  format: RGBA16
-  symbol: mario_cap_seg3_texture_0301E750
-
-mario_cap_wing_tip:
-  type: TEXTURE
-  size: 4096
-  width: 32
-  height: 64
-  offset: 0x9090
-  format: RGBA16
-  symbol: mario_cap_seg3_texture_0301F750
-
-mario_cap_metal_wing_unused:
-  type: TEXTURE
-  size: 4096
-  width: 32
-  height: 64
-  offset: 0xA090
-  format: RGBA16
-  symbol: mario_cap_seg3_texture_03020750
-
-mario_cap_metal_wing_tip_unused:
-  type: TEXTURE
-  size: 4096
-  width: 32
-  height: 64
-  offset: 0xB090
-  format: RGBA16
-  symbol: mario_cap_seg3_texture_03021750
-
 mario_cap_seg3_lights_0301CF08:
   type: LIGHTS
   size: 24
@@ -77,6 +23,60 @@ mario_cap_seg3_lights_0301CF38:
   offset: 0x1CF38
   symbol: mario_cap_seg3_lights_0301CF38
 
+mario_cap_metal:
+  type: TEXTURE
+  size: 4096
+  width: 64
+  height: 32
+  offset: 0x1CF50
+  format: RGBA16
+  symbol: mario_cap_seg3_texture_0301CF50
+
+mario_cap_logo:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x1DF50
+  format: RGBA16
+  symbol: mario_cap_seg3_texture_0301DF50
+
+mario_cap_wing:
+  type: TEXTURE
+  size: 4096
+  width: 32
+  height: 64
+  offset: 0x1E750
+  format: RGBA16
+  symbol: mario_cap_seg3_texture_0301E750
+
+mario_cap_wing_tip:
+  type: TEXTURE
+  size: 4096
+  width: 32
+  height: 64
+  offset: 0x1F750
+  format: RGBA16
+  symbol: mario_cap_seg3_texture_0301F750
+
+mario_cap_metal_wing_unused:
+  type: TEXTURE
+  size: 4096
+  width: 32
+  height: 64
+  offset: 0x20750
+  format: RGBA16
+  symbol: mario_cap_seg3_texture_03020750
+
+mario_cap_metal_wing_tip_unused:
+  type: TEXTURE
+  size: 4096
+  width: 32
+  height: 64
+  offset: 0x21750
+  format: RGBA16
+  symbol: mario_cap_seg3_texture_03021750
+
 mario_cap_seg3_vertex_03022750:
   type: VTX
   count: 7
diff --git a/assets/ymls/us/actors/water_mine.yml b/assets/ymls/us/actors/water_mine.yml
index 97b7015d..e39b68a4 100644
--- a/assets/ymls/us/actors/water_mine.yml
+++ b/assets/ymls/us/actors/water_mine.yml
@@ -11,6 +11,33 @@ water_mine_seg6_lights_0600A4E0:
   offset: 0xA4E0
   symbol: water_mine_seg6_lights_0600A4E0
 
+water_mine_left_side_unused:
+  type: TEXTURE
+  size: 4096
+  width: 32
+  height: 64
+  offset: 0xA4F8
+  format: RGBA16
+  symbol: water_mine_seg6_texture_0600A4F8
+
+water_mine_right_side_unused:
+  type: TEXTURE
+  size: 4096
+  width: 32
+  height: 64
+  offset: 0xB4F8
+  format: RGBA16
+  symbol: water_mine_seg6_texture_0600B4F8
+
+water_mine_spike_unused:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0xC4F8
+  format: RGBA16
+  symbol: water_mine_seg6_texture_0600C4F8
+
 water_mine_seg6_vertex_0600CCF8:
   type: VTX
   count: 4
@@ -78,30 +105,3 @@ water_mine_seg6_dl_0600D3F8:
   offset: 0xD3F8
   symbol: water_mine_seg6_dl_0600D3F8
 
-water_mine_left_side_unused:
-  type: TEXTURE
-  size: 4096
-  width: 32
-  height: 64
-  offset: 0x57C10
-  format: RGBA16
-  symbol: water_mine_seg6_texture_0600A4F8
-
-water_mine_right_side_unused:
-  type: TEXTURE
-  size: 4096
-  width: 32
-  height: 64
-  offset: 0x58C10
-  format: RGBA16
-  symbol: water_mine_seg6_texture_0600B4F8
-
-water_mine_spike_unused:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x59C10
-  format: RGBA16
-  symbol: water_mine_seg6_texture_0600C4F8
-
diff --git a/assets/ymls/us/actors/yellow_sphere.yml b/assets/ymls/us/actors/yellow_sphere.yml
index 75351106..99bbca74 100644
--- a/assets/ymls/us/actors/yellow_sphere.yml
+++ b/assets/ymls/us/actors/yellow_sphere.yml
@@ -5,21 +5,21 @@
   segments:
     - [0x06,  0x188440]
 
-yellow_sphere:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x40
-  format: RGBA16
-  symbol: yellow_sphere_seg6_texture_0601EB88
-
 yellow_sphere_seg6_vertex_0601EB48:
   type: VTX
   count: 4
   offset: 0x1EB48
   symbol: yellow_sphere_seg6_vertex_0601EB48
 
+yellow_sphere:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x1EB88
+  format: RGBA16
+  symbol: yellow_sphere_seg6_texture_0601EB88
+
 yellow_sphere_seg6_dl_0601F388:
   type: GFX
   offset: 0x1F388