- # Pokémon need their form name added
- # XXX kinda kludgy
- add(row.full_name, None, u'en', u'us')
-
- # If this is a default form, ALSO add the unadorned name,
- # so 'Deoxys' alone will still do the right thing
- if row.forme_name and not row.forme_base_pokemon_id:
- add(row.name, None, u'en', u'us')
- else:
- add(row.name, None, u'en', u'us')
+ # Don't re-add alternate forms of the same Pokémon; they'll
+ # be added as Pokémon forms instead
+ if not row.is_base_form:
+ continue
+ elif cls == tables.PokemonForm:
+ if row.name:
+ add(row.pokemon_name, None, u'en', u'us')
+ continue