veniasilente/veekun_pokedex
1
0
Fork 0
mirror of https://github.com/veekun/pokedex.git synced 2024-08-20 18:16:34 +00:00
Code Issues Projects Releases Wiki Activity
1271 commits 28 branches 36 tags 30 MiB
Commit graph

821 commits

Author SHA1 Message Date
Lynn "Zhorken" Vaughan
ee297aad45 Rip X/Y level-up and egg moves. 2014-05-12 14:00:50 -04:00
Lynn "Zhorken" Vaughan
4b2455cf62 Update new egg group names to match Pokédex 3D Pro. 
Also, a lot of them had spaces on the end fsr.
 2014-05-03 14:48:53 -04:00
Pyrox
066827017f Added languages for egg groups 2014-05-03 19:25:26 +02:00
Lynn "Zhorken" Vaughan
bb6d8cf552 Rip EVERYTHING available in the X/Y base stats structure. 2014-04-16 01:21:52 -04:00
Lynn "Zhorken" Vaughan
aa869dc68c Count Volt Tackle as its usual method in X/Y, rather than an egg move. 2014-04-15 16:04:55 -04:00
Lynn "Zhorken" Vaughan
934ae1003f Add Rotom's form moves for X/Y. #120 2014-04-15 16:04:48 -04:00
Lynn "Zhorken" Vaughan
7f92a05003 Match Parental Bond and Aerilate's ids to their internal ids. 
Thanks to Kaphotics of Project Pokémon.
 2014-04-14 19:43:34 -04:00
valepert
3819a2619f PS = HP 
PS (Punti Salute) = HP (Hit Points)
 2014-03-17 15:58:36 +01:00
Lynn "Zhorken" Vaughan
10863c55e1 Change Shadow moves' target to the usual "Selected Pokémon" rather than Me First's. 2014-03-16 22:09:55 -04:00
Lynn "Zhorken" Vaughan
955b48c17a Give Me First's move target a unique identifier. 2014-03-16 22:09:36 -04:00
Lynn "Zhorken" Vaughan
de05d211ae Add remaining English X/Y ability flavour. 2014-03-14 16:28:58 -04:00
Lynn "Zhorken" Vaughan
329312a546 Sync Pokémon stats with Showdown. 2014-03-13 19:04:02 -04:00
Lynn "Zhorken" Vaughan
7462c0fc1b Put short_effect before effect in ability_prose. 
This way it matches /all the other prose tables/.  Relatedly, all the
abilities I recently expanded on had short_effect and effect swapped,
so I fixed that too.
 2014-03-12 12:18:37 -04:00
Lynn "Zhorken" Vaughan
2632454829 Set form_name=pokemon_name for Mega Evolutions. 2014-03-12 11:17:05 -04:00
Lynn "Zhorken" Vaughan
3fe999db89 Add a dummy pokemon_form_names row for Diancie. 
Apparently PokemonForm.name requires this row, so the tests weren't
passing. 9_6
 2014-03-11 20:36:06 -04:00
Lynn "Zhorken" Vaughan
efa41be984 Fix a typo in a move flag description so the tests pass again. 2014-03-11 20:23:02 -04:00
Lynn "Zhorken" Vaughan
d344e8b5f0 Strip some trailing whitespace in X/Y flavour text. 2014-03-11 18:31:41 -04:00
Lynn "Zhorken" Vaughan
d74b55fbad Add zero-width space to Thick Fat's flavour text as needed. 2014-03-11 18:22:51 -04:00
Lynn "Zhorken" Vaughan
cb1523e296 Add everything remaining from the spreadsheet. 2014-03-11 18:20:41 -04:00
Lynn "Zhorken" Vaughan
df449280b7 Add a separate fucking language for kanji. 2014-03-11 16:49:08 -04:00
Lynn "Zhorken" Vaughan
5770a3ea7d Add Spanish and Italian Pokémon names. 
We decided a while back to just give up and include these separately,
even though they're really just the English names.  Now I actually need
them, because genus.
 2014-03-11 16:14:59 -04:00
