60 files changed, 59 insertions, 59 deletions
diff --git a/data/wild/grass_water.asm b/data/wild/grass_water.asm
index 5697300e..f1dd461e 100755
--- a/data/wild/grass_water.asm
+++ b/data/wild/grass_water.asm
@@ -260,62 +260,62 @@ WildDataPointers:
         ; followed by 20 bytes:
         ; level, species (ten times)
 
-INCLUDE "data/mapWilds/nothing.asm"
-INCLUDE "data/mapWilds/Route1.asm"
-INCLUDE "data/mapWilds/Route2.asm"
-INCLUDE "data/mapWilds/Route22.asm"
-INCLUDE "data/mapWilds/ViridianForest.asm"
-INCLUDE "data/mapWilds/Route3.asm"
-INCLUDE "data/mapWilds/MtMoon1F.asm"
-INCLUDE "data/mapWilds/MtMoonB1F.asm"
-INCLUDE "data/mapWilds/MtMoonB2F.asm"
-INCLUDE "data/mapWilds/Route4.asm"
-INCLUDE "data/mapWilds/Route24.asm"
-INCLUDE "data/mapWilds/Route25.asm"
-INCLUDE "data/mapWilds/Route9.asm"
-INCLUDE "data/mapWilds/Route5.asm"
-INCLUDE "data/mapWilds/Route6.asm"
-INCLUDE "data/mapWilds/Route11.asm"
-INCLUDE "data/mapWilds/RockTunnel1F.asm"
-INCLUDE "data/mapWilds/RockTunnelB1F.asm"
-INCLUDE "data/mapWilds/Route10.asm"
-INCLUDE "data/mapWilds/Route12.asm"
-INCLUDE "data/mapWilds/Route8.asm"
-INCLUDE "data/mapWilds/Route7.asm"
-INCLUDE "data/mapWilds/PokemonTower1F.asm"
-INCLUDE "data/mapWilds/PokemonTower2F.asm"
-INCLUDE "data/mapWilds/PokemonTower3F.asm"
-INCLUDE "data/mapWilds/PokemonTower4F.asm"
-INCLUDE "data/mapWilds/PokemonTower5F.asm"
-INCLUDE "data/mapWilds/PokemonTower6F.asm"
-INCLUDE "data/mapWilds/PokemonTower7F.asm"
-INCLUDE "data/mapWilds/Route13.asm"
-INCLUDE "data/mapWilds/Route14.asm"
-INCLUDE "data/mapWilds/Route15.asm"
-INCLUDE "data/mapWilds/Route16.asm"
-INCLUDE "data/mapWilds/Route17.asm"
-INCLUDE "data/mapWilds/Route18.asm"
-INCLUDE "data/mapWilds/SafariZoneCenter.asm"
-INCLUDE "data/mapWilds/SafariZoneEast.asm"
-INCLUDE "data/mapWilds/SafariZoneNorth.asm"
-INCLUDE "data/mapWilds/SafariZoneWest.asm"
-INCLUDE "data/mapWilds/SeaRoutes.asm"
-INCLUDE "data/mapWilds/SeafoamIslands1F.asm"
-INCLUDE "data/mapWilds/SeafoamIslandsB1F.asm"
-INCLUDE "data/mapWilds/SeafoamIslandsB2F.asm"
-INCLUDE "data/mapWilds/SeafoamIslandsB3F.asm"
-INCLUDE "data/mapWilds/SeafoamIslandsB4F.asm"
-INCLUDE "data/mapWilds/PokemonMansion1F.asm"
-INCLUDE "data/mapWilds/PokemonMansion2F.asm"
-INCLUDE "data/mapWilds/PokemonMansion3F.asm"
-INCLUDE "data/mapWilds/PokemonMansionB1F.asm"
-INCLUDE "data/mapWilds/Route21.asm"
-INCLUDE "data/mapWilds/CeruleanCave1F.asm"
-INCLUDE "data/mapWilds/CeruleanCave2F.asm"
-INCLUDE "data/mapWilds/CeruleanCaveB1F.asm"
-INCLUDE "data/mapWilds/PowerPlant.asm"
-INCLUDE "data/mapWilds/Route23.asm"
-INCLUDE "data/mapWilds/VictoryRoad2F.asm"
-INCLUDE "data/mapWilds/VictoryRoad3F.asm"
-INCLUDE "data/mapWilds/VictoryRoad1F.asm"
-INCLUDE "data/mapWilds/DiglettsCave.asm"
+INCLUDE "data/wild/maps/nothing.asm"
+INCLUDE "data/wild/maps/Route1.asm"
+INCLUDE "data/wild/maps/Route2.asm"
+INCLUDE "data/wild/maps/Route22.asm"
+INCLUDE "data/wild/maps/ViridianForest.asm"
+INCLUDE "data/wild/maps/Route3.asm"
+INCLUDE "data/wild/maps/MtMoon1F.asm"
+INCLUDE "data/wild/maps/MtMoonB1F.asm"
+INCLUDE "data/wild/maps/MtMoonB2F.asm"
+INCLUDE "data/wild/maps/Route4.asm"
+INCLUDE "data/wild/maps/Route24.asm"
+INCLUDE "data/wild/maps/Route25.asm"
+INCLUDE "data/wild/maps/Route9.asm"
+INCLUDE "data/wild/maps/Route5.asm"
+INCLUDE "data/wild/maps/Route6.asm"
+INCLUDE "data/wild/maps/Route11.asm"
+INCLUDE "data/wild/maps/RockTunnel1F.asm"
+INCLUDE "data/wild/maps/RockTunnelB1F.asm"
+INCLUDE "data/wild/maps/Route10.asm"
+INCLUDE "data/wild/maps/Route12.asm"
+INCLUDE "data/wild/maps/Route8.asm"
+INCLUDE "data/wild/maps/Route7.asm"
+INCLUDE "data/wild/maps/PokemonTower1F.asm"
+INCLUDE "data/wild/maps/PokemonTower2F.asm"
+INCLUDE "data/wild/maps/PokemonTower3F.asm"
+INCLUDE "data/wild/maps/PokemonTower4F.asm"
+INCLUDE "data/wild/maps/PokemonTower5F.asm"
+INCLUDE "data/wild/maps/PokemonTower6F.asm"
+INCLUDE "data/wild/maps/PokemonTower7F.asm"
+INCLUDE "data/wild/maps/Route13.asm"
+INCLUDE "data/wild/maps/Route14.asm"
+INCLUDE "data/wild/maps/Route15.asm"
+INCLUDE "data/wild/maps/Route16.asm"
+INCLUDE "data/wild/maps/Route17.asm"
+INCLUDE "data/wild/maps/Route18.asm"
+INCLUDE "data/wild/maps/SafariZoneCenter.asm"
+INCLUDE "data/wild/maps/SafariZoneEast.asm"
+INCLUDE "data/wild/maps/SafariZoneNorth.asm"
+INCLUDE "data/wild/maps/SafariZoneWest.asm"
+INCLUDE "data/wild/maps/SeaRoutes.asm"
+INCLUDE "data/wild/maps/SeafoamIslands1F.asm"
+INCLUDE "data/wild/maps/SeafoamIslandsB1F.asm"
+INCLUDE "data/wild/maps/SeafoamIslandsB2F.asm"
+INCLUDE "data/wild/maps/SeafoamIslandsB3F.asm"
+INCLUDE "data/wild/maps/SeafoamIslandsB4F.asm"
+INCLUDE "data/wild/maps/PokemonMansion1F.asm"
+INCLUDE "data/wild/maps/PokemonMansion2F.asm"
+INCLUDE "data/wild/maps/PokemonMansion3F.asm"
+INCLUDE "data/wild/maps/PokemonMansionB1F.asm"
+INCLUDE "data/wild/maps/Route21.asm"
+INCLUDE "data/wild/maps/CeruleanCave1F.asm"
+INCLUDE "data/wild/maps/CeruleanCave2F.asm"
+INCLUDE "data/wild/maps/CeruleanCaveB1F.asm"
+INCLUDE "data/wild/maps/PowerPlant.asm"
+INCLUDE "data/wild/maps/Route23.asm"
+INCLUDE "data/wild/maps/VictoryRoad2F.asm"
+INCLUDE "data/wild/maps/VictoryRoad3F.asm"
+INCLUDE "data/wild/maps/VictoryRoad1F.asm"
+INCLUDE "data/wild/maps/DiglettsCave.asm"
diff --git a/data/mapWilds/CeruleanCave1F.asm b/data/wild/maps/CeruleanCave1F.asm
index 20e8643a..20e8643a 100644
--- a/data/mapWilds/CeruleanCave1F.asm
+++ b/data/wild/maps/CeruleanCave1F.asm
diff --git a/data/mapWilds/CeruleanCave2F.asm b/data/wild/maps/CeruleanCave2F.asm
index 5afe55ac..5afe55ac 100644
--- a/data/mapWilds/CeruleanCave2F.asm
+++ b/data/wild/maps/CeruleanCave2F.asm
diff --git a/data/mapWilds/CeruleanCaveB1F.asm b/data/wild/maps/CeruleanCaveB1F.asm
index 245d5912..245d5912 100644
--- a/data/mapWilds/CeruleanCaveB1F.asm
+++ b/data/wild/maps/CeruleanCaveB1F.asm
diff --git a/data/mapWilds/DiglettsCave.asm b/data/wild/maps/DiglettsCave.asm
index 37512687..37512687 100755
--- a/data/mapWilds/DiglettsCave.asm
+++ b/data/wild/maps/DiglettsCave.asm
diff --git a/data/mapWilds/MtMoon1F.asm b/data/wild/maps/MtMoon1F.asm
index 44b34c45..44b34c45 100755
--- a/data/mapWilds/MtMoon1F.asm
+++ b/data/wild/maps/MtMoon1F.asm
diff --git a/data/mapWilds/MtMoonB1F.asm b/data/wild/maps/MtMoonB1F.asm
index 5c0d8a53..5c0d8a53 100755
--- a/data/mapWilds/MtMoonB1F.asm
+++ b/data/wild/maps/MtMoonB1F.asm
diff --git a/data/mapWilds/MtMoonB2F.asm b/data/wild/maps/MtMoonB2F.asm
index cbf97e7e..cbf97e7e 100755
--- a/data/mapWilds/MtMoonB2F.asm
+++ b/data/wild/maps/MtMoonB2F.asm
diff --git a/data/mapWilds/PokemonMansion1F.asm b/data/wild/maps/PokemonMansion1F.asm
index 22ad032b..22ad032b 100755
--- a/data/mapWilds/PokemonMansion1F.asm
+++ b/data/wild/maps/PokemonMansion1F.asm
diff --git a/data/mapWilds/PokemonMansion2F.asm b/data/wild/maps/PokemonMansion2F.asm
index 985474fc..985474fc 100755
--- a/data/mapWilds/PokemonMansion2F.asm
+++ b/data/wild/maps/PokemonMansion2F.asm
diff --git a/data/mapWilds/PokemonMansion3F.asm b/data/wild/maps/PokemonMansion3F.asm
index 9c5521ae..9c5521ae 100755
--- a/data/mapWilds/PokemonMansion3F.asm
+++ b/data/wild/maps/PokemonMansion3F.asm
diff --git a/data/mapWilds/PokemonMansionB1F.asm b/data/wild/maps/PokemonMansionB1F.asm
index 83266ddd..83266ddd 100755
--- a/data/mapWilds/PokemonMansionB1F.asm
+++ b/data/wild/maps/PokemonMansionB1F.asm
diff --git a/data/mapWilds/PokemonTower1F.asm b/data/wild/maps/PokemonTower1F.asm
index df951e70..df951e70 100755
--- a/data/mapWilds/PokemonTower1F.asm
+++ b/data/wild/maps/PokemonTower1F.asm
diff --git a/data/mapWilds/PokemonTower2F.asm b/data/wild/maps/PokemonTower2F.asm
index dcbe0da0..dcbe0da0 100755
--- a/data/mapWilds/PokemonTower2F.asm
+++ b/data/wild/maps/PokemonTower2F.asm
diff --git a/data/mapWilds/PokemonTower3F.asm b/data/wild/maps/PokemonTower3F.asm
index 135ed84f..135ed84f 100755
--- a/data/mapWilds/PokemonTower3F.asm
+++ b/data/wild/maps/PokemonTower3F.asm
diff --git a/data/mapWilds/PokemonTower4F.asm b/data/wild/maps/PokemonTower4F.asm
index 0c84b0cf..0c84b0cf 100755
--- a/data/mapWilds/PokemonTower4F.asm
+++ b/data/wild/maps/PokemonTower4F.asm
diff --git a/data/mapWilds/PokemonTower5F.asm b/data/wild/maps/PokemonTower5F.asm
index 440dbf8d..440dbf8d 100755
--- a/data/mapWilds/PokemonTower5F.asm
+++ b/data/wild/maps/PokemonTower5F.asm
diff --git a/data/mapWilds/PokemonTower6F.asm b/data/wild/maps/PokemonTower6F.asm
index 553fdb5d..553fdb5d 100755
--- a/data/mapWilds/PokemonTower6F.asm
+++ b/data/wild/maps/PokemonTower6F.asm
diff --git a/data/mapWilds/PokemonTower7F.asm b/data/wild/maps/PokemonTower7F.asm
index 0f7e66e9..0f7e66e9 100755
--- a/data/mapWilds/PokemonTower7F.asm
+++ b/data/wild/maps/PokemonTower7F.asm
diff --git a/data/mapWilds/PowerPlant.asm b/data/wild/maps/PowerPlant.asm
index 35eece95..35eece95 100755
--- a/data/mapWilds/PowerPlant.asm
+++ b/data/wild/maps/PowerPlant.asm
diff --git a/data/mapWilds/RockTunnel1F.asm b/data/wild/maps/RockTunnel1F.asm
index a36f2092..a36f2092 100755
--- a/data/mapWilds/RockTunnel1F.asm
+++ b/data/wild/maps/RockTunnel1F.asm
diff --git a/data/mapWilds/RockTunnelB1F.asm b/data/wild/maps/RockTunnelB1F.asm
index 2fc7ef94..2fc7ef94 100755
--- a/data/mapWilds/RockTunnelB1F.asm
+++ b/data/wild/maps/RockTunnelB1F.asm
diff --git a/data/mapWilds/Route1.asm b/data/wild/maps/Route1.asm
index f618c34f..f618c34f 100755
--- a/data/mapWilds/Route1.asm
+++ b/data/wild/maps/Route1.asm
diff --git a/data/mapWilds/Route10.asm b/data/wild/maps/Route10.asm
index 34e0b5ee..34e0b5ee 100755
--- a/data/mapWilds/Route10.asm
+++ b/data/wild/maps/Route10.asm
diff --git a/data/mapWilds/Route11.asm b/data/wild/maps/Route11.asm
index 9e4e3644..9e4e3644 100755
--- a/data/mapWilds/Route11.asm
+++ b/data/wild/maps/Route11.asm
diff --git a/data/mapWilds/Route12.asm b/data/wild/maps/Route12.asm
index 45dfbc9d..45dfbc9d 100755
--- a/data/mapWilds/Route12.asm
+++ b/data/wild/maps/Route12.asm
diff --git a/data/mapWilds/Route13.asm b/data/wild/maps/Route13.asm
index 2a1a6cb5..2a1a6cb5 100755
--- a/data/mapWilds/Route13.asm
+++ b/data/wild/maps/Route13.asm
diff --git a/data/mapWilds/Route14.asm b/data/wild/maps/Route14.asm
index aad5aa48..aad5aa48 100755
--- a/data/mapWilds/Route14.asm
+++ b/data/wild/maps/Route14.asm
diff --git a/data/mapWilds/Route15.asm b/data/wild/maps/Route15.asm
index b4762230..b4762230 100755
--- a/data/mapWilds/Route15.asm
+++ b/data/wild/maps/Route15.asm
diff --git a/data/mapWilds/Route16.asm b/data/wild/maps/Route16.asm
index c2421c50..c2421c50 100755
--- a/data/mapWilds/Route16.asm
+++ b/data/wild/maps/Route16.asm
diff --git a/data/mapWilds/Route17.asm b/data/wild/maps/Route17.asm
index 8dffd9a3..8dffd9a3 100755
--- a/data/mapWilds/Route17.asm
+++ b/data/wild/maps/Route17.asm
diff --git a/data/mapWilds/Route18.asm b/data/wild/maps/Route18.asm
index 47bd247d..47bd247d 100755
--- a/data/mapWilds/Route18.asm
+++ b/data/wild/maps/Route18.asm
diff --git a/data/mapWilds/Route2.asm b/data/wild/maps/Route2.asm
index ad958ea5..ad958ea5 100755
--- a/data/mapWilds/Route2.asm
+++ b/data/wild/maps/Route2.asm
diff --git a/data/mapWilds/Route21.asm b/data/wild/maps/Route21.asm
index 3cc73ba0..3cc73ba0 100755
--- a/data/mapWilds/Route21.asm
+++ b/data/wild/maps/Route21.asm
diff --git a/data/mapWilds/Route22.asm b/data/wild/maps/Route22.asm
index 750a2f4e..750a2f4e 100755
--- a/data/mapWilds/Route22.asm
+++ b/data/wild/maps/Route22.asm
diff --git a/data/mapWilds/Route23.asm b/data/wild/maps/Route23.asm
index a057d24d..a057d24d 100755
--- a/data/mapWilds/Route23.asm
+++ b/data/wild/maps/Route23.asm
diff --git a/data/mapWilds/Route24.asm b/data/wild/maps/Route24.asm
index 3a745f36..3a745f36 100755
--- a/data/mapWilds/Route24.asm
+++ b/data/wild/maps/Route24.asm
diff --git a/data/mapWilds/Route25.asm b/data/wild/maps/Route25.asm
index 4884fa64..4884fa64 100755
--- a/data/mapWilds/Route25.asm
+++ b/data/wild/maps/Route25.asm
diff --git a/data/mapWilds/Route3.asm b/data/wild/maps/Route3.asm
index dea820a4..dea820a4 100755
--- a/data/mapWilds/Route3.asm
+++ b/data/wild/maps/Route3.asm
diff --git a/data/mapWilds/Route4.asm b/data/wild/maps/Route4.asm
index 624d58de..624d58de 100755
--- a/data/mapWilds/Route4.asm
+++ b/data/wild/maps/Route4.asm
diff --git a/data/mapWilds/Route5.asm b/data/wild/maps/Route5.asm
index cb8c583b..cb8c583b 100755
--- a/data/mapWilds/Route5.asm
+++ b/data/wild/maps/Route5.asm
diff --git a/data/mapWilds/Route6.asm b/data/wild/maps/Route6.asm
index 92512ffb..92512ffb 100755
--- a/data/mapWilds/Route6.asm
+++ b/data/wild/maps/Route6.asm
diff --git a/data/mapWilds/Route7.asm b/data/wild/maps/Route7.asm
index 559c98ee..559c98ee 100755
--- a/data/mapWilds/Route7.asm
+++ b/data/wild/maps/Route7.asm
diff --git a/data/mapWilds/Route8.asm b/data/wild/maps/Route8.asm
index 8a0bfa31..8a0bfa31 100755
--- a/data/mapWilds/Route8.asm
+++ b/data/wild/maps/Route8.asm
diff --git a/data/mapWilds/Route9.asm b/data/wild/maps/Route9.asm
index 716589b0..716589b0 100755
--- a/data/mapWilds/Route9.asm
+++ b/data/wild/maps/Route9.asm
diff --git a/data/mapWilds/SafariZoneCenter.asm b/data/wild/maps/SafariZoneCenter.asm
index 0cd5323a..0cd5323a 100755
--- a/data/mapWilds/SafariZoneCenter.asm
+++ b/data/wild/maps/SafariZoneCenter.asm
diff --git a/data/mapWilds/SafariZoneEast.asm b/data/wild/maps/SafariZoneEast.asm
index 3d77b6fe..3d77b6fe 100755
--- a/data/mapWilds/SafariZoneEast.asm
+++ b/data/wild/maps/SafariZoneEast.asm
diff --git a/data/mapWilds/SafariZoneNorth.asm b/data/wild/maps/SafariZoneNorth.asm
index c1b6a547..c1b6a547 100755
--- a/data/mapWilds/SafariZoneNorth.asm
+++ b/data/wild/maps/SafariZoneNorth.asm
diff --git a/data/mapWilds/SafariZoneWest.asm b/data/wild/maps/SafariZoneWest.asm
index 47b6a102..47b6a102 100755
--- a/data/mapWilds/SafariZoneWest.asm
+++ b/data/wild/maps/SafariZoneWest.asm
diff --git a/data/mapWilds/SeaRoutes.asm b/data/wild/maps/SeaRoutes.asm
index 07c6a187..07c6a187 100755
--- a/data/mapWilds/SeaRoutes.asm
+++ b/data/wild/maps/SeaRoutes.asm
diff --git a/data/mapWilds/SeafoamIslands1F.asm b/data/wild/maps/SeafoamIslands1F.asm
index 3c431f9a..3c431f9a 100755
--- a/data/mapWilds/SeafoamIslands1F.asm
+++ b/data/wild/maps/SeafoamIslands1F.asm
diff --git a/data/mapWilds/SeafoamIslandsB1F.asm b/data/wild/maps/SeafoamIslandsB1F.asm
index 6f96f240..6f96f240 100755
--- a/data/mapWilds/SeafoamIslandsB1F.asm
+++ b/data/wild/maps/SeafoamIslandsB1F.asm
diff --git a/data/mapWilds/SeafoamIslandsB2F.asm b/data/wild/maps/SeafoamIslandsB2F.asm
index 7191fea9..7191fea9 100755
--- a/data/mapWilds/SeafoamIslandsB2F.asm
+++ b/data/wild/maps/SeafoamIslandsB2F.asm
diff --git a/data/mapWilds/SeafoamIslandsB3F.asm b/data/wild/maps/SeafoamIslandsB3F.asm
index 9778c0e9..9778c0e9 100755
--- a/data/mapWilds/SeafoamIslandsB3F.asm
+++ b/data/wild/maps/SeafoamIslandsB3F.asm
diff --git a/data/mapWilds/SeafoamIslandsB4F.asm b/data/wild/maps/SeafoamIslandsB4F.asm
index 3948470b..3948470b 100755
--- a/data/mapWilds/SeafoamIslandsB4F.asm
+++ b/data/wild/maps/SeafoamIslandsB4F.asm
diff --git a/data/mapWilds/VictoryRoad1F.asm b/data/wild/maps/VictoryRoad1F.asm
index 60aae31a..60aae31a 100755
--- a/data/mapWilds/VictoryRoad1F.asm
+++ b/data/wild/maps/VictoryRoad1F.asm
diff --git a/data/mapWilds/VictoryRoad2F.asm b/data/wild/maps/VictoryRoad2F.asm
index 580d644d..580d644d 100755
--- a/data/mapWilds/VictoryRoad2F.asm
+++ b/data/wild/maps/VictoryRoad2F.asm
diff --git a/data/mapWilds/VictoryRoad3F.asm b/data/wild/maps/VictoryRoad3F.asm
index 80d7ef3e..80d7ef3e 100755
--- a/data/mapWilds/VictoryRoad3F.asm
+++ b/data/wild/maps/VictoryRoad3F.asm
diff --git a/data/mapWilds/ViridianForest.asm b/data/wild/maps/ViridianForest.asm
index ae9a5a70..ae9a5a70 100755
--- a/data/mapWilds/ViridianForest.asm
+++ b/data/wild/maps/ViridianForest.asm
diff --git a/data/mapWilds/nothing.asm b/data/wild/maps/nothing.asm
index ce7f7ede..ce7f7ede 100755
--- a/data/mapWilds/nothing.asm
+++ b/data/wild/maps/nothing.asm