Merge pull request #1 from pret/master

Pulling master commits

163 files changed, 62 insertions, 269 deletions

diff --git a/data/tilesets/primary/building/anim/0.png b/data/tilesets/primary/building/anim/0.png
index 966f6566d..938ae1acb 100644
--- a/data/tilesets/primary/building/anim/0.png
+++ b/data/tilesets/primary/building/anim/0.png
diff --git a/data/tilesets/primary/building/anim/1.png b/data/tilesets/primary/building/anim/1.png
index bbbf370a9..0db9a6a9b 100644
--- a/data/tilesets/primary/building/anim/1.png
+++ b/data/tilesets/primary/building/anim/1.png
diff --git a/data/tilesets/primary/building/tiles.png b/data/tilesets/primary/building/tiles.png
index d7343a1d6..63f7a1857 100644
--- a/data/tilesets/primary/building/tiles.png
+++ b/data/tilesets/primary/building/tiles.png
diff --git a/data/tilesets/primary/general/anim/0/0.png b/data/tilesets/primary/general/anim/0/0.png
index ebe74a3c4..5a2ed537a 100644
--- a/data/tilesets/primary/general/anim/0/0.png
+++ b/data/tilesets/primary/general/anim/0/0.png
diff --git a/data/tilesets/primary/general/anim/0/1.png b/data/tilesets/primary/general/anim/0/1.png
index 0aa8ccd8b..56811b1a0 100644
--- a/data/tilesets/primary/general/anim/0/1.png
+++ b/data/tilesets/primary/general/anim/0/1.png
diff --git a/data/tilesets/primary/general/anim/0/2.png b/data/tilesets/primary/general/anim/0/2.png
index 44a9bfb52..278851f47 100644
--- a/data/tilesets/primary/general/anim/0/2.png
+++ b/data/tilesets/primary/general/anim/0/2.png
diff --git a/data/tilesets/primary/general/anim/1/0.png b/data/tilesets/primary/general/anim/1/0.png
index f2c69978b..d3f2ea0da 100644
--- a/data/tilesets/primary/general/anim/1/0.png
+++ b/data/tilesets/primary/general/anim/1/0.png
diff --git a/data/tilesets/primary/general/anim/1/1.png b/data/tilesets/primary/general/anim/1/1.png
index 9285725d4..86b0ff176 100644
--- a/data/tilesets/primary/general/anim/1/1.png
+++ b/data/tilesets/primary/general/anim/1/1.png
diff --git a/data/tilesets/primary/general/anim/1/2.png b/data/tilesets/primary/general/anim/1/2.png
index fc15dfee3..d2302180e 100644
--- a/data/tilesets/primary/general/anim/1/2.png
+++ b/data/tilesets/primary/general/anim/1/2.png
diff --git a/data/tilesets/primary/general/anim/1/3.png b/data/tilesets/primary/general/anim/1/3.png
index 4b075d692..f757f8253 100644
--- a/data/tilesets/primary/general/anim/1/3.png
+++ b/data/tilesets/primary/general/anim/1/3.png
diff --git a/data/tilesets/primary/general/anim/1/4.png b/data/tilesets/primary/general/anim/1/4.png
index e48773472..950b88585 100644
--- a/data/tilesets/primary/general/anim/1/4.png
+++ b/data/tilesets/primary/general/anim/1/4.png
diff --git a/data/tilesets/primary/general/anim/1/5.png b/data/tilesets/primary/general/anim/1/5.png
index 17619f250..4de7d4225 100644
--- a/data/tilesets/primary/general/anim/1/5.png
+++ b/data/tilesets/primary/general/anim/1/5.png
diff --git a/data/tilesets/primary/general/anim/1/6.png b/data/tilesets/primary/general/anim/1/6.png
index eaff830ca..73c1cabdd 100644
--- a/data/tilesets/primary/general/anim/1/6.png
+++ b/data/tilesets/primary/general/anim/1/6.png
diff --git a/data/tilesets/primary/general/anim/1/7.png b/data/tilesets/primary/general/anim/1/7.png
index 684bb8a99..827fd8b74 100644
--- a/data/tilesets/primary/general/anim/1/7.png
+++ b/data/tilesets/primary/general/anim/1/7.png
diff --git a/data/tilesets/primary/general/anim/2/0.png b/data/tilesets/primary/general/anim/2/0.png
index 04c2b2520..80c99c473 100644
--- a/data/tilesets/primary/general/anim/2/0.png
+++ b/data/tilesets/primary/general/anim/2/0.png
diff --git a/data/tilesets/primary/general/anim/2/1.png b/data/tilesets/primary/general/anim/2/1.png
index dcf9ee899..52051f056 100644
--- a/data/tilesets/primary/general/anim/2/1.png
+++ b/data/tilesets/primary/general/anim/2/1.png
diff --git a/data/tilesets/primary/general/anim/2/2.png b/data/tilesets/primary/general/anim/2/2.png
index 4c47a6a21..39c6e2f87 100644
--- a/data/tilesets/primary/general/anim/2/2.png
+++ b/data/tilesets/primary/general/anim/2/2.png
diff --git a/data/tilesets/primary/general/anim/2/3.png b/data/tilesets/primary/general/anim/2/3.png
index 000f179f6..abb5ff362 100644
--- a/data/tilesets/primary/general/anim/2/3.png
+++ b/data/tilesets/primary/general/anim/2/3.png
diff --git a/data/tilesets/primary/general/anim/2/4.png b/data/tilesets/primary/general/anim/2/4.png
index 92599da38..a7bde9837 100644
--- a/data/tilesets/primary/general/anim/2/4.png
+++ b/data/tilesets/primary/general/anim/2/4.png
diff --git a/data/tilesets/primary/general/anim/2/5.png b/data/tilesets/primary/general/anim/2/5.png
index d0fb9fe00..05f88d81e 100644
--- a/data/tilesets/primary/general/anim/2/5.png
+++ b/data/tilesets/primary/general/anim/2/5.png
diff --git a/data/tilesets/primary/general/anim/2/6.png b/data/tilesets/primary/general/anim/2/6.png
index 24385d2e9..01f9c203d 100644
--- a/data/tilesets/primary/general/anim/2/6.png
+++ b/data/tilesets/primary/general/anim/2/6.png
diff --git a/data/tilesets/primary/general/anim/3/0.png b/data/tilesets/primary/general/anim/3/0.png
index a0b45b050..87b3ee5f5 100644
--- a/data/tilesets/primary/general/anim/3/0.png
+++ b/data/tilesets/primary/general/anim/3/0.png
diff --git a/data/tilesets/primary/general/anim/3/1.png b/data/tilesets/primary/general/anim/3/1.png
index cd5679d9e..de633e03c 100644
--- a/data/tilesets/primary/general/anim/3/1.png
+++ b/data/tilesets/primary/general/anim/3/1.png
diff --git a/data/tilesets/primary/general/anim/3/2.png b/data/tilesets/primary/general/anim/3/2.png
index c8f6abd1e..48ab11d04 100644
--- a/data/tilesets/primary/general/anim/3/2.png
+++ b/data/tilesets/primary/general/anim/3/2.png
diff --git a/data/tilesets/primary/general/anim/3/3.png b/data/tilesets/primary/general/anim/3/3.png
index c31bc0cbf..c5177e4f0 100644
--- a/data/tilesets/primary/general/anim/3/3.png
+++ b/data/tilesets/primary/general/anim/3/3.png
diff --git a/data/tilesets/primary/general/anim/4/0.png b/data/tilesets/primary/general/anim/4/0.png
index 04d9fc523..ba160b633 100644
--- a/data/tilesets/primary/general/anim/4/0.png
+++ b/data/tilesets/primary/general/anim/4/0.png
diff --git a/data/tilesets/primary/general/anim/4/1.png b/data/tilesets/primary/general/anim/4/1.png
index 31cac19b3..48274c9a0 100644
--- a/data/tilesets/primary/general/anim/4/1.png
+++ b/data/tilesets/primary/general/anim/4/1.png
diff --git a/data/tilesets/primary/general/anim/4/2.png b/data/tilesets/primary/general/anim/4/2.png
index 9f02ef64e..9e1f98c1b 100644
--- a/data/tilesets/primary/general/anim/4/2.png
+++ b/data/tilesets/primary/general/anim/4/2.png
diff --git a/data/tilesets/primary/general/anim/4/3.png b/data/tilesets/primary/general/anim/4/3.png
index 59e8efac1..c5b446f65 100644
--- a/data/tilesets/primary/general/anim/4/3.png
+++ b/data/tilesets/primary/general/anim/4/3.png
diff --git a/data/tilesets/primary/general/tiles.png b/data/tilesets/primary/general/tiles.png
index 168689b6d..b2955324e 100644
--- a/data/tilesets/primary/general/tiles.png
+++ b/data/tilesets/primary/general/tiles.png
diff --git a/data/tilesets/primary/secret_base/tiles.png b/data/tilesets/primary/secret_base/tiles.png
index 9adc0e13f..e19d61a9d 100644
--- a/data/tilesets/primary/secret_base/tiles.png
+++ b/data/tilesets/primary/secret_base/tiles.png
diff --git a/data/tilesets/primary/secret_base/unknown_tiles.png b/data/tilesets/primary/secret_base/unknown_tiles.png
index dd5c4e16a..2511e18b0 100644
--- a/data/tilesets/primary/secret_base/unknown_tiles.png
+++ b/data/tilesets/primary/secret_base/unknown_tiles.png
diff --git a/data/tilesets/secondary/battle_tower/tiles.png b/data/tilesets/secondary/battle_tower/tiles.png
index 9e804c6bb..42ba6da3d 100644
--- a/data/tilesets/secondary/battle_tower/tiles.png
+++ b/data/tilesets/secondary/battle_tower/tiles.png
diff --git a/data/tilesets/secondary/bike_shop/anim/0.png b/data/tilesets/secondary/bike_shop/anim/0.png
index cf8e62134..6b361d120 100644
--- a/data/tilesets/secondary/bike_shop/anim/0.png
+++ b/data/tilesets/secondary/bike_shop/anim/0.png
diff --git a/data/tilesets/secondary/bike_shop/anim/1.png b/data/tilesets/secondary/bike_shop/anim/1.png
index 9e6df6692..c1f6783da 100644
--- a/data/tilesets/secondary/bike_shop/anim/1.png
+++ b/data/tilesets/secondary/bike_shop/anim/1.png
diff --git a/data/tilesets/secondary/bike_shop/tiles.png b/data/tilesets/secondary/bike_shop/tiles.png
index ec109c3be..f4f48fca3 100644
--- a/data/tilesets/secondary/bike_shop/tiles.png
+++ b/data/tilesets/secondary/bike_shop/tiles.png
diff --git a/data/tilesets/secondary/brendans_mays_house/tiles.png b/data/tilesets/secondary/brendans_mays_house/tiles.png
index b2f41cdae..4a1572fc7 100644
--- a/data/tilesets/secondary/brendans_mays_house/tiles.png
+++ b/data/tilesets/secondary/brendans_mays_house/tiles.png
diff --git a/data/tilesets/secondary/cable_club/tiles.png b/data/tilesets/secondary/cable_club/tiles.png
index 2b153c1f4..7d2378a06 100644
--- a/data/tilesets/secondary/cable_club/tiles.png
+++ b/data/tilesets/secondary/cable_club/tiles.png
diff --git a/data/tilesets/secondary/cable_club/unknown_tiles.png b/data/tilesets/secondary/cable_club/unknown_tiles.png
index da68cdff2..46e0916f3 100644
--- a/data/tilesets/secondary/cable_club/unknown_tiles.png
+++ b/data/tilesets/secondary/cable_club/unknown_tiles.png
diff --git a/data/tilesets/secondary/cave/anim/0.png b/data/tilesets/secondary/cave/anim/0.png
index 67f294ffe..b5cf31bb4 100644
--- a/data/tilesets/secondary/cave/anim/0.png
+++ b/data/tilesets/secondary/cave/anim/0.png
diff --git a/data/tilesets/secondary/cave/anim/1.png b/data/tilesets/secondary/cave/anim/1.png
index 9c92be807..a4324d4da 100644
--- a/data/tilesets/secondary/cave/anim/1.png
+++ b/data/tilesets/secondary/cave/anim/1.png
diff --git a/data/tilesets/secondary/cave/anim/2.png b/data/tilesets/secondary/cave/anim/2.png
index 78ea00e04..4e69ab954 100644
--- a/data/tilesets/secondary/cave/anim/2.png
+++ b/data/tilesets/secondary/cave/anim/2.png
diff --git a/data/tilesets/secondary/cave/anim/3.png b/data/tilesets/secondary/cave/anim/3.png
index 7edd52eaa..5d8448cec 100644
--- a/data/tilesets/secondary/cave/anim/3.png
+++ b/data/tilesets/secondary/cave/anim/3.png
diff --git a/data/tilesets/secondary/cave/anim/unused/0.png b/data/tilesets/secondary/cave/anim/unused/0.png
index 44564e67a..21f4d55e7 100644
--- a/data/tilesets/secondary/cave/anim/unused/0.png
+++ b/data/tilesets/secondary/cave/anim/unused/0.png
diff --git a/data/tilesets/secondary/cave/anim/unused/1.png b/data/tilesets/secondary/cave/anim/unused/1.png
index 47e7e17ee..c62636b1b 100644
--- a/data/tilesets/secondary/cave/anim/unused/1.png
+++ b/data/tilesets/secondary/cave/anim/unused/1.png
diff --git a/data/tilesets/secondary/cave/anim/unused/2.png b/data/tilesets/secondary/cave/anim/unused/2.png
index d1447cde2..f07a0dc61 100644
--- a/data/tilesets/secondary/cave/anim/unused/2.png
+++ b/data/tilesets/secondary/cave/anim/unused/2.png
diff --git a/data/tilesets/secondary/cave/anim/unused/3.png b/data/tilesets/secondary/cave/anim/unused/3.png
index 8ad81b1e1..4d305b934 100644
--- a/data/tilesets/secondary/cave/anim/unused/3.png
+++ b/data/tilesets/secondary/cave/anim/unused/3.png
diff --git a/data/tilesets/secondary/cave/tiles.png b/data/tilesets/secondary/cave/tiles.png
index cf6ddc31a..28e4c0d0f 100644
--- a/data/tilesets/secondary/cave/tiles.png
+++ b/data/tilesets/secondary/cave/tiles.png
diff --git a/data/tilesets/secondary/contest/tiles.png b/data/tilesets/secondary/contest/tiles.png
index 09ddee472..f9a1b5cd9 100644
--- a/data/tilesets/secondary/contest/tiles.png
+++ b/data/tilesets/secondary/contest/tiles.png
diff --git a/data/tilesets/secondary/dewford/tiles.png b/data/tilesets/secondary/dewford/tiles.png
index cfaebcdbd..2073f4d08 100644
--- a/data/tilesets/secondary/dewford/tiles.png
+++ b/data/tilesets/secondary/dewford/tiles.png
diff --git a/data/tilesets/secondary/dewford_gym/tiles.png b/data/tilesets/secondary/dewford_gym/tiles.png
index 2c41d6850..4f7cf81f9 100644
--- a/data/tilesets/secondary/dewford_gym/tiles.png
+++ b/data/tilesets/secondary/dewford_gym/tiles.png
diff --git a/data/tilesets/secondary/elite_four/anim/0/0.png b/data/tilesets/secondary/elite_four/anim/0/0.png
index 806d26e57..108a2099b 100644
--- a/data/tilesets/secondary/elite_four/anim/0/0.png
+++ b/data/tilesets/secondary/elite_four/anim/0/0.png
diff --git a/data/tilesets/secondary/elite_four/anim/0/1.png b/data/tilesets/secondary/elite_four/anim/0/1.png
index 2a8e6a31c..64b23f061 100644
--- a/data/tilesets/secondary/elite_four/anim/0/1.png
+++ b/data/tilesets/secondary/elite_four/anim/0/1.png
diff --git a/data/tilesets/secondary/elite_four/anim/0/2.png b/data/tilesets/secondary/elite_four/anim/0/2.png
index c4e6161a6..0d9f603fc 100644
--- a/data/tilesets/secondary/elite_four/anim/0/2.png
+++ b/data/tilesets/secondary/elite_four/anim/0/2.png
diff --git a/data/tilesets/secondary/elite_four/anim/0/3.png b/data/tilesets/secondary/elite_four/anim/0/3.png
index 2a8e6a31c..64b23f061 100644
--- a/data/tilesets/secondary/elite_four/anim/0/3.png
+++ b/data/tilesets/secondary/elite_four/anim/0/3.png
diff --git a/data/tilesets/secondary/elite_four/anim/1/0.png b/data/tilesets/secondary/elite_four/anim/1/0.png
index 50b109ae5..6e508308b 100644
--- a/data/tilesets/secondary/elite_four/anim/1/0.png
+++ b/data/tilesets/secondary/elite_four/anim/1/0.png
diff --git a/data/tilesets/secondary/elite_four/anim/1/1.png b/data/tilesets/secondary/elite_four/anim/1/1.png
index ae6a7f43a..794f26195 100644
--- a/data/tilesets/secondary/elite_four/anim/1/1.png
+++ b/data/tilesets/secondary/elite_four/anim/1/1.png
diff --git a/data/tilesets/secondary/elite_four/tiles.png b/data/tilesets/secondary/elite_four/tiles.png
index 834be3701..751f5d8cd 100644
--- a/data/tilesets/secondary/elite_four/tiles.png
+++ b/data/tilesets/secondary/elite_four/tiles.png
diff --git a/data/tilesets/secondary/ever_grande/anim/0.png b/data/tilesets/secondary/ever_grande/anim/0.png
index af45de64e..e749a3928 100644
--- a/data/tilesets/secondary/ever_grande/anim/0.png
+++ b/data/tilesets/secondary/ever_grande/anim/0.png
diff --git a/data/tilesets/secondary/ever_grande/anim/1.png b/data/tilesets/secondary/ever_grande/anim/1.png
index af45de64e..e749a3928 100644
--- a/data/tilesets/secondary/ever_grande/anim/1.png
+++ b/data/tilesets/secondary/ever_grande/anim/1.png
diff --git a/data/tilesets/secondary/ever_grande/anim/2.png b/data/tilesets/secondary/ever_grande/anim/2.png
index f6e0941c6..b91f5f41d 100644
--- a/data/tilesets/secondary/ever_grande/anim/2.png
+++ b/data/tilesets/secondary/ever_grande/anim/2.png
diff --git a/data/tilesets/secondary/ever_grande/anim/3.png b/data/tilesets/secondary/ever_grande/anim/3.png
index 84b6438e1..98a0a1c0a 100644
--- a/data/tilesets/secondary/ever_grande/anim/3.png
+++ b/data/tilesets/secondary/ever_grande/anim/3.png
diff --git a/data/tilesets/secondary/ever_grande/anim/4.png b/data/tilesets/secondary/ever_grande/anim/4.png
index af45de64e..e749a3928 100644
--- a/data/tilesets/secondary/ever_grande/anim/4.png
+++ b/data/tilesets/secondary/ever_grande/anim/4.png
diff --git a/data/tilesets/secondary/ever_grande/anim/5.png b/data/tilesets/secondary/ever_grande/anim/5.png
index af45de64e..e749a3928 100644
--- a/data/tilesets/secondary/ever_grande/anim/5.png
+++ b/data/tilesets/secondary/ever_grande/anim/5.png
diff --git a/data/tilesets/secondary/ever_grande/anim/6.png b/data/tilesets/secondary/ever_grande/anim/6.png
index 5042b12cd..f89873480 100644
--- a/data/tilesets/secondary/ever_grande/anim/6.png
+++ b/data/tilesets/secondary/ever_grande/anim/6.png
diff --git a/data/tilesets/secondary/ever_grande/anim/7.png b/data/tilesets/secondary/ever_grande/anim/7.png
index 5042b12cd..f89873480 100644
--- a/data/tilesets/secondary/ever_grande/anim/7.png
+++ b/data/tilesets/secondary/ever_grande/anim/7.png
diff --git a/data/tilesets/secondary/ever_grande/tiles.png b/data/tilesets/secondary/ever_grande/tiles.png
index 0f3689c24..a8ff3a742 100644
--- a/data/tilesets/secondary/ever_grande/tiles.png
+++ b/data/tilesets/secondary/ever_grande/tiles.png
diff --git a/data/tilesets/secondary/facility/tiles.png b/data/tilesets/secondary/facility/tiles.png
index 015efc2a7..7ab52264b 100644
--- a/data/tilesets/secondary/facility/tiles.png
+++ b/data/tilesets/secondary/facility/tiles.png
diff --git a/data/tilesets/secondary/fallarbor/tiles.png b/data/tilesets/secondary/fallarbor/tiles.png
index ab88caa62..4cebf7e81 100644
--- a/data/tilesets/secondary/fallarbor/tiles.png
+++ b/data/tilesets/secondary/fallarbor/tiles.png
diff --git a/data/tilesets/secondary/fortree/tiles.png b/data/tilesets/secondary/fortree/tiles.png
index b14c78bf5..c19f2e80c 100644
--- a/data/tilesets/secondary/fortree/tiles.png
+++ b/data/tilesets/secondary/fortree/tiles.png
diff --git a/data/tilesets/secondary/fortree_gym/tiles.png b/data/tilesets/secondary/fortree_gym/tiles.png
index cd571387a..3e278d4e1 100644
--- a/data/tilesets/secondary/fortree_gym/tiles.png
+++ b/data/tilesets/secondary/fortree_gym/tiles.png
diff --git a/data/tilesets/secondary/generic_building/tiles.png b/data/tilesets/secondary/generic_building/tiles.png
index 0565c75a0..18aab082f 100644
--- a/data/tilesets/secondary/generic_building/tiles.png
+++ b/data/tilesets/secondary/generic_building/tiles.png
diff --git a/data/tilesets/secondary/inside_of_truck/tiles.png b/data/tilesets/secondary/inside_of_truck/tiles.png
index 44f923a5a..59a24b705 100644
--- a/data/tilesets/secondary/inside_of_truck/tiles.png
+++ b/data/tilesets/secondary/inside_of_truck/tiles.png
diff --git a/data/tilesets/secondary/lab/tiles.png b/data/tilesets/secondary/lab/tiles.png
index 1b1900dae..2f667aaff 100644
--- a/data/tilesets/secondary/lab/tiles.png
+++ b/data/tilesets/secondary/lab/tiles.png
diff --git a/data/tilesets/secondary/lavaridge/anim/0.png b/data/tilesets/secondary/lavaridge/anim/0.png
index 303855f71..66f73e2d2 100644
--- a/data/tilesets/secondary/lavaridge/anim/0.png
+++ b/data/tilesets/secondary/lavaridge/anim/0.png
diff --git a/data/tilesets/secondary/lavaridge/anim/1.png b/data/tilesets/secondary/lavaridge/anim/1.png
index 7cdee79e2..306799e63 100644
--- a/data/tilesets/secondary/lavaridge/anim/1.png
+++ b/data/tilesets/secondary/lavaridge/anim/1.png
diff --git a/data/tilesets/secondary/lavaridge/anim/2.png b/data/tilesets/secondary/lavaridge/anim/2.png
index b5810b806..06ec224e9 100644
--- a/data/tilesets/secondary/lavaridge/anim/2.png
+++ b/data/tilesets/secondary/lavaridge/anim/2.png
diff --git a/data/tilesets/secondary/lavaridge/anim/3.png b/data/tilesets/secondary/lavaridge/anim/3.png
index caf7b5698..cdacfa119 100644
--- a/data/tilesets/secondary/lavaridge/anim/3.png
+++ b/data/tilesets/secondary/lavaridge/anim/3.png
diff --git a/data/tilesets/secondary/lavaridge/tiles.png b/data/tilesets/secondary/lavaridge/tiles.png
index b7f11ad3a..bfce10a15 100644
--- a/data/tilesets/secondary/lavaridge/tiles.png
+++ b/data/tilesets/secondary/lavaridge/tiles.png
diff --git a/data/tilesets/secondary/lavaridge_gym/tiles.png b/data/tilesets/secondary/lavaridge_gym/tiles.png
index 294f066d6..6af060f6d 100644
--- a/data/tilesets/secondary/lavaridge_gym/tiles.png
+++ b/data/tilesets/secondary/lavaridge_gym/tiles.png
diff --git a/data/tilesets/secondary/lilycove/tiles.png b/data/tilesets/secondary/lilycove/tiles.png
index 870c2dcc3..efdc0e770 100644
--- a/data/tilesets/secondary/lilycove/tiles.png
+++ b/data/tilesets/secondary/lilycove/tiles.png
diff --git a/data/tilesets/secondary/lilycove_museum/tiles.png b/data/tilesets/secondary/lilycove_museum/tiles.png
index 495187301..d0f0cf036 100644
--- a/data/tilesets/secondary/lilycove_museum/tiles.png
+++ b/data/tilesets/secondary/lilycove_museum/tiles.png
diff --git a/data/tilesets/secondary/mauville/anim/0/0.png b/data/tilesets/secondary/mauville/anim/0/0.png
index fbf1f5169..2b66ac856 100644
--- a/data/tilesets/secondary/mauville/anim/0/0.png
+++ b/data/tilesets/secondary/mauville/anim/0/0.png
diff --git a/data/tilesets/secondary/mauville/anim/0/1.png b/data/tilesets/secondary/mauville/anim/0/1.png
index b07d27c5e..13fe4e27d 100644
--- a/data/tilesets/secondary/mauville/anim/0/1.png
+++ b/data/tilesets/secondary/mauville/anim/0/1.png
diff --git a/data/tilesets/secondary/mauville/anim/0/2.png b/data/tilesets/secondary/mauville/anim/0/2.png
index 576981d72..c3a18889c 100644
--- a/data/tilesets/secondary/mauville/anim/0/2.png
+++ b/data/tilesets/secondary/mauville/anim/0/2.png
diff --git a/data/tilesets/secondary/mauville/anim/0/3.png b/data/tilesets/secondary/mauville/anim/0/3.png
index 998f0c1b1..faf12f826 100644
--- a/data/tilesets/secondary/mauville/anim/0/3.png
+++ b/data/tilesets/secondary/mauville/anim/0/3.png
diff --git a/data/tilesets/secondary/mauville/anim/0/4.png b/data/tilesets/secondary/mauville/anim/0/4.png
index 6bd9947f0..f8061fcfc 100644
--- a/data/tilesets/secondary/mauville/anim/0/4.png
+++ b/data/tilesets/secondary/mauville/anim/0/4.png
diff --git a/data/tilesets/secondary/mauville/anim/1/0.png b/data/tilesets/secondary/mauville/anim/1/0.png
index fbf1f5169..2b66ac856 100644
--- a/data/tilesets/secondary/mauville/anim/1/0.png
+++ b/data/tilesets/secondary/mauville/anim/1/0.png
diff --git a/data/tilesets/secondary/mauville/anim/1/1.png b/data/tilesets/secondary/mauville/anim/1/1.png
index b07d27c5e..13fe4e27d 100644
--- a/data/tilesets/secondary/mauville/anim/1/1.png
+++ b/data/tilesets/secondary/mauville/anim/1/1.png
diff --git a/data/tilesets/secondary/mauville/anim/1/2.png b/data/tilesets/secondary/mauville/anim/1/2.png
index 576981d72..c3a18889c 100644
--- a/data/tilesets/secondary/mauville/anim/1/2.png
+++ b/data/tilesets/secondary/mauville/anim/1/2.png
diff --git a/data/tilesets/secondary/mauville/anim/1/3.png b/data/tilesets/secondary/mauville/anim/1/3.png
index 998f0c1b1..faf12f826 100644
--- a/data/tilesets/secondary/mauville/anim/1/3.png
+++ b/data/tilesets/secondary/mauville/anim/1/3.png
diff --git a/data/tilesets/secondary/mauville/anim/1/4.png b/data/tilesets/secondary/mauville/anim/1/4.png
index 6bd9947f0..f8061fcfc 100644
--- a/data/tilesets/secondary/mauville/anim/1/4.png
+++ b/data/tilesets/secondary/mauville/anim/1/4.png
diff --git a/data/tilesets/secondary/mauville/tiles.png b/data/tilesets/secondary/mauville/tiles.png
index 66a5b9409..43029c47b 100644
--- a/data/tilesets/secondary/mauville/tiles.png
+++ b/data/tilesets/secondary/mauville/tiles.png
diff --git a/data/tilesets/secondary/mauville_game_corner/tiles.png b/data/tilesets/secondary/mauville_game_corner/tiles.png
index c8f0dd1ee..50e341fde 100644
--- a/data/tilesets/secondary/mauville_game_corner/tiles.png
+++ b/data/tilesets/secondary/mauville_game_corner/tiles.png
diff --git a/data/tilesets/secondary/mauville_gym/anim/0.png b/data/tilesets/secondary/mauville_gym/anim/0.png
index 009e26376..ebf603978 100644
--- a/data/tilesets/secondary/mauville_gym/anim/0.png
+++ b/data/tilesets/secondary/mauville_gym/anim/0.png
diff --git a/data/tilesets/secondary/mauville_gym/anim/1.png b/data/tilesets/secondary/mauville_gym/anim/1.png
index 9decb30cc..34072707f 100644
--- a/data/tilesets/secondary/mauville_gym/anim/1.png
+++ b/data/tilesets/secondary/mauville_gym/anim/1.png
diff --git a/data/tilesets/secondary/mauville_gym/tiles.png b/data/tilesets/secondary/mauville_gym/tiles.png
index e48835bd4..31ab2420d 100644
--- a/data/tilesets/secondary/mauville_gym/tiles.png
+++ b/data/tilesets/secondary/mauville_gym/tiles.png
diff --git a/data/tilesets/secondary/meteor_falls/tiles.png b/data/tilesets/secondary/meteor_falls/tiles.png
index 391b509a4..95f665a06 100644
--- a/data/tilesets/secondary/meteor_falls/tiles.png
+++ b/data/tilesets/secondary/meteor_falls/tiles.png
diff --git a/data/tilesets/secondary/mossdeep/tiles.png b/data/tilesets/secondary/mossdeep/tiles.png
index 4e79dd23c..d38750f93 100644
--- a/data/tilesets/secondary/mossdeep/tiles.png
+++ b/data/tilesets/secondary/mossdeep/tiles.png
diff --git a/data/tilesets/secondary/mossdeep_gym/tiles.png b/data/tilesets/secondary/mossdeep_gym/tiles.png
index a804c3ed1..b9e5b0a54 100644
--- a/data/tilesets/secondary/mossdeep_gym/tiles.png
+++ b/data/tilesets/secondary/mossdeep_gym/tiles.png
diff --git a/data/tilesets/secondary/oceanic_museum/tiles.png b/data/tilesets/secondary/oceanic_museum/tiles.png
index 25a20d586..bda540d6b 100644
--- a/data/tilesets/secondary/oceanic_museum/tiles.png
+++ b/data/tilesets/secondary/oceanic_museum/tiles.png
diff --git a/data/tilesets/secondary/pacifidlog/anim/0/0.png b/data/tilesets/secondary/pacifidlog/anim/0/0.png
index 796919f75..1b99b24a1 100644
--- a/data/tilesets/secondary/pacifidlog/anim/0/0.png
+++ b/data/tilesets/secondary/pacifidlog/anim/0/0.png
diff --git a/data/tilesets/secondary/pacifidlog/anim/0/1.png b/data/tilesets/secondary/pacifidlog/anim/0/1.png
index ece22253b..74c510efe 100644
--- a/data/tilesets/secondary/pacifidlog/anim/0/1.png
+++ b/data/tilesets/secondary/pacifidlog/anim/0/1.png
diff --git a/data/tilesets/secondary/pacifidlog/anim/0/2.png b/data/tilesets/secondary/pacifidlog/anim/0/2.png
index cf2b2dea0..7e9811c4e 100644
--- a/data/tilesets/secondary/pacifidlog/anim/0/2.png
+++ b/data/tilesets/secondary/pacifidlog/anim/0/2.png
diff --git a/data/tilesets/secondary/pacifidlog/anim/1/0.png b/data/tilesets/secondary/pacifidlog/anim/1/0.png
index 6510bf558..6d432eb25 100644
--- a/data/tilesets/secondary/pacifidlog/anim/1/0.png
+++ b/data/tilesets/secondary/pacifidlog/anim/1/0.png
diff --git a/data/tilesets/secondary/pacifidlog/anim/1/1.png b/data/tilesets/secondary/pacifidlog/anim/1/1.png
index b31301a5e..7588b8a72 100644
--- a/data/tilesets/secondary/pacifidlog/anim/1/1.png
+++ b/data/tilesets/secondary/pacifidlog/anim/1/1.png
diff --git a/data/tilesets/secondary/pacifidlog/anim/1/2.png b/data/tilesets/secondary/pacifidlog/anim/1/2.png
index 6287c3c56..2a11e5065 100644
--- a/data/tilesets/secondary/pacifidlog/anim/1/2.png
+++ b/data/tilesets/secondary/pacifidlog/anim/1/2.png
diff --git a/data/tilesets/secondary/pacifidlog/anim/1/3.png b/data/tilesets/secondary/pacifidlog/anim/1/3.png
index b015319e4..be4089ff4 100644
--- a/data/tilesets/secondary/pacifidlog/anim/1/3.png
+++ b/data/tilesets/secondary/pacifidlog/anim/1/3.png
diff --git a/data/tilesets/secondary/pacifidlog/anim/1/4.png b/data/tilesets/secondary/pacifidlog/anim/1/4.png
index 66d150608..4c16111de 100644
--- a/data/tilesets/secondary/pacifidlog/anim/1/4.png
+++ b/data/tilesets/secondary/pacifidlog/anim/1/4.png
diff --git a/data/tilesets/secondary/pacifidlog/anim/1/5.png b/data/tilesets/secondary/pacifidlog/anim/1/5.png
index fcb3e7fda..93bbc6375 100644
--- a/data/tilesets/secondary/pacifidlog/anim/1/5.png
+++ b/data/tilesets/secondary/pacifidlog/anim/1/5.png
diff --git a/data/tilesets/secondary/pacifidlog/anim/1/6.png b/data/tilesets/secondary/pacifidlog/anim/1/6.png
index e6fd8abb2..b08f5a0d9 100644
--- a/data/tilesets/secondary/pacifidlog/anim/1/6.png
+++ b/data/tilesets/secondary/pacifidlog/anim/1/6.png
diff --git a/data/tilesets/secondary/pacifidlog/anim/1/7.png b/data/tilesets/secondary/pacifidlog/anim/1/7.png
index 7b4785692..1a5f0ae5c 100644
--- a/data/tilesets/secondary/pacifidlog/anim/1/7.png
+++ b/data/tilesets/secondary/pacifidlog/anim/1/7.png
diff --git a/data/tilesets/secondary/pacifidlog/tiles.png b/data/tilesets/secondary/pacifidlog/tiles.png
index 836fa205f..2b38b82b8 100644
--- a/data/tilesets/secondary/pacifidlog/tiles.png
+++ b/data/tilesets/secondary/pacifidlog/tiles.png
diff --git a/data/tilesets/secondary/petalburg/tiles.png b/data/tilesets/secondary/petalburg/tiles.png
index 645d3d1f3..e938a0237 100644
--- a/data/tilesets/secondary/petalburg/tiles.png
+++ b/data/tilesets/secondary/petalburg/tiles.png
diff --git a/data/tilesets/secondary/petalburg_gym/tiles.png b/data/tilesets/secondary/petalburg_gym/tiles.png
index c9654b13c..1050f8d34 100644
--- a/data/tilesets/secondary/petalburg_gym/tiles.png
+++ b/data/tilesets/secondary/petalburg_gym/tiles.png
diff --git a/data/tilesets/secondary/pokemon_center/tiles.png b/data/tilesets/secondary/pokemon_center/tiles.png
index 47ef09750..e2294af02 100644
--- a/data/tilesets/secondary/pokemon_center/tiles.png
+++ b/data/tilesets/secondary/pokemon_center/tiles.png
diff --git a/data/tilesets/secondary/pokemon_day_care/tiles.png b/data/tilesets/secondary/pokemon_day_care/tiles.png
index eab49af32..a45206efc 100644
--- a/data/tilesets/secondary/pokemon_day_care/tiles.png
+++ b/data/tilesets/secondary/pokemon_day_care/tiles.png
diff --git a/data/tilesets/secondary/pokemon_fan_club/tiles.png b/data/tilesets/secondary/pokemon_fan_club/tiles.png
index 2714292f0..fa42a5ef1 100644
--- a/data/tilesets/secondary/pokemon_fan_club/tiles.png
+++ b/data/tilesets/secondary/pokemon_fan_club/tiles.png
diff --git a/data/tilesets/secondary/pokemon_school/tiles.png b/data/tilesets/secondary/pokemon_school/tiles.png
index 3c8c4dffe..8ea0e8fbd 100644
--- a/data/tilesets/secondary/pokemon_school/tiles.png
+++ b/data/tilesets/secondary/pokemon_school/tiles.png
diff --git a/data/tilesets/secondary/pretty_petal_flower_shop/tiles.png b/data/tilesets/secondary/pretty_petal_flower_shop/tiles.png
index 7a9e44935..daf4e05b4 100644
--- a/data/tilesets/secondary/pretty_petal_flower_shop/tiles.png
+++ b/data/tilesets/secondary/pretty_petal_flower_shop/tiles.png
diff --git a/data/tilesets/secondary/rustboro/anim/0/0.png b/data/tilesets/secondary/rustboro/anim/0/0.png
index 0ffce1460..af00b97c7 100644
--- a/data/tilesets/secondary/rustboro/anim/0/0.png
+++ b/data/tilesets/secondary/rustboro/anim/0/0.png
diff --git a/data/tilesets/secondary/rustboro/anim/0/1.png b/data/tilesets/secondary/rustboro/anim/0/1.png
index b29ebd10c..20b1ef630 100644
--- a/data/tilesets/secondary/rustboro/anim/0/1.png
+++ b/data/tilesets/secondary/rustboro/anim/0/1.png
diff --git a/data/tilesets/secondary/rustboro/anim/0/2.png b/data/tilesets/secondary/rustboro/anim/0/2.png
index 7716d0b1a..44c4b2cdc 100644
--- a/data/tilesets/secondary/rustboro/anim/0/2.png
+++ b/data/tilesets/secondary/rustboro/anim/0/2.png
diff --git a/data/tilesets/secondary/rustboro/anim/0/3.png b/data/tilesets/secondary/rustboro/anim/0/3.png
index 7716d0b1a..44c4b2cdc 100644
--- a/data/tilesets/secondary/rustboro/anim/0/3.png
+++ b/data/tilesets/secondary/rustboro/anim/0/3.png
diff --git a/data/tilesets/secondary/rustboro/anim/0/4.png b/data/tilesets/secondary/rustboro/anim/0/4.png
index 7716d0b1a..44c4b2cdc 100644
--- a/data/tilesets/secondary/rustboro/anim/0/4.png
+++ b/data/tilesets/secondary/rustboro/anim/0/4.png
diff --git a/data/tilesets/secondary/rustboro/anim/0/5.png b/data/tilesets/secondary/rustboro/anim/0/5.png
index 7716d0b1a..44c4b2cdc 100644
--- a/data/tilesets/secondary/rustboro/anim/0/5.png
+++ b/data/tilesets/secondary/rustboro/anim/0/5.png
diff --git a/data/tilesets/secondary/rustboro/anim/0/6.png b/data/tilesets/secondary/rustboro/anim/0/6.png
index 7716d0b1a..44c4b2cdc 100644
--- a/data/tilesets/secondary/rustboro/anim/0/6.png
+++ b/data/tilesets/secondary/rustboro/anim/0/6.png
diff --git a/data/tilesets/secondary/rustboro/anim/0/7.png b/data/tilesets/secondary/rustboro/anim/0/7.png
index 7716d0b1a..44c4b2cdc 100644
--- a/data/tilesets/secondary/rustboro/anim/0/7.png
+++ b/data/tilesets/secondary/rustboro/anim/0/7.png
diff --git a/data/tilesets/secondary/rustboro/anim/1/0.png b/data/tilesets/secondary/rustboro/anim/1/0.png
index d975c947f..cc28fd1c0 100644
--- a/data/tilesets/secondary/rustboro/anim/1/0.png
+++ b/data/tilesets/secondary/rustboro/anim/1/0.png
diff --git a/data/tilesets/secondary/rustboro/anim/1/1.png b/data/tilesets/secondary/rustboro/anim/1/1.png
index 751ba9cef..8752818ed 100644
--- a/data/tilesets/secondary/rustboro/anim/1/1.png
+++ b/data/tilesets/secondary/rustboro/anim/1/1.png
diff --git a/data/tilesets/secondary/rustboro/tiles.png b/data/tilesets/secondary/rustboro/tiles.png
index 59ddc0135..32d35a419 100644
--- a/data/tilesets/secondary/rustboro/tiles.png
+++ b/data/tilesets/secondary/rustboro/tiles.png
diff --git a/data/tilesets/secondary/rustboro_gym/tiles.png b/data/tilesets/secondary/rustboro_gym/tiles.png
index 760816284..7e2406d68 100644
--- a/data/tilesets/secondary/rustboro_gym/tiles.png
+++ b/data/tilesets/secondary/rustboro_gym/tiles.png
diff --git a/data/tilesets/secondary/rusturf_tunnel/tiles.png b/data/tilesets/secondary/rusturf_tunnel/tiles.png
index a01a09844..3f94257c8 100644
--- a/data/tilesets/secondary/rusturf_tunnel/tiles.png
+++ b/data/tilesets/secondary/rusturf_tunnel/tiles.png
diff --git a/data/tilesets/secondary/seashore_house/tiles.png b/data/tilesets/secondary/seashore_house/tiles.png
index 695f83037..14100fa06 100644
--- a/data/tilesets/secondary/seashore_house/tiles.png
+++ b/data/tilesets/secondary/seashore_house/tiles.png
diff --git a/data/tilesets/secondary/secret_base/blue_cave/tiles.png b/data/tilesets/secondary/secret_base/blue_cave/tiles.png
index 207e8d845..ed7126297 100644
--- a/data/tilesets/secondary/secret_base/blue_cave/tiles.png
+++ b/data/tilesets/secondary/secret_base/blue_cave/tiles.png
diff --git a/data/tilesets/secondary/secret_base/brown_cave/tiles.png b/data/tilesets/secondary/secret_base/brown_cave/tiles.png
index 7888f8cc2..7beb706d9 100644
--- a/data/tilesets/secondary/secret_base/brown_cave/tiles.png
+++ b/data/tilesets/secondary/secret_base/brown_cave/tiles.png
diff --git a/data/tilesets/secondary/secret_base/red_cave/tiles.png b/data/tilesets/secondary/secret_base/red_cave/tiles.png
index 5c21865e2..5146810e1 100644
--- a/data/tilesets/secondary/secret_base/red_cave/tiles.png
+++ b/data/tilesets/secondary/secret_base/red_cave/tiles.png
diff --git a/data/tilesets/secondary/secret_base/shrub/tiles.png b/data/tilesets/secondary/secret_base/shrub/tiles.png
index 2e0a6d028..a64727c6e 100644
--- a/data/tilesets/secondary/secret_base/shrub/tiles.png
+++ b/data/tilesets/secondary/secret_base/shrub/tiles.png
diff --git a/data/tilesets/secondary/secret_base/tree/tiles.png b/data/tilesets/secondary/secret_base/tree/tiles.png
index 83ddd6144..f07999cb0 100644
--- a/data/tilesets/secondary/secret_base/tree/tiles.png
+++ b/data/tilesets/secondary/secret_base/tree/tiles.png
diff --git a/data/tilesets/secondary/secret_base/yellow_cave/tiles.png b/data/tilesets/secondary/secret_base/yellow_cave/tiles.png
index e8386a804..d4535523b 100644
--- a/data/tilesets/secondary/secret_base/yellow_cave/tiles.png
+++ b/data/tilesets/secondary/secret_base/yellow_cave/tiles.png
diff --git a/data/tilesets/secondary/ship/tiles.png b/data/tilesets/secondary/ship/tiles.png
index d4b0471b2..5ddbe2859 100644
--- a/data/tilesets/secondary/ship/tiles.png
+++ b/data/tilesets/secondary/ship/tiles.png
diff --git a/data/tilesets/secondary/shop/tiles.png b/data/tilesets/secondary/shop/tiles.png
index b5a0a4936..9715afa0e 100644
--- a/data/tilesets/secondary/shop/tiles.png
+++ b/data/tilesets/secondary/shop/tiles.png
diff --git a/data/tilesets/secondary/slateport/tiles.png b/data/tilesets/secondary/slateport/tiles.png
index d51c0dea5..f350b3b8d 100644
--- a/data/tilesets/secondary/slateport/tiles.png
+++ b/data/tilesets/secondary/slateport/tiles.png
diff --git a/data/tilesets/secondary/sootopolis/tiles.png b/data/tilesets/secondary/sootopolis/tiles.png
index 588e5e8e9..8c5dddc76 100644
--- a/data/tilesets/secondary/sootopolis/tiles.png
+++ b/data/tilesets/secondary/sootopolis/tiles.png
diff --git a/data/tilesets/secondary/sootopolis_gym/anim/0/0.png b/data/tilesets/secondary/sootopolis_gym/anim/0/0.png
index 6d2101cb3..180b5522e 100644
--- a/data/tilesets/secondary/sootopolis_gym/anim/0/0.png
+++ b/data/tilesets/secondary/sootopolis_gym/anim/0/0.png
diff --git a/data/tilesets/secondary/sootopolis_gym/anim/0/1.png b/data/tilesets/secondary/sootopolis_gym/anim/0/1.png
index 0d5143569..af3ab12d2 100644
--- a/data/tilesets/secondary/sootopolis_gym/anim/0/1.png
+++ b/data/tilesets/secondary/sootopolis_gym/anim/0/1.png
diff --git a/data/tilesets/secondary/sootopolis_gym/anim/0/2.png b/data/tilesets/secondary/sootopolis_gym/anim/0/2.png
index 2f8981ba2..8481c0cde 100644
--- a/data/tilesets/secondary/sootopolis_gym/anim/0/2.png
+++ b/data/tilesets/secondary/sootopolis_gym/anim/0/2.png
diff --git a/data/tilesets/secondary/sootopolis_gym/anim/1/0.png b/data/tilesets/secondary/sootopolis_gym/anim/1/0.png
index 7b863adf3..dc6cf500e 100644
--- a/data/tilesets/secondary/sootopolis_gym/anim/1/0.png
+++ b/data/tilesets/secondary/sootopolis_gym/anim/1/0.png
diff --git a/data/tilesets/secondary/sootopolis_gym/anim/1/1.png b/data/tilesets/secondary/sootopolis_gym/anim/1/1.png
index d685a9a03..93dd79753 100644
--- a/data/tilesets/secondary/sootopolis_gym/anim/1/1.png
+++ b/data/tilesets/secondary/sootopolis_gym/anim/1/1.png
diff --git a/data/tilesets/secondary/sootopolis_gym/anim/1/2.png b/data/tilesets/secondary/sootopolis_gym/anim/1/2.png
index 0966ce903..30961482c 100644
--- a/data/tilesets/secondary/sootopolis_gym/anim/1/2.png
+++ b/data/tilesets/secondary/sootopolis_gym/anim/1/2.png
diff --git a/data/tilesets/secondary/sootopolis_gym/tiles.png b/data/tilesets/secondary/sootopolis_gym/tiles.png
index ca53f06f7..5231d92ab 100644
--- a/data/tilesets/secondary/sootopolis_gym/tiles.png
+++ b/data/tilesets/secondary/sootopolis_gym/tiles.png
diff --git a/data/tilesets/secondary/trick_house_puzzle/tiles.png b/data/tilesets/secondary/trick_house_puzzle/tiles.png
index c1a8d7055..e74f00aa2 100644
--- a/data/tilesets/secondary/trick_house_puzzle/tiles.png
+++ b/data/tilesets/secondary/trick_house_puzzle/tiles.png
diff --git a/data/tilesets/secondary/underwater/anim/0.png b/data/tilesets/secondary/underwater/anim/0.png
index 50a737609..fab28e54f 100644
--- a/data/tilesets/secondary/underwater/anim/0.png
+++ b/data/tilesets/secondary/underwater/anim/0.png
diff --git a/data/tilesets/secondary/underwater/anim/1.png b/data/tilesets/secondary/underwater/anim/1.png
index da52e9b17..869bc6060 100644
--- a/data/tilesets/secondary/underwater/anim/1.png
+++ b/data/tilesets/secondary/underwater/anim/1.png
diff --git a/data/tilesets/secondary/underwater/anim/2.png b/data/tilesets/secondary/underwater/anim/2.png
index 5055f6a01..64e4b267d 100644
--- a/data/tilesets/secondary/underwater/anim/2.png
+++ b/data/tilesets/secondary/underwater/anim/2.png
diff --git a/data/tilesets/secondary/underwater/anim/3.png b/data/tilesets/secondary/underwater/anim/3.png
index 25514326d..0c1392011 100644
--- a/data/tilesets/secondary/underwater/anim/3.png
+++ b/data/tilesets/secondary/underwater/anim/3.png
diff --git a/data/tilesets/secondary/underwater/tiles.png b/data/tilesets/secondary/underwater/tiles.png
index e0569d970..811b0cae4 100644
--- a/data/tilesets/secondary/underwater/tiles.png
+++ b/data/tilesets/secondary/underwater/tiles.png
diff --git a/data/tilesets/secondary/unused_1/tiles.png b/data/tilesets/secondary/unused_1/tiles.png
index 0a35187c8..9347405d4 100644
--- a/data/tilesets/secondary/unused_1/tiles.png
+++ b/data/tilesets/secondary/unused_1/tiles.png
diff --git a/data/tilesets/secondary/unused_2/tiles.png b/data/tilesets/secondary/unused_2/tiles.png
index b9c594303..d734e826d 100644
--- a/data/tilesets/secondary/unused_2/tiles.png
+++ b/data/tilesets/secondary/unused_2/tiles.png
diff --git a/include/fieldmap.h b/include/fieldmap.h
index e77342b72..cc2a29914 100644
--- a/include/fieldmap.h
+++ b/include/fieldmap.h
@@ -2,6 +2,13 @@
 #define GUARD_FIELDMAP2_H
 #include "event_object_movement.h"
 
