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
veekun_pokedex/pokedex/data/csv
History
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
..
translations Pokemon species split: Other data changes 2011-05-06 12:26:16 +03:00
abilities.csv Add new abilities from OR/AS. 2015-06-13 13:49:07 -07:00
ability_changelog.csv A bit of ability prose cleanup related to the last commit. #561 2011-09-21 17:38:56 -04:00
ability_changelog_prose.csv A bit of ability prose cleanup related to the last commit. #561 2011-09-21 17:38:56 -04:00
ability_flavor_text.csv ORAS move and ability flavor text. 2015-08-13 00:05:01 -07:00
ability_names.csv Add new abilities from OR/AS. 2015-06-13 13:49:07 -07:00
ability_prose.csv Add new abilities from OR/AS. 2015-06-13 13:49:07 -07:00
berries.csv At last, imported item and berry data. #10 2010-04-25 23:23:52 -07:00
berry_firmness.csv Move English texts to language-specific tables 2011-03-13 15:41:22 -07:00
berry_firmness_names.csv Add some French translations 2015-06-17 12:06:00 -07:00
berry_flavors.csv At last, imported item and berry data. #10 2010-04-25 23:23:52 -07:00
characteristic_text.csv Add some French translations 2015-06-17 12:06:00 -07:00
characteristics.csv Call characteristics "characteristics". #132 2014-07-28 19:01:33 -04:00
conquest_episode_names.csv Add episodes and warrior transformation info. 2012-08-17 01:50:09 -04:00
conquest_episode_warriors.csv Add episodes and warrior transformation info. 2012-08-17 01:50:09 -04:00
conquest_episodes.csv Add episodes and warrior transformation info. 2012-08-17 01:50:09 -04:00
conquest_kingdom_names.csv Add Conquest kingdoms and Pokémon evolution. 2012-07-23 17:34:44 -04:00
conquest_kingdoms.csv Add Conquest kingdoms and Pokémon evolution. 2012-07-23 17:34:44 -04:00
conquest_max_links.csv Add all 48 400 max links from Pokémon Conquest. 2012-07-28 11:04:02 -04:00
conquest_move_data.csv Delete unused conquest move effects and renumber effect 0 to 1. 2012-09-25 21:35:59 -04:00
conquest_move_displacement_prose.csv Flesh out move effects some more. 2012-08-04 23:50:39 -04:00
conquest_move_displacements.csv Flesh out move effects some more. 2012-08-04 23:50:39 -04:00
conquest_move_effect_prose.csv Delete unused conquest move effects and renumber effect 0 to 1. 2012-09-25 21:35:59 -04:00
conquest_move_effects.csv Delete unused conquest move effects and renumber effect 0 to 1. 2012-09-25 21:35:59 -04:00
conquest_move_range_prose.csv Add prose for most things move-related. 2012-08-03 20:37:28 -04:00
conquest_move_ranges.csv Add target counts for Conquest move ranges. 2012-08-04 19:55:55 -04:00
conquest_pokemon_abilities.csv Add Conquest Pokémon abilities and moves. 2012-07-28 11:04:02 -04:00
conquest_pokemon_evolution.csv Separate Conquest stats from main-series stats. 2012-07-28 11:04:02 -04:00
conquest_pokemon_moves.csv Add Conquest Pokémon abilities and moves. 2012-07-28 11:04:02 -04:00
conquest_pokemon_stats.csv Add a bunch of relationships for Conquest stuff. 2012-07-28 11:04:02 -04:00
conquest_stat_names.csv Separate Conquest stats from main-series stats. 2012-07-28 11:04:02 -04:00
conquest_stats.csv Separate Conquest stats from main-series stats. 2012-07-28 11:04:02 -04:00
conquest_transformation_pokemon.csv Add episodes and warrior transformation info. 2012-08-17 01:50:09 -04:00
conquest_transformation_warriors.csv Add episodes and warrior transformation info. 2012-08-17 01:50:09 -04:00
conquest_warrior_archetypes.csv Add generic warrior archetypes. 2012-07-29 17:58:30 -04:00
conquest_warrior_names.csv Use gender symbols in the player characters' names. 2012-07-28 11:04:02 -04:00
conquest_warrior_rank_stat_map.csv Add and tweak more relationships. 2012-07-31 23:44:02 -04:00
conquest_warrior_ranks.csv Toss the capacity column now that it's a stat. 2012-08-07 00:13:00 -04:00
conquest_warrior_skill_names.csv Add Conquest warriors and a bunch of data on them. 2012-07-28 11:04:01 -04:00
conquest_warrior_skills.csv Add Conquest warriors and a bunch of data on them. 2012-07-28 11:04:01 -04:00
conquest_warrior_specialties.csv Add Conquest warriors and a bunch of data on them. 2012-07-28 11:04:01 -04:00
conquest_warrior_stat_names.csv Add warriors' stats. 2012-07-28 11:04:02 -04:00
conquest_warrior_stats.csv Add warriors' stats. 2012-07-28 11:04:02 -04:00
conquest_warrior_transformation.csv Add episodes and warrior transformation info. 2012-08-17 01:50:09 -04:00
conquest_warriors.csv Add generic warrior archetypes. 2012-07-29 17:58:30 -04:00
contest_combos.csv Added contest combos. 2009-09-15 20:04:22 -07:00
contest_effect_prose.csv language_id -> local_language_id 2011-03-28 19:12:30 -07:00
contest_effects.csv Move English texts to language-specific tables 2011-03-13 15:41:22 -07:00
contest_type_names.csv Add some more French text 2015-11-11 23:05:02 -08:00
contest_types.csv Move English texts to language-specific tables 2011-03-13 15:41:22 -07:00
egg_group_prose.csv Update new egg group names to match Pokédex 3D Pro. 2014-05-03 14:48:53 -04:00
egg_groups.csv Alter some identifiers. #207 2011-04-03 03:17:06 -07:00
encounter_condition_prose.csv Add some more French text 2015-11-11 23:06:25 -08:00
encounter_condition_value_map.csv Add B/W 2 encounters 2012-09-29 00:03:40 -07:00
encounter_condition_value_prose.csv Some german translations 2014-06-01 10:49:19 -04:00
encounter_condition_values.csv Add B/W encounter methods and conditions 2012-09-28 23:00:53 -07:00
encounter_conditions.csv Add B/W encounter methods and conditions 2012-09-28 23:00:53 -07:00
encounter_method_prose.csv fixed id for german encounter method prose 2015-09-24 22:08:23 +02:00
encounter_methods.csv Add encounter methods and slots for X/Y. 2015-05-30 14:41:32 -07:00
encounter_slots.csv Add encounter methods and slots for X/Y. 2015-05-30 14:41:32 -07:00
encounters.csv Load/dump dance 2016-09-24 12:44:13 -07:00
evolution_chains.csv Add unreleased Pokémon. 2014-06-13 14:09:38 -04:00
evolution_trigger_prose.csv Add some more French text 2015-11-11 23:06:25 -08:00
evolution_triggers.csv Move English texts to language-specific tables 2011-03-13 15:41:22 -07:00
experience.csv Add experience tables. 2010-04-27 14:53:47 -07:00
genders.csv Turn gender into a table. 2012-07-28 11:03:52 -04:00
generation_names.csv Add some more French text 2015-11-11 23:06:25 -08:00
generations.csv Drop Generation.canonical_pokedex. 2013-10-18 18:58:07 -07:00
growth_rate_prose.csv Add some more French text 2015-11-11 23:06:25 -08:00
growth_rates.csv Move English texts to language-specific tables 2011-03-13 15:41:22 -07:00
item_categories.csv Sort out all the non-nullable columns with empty values. 2014-02-21 17:48:19 -05:00
item_category_prose.csv Sort out all the non-nullable columns with empty values. 2014-02-21 17:48:19 -05:00
item_flag_map.csv Add 'underground' flag to Iron Ball and Light Clay 2011-04-17 20:55:25 -07:00
item_flag_prose.csv language_id -> local_language_id 2011-03-28 19:12:30 -07:00
item_flags.csv Move English texts to language-specific tables 2011-03-13 15:41:22 -07:00
item_flavor_summaries.csv Created flavor summary tables. 2011-04-01 17:07:28 -07:00
item_flavor_text.csv Fix private use characters in French flavour text. 2014-05-19 23:51:57 -04:00
item_fling_effect_prose.csv language_id -> local_language_id 2011-03-28 19:12:30 -07:00
item_fling_effects.csv Move English texts to language-specific tables 2011-03-13 15:41:22 -07:00
item_game_indices.csv Add internal item IDs for X/Y. 2014-05-19 14:33:15 -04:00
item_names.csv Add missing genuses and move/ability/item names. 2014-05-19 14:32:14 -04:00
item_pocket_names.csv language_id -> local_language_id 2011-03-28 19:12:30 -07:00
item_pockets.csv Move English texts to language-specific tables 2011-03-13 15:41:22 -07:00
item_prose.csv Item effects: Convert lingering reST to markdown. 2014-08-26 19:37:51 -07:00
items.csv Update the identifiers of abilities and items whose names changed. #117 2014-05-19 14:33:15 -04:00
language_names.csv Add some French translations 2015-06-17 12:06:00 -07:00
languages.csv Add a better ordering to languages. 2014-05-19 22:11:13 -04:00
location_area_encounter_rates.csv Load/dump dance 2016-09-24 12:44:13 -07:00
location_area_prose.csv Merge all separate FR/LG locations back into existing locations 2016-07-19 12:01:04 -05:00
location_areas.csv Merge all separate FR/LG locations back into existing locations 2016-07-19 12:01:04 -05:00
location_game_indices.csv Rip X/Y locations and names. 2015-05-30 10:44:44 -07:00
location_names.csv Fix location_names 2016-07-19 13:28:12 -05:00
locations.csv Merge victory-road-3 into victory-road-2 2016-07-19 10:04:00 -05:00
machines.csv ORAS machines. 2015-08-08 00:10:26 -07:00
move_battle_style_prose.csv Add some more French text 2015-11-11 23:05:02 -08:00
move_battle_styles.csv Move English texts to language-specific tables 2011-03-13 15:41:22 -07:00
move_changelog.csv Update the move changelog after that rerip. 2012-01-19 03:00:36 -05:00
move_damage_class_prose.csv Add some more French text 2015-11-11 23:05:02 -08:00
move_damage_classes.csv Update the "status" damage class's identifier. 2014-05-19 22:40:17 -04:00
move_effect_changelog.csv Update Brick Break for its BW effect. 2015-11-11 23:13:05 -08:00
move_effect_changelog_prose.csv Update Brick Break for its BW effect. 2015-11-11 23:13:05 -08:00
move_effect_prose.csv Update Brick Break for its BW effect. 2015-11-11 23:13:05 -08:00
move_effects.csv Add unreleased moves. 2014-06-12 23:23:04 -04:00
move_flag_map.csv Add unreleased moves. 2014-06-12 23:23:04 -04:00
move_flag_prose.csv Load/dump dance. 2014-06-01 19:46:12 -04:00
move_flags.csv Rerip move stats. 2014-05-19 22:10:09 -04:00
move_flavor_summaries.csv Created flavor summary tables. 2011-04-01 17:07:28 -07:00
move_flavor_text.csv ORAS move and ability flavor text. 2015-08-13 00:05:01 -07:00
move_meta.csv Fix drain/recoil name in MoveMeta 2014-07-09 10:47:36 -07:00
move_meta_ailment_names.csv Add a missing French translation for move meta. 2015-11-16 17:40:40 -08:00
move_meta_ailments.csv Move English texts to language-specific tables 2011-03-13 15:41:22 -07:00
move_meta_categories.csv Added identifiers for move meta categories. 2011-04-09 22:22:58 -07:00
move_meta_category_prose.csv language_id -> local_language_id 2011-03-28 19:12:30 -07:00
move_meta_stat_changes.csv Rerip move stats. 2014-05-19 22:10:09 -04:00
move_names.csv ORAS move names/stats and the Rayquaza tutor. 2015-08-08 18:22:31 -07:00
move_target_prose.csv Some german translations 2014-06-01 10:49:19 -04:00
move_targets.csv Rerip move stats. 2014-05-19 22:10:09 -04:00
moves.csv Eerie Impulse lowers Special Attack, not Attack 2015-10-05 05:27:22 -07:00
nature_battle_style_preferences.csv Jammed in a bunch of nature stuff. 2010-04-26 23:26:37 -07:00
nature_names.csv Rerip nature names from X. 2014-06-22 13:07:04 -04:00
nature_pokeathlon_stats.csv Jammed in a bunch of nature stuff. 2010-04-26 23:26:37 -07:00
natures.csv Fix natures.game_index 2014-07-03 17:25:26 -07:00
pal_park.csv Turn PalPark.area Enum into a table. 2012-06-02 00:17:53 -07:00
pal_park_area_names.csv Add some French translations 2015-06-17 12:06:00 -07:00
pal_park_areas.csv Turn PalPark.area Enum into a table. 2012-06-02 00:17:53 -07:00
pokeathlon_stat_names.csv Add some French translations 2015-06-17 12:06:00 -07:00
pokeathlon_stats.csv Move English texts to language-specific tables 2011-03-13 15:41:22 -07:00
pokedex_prose.csv Add French prose for both Hoenn Dexes 2015-11-11 22:11:02 -08:00
pokedex_version_groups.csv Add OR/AS pokedex numbers. 2015-05-31 13:34:40 -07:00
pokedexes.csv Add OR/AS pokedex numbers. 2015-05-31 13:34:40 -07:00
pokemon.csv Load/dump dance 2016-09-24 12:44:13 -07:00
pokemon_abilities.csv Add new Pokémon forms from OR/AS. 2015-06-19 00:43:34 -07:00
pokemon_color_names.csv Add some French translations 2015-06-17 12:06:00 -07:00
pokemon_colors.csv Move English texts to language-specific tables 2011-03-13 15:41:22 -07:00
pokemon_dex_numbers.csv Add OR/AS pokedex numbers. 2015-05-31 13:34:40 -07:00
pokemon_egg_groups.csv Add unreleased Pokémon. 2014-06-13 14:09:38 -04:00
pokemon_evolution.csv Rip X/Y locations and names. 2015-05-30 10:44:44 -07:00
pokemon_form_generations.csv Add new Pokémon forms from OR/AS. 2015-06-19 00:43:34 -07:00
pokemon_form_names.csv Fix the primary index of Mega Beedrill 2016-08-18 08:42:49 +02:00
pokemon_form_pokeathlon_stats.csv Move alternate forms to ids 10001+ again. 2013-10-27 22:43:48 -04:00
pokemon_forms.csv Correct 'is_battle_only' flag for Primal Kyogre and Groudon 2016-07-05 21:57:01 -05:00
pokemon_game_indices.csv Add new Pokémon forms from OR/AS. 2015-06-19 00:43:34 -07:00
pokemon_habitat_names.csv Add some French translations 2015-06-17 12:06:00 -07:00
pokemon_habitats.csv Move English texts to language-specific tables 2011-03-13 15:41:22 -07:00
pokemon_items.csv Rip EVERYTHING available in the X/Y base stats structure. 2014-04-16 01:21:52 -04:00
pokemon_move_method_prose.csv Some german translations 2014-06-01 10:49:19 -04:00
pokemon_move_methods.csv Alter some identifiers. #207 2011-04-03 03:17:06 -07:00
pokemon_moves.csv Remove some bogus ORAS egg moves 2015-11-04 20:03:17 -08:00
pokemon_shape_prose.csv Re-add quotes around shape prose including commas 2016-08-20 22:16:24 +01:00
pokemon_shapes.csv Move English texts to language-specific tables 2011-03-13 15:41:22 -07:00
pokemon_species.csv Fix forms_switchable flag for new Mega evolutions in ORAS 2016-07-05 15:59:18 -05:00
pokemon_species_flavor_summaries.csv Pokemon species split: Other data changes 2011-05-06 12:26:16 +03:00
pokemon_species_flavor_text.csv ORAS Pokémon flavor text. 2015-08-13 00:00:59 -07:00
pokemon_species_names.csv Add unreleased Pokémon. 2014-06-13 14:09:38 -04:00
pokemon_species_prose.csv Add form difference prose for Kalos Pokémon. 2014-08-05 23:01:37 -04:00
pokemon_stats.csv Add new Pokémon forms from OR/AS. 2015-06-19 00:43:34 -07:00
pokemon_types.csv Add new Pokémon forms from OR/AS. 2015-06-19 00:43:34 -07:00
region_names.csv added italian region names 2015-09-23 18:20:07 +02:00
regions.csv XY rows. 2013-10-10 23:28:13 -07:00
stat_names.csv Add some French translations 2015-06-17 12:06:00 -07:00
stats.csv Add game indices for the main six stats. 2012-03-20 03:33:18 -04:00
super_contest_combos.csv Added contest combos. 2009-09-15 20:04:22 -07:00
super_contest_effect_prose.csv language_id -> local_language_id 2011-03-28 19:12:30 -07:00
super_contest_effects.csv Move English texts to language-specific tables 2011-03-13 15:41:22 -07:00
type_efficacy.csv Update type efficacy. 2013-11-06 17:15:54 -05:00
type_game_indices.csv Add internal IDs for types 2014-07-03 16:55:33 -07:00
type_names.csv added german translation for shadow type 2015-09-24 03:29:32 +02:00
types.csv XY Pokémon, names, types. 2013-10-11 12:31:27 -07:00
version_group_pokemon_move_methods.csv Add ORAS move methods 2015-08-23 18:29:17 +02:00
version_group_regions.csv Add versions for OR/AS. 2015-05-31 13:34:29 -07:00
version_groups.csv Add versions for OR/AS. 2015-05-31 13:34:29 -07:00
version_names.csv fixed german translation of "Alpha Sapphire" version name 2015-09-24 03:30:15 +02:00
versions.csv Add versions for OR/AS. 2015-05-31 13:34:29 -07:00