summaryrefslogtreecommitdiff
path: root/data/tilesets
diff options
context:
space:
mode:
Diffstat (limited to 'data/tilesets')
-rw-r--r--data/tilesets/champions_room_collision.asm (renamed from data/tilesets/olivine_gym_collision.asm)0
-rw-r--r--data/tilesets/champions_room_metatiles.bin (renamed from data/tilesets/olivine_gym_metatiles.bin)0
-rw-r--r--data/tilesets/dark_cave_collision.asm (renamed from data/tilesets/whirl_islands_collision.asm)0
-rw-r--r--data/tilesets/dark_cave_metatiles.bin (renamed from data/tilesets/whirl_islands_metatiles.bin)0
-rw-r--r--data/tilesets/elite_four_room_collision.asm (renamed from data/tilesets/gym_1_collision.asm)0
-rw-r--r--data/tilesets/elite_four_room_metatiles.bin (renamed from data/tilesets/gym_1_metatiles.bin)bin1024 -> 1024 bytes
-rw-r--r--data/tilesets/facility_collision.asm (renamed from data/tilesets/power_plant_collision.asm)0
-rw-r--r--data/tilesets/facility_metatiles.bin (renamed from data/tilesets/power_plant_metatiles.bin)0
-rw-r--r--data/tilesets/forest_collision.asm (renamed from data/tilesets/ilex_forest_collision.asm)0
-rw-r--r--data/tilesets/forest_metatiles.bin (renamed from data/tilesets/ilex_forest_metatiles.bin)0
-rw-r--r--data/tilesets/house_collision.asm (renamed from data/tilesets/house_1_collision.asm)0
-rw-r--r--data/tilesets/house_metatiles.bin (renamed from data/tilesets/house_1_metatiles.bin)bin1024 -> 1024 bytes
-rw-r--r--data/tilesets/johto_collision.asm (renamed from data/tilesets/johto_1_collision.asm)0
-rw-r--r--data/tilesets/johto_metatiles.bin (renamed from data/tilesets/johto_1_metatiles.bin)bin2048 -> 2048 bytes
-rw-r--r--data/tilesets/johto_modern_collision.asm (renamed from data/tilesets/johto_2_collision.asm)0
-rw-r--r--data/tilesets/johto_modern_metatiles.bin (renamed from data/tilesets/johto_2_metatiles.bin)bin2048 -> 2048 bytes
-rw-r--r--data/tilesets/mansion_collision.asm (renamed from data/tilesets/celadon_mansion_collision.asm)0
-rw-r--r--data/tilesets/mansion_metatiles.bin (renamed from data/tilesets/celadon_mansion_metatiles.bin)0
-rw-r--r--data/tilesets/players_room_collision.asm (renamed from data/tilesets/players_house_2f_collision.asm)0
-rw-r--r--data/tilesets/players_room_metatiles.bin (renamed from data/tilesets/players_house_2f_metatiles.bin)bin1024 -> 1024 bytes
-rw-r--r--data/tilesets/tower_collision.asm (renamed from data/tilesets/sprout_tower_collision.asm)0
-rw-r--r--data/tilesets/tower_metatiles.bin (renamed from data/tilesets/sprout_tower_metatiles.bin)0
-rw-r--r--data/tilesets/traditional_house_collision.asm (renamed from data/tilesets/kurts_house_collision.asm)0
-rw-r--r--data/tilesets/traditional_house_metatiles.bin (renamed from data/tilesets/kurts_house_metatiles.bin)bin1024 -> 1024 bytes
-rw-r--r--data/tilesets/unused_dark_cave_collision.asm (renamed from data/tilesets/unused_whirl_islands_collision.asm)0
-rw-r--r--data/tilesets/unused_dark_cave_metatiles.bin (renamed from data/tilesets/unused_whirl_islands_metatiles.bin)bin2048 -> 2048 bytes
26 files changed, 0 insertions, 0 deletions
diff --git a/data/tilesets/olivine_gym_collision.asm b/data/tilesets/champions_room_collision.asm
index 351f76f61..351f76f61 100644
--- a/data/tilesets/olivine_gym_collision.asm
+++ b/data/tilesets/champions_room_collision.asm
diff --git a/data/tilesets/olivine_gym_metatiles.bin b/data/tilesets/champions_room_metatiles.bin
index a2adb197a..a2adb197a 100644
--- a/data/tilesets/olivine_gym_metatiles.bin
+++ b/data/tilesets/champions_room_metatiles.bin
diff --git a/data/tilesets/whirl_islands_collision.asm b/data/tilesets/dark_cave_collision.asm
index 3d5e0ae05..3d5e0ae05 100644
--- a/data/tilesets/whirl_islands_collision.asm
+++ b/data/tilesets/dark_cave_collision.asm
diff --git a/data/tilesets/whirl_islands_metatiles.bin b/data/tilesets/dark_cave_metatiles.bin
index a41b5b080..a41b5b080 100644
--- a/data/tilesets/whirl_islands_metatiles.bin
+++ b/data/tilesets/dark_cave_metatiles.bin
diff --git a/data/tilesets/gym_1_collision.asm b/data/tilesets/elite_four_room_collision.asm
index cc0b705f3..cc0b705f3 100644
--- a/data/tilesets/gym_1_collision.asm
+++ b/data/tilesets/elite_four_room_collision.asm
diff --git a/data/tilesets/gym_1_metatiles.bin b/data/tilesets/elite_four_room_metatiles.bin
index a9df6062c..a9df6062c 100644
--- a/data/tilesets/gym_1_metatiles.bin
+++ b/data/tilesets/elite_four_room_metatiles.bin
Binary files differ
diff --git a/data/tilesets/power_plant_collision.asm b/data/tilesets/facility_collision.asm
index eb5cd8f33..eb5cd8f33 100644
--- a/data/tilesets/power_plant_collision.asm
+++ b/data/tilesets/facility_collision.asm
diff --git a/data/tilesets/power_plant_metatiles.bin b/data/tilesets/facility_metatiles.bin
index f6089d29c..f6089d29c 100644
--- a/data/tilesets/power_plant_metatiles.bin
+++ b/data/tilesets/facility_metatiles.bin
diff --git a/data/tilesets/ilex_forest_collision.asm b/data/tilesets/forest_collision.asm
index 70cc72ff1..70cc72ff1 100644
--- a/data/tilesets/ilex_forest_collision.asm
+++ b/data/tilesets/forest_collision.asm
diff --git a/data/tilesets/ilex_forest_metatiles.bin b/data/tilesets/forest_metatiles.bin
index a8b82d8cf..a8b82d8cf 100644
--- a/data/tilesets/ilex_forest_metatiles.bin
+++ b/data/tilesets/forest_metatiles.bin
diff --git a/data/tilesets/house_1_collision.asm b/data/tilesets/house_collision.asm
index ae5580782..ae5580782 100644
--- a/data/tilesets/house_1_collision.asm
+++ b/data/tilesets/house_collision.asm
diff --git a/data/tilesets/house_1_metatiles.bin b/data/tilesets/house_metatiles.bin
index 0d3a22f32..0d3a22f32 100644
--- a/data/tilesets/house_1_metatiles.bin
+++ b/data/tilesets/house_metatiles.bin
Binary files differ
diff --git a/data/tilesets/johto_1_collision.asm b/data/tilesets/johto_collision.asm
index 4d6d2c072..4d6d2c072 100644
--- a/data/tilesets/johto_1_collision.asm
+++ b/data/tilesets/johto_collision.asm
diff --git a/data/tilesets/johto_1_metatiles.bin b/data/tilesets/johto_metatiles.bin
index 9024f2ad6..9024f2ad6 100644
--- a/data/tilesets/johto_1_metatiles.bin
+++ b/data/tilesets/johto_metatiles.bin
Binary files differ
diff --git a/data/tilesets/johto_2_collision.asm b/data/tilesets/johto_modern_collision.asm
index 40255d744..40255d744 100644
--- a/data/tilesets/johto_2_collision.asm
+++ b/data/tilesets/johto_modern_collision.asm
diff --git a/data/tilesets/johto_2_metatiles.bin b/data/tilesets/johto_modern_metatiles.bin
index a15c0c2c7..a15c0c2c7 100644
--- a/data/tilesets/johto_2_metatiles.bin
+++ b/data/tilesets/johto_modern_metatiles.bin
Binary files differ
diff --git a/data/tilesets/celadon_mansion_collision.asm b/data/tilesets/mansion_collision.asm
index 5db409be7..5db409be7 100644
--- a/data/tilesets/celadon_mansion_collision.asm
+++ b/data/tilesets/mansion_collision.asm
diff --git a/data/tilesets/celadon_mansion_metatiles.bin b/data/tilesets/mansion_metatiles.bin
index d4506328f..d4506328f 100644
--- a/data/tilesets/celadon_mansion_metatiles.bin
+++ b/data/tilesets/mansion_metatiles.bin
diff --git a/data/tilesets/players_house_2f_collision.asm b/data/tilesets/players_room_collision.asm
index 464d80b83..464d80b83 100644
--- a/data/tilesets/players_house_2f_collision.asm
+++ b/data/tilesets/players_room_collision.asm
diff --git a/data/tilesets/players_house_2f_metatiles.bin b/data/tilesets/players_room_metatiles.bin
index 0839798fe..0839798fe 100644
--- a/data/tilesets/players_house_2f_metatiles.bin
+++ b/data/tilesets/players_room_metatiles.bin
Binary files differ
diff --git a/data/tilesets/sprout_tower_collision.asm b/data/tilesets/tower_collision.asm
index 9d02e9640..9d02e9640 100644
--- a/data/tilesets/sprout_tower_collision.asm
+++ b/data/tilesets/tower_collision.asm
diff --git a/data/tilesets/sprout_tower_metatiles.bin b/data/tilesets/tower_metatiles.bin
index b6668fcd4..b6668fcd4 100644
--- a/data/tilesets/sprout_tower_metatiles.bin
+++ b/data/tilesets/tower_metatiles.bin
diff --git a/data/tilesets/kurts_house_collision.asm b/data/tilesets/traditional_house_collision.asm
index 95cb1c21d..95cb1c21d 100644
--- a/data/tilesets/kurts_house_collision.asm
+++ b/data/tilesets/traditional_house_collision.asm
diff --git a/data/tilesets/kurts_house_metatiles.bin b/data/tilesets/traditional_house_metatiles.bin
index 3f6b41bd1..3f6b41bd1 100644
--- a/data/tilesets/kurts_house_metatiles.bin
+++ b/data/tilesets/traditional_house_metatiles.bin
Binary files differ
diff --git a/data/tilesets/unused_whirl_islands_collision.asm b/data/tilesets/unused_dark_cave_collision.asm
index 0022d3881..0022d3881 100644
--- a/data/tilesets/unused_whirl_islands_collision.asm
+++ b/data/tilesets/unused_dark_cave_collision.asm
diff --git a/data/tilesets/unused_whirl_islands_metatiles.bin b/data/tilesets/unused_dark_cave_metatiles.bin
index b70f1a0e6..b70f1a0e6 100644
--- a/data/tilesets/unused_whirl_islands_metatiles.bin
+++ b/data/tilesets/unused_dark_cave_metatiles.bin
Binary files differ