Give Pokémon internal IDs their own table and add all gens' IDs.

- Gen I has them all mixed around.
- Gen II has no surprises, but I figured it's good to be thorough.
- Gen III has the first 251 in order, then a big break, then the
  third-gen Pokémon mixed around, though families are usually together.
- Gen IV has the 493 in order and then alternate forms after Arceus,
  which will be useful to have once Gen V comes and we have to bump
  the alt forms in the pokemon table forward.

pokedex/data/csv/pokedex_version_groups.csv

@@ -9,5 +9,3 @@ pokedex_id,version_group_id
 5,8
 6,9
 7,10
-8,1
-8,2

pokedex/data/csv/pokedexes.csv

@@ -6,4 +6,3 @@ id,region_id,name,description
 5,4,Original Sinnoh,Diamond/Pearl Sinnoh dex
 6,4,Extended Sinnoh,Platinum Sinnoh dex—an extended version of Diamond and Pearl's
 7,2,Updated Johto,"HeartGold/SoulSilver Johto dex—Gold/Silver/Crystal's, extended to add move-based Generation IV evolutions"
-8,1,Internal ID,IDs used internally in Generation I

pokedex/data/csv/pokemon_dex_numbers.csv

@@ -3,122 +3,98 @@ pokemon_id,pokedex_id,pokedex_number
 1,2,1
 1,3,226
 1,7,231
-1,8,153
 2,1,2
 2,2,2
 2,3,227
 2,7,232
-2,8,9
 3,1,3
 3,2,3
 3,3,228
 3,7,233
-3,8,154
 4,1,4
 4,2,4
 4,3,229
 4,7,234
-4,8,176
 5,1,5
 5,2,5
 5,3,230
 5,7,235
-5,8,178
 6,1,6
 6,2,6
 6,3,231
 6,7,236
-6,8,180
 7,1,7
 7,2,7
 7,3,232
 7,7,237
-7,8,177
 8,1,8
 8,2,8
 8,3,233
 8,7,238
-8,8,179
 9,1,9
 9,2,9
 9,3,234
 9,7,239
-9,8,28
 10,1,10
 10,2,10
 10,3,24
 10,7,24
-10,8,123
 11,1,11
 11,2,11
 11,3,25
 11,7,25
-11,8,124
 12,1,12
 12,2,12
 12,3,26
 12,7,26
-12,8,125
 13,1,13
 13,2,13
 13,3,27
 13,7,27
-13,8,112
 14,1,14
 14,2,14
 14,3,28
 14,7,28
-14,8,113
 15,1,15
 15,2,15
 15,3,29
 15,7,29
-15,8,114
 16,1,16
 16,2,16
 16,3,10
 16,7,10
-16,8,36
 17,1,17
 17,2,17
 17,3,11
 17,7,11
-17,8,150
 18,1,18
 18,2,18
 18,3,12
 18,7,12
-18,8,151
 19,1,19
 19,2,19
 19,3,17
 19,7,17
-19,8,165
 20,1,20
 20,2,20
 20,3,18
 20,7,18
-20,8,166
 21,1,21
 21,2,21
 21,3,13
 21,7,13
-21,8,5
 22,1,22
 22,2,22
 22,3,14
 22,7,14
-22,8,35
 23,1,23
 23,2,23
 23,3,50
 23,7,50
-23,8,108
 24,1,24
 24,2,24
 24,3,51
 24,7,51
-24,8,45
 25,1,25
 25,2,25
 25,3,22
@@ -126,7 +102,6 @@ pokemon_id,pokedex_id,pokedex_number
 25,5,104
 25,6,104
 25,7,22
-25,8,84
 26,1,26
 26,2,26
 26,3,23
@@ -134,87 +109,72 @@ pokemon_id,pokedex_id,pokedex_number
 26,5,105
 26,6,105
 26,7,23
-26,8,85
 27,1,27
 27,2,27
 27,3,48
 27,4,112
 27,7,48
-27,8,96
 28,1,28
 28,2,28
 28,3,49
 28,4,113
 28,7,49
-28,8,97
 29,1,29
 29,2,29
 29,3,95
 29,7,95
-29,8,15
 30,1,30
 30,2,30
 30,3,96
 30,7,96
-30,8,168
 31,1,31
 31,2,31
 31,3,97
 31,7,97
-31,8,16
 32,1,32
 32,2,32
 32,3,98
 32,7,98
-32,8,3
 33,1,33
 33,2,33
 33,3,99
 33,7,99
-33,8,167
 34,1,34
 34,2,34
 34,3,100
 34,7,100
-34,8,7
 35,1,35
 35,2,35
 35,3,41
 35,5,100
 35,6,100
 35,7,41
-35,8,4
 36,1,36
 36,2,36
 36,3,42
 36,5,101
 36,6,101
 36,7,42
