diff options
| author | dannye <33dannye@gmail.com> | 2020-11-14 21:46:05 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2020-11-14 21:54:23 -0600 |
| commit | 48dc6a8cf4da512273e79e49346b35dcc225f773 (patch) | |
| tree | 52ca406cccaf728156d4d0f43d77b93ba0d75da4 /data/wild | |
| parent | b88572fbccecc8d125fe8a50365751f0530d1a9a (diff) | |
| parent | 66377fca32c63ca9e362d2d2ce15f0692260ce53 (diff) | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/wild')
58 files changed, 0 insertions, 0 deletions
diff --git a/data/wild/good_rod.asm b/data/wild/good_rod.asm index 700a5516..700a5516 100755..100644 --- a/data/wild/good_rod.asm +++ b/data/wild/good_rod.asm diff --git a/data/wild/grass_water.asm b/data/wild/grass_water.asm index a991e9ae..a991e9ae 100755..100644 --- a/data/wild/grass_water.asm +++ b/data/wild/grass_water.asm diff --git a/data/wild/maps/DiglettsCave.asm b/data/wild/maps/DiglettsCave.asm index d1e73af4..d1e73af4 100755..100644 --- a/data/wild/maps/DiglettsCave.asm +++ b/data/wild/maps/DiglettsCave.asm diff --git a/data/wild/maps/MtMoon1F.asm b/data/wild/maps/MtMoon1F.asm index 2e426655..2e426655 100755..100644 --- a/data/wild/maps/MtMoon1F.asm +++ b/data/wild/maps/MtMoon1F.asm diff --git a/data/wild/maps/MtMoonB1F.asm b/data/wild/maps/MtMoonB1F.asm index 1eee34ce..1eee34ce 100755..100644 --- a/data/wild/maps/MtMoonB1F.asm +++ b/data/wild/maps/MtMoonB1F.asm diff --git a/data/wild/maps/MtMoonB2F.asm b/data/wild/maps/MtMoonB2F.asm index d49ec585..d49ec585 100755..100644 --- a/data/wild/maps/MtMoonB2F.asm +++ b/data/wild/maps/MtMoonB2F.asm diff --git a/data/wild/maps/PokemonMansion1F.asm b/data/wild/maps/PokemonMansion1F.asm index 75fcadfe..75fcadfe 100755..100644 --- a/data/wild/maps/PokemonMansion1F.asm +++ b/data/wild/maps/PokemonMansion1F.asm diff --git a/data/wild/maps/PokemonMansion2F.asm b/data/wild/maps/PokemonMansion2F.asm index 2143532f..2143532f 100755..100644 --- a/data/wild/maps/PokemonMansion2F.asm +++ b/data/wild/maps/PokemonMansion2F.asm diff --git a/data/wild/maps/PokemonMansion3F.asm b/data/wild/maps/PokemonMansion3F.asm index f0c77977..f0c77977 100755..100644 --- a/data/wild/maps/PokemonMansion3F.asm +++ b/data/wild/maps/PokemonMansion3F.asm diff --git a/data/wild/maps/PokemonMansionB1F.asm b/data/wild/maps/PokemonMansionB1F.asm index c0ad432b..c0ad432b 100755..100644 --- a/data/wild/maps/PokemonMansionB1F.asm +++ b/data/wild/maps/PokemonMansionB1F.asm diff --git a/data/wild/maps/PokemonTower1F.asm b/data/wild/maps/PokemonTower1F.asm index 95bef4a3..95bef4a3 100755..100644 --- a/data/wild/maps/PokemonTower1F.asm +++ b/data/wild/maps/PokemonTower1F.asm diff --git a/data/wild/maps/PokemonTower2F.asm b/data/wild/maps/PokemonTower2F.asm index 77b7d415..77b7d415 100755..100644 --- a/data/wild/maps/PokemonTower2F.asm +++ b/data/wild/maps/PokemonTower2F.asm diff --git a/data/wild/maps/PokemonTower3F.asm b/data/wild/maps/PokemonTower3F.asm index b608ea15..b608ea15 100755..100644 --- a/data/wild/maps/PokemonTower3F.asm +++ b/data/wild/maps/PokemonTower3F.asm diff --git a/data/wild/maps/PokemonTower4F.asm b/data/wild/maps/PokemonTower4F.asm index 425b200c..425b200c 100755..100644 --- a/data/wild/maps/PokemonTower4F.asm +++ b/data/wild/maps/PokemonTower4F.asm diff --git a/data/wild/maps/PokemonTower5F.asm b/data/wild/maps/PokemonTower5F.asm index 5a0c96e1..5a0c96e1 100755..100644 --- a/data/wild/maps/PokemonTower5F.asm +++ b/data/wild/maps/PokemonTower5F.asm diff --git a/data/wild/maps/PokemonTower6F.asm b/data/wild/maps/PokemonTower6F.asm index 5e9d23f4..5e9d23f4 100755..100644 --- a/data/wild/maps/PokemonTower6F.asm +++ b/data/wild/maps/PokemonTower6F.asm diff --git a/data/wild/maps/PokemonTower7F.asm b/data/wild/maps/PokemonTower7F.asm index 8a3467ff..8a3467ff 100755..100644 --- a/data/wild/maps/PokemonTower7F.asm +++ b/data/wild/maps/PokemonTower7F.asm diff --git a/data/wild/maps/PowerPlant.asm b/data/wild/maps/PowerPlant.asm index a910420e..a910420e 100755..100644 --- a/data/wild/maps/PowerPlant.asm +++ b/data/wild/maps/PowerPlant.asm diff --git a/data/wild/maps/RockTunnel1F.asm b/data/wild/maps/RockTunnel1F.asm index 5c64bac4..5c64bac4 100755..100644 --- a/data/wild/maps/RockTunnel1F.asm +++ b/data/wild/maps/RockTunnel1F.asm diff --git a/data/wild/maps/RockTunnelB1F.asm b/data/wild/maps/RockTunnelB1F.asm index 3f034958..3f034958 100755..100644 --- a/data/wild/maps/RockTunnelB1F.asm +++ b/data/wild/maps/RockTunnelB1F.asm diff --git a/data/wild/maps/Route1.asm b/data/wild/maps/Route1.asm index df599383..df599383 100755..100644 --- a/data/wild/maps/Route1.asm +++ b/data/wild/maps/Route1.asm diff --git a/data/wild/maps/Route10.asm b/data/wild/maps/Route10.asm index b7ca364c..b7ca364c 100755..100644 --- a/data/wild/maps/Route10.asm +++ b/data/wild/maps/Route10.asm diff --git a/data/wild/maps/Route11.asm b/data/wild/maps/Route11.asm index eb00aa7e..eb00aa7e 100755..100644 --- a/data/wild/maps/Route11.asm +++ b/data/wild/maps/Route11.asm diff --git a/data/wild/maps/Route12.asm b/data/wild/maps/Route12.asm index 46c4106e..46c4106e 100755..100644 --- a/data/wild/maps/Route12.asm +++ b/data/wild/maps/Route12.asm diff --git a/data/wild/maps/Route13.asm b/data/wild/maps/Route13.asm index d19e0d83..d19e0d83 100755..100644 --- a/data/wild/maps/Route13.asm +++ b/data/wild/maps/Route13.asm diff --git a/data/wild/maps/Route14.asm b/data/wild/maps/Route14.asm index fe600bed..fe600bed 100755..100644 --- a/data/wild/maps/Route14.asm +++ b/data/wild/maps/Route14.asm diff --git a/data/wild/maps/Route15.asm b/data/wild/maps/Route15.asm index 4374acfb..4374acfb 100755..100644 --- a/data/wild/maps/Route15.asm +++ b/data/wild/maps/Route15.asm diff --git a/data/wild/maps/Route16.asm b/data/wild/maps/Route16.asm index f858dcdb..f858dcdb 100755..100644 --- a/data/wild/maps/Route16.asm +++ b/data/wild/maps/Route16.asm diff --git a/data/wild/maps/Route17.asm b/data/wild/maps/Route17.asm index 3f6316f3..3f6316f3 100755..100644 --- a/data/wild/maps/Route17.asm +++ b/data/wild/maps/Route17.asm diff --git a/data/wild/maps/Route18.asm b/data/wild/maps/Route18.asm index b76cef02..b76cef02 100755..100644 --- a/data/wild/maps/Route18.asm +++ b/data/wild/maps/Route18.asm diff --git a/data/wild/maps/Route2.asm b/data/wild/maps/Route2.asm index 40093712..40093712 100755..100644 --- a/data/wild/maps/Route2.asm +++ b/data/wild/maps/Route2.asm diff --git a/data/wild/maps/Route21.asm b/data/wild/maps/Route21.asm index e934e079..e934e079 100755..100644 --- a/data/wild/maps/Route21.asm +++ b/data/wild/maps/Route21.asm diff --git a/data/wild/maps/Route22.asm b/data/wild/maps/Route22.asm index 1b50ded0..1b50ded0 100755..100644 --- a/data/wild/maps/Route22.asm +++ b/data/wild/maps/Route22.asm diff --git a/data/wild/maps/Route23.asm b/data/wild/maps/Route23.asm index cc1642e8..cc1642e8 100755..100644 --- a/data/wild/maps/Route23.asm +++ b/data/wild/maps/Route23.asm diff --git a/data/wild/maps/Route24.asm b/data/wild/maps/Route24.asm index e493dfbf..e493dfbf 100755..100644 --- a/data/wild/maps/Route24.asm +++ b/data/wild/maps/Route24.asm diff --git a/data/wild/maps/Route25.asm b/data/wild/maps/Route25.asm index 2daa060c..2daa060c 100755..100644 --- a/data/wild/maps/Route25.asm +++ b/data/wild/maps/Route25.asm diff --git a/data/wild/maps/Route3.asm b/data/wild/maps/Route3.asm index be7afe95..be7afe95 100755..100644 --- a/data/wild/maps/Route3.asm +++ b/data/wild/maps/Route3.asm diff --git a/data/wild/maps/Route4.asm b/data/wild/maps/Route4.asm index 29f0aec4..29f0aec4 100755..100644 --- a/data/wild/maps/Route4.asm +++ b/data/wild/maps/Route4.asm diff --git a/data/wild/maps/Route5.asm b/data/wild/maps/Route5.asm index 7517bcb9..7517bcb9 100755..100644 --- a/data/wild/maps/Route5.asm +++ b/data/wild/maps/Route5.asm diff --git a/data/wild/maps/Route6.asm b/data/wild/maps/Route6.asm index 067d2694..067d2694 100755..100644 --- a/data/wild/maps/Route6.asm +++ b/data/wild/maps/Route6.asm diff --git a/data/wild/maps/Route7.asm b/data/wild/maps/Route7.asm index 1ebb1ce9..1ebb1ce9 100755..100644 --- a/data/wild/maps/Route7.asm +++ b/data/wild/maps/Route7.asm diff --git a/data/wild/maps/Route8.asm b/data/wild/maps/Route8.asm index db07dbba..db07dbba 100755..100644 --- a/data/wild/maps/Route8.asm +++ b/data/wild/maps/Route8.asm diff --git a/data/wild/maps/Route9.asm b/data/wild/maps/Route9.asm index 78512402..78512402 100755..100644 --- a/data/wild/maps/Route9.asm +++ b/data/wild/maps/Route9.asm diff --git a/data/wild/maps/SafariZoneCenter.asm b/data/wild/maps/SafariZoneCenter.asm index 125fbc6a..125fbc6a 100755..100644 --- a/data/wild/maps/SafariZoneCenter.asm +++ b/data/wild/maps/SafariZoneCenter.asm diff --git a/data/wild/maps/SafariZoneEast.asm b/data/wild/maps/SafariZoneEast.asm index ba0a1954..ba0a1954 100755..100644 --- a/data/wild/maps/SafariZoneEast.asm +++ b/data/wild/maps/SafariZoneEast.asm diff --git a/data/wild/maps/SafariZoneNorth.asm b/data/wild/maps/SafariZoneNorth.asm index fa6dd3b4..fa6dd3b4 100755..100644 --- a/data/wild/maps/SafariZoneNorth.asm +++ b/data/wild/maps/SafariZoneNorth.asm diff --git a/data/wild/maps/SafariZoneWest.asm b/data/wild/maps/SafariZoneWest.asm index b1e2fe3a..b1e2fe3a 100755..100644 --- a/data/wild/maps/SafariZoneWest.asm +++ b/data/wild/maps/SafariZoneWest.asm diff --git a/data/wild/maps/SeafoamIslands1F.asm b/data/wild/maps/SeafoamIslands1F.asm index e37005b2..e37005b2 100755..100644 --- a/data/wild/maps/SeafoamIslands1F.asm +++ b/data/wild/maps/SeafoamIslands1F.asm diff --git a/data/wild/maps/SeafoamIslandsB1F.asm b/data/wild/maps/SeafoamIslandsB1F.asm index fd9ab09a..fd9ab09a 100755..100644 --- a/data/wild/maps/SeafoamIslandsB1F.asm +++ b/data/wild/maps/SeafoamIslandsB1F.asm diff --git a/data/wild/maps/SeafoamIslandsB2F.asm b/data/wild/maps/SeafoamIslandsB2F.asm index 53961534..53961534 100755..100644 --- a/data/wild/maps/SeafoamIslandsB2F.asm +++ b/data/wild/maps/SeafoamIslandsB2F.asm diff --git a/data/wild/maps/SeafoamIslandsB3F.asm b/data/wild/maps/SeafoamIslandsB3F.asm index 5435d1e6..5435d1e6 100755..100644 --- a/data/wild/maps/SeafoamIslandsB3F.asm +++ b/data/wild/maps/SeafoamIslandsB3F.asm diff --git a/data/wild/maps/SeafoamIslandsB4F.asm b/data/wild/maps/SeafoamIslandsB4F.asm index bfeb6821..bfeb6821 100755..100644 --- a/data/wild/maps/SeafoamIslandsB4F.asm +++ b/data/wild/maps/SeafoamIslandsB4F.asm diff --git a/data/wild/maps/VictoryRoad1F.asm b/data/wild/maps/VictoryRoad1F.asm index bcb16dc8..bcb16dc8 100755..100644 --- a/data/wild/maps/VictoryRoad1F.asm +++ b/data/wild/maps/VictoryRoad1F.asm diff --git a/data/wild/maps/VictoryRoad2F.asm b/data/wild/maps/VictoryRoad2F.asm index 89b736cd..89b736cd 100755..100644 --- a/data/wild/maps/VictoryRoad2F.asm +++ b/data/wild/maps/VictoryRoad2F.asm diff --git a/data/wild/maps/VictoryRoad3F.asm b/data/wild/maps/VictoryRoad3F.asm index aec2d097..aec2d097 100755..100644 --- a/data/wild/maps/VictoryRoad3F.asm +++ b/data/wild/maps/VictoryRoad3F.asm diff --git a/data/wild/maps/ViridianForest.asm b/data/wild/maps/ViridianForest.asm index e7b1288f..e7b1288f 100755..100644 --- a/data/wild/maps/ViridianForest.asm +++ b/data/wild/maps/ViridianForest.asm diff --git a/data/wild/maps/nothing.asm b/data/wild/maps/nothing.asm index 19570b50..19570b50 100755..100644 --- a/data/wild/maps/nothing.asm +++ b/data/wild/maps/nothing.asm diff --git a/data/wild/super_rod.asm b/data/wild/super_rod.asm index 7b3b6407..7b3b6407 100755..100644 --- a/data/wild/super_rod.asm +++ b/data/wild/super_rod.asm |