From 00438a19032eccc3a1c757d3c2b426f02066c88e Mon Sep 17 00:00:00 2001 From: Alex Bates Date: Sun, 25 Aug 2024 02:52:24 +0100 Subject: [PATCH] splat 0.27.0 --- tools/splat_ext/a.py | 4 ++-- tools/splat_ext/pm_charset.py | 4 ++-- tools/splat_ext/pm_charset_palettes.py | 4 ++-- tools/splat_ext/pm_effect_loads.py | 4 ++-- tools/splat_ext/pm_effect_shims.py | 4 ++-- tools/splat_ext/pm_icons.py | 4 ++-- tools/splat_ext/pm_imgfx_data.py | 4 ++-- tools/splat_ext/pm_map_data.py | 4 ++-- tools/splat_ext/pm_msg.py | 4 ++-- tools/splat_ext/pm_sbn.py | 4 ++-- tools/splat_ext/pm_sprite_shading_profiles.py | 4 ++-- tools/splat_ext/pm_sprites.py | 4 ++-- ver/us/splat.yaml | 5 ----- 13 files changed, 24 insertions(+), 29 deletions(-) diff --git a/tools/splat_ext/a.py b/tools/splat_ext/a.py index d13e8e1d27..e62ae4002e 100644 --- a/tools/splat_ext/a.py +++ b/tools/splat_ext/a.py @@ -1,9 +1,9 @@ -from splat.segtypes.n64.segment import N64Segment +from splat.segtypes.segment import Segment from splat.segtypes.linker_entry import LinkerEntry from splat.util import options -class N64SegA(N64Segment): +class N64SegA(Segment): def get_linker_entries(self): path = options.opts.asset_path / self.dir / (self.name + ".a") diff --git a/tools/splat_ext/pm_charset.py b/tools/splat_ext/pm_charset.py index 60de269c5f..61c33bade1 100644 --- a/tools/splat_ext/pm_charset.py +++ b/tools/splat_ext/pm_charset.py @@ -1,4 +1,4 @@ -from splat.segtypes.n64.segment import N64Segment +from splat.segtypes.segment import Segment from splat.util import options import png # type: ignore @@ -60,7 +60,7 @@ def get_palette_idx(charset_name, char_id): return pal_id -class N64SegPm_charset(N64Segment): +class N64SegPm_charset(Segment): def scan(self, rom_bytes): data = rom_bytes[self.rom_start : self.rom_end] diff --git a/tools/splat_ext/pm_charset_palettes.py b/tools/splat_ext/pm_charset_palettes.py index 48903c5b00..7e0f569573 100644 --- a/tools/splat_ext/pm_charset_palettes.py +++ b/tools/splat_ext/pm_charset_palettes.py @@ -1,10 +1,10 @@ -from splat.segtypes.n64.segment import N64Segment +from splat.segtypes.segment import Segment from splat.segtypes.n64.palette import N64SegPalette from splat.util import options import png # type: ignore -class N64SegPm_charset_palettes(N64Segment): +class N64SegPm_charset_palettes(Segment): require_unique_name = False def scan(self, rom_bytes): diff --git a/tools/splat_ext/pm_effect_loads.py b/tools/splat_ext/pm_effect_loads.py index 811231ef18..9278071af8 100644 --- a/tools/splat_ext/pm_effect_loads.py +++ b/tools/splat_ext/pm_effect_loads.py @@ -1,7 +1,7 @@ from dataclasses import dataclass from pathlib import Path from typing import List -from splat.segtypes.n64.segment import N64Segment +from splat.segtypes.segment import Segment from splat.util import options import yaml as yaml_loader @@ -43,7 +43,7 @@ def effects_from_yaml(yaml_path: Path) -> List[Effect]: return effects -class N64SegPm_effect_loads(N64Segment): +class N64SegPm_effect_loads(Segment): effects: List[Effect] = [] @staticmethod diff --git a/tools/splat_ext/pm_effect_shims.py b/tools/splat_ext/pm_effect_shims.py index d2802441ba..c07361ed5a 100644 --- a/tools/splat_ext/pm_effect_shims.py +++ b/tools/splat_ext/pm_effect_shims.py @@ -1,11 +1,11 @@ from typing import List from yaml.loader import Loader -from splat.segtypes.n64.segment import N64Segment +from splat.segtypes.segment import Segment from splat.util import options import yaml as yaml_loader -class N64SegPm_effect_shims(N64Segment): +class N64SegPm_effect_shims(Segment): shims: List[str] = [] @staticmethod diff --git a/tools/splat_ext/pm_icons.py b/tools/splat_ext/pm_icons.py index c48370b6c8..732de51d8a 100644 --- a/tools/splat_ext/pm_icons.py +++ b/tools/splat_ext/pm_icons.py @@ -1,7 +1,7 @@ import os import re from pathlib import Path -from splat.segtypes.n64.segment import N64Segment +from splat.segtypes.segment import Segment import n64img.image from splat.util.color import unpack_color from common import iter_in_groups @@ -46,7 +46,7 @@ def parse_palette(data): return palette -class N64SegPm_icons(N64Segment): +class N64SegPm_icons(Segment): def split(self, rom_bytes): self.out_dir = options.opts.asset_path / "icon" diff --git a/tools/splat_ext/pm_imgfx_data.py b/tools/splat_ext/pm_imgfx_data.py index fa1de6f29b..dba97d7833 100644 --- a/tools/splat_ext/pm_imgfx_data.py +++ b/tools/splat_ext/pm_imgfx_data.py @@ -8,11 +8,11 @@ sys.path.append(str(Path(TOOLS_DIR) / "build/imgfx")) from imgfx_data import Anim, Triangle, Vertex -from splat.segtypes.n64.segment import N64Segment +from splat.segtypes.segment import Segment from splat.util import log, options -class N64SegPm_imgfx_data(N64Segment): +class N64SegPm_imgfx_data(Segment): anims: List[Anim] = [] OUT_DIR: Path = options.opts.asset_path / "imgfx" diff --git a/tools/splat_ext/pm_map_data.py b/tools/splat_ext/pm_map_data.py index e3061feec5..6b25960c6e 100644 --- a/tools/splat_ext/pm_map_data.py +++ b/tools/splat_ext/pm_map_data.py @@ -4,7 +4,7 @@ from pathlib import Path import crunch64 -from splat.segtypes.n64.segment import N64Segment +from splat.segtypes.segment import Segment from common import iter_in_groups from splat.util import options import png # type: ignore @@ -66,7 +66,7 @@ def add_file_ext(name: str, linker: bool = False) -> str: return name + ".bin" -class N64SegPm_map_data(N64Segment): +class N64SegPm_map_data(Segment): def __init__( self, rom_start, diff --git a/tools/splat_ext/pm_msg.py b/tools/splat_ext/pm_msg.py index d742158b94..952f960e3e 100644 --- a/tools/splat_ext/pm_msg.py +++ b/tools/splat_ext/pm_msg.py @@ -1,5 +1,5 @@ import shutil -from splat.segtypes.n64.segment import N64Segment +from splat.segtypes.segment import Segment from pathlib import Path from splat.util import options import re @@ -3273,7 +3273,7 @@ } -class N64SegPm_msg(N64Segment): +class N64SegPm_msg(Segment): def __init__( self, rom_start, diff --git a/tools/splat_ext/pm_sbn.py b/tools/splat_ext/pm_sbn.py index 9cd7a8f600..a7c8079c10 100644 --- a/tools/splat_ext/pm_sbn.py +++ b/tools/splat_ext/pm_sbn.py @@ -8,7 +8,7 @@ # splat imports; will fail if script run directly try: - from splat.segtypes.n64.segment import N64Segment + from splat.segtypes.segment import Segment from splat.segtypes.linker_entry import LinkerEntry from splat.util import options @@ -542,7 +542,7 @@ def __iter__(self): if splat_loaded: - class N64SegPm_sbn(N64Segment): + class N64SegPm_sbn(Segment): def split(self, rom_bytes): dir = options.opts.asset_path / self.dir / self.name data = rom_bytes[self.rom_start : self.rom_end] diff --git a/tools/splat_ext/pm_sprite_shading_profiles.py b/tools/splat_ext/pm_sprite_shading_profiles.py index 1b0b96b18c..f7c314c9ad 100644 --- a/tools/splat_ext/pm_sprite_shading_profiles.py +++ b/tools/splat_ext/pm_sprite_shading_profiles.py @@ -10,7 +10,7 @@ import struct from typing import Literal -from splat.segtypes.n64.segment import N64Segment +from splat.segtypes.segment import Segment from splat.util import options GROUPS = [ @@ -194,7 +194,7 @@ def extract(input_data: bytes, endian: Literal["big", "little"] = "big") -> str: ) -class N64SegPm_sprite_shading_profiles(N64Segment): +class N64SegPm_sprite_shading_profiles(Segment): OUT_DIR: Path = options.opts.asset_path / "sprite" def scan(self, rom_bytes): diff --git a/tools/splat_ext/pm_sprites.py b/tools/splat_ext/pm_sprites.py index 5a2184b7c1..007f945e77 100644 --- a/tools/splat_ext/pm_sprites.py +++ b/tools/splat_ext/pm_sprites.py @@ -12,7 +12,7 @@ import png # type: ignore import yaml as yaml_loader from n64img.image import CI4 -from splat.segtypes.n64.segment import N64Segment +from splat.segtypes.segment import Segment from splat.util import options from splat.util.color import unpack_color @@ -713,7 +713,7 @@ def write_to_dir(self, path): pretty_print_xml(xml, path / "SpriteSheet.xml") -class N64SegPm_sprites(N64Segment): +class N64SegPm_sprites(Segment): DEFAULT_NPC_SPRITE_NAMES = [f"{i:02X}" for i in range(0xEA)] def __init__(self, rom_start, rom_end, type, name, vram_start, args, yaml) -> None: diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index 9a3e9eeb73..fe20aed762 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -6411,7 +6411,6 @@ segments: - start: 0x59F530 type: .data name: anim/unused_gfx - subalign: 8 subsegments: - [0x59F530, vtx, vtx1] - [0x59F6B0, vtx, vtx2] @@ -6446,7 +6445,6 @@ segments: - start: 0x5A2E80 type: .data name: actor/lava_piranha - subalign: 8 subsegments: - [0x5A2E80] - [0x5A3020, ci4, lava_piranha_vine, 64, 32] @@ -6592,7 +6590,6 @@ segments: - start: 0x63F040 type: .data name: actor/monstar - subalign: 8 subsegments: - [0x63F040] - [0x63F278, ci4, actor/img, 32, 32] @@ -6601,7 +6598,6 @@ segments: - start: 0x648860 type: .data name: vtx - subalign: 8 subsegments: - [0x648860, vtx, monstar_bubbles] - [0x648C80] @@ -8436,7 +8432,6 @@ segments: - start: 0x8CC4F0 type: .data name: kmr_04_5_foliage - subalign: 8 subsegments: - [0x8CC4F0, ci4, hammer_block_message, 48, 48] - [0x8CC970, palette, hammer_block_message]