From c3cf1565faf8a804405c09e2f1eaa7de3d5e8127 Mon Sep 17 00:00:00 2001
From: Ethan <ethteck@gmail.com>
Date: Tue, 20 Feb 2024 16:37:02 +0900
Subject: [PATCH] Update splat to 0.22.0

---
 requirements.txt                       |  2 +-
 tools/splat_ext/pm_charset_palettes.py | 14 ++------------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 1d1b489827..7f4826ade8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,5 +13,5 @@ rabbitizer
 n64img
 python-githooks
 crunch64>=0.2.0
-splat64>=0.21.5
+splat64>=0.22.0
 requests
diff --git a/tools/splat_ext/pm_charset_palettes.py b/tools/splat_ext/pm_charset_palettes.py
index aa4847b439..48903c5b00 100644
--- a/tools/splat_ext/pm_charset_palettes.py
+++ b/tools/splat_ext/pm_charset_palettes.py
@@ -1,19 +1,9 @@
 from splat.segtypes.n64.segment import N64Segment
-from splat.segtypes.n64.palette import iter_in_groups
-from splat.util.color import unpack_color
+from splat.segtypes.n64.palette import N64SegPalette
 from splat.util import options
 import png  # type: ignore
 
 
-def parse_palette(data):
-    palette = []
-
-    for a, b in iter_in_groups(data, 2):
-        palette.append(unpack_color([a, b]))
-
-    return palette
-
-
 class N64SegPm_charset_palettes(N64Segment):
     require_unique_name = False
 
@@ -34,7 +24,7 @@ class N64SegPm_charset_palettes(N64Segment):
         self.palettes = []
 
         for i in range(0, self.size, 0x10):
-            palette = parse_palette(data[i : i + 0x10])
+            palette = N64SegPalette.parse_palette_bytes(data[i : i + 0x10])
             self.palettes.append(palette)
 
     def split(self, rom_bytes):