-36,8,142
 37,1,37
 37,2,37
 37,3,125
 37,4,153
 37,7,127
-37,8,82
 38,1,38
 38,2,38
 38,3,126
 38,4,154
 38,7,128
-38,8,83
 39,1,39
 39,2,39
 39,3,44
 39,4,138
 39,7,44
-39,8,100
 40,1,40
 40,2,40
 40,3,45
 40,4,139
 40,7,45
-40,8,101
 41,1,41
 41,2,41
 41,3,37
@@ -222,7 +182,6 @@ pokemon_id,pokedex_id,pokedex_number
 41,5,28
 41,6,28
 41,7,37
-41,8,107
 42,1,42
 42,2,42
 42,3,38
@@ -230,65 +189,53 @@ pokemon_id,pokedex_id,pokedex_number
 42,5,29
 42,6,29
 42,7,38
-42,8,130
 43,1,43
 43,2,43
 43,3,83
 43,4,88
 43,7,83
-43,8,185
 44,1,44
 44,2,44
 44,3,84
 44,4,89
 44,7,84
-44,8,186
 45,1,45
 45,2,45
 45,3,85
 45,4,90
 45,7,85
-45,8,187
 46,1,46
 46,2,46
 46,3,70
 46,7,70
-46,8,109
 47,1,47
 47,2,47
 47,3,71
 47,7,71
-47,8,46
 48,1,48
 48,2,48
 48,3,108
 48,7,109
-48,8,65
 49,1,49
 49,2,49
 49,3,109
 49,7,110
-49,8,119
 50,1,50
 50,2,50
 50,3,132
 50,7,134
-50,8,59
 51,1,51
 51,2,51
 51,3,133
 51,7,135
-51,8,118
 52,1,52
 52,2,52
 52,3,136
 52,7,138
-52,8,77
 53,1,53
 53,2,53
 53,3,137
 53,7,139
-53,8,144
 54,1,54
 54,2,54
 54,3,138
@@ -296,7 +243,6 @@ pokemon_id,pokedex_id,pokedex_number
 54,5,43
 54,6,43
 54,7,140
-54,8,47
 55,1,55
 55,2,55
 55,3,139
@@ -304,42 +250,34 @@ pokemon_id,pokedex_id,pokedex_number
 55,5,44
 55,6,44
 55,7,141
-55,8,128
 56,1,56
 56,2,56
 56,3,134
 56,7,136
-56,8,57
 57,1,57
 57,2,57
 57,3,135
 57,7,137
-57,8,117
 58,1,58
 58,2,58
 58,3,127
 58,7,129
-58,8,33
 59,1,59
 59,2,59
 59,3,128
 59,7,130
-59,8,20
 60,1,60
 60,2,60
 60,3,72
 60,7,72
-60,8,71
 61,1,61
 61,2,61
 61,3,73
 61,7,73
-61,8,110
 62,1,62
 62,2,62
 62,3,74
 62,7,74
-62,8,111
 63,1,63
 63,2,63
 63,3,89
@@ -347,7 +285,6 @@ pokemon_id,pokedex_id,pokedex_number
 63,5,20
 63,6,20
 63,7,89
-63,8,148
 64,1,64
 64,2,64
 64,3,90
@@ -355,7 +292,6 @@ pokemon_id,pokedex_id,pokedex_number
 64,5,21
 64,6,21
 64,7,90
-64,8,38
 65,1,65
 65,2,65
 65,3,91
@@ -363,7 +299,6 @@ pokemon_id,pokedex_id,pokedex_number
 65,5,22
 65,6,22
 65,7,91
-65,8,149
 66,1,66
 66,2,66
 66,3,140
@@ -371,7 +306,6 @@ pokemon_id,pokedex_id,pokedex_number
 66,5,40
 66,6,40
 66,7,142
-66,8,106
 67,1,67
 67,2,67
 67,3,141
@@ -379,7 +313,6 @@ pokemon_id,pokedex_id,pokedex_number
 67,5,41
 67,6,41
 67,7,143
-67,8,41
 68,1,68
 68,2,68
 68,3,142
@@ -387,22 +320,18 @@ pokemon_id,pokedex_id,pokedex_number
 68,5,42
 68,6,42
 68,7,144
-68,8,126
 69,1,69
 69,2,69
 69,3,64
 69,7,64
-69,8,188
 70,1,70
 70,2,70
 70,3,65
 70,7,65
-70,8,189
 71,1,71
 71,2,71
 71,3,66
 71,7,66
-71,8,190
 72,1,72
 72,2,72
 72,3,162
@@ -410,7 +339,6 @@ pokemon_id,pokedex_id,pokedex_number
 72,5,136
 72,6,136
 72,7,164
-72,8,24
 73,1,73
 73,2,73
 73,3,163