+#define NUM_TILES_IN_PRIMARY 512
+#define NUM_TILES_TOTAL 1024
+#define NUM_METATILES_IN_PRIMARY 512
+#define NUM_METATILES_TOTAL 1024
+#define NUM_PALS_IN_PRIMARY 6
+#define NUM_PALS_TOTAL 12
+
 extern struct BackupMapLayout gUnknown_03004870;
 struct MapHeader *mapconnection_get_mapheader(struct MapConnection *connection);
 int GetMapBorderIdAt(int x, int y);
diff --git a/src/field_camera.c b/src/field_camera.c
index 29cdf0496..319c8a540 100644
--- a/src/field_camera.c
+++ b/src/field_camera.c
@@ -231,17 +231,17 @@ static void DrawMetatileAt(struct MapLayout *mapLayout, u16 offset, int x, int y
     u16 *metatiles;
     u16 metatileId = MapGridGetMetatileIdAt(x, y);
 
-    if (metatileId > 0x400)
+    if (metatileId > NUM_METATILES_TOTAL)
         metatileId = 0;
 
-    if (metatileId < 0x200)
+    if (metatileId < NUM_METATILES_IN_PRIMARY)
     {
         metatiles = mapLayout->primaryTileset->metatiles;
     }
     else
     {
         metatiles = mapLayout->secondaryTileset->metatiles;
-        metatileId -= 0x200;
+        metatileId -= NUM_METATILES_IN_PRIMARY;
     }
 
     DrawMetatile(MapGridGetMetatileLayerTypeAt(x, y), metatiles + metatileId * 8, offset);
diff --git a/src/fieldmap.c b/src/fieldmap.c
index 874df23b0..abb46fd35 100644
--- a/src/fieldmap.c
+++ b/src/fieldmap.c
@@ -463,15 +463,15 @@ void MapGridSetMetatileEntryAt(int x, int y, u16 metatile)
 u32 GetBehaviorByMetatileId(u16 metatile)
 {
     u16 *attributes;
-    if (metatile <= 0x1ff)
+    if (metatile < NUM_METATILES_IN_PRIMARY)
     {
         attributes = gMapHeader.mapLayout->primaryTileset->metatileAttributes;
         return attributes[metatile];
     }
-    else if (metatile <= 0x3ff)
+    else if (metatile < NUM_METATILES_TOTAL)
     {
         attributes = gMapHeader.mapLayout->secondaryTileset->metatileAttributes;
-        return attributes[metatile - 0x200];
+        return attributes[metatile - NUM_METATILES_IN_PRIMARY];
     }
     else
     {
@@ -878,17 +878,17 @@ void GetCameraCoords(u16 *x, u16 *y)
     *y = gSaveBlock1.pos.y;
 }
 
-void sub_8056C98(struct Tileset *tileset, void *src)
+void sub_8056C98(struct Tileset *tileset, void *dest)
 {
     if (tileset)
     {
         if (!tileset->isCompressed)
         {
-            CpuFastSet(tileset->tiles, src, 0x1000);
+            CpuFastCopy(tileset->tiles, dest, NUM_TILES_IN_PRIMARY * 16 * 2);
         }
         else
         {
-            LZ77UnCompVram(tileset->tiles, src);
+            LZ77UnCompVram(tileset->tiles, dest);
         }
     }
 }
@@ -906,7 +906,7 @@ void sub_8056CBC(struct Tileset *tileset, int offset, int size)
         }
         else if (tileset->isSecondary == TRUE)
         {
-            LoadPalette(tileset->palettes + 0xc0, offset, size);
+            LoadPalette((u16*)tileset->palettes + (NUM_PALS_IN_PRIMARY * 16), offset, size);
         }
         else
         {
@@ -918,24 +918,24 @@ void sub_8056CBC(struct Tileset *tileset, int offset, int size)
 
 void sub_8056D28(struct MapLayout *mapLayout)
 {
-    void *src = (void*)(BG_VRAM);
-    sub_8056C98(mapLayout->primaryTileset, src);
+    void *dest = (void*)(BG_VRAM);
+    sub_8056C98(mapLayout->primaryTileset, dest);
 }
 
 void sub_8056D38(struct MapLayout *mapLayout)
 {
-    void *src = (void*)(BG_VRAM + 0x4000);
-    sub_8056C98(mapLayout->secondaryTileset, src);
+    void *dest = (void*)(BG_VRAM + NUM_TILES_IN_PRIMARY * 16 * 2);
+    sub_8056C98(mapLayout->secondaryTileset, dest);
 }
 
 void apply_map_tileset1_palette(struct MapLayout *mapLayout)
 {
-    sub_8056CBC(mapLayout->primaryTileset, 0, 0xc0);
+    sub_8056CBC(mapLayout->primaryTileset, 0, NUM_PALS_IN_PRIMARY * 16 * 2);
 }
 
 void apply_map_tileset2_palette(struct MapLayout *mapLayout)
 {
-    sub_8056CBC(mapLayout->secondaryTileset, 0x60, 0xc0);
+    sub_8056CBC(mapLayout->secondaryTileset, NUM_PALS_IN_PRIMARY * 16, (NUM_PALS_TOTAL - NUM_PALS_IN_PRIMARY) * 16 * 2);
 }
 
 void copy_map_tileset1_tileset2_to_vram(struct MapLayout *mapLayout)
diff --git a/src/item_menu.c b/src/item_menu.c
index 12d02ebd8..95a84b1fb 100644
--- a/src/item_menu.c
+++ b/src/item_menu.c
@@ -1119,13 +1119,13 @@ static void sub_80A41E0(u8 *a, u16 b, const u8 *c, u16 d, u8 e)
     AlignInt1InMenuWindow(a, d, 0x78, 1);
 }
 
-static u8 *sub_80A425C(u8 taskId, u8 *text, u8 c)
+static u8 *sub_80A425C(u8 taskId, u8 *text, u8 itemSlot)
 {
-    if (gTasks[taskId].data[10] - gBagPocketScrollStates[sCurrentBagPocket].scrollTop - 1 == c)
+    if (gTasks[taskId].data[10] - gBagPocketScrollStates[sCurrentBagPocket].scrollTop - 1 == itemSlot)
     {
         text[0] = EXT_CTRL_CODE_BEGIN;
         text[1] = 1;
-        text[2] = 2;
+        text[2] = TEXT_COLOR_RED;
         text += 3;
     }
     return text;
@@ -1222,275 +1222,61 @@ static void sub_80A444C(u16 a, int b, int c, int d)
     }
 }
 
