From b94e5abe7a982c2581b3d45d431a6323545e4416 Mon Sep 17 00:00:00 2001 From: inspectredc <78732756+inspectredc@users.noreply.github.com> Date: Fri, 14 Jun 2024 14:09:33 +0100 Subject: [PATCH] Misc. Offset Fixes (#58) * more offset fixes * format --- assets/ymls/jp/actors/bowser.yml | 92 +++++++------- assets/ymls/jp/actors/capswitch.yml | 2 +- assets/ymls/jp/actors/chair.yml | 12 +- assets/ymls/jp/actors/flyguy.yml | 10 +- assets/ymls/jp/actors/koopa.yml | 12 +- assets/ymls/jp/actors/lakitu_cameraman.yml | 8 +- assets/ymls/jp/actors/mario.yml | 8 +- assets/ymls/jp/actors/mario_cap.yml | 4 +- assets/ymls/jp/actors/moneybag.yml | 6 +- assets/ymls/jp/actors/skeeter.yml | 72 +++++------ assets/ymls/jp/actors/unagi/geo.yml | 1 + assets/ymls/jp/actors/water_mine.yml | 4 +- assets/ymls/jp/actors/wiggler_head.yml | 2 +- assets/ymls/jp/levels/bits.yml | 16 +-- assets/ymls/jp/levels/castle_inside.yml | 132 ++++++++++----------- assets/ymls/jp/levels/hmc.yml | 18 +-- assets/ymls/jp/levels/rr.yml | 62 +++++----- assets/ymls/us/actors/boo_castle.yml | 40 +++---- assets/ymls/us/actors/bowser.yml | 92 +++++++------- assets/ymls/us/actors/capswitch.yml | 2 +- assets/ymls/us/actors/mario.yml | 36 +++--- assets/ymls/us/actors/mario_cap.yml | 4 +- assets/ymls/us/actors/tornado.yml | 2 +- assets/ymls/us/actors/unagi/geo.yml | 1 + assets/ymls/us/actors/water_mine.yml | 4 +- assets/ymls/us/actors/wiggler_head.yml | 2 +- assets/ymls/us/levels/menu.yml | 22 ++-- assets/ymls/us/textures/segment2.yml | 77 ++++-------- 28 files changed, 359 insertions(+), 384 deletions(-) diff --git a/assets/ymls/jp/actors/bowser.yml b/assets/ymls/jp/actors/bowser.yml index f45d04d1..1dca0f84 100644 --- a/assets/ymls/jp/actors/bowser.yml +++ b/assets/ymls/jp/actors/bowser.yml @@ -167,15 +167,6 @@ bowser_eye_left_0: 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 @@ -185,15 +176,6 @@ bowser_eye_half_closed_0: 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 @@ -203,15 +185,6 @@ bowser_eye_closed_0: 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 @@ -221,15 +194,6 @@ bowser_eye_center_0: 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 @@ -239,15 +203,6 @@ bowser_eye_right_0: 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 @@ -257,12 +212,57 @@ bowser_eye_far_left_0: format: RGBA16 symbol: bowser_seg6_texture_06031C38 +bowser_eye_left_1: + type: TEXTURE + size: 4096 + width: 64 + height: 32 + offset: 0x32C38 + format: RGBA16 + symbol: bowser_seg6_texture_06032C38 + +bowser_eye_half_closed_1: + type: TEXTURE + size: 4096 + width: 64 + height: 32 + offset: 0x33C38 + format: RGBA16 + symbol: bowser_seg6_texture_06033C38 + +bowser_eye_closed_1: + type: TEXTURE + size: 4096 + width: 64 + height: 32 + offset: 0x34C38 + format: RGBA16 + symbol: bowser_seg6_texture_06034C38 + +bowser_eye_center_1: + type: TEXTURE + size: 4096 + width: 64 + height: 32 + offset: 0x35C38 + format: RGBA16 + symbol: bowser_seg6_texture_06035C38 + +bowser_eye_right_1: + type: TEXTURE + size: 4096 + width: 64 + height: 32 + offset: 0x36C38 + format: RGBA16 + symbol: bowser_seg6_texture_06036C38 + bowser_eye_far_left_1: type: TEXTURE size: 4096 width: 64 height: 32 - offset: 0x31C38 + offset: 0x37C38 format: RGBA16 symbol: bowser_seg6_texture_06037C38 diff --git a/assets/ymls/jp/actors/capswitch.yml b/assets/ymls/jp/actors/capswitch.yml index 4ab7b6c7..c613e656 100644 --- a/assets/ymls/jp/actors/capswitch.yml +++ b/assets/ymls/jp/actors/capswitch.yml @@ -100,7 +100,7 @@ cap_switch_base_seg5_dl_05003120: capswitch_seg5_vertex_05003180: type: VTX count: 16 - offset: 0x3120 + offset: 0x3180 symbol: capswitch_seg5_vertex_05003180 capswitch_seg5_dl_05003280: diff --git a/assets/ymls/jp/actors/chair.yml b/assets/ymls/jp/actors/chair.yml index 88018b4d..57949810 100644 --- a/assets/ymls/jp/actors/chair.yml +++ b/assets/ymls/jp/actors/chair.yml @@ -5,6 +5,12 @@ segments: - [0x05, 0x165060] +chair_lights_unused: + type: LIGHTS + size: 24 + offset: 0x3048 + symbol: chair_lights_unused + chair_front: type: TEXTURE size: 2048 @@ -153,9 +159,3 @@ chair_seg5_dl_05005680: offset: 0x5680 symbol: chair_seg5_dl_05005680 -chair_lights_unused: - type: LIGHTS - size: 24 - offset: 0x57F8 - symbol: chair_lights_unused - diff --git a/assets/ymls/jp/actors/flyguy.yml b/assets/ymls/jp/actors/flyguy.yml index 9e3c5df6..7a621f4d 100644 --- a/assets/ymls/jp/actors/flyguy.yml +++ b/assets/ymls/jp/actors/flyguy.yml @@ -35,7 +35,7 @@ flyguy_propeller: flyguy_lights_unused1: type: LIGHTS size: 24 - offset: 0xF888 + offset: 0x10088 symbol: flyguy_lights_unused1 flyguy_seg8_lights_080100A0: @@ -53,25 +53,25 @@ flyguy_seg8_lights_080100B8: flyguy_lights_unused2: type: LIGHTS size: 24 - offset: 0x100B8 + offset: 0x100D0 symbol: flyguy_lights_unused2 flyguy_lights_unused3: type: LIGHTS size: 24 - offset: 0x100B8 + offset: 0x100E8 symbol: flyguy_lights_unused3 flyguy_lights_unused4: type: LIGHTS size: 24 - offset: 0x100B8 + offset: 0x10100 symbol: flyguy_lights_unused4 flyguy_lights_unused5: type: LIGHTS size: 24 - offset: 0x100B8 + offset: 0x10118 symbol: flyguy_lights_unused5 flyguy_seg8_vertex_08010130: diff --git a/assets/ymls/jp/actors/koopa.yml b/assets/ymls/jp/actors/koopa.yml index c2167c8c..91ea97bf 100644 --- a/assets/ymls/jp/actors/koopa.yml +++ b/assets/ymls/jp/actors/koopa.yml @@ -5,6 +5,12 @@ segments: - [0x06, 0x1C2580] +koopa_lights_unused1: + type: LIGHTS + size: 24 + offset: 0x2588 + symbol: koopa_lights_unused1 + koopa_seg6_lights_060025A0: type: LIGHTS size: 24 @@ -65,12 +71,6 @@ koopa_shell_back: format: RGBA16 symbol: koopa_seg6_texture_06002E48 -koopa_lights_unused1: - type: LIGHTS - size: 24 - offset: 0x33B0 - symbol: koopa_lights_unused1 - koopa_shoe: type: TEXTURE size: 2048 diff --git a/assets/ymls/jp/actors/lakitu_cameraman.yml b/assets/ymls/jp/actors/lakitu_cameraman.yml index 43199559..c86680c7 100644 --- a/assets/ymls/jp/actors/lakitu_cameraman.yml +++ b/assets/ymls/jp/actors/lakitu_cameraman.yml @@ -311,7 +311,7 @@ lakitu_seg6_dl_06005360: lakitu_cameraman_lights_unused1: type: LIGHTS size: 24 - offset: 0x5360 + offset: 0x53D8 symbol: lakitu_cameraman_lights_unused1 lakitu_seg6_lights_060053F0: @@ -323,13 +323,13 @@ lakitu_seg6_lights_060053F0: lakitu_cameraman_lights_unused2: type: LIGHTS size: 24 - offset: 0x53F0 + offset: 0x5408 symbol: lakitu_cameraman_lights_unused2 lakitu_cameraman_lights_unused3: type: LIGHTS size: 24 - offset: 0x53F0 + offset: 0x5420 symbol: lakitu_cameraman_lights_unused3 lakitu_seg6_lights_06005438: @@ -341,7 +341,7 @@ lakitu_seg6_lights_06005438: lakitu_cameraman_lights_unused4: type: LIGHTS size: 24 - offset: 0x5438 + offset: 0x5450 symbol: lakitu_cameraman_lights_unused4 lakitu_seg6_vertex_06005468: diff --git a/assets/ymls/jp/actors/mario.yml b/assets/ymls/jp/actors/mario.yml index 86b29e40..0ac31a8d 100644 --- a/assets/ymls/jp/actors/mario.yml +++ b/assets/ymls/jp/actors/mario.yml @@ -118,7 +118,7 @@ mario_eyes_closed_unused_0: size: 2048 width: 32 height: 32 - offset: 0x4090 + offset: 0x4890 format: RGBA16 symbol: mario_texture_eyes_closed_unused1 @@ -127,7 +127,7 @@ mario_eyes_closed_unused_1: size: 2048 width: 32 height: 32 - offset: 0x4090 + offset: 0x5090 format: RGBA16 symbol: mario_texture_eyes_closed_unused2 @@ -856,13 +856,13 @@ mario_metal_cap_on_shared_dl: mario_lights_unused1: type: LIGHTS size: 24 - offset: 0x12120 + offset: 0x12160 symbol: mario_lights_unused1 mario_lights_unused2: type: LIGHTS size: 24 - offset: 0x12120 + offset: 0x12178 symbol: mario_lights_unused2 mario_eyes_cap_off_dl_vertex: diff --git a/assets/ymls/jp/actors/mario_cap.yml b/assets/ymls/jp/actors/mario_cap.yml index 6701483f..af11d657 100644 --- a/assets/ymls/jp/actors/mario_cap.yml +++ b/assets/ymls/jp/actors/mario_cap.yml @@ -1,9 +1,9 @@ :config: autopads: false compression: - offset: 0x112B50 + offset: 0x1FF740 segments: - - [0x03, 0x112B50] + - [0x03, 0x1FF740] mario_cap_seg3_lights_0301CF08: type: LIGHTS diff --git a/assets/ymls/jp/actors/moneybag.yml b/assets/ymls/jp/actors/moneybag.yml index dfd371f9..a2c47e46 100644 --- a/assets/ymls/jp/actors/moneybag.yml +++ b/assets/ymls/jp/actors/moneybag.yml @@ -114,13 +114,13 @@ moneybag_seg6_dl_06005750: moneybag_lights_unused1: type: LIGHTS size: 24 - offset: 0x5750 + offset: 0x57C0 symbol: moneybag_lights_unused1 moneybag_lights_unused2: type: LIGHTS size: 24 - offset: 0x5750 + offset: 0x57D8 symbol: moneybag_lights_unused2 moneybag_seg6_lights_060057F0: @@ -132,7 +132,7 @@ moneybag_seg6_lights_060057F0: moneybag_lights_unused3: type: LIGHTS size: 24 - offset: 0x57F0 + offset: 0x5808 symbol: moneybag_lights_unused3 moneybag_seg6_vertex_06005820: diff --git a/assets/ymls/jp/actors/skeeter.yml b/assets/ymls/jp/actors/skeeter.yml index fa3642c6..e09c61dc 100644 --- a/assets/ymls/jp/actors/skeeter.yml +++ b/assets/ymls/jp/actors/skeeter.yml @@ -5,6 +5,42 @@ segments: - [0x06, 0x1B8010] +skeeter_lights_unused1: + type: LIGHTS + size: 24 + offset: 0x0 + symbol: skeeter_lights_unused1 + +skeeter_lights_unused2: + type: LIGHTS + size: 24 + offset: 0x18 + symbol: skeeter_lights_unused2 + +skeeter_lights_unused3: + type: LIGHTS + size: 24 + offset: 0x30 + symbol: skeeter_lights_unused3 + +skeeter_lights_unused4: + type: LIGHTS + size: 24 + offset: 0x48 + symbol: skeeter_lights_unused4 + +skeeter_lights_unused5: + type: LIGHTS + size: 24 + offset: 0x60 + symbol: skeeter_lights_unused5 + +skeeter_lights_unused6: + type: LIGHTS + size: 24 + offset: 0x78 + symbol: skeeter_lights_unused6 + skeeter_eye: type: TEXTURE size: 2048 @@ -537,42 +573,6 @@ skeeter_seg6_dl_06004678: offset: 0x4678 symbol: skeeter_seg6_dl_06004678 -skeeter_lights_unused1: - type: LIGHTS - size: 24 - offset: 0x48E0 - symbol: skeeter_lights_unused1 - -skeeter_lights_unused2: - type: LIGHTS - size: 24 - offset: 0x48E0 - symbol: skeeter_lights_unused2 - -skeeter_lights_unused3: - type: LIGHTS - size: 24 - offset: 0x48E0 - symbol: skeeter_lights_unused3 - -skeeter_lights_unused4: - type: LIGHTS - size: 24 - offset: 0x48E0 - symbol: skeeter_lights_unused4 - -skeeter_lights_unused5: - type: LIGHTS - size: 24 - offset: 0x48E0 - symbol: skeeter_lights_unused5 - -skeeter_lights_unused6: - type: LIGHTS - size: 24 - offset: 0x48E0 - symbol: skeeter_lights_unused6 - skeeter_seg6_dl_06004A40: type: GFX offset: 0x4A40 diff --git a/assets/ymls/jp/actors/unagi/geo.yml b/assets/ymls/jp/actors/unagi/geo.yml index 6a1d7c2e..eee7d689 100644 --- a/assets/ymls/jp/actors/unagi/geo.yml +++ b/assets/ymls/jp/actors/unagi/geo.yml @@ -1,6 +1,7 @@ :config: external_files: - "assets/ymls/jp/actors/unagi.yml" + - "assets/ymls/jp/actors/star.yml" autopads: false segments: - [0x0C, 0x144010] diff --git a/assets/ymls/jp/actors/water_mine.yml b/assets/ymls/jp/actors/water_mine.yml index 7187b08f..99cae8f0 100644 --- a/assets/ymls/jp/actors/water_mine.yml +++ b/assets/ymls/jp/actors/water_mine.yml @@ -1,9 +1,9 @@ :config: autopads: false compression: - offset: 0x186810 + offset: 0x1B8010 segments: - - [0x06, 0x186810] + - [0x06, 0x1B8010] water_mine_seg6_lights_0600A4E0: type: LIGHTS diff --git a/assets/ymls/jp/actors/wiggler_head.yml b/assets/ymls/jp/actors/wiggler_head.yml index 9b619c87..cc0aad63 100644 --- a/assets/ymls/jp/actors/wiggler_head.yml +++ b/assets/ymls/jp/actors/wiggler_head.yml @@ -104,7 +104,7 @@ wiggler_seg5_vertex_0500D228: wiggler_seg5_vertex_0500D318: type: VTX count: 144 - offset: 0xD228 + offset: 0xD318 symbol: wiggler_seg5_vertex_0500D318 wiggler_seg5_dl_0500DC18: diff --git a/assets/ymls/jp/levels/bits.yml b/assets/ymls/jp/levels/bits.yml index 291c323f..d3233093 100644 --- a/assets/ymls/jp/levels/bits.yml +++ b/assets/ymls/jp/levels/bits.yml @@ -1448,7 +1448,7 @@ bits_seg7_vertex_07010208: bits_seg7_vertex_07010308: type: VTX - count: 16 + count: 15 offset: 0x10308 symbol: bits_seg7_vertex_07010308 @@ -1472,19 +1472,19 @@ bits_seg7_vertex_070105C8: bits_seg7_vertex_070106C8: type: VTX - count: 15 + count: 14 offset: 0x106C8 symbol: bits_seg7_vertex_070106C8 bits_seg7_vertex_070107A8: type: VTX - count: 15 + count: 14 offset: 0x107A8 symbol: bits_seg7_vertex_070107A8 bits_seg7_vertex_07010888: type: VTX - count: 16 + count: 15 offset: 0x10888 symbol: bits_seg7_vertex_07010888 @@ -1508,7 +1508,7 @@ bits_seg7_vertex_07010B58: bits_seg7_vertex_07010C48: type: VTX - count: 16 + count: 15 offset: 0x10C48 symbol: bits_seg7_vertex_07010C48 @@ -1520,7 +1520,7 @@ bits_seg7_vertex_07010D38: bits_seg7_vertex_07010E18: type: VTX - count: 15 + count: 14 offset: 0x10E18 symbol: bits_seg7_vertex_07010E18 @@ -1556,13 +1556,13 @@ bits_seg7_vertex_07011298: bits_seg7_vertex_07011388: type: VTX - count: 16 + count: 15 offset: 0x11388 symbol: bits_seg7_vertex_07011388 bits_seg7_vertex_07011478: type: VTX - count: 15 + count: 14 offset: 0x11478 symbol: bits_seg7_vertex_07011478 diff --git a/assets/ymls/jp/levels/castle_inside.yml b/assets/ymls/jp/levels/castle_inside.yml index c9774412..5111c3dd 100644 --- a/assets/ymls/jp/levels/castle_inside.yml +++ b/assets/ymls/jp/levels/castle_inside.yml @@ -14,6 +14,15 @@ 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 @@ -158,15 +167,6 @@ format: RGBA16 symbol: inside_castle_seg7_texture_0700B800 -2: - type: TEXTURE - size: 4096 - width: 32 - height: 64 - offset: 0xB800 - format: IA16 - symbol: inside_castle_seg7_texture_07001000 - castle_light: type: TEXTURE size: 2048 @@ -1214,6 +1214,22 @@ inside_castle_seg7_dl_0702A650: offset: 0x2A650 symbol: inside_castle_seg7_dl_0702A650 +dl_castle_lobby_wing_cap_light_vertex_group: + type: VTX + count: 16 + offset: 0x2A6D8 + symbol: dl_castle_lobby_wing_cap_light_vertex_group + +dl_castle_lobby_wing_cap_light_model: + type: GFX + offset: 0x2A7D8 + symbol: dl_castle_lobby_wing_cap_light_model + +dl_castle_lobby_wing_cap_light: + type: GFX + offset: 0x2A880 + symbol: dl_castle_lobby_wing_cap_light + inside_castle_seg7_lights_0702A8F0: type: LIGHTS size: 24 @@ -1783,19 +1799,19 @@ inside_castle_seg7_lights_0702FDD8: inside_castle_seg7_vertex_0702FDF0: type: VTX - count: 9 + count: 8 offset: 0x2FDF0 symbol: inside_castle_seg7_vertex_0702FDF0 inside_castle_seg7_vertex_0702FE70: type: VTX - count: 17 + count: 16 offset: 0x2FE70 symbol: inside_castle_seg7_vertex_0702FE70 inside_castle_seg7_vertex_0702FF70: type: VTX - count: 9 + count: 8 offset: 0x2FF70 symbol: inside_castle_seg7_vertex_0702FF70 @@ -1819,91 +1835,91 @@ inside_castle_seg7_vertex_070301D0: inside_castle_seg7_vertex_070302B0: type: VTX - count: 17 + count: 16 offset: 0x302B0 symbol: inside_castle_seg7_vertex_070302B0 inside_castle_seg7_vertex_070303B0: type: VTX - count: 15 + count: 14 offset: 0x303B0 symbol: inside_castle_seg7_vertex_070303B0 inside_castle_seg7_vertex_07030490: type: VTX - count: 17 + count: 16 offset: 0x30490 symbol: inside_castle_seg7_vertex_07030490 inside_castle_seg7_vertex_07030590: type: VTX - count: 15 + count: 14 offset: 0x30590 symbol: inside_castle_seg7_vertex_07030590 inside_castle_seg7_vertex_07030670: type: VTX - count: 16 + count: 15 offset: 0x30670 symbol: inside_castle_seg7_vertex_07030670 inside_castle_seg7_vertex_07030760: type: VTX - count: 17 + count: 16 offset: 0x30760 symbol: inside_castle_seg7_vertex_07030760 inside_castle_seg7_vertex_07030860: type: VTX - count: 15 + count: 14 offset: 0x30860 symbol: inside_castle_seg7_vertex_07030860 inside_castle_seg7_vertex_07030940: type: VTX - count: 17 + count: 16 offset: 0x30940 symbol: inside_castle_seg7_vertex_07030940 inside_castle_seg7_vertex_07030A40: type: VTX - count: 16 + count: 15 offset: 0x30A40 symbol: inside_castle_seg7_vertex_07030A40 inside_castle_seg7_vertex_07030B30: type: VTX - count: 16 + count: 15 offset: 0x30B30 symbol: inside_castle_seg7_vertex_07030B30 inside_castle_seg7_vertex_07030C20: type: VTX - count: 17 + count: 16 offset: 0x30C20 symbol: inside_castle_seg7_vertex_07030C20 inside_castle_seg7_vertex_07030D20: type: VTX - count: 17 + count: 16 offset: 0x30D20 symbol: inside_castle_seg7_vertex_07030D20 inside_castle_seg7_vertex_07030E20: type: VTX - count: 16 + count: 15 offset: 0x30E20 symbol: inside_castle_seg7_vertex_07030E20 inside_castle_seg7_vertex_07030F10: type: VTX - count: 15 + count: 14 offset: 0x30F10 symbol: inside_castle_seg7_vertex_07030F10 inside_castle_seg7_vertex_07030FF0: type: VTX - count: 9 + count: 8 offset: 0x30FF0 symbol: inside_castle_seg7_vertex_07030FF0 @@ -2127,22 +2143,6 @@ inside_castle_seg7_dl_07032FC0: offset: 0x32FC0 symbol: inside_castle_seg7_dl_07032FC0 -dl_castle_lobby_wing_cap_light_vertex_group: - type: VTX - count: 16 - offset: 0x32FC0 - symbol: dl_castle_lobby_wing_cap_light_vertex_group - -dl_castle_lobby_wing_cap_light_model: - type: GFX - offset: 0x32FC0 - symbol: dl_castle_lobby_wing_cap_light_model - -dl_castle_lobby_wing_cap_light: - type: GFX - offset: 0x32FC0 - symbol: dl_castle_lobby_wing_cap_light - inside_castle_seg7_lights_07033068: type: LIGHTS size: 24 @@ -2165,29 +2165,6 @@ inside_castle_seg7_dl_07033158: offset: 0x33158 symbol: inside_castle_seg7_dl_07033158 -dl_castle_aquarium_light_vertex_group_1: - type: VTX - count: 16 - offset: 0x33158 - symbol: dl_castle_aquarium_light_vertex_group_1 - -dl_castle_aquarium_light_vertex_group_2: - type: VTX - count: 16 - offset: 0x33158 - symbol: dl_castle_aquarium_light_vertex_group_2 - -dl_castle_aquarium_light_vertex_group_3: - type: VTX - count: 13 - offset: 0x33158 - symbol: dl_castle_aquarium_light_vertex_group_3 - -dl_castle_aquarium_light_model: - type: GFX - offset: 0x33158 - symbol: dl_castle_aquarium_light_model - inside_castle_seg7_lights_070331C8: type: LIGHTS size: 24 @@ -2740,6 +2717,29 @@ inside_castle_seg7_dl_07037DE8: offset: 0x37DE8 symbol: inside_castle_seg7_dl_07037DE8 +dl_castle_aquarium_light_vertex_group_1: + type: VTX + count: 16 + offset: 0x37E38 + symbol: dl_castle_aquarium_light_vertex_group_1 + +dl_castle_aquarium_light_vertex_group_2: + type: VTX + count: 16 + offset: 0x37F38 + symbol: dl_castle_aquarium_light_vertex_group_2 + +dl_castle_aquarium_light_vertex_group_3: + type: VTX + count: 13 + offset: 0x38038 + symbol: dl_castle_aquarium_light_vertex_group_3 + +dl_castle_aquarium_light_model: + type: GFX + offset: 0x38108 + symbol: dl_castle_aquarium_light_model + dl_castle_aquarium_light: type: GFX offset: 0x38240 diff --git a/assets/ymls/jp/levels/hmc.yml b/assets/ymls/jp/levels/hmc.yml index d28ac411..d2a4c17e 100644 --- a/assets/ymls/jp/levels/hmc.yml +++ b/assets/ymls/jp/levels/hmc.yml @@ -1805,15 +1805,6 @@ hmc_seg7_vertex_070167F8: offset: 0x167F8 symbol: hmc_seg7_vertex_070167F8 -7: - type: TEXTURE - size: 2048 - width: 32 - height: 32 - offset: 0x16800 - format: RGBA16 - symbol: hmc_seg7_texture_07024CE0 - hmc_seg7_vertex_07016898: type: VTX count: 4 @@ -3256,6 +3247,15 @@ hmc_seg7_painting_dl_070242D0: offset: 0x242D0 symbol: hmc_seg7_painting_dl_070242D0 +7: + type: TEXTURE + size: 2048 + width: 32 + height: 32 + offset: 0x24CE0 + format: RGBA16 + symbol: hmc_seg7_texture_07024CE0 + hmc_seg7_painting_dl_070254E0: type: GFX offset: 0x254E0 diff --git a/assets/ymls/jp/levels/rr.yml b/assets/ymls/jp/levels/rr.yml index 7bc07bc8..d1e4c5b3 100644 --- a/assets/ymls/jp/levels/rr.yml +++ b/assets/ymls/jp/levels/rr.yml @@ -86,25 +86,25 @@ rr_seg7_vertex_07002688: rr_seg7_vertex_070026F8: type: VTX - count: 17 + count: 16 offset: 0x26F8 symbol: rr_seg7_vertex_070026F8 rr_seg7_vertex_070027F8: type: VTX - count: 16 + count: 15 offset: 0x27F8 symbol: rr_seg7_vertex_070027F8 rr_seg7_vertex_070028E8: type: VTX - count: 16 + count: 15 offset: 0x28E8 symbol: rr_seg7_vertex_070028E8 rr_seg7_vertex_070029D8: type: VTX - count: 5 + count: 4 offset: 0x29D8 symbol: rr_seg7_vertex_070029D8 @@ -1587,151 +1587,151 @@ rr_seg7_dl_07012758: rr_seg7_vertex_070127E8: type: VTX - count: 16 + count: 15 offset: 0x127E8 symbol: rr_seg7_vertex_070127E8 rr_seg7_vertex_070128D8: type: VTX - count: 15 + count: 14 offset: 0x128D8 symbol: rr_seg7_vertex_070128D8 rr_seg7_vertex_070129B8: type: VTX - count: 16 + count: 15 offset: 0x129B8 symbol: rr_seg7_vertex_070129B8 rr_seg7_vertex_07012AA8: type: VTX - count: 16 + count: 15 offset: 0x12AA8 symbol: rr_seg7_vertex_07012AA8 rr_seg7_vertex_07012B98: type: VTX - count: 17 + count: 16 offset: 0x12B98 symbol: rr_seg7_vertex_07012B98 rr_seg7_vertex_07012C98: type: VTX - count: 15 + count: 14 offset: 0x12C98 symbol: rr_seg7_vertex_07012C98 rr_seg7_vertex_07012D78: type: VTX - count: 16 + count: 15 offset: 0x12D78 symbol: rr_seg7_vertex_07012D78 rr_seg7_vertex_07012E68: type: VTX - count: 16 + count: 15 offset: 0x12E68 symbol: rr_seg7_vertex_07012E68 rr_seg7_vertex_07012F58: type: VTX - count: 15 + count: 14 offset: 0x12F58 symbol: rr_seg7_vertex_07012F58 rr_seg7_vertex_07013038: type: VTX - count: 16 + count: 15 offset: 0x13038 symbol: rr_seg7_vertex_07013038 rr_seg7_vertex_07013128: type: VTX - count: 15 + count: 14 offset: 0x13128 symbol: rr_seg7_vertex_07013128 rr_seg7_vertex_07013208: type: VTX - count: 16 + count: 15 offset: 0x13208 symbol: rr_seg7_vertex_07013208 rr_seg7_vertex_070132F8: type: VTX - count: 16 + count: 15 offset: 0x132F8 symbol: rr_seg7_vertex_070132F8 rr_seg7_vertex_070133E8: type: VTX - count: 15 + count: 14 offset: 0x133E8 symbol: rr_seg7_vertex_070133E8 rr_seg7_vertex_070134C8: type: VTX - count: 17 + count: 16 offset: 0x134C8 symbol: rr_seg7_vertex_070134C8 rr_seg7_vertex_070135C8: type: VTX - count: 15 + count: 14 offset: 0x135C8 symbol: rr_seg7_vertex_070135C8 rr_seg7_vertex_070136A8: type: VTX - count: 9 + count: 8 offset: 0x136A8 symbol: rr_seg7_vertex_070136A8 rr_seg7_vertex_07013728: type: VTX - count: 17 + count: 16 offset: 0x13728 symbol: rr_seg7_vertex_07013728 rr_seg7_vertex_07013828: type: VTX - count: 9 + count: 8 offset: 0x13828 symbol: rr_seg7_vertex_07013828 rr_seg7_vertex_070138A8: type: VTX - count: 16 + count: 15 offset: 0x138A8 symbol: rr_seg7_vertex_070138A8 rr_seg7_vertex_07013998: type: VTX - count: 16 + count: 15 offset: 0x13998 symbol: rr_seg7_vertex_07013998 rr_seg7_vertex_07013A88: type: VTX - count: 17 + count: 16 offset: 0x13A88 symbol: rr_seg7_vertex_07013A88 rr_seg7_vertex_07013B88: type: VTX - count: 17 + count: 16 offset: 0x13B88 symbol: rr_seg7_vertex_07013B88 rr_seg7_vertex_07013C88: type: VTX - count: 16 + count: 15 offset: 0x13C88 symbol: rr_seg7_vertex_07013C88 rr_seg7_vertex_07013D78: type: VTX - count: 15 + count: 14 offset: 0x13D78 symbol: rr_seg7_vertex_07013D78 @@ -2538,13 +2538,13 @@ rr_seg7_dl_0701B220: rr_seg7_vertex_0701B290: type: VTX - count: 15 + count: 14 offset: 0x1B290 symbol: rr_seg7_vertex_0701B290 rr_seg7_vertex_0701B370: type: VTX - count: 13 + count: 12 offset: 0x1B370 symbol: rr_seg7_vertex_0701B370 diff --git a/assets/ymls/us/actors/boo_castle.yml b/assets/ymls/us/actors/boo_castle.yml index 9d90162a..1e925e15 100644 --- a/assets/ymls/us/actors/boo_castle.yml +++ b/assets/ymls/us/actors/boo_castle.yml @@ -8,7 +8,7 @@ boo_castle_seg6_lights_06015658: type: LIGHTS size: 24 - offset: 0x15658 + offset: 0x15748 symbol: boo_castle_seg6_lights_06015658 bbh_boo_eyes: @@ -16,7 +16,7 @@ bbh_boo_eyes: size: 4096 width: 64 height: 32 - offset: 0x15670 + offset: 0x15760 format: RGBA16 symbol: boo_castle_seg6_texture_06015670 @@ -25,105 +25,105 @@ bbh_boo_mouth: size: 2048 width: 32 height: 32 - offset: 0x16670 + offset: 0x16760 format: RGBA16 symbol: boo_castle_seg6_texture_06016670 boo_castle_seg6_vertex_06016E70: type: VTX count: 12 - offset: 0x16E70 + offset: 0x16F60 symbol: boo_castle_seg6_vertex_06016E70 boo_castle_seg6_vertex_06016F30: type: VTX count: 12 - offset: 0x16F30 + offset: 0x17020 symbol: boo_castle_seg6_vertex_06016F30 boo_castle_seg6_vertex_06016FF0: type: VTX count: 15 - offset: 0x16FF0 + offset: 0x170E0 symbol: boo_castle_seg6_vertex_06016FF0 boo_castle_seg6_vertex_060170E0: type: VTX count: 15 - offset: 0x170E0 + offset: 0x171D0 symbol: boo_castle_seg6_vertex_060170E0 boo_castle_seg6_vertex_060171D0: type: VTX count: 15 - offset: 0x171D0 + offset: 0x172C0 symbol: boo_castle_seg6_vertex_060171D0 boo_castle_seg6_vertex_060172C0: type: VTX count: 15 - offset: 0x172C0 + offset: 0x173B0 symbol: boo_castle_seg6_vertex_060172C0 boo_castle_seg6_vertex_060173B0: type: VTX count: 15 - offset: 0x173B0 + offset: 0x174A0 symbol: boo_castle_seg6_vertex_060173B0 boo_castle_seg6_vertex_060174A0: type: VTX count: 15 - offset: 0x174A0 + offset: 0x17590 symbol: boo_castle_seg6_vertex_060174A0 boo_castle_seg6_vertex_06017590: type: VTX count: 15 - offset: 0x17590 + offset: 0x17680 symbol: boo_castle_seg6_vertex_06017590 boo_castle_seg6_vertex_06017680: type: VTX count: 15 - offset: 0x17680 + offset: 0x17770 symbol: boo_castle_seg6_vertex_06017680 boo_castle_seg6_vertex_06017770: type: VTX count: 15 - offset: 0x17770 + offset: 0x17860 symbol: boo_castle_seg6_vertex_06017770 boo_castle_seg6_vertex_06017860: type: VTX count: 15 - offset: 0x17860 + offset: 0x17950 symbol: boo_castle_seg6_vertex_06017860 boo_castle_seg6_vertex_06017950: type: VTX count: 12 - offset: 0x17950 + offset: 0x17A40 symbol: boo_castle_seg6_vertex_06017950 boo_castle_seg6_dl_06017A10: type: GFX - offset: 0x17A10 + offset: 0x17B00 symbol: boo_castle_seg6_dl_06017A10 boo_castle_seg6_dl_06017A78: type: GFX - offset: 0x17A78 + offset: 0x17B68 symbol: boo_castle_seg6_dl_06017A78 boo_castle_seg6_dl_06017AD0: type: GFX - offset: 0x17AD0 + offset: 0x17BC0 symbol: boo_castle_seg6_dl_06017AD0 boo_castle_seg6_dl_06017CE0: type: GFX - offset: 0x17CE0 + offset: 0x17DD0 symbol: boo_castle_seg6_dl_06017CE0 diff --git a/assets/ymls/us/actors/bowser.yml b/assets/ymls/us/actors/bowser.yml index 594a216e..24560b89 100644 --- a/assets/ymls/us/actors/bowser.yml +++ b/assets/ymls/us/actors/bowser.yml @@ -167,15 +167,6 @@ bowser_eye_left_0: 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 @@ -185,15 +176,6 @@ bowser_eye_half_closed_0: 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 @@ -203,15 +185,6 @@ bowser_eye_closed_0: 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 @@ -221,15 +194,6 @@ bowser_eye_center_0: 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 @@ -239,15 +203,6 @@ bowser_eye_right_0: 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 @@ -257,12 +212,57 @@ bowser_eye_far_left_0: format: RGBA16 symbol: bowser_seg6_texture_06031C38 +bowser_eye_left_1: + type: TEXTURE + size: 4096 + width: 64 + height: 32 + offset: 0x32C38 + format: RGBA16 + symbol: bowser_seg6_texture_06032C38 + +bowser_eye_half_closed_1: + type: TEXTURE + size: 4096 + width: 64 + height: 32 + offset: 0x33C38 + format: RGBA16 + symbol: bowser_seg6_texture_06033C38 + +bowser_eye_closed_1: + type: TEXTURE + size: 4096 + width: 64 + height: 32 + offset: 0x34C38 + format: RGBA16 + symbol: bowser_seg6_texture_06034C38 + +bowser_eye_center_1: + type: TEXTURE + size: 4096 + width: 64 + height: 32 + offset: 0x35C38 + format: RGBA16 + symbol: bowser_seg6_texture_06035C38 + +bowser_eye_right_1: + type: TEXTURE + size: 4096 + width: 64 + height: 32 + offset: 0x36C38 + format: RGBA16 + symbol: bowser_seg6_texture_06036C38 + bowser_eye_far_left_1: type: TEXTURE size: 4096 width: 64 height: 32 - offset: 0x31C38 + offset: 0x37C38 format: RGBA16 symbol: bowser_seg6_texture_06037C38 diff --git a/assets/ymls/us/actors/capswitch.yml b/assets/ymls/us/actors/capswitch.yml index 5c0135eb..8bee2f96 100644 --- a/assets/ymls/us/actors/capswitch.yml +++ b/assets/ymls/us/actors/capswitch.yml @@ -100,7 +100,7 @@ cap_switch_base_seg5_dl_05003120: capswitch_seg5_vertex_05003180: type: VTX count: 16 - offset: 0x3120 + offset: 0x3180 symbol: capswitch_seg5_vertex_05003180 capswitch_seg5_dl_05003280: diff --git a/assets/ymls/us/actors/mario.yml b/assets/ymls/us/actors/mario.yml index fd475a79..91f9d3d1 100644 --- a/assets/ymls/us/actors/mario.yml +++ b/assets/ymls/us/actors/mario.yml @@ -104,24 +104,6 @@ mario_eyes_half_closed: format: RGBA16 symbol: mario_texture_eyes_half_closed -mario_eyes_closed: - type: TEXTURE - size: 2048 - width: 32 - height: 32 - offset: 0x4090 - format: RGBA16 - symbol: mario_texture_eyes_closed - -mario_eyes_closed_unused_0: - type: TEXTURE - size: 2048 - width: 32 - height: 32 - offset: 0x4090 - format: RGBA16 - symbol: mario_texture_eyes_closed_unused1 - mario_eyes_closed_unused_1: type: TEXTURE size: 2048 @@ -131,6 +113,24 @@ mario_eyes_closed_unused_1: format: RGBA16 symbol: mario_texture_eyes_closed_unused2 +mario_eyes_closed: + type: TEXTURE + size: 2048 + width: 32 + height: 32 + offset: 0x4890 + format: RGBA16 + symbol: mario_texture_eyes_closed + +mario_eyes_closed_unused_0: + type: TEXTURE + size: 2048 + width: 32 + height: 32 + offset: 0x5090 + format: RGBA16 + symbol: mario_texture_eyes_closed_unused1 + mario_eyes_left_unused: type: TEXTURE size: 2048 diff --git a/assets/ymls/us/actors/mario_cap.yml b/assets/ymls/us/actors/mario_cap.yml index 19f95bd5..c73cb3b4 100644 --- a/assets/ymls/us/actors/mario_cap.yml +++ b/assets/ymls/us/actors/mario_cap.yml @@ -1,9 +1,9 @@ :config: autopads: false compression: - offset: 0x114750 + offset: 0x201410 segments: - - [0x03, 0x114750] + - [0x03, 0x201410] mario_cap_seg3_lights_0301CF08: type: LIGHTS diff --git a/assets/ymls/us/actors/tornado.yml b/assets/ymls/us/actors/tornado.yml index a5c86c56..bc40b3bd 100644 --- a/assets/ymls/us/actors/tornado.yml +++ b/assets/ymls/us/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/us/actors/unagi/geo.yml b/assets/ymls/us/actors/unagi/geo.yml index e11853c7..282625f5 100644 --- a/assets/ymls/us/actors/unagi/geo.yml +++ b/assets/ymls/us/actors/unagi/geo.yml @@ -1,6 +1,7 @@ :config: external_files: - "assets/ymls/us/actors/unagi.yml" + - "assets/ymls/us/actors/star.yml" autopads: false segments: - [0x0C, 0x145C10] diff --git a/assets/ymls/us/actors/water_mine.yml b/assets/ymls/us/actors/water_mine.yml index e39b68a4..652149c5 100644 --- a/assets/ymls/us/actors/water_mine.yml +++ b/assets/ymls/us/actors/water_mine.yml @@ -1,9 +1,9 @@ :config: autopads: false compression: - offset: 0x188440 + offset: 0x1B9CC0 segments: - - [0x06, 0x188440] + - [0x06, 0x1B9CC0] water_mine_seg6_lights_0600A4E0: type: LIGHTS diff --git a/assets/ymls/us/actors/wiggler_head.yml b/assets/ymls/us/actors/wiggler_head.yml index b0592287..3ef0e4e2 100644 --- a/assets/ymls/us/actors/wiggler_head.yml +++ b/assets/ymls/us/actors/wiggler_head.yml @@ -104,7 +104,7 @@ wiggler_seg5_vertex_0500D228: wiggler_seg5_vertex_0500D318: type: VTX count: 144 - offset: 0xD228 + offset: 0xD318 symbol: wiggler_seg5_vertex_0500D318 wiggler_seg5_dl_0500DC18: diff --git a/assets/ymls/us/levels/menu.yml b/assets/ymls/us/levels/menu.yml index 7dc9385a..3da1e173 100644 --- a/assets/ymls/us/levels/menu.yml +++ b/assets/ymls/us/levels/menu.yml @@ -716,15 +716,6 @@ main_menu_seg7.0B600: format: IA8 symbol: texture_menu_font_char_dash -main_menu_seg7.0B7C0: - type: TEXTURE - size: 64 - width: 8 - height: 8 - offset: 0xB638 - format: IA8 - symbol: texture_menu_font_char_period - main_menu_seg7.0B640: type: TEXTURE size: 64 @@ -779,6 +770,15 @@ main_menu_seg7.0B780: format: IA8 symbol: texture_menu_font_char_mface2 +main_menu_seg7.0B7C0: + type: TEXTURE + size: 64 + width: 8 + height: 8 + offset: 0xB7C0 + format: IA8 + symbol: texture_menu_font_char_period + main_menu_seg7.0B800: type: TEXTURE size: 64 @@ -793,7 +793,7 @@ main_menu_seg7.0D1A8: size: 4096 width: 64 height: 32 - offset: 0xBCE0 + offset: 0xD1A8 format: RGBA16 symbol: texture_menu_course_upper @@ -802,6 +802,6 @@ main_menu_seg7.0E1A8: size: 4096 width: 64 height: 32 - offset: 0xCCE0 + offset: 0xE1A8 format: RGBA16 symbol: texture_menu_course_lower diff --git a/assets/ymls/us/textures/segment2.yml b/assets/ymls/us/textures/segment2.yml index 76d03c6c..ee287648 100644 --- a/assets/ymls/us/textures/segment2.yml +++ b/assets/ymls/us/textures/segment2.yml @@ -794,15 +794,6 @@ font_graphics.05DC0: format: IA4 symbol: texture_font_char_us_J -segment2.07340: - type: TEXTURE - size: 16 - width: 8 - height: 16 - offset: 0x5DF2 - format: IA1 - symbol: texture_font_char_jp_long_vowel - font_graphics.05E00: type: TEXTURE size: 64 @@ -846,7 +837,7 @@ font_graphics.05F00: height: 8 offset: 0x5F00 format: IA4 - symbol: texture_font_char_eu_0 + symbol: texture_font_char_us_O font_graphics.05F40: type: TEXTURE @@ -855,7 +846,7 @@ font_graphics.05F40: height: 8 offset: 0x5F40 format: IA4 - symbol: texture_font_char_eu_4 + symbol: texture_font_char_us_P font_graphics.05F80: type: TEXTURE @@ -864,7 +855,7 @@ font_graphics.05F80: height: 8 offset: 0x5F80 format: IA4 - symbol: texture_font_char_eu_8 + symbol: texture_font_char_us_Q font_graphics.05FC0: type: TEXTURE @@ -873,7 +864,7 @@ font_graphics.05FC0: height: 8 offset: 0x5FC0 format: IA4 - symbol: texture_font_char_eu_C + symbol: texture_font_char_us_R font_graphics.06000: type: TEXTURE @@ -882,7 +873,7 @@ font_graphics.06000: height: 8 offset: 0x6000 format: IA4 - symbol: texture_font_char_eu_G + symbol: texture_font_char_us_S font_graphics.06040: type: TEXTURE @@ -891,7 +882,7 @@ font_graphics.06040: height: 8 offset: 0x6040 format: IA4 - symbol: texture_font_char_eu_K + symbol: texture_font_char_us_T font_graphics.06080: type: TEXTURE @@ -900,7 +891,7 @@ font_graphics.06080: height: 8 offset: 0x6080 format: IA4 - symbol: texture_font_char_eu_O + symbol: texture_font_char_us_U font_graphics.060C0: type: TEXTURE @@ -909,7 +900,7 @@ font_graphics.060C0: height: 8 offset: 0x60C0 format: IA4 - symbol: texture_font_char_eu_S + symbol: texture_font_char_us_V font_graphics.06100: type: TEXTURE @@ -918,7 +909,7 @@ font_graphics.06100: height: 8 offset: 0x6100 format: IA4 - symbol: texture_font_char_eu_W + symbol: texture_font_char_us_W font_graphics.06140: type: TEXTURE @@ -927,7 +918,7 @@ font_graphics.06140: height: 8 offset: 0x6140 format: IA4 - symbol: texture_font_char_eu_a + symbol: texture_font_char_us_X font_graphics.06180: type: TEXTURE @@ -936,7 +927,7 @@ font_graphics.06180: height: 8 offset: 0x6180 format: IA4 - symbol: texture_font_char_eu_e + symbol: texture_font_char_us_Y font_graphics.061C0: type: TEXTURE @@ -945,7 +936,7 @@ font_graphics.061C0: height: 8 offset: 0x61C0 format: IA4 - symbol: texture_font_char_eu_i + symbol: texture_font_char_us_Z font_graphics.06200: type: TEXTURE @@ -954,7 +945,7 @@ font_graphics.06200: height: 8 offset: 0x6200 format: IA4 - symbol: texture_font_char_eu_m + symbol: texture_font_char_us_a font_graphics.06240: type: TEXTURE @@ -963,7 +954,7 @@ font_graphics.06240: height: 8 offset: 0x6240 format: IA4 - symbol: texture_font_char_eu_q + symbol: texture_font_char_us_b font_graphics.06280: type: TEXTURE @@ -972,7 +963,7 @@ font_graphics.06280: height: 8 offset: 0x6280 format: IA4 - symbol: texture_font_char_eu_u + symbol: texture_font_char_us_c font_graphics.062C0: type: TEXTURE @@ -981,7 +972,7 @@ font_graphics.062C0: height: 8 offset: 0x62C0 format: IA4 - symbol: texture_font_char_eu_y + symbol: texture_font_char_us_d font_graphics.06300: type: TEXTURE @@ -990,7 +981,7 @@ font_graphics.06300: height: 8 offset: 0x6300 format: IA4 - symbol: texture_font_char_eu_exclamation + symbol: texture_font_char_us_e font_graphics.06340: type: TEXTURE @@ -999,7 +990,7 @@ font_graphics.06340: height: 8 offset: 0x6340 format: IA4 - symbol: texture_font_char_eu_close_open_parentheses + symbol: texture_font_char_us_f font_graphics.06380: type: TEXTURE @@ -1008,7 +999,7 @@ font_graphics.06380: height: 8 offset: 0x6380 format: IA4 - symbol: texture_font_char_eu_percent + symbol: texture_font_char_us_g font_graphics.063C0: type: TEXTURE @@ -1017,7 +1008,7 @@ font_graphics.063C0: height: 8 offset: 0x63C0 format: IA4 - symbol: texture_font_char_eu_question + symbol: texture_font_char_us_h font_graphics.06400: type: TEXTURE @@ -1026,25 +1017,7 @@ font_graphics.06400: height: 8 offset: 0x6400 format: IA4 - symbol: texture_font_char_eu_double_quote_close - -font_graphics.06410: - type: TEXTURE - size: 16 - width: 16 - height: 8 - offset: 0x6410 - format: IA1 - symbol: texture_font_char_eu_colon - -font_graphics.06420: - type: TEXTURE - size: 16 - width: 16 - height: 8 - offset: 0x6420 - format: IA1 - symbol: texture_font_char_EU_slash + symbol: texture_font_char_us_i font_graphics.06440: type: TEXTURE @@ -1053,7 +1026,7 @@ font_graphics.06440: height: 8 offset: 0x6440 format: IA4 - symbol: texture_font_char_eu_button_B + symbol: texture_font_char_us_j font_graphics.06480: type: TEXTURE @@ -1062,7 +1035,7 @@ font_graphics.06480: height: 8 offset: 0x6480 format: IA4 - symbol: texture_font_char_eu_button_C_up + symbol: texture_font_char_us_k font_graphics.064C0: type: TEXTURE @@ -1071,7 +1044,7 @@ font_graphics.064C0: height: 8 offset: 0x64C0 format: IA4 - symbol: texture_font_char_eu_umlaut + symbol: texture_font_char_us_l font_graphics.06500: type: TEXTURE @@ -1080,7 +1053,7 @@ font_graphics.06500: height: 8 offset: 0x6500 format: IA4 - symbol: texture_font_char_eu_cedilla + symbol: texture_font_char_us_m font_graphics.06540: type: TEXTURE