48 files changed, 8 insertions, 8 deletions

diff --git a/gfx/diploma/page2.tilemap b/gfx/diploma/page2.tilemap
index e37c6b27d..26e0d07b3 100644
--- a/gfx/diploma/page2.tilemap
+++ b/gfx/diploma/page2.tilemap
diff --git a/gfx/intro/003.tilemap b/gfx/intro/background.attrmap
index 98512513c..98512513c 100644
--- a/gfx/intro/003.tilemap
+++ b/gfx/intro/background.attrmap
diff --git a/gfx/intro/003.tilemap.lz.9f90366a b/gfx/intro/background.attrmap.lz.9f90366a
index 182ffb130..182ffb130 100644
--- a/gfx/intro/003.tilemap.lz.9f90366a
+++ b/gfx/intro/background.attrmap.lz.9f90366a
diff --git a/gfx/intro/intro_1.pal b/gfx/intro/background.pal
index ae0faadac..ae0faadac 100644
--- a/gfx/intro/intro_1.pal
+++ b/gfx/intro/background.pal
diff --git a/gfx/intro/background.png b/gfx/intro/background.png
index ede95e46b..dfb2b62ff 100644
--- a/gfx/intro/background.png
+++ b/gfx/intro/background.png
diff --git a/gfx/intro/004.tilemap b/gfx/intro/background.tilemap
index 2dd6b6ea7..2dd6b6ea7 100644
--- a/gfx/intro/004.tilemap
+++ b/gfx/intro/background.tilemap
diff --git a/gfx/intro/004.tilemap.lz.4c7562ee b/gfx/intro/background.tilemap.lz.4c7562ee
index 5897d176b..5897d176b 100644
--- a/gfx/intro/004.tilemap.lz.4c7562ee
+++ b/gfx/intro/background.tilemap.lz.4c7562ee
diff --git a/gfx/intro/015.tilemap b/gfx/intro/crystal_unowns.attrmap
index f97c9cb93..f97c9cb93 100644
--- a/gfx/intro/015.tilemap
+++ b/gfx/intro/crystal_unowns.attrmap
diff --git a/gfx/intro/015.tilemap.lz.1bfc5a89 b/gfx/intro/crystal_unowns.attrmap.lz.1bfc5a89
index 22a4cc926..22a4cc926 100644
--- a/gfx/intro/015.tilemap.lz.1bfc5a89
+++ b/gfx/intro/crystal_unowns.attrmap.lz.1bfc5a89
diff --git a/gfx/intro/intro_3.pal b/gfx/intro/crystal_unowns.pal
index 95f3e052a..95f3e052a 100644
--- a/gfx/intro/intro_3.pal
+++ b/gfx/intro/crystal_unowns.pal
diff --git a/gfx/intro/017.tilemap b/gfx/intro/crystal_unowns.tilemap
index 05c37dbf2..05c37dbf2 100644
--- a/gfx/intro/017.tilemap
+++ b/gfx/intro/crystal_unowns.tilemap
diff --git a/gfx/intro/017.tilemap.lz.e4772015 b/gfx/intro/crystal_unowns.tilemap.lz.e4772015
index 90ce59e58..90ce59e58 100644
--- a/gfx/intro/017.tilemap.lz.e4772015
+++ b/gfx/intro/crystal_unowns.tilemap.lz.e4772015
diff --git a/gfx/intro/intro_5.pal b/gfx/intro/suicune.pal
index 5b1be1a5f..5b1be1a5f 100644
--- a/gfx/intro/intro_5.pal
+++ b/gfx/intro/suicune.pal
diff --git a/gfx/intro/013.tilemap b/gfx/intro/suicune_back.attrmap
index 28e27ad62..28e27ad62 100644
--- a/gfx/intro/013.tilemap
+++ b/gfx/intro/suicune_back.attrmap
diff --git a/gfx/intro/013.tilemap.lz.18e3115f b/gfx/intro/suicune_back.attrmap.lz.18e3115f
index 91635527c..91635527c 100644
--- a/gfx/intro/013.tilemap.lz.18e3115f
+++ b/gfx/intro/suicune_back.attrmap.lz.18e3115f
diff --git a/gfx/intro/014.tilemap b/gfx/intro/suicune_back.tilemap
index 52829cc74..52829cc74 100644
--- a/gfx/intro/014.tilemap
+++ b/gfx/intro/suicune_back.tilemap
diff --git a/gfx/intro/014.tilemap.lz.7b59259d b/gfx/intro/suicune_back.tilemap.lz.7b59259d
index a892ab1b4..a892ab1b4 100644
--- a/gfx/intro/014.tilemap.lz.7b59259d
+++ b/gfx/intro/suicune_back.tilemap.lz.7b59259d
diff --git a/gfx/intro/011.tilemap b/gfx/intro/suicune_close.attrmap
index 59f365a34..59f365a34 100644
--- a/gfx/intro/011.tilemap
+++ b/gfx/intro/suicune_close.attrmap
diff --git a/gfx/intro/011.tilemap.lz.bb066632 b/gfx/intro/suicune_close.attrmap.lz.bb066632
index 68ceb19f8..68ceb19f8 100644
--- a/gfx/intro/011.tilemap.lz.bb066632
+++ b/gfx/intro/suicune_close.attrmap.lz.bb066632
diff --git a/gfx/intro/intro_4.pal b/gfx/intro/suicune_close.pal
index fdcf058de..fdcf058de 100644
--- a/gfx/intro/intro_4.pal
+++ b/gfx/intro/suicune_close.pal
diff --git a/gfx/intro/012.tilemap b/gfx/intro/suicune_close.tilemap
index 3577fc467..3577fc467 100644
--- a/gfx/intro/012.tilemap
+++ b/gfx/intro/suicune_close.tilemap
diff --git a/gfx/intro/012.tilemap.lz.bc182264 b/gfx/intro/suicune_close.tilemap.lz.bc182264
index 0d6af294c..0d6af294c 100644
--- a/gfx/intro/012.tilemap.lz.bc182264
+++ b/gfx/intro/suicune_close.tilemap.lz.bc182264
diff --git a/gfx/intro/009.tilemap b/gfx/intro/suicune_jump.attrmap
index 554e919a8..554e919a8 100644
--- a/gfx/intro/009.tilemap
+++ b/gfx/intro/suicune_jump.attrmap
diff --git a/gfx/intro/009.tilemap.lz.911a1ace b/gfx/intro/suicune_jump.attrmap.lz.911a1ace
index 238d6a60e..238d6a60e 100644
--- a/gfx/intro/009.tilemap.lz.911a1ace
+++ b/gfx/intro/suicune_jump.attrmap.lz.911a1ace
diff --git a/gfx/intro/010.tilemap b/gfx/intro/suicune_jump.tilemap
index 4ddef19c7..4ddef19c7 100644
--- a/gfx/intro/010.tilemap
+++ b/gfx/intro/suicune_jump.tilemap
diff --git a/gfx/intro/010.tilemap.lz.2717d106 b/gfx/intro/suicune_jump.tilemap.lz.2717d106
index 6e45c45f7..6e45c45f7 100644
--- a/gfx/intro/010.tilemap.lz.2717d106
+++ b/gfx/intro/suicune_jump.tilemap.lz.2717d106
diff --git a/gfx/intro/001.tilemap b/gfx/intro/unown_a.attrmap
index 8b1b66033..8b1b66033 100644
--- a/gfx/intro/001.tilemap
+++ b/gfx/intro/unown_a.attrmap
diff --git a/gfx/intro/001.tilemap.lz.c2341875 b/gfx/intro/unown_a.attrmap.lz.c2341875
index 926fb6e8e..926fb6e8e 100644
--- a/gfx/intro/001.tilemap.lz.c2341875
+++ b/gfx/intro/unown_a.attrmap.lz.c2341875
diff --git a/gfx/intro/002.tilemap b/gfx/intro/unown_a.tilemap
index 6a035d14a..6a035d14a 100644
--- a/gfx/intro/002.tilemap
+++ b/gfx/intro/unown_a.tilemap
diff --git a/gfx/intro/002.tilemap.lz.54d5b74b b/gfx/intro/unown_a.tilemap.lz.54d5b74b
index c63f215f2..c63f215f2 100644
--- a/gfx/intro/002.tilemap.lz.54d5b74b
+++ b/gfx/intro/unown_a.tilemap.lz.54d5b74b
diff --git a/gfx/intro/005.tilemap b/gfx/intro/unown_hi.attrmap
index 3f7d23b64..3f7d23b64 100644
--- a/gfx/intro/005.tilemap
+++ b/gfx/intro/unown_hi.attrmap
diff --git a/gfx/intro/005.tilemap.lz.bed1ff6d b/gfx/intro/unown_hi.attrmap.lz.bed1ff6d
index 0ae96b7f7..0ae96b7f7 100644
--- a/gfx/intro/005.tilemap.lz.bed1ff6d
+++ b/gfx/intro/unown_hi.attrmap.lz.bed1ff6d
diff --git a/gfx/intro/006.tilemap b/gfx/intro/unown_hi.tilemap
index 4af27a158..4af27a158 100644
--- a/gfx/intro/006.tilemap
+++ b/gfx/intro/unown_hi.tilemap
diff --git a/gfx/intro/006.tilemap.lz.c8756972 b/gfx/intro/unown_hi.tilemap.lz.c8756972
index 46436b607..46436b607 100644
--- a/gfx/intro/006.tilemap.lz.c8756972
+++ b/gfx/intro/unown_hi.tilemap.lz.c8756972
diff --git a/gfx/intro/007.tilemap b/gfx/intro/unowns.attrmap
index 2e3fdb41a..2e3fdb41a 100644
--- a/gfx/intro/007.tilemap
+++ b/gfx/intro/unowns.attrmap
diff --git a/gfx/intro/007.tilemap.lz.a9cbcbca b/gfx/intro/unowns.attrmap.lz.a9cbcbca
index d1694ed3e..d1694ed3e 100644
--- a/gfx/intro/007.tilemap.lz.a9cbcbca
+++ b/gfx/intro/unowns.attrmap.lz.a9cbcbca
diff --git a/gfx/intro/intro_2.pal b/gfx/intro/unowns.pal
index 5f83df020..5f83df020 100644
--- a/gfx/intro/intro_2.pal
+++ b/gfx/intro/unowns.pal
diff --git a/gfx/intro/008.tilemap b/gfx/intro/unowns.tilemap
index 903f59ae5..903f59ae5 100644
--- a/gfx/intro/008.tilemap
+++ b/gfx/intro/unowns.tilemap
diff --git a/gfx/intro/008.tilemap.lz.f12ed6d9 b/gfx/intro/unowns.tilemap.lz.f12ed6d9
index 356c6d5e8..356c6d5e8 100644
--- a/gfx/intro/008.tilemap.lz.f12ed6d9
+++ b/gfx/intro/unowns.tilemap.lz.f12ed6d9
diff --git a/gfx/unknown/17eb8e.attrmap b/gfx/mobile/pokemon_news.bin
index 24a0bcfee..24a0bcfee 100644
--- a/gfx/unknown/17eb8e.attrmap
+++ b/gfx/mobile/pokemon_news.bin
diff --git a/gfx/pokedex/question_mark.2bpp.lz.14c284f5 b/gfx/pokedex/question_mark.2bpp.lz.6e639380
index cd2f7f22e..cd2f7f22e 100644
--- a/gfx/pokedex/question_mark.2bpp.lz.14c284f5
+++ b/gfx/pokedex/question_mark.2bpp.lz.6e639380
diff --git a/gfx/sgb/sgb_border_nonmatching.bin b/gfx/sgb/sgb_border_nonmatching.bin
new file mode 100644
index 000000000..5ad4fb002
--- /dev/null
+++ b/gfx/sgb/sgb_border_nonmatching.bin
diff --git a/gfx/tileset_palette_maps.asm b/gfx/tileset_palette_maps.asm
index 41f71ff0b..110e48941 100644
--- a/gfx/tileset_palette_maps.asm
+++ b/gfx/tileset_palette_maps.asm
@@ -103,8 +103,8 @@ INCLUDE "gfx/tilesets/forest_palette_map.asm"
 TilesetPokeComCenterPalMap:
 INCLUDE "gfx/tilesets/pokecom_center_palette_map.asm"
 