-// more gBGTilemapBuffers shenanigans
-#ifdef NONMATCHING
-static void sub_80A4548(u16 a, int b, int c, int d)
+static void sub_80A4548(u16 taskId, int topItemOffset, int bottomItemOffset, int d)
 {
     u8 i;
 
-    for (i = b; i <= c; i++)
+    for (i = topItemOffset; i <= bottomItemOffset; i++)
     {
-        u8 r4;
-        u8 sp10;
-        u32 r5;
+        u8 slot;
+        u8 y;
+        u16 tilemapOffset;
         u8 *text;
 
         if (sub_80A42B0(i, d) == TRUE)
             break;
-        r4 = gBagPocketScrollStates[sCurrentBagPocket].scrollTop + i;
-        sp10 = i * 2 + 2;
-        r5 = sp10 * 32 + 14;
+
+        slot = gBagPocketScrollStates[sCurrentBagPocket].scrollTop + i;
+        y = i * 2 + 2;
+        tilemapOffset = y * 32 + 14;
         text = gStringVar1;
-        text = sub_80A425C(a, text, i);
-        if (gCurrentBagPocketItemSlots[r4].itemId < 0x153)
+        text = sub_80A425C(taskId, text, i);
+
+        if (gCurrentBagPocketItemSlots[slot].itemId < ITEM_HM01_CUT)
         {
-            const u8 *r2;
-
-            gBGTilemapBuffers[2][r5 + 0] = 0x59;
-            gBGTilemapBuffers[2][r5 + 1] = 0x4F;
-            gBGTilemapBuffers[2][r5 + 32] = 0x69;
-            gBGTilemapBuffers[2][r5 + 33] = 0x4F;
-            r2 = gMoveNames[ItemIdToBattleMoveId(gCurrentBagPocketItemSlots[r4].itemId)];
-            sub_80A41E0(text, gCurrentBagPocketItemSlots[r4].itemId - 288, r2, gCurrentBagPocketItemSlots[r4].quantity, 2);
+            const u8 *moveName;
+            gBGTilemapBuffers[2][tilemapOffset + 0] = 0x59;
+            gBGTilemapBuffers[2][tilemapOffset + 1] = 0x4F;
+            gBGTilemapBuffers[2][tilemapOffset + 32] = 0x69;
+            gBGTilemapBuffers[2][tilemapOffset + 33] = 0x4F;
+            moveName = gMoveNames[ItemIdToBattleMoveId(gCurrentBagPocketItemSlots[slot].itemId)];
+            sub_80A41E0(text, gCurrentBagPocketItemSlots[slot].itemId - (ITEM_TM01_FOCUS_PUNCH - 1), moveName, gCurrentBagPocketItemSlots[slot].quantity, 2);
         }
         else
         {
             const u8 *moveName;
-
-            gBGTilemapBuffers[2][r5 + 0] = 0x105D;
-            gBGTilemapBuffers[2][r5 + 1] = 0x105E;
-            gBGTilemapBuffers[2][r5 + 32] = 0x106D;
-            gBGTilemapBuffers[2][r5 + 33] = 0x106E;
+            gBGTilemapBuffers[2][tilemapOffset + 0] = 0x105D;
+            gBGTilemapBuffers[2][tilemapOffset + 1] = 0x105E;
+            gBGTilemapBuffers[2][tilemapOffset + 32] = 0x106D;
+            gBGTilemapBuffers[2][tilemapOffset + 33] = 0x106E;
             text[0] = EXT_CTRL_CODE_BEGIN;
             text[1] = 0x13;
             text[2] = 0x11;
             text += 3;
-            text = ConvertIntToDecimalString(text, gCurrentBagPocketItemSlots[r4].itemId);
+            text = ConvertIntToDecimalString(text, gCurrentBagPocketItemSlots[slot].itemId - (ITEM_HM01_CUT - 1));
             text[0] = EXT_CTRL_CODE_BEGIN;
             text[1] = 0x13;
             text[2] = 0x18;
             text += 3;
-            moveName = gMoveNames[ItemIdToBattleMoveId(gCurrentBagPocketItemSlots[r4].itemId)];
+            moveName = gMoveNames[ItemIdToBattleMoveId(gCurrentBagPocketItemSlots[slot].itemId)];
             AlignStringInMenuWindow(text, moveName, 0x78, 0);
         }
-        Menu_PrintText(gStringVar1, 14, sp10);
+
+        Menu_PrintText(gStringVar1, 14, y);
     }
 }
