Format Asset Yamls and Add Script (#42)

* format yamls + script

* re run script

assets/ymls/jp/actors/amp.yml

@@ -5,6 +5,24 @@
   segments:
     - [0x08,  0x1F0530]
 
+amp_electricity:
+  type: TEXTURE
+  size: 1024
+  width: 16
+  height: 32
+  offset: 0xF18
+  format: RGBA16
+  symbol: dAmpElectricityTexture
+
+amp_eyes:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x1318
+  format: RGBA16
+  symbol: dAmpEyesTexture
+
 amp_body:
   type: TEXTURE
   size: 2048
@@ -13,22 +31,7 @@ amp_body:
   offset: 0x1B18
   format: RGBA16
   symbol: dAmpBodyTexture
-amp_electricity:
-  type: TEXTURE
-  size: 1024
-  width: 16
-  height: 32
-  offset: 0xF18
-  format: RGBA16
-  symbol: dAmpElectricityTexture
-amp_eyes:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x1318
-  format: RGBA16
-  symbol: dAmpEyesTexture
+
 amp_mouth:
   type: TEXTURE
   size: 2048

assets/ymls/jp/actors/blue_coin_switch.yml

@@ -5,6 +5,12 @@
   segments:
     - [0x08,  0x1F0530]
 
+blue_coin_switch_seg8_lights_08000000:
+  type: LIGHTS
+  size: 24
+  offset: 0x0
+  symbol: blue_coin_switch_seg8_lights_08000000
+
 blue_coin_switch_side:
   type: TEXTURE
   size: 1024
@@ -13,6 +19,7 @@ blue_coin_switch_side:
   offset: 0x18
   format: RGBA16
   symbol: blue_coin_switch_seg8_texture_08000018
+
 blue_coin_switch_top:
   type: TEXTURE
   size: 2048
@@ -22,12 +29,6 @@ blue_coin_switch_top:
   format: RGBA16
   symbol: blue_coin_switch_seg8_texture_08000418
 
-blue_coin_switch_seg8_lights_08000000:
-  type: LIGHTS
-  size: 24
-  offset: 0x0
-  symbol: blue_coin_switch_seg8_lights_08000000
-
 blue_coin_switch_seg8_vertex_08000C18:
   type: VTX
   count: 16

assets/ymls/jp/actors/blue_fish.yml

@@ -5,6 +5,12 @@
   segments:
     - [0x03,  0x1FF740]
 
+blue_fish_seg3_lights_0301B5C8:
+  type: LIGHTS
+  size: 24
+  offset: 0x1B5C8
+  symbol: blue_fish_seg3_lights_0301B5C8
+
 blue_fish:
   type: TEXTURE
   size: 2048
@@ -14,12 +20,6 @@ blue_fish:
   format: RGBA16
   symbol: blue_fish_seg3_texture_0301B5E0
 
-blue_fish_seg3_lights_0301B5C8:
-  type: LIGHTS
-  size: 24
-  offset: 0x1B5C8
-  symbol: blue_fish_seg3_lights_0301B5C8
-
 blue_fish_seg3_vertex_0301BDE0:
   type: VTX
   count: 14

assets/ymls/jp/actors/bobomb.yml

@@ -13,6 +13,7 @@ bob-omb_buddy_left_side:
   offset: 0x78
   format: RGBA16
   symbol: bobomb_seg8_texture_0801FA60
+
 bob-omb_buddy_right_side:
   type: TEXTURE
   size: 4096
@@ -21,6 +22,7 @@ bob-omb_buddy_right_side:
   offset: 0x1078
   format: RGBA16
   symbol: bobomb_seg8_texture_08020A60
+
 bob-omb_eyes:
   type: TEXTURE
   size: 2048
@@ -29,6 +31,7 @@ bob-omb_eyes:
   offset: 0x4878
   format: RGBA16
   symbol: bobomb_seg8_texture_08021A60
+
 bob-omb_eyes_blink:
   type: TEXTURE
   size: 2048
@@ -37,6 +40,7 @@ bob-omb_eyes_blink:
   offset: 0x5078
   format: RGBA16
   symbol: bobomb_seg8_texture_08022260
+
 bob-omb_left_side:
   type: TEXTURE
   size: 4096
@@ -45,6 +49,7 @@ bob-omb_left_side:
   offset: 0x1DA60
   format: RGBA16
   symbol: bobomb_seg8_texture_0801DA60
+
 bob-omb_right_side:
   type: TEXTURE
   size: 4096

assets/ymls/jp/actors/bomb.yml

@@ -5,6 +5,12 @@
   segments:
     - [0x06,  0x186810]
 
+bomb_seg6_lights_06057AA8:
+  type: LIGHTS
+  size: 24
+  offset: 0x57AA8
+  symbol: bomb_seg6_lights_06057AA8
+
 bomb_left_side:
   type: TEXTURE
   size: 4096
@@ -13,6 +19,7 @@ bomb_left_side:
   offset: 0x57AC0
   format: RGBA16
   symbol: bomb_seg6_texture_06057AC0
+
 bomb_right_side:
   type: TEXTURE
   size: 4096
@@ -21,6 +28,7 @@ bomb_right_side:
   offset: 0x58AC0
   format: RGBA16
   symbol: bomb_seg6_texture_06058AC0
+
 bomb_spike:
   type: TEXTURE
   size: 2048
@@ -30,12 +38,6 @@ bomb_spike:
   format: RGBA16
   symbol: bomb_seg6_texture_06059AC0
 
-bomb_seg6_lights_06057AA8:
-  type: LIGHTS
-  size: 24
-  offset: 0x57AA8
-  symbol: bomb_seg6_lights_06057AA8
-
 bomb_seg6_vertex_0605A2C0:
   type: VTX
   count: 4

assets/ymls/jp/actors/boo.yml

@@ -5,6 +5,12 @@
   segments:
     - [0x05,  0x165060]
 
+boo_seg5_lights_05009B28:
+  type: LIGHTS
+  size: 24
+  offset: 0x9B28
+  symbol: boo_seg5_lights_05009B28
+
 boo_eyes:
   type: TEXTURE
   size: 4096
@@ -13,6 +19,7 @@ boo_eyes:
   offset: 0x9B40
   format: RGBA16
   symbol: boo_seg5_texture_05009B40
+
 boo_mouth:
   type: TEXTURE
   size: 2048
@@ -22,12 +29,6 @@ boo_mouth:
   format: RGBA16
   symbol: boo_seg5_texture_0500AB40
 
-boo_seg5_lights_05009B28:
-  type: LIGHTS
-  size: 24
-  offset: 0x9B28
-  symbol: boo_seg5_lights_05009B28
-
 boo_seg5_vertex_0500B340:
   type: VTX
   count: 12

assets/ymls/jp/actors/boo_castle.yml

@@ -13,6 +13,7 @@ bbh_boo_eyes:
   offset: 0x9B40
   format: RGBA16
   symbol: boo_castle_seg6_texture_06015670
+
 bbh_boo_mouth:
   type: TEXTURE
   size: 2048

assets/ymls/jp/actors/book.yml

@@ -5,6 +5,12 @@
   segments:
     - [0x05,  0x165060]
 
+book_seg5_lights_05002558:
+  type: LIGHTS
+  size: 24
+  offset: 0x2558
+  symbol: book_seg5_lights_05002558
+
 book_cover:
   type: TEXTURE
   size: 2048
@@ -14,12 +20,6 @@ book_cover:
   format: RGBA16
   symbol: book_seg5_texture_05002570
 
-book_seg5_lights_05002558:
-  type: LIGHTS
-  size: 24
-  offset: 0x2558
-  symbol: book_seg5_lights_05002558
-
 book_seg5_vertex_05002D70:
   type: VTX
   count: 12

assets/ymls/jp/actors/bookend.yml

@@ -5,30 +5,6 @@
   segments:
     - [0x05,  0x165060]
 
-bookend_cover:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x1060
-  format: RGBA16
-  symbol: bookend_seg5_texture_05001060
-bookend_mouth:
-  type: TEXTURE
-  size: 1024
-  width: 16
-  height: 32
-  offset: 0x860
-  format: RGBA16
-  symbol: bookend_seg5_texture_05000860
-bookend_pages:
-  type: TEXTURE
-  size: 1024
-  width: 16
-  height: 32
-  offset: 0xC60
-  format: RGBA16
-  symbol: bookend_seg5_texture_05000C60
 bookend_spine:
   type: TEXTURE
   size: 1024
@@ -37,6 +13,7 @@ bookend_spine:
   offset: 0x60
   format: RGBA16
   symbol: bookend_seg5_texture_05000060
+
 bookend_tooth:
   type: TEXTURE
   size: 1024
@@ -46,29 +23,32 @@ bookend_tooth:
   format: RGBA16
   symbol: bookend_seg5_texture_05000460
 
-bookend_lights_unused1:
-  type: LIGHTS
-  size: 24
-  offset: 0x6C08
-  symbol: bookend_lights_unused1
+bookend_mouth:
+  type: TEXTURE
+  size: 1024
+  width: 16
+  height: 32
+  offset: 0x860
+  format: RGBA16
+  symbol: bookend_seg5_texture_05000860
 
-bookend_lights_unused2:
-  type: LIGHTS
-  size: 24
-  offset: 0x6C08
-  symbol: bookend_lights_unused2
+bookend_pages:
+  type: TEXTURE
+  size: 1024
+  width: 16
+  height: 32
+  offset: 0xC60
+  format: RGBA16
+  symbol: bookend_seg5_texture_05000C60
 
-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
+bookend_cover:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x1060
+  format: RGBA16
+  symbol: bookend_seg5_texture_05001060
 
 bookend_seg5_lights_05001860:
   type: LIGHTS
@@ -246,3 +226,27 @@ 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
+

assets/ymls/jp/actors/bowser.yml

@@ -5,6 +5,60 @@
   segments:
     - [0x06,  0x186810]
 
+bowser_shell:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x1F438
+  format: RGBA16
+  symbol: bowser_seg6_texture_0601F438
+
+bowser_eyebrow:
+  type: TEXTURE
+  size: 4096
+  width: 64
+  height: 32
+  offset: 0x1FC38
+  format: RGBA16
+  symbol: bowser_seg6_texture_0601FC38
+
+bowser_muzzle:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x20C38
+  format: RGBA16
+  symbol: bowser_seg6_texture_06020C38
+
+bowser_nostrils:
+  type: TEXTURE
+  size: 4096
+  width: 64
+  height: 32
+  offset: 0x21438
+  format: RGBA16
+  symbol: bowser_seg6_texture_06021438
+
+bowser_body:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x22438
+  format: RGBA16
+  symbol: bowser_seg6_texture_06022438
+
+bowser_armband_spike:
+  type: TEXTURE
+  size: 4096
+  width: 64
+  height: 32
+  offset: 0x22C38
+  format: RGBA16
+  symbol: bowser_seg6_texture_06022C38
+
 bowser_armband:
   type: TEXTURE
   size: 2048
@@ -13,214 +67,7 @@ bowser_armband:
   offset: 0x23C38
   format: RGBA16
   symbol: bowser_seg6_texture_06023C38
-bowser_armband_spike:
-  type: TEXTURE
-  size: 4096
-  width: 64
-  height: 32
-  offset: 0x22C38
-  format: RGBA16
-  symbol: bowser_seg6_texture_06022C38
-bowser_blue_eye_unused:
-  type: TEXTURE
-  size: 4096
-  width: 64
-  height: 32
-  offset: 0x26438
-  format: RGBA16
-  symbol: bowser_seg6_texture_06026438
-bowser_body:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x22438
-  format: RGBA16
-  symbol: bowser_seg6_texture_06022438
-bowser_chest:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x25438
-  format: RGBA16
-  symbol: bowser_seg6_texture_06025438
-bowser_claw_edge:
-  type: TEXTURE
-  size: 4096
-  width: 32
-  height: 64
-  offset: 0x29C38
-  format: RGBA16
-  symbol: bowser_seg6_texture_06029C38
-bowser_claw_horn_angle:
-  type: TEXTURE
-  size: 4096
-  width: 32
-  height: 64
-  offset: 0x2BC38
-  format: RGBA16
-  symbol: bowser_seg6_texture_0602BC38
-bowser_claw_horn_tooth:
-  type: TEXTURE
-  size: 4096
-  width: 32
-  height: 64
-  offset: 0x2AC38
-  format: RGBA16
-  symbol: bowser_seg6_texture_0602AC38
-bowser_eye_center_0:
-  type: TEXTURE
-  size: 4096
-  width: 64
-  height: 32
-  offset: 0x2FC38
-  format: RGBA16
-  symbol: bowser_seg6_texture_0602FC38
-bowser_eye_center_1:
-  type: TEXTURE
-  size: 4096
-  width: 64
-  height: 32
-  offset: 0x2FC38
-  format: RGBA16
-  symbol: bowser_seg6_texture_06035C38
-bowser_eye_closed_0:
-  type: TEXTURE
-  size: 4096
-  width: 64
-  height: 32
-  offset: 0x2EC38
-  format: RGBA16
-  symbol: bowser_seg6_texture_0602EC38
-bowser_eye_closed_1:
-  type: TEXTURE
-  size: 4096
-  width: 64
-  height: 32
-  offset: 0x2EC38
-  format: RGBA16
-  symbol: bowser_seg6_texture_06034C38
-bowser_eye_far_left_0:
-  type: TEXTURE
-  size: 4096
-  width: 64
-  height: 32
-  offset: 0x31C38
-  format: RGBA16
-  symbol: bowser_seg6_texture_06031C38
-bowser_eye_far_left_1:
-  type: TEXTURE
-  size: 4096
-  width: 64
-  height: 32
-  offset: 0x31C38
-  format: RGBA16
-  symbol: bowser_seg6_texture_06037C38
-bowser_eye_half_closed_0:
-  type: TEXTURE
-  size: 4096
-  width: 64
-  height: 32
-  offset: 0x2DC38
-  format: RGBA16
-  symbol: bowser_seg6_texture_0602DC38
-bowser_eye_half_closed_1:
-  type: TEXTURE
-  size: 4096
-  width: 64
-  height: 32
-  offset: 0x2DC38
-  format: RGBA16
-  symbol: bowser_seg6_texture_06033C38
-bowser_eye_left_0:
-  type: TEXTURE
-  size: 4096
-  width: 64
-  height: 32
-  offset: 0x2CC38
-  format: RGBA16
-  symbol: bowser_seg6_texture_0602CC38
-bowser_eye_left_1:
-  type: TEXTURE
-  size: 4096
-  width: 64
-  height: 32
-  offset: 0x2CC38
-  format: RGBA16
-  symbol: bowser_seg6_texture_06032C38
-bowser_eye_right_0:
-  type: TEXTURE
-  size: 4096
-  width: 64
-  height: 32
-  offset: 0x30C38
-  format: RGBA16
-  symbol: bowser_seg6_texture_06030C38
-bowser_eye_right_1:
-  type: TEXTURE
-  size: 4096
-  width: 64
-  height: 32
-  offset: 0x30C38
-  format: RGBA16
-  symbol: bowser_seg6_texture_06036C38
-bowser_eyebrow:
-  type: TEXTURE
-  size: 4096
-  width: 64
-  height: 32
-  offset: 0x1FC38
-  format: RGBA16
-  symbol: bowser_seg6_texture_0601FC38
-bowser_hair:
-  type: TEXTURE
-  size: 4096
-  width: 32
-  height: 64
-  offset: 0x28C38
-  format: RGBA16
-  symbol: bowser_seg6_texture_06028C38
-bowser_mouth_unused:
-  type: TEXTURE
-  size: 4096
-  width: 64
-  height: 32
-  offset: 0x27438
-  format: RGBA16
-  symbol: bowser_seg6_texture_06027438
-bowser_muzzle:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x20C38
-  format: RGBA16
-  symbol: bowser_seg6_texture_06020C38
-bowser_nostrils:
-  type: TEXTURE
-  size: 4096
-  width: 64
-  height: 32
-  offset: 0x21438
-  format: RGBA16
-  symbol: bowser_seg6_texture_06021438
-bowser_shell:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x1F438
-  format: RGBA16
-  symbol: bowser_seg6_texture_0601F438
-bowser_shell_edge:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x25C38
-  format: RGBA16
-  symbol: bowser_seg6_texture_06025C38
+
 bowser_tongue:
   type: TEXTURE
   size: 4096
@@ -229,6 +76,43 @@ bowser_tongue:
   offset: 0x24438
   format: RGBA16
   symbol: bowser_seg6_texture_06024438
+
+bowser_chest:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x25438
+  format: RGBA16
+  symbol: bowser_seg6_texture_06025438
+
+bowser_shell_edge:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x25C38
+  format: RGBA16
+  symbol: bowser_seg6_texture_06025C38
+
+bowser_blue_eye_unused:
+  type: TEXTURE
+  size: 4096
+  width: 64
+  height: 32
+  offset: 0x26438
+  format: RGBA16
+  symbol: bowser_seg6_texture_06026438
+
+bowser_mouth_unused:
+  type: TEXTURE
+  size: 4096
+  width: 64
+  height: 32
+  offset: 0x27438
+  format: RGBA16
+  symbol: bowser_seg6_texture_06027438
+
 bowser_upper_face:
   type: TEXTURE
   size: 2048
@@ -238,6 +122,150 @@ bowser_upper_face:
   format: RGBA16
   symbol: bowser_seg6_texture_06028438
 
+bowser_hair:
+  type: TEXTURE
+  size: 4096
+  width: 32
+  height: 64
+  offset: 0x28C38
+  format: RGBA16
+  symbol: bowser_seg6_texture_06028C38
+
+bowser_claw_edge:
+  type: TEXTURE
+  size: 4096
+  width: 32
+  height: 64
+  offset: 0x29C38
+  format: RGBA16
+  symbol: bowser_seg6_texture_06029C38
+
+bowser_claw_horn_tooth:
+  type: TEXTURE
+  size: 4096
+  width: 32
+  height: 64
+  offset: 0x2AC38
+  format: RGBA16
+  symbol: bowser_seg6_texture_0602AC38
+
+bowser_claw_horn_angle:
+  type: TEXTURE
+  size: 4096
+  width: 32
+  height: 64
+  offset: 0x2BC38
+  format: RGBA16
+  symbol: bowser_seg6_texture_0602BC38
+
+bowser_eye_left_0:
+  type: TEXTURE
+  size: 4096
+  width: 64
+  height: 32
+  offset: 0x2CC38
+  format: RGBA16
+  symbol: bowser_seg6_texture_0602CC38
+
+bowser_eye_left_1:
+  type: TEXTURE
+  size: 4096
+  width: 64
+  height: 32
+  offset: 0x2CC38
+  format: RGBA16
+  symbol: bowser_seg6_texture_06032C38
+
+bowser_eye_half_closed_0:
+  type: TEXTURE
+  size: 4096
+  width: 64
+  height: 32
+  offset: 0x2DC38
+  format: RGBA16
+  symbol: bowser_seg6_texture_0602DC38
+
+bowser_eye_half_closed_1:
+  type: TEXTURE
+  size: 4096
+  width: 64
+  height: 32
+  offset: 0x2DC38
+  format: RGBA16
+  symbol: bowser_seg6_texture_06033C38
+
+bowser_eye_closed_0:
+  type: TEXTURE
+  size: 4096
+  width: 64
+  height: 32
+  offset: 0x2EC38
+  format: RGBA16
+  symbol: bowser_seg6_texture_0602EC38
+
+bowser_eye_closed_1:
+  type: TEXTURE
+  size: 4096
+  width: 64
+  height: 32
+  offset: 0x2EC38
+  format: RGBA16
+  symbol: bowser_seg6_texture_06034C38
+
+bowser_eye_center_0:
+  type: TEXTURE
+  size: 4096
+  width: 64
+  height: 32
+  offset: 0x2FC38
+  format: RGBA16
+  symbol: bowser_seg6_texture_0602FC38
+
+bowser_eye_center_1:
+  type: TEXTURE
+  size: 4096
+  width: 64
+  height: 32
+  offset: 0x2FC38
+  format: RGBA16
+  symbol: bowser_seg6_texture_06035C38
+
+bowser_eye_right_0:
+  type: TEXTURE
+  size: 4096
+  width: 64
+  height: 32
+  offset: 0x30C38
+  format: RGBA16
+  symbol: bowser_seg6_texture_06030C38
+
+bowser_eye_right_1:
+  type: TEXTURE
+  size: 4096
+  width: 64
+  height: 32
+  offset: 0x30C38
+  format: RGBA16
+  symbol: bowser_seg6_texture_06036C38
+
+bowser_eye_far_left_0:
+  type: TEXTURE
+  size: 4096
+  width: 64
+  height: 32
+  offset: 0x31C38
+  format: RGBA16
+  symbol: bowser_seg6_texture_06031C38
+
+bowser_eye_far_left_1:
+  type: TEXTURE
+  size: 4096
+  width: 64
+  height: 32
+  offset: 0x31C38
+  format: RGBA16
+  symbol: bowser_seg6_texture_06037C38
+
 bowser_seg6_lights_06038C38:
   type: LIGHTS
   size: 24

assets/ymls/jp/actors/bowser_flame.yml

@@ -13,6 +13,7 @@ bowser_flame_0:
   offset: 0x0
   format: RGBA16
   symbol: flame_seg6_texture_06000000
+
 bowser_flame_1:
   type: TEXTURE
   size: 8192
@@ -21,38 +22,7 @@ bowser_flame_1:
   offset: 0x2000
   format: RGBA16
   symbol: flame_seg6_texture_06002000
-bowser_flame_10:
-  type: TEXTURE
-  size: 8192
-  width: 64
-  height: 64
-  offset: 0x14000
-  format: RGBA16
-  symbol: flame_seg6_texture_06014000
-bowser_flame_11:
-  type: TEXTURE
-  size: 8192
-  width: 64
-  height: 64
-  offset: 0x16000
-  format: RGBA16
-  symbol: flame_seg6_texture_06016000
-bowser_flame_12:
-  type: TEXTURE
-  size: 8192
-  width: 64
-  height: 64
-  offset: 0x18000
-  format: RGBA16
-  symbol: flame_seg6_texture_06018000
-bowser_flame_13:
-  type: TEXTURE
-  size: 8192
-  width: 64
-  height: 64
-  offset: 0x1A000
-  format: RGBA16
-  symbol: flame_seg6_texture_0601A000
+
 bowser_flame_2:
   type: TEXTURE
   size: 8192
@@ -61,6 +31,7 @@ bowser_flame_2:
   offset: 0x4000
   format: RGBA16
   symbol: flame_seg6_texture_06004000
+
 bowser_flame_3:
   type: TEXTURE
   size: 8192
@@ -69,6 +40,7 @@ bowser_flame_3:
   offset: 0x6000
   format: RGBA16
   symbol: flame_seg6_texture_06006000
+
 bowser_flame_4:
   type: TEXTURE
   size: 8192
@@ -77,6 +49,7 @@ bowser_flame_4:
   offset: 0x8000
   format: RGBA16
   symbol: flame_seg6_texture_06008000
+
 bowser_flame_5:
   type: TEXTURE
   size: 8192
@@ -85,6 +58,7 @@ bowser_flame_5:
   offset: 0xA000
   format: RGBA16
   symbol: flame_seg6_texture_0600A000
+
 bowser_flame_6:
   type: TEXTURE
   size: 8192
@@ -93,6 +67,7 @@ bowser_flame_6:
   offset: 0xC000
   format: RGBA16
   symbol: flame_seg6_texture_0600C000
+
 bowser_flame_7:
   type: TEXTURE
   size: 8192
@@ -101,6 +76,7 @@ bowser_flame_7:
   offset: 0xE000
   format: RGBA16
   symbol: flame_seg6_texture_0600E000
+
 bowser_flame_8:
   type: TEXTURE
   size: 8192
@@ -109,6 +85,7 @@ bowser_flame_8:
   offset: 0x10000
   format: RGBA16
   symbol: flame_seg6_texture_06010000
+
 bowser_flame_9:
   type: TEXTURE
   size: 8192
@@ -118,6 +95,42 @@ bowser_flame_9:
   format: RGBA16
   symbol: flame_seg6_texture_06012000
 
+bowser_flame_10:
+  type: TEXTURE
+  size: 8192
+  width: 64
+  height: 64
+  offset: 0x14000
+  format: RGBA16
+  symbol: flame_seg6_texture_06014000
+
+bowser_flame_11:
+  type: TEXTURE
+  size: 8192
+  width: 64
+  height: 64
+  offset: 0x16000
+  format: RGBA16
+  symbol: flame_seg6_texture_06016000
+
+bowser_flame_12:
+  type: TEXTURE
+  size: 8192
+  width: 64
+  height: 64
+  offset: 0x18000
+  format: RGBA16
+  symbol: flame_seg6_texture_06018000
+
+bowser_flame_13:
+  type: TEXTURE
+  size: 8192
+  width: 64
+  height: 64
+  offset: 0x1A000
+  format: RGBA16
+  symbol: flame_seg6_texture_0601A000
+
 flame_seg6_vertex_0601C000:
   type: VTX
   count: 8

assets/ymls/jp/actors/breakable_box.yml

@@ -5,14 +5,12 @@
   segments:
     - [0x08,  0x1F0530]
 
-cork_box_surface:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x12290
-  format: RGBA16
-  symbol: breakable_box_seg8_texture_08012290
+breakable_box_seg8_lights_08011A80:
+  type: LIGHTS
+  size: 24
+  offset: 0x11A78
+  symbol: breakable_box_seg8_lights_08011A80
+
 crazy_box_surface:
   type: TEXTURE
   size: 2048
@@ -22,11 +20,14 @@ crazy_box_surface:
   format: RGBA16
   symbol: breakable_box_seg8_texture_08011A90
 
-breakable_box_seg8_lights_08011A80:
-  type: LIGHTS
-  size: 24
-  offset: 0x11A78
-  symbol: breakable_box_seg8_lights_08011A80
+cork_box_surface:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x12290
+  format: RGBA16
+  symbol: breakable_box_seg8_texture_08012290
 
 breakable_box_seg8_vertex_08012A90:
   type: VTX

assets/ymls/jp/actors/bub.yml

@@ -5,6 +5,15 @@
   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
@@ -13,14 +22,7 @@ bub_eye_border:
   offset: 0x1408
   format: RGBA16
   symbol: bub_seg6_texture_0600E2A8
-bub_eyes:
-  type: TEXTURE
-  size: 4096
-  width: 64
-  height: 32
-  offset: 0x408
-  format: RGBA16
-  symbol: bub_seg6_texture_0600F2A8
+
 bub_fins:
   type: TEXTURE
   size: 2048
@@ -29,6 +31,7 @@ bub_fins:
   offset: 0x1C08
   format: RGBA16
   symbol: bub_seg6_texture_0600EAA8
+
 bub_scales:
   type: TEXTURE
   size: 4096

assets/ymls/jp/actors/bubba.yml

@@ -5,6 +5,24 @@
   segments:
     - [0x05,  0x17EF80]
 
+bubba_sunglasses:
+  type: TEXTURE
+  size: 1024
+  width: 16
+  height: 32
+  offset: 0x8
+  format: RGBA16
+  symbol: bubba_seg5_texture_05000008
+
+bubba_eyes_unused:
+  type: TEXTURE
+  size: 4096
+  width: 64
+  height: 32
+  offset: 0x408
+  format: RGBA16
+  symbol: bubba_seg5_texture_05000408
+
 bubba_eye_border:
   type: TEXTURE
   size: 2048
@@ -13,14 +31,7 @@ bubba_eye_border:
   offset: 0x1408
   format: RGBA16
   symbol: bubba_seg5_texture_05001408
-bubba_eyes_unused:
-  type: TEXTURE
-  size: 4096
-  width: 64
-  height: 32
-  offset: 0x408
-  format: RGBA16
-  symbol: bubba_seg5_texture_05000408
+
 bubba_fins:
   type: TEXTURE
   size: 2048
@@ -29,6 +40,7 @@ bubba_fins:
   offset: 0x1C08
   format: RGBA16
   symbol: bubba_seg5_texture_05001C08
+
 bubba_scales:
   type: TEXTURE
   size: 8192
@@ -37,14 +49,6 @@ bubba_scales:
   offset: 0x2408
   format: RGBA16
   symbol: bubba_seg5_texture_05002408
-bubba_sunglasses:
-  type: TEXTURE
-  size: 1024
-  width: 16
-  height: 32
-  offset: 0x8
-  format: RGBA16
-  symbol: bubba_seg5_texture_05000008
 
 bubba_seg5_lights_05004408:
   type: LIGHTS

assets/ymls/jp/actors/bubble.yml

@@ -5,6 +5,12 @@
   segments:
     - [0x04,  0x112B50]
 
+bubble_seg4_vertex_0401CD20:
+  type: VTX
+  count: 4
+  offset: 0x1CD20
+  symbol: bubble_seg4_vertex_0401CD20
+
 bubble:
   type: TEXTURE
   size: 2048
@@ -13,6 +19,7 @@ bubble:
   offset: 0x1CD60
   format: RGBA16
   symbol: bubble_seg4_texture_0401CD60
+
 mr_i_bubble:
   type: TEXTURE
   size: 2048
@@ -22,12 +29,6 @@ mr_i_bubble:
   format: RGBA16
   symbol: bubble_seg4_texture_0401D560
 
-bubble_seg4_vertex_0401CD20:
-  type: VTX
-  count: 4
-  offset: 0x1CD20
-  symbol: bubble_seg4_vertex_0401CD20
-
 bubble_seg4_dl_0401DD60:
   type: GFX
   offset: 0x1DD60

assets/ymls/jp/actors/bullet_bill.yml

@@ -5,6 +5,12 @@
   segments:
     - [0x05,  0x128BE0]
 
+bullet_bill_seg5_lights_0500BA90:
+  type: LIGHTS
+  size: 24
+  offset: 0xBA90
+  symbol: bullet_bill_seg5_lights_0500BA90
+
 bullet_bill_eye:
   type: TEXTURE
   size: 4096
@@ -13,6 +19,7 @@ bullet_bill_eye:
   offset: 0xBAA8
   format: RGBA16
   symbol: bullet_bill_seg5_texture_0500BAA8
+
 bullet_bill_mouth:
   type: TEXTURE
   size: 4096
@@ -22,12 +29,6 @@ bullet_bill_mouth:
   format: RGBA16
   symbol: bullet_bill_seg5_texture_0500CAA8
 
-bullet_bill_seg5_lights_0500BA90:
-  type: LIGHTS
-  size: 24
-  offset: 0xBA90
-  symbol: bullet_bill_seg5_lights_0500BA90
-
 bullet_bill_seg5_vertex_0500DAA8:
   type: VTX
   count: 15

assets/ymls/jp/actors/bully.yml

@@ -5,14 +5,12 @@
   segments:
     - [0x05,  0x131060]
 
-bully_eye:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x2468
-  format: RGBA16
-  symbol: bully_seg5_texture_05002468
+bully_seg5_vertex_05000000:
+  type: VTX
+  count: 14
+  offset: 0x0
+  symbol: bully_seg5_vertex_05000000
+
 bully_horn:
   type: TEXTURE
   size: 512
@@ -21,28 +19,6 @@ bully_horn:
   offset: 0xE0
   format: RGBA16
   symbol: bully_seg5_texture_050000E0
-bully_left_side:
-  type: TEXTURE
-  size: 4096
-  width: 32
-  height: 64
-  offset: 0x468
-  format: RGBA16
-  symbol: bully_seg5_texture_05000468
-bully_right_side:
-  type: TEXTURE
-  size: 4096
-  width: 32
-  height: 64
-  offset: 0x1468
-  format: RGBA16
-  symbol: bully_seg5_texture_05001468
-
-bully_seg5_vertex_05000000:
-  type: VTX
-  count: 14
-  offset: 0x0
-  symbol: bully_seg5_vertex_05000000
 
 bully_seg5_dl_050002E0:
   type: GFX
@@ -78,6 +54,33 @@ bully_seg5_lights_05000450:
   offset: 0x450
   symbol: bully_seg5_lights_05000450
 
+bully_left_side:
+  type: TEXTURE
+  size: 4096
+  width: 32
+  height: 64
+  offset: 0x468
+  format: RGBA16
+  symbol: bully_seg5_texture_05000468
+
+bully_right_side:
+  type: TEXTURE
+  size: 4096
+  width: 32
+  height: 64
+  offset: 0x1468
+  format: RGBA16
+  symbol: bully_seg5_texture_05001468
+
+bully_eye:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x2468
+  format: RGBA16
+  symbol: bully_seg5_texture_05002468
+
 bully_seg5_vertex_05002C68:
   type: VTX
   count: 14

assets/ymls/jp/actors/burn_smoke.yml

@@ -5,6 +5,12 @@
   segments:
     - [0x04,  0x112B50]
 
+burn_smoke_seg4_vertex_040217C0:
+  type: VTX
+  count: 4
+  offset: 0x217C0
+  symbol: burn_smoke_seg4_vertex_040217C0
+
 burn_smoke:
   type: TEXTURE
   size: 2048
@@ -14,12 +20,6 @@ burn_smoke:
   format: IA16
   symbol: burn_smoke_seg4_texture_04021800
 
-burn_smoke_seg4_vertex_040217C0:
-  type: VTX
-  count: 4
-  offset: 0x217C0
-  symbol: burn_smoke_seg4_vertex_040217C0
-
 burn_smoke_seg4_dl_04022000:
   type: GFX
   offset: 0x22000

assets/ymls/jp/actors/butterfly.yml

@@ -5,6 +5,12 @@
   segments:
     - [0x03,  0x1FF740]
 
+butterfly_seg3_vertex_03004348:
+  type: VTX
+  count: 6
+  offset: 0x4348
+  symbol: butterfly_seg3_vertex_03004348
+
 butterfly_wing:
   type: TEXTURE
   size: 4096
@@ -14,12 +20,6 @@ butterfly_wing:
   format: RGBA16
   symbol: butterfly_seg3_texture_030043A8
 
-butterfly_seg3_vertex_03004348:
-  type: VTX
-  count: 6
-  offset: 0x4348
-  symbol: butterfly_seg3_vertex_03004348
-
 butterfly_seg3_vertex_030053A8:
   type: VTX
   count: 6

assets/ymls/jp/actors/cannon_barrel.yml

@@ -5,15 +5,6 @@
   segments:
     - [0x08,  0x1F0530]
 
-cannon_barrel:
-  type: TEXTURE
-  size: 2048
-  width: 32
-  height: 32
-  offset: 0x58A8
-  format: RGBA16
-  symbol: cannon_barrel_seg8_texture_080058A8
-
 cannon_barrel_seg8_lights_08005878:
   type: LIGHTS
   size: 24
@@ -26,6 +17,15 @@ cannon_barrel_seg8_lights_08005890:
   offset: 0x5890
   symbol: cannon_barrel_seg8_lights_08005890
 
+cannon_barrel:
+  type: TEXTURE
+  size: 2048
+  width: 32
+  height: 32
+  offset: 0x58A8
+  format: RGBA16
+  symbol: cannon_barrel_seg8_texture_080058A8
+
 cannon_barrel_seg8_vertex_080060A8:
   type: VTX
   count: 16