Lynn "Zhorken" Vaughan
5625b8274d Add national dex #, dex entries, name for Diancie. 2014-03-10 16:13:47 -04:00
Lynn "Zhorken" Vaughan
7cd9f36e24 Improve effects for new moves and abilities a little. 2014-03-09 20:53:53 -04:00
Lynn "Zhorken" Vaughan
8edb9329dc Add Diancie to the Undiscovered egg group. 2014-03-07 12:32:32 -05:00
Lynn "Zhorken" Vaughan
4b11c70231 Fix Diamond Storm's type. 2014-03-07 12:32:22 -05:00
Lynn "Zhorken" Vaughan
d91a2e5e13 Sync moves with Showdown. #116 2014-03-07 12:28:12 -05:00
Lynn "Zhorken" Vaughan
21fd51bb0b Add Hold Back and Diamond Storm. 2014-03-07 11:18:14 -05:00
Lynn "Zhorken" Vaughan
f71e1521a9 Load/dump dance. 2014-03-07 11:18:14 -05:00
Lynn "Zhorken" Vaughan
9cb44f56e5 Add Diancie. 2014-03-07 11:18:03 -05:00
Lynn "Zhorken" Vaughan
b8630cb076 Correct the descriptions for the Razor Claw and Razor Fang. 2014-03-04 13:50:19 -05:00
Lynn "Zhorken" Vaughan
0c8aadc53c Merge branch 'oracle'. #109 2014-02-21 17:51:46 -05:00
Lynn "Zhorken" Vaughan
5b759feaa2 Sort out all the non-nullable columns with empty values. 2014-02-21 17:48:19 -05:00
Lynn Vaughan
80838793d5 Merge pull request #100 from valepert/patch-3 
Merge valepert's Italian names for B/W 2 items. #100
 2014-02-06 15:33:10 -05:00
Lynn "Zhorken" Vaughan
a9bce8f5a3 Add ability changes for Feebas, Milotic, and Zapdos. 2014-01-06 13:12:43 -05:00
Lynn "Zhorken" Vaughan
61b5032519 Put the hyphen back in Lock-On's name. 
Showdown's data files said "Lock On" in a bunch of places, so I assumed
it had changed.  I was wrong!  Oops.  Thanks to Chispy for confirming
that it hadn't.
 2014-01-04 08:07:02 -05:00
Lynn "Zhorken" Vaughan
3fbe98c93a Sync move stats with Showdown. 2014-01-03 20:24:18 -05:00
Lynn "Zhorken" Vaughan
0ad40dee14 Sync Pokémon moves with Showdown. 2014-01-03 20:00:47 -05:00
Lynn "Zhorken" Vaughan
befea028ca Correct Japanese names for a few Kalos Pokémon. 
I double-checked against http://wiki.ポケモン.com/wiki/ポケモン一覧 .
(Apologies for the likely-unclickable URL but it was really really long
otherwise.)

Flabébé was using hiragana べ instead of katakana ベ.  Those were the
only hiragana in the csv.
 2013-12-20 20:28:06 -05:00
Lynn "Zhorken" Vaughan
bf2c79879d Add Happy Hour and Celebrate. 2013-12-11 14:20:14 -05:00
Lynn "Zhorken" Vaughan
fb06d85e1e Keldeo can switch forms. 2013-12-05 16:41:22 -05:00
Lynn "Zhorken" Vaughan
199feadce6 Fix a typo in Combusken's X entry. 2013-12-02 22:49:23 -05:00
Lynn "Zhorken" Vaughan
489b0dca9b Add all the remaining heights and weights. 
I got these all from pokemonxy.com, along with most of the last batch.
I'll double-check them in-game when I can.
 2013-11-23 10:14:28 -05:00
Lynn "Zhorken" Vaughan
5bba8d9ca9 Remove flags for nonexistent moves. 2013-11-23 09:42:09 -05:00
Lynn "Zhorken" Vaughan
79acc09c4f Correct Eerie Impulse's effect. 2013-11-23 09:30:40 -05:00
surskitty
b9b39b0baa Actually add abilities ignored by role play this time. 2013-11-22 10:44:16 -05:00
surskitty
e3f2f4006f Add abilities ignored by role play. 2013-11-22 10:41:48 -05:00
surskitty
bfbd41c29e Update a few moves for XY. 2013-11-21 21:56:54 -05:00
surskitty
20e211fac6 Correct powder move flag to include overcoat. 2013-11-21 21:56:15 -05:00
surskitty
525bbfc971 Fix errors with Draining Kiss and Mat Block flags. 2013-11-21 20:54:22 -05:00
surskitty
7b3016618c Preliminary flags for new moves. 2013-11-21 20:31:18 -05:00
surskitty
1a6b68ab1f Add new flags to old moves. 2013-11-21 20:30:32 -05:00
surskitty
92f75858c7 Add new flags (powder, pulse, ballistics, bite, mental) 2013-11-21 20:15:23 -05:00
John Pray
c80e35bae7 Fix Big Pecks ability description 
Fix typo of "Attack" to "Defense"
 2013-11-17 14:24:03 -05:00
Lynn "Zhorken" Vaughan
cfb19162ea Correct Magician too (thx daikonpan). 2013-11-17 11:22:37 -05:00
Lynn "Zhorken" Vaughan
53e4c063ba A handful of move/ability corrections (thx Bachuru). 2013-11-17 11:12:16 -05:00
Lynn "Zhorken" Vaughan
917f79fb61 Update Pokémon stats. 
From Showdown, of course.