-TilesetBattleTowerPalMap:
-INCLUDE "gfx/tilesets/battle_tower_palette_map.asm"
+TilesetBattleTowerInsidePalMap:
+INCLUDE "gfx/tilesets/battle_tower_inside_palette_map.asm"
 
 TilesetBattleTowerOutsidePalMap:
 INCLUDE "gfx/tilesets/battle_tower_outside_palette_map.asm"
diff --git a/gfx/tilesets.asm b/gfx/tilesets.asm
index c4071349c..6cc4d7155 100644
--- a/gfx/tilesets.asm
+++ b/gfx/tilesets.asm
@@ -206,14 +206,14 @@ INCBIN "data/tilesets/pokecom_center_metatiles.bin"
 TilesetPokeComCenterColl:
 INCLUDE "data/tilesets/pokecom_center_collision.asm"
 
-TilesetBattleTowerGFX:
-INCBIN "gfx/tilesets/battle_tower.2bpp.lz"
+TilesetBattleTowerInsideGFX:
+INCBIN "gfx/tilesets/battle_tower_inside.2bpp.lz"
 
-TilesetBattleTowerMeta:
-INCBIN "data/tilesets/battle_tower_metatiles.bin"
+TilesetBattleTowerInsideMeta:
+INCBIN "data/tilesets/battle_tower_inside_metatiles.bin"
 
