diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-04-12 13:29:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-12 13:29:50 -0400 |
| commit | ee1744865ee1c37ad9f426ab06757926e854a6f1 (patch) | |
| tree | d70dfe44ffec6aacd415285bc9206354c5c25a03 | |
| parent | 7eaabab3f0d1cd580d85e93ba560c58c62a2f364 (diff) | |
| parent | 715e0d7f64ac6cf980d212608768392083659d8b (diff) | |
Merge pull request #1014 from GriffinRichards/fix-png
Re-export tileset anim pngs to use palettes
146 files changed, 37 insertions, 3 deletions
diff --git a/data/tilesets/primary/building/anim/tv_turned_on/0.png b/data/tilesets/primary/building/anim/tv_turned_on/0.png Binary files differindex 1d98f3621..65645fb73 100644 --- a/data/tilesets/primary/building/anim/tv_turned_on/0.png +++ b/data/tilesets/primary/building/anim/tv_turned_on/0.png diff --git a/data/tilesets/primary/building/anim/tv_turned_on/1.png b/data/tilesets/primary/building/anim/tv_turned_on/1.png Binary files differindex 6798473b7..6ecb516e3 100644 --- a/data/tilesets/primary/building/anim/tv_turned_on/1.png +++ b/data/tilesets/primary/building/anim/tv_turned_on/1.png diff --git a/data/tilesets/primary/general/anim/flower/0.png b/data/tilesets/primary/general/anim/flower/0.png Binary files differindex 1254a7655..106b75af5 100644 --- a/data/tilesets/primary/general/anim/flower/0.png +++ b/data/tilesets/primary/general/anim/flower/0.png diff --git a/data/tilesets/primary/general/anim/flower/1.png b/data/tilesets/primary/general/anim/flower/1.png Binary files differindex 50bd949f2..cf35dfd6c 100644 --- a/data/tilesets/primary/general/anim/flower/1.png +++ b/data/tilesets/primary/general/anim/flower/1.png diff --git a/data/tilesets/primary/general/anim/flower/2.png b/data/tilesets/primary/general/anim/flower/2.png Binary files differindex 5d8192c9d..d482e5475 100644 --- a/data/tilesets/primary/general/anim/flower/2.png +++ b/data/tilesets/primary/general/anim/flower/2.png diff --git a/data/tilesets/primary/general/anim/land_water_edge/0.png b/data/tilesets/primary/general/anim/land_water_edge/0.png Binary files differindex ba160b633..c1dcd5f5a 100644 --- a/data/tilesets/primary/general/anim/land_water_edge/0.png +++ b/data/tilesets/primary/general/anim/land_water_edge/0.png diff --git a/data/tilesets/primary/general/anim/land_water_edge/1.png b/data/tilesets/primary/general/anim/land_water_edge/1.png Binary files differindex 48274c9a0..75aea1193 100644 --- a/data/tilesets/primary/general/anim/land_water_edge/1.png +++ b/data/tilesets/primary/general/anim/land_water_edge/1.png diff --git a/data/tilesets/primary/general/anim/land_water_edge/2.png b/data/tilesets/primary/general/anim/land_water_edge/2.png Binary files differindex 9e1f98c1b..bafda3aa2 100644 --- a/data/tilesets/primary/general/anim/land_water_edge/2.png +++ b/data/tilesets/primary/general/anim/land_water_edge/2.png diff --git a/data/tilesets/primary/general/anim/land_water_edge/3.png b/data/tilesets/primary/general/anim/land_water_edge/3.png Binary files differindex c5b446f65..8d9645f6b 100644 --- a/data/tilesets/primary/general/anim/land_water_edge/3.png +++ b/data/tilesets/primary/general/anim/land_water_edge/3.png diff --git a/data/tilesets/primary/general/anim/sand_water_edge/0.png b/data/tilesets/primary/general/anim/sand_water_edge/0.png Binary files differindex 80c99c473..46dcf9088 100644 --- a/data/tilesets/primary/general/anim/sand_water_edge/0.png +++ b/data/tilesets/primary/general/anim/sand_water_edge/0.png diff --git a/data/tilesets/primary/general/anim/sand_water_edge/1.png b/data/tilesets/primary/general/anim/sand_water_edge/1.png Binary files differindex 52051f056..4188eefbe 100644 --- a/data/tilesets/primary/general/anim/sand_water_edge/1.png +++ b/data/tilesets/primary/general/anim/sand_water_edge/1.png diff --git a/data/tilesets/primary/general/anim/sand_water_edge/2.png b/data/tilesets/primary/general/anim/sand_water_edge/2.png Binary files differindex 39c6e2f87..f414a71ae 100644 --- a/data/tilesets/primary/general/anim/sand_water_edge/2.png +++ b/data/tilesets/primary/general/anim/sand_water_edge/2.png diff --git a/data/tilesets/primary/general/anim/sand_water_edge/3.png b/data/tilesets/primary/general/anim/sand_water_edge/3.png Binary files differindex abb5ff362..0a8fc0514 100644 --- a/data/tilesets/primary/general/anim/sand_water_edge/3.png +++ b/data/tilesets/primary/general/anim/sand_water_edge/3.png diff --git a/data/tilesets/primary/general/anim/sand_water_edge/4.png b/data/tilesets/primary/general/anim/sand_water_edge/4.png Binary files differindex a7bde9837..202cf97d5 100644 --- a/data/tilesets/primary/general/anim/sand_water_edge/4.png +++ b/data/tilesets/primary/general/anim/sand_water_edge/4.png diff --git a/data/tilesets/primary/general/anim/sand_water_edge/5.png b/data/tilesets/primary/general/anim/sand_water_edge/5.png Binary files differindex 05f88d81e..3f984d0ac 100644 --- a/data/tilesets/primary/general/anim/sand_water_edge/5.png +++ b/data/tilesets/primary/general/anim/sand_water_edge/5.png diff --git a/data/tilesets/primary/general/anim/sand_water_edge/6.png b/data/tilesets/primary/general/anim/sand_water_edge/6.png Binary files differindex 01f9c203d..9c60501de 100644 --- a/data/tilesets/primary/general/anim/sand_water_edge/6.png +++ b/data/tilesets/primary/general/anim/sand_water_edge/6.png diff --git a/data/tilesets/primary/general/anim/water/0.png b/data/tilesets/primary/general/anim/water/0.png Binary files differindex d3f2ea0da..209b93b29 100644 --- a/data/tilesets/primary/general/anim/water/0.png +++ b/data/tilesets/primary/general/anim/water/0.png diff --git a/data/tilesets/primary/general/anim/water/1.png b/data/tilesets/primary/general/anim/water/1.png Binary files differindex 86b0ff176..cf07461b6 100644 --- a/data/tilesets/primary/general/anim/water/1.png +++ b/data/tilesets/primary/general/anim/water/1.png diff --git a/data/tilesets/primary/general/anim/water/2.png b/data/tilesets/primary/general/anim/water/2.png Binary files differindex d2302180e..28fc4de47 100644 --- a/data/tilesets/primary/general/anim/water/2.png +++ b/data/tilesets/primary/general/anim/water/2.png diff --git a/data/tilesets/primary/general/anim/water/3.png b/data/tilesets/primary/general/anim/water/3.png Binary files differindex f757f8253..3440c0970 100644 --- a/data/tilesets/primary/general/anim/water/3.png +++ b/data/tilesets/primary/general/anim/water/3.png diff --git a/data/tilesets/primary/general/anim/water/4.png b/data/tilesets/primary/general/anim/water/4.png Binary files differindex 950b88585..994d08a12 100644 --- a/data/tilesets/primary/general/anim/water/4.png +++ b/data/tilesets/primary/general/anim/water/4.png diff --git a/data/tilesets/primary/general/anim/water/5.png b/data/tilesets/primary/general/anim/water/5.png Binary files differindex 4de7d4225..227dbaed8 100644 --- a/data/tilesets/primary/general/anim/water/5.png +++ b/data/tilesets/primary/general/anim/water/5.png diff --git a/data/tilesets/primary/general/anim/water/6.png b/data/tilesets/primary/general/anim/water/6.png Binary files differindex 73c1cabdd..05e05510e 100644 --- a/data/tilesets/primary/general/anim/water/6.png +++ b/data/tilesets/primary/general/anim/water/6.png diff --git a/data/tilesets/primary/general/anim/water/7.png b/data/tilesets/primary/general/anim/water/7.png Binary files differindex 827fd8b74..fa295f852 100644 --- a/data/tilesets/primary/general/anim/water/7.png +++ b/data/tilesets/primary/general/anim/water/7.png diff --git a/data/tilesets/primary/general/anim/waterfall/0.png b/data/tilesets/primary/general/anim/waterfall/0.png Binary files differindex e307d81aa..f69a4686b 100644 --- a/data/tilesets/primary/general/anim/waterfall/0.png +++ b/data/tilesets/primary/general/anim/waterfall/0.png diff --git a/data/tilesets/primary/general/anim/waterfall/1.png b/data/tilesets/primary/general/anim/waterfall/1.png Binary files differindex df6aaf3bc..9a3c68c8f 100644 --- a/data/tilesets/primary/general/anim/waterfall/1.png +++ b/data/tilesets/primary/general/anim/waterfall/1.png diff --git a/data/tilesets/primary/general/anim/waterfall/2.png b/data/tilesets/primary/general/anim/waterfall/2.png Binary files differindex 560f89d06..4d09e8de9 100644 --- a/data/tilesets/primary/general/anim/waterfall/2.png +++ b/data/tilesets/primary/general/anim/waterfall/2.png diff --git a/data/tilesets/primary/general/anim/waterfall/3.png b/data/tilesets/primary/general/anim/waterfall/3.png Binary files differindex a8db289ae..0c50e43fb 100644 --- a/data/tilesets/primary/general/anim/waterfall/3.png +++ b/data/tilesets/primary/general/anim/waterfall/3.png diff --git a/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/0.png b/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/0.png Binary files differindex 98f1a9283..b5621be76 100644 --- a/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/0.png +++ b/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/0.png diff --git a/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/1.png b/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/1.png Binary files differindex d0254e9ee..56a46ce92 100644 --- a/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/1.png +++ b/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/1.png diff --git a/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/2.png b/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/2.png Binary files differindex 1be9641b8..e51f5b531 100644 --- a/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/2.png +++ b/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/2.png diff --git a/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/3.png b/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/3.png Binary files differindex 7a536f24c..3ec6ff703 100644 --- a/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/3.png +++ b/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/3.png diff --git a/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/0.png b/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/0.png Binary files differindex 98f1a9283..b5621be76 100644 --- a/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/0.png +++ b/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/0.png diff --git a/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/1.png b/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/1.png Binary files differindex d0254e9ee..56a46ce92 100644 --- a/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/1.png +++ b/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/1.png diff --git a/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/2.png b/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/2.png Binary files differindex 1be9641b8..e51f5b531 100644 --- a/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/2.png +++ b/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/2.png diff --git a/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/3.png b/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/3.png Binary files differindex 7a536f24c..3ec6ff703 100644 --- a/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/3.png +++ b/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/3.png diff --git a/data/tilesets/secondary/battle_pyramid/anim/statue_shadow/0.png b/data/tilesets/secondary/battle_pyramid/anim/statue_shadow/0.png Binary files differindex c135df824..552bdbe0c 100644 --- a/data/tilesets/secondary/battle_pyramid/anim/statue_shadow/0.png +++ b/data/tilesets/secondary/battle_pyramid/anim/statue_shadow/0.png diff --git a/data/tilesets/secondary/battle_pyramid/anim/statue_shadow/1.png b/data/tilesets/secondary/battle_pyramid/anim/statue_shadow/1.png Binary files differindex 2588bdac0..3b6f481e8 100644 --- a/data/tilesets/secondary/battle_pyramid/anim/statue_shadow/1.png +++ b/data/tilesets/secondary/battle_pyramid/anim/statue_shadow/1.png diff --git a/data/tilesets/secondary/battle_pyramid/anim/statue_shadow/2.png b/data/tilesets/secondary/battle_pyramid/anim/statue_shadow/2.png Binary files differindex fbbf67d2f..cb0569e78 100644 --- a/data/tilesets/secondary/battle_pyramid/anim/statue_shadow/2.png +++ b/data/tilesets/secondary/battle_pyramid/anim/statue_shadow/2.png diff --git a/data/tilesets/secondary/battle_pyramid/anim/torch/0.png b/data/tilesets/secondary/battle_pyramid/anim/torch/0.png Binary files differindex 04bb8ad84..4becd1edc 100644 --- a/data/tilesets/secondary/battle_pyramid/anim/torch/0.png +++ b/data/tilesets/secondary/battle_pyramid/anim/torch/0.png diff --git a/data/tilesets/secondary/battle_pyramid/anim/torch/1.png b/data/tilesets/secondary/battle_pyramid/anim/torch/1.png Binary files differindex e292686f9..91bdf8ac5 100644 --- a/data/tilesets/secondary/battle_pyramid/anim/torch/1.png +++ b/data/tilesets/secondary/battle_pyramid/anim/torch/1.png diff --git a/data/tilesets/secondary/battle_pyramid/anim/torch/2.png b/data/tilesets/secondary/battle_pyramid/anim/torch/2.png Binary files differindex fa24db001..fb6153b4f 100644 --- a/data/tilesets/secondary/battle_pyramid/anim/torch/2.png +++ b/data/tilesets/secondary/battle_pyramid/anim/torch/2.png diff --git a/data/tilesets/secondary/bike_shop/anim/blinking_lights/0.png b/data/tilesets/secondary/bike_shop/anim/blinking_lights/0.png Binary files differindex 127ed4e47..f8bafb21b 100644 --- a/data/tilesets/secondary/bike_shop/anim/blinking_lights/0.png +++ b/data/tilesets/secondary/bike_shop/anim/blinking_lights/0.png diff --git a/data/tilesets/secondary/bike_shop/anim/blinking_lights/1.png b/data/tilesets/secondary/bike_shop/anim/blinking_lights/1.png Binary files differindex 71f12a746..d5e22861d 100644 --- a/data/tilesets/secondary/bike_shop/anim/blinking_lights/1.png +++ b/data/tilesets/secondary/bike_shop/anim/blinking_lights/1.png diff --git a/data/tilesets/secondary/cave/anim/lava/0.png b/data/tilesets/secondary/cave/anim/lava/0.png Binary files differindex e98a161eb..66a0472f5 100644 --- a/data/tilesets/secondary/cave/anim/lava/0.png +++ b/data/tilesets/secondary/cave/anim/lava/0.png diff --git a/data/tilesets/secondary/cave/anim/lava/1.png b/data/tilesets/secondary/cave/anim/lava/1.png Binary files differindex 12ffcd12c..0b2a826c2 100644 --- a/data/tilesets/secondary/cave/anim/lava/1.png +++ b/data/tilesets/secondary/cave/anim/lava/1.png diff --git a/data/tilesets/secondary/cave/anim/lava/2.png b/data/tilesets/secondary/cave/anim/lava/2.png Binary files differindex c5be89c00..9a1eedddf 100644 --- a/data/tilesets/secondary/cave/anim/lava/2.png +++ b/data/tilesets/secondary/cave/anim/lava/2.png diff --git a/data/tilesets/secondary/cave/anim/lava/3.png b/data/tilesets/secondary/cave/anim/lava/3.png Binary files differindex 635a81154..6656b0c80 100644 --- a/data/tilesets/secondary/cave/anim/lava/3.png +++ b/data/tilesets/secondary/cave/anim/lava/3.png diff --git a/data/tilesets/secondary/cave/anim/lava/4.png b/data/tilesets/secondary/cave/anim/lava/4.png Binary files differindex cea6ece85..a3d77615a 100644 --- a/data/tilesets/secondary/cave/anim/lava/4.png +++ b/data/tilesets/secondary/cave/anim/lava/4.png diff --git a/data/tilesets/secondary/cave/anim/lava/5.png b/data/tilesets/secondary/cave/anim/lava/5.png Binary files differindex 01d8a300a..c1469938a 100644 --- a/data/tilesets/secondary/cave/anim/lava/5.png +++ b/data/tilesets/secondary/cave/anim/lava/5.png diff --git a/data/tilesets/secondary/cave/anim/lava/6.png b/data/tilesets/secondary/cave/anim/lava/6.png Binary files differindex ba13bda8c..41afe9d1f 100644 --- a/data/tilesets/secondary/cave/anim/lava/6.png +++ b/data/tilesets/secondary/cave/anim/lava/6.png diff --git a/data/tilesets/secondary/cave/anim/lava/7.png b/data/tilesets/secondary/cave/anim/lava/7.png Binary files differindex 117f04aa4..a6a04ffb6 100644 --- a/data/tilesets/secondary/cave/anim/lava/7.png +++ b/data/tilesets/secondary/cave/anim/lava/7.png diff --git a/data/tilesets/secondary/dewford/anim/flag/0.png b/data/tilesets/secondary/dewford/anim/flag/0.png Binary files differindex f80971c45..c2d69b2e2 100644 --- a/data/tilesets/secondary/dewford/anim/flag/0.png +++ b/data/tilesets/secondary/dewford/anim/flag/0.png diff --git a/data/tilesets/secondary/dewford/anim/flag/1.png b/data/tilesets/secondary/dewford/anim/flag/1.png Binary files differindex b98d9cafb..556d21170 100644 --- a/data/tilesets/secondary/dewford/anim/flag/1.png +++ b/data/tilesets/secondary/dewford/anim/flag/1.png diff --git a/data/tilesets/secondary/dewford/anim/flag/2.png b/data/tilesets/secondary/dewford/anim/flag/2.png Binary files differindex 6f88f493f..372a9a5db 100644 --- a/data/tilesets/secondary/dewford/anim/flag/2.png +++ b/data/tilesets/secondary/dewford/anim/flag/2.png diff --git a/data/tilesets/secondary/dewford/anim/flag/3.png b/data/tilesets/secondary/dewford/anim/flag/3.png Binary files differindex b95b4bc9e..6190ce3cd 100644 --- a/data/tilesets/secondary/dewford/anim/flag/3.png +++ b/data/tilesets/secondary/dewford/anim/flag/3.png diff --git a/data/tilesets/secondary/elite_four/anim/floor_light/0.png b/data/tilesets/secondary/elite_four/anim/floor_light/0.png Binary files differindex 6e508308b..f5c4168c3 100644 --- a/data/tilesets/secondary/elite_four/anim/floor_light/0.png +++ b/data/tilesets/secondary/elite_four/anim/floor_light/0.png diff --git a/data/tilesets/secondary/elite_four/anim/floor_light/1.png b/data/tilesets/secondary/elite_four/anim/floor_light/1.png Binary files differindex 794f26195..e7e66e611 100644 --- a/data/tilesets/secondary/elite_four/anim/floor_light/1.png +++ b/data/tilesets/secondary/elite_four/anim/floor_light/1.png diff --git a/data/tilesets/secondary/elite_four/anim/wall_lights/0.png b/data/tilesets/secondary/elite_four/anim/wall_lights/0.png Binary files differindex 108a2099b..3ce30e90b 100644 --- a/data/tilesets/secondary/elite_four/anim/wall_lights/0.png +++ b/data/tilesets/secondary/elite_four/anim/wall_lights/0.png diff --git a/data/tilesets/secondary/elite_four/anim/wall_lights/1.png b/data/tilesets/secondary/elite_four/anim/wall_lights/1.png Binary files differindex 64b23f061..d28ff5515 100644 --- a/data/tilesets/secondary/elite_four/anim/wall_lights/1.png +++ b/data/tilesets/secondary/elite_four/anim/wall_lights/1.png diff --git a/data/tilesets/secondary/elite_four/anim/wall_lights/2.png b/data/tilesets/secondary/elite_four/anim/wall_lights/2.png Binary files differindex 0d9f603fc..9a18c5c46 100644 --- a/data/tilesets/secondary/elite_four/anim/wall_lights/2.png +++ b/data/tilesets/secondary/elite_four/anim/wall_lights/2.png diff --git a/data/tilesets/secondary/elite_four/anim/wall_lights/3.png b/data/tilesets/secondary/elite_four/anim/wall_lights/3.png Binary files differindex 64b23f061..d28ff5515 100644 --- a/data/tilesets/secondary/elite_four/anim/wall_lights/3.png +++ b/data/tilesets/secondary/elite_four/anim/wall_lights/3.png diff --git a/data/tilesets/secondary/ever_grande/anim/flowers/0.png b/data/tilesets/secondary/ever_grande/anim/flowers/0.png Binary files differindex ac03df40b..6493e2e82 100644 --- a/data/tilesets/secondary/ever_grande/anim/flowers/0.png +++ b/data/tilesets/secondary/ever_grande/anim/flowers/0.png diff --git a/data/tilesets/secondary/ever_grande/anim/flowers/1.png b/data/tilesets/secondary/ever_grande/anim/flowers/1.png Binary files differindex ac03df40b..6493e2e82 100644 --- a/data/tilesets/secondary/ever_grande/anim/flowers/1.png +++ b/data/tilesets/secondary/ever_grande/anim/flowers/1.png diff --git a/data/tilesets/secondary/ever_grande/anim/flowers/2.png b/data/tilesets/secondary/ever_grande/anim/flowers/2.png Binary files differindex 4f8baa2a3..0b1f568cb 100644 --- a/data/tilesets/secondary/ever_grande/anim/flowers/2.png +++ b/data/tilesets/secondary/ever_grande/anim/flowers/2.png diff --git a/data/tilesets/secondary/ever_grande/anim/flowers/3.png b/data/tilesets/secondary/ever_grande/anim/flowers/3.png Binary files differindex f120dee16..edc7220b8 100644 --- a/data/tilesets/secondary/ever_grande/anim/flowers/3.png +++ b/data/tilesets/secondary/ever_grande/anim/flowers/3.png diff --git a/data/tilesets/secondary/ever_grande/anim/flowers/4.png b/data/tilesets/secondary/ever_grande/anim/flowers/4.png Binary files differindex ac03df40b..6493e2e82 100644 --- a/data/tilesets/secondary/ever_grande/anim/flowers/4.png +++ b/data/tilesets/secondary/ever_grande/anim/flowers/4.png diff --git a/data/tilesets/secondary/ever_grande/anim/flowers/5.png b/data/tilesets/secondary/ever_grande/anim/flowers/5.png Binary files differindex ac03df40b..6493e2e82 100644 --- a/data/tilesets/secondary/ever_grande/anim/flowers/5.png +++ b/data/tilesets/secondary/ever_grande/anim/flowers/5.png diff --git a/data/tilesets/secondary/ever_grande/anim/flowers/6.png b/data/tilesets/secondary/ever_grande/anim/flowers/6.png Binary files differindex d7cfd4529..4d43dfd0a 100644 --- a/data/tilesets/secondary/ever_grande/anim/flowers/6.png +++ b/data/tilesets/secondary/ever_grande/anim/flowers/6.png diff --git a/data/tilesets/secondary/ever_grande/anim/flowers/7.png b/data/tilesets/secondary/ever_grande/anim/flowers/7.png Binary files differindex d7cfd4529..4d43dfd0a 100644 --- a/data/tilesets/secondary/ever_grande/anim/flowers/7.png +++ b/data/tilesets/secondary/ever_grande/anim/flowers/7.png diff --git a/data/tilesets/secondary/lavaridge/anim/steam/0.png b/data/tilesets/secondary/lavaridge/anim/steam/0.png Binary files differindex 434041fbd..adf450afd 100644 --- a/data/tilesets/secondary/lavaridge/anim/steam/0.png +++ b/data/tilesets/secondary/lavaridge/anim/steam/0.png diff --git a/data/tilesets/secondary/lavaridge/anim/steam/1.png b/data/tilesets/secondary/lavaridge/anim/steam/1.png Binary files differindex ebc028ed4..df7ad3419 100644 --- a/data/tilesets/secondary/lavaridge/anim/steam/1.png +++ b/data/tilesets/secondary/lavaridge/anim/steam/1.png diff --git a/data/tilesets/secondary/lavaridge/anim/steam/2.png b/data/tilesets/secondary/lavaridge/anim/steam/2.png Binary files differindex aee227f05..2a8c8a28c 100644 --- a/data/tilesets/secondary/lavaridge/anim/steam/2.png +++ b/data/tilesets/secondary/lavaridge/anim/steam/2.png diff --git a/data/tilesets/secondary/lavaridge/anim/steam/3.png b/data/tilesets/secondary/lavaridge/anim/steam/3.png Binary files differindex 99149ae62..8dcaa6c82 100644 --- a/data/tilesets/secondary/lavaridge/anim/steam/3.png +++ b/data/tilesets/secondary/lavaridge/anim/steam/3.png diff --git a/data/tilesets/secondary/mauville/anim/flower_1/0.png b/data/tilesets/secondary/mauville/anim/flower_1/0.png Binary files differindex b20c5470e..263dba070 100644 --- a/data/tilesets/secondary/mauville/anim/flower_1/0.png +++ b/data/tilesets/secondary/mauville/anim/flower_1/0.png diff --git a/data/tilesets/secondary/mauville/anim/flower_1/1.png b/data/tilesets/secondary/mauville/anim/flower_1/1.png Binary files differindex 0587295fc..66179f13d 100644 --- a/data/tilesets/secondary/mauville/anim/flower_1/1.png +++ b/data/tilesets/secondary/mauville/anim/flower_1/1.png diff --git a/data/tilesets/secondary/mauville/anim/flower_1/2.png b/data/tilesets/secondary/mauville/anim/flower_1/2.png Binary files differindex af0dd4ffe..63250e7b0 100644 --- a/data/tilesets/secondary/mauville/anim/flower_1/2.png +++ b/data/tilesets/secondary/mauville/anim/flower_1/2.png diff --git a/data/tilesets/secondary/mauville/anim/flower_1/3.png b/data/tilesets/secondary/mauville/anim/flower_1/3.png Binary files differindex bc132f2ef..b1015d370 100644 --- a/data/tilesets/secondary/mauville/anim/flower_1/3.png +++ b/data/tilesets/secondary/mauville/anim/flower_1/3.png diff --git a/data/tilesets/secondary/mauville/anim/flower_1/4.png b/data/tilesets/secondary/mauville/anim/flower_1/4.png Binary files differindex 911b980a3..1e8cb84af 100644 --- a/data/tilesets/secondary/mauville/anim/flower_1/4.png +++ b/data/tilesets/secondary/mauville/anim/flower_1/4.png diff --git a/data/tilesets/secondary/mauville/anim/flower_2/0.png b/data/tilesets/secondary/mauville/anim/flower_2/0.png Binary files differindex b20c5470e..263dba070 100644 --- a/data/tilesets/secondary/mauville/anim/flower_2/0.png +++ b/data/tilesets/secondary/mauville/anim/flower_2/0.png diff --git a/data/tilesets/secondary/mauville/anim/flower_2/1.png b/data/tilesets/secondary/mauville/anim/flower_2/1.png Binary files differindex 0587295fc..66179f13d 100644 --- a/data/tilesets/secondary/mauville/anim/flower_2/1.png +++ b/data/tilesets/secondary/mauville/anim/flower_2/1.png diff --git a/data/tilesets/secondary/mauville/anim/flower_2/2.png b/data/tilesets/secondary/mauville/anim/flower_2/2.png Binary files differindex af0dd4ffe..63250e7b0 100644 --- a/data/tilesets/secondary/mauville/anim/flower_2/2.png +++ b/data/tilesets/secondary/mauville/anim/flower_2/2.png diff --git a/data/tilesets/secondary/mauville/anim/flower_2/3.png b/data/tilesets/secondary/mauville/anim/flower_2/3.png Binary files differindex bc132f2ef..b1015d370 100644 --- a/data/tilesets/secondary/mauville/anim/flower_2/3.png +++ b/data/tilesets/secondary/mauville/anim/flower_2/3.png diff --git a/data/tilesets/secondary/mauville/anim/flower_2/4.png b/data/tilesets/secondary/mauville/anim/flower_2/4.png Binary files differindex 911b980a3..1e8cb84af 100644 --- a/data/tilesets/secondary/mauville/anim/flower_2/4.png +++ b/data/tilesets/secondary/mauville/anim/flower_2/4.png diff --git a/data/tilesets/secondary/mauville_gym/anim/electric_gates/0.png b/data/tilesets/secondary/mauville_gym/anim/electric_gates/0.png Binary files differindex ebf603978..91659efd1 100644 --- a/data/tilesets/secondary/mauville_gym/anim/electric_gates/0.png +++ b/data/tilesets/secondary/mauville_gym/anim/electric_gates/0.png diff --git a/data/tilesets/secondary/mauville_gym/anim/electric_gates/1.png b/data/tilesets/secondary/mauville_gym/anim/electric_gates/1.png Binary files differindex 34072707f..f766cc8e5 100644 --- a/data/tilesets/secondary/mauville_gym/anim/electric_gates/1.png +++ b/data/tilesets/secondary/mauville_gym/anim/electric_gates/1.png diff --git a/data/tilesets/secondary/pacifidlog/anim/log_bridges/0.png b/data/tilesets/secondary/pacifidlog/anim/log_bridges/0.png Binary files differindex 316eb500e..f7aa47448 100644 --- a/data/tilesets/secondary/pacifidlog/anim/log_bridges/0.png +++ b/data/tilesets/secondary/pacifidlog/anim/log_bridges/0.png diff --git a/data/tilesets/secondary/pacifidlog/anim/log_bridges/1.png b/data/tilesets/secondary/pacifidlog/anim/log_bridges/1.png Binary files differindex ee9d4316e..d0ae0b0a5 100644 --- a/data/tilesets/secondary/pacifidlog/anim/log_bridges/1.png +++ b/data/tilesets/secondary/pacifidlog/anim/log_bridges/1.png diff --git a/data/tilesets/secondary/pacifidlog/anim/log_bridges/2.png b/data/tilesets/secondary/pacifidlog/anim/log_bridges/2.png Binary files differindex 221a71585..014654cf6 100644 --- a/data/tilesets/secondary/pacifidlog/anim/log_bridges/2.png +++ b/data/tilesets/secondary/pacifidlog/anim/log_bridges/2.png diff --git a/data/tilesets/secondary/pacifidlog/anim/water_currents/0.png b/data/tilesets/secondary/pacifidlog/anim/water_currents/0.png Binary files differindex 6d432eb25..6b692db41 100644 --- a/data/tilesets/secondary/pacifidlog/anim/water_currents/0.png +++ b/data/tilesets/secondary/pacifidlog/anim/water_currents/0.png diff --git a/data/tilesets/secondary/pacifidlog/anim/water_currents/1.png b/data/tilesets/secondary/pacifidlog/anim/water_currents/1.png Binary files differindex 7588b8a72..03d984291 100644 --- a/data/tilesets/secondary/pacifidlog/anim/water_currents/1.png +++ b/data/tilesets/secondary/pacifidlog/anim/water_currents/1.png diff --git a/data/tilesets/secondary/pacifidlog/anim/water_currents/2.png b/data/tilesets/secondary/pacifidlog/anim/water_currents/2.png Binary files differindex 2a11e5065..bf4c33de9 100644 --- a/data/tilesets/secondary/pacifidlog/anim/water_currents/2.png +++ b/data/tilesets/secondary/pacifidlog/anim/water_currents/2.png diff --git a/data/tilesets/secondary/pacifidlog/anim/water_currents/3.png b/data/tilesets/secondary/pacifidlog/anim/water_currents/3.png Binary files differindex be4089ff4..67b816d38 100644 --- a/data/tilesets/secondary/pacifidlog/anim/water_currents/3.png +++ b/data/tilesets/secondary/pacifidlog/anim/water_currents/3.png diff --git a/data/tilesets/secondary/pacifidlog/anim/water_currents/4.png b/data/tilesets/secondary/pacifidlog/anim/water_currents/4.png Binary files differindex 4c16111de..7a23b7231 100644 --- a/data/tilesets/secondary/pacifidlog/anim/water_currents/4.png +++ b/data/tilesets/secondary/pacifidlog/anim/water_currents/4.png diff --git a/data/tilesets/secondary/pacifidlog/anim/water_currents/5.png b/data/tilesets/secondary/pacifidlog/anim/water_currents/5.png Binary files differindex 93bbc6375..eee9756e3 100644 --- a/data/tilesets/secondary/pacifidlog/anim/water_currents/5.png +++ b/data/tilesets/secondary/pacifidlog/anim/water_currents/5.png diff --git a/data/tilesets/secondary/pacifidlog/anim/water_currents/6.png b/data/tilesets/secondary/pacifidlog/anim/water_currents/6.png Binary files differindex b08f5a0d9..1ba88117f 100644 --- a/data/tilesets/secondary/pacifidlog/anim/water_currents/6.png +++ b/data/tilesets/secondary/pacifidlog/anim/water_currents/6.png diff --git a/data/tilesets/secondary/pacifidlog/anim/water_currents/7.png b/data/tilesets/secondary/pacifidlog/anim/water_currents/7.png Binary files differindex 1a5f0ae5c..2c3c079b9 100644 --- a/data/tilesets/secondary/pacifidlog/anim/water_currents/7.png +++ b/data/tilesets/secondary/pacifidlog/anim/water_currents/7.png diff --git a/data/tilesets/secondary/rustboro/anim/fountain/0.png b/data/tilesets/secondary/rustboro/anim/fountain/0.png Binary files differindex 07471595b..1208344d8 100644 --- a/data/tilesets/secondary/rustboro/anim/fountain/0.png +++ b/data/tilesets/secondary/rustboro/anim/fountain/0.png diff --git a/data/tilesets/secondary/rustboro/anim/fountain/1.png b/data/tilesets/secondary/rustboro/anim/fountain/1.png Binary files differindex 408f2b03a..456e5a250 100644 --- a/data/tilesets/secondary/rustboro/anim/fountain/1.png +++ b/data/tilesets/secondary/rustboro/anim/fountain/1.png diff --git a/data/tilesets/secondary/rustboro/anim/windy_water/0.png b/data/tilesets/secondary/rustboro/anim/windy_water/0.png Binary files differindex af00b97c7..2e648b834 100644 --- a/data/tilesets/secondary/rustboro/anim/windy_water/0.png +++ b/data/tilesets/secondary/rustboro/anim/windy_water/0.png diff --git a/data/tilesets/secondary/rustboro/anim/windy_water/1.png b/data/tilesets/secondary/rustboro/anim/windy_water/1.png Binary files differindex 20b1ef630..143e9d12d 100644 --- a/data/tilesets/secondary/rustboro/anim/windy_water/1.png +++ b/data/tilesets/secondary/rustboro/anim/windy_water/1.png diff --git a/data/tilesets/secondary/rustboro/anim/windy_water/2.png b/data/tilesets/secondary/rustboro/anim/windy_water/2.png Binary files differindex 44c4b2cdc..94820fcb0 100644 --- a/data/tilesets/secondary/rustboro/anim/windy_water/2.png +++ b/data/tilesets/secondary/rustboro/anim/windy_water/2.png diff --git a/data/tilesets/secondary/rustboro/anim/windy_water/3.png b/data/tilesets/secondary/rustboro/anim/windy_water/3.png Binary files differindex 44c4b2cdc..94820fcb0 100644 --- a/data/tilesets/secondary/rustboro/anim/windy_water/3.png +++ b/data/tilesets/secondary/rustboro/anim/windy_water/3.png diff --git a/data/tilesets/secondary/rustboro/anim/windy_water/4.png b/data/tilesets/secondary/rustboro/anim/windy_water/4.png Binary files differindex 44c4b2cdc..94820fcb0 100644 --- a/data/tilesets/secondary/rustboro/anim/windy_water/4.png +++ b/data/tilesets/secondary/rustboro/anim/windy_water/4.png diff --git a/data/tilesets/secondary/rustboro/anim/windy_water/5.png b/data/tilesets/secondary/rustboro/anim/windy_water/5.png Binary files differindex 44c4b2cdc..94820fcb0 100644 --- a/data/tilesets/secondary/rustboro/anim/windy_water/5.png +++ b/data/tilesets/secondary/rustboro/anim/windy_water/5.png diff --git a/data/tilesets/secondary/rustboro/anim/windy_water/6.png b/data/tilesets/secondary/rustboro/anim/windy_water/6.png Binary files differindex 44c4b2cdc..94820fcb0 100644 --- a/data/tilesets/secondary/rustboro/anim/windy_water/6.png +++ b/data/tilesets/secondary/rustboro/anim/windy_water/6.png diff --git a/data/tilesets/secondary/rustboro/anim/windy_water/7.png b/data/tilesets/secondary/rustboro/anim/windy_water/7.png Binary files differindex 44c4b2cdc..94820fcb0 100644 --- a/data/tilesets/secondary/rustboro/anim/windy_water/7.png +++ b/data/tilesets/secondary/rustboro/anim/windy_water/7.png diff --git a/data/tilesets/secondary/slateport/anim/balloons/0.png b/data/tilesets/secondary/slateport/anim/balloons/0.png Binary files differindex 28bf60f26..eb9808467 100644 --- a/data/tilesets/secondary/slateport/anim/balloons/0.png +++ b/data/tilesets/secondary/slateport/anim/balloons/0.png diff --git a/data/tilesets/secondary/slateport/anim/balloons/1.png b/data/tilesets/secondary/slateport/anim/balloons/1.png Binary files differindex 31d22f697..65df1eaa0 100644 --- a/data/tilesets/secondary/slateport/anim/balloons/1.png +++ b/data/tilesets/secondary/slateport/anim/balloons/1.png diff --git a/data/tilesets/secondary/slateport/anim/balloons/2.png b/data/tilesets/secondary/slateport/anim/balloons/2.png Binary files differindex 83b0e3940..47dd73ae4 100644 --- a/data/tilesets/secondary/slateport/anim/balloons/2.png +++ b/data/tilesets/secondary/slateport/anim/balloons/2.png diff --git a/data/tilesets/secondary/slateport/anim/balloons/3.png b/data/tilesets/secondary/slateport/anim/balloons/3.png Binary files differindex 31d22f697..65df1eaa0 100644 --- a/data/tilesets/secondary/slateport/anim/balloons/3.png +++ b/data/tilesets/secondary/slateport/anim/balloons/3.png diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/0.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/0.png Binary files differdeleted file mode 100644 index 6ae032652..000000000 --- a/data/tilesets/secondary/sootopolis/anim/stormy_water/0.png +++ /dev/null diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/0_groudon.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/0_groudon.png Binary files differnew file mode 100644 index 000000000..05276dd61 --- /dev/null +++ b/data/tilesets/secondary/sootopolis/anim/stormy_water/0_groudon.png diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/0_kyogre.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/0_kyogre.png Binary files differnew file mode 100644 index 000000000..ce6f8e5e6 --- /dev/null +++ b/data/tilesets/secondary/sootopolis/anim/stormy_water/0_kyogre.png diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/1.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/1.png Binary files differdeleted file mode 100644 index 5bf8f7a98..000000000 --- a/data/tilesets/secondary/sootopolis/anim/stormy_water/1.png +++ /dev/null diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/1_groudon.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/1_groudon.png Binary files differnew file mode 100644 index 000000000..e59bdf747 --- /dev/null +++ b/data/tilesets/secondary/sootopolis/anim/stormy_water/1_groudon.png diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/1_kyogre.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/1_kyogre.png Binary files differnew file mode 100644 index 000000000..9e7e1ab5a --- /dev/null +++ b/data/tilesets/secondary/sootopolis/anim/stormy_water/1_kyogre.png diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/2.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/2.png Binary files differdeleted file mode 100644 index 85598e145..000000000 --- a/data/tilesets/secondary/sootopolis/anim/stormy_water/2.png +++ /dev/null diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/2_groudon.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/2_groudon.png Binary files differnew file mode 100644 index 000000000..0d59d5e16 --- /dev/null +++ b/data/tilesets/secondary/sootopolis/anim/stormy_water/2_groudon.png diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/2_kyogre.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/2_kyogre.png Binary files differnew file mode 100644 index 000000000..71ce73e8b --- /dev/null +++ b/data/tilesets/secondary/sootopolis/anim/stormy_water/2_kyogre.png diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/3.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/3.png Binary files differdeleted file mode 100644 index c7aad10c7..000000000 --- a/data/tilesets/secondary/sootopolis/anim/stormy_water/3.png +++ /dev/null diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/3_groudon.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/3_groudon.png Binary files differnew file mode 100644 index 000000000..4aded92e4 --- /dev/null +++ b/data/tilesets/secondary/sootopolis/anim/stormy_water/3_groudon.png diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/3_kyogre.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/3_kyogre.png Binary files differnew file mode 100644 index 000000000..a305f6ab0 --- /dev/null +++ b/data/tilesets/secondary/sootopolis/anim/stormy_water/3_kyogre.png diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/4.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/4.png Binary files differdeleted file mode 100644 index ec446b9db..000000000 --- a/data/tilesets/secondary/sootopolis/anim/stormy_water/4.png +++ /dev/null diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/4_groudon.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/4_groudon.png Binary files differnew file mode 100644 index 000000000..d4618ab9c --- /dev/null +++ b/data/tilesets/secondary/sootopolis/anim/stormy_water/4_groudon.png diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/4_kyogre.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/4_kyogre.png Binary files differnew file mode 100644 index 000000000..ddb257213 --- /dev/null +++ b/data/tilesets/secondary/sootopolis/anim/stormy_water/4_kyogre.png diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/5.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/5.png Binary files differdeleted file mode 100644 index cbe1769c0..000000000 --- a/data/tilesets/secondary/sootopolis/anim/stormy_water/5.png +++ /dev/null diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/5_groudon.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/5_groudon.png Binary files differnew file mode 100644 index 000000000..4e59ead20 --- /dev/null +++ b/data/tilesets/secondary/sootopolis/anim/stormy_water/5_groudon.png diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/5_kyogre.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/5_kyogre.png Binary files differnew file mode 100644 index 000000000..f3e24ef7b --- /dev/null +++ b/data/tilesets/secondary/sootopolis/anim/stormy_water/5_kyogre.png diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/6.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/6.png Binary files differdeleted file mode 100644 index 690c5fd8e..000000000 --- a/data/tilesets/secondary/sootopolis/anim/stormy_water/6.png +++ /dev/null diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/6_groudon.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/6_groudon.png Binary files differnew file mode 100644 index 000000000..1aea2dc7b --- /dev/null +++ b/data/tilesets/secondary/sootopolis/anim/stormy_water/6_groudon.png diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/6_kyogre.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/6_kyogre.png Binary files differnew file mode 100644 index 000000000..2d7dc677f --- /dev/null +++ b/data/tilesets/secondary/sootopolis/anim/stormy_water/6_kyogre.png diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/7.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/7.png Binary files differdeleted file mode 100644 index e4026a02f..000000000 --- a/data/tilesets/secondary/sootopolis/anim/stormy_water/7.png +++ /dev/null diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/7_groudon.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/7_groudon.png Binary files differnew file mode 100644 index 000000000..4d9a556a4 --- /dev/null +++ b/data/tilesets/secondary/sootopolis/anim/stormy_water/7_groudon.png diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/7_kyogre.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/7_kyogre.png Binary files differnew file mode 100644 index 000000000..691af34b6 --- /dev/null +++ b/data/tilesets/secondary/sootopolis/anim/stormy_water/7_kyogre.png diff --git a/data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/0.png b/data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/0.png Binary files differindex dc6cf500e..edac313ca 100644 --- a/data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/0.png +++ b/data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/0.png diff --git a/data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/1.png b/data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/1.png Binary files differindex 93dd79753..83adf5f3e 100644 --- a/data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/1.png +++ b/data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/1.png diff --git a/data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/2.png b/data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/2.png Binary files differindex 30961482c..0f4daa7a5 100644 --- a/data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/2.png +++ b/data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/2.png diff --git a/data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/0.png b/data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/0.png Binary files differindex 180b5522e..75b24e1c5 100644 --- a/data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/0.png +++ b/data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/0.png diff --git a/data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/1.png b/data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/1.png Binary files differindex af3ab12d2..e24fc8ab2 100644 --- a/data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/1.png +++ b/data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/1.png diff --git a/data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/2.png b/data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/2.png Binary files differindex 8481c0cde..1a1e4114d 100644 --- a/data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/2.png +++ b/data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/2.png diff --git a/data/tilesets/secondary/underwater/anim/seaweed/0.png b/data/tilesets/secondary/underwater/anim/seaweed/0.png Binary files differindex fab28e54f..0bc01624f 100644 --- a/data/tilesets/secondary/underwater/anim/seaweed/0.png +++ b/data/tilesets/secondary/underwater/anim/seaweed/0.png diff --git a/data/tilesets/secondary/underwater/anim/seaweed/1.png b/data/tilesets/secondary/underwater/anim/seaweed/1.png Binary files differindex 869bc6060..6562f2a3a 100644 --- a/data/tilesets/secondary/underwater/anim/seaweed/1.png +++ b/data/tilesets/secondary/underwater/anim/seaweed/1.png diff --git a/data/tilesets/secondary/underwater/anim/seaweed/2.png b/data/tilesets/secondary/underwater/anim/seaweed/2.png Binary files differindex 64e4b267d..9c18258de 100644 --- a/data/tilesets/secondary/underwater/anim/seaweed/2.png +++ b/data/tilesets/secondary/underwater/anim/seaweed/2.png diff --git a/data/tilesets/secondary/underwater/anim/seaweed/3.png b/data/tilesets/secondary/underwater/anim/seaweed/3.png Binary files differindex 0c1392011..28b0081ff 100644 --- a/data/tilesets/secondary/underwater/anim/seaweed/3.png +++ b/data/tilesets/secondary/underwater/anim/seaweed/3.png diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 79c910ea2..c53033f4c 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 @@ -357,9 +391,9 @@ $(INTERFACEGFXDIR)/hp_numbers.4bpp: $(INTERFACEGFXDIR)/hpbar_anim.4bpp \ @cat $^ >$@ $(UNUSEDGFXDIR)/redyellowgreen_frame.bin: $(UNUSEDGFXDIR)/red_frame.bin \ - $(UNUSEDGFXDIR)/yellow_frame.bin \ - $(UNUSEDGFXDIR)/green_frame.bin \ - $(UNUSEDGFXDIR)/blank_frame.bin + $(UNUSEDGFXDIR)/yellow_frame.bin \ + $(UNUSEDGFXDIR)/green_frame.bin \ + $(UNUSEDGFXDIR)/blank_frame.bin @cat $^ >$@ $(UNUSEDGFXDIR)/color_frames.4bpp: %.4bpp: %.png |