n.b. their stats for Average Pumpkaboo don't line up with the rest of
the Pumpkaboos so I skipped those.
 2013-11-14 09:48:49 -05:00
Lynn "Zhorken" Vaughan
872793fc1b Another Showdown sync for Pokémon moves. 
Hopefully the last for now; veekun's about ready to update.
 2013-11-13 18:03:36 -05:00
Lynn "Zhorken" Vaughan
3af0aabd7f Add about half the remaining heights/weights. 2013-11-11 12:30:15 -05:00
Lynn "Zhorken" Vaughan
4f47c485a2 Update move stats, again from Showdown. 2013-11-10 05:34:51 -05:00
Lynn "Zhorken" Vaughan
f343c615a1 Another little Showdown sync. 2013-11-10 05:34:45 -05:00
Lynn "Zhorken" Vaughan
281887b041 Blade Aegislash is battle-only. 2013-11-09 11:13:20 -05:00
Lynn "Zhorken" Vaughan
f17833d1be Add move/item flavor text. 
I'll add ability flavor text once the ability column is fixed.
 2013-11-09 10:44:17 -05:00
Lynn "Zhorken" Vaughan
7486330365 Update a few item names. 2013-11-09 10:42:30 -05:00
Lynn "Zhorken" Vaughan
4670dc6149 Add foreign item names. 2013-11-09 10:08:47 -05:00
Lynn "Zhorken" Vaughan
00d5ef03cb Fix a typo in "Kangaskhanite". 2013-11-09 10:04:38 -05:00
Lynn "Zhorken" Vaughan
5d914a78f4 Add foreign names for everything. 
The ones we have, anyway.
 2013-11-09 08:24:21 -05:00
Lynn "Zhorken" Vaughan
6625b48bfc Update pokemon_form_generations and version_group_pokemon_move_methods. 2013-11-09 06:42:30 -05:00
Lynn "Zhorken" Vaughan
712056b6b5 Sync Pokémon moves with Showdown. 2013-11-09 06:23:14 -05:00
Lynn "Zhorken" Vaughan
83d713b101 Aaaand Rollout didn't actually change, either. 2013-11-09 05:11:39 -05:00
Lynn "Zhorken" Vaughan
7b16deda57 Whoops, Freeze-Dry has a hyphen after all. 2013-11-09 05:04:02 -05:00
Lynn "Zhorken" Vaughan
7f22ad2c86 Update identifiers in prose. 2013-11-09 03:25:34 -05:00
Lynn "Zhorken" Vaughan
225d8c7225 Update move names. 
This may be incomplete; this is just all the changes Showdown has so that
I can sync moves again.
 2013-11-09 03:08:14 -05:00
Lynn "Zhorken" Vaughan
75d3932bf0 Double-check TM/HM compatibility for Kalos Pokémon. 2013-11-08 02:02:00 -05:00
Lynn "Zhorken" Vaughan
052b7162b4 Burmy actually does learn Hidden Power by TM now, but nothing else. 2013-11-07 10:47:27 -05:00
Lynn "Zhorken" Vaughan
8a752f3be4 Add effects for new moves. 2013-11-07 10:29:20 -05:00
Lynn "Zhorken" Vaughan
ec2a04ccaf Copy short effects to long effects for new abilities. 2013-11-07 09:44:03 -05:00
Lynn "Zhorken" Vaughan
42c69cfc53 Correct Tough Claws' effect. 2013-11-07 09:42:11 -05:00
Lynn "Zhorken" Vaughan
81d9641b84 Complete tutors and delete erroneous TM moves. 2013-11-07 09:19:35 -05:00
Lynn "Zhorken" Vaughan
d1f62f4b52 Copy moves for non-default forms where needed. 2013-11-07 09:05:11 -05:00
Lynn "Zhorken" Vaughan
02e2764084 Add moves for old Pokémon. 
Data taken from Showdown.
 2013-11-07 08:58:26 -05:00
Lynn "Zhorken" Vaughan
bf37254908 Add ability changes for old Pokémon. 
I didn't add Competitive Milotic because Milotic is unobtainable in X/Y
until Bank comes out and as such we don't know if Competitive is its
second ability or if it replaced its hidden ability.
 2013-11-07 00:53:29 -05:00
