From 44d54b09396ea1682574111c44014ef41d3a84f9 Mon Sep 17 00:00:00 2001 From: Luke Hubmayer-Werner Date: Sat, 22 Jul 2023 19:15:34 +0930 Subject: [PATCH] Remove partial application of _make_string_img_list --- ff5reader.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/ff5reader.py b/ff5reader.py index c0aa7cd..e53716c 100755 --- a/ff5reader.py +++ b/ff5reader.py @@ -19,10 +19,7 @@ import sys import re from struct import unpack -from itertools import chain -from array import array import time -import functools from typing import Iterable from includes.helpers import * @@ -72,13 +69,12 @@ class FF5Reader(QMainWindow): 'glyphs_jp_l': generate_glyphs_large(ROM_jp, 0x03E800), 'glyphs_kanji': generate_glyphs_large(ROM_jp, 0x1BD000, 0x1AA), # Kanji are unchanged in EN version } - make_string_img_list = functools.partial(_make_string_img_list, **self.glyph_sprites) perfcount() imglist_headers = ['ID', 'EN Pointer', 'EN Address', 'EN String', 'EN Img', 'JP Pointer', 'JP Address', 'JP String', 'JP Img'] print('Generating String Images') - string_images = {k: make_string_img_list(*FFVStrings.blocks_SNES_RPGe[k], large=config.get('dialog')) for k,config in FFVStrings.config.items()} + string_images = {k: _make_string_img_list(*FFVStrings.blocks_SNES_RPGe[k], large=config.get('dialog'), **self.glyph_sprites) for k,config in FFVStrings.config.items()} ends_in_digit = re.compile('^([\w_]+)(\d+)') for k in sorted(list(string_images.keys())): # Pre-generate keys as we destructively iterate the dict if m := ends_in_digit.match(k):