Commit graph

1143 commits

Author SHA1 Message Date
Ruben
d2dfc911c3 Add Cosplay Pikachu special moves
Merge pull request #162 from rubendal/master

The Cosplay Pikachu form change mechanic is similar to Rotom:
when it changes form it learns a special move, possibly forgetting
its old special move if it had already changed form.

Renamed the "Rotom Form" pokemon move method to "Form Change"
and updated the description accordingly.
2016-09-25 10:34:41 -07:00
Jerry
10ab743bc2 Fix Cosplay Pikachu heights (#179)
Not sure why they weren't fixed when the height of megas were fixed
2016-09-24 15:38:46 -07:00
Lorenzo Rapetti
625be26239 Fix ORAS HM items (PR #170)
The HMs in OR/AS were pointing at the completely wrong moves.

Fixes #161
2016-09-24 14:36:31 -07:00
jota
d48f1d3617 Fix forms_switchable flag for Primal Pokemon in ORAS (#187)
It was fixed for Megas in #177 but not for Primal Pokemon.
2016-09-24 14:32:14 -07:00
Philippe Matray
65d1a59724 Fix typo in Sandy Wormadam's French name
Merge pull request #189 from phmatray/patch-1

The pokemon_name field in pokemon_form_names is sadly not rippable and has to be created by hand, being an unofficial amalgam of the species name and form name. Looks like Zhorken made a typo when adding the French form names originally.
2016-09-24 14:29:17 -07:00
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
Andrew Ekstedt
ddf987a110 Load/dump dance 2016-09-24 12:44:13 -07:00
Andrew Ekstedt
d70cd810cd Fix Pokémon Mansion encounters.
There was a mix up with B1F and 1F in FireRed and LeafGreen.
Both floors got labeled as 1F during the location area cleanup,
and the B1F encounters were copied to 2F and 3F instead of the 1F
encounters.
2016-09-24 12:31:04 -07:00
Christopher Sidebottom
77af7e9466 Re-add quotes around shape prose including commas
This broke my database import:

```
psycopg2.DataError: extra data after last expected column
CONTEXT:  COPY pokemon_shape_prose, line 21: "6,9,Upright,Sciurine,Pokémon with a bipedal, tailed form"
```
2016-08-20 22:16:24 +01:00
Philippe Matray
8c30801b85 Fix the primary index of Mega Beedrill 2016-08-18 08:42:49 +02:00
Philippe Matray
6082bd953e Fix indexes for french translations 2016-08-18 08:37:20 +02:00
Philippe Matray
2e8476a41f Fix "No newline at end of file" 2016-08-18 08:30:54 +02:00
Philippe Matray
58c06878c3 Add french translations for ROSA's mega-evolution 2016-08-18 08:27:23 +02:00
Philippe Matray
b2fbc36b23 Remove double quote in two descriptions 2016-08-17 14:16:05 +02:00
Philippe Matray
d6d916e281 Add a description of the shape picks from Bulbapédia
Add the french translation for this table
http://bulbapedia.bulbagarden.net/wiki/List_of_Pok%C3%A9mon_by_body_style
2016-08-17 13:18:51 +02:00
Seii
c5b1b5e033 Fix an Encounter mismatch (hopefully the last one) 2016-07-20 14:11:32 -05:00
Seii
f99364fff0 Fix incorrect FR/LG Safari Zone entries 2016-07-20 12:05:25 -05:00
Seii
6978771321 Fix ID duplication in Encounters table 2016-07-19 14:02:09 -05:00
Seii
1e09243b39 Fix location_names 2016-07-19 13:28:12 -05:00
Seii
48bf32299c Merge all separate FR/LG locations back into existing locations 2016-07-19 12:01:04 -05:00
Seii
9ff5609890 Merge victory-road-3 into victory-road-2 2016-07-19 10:04:00 -05:00
Seii
52f5b94a67 Fix Pokemon Mansion encounters in FR/LG 2016-07-19 09:29:48 -05:00
Seii
a9cc46585b Remove redundant FR/LG prose 2016-07-18 15:44:38 -05:00
Seii
be251eb308 Merge FR/LG safari zone entries into existing entries 2016-07-18 15:41:54 -05:00
Seii
5e87d46edd Remove separate Kanto Safari Zone location areas for FR/LG 2016-07-18 15:35:50 -05:00
Seii
f33531aff0 Merge separate FR/LG encounters on Victory Road, merge FR/LG "sea routes"
into existing R/B/Y equivalent routes
2016-07-18 15:30:33 -05:00
Seii
377ad27e3b Merge unique FR/LG references into existing R/B/Y locations 2016-07-18 14:07:24 -05:00
Seii
d1a953399b Remove obsolete Location Area from Location Area Prose 2016-07-18 13:42:14 -05:00
Seii
c21817a3f5 Remove obsolete Locations from Location Areas 2016-07-18 13:37:31 -05:00
Seii
2ebaa0b656 Remove obsolete Locations from Location Names 2016-07-18 13:21:42 -05:00
Seii
d56e04ce0d Remove duplicate locations 2016-07-18 12:52:42 -05:00
Eevee
22bfacb590 Merge pull request #177 from seii/veekun-issue-172
Fix forms_switchable flag for new Mega evolutions in ORAS
2016-07-06 13:48:30 -07:00
Seii
8fb46983b8 Correct 'is_battle_only' flag for Primal Kyogre and Groudon 2016-07-05 21:57:01 -05:00
Seii
b40727821e Fix forms_switchable flag for new Mega evolutions in ORAS 2016-07-05 15:59:18 -05:00
Alexander Lazenby-Catherwood
b5e4038f2d Fix terrifyingly wrong heights.
I have no clue how these went under the radar for so long. .-.'
2016-03-06 22:31:30 +08:00
Eevee (Lexy Munroe)
dd6630368d Allow common CLI arguments to work both before and after the subcommand 2016-02-02 11:01:45 -08:00
Eevee (Lexy Munroe)
59d8a790d1 Stub out a CLI search interface, which can also work with JSON and strings 2016-02-02 10:13:38 -08:00
Eevee (Lexy Munroe)
2dcc3c1aab Port the CLI to argparse 2016-02-02 10:13:38 -08:00
Eevee (Lexy Munroe)
ef03259e0f Little better CLI handling of Unicode in Py2 2016-02-02 10:12:56 -08:00
Andrew Ekstedt
abf8e6372a Add a missing French translation for move meta.
Courtesy of megadrifter-pt.
2015-11-16 17:40:40 -08:00
Konrad Borowski
cae59b2447 Update Brick Break for its BW effect. 2015-11-11 23:13:05 -08:00
megadrifter-pt
c5b0aa8bc7 Add some more French text 2015-11-11 23:06:25 -08:00
megadrifter-pt
20c4a0b792 RSE/BW2 French locations 2015-11-11 23:06:10 -08:00
megadrifter-pt
01f3261e34 HGSS French locations 2015-11-11 23:05:33 -08:00
megadrifter-pt
85317a28d2 Add some more French text 2015-11-11 23:05:02 -08:00
megadrifter-pt
2b6542c2ce Add French prose for both Hoenn Dexes 2015-11-11 22:11:02 -08:00
Andrew Ekstedt
0fb92f33d4 Merge pull request #155 from ncorgan/locations/kanto_fix
Fix region_id for Kanto locations listed as being in Johto
2015-11-04 22:16:56 -08:00
Eevee (Lexy Munroe)
54ea67a804 Fix pokedex dump under Python 2 AND 3, at the same time even 2015-11-04 20:10:27 -08:00
Eevee (Lexy Munroe)
b581c5205a Remove some bogus ORAS egg moves 2015-11-04 20:03:17 -08:00
Eevee (Lexy Munroe)
e0f4d3be7a Fix pokedex dump under Python 2 2015-11-04 20:03:08 -08:00