Lynn "Zhorken" Vaughan
092ba6c11d Update type efficacy. 2013-11-06 17:15:54 -05:00
Lynn "Zhorken" Vaughan
1d1379081f Add Fairy type amendments to old Pokémon. 2013-11-06 17:09:29 -05:00
Lynn "Zhorken" Vaughan
1fda48c356 Fix a typo in Sylveon's X Pokédex entry. 2013-11-06 14:10:52 -05:00
Lynn "Zhorken" Vaughan
211cb02f49 Add a handful of missing heights/weights. 2013-11-06 13:55:29 -05:00
Lynn "Zhorken" Vaughan
10536b5538 Set ~~~genus~~~ for Kalos Pokémon. 2013-11-06 13:16:18 -05:00
Lynn "Zhorken" Vaughan
988edc5d8b Add all the X/Y Pokémon flavour text we have. 
This includes every Kalos Pokémon!  Woo!
 2013-11-06 13:15:28 -05:00
Lynn "Zhorken" Vaughan
9394c747cb Add new evolution info. 2013-11-06 11:51:44 -05:00
Lynn "Zhorken" Vaughan
b00d624e41 Add Kalos locations. 
I skipped Flare Café and Team Flare HQ because I'm not convinced
they're real locations — the Café is just labelled part of Lumiose,
and Team Flare has two different HQs which may or may not be called
Team Flare HQ and I have no idea.  They can get added later if
they're correct.
 2013-11-06 11:49:29 -05:00
Lynn "Zhorken" Vaughan
69df7286c6 Set colour, shape, and growth rate for Kalos Pokémon. 
That's everything trivial that goes on pokemon_species.
 2013-11-06 09:48:41 -05:00
Lynn "Zhorken" Vaughan
66071291a6 Split Pokédex version groups into their own table again. 
spline-pokedex doesn't need to adapt; Pokedex.version_groups looks the
same as always and VersionGroup.pokedex wasn't used anywhere.
 2013-11-06 09:47:49 -05:00
Lynn "Zhorken" Vaughan
386bbb1fdd Add national dex numbers for Kalos Pokémon. 2013-11-06 04:20:11 -05:00
Lynn "Zhorken" Vaughan
65e983fdd2 Belatedly commit the new item categories I added. 2013-11-06 04:19:32 -05:00
Lynn "Zhorken" Vaughan
e4528a1bf6 Swap the order of Average and Small Pumpkaboo/Gourgeist. 
Apparently the order column was one off starting after Arceus,
presumably from when I accidentally left Fairy Arceus as a second
default.
 2013-11-06 04:16:50 -05:00
Lynn "Zhorken" Vaughan
fd11a707e4 Add heights and weights for most new Pokémon. 
Missing: Aromatisse, Large Gourgeist, most Mega Evolutions.
 2013-11-06 03:43:07 -05:00
Lynn "Zhorken" Vaughan
12b3fbdc71 Add egg groups for new Pokémon. 
I'm kind of confused about these.  These data (which I got from
Showdown, again) include egg groups for Carbink, which is genderless;
I have heard that the official guide lists egg groups, but then
Pumpkaboo and Gourgeist aren't listed as being in Grass, which is...
very suspicious.  Hm.
 2013-11-05 12:05:17 -05:00
Lynn "Zhorken" Vaughan
51e69b16de Add stats for new Pokémon, incl Megas. 2013-11-05 11:51:30 -05:00
Lynn "Zhorken" Vaughan
136359cf4a Tweak a couple new ability descriptions. 2013-11-05 11:27:09 -05:00
Lynn "Zhorken" Vaughan
16feb5212e Add moves for Kalos Pokémon. 
Level-up moves taken from the spreadsheet; other moves taken from
Pokémon Showdown.
 2013-11-05 11:03:49 -05:00
Lynn "Zhorken" Vaughan
c351515fb7 Add TMs/HMs for X/Y. 
TM100 might get mistaken for HM00, idk.  Really there should just be an
is_hm column.  I'd do it myself, but then I'd have to update
spline-pokedex too, and urgh.
 2013-11-05 07:19:16 -05:00
Lynn "Zhorken" Vaughan
15500d6dc6 Add new items. 2013-11-05 07:12:49 -05:00
Lynn "Zhorken" Vaughan
fcc6ab95fc Make Gen VI ability IDs match internal IDs, almost. 
We have way of figuring out IDs for Aerilate or Parental Bond, because
those abilities are only on Megas.  I assumed they'd fit in the two-ID
gap and took a wild guess at order.  (I put Parental Bond first
because Kangaskhan comes first.)
 2013-11-05 01:54:28 -05:00
Lynn "Zhorken" Vaughan
e967edb4b1 Make Gen VI move IDs match internal IDs. 2013-11-05 01:33:51 -05:00
Lynn "Zhorken" Vaughan
ba368bec2c Add Aromatic Mist. 
I'm not going to bother sorting it in; all the IDs are about to change
anyway when we get the few remaining internal IDs on the spreadsheet.
 2013-11-02 19:58:30 -04:00
