veniasilente/veekun_pokedex
1
0
Fork 0
mirror of https://github.com/veekun/pokedex.git synced 2024-06-29 01:42:42 +00:00
Code Issues Projects Releases Wiki Activity
1214 commits 28 branches 36 tags 30 MiB
Python 99.8%
Shell 0.1%
Go to file
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
bin python => python2 2012-11-17 04:12:54 -08:00
doc Rename StatHint to Characteristic in docs 2014-12-29 16:01:48 +01:00
pokedex Fix FR/LG duplicate location areas 2016-09-24 12:50:55 -07:00
scripts Rip X/Y locations and names. 2015-05-30 10:44:44 -07:00
.gitignore Added whoosh and sqlite files to .gitignore. 2009-08-23 20:46:21 -07:00
.travis.yml Travis: Drop Python 2.6 2015-11-05 12:39:01 -08:00
conftest.py Modernize our use of py.test 2014-07-06 21:45:05 -07:00
item-questions Effects for the remaining B/W items. #247 2011-04-10 16:41:59 -07:00
LICENSE Added a README and licensed under MIT. 2009-07-23 00:04:47 -07:00
README Update some URLs to point to github.com 2012-12-02 17:14:08 -08:00
setup.py setup.py: List supported Python versions. 2015-11-05 12:54:16 -08:00

README 

This software is copyrighted and licensed under the MIT license.  See the file
entitled LICENSE for full copyright and license text.

This software comes bundled with data, sprites, and sounds extracted from the
Pokémon series of video games.  Some terminology from the Pokémon franchise is
also necessarily used within the software itself.  This is all the intellectual
property of Nintendo, Creatures, inc., and GAME FREAK, inc. and is protected by
various copyrights and trademarks.  The author believes that the use of this
intellectual property for a fan reference is covered by fair use and that the
software is significantly impaired without said property included.  Any use of
this copyrighted property is at your own legal risk.

A complete revision history of this software is available from
https://github.com/veekun/pokedex.

Contributors:
Alex Munroe (Eevee): git@veekun.com