-#else
-NAKED
-static void sub_80A4548(u16 a, int b, int c, int d)
-{
-    asm(".syntax unified\n\
-    push {r4-r7,lr}\n\
-    mov r7, r10\n\
-    mov r6, r9\n\
-    mov r5, r8\n\
-    push {r5-r7}\n\
-    sub sp, 0x14\n\
-    str r2, [sp, 0x8]\n\
-    str r3, [sp, 0xC]\n\
-    lsls r0, 16\n\
-    lsrs r0, 16\n\
-    str r0, [sp, 0x4]\n\
-    lsls r1, 24\n\
-    lsrs r1, 24\n\
-    mov r8, r1\n\
-    ldr r0, _080A456C @ =gBGTilemapBuffers + 0x1000\n\
-    mov r9, r0\n\
-    b _080A46C2\n\
-    .align 2, 0\n\
-_080A456C: .4byte gBGTilemapBuffers + 0x1000\n\
-_080A4570:\n\
-    ldr r1, _080A461C @ =gBagPocketScrollStates\n\
-    ldr r0, _080A4620 @ =sCurrentBagPocket\n\
-    ldrb r0, [r0]\n\
-    lsls r0, 24\n\
-    asrs r0, 24\n\
-    lsls r0, 2\n\
-    adds r0, r1\n\
-    ldrb r4, [r0, 0x1]\n\
-    add r4, r8\n\
-    lsls r4, 24\n\
-    lsrs r4, 24\n\
-    mov r1, r8\n\
-    lsls r0, r1, 25\n\
-    movs r3, 0x80\n\
-    lsls r3, 18\n\
-    adds r0, r3\n\
-    lsrs r0, 24\n\
-    str r0, [sp, 0x10]\n\
-    lsls r0, 5\n\
-    adds r0, 0xE\n\
-    adds r5, r0, 0\n\
-    ldr r6, _080A4624 @ =gStringVar1\n\
-    ldr r1, [sp, 0x4]\n\
-    lsls r0, r1, 24\n\
-    lsrs r0, 24\n\
-    adds r1, r6, 0\n\
-    mov r2, r8\n\
-    bl sub_80A425C\n\
-    adds r6, r0, 0\n\
-    ldr r3, _080A4628 @ =gCurrentBagPocketItemSlots\n\
-    mov r10, r3\n\
-    ldr r0, [r3]\n\
-    lsls r7, r4, 2\n\
-    adds r3, r7, r0\n\
-    ldrh r1, [r3]\n\
-    movs r0, 0xA9\n\
-    lsls r0, 1\n\
-    cmp r1, r0\n\
-    bhi _080A4634\n\
-    lsls r0, r5, 1\n\
-    add r0, r9\n\
-    movs r1, 0x59\n\
-    strh r1, [r0]\n\
-    adds r0, r5, 0x1\n\
-    lsls r0, 1\n\
-    add r0, r9\n\
-    movs r2, 0x4F\n\
-    strh r2, [r0]\n\
-    adds r0, r5, 0\n\
-    adds r0, 0x20\n\
-    lsls r0, 1\n\
-    add r0, r9\n\
-    movs r1, 0x69\n\
-    strh r1, [r0]\n\
-    adds r0, r5, 0\n\
-    adds r0, 0x21\n\
-    lsls r0, 1\n\
-    add r0, r9\n\
-    strh r2, [r0]\n\
-    ldrh r0, [r3]\n\
-    bl ItemIdToBattleMoveId\n\
-    lsls r0, 16\n\
-    lsrs r0, 16\n\
-    movs r1, 0xD\n\
-    adds r2, r0, 0\n\
-    muls r2, r1\n\
-    ldr r0, _080A462C @ =gMoveNames\n\
-    adds r2, r0\n\
-    mov r1, r10\n\
-    ldr r0, [r1]\n\
-    adds r0, r7, r0\n\
-    ldr r3, _080A4630 @ =0xfffffee0\n\
-    adds r1, r3, 0\n\
-    ldrh r3, [r0]\n\
-    adds r1, r3\n\
-    lsls r1, 16\n\
-    lsrs r1, 16\n\
-    ldrh r3, [r0, 0x2]\n\
-    movs r0, 0x2\n\
-    str r0, [sp]\n\
-    adds r0, r6, 0\n\
-    bl sub_80A41E0\n\
-    b _080A46AE\n\
-    .align 2, 0\n\
-_080A461C: .4byte gBagPocketScrollStates\n\
-_080A4620: .4byte sCurrentBagPocket\n\
-_080A4624: .4byte gStringVar1\n\
-_080A4628: .4byte gCurrentBagPocketItemSlots\n\
-_080A462C: .4byte gMoveNames\n\
-_080A4630: .4byte 0xfffffee0\n\
-_080A4634:\n\
-    lsls r0, r5, 1\n\
-    add r0, r9\n\
-    ldr r1, _080A46EC @ =0x0000105d\n\
-    strh r1, [r0]\n\
-    adds r0, r5, 0x1\n\
-    lsls r0, 1\n\
-    add r0, r9\n\
-    adds r1, 0x1\n\
-    strh r1, [r0]\n\
-    adds r0, r5, 0\n\
-    adds r0, 0x20\n\
-    lsls r0, 1\n\
-    add r0, r9\n\
-    adds r1, 0xF\n\
-    strh r1, [r0]\n\
-    adds r0, r5, 0\n\
-    adds r0, 0x21\n\
-    lsls r0, 1\n\
-    add r0, r9\n\
-    adds r1, 0x1\n\
-    strh r1, [r0]\n\
-    movs r0, 0xFC\n\
-    strb r0, [r6]\n\
-    movs r4, 0x13\n\
-    strb r4, [r6, 0x1]\n\
-    movs r0, 0x11\n\
-    strb r0, [r6, 0x2]\n\
-    adds r6, 0x3\n\
-    mov r1, r10\n\
-    ldr r0, [r1]\n\
-    adds r0, r7, r0\n\
-    ldrh r1, [r0]\n\
-    ldr r3, _080A46F0 @ =0xfffffeae\n\
-    adds r1, r3\n\
-    adds r0, r6, 0\n\
-    bl ConvertIntToDecimalString\n\
-    adds r6, r0, 0\n\
-    movs r0, 0xFC\n\
-    strb r0, [r6]\n\
-    strb r4, [r6, 0x1]\n\
-    movs r0, 0x18\n\
-    strb r0, [r6, 0x2]\n\
-    adds r6, 0x3\n\
-    mov r1, r10\n\
-    ldr r0, [r1]\n\
-    adds r0, r7, r0\n\
-    ldrh r0, [r0]\n\
-    bl ItemIdToBattleMoveId\n\
-    lsls r0, 16\n\
-    lsrs r0, 16\n\
-    movs r1, 0xD\n\
-    muls r1, r0\n\
-    ldr r0, _080A46F4 @ =gMoveNames\n\
-    adds r1, r0\n\
-    adds r0, r6, 0\n\
-    movs r2, 0x78\n\
-    movs r3, 0\n\
-    bl AlignStringInMenuWindow\n\
-_080A46AE:\n\
-    ldr r0, _080A46F8 @ =gStringVar1\n\
-    movs r1, 0xE\n\
-    ldr r2, [sp, 0x10]\n\
-    bl Menu_PrintText\n\
-    mov r0, r8\n\
-    adds r0, 0x1\n\
-    lsls r0, 24\n\
-    lsrs r0, 24\n\
-    mov r8, r0\n\
-_080A46C2:\n\
-    ldr r3, [sp, 0x8]\n\
-    cmp r8, r3\n\
-    bgt _080A46DA\n\
-    mov r0, r8\n\
-    ldr r1, [sp, 0xC]\n\
-    bl sub_80A42B0\n\
-    lsls r0, 24\n\
-    lsrs r0, 24\n\
-    cmp r0, 0x1\n\
-    beq _080A46DA\n\
-    b _080A4570\n\
-_080A46DA:\n\
-    add sp, 0x14\n\
-    pop {r3-r5}\n\
-    mov r8, r3\n\
-    mov r9, r4\n\
-    mov r10, r5\n\
-    pop {r4-r7}\n\
-    pop {r0}\n\
-    bx r0\n\
-    .align 2, 0\n\
-_080A46EC: .4byte 0x0000105d\n\
-_080A46F0: .4byte 0xfffffeae\n\
-_080A46F4: .4byte gMoveNames\n\
-_080A46F8: .4byte gStringVar1\n\
-    .syntax divided\n");
-}
-#endif
 