@@ -418,7 +346,6 @@ pokemon_id,pokedex_id,pokedex_number
 73,5,137
 73,6,137
 73,7,165
-73,8,155
 74,1,74
 74,2,74
 74,3,34
@@ -426,7 +353,6 @@ pokemon_id,pokedex_id,pokedex_number
 74,5,31
 74,6,31
 74,7,34
-74,8,169
 75,1,75
 75,2,75
 75,3,35
@@ -434,7 +360,6 @@ pokemon_id,pokedex_id,pokedex_number
 75,5,32
 75,6,32
 75,7,35
-75,8,39
 76,1,76
 76,2,76
 76,3,36
@@ -442,246 +367,204 @@ pokemon_id,pokedex_id,pokedex_number
 76,5,33
 76,6,33
 76,7,36
-76,8,49
 77,1,77
 77,2,77
 77,3,201
 77,5,90
 77,6,90
 77,7,206
-77,8,163
 78,1,78
 78,2,78
 78,3,202
 78,5,91
 78,6,91
 78,7,207
-78,8,164
 79,1,79
 79,2,79
 79,3,80
 79,7,80
-79,8,37
 80,1,80
 80,2,80
 80,3,81
 80,7,81
-80,8,8
 81,1,81
 81,2,81
 81,3,118
 81,4,82
 81,6,178
 81,7,119
-81,8,173
 82,1,82
 82,2,82
 82,3,119
 82,4,83
 82,6,179
 82,7,120
-82,8,54
 83,1,83
 83,2,83
 83,3,158
 83,7,160
-83,8,64
 84,1,84
 84,2,84
 84,3,199
 84,4,92
 84,7,204
-84,8,70
 85,1,85
 85,2,85
 85,3,200
 85,4,93
 85,7,205
-85,8,116
 86,1,86
 86,2,86
 86,3,176
 86,7,178
-86,8,58
 87,1,87
 87,2,87
 87,3,177
 87,7,179
-87,8,120
 88,1,88
 88,2,88
 88,3,116
 88,4,106
 88,7,117
-88,8,13
 89,1,89
 89,2,89
 89,3,117
 89,4,107
 89,7,118
-89,8,136
 90,1,90
 90,2,90
 90,3,169
 90,7,171
-90,8,23
 91,1,91
 91,2,91
 91,3,170
 91,7,172
-91,8,139
 92,1,92
 92,2,92
 92,3,58
 92,5,69
 92,6,69
 92,7,58
-92,8,25
 93,1,93
 93,2,93
 93,3,59
 93,5,70
 93,6,70
 93,7,59
-93,8,147
 94,1,94
 94,2,94
 94,3,60
 94,5,71
 94,6,71
 94,7,60
-94,8,14
 95,1,95
 95,2,95
 95,3,62
 95,5,34
 95,6,34
 95,7,62
-95,8,34
 96,1,96
 96,2,96
 96,3,87
 96,7,87
-96,8,48
 97,1,97
 97,2,97
 97,3,88
 97,7,88
-97,8,129
 98,1,98
 98,2,98
 98,3,164
 98,7,166
-98,8,78
 99,1,99
 99,2,99
 99,3,165
 99,7,167
-99,8,138
 100,1,100
 100,2,100
 100,3,120
 100,4,84
 100,7,121
-100,8,6
 101,1,101
 101,2,101
 101,3,121
 101,4,85
 101,7,122
-101,8,141
 102,1,102
 102,2,102
 102,3,104
 102,7,105
-102,8,12
 103,1,103
 103,2,103
 103,3,105
 103,7,106
-103,8,10
 104,1,104
 104,2,104
 104,3,203
 104,7,208
-104,8,17
 105,1,105
 105,2,105
 105,3,204
 105,7,209
-105,8,145
 106,1,106
 106,2,106
 106,3,144
 106,7,146
-106,8,43
 107,1,107
 107,2,107
 107,3,145
 107,7,147
-107,8,44
 108,1,108
 108,2,108
 108,3,178
 108,6,161
 108,7,180
-108,8,11
 109,1,109
 109,2,109
 109,3,114
 109,4,108
 109,7,115
-109,8,55
 110,1,110
 110,2,110
 110,3,115
 110,4,109
 110,7,116
-110,8,143
 111,1,111
 111,2,111
 111,3,206
 111,4,169
 111,6,186
 111,7,211
-111,8,18
 112,1,112
 112,2,112
 112,3,207
 112,4,170
 112,6,187
 112,7,212
-112,8,1
 113,1,113
 113,2,113
 113,3,217
 113,5,97
 113,6,97
 113,7,222
-113,8,40
 114,1,114
 114,2,114
 114,3,179
 114,6,181
 114,7,182
-114,8,30
 115,1,115
 115,2,115
 115,3,205
 115,7,210
