diff options
| author | entrpntr <12521136+entrpntr@users.noreply.github.com> | 2020-05-27 18:42:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-27 18:42:13 -0400 |
| commit | 2321448d133ac3651f08787b1cf2c2fcbdac82c9 (patch) | |
| tree | 47f648c0fd273463376c981055cdc9cc5b6a93dc /tools/pokemontools/gfx.py | |
| parent | 418ac97a9c2142aae82051e6bdb149c9103b7282 (diff) | |
| parent | 9dac1d992d343f542acae9974eff3099fbd9b39f (diff) | |
Merge pull request #36 from entrpntr/misc-dump
Disassemble banks $70 and $3f, add tileset data
Diffstat (limited to 'tools/pokemontools/gfx.py')
| -rw-r--r-- | tools/pokemontools/gfx.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/pokemontools/gfx.py b/tools/pokemontools/gfx.py index f3e3ed53..f4f2ae3e 100644 --- a/tools/pokemontools/gfx.py +++ b/tools/pokemontools/gfx.py @@ -394,9 +394,9 @@ def export_2bpp_to_png(filein, fileout=None, pal_file=None, height=0, width=0, t } arguments.update(read_filename_arguments(filein)) - if pal_file == None: - if os.path.exists(os.path.splitext(fileout)[0]+'.pal'): - arguments['pal_file'] = os.path.splitext(fileout)[0]+'.pal' + #if pal_file == None: + # if os.path.exists(os.path.splitext(fileout)[0]+'.pal'): + # arguments['pal_file'] = os.path.splitext(fileout)[0]+'.pal' result = convert_2bpp_to_png(image, **arguments) width, height, palette, greyscale, bitdepth, px_map = result |