veekun_pokedex/pokedex
Andrew Ekstedt 359204effd Fix FR/LG duplicate location areas
Merge pull request #180 from seii/veekun-issue-103

Background: When I originally ripped FR/LG encounters, i gave them
their own set of location areas instead of reusing the ones from R/B/Y.
My reasoning was that location areas aren't really consistent across games,
and we have to name them by hand anyway, so it would be better to take care
of merging them in the presentation layer than the database layer.

The other devs disagreed with me, and all other rips have reused location areas.

This set of commits removes the separate location areas for FR/LG, merging them
with the existing location areas. Mostly straightforward, except:

- My original rip collapsed the three upper floors of the Pokémon Mansion into
  a single unnamed area, since they had the same encounters. But R/B/Y had
  slightly different encounters on each floor, so we have to re-duplicate these
  floors.

- I'm not sure how we ended up with four Victory Roads in Kanto, but we did.
  One of them (kanto-victory-road-1) is the G/S/C victory road, which has a
  completely different layout so it makes sense having its own set of location
  areas. As for the other three, one was used by R/B/Y (kanto-victory-road-2),
  one by FireRed (kanto-victory-road-3), and one by LeafGreen
  (kanto-victory-road-4). We can merge these.

Also, a few locations had inconsistent names:

- Routes 19, 20 & 21 => Sea Routes 19, 20 & 21
- Route 2 unnamed area => Route 2 south, towards Viridan City
- Safari Zone center => Safari Zone middle

Thanks to seii for doing all the hard work.

Fixes #103
Fixes #156
2016-09-24 12:50:55 -07:00
..
cli Stub out a CLI search interface, which can also work with JSON and strings 2016-02-02 10:13:38 -08:00
data/csv Fix FR/LG duplicate location areas 2016-09-24 12:50:55 -07:00
db Add a description of the shape picks from Bulbapédia 2016-08-17 13:18:51 +02:00
doc Er, fix tabledoc 2014-07-06 12:17:02 -07:00
struct Compat with Python 3.3+ 2015-10-05 08:12:23 -07:00
tests Compat with Python 3.3+ 2015-10-05 08:12:23 -07:00
util Fix test_media.py. 2012-03-16 12:37:47 -07:00
__init__.py Speed up import pokedex.db slightly. 2011-04-03 03:13:07 -07:00
__main__.py Make the library work with python -m. 2013-08-09 13:00:37 -07:00
compatibility.py Compat with Python 3.3+ 2015-10-05 08:12:23 -07:00
defaults.py Speed up import pokedex.db slightly. 2011-04-03 03:13:07 -07:00
formulae.py Give calculated_stat and calculated_hp the same signature. 2011-03-10 22:12:03 -08:00
lookup.py Compat with Python 3.3+ 2015-10-05 08:12:23 -07:00
main.py Allow common CLI arguments to work both before and after the subcommand 2016-02-02 11:01:45 -08:00
roomaji.py Compat with Python 3.3+ 2015-10-05 08:12:23 -07:00
search.py Stub out a CLI search interface, which can also work with JSON and strings 2016-02-02 10:13:38 -08:00