-115,8,2
 116,1,116
 116,2,116
 116,3,186
 116,4,184
 116,7,190
-116,8,92
 117,1,117
 117,2,117
 117,3,187
 117,4,185
 117,7,191
-117,8,93
 118,1,118
 118,2,118
 118,3,78
@@ -689,7 +572,6 @@ pokemon_id,pokedex_id,pokedex_number
 118,5,78
 118,6,78
 118,7,78
-118,8,157
 119,1,119
 119,2,119
 119,3,79
@@ -697,60 +579,50 @@ pokemon_id,pokedex_id,pokedex_number
 119,5,79
 119,6,79
 119,7,79
-119,8,158
 120,1,120
 120,2,120
 120,3,167
 120,4,143
 120,7,169
-120,8,27
 121,1,121
 121,2,121
 121,3,168
 121,4,144
 121,7,170
-121,8,152
 122,1,122
 122,2,122
 122,3,156
 122,5,95
 122,6,95
 122,7,158
-122,8,42
 123,1,123
 123,2,123
 123,3,110
 123,6,195
 123,7,111
-123,8,26
 124,1,124
 124,2,124
 124,3,153
 124,7,155
-124,8,72
 125,1,125
 125,2,125
 125,3,155
 125,6,198
 125,7,157
-125,8,53
 126,1,126
 126,2,126
 126,3,151
 126,6,201
 126,7,153
-126,8,51
 127,1,127
 127,2,127
 127,3,112
 127,4,167
 127,7,113
-127,8,29
 128,1,128
 128,2,128
 128,3,148
 128,7,150
-128,8,60
 129,1,129
 129,2,129
 129,3,76
@@ -758,7 +630,6 @@ pokemon_id,pokedex_id,pokedex_number
 129,5,23
 129,6,23
 129,7,76
-129,8,133
 130,1,130
 130,2,130
 130,3,77
@@ -766,119 +637,97 @@ pokemon_id,pokedex_id,pokedex_number
 130,5,24
 130,6,24
 130,7,77
-130,8,22
 131,1,131
 131,2,131
 131,3,219
 131,7,224
-131,8,19
 132,1,132
 132,2,132
 132,3,92
 132,7,92
-132,8,76
 133,1,133
 133,2,133
 133,3,180
 133,6,163
 133,7,184
-133,8,102
 134,1,134
 134,2,134
 134,3,181
 134,6,164
 134,7,185
-134,8,105
 135,1,135
 135,2,135
 135,3,182
 135,6,165
 135,7,186
-135,8,104
 136,1,136
 136,2,136
 136,3,183
 136,6,166
 136,7,187
-136,8,103
 137,1,137
 137,2,137
 137,3,215
 137,6,192
 137,7,220
-137,8,170
 138,1,138
 138,2,138
 138,3,220
 138,7,225
-138,8,98
 139,1,139
 139,2,139
 139,3,221
 139,7,226
-139,8,99
 140,1,140
 140,2,140
 140,3,222
 140,7,227
-140,8,90
 141,1,141
 141,2,141
 141,3,223
 141,7,228
-141,8,91
 142,1,142
 142,2,142
 142,3,224
 142,7,229
-142,8,171
 143,1,143
 143,2,143
 143,3,225
 143,5,113
 143,6,113
 143,7,230
-143,8,132
 144,1,144
 144,2,144
 144,3,235
 144,7,240
-144,8,74
 145,1,145
 145,2,145
 145,3,236
 145,7,241
-145,8,75
 146,1,146
 146,2,146
 146,3,237
 146,7,242
-146,8,73
 147,1,147
 147,2,147
 147,3,241
 147,7,246
-147,8,88
 148,1,148
 148,2,148
 148,3,242
 148,7,247
-148,8,89
 149,1,149
 149,2,149
 149,3,243
 149,7,248
-149,8,66
 150,1,150
 150,2,150
 150,3,249
 150,7,254
-150,8,131
 151,1,151
 151,2,151
 151,3,250
 151,7,255
-151,8,21
 152,1,152
 152,3,1
 152,7,1

pokedex/db/tables.py

@@ -578,6 +578,12 @@ class PokemonHabitat(TableBase):
     id = Column(Integer, primary_key=True, nullable=False, autoincrement=False)
     name = Column(Unicode(16), nullable=False)
 
+class PokemonInternalID(TableBase):
+    __tablename__ = 'pokemon_internal_ids'
+    pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, autoincrement=False, nullable=False)
+    generation_id = Column(Integer, ForeignKey('generations.id'), primary_key=True, autoincrement=False, nullable=False)
+    internal_id = Column(Integer, nullable=False)
+
 class PokemonItem(TableBase):
     __tablename__ = 'pokemon_items'
     pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False, autoincrement=False)