Andrew Ekstedt
a6bb5bec83 Set forms_switchable for Mega Evolutions. 2013-11-01 18:34:10 -07:00
Andrew Ekstedt
bfab0b6a10 Set forms_switchable for new Pokémon. 2013-11-01 18:33:44 -07:00
Andrew Ekstedt
a4fa214abe Fix B2/W2 version group identifier. 2013-11-01 17:01:00 -07:00
Andrew Ekstedt
e151162a8b Add identifiers for version groups. 2013-11-01 14:34:51 -07:00
Lynn "Zhorken" Vaughan
ce4e45d08f Add new moves; no effects yet. 2013-10-31 07:06:05 -04:00
Lynn "Zhorken" Vaughan
309bb23086 Add gender for new stuff. 
I defaulted to 1:1.  As far as I know, while we may not know the exact
ratios for most new Pokémon, we do know that everything I just marked
1:1 comes in male and female.

Also, we need to split this into per-form for Meowstic's "forms".

Also also, wait, is gender_rate seriously not a foreign key?  I spent a
good minute trying to figure out where the gender ratio enum table was.
 2013-10-31 04:27:39 -04:00
Lynn "Zhorken" Vaughan
8fed30ca87 Add abilities for new species and Megas. 2013-10-31 03:57:18 -04:00
Lynn "Zhorken" Vaughan
457315b907 Add Gen VI abilities, including English names and short effects. 2013-10-31 03:57:18 -04:00
Andrew Ekstedt
81c67e8080 Fix some backwards Pokémon types. 2013-10-29 14:37:15 -07:00
Andrew Ekstedt
ec5dd5177f Fairy Arceus is not a default form. 2013-10-29 02:54:36 -07:00
Andrew Ekstedt
b412bfaa8e Add is_mega column to pokemon_forms. 2013-10-28 12:21:58 -07:00
Andrew Ekstedt
ab6beabc55 Merge branch 'veekun8' 2013-10-28 10:59:23 -07:00
Lynn "Zhorken" Vaughan
d32258b889 Set evolves_from_species_id for Gen VI Pokémon. 2013-10-28 04:08:33 -04:00
Lynn "Zhorken" Vaughan
729fbb0124 Reorder Furfrou's forms. 
This is the order they're listed at the Furfrou salon in-game.
 2013-10-28 03:30:37 -04:00
Lynn "Zhorken" Vaughan
8bda94c9d4 Refill all the order columns. 2013-10-28 03:21:27 -04:00
Lynn "Zhorken" Vaughan
cc99a0e287 Add evolution chains for new Pokémon. 2013-10-28 03:14:56 -04:00
Lynn "Zhorken" Vaughan
f6a3ed71e3 Add types for new forms. 2013-10-28 03:14:47 -04:00
Lynn "Zhorken" Vaughan
3a117f8dfd Add identifiers for pokemon and pokemon_forms. 2013-10-28 03:14:36 -04:00
Lynn "Zhorken" Vaughan
b5dceff4d1 Add new Pokémon forms and names. 2013-10-28 03:10:31 -04:00
Lynn "Zhorken" Vaughan
c36e09089f Move alternate forms to ids 10001+ again. 2013-10-27 22:43:48 -04:00
Andrew Ekstedt
8a05436945 Add default forms for XY pokemon. 2013-10-19 10:27:30 -07:00
Andrew Ekstedt
d085bd348a Add XY region, generation, version, and dex names. 2013-10-18 19:31:15 -07:00
Andrew Ekstedt
38ce28e48f Drop Generation.canonical_pokedex. 
Generation VI doesn't have a canonical pokedex (it has three). We don't
use this anywhere and as far as i can tell we never have. We can revive
it in another form if and when we find we need it.

Conflicts:
	pokedex/data/csv/generations.csv
	pokedex/db/tables.py
 2013-10-18 18:58:07 -07:00
Andrew Ekstedt
90b57d2c67 Remove some trailing spaces. 2013-10-18 16:06:47 -07:00
Eevee (Alex Munroe)
56aca8e9c3 XY Pokémon, names, types. 2013-10-11 12:31:27 -07:00
Eevee (Alex Munroe)
55b4eebe9d XY rows. 2013-10-10 23:28:13 -07:00
Sanky
ef0b9f0f52 Add missing Hoenn locations (from R/S) 2013-08-07 14:32:09 +02:00
Lynn "Zhorken" Vaughan
e0beddc573 Add an is_main_series column to abilities. 2013-07-04 03:50:34 -04:00
valepert
57bf8bec87 Update item_names.csv 
Italian names BW2 items
 2013-04-21 23:51:20 +03:00
