From 05521b0668e8340321f049dd587fe1a33f370aea Mon Sep 17 00:00:00 2001 From: hjk321 Date: Sun, 28 Mar 2021 22:31:04 -0500 Subject: Document and index graphics/battle --- graphics/battle/terrain_building.bin | Bin 0 -> 4096 bytes graphics/battle/terrain_building.pal | 51 ++++++++++ graphics/battle/terrain_building.png | Bin 0 -> 706 bytes graphics/battle/terrain_building_anim.bin | Bin 0 -> 896 bytes graphics/battle/terrain_building_anim.png | Bin 0 -> 541 bytes graphics/battle/terrain_cave.bin | Bin 0 -> 4096 bytes graphics/battle/terrain_cave.pal | 51 ++++++++++ graphics/battle/terrain_cave.png | Bin 0 -> 901 bytes graphics/battle/terrain_cave_anim.bin | Bin 0 -> 896 bytes graphics/battle/terrain_cave_anim.png | Bin 0 -> 3877 bytes graphics/battle/terrain_grass.bin | Bin 0 -> 4096 bytes graphics/battle/terrain_grass.pal | 51 ++++++++++ graphics/battle/terrain_grass.png | Bin 0 -> 1213 bytes graphics/battle/terrain_grass_anim.bin | Bin 0 -> 896 bytes graphics/battle/terrain_grass_anim.png | Bin 0 -> 683 bytes graphics/battle/terrain_indoor.bin | Bin 0 -> 4096 bytes graphics/battle/terrain_indoor.png | Bin 0 -> 706 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_longgrass.bin | Bin 0 -> 4096 bytes graphics/battle/terrain_longgrass.pal | 51 ++++++++++ graphics/battle/terrain_longgrass.png | Bin 0 -> 1213 bytes graphics/battle/terrain_longgrass_anim.bin | Bin 0 -> 896 bytes graphics/battle/terrain_longgrass_anim.png | Bin 0 -> 986 bytes graphics/battle/terrain_mountain.bin | Bin 0 -> 4096 bytes graphics/battle/terrain_mountain.pal | 51 ++++++++++ graphics/battle/terrain_mountain.png | Bin 0 -> 750 bytes graphics/battle/terrain_mountain_anim.bin | Bin 0 -> 896 bytes graphics/battle/terrain_mountain_anim.png | Bin 0 -> 610 bytes graphics/battle/terrain_pond.bin | Bin 0 -> 4096 bytes graphics/battle/terrain_pond.pal | 51 ++++++++++ graphics/battle/terrain_pond.png | Bin 0 -> 739 bytes graphics/battle/terrain_pond_anim.bin | Bin 0 -> 896 bytes graphics/battle/terrain_pond_anim.png | Bin 0 -> 481 bytes graphics/battle/terrain_sand.bin | Bin 0 -> 4096 bytes graphics/battle/terrain_sand.pal | 51 ++++++++++ graphics/battle/terrain_sand.png | Bin 0 -> 829 bytes graphics/battle/terrain_sand_anim.bin | Bin 0 -> 896 bytes graphics/battle/terrain_sand_anim.png | Bin 0 -> 515 bytes graphics/battle/terrain_underwater.bin | Bin 0 -> 4096 bytes graphics/battle/terrain_underwater.pal | 51 ++++++++++ graphics/battle/terrain_underwater.png | Bin 0 -> 763 bytes graphics/battle/terrain_underwater_anim.bin | Bin 0 -> 896 bytes graphics/battle/terrain_underwater_anim.png | Bin 0 -> 363 bytes graphics/battle/terrain_water.bin | Bin 0 -> 4096 bytes graphics/battle/terrain_water.pal | 51 ++++++++++ graphics/battle/terrain_water.png | Bin 0 -> 959 bytes graphics/battle/terrain_water_anim.bin | Bin 0 -> 896 bytes graphics/battle/terrain_water_anim.png | Bin 0 -> 764 bytes graphics/battle/unk_8248400.pal | 51 ---------- graphics/battle/unk_824844C.png | Bin 1251 -> 0 bytes graphics/battle/unk_82489A8.bin | Bin 4096 -> 0 bytes graphics/battle/unk_8248C68.png | Bin 683 -> 0 bytes graphics/battle/unk_8248F58.bin | Bin 896 -> 0 bytes graphics/battle/unk_8249074.pal | 51 ---------- graphics/battle/unk_82490C4.png | Bin 1251 -> 0 bytes graphics/battle/unk_8249620.bin | Bin 4096 -> 0 bytes graphics/battle/unk_82498DC.png | Bin 998 -> 0 bytes graphics/battle/unk_8249E10.bin | Bin 896 -> 0 bytes graphics/battle/unk_8249F98.pal | 51 ---------- graphics/battle/unk_8249FE4.png | Bin 876 -> 0 bytes graphics/battle/unk_824A37C.bin | Bin 4096 -> 0 bytes graphics/battle/unk_824A618.png | Bin 526 -> 0 bytes graphics/battle/unk_824A844.bin | Bin 896 -> 0 bytes graphics/battle/unk_824A940.pal | 51 ---------- graphics/battle/unk_824A990.png | Bin 829 -> 0 bytes graphics/battle/unk_824ACD0.bin | Bin 4096 -> 0 bytes graphics/battle/unk_824AF70.png | Bin 350 -> 0 bytes graphics/battle/unk_824B0DC.bin | Bin 896 -> 0 bytes graphics/battle/unk_824B19C.pal | 51 ---------- graphics/battle/unk_824B1EC.png | Bin 1005 -> 0 bytes graphics/battle/unk_824B608.bin | Bin 4096 -> 0 bytes graphics/battle/unk_824B8A8.png | Bin 790 -> 0 bytes graphics/battle/unk_824BBE0.bin | Bin 896 -> 0 bytes graphics/battle/unk_824BCE0.pal | 51 ---------- graphics/battle/unk_824BD38.png | Bin 791 -> 0 bytes graphics/battle/unk_824C07C.bin | Bin 4096 -> 0 bytes graphics/battle/unk_824C314.png | Bin 498 -> 0 bytes graphics/battle/unk_824C520.bin | Bin 896 -> 0 bytes graphics/battle/unk_824C5D8.pal | 51 ---------- graphics/battle/unk_824C624.png | Bin 787 -> 0 bytes graphics/battle/unk_824C958.bin | Bin 4096 -> 0 bytes graphics/battle/unk_824CBF8.png | Bin 630 -> 0 bytes graphics/battle/unk_824CEC8.bin | Bin 896 -> 0 bytes graphics/battle/unk_824CF98.pal | 51 ---------- graphics/battle/unk_824CFEC.png | Bin 964 -> 0 bytes graphics/battle/unk_824D418.bin | Bin 4096 -> 0 bytes graphics/battle/unk_824D6B8.png | Bin 1335 -> 0 bytes graphics/battle/unk_824DC98.bin | Bin 896 -> 0 bytes graphics/battle/unk_824DDF0.pal | 51 ---------- graphics/battle/unk_824DE34.png | Bin 781 -> 0 bytes graphics/battle/unk_824E16C.bin | Bin 4096 -> 0 bytes graphics/battle/unk_824E410.png | Bin 167 -> 0 bytes graphics/battle/unk_824E490.bin | Bin 896 -> 0 bytes graphics/battle/unk_824E528.pal | 51 ---------- graphics/battle/unk_824E56C.pal | 51 ---------- graphics/battle/unk_824E5B8.pal | 51 ---------- graphics/battle/unk_824E604.pal | 51 ---------- graphics/battle/unk_824E650.pal | 51 ---------- graphics/battle/unk_824E6A4.pal | 51 ---------- graphics/battle/unk_824E6F0.pal | 51 ---------- graphics/battle/unk_824E740.pal | 51 ---------- graphics/battle/unk_824E78C.pal | 51 ---------- graphics/battle/unk_824E7DC.pal | 51 ---------- graphics/battle/unk_824E81C.pal | 51 ---------- graphics/battle/unk_824E858.png | Bin 781 -> 0 bytes graphics/battle/unk_824EB90.bin | Bin 4096 -> 0 bytes graphics_file_rules.mk | 43 ++++++++ src/battle_bg.c | 153 +++++++++++++++------------- 118 files changed, 1144 insertions(+), 1092 deletions(-) create mode 100644 graphics/battle/terrain_building.bin create mode 100644 graphics/battle/terrain_building.pal create mode 100644 graphics/battle/terrain_building.png create mode 100644 graphics/battle/terrain_building_anim.bin create mode 100644 graphics/battle/terrain_building_anim.png create mode 100644 graphics/battle/terrain_cave.bin create mode 100644 graphics/battle/terrain_cave.pal create mode 100644 graphics/battle/terrain_cave.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_grass.bin create mode 100644 graphics/battle/terrain_grass.pal create mode 100644 graphics/battle/terrain_grass.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_indoor.bin create mode 100644 graphics/battle/terrain_indoor.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_longgrass.bin create mode 100644 graphics/battle/terrain_longgrass.pal create mode 100644 graphics/battle/terrain_longgrass.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_mountain.bin create mode 100644 graphics/battle/terrain_mountain.pal create mode 100644 graphics/battle/terrain_mountain.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_pond.bin create mode 100644 graphics/battle/terrain_pond.pal create mode 100644 graphics/battle/terrain_pond.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_sand.bin create mode 100644 graphics/battle/terrain_sand.pal create mode 100644 graphics/battle/terrain_sand.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_underwater.bin create mode 100644 graphics/battle/terrain_underwater.pal create mode 100644 graphics/battle/terrain_underwater.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_water.bin create mode 100644 graphics/battle/terrain_water.pal create mode 100644 graphics/battle/terrain_water.png create mode 100644 graphics/battle/terrain_water_anim.bin create mode 100644 graphics/battle/terrain_water_anim.png delete mode 100644 graphics/battle/unk_8248400.pal delete mode 100644 graphics/battle/unk_824844C.png delete mode 100644 graphics/battle/unk_82489A8.bin delete mode 100644 graphics/battle/unk_8248C68.png delete mode 100644 graphics/battle/unk_8248F58.bin delete mode 100644 graphics/battle/unk_8249074.pal delete mode 100644 graphics/battle/unk_82490C4.png delete mode 100644 graphics/battle/unk_8249620.bin delete mode 100644 graphics/battle/unk_82498DC.png delete mode 100644 graphics/battle/unk_8249E10.bin delete mode 100644 graphics/battle/unk_8249F98.pal delete mode 100644 graphics/battle/unk_8249FE4.png delete mode 100644 graphics/battle/unk_824A37C.bin delete mode 100644 graphics/battle/unk_824A618.png delete mode 100644 graphics/battle/unk_824A844.bin delete mode 100644 graphics/battle/unk_824A940.pal delete mode 100644 graphics/battle/unk_824A990.png delete mode 100644 graphics/battle/unk_824ACD0.bin delete mode 100644 graphics/battle/unk_824AF70.png delete mode 100644 graphics/battle/unk_824B0DC.bin delete mode 100644 graphics/battle/unk_824B19C.pal delete mode 100644 graphics/battle/unk_824B1EC.png delete mode 100644 graphics/battle/unk_824B608.bin delete mode 100644 graphics/battle/unk_824B8A8.png delete mode 100644 graphics/battle/unk_824BBE0.bin delete mode 100644 graphics/battle/unk_824BCE0.pal delete mode 100644 graphics/battle/unk_824BD38.png delete mode 100644 graphics/battle/unk_824C07C.bin delete mode 100644 graphics/battle/unk_824C314.png delete mode 100644 graphics/battle/unk_824C520.bin delete mode 100644 graphics/battle/unk_824C5D8.pal delete mode 100644 graphics/battle/unk_824C624.png delete mode 100644 graphics/battle/unk_824C958.bin delete mode 100644 graphics/battle/unk_824CBF8.png delete mode 100644 graphics/battle/unk_824CEC8.bin delete mode 100644 graphics/battle/unk_824CF98.pal delete mode 100644 graphics/battle/unk_824CFEC.png delete mode 100644 graphics/battle/unk_824D418.bin delete mode 100644 graphics/battle/unk_824D6B8.png delete mode 100644 graphics/battle/unk_824DC98.bin delete mode 100644 graphics/battle/unk_824DDF0.pal delete mode 100644 graphics/battle/unk_824DE34.png delete mode 100644 graphics/battle/unk_824E16C.bin delete mode 100644 graphics/battle/unk_824E410.png delete mode 100644 graphics/battle/unk_824E490.bin delete mode 100644 graphics/battle/unk_824E528.pal delete mode 100644 graphics/battle/unk_824E56C.pal delete mode 100644 graphics/battle/unk_824E5B8.pal delete mode 100644 graphics/battle/unk_824E604.pal delete mode 100644 graphics/battle/unk_824E650.pal delete mode 100644 graphics/battle/unk_824E6A4.pal delete mode 100644 graphics/battle/unk_824E6F0.pal delete mode 100644 graphics/battle/unk_824E740.pal delete mode 100644 graphics/battle/unk_824E78C.pal delete mode 100644 graphics/battle/unk_824E7DC.pal delete mode 100644 graphics/battle/unk_824E81C.pal delete mode 100644 graphics/battle/unk_824E858.png delete mode 100644 graphics/battle/unk_824EB90.bin diff --git a/graphics/battle/terrain_building.bin b/graphics/battle/terrain_building.bin new file mode 100644 index 000000000..0710427da Binary files /dev/null and b/graphics/battle/terrain_building.bin differ diff --git a/graphics/battle/terrain_building.pal b/graphics/battle/terrain_building.pal new file mode 100644 index 000000000..16421567f --- /dev/null +++ b/graphics/battle/terrain_building.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.png b/graphics/battle/terrain_building.png new file mode 100644 index 000000000..3b060be4e Binary files /dev/null and b/graphics/battle/terrain_building.png differ 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_cave.bin b/graphics/battle/terrain_cave.bin new file mode 100644 index 000000000..255f2953d Binary files /dev/null and b/graphics/battle/terrain_cave.bin differ diff --git a/graphics/battle/terrain_cave.pal b/graphics/battle/terrain_cave.pal new file mode 100644 index 000000000..f17a7bf9d --- /dev/null +++ b/graphics/battle/terrain_cave.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.png b/graphics/battle/terrain_cave.png new file mode 100644 index 000000000..e2a18ae57 Binary files /dev/null and b/graphics/battle/terrain_cave.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_grass.bin b/graphics/battle/terrain_grass.bin new file mode 100644 index 000000000..e0da76dc2 Binary files /dev/null and b/graphics/battle/terrain_grass.bin differ diff --git a/graphics/battle/terrain_grass.pal b/graphics/battle/terrain_grass.pal new file mode 100644 index 000000000..cc00b3dc2 --- /dev/null +++ b/graphics/battle/terrain_grass.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.png b/graphics/battle/terrain_grass.png new file mode 100644 index 000000000..645796cb1 Binary files /dev/null and b/graphics/battle/terrain_grass.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_indoor.bin b/graphics/battle/terrain_indoor.bin new file mode 100644 index 000000000..0710427da Binary files /dev/null and b/graphics/battle/terrain_indoor.bin differ diff --git a/graphics/battle/terrain_indoor.png b/graphics/battle/terrain_indoor.png new file mode 100644 index 000000000..1cbb7c63b Binary files /dev/null and b/graphics/battle/terrain_indoor.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_longgrass.bin b/graphics/battle/terrain_longgrass.bin new file mode 100644 index 000000000..2b2634a14 Binary files /dev/null and b/graphics/battle/terrain_longgrass.bin differ diff --git a/graphics/battle/terrain_longgrass.pal b/graphics/battle/terrain_longgrass.pal new file mode 100644 index 000000000..c390b8c44 --- /dev/null +++ b/graphics/battle/terrain_longgrass.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.png b/graphics/battle/terrain_longgrass.png new file mode 100644 index 000000000..0d09d739c Binary files /dev/null and b/graphics/battle/terrain_longgrass.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_mountain.bin b/graphics/battle/terrain_mountain.bin new file mode 100644 index 000000000..16600f5f8 Binary files /dev/null and b/graphics/battle/terrain_mountain.bin differ diff --git a/graphics/battle/terrain_mountain.pal b/graphics/battle/terrain_mountain.pal new file mode 100644 index 000000000..bfe75be65 --- /dev/null +++ b/graphics/battle/terrain_mountain.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.png b/graphics/battle/terrain_mountain.png new file mode 100644 index 000000000..9889a6b62 Binary files /dev/null and b/graphics/battle/terrain_mountain.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_pond.bin b/graphics/battle/terrain_pond.bin new file mode 100644 index 000000000..d4c3dedcb Binary files /dev/null and b/graphics/battle/terrain_pond.bin differ diff --git a/graphics/battle/terrain_pond.pal b/graphics/battle/terrain_pond.pal new file mode 100644 index 000000000..041560cf4 --- /dev/null +++ b/graphics/battle/terrain_pond.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.png b/graphics/battle/terrain_pond.png new file mode 100644 index 000000000..161498b2a Binary files /dev/null and b/graphics/battle/terrain_pond.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_sand.bin b/graphics/battle/terrain_sand.bin new file mode 100644 index 000000000..365e1474f Binary files /dev/null and b/graphics/battle/terrain_sand.bin differ diff --git a/graphics/battle/terrain_sand.pal b/graphics/battle/terrain_sand.pal new file mode 100644 index 000000000..dafc3eb7f --- /dev/null +++ b/graphics/battle/terrain_sand.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.png b/graphics/battle/terrain_sand.png new file mode 100644 index 000000000..e802b34f2 Binary files /dev/null and b/graphics/battle/terrain_sand.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_underwater.bin b/graphics/battle/terrain_underwater.bin new file mode 100644 index 000000000..29843f17d Binary files /dev/null and b/graphics/battle/terrain_underwater.bin differ diff --git a/graphics/battle/terrain_underwater.pal b/graphics/battle/terrain_underwater.pal new file mode 100644 index 000000000..5fa95cf21 --- /dev/null +++ b/graphics/battle/terrain_underwater.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.png b/graphics/battle/terrain_underwater.png new file mode 100644 index 000000000..19e115348 Binary files /dev/null and b/graphics/battle/terrain_underwater.png 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_water.bin b/graphics/battle/terrain_water.bin new file mode 100644 index 000000000..0ee05129a Binary files /dev/null and b/graphics/battle/terrain_water.bin differ diff --git a/graphics/battle/terrain_water.pal b/graphics/battle/terrain_water.pal new file mode 100644 index 000000000..d31dce658 --- /dev/null +++ b/graphics/battle/terrain_water.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.png b/graphics/battle/terrain_water.png new file mode 100644 index 000000000..8953e7940 Binary files /dev/null and b/graphics/battle/terrain_water.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/unk_8248400.pal b/graphics/battle/unk_8248400.pal deleted file mode 100644 index cc00b3dc2..000000000 --- a/graphics/battle/unk_8248400.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/unk_824844C.png b/graphics/battle/unk_824844C.png deleted file mode 100644 index 3c4a3f733..000000000 Binary files a/graphics/battle/unk_824844C.png and /dev/null differ diff --git a/graphics/battle/unk_82489A8.bin b/graphics/battle/unk_82489A8.bin deleted file mode 100644 index e0da76dc2..000000000 Binary files a/graphics/battle/unk_82489A8.bin and /dev/null differ diff --git a/graphics/battle/unk_8248C68.png b/graphics/battle/unk_8248C68.png deleted file mode 100644 index e927c982c..000000000 Binary files a/graphics/battle/unk_8248C68.png and /dev/null differ diff --git a/graphics/battle/unk_8248F58.bin b/graphics/battle/unk_8248F58.bin deleted file mode 100644 index 03e4194fc..000000000 Binary files a/graphics/battle/unk_8248F58.bin and /dev/null differ diff --git a/graphics/battle/unk_8249074.pal b/graphics/battle/unk_8249074.pal deleted file mode 100644 index c390b8c44..000000000 --- a/graphics/battle/unk_8249074.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/unk_82490C4.png b/graphics/battle/unk_82490C4.png deleted file mode 100644 index 3c4a3f733..000000000 Binary files a/graphics/battle/unk_82490C4.png and /dev/null differ diff --git a/graphics/battle/unk_8249620.bin b/graphics/battle/unk_8249620.bin deleted file mode 100644 index 2b2634a14..000000000 Binary files a/graphics/battle/unk_8249620.bin and /dev/null differ diff --git a/graphics/battle/unk_82498DC.png b/graphics/battle/unk_82498DC.png deleted file mode 100644 index a1f3cca52..000000000 Binary files a/graphics/battle/unk_82498DC.png and /dev/null differ diff --git a/graphics/battle/unk_8249E10.bin b/graphics/battle/unk_8249E10.bin deleted file mode 100644 index 5cb0de868..000000000 Binary files a/graphics/battle/unk_8249E10.bin and /dev/null differ diff --git a/graphics/battle/unk_8249F98.pal b/graphics/battle/unk_8249F98.pal deleted file mode 100644 index dafc3eb7f..000000000 --- a/graphics/battle/unk_8249F98.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/unk_8249FE4.png b/graphics/battle/unk_8249FE4.png deleted file mode 100644 index b96c73fbd..000000000 Binary files a/graphics/battle/unk_8249FE4.png and /dev/null differ diff --git a/graphics/battle/unk_824A37C.bin b/graphics/battle/unk_824A37C.bin deleted file mode 100644 index 365e1474f..000000000 Binary files a/graphics/battle/unk_824A37C.bin and /dev/null differ diff --git a/graphics/battle/unk_824A618.png b/graphics/battle/unk_824A618.png deleted file mode 100644 index cc9a3ebef..000000000 Binary files a/graphics/battle/unk_824A618.png and /dev/null differ diff --git a/graphics/battle/unk_824A844.bin b/graphics/battle/unk_824A844.bin deleted file mode 100644 index e4afe99ae..000000000 Binary files a/graphics/battle/unk_824A844.bin and /dev/null differ diff --git a/graphics/battle/unk_824A940.pal b/graphics/battle/unk_824A940.pal deleted file mode 100644 index 5fa95cf21..000000000 --- a/graphics/battle/unk_824A940.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/unk_824A990.png b/graphics/battle/unk_824A990.png deleted file mode 100644 index f8f483342..000000000 Binary files a/graphics/battle/unk_824A990.png and /dev/null differ diff --git a/graphics/battle/unk_824ACD0.bin b/graphics/battle/unk_824ACD0.bin deleted file mode 100644 index 29843f17d..000000000 Binary files a/graphics/battle/unk_824ACD0.bin and /dev/null differ diff --git a/graphics/battle/unk_824AF70.png b/graphics/battle/unk_824AF70.png deleted file mode 100644 index 9d8af70b8..000000000 Binary files a/graphics/battle/unk_824AF70.png and /dev/null differ diff --git a/graphics/battle/unk_824B0DC.bin b/graphics/battle/unk_824B0DC.bin deleted file mode 100644 index 9029c7c9d..000000000 Binary files a/graphics/battle/unk_824B0DC.bin and /dev/null differ diff --git a/graphics/battle/unk_824B19C.pal b/graphics/battle/unk_824B19C.pal deleted file mode 100644 index d31dce658..000000000 --- a/graphics/battle/unk_824B19C.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/unk_824B1EC.png b/graphics/battle/unk_824B1EC.png deleted file mode 100644 index 91819a570..000000000 Binary files a/graphics/battle/unk_824B1EC.png and /dev/null differ diff --git a/graphics/battle/unk_824B608.bin b/graphics/battle/unk_824B608.bin deleted file mode 100644 index 0ee05129a..000000000 Binary files a/graphics/battle/unk_824B608.bin and /dev/null differ diff --git a/graphics/battle/unk_824B8A8.png b/graphics/battle/unk_824B8A8.png deleted file mode 100644 index f8323d44f..000000000 Binary files a/graphics/battle/unk_824B8A8.png and /dev/null differ diff --git a/graphics/battle/unk_824BBE0.bin b/graphics/battle/unk_824BBE0.bin deleted file mode 100644 index b6661cd3c..000000000 Binary files a/graphics/battle/unk_824BBE0.bin and /dev/null differ diff --git a/graphics/battle/unk_824BCE0.pal b/graphics/battle/unk_824BCE0.pal deleted file mode 100644 index 041560cf4..000000000 --- a/graphics/battle/unk_824BCE0.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/unk_824BD38.png b/graphics/battle/unk_824BD38.png deleted file mode 100644 index c6a1d3c07..000000000 Binary files a/graphics/battle/unk_824BD38.png and /dev/null differ diff --git a/graphics/battle/unk_824C07C.bin b/graphics/battle/unk_824C07C.bin deleted file mode 100644 index d4c3dedcb..000000000 Binary files a/graphics/battle/unk_824C07C.bin and /dev/null differ diff --git a/graphics/battle/unk_824C314.png b/graphics/battle/unk_824C314.png deleted file mode 100644 index 8ebb6f162..000000000 Binary files a/graphics/battle/unk_824C314.png and /dev/null differ diff --git a/graphics/battle/unk_824C520.bin b/graphics/battle/unk_824C520.bin deleted file mode 100644 index e012f647e..000000000 Binary files a/graphics/battle/unk_824C520.bin and /dev/null differ diff --git a/graphics/battle/unk_824C5D8.pal b/graphics/battle/unk_824C5D8.pal deleted file mode 100644 index bfe75be65..000000000 --- a/graphics/battle/unk_824C5D8.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/unk_824C624.png b/graphics/battle/unk_824C624.png deleted file mode 100644 index 90bc93e39..000000000 Binary files a/graphics/battle/unk_824C624.png and /dev/null differ diff --git a/graphics/battle/unk_824C958.bin b/graphics/battle/unk_824C958.bin deleted file mode 100644 index 16600f5f8..000000000 Binary files a/graphics/battle/unk_824C958.bin and /dev/null differ diff --git a/graphics/battle/unk_824CBF8.png b/graphics/battle/unk_824CBF8.png deleted file mode 100644 index 598697bdb..000000000 Binary files a/graphics/battle/unk_824CBF8.png and /dev/null differ diff --git a/graphics/battle/unk_824CEC8.bin b/graphics/battle/unk_824CEC8.bin deleted file mode 100644 index 55c5730c0..000000000 Binary files a/graphics/battle/unk_824CEC8.bin and /dev/null differ diff --git a/graphics/battle/unk_824CF98.pal b/graphics/battle/unk_824CF98.pal deleted file mode 100644 index f17a7bf9d..000000000 --- a/graphics/battle/unk_824CF98.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/unk_824CFEC.png b/graphics/battle/unk_824CFEC.png deleted file mode 100644 index 87969aafc..000000000 Binary files a/graphics/battle/unk_824CFEC.png and /dev/null differ diff --git a/graphics/battle/unk_824D418.bin b/graphics/battle/unk_824D418.bin deleted file mode 100644 index 255f2953d..000000000 Binary files a/graphics/battle/unk_824D418.bin and /dev/null differ diff --git a/graphics/battle/unk_824D6B8.png b/graphics/battle/unk_824D6B8.png deleted file mode 100644 index 799facfeb..000000000 Binary files a/graphics/battle/unk_824D6B8.png and /dev/null differ diff --git a/graphics/battle/unk_824DC98.bin b/graphics/battle/unk_824DC98.bin deleted file mode 100644 index ad7724c67..000000000 Binary files a/graphics/battle/unk_824DC98.bin and /dev/null differ diff --git a/graphics/battle/unk_824DDF0.pal b/graphics/battle/unk_824DDF0.pal deleted file mode 100644 index 16421567f..000000000 --- a/graphics/battle/unk_824DDF0.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/unk_824DE34.png b/graphics/battle/unk_824DE34.png deleted file mode 100644 index b4ec20536..000000000 Binary files a/graphics/battle/unk_824DE34.png and /dev/null differ diff --git a/graphics/battle/unk_824E16C.bin b/graphics/battle/unk_824E16C.bin deleted file mode 100644 index 0710427da..000000000 Binary files a/graphics/battle/unk_824E16C.bin and /dev/null differ diff --git a/graphics/battle/unk_824E410.png b/graphics/battle/unk_824E410.png deleted file mode 100644 index ae71f8f2a..000000000 Binary files a/graphics/battle/unk_824E410.png and /dev/null differ diff --git a/graphics/battle/unk_824E490.bin b/graphics/battle/unk_824E490.bin deleted file mode 100644 index aba49c6f9..000000000 Binary files a/graphics/battle/unk_824E490.bin and /dev/null differ diff --git a/graphics/battle/unk_824E528.pal b/graphics/battle/unk_824E528.pal deleted file mode 100644 index baa0fdf4f..000000000 --- a/graphics/battle/unk_824E528.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/unk_824E56C.pal b/graphics/battle/unk_824E56C.pal deleted file mode 100644 index 187054476..000000000 --- a/graphics/battle/unk_824E56C.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/unk_824E5B8.pal b/graphics/battle/unk_824E5B8.pal deleted file mode 100644 index 581b6d596..000000000 --- a/graphics/battle/unk_824E5B8.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/unk_824E604.pal b/graphics/battle/unk_824E604.pal deleted file mode 100644 index a1bc6b60c..000000000 --- a/graphics/battle/unk_824E604.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/unk_824E650.pal b/graphics/battle/unk_824E650.pal deleted file mode 100644 index 597647872..000000000 --- a/graphics/battle/unk_824E650.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/unk_824E6A4.pal b/graphics/battle/unk_824E6A4.pal deleted file mode 100644 index e63bad165..000000000 --- a/graphics/battle/unk_824E6A4.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/unk_824E6F0.pal b/graphics/battle/unk_824E6F0.pal deleted file mode 100644 index 21196b3e8..000000000 --- a/graphics/battle/unk_824E6F0.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/unk_824E740.pal b/graphics/battle/unk_824E740.pal deleted file mode 100644 index 8ea1eeae7..000000000 --- a/graphics/battle/unk_824E740.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/unk_824E78C.pal b/graphics/battle/unk_824E78C.pal deleted file mode 100644 index c5fb745cf..000000000 --- a/graphics/battle/unk_824E78C.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/unk_824E7DC.pal b/graphics/battle/unk_824E7DC.pal deleted file mode 100644 index 9ce470c9f..000000000 --- a/graphics/battle/unk_824E7DC.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/unk_824E81C.pal b/graphics/battle/unk_824E81C.pal deleted file mode 100644 index b47dc0a8d..000000000 --- a/graphics/battle/unk_824E81C.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/unk_824E858.png b/graphics/battle/unk_824E858.png deleted file mode 100644 index b4ec20536..000000000 Binary files a/graphics/battle/unk_824E858.png and /dev/null differ diff --git a/graphics/battle/unk_824EB90.bin b/graphics/battle/unk_824EB90.bin deleted file mode 100644 index 0710427da..000000000 Binary files a/graphics/battle/unk_824EB90.bin and /dev/null differ diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 64e173aa4..0b3fda217 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -24,6 +24,7 @@ TITLESCREENGFXDIR := graphics/title_screen CREDITSGFXDIR := graphics/credits ITEMMENUGFXDIR := graphics/item_menu INTROGFXDIR := graphics/intro +BATTLEGFXDIR := graphics/battle types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark contest_types := cool beauty cute smart tough @@ -523,3 +524,45 @@ $(INTROGFXDIR)/unk_8406654.4bpp: %.4bpp: %.png $(INTROGFXDIR)/unk_8405B28.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 17 + +$(BATTLEGFXDIR)/terrain_building.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 77 + +$(BATTLEGFXDIR)/terrain_cave_anim.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 106 + +$(BATTLEGFXDIR)/terrain_cave.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 84 + +$(BATTLEGFXDIR)/terrain_grass.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 98 + +$(BATTLEGFXDIR)/terrain_indoor.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 77 + +$(BATTLEGFXDIR)/terrain_longgrass_anim.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 133 + +$(BATTLEGFXDIR)/terrain_longgrass.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 98 + +$(BATTLEGFXDIR)/terrain_mountain_anim.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 47 + +$(BATTLEGFXDIR)/terrain_pond_anim.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 36 + +$(BATTLEGFXDIR)/terrain_pond.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 75 + +$(BATTLEGFXDIR)/terrain_sand.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 83 + +$(BATTLEGFXDIR)/terrain_underwater_anim.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 26 + +$(BATTLEGFXDIR)/terrain_underwater.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 85 + +$(BATTLEGFXDIR)/terrain_water.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 81 diff --git a/src/battle_bg.c b/src/battle_bg.c index 32d3e017a..05a6babe2 100644 --- a/src/battle_bg.c +++ b/src/battle_bg.c @@ -343,64 +343,73 @@ static const struct WindowTemplate gUnknown_8248330[] = { }, DUMMY_WIN_TEMPLATE }; -static const u32 sBattleTerrainPalette_Grass[] = INCBIN_U32("graphics/battle/unk_8248400.gbapal.lz"); -static const u32 sBattleTerrainTiles_Grass[] = INCBIN_U32("graphics/battle/unk_824844C.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Grass[] = INCBIN_U32("graphics/battle/unk_82489A8.bin.lz"); -static const u32 sBattleTerrainAnimTiles_Grass[] = INCBIN_U32("graphics/battle/unk_8248C68.4bpp.lz"); -static const u32 sBattleTerrainAnimTilemap_Grass[] = INCBIN_U32("graphics/battle/unk_8248F58.bin.lz"); -static const u32 sBattleTerrainPalette_LongGrass[] = INCBIN_U32("graphics/battle/unk_8249074.gbapal.lz"); -static const u32 sBattleTerrainTiles_LongGrass[] = INCBIN_U32("graphics/battle/unk_82490C4.4bpp.lz"); -static const u32 sBattleTerrainTilemap_LongGrass[] = INCBIN_U32("graphics/battle/unk_8249620.bin.lz"); -static const u32 sBattleTerrainAnimTiles_LongGrass[] = INCBIN_U32("graphics/battle/unk_82498DC.4bpp.lz"); -static const u32 sBattleTerrainAnimTilemap_LongGrass[] = INCBIN_U32("graphics/battle/unk_8249E10.bin.lz"); -static const u32 sBattleTerrainPalette_Sand[] = INCBIN_U32("graphics/battle/unk_8249F98.gbapal.lz"); -static const u32 sBattleTerrainTiles_Sand[] = INCBIN_U32("graphics/battle/unk_8249FE4.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Sand[] = INCBIN_U32("graphics/battle/unk_824A37C.bin.lz"); -static const u32 sBattleTerrainAnimTiles_Sand[] = INCBIN_U32("graphics/battle/unk_824A618.4bpp.lz"); -static const u32 sBattleTerrainAnimTilemap_Sand[] = INCBIN_U32("graphics/battle/unk_824A844.bin.lz"); -static const u32 sBattleTerrainPalette_Underwater[] = INCBIN_U32("graphics/battle/unk_824A940.gbapal.lz"); -static const u32 sBattleTerrainTiles_Underwater[] = INCBIN_U32("graphics/battle/unk_824A990.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Underwater[] = INCBIN_U32("graphics/battle/unk_824ACD0.bin.lz"); -static const u32 sBattleTerrainAnimTiles_Underwater[] = INCBIN_U32("graphics/battle/unk_824AF70.4bpp.lz"); -static const u32 sBattleTerrainAnimTilemap_Underwater[] = INCBIN_U32("graphics/battle/unk_824B0DC.bin.lz"); -static const u32 sBattleTerrainPalette_Water[] = INCBIN_U32("graphics/battle/unk_824B19C.gbapal.lz"); -static const u32 sBattleTerrainTiles_Water[] = INCBIN_U32("graphics/battle/unk_824B1EC.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Water[] = INCBIN_U32("graphics/battle/unk_824B608.bin.lz"); -static const u32 sBattleTerrainAnimTiles_Water[] = INCBIN_U32("graphics/battle/unk_824B8A8.4bpp.lz"); -static const u32 sBattleTerrainAnimTilemap_Water[] = INCBIN_U32("graphics/battle/unk_824BBE0.bin.lz"); -static const u32 sBattleTerrainPalette_Pond[] = INCBIN_U32("graphics/battle/unk_824BCE0.gbapal.lz"); -static const u32 sBattleTerrainTiles_Pond[] = INCBIN_U32("graphics/battle/unk_824BD38.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Pond[] = INCBIN_U32("graphics/battle/unk_824C07C.bin.lz"); -static const u32 sBattleTerrainAnimTiles_Pond[] = INCBIN_U32("graphics/battle/unk_824C314.4bpp.lz"); -static const u32 sBattleTerrainAnimTilemap_Pond[] = INCBIN_U32("graphics/battle/unk_824C520.bin.lz"); -static const u32 sBattleTerrainPalette_Mountain[] = INCBIN_U32("graphics/battle/unk_824C5D8.gbapal.lz"); -static const u32 sBattleTerrainTiles_Mountain[] = INCBIN_U32("graphics/battle/unk_824C624.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Mountain[] = INCBIN_U32("graphics/battle/unk_824C958.bin.lz"); -static const u32 sBattleTerrainAnimTiles_Mountain[] = INCBIN_U32("graphics/battle/unk_824CBF8.4bpp.lz"); -static const u32 sBattleTerrainAnimTilemap_Mountain[] = INCBIN_U32("graphics/battle/unk_824CEC8.bin.lz"); -static const u32 sBattleTerrainPalette_Cave[] = INCBIN_U32("graphics/battle/unk_824CF98.gbapal.lz"); -static const u32 sBattleTerrainTiles_Cave[] = INCBIN_U32("graphics/battle/unk_824CFEC.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Cave[] = INCBIN_U32("graphics/battle/unk_824D418.bin.lz"); -static const u32 sBattleTerrainAnimTiles_Cave[] = INCBIN_U32("graphics/battle/unk_824D6B8.4bpp.lz"); -static const u32 sBattleTerrainAnimTilemap_Cave[] = INCBIN_U32("graphics/battle/unk_824DC98.bin.lz"); -static const u32 sBattleTerrainPalette_Building[] = INCBIN_U32("graphics/battle/unk_824DDF0.gbapal.lz"); -static const u32 sBattleTerrainTiles_Building[] = INCBIN_U32("graphics/battle/unk_824DE34.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Building[] = INCBIN_U32("graphics/battle/unk_824E16C.bin.lz"); -static const u32 sBattleTerrainAnimTiles_Building[] = INCBIN_U32("graphics/battle/unk_824E410.4bpp.lz"); -static const u32 sBattleTerrainAnimTilemap_Building[] = INCBIN_U32("graphics/battle/unk_824E490.bin.lz"); -static const u32 sBattleTerrainPalette_Link[] = INCBIN_U32("graphics/battle/unk_824E528.gbapal.lz"); -static const u32 sBattleTerrainPalette_Gym[] = INCBIN_U32("graphics/battle/unk_824E56C.gbapal.lz"); -static const u32 sBattleTerrainPalette_Leader[] = INCBIN_U32("graphics/battle/unk_824E5B8.gbapal.lz"); -static const u32 sBattleTerrainPalette_Indoor2[] = INCBIN_U32("graphics/battle/unk_824E604.gbapal.lz"); -static const u32 sBattleTerrainPalette_Indoor1[] = INCBIN_U32("graphics/battle/unk_824E650.gbapal.lz"); -static const u32 sBattleTerrainPalette_Lorelei[] = INCBIN_U32("graphics/battle/unk_824E6A4.gbapal.lz"); -static const u32 sBattleTerrainPalette_Bruno[] = INCBIN_U32("graphics/battle/unk_824E6F0.gbapal.lz"); -static const u32 sBattleTerrainPalette_Agatha[] = INCBIN_U32("graphics/battle/unk_824E740.gbapal.lz"); -static const u32 sBattleTerrainPalette_Lance[] = INCBIN_U32("graphics/battle/unk_824E78C.gbapal.lz"); -static const u32 sBattleTerrainPalette_Champion[] = INCBIN_U32("graphics/battle/unk_824E7DC.gbapal.lz"); -static const u32 sBattleTerrainPalette_Plain[] = INCBIN_U32("graphics/battle/unk_824E81C.gbapal.lz"); -static const u32 sBattleTerrainTiles_Indoor2[] = INCBIN_U32("graphics/battle/unk_824E858.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Indoor2[] = INCBIN_U32("graphics/battle/unk_824EB90.bin.lz"); +static const u32 sBattleTerrainPalette_Grass[] = INCBIN_U32("graphics/battle/terrain_grass.gbapal.lz"); +static const u32 sBattleTerrainTiles_Grass[] = INCBIN_U32("graphics/battle/terrain_grass.4bpp.lz"); +static const u32 sBattleTerrainTilemap_Grass[] = INCBIN_U32("graphics/battle/terrain_grass.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_longgrass.gbapal.lz"); +static const u32 sBattleTerrainTiles_LongGrass[] = INCBIN_U32("graphics/battle/terrain_longgrass.4bpp.lz"); +static const u32 sBattleTerrainTilemap_LongGrass[] = INCBIN_U32("graphics/battle/terrain_longgrass.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_sand.gbapal.lz"); +static const u32 sBattleTerrainTiles_Sand[] = INCBIN_U32("graphics/battle/terrain_sand.4bpp.lz"); +static const u32 sBattleTerrainTilemap_Sand[] = INCBIN_U32("graphics/battle/terrain_sand.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_underwater.gbapal.lz"); +static const u32 sBattleTerrainTiles_Underwater[] = INCBIN_U32("graphics/battle/terrain_underwater.4bpp.lz"); +static const u32 sBattleTerrainTilemap_Underwater[] = INCBIN_U32("graphics/battle/terrain_underwater.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_water.gbapal.lz"); +static const u32 sBattleTerrainTiles_Water[] = INCBIN_U32("graphics/battle/terrain_water.4bpp.lz"); +static const u32 sBattleTerrainTilemap_Water[] = INCBIN_U32("graphics/battle/terrain_water.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_pond.gbapal.lz"); +static const u32 sBattleTerrainTiles_Pond[] = INCBIN_U32("graphics/battle/terrain_pond.4bpp.lz"); +static const u32 sBattleTerrainTilemap_Pond[] = INCBIN_U32("graphics/battle/terrain_pond.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_mountain.gbapal.lz"); +static const u32 sBattleTerrainTiles_Mountain[] = INCBIN_U32("graphics/battle/terrain_mountain.4bpp.lz"); +static const u32 sBattleTerrainTilemap_Mountain[] = INCBIN_U32("graphics/battle/terrain_mountain.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_cave.gbapal.lz"); +static const u32 sBattleTerrainTiles_Cave[] = INCBIN_U32("graphics/battle/terrain_cave.4bpp.lz"); +static const u32 sBattleTerrainTilemap_Cave[] = INCBIN_U32("graphics/battle/terrain_cave.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_building.gbapal.lz"); +static const u32 sBattleTerrainTiles_Building[] = INCBIN_U32("graphics/battle/terrain_building.4bpp.lz"); +static const u32 sBattleTerrainTilemap_Building[] = INCBIN_U32("graphics/battle/terrain_building.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_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.4bpp.lz"); +static const u32 sBattleTerrainTilemap_Indoor[] = INCBIN_U32("graphics/battle/terrain_indoor.bin.lz"); static const struct BattleBackground sBattleTerrainTable[] = { [BATTLE_TERRAIN_GRASS] = @@ -509,56 +518,56 @@ static const struct BattleBackground sBattleTerrainTable[] = { }, [BATTLE_TERRAIN_INDOOR_2] = { - .tileset = sBattleTerrainTiles_Indoor2, - .tilemap = sBattleTerrainTilemap_Indoor2, + .tileset = sBattleTerrainTiles_Indoor, + .tilemap = sBattleTerrainTilemap_Indoor, .entryTileset = sBattleTerrainAnimTiles_Building, .entryTilemap = sBattleTerrainAnimTilemap_Building, .palette = sBattleTerrainPalette_Indoor2 }, [BATTLE_TERRAIN_INDOOR_1] = { - .tileset = sBattleTerrainTiles_Indoor2, - .tilemap = sBattleTerrainTilemap_Indoor2, + .tileset = sBattleTerrainTiles_Indoor, + .tilemap = sBattleTerrainTilemap_Indoor, .entryTileset = sBattleTerrainAnimTiles_Building, .entryTilemap = sBattleTerrainAnimTilemap_Building, .palette = sBattleTerrainPalette_Indoor1 }, [BATTLE_TERRAIN_LORELEI] = { - .tileset = sBattleTerrainTiles_Indoor2, - .tilemap = sBattleTerrainTilemap_Indoor2, + .tileset = sBattleTerrainTiles_Indoor, + .tilemap = sBattleTerrainTilemap_Indoor, .entryTileset = sBattleTerrainAnimTiles_Building, .entryTilemap = sBattleTerrainAnimTilemap_Building, .palette = sBattleTerrainPalette_Lorelei }, [BATTLE_TERRAIN_BRUNO] = { - .tileset = sBattleTerrainTiles_Indoor2, - .tilemap = sBattleTerrainTilemap_Indoor2, + .tileset = sBattleTerrainTiles_Indoor, + .tilemap = sBattleTerrainTilemap_Indoor, .entryTileset = sBattleTerrainAnimTiles_Building, .entryTilemap = sBattleTerrainAnimTilemap_Building, .palette = sBattleTerrainPalette_Bruno }, [BATTLE_TERRAIN_AGATHA] = { - .tileset = sBattleTerrainTiles_Indoor2, - .tilemap = sBattleTerrainTilemap_Indoor2, + .tileset = sBattleTerrainTiles_Indoor, + .tilemap = sBattleTerrainTilemap_Indoor, .entryTileset = sBattleTerrainAnimTiles_Building, .entryTilemap = sBattleTerrainAnimTilemap_Building, .palette = sBattleTerrainPalette_Agatha }, [BATTLE_TERRAIN_LANCE] = { - .tileset = sBattleTerrainTiles_Indoor2, - .tilemap = sBattleTerrainTilemap_Indoor2, + .tileset = sBattleTerrainTiles_Indoor, + .tilemap = sBattleTerrainTilemap_Indoor, .entryTileset = sBattleTerrainAnimTiles_Building, .entryTilemap = sBattleTerrainAnimTilemap_Building, .palette = sBattleTerrainPalette_Lance }, [BATTLE_TERRAIN_CHAMPION] = { - .tileset = sBattleTerrainTiles_Indoor2, - .tilemap = sBattleTerrainTilemap_Indoor2, + .tileset = sBattleTerrainTiles_Indoor, + .tilemap = sBattleTerrainTilemap_Indoor, .entryTileset = sBattleTerrainAnimTiles_Building, .entryTilemap = sBattleTerrainAnimTilemap_Building, .palette = sBattleTerrainPalette_Champion -- cgit v1.2.3 From 7d9bcc9f77aae2a59f657c77ffa670fd43a4bf87 Mon Sep 17 00:00:00 2001 From: hjk321 Date: Mon, 29 Mar 2021 09:49:56 -0500 Subject: Document and index graphics/battle_anims and graphics/battle_interface --- graphics/battle_anims/unk_83E44F4.png | Bin 0 -> 339 bytes graphics/battle_anims/unk_83E4874.png | Bin 286 -> 0 bytes .../battle_interface/ball_display_unused_extra.png | Bin 102 -> 156 bytes graphics/battle_interface/unk_826404C.png | Bin 102 -> 0 bytes graphics/battle_interface/unk_battlebox.pal | 19 ------------------- graphics/battle_interface/unk_battlebox.png | Bin 170 -> 218 bytes graphics/battle_interface/unused.png | Bin 0 -> 102 bytes graphics/battle_interface/unused_window2.png | Bin 445 -> 476 bytes graphics/battle_interface/unused_window3.png | Bin 235 -> 287 bytes graphics/battle_interface/unused_window4.png | Bin 362 -> 411 bytes graphics/battle_interface/window.png | Bin 455 -> 505 bytes graphics_file_rules.mk | 5 ++++- include/graphics.h | 2 +- src/battle_interface.c | 6 +++--- src/battle_script_commands.c | 9 +++++---- src/graphics.c | 4 ++-- src/water.c | 2 +- 17 files changed, 16 insertions(+), 31 deletions(-) create mode 100644 graphics/battle_anims/unk_83E44F4.png delete mode 100644 graphics/battle_anims/unk_83E4874.png delete mode 100644 graphics/battle_interface/unk_826404C.png delete mode 100644 graphics/battle_interface/unk_battlebox.pal create mode 100644 graphics/battle_interface/unused.png diff --git a/graphics/battle_anims/unk_83E44F4.png b/graphics/battle_anims/unk_83E44F4.png new file mode 100644 index 000000000..d63b338d3 Binary files /dev/null and b/graphics/battle_anims/unk_83E44F4.png differ diff --git a/graphics/battle_anims/unk_83E4874.png b/graphics/battle_anims/unk_83E4874.png deleted file mode 100644 index c4a27b929..000000000 Binary files a/graphics/battle_anims/unk_83E4874.png and /dev/null differ diff --git a/graphics/battle_interface/ball_display_unused_extra.png b/graphics/battle_interface/ball_display_unused_extra.png index d75b86b54..d7c1958d4 100644 Binary files a/graphics/battle_interface/ball_display_unused_extra.png and b/graphics/battle_interface/ball_display_unused_extra.png differ diff --git a/graphics/battle_interface/unk_826404C.png b/graphics/battle_interface/unk_826404C.png deleted file mode 100644 index 8672ac614..000000000 Binary files a/graphics/battle_interface/unk_826404C.png and /dev/null differ diff --git a/graphics/battle_interface/unk_battlebox.pal b/graphics/battle_interface/unk_battlebox.pal deleted file mode 100644 index 862165f3f..000000000 --- a/graphics/battle_interface/unk_battlebox.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 255 255 -255 255 255 -106 90 115 -0 0 0 -213 230 255 -189 205 238 -238 238 255 -106 172 197 -90 139 180 -123 197 205 -0 0 0 -0 0 0 -123 197 255 -0 0 139 -255 131 131 -164 0 0 diff --git a/graphics/battle_interface/unk_battlebox.png b/graphics/battle_interface/unk_battlebox.png index 9f136c3af..9ccf3b26b 100644 Binary files a/graphics/battle_interface/unk_battlebox.png and b/graphics/battle_interface/unk_battlebox.png differ diff --git a/graphics/battle_interface/unused.png b/graphics/battle_interface/unused.png new file mode 100644 index 000000000..8672ac614 Binary files /dev/null and b/graphics/battle_interface/unused.png differ diff --git a/graphics/battle_interface/unused_window2.png b/graphics/battle_interface/unused_window2.png index 32f3da0b0..d381d3683 100644 Binary files a/graphics/battle_interface/unused_window2.png and b/graphics/battle_interface/unused_window2.png differ diff --git a/graphics/battle_interface/unused_window3.png b/graphics/battle_interface/unused_window3.png index e93b2ff88..de2f046f9 100644 Binary files a/graphics/battle_interface/unused_window3.png and b/graphics/battle_interface/unused_window3.png differ diff --git a/graphics/battle_interface/unused_window4.png b/graphics/battle_interface/unused_window4.png index 6c249c96d..39ea78e94 100644 Binary files a/graphics/battle_interface/unused_window4.png and b/graphics/battle_interface/unused_window4.png differ diff --git a/graphics/battle_interface/window.png b/graphics/battle_interface/window.png index 5167ce2c5..a3f50feda 100644 Binary files a/graphics/battle_interface/window.png and b/graphics/battle_interface/window.png differ diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 0b3fda217..3fc4b3b7b 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -148,7 +148,10 @@ $(UNUSEDGFXDIR)/color_frames.4bpp: %.4bpp: %.png $(BATINTGFXDIR)/unused_window2bar.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 5 - + +$(BATINTGFXDIR)/unk_battlebox.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 36 + $(BATINTGFXDIR)/window.gbapal: $(BATINTGFXDIR)/window1.gbapal $(BATINTGFXDIR)/window2.gbapal cat $^ > $@ diff --git a/include/graphics.h b/include/graphics.h index 81b6b4ddf..3848bea86 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4861,7 +4861,7 @@ extern const u32 gFile_graphics_battle_interface_ball_status_bar_sheet[]; extern const u8 gHealthboxElementsGfxTable[][32]; extern const u16 gBattleInterface_BallStatusBarPal[]; extern const u16 gBattleInterface_BallDisplayPal[]; -extern const u16 gUnknown_8D12404[]; +extern const u16 gBattleInterface_SummaryBallDisplayGfx[]; // item_menu extern const u32 gUnknown_8E830CC[]; diff --git a/src/battle_interface.c b/src/battle_interface.c index 3744c34eb..32bab8803 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -342,7 +342,7 @@ static const struct SubspriteTable gUnknown_8260404[] = { {NELEMS(gUnknown_82603E4), gUnknown_82603E4} }; -static const u16 gUnknown_26040C[] = INCBIN_U16("graphics/battle_interface/unk_826404C.4bpp"); +static const u16 gBattleInterface_Unused[] = INCBIN_U16("graphics/battle_interface/unused.4bpp"); static const struct CompressedSpriteSheet sStatusSummaryBarSpriteSheets[] = { {gFile_graphics_battle_interface_ball_status_bar_sheet, 0x0200, 55052}, @@ -360,8 +360,8 @@ static const struct SpritePalette sStatusSummaryBallsSpritePals[] = { }; static const struct SpriteSheet sStatusSummaryBallsSpriteSheets[] = { - {gUnknown_8D12404, 0x0080, 55060}, - {gUnknown_8D12404, 0x0080, 55061} + {gBattleInterface_SummaryBallDisplayGfx, 0x0080, 55060}, + {gBattleInterface_SummaryBallDisplayGfx, 0x0080, 55061} }; static const struct OamData gUnknown_82604AC = { diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 30b8bda88..c144833a1 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -703,8 +703,9 @@ static const struct WindowTemplate sUnusedWinTemplate = .baseBlock = 0x3F, }; -static const u16 gUnknown_82506D0[] = INCBIN_U16("graphics/battle_interface/unk_battlebox.gbapal"); -static const u32 gUnknown_82506F0[] = INCBIN_U32("graphics/battle_interface/unk_battlebox.4bpp.lz"); +// not used +static const u16 sUnknownBattleboxPal[] = INCBIN_U16("graphics/battle_interface/unk_battlebox.gbapal"); +static const u32 sUnknownBattleboxGfx[] = INCBIN_U32("graphics/battle_interface/unk_battlebox.4bpp.lz"); // not used static const u8 sRubyLevelUpStatBoxStats[] = @@ -5593,8 +5594,8 @@ static void sub_8026480(void) { gBattle_BG2_Y = 0; gBattle_BG2_X = 0x1A0; - LoadPalette(gUnknown_82506D0, 0x60, 0x20); - CopyToWindowPixelBuffer(13, gUnknown_82506F0, 0, 0); + LoadPalette(sUnknownBattleboxPal, 0x60, 0x20); + CopyToWindowPixelBuffer(13, sUnknownBattleboxGfx, 0, 0); PutWindowTilemap(13); CopyWindowToVram(13, COPYWIN_BOTH); PutMonIconOnLvlUpBox(); diff --git a/src/graphics.c b/src/graphics.c index c9fc09a1e..56faf0b60 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -366,10 +366,10 @@ const u8 gHealthboxElementsGfxTable_Misc[] = INCBIN_U8("graphics/battle_interfac const u8 gHealthboxElementsGfxTable_HpBarAnim[] = INCBIN_U8("graphics/battle_interface/hp_bar_anim.4bpp"); const u8 gHealthboxElementsGfxTable_MiscFrameEnd[] = INCBIN_U8("graphics/battle_interface/misc_frame_end.4bpp"); -const u8 gUnknown_8D12404[] = INCBIN_U8("graphics/battle_interface/ball_display.4bpp"); +const u8 gBattleInterface_SummaryBallDisplayGfx[] = INCBIN_U8("graphics/battle_interface/ball_display.4bpp"); //Originally an array? -const u8 gUnknown_08C1249C[] = INCBIN_U8("graphics/battle_interface/ball_display_unused_extra.4bpp"); +const u8 gBattleInterface_UnusedSummaryBallDisplayGfx[] = INCBIN_U8("graphics/battle_interface/ball_display_unused_extra.4bpp"); const u8 gBattleInterfaceGfx_Status2[] = INCBIN_U8("graphics/battle_interface/status2.4bpp"); // these three duplicate sets of graphics are for the opponent pokemon const u8 gBattleInterfaceGfx_Status3[] = INCBIN_U8("graphics/battle_interface/status3.4bpp"); // and are also for use in double battles. they use dynamic palettes so const u8 gBattleInterfaceGfx_Status4[] = INCBIN_U8("graphics/battle_interface/status4.4bpp"); // coloring them is an extreme headache and wont be done for now diff --git a/src/water.c b/src/water.c index 5f7fa4dc6..eb7c13c8f 100644 --- a/src/water.c +++ b/src/water.c @@ -56,7 +56,7 @@ static void CreateWaterSportDroplet(struct Task*); static void CreateWaterPulseRingBubbles(struct Sprite*, s32, s32); // Both unused? Comment copied from pokeemerald -static const u8 gUnknown_83E44F4[] = INCBIN_U8("graphics/battle_anims/unk_83E4874.4bpp"); +static const u8 gUnknown_83E44F4[] = INCBIN_U8("graphics/battle_anims/unk_83E44F4.4bpp"); static const u8 gUnknown_83E4874[] = INCBIN_U8("graphics/battle_anims/unk_83E4874.bin"); static const union AnimCmd sAnim_RainDrop[] = -- cgit v1.2.3 From ea68ec3fd7359061eaa4ca0e2550ee9961a52449 Mon Sep 17 00:00:00 2001 From: hjk321 Date: Tue, 30 Mar 2021 23:20:48 -0500 Subject: Merge battle graphics into battle_terrain and remove un-included files The previous battle folder contained the used (and until recently undocumented) battle terrain graphics, while everything in the previous battle_terrain folder contained unused data (which is now at battle_terrain/unused, minus the files that never get included in the rom). --- graphics/battle/terrain_building.bin | Bin 4096 -> 0 bytes graphics/battle/terrain_building.pal | 51 --------- graphics/battle/terrain_building.png | Bin 706 -> 0 bytes graphics/battle/terrain_building_anim.bin | Bin 896 -> 0 bytes graphics/battle/terrain_building_anim.png | Bin 541 -> 0 bytes graphics/battle/terrain_cave.bin | Bin 4096 -> 0 bytes graphics/battle/terrain_cave.pal | 51 --------- graphics/battle/terrain_cave.png | Bin 901 -> 0 bytes graphics/battle/terrain_cave_anim.bin | Bin 896 -> 0 bytes graphics/battle/terrain_cave_anim.png | Bin 3877 -> 0 bytes graphics/battle/terrain_grass.bin | Bin 4096 -> 0 bytes graphics/battle/terrain_grass.pal | 51 --------- graphics/battle/terrain_grass.png | Bin 1213 -> 0 bytes graphics/battle/terrain_grass_anim.bin | Bin 896 -> 0 bytes graphics/battle/terrain_grass_anim.png | Bin 683 -> 0 bytes graphics/battle/terrain_indoor.bin | Bin 4096 -> 0 bytes graphics/battle/terrain_indoor.png | Bin 706 -> 0 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_longgrass.bin | Bin 4096 -> 0 bytes graphics/battle/terrain_longgrass.pal | 51 --------- graphics/battle/terrain_longgrass.png | Bin 1213 -> 0 bytes graphics/battle/terrain_longgrass_anim.bin | Bin 896 -> 0 bytes graphics/battle/terrain_longgrass_anim.png | Bin 986 -> 0 bytes graphics/battle/terrain_mountain.bin | Bin 4096 -> 0 bytes graphics/battle/terrain_mountain.pal | 51 --------- graphics/battle/terrain_mountain.png | Bin 750 -> 0 bytes graphics/battle/terrain_mountain_anim.bin | Bin 896 -> 0 bytes graphics/battle/terrain_mountain_anim.png | Bin 610 -> 0 bytes graphics/battle/terrain_pond.bin | Bin 4096 -> 0 bytes graphics/battle/terrain_pond.pal | 51 --------- graphics/battle/terrain_pond.png | Bin 739 -> 0 bytes graphics/battle/terrain_pond_anim.bin | Bin 896 -> 0 bytes graphics/battle/terrain_pond_anim.png | Bin 481 -> 0 bytes graphics/battle/terrain_sand.bin | Bin 4096 -> 0 bytes graphics/battle/terrain_sand.pal | 51 --------- graphics/battle/terrain_sand.png | Bin 829 -> 0 bytes graphics/battle/terrain_sand_anim.bin | Bin 896 -> 0 bytes graphics/battle/terrain_sand_anim.png | Bin 515 -> 0 bytes graphics/battle/terrain_underwater.bin | Bin 4096 -> 0 bytes graphics/battle/terrain_underwater.pal | 51 --------- graphics/battle/terrain_underwater.png | Bin 763 -> 0 bytes graphics/battle/terrain_underwater_anim.bin | Bin 896 -> 0 bytes graphics/battle/terrain_underwater_anim.png | Bin 363 -> 0 bytes graphics/battle/terrain_water.bin | Bin 4096 -> 0 bytes graphics/battle/terrain_water.pal | 51 --------- graphics/battle/terrain_water.png | Bin 959 -> 0 bytes graphics/battle/terrain_water_anim.bin | Bin 896 -> 0 bytes graphics/battle/terrain_water_anim.png | Bin 764 -> 0 bytes graphics/battle_terrain/building/anim_map.bin | Bin 2048 -> 0 bytes graphics/battle_terrain/building/anim_tiles.png | Bin 308 -> 0 bytes graphics/battle_terrain/building/map.bin | Bin 4096 -> 0 bytes graphics/battle_terrain/building/palette.pal | 51 --------- graphics/battle_terrain/building/palette2.pal | 51 --------- graphics/battle_terrain/building/palette3.pal | 51 --------- graphics/battle_terrain/building/tiles.png | Bin 709 -> 0 bytes graphics/battle_terrain/cave/anim_map.bin | Bin 2048 -> 0 bytes graphics/battle_terrain/cave/anim_tiles.png | Bin 1416 -> 0 bytes graphics/battle_terrain/cave/groudon.pal | 51 --------- graphics/battle_terrain/cave/map.bin | Bin 4096 -> 0 bytes graphics/battle_terrain/cave/palette.pal | 51 --------- graphics/battle_terrain/cave/tiles.png | Bin 864 -> 0 bytes graphics/battle_terrain/long_grass/anim_map.bin | Bin 2048 -> 0 bytes graphics/battle_terrain/long_grass/anim_tiles.png | Bin 1127 -> 0 bytes graphics/battle_terrain/long_grass/map.bin | Bin 4096 -> 0 bytes graphics/battle_terrain/long_grass/palette.pal | 51 --------- graphics/battle_terrain/long_grass/tiles.png | Bin 900 -> 0 bytes graphics/battle_terrain/plain/palette.pal | 51 --------- graphics/battle_terrain/pond_water/anim_map.bin | Bin 2048 -> 0 bytes graphics/battle_terrain/pond_water/anim_tiles.png | Bin 592 -> 0 bytes graphics/battle_terrain/pond_water/map.bin | Bin 4096 -> 0 bytes graphics/battle_terrain/pond_water/palette.pal | 51 --------- graphics/battle_terrain/pond_water/tiles.png | Bin 732 -> 0 bytes graphics/battle_terrain/rock/anim_map.bin | Bin 2048 -> 0 bytes graphics/battle_terrain/rock/anim_tiles.png | Bin 760 -> 0 bytes graphics/battle_terrain/rock/map.bin | Bin 4096 -> 0 bytes graphics/battle_terrain/rock/palette.pal | 51 --------- graphics/battle_terrain/rock/tiles.png | Bin 725 -> 0 bytes graphics/battle_terrain/sand/anim_map.bin | Bin 2048 -> 0 bytes graphics/battle_terrain/sand/anim_tiles.png | Bin 644 -> 0 bytes graphics/battle_terrain/sand/map.bin | Bin 4096 -> 0 bytes graphics/battle_terrain/sand/palette.pal | 51 --------- graphics/battle_terrain/sand/tiles.png | Bin 805 -> 0 bytes graphics/battle_terrain/sky/anim_map.bin | Bin 2048 -> 0 bytes graphics/battle_terrain/sky/anim_tiles.png | Bin 961 -> 0 bytes graphics/battle_terrain/sky/map.bin | Bin 4096 -> 0 bytes graphics/battle_terrain/sky/palette.pal | 51 --------- graphics/battle_terrain/sky/tiles.png | Bin 820 -> 0 bytes .../battle_terrain/stadium/battle_frontier.pal | 51 --------- graphics/battle_terrain/stadium/map.bin | Bin 4096 -> 0 bytes graphics/battle_terrain/stadium/palette1.pal | 51 --------- graphics/battle_terrain/stadium/palette2.pal | 51 --------- graphics/battle_terrain/stadium/palette3.pal | 51 --------- graphics/battle_terrain/stadium/palette4.pal | 51 --------- graphics/battle_terrain/stadium/palette5.pal | 51 --------- graphics/battle_terrain/stadium/palette6.pal | 51 --------- graphics/battle_terrain/stadium/palette7.pal | 51 --------- graphics/battle_terrain/stadium/tiles.png | Bin 712 -> 0 bytes graphics/battle_terrain/tall_grass/anim_map.bin | Bin 2048 -> 0 bytes graphics/battle_terrain/tall_grass/anim_tiles.png | Bin 793 -> 0 bytes graphics/battle_terrain/tall_grass/map.bin | Bin 4096 -> 0 bytes graphics/battle_terrain/tall_grass/palette.pal | 51 --------- graphics/battle_terrain/tall_grass/tiles.png | Bin 739 -> 0 bytes graphics/battle_terrain/terrain_building.bin | Bin 0 -> 4096 bytes graphics/battle_terrain/terrain_building.pal | 51 +++++++++ graphics/battle_terrain/terrain_building.png | Bin 0 -> 706 bytes graphics/battle_terrain/terrain_building_anim.bin | Bin 0 -> 896 bytes graphics/battle_terrain/terrain_building_anim.png | Bin 0 -> 541 bytes graphics/battle_terrain/terrain_cave.bin | Bin 0 -> 4096 bytes graphics/battle_terrain/terrain_cave.pal | 51 +++++++++ graphics/battle_terrain/terrain_cave.png | Bin 0 -> 901 bytes graphics/battle_terrain/terrain_cave_anim.bin | Bin 0 -> 896 bytes graphics/battle_terrain/terrain_cave_anim.png | Bin 0 -> 3877 bytes graphics/battle_terrain/terrain_grass.bin | Bin 0 -> 4096 bytes graphics/battle_terrain/terrain_grass.pal | 51 +++++++++ graphics/battle_terrain/terrain_grass.png | Bin 0 -> 1213 bytes graphics/battle_terrain/terrain_grass_anim.bin | Bin 0 -> 896 bytes graphics/battle_terrain/terrain_grass_anim.png | Bin 0 -> 683 bytes graphics/battle_terrain/terrain_indoor.bin | Bin 0 -> 4096 bytes graphics/battle_terrain/terrain_indoor.png | Bin 0 -> 706 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 0 -> 4096 bytes graphics/battle_terrain/terrain_longgrass.pal | 51 +++++++++ graphics/battle_terrain/terrain_longgrass.png | Bin 0 -> 1213 bytes graphics/battle_terrain/terrain_longgrass_anim.bin | Bin 0 -> 896 bytes graphics/battle_terrain/terrain_longgrass_anim.png | Bin 0 -> 986 bytes graphics/battle_terrain/terrain_mountain.bin | Bin 0 -> 4096 bytes graphics/battle_terrain/terrain_mountain.pal | 51 +++++++++ graphics/battle_terrain/terrain_mountain.png | Bin 0 -> 750 bytes graphics/battle_terrain/terrain_mountain_anim.bin | Bin 0 -> 896 bytes graphics/battle_terrain/terrain_mountain_anim.png | Bin 0 -> 610 bytes graphics/battle_terrain/terrain_pond.bin | Bin 0 -> 4096 bytes graphics/battle_terrain/terrain_pond.pal | 51 +++++++++ graphics/battle_terrain/terrain_pond.png | Bin 0 -> 739 bytes graphics/battle_terrain/terrain_pond_anim.bin | Bin 0 -> 896 bytes graphics/battle_terrain/terrain_pond_anim.png | Bin 0 -> 481 bytes graphics/battle_terrain/terrain_sand.bin | Bin 0 -> 4096 bytes graphics/battle_terrain/terrain_sand.pal | 51 +++++++++ graphics/battle_terrain/terrain_sand.png | Bin 0 -> 829 bytes graphics/battle_terrain/terrain_sand_anim.bin | Bin 0 -> 896 bytes graphics/battle_terrain/terrain_sand_anim.png | Bin 0 -> 515 bytes graphics/battle_terrain/terrain_underwater.bin | Bin 0 -> 4096 bytes graphics/battle_terrain/terrain_underwater.pal | 51 +++++++++ graphics/battle_terrain/terrain_underwater.png | Bin 0 -> 763 bytes .../battle_terrain/terrain_underwater_anim.bin | Bin 0 -> 896 bytes .../battle_terrain/terrain_underwater_anim.png | Bin 0 -> 363 bytes graphics/battle_terrain/terrain_water.bin | Bin 0 -> 4096 bytes graphics/battle_terrain/terrain_water.pal | 51 +++++++++ graphics/battle_terrain/terrain_water.png | Bin 0 -> 959 bytes graphics/battle_terrain/terrain_water_anim.bin | Bin 0 -> 896 bytes graphics/battle_terrain/terrain_water_anim.png | Bin 0 -> 764 bytes graphics/battle_terrain/underwater/anim_map.bin | Bin 2048 -> 0 bytes graphics/battle_terrain/underwater/anim_tiles.png | Bin 506 -> 0 bytes graphics/battle_terrain/underwater/map.bin | Bin 4096 -> 0 bytes graphics/battle_terrain/underwater/palette.pal | 51 --------- graphics/battle_terrain/underwater/tiles.png | Bin 773 -> 0 bytes .../battle_terrain/unused/building/anim_map.bin | Bin 0 -> 2048 bytes .../battle_terrain/unused/building/anim_tiles.png | Bin 0 -> 308 bytes graphics/battle_terrain/unused/building/map.bin | Bin 0 -> 4096 bytes .../battle_terrain/unused/building/palette.pal | 51 +++++++++ .../battle_terrain/unused/building/palette2.pal | 51 +++++++++ .../battle_terrain/unused/building/palette3.pal | 51 +++++++++ graphics/battle_terrain/unused/building/tiles.png | Bin 0 -> 709 bytes graphics/battle_terrain/unused/groudon.pal | 51 +++++++++ graphics/battle_terrain/unused/kyogre.pal | 51 +++++++++ graphics/battle_terrain/unused/plain.pal | 51 +++++++++ .../unused/stadium/battle_frontier.pal | 51 +++++++++ graphics/battle_terrain/unused/stadium/map.bin | Bin 0 -> 4096 bytes .../battle_terrain/unused/stadium/palette1.pal | 51 +++++++++ .../battle_terrain/unused/stadium/palette2.pal | 51 +++++++++ .../battle_terrain/unused/stadium/palette3.pal | 51 +++++++++ .../battle_terrain/unused/stadium/palette4.pal | 51 +++++++++ .../battle_terrain/unused/stadium/palette5.pal | 51 +++++++++ .../battle_terrain/unused/stadium/palette6.pal | 51 +++++++++ .../battle_terrain/unused/stadium/palette7.pal | 51 +++++++++ graphics/battle_terrain/unused/stadium/tiles.png | Bin 0 -> 712 bytes graphics/battle_terrain/water/anim_map.bin | Bin 2048 -> 0 bytes graphics/battle_terrain/water/anim_tiles.png | Bin 887 -> 0 bytes graphics/battle_terrain/water/kyogre.pal | 51 --------- graphics/battle_terrain/water/map.bin | Bin 4096 -> 0 bytes graphics/battle_terrain/water/palette.pal | 51 --------- graphics/battle_terrain/water/tiles.png | Bin 766 -> 0 bytes graphics_file_rules.mk | 30 +++--- src/battle_bg.c | 116 ++++++++++----------- src/data/graphics/battle_terrain.h | 30 ------ src/data/graphics/battle_terrain_unused.h | 32 ++++++ src/graphics.c | 2 +- 206 files changed, 1840 insertions(+), 2297 deletions(-) delete mode 100644 graphics/battle/terrain_building.bin delete mode 100644 graphics/battle/terrain_building.pal delete mode 100644 graphics/battle/terrain_building.png delete mode 100644 graphics/battle/terrain_building_anim.bin delete mode 100644 graphics/battle/terrain_building_anim.png delete mode 100644 graphics/battle/terrain_cave.bin delete mode 100644 graphics/battle/terrain_cave.pal delete mode 100644 graphics/battle/terrain_cave.png delete mode 100644 graphics/battle/terrain_cave_anim.bin delete mode 100644 graphics/battle/terrain_cave_anim.png delete mode 100644 graphics/battle/terrain_grass.bin delete mode 100644 graphics/battle/terrain_grass.pal delete mode 100644 graphics/battle/terrain_grass.png delete mode 100644 graphics/battle/terrain_grass_anim.bin delete mode 100644 graphics/battle/terrain_grass_anim.png delete mode 100644 graphics/battle/terrain_indoor.bin delete mode 100644 graphics/battle/terrain_indoor.png delete mode 100644 graphics/battle/terrain_indoor_1.pal delete mode 100644 graphics/battle/terrain_indoor_2.pal delete mode 100644 graphics/battle/terrain_indoor_agatha.pal delete mode 100644 graphics/battle/terrain_indoor_bruno.pal delete mode 100644 graphics/battle/terrain_indoor_champion.pal delete mode 100644 graphics/battle/terrain_indoor_gym.pal delete mode 100644 graphics/battle/terrain_indoor_lance.pal delete mode 100644 graphics/battle/terrain_indoor_leader.pal delete mode 100644 graphics/battle/terrain_indoor_link.pal delete mode 100644 graphics/battle/terrain_indoor_lorelei.pal delete mode 100644 graphics/battle/terrain_indoor_plain.pal delete mode 100644 graphics/battle/terrain_longgrass.bin delete mode 100644 graphics/battle/terrain_longgrass.pal delete mode 100644 graphics/battle/terrain_longgrass.png delete mode 100644 graphics/battle/terrain_longgrass_anim.bin delete mode 100644 graphics/battle/terrain_longgrass_anim.png delete mode 100644 graphics/battle/terrain_mountain.bin delete mode 100644 graphics/battle/terrain_mountain.pal delete mode 100644 graphics/battle/terrain_mountain.png delete mode 100644 graphics/battle/terrain_mountain_anim.bin delete mode 100644 graphics/battle/terrain_mountain_anim.png delete mode 100644 graphics/battle/terrain_pond.bin delete mode 100644 graphics/battle/terrain_pond.pal delete mode 100644 graphics/battle/terrain_pond.png delete mode 100644 graphics/battle/terrain_pond_anim.bin delete mode 100644 graphics/battle/terrain_pond_anim.png delete mode 100644 graphics/battle/terrain_sand.bin delete mode 100644 graphics/battle/terrain_sand.pal delete mode 100644 graphics/battle/terrain_sand.png delete mode 100644 graphics/battle/terrain_sand_anim.bin delete mode 100644 graphics/battle/terrain_sand_anim.png delete mode 100644 graphics/battle/terrain_underwater.bin delete mode 100644 graphics/battle/terrain_underwater.pal delete mode 100644 graphics/battle/terrain_underwater.png delete mode 100644 graphics/battle/terrain_underwater_anim.bin delete mode 100644 graphics/battle/terrain_underwater_anim.png delete mode 100644 graphics/battle/terrain_water.bin delete mode 100644 graphics/battle/terrain_water.pal delete mode 100644 graphics/battle/terrain_water.png delete mode 100644 graphics/battle/terrain_water_anim.bin delete mode 100644 graphics/battle/terrain_water_anim.png delete mode 100644 graphics/battle_terrain/building/anim_map.bin delete mode 100644 graphics/battle_terrain/building/anim_tiles.png delete mode 100644 graphics/battle_terrain/building/map.bin delete mode 100644 graphics/battle_terrain/building/palette.pal delete mode 100644 graphics/battle_terrain/building/palette2.pal delete mode 100644 graphics/battle_terrain/building/palette3.pal delete mode 100644 graphics/battle_terrain/building/tiles.png delete mode 100644 graphics/battle_terrain/cave/anim_map.bin delete mode 100644 graphics/battle_terrain/cave/anim_tiles.png delete mode 100644 graphics/battle_terrain/cave/groudon.pal delete mode 100644 graphics/battle_terrain/cave/map.bin delete mode 100644 graphics/battle_terrain/cave/palette.pal delete mode 100644 graphics/battle_terrain/cave/tiles.png delete mode 100644 graphics/battle_terrain/long_grass/anim_map.bin delete mode 100644 graphics/battle_terrain/long_grass/anim_tiles.png delete mode 100644 graphics/battle_terrain/long_grass/map.bin delete mode 100644 graphics/battle_terrain/long_grass/palette.pal delete mode 100644 graphics/battle_terrain/long_grass/tiles.png delete mode 100644 graphics/battle_terrain/plain/palette.pal delete mode 100644 graphics/battle_terrain/pond_water/anim_map.bin delete mode 100644 graphics/battle_terrain/pond_water/anim_tiles.png delete mode 100644 graphics/battle_terrain/pond_water/map.bin delete mode 100644 graphics/battle_terrain/pond_water/palette.pal delete mode 100644 graphics/battle_terrain/pond_water/tiles.png delete mode 100644 graphics/battle_terrain/rock/anim_map.bin delete mode 100644 graphics/battle_terrain/rock/anim_tiles.png delete mode 100644 graphics/battle_terrain/rock/map.bin delete mode 100644 graphics/battle_terrain/rock/palette.pal delete mode 100644 graphics/battle_terrain/rock/tiles.png delete mode 100644 graphics/battle_terrain/sand/anim_map.bin delete mode 100644 graphics/battle_terrain/sand/anim_tiles.png delete mode 100644 graphics/battle_terrain/sand/map.bin delete mode 100644 graphics/battle_terrain/sand/palette.pal delete mode 100644 graphics/battle_terrain/sand/tiles.png delete mode 100644 graphics/battle_terrain/sky/anim_map.bin delete mode 100644 graphics/battle_terrain/sky/anim_tiles.png delete mode 100644 graphics/battle_terrain/sky/map.bin delete mode 100644 graphics/battle_terrain/sky/palette.pal delete mode 100644 graphics/battle_terrain/sky/tiles.png delete mode 100644 graphics/battle_terrain/stadium/battle_frontier.pal delete mode 100644 graphics/battle_terrain/stadium/map.bin delete mode 100644 graphics/battle_terrain/stadium/palette1.pal delete mode 100644 graphics/battle_terrain/stadium/palette2.pal delete mode 100644 graphics/battle_terrain/stadium/palette3.pal delete mode 100644 graphics/battle_terrain/stadium/palette4.pal delete mode 100644 graphics/battle_terrain/stadium/palette5.pal delete mode 100644 graphics/battle_terrain/stadium/palette6.pal delete mode 100644 graphics/battle_terrain/stadium/palette7.pal delete mode 100644 graphics/battle_terrain/stadium/tiles.png delete mode 100644 graphics/battle_terrain/tall_grass/anim_map.bin delete mode 100644 graphics/battle_terrain/tall_grass/anim_tiles.png delete mode 100644 graphics/battle_terrain/tall_grass/map.bin delete mode 100644 graphics/battle_terrain/tall_grass/palette.pal delete mode 100644 graphics/battle_terrain/tall_grass/tiles.png create mode 100644 graphics/battle_terrain/terrain_building.bin create mode 100644 graphics/battle_terrain/terrain_building.pal create mode 100644 graphics/battle_terrain/terrain_building.png create mode 100644 graphics/battle_terrain/terrain_building_anim.bin create mode 100644 graphics/battle_terrain/terrain_building_anim.png create mode 100644 graphics/battle_terrain/terrain_cave.bin create mode 100644 graphics/battle_terrain/terrain_cave.pal create mode 100644 graphics/battle_terrain/terrain_cave.png create mode 100644 graphics/battle_terrain/terrain_cave_anim.bin create mode 100644 graphics/battle_terrain/terrain_cave_anim.png create mode 100644 graphics/battle_terrain/terrain_grass.bin create mode 100644 graphics/battle_terrain/terrain_grass.pal create mode 100644 graphics/battle_terrain/terrain_grass.png create mode 100644 graphics/battle_terrain/terrain_grass_anim.bin create mode 100644 graphics/battle_terrain/terrain_grass_anim.png create mode 100644 graphics/battle_terrain/terrain_indoor.bin create mode 100644 graphics/battle_terrain/terrain_indoor.png create mode 100644 graphics/battle_terrain/terrain_indoor_1.pal create mode 100644 graphics/battle_terrain/terrain_indoor_2.pal create mode 100644 graphics/battle_terrain/terrain_indoor_agatha.pal create mode 100644 graphics/battle_terrain/terrain_indoor_bruno.pal create mode 100644 graphics/battle_terrain/terrain_indoor_champion.pal create mode 100644 graphics/battle_terrain/terrain_indoor_gym.pal create mode 100644 graphics/battle_terrain/terrain_indoor_lance.pal create mode 100644 graphics/battle_terrain/terrain_indoor_leader.pal create mode 100644 graphics/battle_terrain/terrain_indoor_link.pal create mode 100644 graphics/battle_terrain/terrain_indoor_lorelei.pal create mode 100644 graphics/battle_terrain/terrain_indoor_plain.pal create mode 100644 graphics/battle_terrain/terrain_longgrass.bin create mode 100644 graphics/battle_terrain/terrain_longgrass.pal create mode 100644 graphics/battle_terrain/terrain_longgrass.png create mode 100644 graphics/battle_terrain/terrain_longgrass_anim.bin create mode 100644 graphics/battle_terrain/terrain_longgrass_anim.png create mode 100644 graphics/battle_terrain/terrain_mountain.bin create mode 100644 graphics/battle_terrain/terrain_mountain.pal create mode 100644 graphics/battle_terrain/terrain_mountain.png create mode 100644 graphics/battle_terrain/terrain_mountain_anim.bin create mode 100644 graphics/battle_terrain/terrain_mountain_anim.png create mode 100644 graphics/battle_terrain/terrain_pond.bin create mode 100644 graphics/battle_terrain/terrain_pond.pal create mode 100644 graphics/battle_terrain/terrain_pond.png create mode 100644 graphics/battle_terrain/terrain_pond_anim.bin create mode 100644 graphics/battle_terrain/terrain_pond_anim.png create mode 100644 graphics/battle_terrain/terrain_sand.bin create mode 100644 graphics/battle_terrain/terrain_sand.pal create mode 100644 graphics/battle_terrain/terrain_sand.png create mode 100644 graphics/battle_terrain/terrain_sand_anim.bin create mode 100644 graphics/battle_terrain/terrain_sand_anim.png create mode 100644 graphics/battle_terrain/terrain_underwater.bin create mode 100644 graphics/battle_terrain/terrain_underwater.pal create mode 100644 graphics/battle_terrain/terrain_underwater.png create mode 100644 graphics/battle_terrain/terrain_underwater_anim.bin create mode 100644 graphics/battle_terrain/terrain_underwater_anim.png create mode 100644 graphics/battle_terrain/terrain_water.bin create mode 100644 graphics/battle_terrain/terrain_water.pal create mode 100644 graphics/battle_terrain/terrain_water.png create mode 100644 graphics/battle_terrain/terrain_water_anim.bin create mode 100644 graphics/battle_terrain/terrain_water_anim.png delete mode 100644 graphics/battle_terrain/underwater/anim_map.bin delete mode 100644 graphics/battle_terrain/underwater/anim_tiles.png delete mode 100644 graphics/battle_terrain/underwater/map.bin delete mode 100644 graphics/battle_terrain/underwater/palette.pal delete mode 100644 graphics/battle_terrain/underwater/tiles.png create mode 100644 graphics/battle_terrain/unused/building/anim_map.bin create mode 100644 graphics/battle_terrain/unused/building/anim_tiles.png create mode 100644 graphics/battle_terrain/unused/building/map.bin create mode 100644 graphics/battle_terrain/unused/building/palette.pal create mode 100644 graphics/battle_terrain/unused/building/palette2.pal create mode 100644 graphics/battle_terrain/unused/building/palette3.pal create mode 100644 graphics/battle_terrain/unused/building/tiles.png create mode 100644 graphics/battle_terrain/unused/groudon.pal create mode 100644 graphics/battle_terrain/unused/kyogre.pal create mode 100644 graphics/battle_terrain/unused/plain.pal create mode 100644 graphics/battle_terrain/unused/stadium/battle_frontier.pal create mode 100644 graphics/battle_terrain/unused/stadium/map.bin create mode 100644 graphics/battle_terrain/unused/stadium/palette1.pal create mode 100644 graphics/battle_terrain/unused/stadium/palette2.pal create mode 100644 graphics/battle_terrain/unused/stadium/palette3.pal create mode 100644 graphics/battle_terrain/unused/stadium/palette4.pal create mode 100644 graphics/battle_terrain/unused/stadium/palette5.pal create mode 100644 graphics/battle_terrain/unused/stadium/palette6.pal create mode 100644 graphics/battle_terrain/unused/stadium/palette7.pal create mode 100644 graphics/battle_terrain/unused/stadium/tiles.png delete mode 100644 graphics/battle_terrain/water/anim_map.bin delete mode 100644 graphics/battle_terrain/water/anim_tiles.png delete mode 100644 graphics/battle_terrain/water/kyogre.pal delete mode 100644 graphics/battle_terrain/water/map.bin delete mode 100644 graphics/battle_terrain/water/palette.pal delete mode 100644 graphics/battle_terrain/water/tiles.png delete mode 100644 src/data/graphics/battle_terrain.h create mode 100644 src/data/graphics/battle_terrain_unused.h diff --git a/graphics/battle/terrain_building.bin b/graphics/battle/terrain_building.bin deleted file mode 100644 index 0710427da..000000000 Binary files a/graphics/battle/terrain_building.bin and /dev/null differ diff --git a/graphics/battle/terrain_building.pal b/graphics/battle/terrain_building.pal deleted file mode 100644 index 16421567f..000000000 --- a/graphics/battle/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_building.png b/graphics/battle/terrain_building.png deleted file mode 100644 index 3b060be4e..000000000 Binary files a/graphics/battle/terrain_building.png and /dev/null differ diff --git a/graphics/battle/terrain_building_anim.bin b/graphics/battle/terrain_building_anim.bin deleted file mode 100644 index aba49c6f9..000000000 Binary files a/graphics/battle/terrain_building_anim.bin and /dev/null differ diff --git a/graphics/battle/terrain_building_anim.png b/graphics/battle/terrain_building_anim.png deleted file mode 100644 index 443cd98ab..000000000 Binary files a/graphics/battle/terrain_building_anim.png and /dev/null differ diff --git a/graphics/battle/terrain_cave.bin b/graphics/battle/terrain_cave.bin deleted file mode 100644 index 255f2953d..000000000 Binary files a/graphics/battle/terrain_cave.bin and /dev/null differ diff --git a/graphics/battle/terrain_cave.pal b/graphics/battle/terrain_cave.pal deleted file mode 100644 index f17a7bf9d..000000000 --- a/graphics/battle/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_cave.png b/graphics/battle/terrain_cave.png deleted file mode 100644 index e2a18ae57..000000000 Binary files a/graphics/battle/terrain_cave.png and /dev/null differ diff --git a/graphics/battle/terrain_cave_anim.bin b/graphics/battle/terrain_cave_anim.bin deleted file mode 100644 index ad7724c67..000000000 Binary files a/graphics/battle/terrain_cave_anim.bin and /dev/null differ diff --git a/graphics/battle/terrain_cave_anim.png b/graphics/battle/terrain_cave_anim.png deleted file mode 100644 index 84f13f8f0..000000000 Binary files a/graphics/battle/terrain_cave_anim.png and /dev/null differ diff --git a/graphics/battle/terrain_grass.bin b/graphics/battle/terrain_grass.bin deleted file mode 100644 index e0da76dc2..000000000 Binary files a/graphics/battle/terrain_grass.bin and /dev/null differ diff --git a/graphics/battle/terrain_grass.pal b/graphics/battle/terrain_grass.pal deleted file mode 100644 index cc00b3dc2..000000000 --- a/graphics/battle/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_grass.png b/graphics/battle/terrain_grass.png deleted file mode 100644 index 645796cb1..000000000 Binary files a/graphics/battle/terrain_grass.png and /dev/null differ diff --git a/graphics/battle/terrain_grass_anim.bin b/graphics/battle/terrain_grass_anim.bin deleted file mode 100644 index 03e4194fc..000000000 Binary files a/graphics/battle/terrain_grass_anim.bin and /dev/null differ diff --git a/graphics/battle/terrain_grass_anim.png b/graphics/battle/terrain_grass_anim.png deleted file mode 100644 index f2f2c1bb1..000000000 Binary files a/graphics/battle/terrain_grass_anim.png and /dev/null differ diff --git a/graphics/battle/terrain_indoor.bin b/graphics/battle/terrain_indoor.bin deleted file mode 100644 index 0710427da..000000000 Binary files a/graphics/battle/terrain_indoor.bin and /dev/null differ diff --git a/graphics/battle/terrain_indoor.png b/graphics/battle/terrain_indoor.png deleted file mode 100644 index 1cbb7c63b..000000000 Binary files a/graphics/battle/terrain_indoor.png and /dev/null differ diff --git a/graphics/battle/terrain_indoor_1.pal b/graphics/battle/terrain_indoor_1.pal deleted file mode 100644 index 597647872..000000000 --- a/graphics/battle/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_indoor_2.pal b/graphics/battle/terrain_indoor_2.pal deleted file mode 100644 index a1bc6b60c..000000000 --- a/graphics/battle/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_indoor_agatha.pal b/graphics/battle/terrain_indoor_agatha.pal deleted file mode 100644 index 8ea1eeae7..000000000 --- a/graphics/battle/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_indoor_bruno.pal b/graphics/battle/terrain_indoor_bruno.pal deleted file mode 100644 index 21196b3e8..000000000 --- a/graphics/battle/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_indoor_champion.pal b/graphics/battle/terrain_indoor_champion.pal deleted file mode 100644 index 9ce470c9f..000000000 --- a/graphics/battle/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_indoor_gym.pal b/graphics/battle/terrain_indoor_gym.pal deleted file mode 100644 index 187054476..000000000 --- a/graphics/battle/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_indoor_lance.pal b/graphics/battle/terrain_indoor_lance.pal deleted file mode 100644 index c5fb745cf..000000000 --- a/graphics/battle/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_indoor_leader.pal b/graphics/battle/terrain_indoor_leader.pal deleted file mode 100644 index 581b6d596..000000000 --- a/graphics/battle/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_indoor_link.pal b/graphics/battle/terrain_indoor_link.pal deleted file mode 100644 index baa0fdf4f..000000000 --- a/graphics/battle/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_indoor_lorelei.pal b/graphics/battle/terrain_indoor_lorelei.pal deleted file mode 100644 index e63bad165..000000000 --- a/graphics/battle/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_indoor_plain.pal b/graphics/battle/terrain_indoor_plain.pal deleted file mode 100644 index b47dc0a8d..000000000 --- a/graphics/battle/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_longgrass.bin b/graphics/battle/terrain_longgrass.bin deleted file mode 100644 index 2b2634a14..000000000 Binary files a/graphics/battle/terrain_longgrass.bin and /dev/null differ diff --git a/graphics/battle/terrain_longgrass.pal b/graphics/battle/terrain_longgrass.pal deleted file mode 100644 index c390b8c44..000000000 --- a/graphics/battle/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_longgrass.png b/graphics/battle/terrain_longgrass.png deleted file mode 100644 index 0d09d739c..000000000 Binary files a/graphics/battle/terrain_longgrass.png and /dev/null differ diff --git a/graphics/battle/terrain_longgrass_anim.bin b/graphics/battle/terrain_longgrass_anim.bin deleted file mode 100644 index 5cb0de868..000000000 Binary files a/graphics/battle/terrain_longgrass_anim.bin and /dev/null differ diff --git a/graphics/battle/terrain_longgrass_anim.png b/graphics/battle/terrain_longgrass_anim.png deleted file mode 100644 index c825dd7d2..000000000 Binary files a/graphics/battle/terrain_longgrass_anim.png and /dev/null differ diff --git a/graphics/battle/terrain_mountain.bin b/graphics/battle/terrain_mountain.bin deleted file mode 100644 index 16600f5f8..000000000 Binary files a/graphics/battle/terrain_mountain.bin and /dev/null differ diff --git a/graphics/battle/terrain_mountain.pal b/graphics/battle/terrain_mountain.pal deleted file mode 100644 index bfe75be65..000000000 --- a/graphics/battle/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_mountain.png b/graphics/battle/terrain_mountain.png deleted file mode 100644 index 9889a6b62..000000000 Binary files a/graphics/battle/terrain_mountain.png and /dev/null differ diff --git a/graphics/battle/terrain_mountain_anim.bin b/graphics/battle/terrain_mountain_anim.bin deleted file mode 100644 index 55c5730c0..000000000 Binary files a/graphics/battle/terrain_mountain_anim.bin and /dev/null differ diff --git a/graphics/battle/terrain_mountain_anim.png b/graphics/battle/terrain_mountain_anim.png deleted file mode 100644 index ab90aaddc..000000000 Binary files a/graphics/battle/terrain_mountain_anim.png and /dev/null differ diff --git a/graphics/battle/terrain_pond.bin b/graphics/battle/terrain_pond.bin deleted file mode 100644 index d4c3dedcb..000000000 Binary files a/graphics/battle/terrain_pond.bin and /dev/null differ diff --git a/graphics/battle/terrain_pond.pal b/graphics/battle/terrain_pond.pal deleted file mode 100644 index 041560cf4..000000000 --- a/graphics/battle/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_pond.png b/graphics/battle/terrain_pond.png deleted file mode 100644 index 161498b2a..000000000 Binary files a/graphics/battle/terrain_pond.png and /dev/null differ diff --git a/graphics/battle/terrain_pond_anim.bin b/graphics/battle/terrain_pond_anim.bin deleted file mode 100644 index e012f647e..000000000 Binary files a/graphics/battle/terrain_pond_anim.bin and /dev/null differ diff --git a/graphics/battle/terrain_pond_anim.png b/graphics/battle/terrain_pond_anim.png deleted file mode 100644 index e0a7025e7..000000000 Binary files a/graphics/battle/terrain_pond_anim.png and /dev/null differ diff --git a/graphics/battle/terrain_sand.bin b/graphics/battle/terrain_sand.bin deleted file mode 100644 index 365e1474f..000000000 Binary files a/graphics/battle/terrain_sand.bin and /dev/null differ diff --git a/graphics/battle/terrain_sand.pal b/graphics/battle/terrain_sand.pal deleted file mode 100644 index dafc3eb7f..000000000 --- a/graphics/battle/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_sand.png b/graphics/battle/terrain_sand.png deleted file mode 100644 index e802b34f2..000000000 Binary files a/graphics/battle/terrain_sand.png and /dev/null differ diff --git a/graphics/battle/terrain_sand_anim.bin b/graphics/battle/terrain_sand_anim.bin deleted file mode 100644 index e4afe99ae..000000000 Binary files a/graphics/battle/terrain_sand_anim.bin and /dev/null differ diff --git a/graphics/battle/terrain_sand_anim.png b/graphics/battle/terrain_sand_anim.png deleted file mode 100644 index 092b8b42b..000000000 Binary files a/graphics/battle/terrain_sand_anim.png and /dev/null differ diff --git a/graphics/battle/terrain_underwater.bin b/graphics/battle/terrain_underwater.bin deleted file mode 100644 index 29843f17d..000000000 Binary files a/graphics/battle/terrain_underwater.bin and /dev/null differ diff --git a/graphics/battle/terrain_underwater.pal b/graphics/battle/terrain_underwater.pal deleted file mode 100644 index 5fa95cf21..000000000 --- a/graphics/battle/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_underwater.png b/graphics/battle/terrain_underwater.png deleted file mode 100644 index 19e115348..000000000 Binary files a/graphics/battle/terrain_underwater.png and /dev/null differ diff --git a/graphics/battle/terrain_underwater_anim.bin b/graphics/battle/terrain_underwater_anim.bin deleted file mode 100644 index 9029c7c9d..000000000 Binary files a/graphics/battle/terrain_underwater_anim.bin and /dev/null differ diff --git a/graphics/battle/terrain_underwater_anim.png b/graphics/battle/terrain_underwater_anim.png deleted file mode 100644 index f41eedfb8..000000000 Binary files a/graphics/battle/terrain_underwater_anim.png and /dev/null differ diff --git a/graphics/battle/terrain_water.bin b/graphics/battle/terrain_water.bin deleted file mode 100644 index 0ee05129a..000000000 Binary files a/graphics/battle/terrain_water.bin and /dev/null differ diff --git a/graphics/battle/terrain_water.pal b/graphics/battle/terrain_water.pal deleted file mode 100644 index d31dce658..000000000 --- a/graphics/battle/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_water.png b/graphics/battle/terrain_water.png deleted file mode 100644 index 8953e7940..000000000 Binary files a/graphics/battle/terrain_water.png and /dev/null differ diff --git a/graphics/battle/terrain_water_anim.bin b/graphics/battle/terrain_water_anim.bin deleted file mode 100644 index b6661cd3c..000000000 Binary files a/graphics/battle/terrain_water_anim.bin and /dev/null differ diff --git a/graphics/battle/terrain_water_anim.png b/graphics/battle/terrain_water_anim.png deleted file mode 100644 index 1545d85e7..000000000 Binary files a/graphics/battle/terrain_water_anim.png and /dev/null differ diff --git a/graphics/battle_terrain/building/anim_map.bin b/graphics/battle_terrain/building/anim_map.bin deleted file mode 100644 index 432e41c2f..000000000 Binary files a/graphics/battle_terrain/building/anim_map.bin and /dev/null differ diff --git a/graphics/battle_terrain/building/anim_tiles.png b/graphics/battle_terrain/building/anim_tiles.png deleted file mode 100644 index a627523d8..000000000 Binary files a/graphics/battle_terrain/building/anim_tiles.png and /dev/null differ diff --git a/graphics/battle_terrain/building/map.bin b/graphics/battle_terrain/building/map.bin deleted file mode 100644 index d7bee6035..000000000 Binary files a/graphics/battle_terrain/building/map.bin and /dev/null differ diff --git a/graphics/battle_terrain/building/palette.pal b/graphics/battle_terrain/building/palette.pal deleted file mode 100644 index 219cef565..000000000 --- a/graphics/battle_terrain/building/palette.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -0 0 0 -255 255 255 -222 197 164 -238 222 180 -238 230 205 -230 205 164 -246 238 230 -222 213 180 -230 213 172 -0 0 0 -0 0 0 -246 246 156 -246 246 180 -246 246 205 -246 246 230 -246 246 246 -0 0 0 -255 255 255 -222 197 164 -238 222 180 -238 230 205 -230 205 164 -246 238 230 -222 213 180 -246 246 205 -0 0 0 -0 0 0 -246 246 156 -246 246 180 -246 246 205 -246 246 230 -246 246 246 -0 0 0 -246 205 139 -255 238 164 -246 222 156 -255 238 172 -255 246 180 -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/palette2.pal b/graphics/battle_terrain/building/palette2.pal deleted file mode 100644 index 3ca2e0b0c..000000000 --- a/graphics/battle_terrain/building/palette2.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -0 0 0 -255 255 255 -205 189 148 -222 213 172 -238 230 197 -205 197 156 -246 238 222 -213 205 164 -222 213 156 -0 0 0 -0 0 0 -213 189 148 -230 213 180 -238 230 213 -246 238 230 -246 246 246 -0 0 0 -255 255 255 -205 189 148 -222 213 172 -238 230 197 -205 197 156 -246 238 222 -213 205 164 -222 213 156 -0 0 0 -0 0 0 -213 189 148 -230 213 180 -238 230 213 -246 238 230 -246 246 246 -0 0 0 -164 197 246 -205 246 255 -180 222 255 -189 230 255 -197 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/building/palette3.pal b/graphics/battle_terrain/building/palette3.pal deleted file mode 100644 index cebf5e687..000000000 --- a/graphics/battle_terrain/building/palette3.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -0 0 0 -255 255 255 -205 189 148 -222 213 172 -238 230 197 -205 197 156 -246 238 222 -213 205 164 -222 213 156 -0 0 0 -0 0 0 -213 189 148 -230 213 180 -238 230 213 -246 238 230 -246 246 246 -0 0 0 -255 255 255 -205 189 148 -222 213 172 -238 230 197 -205 197 156 -246 238 222 -213 205 164 -222 213 156 -0 0 0 -0 0 0 -213 189 148 -230 213 180 -238 230 213 -246 238 230 -246 246 246 -0 0 0 -255 222 65 -255 255 180 -255 238 74 -255 246 115 -255 255 148 -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/tiles.png b/graphics/battle_terrain/building/tiles.png deleted file mode 100644 index 9a031c297..000000000 Binary files a/graphics/battle_terrain/building/tiles.png and /dev/null differ diff --git a/graphics/battle_terrain/cave/anim_map.bin b/graphics/battle_terrain/cave/anim_map.bin deleted file mode 100644 index 0ab486890..000000000 Binary files a/graphics/battle_terrain/cave/anim_map.bin and /dev/null differ diff --git a/graphics/battle_terrain/cave/anim_tiles.png b/graphics/battle_terrain/cave/anim_tiles.png deleted file mode 100644 index 464a2058b..000000000 Binary files a/graphics/battle_terrain/cave/anim_tiles.png and /dev/null differ diff --git a/graphics/battle_terrain/cave/groudon.pal b/graphics/battle_terrain/cave/groudon.pal deleted file mode 100644 index 73021c957..000000000 --- a/graphics/battle_terrain/cave/groudon.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -0 0 0 -246 246 189 -222 213 106 -180 156 106 -197 172 123 -205 189 115 -213 197 148 -197 172 106 -230 222 172 -255 189 49 -238 230 123 -213 115 32 -222 172 106 -230 197 139 -230 213 156 -238 230 180 -0 0 0 -246 246 189 -222 213 106 -180 156 106 -197 172 123 -205 189 115 -213 197 148 -197 172 106 -230 222 172 -255 189 49 -238 230 123 -82 106 172 -148 156 164 -197 189 164 -230 213 180 -238 230 180 -0 0 0 -106 74 65 -148 115 82 -180 139 90 -213 180 131 -230 213 156 -0 0 0 -205 148 74 -230 156 57 -255 172 49 -255 189 49 -205 148 74 -205 148 74 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/battle_terrain/cave/map.bin b/graphics/battle_terrain/cave/map.bin deleted file mode 100644 index 61f358f53..000000000 Binary files a/graphics/battle_terrain/cave/map.bin and /dev/null differ diff --git a/graphics/battle_terrain/cave/palette.pal b/graphics/battle_terrain/cave/palette.pal deleted file mode 100644 index 64894d62c..000000000 --- a/graphics/battle_terrain/cave/palette.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -0 0 0 -197 180 131 -205 197 90 -164 139 90 -180 156 106 -189 172 98 -189 164 115 -180 156 90 -197 164 115 -189 172 98 -222 213 106 -172 139 82 -180 148 98 -189 156 106 -197 164 106 -197 172 115 -0 0 0 -197 180 131 -205 197 90 -164 139 90 -180 156 106 -189 172 98 -189 164 115 -180 156 90 -197 164 115 -189 172 98 -222 213 106 -172 139 82 -180 148 98 -189 156 106 -197 164 106 -197 172 115 -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/tiles.png b/graphics/battle_terrain/cave/tiles.png deleted file mode 100644 index 27386731f..000000000 Binary files a/graphics/battle_terrain/cave/tiles.png and /dev/null differ diff --git a/graphics/battle_terrain/long_grass/anim_map.bin b/graphics/battle_terrain/long_grass/anim_map.bin deleted file mode 100644 index bd86cce6c..000000000 Binary files a/graphics/battle_terrain/long_grass/anim_map.bin and /dev/null differ diff --git a/graphics/battle_terrain/long_grass/anim_tiles.png b/graphics/battle_terrain/long_grass/anim_tiles.png deleted file mode 100644 index e2f1bb2c1..000000000 Binary files a/graphics/battle_terrain/long_grass/anim_tiles.png and /dev/null differ diff --git a/graphics/battle_terrain/long_grass/map.bin b/graphics/battle_terrain/long_grass/map.bin deleted file mode 100644 index 61f358f53..000000000 Binary files a/graphics/battle_terrain/long_grass/map.bin and /dev/null differ diff --git a/graphics/battle_terrain/long_grass/palette.pal b/graphics/battle_terrain/long_grass/palette.pal deleted file mode 100644 index 645c3d0e6..000000000 --- a/graphics/battle_terrain/long_grass/palette.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -0 0 0 -180 238 180 -74 172 98 -115 213 131 -131 230 156 -98 189 131 -156 230 164 -115 197 148 -172 230 180 -0 0 0 -0 0 0 -139 205 90 -148 205 106 -156 222 131 -164 230 156 -172 230 180 -0 0 0 -180 238 180 -74 172 98 -115 213 131 -131 230 156 -98 189 131 -156 230 164 -115 197 148 -172 230 180 -0 0 0 -0 0 0 -139 205 90 -148 205 106 -156 213 131 -164 222 156 -172 230 180 -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/long_grass/tiles.png b/graphics/battle_terrain/long_grass/tiles.png deleted file mode 100644 index 8676f2f37..000000000 Binary files a/graphics/battle_terrain/long_grass/tiles.png and /dev/null differ diff --git a/graphics/battle_terrain/plain/palette.pal b/graphics/battle_terrain/plain/palette.pal deleted file mode 100644 index 2377b7729..000000000 --- a/graphics/battle_terrain/plain/palette.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -0 0 0 -238 255 230 -156 230 156 -230 230 148 -230 238 164 -189 230 148 -230 246 180 -205 230 172 -172 238 172 -0 0 0 -0 0 0 -164 222 246 -180 230 230 -197 238 222 -213 246 213 -230 255 205 -0 0 0 -238 255 230 -156 230 156 -230 230 148 -230 238 164 -189 230 148 -230 246 180 -205 230 172 -172 238 172 -0 0 0 -0 0 0 -164 222 246 -180 230 230 -197 238 222 -213 246 213 -230 255 205 -0 0 0 -74 189 65 -172 230 172 -106 205 90 -131 213 115 -156 213 148 -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/pond_water/anim_map.bin b/graphics/battle_terrain/pond_water/anim_map.bin deleted file mode 100644 index 00aee5135..000000000 Binary files a/graphics/battle_terrain/pond_water/anim_map.bin and /dev/null differ diff --git a/graphics/battle_terrain/pond_water/anim_tiles.png b/graphics/battle_terrain/pond_water/anim_tiles.png deleted file mode 100644 index 08568455f..000000000 Binary files a/graphics/battle_terrain/pond_water/anim_tiles.png and /dev/null differ diff --git a/graphics/battle_terrain/pond_water/map.bin b/graphics/battle_terrain/pond_water/map.bin deleted file mode 100644 index 61f358f53..000000000 Binary files a/graphics/battle_terrain/pond_water/map.bin and /dev/null differ diff --git a/graphics/battle_terrain/pond_water/palette.pal b/graphics/battle_terrain/pond_water/palette.pal deleted file mode 100644 index b0f74a08f..000000000 --- a/graphics/battle_terrain/pond_water/palette.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -0 0 0 -255 255 255 -98 164 230 -164 246 98 -197 255 139 -115 205 180 -205 255 197 -148 222 148 -230 255 222 -139 213 255 -0 0 0 -222 230 230 -230 230 238 -230 238 238 -238 246 246 -246 246 255 -0 0 0 -255 255 255 -98 164 230 -164 246 98 -197 255 139 -115 205 180 -205 255 197 -148 222 148 -230 255 222 -139 213 255 -0 0 0 -222 230 230 -230 230 238 -230 238 238 -238 246 246 -246 246 255 -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_water/tiles.png b/graphics/battle_terrain/pond_water/tiles.png deleted file mode 100644 index 81fac5393..000000000 Binary files a/graphics/battle_terrain/pond_water/tiles.png and /dev/null differ diff --git a/graphics/battle_terrain/rock/anim_map.bin b/graphics/battle_terrain/rock/anim_map.bin deleted file mode 100644 index d2a2776bd..000000000 Binary files a/graphics/battle_terrain/rock/anim_map.bin and /dev/null differ diff --git a/graphics/battle_terrain/rock/anim_tiles.png b/graphics/battle_terrain/rock/anim_tiles.png deleted file mode 100644 index 41be70296..000000000 Binary files a/graphics/battle_terrain/rock/anim_tiles.png and /dev/null differ diff --git a/graphics/battle_terrain/rock/map.bin b/graphics/battle_terrain/rock/map.bin deleted file mode 100644 index 61f358f53..000000000 Binary files a/graphics/battle_terrain/rock/map.bin and /dev/null differ diff --git a/graphics/battle_terrain/rock/palette.pal b/graphics/battle_terrain/rock/palette.pal deleted file mode 100644 index 1702e3810..000000000 --- a/graphics/battle_terrain/rock/palette.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -0 0 0 -255 255 255 -189 172 139 -213 213 172 -222 222 213 -205 189 156 -230 230 213 -213 197 172 -238 238 230 -172 156 131 -0 0 0 -222 230 230 -230 230 238 -230 238 238 -238 246 246 -246 246 255 -0 0 0 -255 255 255 -189 172 139 -213 213 172 -222 222 213 -205 189 156 -230 230 213 -213 197 172 -238 238 230 -172 156 131 -0 0 0 -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/rock/tiles.png b/graphics/battle_terrain/rock/tiles.png deleted file mode 100644 index efb139eb6..000000000 Binary files a/graphics/battle_terrain/rock/tiles.png and /dev/null differ diff --git a/graphics/battle_terrain/sand/anim_map.bin b/graphics/battle_terrain/sand/anim_map.bin deleted file mode 100644 index 83c6ba8f1..000000000 Binary files a/graphics/battle_terrain/sand/anim_map.bin and /dev/null differ diff --git a/graphics/battle_terrain/sand/anim_tiles.png b/graphics/battle_terrain/sand/anim_tiles.png deleted file mode 100644 index 79c774acf..000000000 Binary files a/graphics/battle_terrain/sand/anim_tiles.png and /dev/null differ diff --git a/graphics/battle_terrain/sand/map.bin b/graphics/battle_terrain/sand/map.bin deleted file mode 100644 index d7bee6035..000000000 Binary files a/graphics/battle_terrain/sand/map.bin and /dev/null differ diff --git a/graphics/battle_terrain/sand/palette.pal b/graphics/battle_terrain/sand/palette.pal deleted file mode 100644 index 20f4c3f7c..000000000 --- a/graphics/battle_terrain/sand/palette.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -0 0 0 -255 255 205 -213 213 90 -238 238 139 -246 246 172 -230 230 106 -255 255 189 -238 230 131 -255 255 230 -0 0 0 -0 0 0 -238 238 123 -238 238 148 -246 246 172 -246 246 180 -246 246 197 -0 0 0 -255 255 205 -222 213 82 -246 246 148 -246 246 189 -230 230 115 -255 255 197 -238 238 123 -255 255 230 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -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/tiles.png b/graphics/battle_terrain/sand/tiles.png deleted file mode 100644 index a4f7342be..000000000 Binary files a/graphics/battle_terrain/sand/tiles.png and /dev/null differ diff --git a/graphics/battle_terrain/sky/anim_map.bin b/graphics/battle_terrain/sky/anim_map.bin deleted file mode 100644 index c1712cdd8..000000000 Binary files a/graphics/battle_terrain/sky/anim_map.bin and /dev/null differ diff --git a/graphics/battle_terrain/sky/anim_tiles.png b/graphics/battle_terrain/sky/anim_tiles.png deleted file mode 100644 index 246ca2255..000000000 Binary files a/graphics/battle_terrain/sky/anim_tiles.png and /dev/null differ diff --git a/graphics/battle_terrain/sky/map.bin b/graphics/battle_terrain/sky/map.bin deleted file mode 100644 index d7bee6035..000000000 Binary files a/graphics/battle_terrain/sky/map.bin and /dev/null differ diff --git a/graphics/battle_terrain/sky/palette.pal b/graphics/battle_terrain/sky/palette.pal deleted file mode 100644 index 1a547d6a1..000000000 --- a/graphics/battle_terrain/sky/palette.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -0 0 0 -213 238 255 -222 230 255 -148 205 255 -172 213 255 -197 222 255 -197 230 255 -172 213 255 -230 246 255 -205 222 246 -238 246 255 -164 213 255 -180 222 255 -197 230 255 -213 238 255 -230 246 255 -0 0 0 -180 238 255 -222 230 255 -148 205 255 -172 213 255 -197 222 255 -197 230 255 -172 213 255 -230 246 255 -205 222 246 -238 246 255 -148 197 255 -164 205 255 -189 222 255 -205 230 255 -230 246 255 -0 0 0 -222 238 255 -230 238 255 -238 246 255 -246 246 255 -255 255 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -139 172 205 -197 230 255 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/battle_terrain/sky/tiles.png b/graphics/battle_terrain/sky/tiles.png deleted file mode 100644 index 461bba675..000000000 Binary files a/graphics/battle_terrain/sky/tiles.png and /dev/null differ diff --git a/graphics/battle_terrain/stadium/battle_frontier.pal b/graphics/battle_terrain/stadium/battle_frontier.pal deleted file mode 100644 index 10a842bcc..000000000 --- a/graphics/battle_terrain/stadium/battle_frontier.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -0 0 0 -255 255 255 -189 189 156 -213 213 197 -230 230 213 -197 197 180 -238 238 222 -205 205 189 -197 197 180 -0 0 0 -0 0 0 -222 230 230 -230 230 238 -230 238 238 -238 246 246 -246 246 255 -0 0 0 -255 255 255 -189 189 156 -213 213 197 -230 230 213 -197 197 180 -238 238 222 -205 205 189 -197 197 180 -0 0 0 -0 0 0 -222 230 230 -230 230 238 -230 238 238 -238 246 246 -246 246 255 -0 0 0 -172 189 213 -238 238 246 -180 197 222 -205 222 238 -222 230 246 -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/stadium/map.bin b/graphics/battle_terrain/stadium/map.bin deleted file mode 100644 index d7bee6035..000000000 Binary files a/graphics/battle_terrain/stadium/map.bin and /dev/null differ diff --git a/graphics/battle_terrain/stadium/palette1.pal b/graphics/battle_terrain/stadium/palette1.pal deleted file mode 100644 index 8252e3c5e..000000000 --- a/graphics/battle_terrain/stadium/palette1.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -0 0 0 -230 246 255 -65 131 213 -131 197 255 -148 205 246 -82 148 222 -172 213 246 -106 172 238 -98 164 246 -82 148 230 -98 164 246 -65 164 213 -106 189 230 -139 205 238 -180 230 238 -205 238 246 -0 0 0 -255 255 255 -189 189 156 -213 213 197 -230 230 213 -197 197 180 -238 238 222 -205 205 189 -197 197 180 -0 0 0 -0 0 0 -222 230 230 -230 230 238 -230 238 238 -238 246 246 -246 246 255 -0 0 0 -255 213 65 -255 246 197 -255 213 82 -255 230 115 -255 246 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 diff --git a/graphics/battle_terrain/stadium/palette2.pal b/graphics/battle_terrain/stadium/palette2.pal deleted file mode 100644 index 48b2d851b..000000000 --- a/graphics/battle_terrain/stadium/palette2.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -0 0 0 -222 222 222 -222 106 0 -156 148 156 -172 164 172 -197 106 49 -189 180 189 -172 123 98 -238 131 0 -230 115 0 -246 131 0 -139 139 139 -156 148 156 -180 172 180 -197 189 197 -205 197 213 -0 0 0 -255 255 255 -189 189 156 -213 213 197 -230 230 213 -197 197 180 -238 238 222 -205 205 189 -197 197 180 -0 0 0 -0 0 0 -222 230 230 -230 230 238 -230 238 238 -238 246 246 -246 246 255 -0 0 0 -123 205 164 -189 255 230 -139 222 180 -156 238 197 -172 255 213 -0 0 0 -213 49 0 -255 222 139 -213 106 57 -246 180 16 -255 197 90 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/battle_terrain/stadium/palette3.pal b/graphics/battle_terrain/stadium/palette3.pal deleted file mode 100644 index 10c5b50d6..000000000 --- a/graphics/battle_terrain/stadium/palette3.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -0 0 0 -230 246 230 -222 197 148 -246 222 172 -230 222 189 -230 205 156 -213 230 205 -238 213 164 -246 222 172 -238 205 164 -230 213 164 -65 172 156 -98 197 180 -139 213 213 -164 230 222 -197 238 230 -0 0 0 -230 246 230 -205 172 131 -238 213 164 -238 222 189 -213 180 139 -238 230 222 -222 197 148 -230 205 156 -222 189 148 -230 213 164 -65 172 156 -98 197 180 -139 213 213 -164 230 222 -197 238 230 -0 0 0 -255 213 65 -255 246 197 -255 213 82 -255 230 115 -255 246 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 diff --git a/graphics/battle_terrain/stadium/palette4.pal b/graphics/battle_terrain/stadium/palette4.pal deleted file mode 100644 index 201de5471..000000000 --- a/graphics/battle_terrain/stadium/palette4.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -0 0 0 -230 246 230 -197 156 205 -230 205 238 -205 222 230 -205 172 213 -213 213 230 -213 189 222 -213 156 238 -205 164 222 -230 180 238 -65 172 156 -98 197 180 -139 213 213 -164 230 222 -197 238 230 -0 0 0 -230 246 230 -197 139 205 -230 205 238 -205 222 230 -205 156 213 -213 213 230 -213 180 222 -213 156 238 -205 156 213 -230 180 238 -65 172 156 -98 197 180 -139 213 213 -164 230 222 -197 238 230 -0 0 0 -189 90 230 -230 213 246 -189 115 230 -197 139 230 -213 189 230 -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/stadium/palette5.pal b/graphics/battle_terrain/stadium/palette5.pal deleted file mode 100644 index 16f50d89b..000000000 --- a/graphics/battle_terrain/stadium/palette5.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -0 0 0 -230 246 230 -139 172 238 -180 213 255 -180 213 255 -148 180 238 -189 222 255 -164 197 246 -164 197 255 -148 180 246 -180 213 255 -65 172 156 -98 197 180 -139 213 213 -164 230 222 -197 238 230 -0 0 0 -230 246 230 -131 164 230 -180 213 255 -180 213 255 -148 180 238 -189 222 255 -164 197 246 -164 197 255 -148 180 246 -180 213 255 -65 172 156 -98 197 180 -139 213 213 -164 230 222 -197 238 230 -0 0 0 -90 148 238 -172 238 255 -106 172 238 -123 189 246 -164 222 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/stadium/palette6.pal b/graphics/battle_terrain/stadium/palette6.pal deleted file mode 100644 index 118a6a3bb..000000000 --- a/graphics/battle_terrain/stadium/palette6.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -0 0 0 -230 246 230 -246 156 90 -197 197 197 -197 205 205 -230 164 123 -197 222 213 -213 180 156 -255 189 90 -255 172 90 -255 172 32 -65 172 156 -98 197 180 -139 213 213 -164 230 222 -197 238 230 -0 0 0 -230 246 230 -230 115 32 -164 164 164 -172 189 180 -205 131 74 -180 213 205 -180 148 115 -255 148 32 -246 131 32 -255 172 32 -65 172 156 -98 197 180 -139 213 213 -164 230 222 -197 238 230 -0 0 0 -238 189 49 -255 255 131 -238 197 57 -246 222 74 -255 246 98 -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/stadium/palette7.pal b/graphics/battle_terrain/stadium/palette7.pal deleted file mode 100644 index b0c050be5..000000000 --- a/graphics/battle_terrain/stadium/palette7.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -0 0 0 -246 238 246 -197 115 205 -246 180 246 -238 205 238 -205 131 213 -238 213 238 -222 164 230 -222 148 230 -213 131 222 -238 156 246 -172 106 172 -205 148 205 -230 189 230 -238 213 238 -238 230 238 -0 0 0 -246 238 246 -197 115 205 -246 180 246 -238 205 238 -205 131 213 -238 213 238 -222 164 230 -222 148 230 -213 131 222 -238 156 246 -172 106 172 -205 148 205 -230 189 230 -238 213 238 -238 230 238 -0 0 0 -246 172 0 -255 238 131 -255 180 16 -255 197 41 -255 238 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 diff --git a/graphics/battle_terrain/stadium/tiles.png b/graphics/battle_terrain/stadium/tiles.png deleted file mode 100644 index ece531ec0..000000000 Binary files a/graphics/battle_terrain/stadium/tiles.png and /dev/null differ diff --git a/graphics/battle_terrain/tall_grass/anim_map.bin b/graphics/battle_terrain/tall_grass/anim_map.bin deleted file mode 100644 index 8e7d784f3..000000000 Binary files a/graphics/battle_terrain/tall_grass/anim_map.bin and /dev/null differ diff --git a/graphics/battle_terrain/tall_grass/anim_tiles.png b/graphics/battle_terrain/tall_grass/anim_tiles.png deleted file mode 100644 index 85aed13bb..000000000 Binary files a/graphics/battle_terrain/tall_grass/anim_tiles.png and /dev/null differ diff --git a/graphics/battle_terrain/tall_grass/map.bin b/graphics/battle_terrain/tall_grass/map.bin deleted file mode 100644 index 61f358f53..000000000 Binary files a/graphics/battle_terrain/tall_grass/map.bin and /dev/null differ diff --git a/graphics/battle_terrain/tall_grass/palette.pal b/graphics/battle_terrain/tall_grass/palette.pal deleted file mode 100644 index 11db31cad..000000000 --- a/graphics/battle_terrain/tall_grass/palette.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -0 0 0 -222 255 213 -123 213 131 -172 246 115 -197 246 189 -139 230 131 -222 255 205 -156 238 123 -0 0 0 -0 0 0 -0 0 0 -180 230 148 -189 238 164 -197 238 189 -205 246 197 -213 246 213 -0 0 0 -222 255 213 -123 213 131 -172 246 115 -197 246 189 -139 230 131 -222 255 205 -156 238 123 -0 0 0 -0 0 0 -0 0 0 -180 230 148 -189 238 164 -197 238 189 -205 246 197 -213 246 213 -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/tall_grass/tiles.png b/graphics/battle_terrain/tall_grass/tiles.png deleted file mode 100644 index 2d163d7bb..000000000 Binary files a/graphics/battle_terrain/tall_grass/tiles.png and /dev/null differ diff --git a/graphics/battle_terrain/terrain_building.bin b/graphics/battle_terrain/terrain_building.bin new file mode 100644 index 000000000..0710427da Binary files /dev/null and b/graphics/battle_terrain/terrain_building.bin differ diff --git a/graphics/battle_terrain/terrain_building.pal b/graphics/battle_terrain/terrain_building.pal new file mode 100644 index 000000000..16421567f --- /dev/null +++ b/graphics/battle_terrain/terrain_building.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/terrain_building.png b/graphics/battle_terrain/terrain_building.png new file mode 100644 index 000000000..3b060be4e Binary files /dev/null and b/graphics/battle_terrain/terrain_building.png differ diff --git a/graphics/battle_terrain/terrain_building_anim.bin b/graphics/battle_terrain/terrain_building_anim.bin new file mode 100644 index 000000000..aba49c6f9 Binary files /dev/null and b/graphics/battle_terrain/terrain_building_anim.bin differ diff --git a/graphics/battle_terrain/terrain_building_anim.png b/graphics/battle_terrain/terrain_building_anim.png new file mode 100644 index 000000000..443cd98ab Binary files /dev/null and b/graphics/battle_terrain/terrain_building_anim.png differ diff --git a/graphics/battle_terrain/terrain_cave.bin b/graphics/battle_terrain/terrain_cave.bin new file mode 100644 index 000000000..255f2953d Binary files /dev/null and b/graphics/battle_terrain/terrain_cave.bin differ diff --git a/graphics/battle_terrain/terrain_cave.pal b/graphics/battle_terrain/terrain_cave.pal new file mode 100644 index 000000000..f17a7bf9d --- /dev/null +++ b/graphics/battle_terrain/terrain_cave.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/terrain_cave.png b/graphics/battle_terrain/terrain_cave.png new file mode 100644 index 000000000..e2a18ae57 Binary files /dev/null and b/graphics/battle_terrain/terrain_cave.png differ diff --git a/graphics/battle_terrain/terrain_cave_anim.bin b/graphics/battle_terrain/terrain_cave_anim.bin new file mode 100644 index 000000000..ad7724c67 Binary files /dev/null and b/graphics/battle_terrain/terrain_cave_anim.bin differ diff --git a/graphics/battle_terrain/terrain_cave_anim.png b/graphics/battle_terrain/terrain_cave_anim.png new file mode 100644 index 000000000..84f13f8f0 Binary files /dev/null and b/graphics/battle_terrain/terrain_cave_anim.png differ diff --git a/graphics/battle_terrain/terrain_grass.bin b/graphics/battle_terrain/terrain_grass.bin new file mode 100644 index 000000000..e0da76dc2 Binary files /dev/null and b/graphics/battle_terrain/terrain_grass.bin differ diff --git a/graphics/battle_terrain/terrain_grass.pal b/graphics/battle_terrain/terrain_grass.pal new file mode 100644 index 000000000..cc00b3dc2 --- /dev/null +++ b/graphics/battle_terrain/terrain_grass.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/terrain_grass.png b/graphics/battle_terrain/terrain_grass.png new file mode 100644 index 000000000..645796cb1 Binary files /dev/null and b/graphics/battle_terrain/terrain_grass.png differ diff --git a/graphics/battle_terrain/terrain_grass_anim.bin b/graphics/battle_terrain/terrain_grass_anim.bin new file mode 100644 index 000000000..03e4194fc Binary files /dev/null and b/graphics/battle_terrain/terrain_grass_anim.bin differ diff --git a/graphics/battle_terrain/terrain_grass_anim.png b/graphics/battle_terrain/terrain_grass_anim.png new file mode 100644 index 000000000..f2f2c1bb1 Binary files /dev/null and b/graphics/battle_terrain/terrain_grass_anim.png differ diff --git a/graphics/battle_terrain/terrain_indoor.bin b/graphics/battle_terrain/terrain_indoor.bin new file mode 100644 index 000000000..0710427da Binary files /dev/null and b/graphics/battle_terrain/terrain_indoor.bin differ diff --git a/graphics/battle_terrain/terrain_indoor.png b/graphics/battle_terrain/terrain_indoor.png new file mode 100644 index 000000000..1cbb7c63b Binary files /dev/null and b/graphics/battle_terrain/terrain_indoor.png differ diff --git a/graphics/battle_terrain/terrain_indoor_1.pal b/graphics/battle_terrain/terrain_indoor_1.pal new file mode 100644 index 000000000..597647872 --- /dev/null +++ b/graphics/battle_terrain/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/terrain_indoor_2.pal b/graphics/battle_terrain/terrain_indoor_2.pal new file mode 100644 index 000000000..a1bc6b60c --- /dev/null +++ b/graphics/battle_terrain/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/terrain_indoor_agatha.pal b/graphics/battle_terrain/terrain_indoor_agatha.pal new file mode 100644 index 000000000..8ea1eeae7 --- /dev/null +++ b/graphics/battle_terrain/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/terrain_indoor_bruno.pal b/graphics/battle_terrain/terrain_indoor_bruno.pal new file mode 100644 index 000000000..21196b3e8 --- /dev/null +++ b/graphics/battle_terrain/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/terrain_indoor_champion.pal b/graphics/battle_terrain/terrain_indoor_champion.pal new file mode 100644 index 000000000..9ce470c9f --- /dev/null +++ b/graphics/battle_terrain/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/terrain_indoor_gym.pal b/graphics/battle_terrain/terrain_indoor_gym.pal new file mode 100644 index 000000000..187054476 --- /dev/null +++ b/graphics/battle_terrain/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/terrain_indoor_lance.pal b/graphics/battle_terrain/terrain_indoor_lance.pal new file mode 100644 index 000000000..c5fb745cf --- /dev/null +++ b/graphics/battle_terrain/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/terrain_indoor_leader.pal b/graphics/battle_terrain/terrain_indoor_leader.pal new file mode 100644 index 000000000..581b6d596 --- /dev/null +++ b/graphics/battle_terrain/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/terrain_indoor_link.pal b/graphics/battle_terrain/terrain_indoor_link.pal new file mode 100644 index 000000000..baa0fdf4f --- /dev/null +++ b/graphics/battle_terrain/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/terrain_indoor_lorelei.pal b/graphics/battle_terrain/terrain_indoor_lorelei.pal new file mode 100644 index 000000000..e63bad165 --- /dev/null +++ b/graphics/battle_terrain/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/terrain_indoor_plain.pal b/graphics/battle_terrain/terrain_indoor_plain.pal new file mode 100644 index 000000000..b47dc0a8d --- /dev/null +++ b/graphics/battle_terrain/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/terrain_longgrass.bin b/graphics/battle_terrain/terrain_longgrass.bin new file mode 100644 index 000000000..2b2634a14 Binary files /dev/null and b/graphics/battle_terrain/terrain_longgrass.bin differ diff --git a/graphics/battle_terrain/terrain_longgrass.pal b/graphics/battle_terrain/terrain_longgrass.pal new file mode 100644 index 000000000..c390b8c44 --- /dev/null +++ b/graphics/battle_terrain/terrain_longgrass.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/terrain_longgrass.png b/graphics/battle_terrain/terrain_longgrass.png new file mode 100644 index 000000000..0d09d739c Binary files /dev/null and b/graphics/battle_terrain/terrain_longgrass.png differ diff --git a/graphics/battle_terrain/terrain_longgrass_anim.bin b/graphics/battle_terrain/terrain_longgrass_anim.bin new file mode 100644 index 000000000..5cb0de868 Binary files /dev/null and b/graphics/battle_terrain/terrain_longgrass_anim.bin differ diff --git a/graphics/battle_terrain/terrain_longgrass_anim.png b/graphics/battle_terrain/terrain_longgrass_anim.png new file mode 100644 index 000000000..c825dd7d2 Binary files /dev/null and b/graphics/battle_terrain/terrain_longgrass_anim.png differ diff --git a/graphics/battle_terrain/terrain_mountain.bin b/graphics/battle_terrain/terrain_mountain.bin new file mode 100644 index 000000000..16600f5f8 Binary files /dev/null and b/graphics/battle_terrain/terrain_mountain.bin differ diff --git a/graphics/battle_terrain/terrain_mountain.pal b/graphics/battle_terrain/terrain_mountain.pal new file mode 100644 index 000000000..bfe75be65 --- /dev/null +++ b/graphics/battle_terrain/terrain_mountain.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/terrain_mountain.png b/graphics/battle_terrain/terrain_mountain.png new file mode 100644 index 000000000..9889a6b62 Binary files /dev/null and b/graphics/battle_terrain/terrain_mountain.png differ diff --git a/graphics/battle_terrain/terrain_mountain_anim.bin b/graphics/battle_terrain/terrain_mountain_anim.bin new file mode 100644 index 000000000..55c5730c0 Binary files /dev/null and b/graphics/battle_terrain/terrain_mountain_anim.bin differ diff --git a/graphics/battle_terrain/terrain_mountain_anim.png b/graphics/battle_terrain/terrain_mountain_anim.png new file mode 100644 index 000000000..ab90aaddc Binary files /dev/null and b/graphics/battle_terrain/terrain_mountain_anim.png differ diff --git a/graphics/battle_terrain/terrain_pond.bin b/graphics/battle_terrain/terrain_pond.bin new file mode 100644 index 000000000..d4c3dedcb Binary files /dev/null and b/graphics/battle_terrain/terrain_pond.bin differ diff --git a/graphics/battle_terrain/terrain_pond.pal b/graphics/battle_terrain/terrain_pond.pal new file mode 100644 index 000000000..041560cf4 --- /dev/null +++ b/graphics/battle_terrain/terrain_pond.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/terrain_pond.png b/graphics/battle_terrain/terrain_pond.png new file mode 100644 index 000000000..161498b2a Binary files /dev/null and b/graphics/battle_terrain/terrain_pond.png differ diff --git a/graphics/battle_terrain/terrain_pond_anim.bin b/graphics/battle_terrain/terrain_pond_anim.bin new file mode 100644 index 000000000..e012f647e Binary files /dev/null and b/graphics/battle_terrain/terrain_pond_anim.bin differ diff --git a/graphics/battle_terrain/terrain_pond_anim.png b/graphics/battle_terrain/terrain_pond_anim.png new file mode 100644 index 000000000..e0a7025e7 Binary files /dev/null and b/graphics/battle_terrain/terrain_pond_anim.png differ diff --git a/graphics/battle_terrain/terrain_sand.bin b/graphics/battle_terrain/terrain_sand.bin new file mode 100644 index 000000000..365e1474f Binary files /dev/null and b/graphics/battle_terrain/terrain_sand.bin differ diff --git a/graphics/battle_terrain/terrain_sand.pal b/graphics/battle_terrain/terrain_sand.pal new file mode 100644 index 000000000..dafc3eb7f --- /dev/null +++ b/graphics/battle_terrain/terrain_sand.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/terrain_sand.png b/graphics/battle_terrain/terrain_sand.png new file mode 100644 index 000000000..e802b34f2 Binary files /dev/null and b/graphics/battle_terrain/terrain_sand.png differ diff --git a/graphics/battle_terrain/terrain_sand_anim.bin b/graphics/battle_terrain/terrain_sand_anim.bin new file mode 100644 index 000000000..e4afe99ae Binary files /dev/null and b/graphics/battle_terrain/terrain_sand_anim.bin differ diff --git a/graphics/battle_terrain/terrain_sand_anim.png b/graphics/battle_terrain/terrain_sand_anim.png new file mode 100644 index 000000000..092b8b42b Binary files /dev/null and b/graphics/battle_terrain/terrain_sand_anim.png differ diff --git a/graphics/battle_terrain/terrain_underwater.bin b/graphics/battle_terrain/terrain_underwater.bin new file mode 100644 index 000000000..29843f17d Binary files /dev/null and b/graphics/battle_terrain/terrain_underwater.bin differ diff --git a/graphics/battle_terrain/terrain_underwater.pal b/graphics/battle_terrain/terrain_underwater.pal new file mode 100644 index 000000000..5fa95cf21 --- /dev/null +++ b/graphics/battle_terrain/terrain_underwater.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/terrain_underwater.png b/graphics/battle_terrain/terrain_underwater.png new file mode 100644 index 000000000..19e115348 Binary files /dev/null and b/graphics/battle_terrain/terrain_underwater.png differ diff --git a/graphics/battle_terrain/terrain_underwater_anim.bin b/graphics/battle_terrain/terrain_underwater_anim.bin new file mode 100644 index 000000000..9029c7c9d Binary files /dev/null and b/graphics/battle_terrain/terrain_underwater_anim.bin differ diff --git a/graphics/battle_terrain/terrain_underwater_anim.png b/graphics/battle_terrain/terrain_underwater_anim.png new file mode 100644 index 000000000..f41eedfb8 Binary files /dev/null and b/graphics/battle_terrain/terrain_underwater_anim.png differ diff --git a/graphics/battle_terrain/terrain_water.bin b/graphics/battle_terrain/terrain_water.bin new file mode 100644 index 000000000..0ee05129a Binary files /dev/null and b/graphics/battle_terrain/terrain_water.bin differ diff --git a/graphics/battle_terrain/terrain_water.pal b/graphics/battle_terrain/terrain_water.pal new file mode 100644 index 000000000..d31dce658 --- /dev/null +++ b/graphics/battle_terrain/terrain_water.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/terrain_water.png b/graphics/battle_terrain/terrain_water.png new file mode 100644 index 000000000..8953e7940 Binary files /dev/null and b/graphics/battle_terrain/terrain_water.png differ diff --git a/graphics/battle_terrain/terrain_water_anim.bin b/graphics/battle_terrain/terrain_water_anim.bin new file mode 100644 index 000000000..b6661cd3c Binary files /dev/null and b/graphics/battle_terrain/terrain_water_anim.bin differ diff --git a/graphics/battle_terrain/terrain_water_anim.png b/graphics/battle_terrain/terrain_water_anim.png new file mode 100644 index 000000000..1545d85e7 Binary files /dev/null and b/graphics/battle_terrain/terrain_water_anim.png differ diff --git a/graphics/battle_terrain/underwater/anim_map.bin b/graphics/battle_terrain/underwater/anim_map.bin deleted file mode 100644 index 616c2a242..000000000 Binary files a/graphics/battle_terrain/underwater/anim_map.bin and /dev/null differ diff --git a/graphics/battle_terrain/underwater/anim_tiles.png b/graphics/battle_terrain/underwater/anim_tiles.png deleted file mode 100644 index 3e75434db..000000000 Binary files a/graphics/battle_terrain/underwater/anim_tiles.png and /dev/null differ diff --git a/graphics/battle_terrain/underwater/map.bin b/graphics/battle_terrain/underwater/map.bin deleted file mode 100644 index 61f358f53..000000000 Binary files a/graphics/battle_terrain/underwater/map.bin and /dev/null differ diff --git a/graphics/battle_terrain/underwater/palette.pal b/graphics/battle_terrain/underwater/palette.pal deleted file mode 100644 index b5859af6e..000000000 --- a/graphics/battle_terrain/underwater/palette.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -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 -0 0 0 -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 -0 0 0 -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/tiles.png b/graphics/battle_terrain/underwater/tiles.png deleted file mode 100644 index b0d49a9cc..000000000 Binary files a/graphics/battle_terrain/underwater/tiles.png and /dev/null differ diff --git a/graphics/battle_terrain/unused/building/anim_map.bin b/graphics/battle_terrain/unused/building/anim_map.bin new file mode 100644 index 000000000..432e41c2f Binary files /dev/null and b/graphics/battle_terrain/unused/building/anim_map.bin differ diff --git a/graphics/battle_terrain/unused/building/anim_tiles.png b/graphics/battle_terrain/unused/building/anim_tiles.png new file mode 100644 index 000000000..a627523d8 Binary files /dev/null and b/graphics/battle_terrain/unused/building/anim_tiles.png differ diff --git a/graphics/battle_terrain/unused/building/map.bin b/graphics/battle_terrain/unused/building/map.bin new file mode 100644 index 000000000..d7bee6035 Binary files /dev/null and b/graphics/battle_terrain/unused/building/map.bin differ diff --git a/graphics/battle_terrain/unused/building/palette.pal b/graphics/battle_terrain/unused/building/palette.pal new file mode 100644 index 000000000..219cef565 --- /dev/null +++ b/graphics/battle_terrain/unused/building/palette.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +255 255 255 +222 197 164 +238 222 180 +238 230 205 +230 205 164 +246 238 230 +222 213 180 +230 213 172 +0 0 0 +0 0 0 +246 246 156 +246 246 180 +246 246 205 +246 246 230 +246 246 246 +0 0 0 +255 255 255 +222 197 164 +238 222 180 +238 230 205 +230 205 164 +246 238 230 +222 213 180 +246 246 205 +0 0 0 +0 0 0 +246 246 156 +246 246 180 +246 246 205 +246 246 230 +246 246 246 +0 0 0 +246 205 139 +255 238 164 +246 222 156 +255 238 172 +255 246 180 +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/unused/building/palette2.pal b/graphics/battle_terrain/unused/building/palette2.pal new file mode 100644 index 000000000..3ca2e0b0c --- /dev/null +++ b/graphics/battle_terrain/unused/building/palette2.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +255 255 255 +205 189 148 +222 213 172 +238 230 197 +205 197 156 +246 238 222 +213 205 164 +222 213 156 +0 0 0 +0 0 0 +213 189 148 +230 213 180 +238 230 213 +246 238 230 +246 246 246 +0 0 0 +255 255 255 +205 189 148 +222 213 172 +238 230 197 +205 197 156 +246 238 222 +213 205 164 +222 213 156 +0 0 0 +0 0 0 +213 189 148 +230 213 180 +238 230 213 +246 238 230 +246 246 246 +0 0 0 +164 197 246 +205 246 255 +180 222 255 +189 230 255 +197 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/unused/building/palette3.pal b/graphics/battle_terrain/unused/building/palette3.pal new file mode 100644 index 000000000..cebf5e687 --- /dev/null +++ b/graphics/battle_terrain/unused/building/palette3.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +255 255 255 +205 189 148 +222 213 172 +238 230 197 +205 197 156 +246 238 222 +213 205 164 +222 213 156 +0 0 0 +0 0 0 +213 189 148 +230 213 180 +238 230 213 +246 238 230 +246 246 246 +0 0 0 +255 255 255 +205 189 148 +222 213 172 +238 230 197 +205 197 156 +246 238 222 +213 205 164 +222 213 156 +0 0 0 +0 0 0 +213 189 148 +230 213 180 +238 230 213 +246 238 230 +246 246 246 +0 0 0 +255 222 65 +255 255 180 +255 238 74 +255 246 115 +255 255 148 +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/unused/building/tiles.png b/graphics/battle_terrain/unused/building/tiles.png new file mode 100644 index 000000000..9a031c297 Binary files /dev/null and b/graphics/battle_terrain/unused/building/tiles.png differ diff --git a/graphics/battle_terrain/unused/groudon.pal b/graphics/battle_terrain/unused/groudon.pal new file mode 100644 index 000000000..73021c957 --- /dev/null +++ b/graphics/battle_terrain/unused/groudon.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +246 246 189 +222 213 106 +180 156 106 +197 172 123 +205 189 115 +213 197 148 +197 172 106 +230 222 172 +255 189 49 +238 230 123 +213 115 32 +222 172 106 +230 197 139 +230 213 156 +238 230 180 +0 0 0 +246 246 189 +222 213 106 +180 156 106 +197 172 123 +205 189 115 +213 197 148 +197 172 106 +230 222 172 +255 189 49 +238 230 123 +82 106 172 +148 156 164 +197 189 164 +230 213 180 +238 230 180 +0 0 0 +106 74 65 +148 115 82 +180 139 90 +213 180 131 +230 213 156 +0 0 0 +205 148 74 +230 156 57 +255 172 49 +255 189 49 +205 148 74 +205 148 74 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_terrain/unused/kyogre.pal b/graphics/battle_terrain/unused/kyogre.pal new file mode 100644 index 000000000..eaa19730f --- /dev/null +++ b/graphics/battle_terrain/unused/kyogre.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +246 246 189 +90 148 222 +148 213 238 +180 222 222 +106 172 230 +172 213 213 +123 189 230 +205 222 197 +0 0 0 +0 0 0 +172 139 82 +189 156 106 +213 197 148 +230 213 164 +238 230 180 +0 0 0 +246 246 189 +90 148 222 +148 213 238 +180 222 222 +106 172 230 +172 213 213 +123 189 230 +205 222 197 +0 0 0 +0 0 0 +172 139 82 +189 156 106 +213 197 148 +230 213 164 +238 230 180 +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 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_terrain/unused/plain.pal b/graphics/battle_terrain/unused/plain.pal new file mode 100644 index 000000000..2377b7729 --- /dev/null +++ b/graphics/battle_terrain/unused/plain.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +238 255 230 +156 230 156 +230 230 148 +230 238 164 +189 230 148 +230 246 180 +205 230 172 +172 238 172 +0 0 0 +0 0 0 +164 222 246 +180 230 230 +197 238 222 +213 246 213 +230 255 205 +0 0 0 +238 255 230 +156 230 156 +230 230 148 +230 238 164 +189 230 148 +230 246 180 +205 230 172 +172 238 172 +0 0 0 +0 0 0 +164 222 246 +180 230 230 +197 238 222 +213 246 213 +230 255 205 +0 0 0 +74 189 65 +172 230 172 +106 205 90 +131 213 115 +156 213 148 +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/unused/stadium/battle_frontier.pal b/graphics/battle_terrain/unused/stadium/battle_frontier.pal new file mode 100644 index 000000000..10a842bcc --- /dev/null +++ b/graphics/battle_terrain/unused/stadium/battle_frontier.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +255 255 255 +189 189 156 +213 213 197 +230 230 213 +197 197 180 +238 238 222 +205 205 189 +197 197 180 +0 0 0 +0 0 0 +222 230 230 +230 230 238 +230 238 238 +238 246 246 +246 246 255 +0 0 0 +255 255 255 +189 189 156 +213 213 197 +230 230 213 +197 197 180 +238 238 222 +205 205 189 +197 197 180 +0 0 0 +0 0 0 +222 230 230 +230 230 238 +230 238 238 +238 246 246 +246 246 255 +0 0 0 +172 189 213 +238 238 246 +180 197 222 +205 222 238 +222 230 246 +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/unused/stadium/map.bin b/graphics/battle_terrain/unused/stadium/map.bin new file mode 100644 index 000000000..d7bee6035 Binary files /dev/null and b/graphics/battle_terrain/unused/stadium/map.bin differ diff --git a/graphics/battle_terrain/unused/stadium/palette1.pal b/graphics/battle_terrain/unused/stadium/palette1.pal new file mode 100644 index 000000000..8252e3c5e --- /dev/null +++ b/graphics/battle_terrain/unused/stadium/palette1.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +230 246 255 +65 131 213 +131 197 255 +148 205 246 +82 148 222 +172 213 246 +106 172 238 +98 164 246 +82 148 230 +98 164 246 +65 164 213 +106 189 230 +139 205 238 +180 230 238 +205 238 246 +0 0 0 +255 255 255 +189 189 156 +213 213 197 +230 230 213 +197 197 180 +238 238 222 +205 205 189 +197 197 180 +0 0 0 +0 0 0 +222 230 230 +230 230 238 +230 238 238 +238 246 246 +246 246 255 +0 0 0 +255 213 65 +255 246 197 +255 213 82 +255 230 115 +255 246 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 diff --git a/graphics/battle_terrain/unused/stadium/palette2.pal b/graphics/battle_terrain/unused/stadium/palette2.pal new file mode 100644 index 000000000..48b2d851b --- /dev/null +++ b/graphics/battle_terrain/unused/stadium/palette2.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +222 222 222 +222 106 0 +156 148 156 +172 164 172 +197 106 49 +189 180 189 +172 123 98 +238 131 0 +230 115 0 +246 131 0 +139 139 139 +156 148 156 +180 172 180 +197 189 197 +205 197 213 +0 0 0 +255 255 255 +189 189 156 +213 213 197 +230 230 213 +197 197 180 +238 238 222 +205 205 189 +197 197 180 +0 0 0 +0 0 0 +222 230 230 +230 230 238 +230 238 238 +238 246 246 +246 246 255 +0 0 0 +123 205 164 +189 255 230 +139 222 180 +156 238 197 +172 255 213 +0 0 0 +213 49 0 +255 222 139 +213 106 57 +246 180 16 +255 197 90 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_terrain/unused/stadium/palette3.pal b/graphics/battle_terrain/unused/stadium/palette3.pal new file mode 100644 index 000000000..10c5b50d6 --- /dev/null +++ b/graphics/battle_terrain/unused/stadium/palette3.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +230 246 230 +222 197 148 +246 222 172 +230 222 189 +230 205 156 +213 230 205 +238 213 164 +246 222 172 +238 205 164 +230 213 164 +65 172 156 +98 197 180 +139 213 213 +164 230 222 +197 238 230 +0 0 0 +230 246 230 +205 172 131 +238 213 164 +238 222 189 +213 180 139 +238 230 222 +222 197 148 +230 205 156 +222 189 148 +230 213 164 +65 172 156 +98 197 180 +139 213 213 +164 230 222 +197 238 230 +0 0 0 +255 213 65 +255 246 197 +255 213 82 +255 230 115 +255 246 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 diff --git a/graphics/battle_terrain/unused/stadium/palette4.pal b/graphics/battle_terrain/unused/stadium/palette4.pal new file mode 100644 index 000000000..201de5471 --- /dev/null +++ b/graphics/battle_terrain/unused/stadium/palette4.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +230 246 230 +197 156 205 +230 205 238 +205 222 230 +205 172 213 +213 213 230 +213 189 222 +213 156 238 +205 164 222 +230 180 238 +65 172 156 +98 197 180 +139 213 213 +164 230 222 +197 238 230 +0 0 0 +230 246 230 +197 139 205 +230 205 238 +205 222 230 +205 156 213 +213 213 230 +213 180 222 +213 156 238 +205 156 213 +230 180 238 +65 172 156 +98 197 180 +139 213 213 +164 230 222 +197 238 230 +0 0 0 +189 90 230 +230 213 246 +189 115 230 +197 139 230 +213 189 230 +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/unused/stadium/palette5.pal b/graphics/battle_terrain/unused/stadium/palette5.pal new file mode 100644 index 000000000..16f50d89b --- /dev/null +++ b/graphics/battle_terrain/unused/stadium/palette5.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +230 246 230 +139 172 238 +180 213 255 +180 213 255 +148 180 238 +189 222 255 +164 197 246 +164 197 255 +148 180 246 +180 213 255 +65 172 156 +98 197 180 +139 213 213 +164 230 222 +197 238 230 +0 0 0 +230 246 230 +131 164 230 +180 213 255 +180 213 255 +148 180 238 +189 222 255 +164 197 246 +164 197 255 +148 180 246 +180 213 255 +65 172 156 +98 197 180 +139 213 213 +164 230 222 +197 238 230 +0 0 0 +90 148 238 +172 238 255 +106 172 238 +123 189 246 +164 222 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/unused/stadium/palette6.pal b/graphics/battle_terrain/unused/stadium/palette6.pal new file mode 100644 index 000000000..118a6a3bb --- /dev/null +++ b/graphics/battle_terrain/unused/stadium/palette6.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +230 246 230 +246 156 90 +197 197 197 +197 205 205 +230 164 123 +197 222 213 +213 180 156 +255 189 90 +255 172 90 +255 172 32 +65 172 156 +98 197 180 +139 213 213 +164 230 222 +197 238 230 +0 0 0 +230 246 230 +230 115 32 +164 164 164 +172 189 180 +205 131 74 +180 213 205 +180 148 115 +255 148 32 +246 131 32 +255 172 32 +65 172 156 +98 197 180 +139 213 213 +164 230 222 +197 238 230 +0 0 0 +238 189 49 +255 255 131 +238 197 57 +246 222 74 +255 246 98 +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/unused/stadium/palette7.pal b/graphics/battle_terrain/unused/stadium/palette7.pal new file mode 100644 index 000000000..b0c050be5 --- /dev/null +++ b/graphics/battle_terrain/unused/stadium/palette7.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +246 238 246 +197 115 205 +246 180 246 +238 205 238 +205 131 213 +238 213 238 +222 164 230 +222 148 230 +213 131 222 +238 156 246 +172 106 172 +205 148 205 +230 189 230 +238 213 238 +238 230 238 +0 0 0 +246 238 246 +197 115 205 +246 180 246 +238 205 238 +205 131 213 +238 213 238 +222 164 230 +222 148 230 +213 131 222 +238 156 246 +172 106 172 +205 148 205 +230 189 230 +238 213 238 +238 230 238 +0 0 0 +246 172 0 +255 238 131 +255 180 16 +255 197 41 +255 238 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 diff --git a/graphics/battle_terrain/unused/stadium/tiles.png b/graphics/battle_terrain/unused/stadium/tiles.png new file mode 100644 index 000000000..ece531ec0 Binary files /dev/null and b/graphics/battle_terrain/unused/stadium/tiles.png differ diff --git a/graphics/battle_terrain/water/anim_map.bin b/graphics/battle_terrain/water/anim_map.bin deleted file mode 100644 index 2b5f7a548..000000000 Binary files a/graphics/battle_terrain/water/anim_map.bin and /dev/null differ diff --git a/graphics/battle_terrain/water/anim_tiles.png b/graphics/battle_terrain/water/anim_tiles.png deleted file mode 100644 index b50564029..000000000 Binary files a/graphics/battle_terrain/water/anim_tiles.png and /dev/null differ diff --git a/graphics/battle_terrain/water/kyogre.pal b/graphics/battle_terrain/water/kyogre.pal deleted file mode 100644 index eaa19730f..000000000 --- a/graphics/battle_terrain/water/kyogre.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -0 0 0 -246 246 189 -90 148 222 -148 213 238 -180 222 222 -106 172 230 -172 213 213 -123 189 230 -205 222 197 -0 0 0 -0 0 0 -172 139 82 -189 156 106 -213 197 148 -230 213 164 -238 230 180 -0 0 0 -246 246 189 -90 148 222 -148 213 238 -180 222 222 -106 172 230 -172 213 213 -123 189 230 -205 222 197 -0 0 0 -0 0 0 -172 139 82 -189 156 106 -213 197 148 -230 213 164 -238 230 180 -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 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/battle_terrain/water/map.bin b/graphics/battle_terrain/water/map.bin deleted file mode 100644 index 61f358f53..000000000 Binary files a/graphics/battle_terrain/water/map.bin and /dev/null differ diff --git a/graphics/battle_terrain/water/palette.pal b/graphics/battle_terrain/water/palette.pal deleted file mode 100644 index cbef92774..000000000 --- a/graphics/battle_terrain/water/palette.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -0 0 0 -255 255 255 -90 148 222 -148 213 238 -180 230 246 -106 172 230 -197 238 255 -123 189 230 -222 246 255 -0 0 0 -0 0 0 -205 222 246 -222 230 238 -230 238 238 -238 246 246 -246 246 255 -0 0 0 -255 255 255 -90 148 222 -148 213 238 -180 230 246 -106 172 230 -197 238 255 -123 189 230 -222 246 255 -0 0 0 -0 0 0 -205 222 246 -222 230 238 -230 238 238 -238 246 246 -246 246 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -197 238 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 diff --git a/graphics/battle_terrain/water/tiles.png b/graphics/battle_terrain/water/tiles.png deleted file mode 100644 index 902047875..000000000 Binary files a/graphics/battle_terrain/water/tiles.png and /dev/null differ diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 3fc4b3b7b..f3bed2da7 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -24,7 +24,7 @@ TITLESCREENGFXDIR := graphics/title_screen CREDITSGFXDIR := graphics/credits ITEMMENUGFXDIR := graphics/item_menu INTROGFXDIR := graphics/intro -BATTLEGFXDIR := graphics/battle +BATTLETERRAINGFXDIR := graphics/battle_terrain types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark contest_types := cool beauty cute smart tough @@ -528,44 +528,44 @@ $(INTROGFXDIR)/unk_8406654.4bpp: %.4bpp: %.png $(INTROGFXDIR)/unk_8405B28.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 17 -$(BATTLEGFXDIR)/terrain_building.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/terrain_building.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 77 -$(BATTLEGFXDIR)/terrain_cave_anim.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/terrain_cave_anim.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 106 -$(BATTLEGFXDIR)/terrain_cave.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/terrain_cave.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 84 -$(BATTLEGFXDIR)/terrain_grass.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/terrain_grass.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 98 -$(BATTLEGFXDIR)/terrain_indoor.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/terrain_indoor.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 77 -$(BATTLEGFXDIR)/terrain_longgrass_anim.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/terrain_longgrass_anim.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 133 -$(BATTLEGFXDIR)/terrain_longgrass.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/terrain_longgrass.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 98 -$(BATTLEGFXDIR)/terrain_mountain_anim.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/terrain_mountain_anim.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 47 -$(BATTLEGFXDIR)/terrain_pond_anim.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/terrain_pond_anim.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 36 -$(BATTLEGFXDIR)/terrain_pond.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/terrain_pond.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 75 -$(BATTLEGFXDIR)/terrain_sand.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/terrain_sand.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 83 -$(BATTLEGFXDIR)/terrain_underwater_anim.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/terrain_underwater_anim.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 26 -$(BATTLEGFXDIR)/terrain_underwater.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/terrain_underwater.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 85 -$(BATTLEGFXDIR)/terrain_water.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/terrain_water.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 81 diff --git a/src/battle_bg.c b/src/battle_bg.c index 05a6babe2..44f26494b 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_grass.gbapal.lz"); -static const u32 sBattleTerrainTiles_Grass[] = INCBIN_U32("graphics/battle/terrain_grass.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Grass[] = INCBIN_U32("graphics/battle/terrain_grass.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_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_LongGrass[] = INCBIN_U32("graphics/battle/terrain_longgrass.gbapal.lz"); -static const u32 sBattleTerrainTiles_LongGrass[] = INCBIN_U32("graphics/battle/terrain_longgrass.4bpp.lz"); -static const u32 sBattleTerrainTilemap_LongGrass[] = INCBIN_U32("graphics/battle/terrain_longgrass.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_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_Sand[] = INCBIN_U32("graphics/battle/terrain_sand.gbapal.lz"); -static const u32 sBattleTerrainTiles_Sand[] = INCBIN_U32("graphics/battle/terrain_sand.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Sand[] = INCBIN_U32("graphics/battle/terrain_sand.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_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_Underwater[] = INCBIN_U32("graphics/battle/terrain_underwater.gbapal.lz"); -static const u32 sBattleTerrainTiles_Underwater[] = INCBIN_U32("graphics/battle/terrain_underwater.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Underwater[] = INCBIN_U32("graphics/battle/terrain_underwater.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_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_Water[] = INCBIN_U32("graphics/battle/terrain_water.gbapal.lz"); -static const u32 sBattleTerrainTiles_Water[] = INCBIN_U32("graphics/battle/terrain_water.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Water[] = INCBIN_U32("graphics/battle/terrain_water.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_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_Pond[] = INCBIN_U32("graphics/battle/terrain_pond.gbapal.lz"); -static const u32 sBattleTerrainTiles_Pond[] = INCBIN_U32("graphics/battle/terrain_pond.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Pond[] = INCBIN_U32("graphics/battle/terrain_pond.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_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_Mountain[] = INCBIN_U32("graphics/battle/terrain_mountain.gbapal.lz"); -static const u32 sBattleTerrainTiles_Mountain[] = INCBIN_U32("graphics/battle/terrain_mountain.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Mountain[] = INCBIN_U32("graphics/battle/terrain_mountain.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_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_Cave[] = INCBIN_U32("graphics/battle/terrain_cave.gbapal.lz"); -static const u32 sBattleTerrainTiles_Cave[] = INCBIN_U32("graphics/battle/terrain_cave.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Cave[] = INCBIN_U32("graphics/battle/terrain_cave.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_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_Building[] = INCBIN_U32("graphics/battle/terrain_building.gbapal.lz"); -static const u32 sBattleTerrainTiles_Building[] = INCBIN_U32("graphics/battle/terrain_building.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Building[] = INCBIN_U32("graphics/battle/terrain_building.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_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_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.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Indoor[] = INCBIN_U32("graphics/battle/terrain_indoor.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 struct BattleBackground sBattleTerrainTable[] = { [BATTLE_TERRAIN_GRASS] = diff --git a/src/data/graphics/battle_terrain.h b/src/data/graphics/battle_terrain.h deleted file mode 100644 index f91c2d0d9..000000000 --- a/src/data/graphics/battle_terrain.h +++ /dev/null @@ -1,30 +0,0 @@ - -const u32 gFile_graphics_battle_terrain_plain_palette_palette[] = INCBIN_U32("graphics/battle_terrain/plain/palette.gbapal.lz"); - -const u32 gFile_graphics_battle_terrain_building_tiles_sheet[] = INCBIN_U32("graphics/battle_terrain/building/tiles.4bpp.lz"); - -const u32 gFile_graphics_battle_terrain_stadium_battle_frontier_palette[] = INCBIN_U32("graphics/battle_terrain/stadium/battle_frontier.gbapal.lz"); - -const u32 gFile_graphics_battle_terrain_building_map_tilemap[] = INCBIN_U32("graphics/battle_terrain/building/map.bin.lz"); - -const u32 gFile_graphics_battle_terrain_stadium_tiles_sheet[] = INCBIN_U32("graphics/battle_terrain/stadium/tiles.4bpp.lz"); -const u32 gFile_graphics_battle_terrain_stadium_map_tilemap[] = INCBIN_U32("graphics/battle_terrain/stadium/map.bin.lz"); - -const u32 gFile_graphics_battle_terrain_building_palette_palette[] = INCBIN_U32("graphics/battle_terrain/building/palette.gbapal.lz"); - -const u32 gFile_graphics_battle_terrain_water_kyogre_palette[] = INCBIN_U32("graphics/battle_terrain/water/kyogre.gbapal.lz"); -const u32 gFile_graphics_battle_terrain_cave_groudon_palette[] = INCBIN_U32("graphics/battle_terrain/cave/groudon.gbapal.lz"); - -const u32 gFile_graphics_battle_terrain_building_palette2_palette[] = INCBIN_U32("graphics/battle_terrain/building/palette2.gbapal.lz"); -const u32 gFile_graphics_battle_terrain_building_palette3_palette[] = INCBIN_U32("graphics/battle_terrain/building/palette3.gbapal.lz"); - -const u32 gFile_graphics_battle_terrain_stadium_palette1_palette[] = INCBIN_U32("graphics/battle_terrain/stadium/palette1.gbapal.lz"); -const u32 gFile_graphics_battle_terrain_stadium_palette2_palette[] = INCBIN_U32("graphics/battle_terrain/stadium/palette2.gbapal.lz"); -const u32 gFile_graphics_battle_terrain_stadium_palette3_palette[] = INCBIN_U32("graphics/battle_terrain/stadium/palette3.gbapal.lz"); -const u32 gFile_graphics_battle_terrain_stadium_palette4_palette[] = INCBIN_U32("graphics/battle_terrain/stadium/palette4.gbapal.lz"); -const u32 gFile_graphics_battle_terrain_stadium_palette5_palette[] = INCBIN_U32("graphics/battle_terrain/stadium/palette5.gbapal.lz"); -const u32 gFile_graphics_battle_terrain_stadium_palette6_palette[] = INCBIN_U32("graphics/battle_terrain/stadium/palette6.gbapal.lz"); -const u32 gFile_graphics_battle_terrain_stadium_palette7_palette[] = INCBIN_U32("graphics/battle_terrain/stadium/palette7.gbapal.lz"); - -const u32 gFile_graphics_battle_terrain_building_anim_tiles_sheet[] = INCBIN_U32("graphics/battle_terrain/building/anim_tiles.4bpp.lz"); -const u32 gFile_graphics_battle_terrain_building_anim_map_tilemap[] = INCBIN_U32("graphics/battle_terrain/building/anim_map.bin.lz"); diff --git a/src/data/graphics/battle_terrain_unused.h b/src/data/graphics/battle_terrain_unused.h new file mode 100644 index 000000000..b2024a8c2 --- /dev/null +++ b/src/data/graphics/battle_terrain_unused.h @@ -0,0 +1,32 @@ + +// All graphics in this file go completely unused. + +const u32 gUnusedBattleTerrain_Plain_Palette[] = INCBIN_U32("graphics/battle_terrain/unused/plain.gbapal.lz"); + +const u32 gUnusedBattleTerrain_Building_Tiles_Sheet[] = INCBIN_U32("graphics/battle_terrain/unused/building/tiles.4bpp.lz"); + +const u32 gUnusedBattleTerrain_Stadium_Battle_Frontier_Palette[] = INCBIN_U32("graphics/battle_terrain/unused/stadium/battle_frontier.gbapal.lz"); + +const u32 gUnusedBattleTerrain_Building_Map_Tilemap[] = INCBIN_U32("graphics/battle_terrain/unused/building/map.bin.lz"); + +const u32 gUnusedBattleTerrain_Stadium_Tiles_Sheet[] = INCBIN_U32("graphics/battle_terrain/unused/stadium/tiles.4bpp.lz"); +const u32 gUnusedBattleTerrain_Stadium_Map_Tilemap[] = INCBIN_U32("graphics/battle_terrain/unused/stadium/map.bin.lz"); + +const u32 gUnusedBattleTerrain_Building_Palette[] = INCBIN_U32("graphics/battle_terrain/unused/building/palette.gbapal.lz"); + +const u32 gUnusedBattleTerrain_Kyogre_Palette[] = INCBIN_U32("graphics/battle_terrain/unused/kyogre.gbapal.lz"); +const u32 gUnusedBattleTerrain_Groudon_Palette[] = INCBIN_U32("graphics/battle_terrain/unused/groudon.gbapal.lz"); + +const u32 gUnusedBattleTerrain_Building_Palette2[] = INCBIN_U32("graphics/battle_terrain/unused/building/palette2.gbapal.lz"); +const u32 gUnusedBattleTerrain_Building_Palette3[] = INCBIN_U32("graphics/battle_terrain/unused/building/palette3.gbapal.lz"); + +const u32 gUnusedBattleTerrain_Stadium_Palette1[] = INCBIN_U32("graphics/battle_terrain/unused/stadium/palette1.gbapal.lz"); +const u32 gUnusedBattleTerrain_Stadium_Palette2[] = INCBIN_U32("graphics/battle_terrain/unused/stadium/palette2.gbapal.lz"); +const u32 gUnusedBattleTerrain_Stadium_Palette3[] = INCBIN_U32("graphics/battle_terrain/unused/stadium/palette3.gbapal.lz"); +const u32 gUnusedBattleTerrain_Stadium_Palette4[] = INCBIN_U32("graphics/battle_terrain/unused/stadium/palette4.gbapal.lz"); +const u32 gUnusedBattleTerrain_Stadium_Palette5[] = INCBIN_U32("graphics/battle_terrain/unused/stadium/palette5.gbapal.lz"); +const u32 gUnusedBattleTerrain_Stadium_Palette6[] = INCBIN_U32("graphics/battle_terrain/unused/stadium/palette6.gbapal.lz"); +const u32 gUnusedBattleTerrain_Stadium_Palette7[] = INCBIN_U32("graphics/battle_terrain/unused/stadium/palette7.gbapal.lz"); + +const u32 gUnusedBattleTerrain_Building_Anim_Tiles_Sheet[] = INCBIN_U32("graphics/battle_terrain/unused/building/anim_tiles.4bpp.lz"); +const u32 gUnusedBattleTerrain_Building_Anim_Map_Tilemap[] = INCBIN_U32("graphics/battle_terrain/unused/building/anim_map.bin.lz"); diff --git a/src/graphics.c b/src/graphics.c index 56faf0b60..57fde9290 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -964,7 +964,7 @@ const u32 gFile_graphics_battle_transitions_vs_frame_palette[] = INCBIN_U32("gra const u32 gVsLettersGfx[] = INCBIN_U32("graphics/battle_transitions/vs.4bpp.lz"); -#include "data/graphics/battle_terrain.h" +#include "data/graphics/battle_terrain_unused.h" const u32 gBattleAnimSpriteGfx_FlyingDirt[] = INCBIN_U32("graphics/battle_anims/sprites/flying_dirt.4bpp.lz"); -- cgit v1.2.3 From 273e7fc0592b9a659e369017f44606f660c3ddd2 Mon Sep 17 00:00:00 2001 From: hjk321 Date: Wed, 31 Mar 2021 10:08:08 -0500 Subject: Index battle_records and berry_fix graphics --- graphics/battle_records/bg_tiles.bin | Bin 0 -> 2048 bytes graphics/battle_records/bg_tiles.png | Bin 135 -> 175 bytes graphics/battle_records/palette.pal | 19 ------------------- graphics/battle_records/tilemap.bin | Bin 2048 -> 0 bytes graphics/berry_fix/gba_small.png | Bin 2790 -> 2434 bytes graphics/berry_fix/gba_transfer.png | Bin 2311 -> 2005 bytes graphics/berry_fix/gba_transfer_error.png | Bin 1865 -> 1628 bytes graphics/berry_fix/gba_transfer_highlight.png | Bin 2207 -> 2000 bytes graphics/berry_fix/logo.png | Bin 2531 -> 2199 bytes graphics/berry_fix/window.png | Bin 1430 -> 1214 bytes src/battle_records.c | 6 +++--- 11 files changed, 3 insertions(+), 22 deletions(-) create mode 100644 graphics/battle_records/bg_tiles.bin delete mode 100644 graphics/battle_records/palette.pal delete mode 100644 graphics/battle_records/tilemap.bin diff --git a/graphics/battle_records/bg_tiles.bin b/graphics/battle_records/bg_tiles.bin new file mode 100644 index 000000000..a3691cfd7 Binary files /dev/null and b/graphics/battle_records/bg_tiles.bin differ diff --git a/graphics/battle_records/bg_tiles.png b/graphics/battle_records/bg_tiles.png index bbe9de321..824ec68b0 100644 Binary files a/graphics/battle_records/bg_tiles.png and b/graphics/battle_records/bg_tiles.png differ diff --git a/graphics/battle_records/palette.pal b/graphics/battle_records/palette.pal deleted file mode 100644 index d6994a324..000000000 --- a/graphics/battle_records/palette.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -74 74 74 -189 131 156 -230 156 213 -222 238 255 -230 246 255 -148 115 139 -197 213 222 -172 164 189 -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_records/tilemap.bin b/graphics/battle_records/tilemap.bin deleted file mode 100644 index a3691cfd7..000000000 Binary files a/graphics/battle_records/tilemap.bin and /dev/null differ diff --git a/graphics/berry_fix/gba_small.png b/graphics/berry_fix/gba_small.png index 59bfaf4d5..63f79cb49 100644 Binary files a/graphics/berry_fix/gba_small.png and b/graphics/berry_fix/gba_small.png differ diff --git a/graphics/berry_fix/gba_transfer.png b/graphics/berry_fix/gba_transfer.png index a741fe1b9..f8d49db21 100644 Binary files a/graphics/berry_fix/gba_transfer.png and b/graphics/berry_fix/gba_transfer.png differ diff --git a/graphics/berry_fix/gba_transfer_error.png b/graphics/berry_fix/gba_transfer_error.png index 766b9f28e..6c5f69ff5 100644 Binary files a/graphics/berry_fix/gba_transfer_error.png and b/graphics/berry_fix/gba_transfer_error.png differ diff --git a/graphics/berry_fix/gba_transfer_highlight.png b/graphics/berry_fix/gba_transfer_highlight.png index 25b47d036..e763bd62b 100644 Binary files a/graphics/berry_fix/gba_transfer_highlight.png and b/graphics/berry_fix/gba_transfer_highlight.png differ diff --git a/graphics/berry_fix/logo.png b/graphics/berry_fix/logo.png index ab91d5a26..120dd0f52 100644 Binary files a/graphics/berry_fix/logo.png and b/graphics/berry_fix/logo.png differ diff --git a/graphics/berry_fix/window.png b/graphics/berry_fix/window.png index 5e437e727..0ba517a6b 100644 Binary files a/graphics/berry_fix/window.png and b/graphics/berry_fix/window.png differ diff --git a/src/battle_records.c b/src/battle_records.c index a32276199..017c1078c 100644 --- a/src/battle_records.c +++ b/src/battle_records.c @@ -25,7 +25,7 @@ static void Task_WaitFadeIn(u8 taskId); static void Task_WaitButton(u8 taskId); static void Task_FadeOut(u8 taskId); static void Task_DestroyAndReturnToField(u8 taskId); -static void ClearWindowCommitAndRemove(u8 winddowId); +static void ClearWindowCommitAndRemove(u8 windowId); static void ResetGpu(void); static void StopAllRunningTasks(void); static void EnableDisplay(void); @@ -35,8 +35,8 @@ static void CommitWindow(u8 windowId); static void LoadFrameGfxOnBg(u8 bgId); static const u16 sTiles[] = INCBIN_U16("graphics/battle_records/bg_tiles.4bpp"); -static const u16 sPalette[] = INCBIN_U16("graphics/battle_records/palette.gbapal"); -static const u16 sTilemap[] = INCBIN_U16("graphics/battle_records/tilemap.bin"); +static const u16 sPalette[] = INCBIN_U16("graphics/battle_records/bg_tiles.gbapal"); +static const u16 sTilemap[] = INCBIN_U16("graphics/battle_records/bg_tiles.bin"); static const struct WindowTemplate sWindowTemplates[] = { { -- cgit v1.2.3 From 77b781b93a74c0cb2daa5c21f83f4c698f0c2bec Mon Sep 17 00:00:00 2001 From: hjk321 <37224753+hjk321@users.noreply.github.com> Date: Sat, 10 Apr 2021 09:02:36 -0500 Subject: Document and index berry_pouch --- graphics/berry_pouch/background.bin | Bin 0 -> 2048 bytes graphics/berry_pouch/background.pal | 51 +++++++++++++++++++++++++++++ graphics/berry_pouch/background.png | Bin 0 -> 491 bytes graphics/berry_pouch/background_female.pal | 19 +++++++++++ graphics/berry_pouch/berry_pouch.png | Bin 0 -> 782 bytes graphics/berry_pouch/unk_8E8560C.png | Bin 782 -> 0 bytes graphics/berry_pouch/unk_8E859D0.png | Bin 444 -> 0 bytes graphics/berry_pouch/unk_8E85BA4.pal | 51 ----------------------------- graphics/berry_pouch/unk_8E85BF4.pal | 19 ----------- graphics/berry_pouch/unk_8E85C1C.pal | 19 ----------- graphics/berry_pouch/unk_8E85C44.bin | Bin 2048 -> 0 bytes graphics_file_rules.mk | 4 +++ src/graphics.c | 12 +++---- 13 files changed, 80 insertions(+), 95 deletions(-) create mode 100644 graphics/berry_pouch/background.bin create mode 100644 graphics/berry_pouch/background.pal create mode 100644 graphics/berry_pouch/background.png create mode 100644 graphics/berry_pouch/background_female.pal create mode 100644 graphics/berry_pouch/berry_pouch.png delete mode 100644 graphics/berry_pouch/unk_8E8560C.png delete mode 100644 graphics/berry_pouch/unk_8E859D0.png delete mode 100644 graphics/berry_pouch/unk_8E85BA4.pal delete mode 100644 graphics/berry_pouch/unk_8E85BF4.pal delete mode 100644 graphics/berry_pouch/unk_8E85C1C.pal delete mode 100644 graphics/berry_pouch/unk_8E85C44.bin diff --git a/graphics/berry_pouch/background.bin b/graphics/berry_pouch/background.bin new file mode 100644 index 000000000..7c89a8bf0 Binary files /dev/null and b/graphics/berry_pouch/background.bin differ diff --git a/graphics/berry_pouch/background.pal b/graphics/berry_pouch/background.pal new file mode 100644 index 000000000..3398ff143 --- /dev/null +++ b/graphics/berry_pouch/background.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 65 90 +255 0 255 +41 57 82 +65 180 164 +255 0 255 +255 0 255 +106 205 197 +164 205 238 +189 238 255 +255 255 205 +180 189 180 +148 148 148 +238 230 172 +106 106 106 +106 156 238 +0 90 131 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +189 213 213 +238 255 255 +222 246 255 +255 255 255 +164 222 255 +16 172 222 +0 82 115 +0 115 139 +0 123 197 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +189 213 213 +238 255 255 +222 246 255 +255 255 255 +164 222 255 +24 82 180 +0 90 131 +24 82 180 +24 82 180 diff --git a/graphics/berry_pouch/background.png b/graphics/berry_pouch/background.png new file mode 100644 index 000000000..14113b2f9 Binary files /dev/null and b/graphics/berry_pouch/background.png differ diff --git a/graphics/berry_pouch/background_female.pal b/graphics/berry_pouch/background_female.pal new file mode 100644 index 000000000..e7bd18cbf --- /dev/null +++ b/graphics/berry_pouch/background_female.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 65 90 +255 0 255 +41 57 82 +213 139 115 +255 0 255 +255 0 255 +255 172 148 +164 205 238 +189 238 255 +255 255 205 +180 189 180 +148 148 148 +238 230 172 +106 106 106 +106 156 238 +0 90 131 diff --git a/graphics/berry_pouch/berry_pouch.png b/graphics/berry_pouch/berry_pouch.png new file mode 100644 index 000000000..bb714c130 Binary files /dev/null and b/graphics/berry_pouch/berry_pouch.png differ diff --git a/graphics/berry_pouch/unk_8E8560C.png b/graphics/berry_pouch/unk_8E8560C.png deleted file mode 100644 index bb714c130..000000000 Binary files a/graphics/berry_pouch/unk_8E8560C.png and /dev/null differ diff --git a/graphics/berry_pouch/unk_8E859D0.png b/graphics/berry_pouch/unk_8E859D0.png deleted file mode 100644 index 094b4ef39..000000000 Binary files a/graphics/berry_pouch/unk_8E859D0.png and /dev/null differ diff --git a/graphics/berry_pouch/unk_8E85BA4.pal b/graphics/berry_pouch/unk_8E85BA4.pal deleted file mode 100644 index 3398ff143..000000000 --- a/graphics/berry_pouch/unk_8E85BA4.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -0 65 90 -255 0 255 -41 57 82 -65 180 164 -255 0 255 -255 0 255 -106 205 197 -164 205 238 -189 238 255 -255 255 205 -180 189 180 -148 148 148 -238 230 172 -106 106 106 -106 156 238 -0 90 131 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -189 213 213 -238 255 255 -222 246 255 -255 255 255 -164 222 255 -16 172 222 -0 82 115 -0 115 139 -0 123 197 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -189 213 213 -238 255 255 -222 246 255 -255 255 255 -164 222 255 -24 82 180 -0 90 131 -24 82 180 -24 82 180 diff --git a/graphics/berry_pouch/unk_8E85BF4.pal b/graphics/berry_pouch/unk_8E85BF4.pal deleted file mode 100644 index e7bd18cbf..000000000 --- a/graphics/berry_pouch/unk_8E85BF4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 65 90 -255 0 255 -41 57 82 -213 139 115 -255 0 255 -255 0 255 -255 172 148 -164 205 238 -189 238 255 -255 255 205 -180 189 180 -148 148 148 -238 230 172 -106 106 106 -106 156 238 -0 90 131 diff --git a/graphics/berry_pouch/unk_8E85C1C.pal b/graphics/berry_pouch/unk_8E85C1C.pal deleted file mode 100644 index 87d0fc7fb..000000000 --- a/graphics/berry_pouch/unk_8E85C1C.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -222 222 90 -98 115 123 -255 205 156 -230 189 139 -213 164 115 -189 139 90 -156 82 0 -115 57 0 -197 205 213 -246 115 0 -222 57 0 -230 148 98 -255 172 123 -222 230 230 -49 57 57 -255 255 255 diff --git a/graphics/berry_pouch/unk_8E85C44.bin b/graphics/berry_pouch/unk_8E85C44.bin deleted file mode 100644 index 7c89a8bf0..000000000 Binary files a/graphics/berry_pouch/unk_8E85C44.bin and /dev/null differ diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index f3bed2da7..d064c63c8 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -25,6 +25,7 @@ CREDITSGFXDIR := graphics/credits ITEMMENUGFXDIR := graphics/item_menu INTROGFXDIR := graphics/intro BATTLETERRAINGFXDIR := graphics/battle_terrain +BERRYPOUCHGFXDIR := graphics/berry_pouch types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark contest_types := cool beauty cute smart tough @@ -569,3 +570,6 @@ $(BATTLETERRAINGFXDIR)/terrain_underwater.4bpp: %.4bpp: %.png $(BATTLETERRAINGFXDIR)/terrain_water.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 81 + +$(BERRYPOUCHGFXDIR)/background.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 52 diff --git a/src/graphics.c b/src/graphics.c index 57fde9290..87c73b014 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1136,12 +1136,12 @@ const u8 gItemPcTiles[] = INCBIN_U8("graphics/item_pc/unk_8E85090.4bpp.lz"); const u32 gItemPcBgPals[] = INCBIN_U32("graphics/item_pc/unk_8E85408.gbapal.lz"); const u8 gItemPcTilemap[] = INCBIN_U8("graphics/item_pc/unk_8E85458.bin.lz"); -const u32 gBerryPouchSpriteTiles[] = INCBIN_U32("graphics/berry_pouch/unk_8E8560C.4bpp.lz"); -const u8 gBerryPouchBgGfx[] = INCBIN_U8("graphics/berry_pouch/unk_8E859D0.4bpp.lz"); -const u32 gBerryPouchBgPals[] = INCBIN_U32("graphics/berry_pouch/unk_8E85BA4.gbapal.lz"); -const u32 gBerryPouchBgPal0FemaleOverride[] = INCBIN_U32("graphics/berry_pouch/unk_8E85BF4.gbapal.lz"); -const u32 gBerryPouchSpritePalette[] = INCBIN_U32("graphics/berry_pouch/unk_8E85C1C.gbapal.lz"); -const u8 gBerryPouchBg1Tilemap[] = INCBIN_U8("graphics/berry_pouch/unk_8E85C44.bin.lz"); +const u32 gBerryPouchSpriteTiles[] = INCBIN_U32("graphics/berry_pouch/berry_pouch.4bpp.lz"); +const u8 gBerryPouchBgGfx[] = INCBIN_U8("graphics/berry_pouch/background.4bpp.lz"); +const u32 gBerryPouchBgPals[] = INCBIN_U32("graphics/berry_pouch/background.gbapal.lz"); +const u32 gBerryPouchBgPal0FemaleOverride[] = INCBIN_U32("graphics/berry_pouch/background_female.gbapal.lz"); +const u32 gBerryPouchSpritePalette[] = INCBIN_U32("graphics/berry_pouch/berry_pouch.gbapal.lz"); +const u8 gBerryPouchBg1Tilemap[] = INCBIN_U8("graphics/berry_pouch/background.bin.lz"); const u32 gBuyMenuFrame_Gfx[] = INCBIN_U32("graphics/shop_menu/shop_menu.4bpp.lz"); const u32 gBuyMenuFrame_Tilemap[] = INCBIN_U32("graphics/shop_menu/shop_tilemap.bin"); -- cgit v1.2.3 From 117c8db279f9832e07e6dfa6071edb414729b127 Mon Sep 17 00:00:00 2001 From: hjk321 <37224753+hjk321@users.noreply.github.com> Date: Sat, 10 Apr 2021 09:43:46 -0500 Subject: Document and index contest and diploma gfx --- graphics/contest/misc.pal | 259 +++++++++++++++++++++++++++++++++++++++ graphics/contest/misc.png | Bin 1961 -> 2014 bytes graphics/contest/misc_2.pal | 259 --------------------------------------- graphics/contest/misc_2.png | Bin 1565 -> 1610 bytes graphics/diploma/diploma.bin | Bin 0 -> 4096 bytes graphics/diploma/diploma.pal | 35 ++++++ graphics/diploma/diploma.png | Bin 0 -> 2924 bytes graphics/diploma/unk_84147C0.png | Bin 2863 -> 0 bytes graphics/diploma/unk_84154E8.bin | Bin 4096 -> 0 bytes graphics/diploma/unk_8415954.pal | 35 ------ src/diploma.c | 12 +- src/graphics.c | 32 ++--- 12 files changed, 316 insertions(+), 316 deletions(-) create mode 100644 graphics/contest/misc.pal delete mode 100644 graphics/contest/misc_2.pal create mode 100644 graphics/diploma/diploma.bin create mode 100644 graphics/diploma/diploma.pal create mode 100644 graphics/diploma/diploma.png delete mode 100644 graphics/diploma/unk_84147C0.png delete mode 100644 graphics/diploma/unk_84154E8.bin delete mode 100644 graphics/diploma/unk_8415954.pal diff --git a/graphics/contest/misc.pal b/graphics/contest/misc.pal new file mode 100644 index 000000000..869aef9e1 --- /dev/null +++ b/graphics/contest/misc.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +0 0 0 +255 255 255 +189 189 197 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +255 106 115 +255 57 57 +205 32 0 +246 213 0 +255 123 98 +156 180 90 +164 148 57 +90 106 139 +180 172 82 +0 0 0 +255 255 255 +189 189 197 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +164 222 255 +106 148 255 +24 57 205 +246 213 0 +255 123 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +189 189 197 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +255 197 255 +255 139 255 +213 0 139 +246 213 0 +255 123 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +189 189 197 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +180 255 197 +148 255 164 +65 172 57 +246 213 0 +255 123 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +189 189 197 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +255 255 164 +246 213 0 +230 106 0 +246 213 0 +255 123 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +197 255 255 +255 255 255 +213 213 213 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +164 222 255 +106 148 255 +49 82 255 +180 255 197 +148 255 164 +65 172 57 +0 0 0 +0 0 0 +0 0 0 +197 255 255 +255 255 255 +213 213 213 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +255 139 230 +255 139 230 +255 49 156 +255 255 0 +255 255 0 +189 172 0 +41 49 90 +41 49 90 +0 0 0 +197 123 131 +255 255 255 +230 246 255 +205 238 255 +180 238 255 +156 230 255 +139 230 255 +255 205 230 +255 255 139 +255 230 255 +255 255 197 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +197 255 255 +255 255 255 +213 213 213 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +255 172 197 +255 172 172 +255 180 148 +255 189 123 +255 197 98 +255 205 82 +156 156 156 +156 156 156 +156 156 156 +197 255 255 +255 255 255 +213 213 213 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +164 222 255 +106 148 255 +49 82 255 +180 255 197 +148 255 164 +65 172 57 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +164 222 255 +106 230 222 +49 238 189 +0 255 156 +0 255 156 +82 255 98 +164 255 49 +255 255 0 +255 172 16 +255 90 32 +255 8 57 +230 57 106 +205 115 156 +180 164 205 +164 222 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 +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 +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 +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 +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 +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 +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/contest/misc.png b/graphics/contest/misc.png index 73f8054db..a8fdb3e0f 100644 Binary files a/graphics/contest/misc.png and b/graphics/contest/misc.png differ diff --git a/graphics/contest/misc_2.pal b/graphics/contest/misc_2.pal deleted file mode 100644 index 869aef9e1..000000000 --- a/graphics/contest/misc_2.pal +++ /dev/null @@ -1,259 +0,0 @@ -JASC-PAL -0100 -256 -0 0 0 -255 255 255 -189 189 197 -131 131 139 -98 98 123 -65 74 106 -41 49 90 -255 106 115 -255 57 57 -205 32 0 -246 213 0 -255 123 98 -156 180 90 -164 148 57 -90 106 139 -180 172 82 -0 0 0 -255 255 255 -189 189 197 -131 131 139 -98 98 123 -65 74 106 -41 49 90 -164 222 255 -106 148 255 -24 57 205 -246 213 0 -255 123 98 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -255 255 255 -189 189 197 -131 131 139 -98 98 123 -65 74 106 -41 49 90 -255 197 255 -255 139 255 -213 0 139 -246 213 0 -255 123 98 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -255 255 255 -189 189 197 -131 131 139 -98 98 123 -65 74 106 -41 49 90 -180 255 197 -148 255 164 -65 172 57 -246 213 0 -255 123 98 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -255 255 255 -189 189 197 -131 131 139 -98 98 123 -65 74 106 -41 49 90 -255 255 164 -246 213 0 -230 106 0 -246 213 0 -255 123 98 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -197 255 255 -255 255 255 -213 213 213 -131 131 139 -98 98 123 -65 74 106 -41 49 90 -164 222 255 -106 148 255 -49 82 255 -180 255 197 -148 255 164 -65 172 57 -0 0 0 -0 0 0 -0 0 0 -197 255 255 -255 255 255 -213 213 213 -131 131 139 -98 98 123 -65 74 106 -41 49 90 -255 139 230 -255 139 230 -255 49 156 -255 255 0 -255 255 0 -189 172 0 -41 49 90 -41 49 90 -0 0 0 -197 123 131 -255 255 255 -230 246 255 -205 238 255 -180 238 255 -156 230 255 -139 230 255 -255 205 230 -255 255 139 -255 230 255 -255 255 197 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -197 255 255 -255 255 255 -213 213 213 -131 131 139 -98 98 123 -65 74 106 -41 49 90 -255 172 197 -255 172 172 -255 180 148 -255 189 123 -255 197 98 -255 205 82 -156 156 156 -156 156 156 -156 156 156 -197 255 255 -255 255 255 -213 213 213 -131 131 139 -98 98 123 -65 74 106 -41 49 90 -164 222 255 -106 148 255 -49 82 255 -180 255 197 -148 255 164 -65 172 57 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -164 222 255 -106 230 222 -49 238 189 -0 255 156 -0 255 156 -82 255 98 -164 255 49 -255 255 0 -255 172 16 -255 90 32 -255 8 57 -230 57 106 -205 115 156 -180 164 205 -164 222 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 -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 -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 -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 -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 -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 -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/contest/misc_2.png b/graphics/contest/misc_2.png index 92dd92bf7..2d599d0ec 100644 Binary files a/graphics/contest/misc_2.png and b/graphics/contest/misc_2.png differ diff --git a/graphics/diploma/diploma.bin b/graphics/diploma/diploma.bin new file mode 100644 index 000000000..38c32e5b2 Binary files /dev/null and b/graphics/diploma/diploma.bin differ diff --git a/graphics/diploma/diploma.pal b/graphics/diploma/diploma.pal new file mode 100644 index 000000000..3ba0bc65d --- /dev/null +++ b/graphics/diploma/diploma.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +123 205 172 +255 0 255 +222 230 139 +205 246 156 +230 222 164 +197 238 172 +205 230 213 +213 246 172 +205 230 164 +238 255 156 +197 238 172 +222 230 238 +222 238 238 +213 246 172 +246 238 172 +238 238 139 +123 205 172 +255 0 255 +255 0 255 +246 246 205 +230 230 148 +230 230 148 +230 230 148 +238 238 164 +222 222 148 +255 238 180 +238 230 164 +238 222 180 +246 246 164 +246 230 131 +246 230 172 +222 238 222 diff --git a/graphics/diploma/diploma.png b/graphics/diploma/diploma.png new file mode 100644 index 000000000..2bf9cb27a Binary files /dev/null and b/graphics/diploma/diploma.png differ diff --git a/graphics/diploma/unk_84147C0.png b/graphics/diploma/unk_84147C0.png deleted file mode 100644 index ac6e113f8..000000000 Binary files a/graphics/diploma/unk_84147C0.png and /dev/null differ diff --git a/graphics/diploma/unk_84154E8.bin b/graphics/diploma/unk_84154E8.bin deleted file mode 100644 index 38c32e5b2..000000000 Binary files a/graphics/diploma/unk_84154E8.bin and /dev/null differ diff --git a/graphics/diploma/unk_8415954.pal b/graphics/diploma/unk_8415954.pal deleted file mode 100644 index 3ba0bc65d..000000000 --- a/graphics/diploma/unk_8415954.pal +++ /dev/null @@ -1,35 +0,0 @@ -JASC-PAL -0100 -32 -123 205 172 -255 0 255 -222 230 139 -205 246 156 -230 222 164 -197 238 172 -205 230 213 -213 246 172 -205 230 164 -238 255 156 -197 238 172 -222 230 238 -222 238 238 -213 246 172 -246 238 172 -238 238 139 -123 205 172 -255 0 255 -255 0 255 -246 246 205 -230 230 148 -230 230 148 -230 230 148 -238 238 164 -222 222 148 -255 238 180 -238 230 164 -238 222 180 -246 246 164 -246 230 131 -246 230 172 -222 238 222 diff --git a/src/diploma.c b/src/diploma.c index c43eff105..a8ca579ba 100644 --- a/src/diploma.c +++ b/src/diploma.c @@ -29,9 +29,9 @@ static void Task_WaitForExit(u8); static void Task_DiplomaInit(u8); static void Task_DiplomaReturnToOverworld(u8); -static const u32 gUnknown_84147C0[] = INCBIN_U32("graphics/diploma/unk_84147C0.4bpp.lz"); -static const u32 gUnknown_84154E8[] = INCBIN_U32("graphics/diploma/unk_84154E8.bin.lz"); -static const u16 gUnknown_8415954[] = INCBIN_U16("graphics/diploma/unk_8415954.gbapal"); +static const u32 gDiplomaGfx[] = INCBIN_U32("graphics/diploma/diploma.4bpp.lz"); +static const u32 gDiplomaTilemap[] = INCBIN_U32("graphics/diploma/diploma.bin.lz"); +static const u16 gDiplomaPal[] = INCBIN_U16("graphics/diploma/diploma.gbapal"); static const u8 gUnknown_8415994[] = _("{HIGHLIGHT TRANSPARENT}プレイヤー"); static const u8 gUnknown_841599D[] = _("{HIGHLIGHT TRANSPARENT}さま"); @@ -118,7 +118,7 @@ static void Task_DiplomaInit(u8 taskId) } break; case 3: - CopyToBgTilemapBuffer(1, gUnknown_84154E8, 0, 0); + CopyToBgTilemapBuffer(1, gDiplomaTilemap, 0, 0); break; case 4: if (HasAllMons()) @@ -231,7 +231,7 @@ static u8 DiplomaLoadGfx(void) ResetTempTileDataBuffers(); break; case 1: - DecompressAndCopyTileDataToVram(1, gUnknown_84147C0, 0, 0, 0); + DecompressAndCopyTileDataToVram(1, gDiplomaGfx, 0, 0, 0); break; case 2: if (!(FreeTempTileDataBuffersIfPossible() == 1)) @@ -240,7 +240,7 @@ static u8 DiplomaLoadGfx(void) } return 0; case 3: - LoadPalette(gUnknown_8415954, 0, 0x40); + LoadPalette(gDiplomaPal, 0, 0x40); default: return 1; } diff --git a/src/graphics.c b/src/graphics.c index 87c73b014..7769e576c 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -461,25 +461,25 @@ const u32 gFile_graphics_unknown_unknown_D17AB8_tilemap[] = INCBIN_U32("graphics const u32 gContestMiscGfx[] = INCBIN_U32("graphics/contest/misc.4bpp.lz"); -const u32 gFile_graphics_contest_audience_sheet[] = INCBIN_U32("graphics/contest/audience.4bpp.lz"); +const u32 gContestAudienceGfx[] = INCBIN_U32("graphics/contest/audience.4bpp.lz"); -const u32 gFile_graphics_contest_faces_sheet[] = INCBIN_U32("graphics/contest/faces.4bpp.lz"); +const u32 gContestFacesSheetGfx[] = INCBIN_U32("graphics/contest/faces.4bpp.lz"); -const u32 gFile_graphics_contest_judge_symbols_sheet[] = INCBIN_U32("graphics/contest/judge_symbols.4bpp.lz"); -const u32 gFile_graphics_contest_judge_symbols_palette[] = INCBIN_U32("graphics/contest/judge_symbols.gbapal.lz"); +const u32 gContestJudgeSymbolsGfx[] = INCBIN_U32("graphics/contest/judge_symbols.4bpp.lz"); +const u32 gContestJudgeSymbolsPal[] = INCBIN_U32("graphics/contest/judge_symbols.gbapal.lz"); -const u8 gFile_graphics_contest_heart[] = INCBIN_U8("graphics/contest/heart.4bpp"); +const u8 gContestHeartGfx[] = INCBIN_U8("graphics/contest/heart.4bpp"); const u32 gFile_graphics_unknown_unknown_D196E4_sheet[] = INCBIN_U32("graphics/unknown/unknown_D196E4.4bpp.lz"); const u32 gFile_graphics_unknown_unknown_D196E4_palette[] = INCBIN_U32("graphics/unknown/unknown_D196E4.gbapal.lz"); -const u32 gUnknown_8D197FC[] = INCBIN_U32("graphics/contest/misc_2.4bpp.lz"); +const u32 gContestMisc2Gfx[] = INCBIN_U32("graphics/contest/misc_2.4bpp.lz"); -const u32 gFile_graphics_contest_misc_2_tilemap_1_tilemap[] = INCBIN_U32("graphics/contest/misc_2_tilemap_1.bin.lz"); -const u32 gFile_graphics_contest_misc_2_tilemap_2_tilemap[] = INCBIN_U32("graphics/contest/misc_2_tilemap_2.bin.lz"); -const u32 gFile_graphics_contest_misc_2_tilemap_3_tilemap[] = INCBIN_U32("graphics/contest/misc_2_tilemap_3.bin.lz"); +const u32 gContestMiscTilemap1[] = INCBIN_U32("graphics/contest/misc_2_tilemap_1.bin.lz"); +const u32 gContestMiscTilemap2[] = INCBIN_U32("graphics/contest/misc_2_tilemap_2.bin.lz"); +const u32 gContestMiscTilemap3[] = INCBIN_U32("graphics/contest/misc_2_tilemap_3.bin.lz"); -const u32 gFile_graphics_contest_misc_2_palette[] = INCBIN_U32("graphics/contest/misc_2.gbapal.lz"); +const u32 gContestMiscPal[] = INCBIN_U32("graphics/contest/misc.gbapal.lz"); const u32 gBattleAnimSpriteGfx_Impact[] = INCBIN_U32("graphics/battle_anims/sprites/impact.4bpp.lz"); const u32 gBattleAnimSpritePal_Impact[] = INCBIN_U32("graphics/battle_anims/sprites/impact.gbapal.lz"); @@ -582,8 +582,8 @@ const u32 gBattleAnimSpritePal_BlackBall2[] = INCBIN_U32("graphics/battle_anims/ const u32 gBattleAnimSpritePal_PurpleGasCloud[] = INCBIN_U32("graphics/battle_anims/sprites/purple_gas_cloud.gbapal.lz"); -const u32 gFile_graphics_contest_judge_sheet[] = INCBIN_U32("graphics/contest/judge.4bpp.lz"); -const u32 gFile_graphics_contest_judge_palette[] = INCBIN_U32("graphics/contest/judge.gbapal.lz"); +const u32 gContestJudgeGfx[] = INCBIN_U32("graphics/contest/judge.4bpp.lz"); +const u32 gContestJudgePal[] = INCBIN_U32("graphics/contest/judge.gbapal.lz"); const u32 gBattleAnimSpriteGfx_Spark[] = INCBIN_U32("graphics/battle_anims/sprites/spark.4bpp.lz"); const u32 gBattleAnimSpritePal_Spark[] = INCBIN_U32("graphics/battle_anims/sprites/spark.gbapal.lz"); @@ -984,8 +984,8 @@ const u32 gBattleAnimSpriteGfx_IcicleSpear[] = INCBIN_U32("graphics/battle_anims const u32 gBattleAnimSpritePal_IcicleSpear[] = INCBIN_U32("graphics/battle_anims/sprites/icicle_spear.gbapal.lz"); const u32 gContestNextTurnGfx[] = INCBIN_U32("graphics/contest/next_turn.4bpp.lz"); -const u8 gFile_graphics_contest_nextturn_numbers[] = INCBIN_U8("graphics/contest/next_turn_numbers.4bpp"); -const u8 gFile_graphics_contest_nextturn_random[] = INCBIN_U8("graphics/contest/next_turn_random.4bpp"); +const u8 gContestNextTurnNumbersGfx[] = INCBIN_U8("graphics/contest/next_turn_numbers.4bpp"); +const u8 gContestNextTurnRandomGfx[] = INCBIN_U8("graphics/contest/next_turn_random.4bpp"); const u32 gBattleAnimSpriteGfx_GlowyRedOrb[] = INCBIN_U32("graphics/battle_anims/sprites/glowy_red_orb.4bpp.lz"); const u32 gBattleAnimSpritePal_GlowyRedOrb[] = INCBIN_U32("graphics/battle_anims/sprites/glowy_red_orb.gbapal.lz"); @@ -994,9 +994,9 @@ const u32 gBattleAnimSpritePal_SleepPowder[] = INCBIN_U32("graphics/battle_anims const u32 gBattleAnimSpritePal_StunSpore[] = INCBIN_U32("graphics/battle_anims/sprites/stun_spore.gbapal.lz"); const u32 gContestApplauseGfx[] = INCBIN_U32("graphics/contest/applause.4bpp.lz"); -const u8 gFile_graphics_contest_applause_meter[] = INCBIN_U8("graphics/contest/applause_meter.4bpp"); +const u8 gContestApplauseMeterGfx[] = INCBIN_U8("graphics/contest/applause_meter.4bpp"); -const u16 gFile_graphics_contest_nextturn[] = INCBIN_U16("graphics/contest/next_turn.gbapal"); +const u16 gContestNextTurnPal[] = INCBIN_U16("graphics/contest/next_turn.gbapal"); const u32 gBattleAnimSpriteGfx_Splash[] = INCBIN_U32("graphics/battle_anims/sprites/splash.4bpp.lz"); const u32 gBattleAnimSpritePal_Splash[] = INCBIN_U32("graphics/battle_anims/sprites/splash.gbapal.lz"); -- cgit v1.2.3 From bd21bb41ab2cffcaac283c192efe6b5895a27d11 Mon Sep 17 00:00:00 2001 From: hjk321 <37224753+hjk321@users.noreply.github.com> Date: Sat, 10 Apr 2021 15:28:41 -0500 Subject: Index some door animations --- graphics/door_anims/cable_club.png | Bin 392 -> 277 bytes graphics/door_anims/cerulean.png | Bin 388 -> 273 bytes graphics/door_anims/cinnabar_lab.png | Bin 368 -> 253 bytes graphics/door_anims/dept_store_elevator.png | Bin 352 -> 239 bytes graphics/door_anims/four_island_day_care.png | Bin 385 -> 270 bytes graphics/door_anims/fuchsia.png | Bin 386 -> 272 bytes graphics/door_anims/lavender.png | Bin 381 -> 266 bytes graphics/door_anims/oaks_lab.png | Bin 391 -> 276 bytes 8 files changed, 0 insertions(+), 0 deletions(-) diff --git a/graphics/door_anims/cable_club.png b/graphics/door_anims/cable_club.png index 792c23715..0d8b53505 100644 Binary files a/graphics/door_anims/cable_club.png and b/graphics/door_anims/cable_club.png differ diff --git a/graphics/door_anims/cerulean.png b/graphics/door_anims/cerulean.png index 51278be20..fe7b5cdac 100644 Binary files a/graphics/door_anims/cerulean.png and b/graphics/door_anims/cerulean.png differ diff --git a/graphics/door_anims/cinnabar_lab.png b/graphics/door_anims/cinnabar_lab.png index 3d0e00e7f..bf05d510d 100644 Binary files a/graphics/door_anims/cinnabar_lab.png and b/graphics/door_anims/cinnabar_lab.png differ diff --git a/graphics/door_anims/dept_store_elevator.png b/graphics/door_anims/dept_store_elevator.png index 0afbb9e2c..c9c948394 100644 Binary files a/graphics/door_anims/dept_store_elevator.png and b/graphics/door_anims/dept_store_elevator.png differ diff --git a/graphics/door_anims/four_island_day_care.png b/graphics/door_anims/four_island_day_care.png index 38af4eff8..a92b060dc 100644 Binary files a/graphics/door_anims/four_island_day_care.png and b/graphics/door_anims/four_island_day_care.png differ diff --git a/graphics/door_anims/fuchsia.png b/graphics/door_anims/fuchsia.png index ce1ef667d..1be60c3c2 100644 Binary files a/graphics/door_anims/fuchsia.png and b/graphics/door_anims/fuchsia.png differ diff --git a/graphics/door_anims/lavender.png b/graphics/door_anims/lavender.png index a650aaf27..00ad381fe 100644 Binary files a/graphics/door_anims/lavender.png and b/graphics/door_anims/lavender.png differ diff --git a/graphics/door_anims/oaks_lab.png b/graphics/door_anims/oaks_lab.png index 7e49b6266..c8bc9ebea 100644 Binary files a/graphics/door_anims/oaks_lab.png and b/graphics/door_anims/oaks_lab.png differ -- cgit v1.2.3 From e3e7a7423a3bea1cb5e8715278e3836f625842dc Mon Sep 17 00:00:00 2001 From: hjk321 <37224753+hjk321@users.noreply.github.com> Date: Sat, 10 Apr 2021 15:47:58 -0500 Subject: Document and index evolution_scene --- graphics/evolution_scene/bg.png | Bin 1588 -> 1668 bytes graphics/evolution_scene/unknown_5B4114.pal | 19 ------------------- graphics/evolution_scene/unref_83F7D80.bin | Bin 1664 -> 0 bytes graphics/evolution_scene/unused.pal | 19 +++++++++++++++++++ graphics/evolution_scene/unused_tilemap.bin | Bin 0 -> 1664 bytes src/evolution_scene.c | 4 ++-- 6 files changed, 21 insertions(+), 21 deletions(-) delete mode 100644 graphics/evolution_scene/unknown_5B4114.pal delete mode 100644 graphics/evolution_scene/unref_83F7D80.bin create mode 100644 graphics/evolution_scene/unused.pal create mode 100644 graphics/evolution_scene/unused_tilemap.bin diff --git a/graphics/evolution_scene/bg.png b/graphics/evolution_scene/bg.png index c9e84c58e..673077feb 100644 Binary files a/graphics/evolution_scene/bg.png and b/graphics/evolution_scene/bg.png differ diff --git a/graphics/evolution_scene/unknown_5B4114.pal b/graphics/evolution_scene/unknown_5B4114.pal deleted file mode 100644 index 2cd4981fd..000000000 --- a/graphics/evolution_scene/unknown_5B4114.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -90 90 90 -98 106 106 -115 123 123 -131 131 131 -148 148 148 -156 164 164 -172 172 172 -189 189 189 -197 205 205 -213 213 213 -230 230 230 -246 246 246 -255 255 255 -0 0 0 -0 0 0 diff --git a/graphics/evolution_scene/unref_83F7D80.bin b/graphics/evolution_scene/unref_83F7D80.bin deleted file mode 100644 index b2b300184..000000000 Binary files a/graphics/evolution_scene/unref_83F7D80.bin and /dev/null differ diff --git a/graphics/evolution_scene/unused.pal b/graphics/evolution_scene/unused.pal new file mode 100644 index 000000000..2cd4981fd --- /dev/null +++ b/graphics/evolution_scene/unused.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +90 90 90 +98 106 106 +115 123 123 +131 131 131 +148 148 148 +156 164 164 +172 172 172 +189 189 189 +197 205 205 +213 213 213 +230 230 230 +246 246 246 +255 255 255 +0 0 0 +0 0 0 diff --git a/graphics/evolution_scene/unused_tilemap.bin b/graphics/evolution_scene/unused_tilemap.bin new file mode 100644 index 000000000..b2b300184 Binary files /dev/null and b/graphics/evolution_scene/unused_tilemap.bin differ diff --git a/src/evolution_scene.c b/src/evolution_scene.c index 4b85e6e67..d2d6309f9 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -59,12 +59,12 @@ static void Task_MovingBackgroundPos(u8 taskId); static void ResetBgRegsAfterMovingBackgroundCancel(void); // const data -static const u16 sUnrefPal_83F6C90[] = INCBIN_U16("graphics/evolution_scene/unknown_5B4114.gbapal"); +static const u16 sUnusedPal[] = INCBIN_U16("graphics/evolution_scene/unused.gbapal"); static const u32 sMovingBackgroundTiles[] = INCBIN_U32("graphics/evolution_scene/bg.4bpp.lz"); static const u32 sMovingBackgroundMap1[] = INCBIN_U32("graphics/evolution_scene/bg.bin.lz"); static const u32 sMovingBackgroundMap2[] = INCBIN_U32("graphics/evolution_scene/bg2.bin.lz"); static const u16 sBlackPalette[] = INCBIN_U16("graphics/evolution_scene/gray_transition_intro.gbapal"); -static const u16 unref_83F7D80[] = INCBIN_U16("graphics/evolution_scene/unref_83F7D80.bin"); +static const u16 sUnusedTilemap[] = INCBIN_U16("graphics/evolution_scene/unused_tilemap.bin"); static const u16 sMovingBgPals[] = INCBIN_U16("graphics/evolution_scene/transition.gbapal"); static const u8 sText_ShedinjaJapaneseName[] = _("ヌケニン"); -- cgit v1.2.3 From dc59d5ac4fb0deeaf4068f91126a1e1835067299 Mon Sep 17 00:00:00 2001 From: hjk321 <37224753+hjk321@users.noreply.github.com> Date: Sat, 10 Apr 2021 20:12:35 -0500 Subject: Document and index fame_checker and field_effects gfx --- graphics/fame_checker/bg.png | Bin 906 -> 955 bytes graphics/fame_checker/bill.pal | 19 ------------------- graphics/fame_checker/cursor.pal | 19 ------------------- graphics/fame_checker/daisy.pal | 19 ------------------- graphics/fame_checker/mr_fuji.pal | 19 ------------------- graphics/fame_checker/prof_oak.pal | 19 ------------------- graphics/fame_checker/spinning_pokeball.pal | 19 ------------------- graphics/fame_checker/spinning_pokeball.png | Bin 297 -> 284 bytes graphics/field_effects/flash_effect_tiles.png | Bin 199 -> 258 bytes graphics/field_effects/new_game_oak.png | Bin 0 -> 789 bytes graphics/field_effects/pokeball.png | Bin 0 -> 155 bytes graphics/field_effects/unk_83CA770.png | Bin 789 -> 0 bytes graphics/field_effects/unk_83CAF90.png | Bin 168 -> 0 bytes graphics/field_effects/unk_83CAFB0.pal | 19 ------------------- src/field_effect.c | 12 ++++++------ 15 files changed, 6 insertions(+), 139 deletions(-) delete mode 100644 graphics/fame_checker/bill.pal delete mode 100644 graphics/fame_checker/cursor.pal delete mode 100644 graphics/fame_checker/daisy.pal delete mode 100644 graphics/fame_checker/mr_fuji.pal delete mode 100644 graphics/fame_checker/prof_oak.pal delete mode 100644 graphics/fame_checker/spinning_pokeball.pal create mode 100644 graphics/field_effects/new_game_oak.png create mode 100644 graphics/field_effects/pokeball.png delete mode 100644 graphics/field_effects/unk_83CA770.png delete mode 100644 graphics/field_effects/unk_83CAF90.png delete mode 100644 graphics/field_effects/unk_83CAFB0.pal diff --git a/graphics/fame_checker/bg.png b/graphics/fame_checker/bg.png index ed1a9a0f8..5116e4480 100644 Binary files a/graphics/fame_checker/bg.png and b/graphics/fame_checker/bg.png differ diff --git a/graphics/fame_checker/bill.pal b/graphics/fame_checker/bill.pal deleted file mode 100644 index 485e27c48..000000000 --- a/graphics/fame_checker/bill.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 230 205 -230 189 156 -205 156 115 -106 74 57 -180 139 213 -139 98 172 -98 65 106 -213 189 131 -189 164 98 -139 123 74 -180 139 115 -156 106 82 -90 74 49 -255 255 255 -0 0 0 diff --git a/graphics/fame_checker/cursor.pal b/graphics/fame_checker/cursor.pal deleted file mode 100644 index 212d9eb69..000000000 --- a/graphics/fame_checker/cursor.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -246 222 82 -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 -0 0 0 -246 148 41 -255 82 0 diff --git a/graphics/fame_checker/daisy.pal b/graphics/fame_checker/daisy.pal deleted file mode 100644 index adf46bf14..000000000 --- a/graphics/fame_checker/daisy.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 222 205 -238 180 148 -197 139 106 -172 123 98 -213 172 115 -156 123 74 -90 82 65 -205 115 98 -164 213 156 -115 172 106 -90 123 82 -222 230 255 -164 172 197 -255 255 255 -0 0 0 diff --git a/graphics/fame_checker/mr_fuji.pal b/graphics/fame_checker/mr_fuji.pal deleted file mode 100644 index e6dcabf2f..000000000 --- a/graphics/fame_checker/mr_fuji.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 222 205 -238 180 148 -197 139 106 -115 90 65 -222 164 82 -180 139 65 -148 106 57 -172 164 189 -255 230 131 -230 205 106 -238 131 90 -90 90 106 -213 205 213 -255 255 255 -0 0 0 diff --git a/graphics/fame_checker/prof_oak.pal b/graphics/fame_checker/prof_oak.pal deleted file mode 100644 index eb6f2f18b..000000000 --- a/graphics/fame_checker/prof_oak.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 222 205 -238 180 148 -197 139 106 -106 74 74 -139 156 164 -205 164 205 -164 123 164 -82 82 57 -213 213 222 -123 123 82 -115 115 115 -197 189 131 -156 156 90 -255 255 255 -0 0 0 diff --git a/graphics/fame_checker/spinning_pokeball.pal b/graphics/fame_checker/spinning_pokeball.pal deleted file mode 100644 index dac232f78..000000000 --- a/graphics/fame_checker/spinning_pokeball.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -106 106 106 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -139 139 139 -189 189 189 -205 205 205 -238 238 238 -230 230 230 -222 222 222 -180 180 180 -255 255 255 -106 106 106 diff --git a/graphics/fame_checker/spinning_pokeball.png b/graphics/fame_checker/spinning_pokeball.png index 0d692439a..fbc8a1c09 100644 Binary files a/graphics/fame_checker/spinning_pokeball.png and b/graphics/fame_checker/spinning_pokeball.png differ diff --git a/graphics/field_effects/flash_effect_tiles.png b/graphics/field_effects/flash_effect_tiles.png index 4079a5a84..05d4d3b2e 100644 Binary files a/graphics/field_effects/flash_effect_tiles.png and b/graphics/field_effects/flash_effect_tiles.png differ diff --git a/graphics/field_effects/new_game_oak.png b/graphics/field_effects/new_game_oak.png new file mode 100644 index 000000000..d3ca87183 Binary files /dev/null and b/graphics/field_effects/new_game_oak.png differ diff --git a/graphics/field_effects/pokeball.png b/graphics/field_effects/pokeball.png new file mode 100644 index 000000000..eb2e56faf Binary files /dev/null and b/graphics/field_effects/pokeball.png differ diff --git a/graphics/field_effects/unk_83CA770.png b/graphics/field_effects/unk_83CA770.png deleted file mode 100644 index d3ca87183..000000000 Binary files a/graphics/field_effects/unk_83CA770.png and /dev/null differ diff --git a/graphics/field_effects/unk_83CAF90.png b/graphics/field_effects/unk_83CAF90.png deleted file mode 100644 index c6c456817..000000000 Binary files a/graphics/field_effects/unk_83CAF90.png and /dev/null differ diff --git a/graphics/field_effects/unk_83CAFB0.pal b/graphics/field_effects/unk_83CAFB0.pal deleted file mode 100644 index 5e2face1d..000000000 --- a/graphics/field_effects/unk_83CAFB0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -255 255 255 -156 180 172 -106 115 115 -57 57 57 -156 24 24 -255 0 0 -255 123 123 -255 255 255 -82 82 106 -123 123 123 -255 255 255 -189 230 255 -164 197 230 -156 189 213 -90 131 180 diff --git a/src/field_effect.c b/src/field_effect.c index 5942e68fd..c2b507882 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -59,10 +59,10 @@ static void SpriteCB_PokeballGlow(struct Sprite * sprite); static void SpriteCB_PokecenterMonitor(struct Sprite * sprite); static void SpriteCB_HallOfFameMonitor(struct Sprite * sprite); -static const u16 sNewGameOakObjectSpriteTiles[] = INCBIN_U16("graphics/field_effects/unk_83CA770.4bpp"); -static const u16 sNewGameOakObjectPals[] = INCBIN_U16("graphics/field_effects/unk_83CAF70.gbapal"); -static const u16 sUnknown_83CAF90[] = INCBIN_U16("graphics/field_effects/unk_83CAF90.4bpp"); -static const u16 sUnknown_83CAFB0[] = INCBIN_U16("graphics/field_effects/unk_83CAFB0.gbapal"); +static const u16 sNewGameOakObjectSpriteTiles[] = INCBIN_U16("graphics/field_effects/new_game_oak.4bpp"); +static const u16 sNewGameOakObjectPals[] = INCBIN_U16("graphics/field_effects/new_game_oak.gbapal"); +static const u16 sPokeballGfx[] = INCBIN_U16("graphics/field_effects/pokeball.4bpp"); +static const u16 sPokeballPal[] = INCBIN_U16("graphics/field_effects/pokeball.gbapal"); static const u16 sUnknown_83CAFD0[] = INCBIN_U16("graphics/field_effects/unk_83CAFD0.4bpp"); static const u16 sUnknown_83CB3D0[] = INCBIN_U16("graphics/field_effects/unk_83CB3D0.gbapal"); static const u16 sUnknown_83CB3F0[] = INCBIN_U16("graphics/field_effects/unk_83CB3F0.4bpp"); @@ -161,7 +161,7 @@ static const struct SpriteTemplate sNewGameOakObjectTemplate = { }; const struct SpritePalette gUnknown_83CBE9C = { - sUnknown_83CAFB0, 4103 + sPokeballPal, 4103 }; const struct SpritePalette gUnknown_83CBEA4 = { @@ -185,7 +185,7 @@ static const struct OamData sOamData_83CBEAC = { }; static const struct SpriteFrameImage sUnknown_83CBEB4[] = { - {sUnknown_83CAF90, 0x20} + {sPokeballGfx, 0x20} }; static const struct SpriteFrameImage sUnknown_83CBEBC[] = { -- cgit v1.2.3 From 47cc3aa0f1fd77f16d898da30fd482cfd5a4c1ba Mon Sep 17 00:00:00 2001 From: hjk321 <37224753+hjk321@users.noreply.github.com> Date: Sat, 10 Apr 2021 21:35:14 -0500 Subject: Document hall of fame and help system gfx --- graphics/hall_of_fame/hall_of_fame.png | Bin 0 -> 437 bytes graphics/hall_of_fame/unk_840C3BC.png | Bin 481 -> 0 bytes graphics/help_system/unk_845BCB0.bin | Bin 2048 -> 0 bytes graphics/help_system/unused.bin | Bin 0 -> 2048 bytes graphics_file_rules.mk | 4 ++++ src/hall_of_fame.c | 4 ++-- src/help_system.c | 2 +- 7 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 graphics/hall_of_fame/hall_of_fame.png delete mode 100644 graphics/hall_of_fame/unk_840C3BC.png delete mode 100644 graphics/help_system/unk_845BCB0.bin create mode 100644 graphics/help_system/unused.bin diff --git a/graphics/hall_of_fame/hall_of_fame.png b/graphics/hall_of_fame/hall_of_fame.png new file mode 100644 index 000000000..769ca4b35 Binary files /dev/null and b/graphics/hall_of_fame/hall_of_fame.png differ diff --git a/graphics/hall_of_fame/unk_840C3BC.png b/graphics/hall_of_fame/unk_840C3BC.png deleted file mode 100644 index 567665495..000000000 Binary files a/graphics/hall_of_fame/unk_840C3BC.png and /dev/null differ diff --git a/graphics/help_system/unk_845BCB0.bin b/graphics/help_system/unk_845BCB0.bin deleted file mode 100644 index b7ceb5080..000000000 Binary files a/graphics/help_system/unk_845BCB0.bin and /dev/null differ diff --git a/graphics/help_system/unused.bin b/graphics/help_system/unused.bin new file mode 100644 index 000000000..b7ceb5080 Binary files /dev/null and b/graphics/help_system/unused.bin differ diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index d064c63c8..3ad7cf542 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -26,6 +26,7 @@ ITEMMENUGFXDIR := graphics/item_menu INTROGFXDIR := graphics/intro BATTLETERRAINGFXDIR := graphics/battle_terrain BERRYPOUCHGFXDIR := graphics/berry_pouch +HALLOFFAMEGFXDIR := graphics/hall_of_fame types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark contest_types := cool beauty cute smart tough @@ -573,3 +574,6 @@ $(BATTLETERRAINGFXDIR)/terrain_water.4bpp: %.4bpp: %.png $(BERRYPOUCHGFXDIR)/background.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 52 + +$(HALLOFFAMEGFXDIR)/hall_of_fame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 29 diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index 8480edfaf..e6f8b72ec 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -283,8 +283,8 @@ static const struct SpriteTemplate sSpriteTemplate_Confetti = { .callback = SpriteCB_Confetti }; -static const u16 sHallOfFame_Pal[] = INCBIN_U16("graphics/hall_of_fame/unk_840C3BC.gbapal"); -static const u32 sHallOfFame_Gfx[] = INCBIN_U32("graphics/hall_of_fame/unk_840C3BC.4bpp.lz"); +static const u16 sHallOfFame_Pal[] = INCBIN_U16("graphics/hall_of_fame/hall_of_fame.gbapal"); +static const u32 sHallOfFame_Gfx[] = INCBIN_U32("graphics/hall_of_fame/hall_of_fame.4bpp.lz"); static const struct HallofFameMon sDummyHofMon = { .tid = 0x03EA03EA, // (u16[]){1002, 1002} corrupted sprite template? diff --git a/src/help_system.c b/src/help_system.c index 27ec64baa..f29359354 100644 --- a/src/help_system.c +++ b/src/help_system.c @@ -1646,7 +1646,7 @@ static const u8 *const sHelpSystemSubmenuItemLists[HELPCONTEXT_COUNT * (TOPIC_CO NULL, NULL, NULL, NULL, NULL // HELPCONTEXT_UNUSED }; -static const u16 unref_845BCB0[] = INCBIN_U16("graphics/help_system/unk_845BCB0.bin"); +static const u16 unref_845BCB0[] = INCBIN_U16("graphics/help_system/unused.bin"); static const u8 sHelpSystemContextTopicOrder[TOPIC_COUNT] = { TOPIC_ABOUT_GAME, -- cgit v1.2.3 From f6e5d2a2334cd5606d6f1973c3b085b07a5d0912 Mon Sep 17 00:00:00 2001 From: hjk321 <37224753+hjk321@users.noreply.github.com> Date: Mon, 12 Apr 2021 16:26:46 -0500 Subject: [Gfx] - Prefix s for static symbols --- src/battle_interface.c | 2 +- src/diploma.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/battle_interface.c b/src/battle_interface.c index 32bab8803..4cc39e8aa 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -342,7 +342,7 @@ static const struct SubspriteTable gUnknown_8260404[] = { {NELEMS(gUnknown_82603E4), gUnknown_82603E4} }; -static const u16 gBattleInterface_Unused[] = INCBIN_U16("graphics/battle_interface/unused.4bpp"); +static const u16 sBattleInterface_Unused[] = INCBIN_U16("graphics/battle_interface/unused.4bpp"); static const struct CompressedSpriteSheet sStatusSummaryBarSpriteSheets[] = { {gFile_graphics_battle_interface_ball_status_bar_sheet, 0x0200, 55052}, diff --git a/src/diploma.c b/src/diploma.c index a8ca579ba..4f765437f 100644 --- a/src/diploma.c +++ b/src/diploma.c @@ -29,9 +29,9 @@ static void Task_WaitForExit(u8); static void Task_DiplomaInit(u8); static void Task_DiplomaReturnToOverworld(u8); -static const u32 gDiplomaGfx[] = INCBIN_U32("graphics/diploma/diploma.4bpp.lz"); -static const u32 gDiplomaTilemap[] = INCBIN_U32("graphics/diploma/diploma.bin.lz"); -static const u16 gDiplomaPal[] = INCBIN_U16("graphics/diploma/diploma.gbapal"); +static const u32 sDiplomaGfx[] = INCBIN_U32("graphics/diploma/diploma.4bpp.lz"); +static const u32 sDiplomaTilemap[] = INCBIN_U32("graphics/diploma/diploma.bin.lz"); +static const u16 sDiplomaPal[] = INCBIN_U16("graphics/diploma/diploma.gbapal"); static const u8 gUnknown_8415994[] = _("{HIGHLIGHT TRANSPARENT}プレイヤー"); static const u8 gUnknown_841599D[] = _("{HIGHLIGHT TRANSPARENT}さま"); @@ -118,7 +118,7 @@ static void Task_DiplomaInit(u8 taskId) } break; case 3: - CopyToBgTilemapBuffer(1, gDiplomaTilemap, 0, 0); + CopyToBgTilemapBuffer(1, sDiplomaTilemap, 0, 0); break; case 4: if (HasAllMons()) @@ -231,7 +231,7 @@ static u8 DiplomaLoadGfx(void) ResetTempTileDataBuffers(); break; case 1: - DecompressAndCopyTileDataToVram(1, gDiplomaGfx, 0, 0, 0); + DecompressAndCopyTileDataToVram(1, sDiplomaGfx, 0, 0, 0); break; case 2: if (!(FreeTempTileDataBuffersIfPossible() == 1)) @@ -240,7 +240,7 @@ static u8 DiplomaLoadGfx(void) } return 0; case 3: - LoadPalette(gDiplomaPal, 0, 0x40); + LoadPalette(sDiplomaPal, 0, 0x40); default: return 1; } -- cgit v1.2.3 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