diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-28 19:44:26 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-28 19:55:53 -0400 |
| commit | 152efaadc014b3095e087a5375c76be1fb1a9da0 (patch) | |
| tree | a971c1f3f642d5727d660c1a76c20916cdd0511e | |
| parent | d74582dba8ebdd0b35041a0b98c5f7e3afa1b938 (diff) | |
Reformat gfx/trade/game_boy.png and fix tools/gfx --preserve
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | engine/movie/trade_animation.asm | 2 | ||||
| -rw-r--r-- | gfx/trade/game_boy.png | bin | 360 -> 214 bytes | |||
| -rw-r--r-- | gfx/trade/link_cable.png | bin | 0 -> 216 bytes | |||
| -rw-r--r-- | tools/gfx.c | 8 |
5 files changed, 7 insertions, 5 deletions
@@ -177,6 +177,8 @@ gfx/title/hooh_gold.2bpp: tools/gfx += --interleave --png=$< gfx/title/lugia_silver.2bpp: tools/gfx += --interleave --png=$< gfx/trade/ball.2bpp: tools/gfx += --remove-whitespace +gfx/trade/game_boy.2bpp: tools/gfx += --remove-duplicates --preserve=0x23,0x27 +gfx/trade/game_boy_cable.2bpp: gfx/trade/game_boy.2bpp gfx/trade/link_cable.2bpp ; cat $^ > $@ gfx/slots/slots_1.2bpp: tools/gfx += --trim-whitespace gfx/slots/slots_2.2bpp: tools/gfx += --interleave --png=$< diff --git a/engine/movie/trade_animation.asm b/engine/movie/trade_animation.asm index 94736037..3e4826ad 100644 --- a/engine/movie/trade_animation.asm +++ b/engine/movie/trade_animation.asm @@ -1383,6 +1383,6 @@ TradeArrowRightGFX: INCBIN "gfx/trade/arrow_right.2bpp" TradeArrowLeftGFX: INCBIN "gfx/trade/arrow_left.2bpp" TradeCableGFX: INCBIN "gfx/trade/cable.2bpp" TradeBubbleGFX: INCBIN "gfx/trade/bubble.2bpp" -TradeGameBoyLZ: INCBIN "gfx/trade/game_boy.2bpp.lz" +TradeGameBoyLZ: INCBIN "gfx/trade/game_boy_cable.2bpp.lz" TradeBallGFX: INCBIN "gfx/trade/ball.2bpp" TradePoofGFX: INCBIN "gfx/trade/poof.2bpp" diff --git a/gfx/trade/game_boy.png b/gfx/trade/game_boy.png Binary files differindex 64c92260..3fcf9c22 100644 --- a/gfx/trade/game_boy.png +++ b/gfx/trade/game_boy.png diff --git a/gfx/trade/link_cable.png b/gfx/trade/link_cable.png Binary files differnew file mode 100644 index 00000000..64eafdfb --- /dev/null +++ b/gfx/trade/link_cable.png diff --git a/tools/gfx.c b/tools/gfx.c index 6dad2f1a..7d6dd0ee 100644 --- a/tools/gfx.c +++ b/tools/gfx.c @@ -68,7 +68,7 @@ void get_args(int argc, char *argv[]) { while (token) { Options.num_preserved++; Options.preserved = realloc(Options.preserved, Options.num_preserved * sizeof(int)); - Options.preserved[Options.num_preserved-1] = strtoul(optarg, NULL, 0); + Options.preserved[Options.num_preserved-1] = strtoul(token, NULL, 0); token = strtok(NULL, ","); } break; @@ -139,7 +139,7 @@ void remove_whitespace(struct Graphic *graphic) { int i = 0; for (int j = 0, d = 0; i < graphic->size && j < graphic->size; i += tile_size, j += tile_size) { while (j < graphic->size && is_whitespace(&graphic->data[j], tile_size) && !is_preserved(j / tile_size - d)) { - shift_preserved(j / tile_size); + shift_preserved(j / tile_size - d); d++; j += tile_size; } @@ -181,7 +181,7 @@ void remove_duplicates(struct Graphic *graphic) { if ((Options.keep_whitespace && is_whitespace(&graphic->data[j], tile_size)) || is_preserved(j / tile_size - d)) { break; } - shift_preserved(j / tile_size); + shift_preserved(j / tile_size - d); d++; j += tile_size; } @@ -235,7 +235,7 @@ void remove_flip(struct Graphic *graphic, bool xflip, bool yflip) { if ((Options.keep_whitespace && is_whitespace(&graphic->data[j], tile_size)) || is_preserved(j / tile_size - d)) { break; } - shift_preserved(j / tile_size); + shift_preserved(j / tile_size - d); d++; j += tile_size; } |