Lynn
f34f6bb72a SmellingSalt uses the target's paralysis, not the user's. 2013-04-06 18:14:00 -04:00
Lynn
8ece3648fc Add short effects for B/W 2 items. 2013-03-20 23:47:32 -04:00
Lynn "Zhorken" Vaughan
08c5c3d47b Note that Soundproof does not block Yawn. #71 2013-03-19 00:58:32 -04:00
Lynn "Zhorken" Vaughan
421cd8ce35 Fix Black Kyurem's index... 
Whoops.

I'm quite sure putting White Kyurem before Black Kyurem is the correct
thing, though.  The games' guts are pretty consistent about that.
 2013-03-18 01:59:45 -04:00
Lynn "Zhorken" Vaughan
3e95ea32ec Add indices for Kyurems/genies in pokemon_form_generations. #90 2013-03-18 00:48:22 -04:00
Lynn "Zhorken" Vaughan
fb6076dba3 Add TMs (and fake HMs, ugh) for Colosseum & XD. #72 2013-03-17 02:04:33 -04:00
Andrew Ekstedt
a33d0fe3f3 Add Keldeo's resolute form to pokemon_form_generations 2013-02-09 22:02:18 -08:00
Eevee
d2277f23a0 Fix a couple typos in berry short effects. 2013-02-07 00:41:19 -08:00
valepert
e71bfba357 Merge pull request #1 from valepert/patch-2 
Update pokedex/data/csv/stat_names.csv
 2012-12-25 12:10:22 -08:00
valepert
615117bed3 Update pokedex/data/csv/stat_names.csv 
italian names
 2012-12-25 21:09:42 +01:00
valepert
6dc7027f8f Update pokedex/data/csv/pokemon_color_names.csv 
italian colors
 2012-12-25 21:06:04 +01:00
Lynn "Zhorken" Vaughan
31de765d60 Explain move shenanigans better in Pokémon form prose. 2012-12-06 23:55:18 -05:00
Lynn "Zhorken" Vaughan
dcf9ef23e7 Copy Castform's B/W 2 egg moves over, too. 
This commit originally included Basculin, too, but then magical dealt
with that before I pushed.  Anyway, the query I used should have caught
any other similar cases, too:

insert into pokemon_moves select p.id, 14, pm.move_id, 2, 0, null from
    pokemon_moves pm
join pokemon p on pm.pokemon_id=p.species_id and p.is_default=false
where pm.version_group_id=14 and pm.pokemon_move_method_id=2;

The join condition is cheating a little, but it does happen to work; it
joins a pokemon_move to all non-default forms of the same Pokémon.  If
being default and having id=species_id didn't go hand-in-hand, I'm
pretty sure it'd require two joins to pokemon.
 2012-12-06 23:41:34 -05:00
Andrew Ekstedt
4ad4fba921 Copy over Basculin's egg moves in B/W 2. 2012-12-06 18:38:33 -08:00
Lynn "Zhorken" Vaughan
2bf44191da Rerip all the Gen IV tutors. :D #27 #82 
LOOK AT THAT DIFF :D
 2012-12-01 05:17:31 -05:00
Lynn "Zhorken" Vaughan
05d06f96e3 Use Pokédex 3D's egg group names. 2012-11-18 16:01:24 -05:00
Eevee
9a1f38a76d Japanese damage class names. Hokey at best, but. 2012-11-17 04:12:54 -08:00
Eevee
b1626f290b Japanese language names. 2012-11-17 04:12:54 -08:00
Eevee
4d25cc1d9a Fix order of stat names; add Japanese color names. 2012-11-17 04:12:54 -08:00
Eevee
97975e8214 Add Japanese stat names. 2012-11-17 04:12:54 -08:00
Lynn "Zhorken" Vaughan
2ea50b575a Update the short item effects, thanks to JulesLetters. 2012-11-16 14:00:31 -05:00
Lynn "Zhorken" Vaughan
3d20afaa15 Restore the "e" on Deoxys's Formes. 
I'm not sure where it went, or why Normal Forme stayed intact.
 2012-11-12 18:34:51 -05:00
Lynn "Zhorken" Vaughan
e74d5e28bd Give Colosseum Normal Deoxys instead of Speed, too. 
I'm not so sure about XD anymore, but I'm surer about this one.
 2012-11-12 18:15:42 -05:00
Lynn "Zhorken" Vaughan
12beb420d9 Give XD level-up moves for Normal Deoxys, not Speed. 
I'm 90% sure this is correct.
 2012-11-12 17:31:08 -05:00
