diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index 4ebc03c8c9..b9ce0c8092 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -584,7 +584,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_ReceivePokedex:: @ 81FA3AC message LittlerootTown_ProfessorBirchsLab_Text_ReceivedPokedex waitfanfare setflag FLAG_SYS_POKEDEX_GET - special sub_81AFDA0 @ sets flags that are never read + special SetUnlockedPokedexFlags setflag FLAG_RECEIVED_POKEDEX_FROM_BIRCH setvar VAR_CABLE_CLUB_TUTORIAL_STATE, 1 return diff --git a/data/specials.inc b/data/specials.inc index fb2e8fe755..97cc3c782e 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -504,7 +504,7 @@ gSpecials:: @ 81DBA64 def_special GetMartEmployeeObjectEventId def_special sub_80A08CC def_special Unused_SetWeatherSunny - def_special sub_81AFDA0 + def_special SetUnlockedPokedexFlags def_special IsTrainerRegistered def_special ShouldDoBrailleRegicePuzzle def_special EnableNationalPokedex diff --git a/data/tilesets/primary/building/anim/tv_turned_on/0.png b/data/tilesets/primary/building/anim/tv_turned_on/0.png index 1d98f3621c..65645fb73c 100644 Binary files a/data/tilesets/primary/building/anim/tv_turned_on/0.png 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 index 6798473b72..6ecb516e3b 100644 Binary files a/data/tilesets/primary/building/anim/tv_turned_on/1.png and b/data/tilesets/primary/building/anim/tv_turned_on/1.png differ diff --git a/data/tilesets/primary/general/anim/flower/0.png b/data/tilesets/primary/general/anim/flower/0.png index 1254a7655c..106b75af5a 100644 Binary files a/data/tilesets/primary/general/anim/flower/0.png 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 index 50bd949f28..cf35dfd6c1 100644 Binary files a/data/tilesets/primary/general/anim/flower/1.png 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 index 5d8192c9dc..d482e5475e 100644 Binary files a/data/tilesets/primary/general/anim/flower/2.png 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 index ba160b6333..c1dcd5f5a2 100644 Binary files a/data/tilesets/primary/general/anim/land_water_edge/0.png 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 index 48274c9a0a..75aea1193a 100644 Binary files a/data/tilesets/primary/general/anim/land_water_edge/1.png 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 index 9e1f98c1bc..bafda3aa27 100644 Binary files a/data/tilesets/primary/general/anim/land_water_edge/2.png 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 index c5b446f655..8d9645f6b7 100644 Binary files a/data/tilesets/primary/general/anim/land_water_edge/3.png 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 index 80c99c4739..46dcf9088d 100644 Binary files a/data/tilesets/primary/general/anim/sand_water_edge/0.png 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 index 52051f056b..4188eefbe3 100644 Binary files a/data/tilesets/primary/general/anim/sand_water_edge/1.png 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 index 39c6e2f873..f414a71ae4 100644 Binary files a/data/tilesets/primary/general/anim/sand_water_edge/2.png 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 index abb5ff362e..0a8fc0514e 100644 Binary files a/data/tilesets/primary/general/anim/sand_water_edge/3.png 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 index a7bde98371..202cf97d52 100644 Binary files a/data/tilesets/primary/general/anim/sand_water_edge/4.png 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 index 05f88d81e8..3f984d0acf 100644 Binary files a/data/tilesets/primary/general/anim/sand_water_edge/5.png 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 index 01f9c203de..9c60501deb 100644 Binary files a/data/tilesets/primary/general/anim/sand_water_edge/6.png 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 index d3f2ea0da6..209b93b291 100644 Binary files a/data/tilesets/primary/general/anim/water/0.png 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 index 86b0ff1764..cf07461b63 100644 Binary files a/data/tilesets/primary/general/anim/water/1.png 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 index d2302180e2..28fc4de471 100644 Binary files a/data/tilesets/primary/general/anim/water/2.png 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 index f757f8253e..3440c0970a 100644 Binary files a/data/tilesets/primary/general/anim/water/3.png 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 index 950b885850..994d08a12a 100644 Binary files a/data/tilesets/primary/general/anim/water/4.png 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 index 4de7d4225e..227dbaed88 100644 Binary files a/data/tilesets/primary/general/anim/water/5.png 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 index 73c1cabdd2..05e05510e8 100644 Binary files a/data/tilesets/primary/general/anim/water/6.png 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 index 827fd8b740..fa295f8524 100644 Binary files a/data/tilesets/primary/general/anim/water/7.png 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 index e307d81aa7..f69a4686b3 100644 Binary files a/data/tilesets/primary/general/anim/waterfall/0.png 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 index df6aaf3bca..9a3c68c8f4 100644 Binary files a/data/tilesets/primary/general/anim/waterfall/1.png 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 index 560f89d066..4d09e8de9b 100644 Binary files a/data/tilesets/primary/general/anim/waterfall/2.png 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 index a8db289aee..0c50e43fb0 100644 Binary files a/data/tilesets/primary/general/anim/waterfall/3.png and b/data/tilesets/primary/general/anim/waterfall/3.png 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 index 98f1a92838..b5621be76e 100644 Binary files a/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/0.png 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 index d0254e9ee4..56a46ce92a 100644 Binary files a/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/1.png 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 index 1be9641b86..e51f5b5312 100644 Binary files a/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/2.png 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 index 7a536f24c0..3ec6ff703c 100644 Binary files a/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/3.png 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/flag/0.png b/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/0.png index 98f1a92838..b5621be76e 100644 Binary files a/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/0.png 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 index d0254e9ee4..56a46ce92a 100644 Binary files a/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/1.png 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 index 1be9641b86..e51f5b5312 100644 Binary files a/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/2.png 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 index 7a536f24c0..3ec6ff703c 100644 Binary files a/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/3.png and b/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/3.png 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 index c135df8246..552bdbe0c9 100644 Binary files a/data/tilesets/secondary/battle_pyramid/anim/statue_shadow/0.png 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 index 2588bdac06..3b6f481e88 100644 Binary files a/data/tilesets/secondary/battle_pyramid/anim/statue_shadow/1.png 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 index fbbf67d2fc..cb0569e785 100644 Binary files a/data/tilesets/secondary/battle_pyramid/anim/statue_shadow/2.png 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 index 04bb8ad849..4becd1edcf 100644 Binary files a/data/tilesets/secondary/battle_pyramid/anim/torch/0.png 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 index e292686f98..91bdf8ac50 100644 Binary files a/data/tilesets/secondary/battle_pyramid/anim/torch/1.png 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 index fa24db001c..fb6153b4fc 100644 Binary files a/data/tilesets/secondary/battle_pyramid/anim/torch/2.png and b/data/tilesets/secondary/battle_pyramid/anim/torch/2.png 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 index 127ed4e47a..f8bafb21b8 100644 Binary files a/data/tilesets/secondary/bike_shop/anim/blinking_lights/0.png 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 index 71f12a7460..d5e22861d5 100644 Binary files a/data/tilesets/secondary/bike_shop/anim/blinking_lights/1.png and b/data/tilesets/secondary/bike_shop/anim/blinking_lights/1.png differ diff --git a/data/tilesets/secondary/cave/anim/lava/0.png b/data/tilesets/secondary/cave/anim/lava/0.png index e98a161ebc..66a0472f5e 100644 Binary files a/data/tilesets/secondary/cave/anim/lava/0.png 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 index 12ffcd12c5..0b2a826c24 100644 Binary files a/data/tilesets/secondary/cave/anim/lava/1.png 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 index c5be89c00f..9a1eedddff 100644 Binary files a/data/tilesets/secondary/cave/anim/lava/2.png 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 index 635a811547..6656b0c80a 100644 Binary files a/data/tilesets/secondary/cave/anim/lava/3.png 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 index cea6ece857..a3d77615aa 100644 Binary files a/data/tilesets/secondary/cave/anim/lava/4.png 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 index 01d8a300ab..c1469938af 100644 Binary files a/data/tilesets/secondary/cave/anim/lava/5.png 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 index ba13bda8cc..41afe9d1fa 100644 Binary files a/data/tilesets/secondary/cave/anim/lava/6.png 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 index 117f04aa4d..a6a04ffb6f 100644 Binary files a/data/tilesets/secondary/cave/anim/lava/7.png and b/data/tilesets/secondary/cave/anim/lava/7.png differ diff --git a/data/tilesets/secondary/dewford/anim/flag/0.png b/data/tilesets/secondary/dewford/anim/flag/0.png index f80971c453..c2d69b2e23 100644 Binary files a/data/tilesets/secondary/dewford/anim/flag/0.png 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 index b98d9cafb1..556d21170f 100644 Binary files a/data/tilesets/secondary/dewford/anim/flag/1.png 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 index 6f88f493f7..372a9a5db0 100644 Binary files a/data/tilesets/secondary/dewford/anim/flag/2.png 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 index b95b4bc9e2..6190ce3cd2 100644 Binary files a/data/tilesets/secondary/dewford/anim/flag/3.png and b/data/tilesets/secondary/dewford/anim/flag/3.png 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 index 6e508308b7..f5c4168c30 100644 Binary files a/data/tilesets/secondary/elite_four/anim/floor_light/0.png 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 index 794f26195f..e7e66e611e 100644 Binary files a/data/tilesets/secondary/elite_four/anim/floor_light/1.png 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 index 108a2099be..3ce30e90b3 100644 Binary files a/data/tilesets/secondary/elite_four/anim/wall_lights/0.png 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 index 64b23f0613..d28ff55152 100644 Binary files a/data/tilesets/secondary/elite_four/anim/wall_lights/1.png 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 index 0d9f603fc3..9a18c5c46f 100644 Binary files a/data/tilesets/secondary/elite_four/anim/wall_lights/2.png 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 index 64b23f0613..d28ff55152 100644 Binary files a/data/tilesets/secondary/elite_four/anim/wall_lights/3.png and b/data/tilesets/secondary/elite_four/anim/wall_lights/3.png differ diff --git a/data/tilesets/secondary/ever_grande/anim/flowers/0.png b/data/tilesets/secondary/ever_grande/anim/flowers/0.png index ac03df40bb..6493e2e821 100644 Binary files a/data/tilesets/secondary/ever_grande/anim/flowers/0.png 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 index ac03df40bb..6493e2e821 100644 Binary files a/data/tilesets/secondary/ever_grande/anim/flowers/1.png 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 index 4f8baa2a30..0b1f568cbf 100644 Binary files a/data/tilesets/secondary/ever_grande/anim/flowers/2.png 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 index f120dee16e..edc7220b8f 100644 Binary files a/data/tilesets/secondary/ever_grande/anim/flowers/3.png 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 index ac03df40bb..6493e2e821 100644 Binary files a/data/tilesets/secondary/ever_grande/anim/flowers/4.png 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 index ac03df40bb..6493e2e821 100644 Binary files a/data/tilesets/secondary/ever_grande/anim/flowers/5.png 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 index d7cfd45294..4d43dfd0a9 100644 Binary files a/data/tilesets/secondary/ever_grande/anim/flowers/6.png 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 index d7cfd45294..4d43dfd0a9 100644 Binary files a/data/tilesets/secondary/ever_grande/anim/flowers/7.png and b/data/tilesets/secondary/ever_grande/anim/flowers/7.png differ diff --git a/data/tilesets/secondary/lavaridge/anim/steam/0.png b/data/tilesets/secondary/lavaridge/anim/steam/0.png index 434041fbd8..adf450afd7 100644 Binary files a/data/tilesets/secondary/lavaridge/anim/steam/0.png 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 index ebc028ed49..df7ad34195 100644 Binary files a/data/tilesets/secondary/lavaridge/anim/steam/1.png 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 index aee227f05d..2a8c8a28ca 100644 Binary files a/data/tilesets/secondary/lavaridge/anim/steam/2.png 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 index 99149ae625..8dcaa6c82c 100644 Binary files a/data/tilesets/secondary/lavaridge/anim/steam/3.png and b/data/tilesets/secondary/lavaridge/anim/steam/3.png differ diff --git a/data/tilesets/secondary/mauville/anim/flower_1/0.png b/data/tilesets/secondary/mauville/anim/flower_1/0.png index b20c5470ee..263dba0700 100644 Binary files a/data/tilesets/secondary/mauville/anim/flower_1/0.png 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 index 0587295fc5..66179f13dd 100644 Binary files a/data/tilesets/secondary/mauville/anim/flower_1/1.png 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 index af0dd4ffe3..63250e7b03 100644 Binary files a/data/tilesets/secondary/mauville/anim/flower_1/2.png 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 index bc132f2ef5..b1015d370b 100644 Binary files a/data/tilesets/secondary/mauville/anim/flower_1/3.png 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 index 911b980a3c..1e8cb84afe 100644 Binary files a/data/tilesets/secondary/mauville/anim/flower_1/4.png 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 index b20c5470ee..263dba0700 100644 Binary files a/data/tilesets/secondary/mauville/anim/flower_2/0.png 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 index 0587295fc5..66179f13dd 100644 Binary files a/data/tilesets/secondary/mauville/anim/flower_2/1.png 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 index af0dd4ffe3..63250e7b03 100644 Binary files a/data/tilesets/secondary/mauville/anim/flower_2/2.png 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 index bc132f2ef5..b1015d370b 100644 Binary files a/data/tilesets/secondary/mauville/anim/flower_2/3.png 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 index 911b980a3c..1e8cb84afe 100644 Binary files a/data/tilesets/secondary/mauville/anim/flower_2/4.png and b/data/tilesets/secondary/mauville/anim/flower_2/4.png 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 index ebf603978c..91659efd1a 100644 Binary files a/data/tilesets/secondary/mauville_gym/anim/electric_gates/0.png 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 index 34072707ff..f766cc8e5e 100644 Binary files a/data/tilesets/secondary/mauville_gym/anim/electric_gates/1.png and b/data/tilesets/secondary/mauville_gym/anim/electric_gates/1.png differ diff --git a/data/tilesets/secondary/pacifidlog/anim/log_bridges/0.png b/data/tilesets/secondary/pacifidlog/anim/log_bridges/0.png index 316eb500e3..f7aa47448a 100644 Binary files a/data/tilesets/secondary/pacifidlog/anim/log_bridges/0.png 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 index ee9d4316e1..d0ae0b0a51 100644 Binary files a/data/tilesets/secondary/pacifidlog/anim/log_bridges/1.png 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 index 221a715854..014654cf64 100644 Binary files a/data/tilesets/secondary/pacifidlog/anim/log_bridges/2.png 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 index 6d432eb25c..6b692db41f 100644 Binary files a/data/tilesets/secondary/pacifidlog/anim/water_currents/0.png 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 index 7588b8a724..03d984291d 100644 Binary files a/data/tilesets/secondary/pacifidlog/anim/water_currents/1.png 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 index 2a11e5065e..bf4c33de94 100644 Binary files a/data/tilesets/secondary/pacifidlog/anim/water_currents/2.png 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 index be4089ff40..67b816d387 100644 Binary files a/data/tilesets/secondary/pacifidlog/anim/water_currents/3.png 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 index 4c16111def..7a23b7231b 100644 Binary files a/data/tilesets/secondary/pacifidlog/anim/water_currents/4.png 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 index 93bbc63750..eee9756e30 100644 Binary files a/data/tilesets/secondary/pacifidlog/anim/water_currents/5.png 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 index b08f5a0d97..1ba88117fd 100644 Binary files a/data/tilesets/secondary/pacifidlog/anim/water_currents/6.png 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 index 1a5f0ae5c4..2c3c079b90 100644 Binary files a/data/tilesets/secondary/pacifidlog/anim/water_currents/7.png and b/data/tilesets/secondary/pacifidlog/anim/water_currents/7.png differ diff --git a/data/tilesets/secondary/rustboro/anim/fountain/0.png b/data/tilesets/secondary/rustboro/anim/fountain/0.png index 07471595bf..1208344d88 100644 Binary files a/data/tilesets/secondary/rustboro/anim/fountain/0.png 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 index 408f2b03aa..456e5a2508 100644 Binary files a/data/tilesets/secondary/rustboro/anim/fountain/1.png 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 index af00b97c79..2e648b8348 100644 Binary files a/data/tilesets/secondary/rustboro/anim/windy_water/0.png 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 index 20b1ef630a..143e9d12d5 100644 Binary files a/data/tilesets/secondary/rustboro/anim/windy_water/1.png 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 index 44c4b2cdc2..94820fcb0f 100644 Binary files a/data/tilesets/secondary/rustboro/anim/windy_water/2.png 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 index 44c4b2cdc2..94820fcb0f 100644 Binary files a/data/tilesets/secondary/rustboro/anim/windy_water/3.png 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 index 44c4b2cdc2..94820fcb0f 100644 Binary files a/data/tilesets/secondary/rustboro/anim/windy_water/4.png 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 index 44c4b2cdc2..94820fcb0f 100644 Binary files a/data/tilesets/secondary/rustboro/anim/windy_water/5.png 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 index 44c4b2cdc2..94820fcb0f 100644 Binary files a/data/tilesets/secondary/rustboro/anim/windy_water/6.png 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 index 44c4b2cdc2..94820fcb0f 100644 Binary files a/data/tilesets/secondary/rustboro/anim/windy_water/7.png and b/data/tilesets/secondary/rustboro/anim/windy_water/7.png differ diff --git a/data/tilesets/secondary/slateport/anim/balloons/0.png b/data/tilesets/secondary/slateport/anim/balloons/0.png index 28bf60f26a..eb98084677 100644 Binary files a/data/tilesets/secondary/slateport/anim/balloons/0.png 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 index 31d22f6972..65df1eaa0d 100644 Binary files a/data/tilesets/secondary/slateport/anim/balloons/1.png 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 index 83b0e39403..47dd73ae44 100644 Binary files a/data/tilesets/secondary/slateport/anim/balloons/2.png 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 index 31d22f6972..65df1eaa0d 100644 Binary files a/data/tilesets/secondary/slateport/anim/balloons/3.png and b/data/tilesets/secondary/slateport/anim/balloons/3.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/0.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/0.png deleted file mode 100644 index 6ae032652c..0000000000 Binary files a/data/tilesets/secondary/sootopolis/anim/stormy_water/0.png and /dev/null differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/0_groudon.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/0_groudon.png new file mode 100644 index 0000000000..05276dd611 Binary files /dev/null and b/data/tilesets/secondary/sootopolis/anim/stormy_water/0_groudon.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/0_kyogre.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/0_kyogre.png new file mode 100644 index 0000000000..ce6f8e5e64 Binary files /dev/null and b/data/tilesets/secondary/sootopolis/anim/stormy_water/0_kyogre.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/1.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/1.png deleted file mode 100644 index 5bf8f7a98a..0000000000 Binary files a/data/tilesets/secondary/sootopolis/anim/stormy_water/1.png and /dev/null differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/1_groudon.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/1_groudon.png new file mode 100644 index 0000000000..e59bdf7474 Binary files /dev/null and b/data/tilesets/secondary/sootopolis/anim/stormy_water/1_groudon.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/1_kyogre.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/1_kyogre.png new file mode 100644 index 0000000000..9e7e1ab5ad Binary files /dev/null and b/data/tilesets/secondary/sootopolis/anim/stormy_water/1_kyogre.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/2.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/2.png deleted file mode 100644 index 85598e1459..0000000000 Binary files a/data/tilesets/secondary/sootopolis/anim/stormy_water/2.png and /dev/null differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/2_groudon.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/2_groudon.png new file mode 100644 index 0000000000..0d59d5e16a Binary files /dev/null and b/data/tilesets/secondary/sootopolis/anim/stormy_water/2_groudon.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/2_kyogre.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/2_kyogre.png new file mode 100644 index 0000000000..71ce73e8bb Binary files /dev/null and b/data/tilesets/secondary/sootopolis/anim/stormy_water/2_kyogre.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/3.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/3.png deleted file mode 100644 index c7aad10c7d..0000000000 Binary files a/data/tilesets/secondary/sootopolis/anim/stormy_water/3.png and /dev/null differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/3_groudon.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/3_groudon.png new file mode 100644 index 0000000000..4aded92e4b Binary files /dev/null and b/data/tilesets/secondary/sootopolis/anim/stormy_water/3_groudon.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/3_kyogre.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/3_kyogre.png new file mode 100644 index 0000000000..a305f6ab08 Binary files /dev/null and b/data/tilesets/secondary/sootopolis/anim/stormy_water/3_kyogre.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/4.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/4.png deleted file mode 100644 index ec446b9dba..0000000000 Binary files a/data/tilesets/secondary/sootopolis/anim/stormy_water/4.png and /dev/null differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/4_groudon.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/4_groudon.png new file mode 100644 index 0000000000..d4618ab9cd Binary files /dev/null and b/data/tilesets/secondary/sootopolis/anim/stormy_water/4_groudon.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/4_kyogre.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/4_kyogre.png new file mode 100644 index 0000000000..ddb2572139 Binary files /dev/null and b/data/tilesets/secondary/sootopolis/anim/stormy_water/4_kyogre.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/5.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/5.png deleted file mode 100644 index cbe1769c08..0000000000 Binary files a/data/tilesets/secondary/sootopolis/anim/stormy_water/5.png and /dev/null differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/5_groudon.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/5_groudon.png new file mode 100644 index 0000000000..4e59ead20f Binary files /dev/null and b/data/tilesets/secondary/sootopolis/anim/stormy_water/5_groudon.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/5_kyogre.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/5_kyogre.png new file mode 100644 index 0000000000..f3e24ef7bc Binary files /dev/null and b/data/tilesets/secondary/sootopolis/anim/stormy_water/5_kyogre.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/6.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/6.png deleted file mode 100644 index 690c5fd8ef..0000000000 Binary files a/data/tilesets/secondary/sootopolis/anim/stormy_water/6.png and /dev/null differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/6_groudon.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/6_groudon.png new file mode 100644 index 0000000000..1aea2dc7b2 Binary files /dev/null and b/data/tilesets/secondary/sootopolis/anim/stormy_water/6_groudon.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/6_kyogre.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/6_kyogre.png new file mode 100644 index 0000000000..2d7dc677f5 Binary files /dev/null and b/data/tilesets/secondary/sootopolis/anim/stormy_water/6_kyogre.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/7.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/7.png deleted file mode 100644 index e4026a02f8..0000000000 Binary files a/data/tilesets/secondary/sootopolis/anim/stormy_water/7.png and /dev/null differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/7_groudon.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/7_groudon.png new file mode 100644 index 0000000000..4d9a556a46 Binary files /dev/null and b/data/tilesets/secondary/sootopolis/anim/stormy_water/7_groudon.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/stormy_water/7_kyogre.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/7_kyogre.png new file mode 100644 index 0000000000..691af34b67 Binary files /dev/null and b/data/tilesets/secondary/sootopolis/anim/stormy_water/7_kyogre.png differ diff --git a/data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/0.png b/data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/0.png index dc6cf500e1..edac313cab 100644 Binary files a/data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/0.png 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 index 93dd797530..83adf5f3ea 100644 Binary files a/data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/1.png 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 index 30961482cb..0f4daa7a55 100644 Binary files a/data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/2.png 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 index 180b5522ed..75b24e1c5c 100644 Binary files a/data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/0.png 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 index af3ab12d2e..e24fc8ab27 100644 Binary files a/data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/1.png 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 index 8481c0cde8..1a1e4114d0 100644 Binary files a/data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/2.png and b/data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/2.png differ diff --git a/data/tilesets/secondary/underwater/anim/seaweed/0.png b/data/tilesets/secondary/underwater/anim/seaweed/0.png index fab28e54f3..0bc01624f8 100644 Binary files a/data/tilesets/secondary/underwater/anim/seaweed/0.png 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 index 869bc60604..6562f2a3ad 100644 Binary files a/data/tilesets/secondary/underwater/anim/seaweed/1.png 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 index 64e4b267de..9c18258de2 100644 Binary files a/data/tilesets/secondary/underwater/anim/seaweed/2.png 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 index 0c13920112..28b0081ff0 100644 Binary files a/data/tilesets/secondary/underwater/anim/seaweed/3.png and b/data/tilesets/secondary/underwater/anim/seaweed/3.png differ diff --git a/graphics/decorations/attract_mat.png b/graphics/decorations/attract_mat.png new file mode 100644 index 0000000000..77e077a718 Binary files /dev/null and b/graphics/decorations/attract_mat.png differ diff --git a/graphics/decorations/big_plant.png b/graphics/decorations/big_plant.png new file mode 100644 index 0000000000..5f5cac3b38 Binary files /dev/null and b/graphics/decorations/big_plant.png differ diff --git a/graphics/decorations/blastoise_doll.png b/graphics/decorations/blastoise_doll.png new file mode 100644 index 0000000000..a7b0ee6e48 Binary files /dev/null and b/graphics/decorations/blastoise_doll.png differ diff --git a/graphics/decorations/blue_brick.png b/graphics/decorations/blue_brick.png new file mode 100644 index 0000000000..cb187beb10 Binary files /dev/null and b/graphics/decorations/blue_brick.png differ diff --git a/graphics/decorations/blue_tent.png b/graphics/decorations/blue_tent.png new file mode 100644 index 0000000000..f94a61e368 Binary files /dev/null and b/graphics/decorations/blue_tent.png differ diff --git a/graphics/decorations/breakable_door.png b/graphics/decorations/breakable_door.png new file mode 100644 index 0000000000..b96bfe96b0 Binary files /dev/null and b/graphics/decorations/breakable_door.png differ diff --git a/graphics/decorations/brick_desk.png b/graphics/decorations/brick_desk.png new file mode 100644 index 0000000000..c81082bf89 Binary files /dev/null and b/graphics/decorations/brick_desk.png differ diff --git a/graphics/decorations/camp_desk.png b/graphics/decorations/camp_desk.png new file mode 100644 index 0000000000..6a1bf68c91 Binary files /dev/null and b/graphics/decorations/camp_desk.png differ diff --git a/graphics/decorations/charizard_doll.png b/graphics/decorations/charizard_doll.png new file mode 100644 index 0000000000..cb1acc7289 Binary files /dev/null and b/graphics/decorations/charizard_doll.png differ diff --git a/graphics/decorations/colorful_plant.png b/graphics/decorations/colorful_plant.png new file mode 100644 index 0000000000..fdbb43c330 Binary files /dev/null and b/graphics/decorations/colorful_plant.png differ diff --git a/graphics/decorations/comfort_desk.png b/graphics/decorations/comfort_desk.png new file mode 100644 index 0000000000..3e81301dfe Binary files /dev/null and b/graphics/decorations/comfort_desk.png differ diff --git a/graphics/decorations/decor_attract_mat.png b/graphics/decorations/decor_attract_mat.png deleted file mode 100644 index 16528d9f39..0000000000 Binary files a/graphics/decorations/decor_attract_mat.png and /dev/null differ diff --git a/graphics/decorations/decor_big_plant.png b/graphics/decorations/decor_big_plant.png deleted file mode 100644 index e5eedd8591..0000000000 Binary files a/graphics/decorations/decor_big_plant.png and /dev/null differ diff --git a/graphics/decorations/decor_blastoise_doll.png b/graphics/decorations/decor_blastoise_doll.png deleted file mode 100644 index 00c55f229e..0000000000 Binary files a/graphics/decorations/decor_blastoise_doll.png and /dev/null differ diff --git a/graphics/decorations/decor_blue_brick.png b/graphics/decorations/decor_blue_brick.png deleted file mode 100644 index 88e0587127..0000000000 Binary files a/graphics/decorations/decor_blue_brick.png and /dev/null differ diff --git a/graphics/decorations/decor_blue_tent.png b/graphics/decorations/decor_blue_tent.png deleted file mode 100644 index 575b352410..0000000000 Binary files a/graphics/decorations/decor_blue_tent.png and /dev/null differ diff --git a/graphics/decorations/decor_breakable_door.png b/graphics/decorations/decor_breakable_door.png deleted file mode 100644 index 01ba82d28a..0000000000 Binary files a/graphics/decorations/decor_breakable_door.png and /dev/null differ diff --git a/graphics/decorations/decor_brick_desk.png b/graphics/decorations/decor_brick_desk.png deleted file mode 100644 index 829e453497..0000000000 Binary files a/graphics/decorations/decor_brick_desk.png and /dev/null differ diff --git a/graphics/decorations/decor_camp_desk.png b/graphics/decorations/decor_camp_desk.png deleted file mode 100644 index b40429229a..0000000000 Binary files a/graphics/decorations/decor_camp_desk.png and /dev/null differ diff --git a/graphics/decorations/decor_charizard_doll.png b/graphics/decorations/decor_charizard_doll.png deleted file mode 100644 index ffc3dfcef7..0000000000 Binary files a/graphics/decorations/decor_charizard_doll.png and /dev/null differ diff --git a/graphics/decorations/decor_colorful_plant.png b/graphics/decorations/decor_colorful_plant.png deleted file mode 100644 index cc0efecc74..0000000000 Binary files a/graphics/decorations/decor_colorful_plant.png and /dev/null differ diff --git a/graphics/decorations/decor_comfort_desk.png b/graphics/decorations/decor_comfort_desk.png deleted file mode 100644 index e7a72ff080..0000000000 Binary files a/graphics/decorations/decor_comfort_desk.png and /dev/null differ diff --git a/graphics/decorations/decor_fire_blast_mat.png b/graphics/decorations/decor_fire_blast_mat.png deleted file mode 100644 index 510675ee62..0000000000 Binary files a/graphics/decorations/decor_fire_blast_mat.png and /dev/null differ diff --git a/graphics/decorations/decor_fissure_mat.png b/graphics/decorations/decor_fissure_mat.png deleted file mode 100644 index 6de66ef9d6..0000000000 Binary files a/graphics/decorations/decor_fissure_mat.png and /dev/null differ diff --git a/graphics/decorations/decor_glass_ornament.png b/graphics/decorations/decor_glass_ornament.png deleted file mode 100644 index fcc895eb9f..0000000000 Binary files a/graphics/decorations/decor_glass_ornament.png and /dev/null differ diff --git a/graphics/decorations/decor_gorgeous_plant.png b/graphics/decorations/decor_gorgeous_plant.png deleted file mode 100644 index dc8639c657..0000000000 Binary files a/graphics/decorations/decor_gorgeous_plant.png and /dev/null differ diff --git a/graphics/decorations/decor_hard_desk.png b/graphics/decorations/decor_hard_desk.png deleted file mode 100644 index aa0c7feeac..0000000000 Binary files a/graphics/decorations/decor_hard_desk.png and /dev/null differ diff --git a/graphics/decorations/decor_heavy_desk.png b/graphics/decorations/decor_heavy_desk.png deleted file mode 100644 index 141bcd8317..0000000000 Binary files a/graphics/decorations/decor_heavy_desk.png and /dev/null differ diff --git a/graphics/decorations/decor_lapras_doll.png b/graphics/decorations/decor_lapras_doll.png deleted file mode 100644 index 517553a4a9..0000000000 Binary files a/graphics/decorations/decor_lapras_doll.png and /dev/null differ diff --git a/graphics/decorations/decor_powder_snow_mat.png b/graphics/decorations/decor_powder_snow_mat.png deleted file mode 100644 index 82dbbfa668..0000000000 Binary files a/graphics/decorations/decor_powder_snow_mat.png and /dev/null differ diff --git a/graphics/decorations/decor_pretty_desk.png b/graphics/decorations/decor_pretty_desk.png deleted file mode 100644 index 5be05ebcbf..0000000000 Binary files a/graphics/decorations/decor_pretty_desk.png and /dev/null differ diff --git a/graphics/decorations/decor_pretty_flowers.png b/graphics/decorations/decor_pretty_flowers.png deleted file mode 100644 index b9fc0f5de2..0000000000 Binary files a/graphics/decorations/decor_pretty_flowers.png and /dev/null differ diff --git a/graphics/decorations/decor_ragged_desk.png b/graphics/decorations/decor_ragged_desk.png deleted file mode 100644 index 953c1862fe..0000000000 Binary files a/graphics/decorations/decor_ragged_desk.png and /dev/null differ diff --git a/graphics/decorations/decor_red_brick.png b/graphics/decorations/decor_red_brick.png deleted file mode 100644 index 3481044dde..0000000000 Binary files a/graphics/decorations/decor_red_brick.png and /dev/null differ diff --git a/graphics/decorations/decor_red_plant.png b/graphics/decorations/decor_red_plant.png deleted file mode 100644 index c12e656f7a..0000000000 Binary files a/graphics/decorations/decor_red_plant.png and /dev/null differ diff --git a/graphics/decorations/decor_red_tent.png b/graphics/decorations/decor_red_tent.png deleted file mode 100644 index 22e435691c..0000000000 Binary files a/graphics/decorations/decor_red_tent.png and /dev/null differ diff --git a/graphics/decorations/decor_regice_doll.png b/graphics/decorations/decor_regice_doll.png deleted file mode 100644 index 88a28df6dd..0000000000 Binary files a/graphics/decorations/decor_regice_doll.png and /dev/null differ diff --git a/graphics/decorations/decor_regirock_doll.png b/graphics/decorations/decor_regirock_doll.png deleted file mode 100644 index 16372281c1..0000000000 Binary files a/graphics/decorations/decor_regirock_doll.png and /dev/null differ diff --git a/graphics/decorations/decor_registeel_doll.png b/graphics/decorations/decor_registeel_doll.png deleted file mode 100644 index f06de37ab1..0000000000 Binary files a/graphics/decorations/decor_registeel_doll.png and /dev/null differ diff --git a/graphics/decorations/decor_rhydon_doll.png b/graphics/decorations/decor_rhydon_doll.png deleted file mode 100644 index ac4714c355..0000000000 Binary files a/graphics/decorations/decor_rhydon_doll.png and /dev/null differ diff --git a/graphics/decorations/decor_sand_ornament.png b/graphics/decorations/decor_sand_ornament.png deleted file mode 100644 index 9eafc86440..0000000000 Binary files a/graphics/decorations/decor_sand_ornament.png and /dev/null differ diff --git a/graphics/decorations/decor_slide.png b/graphics/decorations/decor_slide.png deleted file mode 100644 index 8a5dbada5b..0000000000 Binary files a/graphics/decorations/decor_slide.png and /dev/null differ diff --git a/graphics/decorations/decor_snorlax_doll.png b/graphics/decorations/decor_snorlax_doll.png deleted file mode 100644 index 6ff891c136..0000000000 Binary files a/graphics/decorations/decor_snorlax_doll.png and /dev/null differ diff --git a/graphics/decorations/decor_solid_board.png b/graphics/decorations/decor_solid_board.png deleted file mode 100644 index d0251d847b..0000000000 Binary files a/graphics/decorations/decor_solid_board.png and /dev/null differ diff --git a/graphics/decorations/decor_spikes_mat.png b/graphics/decorations/decor_spikes_mat.png deleted file mode 100644 index 67f023a0a5..0000000000 Binary files a/graphics/decorations/decor_spikes_mat.png and /dev/null differ diff --git a/graphics/decorations/decor_stand.png b/graphics/decorations/decor_stand.png deleted file mode 100644 index 86b1e4d1fe..0000000000 Binary files a/graphics/decorations/decor_stand.png and /dev/null differ diff --git a/graphics/decorations/decor_surf_mat.png b/graphics/decorations/decor_surf_mat.png deleted file mode 100644 index d74cb97bb9..0000000000 Binary files a/graphics/decorations/decor_surf_mat.png and /dev/null differ diff --git a/graphics/decorations/decor_thunder_mat.png b/graphics/decorations/decor_thunder_mat.png deleted file mode 100644 index 1c5c56e332..0000000000 Binary files a/graphics/decorations/decor_thunder_mat.png and /dev/null differ diff --git a/graphics/decorations/decor_tire.png b/graphics/decorations/decor_tire.png deleted file mode 100644 index e394ebbd40..0000000000 Binary files a/graphics/decorations/decor_tire.png and /dev/null differ diff --git a/graphics/decorations/decor_tropical_plant.png b/graphics/decorations/decor_tropical_plant.png deleted file mode 100644 index 12e43df476..0000000000 Binary files a/graphics/decorations/decor_tropical_plant.png and /dev/null differ diff --git a/graphics/decorations/decor_venusaur_doll.png b/graphics/decorations/decor_venusaur_doll.png deleted file mode 100644 index 57fbdd93ac..0000000000 Binary files a/graphics/decorations/decor_venusaur_doll.png and /dev/null differ diff --git a/graphics/decorations/decor_wailmer_doll.png b/graphics/decorations/decor_wailmer_doll.png deleted file mode 100644 index ceedfa6fb0..0000000000 Binary files a/graphics/decorations/decor_wailmer_doll.png and /dev/null differ diff --git a/graphics/decorations/decor_yellow_brick.png b/graphics/decorations/decor_yellow_brick.png deleted file mode 100644 index cb865760ca..0000000000 Binary files a/graphics/decorations/decor_yellow_brick.png and /dev/null differ diff --git a/graphics/decorations/fire_blast_mat.png b/graphics/decorations/fire_blast_mat.png new file mode 100644 index 0000000000..df6c2bfe08 Binary files /dev/null and b/graphics/decorations/fire_blast_mat.png differ diff --git a/graphics/decorations/fissure_mat.png b/graphics/decorations/fissure_mat.png new file mode 100644 index 0000000000..1a0212487e Binary files /dev/null and b/graphics/decorations/fissure_mat.png differ diff --git a/graphics/decorations/glass_ornament.png b/graphics/decorations/glass_ornament.png new file mode 100644 index 0000000000..c85ae769b2 Binary files /dev/null and b/graphics/decorations/glass_ornament.png differ diff --git a/graphics/decorations/gorgeous_plant.png b/graphics/decorations/gorgeous_plant.png new file mode 100644 index 0000000000..ed8947ebdf Binary files /dev/null and b/graphics/decorations/gorgeous_plant.png differ diff --git a/graphics/decorations/hard_desk.png b/graphics/decorations/hard_desk.png new file mode 100644 index 0000000000..b85b098f98 Binary files /dev/null and b/graphics/decorations/hard_desk.png differ diff --git a/graphics/decorations/heavy_desk.png b/graphics/decorations/heavy_desk.png new file mode 100644 index 0000000000..3e9e74683c Binary files /dev/null and b/graphics/decorations/heavy_desk.png differ diff --git a/graphics/decorations/lapras_doll.png b/graphics/decorations/lapras_doll.png new file mode 100644 index 0000000000..8a98a6cf43 Binary files /dev/null and b/graphics/decorations/lapras_doll.png differ diff --git a/graphics/decorations/powder_snow_mat.png b/graphics/decorations/powder_snow_mat.png new file mode 100644 index 0000000000..22be19f9d4 Binary files /dev/null and b/graphics/decorations/powder_snow_mat.png differ diff --git a/graphics/decorations/pretty_desk.png b/graphics/decorations/pretty_desk.png new file mode 100644 index 0000000000..69d439cfeb Binary files /dev/null and b/graphics/decorations/pretty_desk.png differ diff --git a/graphics/decorations/pretty_flowers.png b/graphics/decorations/pretty_flowers.png new file mode 100644 index 0000000000..6b7b8565f0 Binary files /dev/null and b/graphics/decorations/pretty_flowers.png differ diff --git a/graphics/decorations/ragged_desk.png b/graphics/decorations/ragged_desk.png new file mode 100644 index 0000000000..1bb800267f Binary files /dev/null and b/graphics/decorations/ragged_desk.png differ diff --git a/graphics/decorations/red_brick.png b/graphics/decorations/red_brick.png new file mode 100644 index 0000000000..249ad8f7ae Binary files /dev/null and b/graphics/decorations/red_brick.png differ diff --git a/graphics/decorations/red_plant.png b/graphics/decorations/red_plant.png new file mode 100644 index 0000000000..7f3792c97c Binary files /dev/null and b/graphics/decorations/red_plant.png differ diff --git a/graphics/decorations/red_tent.png b/graphics/decorations/red_tent.png new file mode 100644 index 0000000000..a70d9bc0a8 Binary files /dev/null and b/graphics/decorations/red_tent.png differ diff --git a/graphics/decorations/regice_doll.png b/graphics/decorations/regice_doll.png new file mode 100644 index 0000000000..e7c118659f Binary files /dev/null and b/graphics/decorations/regice_doll.png differ diff --git a/graphics/decorations/regirock_doll.png b/graphics/decorations/regirock_doll.png new file mode 100644 index 0000000000..6bf5205737 Binary files /dev/null and b/graphics/decorations/regirock_doll.png differ diff --git a/graphics/decorations/registeel_doll.png b/graphics/decorations/registeel_doll.png new file mode 100644 index 0000000000..bfe01d75c8 Binary files /dev/null and b/graphics/decorations/registeel_doll.png differ diff --git a/graphics/decorations/rhydon_doll.png b/graphics/decorations/rhydon_doll.png new file mode 100644 index 0000000000..2937d372f2 Binary files /dev/null and b/graphics/decorations/rhydon_doll.png differ diff --git a/graphics/decorations/sand_ornament.png b/graphics/decorations/sand_ornament.png new file mode 100644 index 0000000000..d94673c96a Binary files /dev/null and b/graphics/decorations/sand_ornament.png differ diff --git a/graphics/decorations/slide.png b/graphics/decorations/slide.png new file mode 100644 index 0000000000..ebfc24cad3 Binary files /dev/null and b/graphics/decorations/slide.png differ diff --git a/graphics/decorations/snorlax_doll.png b/graphics/decorations/snorlax_doll.png new file mode 100644 index 0000000000..48f9248aca Binary files /dev/null and b/graphics/decorations/snorlax_doll.png differ diff --git a/graphics/decorations/solid_board.png b/graphics/decorations/solid_board.png new file mode 100644 index 0000000000..1eef712e27 Binary files /dev/null and b/graphics/decorations/solid_board.png differ diff --git a/graphics/decorations/spikes_mat.png b/graphics/decorations/spikes_mat.png new file mode 100644 index 0000000000..a69b003e7b Binary files /dev/null and b/graphics/decorations/spikes_mat.png differ diff --git a/graphics/decorations/stand.png b/graphics/decorations/stand.png new file mode 100644 index 0000000000..09e4d26bd9 Binary files /dev/null and b/graphics/decorations/stand.png differ diff --git a/graphics/decorations/surf_mat.png b/graphics/decorations/surf_mat.png new file mode 100644 index 0000000000..f85498e662 Binary files /dev/null and b/graphics/decorations/surf_mat.png differ diff --git a/graphics/decorations/thunder_mat.png b/graphics/decorations/thunder_mat.png new file mode 100644 index 0000000000..82a1787f69 Binary files /dev/null and b/graphics/decorations/thunder_mat.png differ diff --git a/graphics/decorations/tire.png b/graphics/decorations/tire.png new file mode 100644 index 0000000000..5625323561 Binary files /dev/null and b/graphics/decorations/tire.png differ diff --git a/graphics/decorations/tropical_plant.png b/graphics/decorations/tropical_plant.png new file mode 100644 index 0000000000..f674d6418b Binary files /dev/null and b/graphics/decorations/tropical_plant.png differ diff --git a/graphics/decorations/venusaur_doll.png b/graphics/decorations/venusaur_doll.png new file mode 100644 index 0000000000..ca6bbea761 Binary files /dev/null and b/graphics/decorations/venusaur_doll.png differ diff --git a/graphics/decorations/wailmer_doll.png b/graphics/decorations/wailmer_doll.png new file mode 100644 index 0000000000..b5d723bc83 Binary files /dev/null and b/graphics/decorations/wailmer_doll.png differ diff --git a/graphics/decorations/yellow_brick.png b/graphics/decorations/yellow_brick.png new file mode 100644 index 0000000000..33b41be22a Binary files /dev/null and b/graphics/decorations/yellow_brick.png differ diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 0d6cc81b51..b00e25f2a6 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -86,6 +86,40 @@ $(TILESETGFXDIR)/secondary/pacifidlog/tiles.4bpp: %.4bpp: %.png $(TILESETGFXDIR)/secondary/sootopolis/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 328 +SOOTOPOLISANIMDIR := $(TILESETGFXDIR)/secondary/sootopolis/anim + +$(SOOTOPOLISANIMDIR)/stormy_water/0.4bpp: $(SOOTOPOLISANIMDIR)/stormy_water/0_kyogre.4bpp \ + $(SOOTOPOLISANIMDIR)/stormy_water/0_groudon.4bpp + @cat $^ >$@ + +$(SOOTOPOLISANIMDIR)/stormy_water/1.4bpp: $(SOOTOPOLISANIMDIR)/stormy_water/1_kyogre.4bpp \ + $(SOOTOPOLISANIMDIR)/stormy_water/1_groudon.4bpp + @cat $^ >$@ + +$(SOOTOPOLISANIMDIR)/stormy_water/2.4bpp: $(SOOTOPOLISANIMDIR)/stormy_water/2_kyogre.4bpp \ + $(SOOTOPOLISANIMDIR)/stormy_water/2_groudon.4bpp + @cat $^ >$@ + +$(SOOTOPOLISANIMDIR)/stormy_water/3.4bpp: $(SOOTOPOLISANIMDIR)/stormy_water/3_kyogre.4bpp \ + $(SOOTOPOLISANIMDIR)/stormy_water/3_groudon.4bpp + @cat $^ >$@ + +$(SOOTOPOLISANIMDIR)/stormy_water/4.4bpp: $(SOOTOPOLISANIMDIR)/stormy_water/4_kyogre.4bpp \ + $(SOOTOPOLISANIMDIR)/stormy_water/4_groudon.4bpp + @cat $^ >$@ + +$(SOOTOPOLISANIMDIR)/stormy_water/5.4bpp: $(SOOTOPOLISANIMDIR)/stormy_water/5_kyogre.4bpp \ + $(SOOTOPOLISANIMDIR)/stormy_water/5_groudon.4bpp + @cat $^ >$@ + +$(SOOTOPOLISANIMDIR)/stormy_water/6.4bpp: $(SOOTOPOLISANIMDIR)/stormy_water/6_kyogre.4bpp \ + $(SOOTOPOLISANIMDIR)/stormy_water/6_groudon.4bpp + @cat $^ >$@ + +$(SOOTOPOLISANIMDIR)/stormy_water/7.4bpp: $(SOOTOPOLISANIMDIR)/stormy_water/7_kyogre.4bpp \ + $(SOOTOPOLISANIMDIR)/stormy_water/7_groudon.4bpp + @cat $^ >$@ + $(TILESETGFXDIR)/secondary/battle_frontier_outside_west/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 508 @@ -357,9 +391,9 @@ $(INTERFACEGFXDIR)/hp_numbers.4bpp: $(INTERFACEGFXDIR)/hpbar_anim.4bpp \ @cat $^ >$@ $(UNUSEDGFXDIR)/redyellowgreen_frame.bin: $(UNUSEDGFXDIR)/red_frame.bin \ - $(UNUSEDGFXDIR)/yellow_frame.bin \ - $(UNUSEDGFXDIR)/green_frame.bin \ - $(UNUSEDGFXDIR)/blank_frame.bin + $(UNUSEDGFXDIR)/yellow_frame.bin \ + $(UNUSEDGFXDIR)/green_frame.bin \ + $(UNUSEDGFXDIR)/blank_frame.bin @cat $^ >$@ $(UNUSEDGFXDIR)/color_frames.4bpp: %.4bpp: %.png diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h index 4bcf47ea85..5861076872 100644 --- a/include/constants/metatile_labels.h +++ b/include/constants/metatile_labels.h @@ -524,33 +524,64 @@ #define METATILE_SecretBase_MudBall 0x228 #define METATILE_SecretBase_Fence_Horizontal 0x22C #define METATILE_SecretBase_Fence_Vertical 0x233 -#define METATILE_SecretBase_Board_Top 0x234 -#define METATILE_SecretBase_Board_Bottom 0x23C +#define METATILE_SecretBase_SolidBoard_Top 0x234 +#define METATILE_SecretBase_SolidBoard_Bottom 0x23C +#define METATILE_SecretBase_RedTent_TopLeft 0x230 +#define METATILE_SecretBase_RedTent_TopMid 0x231 +#define METATILE_SecretBase_RedTent_TopRight 0x232 +#define METATILE_SecretBase_RedTent_MidLeft 0x238 #define METATILE_SecretBase_RedTent_DoorTop 0x239 +#define METATILE_SecretBase_RedTent_MidRight 0x23A +#define METATILE_SecretBase_RedTent_BottomLeft 0x240 #define METATILE_SecretBase_RedTent_Door 0x241 +#define METATILE_SecretBase_RedTent_BottomRight 0x23B +#define METATILE_SecretBase_BlueTent_TopLeft 0x248 +#define METATILE_SecretBase_BlueTent_TopMid 0x249 +#define METATILE_SecretBase_BlueTent_TopRight 0x268 +#define METATILE_SecretBase_BlueTent_MidLeft 0x250 #define METATILE_SecretBase_BlueTent_DoorTop 0x251 +#define METATILE_SecretBase_BlueTent_MidRight 0x270 +#define METATILE_SecretBase_BlueTent_BottomLeft 0x258 #define METATILE_SecretBase_BlueTent_Door 0x259 -#define METATILE_SecretBase_Slide_Stairs 0x23D -#define METATILE_SecretBase_Slide 0x23E -#define METATILE_SecretBase_Stand_LeftCorner 0x26A -#define METATILE_SecretBase_Stand_RightCorner 0x26D +#define METATILE_SecretBase_BlueTent_BottomRight 0x269 +#define METATILE_SecretBase_Slide_TopLeft 0x235 +#define METATILE_SecretBase_Slide_TopRight 0x236 +#define METATILE_SecretBase_Slide_StairLanding 0x23D +#define METATILE_SecretBase_Slide_SlideTop 0x23E +#define METATILE_SecretBase_Slide_Stairs 0x263 +#define METATILE_SecretBase_Slide_SlideBottom 0x264 +#define METATILE_SecretBase_Slide_MatLeft 0x26F +#define METATILE_SecretBase_Slide_MatRight 0x277 +#define METATILE_SecretBase_Stand_CornerLeft 0x26A +#define METATILE_SecretBase_Stand_MidLeft 0x26B +#define METATILE_SecretBase_Stand_MidRight 0x26C +#define METATILE_SecretBase_Stand_CornerRight 0x26D +#define METATILE_SecretBase_Stand_StairsLeft 0x272 +#define METATILE_SecretBase_Stand_BaseLeft 0x273 +#define METATILE_SecretBase_Stand_BaseRight 0x274 +#define METATILE_SecretBase_Stand_StairsRight 0x275 #define METATILE_SecretBase_BreakableDoor_TopClosed 0x237 #define METATILE_SecretBase_BreakableDoor_BottomClosed 0x23F #define METATILE_SecretBase_BreakableDoor_TopOpen 0x26E #define METATILE_SecretBase_BreakableDoor_BottomOpen 0x276 -#define METATILE_SecretBase_NoteMat_C 0x278 +#define METATILE_SecretBase_GlitterMat 0x260 +#define METATILE_SecretBase_JumpMat 0x261 +#define METATILE_SecretBase_SpinMat 0x262 +#define METATILE_SecretBase_NoteMat_C_Low 0x278 #define METATILE_SecretBase_NoteMat_D 0x279 #define METATILE_SecretBase_NoteMat_E 0x27A #define METATILE_SecretBase_NoteMat_F 0x27B #define METATILE_SecretBase_NoteMat_G 0x27C #define METATILE_SecretBase_NoteMat_A 0x27D #define METATILE_SecretBase_NoteMat_B 0x27E -#define METATILE_SecretBase_NoteMat_C_Sharp 0x2B3 +#define METATILE_SecretBase_NoteMat_C_High 0x2B3 #define METATILE_SecretBase_Tire_TopLeft 0x280 #define METATILE_SecretBase_Tire_TopRight 0x281 #define METATILE_SecretBase_Tire_BottomLeft 0x288 #define METATILE_SecretBase_Tire_BottomRight 0x289 +#define METATILE_SecretBase_GlassOrnament_Top 0x282 #define METATILE_SecretBase_GlassOrnament_Base1 0x28A +#define METATILE_SecretBase_GlassOrnament_TopWall 0x283 #define METATILE_SecretBase_GlassOrnament_Base2 0x28B #define METATILE_SecretBase_SandOrnament_BrokenTop 0x284 #define METATILE_SecretBase_SandOrnament_BrokenBase 0x28C @@ -622,23 +653,41 @@ #define METATILE_SecretBase_RaggedChair 0x2C2 #define METATILE_SecretBase_BrickChair 0x2C8 #define METATILE_SecretBase_CampChair 0x2C9 -#define METATILE_SecretBase_HardChair 0x2Ca +#define METATILE_SecretBase_HardChair 0x2CA +#define METATILE_SecretBase_RedPlant_Top 0x2D0 #define METATILE_SecretBase_RedPlant_Base1 0x2D8 +#define METATILE_SecretBase_RedPlant_TopWall 0x2D1 #define METATILE_SecretBase_RedPlant_Base2 0x2D9 +#define METATILE_SecretBase_TropicalPlant_Top 0x2D2 #define METATILE_SecretBase_TropicalPlant_Base1 0x2DA +#define METATILE_SecretBase_TropicalPlant_TopWall 0x2D3 #define METATILE_SecretBase_TropicalPlant_Base2 0x2DB -#define METATILE_SecretBase_PrettyFlower_Base1 0x2DC -#define METATILE_SecretBase_PrettyFlower_Base2 0x2DD -#define METATILE_SecretBase_ColorfulFlowers_BaseLeft1 0x2E8 -#define METATILE_SecretBase_ColorfulFlowers_BaseRight1 0x2E9 -#define METATILE_SecretBase_ColorfulFlowers_BaseLeft2 0x2EA -#define METATILE_SecretBase_ColorfulFlowers_BaseRight2 0x2EB +#define METATILE_SecretBase_PrettyFlowers_Top 0x2D4 +#define METATILE_SecretBase_PrettyFlowers_Base1 0x2DC +#define METATILE_SecretBase_PrettyFlowers_TopWall 0x2D5 +#define METATILE_SecretBase_PrettyFlowers_Base2 0x2DD +#define METATILE_SecretBase_ColorfulPlant_TopLeft 0x2E0 +#define METATILE_SecretBase_ColorfulPlant_TopRight 0x2E2 +#define METATILE_SecretBase_ColorfulPlant_BaseLeft1 0x2E8 +#define METATILE_SecretBase_ColorfulPlant_BaseRight1 0x2E9 +#define METATILE_SecretBase_ColorfulPlant_TopLeftWall 0x2E1 +#define METATILE_SecretBase_ColorfulPlant_TopRightWall 0x2E3 +#define METATILE_SecretBase_ColorfulPlant_BaseLeft2 0x2EA +#define METATILE_SecretBase_ColorfulPlant_BaseRight2 0x2EB +#define METATILE_SecretBase_BigPlant_TopLeft 0x2E4 +#define METATILE_SecretBase_BigPlant_TopRight 0x2E6 #define METATILE_SecretBase_BigPlant_BaseLeft1 0x2EC #define METATILE_SecretBase_BigPlant_BaseRight1 0x2ED +#define METATILE_SecretBase_BigPlant_TopLeftWall 0x2E5 +#define METATILE_SecretBase_BigPlant_TopRightWall 0x2E6 #define METATILE_SecretBase_BigPlant_BaseLeft2 0x2EE #define METATILE_SecretBase_BigPlant_BaseRight2 0x2EF +#define METATILE_SecretBase_GorgeousPlant_TopLeft 0x2F0 +#define METATILE_SecretBase_GorgeousPlant_TopRight 0x2F2 #define METATILE_SecretBase_GorgeousPlant_BaseLeft1 0x2F8 #define METATILE_SecretBase_GorgeousPlant_BaseRight1 0x2F9 +#define METATILE_SecretBase_GorgeousPlant_TopLeftWall 0x2F1 +#define METATILE_SecretBase_GorgeousPlant_TopRightWall 0x2F3 #define METATILE_SecretBase_GorgeousPlant_BaseLeft2 0x2FA #define METATILE_SecretBase_GorgeousPlant_BaseRight2 0x2FB #define METATILE_SecretBase_TV 0x2F4 @@ -659,12 +708,79 @@ #define METATILE_SecretBase_RedPoster 0x332 #define METATILE_SecretBase_BluePoster 0x333 #define METATILE_SecretBase_CutePoster 0x334 +#define METATILE_SecretBase_SilverShield_Top 0x2D6 #define METATILE_SecretBase_SilverShield_Base1 0x2DE +#define METATILE_SecretBase_SilverShield_TopWall 0x2D7 #define METATILE_SecretBase_SilverShield_Base2 0x2DF +#define METATILE_SecretBase_GoldShield_Top 0x32E #define METATILE_SecretBase_GoldShield_Base1 0x336 +#define METATILE_SecretBase_GoldShield_TopWall 0x32F #define METATILE_SecretBase_GoldShield_Base2 0x337 #define METATILE_SecretBase_RedBalloon 0x338 -#define METATILE_SecretBase_BlueBalloon 0x33c +#define METATILE_SecretBase_BlueBalloon 0x33C #define METATILE_SecretBase_YellowBalloon 0x340 +#define METATILE_SecretBase_SurfMat_TopLeft 0x242 +#define METATILE_SecretBase_SurfMat_TopMid 0x243 +#define METATILE_SecretBase_SurfMat_TopRight 0x244 +#define METATILE_SecretBase_SurfMat_MidLeft 0x24A +#define METATILE_SecretBase_SurfMat_Center 0x24B +#define METATILE_SecretBase_SurfMat_MidRight 0x24C +#define METATILE_SecretBase_SurfMat_BottomLeft 0x252 +#define METATILE_SecretBase_SurfMat_BottomMid 0x253 +#define METATILE_SecretBase_SurfMat_BottomRight 0x254 +#define METATILE_SecretBase_ThunderMat_TopLeft 0x245 +#define METATILE_SecretBase_ThunderMat_TopMid 0x246 +#define METATILE_SecretBase_ThunderMat_TopRight 0x247 +#define METATILE_SecretBase_ThunderMat_MidLeft 0x24D +#define METATILE_SecretBase_ThunderMat_Center 0x24E +#define METATILE_SecretBase_ThunderMat_MidRight 0x24F +#define METATILE_SecretBase_ThunderMat_BottomLeft 0x255 +#define METATILE_SecretBase_ThunderMat_BottomMid 0x256 +#define METATILE_SecretBase_ThunderMat_BottomRight 0x257 +#define METATILE_SecretBase_FireBlastMat_TopLeft 0x25A +#define METATILE_SecretBase_FireBlastMat_TopMid 0x25B +#define METATILE_SecretBase_FireBlastMat_TopRight 0x25C +#define METATILE_SecretBase_FireBlastMat_MidLeft 0x25D +#define METATILE_SecretBase_FireBlastMat_Center 0x25E +#define METATILE_SecretBase_FireBlastMat_MidRight 0x25F +#define METATILE_SecretBase_FireBlastMat_BottomLeft 0x265 +#define METATILE_SecretBase_FireBlastMat_BottomMid 0x266 +#define METATILE_SecretBase_FireBlastMat_BottomRight 0x267 +#define METATILE_SecretBase_PowderSnowMat_TopLeft 0x300 +#define METATILE_SecretBase_PowderSnowMat_TopMid 0x301 +#define METATILE_SecretBase_PowderSnowMat_TopRight 0x302 +#define METATILE_SecretBase_PowderSnowMat_MidLeft 0x308 +#define METATILE_SecretBase_PowderSnowMat_Center 0x309 +#define METATILE_SecretBase_PowderSnowMat_MidRight 0x30A +#define METATILE_SecretBase_PowderSnowMat_BottomLeft 0x310 +#define METATILE_SecretBase_PowderSnowMat_BottomMid 0x311 +#define METATILE_SecretBase_PowderSnowMat_BottomRight 0x312 +#define METATILE_SecretBase_AttractMat_TopLeft 0x303 +#define METATILE_SecretBase_AttractMat_TopMid 0x304 +#define METATILE_SecretBase_AttractMat_TopRight 0x305 +#define METATILE_SecretBase_AttractMat_MidLeft 0x30B +#define METATILE_SecretBase_AttractMat_Center 0x30C +#define METATILE_SecretBase_AttractMat_MidRight 0x30D +#define METATILE_SecretBase_AttractMat_BottomLeft 0x313 +#define METATILE_SecretBase_AttractMat_BottomMid 0x314 +#define METATILE_SecretBase_AttractMat_BottomRight 0x315 +#define METATILE_SecretBase_FissureMat_TopLeft 0x306 +#define METATILE_SecretBase_FissureMat_TopMid 0x307 +#define METATILE_SecretBase_FissureMat_TopRight 0x318 +#define METATILE_SecretBase_FissureMat_MidLeft 0x30E +#define METATILE_SecretBase_FissureMat_Center 0x30F +#define METATILE_SecretBase_FissureMat_MidRight 0x320 +#define METATILE_SecretBase_FissureMat_BottomLeft 0x316 +#define METATILE_SecretBase_FissureMat_BottomMid 0x317 +#define METATILE_SecretBase_FissureMat_BottomRight 0x328 +#define METATILE_SecretBase_SpikesMat_TopLeft 0x319 +#define METATILE_SecretBase_SpikesMat_TopMid 0x31A +#define METATILE_SecretBase_SpikesMat_TopRight 0x31B +#define METATILE_SecretBase_SpikesMat_MidLeft 0x321 +#define METATILE_SecretBase_SpikesMat_Center 0x322 +#define METATILE_SecretBase_SpikesMat_MidRight 0x323 +#define METATILE_SecretBase_SpikesMat_BottomLeft 0x329 +#define METATILE_SecretBase_SpikesMat_BottomMid 0x32A +#define METATILE_SecretBase_SpikesMat_BottomRight 0x32B #endif // GUARD_METATILE_LABELS_H diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 1dbe171bc2..bcee339d5f 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -52,11 +52,11 @@ u8 GetPlayerAvatarFlags(void); void sub_808B578(void); u8 GetFRLGAvatarGraphicsIdByGender(u8); u8 GetRSAvatarGraphicsIdByGender(u8); -void sub_808B980(u8 direction); -void sub_808B9BC(u8 direction); -void sub_808B9A4(u8 direction); -void sub_808C1B4(u8 direction); -void sub_808B9D4(u8 direction); +void PlayerWheelieInPlace(u8 direction); +void PlayerWheelieMove(u8 direction); +void PlayerPopWheelieWhileMoving(u8 direction); +void PlayerUseAcroBikeOnBumpySlope(u8 direction); +void PlayerEndWheelieWhileMoving(u8 direction); void sub_808D194(void); void sub_808D1C8(void); bool32 sub_808D1B4(void); diff --git a/include/global.h b/include/global.h index 0587e964f7..8347ea28e4 100644 --- a/include/global.h +++ b/include/global.h @@ -471,7 +471,7 @@ struct SaveBlock2 /*0x90*/ u8 filler_90[0x8]; /*0x98*/ struct Time localTimeOffset; /*0xA0*/ struct Time lastBerryTreeUpdate; - /*0xA8*/ u32 field_A8; // Written to, but never read. + /*0xA8*/ u32 gcnLinkFlags; // Read by Pokemon Colosseum/XD /*0xAC*/ u32 encryptionKey; /*0xB0*/ struct PlayersApprentice playerApprentice; /*0xDC*/ struct Apprentice apprentices[APPRENTICE_COUNT]; diff --git a/include/save_location.h b/include/save_location.h index 6c2ae0e6b0..53f317c57a 100644 --- a/include/save_location.h +++ b/include/save_location.h @@ -13,7 +13,6 @@ #define CHAMPION_SAVEWARP (1 << 7) void TrySetMapSaveWarpStatus(void); -void sub_81AFDA0(void); void SetChampionSaveWarp(void); #endif // GUARD_SAVE_LOCATION_H diff --git a/src/bike.c b/src/bike.c index 15857778cc..e66d6b6e13 100644 --- a/src/bike.c +++ b/src/bike.c @@ -696,11 +696,11 @@ static void AcroBikeTransition_WheelieMoving(u8 direction) if (MetatileBehavior_IsBumpySlope(playerObjEvent->currentMetatileBehavior)) PlayerIdleWheelie(direction); else - sub_808B980(direction); //hit wall? + PlayerWheelieInPlace(direction); //hit wall? } return; } - sub_808B9BC(direction); + PlayerWheelieMove(direction); gPlayerAvatar.runningState = MOVING; } @@ -730,11 +730,11 @@ static void AcroBikeTransition_WheelieRisingMoving(u8 direction) if (MetatileBehavior_IsBumpySlope(playerObjEvent->currentMetatileBehavior)) PlayerIdleWheelie(direction); else - sub_808B980(direction); //hit wall? + PlayerWheelieInPlace(direction); //hit wall? } return; } - sub_808B9A4(direction); + PlayerPopWheelieWhileMoving(direction); gPlayerAvatar.runningState = MOVING; } @@ -757,7 +757,7 @@ static void AcroBikeTransition_WheelieLoweringMoving(u8 direction) PlayerEndWheelie(direction); return; } - sub_808B9D4(direction); + PlayerEndWheelieWhileMoving(direction); } void Bike_TryAcroBikeHistoryUpdate(u16 newKeys, u16 heldKeys) @@ -1049,7 +1049,7 @@ void Bike_HandleBumpySlopeJump(void) if (MetatileBehavior_IsBumpySlope(tileBehavior)) { gPlayerAvatar.acroBikeState = ACRO_STATE_WHEELIE_STANDING; - sub_808C1B4(GetPlayerMovementDirection()); + PlayerUseAcroBikeOnBumpySlope(GetPlayerMovementDirection()); } } } diff --git a/src/data/decoration/tiles.h b/src/data/decoration/tiles.h index f115205119..de5c43575b 100644 --- a/src/data/decoration/tiles.h +++ b/src/data/decoration/tiles.h @@ -1,463 +1,465 @@ +#define DECOR_TILE(name) (METATILE_SecretBase_##name - 0x200) + const u16 DecorGfx_SMALL_DESK[] = { - 0x87 + DECOR_TILE(SmallDesk) }; const u16 DecorGfx_POKEMON_DESK[] = { - 0x8F + DECOR_TILE(PokemonDesk) }; const u16 DecorGfx_HEAVY_DESK[] = { - 0x90, - 0x91, - 0x92, - 0x98, - 0x99, - 0x9A + DECOR_TILE(HeavyDesk_TopLeft), + DECOR_TILE(HeavyDesk_TopMid), + DECOR_TILE(HeavyDesk_TopRight), + DECOR_TILE(HeavyDesk_BottomLeft), + DECOR_TILE(HeavyDesk_BottomMid), + DECOR_TILE(HeavyDesk_BottomRight) }; const u16 DecorGfx_RAGGED_DESK[] = { - 0x93, - 0x94, - 0x95, - 0x9B, - 0x9C, - 0x9D + DECOR_TILE(RaggedDesk_TopLeft), + DECOR_TILE(RaggedDesk_TopMid), + DECOR_TILE(RaggedDesk_TopRight), + DECOR_TILE(RaggedDesk_BottomLeft), + DECOR_TILE(RaggedDesk_BottomMid), + DECOR_TILE(RaggedDesk_BottomRight) }; const u16 DecorGfx_COMFORT_DESK[] = { - 0x96, - 0x97, - 0xA3, - 0x9E, - 0x9F, - 0xAB + DECOR_TILE(ComfortDesk_TopLeft), + DECOR_TILE(ComfortDesk_TopMid), + DECOR_TILE(ComfortDesk_TopRight), + DECOR_TILE(ComfortDesk_BottomLeft), + DECOR_TILE(ComfortDesk_BottomMid), + DECOR_TILE(ComfortDesk_BottomRight) }; const u16 DecorGfx_PRETTY_DESK[] = { - 0xBD, - 0xBE, - 0xBF, - 0xC5, - 0xC6, - 0xC7, - 0xCD, - 0xCE, - 0xCF + DECOR_TILE(PrettyDesk_TopLeft), + DECOR_TILE(PrettyDesk_TopMid), + DECOR_TILE(PrettyDesk_TopRight), + DECOR_TILE(PrettyDesk_MidLeft), + DECOR_TILE(PrettyDesk_Center), + DECOR_TILE(PrettyDesk_MidRight), + DECOR_TILE(PrettyDesk_BottomLeft), + DECOR_TILE(PrettyDesk_BottomMid), + DECOR_TILE(PrettyDesk_BottomRight) }; const u16 DecorGfx_BRICK_DESK[] = { - 0xA0, - 0xA1, - 0xA2, - 0xA8, - 0xA9, - 0xAA, - 0xB0, - 0xB1, - 0xB2 + DECOR_TILE(BrickDesk_TopLeft), + DECOR_TILE(BrickDesk_TopMid), + DECOR_TILE(BrickDesk_TopRight), + DECOR_TILE(BrickDesk_MidLeft), + DECOR_TILE(BrickDesk_Center), + DECOR_TILE(BrickDesk_MidRight), + DECOR_TILE(BrickDesk_BottomLeft), + DECOR_TILE(BrickDesk_BottomMid), + DECOR_TILE(BrickDesk_BottomRight) }; const u16 DecorGfx_CAMP_DESK[] = { - 0xA4, - 0xA5, - 0xA6, - 0xAC, - 0xAD, - 0xAE, - 0xB4, - 0xB5, - 0xB6 + DECOR_TILE(CampDesk_TopLeft), + DECOR_TILE(CampDesk_TopMid), + DECOR_TILE(CampDesk_TopRight), + DECOR_TILE(CampDesk_MidLeft), + DECOR_TILE(CampDesk_Center), + DECOR_TILE(CampDesk_MidRight), + DECOR_TILE(CampDesk_BottomLeft), + DECOR_TILE(CampDesk_BottomMid), + DECOR_TILE(CampDesk_BottomRight) }; const u16 DecorGfx_HARD_DESK[] = { - 0xA7, - 0xBB, - 0xBC, - 0xAF, - 0xC3, - 0xC4, - 0xB7, - 0xCB, - 0xCC + DECOR_TILE(HardDesk_TopLeft), + DECOR_TILE(HardDesk_TopMid), + DECOR_TILE(HardDesk_TopRight), + DECOR_TILE(HardDesk_MidLeft), + DECOR_TILE(HardDesk_Center), + DECOR_TILE(HardDesk_MidRight), + DECOR_TILE(HardDesk_BottomLeft), + DECOR_TILE(HardDesk_BottomMid), + DECOR_TILE(HardDesk_BottomRight) }; const u16 DecorGfx_SMALL_CHAIR[] = { - 0xB8 + DECOR_TILE(SmallChair) }; const u16 DecorGfx_POKEMON_CHAIR[] = { - 0xB9 + DECOR_TILE(PokemonChair) }; const u16 DecorGfx_HEAVY_CHAIR[] = { - 0xBA + DECOR_TILE(HeavyChair) }; const u16 DecorGfx_PRETTY_CHAIR[] = { - 0xC0 + DECOR_TILE(PrettyChair) }; const u16 DecorGfx_COMFORT_CHAIR[] = { - 0xC1 + DECOR_TILE(ComfortChair) }; const u16 DecorGfx_RAGGED_CHAIR[] = { - 0xC2 + DECOR_TILE(RaggedChair) }; const u16 DecorGfx_BRICK_CHAIR[] = { - 0xC8 + DECOR_TILE(BrickChair) }; const u16 DecorGfx_CAMP_CHAIR[] = { - 0xC9 + DECOR_TILE(CampChair) }; const u16 DecorGfx_HARD_CHAIR[] = { - 0xCA + DECOR_TILE(HardChair) }; const u16 DecorGfx_RED_PLANT[] = { - 0xD0, - 0xD8 + DECOR_TILE(RedPlant_Top), + DECOR_TILE(RedPlant_Base1) }; const u16 DecorGfx_TROPICAL_PLANT[] = { - 0xD2, - 0xDA + DECOR_TILE(TropicalPlant_Top), + DECOR_TILE(TropicalPlant_Base1) }; const u16 DecorGfx_PRETTY_FLOWERS[] = { - 0xD4, - 0xDC + DECOR_TILE(PrettyFlowers_Top), + DECOR_TILE(PrettyFlowers_Base1) }; const u16 DecorGfx_COLORFUL_PLANT[] = { - 0xE0, - 0xE2, - 0xE8, - 0xE9 + DECOR_TILE(ColorfulPlant_TopLeft), + DECOR_TILE(ColorfulPlant_TopRight), + DECOR_TILE(ColorfulPlant_BaseLeft1), + DECOR_TILE(ColorfulPlant_BaseRight1) }; const u16 DecorGfx_BIG_PLANT[] = { - 0xE4, - 0xE6, - 0xEC, - 0xED + DECOR_TILE(BigPlant_TopLeft), + DECOR_TILE(BigPlant_TopRight), + DECOR_TILE(BigPlant_BaseLeft1), + DECOR_TILE(BigPlant_BaseRight1) }; const u16 DecorGfx_GORGEOUS_PLANT[] = { - 0xF0, - 0xF2, - 0xF8, - 0xF9 + DECOR_TILE(GorgeousPlant_TopLeft), + DECOR_TILE(GorgeousPlant_TopRight), + DECOR_TILE(GorgeousPlant_BaseLeft1), + DECOR_TILE(GorgeousPlant_BaseRight1) }; const u16 DecorGfx_RED_BRICK[] = { - 0x25, - 0x2D + DECOR_TILE(RedBrick_Top), + DECOR_TILE(RedBrick_Bottom) }; const u16 DecorGfx_YELLOW_BRICK[] = { - 0x26, - 0x2E + DECOR_TILE(YellowBrick_Top), + DECOR_TILE(YellowBrick_Bottom) }; const u16 DecorGfx_BLUE_BRICK[] = { - 0x27, - 0x2F + DECOR_TILE(BlueBrick_Top), + DECOR_TILE(BlueBrick_Bottom) }; const u16 DecorGfx_RED_BALLOON[] = { - 0x138 + DECOR_TILE(RedBalloon) }; const u16 DecorGfx_BLUE_BALLOON[] = { - 0x13C + DECOR_TILE(BlueBalloon) }; const u16 DecorGfx_YELLOW_BALLOON[] = { - 0x140 + DECOR_TILE(YellowBalloon) }; const u16 DecorGfx_RED_TENT[] = { - 0x30, - 0x31, - 0x32, - 0x38, - 0x39, - 0x3A, - 0x40, - 0x41, - 0x3B + DECOR_TILE(RedTent_TopLeft), + DECOR_TILE(RedTent_TopMid), + DECOR_TILE(RedTent_TopRight), + DECOR_TILE(RedTent_MidLeft), + DECOR_TILE(RedTent_DoorTop), + DECOR_TILE(RedTent_MidRight), + DECOR_TILE(RedTent_BottomLeft), + DECOR_TILE(RedTent_Door), + DECOR_TILE(RedTent_BottomRight) }; const u16 DecorGfx_BLUE_TENT[] = { - 0x48, - 0x49, - 0x68, - 0x50, - 0x51, - 0x70, - 0x58, - 0x59, - 0x69 + DECOR_TILE(BlueTent_TopLeft), + DECOR_TILE(BlueTent_TopMid), + DECOR_TILE(BlueTent_TopRight), + DECOR_TILE(BlueTent_MidLeft), + DECOR_TILE(BlueTent_DoorTop), + DECOR_TILE(BlueTent_MidRight), + DECOR_TILE(BlueTent_BottomLeft), + DECOR_TILE(BlueTent_Door), + DECOR_TILE(BlueTent_BottomRight) }; const u16 DecorGfx_SOLID_BOARD[] = { - 0x34, - 0x3C + DECOR_TILE(SolidBoard_Top), + DECOR_TILE(SolidBoard_Bottom) }; const u16 DecorGfx_SLIDE[] = { - 0x35, - 0x36, - 0x3D, - 0x3E, - 0x63, - 0x64, - 0x6F, - 0x77 + DECOR_TILE(Slide_TopLeft), + DECOR_TILE(Slide_TopRight), + DECOR_TILE(Slide_StairLanding), + DECOR_TILE(Slide_SlideTop), + DECOR_TILE(Slide_Stairs), + DECOR_TILE(Slide_SlideBottom), + DECOR_TILE(Slide_MatLeft), + DECOR_TILE(Slide_MatRight) }; const u16 DecorGfx_FENCE_LENGTH[] = { - 0x33 + DECOR_TILE(Fence_Vertical) }; const u16 DecorGfx_FENCE_WIDTH[] = { - 0x2C + DECOR_TILE(Fence_Horizontal) }; const u16 DecorGfx_TIRE[] = { - 0x80, - 0x81, - 0x88, - 0x89 + DECOR_TILE(Tire_TopLeft), + DECOR_TILE(Tire_TopRight), + DECOR_TILE(Tire_BottomLeft), + DECOR_TILE(Tire_BottomRight) }; const u16 DecorGfx_STAND[] = { - 0x6A, - 0x6B, - 0x6C, - 0x6D, - 0x72, - 0x73, - 0x74, - 0x75 + DECOR_TILE(Stand_CornerLeft), + DECOR_TILE(Stand_MidLeft), + DECOR_TILE(Stand_MidRight), + DECOR_TILE(Stand_CornerRight), + DECOR_TILE(Stand_StairsLeft), + DECOR_TILE(Stand_BaseLeft), + DECOR_TILE(Stand_BaseRight), + DECOR_TILE(Stand_StairsRight) }; const u16 DecorGfx_MUD_BALL[] = { - 0x28 + DECOR_TILE(MudBall) }; const u16 DecorGfx_BREAKABLE_DOOR[] = { - 0x37, - 0x3F + DECOR_TILE(BreakableDoor_TopClosed), + DECOR_TILE(BreakableDoor_BottomClosed) }; const u16 DecorGfx_SAND_ORNAMENT[] = { - 0x85, - 0x8D + DECOR_TILE(SandOrnament_Top), + DECOR_TILE(SandOrnament_Base1) }; const u16 DecorGfx_SILVER_SHIELD[] = { - 0xD6, - 0xDE + DECOR_TILE(SilverShield_Top), + DECOR_TILE(SilverShield_Base1) }; const u16 DecorGfx_GOLD_SHIELD[] = { - 0x12E, - 0x136 + DECOR_TILE(GoldShield_Top), + DECOR_TILE(GoldShield_Base1) }; const u16 DecorGfx_GLASS_ORNAMENT[] = { - 0x82, - 0x8A + DECOR_TILE(GlassOrnament_Top), + DECOR_TILE(GlassOrnament_Base1) }; const u16 DecorGfx_TV[] = { - 0xF4 + DECOR_TILE(TV) }; const u16 DecorGfx_ROUND_TV[] = { - 0xF5 + DECOR_TILE(RoundTV) }; const u16 DecorGfx_CUTE_TV[] = { - 0xF6 + DECOR_TILE(CuteTV) }; const u16 DecorGfx_GLITTER_MAT[] = { - 0x60 + DECOR_TILE(GlitterMat) }; const u16 DecorGfx_JUMP_MAT[] = { - 0x61 + DECOR_TILE(JumpMat) }; const u16 DecorGfx_SPIN_MAT[] = { - 0x62 + DECOR_TILE(SpinMat) }; const u16 DecorGfx_C_LOW_NOTE_MAT[] = { - 0x78 + DECOR_TILE(NoteMat_C_Low) }; const u16 DecorGfx_D_NOTE_MAT[] = { - 0x79 + DECOR_TILE(NoteMat_D) }; const u16 DecorGfx_E_NOTE_MAT[] = { - 0x7A + DECOR_TILE(NoteMat_E) }; const u16 DecorGfx_F_NOTE_MAT[] = { - 0x7B + DECOR_TILE(NoteMat_F) }; const u16 DecorGfx_G_NOTE_MAT[] = { - 0x7C + DECOR_TILE(NoteMat_G) }; const u16 DecorGfx_A_NOTE_MAT[] = { - 0x7D + DECOR_TILE(NoteMat_A) }; const u16 DecorGfx_B_NOTE_MAT[] = { - 0x7E + DECOR_TILE(NoteMat_B) }; const u16 DecorGfx_C_HIGH_NOTE_MAT[] = { - 0xB3 + DECOR_TILE(NoteMat_C_High) }; const u16 DecorGfx_SURF_MAT[] = { - 0x42, - 0x43, - 0x44, - 0x4A, - 0x4B, - 0x4C, - 0x52, - 0x53, - 0x54 + DECOR_TILE(SurfMat_TopLeft), + DECOR_TILE(SurfMat_TopMid), + DECOR_TILE(SurfMat_TopRight), + DECOR_TILE(SurfMat_MidLeft), + DECOR_TILE(SurfMat_Center), + DECOR_TILE(SurfMat_MidRight), + DECOR_TILE(SurfMat_BottomLeft), + DECOR_TILE(SurfMat_BottomMid), + DECOR_TILE(SurfMat_BottomRight) }; const u16 DecorGfx_THUNDER_MAT[] = { - 0x45, - 0x46, - 0x47, - 0x4D, - 0x4E, - 0x4F, - 0x55, - 0x56, - 0x57 + DECOR_TILE(ThunderMat_TopLeft), + DECOR_TILE(ThunderMat_TopMid), + DECOR_TILE(ThunderMat_TopRight), + DECOR_TILE(ThunderMat_MidLeft), + DECOR_TILE(ThunderMat_Center), + DECOR_TILE(ThunderMat_MidRight), + DECOR_TILE(ThunderMat_BottomLeft), + DECOR_TILE(ThunderMat_BottomMid), + DECOR_TILE(ThunderMat_BottomRight) }; const u16 DecorGfx_FIRE_BLAST_MAT[] = { - 0x5A, - 0x5B, - 0x5C, - 0x5D, - 0x5E, - 0x5F, - 0x65, - 0x66, - 0x67 + DECOR_TILE(FireBlastMat_TopLeft), + DECOR_TILE(FireBlastMat_TopMid), + DECOR_TILE(FireBlastMat_TopRight), + DECOR_TILE(FireBlastMat_MidLeft), + DECOR_TILE(FireBlastMat_Center), + DECOR_TILE(FireBlastMat_MidRight), + DECOR_TILE(FireBlastMat_BottomLeft), + DECOR_TILE(FireBlastMat_BottomMid), + DECOR_TILE(FireBlastMat_BottomRight) }; const u16 DecorGfx_POWDER_SNOW_MAT[] = { - 0x100, - 0x101, - 0x102, - 0x108, - 0x109, - 0x10A, - 0x110, - 0x111, - 0x112 + DECOR_TILE(PowderSnowMat_TopLeft), + DECOR_TILE(PowderSnowMat_TopMid), + DECOR_TILE(PowderSnowMat_TopRight), + DECOR_TILE(PowderSnowMat_MidLeft), + DECOR_TILE(PowderSnowMat_Center), + DECOR_TILE(PowderSnowMat_MidRight), + DECOR_TILE(PowderSnowMat_BottomLeft), + DECOR_TILE(PowderSnowMat_BottomMid), + DECOR_TILE(PowderSnowMat_BottomRight) }; const u16 DecorGfx_ATTRACT_MAT[] = { - 0x103, - 0x104, - 0x105, - 0x10B, - 0x10C, - 0x10D, - 0x113, - 0x114, - 0x115 + DECOR_TILE(AttractMat_TopLeft), + DECOR_TILE(AttractMat_TopMid), + DECOR_TILE(AttractMat_TopRight), + DECOR_TILE(AttractMat_MidLeft), + DECOR_TILE(AttractMat_Center), + DECOR_TILE(AttractMat_MidRight), + DECOR_TILE(AttractMat_BottomLeft), + DECOR_TILE(AttractMat_BottomMid), + DECOR_TILE(AttractMat_BottomRight) }; const u16 DecorGfx_FISSURE_MAT[] = { - 0x106, - 0x107, - 0x118, - 0x10E, - 0x10F, - 0x120, - 0x116, - 0x117, - 0x128 + DECOR_TILE(FissureMat_TopLeft), + DECOR_TILE(FissureMat_TopMid), + DECOR_TILE(FissureMat_TopRight), + DECOR_TILE(FissureMat_MidLeft), + DECOR_TILE(FissureMat_Center), + DECOR_TILE(FissureMat_MidRight), + DECOR_TILE(FissureMat_BottomLeft), + DECOR_TILE(FissureMat_BottomMid), + DECOR_TILE(FissureMat_BottomRight) }; const u16 DecorGfx_SPIKES_MAT[] = { - 0x119, - 0x11A, - 0x11B, - 0x121, - 0x122, - 0x123, - 0x129, - 0x12A, - 0x12B + DECOR_TILE(SpikesMat_TopLeft), + DECOR_TILE(SpikesMat_TopMid), + DECOR_TILE(SpikesMat_TopRight), + DECOR_TILE(SpikesMat_MidLeft), + DECOR_TILE(SpikesMat_Center), + DECOR_TILE(SpikesMat_MidRight), + DECOR_TILE(SpikesMat_BottomLeft), + DECOR_TILE(SpikesMat_BottomMid), + DECOR_TILE(SpikesMat_BottomRight) }; const u16 DecorGfx_BALL_POSTER[] = { - 0x130 + DECOR_TILE(BallPoster) }; const u16 DecorGfx_GREEN_POSTER[] = { - 0x131 + DECOR_TILE(GreenPoster) }; const u16 DecorGfx_RED_POSTER[] = { - 0x132 + DECOR_TILE(RedPoster) }; const u16 DecorGfx_BLUE_POSTER[] = { - 0x133 + DECOR_TILE(BluePoster) }; const u16 DecorGfx_CUTE_POSTER[] = { - 0x134 + DECOR_TILE(CutePoster) }; const u16 DecorGfx_PIKA_POSTER[] = { - 0x11C, - 0x11D + DECOR_TILE(PikaPoster_Left), + DECOR_TILE(PikaPoster_Right) }; const u16 DecorGfx_LONG_POSTER[] = { - 0x11E, - 0x11F + DECOR_TILE(LongPoster_Left), + DECOR_TILE(LongPoster_Right) }; const u16 DecorGfx_SEA_POSTER[] = { - 0x124, - 0x125 + DECOR_TILE(SeaPoster_Left), + DECOR_TILE(SeaPoster_Right) }; const u16 DecorGfx_SKY_POSTER[] = { - 0x126, - 0x127 + DECOR_TILE(SkyPoster_Left), + DECOR_TILE(SkyPoster_Right) }; const u16 DecorGfx_KISS_POSTER[] = { - 0x12C, - 0x12D + DECOR_TILE(KissPoster_Left), + DECOR_TILE(KissPoster_Right) }; const u16 DecorGfx_PICHU_DOLL[] = { diff --git a/src/data/graphics/decorations.h b/src/data/graphics/decorations.h index d8b865fcf7..b18c873481 100644 --- a/src/data/graphics/decorations.h +++ b/src/data/graphics/decorations.h @@ -1,125 +1,125 @@ -const u32 gDecorIcon_HeavyDesk[] = INCBIN_U32("graphics/decorations/decor_heavy_desk.4bpp.lz"); -const u32 gDecorIconPalette_HeavyDesk[] = INCBIN_U32("graphics/decorations/decor_heavy_desk.gbapal.lz"); +const u32 gDecorIcon_HeavyDesk[] = INCBIN_U32("graphics/decorations/heavy_desk.4bpp.lz"); +const u32 gDecorIconPalette_HeavyDesk[] = INCBIN_U32("graphics/decorations/heavy_desk.gbapal.lz"); -const u32 gDecorIcon_RaggedDesk[] = INCBIN_U32("graphics/decorations/decor_ragged_desk.4bpp.lz"); -const u32 gDecorIconPalette_RaggedDesk[] = INCBIN_U32("graphics/decorations/decor_ragged_desk.gbapal.lz"); +const u32 gDecorIcon_RaggedDesk[] = INCBIN_U32("graphics/decorations/ragged_desk.4bpp.lz"); +const u32 gDecorIconPalette_RaggedDesk[] = INCBIN_U32("graphics/decorations/ragged_desk.gbapal.lz"); -const u32 gDecorIcon_ComfortDesk[] = INCBIN_U32("graphics/decorations/decor_comfort_desk.4bpp.lz"); -const u32 gDecorIconPalette_ComfortDesk[] = INCBIN_U32("graphics/decorations/decor_comfort_desk.gbapal.lz"); +const u32 gDecorIcon_ComfortDesk[] = INCBIN_U32("graphics/decorations/comfort_desk.4bpp.lz"); +const u32 gDecorIconPalette_ComfortDesk[] = INCBIN_U32("graphics/decorations/comfort_desk.gbapal.lz"); -const u32 gDecorIcon_PrettyDesk[] = INCBIN_U32("graphics/decorations/decor_pretty_desk.4bpp.lz"); -const u32 gDecorIconPalette_PrettyDesk[] = INCBIN_U32("graphics/decorations/decor_pretty_desk.gbapal.lz"); +const u32 gDecorIcon_PrettyDesk[] = INCBIN_U32("graphics/decorations/pretty_desk.4bpp.lz"); +const u32 gDecorIconPalette_PrettyDesk[] = INCBIN_U32("graphics/decorations/pretty_desk.gbapal.lz"); -const u32 gDecorIcon_BrickDesk[] = INCBIN_U32("graphics/decorations/decor_brick_desk.4bpp.lz"); -const u32 gDecorIconPalette_BrickDesk[] = INCBIN_U32("graphics/decorations/decor_brick_desk.gbapal.lz"); +const u32 gDecorIcon_BrickDesk[] = INCBIN_U32("graphics/decorations/brick_desk.4bpp.lz"); +const u32 gDecorIconPalette_BrickDesk[] = INCBIN_U32("graphics/decorations/brick_desk.gbapal.lz"); -const u32 gDecorIcon_CampDesk[] = INCBIN_U32("graphics/decorations/decor_camp_desk.4bpp.lz"); -const u32 gDecorIconPalette_CampDesk[] = INCBIN_U32("graphics/decorations/decor_camp_desk.gbapal.lz"); +const u32 gDecorIcon_CampDesk[] = INCBIN_U32("graphics/decorations/camp_desk.4bpp.lz"); +const u32 gDecorIconPalette_CampDesk[] = INCBIN_U32("graphics/decorations/camp_desk.gbapal.lz"); -const u32 gDecorIcon_HardDesk[] = INCBIN_U32("graphics/decorations/decor_hard_desk.4bpp.lz"); -const u32 gDecorIconPalette_HardDesk[] = INCBIN_U32("graphics/decorations/decor_hard_desk.gbapal.lz"); +const u32 gDecorIcon_HardDesk[] = INCBIN_U32("graphics/decorations/hard_desk.4bpp.lz"); +const u32 gDecorIconPalette_HardDesk[] = INCBIN_U32("graphics/decorations/hard_desk.gbapal.lz"); -const u32 gDecorIcon_RedPlant[] = INCBIN_U32("graphics/decorations/decor_red_plant.4bpp.lz"); -const u32 gDecorIconPalette_RedPlant[] = INCBIN_U32("graphics/decorations/decor_red_plant.gbapal.lz"); +const u32 gDecorIcon_RedPlant[] = INCBIN_U32("graphics/decorations/red_plant.4bpp.lz"); +const u32 gDecorIconPalette_RedPlant[] = INCBIN_U32("graphics/decorations/red_plant.gbapal.lz"); -const u32 gDecorIcon_TropicalPlant[] = INCBIN_U32("graphics/decorations/decor_tropical_plant.4bpp.lz"); -const u32 gDecorIconPalette_TropicalPlant[] = INCBIN_U32("graphics/decorations/decor_tropical_plant.gbapal.lz"); +const u32 gDecorIcon_TropicalPlant[] = INCBIN_U32("graphics/decorations/tropical_plant.4bpp.lz"); +const u32 gDecorIconPalette_TropicalPlant[] = INCBIN_U32("graphics/decorations/tropical_plant.gbapal.lz"); -const u32 gDecorIcon_PrettyFlowers[] = INCBIN_U32("graphics/decorations/decor_pretty_flowers.4bpp.lz"); -const u32 gDecorIconPalette_PrettyFlowers[] = INCBIN_U32("graphics/decorations/decor_pretty_flowers.gbapal.lz"); +const u32 gDecorIcon_PrettyFlowers[] = INCBIN_U32("graphics/decorations/pretty_flowers.4bpp.lz"); +const u32 gDecorIconPalette_PrettyFlowers[] = INCBIN_U32("graphics/decorations/pretty_flowers.gbapal.lz"); -const u32 gDecorIcon_ColorfulPlant[] = INCBIN_U32("graphics/decorations/decor_colorful_plant.4bpp.lz"); -const u32 gDecorIconPalette_ColorfulPlant[] = INCBIN_U32("graphics/decorations/decor_colorful_plant.gbapal.lz"); +const u32 gDecorIcon_ColorfulPlant[] = INCBIN_U32("graphics/decorations/colorful_plant.4bpp.lz"); +const u32 gDecorIconPalette_ColorfulPlant[] = INCBIN_U32("graphics/decorations/colorful_plant.gbapal.lz"); -const u32 gDecorIcon_BigPlant[] = INCBIN_U32("graphics/decorations/decor_big_plant.4bpp.lz"); -const u32 gDecorIconPalette_BigPlant[] = INCBIN_U32("graphics/decorations/decor_big_plant.gbapal.lz"); +const u32 gDecorIcon_BigPlant[] = INCBIN_U32("graphics/decorations/big_plant.4bpp.lz"); +const u32 gDecorIconPalette_BigPlant[] = INCBIN_U32("graphics/decorations/big_plant.gbapal.lz"); -const u32 gDecorIcon_GorgeousPlant[] = INCBIN_U32("graphics/decorations/decor_gorgeous_plant.4bpp.lz"); -const u32 gDecorIconPalette_GorgeousPlant[] = INCBIN_U32("graphics/decorations/decor_gorgeous_plant.gbapal.lz"); +const u32 gDecorIcon_GorgeousPlant[] = INCBIN_U32("graphics/decorations/gorgeous_plant.4bpp.lz"); +const u32 gDecorIconPalette_GorgeousPlant[] = INCBIN_U32("graphics/decorations/gorgeous_plant.gbapal.lz"); -const u32 gDecorIcon_RedBrick[] = INCBIN_U32("graphics/decorations/decor_red_brick.4bpp.lz"); -const u32 gDecorIconPalette_RedBrick[] = INCBIN_U32("graphics/decorations/decor_red_brick.gbapal.lz"); +const u32 gDecorIcon_RedBrick[] = INCBIN_U32("graphics/decorations/red_brick.4bpp.lz"); +const u32 gDecorIconPalette_RedBrick[] = INCBIN_U32("graphics/decorations/red_brick.gbapal.lz"); -const u32 gDecorIcon_YellowBrick[] = INCBIN_U32("graphics/decorations/decor_yellow_brick.4bpp.lz"); -const u32 gDecorIconPalette_YellowBrick[] = INCBIN_U32("graphics/decorations/decor_yellow_brick.gbapal.lz"); +const u32 gDecorIcon_YellowBrick[] = INCBIN_U32("graphics/decorations/yellow_brick.4bpp.lz"); +const u32 gDecorIconPalette_YellowBrick[] = INCBIN_U32("graphics/decorations/yellow_brick.gbapal.lz"); -const u32 gDecorIcon_BlueBrick[] = INCBIN_U32("graphics/decorations/decor_blue_brick.4bpp.lz"); -const u32 gDecorIconPalette_BlueBrick[] = INCBIN_U32("graphics/decorations/decor_blue_brick.gbapal.lz"); +const u32 gDecorIcon_BlueBrick[] = INCBIN_U32("graphics/decorations/blue_brick.4bpp.lz"); +const u32 gDecorIconPalette_BlueBrick[] = INCBIN_U32("graphics/decorations/blue_brick.gbapal.lz"); -const u32 gDecorIcon_RedTent[] = INCBIN_U32("graphics/decorations/decor_red_tent.4bpp.lz"); -const u32 gDecorIconPalette_RedTent[] = INCBIN_U32("graphics/decorations/decor_red_tent.gbapal.lz"); +const u32 gDecorIcon_RedTent[] = INCBIN_U32("graphics/decorations/red_tent.4bpp.lz"); +const u32 gDecorIconPalette_RedTent[] = INCBIN_U32("graphics/decorations/red_tent.gbapal.lz"); -const u32 gDecorIcon_BlueTent[] = INCBIN_U32("graphics/decorations/decor_blue_tent.4bpp.lz"); -const u32 gDecorIconPalette_BlueTent[] = INCBIN_U32("graphics/decorations/decor_blue_tent.gbapal.lz"); +const u32 gDecorIcon_BlueTent[] = INCBIN_U32("graphics/decorations/blue_tent.4bpp.lz"); +const u32 gDecorIconPalette_BlueTent[] = INCBIN_U32("graphics/decorations/blue_tent.gbapal.lz"); -const u32 gDecorIcon_SolidBoard[] = INCBIN_U32("graphics/decorations/decor_solid_board.4bpp.lz"); -const u32 gDecorIconPalette_SolidBoard[] = INCBIN_U32("graphics/decorations/decor_solid_board.gbapal.lz"); +const u32 gDecorIcon_SolidBoard[] = INCBIN_U32("graphics/decorations/solid_board.4bpp.lz"); +const u32 gDecorIconPalette_SolidBoard[] = INCBIN_U32("graphics/decorations/solid_board.gbapal.lz"); -const u32 gDecorIcon_Slide[] = INCBIN_U32("graphics/decorations/decor_slide.4bpp.lz"); -const u32 gDecorIconPalette_Slide[] = INCBIN_U32("graphics/decorations/decor_slide.gbapal.lz"); +const u32 gDecorIcon_Slide[] = INCBIN_U32("graphics/decorations/slide.4bpp.lz"); +const u32 gDecorIconPalette_Slide[] = INCBIN_U32("graphics/decorations/slide.gbapal.lz"); -const u32 gDecorIcon_Tire[] = INCBIN_U32("graphics/decorations/decor_tire.4bpp.lz"); -const u32 gDecorIconPalette_Tire[] = INCBIN_U32("graphics/decorations/decor_tire.gbapal.lz"); +const u32 gDecorIcon_Tire[] = INCBIN_U32("graphics/decorations/tire.4bpp.lz"); +const u32 gDecorIconPalette_Tire[] = INCBIN_U32("graphics/decorations/tire.gbapal.lz"); -const u32 gDecorIcon_Stand[] = INCBIN_U32("graphics/decorations/decor_stand.4bpp.lz"); -const u32 gDecorIconPalette_Stand[] = INCBIN_U32("graphics/decorations/decor_stand.gbapal.lz"); +const u32 gDecorIcon_Stand[] = INCBIN_U32("graphics/decorations/stand.4bpp.lz"); +const u32 gDecorIconPalette_Stand[] = INCBIN_U32("graphics/decorations/stand.gbapal.lz"); -const u32 gDecorIcon_BreakableDoor[] = INCBIN_U32("graphics/decorations/decor_breakable_door.4bpp.lz"); -const u32 gDecorIconPalette_BreakableDoor[] = INCBIN_U32("graphics/decorations/decor_breakable_door.gbapal.lz"); +const u32 gDecorIcon_BreakableDoor[] = INCBIN_U32("graphics/decorations/breakable_door.4bpp.lz"); +const u32 gDecorIconPalette_BreakableDoor[] = INCBIN_U32("graphics/decorations/breakable_door.gbapal.lz"); -const u32 gDecorIcon_SandOrnament[] = INCBIN_U32("graphics/decorations/decor_sand_ornament.4bpp.lz"); -const u32 gDecorIconPalette_SandOrnament[] = INCBIN_U32("graphics/decorations/decor_sand_ornament.gbapal.lz"); +const u32 gDecorIcon_SandOrnament[] = INCBIN_U32("graphics/decorations/sand_ornament.4bpp.lz"); +const u32 gDecorIconPalette_SandOrnament[] = INCBIN_U32("graphics/decorations/sand_ornament.gbapal.lz"); -const u32 gDecorIcon_GlassOrnament[] = INCBIN_U32("graphics/decorations/decor_glass_ornament.4bpp.lz"); -const u32 gDecorIconPalette_GlassOrnament[] = INCBIN_U32("graphics/decorations/decor_glass_ornament.gbapal.lz"); +const u32 gDecorIcon_GlassOrnament[] = INCBIN_U32("graphics/decorations/glass_ornament.4bpp.lz"); +const u32 gDecorIconPalette_GlassOrnament[] = INCBIN_U32("graphics/decorations/glass_ornament.gbapal.lz"); -const u32 gDecorIcon_SurfMat[] = INCBIN_U32("graphics/decorations/decor_surf_mat.4bpp.lz"); -const u32 gDecorIconPalette_SurfMat[] = INCBIN_U32("graphics/decorations/decor_surf_mat.gbapal.lz"); +const u32 gDecorIcon_SurfMat[] = INCBIN_U32("graphics/decorations/surf_mat.4bpp.lz"); +const u32 gDecorIconPalette_SurfMat[] = INCBIN_U32("graphics/decorations/surf_mat.gbapal.lz"); -const u32 gDecorIcon_ThunderMat[] = INCBIN_U32("graphics/decorations/decor_thunder_mat.4bpp.lz"); -const u32 gDecorIconPalette_ThunderMat[] = INCBIN_U32("graphics/decorations/decor_thunder_mat.gbapal.lz"); +const u32 gDecorIcon_ThunderMat[] = INCBIN_U32("graphics/decorations/thunder_mat.4bpp.lz"); +const u32 gDecorIconPalette_ThunderMat[] = INCBIN_U32("graphics/decorations/thunder_mat.gbapal.lz"); -const u32 gDecorIcon_FireBlastMat[] = INCBIN_U32("graphics/decorations/decor_fire_blast_mat.4bpp.lz"); -const u32 gDecorIconPalette_FireBlastMat[] = INCBIN_U32("graphics/decorations/decor_fire_blast_mat.gbapal.lz"); +const u32 gDecorIcon_FireBlastMat[] = INCBIN_U32("graphics/decorations/fire_blast_mat.4bpp.lz"); +const u32 gDecorIconPalette_FireBlastMat[] = INCBIN_U32("graphics/decorations/fire_blast_mat.gbapal.lz"); -const u32 gDecorIcon_PowderSnowMat[] = INCBIN_U32("graphics/decorations/decor_powder_snow_mat.4bpp.lz"); -const u32 gDecorIconPalette_PowderSnowMat[] = INCBIN_U32("graphics/decorations/decor_powder_snow_mat.gbapal.lz"); +const u32 gDecorIcon_PowderSnowMat[] = INCBIN_U32("graphics/decorations/powder_snow_mat.4bpp.lz"); +const u32 gDecorIconPalette_PowderSnowMat[] = INCBIN_U32("graphics/decorations/powder_snow_mat.gbapal.lz"); -const u32 gDecorIcon_AttractMat[] = INCBIN_U32("graphics/decorations/decor_attract_mat.4bpp.lz"); -const u32 gDecorIconPalette_AttractMat[] = INCBIN_U32("graphics/decorations/decor_attract_mat.gbapal.lz"); +const u32 gDecorIcon_AttractMat[] = INCBIN_U32("graphics/decorations/attract_mat.4bpp.lz"); +const u32 gDecorIconPalette_AttractMat[] = INCBIN_U32("graphics/decorations/attract_mat.gbapal.lz"); -const u32 gDecorIcon_FissureMat[] = INCBIN_U32("graphics/decorations/decor_fissure_mat.4bpp.lz"); -const u32 gDecorIconPalette_FissureMat[] = INCBIN_U32("graphics/decorations/decor_fissure_mat.gbapal.lz"); +const u32 gDecorIcon_FissureMat[] = INCBIN_U32("graphics/decorations/fissure_mat.4bpp.lz"); +const u32 gDecorIconPalette_FissureMat[] = INCBIN_U32("graphics/decorations/fissure_mat.gbapal.lz"); -const u32 gDecorIcon_SpikesMat[] = INCBIN_U32("graphics/decorations/decor_spikes_mat.4bpp.lz"); -const u32 gDecorIconPalette_SpikesMat[] = INCBIN_U32("graphics/decorations/decor_spikes_mat.gbapal.lz"); +const u32 gDecorIcon_SpikesMat[] = INCBIN_U32("graphics/decorations/spikes_mat.4bpp.lz"); +const u32 gDecorIconPalette_SpikesMat[] = INCBIN_U32("graphics/decorations/spikes_mat.gbapal.lz"); -const u32 gDecorIcon_SnorlaxDoll[] = INCBIN_U32("graphics/decorations/decor_snorlax_doll.4bpp.lz"); -const u32 gDecorIconPalette_SnorlaxDoll[] = INCBIN_U32("graphics/decorations/decor_snorlax_doll.gbapal.lz"); +const u32 gDecorIcon_SnorlaxDoll[] = INCBIN_U32("graphics/decorations/snorlax_doll.4bpp.lz"); +const u32 gDecorIconPalette_SnorlaxDoll[] = INCBIN_U32("graphics/decorations/snorlax_doll.gbapal.lz"); -const u32 gDecorIcon_RhydonDoll[] = INCBIN_U32("graphics/decorations/decor_rhydon_doll.4bpp.lz"); -const u32 gDecorIconPalette_RhydonDoll[] = INCBIN_U32("graphics/decorations/decor_rhydon_doll.gbapal.lz"); +const u32 gDecorIcon_RhydonDoll[] = INCBIN_U32("graphics/decorations/rhydon_doll.4bpp.lz"); +const u32 gDecorIconPalette_RhydonDoll[] = INCBIN_U32("graphics/decorations/rhydon_doll.gbapal.lz"); -const u32 gDecorIcon_LaprasDoll[] = INCBIN_U32("graphics/decorations/decor_lapras_doll.4bpp.lz"); -const u32 gDecorIconPalette_LaprasDoll[] = INCBIN_U32("graphics/decorations/decor_lapras_doll.gbapal.lz"); +const u32 gDecorIcon_LaprasDoll[] = INCBIN_U32("graphics/decorations/lapras_doll.4bpp.lz"); +const u32 gDecorIconPalette_LaprasDoll[] = INCBIN_U32("graphics/decorations/lapras_doll.gbapal.lz"); -const u32 gDecorIcon_VenusaurDoll[] = INCBIN_U32("graphics/decorations/decor_venusaur_doll.4bpp.lz"); -const u32 gDecorIconPalette_VenusaurDoll[] = INCBIN_U32("graphics/decorations/decor_venusaur_doll.gbapal.lz"); +const u32 gDecorIcon_VenusaurDoll[] = INCBIN_U32("graphics/decorations/venusaur_doll.4bpp.lz"); +const u32 gDecorIconPalette_VenusaurDoll[] = INCBIN_U32("graphics/decorations/venusaur_doll.gbapal.lz"); -const u32 gDecorIcon_CharizardDoll[] = INCBIN_U32("graphics/decorations/decor_charizard_doll.4bpp.lz"); -const u32 gDecorIconPalette_CharizardDoll[] = INCBIN_U32("graphics/decorations/decor_charizard_doll.gbapal.lz"); +const u32 gDecorIcon_CharizardDoll[] = INCBIN_U32("graphics/decorations/charizard_doll.4bpp.lz"); +const u32 gDecorIconPalette_CharizardDoll[] = INCBIN_U32("graphics/decorations/charizard_doll.gbapal.lz"); -const u32 gDecorIcon_BlastoiseDoll[] = INCBIN_U32("graphics/decorations/decor_blastoise_doll.4bpp.lz"); -const u32 gDecorIconPalette_BlastoiseDoll[] = INCBIN_U32("graphics/decorations/decor_blastoise_doll.gbapal.lz"); +const u32 gDecorIcon_BlastoiseDoll[] = INCBIN_U32("graphics/decorations/blastoise_doll.4bpp.lz"); +const u32 gDecorIconPalette_BlastoiseDoll[] = INCBIN_U32("graphics/decorations/blastoise_doll.gbapal.lz"); -const u32 gDecorIcon_WailmerDoll[] = INCBIN_U32("graphics/decorations/decor_wailmer_doll.4bpp.lz"); -const u32 gDecorIconPalette_WailmerDoll[] = INCBIN_U32("graphics/decorations/decor_wailmer_doll.gbapal.lz"); +const u32 gDecorIcon_WailmerDoll[] = INCBIN_U32("graphics/decorations/wailmer_doll.4bpp.lz"); +const u32 gDecorIconPalette_WailmerDoll[] = INCBIN_U32("graphics/decorations/wailmer_doll.gbapal.lz"); -const u32 gDecorIcon_RegiceDoll[] = INCBIN_U32("graphics/decorations/decor_regice_doll.4bpp.lz"); -const u32 gDecorIconPalette_RegiceDoll[] = INCBIN_U32("graphics/decorations/decor_regice_doll.gbapal.lz"); +const u32 gDecorIcon_RegiceDoll[] = INCBIN_U32("graphics/decorations/regice_doll.4bpp.lz"); +const u32 gDecorIconPalette_RegiceDoll[] = INCBIN_U32("graphics/decorations/regice_doll.gbapal.lz"); -const u32 gDecorIcon_RegirockDoll[] = INCBIN_U32("graphics/decorations/decor_regirock_doll.4bpp.lz"); -const u32 gDecorIconPalette_RegirockDoll[] = INCBIN_U32("graphics/decorations/decor_regirock_doll.gbapal.lz"); +const u32 gDecorIcon_RegirockDoll[] = INCBIN_U32("graphics/decorations/regirock_doll.4bpp.lz"); +const u32 gDecorIconPalette_RegirockDoll[] = INCBIN_U32("graphics/decorations/regirock_doll.gbapal.lz"); -const u32 gDecorIcon_RegisteelDoll[] = INCBIN_U32("graphics/decorations/decor_registeel_doll.4bpp.lz"); -const u32 gDecorIconPalette_RegisteelDoll[] = INCBIN_U32("graphics/decorations/decor_registeel_doll.gbapal.lz"); +const u32 gDecorIcon_RegisteelDoll[] = INCBIN_U32("graphics/decorations/registeel_doll.4bpp.lz"); +const u32 gDecorIconPalette_RegisteelDoll[] = INCBIN_U32("graphics/decorations/registeel_doll.gbapal.lz"); diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index 35bbb1e036..6d44f4b514 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -261,7 +261,7 @@ static const u8 sRSAvatarGfxIds[] = {OBJ_EVENT_GFX_LINK_RS_BRENDAN, OBJ_EVENT_GF static const u8 sPlayerAvatarGfxToStateFlag[2][5][2] = { - [MALE] = + [MALE] = { {OBJ_EVENT_GFX_BRENDAN_NORMAL, PLAYER_AVATAR_FLAG_ON_FOOT}, {OBJ_EVENT_GFX_BRENDAN_MACH_BIKE, PLAYER_AVATAR_FLAG_MACH_BIKE}, @@ -269,7 +269,7 @@ static const u8 sPlayerAvatarGfxToStateFlag[2][5][2] = {OBJ_EVENT_GFX_BRENDAN_SURFING, PLAYER_AVATAR_FLAG_SURFING}, {OBJ_EVENT_GFX_BRENDAN_UNDERWATER, PLAYER_AVATAR_FLAG_UNDERWATER}, }, - [FEMALE] = + [FEMALE] = { {OBJ_EVENT_GFX_MAY_NORMAL, PLAYER_AVATAR_FLAG_ON_FOOT}, {OBJ_EVENT_GFX_MAY_MACH_BIKE, PLAYER_AVATAR_FLAG_MACH_BIKE}, @@ -1079,23 +1079,23 @@ void PlayerAcroTurnJump(u8 direction) PlayerSetAnimId(GetJumpInPlaceTurnAroundMovementAction(direction), 1); } -void sub_808B980(u8 direction) +void PlayerWheelieInPlace(u8 direction) { PlaySE(SE_WALL_HIT); PlayerSetAnimId(GetAcroWheelieInPlaceDirectionMovementAction(direction), 2); } -void sub_808B9A4(u8 direction) +void PlayerPopWheelieWhileMoving(u8 direction) { PlayerSetAnimId(GetAcroPopWheelieMoveDirectionMovementAction(direction), 2); } -void sub_808B9BC(u8 direction) +void PlayerWheelieMove(u8 direction) { PlayerSetAnimId(GetAcroWheelieMoveDirectionMovementAction(direction), 2); } -void sub_808B9D4(u8 direction) +void PlayerEndWheelieWhileMoving(u8 direction) { PlayerSetAnimId(GetAcroEndWheelieMoveDirectionMovementAction(direction), 2); } @@ -1415,7 +1415,7 @@ void sub_808C15C(u8 direction) StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingDirectionAnimNum(direction)); } -void sub_808C1B4(u8 direction) +void PlayerUseAcroBikeOnBumpySlope(u8 direction) { ObjectEventSetGraphicsId(&gObjectEvents[gPlayerAvatar.objectEventId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_ACRO_BIKE)); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetAcroWheelieDirectionAnimNum(direction)); diff --git a/src/fldeff_misc.c b/src/fldeff_misc.c index def86ab1b1..9574ac5634 100644 --- a/src/fldeff_misc.c +++ b/src/fldeff_misc.c @@ -948,7 +948,7 @@ static void Task_SecretBaseMusicNoteMatSound(u8 taskId) { switch (gTasks[taskId].tMetatileID) { - case METATILE_SecretBase_NoteMat_C: + case METATILE_SecretBase_NoteMat_C_Low: PlaySE(SE_TOY_C); break; case METATILE_SecretBase_NoteMat_D: @@ -969,7 +969,7 @@ static void Task_SecretBaseMusicNoteMatSound(u8 taskId) case METATILE_SecretBase_NoteMat_B: PlaySE(SE_TOY_B); break; - case METATILE_SecretBase_NoteMat_C_Sharp: + case METATILE_SecretBase_NoteMat_C_High: PlaySE(SE_TOY_C1); break; } diff --git a/src/new_game.c b/src/new_game.c index 464da64146..290c0c2bb7 100644 --- a/src/new_game.c +++ b/src/new_game.c @@ -162,7 +162,7 @@ void NewGameInitData(void) ClearSav1(); ClearMailData(); gSaveBlock2Ptr->specialSaveWarpFlags = 0; - gSaveBlock2Ptr->field_A8 = 0; + gSaveBlock2Ptr->gcnLinkFlags = 0; InitPlayerTrainerId(); PlayTimeCounter_Reset(); ClearPokedexFlags(); diff --git a/src/save_location.c b/src/save_location.c index 6bf5eceb02..aa56d7b16c 100644 --- a/src/save_location.c +++ b/src/save_location.c @@ -118,17 +118,18 @@ void TrySetMapSaveWarpStatus(void) sub_81AFD5C(); } -// Called when receiving the Pokedex -// Only place field_A8 is written (aside from clearing on new game), never read -void sub_81AFDA0(void) +// In FRLG, only 0x1, 0x10, and 0x20 are set when the pokedex is received +// 0x2, 0x4, 0x8, and 0x8000 are instead set by SetPostgameFlags +// These flags are read by Pokemon Colosseum/XD for linking. XD Additionally requires FLAG_SYS_GAME_CLEAR +void SetUnlockedPokedexFlags(void) { - gSaveBlock2Ptr->field_A8 |= 0x8000; - gSaveBlock2Ptr->field_A8 |= 0x1; - gSaveBlock2Ptr->field_A8 |= 0x2; - gSaveBlock2Ptr->field_A8 |= 0x4; - gSaveBlock2Ptr->field_A8 |= 0x10; - gSaveBlock2Ptr->field_A8 |= 0x20; - gSaveBlock2Ptr->field_A8 |= 0x8; + gSaveBlock2Ptr->gcnLinkFlags |= 0x8000; + gSaveBlock2Ptr->gcnLinkFlags |= 0x1; + gSaveBlock2Ptr->gcnLinkFlags |= 0x2; + gSaveBlock2Ptr->gcnLinkFlags |= 0x4; + gSaveBlock2Ptr->gcnLinkFlags |= 0x10; + gSaveBlock2Ptr->gcnLinkFlags |= 0x20; + gSaveBlock2Ptr->gcnLinkFlags |= 0x8; } void SetChampionSaveWarp(void) diff --git a/src/secret_base.c b/src/secret_base.c index ec48e9b511..24644d0ec6 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -1176,7 +1176,7 @@ void SecretBasePerStepCallback(u8 taskId) VarSet(VAR_SECRET_BASE_STEP_COUNTER, VarGet(VAR_SECRET_BASE_STEP_COUNTER) + 1); behavior = MapGridGetMetatileBehaviorAt(x, y); tileId = MapGridGetMetatileIdAt(x, y); - if (tileId == METATILE_SecretBase_Board_Top || tileId == METATILE_SecretBase_Board_Bottom) + if (tileId == METATILE_SecretBase_SolidBoard_Top || tileId == METATILE_SecretBase_SolidBoard_Bottom) { if (sInFriendSecretBase == TRUE) { @@ -1204,13 +1204,13 @@ void SecretBasePerStepCallback(u8 taskId) if (sInFriendSecretBase == TRUE) VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | SECRET_BASE_USED_TENT); } - else if ((behavior == MB_IMPASSABLE_NORTHEAST && tileId == METATILE_SecretBase_Stand_RightCorner) - || (behavior == MB_IMPASSABLE_NORTHWEST && MapGridGetMetatileIdAt(x, y) == METATILE_SecretBase_Stand_LeftCorner)) + else if ((behavior == MB_IMPASSABLE_NORTHEAST && tileId == METATILE_SecretBase_Stand_CornerRight) + || (behavior == MB_IMPASSABLE_NORTHWEST && MapGridGetMetatileIdAt(x, y) == METATILE_SecretBase_Stand_CornerLeft)) { if (sInFriendSecretBase == TRUE) VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | SECRET_BASE_USED_STAND); } - else if (behavior == MB_IMPASSABLE_WEST_AND_EAST && tileId == METATILE_SecretBase_Slide_Stairs) + else if (behavior == MB_IMPASSABLE_WEST_AND_EAST && tileId == METATILE_SecretBase_Slide_StairLanding) { if (sInFriendSecretBase == TRUE) { @@ -1218,7 +1218,7 @@ void SecretBasePerStepCallback(u8 taskId) VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | SECRET_BASE_DECLINED_SLIDE); } } - else if (behavior == MB_SLIDE_SOUTH && tileId == METATILE_SecretBase_Slide) + else if (behavior == MB_SLIDE_SOUTH && tileId == METATILE_SecretBase_Slide_SlideTop) { if (sInFriendSecretBase == TRUE) { @@ -1846,12 +1846,12 @@ void CheckInteractedWithFriendsFurnitureBottom(void) case METATILE_SecretBase_RedPlant_Base2: case METATILE_SecretBase_TropicalPlant_Base1: case METATILE_SecretBase_TropicalPlant_Base2: - case METATILE_SecretBase_PrettyFlower_Base1: - case METATILE_SecretBase_PrettyFlower_Base2: - case METATILE_SecretBase_ColorfulFlowers_BaseLeft1: - case METATILE_SecretBase_ColorfulFlowers_BaseRight1: - case METATILE_SecretBase_ColorfulFlowers_BaseLeft2: - case METATILE_SecretBase_ColorfulFlowers_BaseRight2: + case METATILE_SecretBase_PrettyFlowers_Base1: + case METATILE_SecretBase_PrettyFlowers_Base2: + case METATILE_SecretBase_ColorfulPlant_BaseLeft1: + case METATILE_SecretBase_ColorfulPlant_BaseRight1: + case METATILE_SecretBase_ColorfulPlant_BaseLeft2: + case METATILE_SecretBase_ColorfulPlant_BaseRight2: case METATILE_SecretBase_BigPlant_BaseLeft1: case METATILE_SecretBase_BigPlant_BaseRight1: case METATILE_SecretBase_BigPlant_BaseLeft2: