diff --git a/tools/splat.yaml b/tools/splat.yaml index df26d849d6..52f0b34be1 100644 --- a/tools/splat.yaml +++ b/tools/splat.yaml @@ -7,7 +7,8 @@ options: ld_o_replace_extension: False ld_addrs_header: include/ld_addrs.h extensions: splat_ext - symbol_addrs: tools/symbol_addrs.txt + symbol_addrs_path: tools/symbol_addrs.txt + platform: n64 segments: - name: header type: header diff --git a/tools/splat_ext/PaperMarioMapFS.py b/tools/splat_ext/PaperMarioMapFS.py index a2ff417ba1..3550ffa124 100644 --- a/tools/splat_ext/PaperMarioMapFS.py +++ b/tools/splat_ext/PaperMarioMapFS.py @@ -1,7 +1,7 @@ import os -from segtypes.segment import N64Segment +from segtypes.n64.segment import N64Segment from pathlib import Path -from util import Yay0decompress +from util.n64 import Yay0decompress def decode_null_terminated_ascii(data): diff --git a/tools/splat_ext/PaperMarioMessages.py b/tools/splat_ext/PaperMarioMessages.py index 5cad55af5d..af29d66a84 100644 --- a/tools/splat_ext/PaperMarioMessages.py +++ b/tools/splat_ext/PaperMarioMessages.py @@ -1,4 +1,4 @@ -from segtypes.segment import N64Segment +from segtypes.n64.segment import N64Segment from pathlib import Path CHARSET = { diff --git a/tools/splat_ext/PaperMarioNpcSprites.py b/tools/splat_ext/PaperMarioNpcSprites.py index cd7be31575..51a4deee02 100644 --- a/tools/splat_ext/PaperMarioNpcSprites.py +++ b/tools/splat_ext/PaperMarioNpcSprites.py @@ -1,6 +1,6 @@ -from segtypes.segment import N64Segment +from segtypes.n64.segment import N64Segment from pathlib import Path -from util import Yay0decompress +from util.n64 import Yay0decompress from util.iter import iter_in_groups from util.color import unpack_color import png