Lynn "Zhorken" Vaughan
833fedafe1 Fix the XD tutors based on the Emerald tutors. 
I'm assuming Normal Deoxys learns tutors based on Speed Deoxys's list,
given that Attack and Defense Deoxys have all the same tutors, and Speed
Deoxys has all those same tutors too while only gaining tutors unique to
Emerald.  So in other words, it looks like Deoxys's Forme doesn't matter
for tutor compatibility in Gen III.
 2012-11-12 17:19:41 -05:00
Lynn "Zhorken" Vaughan
e478bb8c3f Rerip Gen III tutors. #27 #81 
I AM SUCH A BADASS
 2012-11-12 17:09:59 -05:00
Lynn "Zhorken" Vaughan
f1455f922e Use official full form names from Pokédex 3D Pro. 
Notes:

- The removal of "Type" in ??? Arceus's French name follows all its
  other types, even though ??? Arceus obviously doesn't appear in
  Pokédex 3D Pro.  (The English names do retain "Type".)
- Meloetta and Genesect are locked until passwords are revealed for
  them.  Meloetta is pretty unambiguously "Forme", but Genesect's forms
  being named after their drives is still our (my) invention.
- Spiky-eared Pichu is also absent from Pokédex 3D, but I remember
  having good reason for not including "Form" or anything.  I just don't
  don't remember what it was.  Probably just that nothing's official,
  afaik, and it's not really a "form" like the others, in that it's a
  specific individual and a very small variation.  "-eared" with a
  lowercase "e" is definitely what the games say, though.
- I can put other foreign form names in later, although I won't know how
  to do pokemon_name for other languages.
 2012-11-12 15:00:28 -05:00
Lynn "Zhorken" Vaughan
c976197785 Er, give Keldeo Secret Sword and Meloetta Relic Song, not vice versa. 
Also worth noting: I gave the alternate forms their respective moves
even though they technically learn them specifically in their default
forms.  It seems weird to say that only one form gets the move,
especially when learning Secret Sword immediately causes Keldeo to /not/
be its default form.  Also, Pirouette Meloetta already has TMs and other
tutors even though it's battle-only.
 2012-11-04 21:30:06 -05:00
Lynn "Zhorken" Vaughan
a3b68f9cf2 Add various special moves for B/W 2. #83 
Add the following:
- Rotom form moves
- Volt Tackle Pichu
- Secret Sword and Relic Song tutors
 2012-11-04 21:02:43 -05:00
Lynn "Zhorken" Vaughan
9fffb2a401 Change the is_dream header to is_hidden in pokemon_abilities.csv. 
Whoops.  grep says this is the only remaining instance of is_dream,
though.
 2012-11-04 19:37:10 -05:00
Lynn "Zhorken" Vaughan
76a4666cc9 Update the Pokémon form descriptions. 2012-11-04 19:03:06 -05:00
Lynn "Zhorken" Vaughan
1d3e5af093 Switch pokemon_game_indices to version_id; add B/W 2 indices. 
version_id rather than version_group_id for the sake of FR/LG Deoxys.
It seems a little silly but magical's on board with this decision too.
 2012-11-03 03:51:29 -04:00
Andrew Ekstedt
c5418ea344 Fix "Fiery Path" location name 2012-10-26 23:55:21 -07:00
Andrew Ekstedt
48e0b9a605 Fix Pattern Bush identifier 2012-10-26 23:51:51 -07:00
Eevee
ddfd6dcb46 Merge pull request #84 from matchu/master 
Fix typo on location "Pattern Bush"
 2012-10-26 21:52:26 -07:00
Eevee
ea59278f01 Merge pull request #80 from coyotte508/master 
Adds specific level moves to kyurem formes
 2012-10-26 21:51:42 -07:00
Lynn "Zhorken" Vaughan
c77c32d99b Add B/W 2 item flavour text. 
I remembered to add the zero width spaces on the Adamant and Lustrous
Orbs' text, too! :D
 2012-10-19 21:49:22 -04:00
Lynn "Zhorken" Vaughan
17d1c0e9c3 Add B/W 2 items. 2012-10-19 21:22:59 -04:00
Lynn "Zhorken" Vaughan
33f227d4cd The S.S. Ticket and Magma Stone are no longer unused. 2012-10-19 21:09:28 -04:00
Lynn "Zhorken" Vaughan
1cd419b19a Disperse the "B/W unknown" item category. 2012-10-19 21:01:46 -04:00
Lynn "Zhorken" Vaughan
a1fb616cfc Add B/W 2 flavour text. 2012-10-18 17:23:26 -04:00
Lynn "Zhorken" Vaughan
63c2693054 Fix the language ID on English B/W move/ability/item flavour text. 2012-10-17 21:43:34 -04:00
Lynn "Zhorken" Vaughan
aee71712f9 Add form names for Keldeo; do "forme" → "Form" for Kyurem. 
Note that "Form" isn't actaully official for Kyurem; it's just "Kyurem",
"Black Kyurem", and "White Kyurem", but we do the same with Rotom and
some other cases like this.
 2012-10-06 21:29:59 -04:00
