diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/pokemontools/gfx.py | 8 | ||||
| -rw-r--r-- | tools/scan_includes.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tools/pokemontools/gfx.py b/tools/pokemontools/gfx.py index 06f6e7b4..30ef0702 100644 --- a/tools/pokemontools/gfx.py +++ b/tools/pokemontools/gfx.py @@ -89,7 +89,7 @@ def interleave(tiles, width): def deinterleave(tiles, width): """ - 00 02 04 06 08 0a 00 01 02 03 04 05 + 00 02 04 06 08 0a 00 01 02 03 04 05 01 03 05 07 09 0b 06 07 08 09 0a 0b 0c 0e 10 12 14 16 --> 0c 0d 0e 0f 10 11 0d 0f 11 13 15 17 12 13 14 15 16 17 @@ -240,9 +240,9 @@ def flatten(planar): Flatten planar 2bpp image data into a quaternary pixel map. """ strips = [] - for bottom, top in split(planar, 2): - bottom = bottom - top = top + for bottom_top in split(planar, 2): + bottom = bottom_top[0] + top = bottom_top[1] strip = [] for i in range(7,-1,-1): color = ( diff --git a/tools/scan_includes.c b/tools/scan_includes.c index 63af3bcf..734c147f 100644 --- a/tools/scan_includes.c +++ b/tools/scan_includes.c @@ -69,7 +69,7 @@ void scan_file(char* filename) { } else if ((strncmp(buffer, "INCLUDE", 7) == 0) || (strncmp(buffer, "include", 7) == 0)) { is_include = true; } - if (is_incbin || is_include) { + if (is_include) { buffer = strchr(buffer, '"'); if (!buffer) { break; |