Merge pull request #257 from Rangi42/master

More reorganization

63 files changed, 60 insertions, 60 deletions

diff --git a/data/good_rod.asm b/data/wild/good_rod.asm
index 6c23f402..6c23f402 100755
--- a/data/good_rod.asm
+++ b/data/wild/good_rod.asm
diff --git a/data/wild_mons.asm b/data/wild/grass_water.asm
index e089a582..9dc41f82 100755
--- a/data/wild_mons.asm
+++ b/data/wild/grass_water.asm
@@ -247,7 +247,7 @@ WildDataPointers:
 	dw NoMons
 	dw NoMons
 	dw NoMons
-	dw $FFFF
+	dw -1 ; end
 
 ; wild pokemon data is divided into two parts.
 ; first part:  pokemon found in grass
@@ -260,62 +260,62 @@ WildDataPointers:
         ; followed by 20 bytes:
         ; level, species (ten times)
 
-INCLUDE "data/wildPokemon/nomons.asm"
-INCLUDE "data/wildPokemon/route1.asm"
-INCLUDE "data/wildPokemon/route2.asm"
-INCLUDE "data/wildPokemon/route22.asm"
-INCLUDE "data/wildPokemon/viridianforest.asm"
-INCLUDE "data/wildPokemon/route3.asm"
-INCLUDE "data/wildPokemon/mtmoon1.asm"
-INCLUDE "data/wildPokemon/mtmoonb1.asm"
-INCLUDE "data/wildPokemon/mtmoonb2.asm"
-INCLUDE "data/wildPokemon/route4.asm"
-INCLUDE "data/wildPokemon/route24.asm"
-INCLUDE "data/wildPokemon/route25.asm"
-INCLUDE "data/wildPokemon/route9.asm"
-INCLUDE "data/wildPokemon/route5.asm"
-INCLUDE "data/wildPokemon/route6.asm"
-INCLUDE "data/wildPokemon/route11.asm"
-INCLUDE "data/wildPokemon/rocktunnel1.asm"
-INCLUDE "data/wildPokemon/rocktunnel2.asm"
-INCLUDE "data/wildPokemon/route10.asm"
-INCLUDE "data/wildPokemon/route12.asm"
-INCLUDE "data/wildPokemon/route8.asm"
-INCLUDE "data/wildPokemon/route7.asm"
-INCLUDE "data/wildPokemon/pokemontower1.asm"
-INCLUDE "data/wildPokemon/pokemontower2.asm"
-INCLUDE "data/wildPokemon/pokemontower3.asm"
-INCLUDE "data/wildPokemon/pokemontower4.asm"
-INCLUDE "data/wildPokemon/pokemontower5.asm"
-INCLUDE "data/wildPokemon/pokemontower6.asm"
-INCLUDE "data/wildPokemon/pokemontower7.asm"
-INCLUDE "data/wildPokemon/route13.asm"
-INCLUDE "data/wildPokemon/route14.asm"
-INCLUDE "data/wildPokemon/route15.asm"
-INCLUDE "data/wildPokemon/route16.asm"
-INCLUDE "data/wildPokemon/route17.asm"
-INCLUDE "data/wildPokemon/route18.asm"
-INCLUDE "data/wildPokemon/safarizonecenter.asm"
-INCLUDE "data/wildPokemon/safarizone1.asm"
-INCLUDE "data/wildPokemon/safarizone2.asm"
-INCLUDE "data/wildPokemon/safarizone3.asm"
-INCLUDE "data/wildPokemon/waterpokemon.asm"
-INCLUDE "data/wildPokemon/seafoamisland1.asm"
-INCLUDE "data/wildPokemon/seafoamislandb1.asm"
-INCLUDE "data/wildPokemon/seafoamislandb2.asm"
-INCLUDE "data/wildPokemon/seafoamislandb3.asm"
-INCLUDE "data/wildPokemon/seafoamislandb4.asm"
-INCLUDE "data/wildPokemon/mansion1.asm"
-INCLUDE "data/wildPokemon/mansion2.asm"
-INCLUDE "data/wildPokemon/mansion3.asm"
-INCLUDE "data/wildPokemon/mansionb1.asm"
-INCLUDE "data/wildPokemon/route21.asm"
-INCLUDE "data/wildPokemon/ceruleancave1.asm"
-INCLUDE "data/wildPokemon/ceruleancave2.asm"
-INCLUDE "data/wildPokemon/ceruleancaveb1.asm"
-INCLUDE "data/wildPokemon/powerplant.asm"
-INCLUDE "data/wildPokemon/route23.asm"
-INCLUDE "data/wildPokemon/victoryroad2.asm"
-INCLUDE "data/wildPokemon/victoryroad3.asm"
-INCLUDE "data/wildPokemon/victoryroad1.asm"
-INCLUDE "data/wildPokemon/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/wildPokemon/ceruleancave1.asm b/data/wild/maps/CeruleanCave1F.asm
index 20e8643a..20e8643a 100644
--- a/data/wildPokemon/ceruleancave1.asm
+++ b/data/wild/maps/CeruleanCave1F.asm
diff --git a/data/wildPokemon/ceruleancave2.asm b/data/wild/maps/CeruleanCave2F.asm
index 5afe55ac..5afe55ac 100644
--- a/data/wildPokemon/ceruleancave2.asm
+++ b/data/wild/maps/CeruleanCave2F.asm
diff --git a/data/wildPokemon/ceruleancaveb1.asm b/data/wild/maps/CeruleanCaveB1F.asm
index 245d5912..245d5912 100644
--- a/data/wildPokemon/ceruleancaveb1.asm
+++ b/data/wild/maps/CeruleanCaveB1F.asm
diff --git a/data/wildPokemon/diglettscave.asm b/data/wild/maps/DiglettsCave.asm
index 37512687..37512687 100755
--- a/data/wildPokemon/diglettscave.asm
+++ b/data/wild/maps/DiglettsCave.asm
diff --git a/data/wildPokemon/mtmoon1.asm b/data/wild/maps/MtMoon1F.asm
index 44b34c45..44b34c45 100755
--- a/data/wildPokemon/mtmoon1.asm
+++ b/data/wild/maps/MtMoon1F.asm
diff --git a/data/wildPokemon/mtmoonb1.asm b/data/wild/maps/MtMoonB1F.asm
index 5c0d8a53..5c0d8a53 100755
--- a/data/wildPokemon/mtmoonb1.asm
+++ b/data/wild/maps/MtMoonB1F.asm
diff --git a/data/wildPokemon/mtmoonb2.asm b/data/wild/maps/MtMoonB2F.asm
index cbf97e7e..cbf97e7e 100755
--- a/data/wildPokemon/mtmoonb2.asm
+++ b/data/wild/maps/MtMoonB2F.asm
diff --git a/data/wildPokemon/mansion1.asm b/data/wild/maps/PokemonMansion1F.asm
index 22ad032b..22ad032b 100755
--- a/data/wildPokemon/mansion1.asm
+++ b/data/wild/maps/PokemonMansion1F.asm
diff --git a/data/wildPokemon/mansion2.asm b/data/wild/maps/PokemonMansion2F.asm
index 985474fc..985474fc 100755
--- a/data/wildPokemon/mansion2.asm
+++ b/data/wild/maps/PokemonMansion2F.asm
diff --git a/data/wildPokemon/mansion3.asm b/data/wild/maps/PokemonMansion3F.asm
index 9c5521ae..9c5521ae 100755
--- a/data/wildPokemon/mansion3.asm
+++ b/data/wild/maps/PokemonMansion3F.asm
diff --git a/data/wildPokemon/mansionb1.asm b/data/wild/maps/PokemonMansionB1F.asm
index 83266ddd..83266ddd 100755
--- a/data/wildPokemon/mansionb1.asm
+++ b/data/wild/maps/PokemonMansionB1F.asm
diff --git a/data/wildPokemon/pokemontower1.asm b/data/wild/maps/PokemonTower1F.asm
index df951e70..df951e70 100755
--- a/data/wildPokemon/pokemontower1.asm
+++ b/data/wild/maps/PokemonTower1F.asm
diff --git a/data/wildPokemon/pokemontower2.asm b/data/wild/maps/PokemonTower2F.asm
index dcbe0da0..dcbe0da0 100755
--- a/data/wildPokemon/pokemontower2.asm
+++ b/data/wild/maps/PokemonTower2F.asm
diff --git a/data/wildPokemon/pokemontower3.asm b/data/wild/maps/PokemonTower3F.asm
index 135ed84f..135ed84f 100755
--- a/data/wildPokemon/pokemontower3.asm
+++ b/data/wild/maps/PokemonTower3F.asm
diff --git a/data/wildPokemon/pokemontower4.asm b/data/wild/maps/PokemonTower4F.asm
index 0c84b0cf..0c84b0cf 100755
--- a/data/wildPokemon/pokemontower4.asm
+++ b/data/wild/maps/PokemonTower4F.asm
diff --git a/data/wildPokemon/pokemontower5.asm b/data/wild/maps/PokemonTower5F.asm
index 440dbf8d..440dbf8d 100755
--- a/data/wildPokemon/pokemontower5.asm
+++ b/data/wild/maps/PokemonTower5F.asm
diff --git a/data/wildPokemon/pokemontower6.asm b/data/wild/maps/PokemonTower6F.asm
index 553fdb5d..553fdb5d 100755
--- a/data/wildPokemon/pokemontower6.asm
+++ b/data/wild/maps/PokemonTower6F.asm
diff --git a/data/wildPokemon/pokemontower7.asm b/data/wild/maps/PokemonTower7F.asm
index 0f7e66e9..0f7e66e9 100755
--- a/data/wildPokemon/pokemontower7.asm
+++ b/data/wild/maps/PokemonTower7F.asm
diff --git a/data/wildPokemon/powerplant.asm b/data/wild/maps/PowerPlant.asm
index 35eece95..35eece95 100755
--- a/data/wildPokemon/powerplant.asm
+++ b/data/wild/maps/PowerPlant.asm
diff --git a/data/wildPokemon/rocktunnel1.asm b/data/wild/maps/RockTunnel1F.asm
index a36f2092..a36f2092 100755
--- a/data/wildPokemon/rocktunnel1.asm
+++ b/data/wild/maps/RockTunnel1F.asm
diff --git a/data/wildPokemon/rocktunnel2.asm b/data/wild/maps/RockTunnelB1F.asm
index 2fc7ef94..2fc7ef94 100755
--- a/data/wildPokemon/rocktunnel2.asm
+++ b/data/wild/maps/RockTunnelB1F.asm
diff --git a/data/wildPokemon/route1.asm b/data/wild/maps/Route1.asm
index f618c34f..f618c34f 100755
--- a/data/wildPokemon/route1.asm
+++ b/data/wild/maps/Route1.asm
diff --git a/data/wildPokemon/route10.asm b/data/wild/maps/Route10.asm
index 34e0b5ee..34e0b5ee 100755
--- a/data/wildPokemon/route10.asm
+++ b/data/wild/maps/Route10.asm
diff --git a/data/wildPokemon/route11.asm b/data/wild/maps/Route11.asm
index 9e4e3644..9e4e3644 100755
--- a/data/wildPokemon/route11.asm
+++ b/data/wild/maps/Route11.asm
diff --git a/data/wildPokemon/route12.asm b/data/wild/maps/Route12.asm
index 45dfbc9d..45dfbc9d 100755
--- a/data/wildPokemon/route12.asm
+++ b/data/wild/maps/Route12.asm
diff --git a/data/wildPokemon/route13.asm b/data/wild/maps/Route13.asm
index 2a1a6cb5..2a1a6cb5 100755
--- a/data/wildPokemon/route13.asm
+++ b/data/wild/maps/Route13.asm
diff --git a/data/wildPokemon/route14.asm b/data/wild/maps/Route14.asm
index aad5aa48..aad5aa48 100755
--- a/data/wildPokemon/route14.asm
+++ b/data/wild/maps/Route14.asm
diff --git a/data/wildPokemon/route15.asm b/data/wild/maps/Route15.asm
index b4762230..b4762230 100755
--- a/data/wildPokemon/route15.asm
+++ b/data/wild/maps/Route15.asm
diff --git a/data/wildPokemon/route16.asm b/data/wild/maps/Route16.asm
index c2421c50..c2421c50 100755
--- a/data/wildPokemon/route16.asm
+++ b/data/wild/maps/Route16.asm
diff --git a/data/wildPokemon/route17.asm b/data/wild/maps/Route17.asm
index 8dffd9a3..8dffd9a3 100755
--- a/data/wildPokemon/route17.asm
+++ b/data/wild/maps/Route17.asm
diff --git a/data/wildPokemon/route18.asm b/data/wild/maps/Route18.asm
index 47bd247d..47bd247d 100755
--- a/data/wildPokemon/route18.asm
+++ b/data/wild/maps/Route18.asm
diff --git a/data/wildPokemon/route2.asm b/data/wild/maps/Route2.asm
index ad958ea5..ad958ea5 100755
--- a/data/wildPokemon/route2.asm
+++ b/data/wild/maps/Route2.asm
diff --git a/data/wildPokemon/route21.asm b/data/wild/maps/Route21.asm
index 3cc73ba0..3cc73ba0 100755
--- a/data/wildPokemon/route21.asm
+++ b/data/wild/maps/Route21.asm
diff --git a/data/wildPokemon/route22.asm b/data/wild/maps/Route22.asm
index 750a2f4e..750a2f4e 100755
--- a/data/wildPokemon/route22.asm
+++ b/data/wild/maps/Route22.asm
diff --git a/data/wildPokemon/route23.asm b/data/wild/maps/Route23.asm
index a057d24d..a057d24d 100755
--- a/data/wildPokemon/route23.asm
+++ b/data/wild/maps/Route23.asm
diff --git a/data/wildPokemon/route24.asm b/data/wild/maps/Route24.asm
index 3a745f36..3a745f36 100755
--- a/data/wildPokemon/route24.asm
+++ b/data/wild/maps/Route24.asm
diff --git a/data/wildPokemon/route25.asm b/data/wild/maps/Route25.asm
index 4884fa64..4884fa64 100755
--- a/data/wildPokemon/route25.asm
+++ b/data/wild/maps/Route25.asm
diff --git a/data/wildPokemon/route3.asm b/data/wild/maps/Route3.asm
index dea820a4..dea820a4 100755
--- a/data/wildPokemon/route3.asm
+++ b/data/wild/maps/Route3.asm
diff --git a/data/wildPokemon/route4.asm b/data/wild/maps/Route4.asm
index 624d58de..624d58de 100755
--- a/data/wildPokemon/route4.asm
+++ b/data/wild/maps/Route4.asm
diff --git a/data/wildPokemon/route5.asm b/data/wild/maps/Route5.asm
index cb8c583b..cb8c583b 100755
--- a/data/wildPokemon/route5.asm
+++ b/data/wild/maps/Route5.asm
diff --git a/data/wildPokemon/route6.asm b/data/wild/maps/Route6.asm
index 92512ffb..92512ffb 100755
--- a/data/wildPokemon/route6.asm
+++ b/data/wild/maps/Route6.asm
diff --git a/data/wildPokemon/route7.asm b/data/wild/maps/Route7.asm
index 559c98ee..559c98ee 100755
--- a/data/wildPokemon/route7.asm
+++ b/data/wild/maps/Route7.asm
diff --git a/data/wildPokemon/route8.asm b/data/wild/maps/Route8.asm
index 8a0bfa31..8a0bfa31 100755
--- a/data/wildPokemon/route8.asm
+++ b/data/wild/maps/Route8.asm
diff --git a/data/wildPokemon/route9.asm b/data/wild/maps/Route9.asm
index 716589b0..716589b0 100755
--- a/data/wildPokemon/route9.asm
+++ b/data/wild/maps/Route9.asm
diff --git a/data/wildPokemon/safarizonecenter.asm b/data/wild/maps/SafariZoneCenter.asm
index 0cd5323a..0cd5323a 100755
--- a/data/wildPokemon/safarizonecenter.asm
+++ b/data/wild/maps/SafariZoneCenter.asm
diff --git a/data/wildPokemon/safarizone1.asm b/data/wild/maps/SafariZoneEast.asm
index 3d77b6fe..3d77b6fe 100755
--- a/data/wildPokemon/safarizone1.asm
+++ b/data/wild/maps/SafariZoneEast.asm
diff --git a/data/wildPokemon/safarizone2.asm b/data/wild/maps/SafariZoneNorth.asm
index c1b6a547..c1b6a547 100755
--- a/data/wildPokemon/safarizone2.asm
+++ b/data/wild/maps/SafariZoneNorth.asm
diff --git a/data/wildPokemon/safarizone3.asm b/data/wild/maps/SafariZoneWest.asm
index 47b6a102..47b6a102 100755
--- a/data/wildPokemon/safarizone3.asm
+++ b/data/wild/maps/SafariZoneWest.asm
diff --git a/data/wildPokemon/waterpokemon.asm b/data/wild/maps/SeaRoutes.asm
index 07c6a187..07c6a187 100755
--- a/data/wildPokemon/waterpokemon.asm
+++ b/data/wild/maps/SeaRoutes.asm
diff --git a/data/wildPokemon/seafoamisland1.asm b/data/wild/maps/SeafoamIslands1F.asm
index 3c431f9a..3c431f9a 100755
--- a/data/wildPokemon/seafoamisland1.asm
+++ b/data/wild/maps/SeafoamIslands1F.asm
diff --git a/data/wildPokemon/seafoamislandb1.asm b/data/wild/maps/SeafoamIslandsB1F.asm
index 6f96f240..6f96f240 100755
--- a/data/wildPokemon/seafoamislandb1.asm
+++ b/data/wild/maps/SeafoamIslandsB1F.asm
diff --git a/data/wildPokemon/seafoamislandb2.asm b/data/wild/maps/SeafoamIslandsB2F.asm
index 7191fea9..7191fea9 100755
--- a/data/wildPokemon/seafoamislandb2.asm
+++ b/data/wild/maps/SeafoamIslandsB2F.asm
diff --git a/data/wildPokemon/seafoamislandb3.asm b/data/wild/maps/SeafoamIslandsB3F.asm
index 9778c0e9..9778c0e9 100755
--- a/data/wildPokemon/seafoamislandb3.asm
+++ b/data/wild/maps/SeafoamIslandsB3F.asm
diff --git a/data/wildPokemon/seafoamislandb4.asm b/data/wild/maps/SeafoamIslandsB4F.asm
index 3948470b..3948470b 100755
--- a/data/wildPokemon/seafoamislandb4.asm
+++ b/data/wild/maps/SeafoamIslandsB4F.asm
diff --git a/data/wildPokemon/victoryroad1.asm b/data/wild/maps/VictoryRoad1F.asm
index 60aae31a..60aae31a 100755
--- a/data/wildPokemon/victoryroad1.asm
+++ b/data/wild/maps/VictoryRoad1F.asm
diff --git a/data/wildPokemon/victoryroad2.asm b/data/wild/maps/VictoryRoad2F.asm
index 580d644d..580d644d 100755
--- a/data/wildPokemon/victoryroad2.asm
+++ b/data/wild/maps/VictoryRoad2F.asm
diff --git a/data/wildPokemon/victoryroad3.asm b/data/wild/maps/VictoryRoad3F.asm
index 80d7ef3e..80d7ef3e 100755
--- a/data/wildPokemon/victoryroad3.asm
+++ b/data/wild/maps/VictoryRoad3F.asm
diff --git a/data/wildPokemon/viridianforest.asm b/data/wild/maps/ViridianForest.asm
index ae9a5a70..ae9a5a70 100755
--- a/data/wildPokemon/viridianforest.asm
+++ b/data/wild/maps/ViridianForest.asm
diff --git a/data/wildPokemon/nomons.asm b/data/wild/maps/nothing.asm
index ce7f7ede..ce7f7ede 100755
--- a/data/wildPokemon/nomons.asm
+++ b/data/wild/maps/nothing.asm
diff --git a/data/wild_probabilities.asm b/data/wild/probabilities.asm
index 9d4704c6..9d4704c6 100644
--- a/data/wild_probabilities.asm
+++ b/data/wild/probabilities.asm
diff --git a/data/super_rod.asm b/data/wild/super_rod.asm
index d3d64632..d3d64632 100755
--- a/data/super_rod.asm
+++ b/data/wild/super_rod.asm