diff --git a/assets/ymls/us/actors/bobomb/bobomb.yml b/assets/ymls/us/actors/bobomb/bobomb.yml index f2eff937..9df3e7fa 100644 --- a/assets/ymls/us/actors/bobomb/bobomb.yml +++ b/assets/ymls/us/actors/bobomb/bobomb.yml @@ -1,41 +1,3 @@ -:config: - compressed_offset: 0x134D20 - segments: - seg5: 0x134D20 - -bob-omb_buddy_left_side: - type: TEXTURE - size: 4096 - width: 32 - height: 64 - offset: 0x78 - format: RGBA16 - symbol: bobomb_seg8_texture_0801FA60 -bob-omb_buddy_right_side: - type: TEXTURE - size: 4096 - width: 32 - height: 64 - offset: 0x1078 - format: RGBA16 - symbol: bobomb_seg8_texture_08020A60 -bob-omb_eyes: - type: TEXTURE - size: 2048 - width: 32 - height: 32 - offset: 0x4878 - format: RGBA16 - symbol: bobomb_seg8_texture_08021A60 -bob-omb_eyes_blink: - type: TEXTURE - size: 2048 - width: 32 - height: 32 - offset: 0x5078 - format: RGBA16 - symbol: bobomb_seg8_texture_08022260 - :config: compressed_offset: 0x1F2200 segments: @@ -57,3 +19,35 @@ bob-omb_right_side: offset: 0x1EA60 format: RGBA16 symbol: bobomb_seg8_texture_0801EA60 +bob-omb_buddy_left_side: + type: TEXTURE + size: 4096 + width: 32 + height: 64 + offset: 0x1FA60 + format: RGBA16 + symbol: bobomb_seg8_texture_0801FA60 +bob-omb_buddy_right_side: + type: TEXTURE + size: 4096 + width: 32 + height: 64 + offset: 0x20A60 + format: RGBA16 + symbol: bobomb_seg8_texture_08020A60 +bob-omb_eyes: + type: TEXTURE + size: 2048 + width: 32 + height: 32 + offset: 0x21A60 + format: RGBA16 + symbol: bobomb_seg8_texture_08021A60 +bob-omb_eyes_blink: + type: TEXTURE + size: 2048 + width: 32 + height: 32 + offset: 0x22260 + format: RGBA16 + symbol: bobomb_seg8_texture_08022260 \ No newline at end of file diff --git a/assets/ymls/us/actors/chain_chomp/chain_chomp.yml b/assets/ymls/us/actors/chain_chomp/chain_chomp.yml index 91727b5b..7d57611a 100644 --- a/assets/ymls/us/actors/chain_chomp/chain_chomp.yml +++ b/assets/ymls/us/actors/chain_chomp/chain_chomp.yml @@ -19,6 +19,14 @@ chain_chomp_dull_shine: offset: 0x21BD0 format: RGBA16 symbol: chain_chomp_seg6_texture_06021BD0 +chain_chomp_tooth: + type: TEXTURE + size: 2048 + width: 32 + height: 32 + offset: 0x22BD0 + format: RGBA16 + symbol: chain_chomp_seg6_texture_06022BD0 chain_chomp_eye: type: TEXTURE size: 2048 @@ -36,16 +44,3 @@ chain_chomp_tongue: format: RGBA16 symbol: chain_chomp_seg6_texture_060223D0 -:config: - compressed_offset: 0x166C60 - segments: - seg5: 0x166C60 - -chain_chomp_tooth: - type: TEXTURE - size: 2048 - width: 32 - height: 32 - offset: 0x6AF0 - format: RGBA16 - symbol: chain_chomp_seg6_texture_06022BD0 diff --git a/assets/ymls/us/actors/chillychief/chillychief.yml b/assets/ymls/us/actors/chillychief/chillychief.yml index 7dea4435..7865574e 100644 --- a/assets/ymls/us/actors/chillychief/chillychief.yml +++ b/assets/ymls/us/actors/chillychief/chillychief.yml @@ -1,17 +1,3 @@ -:config: - compressed_offset: 0x132C60 - segments: - seg5: 0x132C60 - -chill_bully_eye: - type: TEXTURE - size: 2048 - width: 32 - height: 32 - offset: 0x2468 - format: RGBA16 - symbol: chilly_chief_seg6_texture_06002060 - :config: compressed_offset: 0x1E51F0 segments: @@ -33,6 +19,14 @@ chill_bully_right_side: offset: 0x1060 format: RGBA16 symbol: chilly_chief_seg6_texture_06001060 +chill_bully_eye: + type: TEXTURE + size: 2048 + width: 32 + height: 32 + offset: 0x2060 + format: RGBA16 + symbol: chilly_chief_seg6_texture_06002060 chilly_chief_geo: type: SM64:GEO_LAYOUT diff --git a/assets/ymls/us/actors/dorrie/dorrie.yml b/assets/ymls/us/actors/dorrie/dorrie.yml index fff08a0e..4ed744de 100644 --- a/assets/ymls/us/actors/dorrie/dorrie.yml +++ b/assets/ymls/us/actors/dorrie/dorrie.yml @@ -19,17 +19,11 @@ dorrie_skin: offset: 0x9DA0 format: RGBA16 symbol: dorrie_seg6_texture_06009DA0 - -:config: - compressed_offset: 0x1C4230 - segments: - seg6: 0x1C4230 - dorrie_tongue: type: TEXTURE size: 2048 width: 32 height: 32 - offset: 0x223D0 + offset: 0xADA0 format: RGBA16 symbol: dorrie_seg6_texture_0600ADA0 diff --git a/assets/ymls/us/actors/lakitu_cameraman/lakitu_cameraman.yml b/assets/ymls/us/actors/lakitu_cameraman/lakitu_cameraman.yml index 20ee3000..5a35cb74 100644 --- a/assets/ymls/us/actors/lakitu_cameraman/lakitu_cameraman.yml +++ b/assets/ymls/us/actors/lakitu_cameraman/lakitu_cameraman.yml @@ -3,6 +3,46 @@ segments: seg6: 0x1D8310 +lakitu_cameraman_cloud_face_unused: + type: TEXTURE + size: 2048 + width: 32 + height: 32 + offset: 0x0 + format: RGBA16 + symbol: lakitu_seg6_texture_06000000 +lakitu_cameraman_eyes_open: + type: TEXTURE + size: 4096 + width: 64 + height: 32 + offset: 0x800 + format: RGBA16 + symbol: lakitu_seg6_texture_06000800 +lakitu_cameraman_eyes_closed: + type: TEXTURE + size: 4096 + width: 64 + height: 32 + offset: 0x1800 + format: RGBA16 + symbol: lakitu_seg6_texture_06001800 +lakitu_cameraman_shell: + type: TEXTURE + size: 2048 + width: 32 + height: 32 + offset: 0x2800 + format: RGBA16 + symbol: lakitu_seg6_texture_06002800 +lakitu_cameraman_frown: + type: TEXTURE + size: 2048 + width: 32 + height: 32 + offset: 0x3000 + format: RGBA16 + symbol: lakitu_seg6_texture_06003000 lakitu_camera_lens: type: TEXTURE size: 512 @@ -12,48 +52,3 @@ lakitu_camera_lens: format: RGBA16 symbol: lakitu_seg6_texture_06003800 -:config: - compressed_offset: 0x180BB0 - segments: - seg5: 0x180BB0 - -lakitu_cameraman_cloud_face_unused: - type: TEXTURE - size: 2048 - width: 32 - height: 32 - offset: 0xECE0 - format: RGBA16 - symbol: lakitu_seg6_texture_06000000 -lakitu_cameraman_eyes_closed: - type: TEXTURE - size: 4096 - width: 64 - height: 32 - offset: 0x104E0 - format: RGBA16 - symbol: lakitu_seg6_texture_06001800 -lakitu_cameraman_eyes_open: - type: TEXTURE - size: 4096 - width: 64 - height: 32 - offset: 0xF4E0 - format: RGBA16 - symbol: lakitu_seg6_texture_06000800 -lakitu_cameraman_frown: - type: TEXTURE - size: 2048 - width: 32 - height: 32 - offset: 0x11CE0 - format: RGBA16 - symbol: lakitu_seg6_texture_06003000 -lakitu_cameraman_shell: - type: TEXTURE - size: 2048 - width: 32 - height: 32 - offset: 0x114E0 - format: RGBA16 - symbol: lakitu_seg6_texture_06002800 diff --git a/assets/ymls/us/actors/piranha_plant/piranha_plant.yml b/assets/ymls/us/actors/piranha_plant/piranha_plant.yml index 2d7ded92..1544cdbe 100644 --- a/assets/ymls/us/actors/piranha_plant/piranha_plant.yml +++ b/assets/ymls/us/actors/piranha_plant/piranha_plant.yml @@ -3,22 +3,14 @@ segments: seg6: 0x1C4230 -piranha_plant_bottom_lip: - type: TEXTURE - size: 2048 - width: 32 - height: 32 - offset: 0x133F8 - format: RGBA16 - symbol: piranha_plant_seg6_texture_060133F8 -piranha_plant_leaf: +piranha_plant_tongue: type: TEXTURE size: 4096 width: 32 height: 64 - offset: 0x143F8 + offset: 0x113F8 format: RGBA16 - symbol: piranha_plant_seg6_texture_060143F8 + symbol: piranha_plant_seg6_texture_060113F8 piranha_plant_skin: type: TEXTURE size: 2048 @@ -35,7 +27,14 @@ piranha_plant_stem: offset: 0x12BF8 format: RGBA16 symbol: piranha_plant_seg6_texture_06012BF8 - +piranha_plant_bottom_lip: + type: TEXTURE + size: 2048 + width: 32 + height: 32 + offset: 0x133F8 + format: RGBA16 + symbol: piranha_plant_seg6_texture_060133F8 piranha_plant_tooth: type: TEXTURE size: 2048 @@ -44,17 +43,11 @@ piranha_plant_tooth: offset: 0x13BF8 format: RGBA16 symbol: piranha_plant_seg6_texture_06013BF8 - -:config: - compressed_offset: 0x188440 - segments: - seg6: 0x188440 - -piranha_plant_tongue: +piranha_plant_leaf: type: TEXTURE size: 4096 width: 32 height: 64 - offset: 0x24438 + offset: 0x143F8 format: RGBA16 - symbol: piranha_plant_seg6_texture_060113F8 + symbol: piranha_plant_seg6_texture_060143F8 diff --git a/assets/ymls/us/actors/star/star.yml b/assets/ymls/us/actors/star/star.yml index 29ec9b4b..99133e4c 100644 --- a/assets/ymls/us/actors/star/star.yml +++ b/assets/ymls/us/actors/star/star.yml @@ -1,17 +1,3 @@ -:config: - compressed_offset: 0x180BB0 - segments: - seg5: 0x180BB0 - -star_eye: - type: TEXTURE - size: 2048 - width: 32 - height: 32 - offset: 0x7A30 - format: RGBA16 - symbol: star_seg3_texture_0302AEF0 - :config: compressed_offset: 0x201410 segments: @@ -25,3 +11,11 @@ star_surface: offset: 0x2A6F0 format: RGBA16 symbol: star_seg3_texture_0302A6F0 +star_eye: + type: TEXTURE + size: 2048 + width: 32 + height: 32 + offset: 0x2AEF0 + format: RGBA16 + symbol: star_seg3_texture_0302AEF0 diff --git a/assets/ymls/us/levels/castle_inside/castle_inside.yml b/assets/ymls/us/levels/castle_inside/castle_inside.yml index 8baf9361..9cab4838 100644 --- a/assets/ymls/us/levels/castle_inside/castle_inside.yml +++ b/assets/ymls/us/levels/castle_inside/castle_inside.yml @@ -3,6 +3,14 @@ segments: seg7: 0x396340 +castle_light: + type: TEXTURE + size: 2048 + width: 32 + height: 32 + offset: 0x0 + format: IA16 + symbol: texture_castle_light 1: type: TEXTURE size: 2048 @@ -11,6 +19,70 @@ offset: 0x800 format: RGBA16 symbol: inside_castle_seg7_texture_07000800 +2: + type: TEXTURE + size: 4096 + width: 32 + height: 64 + offset: 0x1000 + format: IA16 + symbol: inside_castle_seg7_texture_07001000 +3: + type: TEXTURE + size: 4096 + width: 32 + height: 64 + offset: 0x2000 + format: RGBA16 + symbol: inside_castle_seg7_texture_07002000 +4: + type: TEXTURE + size: 2048 + width: 32 + height: 32 + offset: 0x3000 + format: RGBA16 + symbol: inside_castle_seg7_texture_07003000 +5: + type: TEXTURE + size: 4096 + width: 32 + height: 64 + offset: 0x3800 + format: RGBA16 + symbol: inside_castle_seg7_texture_07003800 +6: + type: TEXTURE + size: 4096 + width: 32 + height: 64 + offset: 0x4800 + format: RGBA16 + symbol: inside_castle_seg7_texture_07004800 +7: + type: TEXTURE + size: 2048 + width: 32 + height: 32 + offset: 0x5800 + format: RGBA16 + symbol: inside_castle_seg7_texture_07005800 +8: + type: TEXTURE + size: 2048 + width: 32 + height: 32 + offset: 0x6000 + format: RGBA16 + symbol: inside_castle_seg7_texture_07006000 +9: + type: TEXTURE + size: 2048 + width: 32 + height: 32 + offset: 0x6800 + format: RGBA16 + symbol: inside_castle_seg7_texture_07006800 10: type: TEXTURE size: 2048 @@ -172,14 +244,6 @@ offset: 0x16800 format: RGBA16 symbol: inside_castle_seg7_texture_07016800 -3: - type: TEXTURE - size: 4096 - width: 32 - height: 64 - offset: 0x2000 - format: RGBA16 - symbol: inside_castle_seg7_texture_07002000 30: type: TEXTURE size: 2048 @@ -260,14 +324,6 @@ offset: 0x1F800 format: RGBA16 symbol: inside_castle_seg7_texture_0701F800 -4: - type: TEXTURE - size: 2048 - width: 32 - height: 32 - offset: 0x3000 - format: RGBA16 - symbol: inside_castle_seg7_texture_07003000 40: type: TEXTURE size: 4096 @@ -276,71 +332,3 @@ offset: 0x20800 format: RGBA16 symbol: inside_castle_seg7_texture_07020800 -5: - type: TEXTURE - size: 4096 - width: 32 - height: 64 - offset: 0x3800 - format: RGBA16 - symbol: inside_castle_seg7_texture_07003800 -6: - type: TEXTURE - size: 4096 - width: 32 - height: 64 - offset: 0x4800 - format: RGBA16 - symbol: inside_castle_seg7_texture_07004800 -7: - type: TEXTURE - size: 2048 - width: 32 - height: 32 - offset: 0x5800 - format: RGBA16 - symbol: inside_castle_seg7_texture_07005800 -8: - type: TEXTURE - size: 2048 - width: 32 - height: 32 - offset: 0x6000 - format: RGBA16 - symbol: inside_castle_seg7_texture_07006000 -9: - type: TEXTURE - size: 2048 - width: 32 - height: 32 - offset: 0x6800 - format: RGBA16 - symbol: inside_castle_seg7_texture_07006800 - -:config: - compressed_offset: 0x347A50 - segments: - seg9: 0x347A50 - -castle_light: - type: TEXTURE - size: 2048 - width: 32 - height: 32 - offset: 0xB800 - format: IA16 - symbol: texture_castle_light - -:config: - compressed_offset: 0x326E40 - segments: - seg9: 0x326E40 - -2: - type: TEXTURE - size: 4096 - width: 32 - height: 64 - offset: 0xB800 - format: IA16 - symbol: inside_castle_seg7_texture_07001000 diff --git a/assets/ymls/us/levels/ccm/ccm.yml b/assets/ymls/us/levels/ccm/ccm.yml index 81fc66ae..2f23897a 100644 --- a/assets/ymls/us/levels/ccm/ccm.yml +++ b/assets/ymls/us/levels/ccm/ccm.yml @@ -19,30 +19,6 @@ offset: 0x800 format: RGBA16 symbol: ccm_seg7_texture_07000800 -10: - type: TEXTURE - size: 2048 - width: 32 - height: 32 - offset: 0x4300 - format: RGBA16 - symbol: ccm_seg7_texture_07004300 -11: - type: TEXTURE - size: 2048 - width: 32 - height: 32 - offset: 0x4B00 - format: RGBA16 - symbol: ccm_seg7_texture_07004B00 -12: - type: TEXTURE - size: 2048 - width: 32 - height: 32 - offset: 0x11958 - format: RGBA16 - symbol: ccm_seg7_texture_07011958 2: type: TEXTURE size: 2048 @@ -67,7 +43,22 @@ offset: 0x1900 format: RGBA16 symbol: ccm_seg7_texture_07001900 - +5: + type: TEXTURE + size: 2048 + width: 32 + height: 32 + offset: 0x2100 + format: RGBA16 + symbol: ccm_seg7_texture_07002100 +6: + type: TEXTURE + size: 2048 + width: 32 + height: 32 + offset: 0x2900 + format: RGBA16 + symbol: ccm_seg7_texture_07002900 7: type: TEXTURE size: 2048 @@ -92,25 +83,27 @@ offset: 0x3B00 format: IA16 symbol: ccm_seg7_texture_07003B00 - -:config: - compressed_offset: 0x160670 - segments: - seg5: 0x160670 - -5: +10: type: TEXTURE size: 2048 width: 32 height: 32 - offset: 0xBC70 + offset: 0x4300 format: RGBA16 - symbol: ccm_seg7_texture_07002100 -6: + symbol: ccm_seg7_texture_07004300 +11: type: TEXTURE size: 2048 width: 32 height: 32 - offset: 0xB470 + offset: 0x4B00 format: RGBA16 - symbol: ccm_seg7_texture_07002900 + symbol: ccm_seg7_texture_07004B00 +12: + type: TEXTURE + size: 2048 + width: 32 + height: 32 + offset: 0x11958 + format: RGBA16 + symbol: ccm_seg7_texture_07011958 diff --git a/assets/ymls/us/levels/ddd/ddd.yml b/assets/ymls/us/levels/ddd/ddd.yml index fa971949..0e068af6 100644 --- a/assets/ymls/us/levels/ddd/ddd.yml +++ b/assets/ymls/us/levels/ddd/ddd.yml @@ -11,7 +11,14 @@ offset: 0x0 format: RGBA16 symbol: ddd_seg7_texture_07000000 - +1: + type: TEXTURE + size: 2048 + width: 32 + height: 32 + offset: 0x1000 + format: RGBA16 + symbol: ddd_seg7_texture_07001000 2: type: TEXTURE size: 2048 @@ -37,16 +44,3 @@ format: RGBA16 symbol: ddd_seg7_texture_07003000 -:config: - compressed_offset: 0x347A50 - segments: - seg9: 0x347A50 - -1: - type: TEXTURE - size: 2048 - width: 32 - height: 32 - offset: 0x1000 - format: RGBA16 - symbol: ddd_seg7_texture_07001000 diff --git a/assets/ymls/us/levels/hmc/hmc.yml b/assets/ymls/us/levels/hmc/hmc.yml index ef0f325c..1c8b502c 100644 --- a/assets/ymls/us/levels/hmc/hmc.yml +++ b/assets/ymls/us/levels/hmc/hmc.yml @@ -59,17 +59,11 @@ offset: 0x4800 format: RGBA16 symbol: hmc_seg7_texture_07004800 - -:config: - compressed_offset: 0x396340 - segments: - seg7: 0x396340 - 7: type: TEXTURE size: 2048 width: 32 height: 32 - offset: 0x16800 + offset: 0x24CE0 format: RGBA16 symbol: hmc_seg7_texture_07024CE0 diff --git a/assets/ymls/us/levels/jrb/jrb.yml b/assets/ymls/us/levels/jrb/jrb.yml index 5330c570..945e7bc1 100644 --- a/assets/ymls/us/levels/jrb/jrb.yml +++ b/assets/ymls/us/levels/jrb/jrb.yml @@ -1,22 +1,16 @@ :config: - compressed_offset: 0x347A50 + compressed_offset: 0x41A760 segments: - seg9: 0x347A50 + seg7: 0x41A760 0: type: TEXTURE size: 2048 width: 32 height: 32 - offset: 0x1000 + offset: 0x0 format: RGBA16 symbol: jrb_seg7_texture_07000000 - -:config: - compressed_offset: 0x41A760 - segments: - seg7: 0x41A760 - 1: type: TEXTURE size: 4096 diff --git a/assets/ymls/us/levels/lll/lll.yml b/assets/ymls/us/levels/lll/lll.yml index 0e53371e..ad304a41 100644 --- a/assets/ymls/us/levels/lll/lll.yml +++ b/assets/ymls/us/levels/lll/lll.yml @@ -19,6 +19,70 @@ offset: 0x800 format: RGBA16 symbol: lll_seg7_texture_07000800 +2: + type: TEXTURE + size: 2048 + width: 32 + height: 32 + offset: 0x1000 + format: RGBA16 + symbol: lll_seg7_texture_07001000 +3: + type: TEXTURE + size: 2048 + width: 32 + height: 32 + offset: 0x1800 + format: RGBA16 + symbol: lll_seg7_texture_07001800 +4: + type: TEXTURE + size: 2048 + width: 32 + height: 32 + offset: 0x2000 + format: RGBA16 + symbol: lll_seg7_texture_07002000 +5: + type: TEXTURE + size: 2048 + width: 32 + height: 32 + offset: 0x2800 + format: RGBA16 + symbol: lll_seg7_texture_07002800 +6: + type: TEXTURE + size: 2048 + width: 32 + height: 32 + offset: 0x3000 + format: RGBA16 + symbol: lll_seg7_texture_07003000 +7: + type: TEXTURE + size: 2048 + width: 32 + height: 32 + offset: 0x3800 + format: RGBA16 + symbol: lll_seg7_texture_07003800 +8: + type: TEXTURE + size: 2048 + width: 32 + height: 32 + offset: 0x4000 + format: RGBA16 + symbol: lll_seg7_texture_07004000 +9: + type: TEXTURE + size: 2048 + width: 32 + height: 32 + offset: 0x4800 + format: RGBA16 + symbol: lll_seg7_texture_07004800 10: type: TEXTURE size: 2048 @@ -99,14 +163,6 @@ offset: 0x9800 format: RGBA16 symbol: lll_seg7_texture_07009800 -2: - type: TEXTURE - size: 2048 - width: 32 - height: 32 - offset: 0x1000 - format: RGBA16 - symbol: lll_seg7_texture_07001000 20: type: TEXTURE size: 2048 @@ -163,7 +219,14 @@ offset: 0xD000 format: RGBA16 symbol: lll_seg7_texture_0700D000 - +27: + type: TEXTURE + size: 512 + width: 16 + height: 16 + offset: 0xD200 + format: IA16 + symbol: lll_seg7_texture_0700D200 28: type: TEXTURE size: 2048 @@ -180,14 +243,6 @@ offset: 0xDC00 format: RGBA16 symbol: lll_seg7_texture_0700DC00 -3: - type: TEXTURE - size: 2048 - width: 32 - height: 32 - offset: 0x1800 - format: RGBA16 - symbol: lll_seg7_texture_07001800 30: type: TEXTURE size: 2048 @@ -212,73 +267,3 @@ offset: 0xF400 format: RGBA16 symbol: lll_seg7_texture_0700F400 -4: - type: TEXTURE - size: 2048 - width: 32 - height: 32 - offset: 0x2000 - format: RGBA16 - symbol: lll_seg7_texture_07002000 -5: - type: TEXTURE - size: 2048 - width: 32 - height: 32 - offset: 0x2800 - format: RGBA16 - symbol: lll_seg7_texture_07002800 -6: - type: TEXTURE - size: 2048 - width: 32 - height: 32 - offset: 0x3000 - format: RGBA16 - symbol: lll_seg7_texture_07003000 - -8: - type: TEXTURE - size: 2048 - width: 32 - height: 32 - offset: 0x4000 - format: RGBA16 - symbol: lll_seg7_texture_07004000 -9: - type: TEXTURE - size: 2048 - width: 32 - height: 32 - offset: 0x4800 - format: RGBA16 - symbol: lll_seg7_texture_07004800 - -:config: - compressed_offset: 0x31E1D0 - segments: - seg9: 0x31E1D0 - -7: - type: TEXTURE - size: 2048 - width: 32 - height: 32 - offset: 0x1800 - format: RGBA16 - symbol: lll_seg7_texture_07003800 - -:config: - compressed_offset: 0x383950 - segments: - seg7: 0x383950 - -27: - type: TEXTURE - size: 512 - width: 16 - height: 16 - offset: 0x383950 - mio0: 0x3900 - format: IA16 - symbol: lll_seg7_texture_0700D200 diff --git a/assets/ymls/us/levels/ssl/ssl.yml b/assets/ymls/us/levels/ssl/ssl.yml index 154cf350..332706c8 100644 --- a/assets/ymls/us/levels/ssl/ssl.yml +++ b/assets/ymls/us/levels/ssl/ssl.yml @@ -19,22 +19,6 @@ offset: 0x800 format: IA16 symbol: ssl_seg7_texture_07000800 -10: - type: TEXTURE - size: 4096 - width: 32 - height: 64 - offset: 0xD7A8 - format: RGBA16 - symbol: ssl_seg7_texture_0700D7A8 -11: - type: TEXTURE - size: 4096 - width: 32 - height: 64 - offset: 0xE7A8 - format: RGBA16 - symbol: ssl_seg7_texture_0700E7A8 2: type: TEXTURE size: 2048 @@ -75,7 +59,14 @@ offset: 0x3800 format: RGBA16 symbol: ssl_seg7_texture_07003800 - +7: + type: TEXTURE + size: 2048 + width: 32 + height: 32 + offset: 0x4018 + format: RGBA16 + symbol: ssl_quicksand 8: type: TEXTURE size: 2048 @@ -92,17 +83,20 @@ offset: 0xC7A8 format: RGBA16 symbol: ssl_seg7_texture_0700C7A8 - -:config: - compressed_offset: 0x32D070 - segments: - seg9: 0x32D070 - -7: +10: type: TEXTURE - size: 2048 + size: 4096 width: 32 - height: 32 - offset: 0x8000 + height: 64 + offset: 0xD7A8 format: RGBA16 - symbol: ssl_quicksand + symbol: ssl_seg7_texture_0700D7A8 +11: + type: TEXTURE + size: 4096 + width: 32 + height: 64 + offset: 0xE7A8 + format: RGBA16 + symbol: ssl_seg7_texture_0700E7A8 + diff --git a/assets/ymls/us/levels/ttm/ttm.yml b/assets/ymls/us/levels/ttm/ttm.yml index 3b5589de..7e4bc0a5 100644 --- a/assets/ymls/us/levels/ttm/ttm.yml +++ b/assets/ymls/us/levels/ttm/ttm.yml @@ -67,17 +67,11 @@ offset: 0x4000 format: RGBA16 symbol: ttm_seg7_texture_07004000 - -:config: - compressed_offset: 0x351960 - segments: - seg9: 0x351960 - 8: type: TEXTURE size: 2048 width: 32 height: 32 - offset: 0xA800 + offset: 0x2AD30 format: RGBA16 symbol: ttm_seg7_texture_0702AD30 diff --git a/assets/ymls/us/levels/wf/wf.yml b/assets/ymls/us/levels/wf/wf.yml index c04be942..d7b3e6a4 100644 --- a/assets/ymls/us/levels/wf/wf.yml +++ b/assets/ymls/us/levels/wf/wf.yml @@ -43,17 +43,11 @@ offset: 0x2000 format: RGBA16 symbol: wf_seg7_texture_07002000 - -:config: - compressed_offset: 0x108A40 - segments: - seg2: 0x108A40 - 5: type: TEXTURE size: 256 width: 16 height: 16 - offset: 0x121B8 + offset: 0x2800 format: IA8 symbol: wf_seg7_texture_07002800 diff --git a/assets/ymls/us/textures/cave.yml b/assets/ymls/us/textures/cave.yml index a6ef62e3..da2092d2 100644 --- a/assets/ymls/us/textures/cave.yml +++ b/assets/ymls/us/textures/cave.yml @@ -131,17 +131,11 @@ hmc_textures.0B800: offset: 0xB800 format: IA16 symbol: cave_0900B800 - -:config: - compressed_offset: 0x326E40 - segments: - seg9: 0x326E40 - hmc_textures.0C000: type: TEXTURE size: 2048 width: 32 height: 32 - offset: 0xA800 + offset: 0xC000 format: IA16 symbol: cave_0900C000 diff --git a/assets/ymls/us/textures/fire.yml b/assets/ymls/us/textures/fire.yml index 29a72c60..0cce6497 100644 --- a/assets/ymls/us/textures/fire.yml +++ b/assets/ymls/us/textures/fire.yml @@ -147,7 +147,14 @@ lll_textures.08800: offset: 0x8800 format: RGBA16 symbol: fire_09008800 - +lll_textures.09000: + type: TEXTURE + size: 2048 + width: 32 + height: 32 + offset: 0x9000 + format: RGBA16 + symbol: fire_09009000 lll_textures.09800: type: TEXTURE size: 2048 @@ -188,17 +195,3 @@ lll_textures.0B800: offset: 0xB800 format: RGBA16 symbol: fire_0900B800 - -:config: - compressed_offset: 0x108A40 - segments: - seg2: 0x108A40 - -lll_textures.09000: - type: TEXTURE - size: 2048 - width: 32 - height: 32 - offset: 0x16AB8 - format: RGBA16 - symbol: fire_09009000 diff --git a/assets/ymls/us/textures/generic.yml b/assets/ymls/us/textures/generic.yml index 62dda6e1..c9b09e02 100644 --- a/assets/ymls/us/textures/generic.yml +++ b/assets/ymls/us/textures/generic.yml @@ -11,7 +11,14 @@ bob_textures.00000: offset: 0x0 format: RGBA16 symbol: generic_09000000 - +bob_textures.00800: + type: TEXTURE + size: 2048 + width: 32 + height: 32 + offset: 0x800 + format: RGBA16 + symbol: generic_09000800 bob_textures.01000: type: TEXTURE size: 2048 @@ -172,17 +179,3 @@ bob_textures.0B000: offset: 0xB000 format: IA16 symbol: generic_0900B000 - -:config: - compressed_offset: 0x145E90 - segments: - seg5: 0x145E90 - -bob_textures.00800: - type: TEXTURE - size: 2048 - width: 32 - height: 32 - offset: 0x8D40 - format: RGBA16 - symbol: generic_09000800 diff --git a/assets/ymls/us/textures/grass.yml b/assets/ymls/us/textures/grass.yml index 028d7744..d31f5a20 100644 --- a/assets/ymls/us/textures/grass.yml +++ b/assets/ymls/us/textures/grass.yml @@ -99,7 +99,14 @@ wf_textures.05800: offset: 0x5800 format: RGBA16 symbol: grass_09005800 - +wf_textures.06000: + type: TEXTURE + size: 2048 + width: 32 + height: 32 + offset: 0x6000 + format: RGBA16 + symbol: grass_09006000 wf_textures.06800: type: TEXTURE size: 2048 @@ -172,35 +179,6 @@ wf_textures.0A800: offset: 0xA800 format: RGBA16 symbol: grass_0900A800 - -wf_textures.0B800: - type: TEXTURE - size: 2048 - width: 32 - height: 32 - offset: 0xB800 - format: IA16 - symbol: grass_0900B800 - -:config: - compressed_offset: 0x33D710 - segments: - seg9: 0x33D710 - -wf_textures.06000: - type: TEXTURE - size: 2048 - width: 32 - height: 32 - offset: 0x5000 - format: RGBA16 - symbol: grass_09006000 - -:config: - compressed_offset: 0x32D070 - segments: - seg9: 0x32D070 - wf_textures.0B000: type: TEXTURE size: 2048 @@ -209,3 +187,11 @@ wf_textures.0B000: offset: 0xB000 format: IA16 symbol: grass_0900B000 +wf_textures.0B800: + type: TEXTURE + size: 2048 + width: 32 + height: 32 + offset: 0xB800 + format: IA16 + symbol: grass_0900B800 diff --git a/assets/ymls/us/textures/inside.yml b/assets/ymls/us/textures/inside.yml index 73484113..0c984a8e 100644 --- a/assets/ymls/us/textures/inside.yml +++ b/assets/ymls/us/textures/inside.yml @@ -51,7 +51,14 @@ inside_castle_textures.04000: offset: 0x4000 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 @@ -132,17 +139,3 @@ inside_castle_textures.0B800: offset: 0xB800 format: RGBA16 symbol: inside_0900B800 - -:config: - compressed_offset: 0x34E760 - segments: - seg9: 0x34E760 - -inside_castle_textures.04800: - type: TEXTURE - size: 2048 - width: 32 - height: 32 - offset: 0x800 - format: RGBA16 - symbol: inside_09004800 \ No newline at end of file diff --git a/assets/ymls/us/textures/mountain.yml b/assets/ymls/us/textures/mountain.yml index 48978792..c593e0b0 100644 --- a/assets/ymls/us/textures/mountain.yml +++ b/assets/ymls/us/textures/mountain.yml @@ -131,7 +131,14 @@ ttm_textures.09800: offset: 0x9800 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 @@ -164,17 +171,3 @@ ttm_textures.0C000: offset: 0xC000 format: RGBA16 symbol: mountain_0900C000 - -:config: - compressed_offset: 0x33D710 - segments: - seg9: 0x33D710 - -ttm_textures.0A000: - type: TEXTURE - size: 2048 - width: 32 - height: 32 - offset: 0x6000 - format: RGBA16 - symbol: mountain_0900A000 diff --git a/assets/ymls/us/textures/outside.yml b/assets/ymls/us/textures/outside.yml index a472e469..c0f4eb63 100644 --- a/assets/ymls/us/textures/outside.yml +++ b/assets/ymls/us/textures/outside.yml @@ -163,17 +163,11 @@ castle_grounds_textures.0B400: offset: 0xB400 format: RGBA16 symbol: outside_0900B400 - -:config: - compressed_offset: 0x32D070 - segments: - seg9: 0x32D070 - castle_grounds_textures.0BC00: type: TEXTURE size: 2048 width: 32 height: 32 - offset: 0xB000 + offset: 0xBC00 format: IA16 symbol: outside_0900BC00 diff --git a/assets/ymls/us/textures/segment2.yml b/assets/ymls/us/textures/segment2.yml index 5c14b7e0..5c8ecd15 100644 --- a/assets/ymls/us/textures/segment2.yml +++ b/assets/ymls/us/textures/segment2.yml @@ -363,7 +363,22 @@ font_graphics.06400: 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 font_graphics.06440: type: TEXTURE size: 64 @@ -892,6 +907,7 @@ segment2.02400: offset: 0x2400 format: RGBA16 symbol: texture_hud_char_I +# texture_hud_char_J does not exist on US versions, offsets from here will be off by 0x200 segment2.02800: type: TEXTURE size: 512 @@ -940,6 +956,7 @@ segment2.03200: offset: 0x3000 format: RGBA16 symbol: texture_hud_char_P +# texture_hud_char_Q does not exist on US versions, offsets from here will be off by 0x400 segment2.03600: type: TEXTURE size: 512 @@ -972,6 +989,7 @@ segment2.03C00: offset: 0x3800 format: RGBA16 symbol: texture_hud_char_U +# texture_hud_char_V does not exist on US versions, offsets from here will be off by 0x600 segment2.04000: type: TEXTURE size: 512 @@ -980,6 +998,7 @@ segment2.04000: offset: 0x3A00 format: RGBA16 symbol: texture_hud_char_W +# texture_hud_char_X does not exist on US versions, offsets from here will be off by 0x800 segment2.04400: type: TEXTURE size: 512 @@ -988,6 +1007,7 @@ segment2.04400: offset: 0x3C00 format: RGBA16 symbol: texture_hud_char_Y +# texture_hud_char_Z does not exist on US versions, offsets from here will be off by 0xA000 segment2.04800: type: TEXTURE size: 512 @@ -1004,7 +1024,7 @@ segment2.04A00: offset: 0x4000 format: RGBA16 symbol: texture_hud_char_double_quote - +# several symbols do not exist on US versions, offsets from here will be off by 0x14000 segment2.05600: type: TEXTURE size: 512 @@ -1421,45 +1441,3 @@ shadow_quarter_square: offset: 0x121B8 format: IA8 symbol: texture_shadow_quarter_square - -:config: - compressed_offset: 0x188440 - segments: - seg6: 0x188440 - -font_graphics.06410: - type: TEXTURE - size: 16 - width: 16 - height: 8 - offset: 0x14676 - format: IA1 - symbol: texture_font_char_eu_colon - -:config: - compressed_offset: 0x1C4230 - segments: - seg6: 0x1C4230 - -font_graphics.06420: - type: TEXTURE - size: 16 - width: 16 - height: 8 - offset: 0x20B5B - format: IA1 - symbol: texture_font_char_EU_slash - -:config: - compressed_offset: 0x2A65B0 - segments: - seg7: 0x2A65B0 - -segment2.05000: - type: TEXTURE - size: 512 - width: 16 - height: 16 - offset: 0xA1D0 - format: RGBA16 - symbol: texture_hud_char_question \ No newline at end of file diff --git a/assets/ymls/us/textures/skyboxes.yml b/assets/ymls/us/textures/skyboxes.yml deleted file mode 100644 index bc8112ea..00000000 --- a/assets/ymls/us/textures/skyboxes.yml +++ /dev/null @@ -1,99 +0,0 @@ -:config: - compressed_offset: 0x2FB1B0 - segments: - seg10: 0x2FB1B0 - -bbh: - type: BLOB - size: 84288 - offset: 0x0 - -:config: - compressed_offset: 0x301CD0 - segments: - seg10: 0x301CD0 - -bidw: - type: BLOB - size: 131392 - offset: 0x0 - -:config: - compressed_offset: 0x2D0040 - segments: - seg10: 0x2D0040 - -bitfs: - type: BLOB - size: 102720 - offset: 0x0 - -:config: - compressed_offset: 0x30CEC0 - segments: - seg10: 0x30CEC0 - -bits: - type: BLOB - size: 131392 - offset: 0x0 - -:config: - compressed_offset: 0x2B8F10 - segments: - seg10: 0x2B8F10 - -ccm: - type: BLOB - size: 131392 - offset: 0x0 - -:config: - compressed_offset: 0x2E7880 - segments: - seg10: 0x2E7880 - -cloud_floor: - type: BLOB - size: 131392 - offset: 0x0 - -:config: - compressed_offset: 0x2C73D0 - segments: - seg10: 0x2C73D0 - -clouds: - type: BLOB - size: 84288 - offset: 0x0 - -:config: - compressed_offset: 0x2F14E0 - segments: - seg10: 0x2F14E0 - -ssl: - type: BLOB - size: 131392 - offset: 0x0 - -:config: - compressed_offset: 0x2AC6B0 - segments: - seg10: 0x2AC6B0 - -water: - type: BLOB - size: 131392 - offset: 0x0 - -:config: - compressed_offset: 0x2D64F0 - segments: - seg10: 0x2D64F0 - -wdw: - type: BLOB - size: 131392 - offset: 0x0 diff --git a/assets/ymls/us/textures/skyboxes/bbh.yml b/assets/ymls/us/textures/skyboxes/bbh.yml new file mode 100644 index 00000000..b51c9571 --- /dev/null +++ b/assets/ymls/us/textures/skyboxes/bbh.yml @@ -0,0 +1,9 @@ +:config: + compressed_offset: 0x2FB1B0 + segments: + seg10: 0x2FB1B0 + +bbh: + type: BLOB + size: 84288 + offset: 0x0 diff --git a/assets/ymls/us/textures/skyboxes/bidw.yml b/assets/ymls/us/textures/skyboxes/bidw.yml new file mode 100644 index 00000000..9a1c8f9b --- /dev/null +++ b/assets/ymls/us/textures/skyboxes/bidw.yml @@ -0,0 +1,9 @@ +:config: + compressed_offset: 0x301CD0 + segments: + seg10: 0x301CD0 + +bidw: + type: BLOB + size: 131392 + offset: 0x0 diff --git a/assets/ymls/us/textures/skyboxes/bitfs.yml b/assets/ymls/us/textures/skyboxes/bitfs.yml new file mode 100644 index 00000000..52e8e292 --- /dev/null +++ b/assets/ymls/us/textures/skyboxes/bitfs.yml @@ -0,0 +1,9 @@ +:config: + compressed_offset: 0x2D0040 + segments: + seg10: 0x2D0040 + +bitfs: + type: BLOB + size: 102720 + offset: 0x0 diff --git a/assets/ymls/us/textures/skyboxes/bits.yml b/assets/ymls/us/textures/skyboxes/bits.yml new file mode 100644 index 00000000..f6d0d3fb --- /dev/null +++ b/assets/ymls/us/textures/skyboxes/bits.yml @@ -0,0 +1,9 @@ +:config: + compressed_offset: 0x30CEC0 + segments: + seg10: 0x30CEC0 + +bits: + type: BLOB + size: 131392 + offset: 0x0 diff --git a/assets/ymls/us/textures/skyboxes/ccm.yml b/assets/ymls/us/textures/skyboxes/ccm.yml new file mode 100644 index 00000000..1b2ccfaa --- /dev/null +++ b/assets/ymls/us/textures/skyboxes/ccm.yml @@ -0,0 +1,9 @@ +:config: + compressed_offset: 0x2B8F10 + segments: + seg10: 0x2B8F10 + +ccm: + type: BLOB + size: 131392 + offset: 0x0 diff --git a/assets/ymls/us/textures/skyboxes/cloud_floor.yml b/assets/ymls/us/textures/skyboxes/cloud_floor.yml new file mode 100644 index 00000000..3f06456d --- /dev/null +++ b/assets/ymls/us/textures/skyboxes/cloud_floor.yml @@ -0,0 +1,9 @@ +:config: + compressed_offset: 0x2E7880 + segments: + seg10: 0x2E7880 + +cloud_floor: + type: BLOB + size: 131392 + offset: 0x0 diff --git a/assets/ymls/us/textures/skyboxes/clouds.yml b/assets/ymls/us/textures/skyboxes/clouds.yml new file mode 100644 index 00000000..a44e1a04 --- /dev/null +++ b/assets/ymls/us/textures/skyboxes/clouds.yml @@ -0,0 +1,9 @@ +:config: + compressed_offset: 0x2C73D0 + segments: + seg10: 0x2C73D0 + +clouds: + type: BLOB + size: 84288 + offset: 0x0 diff --git a/assets/ymls/us/textures/skyboxes/ssl.yml b/assets/ymls/us/textures/skyboxes/ssl.yml new file mode 100644 index 00000000..6a91edff --- /dev/null +++ b/assets/ymls/us/textures/skyboxes/ssl.yml @@ -0,0 +1,9 @@ +:config: + compressed_offset: 0x2F14E0 + segments: + seg10: 0x2F14E0 + +ssl: + type: BLOB + size: 131392 + offset: 0x0 diff --git a/assets/ymls/us/textures/skyboxes/water.yml b/assets/ymls/us/textures/skyboxes/water.yml new file mode 100644 index 00000000..a9d7a249 --- /dev/null +++ b/assets/ymls/us/textures/skyboxes/water.yml @@ -0,0 +1,9 @@ +:config: + compressed_offset: 0x2AC6B0 + segments: + seg10: 0x2AC6B0 + +water: + type: BLOB + size: 131392 + offset: 0x0 diff --git a/assets/ymls/us/textures/skyboxes/wdw.yml b/assets/ymls/us/textures/skyboxes/wdw.yml new file mode 100644 index 00000000..37d3e192 --- /dev/null +++ b/assets/ymls/us/textures/skyboxes/wdw.yml @@ -0,0 +1,9 @@ +:config: + compressed_offset: 0x2D64F0 + segments: + seg10: 0x2D64F0 + +wdw: + type: BLOB + size: 131392 + offset: 0x0 diff --git a/assets/ymls/us/textures/spooky.yml b/assets/ymls/us/textures/spooky.yml index ddfbc5da..464f50de 100644 --- a/assets/ymls/us/textures/spooky.yml +++ b/assets/ymls/us/textures/spooky.yml @@ -107,7 +107,14 @@ bbh_textures.09000: offset: 0x9000 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 @@ -132,17 +139,3 @@ bbh_textures.0B800: offset: 0xB800 format: IA16 symbol: spooky_0900B800 - -:config: - compressed_offset: 0x166C60 - segments: - seg5: 0x166C60 - -bbh_textures.0A000: - type: TEXTURE - size: 2048 - width: 32 - height: 32 - offset: 0xC288 - format: RGBA16 - symbol: spooky_0900A000