From b80442645dc880216a35a780e5bed232aea1f92a Mon Sep 17 00:00:00 2001 From: hjk321 <37224753+hjk321@users.noreply.github.com> Date: Fri, 23 Apr 2021 11:10:15 -0600 Subject: Reorganize battle terrain gfx --- graphics/battle_terrain/building/anim.bin | Bin 0 -> 896 bytes graphics/battle_terrain/building/anim.png | Bin 0 -> 541 bytes graphics/battle_terrain/building/terrain.bin | Bin 0 -> 4096 bytes graphics/battle_terrain/building/terrain.pal | 51 +++++++++ graphics/battle_terrain/building/terrain.png | Bin 0 -> 706 bytes graphics/battle_terrain/cave/anim.bin | Bin 0 -> 896 bytes graphics/battle_terrain/cave/anim.png | Bin 0 -> 3877 bytes graphics/battle_terrain/cave/terrain.bin | Bin 0 -> 4096 bytes graphics/battle_terrain/cave/terrain.pal | 51 +++++++++ graphics/battle_terrain/cave/terrain.png | Bin 0 -> 901 bytes graphics/battle_terrain/grass/anim.bin | Bin 0 -> 896 bytes graphics/battle_terrain/grass/anim.png | Bin 0 -> 683 bytes graphics/battle_terrain/grass/terrain.bin | Bin 0 -> 4096 bytes graphics/battle_terrain/grass/terrain.pal | 51 +++++++++ graphics/battle_terrain/grass/terrain.png | Bin 0 -> 1213 bytes graphics/battle_terrain/indoor/1.pal | 51 +++++++++ graphics/battle_terrain/indoor/2.pal | 51 +++++++++ graphics/battle_terrain/indoor/agatha.pal | 51 +++++++++ graphics/battle_terrain/indoor/bruno.pal | 51 +++++++++ graphics/battle_terrain/indoor/champion.pal | 51 +++++++++ graphics/battle_terrain/indoor/gym.pal | 51 +++++++++ graphics/battle_terrain/indoor/lance.pal | 51 +++++++++ graphics/battle_terrain/indoor/leader.pal | 51 +++++++++ graphics/battle_terrain/indoor/link.pal | 51 +++++++++ graphics/battle_terrain/indoor/lorelei.pal | 51 +++++++++ graphics/battle_terrain/indoor/plain.pal | 51 +++++++++ graphics/battle_terrain/indoor/terrain.bin | Bin 0 -> 4096 bytes graphics/battle_terrain/indoor/terrain.png | Bin 0 -> 706 bytes graphics/battle_terrain/longgrass/anim.bin | Bin 0 -> 896 bytes graphics/battle_terrain/longgrass/anim.png | Bin 0 -> 986 bytes graphics/battle_terrain/longgrass/terrain.bin | Bin 0 -> 4096 bytes graphics/battle_terrain/longgrass/terrain.pal | 51 +++++++++ graphics/battle_terrain/longgrass/terrain.png | Bin 0 -> 1213 bytes graphics/battle_terrain/mountain/anim.bin | Bin 0 -> 896 bytes graphics/battle_terrain/mountain/anim.png | Bin 0 -> 610 bytes graphics/battle_terrain/mountain/terrain.bin | Bin 0 -> 4096 bytes graphics/battle_terrain/mountain/terrain.pal | 51 +++++++++ graphics/battle_terrain/mountain/terrain.png | Bin 0 -> 750 bytes graphics/battle_terrain/pond/anim.bin | Bin 0 -> 896 bytes graphics/battle_terrain/pond/anim.png | Bin 0 -> 481 bytes graphics/battle_terrain/pond/terrain.bin | Bin 0 -> 4096 bytes graphics/battle_terrain/pond/terrain.pal | 51 +++++++++ graphics/battle_terrain/pond/terrain.png | Bin 0 -> 739 bytes graphics/battle_terrain/sand/anim.bin | Bin 0 -> 896 bytes graphics/battle_terrain/sand/anim.png | Bin 0 -> 515 bytes graphics/battle_terrain/sand/terrain.bin | Bin 0 -> 4096 bytes graphics/battle_terrain/sand/terrain.pal | 51 +++++++++ graphics/battle_terrain/sand/terrain.png | Bin 0 -> 829 bytes graphics/battle_terrain/terrain_building.bin | Bin 4096 -> 0 bytes graphics/battle_terrain/terrain_building.pal | 51 --------- graphics/battle_terrain/terrain_building.png | Bin 706 -> 0 bytes graphics/battle_terrain/terrain_building_anim.bin | Bin 896 -> 0 bytes graphics/battle_terrain/terrain_building_anim.png | Bin 541 -> 0 bytes graphics/battle_terrain/terrain_cave.bin | Bin 4096 -> 0 bytes graphics/battle_terrain/terrain_cave.pal | 51 --------- graphics/battle_terrain/terrain_cave.png | Bin 901 -> 0 bytes graphics/battle_terrain/terrain_cave_anim.bin | Bin 896 -> 0 bytes graphics/battle_terrain/terrain_cave_anim.png | Bin 3877 -> 0 bytes graphics/battle_terrain/terrain_grass.bin | Bin 4096 -> 0 bytes graphics/battle_terrain/terrain_grass.pal | 51 --------- graphics/battle_terrain/terrain_grass.png | Bin 1213 -> 0 bytes graphics/battle_terrain/terrain_grass_anim.bin | Bin 896 -> 0 bytes graphics/battle_terrain/terrain_grass_anim.png | Bin 683 -> 0 bytes graphics/battle_terrain/terrain_indoor.bin | Bin 4096 -> 0 bytes graphics/battle_terrain/terrain_indoor.png | Bin 706 -> 0 bytes graphics/battle_terrain/terrain_indoor_1.pal | 51 --------- graphics/battle_terrain/terrain_indoor_2.pal | 51 --------- graphics/battle_terrain/terrain_indoor_agatha.pal | 51 --------- graphics/battle_terrain/terrain_indoor_bruno.pal | 51 --------- .../battle_terrain/terrain_indoor_champion.pal | 51 --------- graphics/battle_terrain/terrain_indoor_gym.pal | 51 --------- graphics/battle_terrain/terrain_indoor_lance.pal | 51 --------- graphics/battle_terrain/terrain_indoor_leader.pal | 51 --------- graphics/battle_terrain/terrain_indoor_link.pal | 51 --------- graphics/battle_terrain/terrain_indoor_lorelei.pal | 51 --------- graphics/battle_terrain/terrain_indoor_plain.pal | 51 --------- graphics/battle_terrain/terrain_longgrass.bin | Bin 4096 -> 0 bytes graphics/battle_terrain/terrain_longgrass.pal | 51 --------- graphics/battle_terrain/terrain_longgrass.png | Bin 1213 -> 0 bytes graphics/battle_terrain/terrain_longgrass_anim.bin | Bin 896 -> 0 bytes graphics/battle_terrain/terrain_longgrass_anim.png | Bin 986 -> 0 bytes graphics/battle_terrain/terrain_mountain.bin | Bin 4096 -> 0 bytes graphics/battle_terrain/terrain_mountain.pal | 51 --------- graphics/battle_terrain/terrain_mountain.png | Bin 750 -> 0 bytes graphics/battle_terrain/terrain_mountain_anim.bin | Bin 896 -> 0 bytes graphics/battle_terrain/terrain_mountain_anim.png | Bin 610 -> 0 bytes graphics/battle_terrain/terrain_pond.bin | Bin 4096 -> 0 bytes graphics/battle_terrain/terrain_pond.pal | 51 --------- graphics/battle_terrain/terrain_pond.png | Bin 739 -> 0 bytes graphics/battle_terrain/terrain_pond_anim.bin | Bin 896 -> 0 bytes graphics/battle_terrain/terrain_pond_anim.png | Bin 481 -> 0 bytes graphics/battle_terrain/terrain_sand.bin | Bin 4096 -> 0 bytes graphics/battle_terrain/terrain_sand.pal | 51 --------- graphics/battle_terrain/terrain_sand.png | Bin 829 -> 0 bytes graphics/battle_terrain/terrain_sand_anim.bin | Bin 896 -> 0 bytes graphics/battle_terrain/terrain_sand_anim.png | Bin 515 -> 0 bytes graphics/battle_terrain/terrain_underwater.bin | Bin 4096 -> 0 bytes graphics/battle_terrain/terrain_underwater.pal | 51 --------- graphics/battle_terrain/terrain_underwater.png | Bin 763 -> 0 bytes .../battle_terrain/terrain_underwater_anim.bin | Bin 896 -> 0 bytes .../battle_terrain/terrain_underwater_anim.png | Bin 363 -> 0 bytes graphics/battle_terrain/terrain_water.bin | Bin 4096 -> 0 bytes graphics/battle_terrain/terrain_water.pal | 51 --------- graphics/battle_terrain/terrain_water.png | Bin 959 -> 0 bytes graphics/battle_terrain/terrain_water_anim.bin | Bin 896 -> 0 bytes graphics/battle_terrain/terrain_water_anim.png | Bin 764 -> 0 bytes graphics/battle_terrain/underwater/anim.bin | Bin 0 -> 896 bytes graphics/battle_terrain/underwater/anim.png | Bin 0 -> 363 bytes graphics/battle_terrain/underwater/terrain.bin | Bin 0 -> 4096 bytes graphics/battle_terrain/underwater/terrain.pal | 51 +++++++++ graphics/battle_terrain/underwater/terrain.png | Bin 0 -> 763 bytes graphics/battle_terrain/water/anim.bin | Bin 0 -> 896 bytes graphics/battle_terrain/water/anim.png | Bin 0 -> 764 bytes graphics/battle_terrain/water/terrain.bin | Bin 0 -> 4096 bytes graphics/battle_terrain/water/terrain.pal | 51 +++++++++ graphics/battle_terrain/water/terrain.png | Bin 0 -> 959 bytes graphics_file_rules.mk | 28 ++--- src/battle_bg.c | 116 ++++++++++----------- 118 files changed, 1092 insertions(+), 1092 deletions(-) create mode 100644 graphics/battle_terrain/building/anim.bin create mode 100644 graphics/battle_terrain/building/anim.png create mode 100644 graphics/battle_terrain/building/terrain.bin create mode 100644 graphics/battle_terrain/building/terrain.pal create mode 100644 graphics/battle_terrain/building/terrain.png create mode 100644 graphics/battle_terrain/cave/anim.bin create mode 100644 graphics/battle_terrain/cave/anim.png create mode 100644 graphics/battle_terrain/cave/terrain.bin create mode 100644 graphics/battle_terrain/cave/terrain.pal create mode 100644 graphics/battle_terrain/cave/terrain.png create mode 100644 graphics/battle_terrain/grass/anim.bin create mode 100644 graphics/battle_terrain/grass/anim.png create mode 100644 graphics/battle_terrain/grass/terrain.bin create mode 100644 graphics/battle_terrain/grass/terrain.pal create mode 100644 graphics/battle_terrain/grass/terrain.png create mode 100644 graphics/battle_terrain/indoor/1.pal create mode 100644 graphics/battle_terrain/indoor/2.pal create mode 100644 graphics/battle_terrain/indoor/agatha.pal create mode 100644 graphics/battle_terrain/indoor/bruno.pal create mode 100644 graphics/battle_terrain/indoor/champion.pal create mode 100644 graphics/battle_terrain/indoor/gym.pal create mode 100644 graphics/battle_terrain/indoor/lance.pal create mode 100644 graphics/battle_terrain/indoor/leader.pal create mode 100644 graphics/battle_terrain/indoor/link.pal create mode 100644 graphics/battle_terrain/indoor/lorelei.pal create mode 100644 graphics/battle_terrain/indoor/plain.pal create mode 100644 graphics/battle_terrain/indoor/terrain.bin create mode 100644 graphics/battle_terrain/indoor/terrain.png create mode 100644 graphics/battle_terrain/longgrass/anim.bin create mode 100644 graphics/battle_terrain/longgrass/anim.png create mode 100644 graphics/battle_terrain/longgrass/terrain.bin create mode 100644 graphics/battle_terrain/longgrass/terrain.pal create mode 100644 graphics/battle_terrain/longgrass/terrain.png create mode 100644 graphics/battle_terrain/mountain/anim.bin create mode 100644 graphics/battle_terrain/mountain/anim.png create mode 100644 graphics/battle_terrain/mountain/terrain.bin create mode 100644 graphics/battle_terrain/mountain/terrain.pal create mode 100644 graphics/battle_terrain/mountain/terrain.png create mode 100644 graphics/battle_terrain/pond/anim.bin create mode 100644 graphics/battle_terrain/pond/anim.png create mode 100644 graphics/battle_terrain/pond/terrain.bin create mode 100644 graphics/battle_terrain/pond/terrain.pal create mode 100644 graphics/battle_terrain/pond/terrain.png create mode 100644 graphics/battle_terrain/sand/anim.bin create mode 100644 graphics/battle_terrain/sand/anim.png create mode 100644 graphics/battle_terrain/sand/terrain.bin create mode 100644 graphics/battle_terrain/sand/terrain.pal create mode 100644 graphics/battle_terrain/sand/terrain.png delete mode 100644 graphics/battle_terrain/terrain_building.bin delete mode 100644 graphics/battle_terrain/terrain_building.pal delete mode 100644 graphics/battle_terrain/terrain_building.png delete mode 100644 graphics/battle_terrain/terrain_building_anim.bin delete mode 100644 graphics/battle_terrain/terrain_building_anim.png delete mode 100644 graphics/battle_terrain/terrain_cave.bin delete mode 100644 graphics/battle_terrain/terrain_cave.pal delete mode 100644 graphics/battle_terrain/terrain_cave.png delete mode 100644 graphics/battle_terrain/terrain_cave_anim.bin delete mode 100644 graphics/battle_terrain/terrain_cave_anim.png delete mode 100644 graphics/battle_terrain/terrain_grass.bin delete mode 100644 graphics/battle_terrain/terrain_grass.pal delete mode 100644 graphics/battle_terrain/terrain_grass.png delete mode 100644 graphics/battle_terrain/terrain_grass_anim.bin delete mode 100644 graphics/battle_terrain/terrain_grass_anim.png delete mode 100644 graphics/battle_terrain/terrain_indoor.bin delete mode 100644 graphics/battle_terrain/terrain_indoor.png delete mode 100644 graphics/battle_terrain/terrain_indoor_1.pal delete mode 100644 graphics/battle_terrain/terrain_indoor_2.pal delete mode 100644 graphics/battle_terrain/terrain_indoor_agatha.pal delete mode 100644 graphics/battle_terrain/terrain_indoor_bruno.pal delete mode 100644 graphics/battle_terrain/terrain_indoor_champion.pal delete mode 100644 graphics/battle_terrain/terrain_indoor_gym.pal delete mode 100644 graphics/battle_terrain/terrain_indoor_lance.pal delete mode 100644 graphics/battle_terrain/terrain_indoor_leader.pal delete mode 100644 graphics/battle_terrain/terrain_indoor_link.pal delete mode 100644 graphics/battle_terrain/terrain_indoor_lorelei.pal delete mode 100644 graphics/battle_terrain/terrain_indoor_plain.pal delete mode 100644 graphics/battle_terrain/terrain_longgrass.bin delete mode 100644 graphics/battle_terrain/terrain_longgrass.pal delete mode 100644 graphics/battle_terrain/terrain_longgrass.png delete mode 100644 graphics/battle_terrain/terrain_longgrass_anim.bin delete mode 100644 graphics/battle_terrain/terrain_longgrass_anim.png delete mode 100644 graphics/battle_terrain/terrain_mountain.bin delete mode 100644 graphics/battle_terrain/terrain_mountain.pal delete mode 100644 graphics/battle_terrain/terrain_mountain.png delete mode 100644 graphics/battle_terrain/terrain_mountain_anim.bin delete mode 100644 graphics/battle_terrain/terrain_mountain_anim.png delete mode 100644 graphics/battle_terrain/terrain_pond.bin delete mode 100644 graphics/battle_terrain/terrain_pond.pal delete mode 100644 graphics/battle_terrain/terrain_pond.png delete mode 100644 graphics/battle_terrain/terrain_pond_anim.bin delete mode 100644 graphics/battle_terrain/terrain_pond_anim.png delete mode 100644 graphics/battle_terrain/terrain_sand.bin delete mode 100644 graphics/battle_terrain/terrain_sand.pal delete mode 100644 graphics/battle_terrain/terrain_sand.png delete mode 100644 graphics/battle_terrain/terrain_sand_anim.bin delete mode 100644 graphics/battle_terrain/terrain_sand_anim.png delete mode 100644 graphics/battle_terrain/terrain_underwater.bin delete mode 100644 graphics/battle_terrain/terrain_underwater.pal delete mode 100644 graphics/battle_terrain/terrain_underwater.png delete mode 100644 graphics/battle_terrain/terrain_underwater_anim.bin delete mode 100644 graphics/battle_terrain/terrain_underwater_anim.png delete mode 100644 graphics/battle_terrain/terrain_water.bin delete mode 100644 graphics/battle_terrain/terrain_water.pal delete mode 100644 graphics/battle_terrain/terrain_water.png delete mode 100644 graphics/battle_terrain/terrain_water_anim.bin delete mode 100644 graphics/battle_terrain/terrain_water_anim.png create mode 100644 graphics/battle_terrain/underwater/anim.bin create mode 100644 graphics/battle_terrain/underwater/anim.png create mode 100644 graphics/battle_terrain/underwater/terrain.bin create mode 100644 graphics/battle_terrain/underwater/terrain.pal create mode 100644 graphics/battle_terrain/underwater/terrain.png create mode 100644 graphics/battle_terrain/water/anim.bin create mode 100644 graphics/battle_terrain/water/anim.png create mode 100644 graphics/battle_terrain/water/terrain.bin create mode 100644 graphics/battle_terrain/water/terrain.pal create mode 100644 graphics/battle_terrain/water/terrain.png diff --git a/graphics/battle_terrain/building/anim.bin b/graphics/battle_terrain/building/anim.bin new file mode 100644 index 000000000..aba49c6f9 Binary files /dev/null and b/graphics/battle_terrain/building/anim.bin differ diff --git a/graphics/battle_terrain/building/anim.png b/graphics/battle_terrain/building/anim.png new file mode 100644 index 000000000..443cd98ab Binary files /dev/null and b/graphics/battle_terrain/building/anim.png differ diff --git a/graphics/battle_terrain/building/terrain.bin b/graphics/battle_terrain/building/terrain.bin new file mode 100644 index 000000000..0710427da Binary files /dev/null and b/graphics/battle_terrain/building/terrain.bin differ diff --git a/graphics/battle_terrain/building/terrain.pal b/graphics/battle_terrain/building/terrain.pal new file mode 100644 index 000000000..16421567f --- /dev/null +++ b/graphics/battle_terrain/building/terrain.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +246 255 255 +255 255 255 +230 230 230 +230 230 230 +246 246 246 +230 238 238 +238 238 238 +238 238 238 +246 255 255 +255 255 255 +255 255 180 +255 255 197 +255 255 222 +255 255 238 +246 246 246 +0 0 0 +246 255 255 +255 255 255 +213 213 213 +230 230 230 +238 238 238 +230 238 238 +222 230 222 +238 238 238 +246 255 255 +255 255 255 +255 255 180 +255 255 197 +255 255 222 +255 255 238 +246 246 246 +0 0 0 +164 213 255 +238 255 255 +180 230 255 +205 238 255 +222 246 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_terrain/building/terrain.png b/graphics/battle_terrain/building/terrain.png new file mode 100644 index 000000000..3b060be4e Binary files /dev/null and b/graphics/battle_terrain/building/terrain.png differ diff --git a/graphics/battle_terrain/cave/anim.bin b/graphics/battle_terrain/cave/anim.bin new file mode 100644 index 000000000..ad7724c67 Binary files /dev/null and b/graphics/battle_terrain/cave/anim.bin differ diff --git a/graphics/battle_terrain/cave/anim.png b/graphics/battle_terrain/cave/anim.png new file mode 100644 index 000000000..84f13f8f0 Binary files /dev/null and b/graphics/battle_terrain/cave/anim.png differ diff --git a/graphics/battle_terrain/cave/terrain.bin b/graphics/battle_terrain/cave/terrain.bin new file mode 100644 index 000000000..255f2953d Binary files /dev/null and b/graphics/battle_terrain/cave/terrain.bin differ diff --git a/graphics/battle_terrain/cave/terrain.pal b/graphics/battle_terrain/cave/terrain.pal new file mode 100644 index 000000000..f17a7bf9d --- /dev/null +++ b/graphics/battle_terrain/cave/terrain.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +197 172 106 +205 197 90 +156 131 98 +180 148 106 +180 164 106 +197 180 106 +255 0 255 +213 197 115 +230 222 106 +164 139 82 +205 180 106 +189 164 106 +180 156 98 +172 148 90 +189 156 106 +0 0 0 +197 172 106 +205 197 90 +148 123 82 +164 131 90 +172 156 90 +189 180 90 +255 0 255 +213 197 115 +230 222 106 +164 139 82 +197 172 106 +189 164 106 +180 156 98 +172 148 90 +189 156 106 +0 0 0 +106 74 65 +148 115 82 +180 139 90 +213 180 131 +230 213 156 +0 0 0 +180 139 90 +180 139 90 +180 139 90 +213 180 131 +106 74 65 +148 115 82 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_terrain/cave/terrain.png b/graphics/battle_terrain/cave/terrain.png new file mode 100644 index 000000000..e2a18ae57 Binary files /dev/null and b/graphics/battle_terrain/cave/terrain.png differ diff --git a/graphics/battle_terrain/grass/anim.bin b/graphics/battle_terrain/grass/anim.bin new file mode 100644 index 000000000..03e4194fc Binary files /dev/null and b/graphics/battle_terrain/grass/anim.bin differ diff --git a/graphics/battle_terrain/grass/anim.png b/graphics/battle_terrain/grass/anim.png new file mode 100644 index 000000000..f2f2c1bb1 Binary files /dev/null and b/graphics/battle_terrain/grass/anim.png differ diff --git a/graphics/battle_terrain/grass/terrain.bin b/graphics/battle_terrain/grass/terrain.bin new file mode 100644 index 000000000..e0da76dc2 Binary files /dev/null and b/graphics/battle_terrain/grass/terrain.bin differ diff --git a/graphics/battle_terrain/grass/terrain.pal b/graphics/battle_terrain/grass/terrain.pal new file mode 100644 index 000000000..cc00b3dc2 --- /dev/null +++ b/graphics/battle_terrain/grass/terrain.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +230 255 230 +164 246 123 +131 230 123 +197 255 148 +230 255 189 +156 238 115 +197 246 189 +172 238 164 +255 0 255 +238 246 246 +189 222 246 +205 230 246 +213 230 246 +222 238 246 +222 246 222 +0 0 0 +230 255 230 +148 230 106 +115 213 106 +172 246 115 +189 255 148 +139 222 98 +189 238 180 +164 230 156 +255 0 255 +238 246 246 +189 222 246 +205 230 246 +213 230 246 +222 238 246 +222 246 222 +0 0 0 +123 205 115 +164 222 148 +82 164 57 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_terrain/grass/terrain.png b/graphics/battle_terrain/grass/terrain.png new file mode 100644 index 000000000..645796cb1 Binary files /dev/null and b/graphics/battle_terrain/grass/terrain.png differ diff --git a/graphics/battle_terrain/indoor/1.pal b/graphics/battle_terrain/indoor/1.pal new file mode 100644 index 000000000..597647872 --- /dev/null +++ b/graphics/battle_terrain/indoor/1.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +238 238 238 +255 255 255 +213 213 213 +222 222 230 +238 238 246 +222 230 230 +222 230 222 +230 230 238 +246 246 255 +238 238 238 +205 172 205 +213 189 213 +222 205 222 +238 222 238 +230 230 230 +0 0 0 +230 238 238 +255 255 255 +205 205 205 +213 213 222 +230 238 238 +222 230 230 +222 230 222 +230 230 238 +246 246 255 +238 238 238 +189 189 189 +197 197 197 +205 205 205 +222 222 222 +230 230 230 +0 0 0 +115 180 255 +197 246 255 +148 213 255 +172 222 255 +180 238 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_terrain/indoor/2.pal b/graphics/battle_terrain/indoor/2.pal new file mode 100644 index 000000000..a1bc6b60c --- /dev/null +++ b/graphics/battle_terrain/indoor/2.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +238 238 238 +255 255 255 +213 213 213 +222 222 230 +238 238 246 +222 230 230 +222 230 222 +230 230 238 +246 246 255 +238 238 238 +189 189 189 +197 197 197 +205 205 205 +222 222 222 +230 230 230 +0 0 0 +230 238 238 +255 255 255 +205 205 205 +213 213 222 +230 238 238 +222 230 230 +222 230 222 +230 230 238 +246 246 255 +238 238 238 +189 189 189 +197 197 197 +205 205 205 +222 222 222 +230 230 230 +0 0 0 +115 180 255 +197 246 255 +148 213 255 +172 222 255 +180 238 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_terrain/indoor/agatha.pal b/graphics/battle_terrain/indoor/agatha.pal new file mode 100644 index 000000000..8ea1eeae7 --- /dev/null +++ b/graphics/battle_terrain/indoor/agatha.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +255 238 255 +238 230 246 +205 156 222 +213 172 230 +222 189 238 +222 197 238 +213 172 230 +230 213 246 +230 213 238 +246 246 255 +222 197 148 +230 213 180 +238 230 205 +246 238 230 +238 230 255 +0 0 0 +255 238 255 +230 222 246 +189 139 205 +213 172 230 +213 180 230 +222 189 238 +197 156 213 +230 205 246 +222 197 238 +246 246 255 +222 197 148 +230 213 180 +238 230 205 +246 238 230 +238 230 255 +0 0 0 +255 213 106 +255 255 230 +255 230 148 +255 238 164 +255 255 189 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_terrain/indoor/bruno.pal b/graphics/battle_terrain/indoor/bruno.pal new file mode 100644 index 000000000..21196b3e8 --- /dev/null +++ b/graphics/battle_terrain/indoor/bruno.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +246 246 246 +246 246 238 +213 205 156 +222 213 164 +238 230 197 +230 222 189 +222 213 172 +238 230 213 +238 238 205 +246 246 255 +222 197 148 +230 213 180 +238 230 205 +246 238 230 +238 238 238 +0 0 0 +246 246 246 +238 238 230 +197 189 139 +205 197 164 +230 222 189 +213 213 189 +213 205 164 +222 222 213 +230 230 205 +246 246 255 +222 197 148 +230 213 180 +238 230 205 +246 238 230 +238 238 238 +0 0 0 +82 238 164 +222 255 230 +148 238 164 +172 246 189 +197 246 205 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_terrain/indoor/champion.pal b/graphics/battle_terrain/indoor/champion.pal new file mode 100644 index 000000000..9ce470c9f --- /dev/null +++ b/graphics/battle_terrain/indoor/champion.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +246 246 255 +246 255 255 +213 205 205 +213 213 213 +238 238 238 +230 222 230 +230 222 222 +238 230 238 +238 246 246 +255 255 255 +197 172 230 +222 197 238 +238 222 246 +246 230 255 +238 238 238 +0 0 0 +246 246 255 +246 255 255 +213 205 205 +213 205 213 +238 238 238 +230 222 230 +230 222 222 +238 230 238 +238 246 246 +255 255 255 +197 172 230 +222 197 238 +238 222 246 +246 230 255 +238 238 238 +0 0 0 +131 197 255 +213 255 255 +164 222 255 +189 230 255 +197 246 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_terrain/indoor/gym.pal b/graphics/battle_terrain/indoor/gym.pal new file mode 100644 index 000000000..187054476 --- /dev/null +++ b/graphics/battle_terrain/indoor/gym.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +246 255 255 +255 255 255 +230 230 230 +230 230 230 +246 246 246 +230 238 238 +238 238 238 +238 238 238 +246 255 255 +255 255 255 +222 222 189 +230 230 205 +238 238 222 +246 246 238 +246 246 246 +0 0 0 +246 255 255 +255 255 255 +213 213 213 +230 230 230 +238 238 246 +230 238 238 +222 230 222 +238 238 238 +246 255 255 +255 255 255 +213 213 213 +230 230 230 +238 238 238 +246 246 246 +246 246 246 +0 0 0 +131 197 255 +213 255 255 +164 222 255 +189 230 255 +197 246 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_terrain/indoor/lance.pal b/graphics/battle_terrain/indoor/lance.pal new file mode 100644 index 000000000..c5fb745cf --- /dev/null +++ b/graphics/battle_terrain/indoor/lance.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +238 246 238 +222 238 246 +123 197 172 +148 205 189 +189 230 213 +180 222 205 +148 213 189 +205 230 222 +205 230 230 +246 246 255 +222 197 148 +230 213 180 +238 230 205 +246 238 230 +222 238 246 +0 0 0 +238 246 238 +213 230 246 +106 180 156 +148 205 189 +180 213 205 +180 222 205 +139 197 180 +205 230 222 +197 222 222 +246 246 255 +222 197 148 +230 213 180 +238 230 205 +246 238 230 +222 238 246 +0 0 0 +131 197 255 +213 255 255 +164 222 255 +189 230 255 +197 246 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_terrain/indoor/leader.pal b/graphics/battle_terrain/indoor/leader.pal new file mode 100644 index 000000000..581b6d596 --- /dev/null +++ b/graphics/battle_terrain/indoor/leader.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +246 255 255 +255 255 255 +230 230 230 +230 230 230 +246 246 246 +230 238 238 +238 238 238 +238 238 238 +246 255 255 +255 255 255 +222 222 189 +230 230 205 +238 238 222 +246 246 238 +246 246 246 +0 0 0 +246 255 255 +255 255 255 +213 213 213 +230 230 230 +238 238 246 +230 238 238 +222 230 222 +238 238 238 +246 255 255 +255 255 255 +213 213 213 +230 230 230 +238 238 238 +246 246 246 +246 246 246 +0 0 0 +255 222 115 +255 255 213 +255 230 156 +255 238 172 +255 246 189 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_terrain/indoor/link.pal b/graphics/battle_terrain/indoor/link.pal new file mode 100644 index 000000000..baa0fdf4f --- /dev/null +++ b/graphics/battle_terrain/indoor/link.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +246 255 255 +255 255 255 +230 230 230 +230 230 230 +246 246 246 +230 238 238 +238 238 238 +238 238 238 +246 255 255 +255 255 255 +213 213 213 +230 230 230 +238 238 238 +246 246 246 +246 246 246 +0 0 0 +246 255 255 +255 255 255 +213 213 213 +230 230 230 +238 238 246 +230 238 238 +222 230 222 +238 238 238 +238 246 246 +255 255 255 +213 213 213 +230 230 230 +238 238 238 +246 246 246 +246 246 246 +0 0 0 +164 213 255 +238 255 255 +180 230 255 +205 238 255 +222 246 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_terrain/indoor/lorelei.pal b/graphics/battle_terrain/indoor/lorelei.pal new file mode 100644 index 000000000..e63bad165 --- /dev/null +++ b/graphics/battle_terrain/indoor/lorelei.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +238 255 255 +230 246 255 +156 189 230 +172 197 230 +205 230 238 +189 213 238 +189 222 230 +222 238 246 +213 238 246 +246 246 255 +222 197 148 +230 213 180 +238 230 205 +246 238 230 +230 246 246 +0 0 0 +238 255 255 +230 246 255 +139 172 213 +172 197 230 +197 222 230 +189 213 238 +164 197 222 +222 238 246 +213 230 238 +246 246 255 +222 197 148 +230 213 180 +238 230 205 +246 238 230 +230 246 246 +0 0 0 +115 205 255 +230 255 255 +148 213 255 +164 222 255 +205 238 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_terrain/indoor/plain.pal b/graphics/battle_terrain/indoor/plain.pal new file mode 100644 index 000000000..b47dc0a8d --- /dev/null +++ b/graphics/battle_terrain/indoor/plain.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +230 255 230 +197 255 148 +238 238 172 +230 238 180 +180 238 131 +230 246 197 +205 238 148 +230 246 213 +189 246 139 +238 246 246 +189 222 246 +205 230 246 +213 230 246 +222 238 246 +222 246 222 +0 0 0 +230 255 230 +197 255 148 +238 238 172 +230 238 180 +180 238 131 +230 246 197 +205 238 148 +230 246 213 +189 246 139 +238 246 246 +189 222 246 +205 230 246 +213 230 246 +222 238 246 +222 246 222 +0 0 0 +156 213 255 +238 255 255 +180 230 255 +205 238 255 +222 246 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_terrain/indoor/terrain.bin b/graphics/battle_terrain/indoor/terrain.bin new file mode 100644 index 000000000..0710427da Binary files /dev/null and b/graphics/battle_terrain/indoor/terrain.bin differ diff --git a/graphics/battle_terrain/indoor/terrain.png b/graphics/battle_terrain/indoor/terrain.png new file mode 100644 index 000000000..1cbb7c63b Binary files /dev/null and b/graphics/battle_terrain/indoor/terrain.png differ diff --git a/graphics/battle_terrain/longgrass/anim.bin b/graphics/battle_terrain/longgrass/anim.bin new file mode 100644 index 000000000..5cb0de868 Binary files /dev/null and b/graphics/battle_terrain/longgrass/anim.bin differ diff --git a/graphics/battle_terrain/longgrass/anim.png b/graphics/battle_terrain/longgrass/anim.png new file mode 100644 index 000000000..c825dd7d2 Binary files /dev/null and b/graphics/battle_terrain/longgrass/anim.png differ diff --git a/graphics/battle_terrain/longgrass/terrain.bin b/graphics/battle_terrain/longgrass/terrain.bin new file mode 100644 index 000000000..2b2634a14 Binary files /dev/null and b/graphics/battle_terrain/longgrass/terrain.bin differ diff --git a/graphics/battle_terrain/longgrass/terrain.pal b/graphics/battle_terrain/longgrass/terrain.pal new file mode 100644 index 000000000..c390b8c44 --- /dev/null +++ b/graphics/battle_terrain/longgrass/terrain.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +205 255 189 +148 230 106 +115 213 106 +180 238 131 +222 246 172 +139 222 98 +180 230 172 +156 222 148 +255 0 255 +197 255 180 +106 197 74 +131 213 98 +156 230 123 +172 238 148 +180 246 172 +0 0 0 +205 255 189 +139 222 98 +98 197 98 +164 230 131 +222 246 172 +123 213 90 +180 230 172 +156 222 148 +255 0 255 +197 255 180 +106 197 74 +123 205 98 +148 222 123 +172 238 148 +172 246 172 +0 0 0 +115 213 82 +98 180 90 +90 148 74 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_terrain/longgrass/terrain.png b/graphics/battle_terrain/longgrass/terrain.png new file mode 100644 index 000000000..0d09d739c Binary files /dev/null and b/graphics/battle_terrain/longgrass/terrain.png differ diff --git a/graphics/battle_terrain/mountain/anim.bin b/graphics/battle_terrain/mountain/anim.bin new file mode 100644 index 000000000..55c5730c0 Binary files /dev/null and b/graphics/battle_terrain/mountain/anim.bin differ diff --git a/graphics/battle_terrain/mountain/anim.png b/graphics/battle_terrain/mountain/anim.png new file mode 100644 index 000000000..ab90aaddc Binary files /dev/null and b/graphics/battle_terrain/mountain/anim.png differ diff --git a/graphics/battle_terrain/mountain/terrain.bin b/graphics/battle_terrain/mountain/terrain.bin new file mode 100644 index 000000000..16600f5f8 Binary files /dev/null and b/graphics/battle_terrain/mountain/terrain.bin differ diff --git a/graphics/battle_terrain/mountain/terrain.pal b/graphics/battle_terrain/mountain/terrain.pal new file mode 100644 index 000000000..bfe75be65 --- /dev/null +++ b/graphics/battle_terrain/mountain/terrain.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +255 255 255 +222 222 180 +197 189 148 +205 197 164 +246 246 213 +230 230 197 +230 230 230 +205 197 172 +222 222 213 +255 255 255 +222 230 230 +230 230 238 +230 238 238 +238 246 246 +246 246 255 +0 0 0 +255 255 255 +213 213 172 +189 172 139 +197 189 156 +238 238 205 +222 222 189 +230 230 230 +205 197 172 +222 222 213 +255 255 255 +222 230 230 +230 230 238 +230 238 238 +238 246 246 +246 246 255 +0 0 0 +131 98 90 +164 131 98 +197 156 106 +213 180 131 +230 213 156 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_terrain/mountain/terrain.png b/graphics/battle_terrain/mountain/terrain.png new file mode 100644 index 000000000..9889a6b62 Binary files /dev/null and b/graphics/battle_terrain/mountain/terrain.png differ diff --git a/graphics/battle_terrain/pond/anim.bin b/graphics/battle_terrain/pond/anim.bin new file mode 100644 index 000000000..e012f647e Binary files /dev/null and b/graphics/battle_terrain/pond/anim.bin differ diff --git a/graphics/battle_terrain/pond/anim.png b/graphics/battle_terrain/pond/anim.png new file mode 100644 index 000000000..e0a7025e7 Binary files /dev/null and b/graphics/battle_terrain/pond/anim.png differ diff --git a/graphics/battle_terrain/pond/terrain.bin b/graphics/battle_terrain/pond/terrain.bin new file mode 100644 index 000000000..d4c3dedcb Binary files /dev/null and b/graphics/battle_terrain/pond/terrain.bin differ diff --git a/graphics/battle_terrain/pond/terrain.pal b/graphics/battle_terrain/pond/terrain.pal new file mode 100644 index 000000000..041560cf4 --- /dev/null +++ b/graphics/battle_terrain/pond/terrain.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +255 255 255 +115 189 246 +189 255 115 +205 255 156 +131 205 255 +222 255 205 +164 238 164 +246 255 238 +156 230 255 +255 255 255 +205 230 246 +213 230 246 +230 238 246 +238 246 255 +246 246 246 +0 0 0 +255 255 255 +98 164 230 +164 246 98 +197 255 139 +115 189 238 +205 255 197 +148 230 156 +230 255 222 +139 213 255 +255 255 255 +205 230 246 +213 230 246 +222 238 246 +230 238 246 +246 246 246 +0 0 0 +205 246 255 +148 213 238 +123 189 230 +90 148 222 +49 106 189 +16 74 156 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_terrain/pond/terrain.png b/graphics/battle_terrain/pond/terrain.png new file mode 100644 index 000000000..161498b2a Binary files /dev/null and b/graphics/battle_terrain/pond/terrain.png differ diff --git a/graphics/battle_terrain/sand/anim.bin b/graphics/battle_terrain/sand/anim.bin new file mode 100644 index 000000000..e4afe99ae Binary files /dev/null and b/graphics/battle_terrain/sand/anim.bin differ diff --git a/graphics/battle_terrain/sand/anim.png b/graphics/battle_terrain/sand/anim.png new file mode 100644 index 000000000..092b8b42b Binary files /dev/null and b/graphics/battle_terrain/sand/anim.png differ diff --git a/graphics/battle_terrain/sand/terrain.bin b/graphics/battle_terrain/sand/terrain.bin new file mode 100644 index 000000000..365e1474f Binary files /dev/null and b/graphics/battle_terrain/sand/terrain.bin differ diff --git a/graphics/battle_terrain/sand/terrain.pal b/graphics/battle_terrain/sand/terrain.pal new file mode 100644 index 000000000..dafc3eb7f --- /dev/null +++ b/graphics/battle_terrain/sand/terrain.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +255 255 238 +246 246 148 +238 230 123 +230 222 98 +238 238 156 +246 246 189 +255 255 246 +255 255 197 +230 230 131 +255 255 255 +189 222 246 +205 230 246 +222 238 246 +230 246 246 +246 246 222 +0 0 0 +255 255 238 +238 238 139 +230 222 139 +222 213 90 +238 230 156 +238 238 189 +255 255 246 +255 246 197 +230 222 106 +255 255 255 +189 222 246 +205 230 246 +222 238 246 +230 246 246 +246 246 222 +0 0 0 +197 197 74 +164 156 32 +222 222 131 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_terrain/sand/terrain.png b/graphics/battle_terrain/sand/terrain.png new file mode 100644 index 000000000..e802b34f2 Binary files /dev/null and b/graphics/battle_terrain/sand/terrain.png differ diff --git a/graphics/battle_terrain/terrain_building.bin b/graphics/battle_terrain/terrain_building.bin deleted file mode 100644 index 0710427da..000000000 Binary files a/graphics/battle_terrain/terrain_building.bin and /dev/null differ diff --git a/graphics/battle_terrain/terrain_building.pal b/graphics/battle_terrain/terrain_building.pal deleted file mode 100644 index 16421567f..000000000 --- a/graphics/battle_terrain/terrain_building.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -0 0 0 -246 255 255 -255 255 255 -230 230 230 -230 230 230 -246 246 246 -230 238 238 -238 238 238 -238 238 238 -246 255 255 -255 255 255 -255 255 180 -255 255 197 -255 255 222 -255 255 238 -246 246 246 -0 0 0 -246 255 255 -255 255 255 -213 213 213 -230 230 230 -238 238 238 -230 238 238 -222 230 222 -238 238 238 -246 255 255 -255 255 255 -255 255 180 -255 255 197 -255 255 222 -255 255 238 -246 246 246 -0 0 0 -164 213 255 -238 255 255 -180 230 255 -205 238 255 -222 246 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/battle_terrain/terrain_building.png b/graphics/battle_terrain/terrain_building.png deleted file mode 100644 index 3b060be4e..000000000 Binary files a/graphics/battle_terrain/terrain_building.png and /dev/null differ diff --git a/graphics/battle_terrain/terrain_building_anim.bin b/graphics/battle_terrain/terrain_building_anim.bin deleted file mode 100644 index aba49c6f9..000000000 Binary files a/graphics/battle_terrain/terrain_building_anim.bin and /dev/null differ diff --git a/graphics/battle_terrain/terrain_building_anim.png b/graphics/battle_terrain/terrain_building_anim.png deleted file mode 100644 index 443cd98ab..000000000 Binary files a/graphics/battle_terrain/terrain_building_anim.png and /dev/null differ diff --git a/graphics/battle_terrain/terrain_cave.bin b/graphics/battle_terrain/terrain_cave.bin deleted file mode 100644 index 255f2953d..000000000 Binary files a/graphics/battle_terrain/terrain_cave.bin and /dev/null differ diff --git a/graphics/battle_terrain/terrain_cave.pal b/graphics/battle_terrain/terrain_cave.pal deleted file mode 100644 index f17a7bf9d..000000000 --- a/graphics/battle_terrain/terrain_cave.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -0 0 0 -197 172 106 -205 197 90 -156 131 98 -180 148 106 -180 164 106 -197 180 106 -255 0 255 -213 197 115 -230 222 106 -164 139 82 -205 180 106 -189 164 106 -180 156 98 -172 148 90 -189 156 106 -0 0 0 -197 172 106 -205 197 90 -148 123 82 -164 131 90 -172 156 90 -189 180 90 -255 0 255 -213 197 115 -230 222 106 -164 139 82 -197 172 106 -189 164 106 -180 156 98 -172 148 90 -189 156 106 -0 0 0 -106 74 65 -148 115 82 -180 139 90 -213 180 131 -230 213 156 -0 0 0 -180 139 90 -180 139 90 -180 139 90 -213 180 131 -106 74 65 -148 115 82 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/battle_terrain/terrain_cave.png b/graphics/battle_terrain/terrain_cave.png deleted file mode 100644 index e2a18ae57..000000000 Binary files a/graphics/battle_terrain/terrain_cave.png and /dev/null differ diff --git a/graphics/battle_terrain/terrain_cave_anim.bin b/graphics/battle_terrain/terrain_cave_anim.bin deleted file mode 100644 index ad7724c67..000000000 Binary files a/graphics/battle_terrain/terrain_cave_anim.bin and /dev/null differ diff --git a/graphics/battle_terrain/terrain_cave_anim.png b/graphics/battle_terrain/terrain_cave_anim.png deleted file mode 100644 index 84f13f8f0..000000000 Binary files a/graphics/battle_terrain/terrain_cave_anim.png and /dev/null differ diff --git a/graphics/battle_terrain/terrain_grass.bin b/graphics/battle_terrain/terrain_grass.bin deleted file mode 100644 index e0da76dc2..000000000 Binary files a/graphics/battle_terrain/terrain_grass.bin and /dev/null differ diff --git a/graphics/battle_terrain/terrain_grass.pal b/graphics/battle_terrain/terrain_grass.pal deleted file mode 100644 index cc00b3dc2..000000000 --- a/graphics/battle_terrain/terrain_grass.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -0 0 0 -230 255 230 -164 246 123 -131 230 123 -197 255 148 -230 255 189 -156 238 115 -197 246 189 -172 238 164 -255 0 255 -238 246 246 -189 222 246 -205 230 246 -213 230 246 -222 238 246 -222 246 222 -0 0 0 -230 255 230 -148 230 106 -115 213 106 -172 246 115 -189 255 148 -139 222 98 -189 238 180 -164 230 156 -255 0 255 -238 246 246 -189 222 246 -205 230 246 -213 230 246 -222 238 246 -222 246 222 -0 0 0 -123 205 115 -164 222 148 -82 164 57 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/battle_terrain/terrain_grass.png b/graphics/battle_terrain/terrain_grass.png deleted file mode 100644 index 645796cb1..000000000 Binary files a/graphics/battle_terrain/terrain_grass.png and /dev/null differ diff --git a/graphics/battle_terrain/terrain_grass_anim.bin b/graphics/battle_terrain/terrain_grass_anim.bin deleted file mode 100644 index 03e4194fc..000000000 Binary files a/graphics/battle_terrain/terrain_grass_anim.bin and /dev/null differ diff --git a/graphics/battle_terrain/terrain_grass_anim.png b/graphics/battle_terrain/terrain_grass_anim.png deleted file mode 100644 index f2f2c1bb1..000000000 Binary files a/graphics/battle_terrain/terrain_grass_anim.png and /dev/null differ diff --git a/graphics/battle_terrain/terrain_indoor.bin b/graphics/battle_terrain/terrain_indoor.bin deleted file mode 100644 index 0710427da..000000000 Binary files a/graphics/battle_terrain/terrain_indoor.bin and /dev/null differ diff --git a/graphics/battle_terrain/terrain_indoor.png b/graphics/battle_terrain/terrain_indoor.png deleted file mode 100644 index 1cbb7c63b..000000000 Binary files a/graphics/battle_terrain/terrain_indoor.png and /dev/null differ diff --git a/graphics/battle_terrain/terrain_indoor_1.pal b/graphics/battle_terrain/terrain_indoor_1.pal deleted file mode 100644 index 597647872..000000000 --- a/graphics/battle_terrain/terrain_indoor_1.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -0 0 0 -238 238 238 -255 255 255 -213 213 213 -222 222 230 -238 238 246 -222 230 230 -222 230 222 -230 230 238 -246 246 255 -238 238 238 -205 172 205 -213 189 213 -222 205 222 -238 222 238 -230 230 230 -0 0 0 -230 238 238 -255 255 255 -205 205 205 -213 213 222 -230 238 238 -222 230 230 -222 230 222 -230 230 238 -246 246 255 -238 238 238 -189 189 189 -197 197 197 -205 205 205 -222 222 222 -230 230 230 -0 0 0 -115 180 255 -197 246 255 -148 213 255 -172 222 255 -180 238 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/battle_terrain/terrain_indoor_2.pal b/graphics/battle_terrain/terrain_indoor_2.pal deleted file mode 100644 index a1bc6b60c..000000000 --- a/graphics/battle_terrain/terrain_indoor_2.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -0 0 0 -238 238 238 -255 255 255 -213 213 213 -222 222 230 -238 238 246 -222 230 230 -222 230 222 -230 230 238 -246 246 255 -238 238 238 -189 189 189 -197 197 197 -205 205 205 -222 222 222 -230 230 230 -0 0 0 -230 238 238 -255 255 255 -205 205 205 -213 213 222 -230 238 238 -222 230 230 -222 230 222 -230 230 238 -246 246 255 -238 238 238 -189 189 189 -197 197 197 -205 205 205 -222 222 222 -230 230 230 -0 0 0 -115 180 255 -197 246 255 -148 213 255 -172 222 255 -180 238 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/battle_terrain/terrain_indoor_agatha.pal b/graphics/battle_terrain/terrain_indoor_agatha.pal deleted file mode 100644 index 8ea1eeae7..000000000 --- a/graphics/battle_terrain/terrain_indoor_agatha.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -0 0 0 -255 238 255 -238 230 246 -205 156 222 -213 172 230 -222 189 238 -222 197 238 -213 172 230 -230 213 246 -230 213 238 -246 246 255 -222 197 148 -230 213 180 -238 230 205 -246 238 230 -238 230 255 -0 0 0 -255 238 255 -230 222 246 -189 139 205 -213 172 230 -213 180 230 -222 189 238 -197 156 213 -230 205 246 -222 197 238 -246 246 255 -222 197 148 -230 213 180 -238 230 205 -246 238 230 -238 230 255 -0 0 0 -255 213 106 -255 255 230 -255 230 148 -255 238 164 -255 255 189 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/battle_terrain/terrain_indoor_bruno.pal b/graphics/battle_terrain/terrain_indoor_bruno.pal deleted file mode 100644 index 21196b3e8..000000000 --- a/graphics/battle_terrain/terrain_indoor_bruno.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -0 0 0 -246 246 246 -246 246 238 -213 205 156 -222 213 164 -238 230 197 -230 222 189 -222 213 172 -238 230 213 -238 238 205 -246 246 255 -222 197 148 -230 213 180 -238 230 205 -246 238 230 -238 238 238 -0 0 0 -246 246 246 -238 238 230 -197 189 139 -205 197 164 -230 222 189 -213 213 189 -213 205 164 -222 222 213 -230 230 205 -246 246 255 -222 197 148 -230 213 180 -238 230 205 -246 238 230 -238 238 238 -0 0 0 -82 238 164 -222 255 230 -148 238 164 -172 246 189 -197 246 205 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/battle_terrain/terrain_indoor_champion.pal b/graphics/battle_terrain/terrain_indoor_champion.pal deleted file mode 100644 index 9ce470c9f..000000000 --- a/graphics/battle_terrain/terrain_indoor_champion.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -0 0 0 -246 246 255 -246 255 255 -213 205 205 -213 213 213 -238 238 238 -230 222 230 -230 222 222 -238 230 238 -238 246 246 -255 255 255 -197 172 230 -222 197 238 -238 222 246 -246 230 255 -238 238 238 -0 0 0 -246 246 255 -246 255 255 -213 205 205 -213 205 213 -238 238 238 -230 222 230 -230 222 222 -238 230 238 -238 246 246 -255 255 255 -197 172 230 -222 197 238 -238 222 246 -246 230 255 -238 238 238 -0 0 0 -131 197 255 -213 255 255 -164 222 255 -189 230 255 -197 246 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/battle_terrain/terrain_indoor_gym.pal b/graphics/battle_terrain/terrain_indoor_gym.pal deleted file mode 100644 index 187054476..000000000 --- a/graphics/battle_terrain/terrain_indoor_gym.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -0 0 0 -246 255 255 -255 255 255 -230 230 230 -230 230 230 -246 246 246 -230 238 238 -238 238 238 -238 238 238 -246 255 255 -255 255 255 -222 222 189 -230 230 205 -238 238 222 -246 246 238 -246 246 246 -0 0 0 -246 255 255 -255 255 255 -213 213 213 -230 230 230 -238 238 246 -230 238 238 -222 230 222 -238 238 238 -246 255 255 -255 255 255 -213 213 213 -230 230 230 -238 238 238 -246 246 246 -246 246 246 -0 0 0 -131 197 255 -213 255 255 -164 222 255 -189 230 255 -197 246 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/battle_terrain/terrain_indoor_lance.pal b/graphics/battle_terrain/terrain_indoor_lance.pal deleted file mode 100644 index c5fb745cf..000000000 --- a/graphics/battle_terrain/terrain_indoor_lance.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -0 0 0 -238 246 238 -222 238 246 -123 197 172 -148 205 189 -189 230 213 -180 222 205 -148 213 189 -205 230 222 -205 230 230 -246 246 255 -222 197 148 -230 213 180 -238 230 205 -246 238 230 -222 238 246 -0 0 0 -238 246 238 -213 230 246 -106 180 156 -148 205 189 -180 213 205 -180 222 205 -139 197 180 -205 230 222 -197 222 222 -246 246 255 -222 197 148 -230 213 180 -238 230 205 -246 238 230 -222 238 246 -0 0 0 -131 197 255 -213 255 255 -164 222 255 -189 230 255 -197 246 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/battle_terrain/terrain_indoor_leader.pal b/graphics/battle_terrain/terrain_indoor_leader.pal deleted file mode 100644 index 581b6d596..000000000 --- a/graphics/battle_terrain/terrain_indoor_leader.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -0 0 0 -246 255 255 -255 255 255 -230 230 230 -230 230 230 -246 246 246 -230 238 238 -238 238 238 -238 238 238 -246 255 255 -255 255 255 -222 222 189 -230 230 205 -238 238 222 -246 246 238 -246 246 246 -0 0 0 -246 255 255 -255 255 255 -213 213 213 -230 230 230 -238 238 246 -230 238 238 -222 230 222 -238 238 238 -246 255 255 -255 255 255 -213 213 213 -230 230 230 -238 238 238 -246 246 246 -246 246 246 -0 0 0 -255 222 115 -255 255 213 -255 230 156 -255 238 172 -255 246 189 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/battle_terrain/terrain_indoor_link.pal b/graphics/battle_terrain/terrain_indoor_link.pal deleted file mode 100644 index baa0fdf4f..000000000 --- a/graphics/battle_terrain/terrain_indoor_link.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -0 0 0 -246 255 255 -255 255 255 -230 230 230 -230 230 230 -246 246 246 -230 238 238 -238 238 238 -238 238 238 -246 255 255 -255 255 255 -213 213 213 -230 230 230 -238 238 238 -246 246 246 -246 246 246 -0 0 0 -246 255 255 -255 255 255 -213 213 213 -230 230 230 -238 238 246 -230 238 238 -222 230 222 -238 238 238 -238 246 246 -255 255 255 -213 213 213 -230 230 230 -238 238 238 -246 246 246 -246 246 246 -0 0 0 -164 213 255 -238 255 255 -180 230 255 -205 238 255 -222 246 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/battle_terrain/terrain_indoor_lorelei.pal b/graphics/battle_terrain/terrain_indoor_lorelei.pal deleted file mode 100644 index e63bad165..000000000 --- a/graphics/battle_terrain/terrain_indoor_lorelei.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -0 0 0 -238 255 255 -230 246 255 -156 189 230 -172 197 230 -205 230 238 -189 213 238 -189 222 230 -222 238 246 -213 238 246 -246 246 255 -222 197 148 -230 213 180 -238 230 205 -246 238 230 -230 246 246 -0 0 0 -238 255 255 -230 246 255 -139 172 213 -172 197 230 -197 222 230 -189 213 238 -164 197 222 -222 238 246 -213 230 238 -246 246 255 -222 197 148 -230 213 180 -238 230 205 -246 238 230 -230 246 246 -0 0 0 -115 205 255 -230 255 255 -148 213 255 -164 222 255 -205 238 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/battle_terrain/terrain_indoor_plain.pal b/graphics/battle_terrain/terrain_indoor_plain.pal deleted file mode 100644 index b47dc0a8d..000000000 --- a/graphics/battle_terrain/terrain_indoor_plain.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -0 0 0 -230 255 230 -197 255 148 -238 238 172 -230 238 180 -180 238 131 -230 246 197 -205 238 148 -230 246 213 -189 246 139 -238 246 246 -189 222 246 -205 230 246 -213 230 246 -222 238 246 -222 246 222 -0 0 0 -230 255 230 -197 255 148 -238 238 172 -230 238 180 -180 238 131 -230 246 197 -205 238 148 -230 246 213 -189 246 139 -238 246 246 -189 222 246 -205 230 246 -213 230 246 -222 238 246 -222 246 222 -0 0 0 -156 213 255 -238 255 255 -180 230 255 -205 238 255 -222 246 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/battle_terrain/terrain_longgrass.bin b/graphics/battle_terrain/terrain_longgrass.bin deleted file mode 100644 index 2b2634a14..000000000 Binary files a/graphics/battle_terrain/terrain_longgrass.bin and /dev/null differ diff --git a/graphics/battle_terrain/terrain_longgrass.pal b/graphics/battle_terrain/terrain_longgrass.pal deleted file mode 100644 index c390b8c44..000000000 --- a/graphics/battle_terrain/terrain_longgrass.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -0 0 0 -205 255 189 -148 230 106 -115 213 106 -180 238 131 -222 246 172 -139 222 98 -180 230 172 -156 222 148 -255 0 255 -197 255 180 -106 197 74 -131 213 98 -156 230 123 -172 238 148 -180 246 172 -0 0 0 -205 255 189 -139 222 98 -98 197 98 -164 230 131 -222 246 172 -123 213 90 -180 230 172 -156 222 148 -255 0 255 -197 255 180 -106 197 74 -123 205 98 -148 222 123 -172 238 148 -172 246 172 -0 0 0 -115 213 82 -98 180 90 -90 148 74 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/battle_terrain/terrain_longgrass.png b/graphics/battle_terrain/terrain_longgrass.png deleted file mode 100644 index 0d09d739c..000000000 Binary files a/graphics/battle_terrain/terrain_longgrass.png and /dev/null differ diff --git a/graphics/battle_terrain/terrain_longgrass_anim.bin b/graphics/battle_terrain/terrain_longgrass_anim.bin deleted file mode 100644 index 5cb0de868..000000000 Binary files a/graphics/battle_terrain/terrain_longgrass_anim.bin and /dev/null differ diff --git a/graphics/battle_terrain/terrain_longgrass_anim.png b/graphics/battle_terrain/terrain_longgrass_anim.png deleted file mode 100644 index c825dd7d2..000000000 Binary files a/graphics/battle_terrain/terrain_longgrass_anim.png and /dev/null differ diff --git a/graphics/battle_terrain/terrain_mountain.bin b/graphics/battle_terrain/terrain_mountain.bin deleted file mode 100644 index 16600f5f8..000000000 Binary files a/graphics/battle_terrain/terrain_mountain.bin and /dev/null differ diff --git a/graphics/battle_terrain/terrain_mountain.pal b/graphics/battle_terrain/terrain_mountain.pal deleted file mode 100644 index bfe75be65..000000000 --- a/graphics/battle_terrain/terrain_mountain.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -0 0 0 -255 255 255 -222 222 180 -197 189 148 -205 197 164 -246 246 213 -230 230 197 -230 230 230 -205 197 172 -222 222 213 -255 255 255 -222 230 230 -230 230 238 -230 238 238 -238 246 246 -246 246 255 -0 0 0 -255 255 255 -213 213 172 -189 172 139 -197 189 156 -238 238 205 -222 222 189 -230 230 230 -205 197 172 -222 222 213 -255 255 255 -222 230 230 -230 230 238 -230 238 238 -238 246 246 -246 246 255 -0 0 0 -131 98 90 -164 131 98 -197 156 106 -213 180 131 -230 213 156 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/battle_terrain/terrain_mountain.png b/graphics/battle_terrain/terrain_mountain.png deleted file mode 100644 index 9889a6b62..000000000 Binary files a/graphics/battle_terrain/terrain_mountain.png and /dev/null differ diff --git a/graphics/battle_terrain/terrain_mountain_anim.bin b/graphics/battle_terrain/terrain_mountain_anim.bin deleted file mode 100644 index 55c5730c0..000000000 Binary files a/graphics/battle_terrain/terrain_mountain_anim.bin and /dev/null differ diff --git a/graphics/battle_terrain/terrain_mountain_anim.png b/graphics/battle_terrain/terrain_mountain_anim.png deleted file mode 100644 index ab90aaddc..000000000 Binary files a/graphics/battle_terrain/terrain_mountain_anim.png and /dev/null differ diff --git a/graphics/battle_terrain/terrain_pond.bin b/graphics/battle_terrain/terrain_pond.bin deleted file mode 100644 index d4c3dedcb..000000000 Binary files a/graphics/battle_terrain/terrain_pond.bin and /dev/null differ diff --git a/graphics/battle_terrain/terrain_pond.pal b/graphics/battle_terrain/terrain_pond.pal deleted file mode 100644 index 041560cf4..000000000 --- a/graphics/battle_terrain/terrain_pond.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -0 0 0 -255 255 255 -115 189 246 -189 255 115 -205 255 156 -131 205 255 -222 255 205 -164 238 164 -246 255 238 -156 230 255 -255 255 255 -205 230 246 -213 230 246 -230 238 246 -238 246 255 -246 246 246 -0 0 0 -255 255 255 -98 164 230 -164 246 98 -197 255 139 -115 189 238 -205 255 197 -148 230 156 -230 255 222 -139 213 255 -255 255 255 -205 230 246 -213 230 246 -222 238 246 -230 238 246 -246 246 246 -0 0 0 -205 246 255 -148 213 238 -123 189 230 -90 148 222 -49 106 189 -16 74 156 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/battle_terrain/terrain_pond.png b/graphics/battle_terrain/terrain_pond.png deleted file mode 100644 index 161498b2a..000000000 Binary files a/graphics/battle_terrain/terrain_pond.png and /dev/null differ diff --git a/graphics/battle_terrain/terrain_pond_anim.bin b/graphics/battle_terrain/terrain_pond_anim.bin deleted file mode 100644 index e012f647e..000000000 Binary files a/graphics/battle_terrain/terrain_pond_anim.bin and /dev/null differ diff --git a/graphics/battle_terrain/terrain_pond_anim.png b/graphics/battle_terrain/terrain_pond_anim.png deleted file mode 100644 index e0a7025e7..000000000 Binary files a/graphics/battle_terrain/terrain_pond_anim.png and /dev/null differ diff --git a/graphics/battle_terrain/terrain_sand.bin b/graphics/battle_terrain/terrain_sand.bin deleted file mode 100644 index 365e1474f..000000000 Binary files a/graphics/battle_terrain/terrain_sand.bin and /dev/null differ diff --git a/graphics/battle_terrain/terrain_sand.pal b/graphics/battle_terrain/terrain_sand.pal deleted file mode 100644 index dafc3eb7f..000000000 --- a/graphics/battle_terrain/terrain_sand.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -0 0 0 -255 255 238 -246 246 148 -238 230 123 -230 222 98 -238 238 156 -246 246 189 -255 255 246 -255 255 197 -230 230 131 -255 255 255 -189 222 246 -205 230 246 -222 238 246 -230 246 246 -246 246 222 -0 0 0 -255 255 238 -238 238 139 -230 222 139 -222 213 90 -238 230 156 -238 238 189 -255 255 246 -255 246 197 -230 222 106 -255 255 255 -189 222 246 -205 230 246 -222 238 246 -230 246 246 -246 246 222 -0 0 0 -197 197 74 -164 156 32 -222 222 131 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/battle_terrain/terrain_sand.png b/graphics/battle_terrain/terrain_sand.png deleted file mode 100644 index e802b34f2..000000000 Binary files a/graphics/battle_terrain/terrain_sand.png and /dev/null differ diff --git a/graphics/battle_terrain/terrain_sand_anim.bin b/graphics/battle_terrain/terrain_sand_anim.bin deleted file mode 100644 index e4afe99ae..000000000 Binary files a/graphics/battle_terrain/terrain_sand_anim.bin and /dev/null differ diff --git a/graphics/battle_terrain/terrain_sand_anim.png b/graphics/battle_terrain/terrain_sand_anim.png deleted file mode 100644 index 092b8b42b..000000000 Binary files a/graphics/battle_terrain/terrain_sand_anim.png and /dev/null differ diff --git a/graphics/battle_terrain/terrain_underwater.bin b/graphics/battle_terrain/terrain_underwater.bin deleted file mode 100644 index 29843f17d..000000000 Binary files a/graphics/battle_terrain/terrain_underwater.bin and /dev/null differ diff --git a/graphics/battle_terrain/terrain_underwater.pal b/graphics/battle_terrain/terrain_underwater.pal deleted file mode 100644 index 5fa95cf21..000000000 --- a/graphics/battle_terrain/terrain_underwater.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -0 0 0 -197 230 255 -139 156 213 -148 197 246 -172 205 255 -139 180 222 -189 213 255 -148 189 230 -205 222 255 -197 230 255 -205 230 255 -148 164 238 -156 189 238 -172 205 238 -189 213 246 -197 222 255 -0 0 0 -197 230 255 -131 139 197 -148 197 246 -172 205 255 -131 164 213 -189 213 255 -148 180 222 -205 222 255 -197 230 255 -205 230 255 -148 164 238 -156 189 238 -172 205 238 -189 213 246 -197 222 255 -0 0 0 -98 164 230 -131 197 255 -172 238 255 -255 255 255 -205 255 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -98 98 172 -131 131 230 -172 172 255 -255 255 255 diff --git a/graphics/battle_terrain/terrain_underwater.png b/graphics/battle_terrain/terrain_underwater.png deleted file mode 100644 index 19e115348..000000000 Binary files a/graphics/battle_terrain/terrain_underwater.png and /dev/null differ diff --git a/graphics/battle_terrain/terrain_underwater_anim.bin b/graphics/battle_terrain/terrain_underwater_anim.bin deleted file mode 100644 index 9029c7c9d..000000000 Binary files a/graphics/battle_terrain/terrain_underwater_anim.bin and /dev/null differ diff --git a/graphics/battle_terrain/terrain_underwater_anim.png b/graphics/battle_terrain/terrain_underwater_anim.png deleted file mode 100644 index f41eedfb8..000000000 Binary files a/graphics/battle_terrain/terrain_underwater_anim.png and /dev/null differ diff --git a/graphics/battle_terrain/terrain_water.bin b/graphics/battle_terrain/terrain_water.bin deleted file mode 100644 index 0ee05129a..000000000 Binary files a/graphics/battle_terrain/terrain_water.bin and /dev/null differ diff --git a/graphics/battle_terrain/terrain_water.pal b/graphics/battle_terrain/terrain_water.pal deleted file mode 100644 index d31dce658..000000000 --- a/graphics/battle_terrain/terrain_water.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -0 0 0 -246 255 255 -131 180 238 -123 164 238 -139 205 246 -205 230 246 -230 246 255 -180 222 246 -156 213 255 -255 0 255 -255 255 255 -205 222 238 -222 238 238 -230 246 246 -246 246 255 -246 246 255 -0 0 0 -246 255 255 -106 189 238 -106 156 230 -131 197 238 -205 230 246 -230 246 255 -180 222 246 -156 213 255 -255 0 255 -255 255 255 -205 222 230 -213 230 238 -230 238 246 -246 255 255 -246 246 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -246 255 255 -180 230 255 -139 205 246 -106 172 238 -49 148 197 -16 98 180 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/battle_terrain/terrain_water.png b/graphics/battle_terrain/terrain_water.png deleted file mode 100644 index 8953e7940..000000000 Binary files a/graphics/battle_terrain/terrain_water.png and /dev/null differ diff --git a/graphics/battle_terrain/terrain_water_anim.bin b/graphics/battle_terrain/terrain_water_anim.bin deleted file mode 100644 index b6661cd3c..000000000 Binary files a/graphics/battle_terrain/terrain_water_anim.bin and /dev/null differ diff --git a/graphics/battle_terrain/terrain_water_anim.png b/graphics/battle_terrain/terrain_water_anim.png deleted file mode 100644 index 1545d85e7..000000000 Binary files a/graphics/battle_terrain/terrain_water_anim.png and /dev/null differ diff --git a/graphics/battle_terrain/underwater/anim.bin b/graphics/battle_terrain/underwater/anim.bin new file mode 100644 index 000000000..9029c7c9d Binary files /dev/null and b/graphics/battle_terrain/underwater/anim.bin differ diff --git a/graphics/battle_terrain/underwater/anim.png b/graphics/battle_terrain/underwater/anim.png new file mode 100644 index 000000000..f41eedfb8 Binary files /dev/null and b/graphics/battle_terrain/underwater/anim.png differ diff --git a/graphics/battle_terrain/underwater/terrain.bin b/graphics/battle_terrain/underwater/terrain.bin new file mode 100644 index 000000000..29843f17d Binary files /dev/null and b/graphics/battle_terrain/underwater/terrain.bin differ diff --git a/graphics/battle_terrain/underwater/terrain.pal b/graphics/battle_terrain/underwater/terrain.pal new file mode 100644 index 000000000..5fa95cf21 --- /dev/null +++ b/graphics/battle_terrain/underwater/terrain.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +197 230 255 +139 156 213 +148 197 246 +172 205 255 +139 180 222 +189 213 255 +148 189 230 +205 222 255 +197 230 255 +205 230 255 +148 164 238 +156 189 238 +172 205 238 +189 213 246 +197 222 255 +0 0 0 +197 230 255 +131 139 197 +148 197 246 +172 205 255 +131 164 213 +189 213 255 +148 180 222 +205 222 255 +197 230 255 +205 230 255 +148 164 238 +156 189 238 +172 205 238 +189 213 246 +197 222 255 +0 0 0 +98 164 230 +131 197 255 +172 238 255 +255 255 255 +205 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +98 98 172 +131 131 230 +172 172 255 +255 255 255 diff --git a/graphics/battle_terrain/underwater/terrain.png b/graphics/battle_terrain/underwater/terrain.png new file mode 100644 index 000000000..19e115348 Binary files /dev/null and b/graphics/battle_terrain/underwater/terrain.png differ diff --git a/graphics/battle_terrain/water/anim.bin b/graphics/battle_terrain/water/anim.bin new file mode 100644 index 000000000..b6661cd3c Binary files /dev/null and b/graphics/battle_terrain/water/anim.bin differ diff --git a/graphics/battle_terrain/water/anim.png b/graphics/battle_terrain/water/anim.png new file mode 100644 index 000000000..1545d85e7 Binary files /dev/null and b/graphics/battle_terrain/water/anim.png differ diff --git a/graphics/battle_terrain/water/terrain.bin b/graphics/battle_terrain/water/terrain.bin new file mode 100644 index 000000000..0ee05129a Binary files /dev/null and b/graphics/battle_terrain/water/terrain.bin differ diff --git a/graphics/battle_terrain/water/terrain.pal b/graphics/battle_terrain/water/terrain.pal new file mode 100644 index 000000000..d31dce658 --- /dev/null +++ b/graphics/battle_terrain/water/terrain.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +246 255 255 +131 180 238 +123 164 238 +139 205 246 +205 230 246 +230 246 255 +180 222 246 +156 213 255 +255 0 255 +255 255 255 +205 222 238 +222 238 238 +230 246 246 +246 246 255 +246 246 255 +0 0 0 +246 255 255 +106 189 238 +106 156 230 +131 197 238 +205 230 246 +230 246 255 +180 222 246 +156 213 255 +255 0 255 +255 255 255 +205 222 230 +213 230 238 +230 238 246 +246 255 255 +246 246 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +246 255 255 +180 230 255 +139 205 246 +106 172 238 +49 148 197 +16 98 180 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_terrain/water/terrain.png b/graphics/battle_terrain/water/terrain.png new file mode 100644 index 000000000..8953e7940 Binary files /dev/null and b/graphics/battle_terrain/water/terrain.png differ diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 3ad7cf542..72dd013b0 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -530,46 +530,46 @@ $(INTROGFXDIR)/unk_8406654.4bpp: %.4bpp: %.png $(INTROGFXDIR)/unk_8405B28.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 17 -$(BATTLETERRAINGFXDIR)/terrain_building.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/building/terrain.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 77 -$(BATTLETERRAINGFXDIR)/terrain_cave_anim.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/cave/anim.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 106 -$(BATTLETERRAINGFXDIR)/terrain_cave.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/cave/terrain.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 84 -$(BATTLETERRAINGFXDIR)/terrain_grass.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/grass/terrain.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 98 -$(BATTLETERRAINGFXDIR)/terrain_indoor.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/indoor/terrain.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 77 -$(BATTLETERRAINGFXDIR)/terrain_longgrass_anim.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/longgrass/anim.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 133 -$(BATTLETERRAINGFXDIR)/terrain_longgrass.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/longgrass/terrain.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 98 -$(BATTLETERRAINGFXDIR)/terrain_mountain_anim.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/mountain/anim.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 47 -$(BATTLETERRAINGFXDIR)/terrain_pond_anim.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/pond/anim.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 36 -$(BATTLETERRAINGFXDIR)/terrain_pond.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/pond/terrain.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 75 -$(BATTLETERRAINGFXDIR)/terrain_sand.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/sand/terrain.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 83 -$(BATTLETERRAINGFXDIR)/terrain_underwater_anim.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/underwater/anim.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 26 -$(BATTLETERRAINGFXDIR)/terrain_underwater.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/underwater/terrain.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 85 -$(BATTLETERRAINGFXDIR)/terrain_water.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/water/terrain.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 81 $(BERRYPOUCHGFXDIR)/background.4bpp: %.4bpp: %.png diff --git a/src/battle_bg.c b/src/battle_bg.c index 44f26494b..c30f10643 100644 --- a/src/battle_bg.c +++ b/src/battle_bg.c @@ -343,73 +343,73 @@ static const struct WindowTemplate gUnknown_8248330[] = { }, DUMMY_WIN_TEMPLATE }; -static const u32 sBattleTerrainPalette_Grass[] = INCBIN_U32("graphics/battle_terrain/terrain_grass.gbapal.lz"); -static const u32 sBattleTerrainTiles_Grass[] = INCBIN_U32("graphics/battle_terrain/terrain_grass.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Grass[] = INCBIN_U32("graphics/battle_terrain/terrain_grass.bin.lz"); -static const u32 sBattleTerrainAnimTiles_Grass[] = INCBIN_U32("graphics/battle_terrain/terrain_grass_anim.4bpp.lz"); -static const u32 sBattleTerrainAnimTilemap_Grass[] = INCBIN_U32("graphics/battle_terrain/terrain_grass_anim.bin.lz"); +static const u32 sBattleTerrainPalette_Grass[] = INCBIN_U32("graphics/battle_terrain/grass/terrain.gbapal.lz"); +static const u32 sBattleTerrainTiles_Grass[] = INCBIN_U32("graphics/battle_terrain/grass/terrain.4bpp.lz"); +static const u32 sBattleTerrainTilemap_Grass[] = INCBIN_U32("graphics/battle_terrain/grass/terrain.bin.lz"); +static const u32 sBattleTerrainAnimTiles_Grass[] = INCBIN_U32("graphics/battle_terrain/grass/anim.4bpp.lz"); +static const u32 sBattleTerrainAnimTilemap_Grass[] = INCBIN_U32("graphics/battle_terrain/grass/anim.bin.lz"); -static const u32 sBattleTerrainPalette_LongGrass[] = INCBIN_U32("graphics/battle_terrain/terrain_longgrass.gbapal.lz"); -static const u32 sBattleTerrainTiles_LongGrass[] = INCBIN_U32("graphics/battle_terrain/terrain_longgrass.4bpp.lz"); -static const u32 sBattleTerrainTilemap_LongGrass[] = INCBIN_U32("graphics/battle_terrain/terrain_longgrass.bin.lz"); -static const u32 sBattleTerrainAnimTiles_LongGrass[] = INCBIN_U32("graphics/battle_terrain/terrain_longgrass_anim.4bpp.lz"); -static const u32 sBattleTerrainAnimTilemap_LongGrass[] = INCBIN_U32("graphics/battle_terrain/terrain_longgrass_anim.bin.lz"); +static const u32 sBattleTerrainPalette_LongGrass[] = INCBIN_U32("graphics/battle_terrain/longgrass/terrain.gbapal.lz"); +static const u32 sBattleTerrainTiles_LongGrass[] = INCBIN_U32("graphics/battle_terrain/longgrass/terrain.4bpp.lz"); +static const u32 sBattleTerrainTilemap_LongGrass[] = INCBIN_U32("graphics/battle_terrain/longgrass/terrain.bin.lz"); +static const u32 sBattleTerrainAnimTiles_LongGrass[] = INCBIN_U32("graphics/battle_terrain/longgrass/anim.4bpp.lz"); +static const u32 sBattleTerrainAnimTilemap_LongGrass[] = INCBIN_U32("graphics/battle_terrain/longgrass/anim.bin.lz"); -static const u32 sBattleTerrainPalette_Sand[] = INCBIN_U32("graphics/battle_terrain/terrain_sand.gbapal.lz"); -static const u32 sBattleTerrainTiles_Sand[] = INCBIN_U32("graphics/battle_terrain/terrain_sand.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Sand[] = INCBIN_U32("graphics/battle_terrain/terrain_sand.bin.lz"); -static const u32 sBattleTerrainAnimTiles_Sand[] = INCBIN_U32("graphics/battle_terrain/terrain_sand_anim.4bpp.lz"); -static const u32 sBattleTerrainAnimTilemap_Sand[] = INCBIN_U32("graphics/battle_terrain/terrain_sand_anim.bin.lz"); +static const u32 sBattleTerrainPalette_Sand[] = INCBIN_U32("graphics/battle_terrain/sand/terrain.gbapal.lz"); +static const u32 sBattleTerrainTiles_Sand[] = INCBIN_U32("graphics/battle_terrain/sand/terrain.4bpp.lz"); +static const u32 sBattleTerrainTilemap_Sand[] = INCBIN_U32("graphics/battle_terrain/sand/terrain.bin.lz"); +static const u32 sBattleTerrainAnimTiles_Sand[] = INCBIN_U32("graphics/battle_terrain/sand/anim.4bpp.lz"); +static const u32 sBattleTerrainAnimTilemap_Sand[] = INCBIN_U32("graphics/battle_terrain/sand/anim.bin.lz"); -static const u32 sBattleTerrainPalette_Underwater[] = INCBIN_U32("graphics/battle_terrain/terrain_underwater.gbapal.lz"); -static const u32 sBattleTerrainTiles_Underwater[] = INCBIN_U32("graphics/battle_terrain/terrain_underwater.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Underwater[] = INCBIN_U32("graphics/battle_terrain/terrain_underwater.bin.lz"); -static const u32 sBattleTerrainAnimTiles_Underwater[] = INCBIN_U32("graphics/battle_terrain/terrain_underwater_anim.4bpp.lz"); -static const u32 sBattleTerrainAnimTilemap_Underwater[] = INCBIN_U32("graphics/battle_terrain/terrain_underwater_anim.bin.lz"); +static const u32 sBattleTerrainPalette_Underwater[] = INCBIN_U32("graphics/battle_terrain/underwater/terrain.gbapal.lz"); +static const u32 sBattleTerrainTiles_Underwater[] = INCBIN_U32("graphics/battle_terrain/underwater/terrain.4bpp.lz"); +static const u32 sBattleTerrainTilemap_Underwater[] = INCBIN_U32("graphics/battle_terrain/underwater/terrain.bin.lz"); +static const u32 sBattleTerrainAnimTiles_Underwater[] = INCBIN_U32("graphics/battle_terrain/underwater/anim.4bpp.lz"); +static const u32 sBattleTerrainAnimTilemap_Underwater[] = INCBIN_U32("graphics/battle_terrain/underwater/anim.bin.lz"); -static const u32 sBattleTerrainPalette_Water[] = INCBIN_U32("graphics/battle_terrain/terrain_water.gbapal.lz"); -static const u32 sBattleTerrainTiles_Water[] = INCBIN_U32("graphics/battle_terrain/terrain_water.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Water[] = INCBIN_U32("graphics/battle_terrain/terrain_water.bin.lz"); -static const u32 sBattleTerrainAnimTiles_Water[] = INCBIN_U32("graphics/battle_terrain/terrain_water_anim.4bpp.lz"); -static const u32 sBattleTerrainAnimTilemap_Water[] = INCBIN_U32("graphics/battle_terrain/terrain_water_anim.bin.lz"); +static const u32 sBattleTerrainPalette_Water[] = INCBIN_U32("graphics/battle_terrain/water/terrain.gbapal.lz"); +static const u32 sBattleTerrainTiles_Water[] = INCBIN_U32("graphics/battle_terrain/water/terrain.4bpp.lz"); +static const u32 sBattleTerrainTilemap_Water[] = INCBIN_U32("graphics/battle_terrain/water/terrain.bin.lz"); +static const u32 sBattleTerrainAnimTiles_Water[] = INCBIN_U32("graphics/battle_terrain/water/anim.4bpp.lz"); +static const u32 sBattleTerrainAnimTilemap_Water[] = INCBIN_U32("graphics/battle_terrain/water/anim.bin.lz"); -static const u32 sBattleTerrainPalette_Pond[] = INCBIN_U32("graphics/battle_terrain/terrain_pond.gbapal.lz"); -static const u32 sBattleTerrainTiles_Pond[] = INCBIN_U32("graphics/battle_terrain/terrain_pond.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Pond[] = INCBIN_U32("graphics/battle_terrain/terrain_pond.bin.lz"); -static const u32 sBattleTerrainAnimTiles_Pond[] = INCBIN_U32("graphics/battle_terrain/terrain_pond_anim.4bpp.lz"); -static const u32 sBattleTerrainAnimTilemap_Pond[] = INCBIN_U32("graphics/battle_terrain/terrain_pond_anim.bin.lz"); +static const u32 sBattleTerrainPalette_Pond[] = INCBIN_U32("graphics/battle_terrain/pond/terrain.gbapal.lz"); +static const u32 sBattleTerrainTiles_Pond[] = INCBIN_U32("graphics/battle_terrain/pond/terrain.4bpp.lz"); +static const u32 sBattleTerrainTilemap_Pond[] = INCBIN_U32("graphics/battle_terrain/pond/terrain.bin.lz"); +static const u32 sBattleTerrainAnimTiles_Pond[] = INCBIN_U32("graphics/battle_terrain/pond/anim.4bpp.lz"); +static const u32 sBattleTerrainAnimTilemap_Pond[] = INCBIN_U32("graphics/battle_terrain/pond/anim.bin.lz"); -static const u32 sBattleTerrainPalette_Mountain[] = INCBIN_U32("graphics/battle_terrain/terrain_mountain.gbapal.lz"); -static const u32 sBattleTerrainTiles_Mountain[] = INCBIN_U32("graphics/battle_terrain/terrain_mountain.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Mountain[] = INCBIN_U32("graphics/battle_terrain/terrain_mountain.bin.lz"); -static const u32 sBattleTerrainAnimTiles_Mountain[] = INCBIN_U32("graphics/battle_terrain/terrain_mountain_anim.4bpp.lz"); -static const u32 sBattleTerrainAnimTilemap_Mountain[] = INCBIN_U32("graphics/battle_terrain/terrain_mountain_anim.bin.lz"); +static const u32 sBattleTerrainPalette_Mountain[] = INCBIN_U32("graphics/battle_terrain/mountain/terrain.gbapal.lz"); +static const u32 sBattleTerrainTiles_Mountain[] = INCBIN_U32("graphics/battle_terrain/mountain/terrain.4bpp.lz"); +static const u32 sBattleTerrainTilemap_Mountain[] = INCBIN_U32("graphics/battle_terrain/mountain/terrain.bin.lz"); +static const u32 sBattleTerrainAnimTiles_Mountain[] = INCBIN_U32("graphics/battle_terrain/mountain/anim.4bpp.lz"); +static const u32 sBattleTerrainAnimTilemap_Mountain[] = INCBIN_U32("graphics/battle_terrain/mountain/anim.bin.lz"); -static const u32 sBattleTerrainPalette_Cave[] = INCBIN_U32("graphics/battle_terrain/terrain_cave.gbapal.lz"); -static const u32 sBattleTerrainTiles_Cave[] = INCBIN_U32("graphics/battle_terrain/terrain_cave.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Cave[] = INCBIN_U32("graphics/battle_terrain/terrain_cave.bin.lz"); -static const u32 sBattleTerrainAnimTiles_Cave[] = INCBIN_U32("graphics/battle_terrain/terrain_cave_anim.4bpp.lz"); -static const u32 sBattleTerrainAnimTilemap_Cave[] = INCBIN_U32("graphics/battle_terrain/terrain_cave_anim.bin.lz"); +static const u32 sBattleTerrainPalette_Cave[] = INCBIN_U32("graphics/battle_terrain/cave/terrain.gbapal.lz"); +static const u32 sBattleTerrainTiles_Cave[] = INCBIN_U32("graphics/battle_terrain/cave/terrain.4bpp.lz"); +static const u32 sBattleTerrainTilemap_Cave[] = INCBIN_U32("graphics/battle_terrain/cave/terrain.bin.lz"); +static const u32 sBattleTerrainAnimTiles_Cave[] = INCBIN_U32("graphics/battle_terrain/cave/anim.4bpp.lz"); +static const u32 sBattleTerrainAnimTilemap_Cave[] = INCBIN_U32("graphics/battle_terrain/cave/anim.bin.lz"); -static const u32 sBattleTerrainPalette_Building[] = INCBIN_U32("graphics/battle_terrain/terrain_building.gbapal.lz"); -static const u32 sBattleTerrainTiles_Building[] = INCBIN_U32("graphics/battle_terrain/terrain_building.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Building[] = INCBIN_U32("graphics/battle_terrain/terrain_building.bin.lz"); -static const u32 sBattleTerrainAnimTiles_Building[] = INCBIN_U32("graphics/battle_terrain/terrain_building_anim.4bpp.lz"); -static const u32 sBattleTerrainAnimTilemap_Building[] = INCBIN_U32("graphics/battle_terrain/terrain_building_anim.bin.lz"); +static const u32 sBattleTerrainPalette_Building[] = INCBIN_U32("graphics/battle_terrain/building/terrain.gbapal.lz"); +static const u32 sBattleTerrainTiles_Building[] = INCBIN_U32("graphics/battle_terrain/building/terrain.4bpp.lz"); +static const u32 sBattleTerrainTilemap_Building[] = INCBIN_U32("graphics/battle_terrain/building/terrain.bin.lz"); +static const u32 sBattleTerrainAnimTiles_Building[] = INCBIN_U32("graphics/battle_terrain/building/anim.4bpp.lz"); +static const u32 sBattleTerrainAnimTilemap_Building[] = INCBIN_U32("graphics/battle_terrain/building/anim.bin.lz"); -static const u32 sBattleTerrainPalette_Link[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor_link.gbapal.lz"); -static const u32 sBattleTerrainPalette_Gym[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor_gym.gbapal.lz"); -static const u32 sBattleTerrainPalette_Leader[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor_leader.gbapal.lz"); -static const u32 sBattleTerrainPalette_Indoor2[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor_2.gbapal.lz"); -static const u32 sBattleTerrainPalette_Indoor1[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor_1.gbapal.lz"); -static const u32 sBattleTerrainPalette_Lorelei[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor_lorelei.gbapal.lz"); -static const u32 sBattleTerrainPalette_Bruno[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor_bruno.gbapal.lz"); -static const u32 sBattleTerrainPalette_Agatha[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor_agatha.gbapal.lz"); -static const u32 sBattleTerrainPalette_Lance[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor_lance.gbapal.lz"); -static const u32 sBattleTerrainPalette_Champion[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor_champion.gbapal.lz"); -static const u32 sBattleTerrainPalette_Plain[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor_plain.gbapal.lz"); -static const u32 sBattleTerrainTiles_Indoor[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Indoor[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor.bin.lz"); +static const u32 sBattleTerrainPalette_Link[] = INCBIN_U32("graphics/battle_terrain/indoor/link.gbapal.lz"); +static const u32 sBattleTerrainPalette_Gym[] = INCBIN_U32("graphics/battle_terrain/indoor/gym.gbapal.lz"); +static const u32 sBattleTerrainPalette_Leader[] = INCBIN_U32("graphics/battle_terrain/indoor/leader.gbapal.lz"); +static const u32 sBattleTerrainPalette_Indoor2[] = INCBIN_U32("graphics/battle_terrain/indoor/2.gbapal.lz"); +static const u32 sBattleTerrainPalette_Indoor1[] = INCBIN_U32("graphics/battle_terrain/indoor/1.gbapal.lz"); +static const u32 sBattleTerrainPalette_Lorelei[] = INCBIN_U32("graphics/battle_terrain/indoor/lorelei.gbapal.lz"); +static const u32 sBattleTerrainPalette_Bruno[] = INCBIN_U32("graphics/battle_terrain/indoor/bruno.gbapal.lz"); +static const u32 sBattleTerrainPalette_Agatha[] = INCBIN_U32("graphics/battle_terrain/indoor/agatha.gbapal.lz"); +static const u32 sBattleTerrainPalette_Lance[] = INCBIN_U32("graphics/battle_terrain/indoor/lance.gbapal.lz"); +static const u32 sBattleTerrainPalette_Champion[] = INCBIN_U32("graphics/battle_terrain/indoor/champion.gbapal.lz"); +static const u32 sBattleTerrainPalette_Plain[] = INCBIN_U32("graphics/battle_terrain/indoor/plain.gbapal.lz"); +static const u32 sBattleTerrainTiles_Indoor[] = INCBIN_U32("graphics/battle_terrain/indoor/terrain.4bpp.lz"); +static const u32 sBattleTerrainTilemap_Indoor[] = INCBIN_U32("graphics/battle_terrain/indoor/terrain.bin.lz"); static const struct BattleBackground sBattleTerrainTable[] = { [BATTLE_TERRAIN_GRASS] = -- cgit v1.2.3