From 0d94b5ed7da283f9d6b47a5eee9643cdf652b872 Mon Sep 17 00:00:00 2001 From: Ethan Date: Fri, 2 Feb 2024 15:11:32 +0900 Subject: [PATCH] fix black issues --- tools/build/configure.py | 2 +- tools/splat_ext/pm_sprites.py | 6 +++--- tools/star_rod_idx_to_c.py | 6 +----- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/tools/build/configure.py b/tools/build/configure.py index 97b5dc52dd..403ba9ef2a 100755 --- a/tools/build/configure.py +++ b/tools/build/configure.py @@ -85,7 +85,7 @@ def write_ninja_rules( ninja.variable("python", sys.executable) ld_args = f"-T ver/$version/build/undefined_syms.txt -T ver/$version/undefined_syms_auto.txt -T ver/$version/undefined_funcs_auto.txt -Map $mapfile --no-check-sections -T $in -o $out" - ld = f"{cross}ld" if not 'PAPERMARIO_LD' in os.environ else os.environ['PAPERMARIO_LD'] + ld = f"{cross}ld" if not "PAPERMARIO_LD" in os.environ else os.environ["PAPERMARIO_LD"] if shift: # For the shiftable build, we link twice to resolve some addresses that gnu ld can't figure out all in one go. diff --git a/tools/splat_ext/pm_sprites.py b/tools/splat_ext/pm_sprites.py index b7e52caad7..d877581ea3 100644 --- a/tools/splat_ext/pm_sprites.py +++ b/tools/splat_ext/pm_sprites.py @@ -424,9 +424,9 @@ def write_player_xmls( raster_attributes["special"] = f"{back_raster.width & 0xFF:X},{back_raster.height & 0xFF:X}" else: back_name_offset = raster_sets[sprite_idx + 1].raster_offsets[i] - raster_attributes[ - "back" - ] = f"{get_sprite_name_from_offset(back_name_offset, sprite_offsets, raster_names)}.png" + raster_attributes["back"] = ( + f"{get_sprite_name_from_offset(back_name_offset, sprite_offsets, raster_names)}.png" + ) if back_raster.palette_idx != raster.palette_idx: raster_attributes[BACK_PALETTE_XML] = f"{back_raster.palette_idx:X}" diff --git a/tools/star_rod_idx_to_c.py b/tools/star_rod_idx_to_c.py index 6098ce484f..1e36abc329 100755 --- a/tools/star_rod_idx_to_c.py +++ b/tools/star_rod_idx_to_c.py @@ -385,11 +385,7 @@ def disassemble(bytes, midx, symbol_map={}, comments=True, romstart=0, namespace var_name = ( var_names[1] if i == 0x4 - else var_names[3] - if i == 0x14 - else var_names[4] - if i == 0x18 - else var_names[17] + else var_names[3] if i == 0x14 else var_names[4] if i == 0x18 else var_names[17] ) addr = unpack_from(f">I", staticNpc, curr_base + i)[0] if not addr == 0: