summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-07-16 19:56:52 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-07-16 19:56:52 -0400
commit7bcb4b19c77eee2b8d2c3e769d25e7e4d7d028a7 (patch)
tree6fc0fb6fa5067b3bc627f98f8e5cca913d1ce592
parentcd71ae03af9e75235c8035821700dd6dc6b69616 (diff)
Un-deduplicate gfx/intro_credits/gengar.png's tiles
-rw-r--r--Makefile2
-rwxr-xr-xengine/movie/intro.asm1
-rw-r--r--gfx/intro_credits/gengar.pngbin1082 -> 1089 bytes
3 files changed, 3 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 8b00cde9..bef635ae 100644
--- a/Makefile
+++ b/Makefile
@@ -122,6 +122,8 @@ gfx/intro_credits/blue_jigglypuff_3.2bpp: rgbgfx += -h
gfx/intro_credits/red_nidorino_1.2bpp: rgbgfx += -h
gfx/intro_credits/red_nidorino_2.2bpp: rgbgfx += -h
gfx/intro_credits/red_nidorino_3.2bpp: rgbgfx += -h
+gfx/intro_credits/gengar.2bpp: rgbgfx += -h
+gfx/intro_credits/gengar.2bpp: tools/gfx += --remove-duplicates --preserve=0x19,0x76
gfx/intro_credits/the_end.2bpp: tools/gfx += --interleave --png=$<
diff --git a/engine/movie/intro.asm b/engine/movie/intro.asm
index 215b54ae..c5896ecb 100755
--- a/engine/movie/intro.asm
+++ b/engine/movie/intro.asm
@@ -445,6 +445,7 @@ GameFreakIntroEnd:
FightIntroBackMon:
INCBIN "gfx/intro_credits/gengar.2bpp"
+ ds 16, $00 ; blank tile
FightIntroBackMonEnd:
FightIntroFrontMon:
diff --git a/gfx/intro_credits/gengar.png b/gfx/intro_credits/gengar.png
index 99fcda8d..9558d1a1 100644
--- a/gfx/intro_credits/gengar.png
+++ b/gfx/intro_credits/gengar.png
Binary files differ