-static void sub_80A46FC(u16 a, int b, int c, int d)
+static void sub_80A46FC(u16 taskId, int b, int c, int d)
 {
     u8 i;
 
@@ -1512,29 +1298,29 @@ static void sub_80A46FC(u16 a, int b, int c, int d)
         gBGTilemapBuffers[2][var] = 0x69;
 
         text = gStringVar1;
-        text = sub_80A425C(a, text, i);
+        text = sub_80A425C(taskId, text, i);
         CopyItemName(gCurrentBagPocketItemSlots[r4].itemId, gStringVar2);
         sub_80A41E0(text, gCurrentBagPocketItemSlots[r4].itemId - 0x84, gStringVar2, gCurrentBagPocketItemSlots[r4].quantity, 3);
         Menu_PrintText(gStringVar1, 14, r5);
     }
 }
 
-static void sub_80A47E8(u16 a, int b, int c, int d)
+static void sub_80A47E8(u16 taskId, int topItemOffset, int bottomItemOffset, int d)
 {
     switch (sCurrentBagPocket)
     {
     case BAG_POCKET_ITEMS:
     case BAG_POCKET_POKE_BALLS:
-        sub_80A4380(a, b, c, d);
+        sub_80A4380(taskId, topItemOffset, bottomItemOffset, d);
         break;
     case BAG_POCKET_KEY_ITEMS:
-        sub_80A444C(a, b, c, d);
+        sub_80A444C(taskId, topItemOffset, bottomItemOffset, d);
         break;
     case BAG_POCKET_TMs_HMs:
-        sub_80A4548(a, b, c, d);
+        sub_80A4548(taskId, topItemOffset, bottomItemOffset, d);
         break;
     case BAG_POCKET_BERRIES:
-        sub_80A46FC(a, b, c, d);
+        sub_80A46FC(taskId, topItemOffset, bottomItemOffset, d);
         break;
     }
     if (gBagPocketScrollStates[sCurrentBagPocket].scrollTop != 0)
@@ -1548,9 +1334,9 @@ static void sub_80A47E8(u16 a, int b, int c, int d)
         SetVerticalScrollIndicators(BOTTOM_ARROW, INVISIBLE);
 }
 
-static void sub_80A48E8(u16 taskId, int b, int c)
+static void sub_80A48E8(u16 taskId, int topItemOffset, int bottomItemOffset)
 {
-    sub_80A47E8(taskId, b, c, 0);
+    sub_80A47E8(taskId, topItemOffset, bottomItemOffset, 0);
 }
 
 static void sub_80A48F8(u16 taskId)