diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/0.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/0.png deleted file mode 100644 index cfeefd8829..0000000000 Binary files a/data/tilesets/secondary/sootopolis/anim/stormy_water/0.png and /dev/null differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/0_groudon.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/0_groudon.png new file mode 100644 index 0000000000..05276dd611 Binary files /dev/null and b/data/tilesets/secondary/sootopolis/anim/stormy_water/0_groudon.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/0_kyogre.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/0_kyogre.png new file mode 100644 index 0000000000..ce6f8e5e64 Binary files /dev/null and b/data/tilesets/secondary/sootopolis/anim/stormy_water/0_kyogre.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/1.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/1.png deleted file mode 100644 index db8984832c..0000000000 Binary files a/data/tilesets/secondary/sootopolis/anim/stormy_water/1.png and /dev/null differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/1_groudon.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/1_groudon.png new file mode 100644 index 0000000000..e59bdf7474 Binary files /dev/null and b/data/tilesets/secondary/sootopolis/anim/stormy_water/1_groudon.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/1_kyogre.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/1_kyogre.png new file mode 100644 index 0000000000..9e7e1ab5ad Binary files /dev/null and b/data/tilesets/secondary/sootopolis/anim/stormy_water/1_kyogre.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/2.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/2.png deleted file mode 100644 index aaaabb7b4e..0000000000 Binary files a/data/tilesets/secondary/sootopolis/anim/stormy_water/2.png and /dev/null differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/2_groudon.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/2_groudon.png new file mode 100644 index 0000000000..0d59d5e16a Binary files /dev/null and b/data/tilesets/secondary/sootopolis/anim/stormy_water/2_groudon.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/2_kyogre.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/2_kyogre.png new file mode 100644 index 0000000000..71ce73e8bb Binary files /dev/null and b/data/tilesets/secondary/sootopolis/anim/stormy_water/2_kyogre.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/3.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/3.png deleted file mode 100644 index 8010dc5b77..0000000000 Binary files a/data/tilesets/secondary/sootopolis/anim/stormy_water/3.png and /dev/null differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/3_groudon.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/3_groudon.png new file mode 100644 index 0000000000..4aded92e4b Binary files /dev/null and b/data/tilesets/secondary/sootopolis/anim/stormy_water/3_groudon.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/3_kyogre.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/3_kyogre.png new file mode 100644 index 0000000000..a305f6ab08 Binary files /dev/null and b/data/tilesets/secondary/sootopolis/anim/stormy_water/3_kyogre.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/4.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/4.png deleted file mode 100644 index 0b817510b7..0000000000 Binary files a/data/tilesets/secondary/sootopolis/anim/stormy_water/4.png and /dev/null differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/4_groudon.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/4_groudon.png new file mode 100644 index 0000000000..d4618ab9cd Binary files /dev/null and b/data/tilesets/secondary/sootopolis/anim/stormy_water/4_groudon.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/4_kyogre.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/4_kyogre.png new file mode 100644 index 0000000000..ddb2572139 Binary files /dev/null and b/data/tilesets/secondary/sootopolis/anim/stormy_water/4_kyogre.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/5.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/5.png deleted file mode 100644 index 3439d90d0c..0000000000 Binary files a/data/tilesets/secondary/sootopolis/anim/stormy_water/5.png and /dev/null differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/5_groudon.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/5_groudon.png new file mode 100644 index 0000000000..4e59ead20f Binary files /dev/null and b/data/tilesets/secondary/sootopolis/anim/stormy_water/5_groudon.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/5_kyogre.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/5_kyogre.png new file mode 100644 index 0000000000..f3e24ef7bc Binary files /dev/null and b/data/tilesets/secondary/sootopolis/anim/stormy_water/5_kyogre.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/6.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/6.png deleted file mode 100644 index 250ac75bac..0000000000 Binary files a/data/tilesets/secondary/sootopolis/anim/stormy_water/6.png and /dev/null differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/6_groudon.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/6_groudon.png new file mode 100644 index 0000000000..1aea2dc7b2 Binary files /dev/null and b/data/tilesets/secondary/sootopolis/anim/stormy_water/6_groudon.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/6_kyogre.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/6_kyogre.png new file mode 100644 index 0000000000..2d7dc677f5 Binary files /dev/null and b/data/tilesets/secondary/sootopolis/anim/stormy_water/6_kyogre.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/7.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/7.png deleted file mode 100644 index fe921b21a9..0000000000 Binary files a/data/tilesets/secondary/sootopolis/anim/stormy_water/7.png and /dev/null differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/7_groudon.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/7_groudon.png new file mode 100644 index 0000000000..4d9a556a46 Binary files /dev/null and b/data/tilesets/secondary/sootopolis/anim/stormy_water/7_groudon.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/7_kyogre.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/7_kyogre.png new file mode 100644 index 0000000000..691af34b67 Binary files /dev/null and b/data/tilesets/secondary/sootopolis/anim/stormy_water/7_kyogre.png differ diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 79c910ea27..fc4d623fbf 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -86,6 +86,40 @@ $(TILESETGFXDIR)/secondary/pacifidlog/tiles.4bpp: %.4bpp: %.png $(TILESETGFXDIR)/secondary/sootopolis/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 328 +SOOTOPOLISANIMDIR := $(TILESETGFXDIR)/secondary/sootopolis/anim + +$(SOOTOPOLISANIMDIR)/stormy_water/0.4bpp: $(SOOTOPOLISANIMDIR)/stormy_water/0_kyogre.4bpp \ + $(SOOTOPOLISANIMDIR)/stormy_water/0_groudon.4bpp + @cat $^ >$@ + +$(SOOTOPOLISANIMDIR)/stormy_water/1.4bpp: $(SOOTOPOLISANIMDIR)/stormy_water/1_kyogre.4bpp \ + $(SOOTOPOLISANIMDIR)/stormy_water/1_groudon.4bpp + @cat $^ >$@ + +$(SOOTOPOLISANIMDIR)/stormy_water/2.4bpp: $(SOOTOPOLISANIMDIR)/stormy_water/2_kyogre.4bpp \ + $(SOOTOPOLISANIMDIR)/stormy_water/2_groudon.4bpp + @cat $^ >$@ + +$(SOOTOPOLISANIMDIR)/stormy_water/3.4bpp: $(SOOTOPOLISANIMDIR)/stormy_water/3_kyogre.4bpp \ + $(SOOTOPOLISANIMDIR)/stormy_water/3_groudon.4bpp + @cat $^ >$@ + +$(SOOTOPOLISANIMDIR)/stormy_water/4.4bpp: $(SOOTOPOLISANIMDIR)/stormy_water/4_kyogre.4bpp \ + $(SOOTOPOLISANIMDIR)/stormy_water/4_groudon.4bpp + @cat $^ >$@ + +$(SOOTOPOLISANIMDIR)/stormy_water/5.4bpp: $(SOOTOPOLISANIMDIR)/stormy_water/5_kyogre.4bpp \ + $(SOOTOPOLISANIMDIR)/stormy_water/5_groudon.4bpp + @cat $^ >$@ + +$(SOOTOPOLISANIMDIR)/stormy_water/6.4bpp: $(SOOTOPOLISANIMDIR)/stormy_water/6_kyogre.4bpp \ + $(SOOTOPOLISANIMDIR)/stormy_water/6_groudon.4bpp + @cat $^ >$@ + +$(SOOTOPOLISANIMDIR)/stormy_water/7.4bpp: $(SOOTOPOLISANIMDIR)/stormy_water/7_kyogre.4bpp \ + $(SOOTOPOLISANIMDIR)/stormy_water/7_groudon.4bpp + @cat $^ >$@ + $(TILESETGFXDIR)/secondary/battle_frontier_outside_west/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 508