Andrew Ekstedt
32d88bf97f Add B/W 2 encounters 
- Victory Road, Giant Chasm, and Reversal Mountain have unknown area
  names. The others are hopefully accurate.

- Swarms are, again, not present. Neither are Hidden Grove encounters.
 2012-09-29 00:03:40 -07:00
Andrew Ekstedt
84f34dee42 Add B/W 2 locations 
Most of the English names are official; the remaining few were
translated by Guested.

B/W 2 adds another Victory Road—this is a new location, distinct from
the previous one. The name remains the same, but our identifier is
unova-victory-road-2.
 2012-09-28 23:58:03 -07:00
Andrew Ekstedt
7d9381699a Add B/W encounters 
- Victory Road still has unknown area names

- Swarms don't work like normal encounters so are not present
 2012-09-28 23:50:04 -07:00
Andrew Ekstedt
ca5b7a9cbf Add B/W encounter methods and conditions 
Spots: it might seem like they should be conditions, but in practice
they behave more like methods. Specifically, conditions typically make
only minor changes to an encounter list. Spots change everything.
So spots are added as methods, with each type of spot as a separate
method. Not exactly ideal, but this causes the least fuss.

Seasons work fine as conditions.

Well, as well as time-of-day.
 2012-09-28 23:00:53 -07:00
Lynn "Zhorken" Vaughan
442ba27943 Delete unused conquest move effects and renumber effect 0 to 1. 2012-09-25 21:35:59 -04:00
Lynn "Zhorken" Vaughan
cb3740a7e5 Merge branch 'conquest' 
Conflicts:
	pokedex/data/csv/pokemon_dex_numbers.csv
 2012-09-25 21:00:02 -04:00
Lynn "Zhorken" Vaughan
765be26405 Add episodes and warrior transformation info. 2012-08-17 01:50:09 -04:00
Lynn "Zhorken" Vaughan
108c4243da More move effect tweaking... 2012-08-17 01:49:31 -04:00
Lynn "Zhorken" Vaughan
f11058dd2f Toss the capacity column now that it's a stat. 2012-08-07 00:13:00 -04:00
Lynn "Zhorken" Vaughan
c00bc4cad2 Remove Mega Drain's "effect chance". 
Effect chance shares seven bits with draining moves' drain percentage
(always 50) and Dragon Rage's set damage (40) in Conquest's guts.
 2012-08-05 20:54:29 -04:00
Lynn "Zhorken" Vaughan
d689bd3de3 Give Splash its own effect. 2012-08-05 00:52:50 -04:00
Lynn "Zhorken" Vaughan
0596032d00 Flesh out move effects some more. 2012-08-04 23:50:39 -04:00
Lynn "Zhorken" Vaughan
789a1bdc0e Add target counts for Conquest move ranges. 2012-08-04 19:55:55 -04:00
Lynn "Zhorken" Vaughan
14232f0e74 Add prose for most things move-related. 2012-08-03 20:37:28 -04:00
Lynn "Zhorken" Vaughan
707b34fb8f Add Conquest move info. 2012-08-03 13:03:56 -04:00
Lynn "Zhorken" Vaughan
3c76c08042 Add and tweak more relationships. 2012-07-31 23:44:02 -04:00
Lynn "Zhorken" Vaughan
47410a9e9c Add generic warrior archetypes. 2012-07-29 17:58:30 -04:00
Lynn "Zhorken" Vaughan
d3693319f1 Add Conquest gallery order. 2012-07-28 11:04:02 -04:00
Lynn "Zhorken" Vaughan
0d1818002e Add a bunch of relationships for Conquest stuff. 2012-07-28 11:04:02 -04:00
Lynn "Zhorken" Vaughan
f2441a3f80 Add warriors' stats. 2012-07-28 11:04:02 -04:00
Lynn "Zhorken" Vaughan
39aa729e0a Add all 48 400 max links from Pokémon Conquest. 
Apparently I already committed the table class.
 2012-07-28 11:04:02 -04:00
Lynn "Zhorken" Vaughan
4597b970b0 Use gender symbols in the player characters' names. 
I spent longer than I should have deliberating, but in the end, it came
down to the fact that searching for "Player" won't fuzzy-match the long
versions.
 2012-07-28 11:04:02 -04:00
Lynn "Zhorken" Vaughan
22a079390d Add Conquest Pokémon abilities and moves. 2012-07-28 11:04:02 -04:00
Lynn "Zhorken" Vaughan
2dbd5da8e2 Add Conquest Pokémon stats. 2012-07-28 11:04:02 -04:00