-TilesetBattleTowerColl:
-INCLUDE "data/tilesets/battle_tower_collision.asm"
+TilesetBattleTowerInsideColl:
+INCLUDE "data/tilesets/battle_tower_inside_collision.asm"
 
 TilesetGateGFX:
 INCBIN "gfx/tilesets/gate.2bpp.lz"
diff --git a/gfx/tilesets/battle_tower.2bpp.lz.467b6a2d b/gfx/tilesets/battle_tower_inside.2bpp.lz.467b6a2d
index fa5d0a9f0..fa5d0a9f0 100644
--- a/gfx/tilesets/battle_tower.2bpp.lz.467b6a2d
+++ b/gfx/tilesets/battle_tower_inside.2bpp.lz.467b6a2d
diff --git a/gfx/tilesets/battle_tower.pal b/gfx/tilesets/battle_tower_inside.pal
index 4e71a5575..4e71a5575 100644
--- a/gfx/tilesets/battle_tower.pal
+++ b/gfx/tilesets/battle_tower_inside.pal
diff --git a/gfx/tilesets/battle_tower.png b/gfx/tilesets/battle_tower_inside.png
index cf9e12d53..cf9e12d53 100644
--- a/gfx/tilesets/battle_tower.png
+++ b/gfx/tilesets/battle_tower_inside.png
diff --git a/gfx/tilesets/battle_tower_palette_map.asm b/gfx/tilesets/battle_tower_inside_palette_map.asm
index 1abce2a16..1abce2a16 100644
--- a/gfx/tilesets/battle_tower_palette_map.asm
+++ b/gfx/tilesets/battle_tower_inside_palette_map.asm