From 40dc6833c579f13a0ad939e3ac9ebd83d7dd752e Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 8 Feb 2019 15:07:42 -0600 Subject: Fully document tileset animations --- data/tilesets/headers.inc | 50 +- data/tilesets/primary/building/anim/0.png | Bin 179 -> 0 bytes data/tilesets/primary/building/anim/1.png | Bin 180 -> 0 bytes .../primary/building/anim/tv_turned_on/0.png | Bin 0 -> 179 bytes .../primary/building/anim/tv_turned_on/1.png | Bin 0 -> 180 bytes data/tilesets/primary/general/anim/0/0.png | Bin 239 -> 0 bytes data/tilesets/primary/general/anim/0/1.png | Bin 238 -> 0 bytes data/tilesets/primary/general/anim/0/2.png | Bin 241 -> 0 bytes data/tilesets/primary/general/anim/1/0.png | Bin 608 -> 0 bytes data/tilesets/primary/general/anim/1/1.png | Bin 651 -> 0 bytes data/tilesets/primary/general/anim/1/2.png | Bin 597 -> 0 bytes data/tilesets/primary/general/anim/1/3.png | Bin 610 -> 0 bytes data/tilesets/primary/general/anim/1/4.png | Bin 534 -> 0 bytes data/tilesets/primary/general/anim/1/5.png | Bin 538 -> 0 bytes data/tilesets/primary/general/anim/1/6.png | Bin 554 -> 0 bytes data/tilesets/primary/general/anim/1/7.png | Bin 612 -> 0 bytes data/tilesets/primary/general/anim/2/0.png | Bin 259 -> 0 bytes data/tilesets/primary/general/anim/2/1.png | Bin 293 -> 0 bytes data/tilesets/primary/general/anim/2/2.png | Bin 303 -> 0 bytes data/tilesets/primary/general/anim/2/3.png | Bin 320 -> 0 bytes data/tilesets/primary/general/anim/2/4.png | Bin 281 -> 0 bytes data/tilesets/primary/general/anim/2/5.png | Bin 261 -> 0 bytes data/tilesets/primary/general/anim/2/6.png | Bin 249 -> 0 bytes data/tilesets/primary/general/anim/3/0.png | Bin 199 -> 0 bytes data/tilesets/primary/general/anim/3/1.png | Bin 214 -> 0 bytes data/tilesets/primary/general/anim/3/2.png | Bin 195 -> 0 bytes data/tilesets/primary/general/anim/3/3.png | Bin 191 -> 0 bytes data/tilesets/primary/general/anim/4/0.png | Bin 333 -> 0 bytes data/tilesets/primary/general/anim/4/1.png | Bin 341 -> 0 bytes data/tilesets/primary/general/anim/4/2.png | Bin 342 -> 0 bytes data/tilesets/primary/general/anim/4/3.png | Bin 360 -> 0 bytes data/tilesets/primary/general/anim/flower/0.png | Bin 0 -> 239 bytes data/tilesets/primary/general/anim/flower/1.png | Bin 0 -> 238 bytes data/tilesets/primary/general/anim/flower/2.png | Bin 0 -> 241 bytes .../primary/general/anim/land_water_edge/0.png | Bin 0 -> 333 bytes .../primary/general/anim/land_water_edge/1.png | Bin 0 -> 341 bytes .../primary/general/anim/land_water_edge/2.png | Bin 0 -> 342 bytes .../primary/general/anim/land_water_edge/3.png | Bin 0 -> 360 bytes .../primary/general/anim/sand_water_edge/0.png | Bin 0 -> 259 bytes .../primary/general/anim/sand_water_edge/1.png | Bin 0 -> 293 bytes .../primary/general/anim/sand_water_edge/2.png | Bin 0 -> 303 bytes .../primary/general/anim/sand_water_edge/3.png | Bin 0 -> 320 bytes .../primary/general/anim/sand_water_edge/4.png | Bin 0 -> 281 bytes .../primary/general/anim/sand_water_edge/5.png | Bin 0 -> 261 bytes .../primary/general/anim/sand_water_edge/6.png | Bin 0 -> 249 bytes data/tilesets/primary/general/anim/water/0.png | Bin 0 -> 608 bytes data/tilesets/primary/general/anim/water/1.png | Bin 0 -> 651 bytes data/tilesets/primary/general/anim/water/2.png | Bin 0 -> 597 bytes data/tilesets/primary/general/anim/water/3.png | Bin 0 -> 610 bytes data/tilesets/primary/general/anim/water/4.png | Bin 0 -> 534 bytes data/tilesets/primary/general/anim/water/5.png | Bin 0 -> 538 bytes data/tilesets/primary/general/anim/water/6.png | Bin 0 -> 554 bytes data/tilesets/primary/general/anim/water/7.png | Bin 0 -> 612 bytes data/tilesets/primary/general/anim/waterfall/0.png | Bin 0 -> 199 bytes data/tilesets/primary/general/anim/waterfall/1.png | Bin 0 -> 214 bytes data/tilesets/primary/general/anim/waterfall/2.png | Bin 0 -> 195 bytes data/tilesets/primary/general/anim/waterfall/3.png | Bin 0 -> 191 bytes .../battle_frontier_outside_east/anim/0.png | Bin 230 -> 0 bytes .../battle_frontier_outside_east/anim/1.png | Bin 227 -> 0 bytes .../battle_frontier_outside_east/anim/2.png | Bin 225 -> 0 bytes .../battle_frontier_outside_east/anim/3.png | Bin 228 -> 0 bytes .../battle_frontier_outside_east/anim/flag/0.png | Bin 0 -> 230 bytes .../battle_frontier_outside_east/anim/flag/1.png | Bin 0 -> 227 bytes .../battle_frontier_outside_east/anim/flag/2.png | Bin 0 -> 225 bytes .../battle_frontier_outside_east/anim/flag/3.png | Bin 0 -> 228 bytes .../battle_frontier_outside_west/anim/0.png | Bin 230 -> 0 bytes .../battle_frontier_outside_west/anim/1.png | Bin 227 -> 0 bytes .../battle_frontier_outside_west/anim/2.png | Bin 225 -> 0 bytes .../battle_frontier_outside_west/anim/3.png | Bin 228 -> 0 bytes .../battle_frontier_outside_west/anim/flag/0.png | Bin 0 -> 230 bytes .../battle_frontier_outside_west/anim/flag/1.png | Bin 0 -> 227 bytes .../battle_frontier_outside_west/anim/flag/2.png | Bin 0 -> 225 bytes .../battle_frontier_outside_west/anim/flag/3.png | Bin 0 -> 228 bytes .../tilesets/secondary/battle_pyramid/anim/0/0.png | Bin 265 -> 0 bytes .../tilesets/secondary/battle_pyramid/anim/0/1.png | Bin 259 -> 0 bytes .../tilesets/secondary/battle_pyramid/anim/0/2.png | Bin 254 -> 0 bytes .../tilesets/secondary/battle_pyramid/anim/1/0.png | Bin 303 -> 0 bytes .../tilesets/secondary/battle_pyramid/anim/1/1.png | Bin 307 -> 0 bytes .../tilesets/secondary/battle_pyramid/anim/1/2.png | Bin 303 -> 0 bytes .../battle_pyramid/anim/statue_shadow/0.png | Bin 0 -> 303 bytes .../battle_pyramid/anim/statue_shadow/1.png | Bin 0 -> 307 bytes .../battle_pyramid/anim/statue_shadow/2.png | Bin 0 -> 303 bytes .../secondary/battle_pyramid/anim/torch/0.png | Bin 0 -> 265 bytes .../secondary/battle_pyramid/anim/torch/1.png | Bin 0 -> 259 bytes .../secondary/battle_pyramid/anim/torch/2.png | Bin 0 -> 254 bytes data/tilesets/secondary/bike_shop/anim/0.png | Bin 290 -> 0 bytes data/tilesets/secondary/bike_shop/anim/1.png | Bin 286 -> 0 bytes .../secondary/bike_shop/anim/blinking_lights/0.png | Bin 0 -> 290 bytes .../secondary/bike_shop/anim/blinking_lights/1.png | Bin 0 -> 286 bytes data/tilesets/secondary/cave/anim/0.png | Bin 157 -> 0 bytes data/tilesets/secondary/cave/anim/1.png | Bin 181 -> 0 bytes data/tilesets/secondary/cave/anim/2.png | Bin 173 -> 0 bytes data/tilesets/secondary/cave/anim/3.png | Bin 175 -> 0 bytes data/tilesets/secondary/cave/anim/lava/0.png | Bin 0 -> 157 bytes data/tilesets/secondary/cave/anim/lava/1.png | Bin 0 -> 181 bytes data/tilesets/secondary/cave/anim/lava/2.png | Bin 0 -> 173 bytes data/tilesets/secondary/cave/anim/lava/3.png | Bin 0 -> 175 bytes data/tilesets/secondary/cave/anim/lava/4.png | Bin 0 -> 157 bytes data/tilesets/secondary/cave/anim/lava/5.png | Bin 0 -> 177 bytes data/tilesets/secondary/cave/anim/lava/6.png | Bin 0 -> 173 bytes data/tilesets/secondary/cave/anim/lava/7.png | Bin 0 -> 171 bytes data/tilesets/secondary/cave/anim/unused/0.png | Bin 157 -> 0 bytes data/tilesets/secondary/cave/anim/unused/1.png | Bin 177 -> 0 bytes data/tilesets/secondary/cave/anim/unused/2.png | Bin 173 -> 0 bytes data/tilesets/secondary/cave/anim/unused/3.png | Bin 171 -> 0 bytes data/tilesets/secondary/dewford/anim/0.png | Bin 224 -> 0 bytes data/tilesets/secondary/dewford/anim/1.png | Bin 222 -> 0 bytes data/tilesets/secondary/dewford/anim/2.png | Bin 228 -> 0 bytes data/tilesets/secondary/dewford/anim/3.png | Bin 234 -> 0 bytes data/tilesets/secondary/dewford/anim/flag/0.png | Bin 0 -> 224 bytes data/tilesets/secondary/dewford/anim/flag/1.png | Bin 0 -> 222 bytes data/tilesets/secondary/dewford/anim/flag/2.png | Bin 0 -> 228 bytes data/tilesets/secondary/dewford/anim/flag/3.png | Bin 0 -> 234 bytes data/tilesets/secondary/elite_four/anim/0/0.png | Bin 152 -> 0 bytes data/tilesets/secondary/elite_four/anim/0/1.png | Bin 152 -> 0 bytes data/tilesets/secondary/elite_four/anim/0/2.png | Bin 152 -> 0 bytes data/tilesets/secondary/elite_four/anim/0/3.png | Bin 152 -> 0 bytes data/tilesets/secondary/elite_four/anim/1/0.png | Bin 171 -> 0 bytes data/tilesets/secondary/elite_four/anim/1/1.png | Bin 129 -> 0 bytes .../secondary/elite_four/anim/floor_light/0.png | Bin 0 -> 171 bytes .../secondary/elite_four/anim/floor_light/1.png | Bin 0 -> 129 bytes .../secondary/elite_four/anim/wall_lights/0.png | Bin 0 -> 152 bytes .../secondary/elite_four/anim/wall_lights/1.png | Bin 0 -> 152 bytes .../secondary/elite_four/anim/wall_lights/2.png | Bin 0 -> 152 bytes .../secondary/elite_four/anim/wall_lights/3.png | Bin 0 -> 152 bytes data/tilesets/secondary/ever_grande/anim/0.png | Bin 257 -> 0 bytes data/tilesets/secondary/ever_grande/anim/1.png | Bin 257 -> 0 bytes data/tilesets/secondary/ever_grande/anim/2.png | Bin 253 -> 0 bytes data/tilesets/secondary/ever_grande/anim/3.png | Bin 255 -> 0 bytes data/tilesets/secondary/ever_grande/anim/4.png | Bin 257 -> 0 bytes data/tilesets/secondary/ever_grande/anim/5.png | Bin 257 -> 0 bytes data/tilesets/secondary/ever_grande/anim/6.png | Bin 254 -> 0 bytes data/tilesets/secondary/ever_grande/anim/7.png | Bin 254 -> 0 bytes .../secondary/ever_grande/anim/flowers/0.png | Bin 0 -> 257 bytes .../secondary/ever_grande/anim/flowers/1.png | Bin 0 -> 257 bytes .../secondary/ever_grande/anim/flowers/2.png | Bin 0 -> 253 bytes .../secondary/ever_grande/anim/flowers/3.png | Bin 0 -> 255 bytes .../secondary/ever_grande/anim/flowers/4.png | Bin 0 -> 257 bytes .../secondary/ever_grande/anim/flowers/5.png | Bin 0 -> 257 bytes .../secondary/ever_grande/anim/flowers/6.png | Bin 0 -> 254 bytes .../secondary/ever_grande/anim/flowers/7.png | Bin 0 -> 254 bytes data/tilesets/secondary/lavaridge/anim/0.png | Bin 140 -> 0 bytes data/tilesets/secondary/lavaridge/anim/1.png | Bin 147 -> 0 bytes data/tilesets/secondary/lavaridge/anim/2.png | Bin 143 -> 0 bytes data/tilesets/secondary/lavaridge/anim/3.png | Bin 153 -> 0 bytes data/tilesets/secondary/lavaridge/anim/steam/0.png | Bin 0 -> 140 bytes data/tilesets/secondary/lavaridge/anim/steam/1.png | Bin 0 -> 147 bytes data/tilesets/secondary/lavaridge/anim/steam/2.png | Bin 0 -> 143 bytes data/tilesets/secondary/lavaridge/anim/steam/3.png | Bin 0 -> 153 bytes data/tilesets/secondary/mauville/anim/0/a/0.png | Bin 234 -> 0 bytes data/tilesets/secondary/mauville/anim/0/a/1.png | Bin 229 -> 0 bytes data/tilesets/secondary/mauville/anim/0/a/2.png | Bin 224 -> 0 bytes data/tilesets/secondary/mauville/anim/0/a/3.png | Bin 216 -> 0 bytes data/tilesets/secondary/mauville/anim/0/b/0.png | Bin 234 -> 0 bytes data/tilesets/secondary/mauville/anim/0/b/1.png | Bin 229 -> 0 bytes data/tilesets/secondary/mauville/anim/0/b/2.png | Bin 224 -> 0 bytes data/tilesets/secondary/mauville/anim/0/b/3.png | Bin 216 -> 0 bytes data/tilesets/secondary/mauville/anim/1/a/1.png | Bin 232 -> 0 bytes data/tilesets/secondary/mauville/anim/1/b/1.png | Bin 232 -> 0 bytes .../secondary/mauville/anim/flower_1/0.png | Bin 0 -> 234 bytes .../secondary/mauville/anim/flower_1/1.png | Bin 0 -> 229 bytes .../secondary/mauville/anim/flower_1/2.png | Bin 0 -> 224 bytes .../secondary/mauville/anim/flower_1/3.png | Bin 0 -> 216 bytes .../secondary/mauville/anim/flower_1/4.png | Bin 0 -> 232 bytes .../secondary/mauville/anim/flower_2/0.png | Bin 0 -> 234 bytes .../secondary/mauville/anim/flower_2/1.png | Bin 0 -> 229 bytes .../secondary/mauville/anim/flower_2/2.png | Bin 0 -> 224 bytes .../secondary/mauville/anim/flower_2/3.png | Bin 0 -> 216 bytes .../secondary/mauville/anim/flower_2/4.png | Bin 0 -> 232 bytes data/tilesets/secondary/mauville_gym/anim/0.png | Bin 243 -> 0 bytes data/tilesets/secondary/mauville_gym/anim/1.png | Bin 242 -> 0 bytes .../mauville_gym/anim/electric_gates/0.png | Bin 0 -> 243 bytes .../mauville_gym/anim/electric_gates/1.png | Bin 0 -> 242 bytes data/tilesets/secondary/pacifidlog/anim/0/0.png | Bin 631 -> 0 bytes data/tilesets/secondary/pacifidlog/anim/0/1.png | Bin 655 -> 0 bytes data/tilesets/secondary/pacifidlog/anim/0/2.png | Bin 664 -> 0 bytes data/tilesets/secondary/pacifidlog/anim/1/0.png | Bin 263 -> 0 bytes data/tilesets/secondary/pacifidlog/anim/1/1.png | Bin 271 -> 0 bytes data/tilesets/secondary/pacifidlog/anim/1/2.png | Bin 284 -> 0 bytes data/tilesets/secondary/pacifidlog/anim/1/3.png | Bin 266 -> 0 bytes data/tilesets/secondary/pacifidlog/anim/1/4.png | Bin 200 -> 0 bytes data/tilesets/secondary/pacifidlog/anim/1/5.png | Bin 200 -> 0 bytes data/tilesets/secondary/pacifidlog/anim/1/6.png | Bin 200 -> 0 bytes data/tilesets/secondary/pacifidlog/anim/1/7.png | Bin 261 -> 0 bytes .../secondary/pacifidlog/anim/log_bridges/0.png | Bin 0 -> 631 bytes .../secondary/pacifidlog/anim/log_bridges/1.png | Bin 0 -> 655 bytes .../secondary/pacifidlog/anim/log_bridges/2.png | Bin 0 -> 664 bytes .../secondary/pacifidlog/anim/water_currents/0.png | Bin 0 -> 263 bytes .../secondary/pacifidlog/anim/water_currents/1.png | Bin 0 -> 271 bytes .../secondary/pacifidlog/anim/water_currents/2.png | Bin 0 -> 284 bytes .../secondary/pacifidlog/anim/water_currents/3.png | Bin 0 -> 266 bytes .../secondary/pacifidlog/anim/water_currents/4.png | Bin 0 -> 200 bytes .../secondary/pacifidlog/anim/water_currents/5.png | Bin 0 -> 200 bytes .../secondary/pacifidlog/anim/water_currents/6.png | Bin 0 -> 200 bytes .../secondary/pacifidlog/anim/water_currents/7.png | Bin 0 -> 261 bytes data/tilesets/secondary/rustboro/anim/0/0.png | Bin 180 -> 0 bytes data/tilesets/secondary/rustboro/anim/0/1.png | Bin 170 -> 0 bytes data/tilesets/secondary/rustboro/anim/0/2.png | Bin 132 -> 0 bytes data/tilesets/secondary/rustboro/anim/0/3.png | Bin 132 -> 0 bytes data/tilesets/secondary/rustboro/anim/0/4.png | Bin 132 -> 0 bytes data/tilesets/secondary/rustboro/anim/0/5.png | Bin 132 -> 0 bytes data/tilesets/secondary/rustboro/anim/0/6.png | Bin 132 -> 0 bytes data/tilesets/secondary/rustboro/anim/0/7.png | Bin 132 -> 0 bytes data/tilesets/secondary/rustboro/anim/1/0.png | Bin 252 -> 0 bytes data/tilesets/secondary/rustboro/anim/1/1.png | Bin 247 -> 0 bytes .../secondary/rustboro/anim/fountain/0.png | Bin 0 -> 252 bytes .../secondary/rustboro/anim/fountain/1.png | Bin 0 -> 247 bytes .../secondary/rustboro/anim/windy_water/0.png | Bin 0 -> 180 bytes .../secondary/rustboro/anim/windy_water/1.png | Bin 0 -> 170 bytes .../secondary/rustboro/anim/windy_water/2.png | Bin 0 -> 132 bytes .../secondary/rustboro/anim/windy_water/3.png | Bin 0 -> 132 bytes .../secondary/rustboro/anim/windy_water/4.png | Bin 0 -> 132 bytes .../secondary/rustboro/anim/windy_water/5.png | Bin 0 -> 132 bytes .../secondary/rustboro/anim/windy_water/6.png | Bin 0 -> 132 bytes .../secondary/rustboro/anim/windy_water/7.png | Bin 0 -> 132 bytes data/tilesets/secondary/slateport/anim/0.png | Bin 227 -> 0 bytes data/tilesets/secondary/slateport/anim/1.png | Bin 234 -> 0 bytes data/tilesets/secondary/slateport/anim/2.png | Bin 231 -> 0 bytes data/tilesets/secondary/slateport/anim/3.png | Bin 234 -> 0 bytes .../secondary/slateport/anim/balloons/0.png | Bin 0 -> 227 bytes .../secondary/slateport/anim/balloons/1.png | Bin 0 -> 234 bytes .../secondary/slateport/anim/balloons/2.png | Bin 0 -> 231 bytes .../secondary/slateport/anim/balloons/3.png | Bin 0 -> 234 bytes data/tilesets/secondary/sootopolis/anim/0.png | Bin 1135 -> 0 bytes data/tilesets/secondary/sootopolis/anim/1.png | Bin 1155 -> 0 bytes data/tilesets/secondary/sootopolis/anim/2.png | Bin 1155 -> 0 bytes data/tilesets/secondary/sootopolis/anim/3.png | Bin 1112 -> 0 bytes data/tilesets/secondary/sootopolis/anim/4.png | Bin 1124 -> 0 bytes data/tilesets/secondary/sootopolis/anim/5.png | Bin 1149 -> 0 bytes data/tilesets/secondary/sootopolis/anim/6.png | Bin 1097 -> 0 bytes data/tilesets/secondary/sootopolis/anim/7.png | Bin 1093 -> 0 bytes .../secondary/sootopolis/anim/stormy_water/0.png | Bin 0 -> 1135 bytes .../secondary/sootopolis/anim/stormy_water/1.png | Bin 0 -> 1155 bytes .../secondary/sootopolis/anim/stormy_water/2.png | Bin 0 -> 1155 bytes .../secondary/sootopolis/anim/stormy_water/3.png | Bin 0 -> 1112 bytes .../secondary/sootopolis/anim/stormy_water/4.png | Bin 0 -> 1124 bytes .../secondary/sootopolis/anim/stormy_water/5.png | Bin 0 -> 1149 bytes .../secondary/sootopolis/anim/stormy_water/6.png | Bin 0 -> 1097 bytes .../secondary/sootopolis/anim/stormy_water/7.png | Bin 0 -> 1093 bytes .../tilesets/secondary/sootopolis_gym/anim/0/0.png | Bin 341 -> 0 bytes .../tilesets/secondary/sootopolis_gym/anim/0/1.png | Bin 339 -> 0 bytes .../tilesets/secondary/sootopolis_gym/anim/0/2.png | Bin 340 -> 0 bytes .../tilesets/secondary/sootopolis_gym/anim/1/0.png | Bin 363 -> 0 bytes .../tilesets/secondary/sootopolis_gym/anim/1/1.png | Bin 372 -> 0 bytes .../tilesets/secondary/sootopolis_gym/anim/1/2.png | Bin 385 -> 0 bytes .../sootopolis_gym/anim/front_waterfall/0.png | Bin 0 -> 363 bytes .../sootopolis_gym/anim/front_waterfall/1.png | Bin 0 -> 372 bytes .../sootopolis_gym/anim/front_waterfall/2.png | Bin 0 -> 385 bytes .../sootopolis_gym/anim/side_waterfall/0.png | Bin 0 -> 341 bytes .../sootopolis_gym/anim/side_waterfall/1.png | Bin 0 -> 339 bytes .../sootopolis_gym/anim/side_waterfall/2.png | Bin 0 -> 340 bytes data/tilesets/secondary/underwater/anim/0.png | Bin 231 -> 0 bytes data/tilesets/secondary/underwater/anim/1.png | Bin 236 -> 0 bytes data/tilesets/secondary/underwater/anim/2.png | Bin 238 -> 0 bytes data/tilesets/secondary/underwater/anim/3.png | Bin 234 -> 0 bytes .../secondary/underwater/anim/seaweed/0.png | Bin 0 -> 231 bytes .../secondary/underwater/anim/seaweed/1.png | Bin 0 -> 236 bytes .../secondary/underwater/anim/seaweed/2.png | Bin 0 -> 238 bytes .../secondary/underwater/anim/seaweed/3.png | Bin 0 -> 234 bytes include/graphics.h | 4 + include/tileset_anims.h | 6 +- src/battle_dome.c | 2 +- src/overworld.c | 12 +- src/tileset_anims.c | 1672 +++++++++----------- 264 files changed, 763 insertions(+), 983 deletions(-) delete mode 100644 data/tilesets/primary/building/anim/0.png delete mode 100644 data/tilesets/primary/building/anim/1.png create mode 100644 data/tilesets/primary/building/anim/tv_turned_on/0.png create mode 100644 data/tilesets/primary/building/anim/tv_turned_on/1.png delete mode 100644 data/tilesets/primary/general/anim/0/0.png delete mode 100644 data/tilesets/primary/general/anim/0/1.png delete mode 100644 data/tilesets/primary/general/anim/0/2.png delete mode 100644 data/tilesets/primary/general/anim/1/0.png delete mode 100644 data/tilesets/primary/general/anim/1/1.png delete mode 100644 data/tilesets/primary/general/anim/1/2.png delete mode 100644 data/tilesets/primary/general/anim/1/3.png delete mode 100644 data/tilesets/primary/general/anim/1/4.png delete mode 100644 data/tilesets/primary/general/anim/1/5.png delete mode 100644 data/tilesets/primary/general/anim/1/6.png delete mode 100644 data/tilesets/primary/general/anim/1/7.png delete mode 100644 data/tilesets/primary/general/anim/2/0.png delete mode 100644 data/tilesets/primary/general/anim/2/1.png delete mode 100644 data/tilesets/primary/general/anim/2/2.png delete mode 100644 data/tilesets/primary/general/anim/2/3.png delete mode 100644 data/tilesets/primary/general/anim/2/4.png delete mode 100644 data/tilesets/primary/general/anim/2/5.png delete mode 100644 data/tilesets/primary/general/anim/2/6.png delete mode 100644 data/tilesets/primary/general/anim/3/0.png delete mode 100644 data/tilesets/primary/general/anim/3/1.png delete mode 100644 data/tilesets/primary/general/anim/3/2.png delete mode 100644 data/tilesets/primary/general/anim/3/3.png delete mode 100644 data/tilesets/primary/general/anim/4/0.png delete mode 100644 data/tilesets/primary/general/anim/4/1.png delete mode 100644 data/tilesets/primary/general/anim/4/2.png delete mode 100644 data/tilesets/primary/general/anim/4/3.png create mode 100644 data/tilesets/primary/general/anim/flower/0.png create mode 100644 data/tilesets/primary/general/anim/flower/1.png create mode 100644 data/tilesets/primary/general/anim/flower/2.png create mode 100644 data/tilesets/primary/general/anim/land_water_edge/0.png create mode 100644 data/tilesets/primary/general/anim/land_water_edge/1.png create mode 100644 data/tilesets/primary/general/anim/land_water_edge/2.png create mode 100644 data/tilesets/primary/general/anim/land_water_edge/3.png create mode 100644 data/tilesets/primary/general/anim/sand_water_edge/0.png create mode 100644 data/tilesets/primary/general/anim/sand_water_edge/1.png create mode 100644 data/tilesets/primary/general/anim/sand_water_edge/2.png create mode 100644 data/tilesets/primary/general/anim/sand_water_edge/3.png create mode 100644 data/tilesets/primary/general/anim/sand_water_edge/4.png create mode 100644 data/tilesets/primary/general/anim/sand_water_edge/5.png create mode 100644 data/tilesets/primary/general/anim/sand_water_edge/6.png create mode 100644 data/tilesets/primary/general/anim/water/0.png create mode 100644 data/tilesets/primary/general/anim/water/1.png create mode 100644 data/tilesets/primary/general/anim/water/2.png create mode 100644 data/tilesets/primary/general/anim/water/3.png create mode 100644 data/tilesets/primary/general/anim/water/4.png create mode 100644 data/tilesets/primary/general/anim/water/5.png create mode 100644 data/tilesets/primary/general/anim/water/6.png create mode 100644 data/tilesets/primary/general/anim/water/7.png create mode 100644 data/tilesets/primary/general/anim/waterfall/0.png create mode 100644 data/tilesets/primary/general/anim/waterfall/1.png create mode 100644 data/tilesets/primary/general/anim/waterfall/2.png create mode 100644 data/tilesets/primary/general/anim/waterfall/3.png delete mode 100644 data/tilesets/secondary/battle_frontier_outside_east/anim/0.png delete mode 100644 data/tilesets/secondary/battle_frontier_outside_east/anim/1.png delete mode 100644 data/tilesets/secondary/battle_frontier_outside_east/anim/2.png delete mode 100644 data/tilesets/secondary/battle_frontier_outside_east/anim/3.png create mode 100644 data/tilesets/secondary/battle_frontier_outside_east/anim/flag/0.png create mode 100644 data/tilesets/secondary/battle_frontier_outside_east/anim/flag/1.png create mode 100644 data/tilesets/secondary/battle_frontier_outside_east/anim/flag/2.png create mode 100644 data/tilesets/secondary/battle_frontier_outside_east/anim/flag/3.png delete mode 100644 data/tilesets/secondary/battle_frontier_outside_west/anim/0.png delete mode 100644 data/tilesets/secondary/battle_frontier_outside_west/anim/1.png delete mode 100644 data/tilesets/secondary/battle_frontier_outside_west/anim/2.png delete mode 100644 data/tilesets/secondary/battle_frontier_outside_west/anim/3.png create mode 100644 data/tilesets/secondary/battle_frontier_outside_west/anim/flag/0.png create mode 100644 data/tilesets/secondary/battle_frontier_outside_west/anim/flag/1.png create mode 100644 data/tilesets/secondary/battle_frontier_outside_west/anim/flag/2.png create mode 100644 data/tilesets/secondary/battle_frontier_outside_west/anim/flag/3.png delete mode 100644 data/tilesets/secondary/battle_pyramid/anim/0/0.png delete mode 100644 data/tilesets/secondary/battle_pyramid/anim/0/1.png delete mode 100644 data/tilesets/secondary/battle_pyramid/anim/0/2.png delete mode 100644 data/tilesets/secondary/battle_pyramid/anim/1/0.png delete mode 100644 data/tilesets/secondary/battle_pyramid/anim/1/1.png delete mode 100644 data/tilesets/secondary/battle_pyramid/anim/1/2.png create mode 100644 data/tilesets/secondary/battle_pyramid/anim/statue_shadow/0.png create mode 100644 data/tilesets/secondary/battle_pyramid/anim/statue_shadow/1.png create mode 100644 data/tilesets/secondary/battle_pyramid/anim/statue_shadow/2.png create mode 100644 data/tilesets/secondary/battle_pyramid/anim/torch/0.png create mode 100644 data/tilesets/secondary/battle_pyramid/anim/torch/1.png create mode 100644 data/tilesets/secondary/battle_pyramid/anim/torch/2.png delete mode 100644 data/tilesets/secondary/bike_shop/anim/0.png delete mode 100644 data/tilesets/secondary/bike_shop/anim/1.png create mode 100644 data/tilesets/secondary/bike_shop/anim/blinking_lights/0.png create mode 100644 data/tilesets/secondary/bike_shop/anim/blinking_lights/1.png delete mode 100644 data/tilesets/secondary/cave/anim/0.png delete mode 100644 data/tilesets/secondary/cave/anim/1.png delete mode 100644 data/tilesets/secondary/cave/anim/2.png delete mode 100644 data/tilesets/secondary/cave/anim/3.png create mode 100644 data/tilesets/secondary/cave/anim/lava/0.png create mode 100644 data/tilesets/secondary/cave/anim/lava/1.png create mode 100644 data/tilesets/secondary/cave/anim/lava/2.png create mode 100644 data/tilesets/secondary/cave/anim/lava/3.png create mode 100644 data/tilesets/secondary/cave/anim/lava/4.png create mode 100644 data/tilesets/secondary/cave/anim/lava/5.png create mode 100644 data/tilesets/secondary/cave/anim/lava/6.png create mode 100644 data/tilesets/secondary/cave/anim/lava/7.png delete mode 100644 data/tilesets/secondary/cave/anim/unused/0.png delete mode 100644 data/tilesets/secondary/cave/anim/unused/1.png delete mode 100644 data/tilesets/secondary/cave/anim/unused/2.png delete mode 100644 data/tilesets/secondary/cave/anim/unused/3.png delete mode 100644 data/tilesets/secondary/dewford/anim/0.png delete mode 100644 data/tilesets/secondary/dewford/anim/1.png delete mode 100644 data/tilesets/secondary/dewford/anim/2.png delete mode 100644 data/tilesets/secondary/dewford/anim/3.png create mode 100644 data/tilesets/secondary/dewford/anim/flag/0.png create mode 100644 data/tilesets/secondary/dewford/anim/flag/1.png create mode 100644 data/tilesets/secondary/dewford/anim/flag/2.png create mode 100644 data/tilesets/secondary/dewford/anim/flag/3.png delete mode 100644 data/tilesets/secondary/elite_four/anim/0/0.png delete mode 100644 data/tilesets/secondary/elite_four/anim/0/1.png delete mode 100644 data/tilesets/secondary/elite_four/anim/0/2.png delete mode 100644 data/tilesets/secondary/elite_four/anim/0/3.png delete mode 100644 data/tilesets/secondary/elite_four/anim/1/0.png delete mode 100644 data/tilesets/secondary/elite_four/anim/1/1.png create mode 100644 data/tilesets/secondary/elite_four/anim/floor_light/0.png create mode 100644 data/tilesets/secondary/elite_four/anim/floor_light/1.png create mode 100644 data/tilesets/secondary/elite_four/anim/wall_lights/0.png create mode 100644 data/tilesets/secondary/elite_four/anim/wall_lights/1.png create mode 100644 data/tilesets/secondary/elite_four/anim/wall_lights/2.png create mode 100644 data/tilesets/secondary/elite_four/anim/wall_lights/3.png delete mode 100644 data/tilesets/secondary/ever_grande/anim/0.png delete mode 100644 data/tilesets/secondary/ever_grande/anim/1.png delete mode 100644 data/tilesets/secondary/ever_grande/anim/2.png delete mode 100644 data/tilesets/secondary/ever_grande/anim/3.png delete mode 100644 data/tilesets/secondary/ever_grande/anim/4.png delete mode 100644 data/tilesets/secondary/ever_grande/anim/5.png delete mode 100644 data/tilesets/secondary/ever_grande/anim/6.png delete mode 100644 data/tilesets/secondary/ever_grande/anim/7.png create mode 100644 data/tilesets/secondary/ever_grande/anim/flowers/0.png create mode 100644 data/tilesets/secondary/ever_grande/anim/flowers/1.png create mode 100644 data/tilesets/secondary/ever_grande/anim/flowers/2.png create mode 100644 data/tilesets/secondary/ever_grande/anim/flowers/3.png create mode 100644 data/tilesets/secondary/ever_grande/anim/flowers/4.png create mode 100644 data/tilesets/secondary/ever_grande/anim/flowers/5.png create mode 100644 data/tilesets/secondary/ever_grande/anim/flowers/6.png create mode 100644 data/tilesets/secondary/ever_grande/anim/flowers/7.png delete mode 100644 data/tilesets/secondary/lavaridge/anim/0.png delete mode 100644 data/tilesets/secondary/lavaridge/anim/1.png delete mode 100644 data/tilesets/secondary/lavaridge/anim/2.png delete mode 100644 data/tilesets/secondary/lavaridge/anim/3.png create mode 100644 data/tilesets/secondary/lavaridge/anim/steam/0.png create mode 100644 data/tilesets/secondary/lavaridge/anim/steam/1.png create mode 100644 data/tilesets/secondary/lavaridge/anim/steam/2.png create mode 100644 data/tilesets/secondary/lavaridge/anim/steam/3.png delete mode 100644 data/tilesets/secondary/mauville/anim/0/a/0.png delete mode 100644 data/tilesets/secondary/mauville/anim/0/a/1.png delete mode 100644 data/tilesets/secondary/mauville/anim/0/a/2.png delete mode 100644 data/tilesets/secondary/mauville/anim/0/a/3.png delete mode 100644 data/tilesets/secondary/mauville/anim/0/b/0.png delete mode 100644 data/tilesets/secondary/mauville/anim/0/b/1.png delete mode 100644 data/tilesets/secondary/mauville/anim/0/b/2.png delete mode 100644 data/tilesets/secondary/mauville/anim/0/b/3.png delete mode 100644 data/tilesets/secondary/mauville/anim/1/a/1.png delete mode 100644 data/tilesets/secondary/mauville/anim/1/b/1.png create mode 100644 data/tilesets/secondary/mauville/anim/flower_1/0.png create mode 100644 data/tilesets/secondary/mauville/anim/flower_1/1.png create mode 100644 data/tilesets/secondary/mauville/anim/flower_1/2.png create mode 100644 data/tilesets/secondary/mauville/anim/flower_1/3.png create mode 100644 data/tilesets/secondary/mauville/anim/flower_1/4.png create mode 100644 data/tilesets/secondary/mauville/anim/flower_2/0.png create mode 100644 data/tilesets/secondary/mauville/anim/flower_2/1.png create mode 100644 data/tilesets/secondary/mauville/anim/flower_2/2.png create mode 100644 data/tilesets/secondary/mauville/anim/flower_2/3.png create mode 100644 data/tilesets/secondary/mauville/anim/flower_2/4.png delete mode 100644 data/tilesets/secondary/mauville_gym/anim/0.png delete mode 100644 data/tilesets/secondary/mauville_gym/anim/1.png create mode 100644 data/tilesets/secondary/mauville_gym/anim/electric_gates/0.png create mode 100644 data/tilesets/secondary/mauville_gym/anim/electric_gates/1.png delete mode 100644 data/tilesets/secondary/pacifidlog/anim/0/0.png delete mode 100644 data/tilesets/secondary/pacifidlog/anim/0/1.png delete mode 100644 data/tilesets/secondary/pacifidlog/anim/0/2.png delete mode 100644 data/tilesets/secondary/pacifidlog/anim/1/0.png delete mode 100644 data/tilesets/secondary/pacifidlog/anim/1/1.png delete mode 100644 data/tilesets/secondary/pacifidlog/anim/1/2.png delete mode 100644 data/tilesets/secondary/pacifidlog/anim/1/3.png delete mode 100644 data/tilesets/secondary/pacifidlog/anim/1/4.png delete mode 100644 data/tilesets/secondary/pacifidlog/anim/1/5.png delete mode 100644 data/tilesets/secondary/pacifidlog/anim/1/6.png delete mode 100644 data/tilesets/secondary/pacifidlog/anim/1/7.png create mode 100644 data/tilesets/secondary/pacifidlog/anim/log_bridges/0.png create mode 100644 data/tilesets/secondary/pacifidlog/anim/log_bridges/1.png create mode 100644 data/tilesets/secondary/pacifidlog/anim/log_bridges/2.png create mode 100644 data/tilesets/secondary/pacifidlog/anim/water_currents/0.png create mode 100644 data/tilesets/secondary/pacifidlog/anim/water_currents/1.png create mode 100644 data/tilesets/secondary/pacifidlog/anim/water_currents/2.png create mode 100644 data/tilesets/secondary/pacifidlog/anim/water_currents/3.png create mode 100644 data/tilesets/secondary/pacifidlog/anim/water_currents/4.png create mode 100644 data/tilesets/secondary/pacifidlog/anim/water_currents/5.png create mode 100644 data/tilesets/secondary/pacifidlog/anim/water_currents/6.png create mode 100644 data/tilesets/secondary/pacifidlog/anim/water_currents/7.png delete mode 100644 data/tilesets/secondary/rustboro/anim/0/0.png delete mode 100644 data/tilesets/secondary/rustboro/anim/0/1.png delete mode 100644 data/tilesets/secondary/rustboro/anim/0/2.png delete mode 100644 data/tilesets/secondary/rustboro/anim/0/3.png delete mode 100644 data/tilesets/secondary/rustboro/anim/0/4.png delete mode 100644 data/tilesets/secondary/rustboro/anim/0/5.png delete mode 100644 data/tilesets/secondary/rustboro/anim/0/6.png delete mode 100644 data/tilesets/secondary/rustboro/anim/0/7.png delete mode 100644 data/tilesets/secondary/rustboro/anim/1/0.png delete mode 100644 data/tilesets/secondary/rustboro/anim/1/1.png create mode 100644 data/tilesets/secondary/rustboro/anim/fountain/0.png create mode 100644 data/tilesets/secondary/rustboro/anim/fountain/1.png create mode 100644 data/tilesets/secondary/rustboro/anim/windy_water/0.png create mode 100644 data/tilesets/secondary/rustboro/anim/windy_water/1.png create mode 100644 data/tilesets/secondary/rustboro/anim/windy_water/2.png create mode 100644 data/tilesets/secondary/rustboro/anim/windy_water/3.png create mode 100644 data/tilesets/secondary/rustboro/anim/windy_water/4.png create mode 100644 data/tilesets/secondary/rustboro/anim/windy_water/5.png create mode 100644 data/tilesets/secondary/rustboro/anim/windy_water/6.png create mode 100644 data/tilesets/secondary/rustboro/anim/windy_water/7.png delete mode 100644 data/tilesets/secondary/slateport/anim/0.png delete mode 100644 data/tilesets/secondary/slateport/anim/1.png delete mode 100644 data/tilesets/secondary/slateport/anim/2.png delete mode 100644 data/tilesets/secondary/slateport/anim/3.png create mode 100644 data/tilesets/secondary/slateport/anim/balloons/0.png create mode 100644 data/tilesets/secondary/slateport/anim/balloons/1.png create mode 100644 data/tilesets/secondary/slateport/anim/balloons/2.png create mode 100644 data/tilesets/secondary/slateport/anim/balloons/3.png delete mode 100644 data/tilesets/secondary/sootopolis/anim/0.png delete mode 100644 data/tilesets/secondary/sootopolis/anim/1.png delete mode 100644 data/tilesets/secondary/sootopolis/anim/2.png delete mode 100644 data/tilesets/secondary/sootopolis/anim/3.png delete mode 100644 data/tilesets/secondary/sootopolis/anim/4.png delete mode 100644 data/tilesets/secondary/sootopolis/anim/5.png delete mode 100644 data/tilesets/secondary/sootopolis/anim/6.png delete mode 100644 data/tilesets/secondary/sootopolis/anim/7.png create mode 100644 data/tilesets/secondary/sootopolis/anim/stormy_water/0.png create mode 100644 data/tilesets/secondary/sootopolis/anim/stormy_water/1.png create mode 100644 data/tilesets/secondary/sootopolis/anim/stormy_water/2.png create mode 100644 data/tilesets/secondary/sootopolis/anim/stormy_water/3.png create mode 100644 data/tilesets/secondary/sootopolis/anim/stormy_water/4.png create mode 100644 data/tilesets/secondary/sootopolis/anim/stormy_water/5.png create mode 100644 data/tilesets/secondary/sootopolis/anim/stormy_water/6.png create mode 100644 data/tilesets/secondary/sootopolis/anim/stormy_water/7.png delete mode 100644 data/tilesets/secondary/sootopolis_gym/anim/0/0.png delete mode 100644 data/tilesets/secondary/sootopolis_gym/anim/0/1.png delete mode 100644 data/tilesets/secondary/sootopolis_gym/anim/0/2.png delete mode 100644 data/tilesets/secondary/sootopolis_gym/anim/1/0.png delete mode 100644 data/tilesets/secondary/sootopolis_gym/anim/1/1.png delete mode 100644 data/tilesets/secondary/sootopolis_gym/anim/1/2.png create mode 100644 data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/0.png create mode 100644 data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/1.png create mode 100644 data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/2.png create mode 100644 data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/0.png create mode 100644 data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/1.png create mode 100644 data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/2.png delete mode 100644 data/tilesets/secondary/underwater/anim/0.png delete mode 100644 data/tilesets/secondary/underwater/anim/1.png delete mode 100644 data/tilesets/secondary/underwater/anim/2.png delete mode 100644 data/tilesets/secondary/underwater/anim/3.png create mode 100644 data/tilesets/secondary/underwater/anim/seaweed/0.png create mode 100644 data/tilesets/secondary/underwater/anim/seaweed/1.png create mode 100644 data/tilesets/secondary/underwater/anim/seaweed/2.png create mode 100644 data/tilesets/secondary/underwater/anim/seaweed/3.png diff --git a/data/tilesets/headers.inc b/data/tilesets/headers.inc index 2083e17df..c56234b13 100644 --- a/data/tilesets/headers.inc +++ b/data/tilesets/headers.inc @@ -7,7 +7,7 @@ gTileset_General:: @ 83DF704 .4byte gTilesetPalettes_General .4byte gMetatiles_General .4byte gMetatileAttributes_General - .4byte TilesetCb_General + .4byte InitTilesetAnim_General .align 2 gTileset_Petalburg:: @ 83DF71C @@ -18,7 +18,7 @@ gTileset_Petalburg:: @ 83DF71C .4byte gTilesetPalettes_Petalburg .4byte gMetatiles_Petalburg .4byte gMetatileAttributes_Petalburg - .4byte TilesetCb_Petalburg + .4byte InitTilesetAnim_Petalburg .align 2 gTileset_Rustboro:: @ 83DF734 @@ -29,7 +29,7 @@ gTileset_Rustboro:: @ 83DF734 .4byte gTilesetPalettes_Rustboro .4byte gMetatiles_Rustboro .4byte gMetatileAttributes_Rustboro - .4byte TilesetCb_Rustboro + .4byte InitTilesetAnim_Rustboro .align 2 gTileset_Dewford:: @ 83DF74C @@ -40,7 +40,7 @@ gTileset_Dewford:: @ 83DF74C .4byte gTilesetPalettes_Dewford .4byte gMetatiles_Dewford .4byte gMetatileAttributes_Dewford - .4byte TilesetCb_Dewford + .4byte InitTilesetAnim_Dewford .align 2 gTileset_Slateport:: @ 83DF764 @@ -51,7 +51,7 @@ gTileset_Slateport:: @ 83DF764 .4byte gTilesetPalettes_Slateport .4byte gMetatiles_Slateport .4byte gMetatileAttributes_Slateport - .4byte TilesetCb_Slateport + .4byte InitTilesetAnim_Slateport .align 2 gTileset_Mauville:: @ 83DF77C @@ -62,7 +62,7 @@ gTileset_Mauville:: @ 83DF77C .4byte gTilesetPalettes_Mauville .4byte gMetatiles_Mauville .4byte gMetatileAttributes_Mauville - .4byte TilesetCb_Mauville + .4byte InitTilesetAnim_Mauville .align 2 gTileset_Lavaridge:: @ 83DF794 @@ -73,7 +73,7 @@ gTileset_Lavaridge:: @ 83DF794 .4byte gTilesetPalettes_Lavaridge .4byte gMetatiles_Lavaridge .4byte gMetatileAttributes_Lavaridge - .4byte TilesetCb_Lavaridge + .4byte InitTilesetAnim_Lavaridge .align 2 gTileset_Fallarbor:: @ 83DF7AC @@ -84,7 +84,7 @@ gTileset_Fallarbor:: @ 83DF7AC .4byte gTilesetPalettes_Fallarbor .4byte gMetatiles_Fallarbor .4byte gMetatileAttributes_Fallarbor - .4byte TilesetCb_Fallarbor + .4byte InitTilesetAnim_Fallarbor .align 2 gTileset_Fortree:: @ 83DF7C4 @@ -95,7 +95,7 @@ gTileset_Fortree:: @ 83DF7C4 .4byte gTilesetPalettes_Fortree .4byte gMetatiles_Fortree .4byte gMetatileAttributes_Fortree - .4byte TilesetCb_Fortree + .4byte InitTilesetAnim_Fortree .align 2 gTileset_Lilycove:: @ 83DF7DC @@ -106,7 +106,7 @@ gTileset_Lilycove:: @ 83DF7DC .4byte gTilesetPalettes_Lilycove .4byte gMetatiles_Lilycove .4byte gMetatileAttributes_Lilycove - .4byte TilesetCb_Lilycove + .4byte InitTilesetAnim_Lilycove .align 2 gTileset_Mossdeep:: @ 83DF7F4 @@ -117,7 +117,7 @@ gTileset_Mossdeep:: @ 83DF7F4 .4byte gTilesetPalettes_Mossdeep .4byte gMetatiles_Mossdeep .4byte gMetatileAttributes_Mossdeep - .4byte TilesetCb_Mossdeep + .4byte InitTilesetAnim_Mossdeep .align 2 gTileset_EverGrande:: @ 83DF80C @@ -128,7 +128,7 @@ gTileset_EverGrande:: @ 83DF80C .4byte gTilesetPalettes_EverGrande .4byte gMetatiles_EverGrande .4byte gMetatileAttributes_EverGrande - .4byte TilesetCb_EverGrande + .4byte InitTilesetAnim_EverGrande .align 2 gTileset_Pacifidlog:: @ 83DF824 @@ -139,7 +139,7 @@ gTileset_Pacifidlog:: @ 83DF824 .4byte gTilesetPalettes_Pacifidlog .4byte gMetatiles_Pacifidlog .4byte gMetatileAttributes_Pacifidlog - .4byte TilesetCb_Pacifidlog + .4byte InitTilesetAnim_Pacifidlog .align 2 gTileset_Sootopolis:: @ 83DF83C @@ -150,7 +150,7 @@ gTileset_Sootopolis:: @ 83DF83C .4byte gTilesetPalettes_Sootopolis .4byte gMetatiles_Sootopolis .4byte gMetatileAttributes_Sootopolis - .4byte TilesetCb_Sootopolis + .4byte InitTilesetAnim_Sootopolis .align 2 gTileset_BattleFrontierOutsideWest:: @ 83DF854 @@ -161,7 +161,7 @@ gTileset_BattleFrontierOutsideWest:: @ 83DF854 .4byte gTilesetPalettes_BattleFrontierOutsideWest .4byte gMetatiles_BattleFrontierOutsideWest .4byte gMetatileAttributes_BattleFrontierOutsideWest - .4byte TilesetCb_BattleFrontierOutsideWest + .4byte InitTilesetAnim_BattleFrontierOutsideWest .align 2 gTileset_BattleFrontierOutsideEast:: @ 83DF86C @@ -172,7 +172,7 @@ gTileset_BattleFrontierOutsideEast:: @ 83DF86C .4byte gTilesetPalettes_BattleFrontierOutsideEast .4byte gMetatiles_BattleFrontierOutsideEast .4byte gMetatileAttributes_BattleFrontierOutsideEast - .4byte TilesetCb_BattleFrontierOutsideEast + .4byte InitTilesetAnim_BattleFrontierOutsideEast .align 2 gTileset_Building:: @ 83DF884 @@ -183,7 +183,7 @@ gTileset_Building:: @ 83DF884 .4byte gTilesetPalettes_InsideBuilding .4byte gMetatiles_InsideBuilding .4byte gMetatileAttributes_InsideBuilding - .4byte TilesetCb_InsideBuilding + .4byte InitTilesetAnim_Building .align 2 gTileset_Shop:: @ 83DF89C @@ -216,7 +216,7 @@ gTileset_Cave:: @ 83DF8CC .4byte gTilesetPalettes_Cave .4byte gMetatiles_Cave .4byte gMetatileAttributes_Cave - .4byte TilesetCb_Cave + .4byte InitTilesetAnim_Cave .align 2 gTileset_PokemonSchool:: @ 83DF8E4 @@ -337,7 +337,7 @@ gTileset_BikeShop:: @ 83DF9D4 .4byte gTilesetPalettes_BikeShop .4byte gMetatiles_BikeShop .4byte gMetatileAttributes_BikeShop - .4byte TilesetCb_BikeShop + .4byte InitTilesetAnim_BikeShop .align 2 gTileset_RusturfTunnel:: @ 83DF9EC @@ -491,7 +491,7 @@ gTileset_Underwater:: @ 83DFB24 .4byte gTilesetPalettes_Underwater .4byte gMetatiles_Underwater .4byte gMetatileAttributes_Underwater - .4byte TilesetCb_Underwater + .4byte InitTilesetAnim_Underwater .align 2 gTileset_PetalburgGym:: @ 83DFB3C @@ -513,7 +513,7 @@ gTileset_SootopolisGym:: @ 83DFB54 .4byte gTilesetPalettes_SootopolisGym .4byte gMetatiles_SootopolisGym .4byte gMetatileAttributes_SootopolisGym - .4byte TilesetCb_SootopolisGym + .4byte InitTilesetAnim_SootopolisGym .align 2 gTileset_GenericBuilding:: @ 83DFB6C @@ -568,7 +568,7 @@ gTileset_MauvilleGym:: @ 83DFBCC .4byte gTilesetPalettes_MauvilleGym .4byte gMetatiles_MauvilleGym .4byte gMetatileAttributes_MauvilleGym - .4byte TilesetCb_MauvilleGym + .4byte InitTilesetAnim_MauvilleGym .align 2 gTileset_LavaridgeGym:: @ 83DFBE4 @@ -653,7 +653,7 @@ gTileset_EliteFour:: @ 83DFC7C .4byte gTilesetPalettes_EliteFour .4byte gMetatiles_EliteFour .4byte gMetatileAttributes_EliteFour - .4byte TilesetCb_EliteFour + .4byte InitTilesetAnim_EliteFour .align 2 gTileset_BattleFrontier:: @ 83DFC94 @@ -686,7 +686,7 @@ gTileset_BattleDome:: @ 83DFCC4 .4byte gTilesetPalettes_BattleDome .4byte gMetatiles_BattleDome .4byte gMetatileAttributes_BattleDome - .4byte TilesetCb_BattleDome + .4byte InitTilesetAnim_BattleDome .align 2 gTileset_BattleFactory:: @ 83DFCDC @@ -730,7 +730,7 @@ gTileset_BattlePyramid:: @ 83DFD24 .4byte gTilesetPalettes_BattlePyramid .4byte gMetatiles_BattlePyramid .4byte gMetatileAttributes_BattlePyramid - .4byte TilesetCb_BattlePyramid + .4byte InitTilesetAnim_BattlePyramid .align 2 gTileset_MirageTower:: @ 83DFD3C diff --git a/data/tilesets/primary/building/anim/0.png b/data/tilesets/primary/building/anim/0.png deleted file mode 100644 index 1d98f3621..000000000 Binary files a/data/tilesets/primary/building/anim/0.png and /dev/null differ diff --git a/data/tilesets/primary/building/anim/1.png b/data/tilesets/primary/building/anim/1.png deleted file mode 100644 index 6798473b7..000000000 Binary files a/data/tilesets/primary/building/anim/1.png and /dev/null differ diff --git a/data/tilesets/primary/building/anim/tv_turned_on/0.png b/data/tilesets/primary/building/anim/tv_turned_on/0.png new file mode 100644 index 000000000..1d98f3621 Binary files /dev/null and b/data/tilesets/primary/building/anim/tv_turned_on/0.png differ diff --git a/data/tilesets/primary/building/anim/tv_turned_on/1.png b/data/tilesets/primary/building/anim/tv_turned_on/1.png new file mode 100644 index 000000000..6798473b7 Binary files /dev/null and b/data/tilesets/primary/building/anim/tv_turned_on/1.png differ diff --git a/data/tilesets/primary/general/anim/0/0.png b/data/tilesets/primary/general/anim/0/0.png deleted file mode 100644 index 1254a7655..000000000 Binary files a/data/tilesets/primary/general/anim/0/0.png and /dev/null differ diff --git a/data/tilesets/primary/general/anim/0/1.png b/data/tilesets/primary/general/anim/0/1.png deleted file mode 100644 index 50bd949f2..000000000 Binary files a/data/tilesets/primary/general/anim/0/1.png and /dev/null differ diff --git a/data/tilesets/primary/general/anim/0/2.png b/data/tilesets/primary/general/anim/0/2.png deleted file mode 100644 index 5d8192c9d..000000000 Binary files a/data/tilesets/primary/general/anim/0/2.png and /dev/null differ diff --git a/data/tilesets/primary/general/anim/1/0.png b/data/tilesets/primary/general/anim/1/0.png deleted file mode 100644 index d3f2ea0da..000000000 Binary files a/data/tilesets/primary/general/anim/1/0.png and /dev/null differ diff --git a/data/tilesets/primary/general/anim/1/1.png b/data/tilesets/primary/general/anim/1/1.png deleted file mode 100644 index 86b0ff176..000000000 Binary files a/data/tilesets/primary/general/anim/1/1.png and /dev/null differ diff --git a/data/tilesets/primary/general/anim/1/2.png b/data/tilesets/primary/general/anim/1/2.png deleted file mode 100644 index d2302180e..000000000 Binary files a/data/tilesets/primary/general/anim/1/2.png and /dev/null differ diff --git a/data/tilesets/primary/general/anim/1/3.png b/data/tilesets/primary/general/anim/1/3.png deleted file mode 100644 index f757f8253..000000000 Binary files a/data/tilesets/primary/general/anim/1/3.png and /dev/null differ diff --git a/data/tilesets/primary/general/anim/1/4.png b/data/tilesets/primary/general/anim/1/4.png deleted file mode 100644 index 950b88585..000000000 Binary files a/data/tilesets/primary/general/anim/1/4.png and /dev/null differ diff --git a/data/tilesets/primary/general/anim/1/5.png b/data/tilesets/primary/general/anim/1/5.png deleted file mode 100644 index 4de7d4225..000000000 Binary files a/data/tilesets/primary/general/anim/1/5.png and /dev/null differ diff --git a/data/tilesets/primary/general/anim/1/6.png b/data/tilesets/primary/general/anim/1/6.png deleted file mode 100644 index 73c1cabdd..000000000 Binary files a/data/tilesets/primary/general/anim/1/6.png and /dev/null differ diff --git a/data/tilesets/primary/general/anim/1/7.png b/data/tilesets/primary/general/anim/1/7.png deleted file mode 100644 index 827fd8b74..000000000 Binary files a/data/tilesets/primary/general/anim/1/7.png and /dev/null differ diff --git a/data/tilesets/primary/general/anim/2/0.png b/data/tilesets/primary/general/anim/2/0.png deleted file mode 100644 index 80c99c473..000000000 Binary files a/data/tilesets/primary/general/anim/2/0.png and /dev/null differ diff --git a/data/tilesets/primary/general/anim/2/1.png b/data/tilesets/primary/general/anim/2/1.png deleted file mode 100644 index 52051f056..000000000 Binary files a/data/tilesets/primary/general/anim/2/1.png and /dev/null differ diff --git a/data/tilesets/primary/general/anim/2/2.png b/data/tilesets/primary/general/anim/2/2.png deleted file mode 100644 index 39c6e2f87..000000000 Binary files a/data/tilesets/primary/general/anim/2/2.png and /dev/null differ diff --git a/data/tilesets/primary/general/anim/2/3.png b/data/tilesets/primary/general/anim/2/3.png deleted file mode 100644 index abb5ff362..000000000 Binary files a/data/tilesets/primary/general/anim/2/3.png and /dev/null differ diff --git a/data/tilesets/primary/general/anim/2/4.png b/data/tilesets/primary/general/anim/2/4.png deleted file mode 100644 index a7bde9837..000000000 Binary files a/data/tilesets/primary/general/anim/2/4.png and /dev/null differ diff --git a/data/tilesets/primary/general/anim/2/5.png b/data/tilesets/primary/general/anim/2/5.png deleted file mode 100644 index 05f88d81e..000000000 Binary files a/data/tilesets/primary/general/anim/2/5.png and /dev/null differ diff --git a/data/tilesets/primary/general/anim/2/6.png b/data/tilesets/primary/general/anim/2/6.png deleted file mode 100644 index 01f9c203d..000000000 Binary files a/data/tilesets/primary/general/anim/2/6.png and /dev/null differ diff --git a/data/tilesets/primary/general/anim/3/0.png b/data/tilesets/primary/general/anim/3/0.png deleted file mode 100644 index e307d81aa..000000000 Binary files a/data/tilesets/primary/general/anim/3/0.png and /dev/null differ diff --git a/data/tilesets/primary/general/anim/3/1.png b/data/tilesets/primary/general/anim/3/1.png deleted file mode 100644 index df6aaf3bc..000000000 Binary files a/data/tilesets/primary/general/anim/3/1.png and /dev/null differ diff --git a/data/tilesets/primary/general/anim/3/2.png b/data/tilesets/primary/general/anim/3/2.png deleted file mode 100644 index 560f89d06..000000000 Binary files a/data/tilesets/primary/general/anim/3/2.png and /dev/null differ diff --git a/data/tilesets/primary/general/anim/3/3.png b/data/tilesets/primary/general/anim/3/3.png deleted file mode 100644 index a8db289ae..000000000 Binary files a/data/tilesets/primary/general/anim/3/3.png and /dev/null differ diff --git a/data/tilesets/primary/general/anim/4/0.png b/data/tilesets/primary/general/anim/4/0.png deleted file mode 100644 index ba160b633..000000000 Binary files a/data/tilesets/primary/general/anim/4/0.png and /dev/null differ diff --git a/data/tilesets/primary/general/anim/4/1.png b/data/tilesets/primary/general/anim/4/1.png deleted file mode 100644 index 48274c9a0..000000000 Binary files a/data/tilesets/primary/general/anim/4/1.png and /dev/null differ diff --git a/data/tilesets/primary/general/anim/4/2.png b/data/tilesets/primary/general/anim/4/2.png deleted file mode 100644 index 9e1f98c1b..000000000 Binary files a/data/tilesets/primary/general/anim/4/2.png and /dev/null differ diff --git a/data/tilesets/primary/general/anim/4/3.png b/data/tilesets/primary/general/anim/4/3.png deleted file mode 100644 index c5b446f65..000000000 Binary files a/data/tilesets/primary/general/anim/4/3.png and /dev/null differ diff --git a/data/tilesets/primary/general/anim/flower/0.png b/data/tilesets/primary/general/anim/flower/0.png new file mode 100644 index 000000000..1254a7655 Binary files /dev/null and b/data/tilesets/primary/general/anim/flower/0.png differ diff --git a/data/tilesets/primary/general/anim/flower/1.png b/data/tilesets/primary/general/anim/flower/1.png new file mode 100644 index 000000000..50bd949f2 Binary files /dev/null and b/data/tilesets/primary/general/anim/flower/1.png differ diff --git a/data/tilesets/primary/general/anim/flower/2.png b/data/tilesets/primary/general/anim/flower/2.png new file mode 100644 index 000000000..5d8192c9d Binary files /dev/null and b/data/tilesets/primary/general/anim/flower/2.png differ diff --git a/data/tilesets/primary/general/anim/land_water_edge/0.png b/data/tilesets/primary/general/anim/land_water_edge/0.png new file mode 100644 index 000000000..ba160b633 Binary files /dev/null and b/data/tilesets/primary/general/anim/land_water_edge/0.png differ diff --git a/data/tilesets/primary/general/anim/land_water_edge/1.png b/data/tilesets/primary/general/anim/land_water_edge/1.png new file mode 100644 index 000000000..48274c9a0 Binary files /dev/null and b/data/tilesets/primary/general/anim/land_water_edge/1.png differ diff --git a/data/tilesets/primary/general/anim/land_water_edge/2.png b/data/tilesets/primary/general/anim/land_water_edge/2.png new file mode 100644 index 000000000..9e1f98c1b Binary files /dev/null and b/data/tilesets/primary/general/anim/land_water_edge/2.png differ diff --git a/data/tilesets/primary/general/anim/land_water_edge/3.png b/data/tilesets/primary/general/anim/land_water_edge/3.png new file mode 100644 index 000000000..c5b446f65 Binary files /dev/null and b/data/tilesets/primary/general/anim/land_water_edge/3.png differ diff --git a/data/tilesets/primary/general/anim/sand_water_edge/0.png b/data/tilesets/primary/general/anim/sand_water_edge/0.png new file mode 100644 index 000000000..80c99c473 Binary files /dev/null and b/data/tilesets/primary/general/anim/sand_water_edge/0.png differ diff --git a/data/tilesets/primary/general/anim/sand_water_edge/1.png b/data/tilesets/primary/general/anim/sand_water_edge/1.png new file mode 100644 index 000000000..52051f056 Binary files /dev/null and b/data/tilesets/primary/general/anim/sand_water_edge/1.png differ diff --git a/data/tilesets/primary/general/anim/sand_water_edge/2.png b/data/tilesets/primary/general/anim/sand_water_edge/2.png new file mode 100644 index 000000000..39c6e2f87 Binary files /dev/null and b/data/tilesets/primary/general/anim/sand_water_edge/2.png differ diff --git a/data/tilesets/primary/general/anim/sand_water_edge/3.png b/data/tilesets/primary/general/anim/sand_water_edge/3.png new file mode 100644 index 000000000..abb5ff362 Binary files /dev/null and b/data/tilesets/primary/general/anim/sand_water_edge/3.png differ diff --git a/data/tilesets/primary/general/anim/sand_water_edge/4.png b/data/tilesets/primary/general/anim/sand_water_edge/4.png new file mode 100644 index 000000000..a7bde9837 Binary files /dev/null and b/data/tilesets/primary/general/anim/sand_water_edge/4.png differ diff --git a/data/tilesets/primary/general/anim/sand_water_edge/5.png b/data/tilesets/primary/general/anim/sand_water_edge/5.png new file mode 100644 index 000000000..05f88d81e Binary files /dev/null and b/data/tilesets/primary/general/anim/sand_water_edge/5.png differ diff --git a/data/tilesets/primary/general/anim/sand_water_edge/6.png b/data/tilesets/primary/general/anim/sand_water_edge/6.png new file mode 100644 index 000000000..01f9c203d Binary files /dev/null and b/data/tilesets/primary/general/anim/sand_water_edge/6.png differ diff --git a/data/tilesets/primary/general/anim/water/0.png b/data/tilesets/primary/general/anim/water/0.png new file mode 100644 index 000000000..d3f2ea0da Binary files /dev/null and b/data/tilesets/primary/general/anim/water/0.png differ diff --git a/data/tilesets/primary/general/anim/water/1.png b/data/tilesets/primary/general/anim/water/1.png new file mode 100644 index 000000000..86b0ff176 Binary files /dev/null and b/data/tilesets/primary/general/anim/water/1.png differ diff --git a/data/tilesets/primary/general/anim/water/2.png b/data/tilesets/primary/general/anim/water/2.png new file mode 100644 index 000000000..d2302180e Binary files /dev/null and b/data/tilesets/primary/general/anim/water/2.png differ diff --git a/data/tilesets/primary/general/anim/water/3.png b/data/tilesets/primary/general/anim/water/3.png new file mode 100644 index 000000000..f757f8253 Binary files /dev/null and b/data/tilesets/primary/general/anim/water/3.png differ diff --git a/data/tilesets/primary/general/anim/water/4.png b/data/tilesets/primary/general/anim/water/4.png new file mode 100644 index 000000000..950b88585 Binary files /dev/null and b/data/tilesets/primary/general/anim/water/4.png differ diff --git a/data/tilesets/primary/general/anim/water/5.png b/data/tilesets/primary/general/anim/water/5.png new file mode 100644 index 000000000..4de7d4225 Binary files /dev/null and b/data/tilesets/primary/general/anim/water/5.png differ diff --git a/data/tilesets/primary/general/anim/water/6.png b/data/tilesets/primary/general/anim/water/6.png new file mode 100644 index 000000000..73c1cabdd Binary files /dev/null and b/data/tilesets/primary/general/anim/water/6.png differ diff --git a/data/tilesets/primary/general/anim/water/7.png b/data/tilesets/primary/general/anim/water/7.png new file mode 100644 index 000000000..827fd8b74 Binary files /dev/null and b/data/tilesets/primary/general/anim/water/7.png differ diff --git a/data/tilesets/primary/general/anim/waterfall/0.png b/data/tilesets/primary/general/anim/waterfall/0.png new file mode 100644 index 000000000..e307d81aa Binary files /dev/null and b/data/tilesets/primary/general/anim/waterfall/0.png differ diff --git a/data/tilesets/primary/general/anim/waterfall/1.png b/data/tilesets/primary/general/anim/waterfall/1.png new file mode 100644 index 000000000..df6aaf3bc Binary files /dev/null and b/data/tilesets/primary/general/anim/waterfall/1.png differ diff --git a/data/tilesets/primary/general/anim/waterfall/2.png b/data/tilesets/primary/general/anim/waterfall/2.png new file mode 100644 index 000000000..560f89d06 Binary files /dev/null and b/data/tilesets/primary/general/anim/waterfall/2.png differ diff --git a/data/tilesets/primary/general/anim/waterfall/3.png b/data/tilesets/primary/general/anim/waterfall/3.png new file mode 100644 index 000000000..a8db289ae Binary files /dev/null and b/data/tilesets/primary/general/anim/waterfall/3.png differ diff --git a/data/tilesets/secondary/battle_frontier_outside_east/anim/0.png b/data/tilesets/secondary/battle_frontier_outside_east/anim/0.png deleted file mode 100644 index 98f1a9283..000000000 Binary files a/data/tilesets/secondary/battle_frontier_outside_east/anim/0.png and /dev/null differ diff --git a/data/tilesets/secondary/battle_frontier_outside_east/anim/1.png b/data/tilesets/secondary/battle_frontier_outside_east/anim/1.png deleted file mode 100644 index d0254e9ee..000000000 Binary files a/data/tilesets/secondary/battle_frontier_outside_east/anim/1.png and /dev/null differ diff --git a/data/tilesets/secondary/battle_frontier_outside_east/anim/2.png b/data/tilesets/secondary/battle_frontier_outside_east/anim/2.png deleted file mode 100644 index 1be9641b8..000000000 Binary files a/data/tilesets/secondary/battle_frontier_outside_east/anim/2.png and /dev/null differ diff --git a/data/tilesets/secondary/battle_frontier_outside_east/anim/3.png b/data/tilesets/secondary/battle_frontier_outside_east/anim/3.png deleted file mode 100644 index 7a536f24c..000000000 Binary files a/data/tilesets/secondary/battle_frontier_outside_east/anim/3.png and /dev/null differ 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 new file mode 100644 index 000000000..98f1a9283 Binary files /dev/null and b/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/0.png differ 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 new file mode 100644 index 000000000..d0254e9ee Binary files /dev/null and b/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/1.png differ 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 new file mode 100644 index 000000000..1be9641b8 Binary files /dev/null and b/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/2.png differ 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 new file mode 100644 index 000000000..7a536f24c Binary files /dev/null and b/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/3.png differ diff --git a/data/tilesets/secondary/battle_frontier_outside_west/anim/0.png b/data/tilesets/secondary/battle_frontier_outside_west/anim/0.png deleted file mode 100644 index 98f1a9283..000000000 Binary files a/data/tilesets/secondary/battle_frontier_outside_west/anim/0.png and /dev/null differ diff --git a/data/tilesets/secondary/battle_frontier_outside_west/anim/1.png b/data/tilesets/secondary/battle_frontier_outside_west/anim/1.png deleted file mode 100644 index d0254e9ee..000000000 Binary files a/data/tilesets/secondary/battle_frontier_outside_west/anim/1.png and /dev/null differ diff --git a/data/tilesets/secondary/battle_frontier_outside_west/anim/2.png b/data/tilesets/secondary/battle_frontier_outside_west/anim/2.png deleted file mode 100644 index 1be9641b8..000000000 Binary files a/data/tilesets/secondary/battle_frontier_outside_west/anim/2.png and /dev/null differ diff --git a/data/tilesets/secondary/battle_frontier_outside_west/anim/3.png b/data/tilesets/secondary/battle_frontier_outside_west/anim/3.png deleted file mode 100644 index 7a536f24c..000000000 Binary files a/data/tilesets/secondary/battle_frontier_outside_west/anim/3.png and /dev/null differ 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 new file mode 100644 index 000000000..98f1a9283 Binary files /dev/null and b/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/0.png differ 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 new file mode 100644 index 000000000..d0254e9ee Binary files /dev/null and b/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/1.png differ 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 new file mode 100644 index 000000000..1be9641b8 Binary files /dev/null and b/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/2.png differ 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 new file mode 100644 index 000000000..7a536f24c Binary files /dev/null and b/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/3.png differ diff --git a/data/tilesets/secondary/battle_pyramid/anim/0/0.png b/data/tilesets/secondary/battle_pyramid/anim/0/0.png deleted file mode 100644 index 04bb8ad84..000000000 Binary files a/data/tilesets/secondary/battle_pyramid/anim/0/0.png and /dev/null differ diff --git a/data/tilesets/secondary/battle_pyramid/anim/0/1.png b/data/tilesets/secondary/battle_pyramid/anim/0/1.png deleted file mode 100644 index e292686f9..000000000 Binary files a/data/tilesets/secondary/battle_pyramid/anim/0/1.png and /dev/null differ diff --git a/data/tilesets/secondary/battle_pyramid/anim/0/2.png b/data/tilesets/secondary/battle_pyramid/anim/0/2.png deleted file mode 100644 index fa24db001..000000000 Binary files a/data/tilesets/secondary/battle_pyramid/anim/0/2.png and /dev/null differ diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/0.png b/data/tilesets/secondary/battle_pyramid/anim/1/0.png deleted file mode 100644 index c135df824..000000000 Binary files a/data/tilesets/secondary/battle_pyramid/anim/1/0.png and /dev/null differ diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/1.png b/data/tilesets/secondary/battle_pyramid/anim/1/1.png deleted file mode 100644 index 2588bdac0..000000000 Binary files a/data/tilesets/secondary/battle_pyramid/anim/1/1.png and /dev/null differ diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/2.png b/data/tilesets/secondary/battle_pyramid/anim/1/2.png deleted file mode 100644 index fbbf67d2f..000000000 Binary files a/data/tilesets/secondary/battle_pyramid/anim/1/2.png and /dev/null differ diff --git a/data/tilesets/secondary/battle_pyramid/anim/statue_shadow/0.png b/data/tilesets/secondary/battle_pyramid/anim/statue_shadow/0.png new file mode 100644 index 000000000..c135df824 Binary files /dev/null and b/data/tilesets/secondary/battle_pyramid/anim/statue_shadow/0.png differ diff --git a/data/tilesets/secondary/battle_pyramid/anim/statue_shadow/1.png b/data/tilesets/secondary/battle_pyramid/anim/statue_shadow/1.png new file mode 100644 index 000000000..2588bdac0 Binary files /dev/null and b/data/tilesets/secondary/battle_pyramid/anim/statue_shadow/1.png differ diff --git a/data/tilesets/secondary/battle_pyramid/anim/statue_shadow/2.png b/data/tilesets/secondary/battle_pyramid/anim/statue_shadow/2.png new file mode 100644 index 000000000..fbbf67d2f Binary files /dev/null and b/data/tilesets/secondary/battle_pyramid/anim/statue_shadow/2.png differ diff --git a/data/tilesets/secondary/battle_pyramid/anim/torch/0.png b/data/tilesets/secondary/battle_pyramid/anim/torch/0.png new file mode 100644 index 000000000..04bb8ad84 Binary files /dev/null and b/data/tilesets/secondary/battle_pyramid/anim/torch/0.png differ diff --git a/data/tilesets/secondary/battle_pyramid/anim/torch/1.png b/data/tilesets/secondary/battle_pyramid/anim/torch/1.png new file mode 100644 index 000000000..e292686f9 Binary files /dev/null and b/data/tilesets/secondary/battle_pyramid/anim/torch/1.png differ diff --git a/data/tilesets/secondary/battle_pyramid/anim/torch/2.png b/data/tilesets/secondary/battle_pyramid/anim/torch/2.png new file mode 100644 index 000000000..fa24db001 Binary files /dev/null and b/data/tilesets/secondary/battle_pyramid/anim/torch/2.png differ diff --git a/data/tilesets/secondary/bike_shop/anim/0.png b/data/tilesets/secondary/bike_shop/anim/0.png deleted file mode 100644 index 127ed4e47..000000000 Binary files a/data/tilesets/secondary/bike_shop/anim/0.png and /dev/null differ diff --git a/data/tilesets/secondary/bike_shop/anim/1.png b/data/tilesets/secondary/bike_shop/anim/1.png deleted file mode 100644 index 71f12a746..000000000 Binary files a/data/tilesets/secondary/bike_shop/anim/1.png and /dev/null differ diff --git a/data/tilesets/secondary/bike_shop/anim/blinking_lights/0.png b/data/tilesets/secondary/bike_shop/anim/blinking_lights/0.png new file mode 100644 index 000000000..127ed4e47 Binary files /dev/null and b/data/tilesets/secondary/bike_shop/anim/blinking_lights/0.png differ diff --git a/data/tilesets/secondary/bike_shop/anim/blinking_lights/1.png b/data/tilesets/secondary/bike_shop/anim/blinking_lights/1.png new file mode 100644 index 000000000..71f12a746 Binary files /dev/null and b/data/tilesets/secondary/bike_shop/anim/blinking_lights/1.png differ diff --git a/data/tilesets/secondary/cave/anim/0.png b/data/tilesets/secondary/cave/anim/0.png deleted file mode 100644 index e98a161eb..000000000 Binary files a/data/tilesets/secondary/cave/anim/0.png and /dev/null differ diff --git a/data/tilesets/secondary/cave/anim/1.png b/data/tilesets/secondary/cave/anim/1.png deleted file mode 100644 index 12ffcd12c..000000000 Binary files a/data/tilesets/secondary/cave/anim/1.png and /dev/null differ diff --git a/data/tilesets/secondary/cave/anim/2.png b/data/tilesets/secondary/cave/anim/2.png deleted file mode 100644 index c5be89c00..000000000 Binary files a/data/tilesets/secondary/cave/anim/2.png and /dev/null differ diff --git a/data/tilesets/secondary/cave/anim/3.png b/data/tilesets/secondary/cave/anim/3.png deleted file mode 100644 index 635a81154..000000000 Binary files a/data/tilesets/secondary/cave/anim/3.png and /dev/null differ diff --git a/data/tilesets/secondary/cave/anim/lava/0.png b/data/tilesets/secondary/cave/anim/lava/0.png new file mode 100644 index 000000000..e98a161eb Binary files /dev/null and b/data/tilesets/secondary/cave/anim/lava/0.png differ diff --git a/data/tilesets/secondary/cave/anim/lava/1.png b/data/tilesets/secondary/cave/anim/lava/1.png new file mode 100644 index 000000000..12ffcd12c Binary files /dev/null and b/data/tilesets/secondary/cave/anim/lava/1.png differ diff --git a/data/tilesets/secondary/cave/anim/lava/2.png b/data/tilesets/secondary/cave/anim/lava/2.png new file mode 100644 index 000000000..c5be89c00 Binary files /dev/null and b/data/tilesets/secondary/cave/anim/lava/2.png differ diff --git a/data/tilesets/secondary/cave/anim/lava/3.png b/data/tilesets/secondary/cave/anim/lava/3.png new file mode 100644 index 000000000..635a81154 Binary files /dev/null and b/data/tilesets/secondary/cave/anim/lava/3.png differ diff --git a/data/tilesets/secondary/cave/anim/lava/4.png b/data/tilesets/secondary/cave/anim/lava/4.png new file mode 100644 index 000000000..cea6ece85 Binary files /dev/null and b/data/tilesets/secondary/cave/anim/lava/4.png differ diff --git a/data/tilesets/secondary/cave/anim/lava/5.png b/data/tilesets/secondary/cave/anim/lava/5.png new file mode 100644 index 000000000..01d8a300a Binary files /dev/null and b/data/tilesets/secondary/cave/anim/lava/5.png differ diff --git a/data/tilesets/secondary/cave/anim/lava/6.png b/data/tilesets/secondary/cave/anim/lava/6.png new file mode 100644 index 000000000..ba13bda8c Binary files /dev/null and b/data/tilesets/secondary/cave/anim/lava/6.png differ diff --git a/data/tilesets/secondary/cave/anim/lava/7.png b/data/tilesets/secondary/cave/anim/lava/7.png new file mode 100644 index 000000000..117f04aa4 Binary files /dev/null and b/data/tilesets/secondary/cave/anim/lava/7.png differ diff --git a/data/tilesets/secondary/cave/anim/unused/0.png b/data/tilesets/secondary/cave/anim/unused/0.png deleted file mode 100644 index cea6ece85..000000000 Binary files a/data/tilesets/secondary/cave/anim/unused/0.png and /dev/null differ diff --git a/data/tilesets/secondary/cave/anim/unused/1.png b/data/tilesets/secondary/cave/anim/unused/1.png deleted file mode 100644 index 01d8a300a..000000000 Binary files a/data/tilesets/secondary/cave/anim/unused/1.png and /dev/null differ diff --git a/data/tilesets/secondary/cave/anim/unused/2.png b/data/tilesets/secondary/cave/anim/unused/2.png deleted file mode 100644 index ba13bda8c..000000000 Binary files a/data/tilesets/secondary/cave/anim/unused/2.png and /dev/null differ diff --git a/data/tilesets/secondary/cave/anim/unused/3.png b/data/tilesets/secondary/cave/anim/unused/3.png deleted file mode 100644 index 117f04aa4..000000000 Binary files a/data/tilesets/secondary/cave/anim/unused/3.png and /dev/null differ diff --git a/data/tilesets/secondary/dewford/anim/0.png b/data/tilesets/secondary/dewford/anim/0.png deleted file mode 100644 index f80971c45..000000000 Binary files a/data/tilesets/secondary/dewford/anim/0.png and /dev/null differ diff --git a/data/tilesets/secondary/dewford/anim/1.png b/data/tilesets/secondary/dewford/anim/1.png deleted file mode 100644 index b98d9cafb..000000000 Binary files a/data/tilesets/secondary/dewford/anim/1.png and /dev/null differ diff --git a/data/tilesets/secondary/dewford/anim/2.png b/data/tilesets/secondary/dewford/anim/2.png deleted file mode 100644 index 6f88f493f..000000000 Binary files a/data/tilesets/secondary/dewford/anim/2.png and /dev/null differ diff --git a/data/tilesets/secondary/dewford/anim/3.png b/data/tilesets/secondary/dewford/anim/3.png deleted file mode 100644 index b95b4bc9e..000000000 Binary files a/data/tilesets/secondary/dewford/anim/3.png and /dev/null differ diff --git a/data/tilesets/secondary/dewford/anim/flag/0.png b/data/tilesets/secondary/dewford/anim/flag/0.png new file mode 100644 index 000000000..f80971c45 Binary files /dev/null and b/data/tilesets/secondary/dewford/anim/flag/0.png differ diff --git a/data/tilesets/secondary/dewford/anim/flag/1.png b/data/tilesets/secondary/dewford/anim/flag/1.png new file mode 100644 index 000000000..b98d9cafb Binary files /dev/null and b/data/tilesets/secondary/dewford/anim/flag/1.png differ diff --git a/data/tilesets/secondary/dewford/anim/flag/2.png b/data/tilesets/secondary/dewford/anim/flag/2.png new file mode 100644 index 000000000..6f88f493f Binary files /dev/null and b/data/tilesets/secondary/dewford/anim/flag/2.png differ diff --git a/data/tilesets/secondary/dewford/anim/flag/3.png b/data/tilesets/secondary/dewford/anim/flag/3.png new file mode 100644 index 000000000..b95b4bc9e Binary files /dev/null and b/data/tilesets/secondary/dewford/anim/flag/3.png differ diff --git a/data/tilesets/secondary/elite_four/anim/0/0.png b/data/tilesets/secondary/elite_four/anim/0/0.png deleted file mode 100644 index 108a2099b..000000000 Binary files a/data/tilesets/secondary/elite_four/anim/0/0.png and /dev/null differ diff --git a/data/tilesets/secondary/elite_four/anim/0/1.png b/data/tilesets/secondary/elite_four/anim/0/1.png deleted file mode 100644 index 64b23f061..000000000 Binary files a/data/tilesets/secondary/elite_four/anim/0/1.png and /dev/null differ diff --git a/data/tilesets/secondary/elite_four/anim/0/2.png b/data/tilesets/secondary/elite_four/anim/0/2.png deleted file mode 100644 index 0d9f603fc..000000000 Binary files a/data/tilesets/secondary/elite_four/anim/0/2.png and /dev/null differ diff --git a/data/tilesets/secondary/elite_four/anim/0/3.png b/data/tilesets/secondary/elite_four/anim/0/3.png deleted file mode 100644 index 64b23f061..000000000 Binary files a/data/tilesets/secondary/elite_four/anim/0/3.png and /dev/null differ diff --git a/data/tilesets/secondary/elite_four/anim/1/0.png b/data/tilesets/secondary/elite_four/anim/1/0.png deleted file mode 100644 index 6e508308b..000000000 Binary files a/data/tilesets/secondary/elite_four/anim/1/0.png and /dev/null differ diff --git a/data/tilesets/secondary/elite_four/anim/1/1.png b/data/tilesets/secondary/elite_four/anim/1/1.png deleted file mode 100644 index 794f26195..000000000 Binary files a/data/tilesets/secondary/elite_four/anim/1/1.png and /dev/null differ diff --git a/data/tilesets/secondary/elite_four/anim/floor_light/0.png b/data/tilesets/secondary/elite_four/anim/floor_light/0.png new file mode 100644 index 000000000..6e508308b Binary files /dev/null and b/data/tilesets/secondary/elite_four/anim/floor_light/0.png differ diff --git a/data/tilesets/secondary/elite_four/anim/floor_light/1.png b/data/tilesets/secondary/elite_four/anim/floor_light/1.png new file mode 100644 index 000000000..794f26195 Binary files /dev/null and b/data/tilesets/secondary/elite_four/anim/floor_light/1.png differ diff --git a/data/tilesets/secondary/elite_four/anim/wall_lights/0.png b/data/tilesets/secondary/elite_four/anim/wall_lights/0.png new file mode 100644 index 000000000..108a2099b Binary files /dev/null and b/data/tilesets/secondary/elite_four/anim/wall_lights/0.png differ diff --git a/data/tilesets/secondary/elite_four/anim/wall_lights/1.png b/data/tilesets/secondary/elite_four/anim/wall_lights/1.png new file mode 100644 index 000000000..64b23f061 Binary files /dev/null and b/data/tilesets/secondary/elite_four/anim/wall_lights/1.png differ diff --git a/data/tilesets/secondary/elite_four/anim/wall_lights/2.png b/data/tilesets/secondary/elite_four/anim/wall_lights/2.png new file mode 100644 index 000000000..0d9f603fc Binary files /dev/null and b/data/tilesets/secondary/elite_four/anim/wall_lights/2.png differ diff --git a/data/tilesets/secondary/elite_four/anim/wall_lights/3.png b/data/tilesets/secondary/elite_four/anim/wall_lights/3.png new file mode 100644 index 000000000..64b23f061 Binary files /dev/null and b/data/tilesets/secondary/elite_four/anim/wall_lights/3.png differ diff --git a/data/tilesets/secondary/ever_grande/anim/0.png b/data/tilesets/secondary/ever_grande/anim/0.png deleted file mode 100644 index ac03df40b..000000000 Binary files a/data/tilesets/secondary/ever_grande/anim/0.png and /dev/null differ diff --git a/data/tilesets/secondary/ever_grande/anim/1.png b/data/tilesets/secondary/ever_grande/anim/1.png deleted file mode 100644 index ac03df40b..000000000 Binary files a/data/tilesets/secondary/ever_grande/anim/1.png and /dev/null differ diff --git a/data/tilesets/secondary/ever_grande/anim/2.png b/data/tilesets/secondary/ever_grande/anim/2.png deleted file mode 100644 index 4f8baa2a3..000000000 Binary files a/data/tilesets/secondary/ever_grande/anim/2.png and /dev/null differ diff --git a/data/tilesets/secondary/ever_grande/anim/3.png b/data/tilesets/secondary/ever_grande/anim/3.png deleted file mode 100644 index f120dee16..000000000 Binary files a/data/tilesets/secondary/ever_grande/anim/3.png and /dev/null differ diff --git a/data/tilesets/secondary/ever_grande/anim/4.png b/data/tilesets/secondary/ever_grande/anim/4.png deleted file mode 100644 index ac03df40b..000000000 Binary files a/data/tilesets/secondary/ever_grande/anim/4.png and /dev/null differ diff --git a/data/tilesets/secondary/ever_grande/anim/5.png b/data/tilesets/secondary/ever_grande/anim/5.png deleted file mode 100644 index ac03df40b..000000000 Binary files a/data/tilesets/secondary/ever_grande/anim/5.png and /dev/null differ diff --git a/data/tilesets/secondary/ever_grande/anim/6.png b/data/tilesets/secondary/ever_grande/anim/6.png deleted file mode 100644 index d7cfd4529..000000000 Binary files a/data/tilesets/secondary/ever_grande/anim/6.png and /dev/null differ diff --git a/data/tilesets/secondary/ever_grande/anim/7.png b/data/tilesets/secondary/ever_grande/anim/7.png deleted file mode 100644 index d7cfd4529..000000000 Binary files a/data/tilesets/secondary/ever_grande/anim/7.png and /dev/null differ diff --git a/data/tilesets/secondary/ever_grande/anim/flowers/0.png b/data/tilesets/secondary/ever_grande/anim/flowers/0.png new file mode 100644 index 000000000..ac03df40b Binary files /dev/null and b/data/tilesets/secondary/ever_grande/anim/flowers/0.png differ diff --git a/data/tilesets/secondary/ever_grande/anim/flowers/1.png b/data/tilesets/secondary/ever_grande/anim/flowers/1.png new file mode 100644 index 000000000..ac03df40b Binary files /dev/null and b/data/tilesets/secondary/ever_grande/anim/flowers/1.png differ diff --git a/data/tilesets/secondary/ever_grande/anim/flowers/2.png b/data/tilesets/secondary/ever_grande/anim/flowers/2.png new file mode 100644 index 000000000..4f8baa2a3 Binary files /dev/null and b/data/tilesets/secondary/ever_grande/anim/flowers/2.png differ diff --git a/data/tilesets/secondary/ever_grande/anim/flowers/3.png b/data/tilesets/secondary/ever_grande/anim/flowers/3.png new file mode 100644 index 000000000..f120dee16 Binary files /dev/null and b/data/tilesets/secondary/ever_grande/anim/flowers/3.png differ diff --git a/data/tilesets/secondary/ever_grande/anim/flowers/4.png b/data/tilesets/secondary/ever_grande/anim/flowers/4.png new file mode 100644 index 000000000..ac03df40b Binary files /dev/null and b/data/tilesets/secondary/ever_grande/anim/flowers/4.png differ diff --git a/data/tilesets/secondary/ever_grande/anim/flowers/5.png b/data/tilesets/secondary/ever_grande/anim/flowers/5.png new file mode 100644 index 000000000..ac03df40b Binary files /dev/null and b/data/tilesets/secondary/ever_grande/anim/flowers/5.png differ diff --git a/data/tilesets/secondary/ever_grande/anim/flowers/6.png b/data/tilesets/secondary/ever_grande/anim/flowers/6.png new file mode 100644 index 000000000..d7cfd4529 Binary files /dev/null and b/data/tilesets/secondary/ever_grande/anim/flowers/6.png differ diff --git a/data/tilesets/secondary/ever_grande/anim/flowers/7.png b/data/tilesets/secondary/ever_grande/anim/flowers/7.png new file mode 100644 index 000000000..d7cfd4529 Binary files /dev/null and b/data/tilesets/secondary/ever_grande/anim/flowers/7.png differ diff --git a/data/tilesets/secondary/lavaridge/anim/0.png b/data/tilesets/secondary/lavaridge/anim/0.png deleted file mode 100644 index 434041fbd..000000000 Binary files a/data/tilesets/secondary/lavaridge/anim/0.png and /dev/null differ diff --git a/data/tilesets/secondary/lavaridge/anim/1.png b/data/tilesets/secondary/lavaridge/anim/1.png deleted file mode 100644 index ebc028ed4..000000000 Binary files a/data/tilesets/secondary/lavaridge/anim/1.png and /dev/null differ diff --git a/data/tilesets/secondary/lavaridge/anim/2.png b/data/tilesets/secondary/lavaridge/anim/2.png deleted file mode 100644 index aee227f05..000000000 Binary files a/data/tilesets/secondary/lavaridge/anim/2.png and /dev/null differ diff --git a/data/tilesets/secondary/lavaridge/anim/3.png b/data/tilesets/secondary/lavaridge/anim/3.png deleted file mode 100644 index 99149ae62..000000000 Binary files a/data/tilesets/secondary/lavaridge/anim/3.png and /dev/null differ diff --git a/data/tilesets/secondary/lavaridge/anim/steam/0.png b/data/tilesets/secondary/lavaridge/anim/steam/0.png new file mode 100644 index 000000000..434041fbd Binary files /dev/null and b/data/tilesets/secondary/lavaridge/anim/steam/0.png differ diff --git a/data/tilesets/secondary/lavaridge/anim/steam/1.png b/data/tilesets/secondary/lavaridge/anim/steam/1.png new file mode 100644 index 000000000..ebc028ed4 Binary files /dev/null and b/data/tilesets/secondary/lavaridge/anim/steam/1.png differ diff --git a/data/tilesets/secondary/lavaridge/anim/steam/2.png b/data/tilesets/secondary/lavaridge/anim/steam/2.png new file mode 100644 index 000000000..aee227f05 Binary files /dev/null and b/data/tilesets/secondary/lavaridge/anim/steam/2.png differ diff --git a/data/tilesets/secondary/lavaridge/anim/steam/3.png b/data/tilesets/secondary/lavaridge/anim/steam/3.png new file mode 100644 index 000000000..99149ae62 Binary files /dev/null and b/data/tilesets/secondary/lavaridge/anim/steam/3.png differ diff --git a/data/tilesets/secondary/mauville/anim/0/a/0.png b/data/tilesets/secondary/mauville/anim/0/a/0.png deleted file mode 100644 index b20c5470e..000000000 Binary files a/data/tilesets/secondary/mauville/anim/0/a/0.png and /dev/null differ diff --git a/data/tilesets/secondary/mauville/anim/0/a/1.png b/data/tilesets/secondary/mauville/anim/0/a/1.png deleted file mode 100644 index 0587295fc..000000000 Binary files a/data/tilesets/secondary/mauville/anim/0/a/1.png and /dev/null differ diff --git a/data/tilesets/secondary/mauville/anim/0/a/2.png b/data/tilesets/secondary/mauville/anim/0/a/2.png deleted file mode 100644 index af0dd4ffe..000000000 Binary files a/data/tilesets/secondary/mauville/anim/0/a/2.png and /dev/null differ diff --git a/data/tilesets/secondary/mauville/anim/0/a/3.png b/data/tilesets/secondary/mauville/anim/0/a/3.png deleted file mode 100644 index bc132f2ef..000000000 Binary files a/data/tilesets/secondary/mauville/anim/0/a/3.png and /dev/null differ diff --git a/data/tilesets/secondary/mauville/anim/0/b/0.png b/data/tilesets/secondary/mauville/anim/0/b/0.png deleted file mode 100644 index b20c5470e..000000000 Binary files a/data/tilesets/secondary/mauville/anim/0/b/0.png and /dev/null differ diff --git a/data/tilesets/secondary/mauville/anim/0/b/1.png b/data/tilesets/secondary/mauville/anim/0/b/1.png deleted file mode 100644 index 0587295fc..000000000 Binary files a/data/tilesets/secondary/mauville/anim/0/b/1.png and /dev/null differ diff --git a/data/tilesets/secondary/mauville/anim/0/b/2.png b/data/tilesets/secondary/mauville/anim/0/b/2.png deleted file mode 100644 index af0dd4ffe..000000000 Binary files a/data/tilesets/secondary/mauville/anim/0/b/2.png and /dev/null differ diff --git a/data/tilesets/secondary/mauville/anim/0/b/3.png b/data/tilesets/secondary/mauville/anim/0/b/3.png deleted file mode 100644 index bc132f2ef..000000000 Binary files a/data/tilesets/secondary/mauville/anim/0/b/3.png and /dev/null differ diff --git a/data/tilesets/secondary/mauville/anim/1/a/1.png b/data/tilesets/secondary/mauville/anim/1/a/1.png deleted file mode 100644 index 911b980a3..000000000 Binary files a/data/tilesets/secondary/mauville/anim/1/a/1.png and /dev/null differ diff --git a/data/tilesets/secondary/mauville/anim/1/b/1.png b/data/tilesets/secondary/mauville/anim/1/b/1.png deleted file mode 100644 index 911b980a3..000000000 Binary files a/data/tilesets/secondary/mauville/anim/1/b/1.png and /dev/null differ diff --git a/data/tilesets/secondary/mauville/anim/flower_1/0.png b/data/tilesets/secondary/mauville/anim/flower_1/0.png new file mode 100644 index 000000000..b20c5470e Binary files /dev/null and b/data/tilesets/secondary/mauville/anim/flower_1/0.png differ diff --git a/data/tilesets/secondary/mauville/anim/flower_1/1.png b/data/tilesets/secondary/mauville/anim/flower_1/1.png new file mode 100644 index 000000000..0587295fc Binary files /dev/null and b/data/tilesets/secondary/mauville/anim/flower_1/1.png differ diff --git a/data/tilesets/secondary/mauville/anim/flower_1/2.png b/data/tilesets/secondary/mauville/anim/flower_1/2.png new file mode 100644 index 000000000..af0dd4ffe Binary files /dev/null and b/data/tilesets/secondary/mauville/anim/flower_1/2.png differ diff --git a/data/tilesets/secondary/mauville/anim/flower_1/3.png b/data/tilesets/secondary/mauville/anim/flower_1/3.png new file mode 100644 index 000000000..bc132f2ef Binary files /dev/null and b/data/tilesets/secondary/mauville/anim/flower_1/3.png differ diff --git a/data/tilesets/secondary/mauville/anim/flower_1/4.png b/data/tilesets/secondary/mauville/anim/flower_1/4.png new file mode 100644 index 000000000..911b980a3 Binary files /dev/null and b/data/tilesets/secondary/mauville/anim/flower_1/4.png differ diff --git a/data/tilesets/secondary/mauville/anim/flower_2/0.png b/data/tilesets/secondary/mauville/anim/flower_2/0.png new file mode 100644 index 000000000..b20c5470e Binary files /dev/null and b/data/tilesets/secondary/mauville/anim/flower_2/0.png differ diff --git a/data/tilesets/secondary/mauville/anim/flower_2/1.png b/data/tilesets/secondary/mauville/anim/flower_2/1.png new file mode 100644 index 000000000..0587295fc Binary files /dev/null and b/data/tilesets/secondary/mauville/anim/flower_2/1.png differ diff --git a/data/tilesets/secondary/mauville/anim/flower_2/2.png b/data/tilesets/secondary/mauville/anim/flower_2/2.png new file mode 100644 index 000000000..af0dd4ffe Binary files /dev/null and b/data/tilesets/secondary/mauville/anim/flower_2/2.png differ diff --git a/data/tilesets/secondary/mauville/anim/flower_2/3.png b/data/tilesets/secondary/mauville/anim/flower_2/3.png new file mode 100644 index 000000000..bc132f2ef Binary files /dev/null and b/data/tilesets/secondary/mauville/anim/flower_2/3.png differ diff --git a/data/tilesets/secondary/mauville/anim/flower_2/4.png b/data/tilesets/secondary/mauville/anim/flower_2/4.png new file mode 100644 index 000000000..911b980a3 Binary files /dev/null and b/data/tilesets/secondary/mauville/anim/flower_2/4.png differ diff --git a/data/tilesets/secondary/mauville_gym/anim/0.png b/data/tilesets/secondary/mauville_gym/anim/0.png deleted file mode 100644 index ebf603978..000000000 Binary files a/data/tilesets/secondary/mauville_gym/anim/0.png and /dev/null differ diff --git a/data/tilesets/secondary/mauville_gym/anim/1.png b/data/tilesets/secondary/mauville_gym/anim/1.png deleted file mode 100644 index 34072707f..000000000 Binary files a/data/tilesets/secondary/mauville_gym/anim/1.png and /dev/null differ diff --git a/data/tilesets/secondary/mauville_gym/anim/electric_gates/0.png b/data/tilesets/secondary/mauville_gym/anim/electric_gates/0.png new file mode 100644 index 000000000..ebf603978 Binary files /dev/null and b/data/tilesets/secondary/mauville_gym/anim/electric_gates/0.png differ diff --git a/data/tilesets/secondary/mauville_gym/anim/electric_gates/1.png b/data/tilesets/secondary/mauville_gym/anim/electric_gates/1.png new file mode 100644 index 000000000..34072707f Binary files /dev/null and b/data/tilesets/secondary/mauville_gym/anim/electric_gates/1.png differ diff --git a/data/tilesets/secondary/pacifidlog/anim/0/0.png b/data/tilesets/secondary/pacifidlog/anim/0/0.png deleted file mode 100644 index 316eb500e..000000000 Binary files a/data/tilesets/secondary/pacifidlog/anim/0/0.png and /dev/null differ diff --git a/data/tilesets/secondary/pacifidlog/anim/0/1.png b/data/tilesets/secondary/pacifidlog/anim/0/1.png deleted file mode 100644 index ee9d4316e..000000000 Binary files a/data/tilesets/secondary/pacifidlog/anim/0/1.png and /dev/null differ diff --git a/data/tilesets/secondary/pacifidlog/anim/0/2.png b/data/tilesets/secondary/pacifidlog/anim/0/2.png deleted file mode 100644 index 221a71585..000000000 Binary files a/data/tilesets/secondary/pacifidlog/anim/0/2.png and /dev/null differ diff --git a/data/tilesets/secondary/pacifidlog/anim/1/0.png b/data/tilesets/secondary/pacifidlog/anim/1/0.png deleted file mode 100644 index 6d432eb25..000000000 Binary files a/data/tilesets/secondary/pacifidlog/anim/1/0.png and /dev/null differ diff --git a/data/tilesets/secondary/pacifidlog/anim/1/1.png b/data/tilesets/secondary/pacifidlog/anim/1/1.png deleted file mode 100644 index 7588b8a72..000000000 Binary files a/data/tilesets/secondary/pacifidlog/anim/1/1.png and /dev/null differ diff --git a/data/tilesets/secondary/pacifidlog/anim/1/2.png b/data/tilesets/secondary/pacifidlog/anim/1/2.png deleted file mode 100644 index 2a11e5065..000000000 Binary files a/data/tilesets/secondary/pacifidlog/anim/1/2.png and /dev/null differ diff --git a/data/tilesets/secondary/pacifidlog/anim/1/3.png b/data/tilesets/secondary/pacifidlog/anim/1/3.png deleted file mode 100644 index be4089ff4..000000000 Binary files a/data/tilesets/secondary/pacifidlog/anim/1/3.png and /dev/null differ diff --git a/data/tilesets/secondary/pacifidlog/anim/1/4.png b/data/tilesets/secondary/pacifidlog/anim/1/4.png deleted file mode 100644 index 4c16111de..000000000 Binary files a/data/tilesets/secondary/pacifidlog/anim/1/4.png and /dev/null differ diff --git a/data/tilesets/secondary/pacifidlog/anim/1/5.png b/data/tilesets/secondary/pacifidlog/anim/1/5.png deleted file mode 100644 index 93bbc6375..000000000 Binary files a/data/tilesets/secondary/pacifidlog/anim/1/5.png and /dev/null differ diff --git a/data/tilesets/secondary/pacifidlog/anim/1/6.png b/data/tilesets/secondary/pacifidlog/anim/1/6.png deleted file mode 100644 index b08f5a0d9..000000000 Binary files a/data/tilesets/secondary/pacifidlog/anim/1/6.png and /dev/null differ diff --git a/data/tilesets/secondary/pacifidlog/anim/1/7.png b/data/tilesets/secondary/pacifidlog/anim/1/7.png deleted file mode 100644 index 1a5f0ae5c..000000000 Binary files a/data/tilesets/secondary/pacifidlog/anim/1/7.png and /dev/null differ diff --git a/data/tilesets/secondary/pacifidlog/anim/log_bridges/0.png b/data/tilesets/secondary/pacifidlog/anim/log_bridges/0.png new file mode 100644 index 000000000..316eb500e Binary files /dev/null and b/data/tilesets/secondary/pacifidlog/anim/log_bridges/0.png differ diff --git a/data/tilesets/secondary/pacifidlog/anim/log_bridges/1.png b/data/tilesets/secondary/pacifidlog/anim/log_bridges/1.png new file mode 100644 index 000000000..ee9d4316e Binary files /dev/null and b/data/tilesets/secondary/pacifidlog/anim/log_bridges/1.png differ diff --git a/data/tilesets/secondary/pacifidlog/anim/log_bridges/2.png b/data/tilesets/secondary/pacifidlog/anim/log_bridges/2.png new file mode 100644 index 000000000..221a71585 Binary files /dev/null and b/data/tilesets/secondary/pacifidlog/anim/log_bridges/2.png differ diff --git a/data/tilesets/secondary/pacifidlog/anim/water_currents/0.png b/data/tilesets/secondary/pacifidlog/anim/water_currents/0.png new file mode 100644 index 000000000..6d432eb25 Binary files /dev/null and b/data/tilesets/secondary/pacifidlog/anim/water_currents/0.png differ diff --git a/data/tilesets/secondary/pacifidlog/anim/water_currents/1.png b/data/tilesets/secondary/pacifidlog/anim/water_currents/1.png new file mode 100644 index 000000000..7588b8a72 Binary files /dev/null and b/data/tilesets/secondary/pacifidlog/anim/water_currents/1.png differ diff --git a/data/tilesets/secondary/pacifidlog/anim/water_currents/2.png b/data/tilesets/secondary/pacifidlog/anim/water_currents/2.png new file mode 100644 index 000000000..2a11e5065 Binary files /dev/null and b/data/tilesets/secondary/pacifidlog/anim/water_currents/2.png differ diff --git a/data/tilesets/secondary/pacifidlog/anim/water_currents/3.png b/data/tilesets/secondary/pacifidlog/anim/water_currents/3.png new file mode 100644 index 000000000..be4089ff4 Binary files /dev/null and b/data/tilesets/secondary/pacifidlog/anim/water_currents/3.png differ diff --git a/data/tilesets/secondary/pacifidlog/anim/water_currents/4.png b/data/tilesets/secondary/pacifidlog/anim/water_currents/4.png new file mode 100644 index 000000000..4c16111de Binary files /dev/null and b/data/tilesets/secondary/pacifidlog/anim/water_currents/4.png differ diff --git a/data/tilesets/secondary/pacifidlog/anim/water_currents/5.png b/data/tilesets/secondary/pacifidlog/anim/water_currents/5.png new file mode 100644 index 000000000..93bbc6375 Binary files /dev/null and b/data/tilesets/secondary/pacifidlog/anim/water_currents/5.png differ diff --git a/data/tilesets/secondary/pacifidlog/anim/water_currents/6.png b/data/tilesets/secondary/pacifidlog/anim/water_currents/6.png new file mode 100644 index 000000000..b08f5a0d9 Binary files /dev/null and b/data/tilesets/secondary/pacifidlog/anim/water_currents/6.png differ diff --git a/data/tilesets/secondary/pacifidlog/anim/water_currents/7.png b/data/tilesets/secondary/pacifidlog/anim/water_currents/7.png new file mode 100644 index 000000000..1a5f0ae5c Binary files /dev/null and b/data/tilesets/secondary/pacifidlog/anim/water_currents/7.png differ diff --git a/data/tilesets/secondary/rustboro/anim/0/0.png b/data/tilesets/secondary/rustboro/anim/0/0.png deleted file mode 100644 index af00b97c7..000000000 Binary files a/data/tilesets/secondary/rustboro/anim/0/0.png and /dev/null differ diff --git a/data/tilesets/secondary/rustboro/anim/0/1.png b/data/tilesets/secondary/rustboro/anim/0/1.png deleted file mode 100644 index 20b1ef630..000000000 Binary files a/data/tilesets/secondary/rustboro/anim/0/1.png and /dev/null differ diff --git a/data/tilesets/secondary/rustboro/anim/0/2.png b/data/tilesets/secondary/rustboro/anim/0/2.png deleted file mode 100644 index 44c4b2cdc..000000000 Binary files a/data/tilesets/secondary/rustboro/anim/0/2.png and /dev/null differ diff --git a/data/tilesets/secondary/rustboro/anim/0/3.png b/data/tilesets/secondary/rustboro/anim/0/3.png deleted file mode 100644 index 44c4b2cdc..000000000 Binary files a/data/tilesets/secondary/rustboro/anim/0/3.png and /dev/null differ diff --git a/data/tilesets/secondary/rustboro/anim/0/4.png b/data/tilesets/secondary/rustboro/anim/0/4.png deleted file mode 100644 index 44c4b2cdc..000000000 Binary files a/data/tilesets/secondary/rustboro/anim/0/4.png and /dev/null differ diff --git a/data/tilesets/secondary/rustboro/anim/0/5.png b/data/tilesets/secondary/rustboro/anim/0/5.png deleted file mode 100644 index 44c4b2cdc..000000000 Binary files a/data/tilesets/secondary/rustboro/anim/0/5.png and /dev/null differ diff --git a/data/tilesets/secondary/rustboro/anim/0/6.png b/data/tilesets/secondary/rustboro/anim/0/6.png deleted file mode 100644 index 44c4b2cdc..000000000 Binary files a/data/tilesets/secondary/rustboro/anim/0/6.png and /dev/null differ diff --git a/data/tilesets/secondary/rustboro/anim/0/7.png b/data/tilesets/secondary/rustboro/anim/0/7.png deleted file mode 100644 index 44c4b2cdc..000000000 Binary files a/data/tilesets/secondary/rustboro/anim/0/7.png and /dev/null differ diff --git a/data/tilesets/secondary/rustboro/anim/1/0.png b/data/tilesets/secondary/rustboro/anim/1/0.png deleted file mode 100644 index 07471595b..000000000 Binary files a/data/tilesets/secondary/rustboro/anim/1/0.png and /dev/null differ diff --git a/data/tilesets/secondary/rustboro/anim/1/1.png b/data/tilesets/secondary/rustboro/anim/1/1.png deleted file mode 100644 index 408f2b03a..000000000 Binary files a/data/tilesets/secondary/rustboro/anim/1/1.png and /dev/null differ diff --git a/data/tilesets/secondary/rustboro/anim/fountain/0.png b/data/tilesets/secondary/rustboro/anim/fountain/0.png new file mode 100644 index 000000000..07471595b Binary files /dev/null and b/data/tilesets/secondary/rustboro/anim/fountain/0.png differ diff --git a/data/tilesets/secondary/rustboro/anim/fountain/1.png b/data/tilesets/secondary/rustboro/anim/fountain/1.png new file mode 100644 index 000000000..408f2b03a Binary files /dev/null and b/data/tilesets/secondary/rustboro/anim/fountain/1.png differ diff --git a/data/tilesets/secondary/rustboro/anim/windy_water/0.png b/data/tilesets/secondary/rustboro/anim/windy_water/0.png new file mode 100644 index 000000000..af00b97c7 Binary files /dev/null and b/data/tilesets/secondary/rustboro/anim/windy_water/0.png differ diff --git a/data/tilesets/secondary/rustboro/anim/windy_water/1.png b/data/tilesets/secondary/rustboro/anim/windy_water/1.png new file mode 100644 index 000000000..20b1ef630 Binary files /dev/null and b/data/tilesets/secondary/rustboro/anim/windy_water/1.png differ diff --git a/data/tilesets/secondary/rustboro/anim/windy_water/2.png b/data/tilesets/secondary/rustboro/anim/windy_water/2.png new file mode 100644 index 000000000..44c4b2cdc Binary files /dev/null and b/data/tilesets/secondary/rustboro/anim/windy_water/2.png differ diff --git a/data/tilesets/secondary/rustboro/anim/windy_water/3.png b/data/tilesets/secondary/rustboro/anim/windy_water/3.png new file mode 100644 index 000000000..44c4b2cdc Binary files /dev/null and b/data/tilesets/secondary/rustboro/anim/windy_water/3.png differ diff --git a/data/tilesets/secondary/rustboro/anim/windy_water/4.png b/data/tilesets/secondary/rustboro/anim/windy_water/4.png new file mode 100644 index 000000000..44c4b2cdc Binary files /dev/null and b/data/tilesets/secondary/rustboro/anim/windy_water/4.png differ diff --git a/data/tilesets/secondary/rustboro/anim/windy_water/5.png b/data/tilesets/secondary/rustboro/anim/windy_water/5.png new file mode 100644 index 000000000..44c4b2cdc Binary files /dev/null and b/data/tilesets/secondary/rustboro/anim/windy_water/5.png differ diff --git a/data/tilesets/secondary/rustboro/anim/windy_water/6.png b/data/tilesets/secondary/rustboro/anim/windy_water/6.png new file mode 100644 index 000000000..44c4b2cdc Binary files /dev/null and b/data/tilesets/secondary/rustboro/anim/windy_water/6.png differ diff --git a/data/tilesets/secondary/rustboro/anim/windy_water/7.png b/data/tilesets/secondary/rustboro/anim/windy_water/7.png new file mode 100644 index 000000000..44c4b2cdc Binary files /dev/null and b/data/tilesets/secondary/rustboro/anim/windy_water/7.png differ diff --git a/data/tilesets/secondary/slateport/anim/0.png b/data/tilesets/secondary/slateport/anim/0.png deleted file mode 100644 index 28bf60f26..000000000 Binary files a/data/tilesets/secondary/slateport/anim/0.png and /dev/null differ diff --git a/data/tilesets/secondary/slateport/anim/1.png b/data/tilesets/secondary/slateport/anim/1.png deleted file mode 100644 index 31d22f697..000000000 Binary files a/data/tilesets/secondary/slateport/anim/1.png and /dev/null differ diff --git a/data/tilesets/secondary/slateport/anim/2.png b/data/tilesets/secondary/slateport/anim/2.png deleted file mode 100644 index 83b0e3940..000000000 Binary files a/data/tilesets/secondary/slateport/anim/2.png and /dev/null differ diff --git a/data/tilesets/secondary/slateport/anim/3.png b/data/tilesets/secondary/slateport/anim/3.png deleted file mode 100644 index 31d22f697..000000000 Binary files a/data/tilesets/secondary/slateport/anim/3.png and /dev/null differ diff --git a/data/tilesets/secondary/slateport/anim/balloons/0.png b/data/tilesets/secondary/slateport/anim/balloons/0.png new file mode 100644 index 000000000..28bf60f26 Binary files /dev/null and b/data/tilesets/secondary/slateport/anim/balloons/0.png differ diff --git a/data/tilesets/secondary/slateport/anim/balloons/1.png b/data/tilesets/secondary/slateport/anim/balloons/1.png new file mode 100644 index 000000000..31d22f697 Binary files /dev/null and b/data/tilesets/secondary/slateport/anim/balloons/1.png differ diff --git a/data/tilesets/secondary/slateport/anim/balloons/2.png b/data/tilesets/secondary/slateport/anim/balloons/2.png new file mode 100644 index 000000000..83b0e3940 Binary files /dev/null and b/data/tilesets/secondary/slateport/anim/balloons/2.png differ diff --git a/data/tilesets/secondary/slateport/anim/balloons/3.png b/data/tilesets/secondary/slateport/anim/balloons/3.png new file mode 100644 index 000000000..31d22f697 Binary files /dev/null and b/data/tilesets/secondary/slateport/anim/balloons/3.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/0.png b/data/tilesets/secondary/sootopolis/anim/0.png deleted file mode 100644 index 6ae032652..000000000 Binary files a/data/tilesets/secondary/sootopolis/anim/0.png and /dev/null differ diff --git a/data/tilesets/secondary/sootopolis/anim/1.png b/data/tilesets/secondary/sootopolis/anim/1.png deleted file mode 100644 index 5bf8f7a98..000000000 Binary files a/data/tilesets/secondary/sootopolis/anim/1.png and /dev/null differ diff --git a/data/tilesets/secondary/sootopolis/anim/2.png b/data/tilesets/secondary/sootopolis/anim/2.png deleted file mode 100644 index 85598e145..000000000 Binary files a/data/tilesets/secondary/sootopolis/anim/2.png and /dev/null differ diff --git a/data/tilesets/secondary/sootopolis/anim/3.png b/data/tilesets/secondary/sootopolis/anim/3.png deleted file mode 100644 index c7aad10c7..000000000 Binary files a/data/tilesets/secondary/sootopolis/anim/3.png and /dev/null differ diff --git a/data/tilesets/secondary/sootopolis/anim/4.png b/data/tilesets/secondary/sootopolis/anim/4.png deleted file mode 100644 index ec446b9db..000000000 Binary files a/data/tilesets/secondary/sootopolis/anim/4.png and /dev/null differ diff --git a/data/tilesets/secondary/sootopolis/anim/5.png b/data/tilesets/secondary/sootopolis/anim/5.png deleted file mode 100644 index cbe1769c0..000000000 Binary files a/data/tilesets/secondary/sootopolis/anim/5.png and /dev/null differ diff --git a/data/tilesets/secondary/sootopolis/anim/6.png b/data/tilesets/secondary/sootopolis/anim/6.png deleted file mode 100644 index 690c5fd8e..000000000 Binary files a/data/tilesets/secondary/sootopolis/anim/6.png and /dev/null differ diff --git a/data/tilesets/secondary/sootopolis/anim/7.png b/data/tilesets/secondary/sootopolis/anim/7.png deleted file mode 100644 index e4026a02f..000000000 Binary files a/data/tilesets/secondary/sootopolis/anim/7.png and /dev/null differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/0.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/0.png new file mode 100644 index 000000000..6ae032652 Binary files /dev/null and b/data/tilesets/secondary/sootopolis/anim/stormy_water/0.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/1.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/1.png new file mode 100644 index 000000000..5bf8f7a98 Binary files /dev/null and b/data/tilesets/secondary/sootopolis/anim/stormy_water/1.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/2.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/2.png new file mode 100644 index 000000000..85598e145 Binary files /dev/null and b/data/tilesets/secondary/sootopolis/anim/stormy_water/2.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/3.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/3.png new file mode 100644 index 000000000..c7aad10c7 Binary files /dev/null and b/data/tilesets/secondary/sootopolis/anim/stormy_water/3.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/4.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/4.png new file mode 100644 index 000000000..ec446b9db Binary files /dev/null and b/data/tilesets/secondary/sootopolis/anim/stormy_water/4.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/5.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/5.png new file mode 100644 index 000000000..cbe1769c0 Binary files /dev/null and b/data/tilesets/secondary/sootopolis/anim/stormy_water/5.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/6.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/6.png new file mode 100644 index 000000000..690c5fd8e Binary files /dev/null and b/data/tilesets/secondary/sootopolis/anim/stormy_water/6.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/7.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/7.png new file mode 100644 index 000000000..e4026a02f Binary files /dev/null and b/data/tilesets/secondary/sootopolis/anim/stormy_water/7.png differ diff --git a/data/tilesets/secondary/sootopolis_gym/anim/0/0.png b/data/tilesets/secondary/sootopolis_gym/anim/0/0.png deleted file mode 100644 index 180b5522e..000000000 Binary files a/data/tilesets/secondary/sootopolis_gym/anim/0/0.png and /dev/null differ diff --git a/data/tilesets/secondary/sootopolis_gym/anim/0/1.png b/data/tilesets/secondary/sootopolis_gym/anim/0/1.png deleted file mode 100644 index af3ab12d2..000000000 Binary files a/data/tilesets/secondary/sootopolis_gym/anim/0/1.png and /dev/null differ diff --git a/data/tilesets/secondary/sootopolis_gym/anim/0/2.png b/data/tilesets/secondary/sootopolis_gym/anim/0/2.png deleted file mode 100644 index 8481c0cde..000000000 Binary files a/data/tilesets/secondary/sootopolis_gym/anim/0/2.png and /dev/null differ diff --git a/data/tilesets/secondary/sootopolis_gym/anim/1/0.png b/data/tilesets/secondary/sootopolis_gym/anim/1/0.png deleted file mode 100644 index dc6cf500e..000000000 Binary files a/data/tilesets/secondary/sootopolis_gym/anim/1/0.png and /dev/null differ diff --git a/data/tilesets/secondary/sootopolis_gym/anim/1/1.png b/data/tilesets/secondary/sootopolis_gym/anim/1/1.png deleted file mode 100644 index 93dd79753..000000000 Binary files a/data/tilesets/secondary/sootopolis_gym/anim/1/1.png and /dev/null differ diff --git a/data/tilesets/secondary/sootopolis_gym/anim/1/2.png b/data/tilesets/secondary/sootopolis_gym/anim/1/2.png deleted file mode 100644 index 30961482c..000000000 Binary files a/data/tilesets/secondary/sootopolis_gym/anim/1/2.png and /dev/null differ diff --git a/data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/0.png b/data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/0.png new file mode 100644 index 000000000..dc6cf500e Binary files /dev/null and b/data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/0.png differ diff --git a/data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/1.png b/data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/1.png new file mode 100644 index 000000000..93dd79753 Binary files /dev/null and b/data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/1.png differ diff --git a/data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/2.png b/data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/2.png new file mode 100644 index 000000000..30961482c Binary files /dev/null and b/data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/2.png differ diff --git a/data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/0.png b/data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/0.png new file mode 100644 index 000000000..180b5522e Binary files /dev/null and b/data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/0.png differ diff --git a/data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/1.png b/data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/1.png new file mode 100644 index 000000000..af3ab12d2 Binary files /dev/null and b/data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/1.png differ diff --git a/data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/2.png b/data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/2.png new file mode 100644 index 000000000..8481c0cde Binary files /dev/null and b/data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/2.png differ diff --git a/data/tilesets/secondary/underwater/anim/0.png b/data/tilesets/secondary/underwater/anim/0.png deleted file mode 100644 index fab28e54f..000000000 Binary files a/data/tilesets/secondary/underwater/anim/0.png and /dev/null differ diff --git a/data/tilesets/secondary/underwater/anim/1.png b/data/tilesets/secondary/underwater/anim/1.png deleted file mode 100644 index 869bc6060..000000000 Binary files a/data/tilesets/secondary/underwater/anim/1.png and /dev/null differ diff --git a/data/tilesets/secondary/underwater/anim/2.png b/data/tilesets/secondary/underwater/anim/2.png deleted file mode 100644 index 64e4b267d..000000000 Binary files a/data/tilesets/secondary/underwater/anim/2.png and /dev/null differ diff --git a/data/tilesets/secondary/underwater/anim/3.png b/data/tilesets/secondary/underwater/anim/3.png deleted file mode 100644 index 0c1392011..000000000 Binary files a/data/tilesets/secondary/underwater/anim/3.png and /dev/null differ diff --git a/data/tilesets/secondary/underwater/anim/seaweed/0.png b/data/tilesets/secondary/underwater/anim/seaweed/0.png new file mode 100644 index 000000000..fab28e54f Binary files /dev/null and b/data/tilesets/secondary/underwater/anim/seaweed/0.png differ diff --git a/data/tilesets/secondary/underwater/anim/seaweed/1.png b/data/tilesets/secondary/underwater/anim/seaweed/1.png new file mode 100644 index 000000000..869bc6060 Binary files /dev/null and b/data/tilesets/secondary/underwater/anim/seaweed/1.png differ diff --git a/data/tilesets/secondary/underwater/anim/seaweed/2.png b/data/tilesets/secondary/underwater/anim/seaweed/2.png new file mode 100644 index 000000000..64e4b267d Binary files /dev/null and b/data/tilesets/secondary/underwater/anim/seaweed/2.png differ diff --git a/data/tilesets/secondary/underwater/anim/seaweed/3.png b/data/tilesets/secondary/underwater/anim/seaweed/3.png new file mode 100644 index 000000000..0c1392011 Binary files /dev/null and b/data/tilesets/secondary/underwater/anim/seaweed/3.png differ diff --git a/include/graphics.h b/include/graphics.h index f86a04085..58a9666a6 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4104,6 +4104,10 @@ extern const u32 gUnknown_08D83B2C[]; extern const u32 gUnknown_08D83C3C[]; extern const u32 gUnknown_08D83900[]; extern const u32 gBattleFrontierGfx_DomeOptions[]; +extern const u16 gTilesetAnims_BattleDomePals0_0[]; +extern const u16 gTilesetAnims_BattleDomePals0_1[]; +extern const u16 gTilesetAnims_BattleDomePals0_2[]; +extern const u16 gTilesetAnims_BattleDomePals0_3[]; extern const u32 gBattleArenaJudgementSymbolsGfx[]; extern const u32 gBattleArenaJudgementSymbolsPalette[]; diff --git a/include/tileset_anims.h b/include/tileset_anims.h index 17d883cd2..0e515f044 100755 --- a/include/tileset_anims.h +++ b/include/tileset_anims.h @@ -1,9 +1,9 @@ #ifndef GUARD_TILESET_ANIMS_H #define GUARD_TILESET_ANIMS_H -void cur_mapheader_run_tileset_funcs_after_some_cpuset(void); -void sub_80A0A2C(void); -void sub_80A0A38(void); +void InitTilesetAnimations(void); +void InitSecondaryTilesetAnimation(void); +void UpdateTilesetAnimations(void); void TransferTilesetAnimsBuffer(void); #endif // GUARD_TILESET_ANIMS_H diff --git a/src/battle_dome.c b/src/battle_dome.c index f6327f31f..bfede1b28 100644 --- a/src/battle_dome.c +++ b/src/battle_dome.c @@ -126,7 +126,7 @@ static EWRAM_DATA struct BattleDomeStruct *sBattleDomeStruct = {0}; static EWRAM_DATA u8 *sTilemapBuffer = NULL; // Const rom data. -static const u8 sMovePointsForDomeTrainers[][DOME_TOURNAMENT_TRAINERS_COUNT] = +static const u8 sMovePointsForDomeTrainers[MOVES_COUNT][DOME_TOURNAMENT_TRAINERS_COUNT] = { [MOVE_NONE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, [MOVE_POUND] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, diff --git a/src/overworld.c b/src/overworld.c index 43610fe09..08fd94c1b 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -528,7 +528,7 @@ static void mapdata_load_assets_to_gpu_and_full_redraw(void) copy_map_tileset1_tileset2_to_vram(gMapHeader.mapLayout); apply_map_tileset1_tileset2_palette(gMapHeader.mapLayout); DrawWholeMapView(); - cur_mapheader_run_tileset_funcs_after_some_cpuset(); + InitTilesetAnimations(); } const struct MapLayout *GetMapLayout(void) @@ -808,7 +808,7 @@ void mliX_load_map(u8 mapGroup, u8 mapNum) for (paletteIndex = 6; paletteIndex < 13; paletteIndex++) ApplyWeatherGammaShiftToPal(paletteIndex); - sub_80A0A2C(); + InitSecondaryTilesetAnimation(); UpdateLocationHistoryForRoamer(); RoamerMove(); DoCurrentWeather(); @@ -1451,7 +1451,7 @@ static void OverworldBasic(void) UpdateCameraPanning(); BuildOamBuffer(); UpdatePaletteFade(); - sub_80A0A38(); + UpdateTilesetAnimations(); do_scheduled_bg_tilemap_copies_to_vram(); } @@ -1843,7 +1843,7 @@ static bool32 map_loading_iteration_3(u8 *state) (*state)++; break; case 10: - cur_mapheader_run_tileset_funcs_after_some_cpuset(); + InitTilesetAnimations(); (*state)++; break; case 11: @@ -1918,7 +1918,7 @@ static bool32 load_map_stuff(u8 *state, u32 a2) (*state)++; break; case 10: - cur_mapheader_run_tileset_funcs_after_some_cpuset(); + InitTilesetAnimations(); (*state)++; break; case 11: @@ -2015,7 +2015,7 @@ static bool32 map_loading_iteration_2_link(u8 *state) (*state)++; break; case 9: - cur_mapheader_run_tileset_funcs_after_some_cpuset(); + InitTilesetAnimations(); (*state)++; break; case 11: diff --git a/src/tileset_anims.c b/src/tileset_anims.c index f7c3cd482..087b75b7c 100644 --- a/src/tileset_anims.c +++ b/src/tileset_anims.c @@ -1,5 +1,5 @@ -// Includes #include "global.h" +#include "graphics.h" #include "palette.h" #include "util.h" #include "battle_transition.h" @@ -7,10 +7,6 @@ #include "battle_transition.h" #include "fieldmap.h" -// Static type declarations - -// Static RAM declarations - static EWRAM_DATA struct { const u16 *src; u16 *dest; @@ -18,211 +14,209 @@ static EWRAM_DATA struct { } sTilesetDMA3TransferBuffer[20] = {0}; static u8 sTilesetDMA3TransferBufferSize; -static u16 sPrimaryTilesetCBCounter; -static u16 sPrimaryTilesetCBBufferSize; -static u16 sSecondaryTilesetCBCounter; -static u16 sSecondaryTilesetCBBufferSize; -static void (*sPrimaryTilesetCB)(u16); -static void (*sSecondaryTilesetCB)(u16); - -// Static ROM declarations - -static void cur_mapheader_run_tileset1_func(void); -static void cur_mapheader_run_tileset2_func(void); - -// .rodata - - -const u16 gTilesetAnims_General0_Frame1[] = INCBIN_U16("data/tilesets/primary/general/anim/0/1.4bpp"); - -const u16 gTilesetAnims_General0_Frame0[] = INCBIN_U16("data/tilesets/primary/general/anim/0/0.4bpp"); - -const u16 gTilesetAnims_General0_Frame2[] = INCBIN_U16("data/tilesets/primary/general/anim/0/2.4bpp"); - +static u16 sPrimaryTilesetAnimCounter; +static u16 sPrimaryTilesetAnimCounterMax; +static u16 sSecondaryTilesetAnimCounter; +static u16 sSecondaryTilesetAnimCounterMax; +static void (*sPrimaryTilesetAnimCallback)(u16); +static void (*sSecondaryTilesetAnimCallback)(u16); + +static void _InitPrimaryTilesetAnimation(void); +static void _InitSecondaryTilesetAnimation(void); +static void TilesetAnim_General(u16); +static void TilesetAnim_Building(u16); +static void TilesetAnim_Rustboro(u16); +static void TilesetAnim_Dewford(u16); +static void TilesetAnim_Slateport(u16); +static void TilesetAnim_Mauville(u16); +static void TilesetAnim_Lavaridge(u16); +static void TilesetAnim_EverGrande(u16); +static void TilesetAnim_Pacifidlog(u16); +static void TilesetAnim_Sootopolis(u16); +static void TilesetAnim_BattleFrontierOutsideWest(u16); +static void TilesetAnim_BattleFrontierOutsideEast(u16); +static void TilesetAnim_Underwater(u16); +static void TilesetAnim_SootopolisGym(u16); +static void TilesetAnim_Cave(u16); +static void TilesetAnim_EliteFour(u16); +static void TilesetAnim_MauvilleGym(u16); +static void TilesetAnim_BikeShop(u16); +static void TilesetAnim_BattlePyramid(u16); +static void TilesetAnim_BattleDome(u16); +static void QueueAnimTiles_General_Flower(u16); +static void QueueAnimTiles_General_Water(u16); +static void QueueAnimTiles_General_SandWaterEdge(u16); +static void QueueAnimTiles_General_Waterfall(u16); +static void QueueAnimTiles_General_LandWaterEdge(u16); +static void QueueAnimTiles_Building_TVTurnedOn(u16); +static void QueueAnimTiles_Rustboro_WindyWater(u16, u8); +static void QueueAnimTiles_Rustboro_Fountain(u16); +static void QueueAnimTiles_Dewford_Flag(u16); +static void QueueAnimTiles_Slateport_Balloons(u16); +static void QueueAnimTiles_Mauville_Flowers(u16, u8); +static void QueueAnimTiles_BikeShop_BlinkingLights(u16); +static void QueueAnimTiles_BattlePyramid_Torch(u16); +static void QueueAnimTiles_BattlePyramid_StatueShadow(u16); +static void BlendAnimPalette_BattleDome_FloorLights(u16); +static void BlendAnimPalette_BattleDome_FloorLightsNoBlend(u16); +static void QueueAnimTiles_Lavaridge_Steam(u8); +static void QueueAnimTiles_Lavaridge_Lava(u16); +static void QueueAnimTiles_EverGrande_Flowers(u16, u8); +static void QueueAnimTiles_Pacifidlog_LogBridges(u8); +static void QueueAnimTiles_Pacifidlog_WaterCurrents(u8); +static void QueueAnimTiles_Sootopolis_StormyWater(u16); +static void QueueAnimTiles_Underwater_Seaweed(u8); +static void QueueAnimTiles_Cave_Lava(u16); +static void QueueAnimTiles_BattleFrontierOutsideWest_Flag(u16); +static void QueueAnimTiles_BattleFrontierOutsideEast_Flag(u16); +static void QueueAnimTiles_MauvilleGym_ElectricGates(u16); +static void QueueAnimTiles_SootopolisGym_Waterfalls(u16); +static void QueueAnimTiles_EliteFour_GroundLights(u16); +static void QueueAnimTiles_EliteFour_WallLights(u16); + +const u16 gTilesetAnims_General_Flower_Frame1[] = INCBIN_U16("data/tilesets/primary/general/anim/flower/1.4bpp"); +const u16 gTilesetAnims_General_Flower_Frame0[] = INCBIN_U16("data/tilesets/primary/general/anim/flower/0.4bpp"); +const u16 gTilesetAnims_General_Flower_Frame2[] = INCBIN_U16("data/tilesets/primary/general/anim/flower/2.4bpp"); const u16 tileset_anims_space_0[16] = {}; -const u16 *const gTilesetAnims_General0[] = { - gTilesetAnims_General0_Frame0, - gTilesetAnims_General0_Frame1, - gTilesetAnims_General0_Frame0, - gTilesetAnims_General0_Frame2 +const u16 *const gTilesetAnims_General_Flower[] = { + gTilesetAnims_General_Flower_Frame0, + gTilesetAnims_General_Flower_Frame1, + gTilesetAnims_General_Flower_Frame0, + gTilesetAnims_General_Flower_Frame2 }; -const u16 gTilesetAnims_General1_Frame0[] = INCBIN_U16("data/tilesets/primary/general/anim/1/0.4bpp"); - -const u16 gTilesetAnims_General1_Frame1[] = INCBIN_U16("data/tilesets/primary/general/anim/1/1.4bpp"); - -const u16 gTilesetAnims_General1_Frame2[] = INCBIN_U16("data/tilesets/primary/general/anim/1/2.4bpp"); - -const u16 gTilesetAnims_General1_Frame3[] = INCBIN_U16("data/tilesets/primary/general/anim/1/3.4bpp"); - -const u16 gTilesetAnims_General1_Frame4[] = INCBIN_U16("data/tilesets/primary/general/anim/1/4.4bpp"); - -const u16 gTilesetAnims_General1_Frame5[] = INCBIN_U16("data/tilesets/primary/general/anim/1/5.4bpp"); - -const u16 gTilesetAnims_General1_Frame6[] = INCBIN_U16("data/tilesets/primary/general/anim/1/6.4bpp"); - -const u16 gTilesetAnims_General1_Frame7[] = INCBIN_U16("data/tilesets/primary/general/anim/1/7.4bpp"); - -const u16 *const gTilesetAnims_General1[] = { - gTilesetAnims_General1_Frame0, - gTilesetAnims_General1_Frame1, - gTilesetAnims_General1_Frame2, - gTilesetAnims_General1_Frame3, - gTilesetAnims_General1_Frame4, - gTilesetAnims_General1_Frame5, - gTilesetAnims_General1_Frame6, - gTilesetAnims_General1_Frame7 +const u16 gTilesetAnims_General_Water_Frame0[] = INCBIN_U16("data/tilesets/primary/general/anim/water/0.4bpp"); +const u16 gTilesetAnims_General_Water_Frame1[] = INCBIN_U16("data/tilesets/primary/general/anim/water/1.4bpp"); +const u16 gTilesetAnims_General_Water_Frame2[] = INCBIN_U16("data/tilesets/primary/general/anim/water/2.4bpp"); +const u16 gTilesetAnims_General_Water_Frame3[] = INCBIN_U16("data/tilesets/primary/general/anim/water/3.4bpp"); +const u16 gTilesetAnims_General_Water_Frame4[] = INCBIN_U16("data/tilesets/primary/general/anim/water/4.4bpp"); +const u16 gTilesetAnims_General_Water_Frame5[] = INCBIN_U16("data/tilesets/primary/general/anim/water/5.4bpp"); +const u16 gTilesetAnims_General_Water_Frame6[] = INCBIN_U16("data/tilesets/primary/general/anim/water/6.4bpp"); +const u16 gTilesetAnims_General_Water_Frame7[] = INCBIN_U16("data/tilesets/primary/general/anim/water/7.4bpp"); + +const u16 *const gTilesetAnims_General_Water[] = { + gTilesetAnims_General_Water_Frame0, + gTilesetAnims_General_Water_Frame1, + gTilesetAnims_General_Water_Frame2, + gTilesetAnims_General_Water_Frame3, + gTilesetAnims_General_Water_Frame4, + gTilesetAnims_General_Water_Frame5, + gTilesetAnims_General_Water_Frame6, + gTilesetAnims_General_Water_Frame7 }; -const u16 gTilesetAnims_General2_Frame0[] = INCBIN_U16("data/tilesets/primary/general/anim/2/0.4bpp"); - -const u16 gTilesetAnims_General2_Frame1[] = INCBIN_U16("data/tilesets/primary/general/anim/2/1.4bpp"); - -const u16 gTilesetAnims_General2_Frame2[] = INCBIN_U16("data/tilesets/primary/general/anim/2/2.4bpp"); - -const u16 gTilesetAnims_General2_Frame3[] = INCBIN_U16("data/tilesets/primary/general/anim/2/3.4bpp"); - -const u16 gTilesetAnims_General2_Frame4[] = INCBIN_U16("data/tilesets/primary/general/anim/2/4.4bpp"); - -const u16 gTilesetAnims_General2_Frame5[] = INCBIN_U16("data/tilesets/primary/general/anim/2/5.4bpp"); - -const u16 gTilesetAnims_General2_Frame6[] = INCBIN_U16("data/tilesets/primary/general/anim/2/6.4bpp"); - -const u16 *const gTilesetAnims_General2[] = { - gTilesetAnims_General2_Frame0, - gTilesetAnims_General2_Frame1, - gTilesetAnims_General2_Frame2, - gTilesetAnims_General2_Frame3, - gTilesetAnims_General2_Frame4, - gTilesetAnims_General2_Frame5, - gTilesetAnims_General2_Frame6, - gTilesetAnims_General2_Frame0 +const u16 gTilesetAnims_General_SandWaterEdge_Frame0[] = INCBIN_U16("data/tilesets/primary/general/anim/sand_water_edge/0.4bpp"); +const u16 gTilesetAnims_General_SandWaterEdge_Frame1[] = INCBIN_U16("data/tilesets/primary/general/anim/sand_water_edge/1.4bpp"); +const u16 gTilesetAnims_General_SandWaterEdge_Frame2[] = INCBIN_U16("data/tilesets/primary/general/anim/sand_water_edge/2.4bpp"); +const u16 gTilesetAnims_General_SandWaterEdge_Frame3[] = INCBIN_U16("data/tilesets/primary/general/anim/sand_water_edge/3.4bpp"); +const u16 gTilesetAnims_General_SandWaterEdge_Frame4[] = INCBIN_U16("data/tilesets/primary/general/anim/sand_water_edge/4.4bpp"); +const u16 gTilesetAnims_General_SandWaterEdge_Frame5[] = INCBIN_U16("data/tilesets/primary/general/anim/sand_water_edge/5.4bpp"); +const u16 gTilesetAnims_General_SandWaterEdge_Frame6[] = INCBIN_U16("data/tilesets/primary/general/anim/sand_water_edge/6.4bpp"); + +const u16 *const gTilesetAnims_General_SandWaterEdge[] = { + gTilesetAnims_General_SandWaterEdge_Frame0, + gTilesetAnims_General_SandWaterEdge_Frame1, + gTilesetAnims_General_SandWaterEdge_Frame2, + gTilesetAnims_General_SandWaterEdge_Frame3, + gTilesetAnims_General_SandWaterEdge_Frame4, + gTilesetAnims_General_SandWaterEdge_Frame5, + gTilesetAnims_General_SandWaterEdge_Frame6, + gTilesetAnims_General_SandWaterEdge_Frame0 }; -const u16 gTilesetAnims_General3_Frame0[] = INCBIN_U16("data/tilesets/primary/general/anim/3/0.4bpp"); - -const u16 gTilesetAnims_General3_Frame1[] = INCBIN_U16("data/tilesets/primary/general/anim/3/1.4bpp"); +const u16 gTilesetAnims_General_Waterfall_Frame0[] = INCBIN_U16("data/tilesets/primary/general/anim/waterfall/0.4bpp"); +const u16 gTilesetAnims_General_Waterfall_Frame1[] = INCBIN_U16("data/tilesets/primary/general/anim/waterfall/1.4bpp"); +const u16 gTilesetAnims_General_Waterfall_Frame2[] = INCBIN_U16("data/tilesets/primary/general/anim/waterfall/2.4bpp"); +const u16 gTilesetAnims_General_Waterfall_Frame3[] = INCBIN_U16("data/tilesets/primary/general/anim/waterfall/3.4bpp"); -const u16 gTilesetAnims_General3_Frame2[] = INCBIN_U16("data/tilesets/primary/general/anim/3/2.4bpp"); - -const u16 gTilesetAnims_General3_Frame3[] = INCBIN_U16("data/tilesets/primary/general/anim/3/3.4bpp"); - -const u16 *const gTilesetAnims_General3[] = { - gTilesetAnims_General3_Frame0, - gTilesetAnims_General3_Frame1, - gTilesetAnims_General3_Frame2, - gTilesetAnims_General3_Frame3 +const u16 *const gTilesetAnims_General_Waterfall[] = { + gTilesetAnims_General_Waterfall_Frame0, + gTilesetAnims_General_Waterfall_Frame1, + gTilesetAnims_General_Waterfall_Frame2, + gTilesetAnims_General_Waterfall_Frame3 }; -const u16 gTilesetAnims_General4_Frame0[] = INCBIN_U16("data/tilesets/primary/general/anim/4/0.4bpp"); - -const u16 gTilesetAnims_General4_Frame1[] = INCBIN_U16("data/tilesets/primary/general/anim/4/1.4bpp"); - -const u16 gTilesetAnims_General4_Frame2[] = INCBIN_U16("data/tilesets/primary/general/anim/4/2.4bpp"); +const u16 gTilesetAnims_General_LandWaterEdge_Frame0[] = INCBIN_U16("data/tilesets/primary/general/anim/land_water_edge/0.4bpp"); +const u16 gTilesetAnims_General_LandWaterEdge_Frame1[] = INCBIN_U16("data/tilesets/primary/general/anim/land_water_edge/1.4bpp"); +const u16 gTilesetAnims_General_LandWaterEdge_Frame2[] = INCBIN_U16("data/tilesets/primary/general/anim/land_water_edge/2.4bpp"); +const u16 gTilesetAnims_General_LandWaterEdge_Frame3[] = INCBIN_U16("data/tilesets/primary/general/anim/land_water_edge/3.4bpp"); -const u16 gTilesetAnims_General4_Frame3[] = INCBIN_U16("data/tilesets/primary/general/anim/4/3.4bpp"); - -const u16 *const gTilesetAnims_General4[] = { - gTilesetAnims_General4_Frame0, - gTilesetAnims_General4_Frame1, - gTilesetAnims_General4_Frame2, - gTilesetAnims_General4_Frame3 +const u16 *const gTilesetAnims_General_LandWaterEdge[] = { + gTilesetAnims_General_LandWaterEdge_Frame0, + gTilesetAnims_General_LandWaterEdge_Frame1, + gTilesetAnims_General_LandWaterEdge_Frame2, + gTilesetAnims_General_LandWaterEdge_Frame3 }; -const u16 gTilesetAnims_Lavaridge0_Frame0[] = INCBIN_U16("data/tilesets/secondary/lavaridge/anim/0.4bpp"); - -const u16 gTilesetAnims_Lavaridge0_Frame1[] = INCBIN_U16("data/tilesets/secondary/lavaridge/anim/1.4bpp"); - -const u16 gTilesetAnims_Lavaridge0_Frame2[] = INCBIN_U16("data/tilesets/secondary/lavaridge/anim/2.4bpp"); +const u16 gTilesetAnims_Lavaridge_Steam_Frame0[] = INCBIN_U16("data/tilesets/secondary/lavaridge/anim/steam/0.4bpp"); +const u16 gTilesetAnims_Lavaridge_Steam_Frame1[] = INCBIN_U16("data/tilesets/secondary/lavaridge/anim/steam/1.4bpp"); +const u16 gTilesetAnims_Lavaridge_Steam_Frame2[] = INCBIN_U16("data/tilesets/secondary/lavaridge/anim/steam/2.4bpp"); +const u16 gTilesetAnims_Lavaridge_Steam_Frame3[] = INCBIN_U16("data/tilesets/secondary/lavaridge/anim/steam/3.4bpp"); -const u16 gTilesetAnims_Lavaridge0_Frame3[] = INCBIN_U16("data/tilesets/secondary/lavaridge/anim/3.4bpp"); - -const u16 *const gTilesetAnims_Lavaridge0[] = { - gTilesetAnims_Lavaridge0_Frame0, - gTilesetAnims_Lavaridge0_Frame1, - gTilesetAnims_Lavaridge0_Frame2, - gTilesetAnims_Lavaridge0_Frame3 +const u16 *const gTilesetAnims_Lavaridge_Steam[] = { + gTilesetAnims_Lavaridge_Steam_Frame0, + gTilesetAnims_Lavaridge_Steam_Frame1, + gTilesetAnims_Lavaridge_Steam_Frame2, + gTilesetAnims_Lavaridge_Steam_Frame3 }; -const u16 gTilesetAnims_Pacifidlog0_Frame0[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/0/0.4bpp"); - -const u16 gTilesetAnims_Pacifidlog0_Frame1[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/0/1.4bpp"); - -const u16 gTilesetAnims_Pacifidlog0_Frame2[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/0/2.4bpp"); +const u16 gTilesetAnims_Pacifidlog_LogBridges_Frame0[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/log_bridges/0.4bpp"); +const u16 gTilesetAnims_Pacifidlog_LogBridges_Frame1[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/log_bridges/1.4bpp"); +const u16 gTilesetAnims_Pacifidlog_LogBridges_Frame2[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/log_bridges/2.4bpp"); -const u16 *const gTilesetAnims_Pacifidlog0[] = { - gTilesetAnims_Pacifidlog0_Frame0, - gTilesetAnims_Pacifidlog0_Frame1, - gTilesetAnims_Pacifidlog0_Frame2, - gTilesetAnims_Pacifidlog0_Frame1 +const u16 *const gTilesetAnims_Pacifidlog_LogBridges[] = { + gTilesetAnims_Pacifidlog_LogBridges_Frame0, + gTilesetAnims_Pacifidlog_LogBridges_Frame1, + gTilesetAnims_Pacifidlog_LogBridges_Frame2, + gTilesetAnims_Pacifidlog_LogBridges_Frame1 }; -const u16 gTilesetAnims_Underwater0_Frame0[] = INCBIN_U16("data/tilesets/secondary/underwater/anim/0.4bpp"); - -const u16 gTilesetAnims_Underwater0_Frame1[] = INCBIN_U16("data/tilesets/secondary/underwater/anim/1.4bpp"); - -const u16 gTilesetAnims_Underwater0_Frame2[] = INCBIN_U16("data/tilesets/secondary/underwater/anim/2.4bpp"); - -const u16 gTilesetAnims_Underwater0_Frame3[] = INCBIN_U16("data/tilesets/secondary/underwater/anim/3.4bpp"); +const u16 gTilesetAnims_Underwater_Seaweed_Frame0[] = INCBIN_U16("data/tilesets/secondary/underwater/anim/seaweed/0.4bpp"); +const u16 gTilesetAnims_Underwater_Seaweed_Frame1[] = INCBIN_U16("data/tilesets/secondary/underwater/anim/seaweed/1.4bpp"); +const u16 gTilesetAnims_Underwater_Seaweed_Frame2[] = INCBIN_U16("data/tilesets/secondary/underwater/anim/seaweed/2.4bpp"); +const u16 gTilesetAnims_Underwater_Seaweed_Frame3[] = INCBIN_U16("data/tilesets/secondary/underwater/anim/seaweed/3.4bpp"); -const u16 *const gTilesetAnims_Underwater0[] = { - gTilesetAnims_Underwater0_Frame0, - gTilesetAnims_Underwater0_Frame1, - gTilesetAnims_Underwater0_Frame2, - gTilesetAnims_Underwater0_Frame3 +const u16 *const gTilesetAnims_Underwater_Seaweed[] = { + gTilesetAnims_Underwater_Seaweed_Frame0, + gTilesetAnims_Underwater_Seaweed_Frame1, + gTilesetAnims_Underwater_Seaweed_Frame2, + gTilesetAnims_Underwater_Seaweed_Frame3 }; -const u16 gTilesetAnims_Pacifidlog1_Frame0[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/1/0.4bpp"); - -const u16 gTilesetAnims_Pacifidlog1_Frame1[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/1/1.4bpp"); - -const u16 gTilesetAnims_Pacifidlog1_Frame2[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/1/2.4bpp"); - -const u16 gTilesetAnims_Pacifidlog1_Frame3[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/1/3.4bpp"); - -const u16 gTilesetAnims_Pacifidlog1_Frame4[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/1/4.4bpp"); - -const u16 gTilesetAnims_Pacifidlog1_Frame5[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/1/5.4bpp"); - -const u16 gTilesetAnims_Pacifidlog1_Frame6[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/1/6.4bpp"); - -const u16 gTilesetAnims_Pacifidlog1_Frame7[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/1/7.4bpp"); - -const u16 *const gTilesetAnims_Pacifidlog1[] = { - gTilesetAnims_Pacifidlog1_Frame0, - gTilesetAnims_Pacifidlog1_Frame1, - gTilesetAnims_Pacifidlog1_Frame2, - gTilesetAnims_Pacifidlog1_Frame3, - gTilesetAnims_Pacifidlog1_Frame4, - gTilesetAnims_Pacifidlog1_Frame5, - gTilesetAnims_Pacifidlog1_Frame6, - gTilesetAnims_Pacifidlog1_Frame7 +const u16 gTilesetAnims_Pacifidlog_WaterCurrents_Frame0[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/water_currents/0.4bpp"); +const u16 gTilesetAnims_Pacifidlog_WaterCurrents_Frame1[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/water_currents/1.4bpp"); +const u16 gTilesetAnims_Pacifidlog_WaterCurrents_Frame2[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/water_currents/2.4bpp"); +const u16 gTilesetAnims_Pacifidlog_WaterCurrents_Frame3[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/water_currents/3.4bpp"); +const u16 gTilesetAnims_Pacifidlog_WaterCurrents_Frame4[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/water_currents/4.4bpp"); +const u16 gTilesetAnims_Pacifidlog_WaterCurrents_Frame5[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/water_currents/5.4bpp"); +const u16 gTilesetAnims_Pacifidlog_WaterCurrents_Frame6[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/water_currents/6.4bpp"); +const u16 gTilesetAnims_Pacifidlog_WaterCurrents_Frame7[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/water_currents/7.4bpp"); + +const u16 *const gTilesetAnims_Pacifidlog_WaterCurrents[] = { + gTilesetAnims_Pacifidlog_WaterCurrents_Frame0, + gTilesetAnims_Pacifidlog_WaterCurrents_Frame1, + gTilesetAnims_Pacifidlog_WaterCurrents_Frame2, + gTilesetAnims_Pacifidlog_WaterCurrents_Frame3, + gTilesetAnims_Pacifidlog_WaterCurrents_Frame4, + gTilesetAnims_Pacifidlog_WaterCurrents_Frame5, + gTilesetAnims_Pacifidlog_WaterCurrents_Frame6, + gTilesetAnims_Pacifidlog_WaterCurrents_Frame7 }; -const u16 gTilesetAnims_Mauville0a_Frame0[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/0/a/0.4bpp"); - -const u16 gTilesetAnims_Mauville0a_Frame1[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/0/a/1.4bpp"); - -const u16 gTilesetAnims_Mauville0a_Frame2[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/0/a/2.4bpp"); - -const u16 gTilesetAnims_Mauville0a_Frame3[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/0/a/3.4bpp"); - -const u16 gTilesetAnims_Mauville1a_Frame1[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/1/a/1.4bpp"); - -const u16 gTilesetAnims_Mauville0b_Frame0[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/0/b/0.4bpp"); - -const u16 gTilesetAnims_Mauville0b_Frame1[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/0/b/1.4bpp"); - -const u16 gTilesetAnims_Mauville0b_Frame2[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/0/b/2.4bpp"); - -const u16 gTilesetAnims_Mauville0b_Frame3[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/0/b/3.4bpp"); - -const u16 gTilesetAnims_Mauville1b_Frame1[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/1/b/1.4bpp"); - +const u16 gTilesetAnims_Mauville_Flower1_Frame0[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/flower_1/0.4bpp"); +const u16 gTilesetAnims_Mauville_Flower1_Frame1[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/flower_1/1.4bpp"); +const u16 gTilesetAnims_Mauville_Flower1_Frame2[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/flower_1/2.4bpp"); +const u16 gTilesetAnims_Mauville_Flower1_Frame3[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/flower_1/3.4bpp"); +const u16 gTilesetAnims_Mauville_Flower1_Frame4[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/flower_1/4.4bpp"); +const u16 gTilesetAnims_Mauville_Flower2_Frame0[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/flower_2/0.4bpp"); +const u16 gTilesetAnims_Mauville_Flower2_Frame1[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/flower_2/1.4bpp"); +const u16 gTilesetAnims_Mauville_Flower2_Frame2[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/flower_2/2.4bpp"); +const u16 gTilesetAnims_Mauville_Flower2_Frame3[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/flower_2/3.4bpp"); +const u16 gTilesetAnims_Mauville_Flower2_Frame4[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/flower_2/4.4bpp"); const u16 tileset_anims_space_1[16] = {}; -u16 *const gTilesetAnims_MauvilleVDests0[] = { +u16 *const gTilesetAnims_Mauville_Flower1_VDests[] = { (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 96)), (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 100)), (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 104)), @@ -233,7 +227,7 @@ u16 *const gTilesetAnims_MauvilleVDests0[] = { (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 124)) }; -u16 *const gTilesetAnims_MauvilleVDests1[] = { +u16 *const gTilesetAnims_Mauville_Flower2_VDests[] = { (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 128)), (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 132)), (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 136)), @@ -244,67 +238,60 @@ u16 *const gTilesetAnims_MauvilleVDests1[] = { (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 156)) }; -const u16 *const gTilesetAnims_Mauville0a[] = { - gTilesetAnims_Mauville0a_Frame0, - gTilesetAnims_Mauville0a_Frame0, - gTilesetAnims_Mauville0a_Frame1, - gTilesetAnims_Mauville0a_Frame2, - gTilesetAnims_Mauville0a_Frame3, - gTilesetAnims_Mauville0a_Frame3, - gTilesetAnims_Mauville0a_Frame3, - gTilesetAnims_Mauville0a_Frame3, - gTilesetAnims_Mauville0a_Frame3, - gTilesetAnims_Mauville0a_Frame3, - gTilesetAnims_Mauville0a_Frame2, - gTilesetAnims_Mauville0a_Frame1 +const u16 *const gTilesetAnims_Mauville_Flower1[] = { + gTilesetAnims_Mauville_Flower1_Frame0, + gTilesetAnims_Mauville_Flower1_Frame0, + gTilesetAnims_Mauville_Flower1_Frame1, + gTilesetAnims_Mauville_Flower1_Frame2, + gTilesetAnims_Mauville_Flower1_Frame3, + gTilesetAnims_Mauville_Flower1_Frame3, + gTilesetAnims_Mauville_Flower1_Frame3, + gTilesetAnims_Mauville_Flower1_Frame3, + gTilesetAnims_Mauville_Flower1_Frame3, + gTilesetAnims_Mauville_Flower1_Frame3, + gTilesetAnims_Mauville_Flower1_Frame2, + gTilesetAnims_Mauville_Flower1_Frame1 }; -const u16 *const gTilesetAnims_Mauville0b[] = { - gTilesetAnims_Mauville0b_Frame0, - gTilesetAnims_Mauville0b_Frame0, - gTilesetAnims_Mauville0b_Frame1, - gTilesetAnims_Mauville0b_Frame2, - gTilesetAnims_Mauville0b_Frame3, - gTilesetAnims_Mauville0b_Frame3, - gTilesetAnims_Mauville0b_Frame3, - gTilesetAnims_Mauville0b_Frame3, - gTilesetAnims_Mauville0b_Frame3, - gTilesetAnims_Mauville0b_Frame3, - gTilesetAnims_Mauville0b_Frame2, - gTilesetAnims_Mauville0b_Frame1 +const u16 *const gTilesetAnims_Mauville_Flower2[] = { + gTilesetAnims_Mauville_Flower2_Frame0, + gTilesetAnims_Mauville_Flower2_Frame0, + gTilesetAnims_Mauville_Flower2_Frame1, + gTilesetAnims_Mauville_Flower2_Frame2, + gTilesetAnims_Mauville_Flower2_Frame3, + gTilesetAnims_Mauville_Flower2_Frame3, + gTilesetAnims_Mauville_Flower2_Frame3, + gTilesetAnims_Mauville_Flower2_Frame3, + gTilesetAnims_Mauville_Flower2_Frame3, + gTilesetAnims_Mauville_Flower2_Frame3, + gTilesetAnims_Mauville_Flower2_Frame2, + gTilesetAnims_Mauville_Flower2_Frame1 }; -const u16 *const gTilesetAnims_Mauville1a[] = { - gTilesetAnims_Mauville0a_Frame0, - gTilesetAnims_Mauville0a_Frame0, - gTilesetAnims_Mauville1a_Frame1, - gTilesetAnims_Mauville1a_Frame1 +const u16 *const gTilesetAnims_Mauville_Flower1_B[] = { + gTilesetAnims_Mauville_Flower1_Frame0, + gTilesetAnims_Mauville_Flower1_Frame0, + gTilesetAnims_Mauville_Flower1_Frame4, + gTilesetAnims_Mauville_Flower1_Frame4 }; -const u16 *const gTilesetAnims_Mauville1b[] = { - gTilesetAnims_Mauville0b_Frame0, - gTilesetAnims_Mauville0b_Frame0, - gTilesetAnims_Mauville1b_Frame1, - gTilesetAnims_Mauville1b_Frame1 +const u16 *const gTilesetAnims_Mauville_Flower2_B[] = { + gTilesetAnims_Mauville_Flower2_Frame0, + gTilesetAnims_Mauville_Flower2_Frame0, + gTilesetAnims_Mauville_Flower2_Frame4, + gTilesetAnims_Mauville_Flower2_Frame4 }; -const u16 gTilesetAnims_Rustboro0_Frame0[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/0/0.4bpp"); - -const u16 gTilesetAnims_Rustboro0_Frame1[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/0/1.4bpp"); - -const u16 gTilesetAnims_Rustboro0_Frame2[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/0/2.4bpp"); - -const u16 gTilesetAnims_Rustboro0_Frame3[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/0/3.4bpp"); - -const u16 gTilesetAnims_Rustboro0_Frame4[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/0/4.4bpp"); - -const u16 gTilesetAnims_Rustboro0_Frame5[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/0/5.4bpp"); - -const u16 gTilesetAnims_Rustboro0_Frame6[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/0/6.4bpp"); - -const u16 gTilesetAnims_Rustboro0_Frame7[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/0/7.4bpp"); +const u16 gTilesetAnims_Rustboro_WindyWater_Frame0[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/windy_water/0.4bpp"); +const u16 gTilesetAnims_Rustboro_WindyWater_Frame1[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/windy_water/1.4bpp"); +const u16 gTilesetAnims_Rustboro_WindyWater_Frame2[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/windy_water/2.4bpp"); +const u16 gTilesetAnims_Rustboro_WindyWater_Frame3[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/windy_water/3.4bpp"); +const u16 gTilesetAnims_Rustboro_WindyWater_Frame4[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/windy_water/4.4bpp"); +const u16 gTilesetAnims_Rustboro_WindyWater_Frame5[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/windy_water/5.4bpp"); +const u16 gTilesetAnims_Rustboro_WindyWater_Frame6[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/windy_water/6.4bpp"); +const u16 gTilesetAnims_Rustboro_WindyWater_Frame7[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/windy_water/7.4bpp"); -u16 *const gTilesetAnims_RustboroVDests0[] = { +u16 *const gTilesetAnims_Rustboro_WindyWater_VDests[] = { (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 128)), (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 132)), (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 136)), @@ -315,72 +302,54 @@ u16 *const gTilesetAnims_RustboroVDests0[] = { (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 156)) }; -const u16 *const gTilesetAnims_Rustboro0[] = { - gTilesetAnims_Rustboro0_Frame0, - gTilesetAnims_Rustboro0_Frame1, - gTilesetAnims_Rustboro0_Frame2, - gTilesetAnims_Rustboro0_Frame3, - gTilesetAnims_Rustboro0_Frame4, - gTilesetAnims_Rustboro0_Frame5, - gTilesetAnims_Rustboro0_Frame6, - gTilesetAnims_Rustboro0_Frame7 +const u16 *const gTilesetAnims_Rustboro_WindyWater[] = { + gTilesetAnims_Rustboro_WindyWater_Frame0, + gTilesetAnims_Rustboro_WindyWater_Frame1, + gTilesetAnims_Rustboro_WindyWater_Frame2, + gTilesetAnims_Rustboro_WindyWater_Frame3, + gTilesetAnims_Rustboro_WindyWater_Frame4, + gTilesetAnims_Rustboro_WindyWater_Frame5, + gTilesetAnims_Rustboro_WindyWater_Frame6, + gTilesetAnims_Rustboro_WindyWater_Frame7 }; -const u16 gTilesetAnims_Rustboro1_Frame0[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/1/0.4bpp"); - -const u16 gTilesetAnims_Rustboro1_Frame1[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/1/1.4bpp"); - +const u16 gTilesetAnims_Rustboro_Fountain_Frame0[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/fountain/0.4bpp"); +const u16 gTilesetAnims_Rustboro_Fountain_Frame1[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/fountain/1.4bpp"); const u16 tileset_anims_space_2[16] = {}; -const u16 *const gTilesetAnims_Rustboro1[] = { - gTilesetAnims_Rustboro1_Frame0, - gTilesetAnims_Rustboro1_Frame1 +const u16 *const gTilesetAnims_Rustboro_Fountain[] = { + gTilesetAnims_Rustboro_Fountain_Frame0, + gTilesetAnims_Rustboro_Fountain_Frame1 }; -const u16 gTilesetAnims_Lavaridge1_Cave0_Frame0[] = INCBIN_U16("data/tilesets/secondary/cave/anim/0.4bpp"); - -const u16 gTilesetAnims_Lavaridge1_Cave0_Frame1[] = INCBIN_U16("data/tilesets/secondary/cave/anim/1.4bpp"); - -const u16 gTilesetAnims_Lavaridge1_Cave0_Frame2[] = INCBIN_U16("data/tilesets/secondary/cave/anim/2.4bpp"); - -const u16 gTilesetAnims_Lavaridge1_Cave0_Frame3[] = INCBIN_U16("data/tilesets/secondary/cave/anim/3.4bpp"); - -const u16 gTilesetAnims_Lavaridge1_CaveUnused_Frame0[] = INCBIN_U16("data/tilesets/secondary/cave/anim/unused/0.4bpp"); - -const u16 gTilesetAnims_Lavaridge1_CaveUnused_Frame1[] = INCBIN_U16("data/tilesets/secondary/cave/anim/unused/1.4bpp"); - -const u16 gTilesetAnims_Lavaridge1_CaveUnused_Frame2[] = INCBIN_U16("data/tilesets/secondary/cave/anim/unused/2.4bpp"); - -const u16 gTilesetAnims_Lavaridge1_CaveUnused_Frame3[] = INCBIN_U16("data/tilesets/secondary/cave/anim/unused/3.4bpp"); - +const u16 gTilesetAnims_Lavaridge_Cave_Lava_Frame0[] = INCBIN_U16("data/tilesets/secondary/cave/anim/lava/0.4bpp"); +const u16 gTilesetAnims_Lavaridge_Cave_Lava_Frame1[] = INCBIN_U16("data/tilesets/secondary/cave/anim/lava/1.4bpp"); +const u16 gTilesetAnims_Lavaridge_Cave_Lava_Frame2[] = INCBIN_U16("data/tilesets/secondary/cave/anim/lava/2.4bpp"); +const u16 gTilesetAnims_Lavaridge_Cave_Lava_Frame3[] = INCBIN_U16("data/tilesets/secondary/cave/anim/lava/3.4bpp"); +const u16 gTilesetAnims_Lavaridge_Cave_Lava_Frame4[] = INCBIN_U16("data/tilesets/secondary/cave/anim/lava/4.4bpp"); +const u16 gTilesetAnims_Lavaridge_Cave_Lava_Frame5[] = INCBIN_U16("data/tilesets/secondary/cave/anim/lava/5.4bpp"); +const u16 gTilesetAnims_Lavaridge_Cave_Lava_Frame6[] = INCBIN_U16("data/tilesets/secondary/cave/anim/lava/6.4bpp"); +const u16 gTilesetAnims_Lavaridge_Cave_Lava_Frame7[] = INCBIN_U16("data/tilesets/secondary/cave/anim/lava/7.4bpp"); const u16 tileset_anims_space_3[16] = {}; -const u16 *const gTilesetAnims_Lavaridge1_Cave0[] = { - gTilesetAnims_Lavaridge1_Cave0_Frame0, - gTilesetAnims_Lavaridge1_Cave0_Frame1, - gTilesetAnims_Lavaridge1_Cave0_Frame2, - gTilesetAnims_Lavaridge1_Cave0_Frame3 +const u16 *const gTilesetAnims_Lavaridge_Cave_Lava[] = { + gTilesetAnims_Lavaridge_Cave_Lava_Frame0, + gTilesetAnims_Lavaridge_Cave_Lava_Frame1, + gTilesetAnims_Lavaridge_Cave_Lava_Frame2, + gTilesetAnims_Lavaridge_Cave_Lava_Frame3 }; -const u16 gTilesetAnims_EverGrande0_Frame0[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/0.4bpp"); - -const u16 gTilesetAnims_EverGrande0_Frame1[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/1.4bpp"); - -const u16 gTilesetAnims_EverGrande0_Frame2[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/2.4bpp"); - -const u16 gTilesetAnims_EverGrande0_Frame3[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/3.4bpp"); - -const u16 gTilesetAnims_EverGrande0_Frame4[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/4.4bpp"); - -const u16 gTilesetAnims_EverGrande0_Frame5[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/5.4bpp"); - -const u16 gTilesetAnims_EverGrande0_Frame6[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/6.4bpp"); - -const u16 gTilesetAnims_EverGrande0_Frame7[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/7.4bpp"); - +const u16 gTilesetAnims_EverGrande_Flowers_Frame0[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/flowers/0.4bpp"); +const u16 gTilesetAnims_EverGrande_Flowers_Frame1[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/flowers/1.4bpp"); +const u16 gTilesetAnims_EverGrande_Flowers_Frame2[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/flowers/2.4bpp"); +const u16 gTilesetAnims_EverGrande_Flowers_Frame3[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/flowers/3.4bpp"); +const u16 gTilesetAnims_EverGrande_Flowers_Frame4[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/flowers/4.4bpp"); +const u16 gTilesetAnims_EverGrande_Flowers_Frame5[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/flowers/5.4bpp"); +const u16 gTilesetAnims_EverGrande_Flowers_Frame6[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/flowers/6.4bpp"); +const u16 gTilesetAnims_EverGrande_Flowers_Frame7[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/flowers/7.4bpp"); const u16 tileset_anims_space_4[16] = {}; -u16 *const gTilesetAnims_EverGrandeVDests0[] = { +u16 *const gTilesetAnims_EverGrande_VDests[] = { (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 224)), (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 228)), (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 232)), @@ -391,243 +360,190 @@ u16 *const gTilesetAnims_EverGrandeVDests0[] = { (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 252)) }; -const u16 *const gTilesetAnims_EverGrande0[] = { - gTilesetAnims_EverGrande0_Frame0, - gTilesetAnims_EverGrande0_Frame1, - gTilesetAnims_EverGrande0_Frame2, - gTilesetAnims_EverGrande0_Frame3, - gTilesetAnims_EverGrande0_Frame4, - gTilesetAnims_EverGrande0_Frame5, - gTilesetAnims_EverGrande0_Frame6, - gTilesetAnims_EverGrande0_Frame7 +const u16 *const gTilesetAnims_EverGrande_Flowers[] = { + gTilesetAnims_EverGrande_Flowers_Frame0, + gTilesetAnims_EverGrande_Flowers_Frame1, + gTilesetAnims_EverGrande_Flowers_Frame2, + gTilesetAnims_EverGrande_Flowers_Frame3, + gTilesetAnims_EverGrande_Flowers_Frame4, + gTilesetAnims_EverGrande_Flowers_Frame5, + gTilesetAnims_EverGrande_Flowers_Frame6, + gTilesetAnims_EverGrande_Flowers_Frame7 }; -const u16 gTilesetAnims_Dewford0_Frame0[] = INCBIN_U16("data/tilesets/secondary/dewford/anim/0.4bpp"); - -const u16 gTilesetAnims_Dewford0_Frame1[] = INCBIN_U16("data/tilesets/secondary/dewford/anim/1.4bpp"); +const u16 gTilesetAnims_Dewford_Flag_Frame0[] = INCBIN_U16("data/tilesets/secondary/dewford/anim/flag/0.4bpp"); +const u16 gTilesetAnims_Dewford_Flag_Frame1[] = INCBIN_U16("data/tilesets/secondary/dewford/anim/flag/1.4bpp"); +const u16 gTilesetAnims_Dewford_Flag_Frame2[] = INCBIN_U16("data/tilesets/secondary/dewford/anim/flag/2.4bpp"); +const u16 gTilesetAnims_Dewford_Flag_Frame3[] = INCBIN_U16("data/tilesets/secondary/dewford/anim/flag/3.4bpp"); -const u16 gTilesetAnims_Dewford0_Frame2[] = INCBIN_U16("data/tilesets/secondary/dewford/anim/2.4bpp"); - -const u16 gTilesetAnims_Dewford0_Frame3[] = INCBIN_U16("data/tilesets/secondary/dewford/anim/3.4bpp"); - -const u16 *const gTilesetAnims_Dewford0[] = { - gTilesetAnims_Dewford0_Frame0, - gTilesetAnims_Dewford0_Frame1, - gTilesetAnims_Dewford0_Frame2, - gTilesetAnims_Dewford0_Frame3 +const u16 *const gTilesetAnims_Dewford_Flag[] = { + gTilesetAnims_Dewford_Flag_Frame0, + gTilesetAnims_Dewford_Flag_Frame1, + gTilesetAnims_Dewford_Flag_Frame2, + gTilesetAnims_Dewford_Flag_Frame3 }; -const u16 gTilesetAnims_BattleFrontierOutsideWest0_Frame0[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/anim/0.4bpp"); - -const u16 gTilesetAnims_BattleFrontierOutsideWest0_Frame1[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/anim/1.4bpp"); +const u16 gTilesetAnims_BattleFrontierOutsideWest_Flag_Frame0[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/anim/flag/0.4bpp"); +const u16 gTilesetAnims_BattleFrontierOutsideWest_Flag_Frame1[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/anim/flag/1.4bpp"); +const u16 gTilesetAnims_BattleFrontierOutsideWest_Flag_Frame2[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/anim/flag/2.4bpp"); +const u16 gTilesetAnims_BattleFrontierOutsideWest_Flag_Frame3[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/anim/flag/3.4bpp"); -const u16 gTilesetAnims_BattleFrontierOutsideWest0_Frame2[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/anim/2.4bpp"); - -const u16 gTilesetAnims_BattleFrontierOutsideWest0_Frame3[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/anim/3.4bpp"); - -const u16 *const gTilesetAnims_BattleFrontierOutsideWest0[] = { - gTilesetAnims_BattleFrontierOutsideWest0_Frame0, - gTilesetAnims_BattleFrontierOutsideWest0_Frame1, - gTilesetAnims_BattleFrontierOutsideWest0_Frame2, - gTilesetAnims_BattleFrontierOutsideWest0_Frame3 +const u16 *const gTilesetAnims_BattleFrontierOutsideWest_Flag[] = { + gTilesetAnims_BattleFrontierOutsideWest_Flag_Frame0, + gTilesetAnims_BattleFrontierOutsideWest_Flag_Frame1, + gTilesetAnims_BattleFrontierOutsideWest_Flag_Frame2, + gTilesetAnims_BattleFrontierOutsideWest_Flag_Frame3 }; -const u16 gTilesetAnims_BattleFrontierOutsideEast0_Frame0[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/anim/0.4bpp"); - -const u16 gTilesetAnims_BattleFrontierOutsideEast0_Frame1[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/anim/1.4bpp"); +const u16 gTilesetAnims_BattleFrontierOutsideEast_Flag_Frame0[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/anim/flag/0.4bpp"); +const u16 gTilesetAnims_BattleFrontierOutsideEast_Flag_Frame1[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/anim/flag/1.4bpp"); +const u16 gTilesetAnims_BattleFrontierOutsideEast_Flag_Frame2[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/anim/flag/2.4bpp"); +const u16 gTilesetAnims_BattleFrontierOutsideEast_Flag_Frame3[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/anim/flag/3.4bpp"); -const u16 gTilesetAnims_BattleFrontierOutsideEast0_Frame2[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/anim/2.4bpp"); - -const u16 gTilesetAnims_BattleFrontierOutsideEast0_Frame3[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/anim/3.4bpp"); - -const u16 *const gTilesetAnims_BattleFrontierOutsideEast0[] = { - gTilesetAnims_BattleFrontierOutsideEast0_Frame0, - gTilesetAnims_BattleFrontierOutsideEast0_Frame1, - gTilesetAnims_BattleFrontierOutsideEast0_Frame2, - gTilesetAnims_BattleFrontierOutsideEast0_Frame3 +const u16 *const gTilesetAnims_BattleFrontierOutsideEast_Flag[] = { + gTilesetAnims_BattleFrontierOutsideEast_Flag_Frame0, + gTilesetAnims_BattleFrontierOutsideEast_Flag_Frame1, + gTilesetAnims_BattleFrontierOutsideEast_Flag_Frame2, + gTilesetAnims_BattleFrontierOutsideEast_Flag_Frame3 }; -const u16 gTilesetAnims_Slateport0_Frame0[] = INCBIN_U16("data/tilesets/secondary/slateport/anim/0.4bpp"); - -const u16 gTilesetAnims_Slateport0_Frame1[] = INCBIN_U16("data/tilesets/secondary/slateport/anim/1.4bpp"); +const u16 gTilesetAnims_Slateport_Balloons_Frame0[] = INCBIN_U16("data/tilesets/secondary/slateport/anim/balloons/0.4bpp"); +const u16 gTilesetAnims_Slateport_Balloons_Frame1[] = INCBIN_U16("data/tilesets/secondary/slateport/anim/balloons/1.4bpp"); +const u16 gTilesetAnims_Slateport_Balloons_Frame2[] = INCBIN_U16("data/tilesets/secondary/slateport/anim/balloons/2.4bpp"); +const u16 gTilesetAnims_Slateport_Balloons_Frame3[] = INCBIN_U16("data/tilesets/secondary/slateport/anim/balloons/3.4bpp"); -const u16 gTilesetAnims_Slateport0_Frame2[] = INCBIN_U16("data/tilesets/secondary/slateport/anim/2.4bpp"); - -const u16 gTilesetAnims_Slateport0_Frame3[] = INCBIN_U16("data/tilesets/secondary/slateport/anim/3.4bpp"); - -const u16 *const gTilesetAnims_Slateport0[] = { - gTilesetAnims_Slateport0_Frame0, - gTilesetAnims_Slateport0_Frame1, - gTilesetAnims_Slateport0_Frame2, - gTilesetAnims_Slateport0_Frame3 +const u16 *const gTilesetAnims_Slateport_Balloons[] = { + gTilesetAnims_Slateport_Balloons_Frame0, + gTilesetAnims_Slateport_Balloons_Frame1, + gTilesetAnims_Slateport_Balloons_Frame2, + gTilesetAnims_Slateport_Balloons_Frame3 }; -const u16 gTilesetAnims_InsideBuilding0_Frame0[] = INCBIN_U16("data/tilesets/primary/building/anim/0.4bpp"); - -const u16 gTilesetAnims_InsideBuilding0_Frame1[] = INCBIN_U16("data/tilesets/primary/building/anim/1.4bpp"); +const u16 gTilesetAnims_Building_TvTurnedOn_Frame0[] = INCBIN_U16("data/tilesets/primary/building/anim/tv_turned_on/0.4bpp"); +const u16 gTilesetAnims_Building_TvTurnedOn_Frame1[] = INCBIN_U16("data/tilesets/primary/building/anim/tv_turned_on/1.4bpp"); -const u16 *const gTilesetAnims_InsideBuilding0[] = { - gTilesetAnims_InsideBuilding0_Frame0, - gTilesetAnims_InsideBuilding0_Frame1 +const u16 *const gTilesetAnims_Building_TvTurnedOn[] = { + gTilesetAnims_Building_TvTurnedOn_Frame0, + gTilesetAnims_Building_TvTurnedOn_Frame1 }; -const u16 gTilesetAnims_SootopolisGym0_Frame0[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/0/0.4bpp"); - -const u16 gTilesetAnims_SootopolisGym0_Frame1[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/0/1.4bpp"); - -const u16 gTilesetAnims_SootopolisGym0_Frame2[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/0/2.4bpp"); - -const u16 gTilesetAnims_SootopolisGym1_Frame0[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/1/0.4bpp"); - -const u16 gTilesetAnims_SootopolisGym1_Frame1[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/1/1.4bpp"); - -const u16 gTilesetAnims_SootopolisGym1_Frame2[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/1/2.4bpp"); - -const u16 *const gTilesetAnims_SootopolisGym0[] = { - gTilesetAnims_SootopolisGym0_Frame0, - gTilesetAnims_SootopolisGym0_Frame1, - gTilesetAnims_SootopolisGym0_Frame2 +const u16 gTilesetAnims_SootopolisGym_SideWaterfall_Frame0[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/0.4bpp"); +const u16 gTilesetAnims_SootopolisGym_SideWaterfall_Frame1[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/1.4bpp"); +const u16 gTilesetAnims_SootopolisGym_SideWaterfall_Frame2[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/2.4bpp"); +const u16 gTilesetAnims_SootopolisGym_FrontWaterfall_Frame0[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/0.4bpp"); +const u16 gTilesetAnims_SootopolisGym_FrontWaterfall_Frame1[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/1.4bpp"); +const u16 gTilesetAnims_SootopolisGym_FrontWaterfall_Frame2[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/2.4bpp"); + +const u16 *const gTilesetAnims_SootopolisGym_SideWaterfall[] = { + gTilesetAnims_SootopolisGym_SideWaterfall_Frame0, + gTilesetAnims_SootopolisGym_SideWaterfall_Frame1, + gTilesetAnims_SootopolisGym_SideWaterfall_Frame2 }; -const u16 *const gTilesetAnims_SootopolisGym1[] = { - gTilesetAnims_SootopolisGym1_Frame0, - gTilesetAnims_SootopolisGym1_Frame1, - gTilesetAnims_SootopolisGym1_Frame2 +const u16 *const gTilesetAnims_SootopolisGym_FrontWaterfall[] = { + gTilesetAnims_SootopolisGym_FrontWaterfall_Frame0, + gTilesetAnims_SootopolisGym_FrontWaterfall_Frame1, + gTilesetAnims_SootopolisGym_FrontWaterfall_Frame2 }; -const u16 gTilesetAnims_EliteFour0_Frame0[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/1/0.4bpp"); - -const u16 gTilesetAnims_EliteFour0_Frame1[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/1/1.4bpp"); - -const u16 gTilesetAnims_EliteFour1_Frame0[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/0/0.4bpp"); - -const u16 gTilesetAnims_EliteFour1_Frame1[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/0/1.4bpp"); - -const u16 gTilesetAnims_EliteFour1_Frame2[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/0/2.4bpp"); - -const u16 gTilesetAnims_EliteFour1_Frame3[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/0/3.4bpp"); - +const u16 gTilesetAnims_EliteFour_FloorLight_Frame0[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/floor_light/0.4bpp"); +const u16 gTilesetAnims_EliteFour_FloorLight_Frame1[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/floor_light/1.4bpp"); +const u16 gTilesetAnims_EliteFour_WallLights_Frame0[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/wall_lights/0.4bpp"); +const u16 gTilesetAnims_EliteFour_WallLights_Frame1[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/wall_lights/1.4bpp"); +const u16 gTilesetAnims_EliteFour_WallLights_Frame2[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/wall_lights/2.4bpp"); +const u16 gTilesetAnims_EliteFour_WallLights_Frame3[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/wall_lights/3.4bpp"); const u16 tileset_anims_space_5[16] = {}; -const u16 *const gTilesetAnims_EliteFour1[] = { - gTilesetAnims_EliteFour1_Frame0, - gTilesetAnims_EliteFour1_Frame1, - gTilesetAnims_EliteFour1_Frame2, - gTilesetAnims_EliteFour1_Frame3 +const u16 *const gTilesetAnims_EliteFour_WallLights[] = { + gTilesetAnims_EliteFour_WallLights_Frame0, + gTilesetAnims_EliteFour_WallLights_Frame1, + gTilesetAnims_EliteFour_WallLights_Frame2, + gTilesetAnims_EliteFour_WallLights_Frame3 }; -const u16 *const gTilesetAnims_EliteFour0[] = { - gTilesetAnims_EliteFour0_Frame0, - gTilesetAnims_EliteFour0_Frame1 +const u16 *const gTilesetAnims_EliteFour_FloorLight[] = { + gTilesetAnims_EliteFour_FloorLight_Frame0, + gTilesetAnims_EliteFour_FloorLight_Frame1 }; -const u16 gTilesetAnims_MauvilleGym0_Frame0[] = INCBIN_U16("data/tilesets/secondary/mauville_gym/anim/0.4bpp"); - -const u16 gTilesetAnims_MauvilleGym0_Frame1[] = INCBIN_U16("data/tilesets/secondary/mauville_gym/anim/1.4bpp"); - +const u16 gTilesetAnims_MauvilleGym_ElectricGates_Frame0[] = INCBIN_U16("data/tilesets/secondary/mauville_gym/anim/electric_gates/0.4bpp"); +const u16 gTilesetAnims_MauvilleGym_ElectricGates_Frame1[] = INCBIN_U16("data/tilesets/secondary/mauville_gym/anim/electric_gates/1.4bpp"); const u16 tileset_anims_space_6[16] = {}; -const u16 *const gTilesetAnims_MauvilleGym0[] = { - gTilesetAnims_MauvilleGym0_Frame0, - gTilesetAnims_MauvilleGym0_Frame1 +const u16 *const gTilesetAnims_MauvilleGym_ElectricGates[] = { + gTilesetAnims_MauvilleGym_ElectricGates_Frame0, + gTilesetAnims_MauvilleGym_ElectricGates_Frame1 }; -const u16 gTilesetAnims_BikeShop0_Frame0[] = INCBIN_U16("data/tilesets/secondary/bike_shop/anim/0.4bpp"); - -const u16 gTilesetAnims_BikeShop0_Frame1[] = INCBIN_U16("data/tilesets/secondary/bike_shop/anim/1.4bpp"); - +const u16 gTilesetAnims_BikeShop_BlinkingLights_Frame0[] = INCBIN_U16("data/tilesets/secondary/bike_shop/anim/blinking_lights/0.4bpp"); +const u16 gTilesetAnims_BikeShop_BlinkingLights_Frame1[] = INCBIN_U16("data/tilesets/secondary/bike_shop/anim/blinking_lights/1.4bpp"); const u16 tileset_anims_space_7[16] = {}; -const u16 *const gTilesetAnims_BikeShop0[] = { - gTilesetAnims_BikeShop0_Frame0, - gTilesetAnims_BikeShop0_Frame1 +const u16 *const gTilesetAnims_BikeShop_BlinkingLights[] = { + gTilesetAnims_BikeShop_BlinkingLights_Frame0, + gTilesetAnims_BikeShop_BlinkingLights_Frame1 }; -const u16 gTilesetAnims_Sootopolis0_Frame0[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/0.4bpp"); - -const u16 gTilesetAnims_Sootopolis0_Frame1[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/1.4bpp"); - -const u16 gTilesetAnims_Sootopolis0_Frame2[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/2.4bpp"); - -const u16 gTilesetAnims_Sootopolis0_Frame3[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/3.4bpp"); - -const u16 gTilesetAnims_Sootopolis0_Frame4[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/4.4bpp"); - -const u16 gTilesetAnims_Sootopolis0_Frame5[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/5.4bpp"); - -const u16 gTilesetAnims_Sootopolis0_Frame6[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/6.4bpp"); - -const u16 gTilesetAnims_Sootopolis0_Frame7[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/7.4bpp"); - +const u16 gTilesetAnims_Sootopolis_StormyWater_Frame0[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/stormy_water/0.4bpp"); +const u16 gTilesetAnims_Sootopolis_StormyWater_Frame1[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/stormy_water/1.4bpp"); +const u16 gTilesetAnims_Sootopolis_StormyWater_Frame2[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/stormy_water/2.4bpp"); +const u16 gTilesetAnims_Sootopolis_StormyWater_Frame3[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/stormy_water/3.4bpp"); +const u16 gTilesetAnims_Sootopolis_StormyWater_Frame4[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/stormy_water/4.4bpp"); +const u16 gTilesetAnims_Sootopolis_StormyWater_Frame5[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/stormy_water/5.4bpp"); +const u16 gTilesetAnims_Sootopolis_StormyWater_Frame6[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/stormy_water/6.4bpp"); +const u16 gTilesetAnims_Sootopolis_StormyWater_Frame7[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/stormy_water/7.4bpp"); const u16 tileset_anims_space_8[16] = {}; const u16 gTilesetAnims_Unused1_Frame0[] = INCBIN_U16("data/tilesets/secondary/unused_1/0.4bpp"); - const u16 gTilesetAnims_Unused1_Frame1[] = INCBIN_U16("data/tilesets/secondary/unused_1/1.4bpp"); - const u16 gTilesetAnims_Unused1_Frame2[] = INCBIN_U16("data/tilesets/secondary/unused_1/2.4bpp"); - const u16 gTilesetAnims_Unused1_Frame3[] = INCBIN_U16("data/tilesets/secondary/unused_1/3.4bpp"); -const u16 *const gTilesetAnims_Sootopolis0[] = { - gTilesetAnims_Sootopolis0_Frame0, - gTilesetAnims_Sootopolis0_Frame1, - gTilesetAnims_Sootopolis0_Frame2, - gTilesetAnims_Sootopolis0_Frame3, - gTilesetAnims_Sootopolis0_Frame4, - gTilesetAnims_Sootopolis0_Frame5, - gTilesetAnims_Sootopolis0_Frame6, - gTilesetAnims_Sootopolis0_Frame7 +const u16 *const gTilesetAnims_Sootopolis_StormyWater[] = { + gTilesetAnims_Sootopolis_StormyWater_Frame0, + gTilesetAnims_Sootopolis_StormyWater_Frame1, + gTilesetAnims_Sootopolis_StormyWater_Frame2, + gTilesetAnims_Sootopolis_StormyWater_Frame3, + gTilesetAnims_Sootopolis_StormyWater_Frame4, + gTilesetAnims_Sootopolis_StormyWater_Frame5, + gTilesetAnims_Sootopolis_StormyWater_Frame6, + gTilesetAnims_Sootopolis_StormyWater_Frame7 }; -const u16 gTilesetAnims_BattlePyramid0_Frame0[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/0/0.4bpp"); - -const u16 gTilesetAnims_BattlePyramid0_Frame1[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/0/1.4bpp"); - -const u16 gTilesetAnims_BattlePyramid0_Frame2[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/0/2.4bpp"); - +const u16 gTilesetAnims_BattlePyramid_Torch_Frame0[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/torch/0.4bpp"); +const u16 gTilesetAnims_BattlePyramid_Torch_Frame1[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/torch/1.4bpp"); +const u16 gTilesetAnims_BattlePyramid_Torch_Frame2[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/torch/2.4bpp"); const u16 tileset_anims_space_9[16] = {}; -const u16 gTilesetAnims_BattlePyramid1_Frame0[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/1/0.4bpp"); - -const u16 gTilesetAnims_BattlePyramid1_Frame1[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/1/1.4bpp"); - -const u16 gTilesetAnims_BattlePyramid1_Frame2[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/1/2.4bpp"); - +const u16 gTilesetAnims_BattlePyramid_StatueShadow_Frame0[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/statue_shadow/0.4bpp"); +const u16 gTilesetAnims_BattlePyramid_StatueShadow_Frame1[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/statue_shadow/1.4bpp"); +const u16 gTilesetAnims_BattlePyramid_StatueShadow_Frame2[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/statue_shadow/2.4bpp"); const u16 tileset_anims_space_10[7808] = {}; const u16 gTilesetAnims_Unused2_Frame0[] = INCBIN_U16("data/tilesets/secondary/unused_2/0.4bpp"); - const u16 tileset_anims_space_11[224] = {}; const u16 gTilesetAnims_Unused2_Frame1[] = INCBIN_U16("data/tilesets/secondary/unused_2/1.4bpp"); -const u16 *const gTilesetAnims_BattlePyramid0[] = { - gTilesetAnims_BattlePyramid0_Frame0, - gTilesetAnims_BattlePyramid0_Frame1, - gTilesetAnims_BattlePyramid0_Frame2 +const u16 *const gTilesetAnims_BattlePyramid_Torch[] = { + gTilesetAnims_BattlePyramid_Torch_Frame0, + gTilesetAnims_BattlePyramid_Torch_Frame1, + gTilesetAnims_BattlePyramid_Torch_Frame2 }; -const u16 *const gTilesetAnims_BattlePyramid1[] = { - gTilesetAnims_BattlePyramid1_Frame0, - gTilesetAnims_BattlePyramid1_Frame1, - gTilesetAnims_BattlePyramid1_Frame2 +const u16 *const gTilesetAnims_BattlePyramid_StatueShadow[] = { + gTilesetAnims_BattlePyramid_StatueShadow_Frame0, + gTilesetAnims_BattlePyramid_StatueShadow_Frame1, + gTilesetAnims_BattlePyramid_StatueShadow_Frame2 }; -extern const u16 gTilesetAnims_BattleDomePals0_0[]; -extern const u16 gTilesetAnims_BattleDomePals0_1[]; -extern const u16 gTilesetAnims_BattleDomePals0_2[]; -extern const u16 gTilesetAnims_BattleDomePals0_3[]; - -static const u16 *const gTilesetAnims_BattleDomePals0[] = { +static const u16 *const gTilesetAnims_BattleDomeFloorLightPals[] = { gTilesetAnims_BattleDomePals0_0, gTilesetAnims_BattleDomePals0_1, gTilesetAnims_BattleDomePals0_2, gTilesetAnims_BattleDomePals0_3, }; -// .text - static void ResetTilesetAnimBuffer(void) { sTilesetDMA3TransferBufferSize = 0; @@ -650,763 +566,623 @@ void TransferTilesetAnimsBuffer(void) int i; for (i = 0; i < sTilesetDMA3TransferBufferSize; i ++) - { DmaCopy16(3, sTilesetDMA3TransferBuffer[i].src, sTilesetDMA3TransferBuffer[i].dest, sTilesetDMA3TransferBuffer[i].size); - } + sTilesetDMA3TransferBufferSize = 0; } -void cur_mapheader_run_tileset_funcs_after_some_cpuset(void) +void InitTilesetAnimations(void) { ResetTilesetAnimBuffer(); - cur_mapheader_run_tileset1_func(); - cur_mapheader_run_tileset2_func(); + _InitPrimaryTilesetAnimation(); + _InitSecondaryTilesetAnimation(); } -void sub_80A0A2C(void) +void InitSecondaryTilesetAnimation(void) { - cur_mapheader_run_tileset2_func(); + _InitSecondaryTilesetAnimation(); } -void sub_80A0A38(void) +void UpdateTilesetAnimations(void) { ResetTilesetAnimBuffer(); - if (++sPrimaryTilesetCBCounter >= sPrimaryTilesetCBBufferSize) - sPrimaryTilesetCBCounter = 0; - if (++sSecondaryTilesetCBCounter >= sSecondaryTilesetCBBufferSize) - sSecondaryTilesetCBCounter = 0; - if (sPrimaryTilesetCB) - sPrimaryTilesetCB(sPrimaryTilesetCBCounter); - if (sSecondaryTilesetCB) - sSecondaryTilesetCB(sSecondaryTilesetCBCounter); + if (++sPrimaryTilesetAnimCounter >= sPrimaryTilesetAnimCounterMax) + sPrimaryTilesetAnimCounter = 0; + if (++sSecondaryTilesetAnimCounter >= sSecondaryTilesetAnimCounterMax) + sSecondaryTilesetAnimCounter = 0; + + if (sPrimaryTilesetAnimCallback) + sPrimaryTilesetAnimCallback(sPrimaryTilesetAnimCounter); + if (sSecondaryTilesetAnimCallback) + sSecondaryTilesetAnimCallback(sSecondaryTilesetAnimCounter); } -static void cur_mapheader_run_tileset1_func(void) +static void _InitPrimaryTilesetAnimation(void) { - sPrimaryTilesetCBCounter = 0; - sPrimaryTilesetCBBufferSize = 0; - sPrimaryTilesetCB = NULL; + sPrimaryTilesetAnimCounter = 0; + sPrimaryTilesetAnimCounterMax = 0; + sPrimaryTilesetAnimCallback = NULL; if (gMapHeader.mapLayout->primaryTileset && gMapHeader.mapLayout->primaryTileset->callback) gMapHeader.mapLayout->primaryTileset->callback(); } -static void cur_mapheader_run_tileset2_func(void) +static void _InitSecondaryTilesetAnimation(void) { - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = 0; - sSecondaryTilesetCB = NULL; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = 0; + sSecondaryTilesetAnimCallback = NULL; if (gMapHeader.mapLayout->secondaryTileset && gMapHeader.mapLayout->secondaryTileset->callback) gMapHeader.mapLayout->secondaryTileset->callback(); } -void TilesetCb_General(void) +void InitTilesetAnim_General(void) { - static void sub_80A0B70(u16); - - sPrimaryTilesetCBCounter = 0; - sPrimaryTilesetCBBufferSize = 0x100; - sPrimaryTilesetCB = sub_80A0B70; + sPrimaryTilesetAnimCounter = 0; + sPrimaryTilesetAnimCounterMax = 256; + sPrimaryTilesetAnimCallback = TilesetAnim_General; } -void TilesetCb_InsideBuilding(void) +void InitTilesetAnim_Building(void) { - static void sub_80A0BB4(u16); - - sPrimaryTilesetCBCounter = 0; - sPrimaryTilesetCBBufferSize = 0x100; - sPrimaryTilesetCB = sub_80A0BB4; + sPrimaryTilesetAnimCounter = 0; + sPrimaryTilesetAnimCounterMax = 256; + sPrimaryTilesetAnimCallback = TilesetAnim_Building; } -static void sub_80A0B70(u16 timer) +static void TilesetAnim_General(u16 timer) { - static void gTilesetAnims_Flower(u16); - static void gTilesetAnims_Water(u16); - static void gTilesetAnims_SandWaterEdge(u16); - static void gTilesetAnims_Waterfall(u16); - static void gTilesetAnims_LandWaterEdge (u16); - - if ((timer & 0x0F) == 0) - gTilesetAnims_Flower(timer >> 4); - if ((timer & 0x0F) == 1) - gTilesetAnims_Water(timer >> 4); - if ((timer & 0x0F) == 2) - gTilesetAnims_SandWaterEdge(timer >> 4); - if ((timer & 0x0F) == 3) - gTilesetAnims_Waterfall(timer >> 4); - if ((timer & 0x0F) == 4) - gTilesetAnims_LandWaterEdge (timer >> 4); + if (timer % 16 == 0) + QueueAnimTiles_General_Flower(timer >> 4); + if (timer % 16 == 1) + QueueAnimTiles_General_Water(timer >> 4); + if (timer % 16 == 2) + QueueAnimTiles_General_SandWaterEdge(timer >> 4); + if (timer % 16 == 3) + QueueAnimTiles_General_Waterfall(timer >> 4); + if (timer % 16 == 4) + QueueAnimTiles_General_LandWaterEdge(timer >> 4); } -static void sub_80A0BB4(u16 timer) +static void TilesetAnim_Building(u16 timer) { - static void sub_80A1688(u16); - - if ((timer & 0x7) == 0) - sub_80A1688(timer >> 3); + if (timer % 8 == 0) + QueueAnimTiles_Building_TVTurnedOn(timer >> 3); } -static void gTilesetAnims_Flower(u16 timer) +static void QueueAnimTiles_General_Flower(u16 timer) { - u16 idx; - - idx = timer % 4; - AppendTilesetAnimToBuffer(gTilesetAnims_General0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(508)), 0x80); + u16 i = timer % 4; + AppendTilesetAnimToBuffer(gTilesetAnims_General_Flower[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(508)), 0x80); } -static void gTilesetAnims_Water(u16 timer) +static void QueueAnimTiles_General_Water(u16 timer) { - u8 idx; - - idx = timer % 8; - AppendTilesetAnimToBuffer(gTilesetAnims_General1[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(432)), 0x3C0); + u8 i = timer % 8; + AppendTilesetAnimToBuffer(gTilesetAnims_General_Water[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(432)), 0x3C0); } -static void gTilesetAnims_SandWaterEdge(u16 timer) +static void QueueAnimTiles_General_SandWaterEdge(u16 timer) { - u16 idx; - - idx = timer % 8; - AppendTilesetAnimToBuffer(gTilesetAnims_General2[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(464)), 0x140); + u16 i = timer % 8; + AppendTilesetAnimToBuffer(gTilesetAnims_General_SandWaterEdge[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(464)), 0x140); } -static void gTilesetAnims_Waterfall(u16 timer) +static void QueueAnimTiles_General_Waterfall(u16 timer) { - u16 idx; - - idx = timer % 4; - AppendTilesetAnimToBuffer(gTilesetAnims_General3[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(496)), 0xc0); + u16 i = timer % 4; + AppendTilesetAnimToBuffer(gTilesetAnims_General_Waterfall[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(496)), 0xc0); } -void TilesetCb_Petalburg(void) +void InitTilesetAnim_Petalburg(void) { - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = NULL; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = NULL; } -void TilesetCb_Rustboro(void) +void InitTilesetAnim_Rustboro(void) { - static void sub_80A103C(u16); - - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = sub_80A103C; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = TilesetAnim_Rustboro; } -void TilesetCb_Dewford(void) +void InitTilesetAnim_Dewford(void) { - static void sub_80A10B8(u16); - - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = sub_80A10B8; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = TilesetAnim_Dewford; } -void TilesetCb_Slateport(void) +void InitTilesetAnim_Slateport(void) { - static void sub_80A10D0(u16); - - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = sub_80A10D0; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = TilesetAnim_Slateport; } -void TilesetCb_Mauville(void) +void InitTilesetAnim_Mauville(void) { - static void sub_80A10E8(u16); - - sSecondaryTilesetCBCounter = sPrimaryTilesetCBCounter; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = sub_80A10E8; + sSecondaryTilesetAnimCounter = sPrimaryTilesetAnimCounter; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = TilesetAnim_Mauville; } -void TilesetCb_Lavaridge(void) +void InitTilesetAnim_Lavaridge(void) { - static void sub_80A115C(u16); - - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = sub_80A115C; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = TilesetAnim_Lavaridge; } -void TilesetCb_Fallarbor(void) +void InitTilesetAnim_Fallarbor(void) { - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = NULL; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = NULL; } -void TilesetCb_Fortree(void) +void InitTilesetAnim_Fortree(void) { - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = NULL; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = NULL; } -void TilesetCb_Lilycove(void) +void InitTilesetAnim_Lilycove(void) { - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = NULL; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = NULL; } -void TilesetCb_Mossdeep(void) +void InitTilesetAnim_Mossdeep(void) { - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = NULL; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = NULL; } -void TilesetCb_EverGrande(void) +void InitTilesetAnim_EverGrande(void) { - static void sub_80A1188(u16); - - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = sub_80A1188; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = TilesetAnim_EverGrande; } -void TilesetCb_Pacifidlog(void) +void InitTilesetAnim_Pacifidlog(void) { - static void sub_80A11FC(u16); - - sSecondaryTilesetCBCounter = sPrimaryTilesetCBCounter; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = sub_80A11FC; + sSecondaryTilesetAnimCounter = sPrimaryTilesetAnimCounter; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = TilesetAnim_Pacifidlog; } -void TilesetCb_Sootopolis(void) +void InitTilesetAnim_Sootopolis(void) { - static void sub_80A122C(u16); - - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = sub_80A122C; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = TilesetAnim_Sootopolis; } -void TilesetCb_BattleFrontierOutsideWest(void) +void InitTilesetAnim_BattleFrontierOutsideWest(void) { - static void sub_80A127C(u16); - - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = sub_80A127C; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = TilesetAnim_BattleFrontierOutsideWest; } -void TilesetCb_BattleFrontierOutsideEast(void) +void InitTilesetAnim_BattleFrontierOutsideEast(void) { - static void sub_80A1294(u16); - - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = sub_80A1294; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = TilesetAnim_BattleFrontierOutsideEast; } -void TilesetCb_Underwater(void) +void InitTilesetAnim_Underwater(void) { - static void sub_80A1244(u16); - - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = 128; - sSecondaryTilesetCB = sub_80A1244; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = 128; + sSecondaryTilesetAnimCallback = TilesetAnim_Underwater; } -void TilesetCb_SootopolisGym(void) +void InitTilesetAnim_SootopolisGym(void) { - static void sub_80A15D8(u16); - - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = 240; - sSecondaryTilesetCB = sub_80A15D8; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = 240; + sSecondaryTilesetAnimCallback = TilesetAnim_SootopolisGym; } -void TilesetCb_Cave(void) +void InitTilesetAnim_Cave(void) { - static void sub_80A1260(u16); - - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = sub_80A1260; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = TilesetAnim_Cave; } -void TilesetCb_EliteFour(void) +void InitTilesetAnim_EliteFour(void) { - static void sub_80A15F0(u16); - - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = 128; - sSecondaryTilesetCB = sub_80A15F0; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = 128; + sSecondaryTilesetAnimCallback = TilesetAnim_EliteFour; } -void TilesetCb_MauvilleGym(void) +void InitTilesetAnim_MauvilleGym(void) { - static void sub_80A15C0(u16); - - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = sub_80A15C0; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = TilesetAnim_MauvilleGym; } -void TilesetCb_BikeShop(void) +void InitTilesetAnim_BikeShop(void) { - static void sub_80A161C(u16); - - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = sub_80A161C; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = TilesetAnim_BikeShop; } -void TilesetCb_BattlePyramid(void) +void InitTilesetAnim_BattlePyramid(void) { - static void sub_80A1634(u16); - - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = sub_80A1634; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = TilesetAnim_BattlePyramid; } -void TilesetCb_BattleDome(void) +void InitTilesetAnim_BattleDome(void) { - static void sub_80A1658(u16); - - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = sub_80A1658; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = TilesetAnim_BattleDome; } -static void sub_80A103C(u16 timer) +static void TilesetAnim_Rustboro(u16 timer) { - static void sub_80A1434(u16, u8); - static void sub_80A1470(u16); - - if ((timer & 0x07) == 0) + if (timer % 8 == 0) { - sub_80A1434(timer >> 3, 0); - sub_80A1470(timer >> 3); + QueueAnimTiles_Rustboro_WindyWater(timer >> 3, 0); + QueueAnimTiles_Rustboro_Fountain(timer >> 3); } - if ((timer & 0x07) == 1) - sub_80A1434(timer >> 3, 1); - if ((timer & 0x07) == 2) - sub_80A1434(timer >> 3, 2); - if ((timer & 0x07) == 3) - sub_80A1434(timer >> 3, 3); - if ((timer & 0x07) == 4) - sub_80A1434(timer >> 3, 4); - if ((timer & 0x07) == 5) - sub_80A1434(timer >> 3, 5); - if ((timer & 0x07) == 6) - sub_80A1434(timer >> 3, 6); - if ((timer & 0x07) == 7) - sub_80A1434(timer >> 3, 7); + if (timer % 8 == 1) + QueueAnimTiles_Rustboro_WindyWater(timer >> 3, 1); + if (timer % 8 == 2) + QueueAnimTiles_Rustboro_WindyWater(timer >> 3, 2); + if (timer % 8 == 3) + QueueAnimTiles_Rustboro_WindyWater(timer >> 3, 3); + if (timer % 8 == 4) + QueueAnimTiles_Rustboro_WindyWater(timer >> 3, 4); + if (timer % 8 == 5) + QueueAnimTiles_Rustboro_WindyWater(timer >> 3, 5); + if (timer % 8 == 6) + QueueAnimTiles_Rustboro_WindyWater(timer >> 3, 6); + if (timer % 8 == 7) + QueueAnimTiles_Rustboro_WindyWater(timer >> 3, 7); } -static void sub_80A10B8(u16 timer) +static void TilesetAnim_Dewford(u16 timer) { - static void sub_80A1520(u16); - - if ((timer & 7) == 0) - sub_80A1520(timer >> 3); + if (timer % 8 == 0) + QueueAnimTiles_Dewford_Flag(timer >> 3); } -static void sub_80A10D0(u16 timer) +static void TilesetAnim_Slateport(u16 timer) { - static void sub_80A1598(u16); - - if ((timer & 15) == 0) - sub_80A1598(timer >> 4); + if (timer % 16 == 0) + QueueAnimTiles_Slateport_Balloons(timer >> 4); } -static void sub_80A10E8(u16 timer) +static void TilesetAnim_Mauville(u16 timer) { - static void sub_80A1394(u16, u8); - - if ((timer & 0x07) == 0) - sub_80A1394(timer >> 3, 0); - if ((timer & 0x07) == 1) - sub_80A1394(timer >> 3, 1); - if ((timer & 0x07) == 2) - sub_80A1394(timer >> 3, 2); - if ((timer & 0x07) == 3) - sub_80A1394(timer >> 3, 3); - if ((timer & 0x07) == 4) - sub_80A1394(timer >> 3, 4); - if ((timer & 0x07) == 5) - sub_80A1394(timer >> 3, 5); - if ((timer & 0x07) == 6) - sub_80A1394(timer >> 3, 6); - if ((timer & 0x07) == 7) - sub_80A1394(timer >> 3, 7); + if (timer % 8 == 0) + QueueAnimTiles_Mauville_Flowers(timer >> 3, 0); + if (timer % 8 == 1) + QueueAnimTiles_Mauville_Flowers(timer >> 3, 1); + if (timer % 8 == 2) + QueueAnimTiles_Mauville_Flowers(timer >> 3, 2); + if (timer % 8 == 3) + QueueAnimTiles_Mauville_Flowers(timer >> 3, 3); + if (timer % 8 == 4) + QueueAnimTiles_Mauville_Flowers(timer >> 3, 4); + if (timer % 8 == 5) + QueueAnimTiles_Mauville_Flowers(timer >> 3, 5); + if (timer % 8 == 6) + QueueAnimTiles_Mauville_Flowers(timer >> 3, 6); + if (timer % 8 == 7) + QueueAnimTiles_Mauville_Flowers(timer >> 3, 7); } -static void sub_80A115C(u16 timer) +static void TilesetAnim_Lavaridge(u16 timer) { - static void sub_80A12D4(u8); - static void sub_80A1498(u16); - - if ((timer & 0x0F) == 0) - sub_80A12D4(timer >> 4); - if ((timer & 0x0F) == 1) - sub_80A1498(timer >> 4); + if (timer % 16 == 0) + QueueAnimTiles_Lavaridge_Steam(timer >> 4); + if (timer % 16 == 1) + QueueAnimTiles_Lavaridge_Lava(timer >> 4); } -static void sub_80A1188(u16 timer) +static void TilesetAnim_EverGrande(u16 timer) { - static void sub_80A14C0(u16, u8); - - if ((timer & 0x07) == 0) - sub_80A14C0(timer >> 3, 0); - if ((timer & 0x07) == 1) - sub_80A14C0(timer >> 3, 1); - if ((timer & 0x07) == 2) - sub_80A14C0(timer >> 3, 2); - if ((timer & 0x07) == 3) - sub_80A14C0(timer >> 3, 3); - if ((timer & 0x07) == 4) - sub_80A14C0(timer >> 3, 4); - if ((timer & 0x07) == 5) - sub_80A14C0(timer >> 3, 5); - if ((timer & 0x07) == 6) - sub_80A14C0(timer >> 3, 6); - if ((timer & 0x07) == 7) - sub_80A14C0(timer >> 3, 7); + if (timer % 8 == 0) + QueueAnimTiles_EverGrande_Flowers(timer >> 3, 0); + if (timer % 8 == 1) + QueueAnimTiles_EverGrande_Flowers(timer >> 3, 1); + if (timer % 8 == 2) + QueueAnimTiles_EverGrande_Flowers(timer >> 3, 2); + if (timer % 8 == 3) + QueueAnimTiles_EverGrande_Flowers(timer >> 3, 3); + if (timer % 8 == 4) + QueueAnimTiles_EverGrande_Flowers(timer >> 3, 4); + if (timer % 8 == 5) + QueueAnimTiles_EverGrande_Flowers(timer >> 3, 5); + if (timer % 8 == 6) + QueueAnimTiles_EverGrande_Flowers(timer >> 3, 6); + if (timer % 8 == 7) + QueueAnimTiles_EverGrande_Flowers(timer >> 3, 7); } -static void sub_80A11FC(u16 timer) +static void TilesetAnim_Pacifidlog(u16 timer) { - static void sub_80A131C(u8); - static void sub_80A136C(u8); - - if ((timer & 0x0F) == 0) - sub_80A131C(timer >> 4); - if ((timer & 0x0F) == 1) - sub_80A136C(timer >> 4); + if (timer % 16 == 0) + QueueAnimTiles_Pacifidlog_LogBridges(timer >> 4); + if (timer % 16 == 1) + QueueAnimTiles_Pacifidlog_WaterCurrents(timer >> 4); } -static void sub_80A122C(u16 timer) +static void TilesetAnim_Sootopolis(u16 timer) { - static void sub_80A1798(u16); - - if ((timer & 0x0F) == 0) - sub_80A1798(timer >> 4); + if (timer % 16 == 0) + QueueAnimTiles_Sootopolis_StormyWater(timer >> 4); } -static void sub_80A1244(u16 timer) +static void TilesetAnim_Underwater(u16 timer) { - static void sub_80A1344(u8); - - if ((timer & 0x0F) == 0) - sub_80A1344(timer >> 4); + if (timer % 16 == 0) + QueueAnimTiles_Underwater_Seaweed(timer >> 4); } -static void sub_80A1260(u16 timer) +static void TilesetAnim_Cave(u16 timer) { - static void sub_80A14F8(u16); - - if ((timer & 0x0F) == 1) - sub_80A14F8(timer >> 4); + if (timer % 16 == 1) + QueueAnimTiles_Cave_Lava(timer >> 4); } -static void sub_80A127C(u16 timer) +static void TilesetAnim_BattleFrontierOutsideWest(u16 timer) { - static void sub_80A1548(u16); - - if ((timer & 0x07) == 0) - sub_80A1548(timer >> 3); + if (timer % 8 == 0) + QueueAnimTiles_BattleFrontierOutsideWest_Flag(timer >> 3); } -static void sub_80A1294(u16 timer) +static void TilesetAnim_BattleFrontierOutsideEast(u16 timer) { - static void sub_80A1570(u16); - - if ((timer & 0x07) == 0) - sub_80A1570(timer >> 3); + if (timer % 8 == 0) + QueueAnimTiles_BattleFrontierOutsideEast_Flag(timer >> 3); } -static void gTilesetAnims_LandWaterEdge (u16 timer) +static void QueueAnimTiles_General_LandWaterEdge(u16 timer) { - u16 idx; - - idx = timer % 4; - AppendTilesetAnimToBuffer(gTilesetAnims_General4[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(480)), 0x140); + u16 i = timer % 4; + AppendTilesetAnimToBuffer(gTilesetAnims_General_LandWaterEdge[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(480)), 0x140); } -static void sub_80A12D4(u8 timer) +static void QueueAnimTiles_Lavaridge_Steam(u8 timer) { - u8 idx; + u8 i = timer % 4; + AppendTilesetAnimToBuffer(gTilesetAnims_Lavaridge_Steam[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 288)), 0x80); - idx = timer % 4; - AppendTilesetAnimToBuffer(gTilesetAnims_Lavaridge0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 288)), 0x80); - - idx = (timer + 2) % 4; - AppendTilesetAnimToBuffer(gTilesetAnims_Lavaridge0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 292)), 0x80); + i = (timer + 2) % 4; + AppendTilesetAnimToBuffer(gTilesetAnims_Lavaridge_Steam[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 292)), 0x80); } -static void sub_80A131C(u8 timer) +static void QueueAnimTiles_Pacifidlog_LogBridges(u8 timer) { - u8 idx; - - idx = timer % 4; - AppendTilesetAnimToBuffer(gTilesetAnims_Pacifidlog0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 464)), 0x3C0); + u8 i = timer % 4; + AppendTilesetAnimToBuffer(gTilesetAnims_Pacifidlog_LogBridges[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 464)), 0x3C0); } -static void sub_80A1344(u8 timer) +static void QueueAnimTiles_Underwater_Seaweed(u8 timer) { - u8 idx; - - idx = timer % 4; - AppendTilesetAnimToBuffer(gTilesetAnims_Underwater0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 496)), 0x80); + u8 i = timer % 4; + AppendTilesetAnimToBuffer(gTilesetAnims_Underwater_Seaweed[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 496)), 0x80); } -static void sub_80A136C(u8 timer) +static void QueueAnimTiles_Pacifidlog_WaterCurrents(u8 timer) { - u8 idx; - - idx = timer % 8; - AppendTilesetAnimToBuffer(gTilesetAnims_Pacifidlog1[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 496)), 0x100); + u8 i = timer % 8; + AppendTilesetAnimToBuffer(gTilesetAnims_Pacifidlog_WaterCurrents[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 496)), 0x100); } -static void sub_80A1394(u16 timer_div, u8 timer_mod) +static void QueueAnimTiles_Mauville_Flowers(u16 timer_div, u8 timer_mod) { timer_div -= timer_mod; if (timer_div < 12) // almost certainly a typo { timer_div %= 12; - AppendTilesetAnimToBuffer(gTilesetAnims_Mauville0a[timer_div], gTilesetAnims_MauvilleVDests0[timer_mod], 0x80); - AppendTilesetAnimToBuffer(gTilesetAnims_Mauville0b[timer_div], gTilesetAnims_MauvilleVDests1[timer_mod], 0x80); + AppendTilesetAnimToBuffer(gTilesetAnims_Mauville_Flower1[timer_div], gTilesetAnims_Mauville_Flower1_VDests[timer_mod], 0x80); + AppendTilesetAnimToBuffer(gTilesetAnims_Mauville_Flower2[timer_div], gTilesetAnims_Mauville_Flower2_VDests[timer_mod], 0x80); } else { timer_div %= 4; - AppendTilesetAnimToBuffer(gTilesetAnims_Mauville1a[timer_div], gTilesetAnims_MauvilleVDests0[timer_mod], 0x80); - AppendTilesetAnimToBuffer(gTilesetAnims_Mauville1b[timer_div], gTilesetAnims_MauvilleVDests1[timer_mod], 0x80); + AppendTilesetAnimToBuffer(gTilesetAnims_Mauville_Flower1_B[timer_div], gTilesetAnims_Mauville_Flower1_VDests[timer_mod], 0x80); + AppendTilesetAnimToBuffer(gTilesetAnims_Mauville_Flower2_B[timer_div], gTilesetAnims_Mauville_Flower2_VDests[timer_mod], 0x80); } } -static void sub_80A1434(u16 timer_div, u8 timer_mod) +static void QueueAnimTiles_Rustboro_WindyWater(u16 timer_div, u8 timer_mod) { timer_div -= timer_mod; timer_div %= 8; - if (gTilesetAnims_Rustboro0[timer_div]) - AppendTilesetAnimToBuffer(gTilesetAnims_Rustboro0[timer_div], gTilesetAnims_RustboroVDests0[timer_mod], 0x80); + if (gTilesetAnims_Rustboro_WindyWater[timer_div]) + AppendTilesetAnimToBuffer(gTilesetAnims_Rustboro_WindyWater[timer_div], gTilesetAnims_Rustboro_WindyWater_VDests[timer_mod], 0x80); } -static void sub_80A1470(u16 timer) +static void QueueAnimTiles_Rustboro_Fountain(u16 timer) { - u16 idx; - - idx = timer % 2; - AppendTilesetAnimToBuffer(gTilesetAnims_Rustboro1[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 448)), 0x80); + u16 i = timer % 2; + AppendTilesetAnimToBuffer(gTilesetAnims_Rustboro_Fountain[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 448)), 0x80); } -static void sub_80A1498(u16 timer) +static void QueueAnimTiles_Lavaridge_Lava(u16 timer) { - u16 idx; - - idx = timer % 4; - AppendTilesetAnimToBuffer(gTilesetAnims_Lavaridge1_Cave0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 160)), 0x80); + u16 i = timer % 4; + AppendTilesetAnimToBuffer(gTilesetAnims_Lavaridge_Cave_Lava[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 160)), 0x80); } -static void sub_80A14C0(u16 timer_div, u8 timer_mod) +static void QueueAnimTiles_EverGrande_Flowers(u16 timer_div, u8 timer_mod) { timer_div -= timer_mod; timer_div %= 8; - AppendTilesetAnimToBuffer(gTilesetAnims_EverGrande0[timer_div], gTilesetAnims_EverGrandeVDests0[timer_mod], 0x80); + AppendTilesetAnimToBuffer(gTilesetAnims_EverGrande_Flowers[timer_div], gTilesetAnims_EverGrande_VDests[timer_mod], 0x80); } -static void sub_80A14F8(u16 timer) +static void QueueAnimTiles_Cave_Lava(u16 timer) { - u16 idx; - - idx = timer % 4; - AppendTilesetAnimToBuffer(gTilesetAnims_Lavaridge1_Cave0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 416)), 0x80); + u16 i = timer % 4; + AppendTilesetAnimToBuffer(gTilesetAnims_Lavaridge_Cave_Lava[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 416)), 0x80); } -static void sub_80A1520(u16 timer) +static void QueueAnimTiles_Dewford_Flag(u16 timer) { - u16 idx; - - idx = timer % 4; - AppendTilesetAnimToBuffer(gTilesetAnims_Dewford0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 170)), 0xC0); + u16 id = timer % 4; + AppendTilesetAnimToBuffer(gTilesetAnims_Dewford_Flag[id], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 170)), 0xC0); } -static void sub_80A1548(u16 timer) +static void QueueAnimTiles_BattleFrontierOutsideWest_Flag(u16 timer) { - u16 idx; - - idx = timer % 4; - AppendTilesetAnimToBuffer(gTilesetAnims_BattleFrontierOutsideWest0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 218)), 0xC0); + u16 i = timer % 4; + AppendTilesetAnimToBuffer(gTilesetAnims_BattleFrontierOutsideWest_Flag[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 218)), 0xC0); } -static void sub_80A1570(u16 timer) +static void QueueAnimTiles_BattleFrontierOutsideEast_Flag(u16 timer) { - u16 idx; - - idx = timer % 4; - AppendTilesetAnimToBuffer(gTilesetAnims_BattleFrontierOutsideEast0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 218)), 0xC0); + u16 i = timer % 4; + AppendTilesetAnimToBuffer(gTilesetAnims_BattleFrontierOutsideEast_Flag[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 218)), 0xC0); } -static void sub_80A1598(u16 timer) +static void QueueAnimTiles_Slateport_Balloons(u16 timer) { - u16 idx; - - idx = timer % 4; - AppendTilesetAnimToBuffer(gTilesetAnims_Slateport0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 224)), 0x80); + u16 i = timer % 4; + AppendTilesetAnimToBuffer(gTilesetAnims_Slateport_Balloons[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 224)), 0x80); } -static void sub_80A15C0(u16 timer) +static void TilesetAnim_MauvilleGym(u16 timer) { - static void sub_80A1748(u16); - - if ((timer & 1) == 0) - sub_80A1748(timer >> 1); + if (timer % 2 == 0) + QueueAnimTiles_MauvilleGym_ElectricGates(timer >> 1); } -static void sub_80A15D8(u16 timer) +static void TilesetAnim_SootopolisGym(u16 timer) { - static void sub_80A16B0(u16); - - if ((timer & 7) == 0) - sub_80A16B0(timer >> 3); + if (timer % 8 == 0) + QueueAnimTiles_SootopolisGym_Waterfalls(timer >> 3); } -static void sub_80A15F0(u16 timer) +static void TilesetAnim_EliteFour(u16 timer) { - static void sub_80A1720(u16); - static void sub_80A16F8(u16); - - if ((timer & 0x3f) == 1) - sub_80A1720(timer >> 6); - if ((timer & 0x07) == 1) - sub_80A16F8(timer >> 3); + if (timer % 64 == 1) + QueueAnimTiles_EliteFour_GroundLights(timer >> 6); + if (timer % 8 == 1) + QueueAnimTiles_EliteFour_WallLights(timer >> 3); } -static void sub_80A161C(u16 timer) -{ - static void sub_80A1770(u16); - if ((timer & 3) == 0) - sub_80A1770(timer >> 2); +static void TilesetAnim_BikeShop(u16 timer) +{ + if (timer % 4 == 0) + QueueAnimTiles_BikeShop_BlinkingLights(timer >> 2); } -static void sub_80A1634(u16 timer) +static void TilesetAnim_BattlePyramid(u16 timer) { - static void sub_80A17C0(u16); - static void sub_80A17EC(u16); - - if ((timer & 7) == 0) + if (timer % 8 == 0) { - sub_80A17C0(timer >> 3); - sub_80A17EC(timer >> 3); + QueueAnimTiles_BattlePyramid_Torch(timer >> 3); + QueueAnimTiles_BattlePyramid_StatueShadow(timer >> 3); } } -static void sub_80A1658(u16 timer) +static void TilesetAnim_BattleDome(u16 timer) { - static void sub_80A1818(u16); - - if ((timer & 3) == 0) - sub_80A1818(timer >> 2); + if (timer % 4 == 0) + BlendAnimPalette_BattleDome_FloorLights(timer >> 2); } -static void sub_80A1670(u16 timer) +static void TilesetAnim_BattleDome2(u16 timer) { - static void sub_80A1884(u16); - - if ((timer & 3) == 0) - sub_80A1884(timer >> 2); + if (timer % 4 == 0) + BlendAnimPalette_BattleDome_FloorLightsNoBlend(timer >> 2); } -static void sub_80A1688(u16 timer) +static void QueueAnimTiles_Building_TVTurnedOn(u16 timer) { - u16 idx; - - idx = timer % 2; - AppendTilesetAnimToBuffer(gTilesetAnims_InsideBuilding0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(496)), 0x80); + u16 i = timer % 2; + AppendTilesetAnimToBuffer(gTilesetAnims_Building_TvTurnedOn[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(496)), 0x80); } -static void sub_80A16B0(u16 timer) +static void QueueAnimTiles_SootopolisGym_Waterfalls(u16 timer) { - u16 idx; - - idx = timer % 3; - AppendTilesetAnimToBuffer(gTilesetAnims_SootopolisGym0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 496)), 0x180); - AppendTilesetAnimToBuffer(gTilesetAnims_SootopolisGym1[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 464)), 0x280); + u16 i = timer % 3; + AppendTilesetAnimToBuffer(gTilesetAnims_SootopolisGym_SideWaterfall[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 496)), 0x180); + AppendTilesetAnimToBuffer(gTilesetAnims_SootopolisGym_FrontWaterfall[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 464)), 0x280); } -static void sub_80A16F8(u16 timer) +static void QueueAnimTiles_EliteFour_WallLights(u16 timer) { - u16 idx; - - idx = timer % 4; - AppendTilesetAnimToBuffer(gTilesetAnims_EliteFour1[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 504)), 0x20); + u16 i = timer % 4; + AppendTilesetAnimToBuffer(gTilesetAnims_EliteFour_WallLights[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 504)), 0x20); } -static void sub_80A1720(u16 timer) +static void QueueAnimTiles_EliteFour_GroundLights(u16 timer) { - u16 idx; - - idx = timer % 2; - AppendTilesetAnimToBuffer(gTilesetAnims_EliteFour0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 480)), 0x80); + u16 i = timer % 2; + AppendTilesetAnimToBuffer(gTilesetAnims_EliteFour_FloorLight[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 480)), 0x80); } -static void sub_80A1748(u16 timer) +static void QueueAnimTiles_MauvilleGym_ElectricGates(u16 timer) { - u16 idx; - - idx = timer % 2; - AppendTilesetAnimToBuffer(gTilesetAnims_MauvilleGym0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 144)), 0x200); + u16 i = timer % 2; + AppendTilesetAnimToBuffer(gTilesetAnims_MauvilleGym_ElectricGates[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 144)), 0x200); } -static void sub_80A1770(u16 timer) +static void QueueAnimTiles_BikeShop_BlinkingLights(u16 timer) { - u16 idx; - - idx = timer % 2; - AppendTilesetAnimToBuffer(gTilesetAnims_BikeShop0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 496)), 0x120); + u16 i = timer % 2; + AppendTilesetAnimToBuffer(gTilesetAnims_BikeShop_BlinkingLights[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 496)), 0x120); } -static void sub_80A1798(u16 timer) +static void QueueAnimTiles_Sootopolis_StormyWater(u16 timer) { - u16 idx; - - idx = timer % 8; - AppendTilesetAnimToBuffer(gTilesetAnims_Sootopolis0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 240)), 0xc00); + u16 i = timer % 8; + AppendTilesetAnimToBuffer(gTilesetAnims_Sootopolis_StormyWater[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 240)), 0xc00); } -static void sub_80A17C0(u16 timer) +static void QueueAnimTiles_BattlePyramid_Torch(u16 timer) { - u16 idx; - - idx = timer % 3; - AppendTilesetAnimToBuffer(gTilesetAnims_BattlePyramid0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 151)), 0x100); + u16 i = timer % 3; + AppendTilesetAnimToBuffer(gTilesetAnims_BattlePyramid_Torch[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 151)), 0x100); } -static void sub_80A17EC(u16 timer) +static void QueueAnimTiles_BattlePyramid_StatueShadow(u16 timer) { - u16 idx; - - idx = timer % 3; - AppendTilesetAnimToBuffer(gTilesetAnims_BattlePyramid1[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 135)), 0x100); + u16 i = timer % 3; + AppendTilesetAnimToBuffer(gTilesetAnims_BattlePyramid_StatueShadow[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 135)), 0x100); } -static void sub_80A1818(u16 a1) +static void BlendAnimPalette_BattleDome_FloorLights(u16 timer) { - CpuCopy16(gTilesetAnims_BattleDomePals0[a1 & 0x3], gPlttBufferUnfaded + 0x80, 32); - BlendPalette(0x80, 0x10, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF); + CpuCopy16(gTilesetAnims_BattleDomeFloorLightPals[timer % 4], gPlttBufferUnfaded + 0x80, 32); + BlendPalette(0x80, 16, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF); if ((u8)FindTaskIdByFunc(TransitionPhase1_Task_RunFuncs) != 0xFF ) { - sSecondaryTilesetCB = sub_80A1670; - sSecondaryTilesetCBBufferSize = 0x20; + sSecondaryTilesetAnimCallback = TilesetAnim_BattleDome2; + sSecondaryTilesetAnimCounterMax = 32; } } -static void sub_80A1884(u16 a1) +static void BlendAnimPalette_BattleDome_FloorLightsNoBlend(u16 timer) { - CpuCopy16(gTilesetAnims_BattleDomePals0[a1 & 0x3], gPlttBufferUnfaded + 0x80, 32); + CpuCopy16(gTilesetAnims_BattleDomeFloorLightPals[timer % 4], gPlttBufferUnfaded + 0x80, 32); if ((u8)FindTaskIdByFunc(TransitionPhase1_Task_RunFuncs) == 0xFF ) { - BlendPalette(0x80, 0x10, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF); - if (!--sSecondaryTilesetCBBufferSize) - sSecondaryTilesetCB = NULL; + BlendPalette(0x80, 16, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF); + if (!--sSecondaryTilesetAnimCounterMax) + sSecondaryTilesetAnimCallback = NULL; } } -- cgit v1.2.3