Added Pokédexes to replace dex numbers' generations.

This deals with Gen IV having two Sinnoh dexes and a Johto dex.

diff --git a/pokedex/data/csv/pokedex_version_groups.csv b/pokedex/data/csv/pokedex_version_groups.csv
new file mode 100644 (file)
index 0000000..87a911c
--- /dev/null
+++ b/pokedex/data/csv/pokedex_version_groups.csv
@@ -0,0 +1,13 @@
+pokedex_id,version_group_id
+2,1
+2,2
+2,7
+3,3
+3,4
+4,5
+4,6
+5,8
+6,9
+7,10
+8,1
+8,2

diff --git a/pokedex/data/csv/pokedexes.csv b/pokedex/data/csv/pokedexes.csv
new file mode 100644 (file)
index 0000000..ee4d18a
--- /dev/null
+++ b/pokedex/data/csv/pokedexes.csv
@@ -0,0 +1,9 @@
+id,name,description
+1,National,
+2,Kanto,
+3,New,Gold/Silver/Crystal Johto dex
+4,Hoenn,
+5,Sinnoh,Diamond/Pearl Sinnoh dex
+6,Sinnoh,Platinum Sinnoh dex: extended version of Diamond and Pearl's
+7,Johto,"Heart Gold/Soul Silver Johto dex: Gold, Silver, and Crystal's Johto dex with five added Generation-IV evolutions of Generation-I and Generation-II Pokémon"
+8,Internal ID,IDs used internally in Generation I

diff --git a/pokedex/data/csv/pokemon_dex_numbers.csv b/pokedex/data/csv/pokemon_dex_numbers.csv
index e75bc03..c95b1f5 100644 (file)
--- a/pokedex/data/csv/pokemon_dex_numbers.csv
+++ b/pokedex/data/csv/pokemon_dex_numbers.csv
@@ -1,1162 +1,1859 @@
-pokemon_id,generation_id,pokedex_number
+pokemon_id,pokedex_id,pokedex_number
 1,1,1
-1,2,226
+1,2,1
+1,3,226
+1,7,231
+1,8,153
 2,1,2
-2,2,227
+2,2,2
+2,3,227
+2,7,232
+2,8,9
 3,1,3
-3,2,228
+3,2,3
+3,3,228
+3,7,233
+3,8,154
 4,1,4
-4,2,229
+4,2,4
+4,3,229
+4,7,234
+4,8,176
 5,1,5
-5,2,230
+5,2,5
+5,3,230
+5,7,235
+5,8,178
 6,1,6
-6,2,231
+6,2,6
+6,3,231
+6,7,236
+6,8,180
 7,1,7
-7,2,232
+7,2,7
+7,3,232
+7,7,237
+7,8,177
 8,1,8
-8,2,233
+8,2,8
+8,3,233
+8,7,238
+8,8,179
 9,1,9
-9,2,234
+9,2,9
+9,3,234
+9,7,239
+9,8,28
 10,1,10
-10,2,24
+10,2,10
+10,3,24
+10,7,24
+10,8,123
 11,1,11
-11,2,25
+11,2,11
+11,3,25
+11,7,25
+11,8,124
 12,1,12
-12,2,26
+12,2,12
+12,3,26
+12,7,26
+12,8,125
 13,1,13
-13,2,27
+13,2,13
+13,3,27
+13,7,27
+13,8,112
 14,1,14
-14,2,28
+14,2,14
+14,3,28
+14,7,28
+14,8,113
 15,1,15
-15,2,29
+15,2,15
+15,3,29
+15,7,29
+15,8,114
 16,1,16
-16,2,10
+16,2,16
+16,3,10
+16,7,10
+16,8,36
 17,1,17
-17,2,11
+17,2,17
+17,3,11
+17,7,11
+17,8,150
 18,1,18
-18,2,12
+18,2,18
+18,3,12
+18,7,12
+18,8,151
 19,1,19
-19,2,17
+19,2,19
+19,3,17
+19,7,17
+19,8,165
 20,1,20
-20,2,18
+20,2,20
+20,3,18
+20,7,18
+20,8,166
 21,1,21
-21,2,13
+21,2,21
+21,3,13
+21,7,13
+21,8,5
 22,1,22
-22,2,14
+22,2,22
+22,3,14
+22,7,14
+22,8,35
 23,1,23
-23,2,50
+23,2,23
+23,3,50
+23,7,50
+23,8,108
 24,1,24
-24,2,51
+24,2,24
+24,3,51
+24,7,51
+24,8,45
 25,1,25
-25,2,22
-25,3,156
-25,4,104
+25,2,25
+25,3,22
+25,4,156
+25,5,104
+25,6,104
+25,7,22
 26,1,26
-26,2,23
-26,3,157
-26,4,105
+26,2,26
+26,3,23
+26,4,157
+26,5,105
+26,6,105
+26,7,23
 27,1,27
-27,2,48
-27,3,112
+27,2,27
+27,3,48
+27,4,112
+27,7,48
+27,8,96
 28,1,28
-28,2,49
-28,3,113
+28,2,28
+28,3,49
+28,4,113
+28,7,49
+28,8,97
 29,1,29
-29,2,95
+29,2,29
+29,3,95
+29,7,95
+29,8,15
 30,1,30
-30,2,96
+30,2,30
+30,3,96
+30,7,96
+30,8,168
 31,1,31
-31,2,97
+31,2,31
+31,3,97
+31,7,97
+31,8,16
 32,1,32
-32,2,98
+32,2,32
+32,3,98
+32,7,98
+32,8,3
 33,1,33
-33,2,99
+33,2,33
+33,3,99
+33,7,99
+33,8,167
 34,1,34
-34,2,100
+34,2,34
+34,3,100
+34,7,100
+34,8,7
 35,1,35
-35,2,41
-35,4,100
+35,2,35
+35,3,41
+35,5,100
+35,6,100
+35,7,41
 36,1,36
-36,2,42
-36,4,101
+36,2,36
+36,3,42
+36,5,101
+36,6,101
+36,7,42
 37,1,37
-37,2,125
-37,3,153
+37,2,37
+37,3,125
+37,4,153
+37,7,127
+37,8,82
 38,1,38
-38,2,126
-38,3,154
+38,2,38
+38,3,126
+38,4,154
+38,7,128
+38,8,83
 39,1,39
-39,2,44
-39,3,138
+39,2,39
+39,3,44
+39,4,138
+39,7,44
 40,1,40
-40,2,45
-40,3,139
+40,2,40
+40,3,45
+40,4,139
+40,7,45
 41,1,41
-41,2,37
-41,3,63
-41,4,28
+41,2,41
+41,3,37
+41,4,63
+41,5,28
+41,6,28
+41,7,37
+41,8,107
 42,1,42
-42,2,38
-42,3,64
-42,4,29
+42,2,42
+42,3,38
+42,4,64
+42,5,29
+42,6,29
+42,7,38
+42,8,130
 43,1,43
-43,2,83
-43,3,88
+43,2,43
+43,3,83
+43,4,88
+43,7,83
+43,8,185
 44,1,44
-44,2,84
-44,3,89
+44,2,44
+44,3,84
+44,4,89
+44,7,84
+44,8,186
 45,1,45
-45,2,85
-45,3,90
+45,2,45
+45,3,85
+45,4,90
+45,7,85
+45,8,187
 46,1,46
-46,2,70
+46,2,46
+46,3,70
+46,7,70
+46,8,109
 47,1,47
-47,2,71
+47,2,47
+47,3,71
+47,7,71
+47,8,46
 48,1,48
-48,2,108
+48,2,48
+48,3,108
+48,7,109
+48,8,65
 49,1,49
-49,2,109
+49,2,49
+49,3,109
+49,7,110
+49,8,119
 50,1,50
-50,2,132
+50,2,50
+50,3,132
+50,7,134
+50,8,59
 51,1,51
-51,2,133
+51,2,51
+51,3,133
+51,7,135
+51,8,118
 52,1,52
-52,2,136
+52,2,52
+52,3,136
+52,7,138
+52,8,77
 53,1,53
-53,2,137
+53,2,53
+53,3,137
+53,7,139
+53,8,144
 54,1,54
-54,2,138
-54,3,158
-54,4,43
+54,2,54
+54,3,138
+54,4,158
+54,5,43
+54,6,43
+54,7,140
+54,8,47
 55,1,55
-55,2,139
-55,3,159
-55,4,44
+55,2,55
+55,3,139
+55,4,159
+55,5,44
+55,6,44
+55,7,141
+55,8,128
 56,1,56
-56,2,134
+56,2,56
+56,3,134
+56,7,136
+56,8,57
 57,1,57
-57,2,135
+57,2,57
+57,3,135
+57,7,137
+57,8,117
 58,1,58
-58,2,127
+58,2,58
+58,3,127
+58,7,129
+58,8,33
 59,1,59
-59,2,128
+59,2,59
+59,3,128
+59,7,130
+59,8,20
 60,1,60
-60,2,72
+60,2,60
+60,3,72
+60,7,72
+60,8,71
 61,1,61
-61,2,73
+61,2,61
+61,3,73
+61,7,73
+61,8,110
 62,1,62
-62,2,74
+62,2,62
+62,3,74
+62,7,74
+62,8,111
 63,1,63
-63,2,89
-63,3,39
-63,4,20
+63,2,63
+63,3,89
+63,4,39
+63,5,20
+63,6,20
+63,7,89
+63,8,148
 64,1,64
-64,2,90
-64,3,40
-64,4,21
+64,2,64
+64,3,90
+64,4,40
+64,5,21
+64,6,21
+64,7,90
+64,8,38
 65,1,65
-65,2,91
-65,3,41
-65,4,22
+65,2,65
+65,3,91
+65,4,41
+65,5,22
+65,6,22
+65,7,91
+65,8,149
 66,1,66
-66,2,140
-66,3,73
-66,4,40
+66,2,66
+66,3,140
+66,4,73
+66,5,40
+66,6,40
+66,7,142
+66,8,106
 67,1,67
-67,2,141
-67,3,74
-67,4,41
+67,2,67
+67,3,141
+67,4,74
+67,5,41
+67,6,41
+67,7,143
+67,8,41
 68,1,68
-68,2,142
-68,3,75
-68,4,42
+68,2,68
+68,3,142
+68,4,75
+68,5,42
+68,6,42
+68,7,144
+68,8,126
 69,1,69
-69,2,64
+69,2,69
+69,3,64
+69,7,64
+69,8,188
 70,1,70
-70,2,65
+70,2,70
+70,3,65
+70,7,65
+70,8,189
 71,1,71
-71,2,66
+71,2,71
+71,3,66
+71,7,66
+71,8,190
 72,1,72
-72,2,162
-72,3,66
-72,4,136
+72,2,72
+72,3,162
+72,4,66
+72,5,136
+72,6,136
+72,7,164
+72,8,24
 73,1,73
-73,2,163
-73,3,67
-73,4,137
+73,2,73
+73,3,163
+73,4,67
+73,5,137
+73,6,137
+73,7,165
+73,8,155
 74,1,74
-74,2,34
-74,3,57
-74,4,31
+74,2,74
+74,3,34
+74,4,57
+74,5,31
+74,6,31
+74,7,34
+74,8,169
 75,1,75
-75,2,35
-75,3,58
-75,4,32
+75,2,75
+75,3,35
+75,4,58
+75,5,32
+75,6,32
+75,7,35
+75,8,39
 76,1,76
-76,2,36
-76,3,59
-76,4,33
+76,2,76
+76,3,36
+76,4,59
+76,5,33
+76,6,33
+76,7,36
+76,8,49
 77,1,77
-77,2,201
-77,4,90
+77,2,77
+77,3,201
+77,5,90
+77,6,90
+77,7,206
+77,8,163
 78,1,78
-78,2,202
-78,4,91
+78,2,78
+78,3,202
+78,5,91
+78,6,91
+78,7,207
+78,8,164
 79,1,79
-79,2,80
+79,2,79
+79,3,80
+79,7,80
+79,8,37
 80,1,80
-80,2,81
+80,2,80
+80,3,81
+80,7,81
+80,8,8
 81,1,81
-81,2,118
-81,3,82
-81,4,178
+81,2,81
+81,3,118
+81,4,82
+81,6,178
+81,7,119
+81,8,173
 82,1,82
-82,2,119
-82,3,83
-82,4,179
+82,2,82
+82,3,119
+82,4,83
+82,6,179
+82,7,120
+82,8,54
 83,1,83
-83,2,158
+83,2,83
+83,3,158
+83,7,160
+83,8,64
 84,1,84
-84,2,199
-84,3,92
+84,2,84
+84,3,199
+84,4,92
+84,7,204
+84,8,70
 85,1,85
-85,2,200
-85,3,93
+85,2,85
+85,3,200
+85,4,93
+85,7,205
+85,8,116
 86,1,86
-86,2,176
+86,2,86
+86,3,176
+86,7,178
+86,8,58
 87,1,87
-87,2,177
+87,2,87
+87,3,177
+87,7,179
+87,8,120
 88,1,88
-88,2,116
-88,3,106
+88,2,88
+88,3,116
+88,4,106
+88,7,117
+88,8,13
 89,1,89
-89,2,117
-89,3,107
+89,2,89
+89,3,117
+89,4,107
+89,7,118
+89,8,136
 90,1,90
-90,2,169
+90,2,90
+90,3,169
+90,7,171
+90,8,23
 91,1,91
-91,2,170
+91,2,91
+91,3,170
+91,7,172
+91,8,139
 92,1,92
-92,2,58
-92,4,69
+92,2,92
+92,3,58
+92,5,69
+92,6,69
+92,7,58
+92,8,25
 93,1,93
-93,2,59
-93,4,70
+93,2,93
+93,3,59
+93,5,70
+93,6,70
+93,7,59
+93,8,147
 94,1,94
-94,2,60
-94,4,71
+94,2,94
+94,3,60
+94,5,71
+94,6,71
+94,7,60
+94,8,14
 95,1,95
-95,2,62
-95,4,34
+95,2,95
+95,3,62
+95,5,34
+95,6,34
+95,7,62
+95,8,34
 96,1,96
-96,2,87
+96,2,96
+96,3,87
+96,7,87
+96,8,48
 97,1,97
-97,2,88
+97,2,97
+97,3,88
+97,7,88
+97,8,129
 98,1,98
-98,2,164
+98,2,98
+98,3,164
+98,7,166
+98,8,78
 99,1,99
-99,2,165
+99,2,99
+99,3,165
+99,7,167
+99,8,138
 100,1,100
-100,2,120
-100,3,84
+100,2,100
+100,3,120
+100,4,84
+100,7,121
+100,8,6
 101,1,101
-101,2,121
-101,3,85
+101,2,101
+101,3,121
+101,4,85
+101,7,122
+101,8,141
 102,1,102
-102,2,104
+102,2,102
+102,3,104
+102,7,105
+102,8,12
 103,1,103
-103,2,105
+103,2,103
+103,3,105
+103,7,106
+103,8,10
 104,1,104
-104,2,203
+104,2,104
+104,3,203
+104,7,208
+104,8,17
 105,1,105
-105,2,204
+105,2,105
+105,3,204
+105,7,209
+105,8,145
 106,1,106
-106,2,144
+106,2,106
+106,3,144
+106,7,146
 107,1,107
-107,2,145
+107,2,107
+107,3,145
+107,7,147
 108,1,108
-108,2,178
-108,4,161
+108,2,108
+108,3,178
+108,6,161
+108,7,180
+108,8,11
 109,1,109
-109,2,114
-109,3,108
+109,2,109
+109,3,114
+109,4,108
+109,7,115
+109,8,55
 110,1,110
-110,2,115
-110,3,109
+110,2,110
+110,3,115
+110,4,109
+110,7,116
+110,8,143
 111,1,111
-111,2,206
-111,3,169
-111,4,186
+111,2,111
+111,3,206
+111,4,169
+111,6,186
+111,7,211
+111,8,18
 112,1,112
-112,2,207
-112,3,170
-112,4,187
+112,2,112
+112,3,207
+112,4,170
+112,6,187
+112,7,212
+112,8,1
 113,1,113
-113,2,217
-113,4,97
+113,2,113
+113,3,217
+113,5,97
+113,6,97
+113,7,222
 114,1,114
-114,2,179
-114,4,181
+114,2,114
+114,3,179
+114,6,181
+114,7,182
+114,8,30
 115,1,115
-115,2,205
+115,2,115
+115,3,205
+115,7,210
+115,8,2
 116,1,116
-116,2,186
-116,3,184
+116,2,116
+116,3,186
+116,4,184
+116,7,190
+116,8,92
 117,1,117
-117,2,187
-117,3,185
+117,2,117
+117,3,187
+117,4,185
+117,7,191
+117,8,93
 118,1,118
-118,2,78
-118,3,50
-118,4,78
+118,2,118
+118,3,78
+118,4,50
+118,5,78
+118,6,78
+118,7,78
+118,8,157
 119,1,119
-119,2,79
-119,3,51
-119,4,79
+119,2,119
+119,3,79
+119,4,51
+119,5,79
+119,6,79
+119,7,79
+119,8,158
 120,1,120
-120,2,167
-120,3,143
+120,2,120
+120,3,167
+120,4,143
+120,7,169
+120,8,27
 121,1,121
-121,2,168
-121,3,144
+121,2,121
+121,3,168
+121,4,144
+121,7,170
+121,8,152
 122,1,122
-122,2,156
-122,4,95
+122,2,122
+122,3,156
+122,5,95
+122,6,95
+122,7,158
 123,1,123
-123,2,110
-123,4,195
+123,2,123
+123,3,110
+123,6,195
+123,7,111
+123,8,26
 124,1,124
-124,2,153
+124,2,124
+124,3,153
+124,7,155
 125,1,125
-125,2,155
-125,4,198
+125,2,125
+125,3,155
+125,6,198
+125,7,157
 126,1,126
-126,2,151
-126,4,201
+126,2,126
+126,3,151
+126,6,201
+126,7,153
 127,1,127
-127,2,112
-127,3,167
+127,2,127
+127,3,112
+127,4,167
+127,7,113
+127,8,29
 128,1,128
-128,2,148
+128,2,128
+128,3,148
+128,7,150
+128,8,60
 129,1,129
-129,2,76
-129,3,52
-129,4,23
+129,2,129
+129,3,76
+129,4,52
+129,5,23
+129,6,23
+129,7,76
+129,8,133
 130,1,130
-130,2,77
-130,3,53
-130,4,24
+130,2,130
+130,3,77
+130,4,53
+130,5,24
+130,6,24
+130,7,77
+130,8,22
 131,1,131
-131,2,219
+131,2,131
+131,3,219
+131,7,224
+131,8,19
 132,1,132
-132,2,92
+132,2,132
+132,3,92
+132,7,92
+132,8,76
 133,1,133
-133,2,180
-133,4,163
+133,2,133
+133,3,180
+133,6,163
+133,7,184
+133,8,102
 134,1,134
-134,2,181
-134,4,164
+134,2,134
+134,3,181
+134,6,164
+134,7,185
+134,8,105
 135,1,135
-135,2,182
-135,4,165
+135,2,135
+135,3,182
+135,6,165
+135,7,186
+135,8,104
 136,1,136
-136,2,183
-136,4,166
+136,2,136
+136,3,183
+136,6,166
+136,7,187
+136,8,103
 137,1,137
-137,2,215
-137,4,192
+137,2,137
+137,3,215
+137,6,192
+137,7,220
+137,8,170
 138,1,138
-138,2,220
+138,2,138
+138,3,220
+138,7,225
+138,8,98
 139,1,139
-139,2,221
+139,2,139
+139,3,221
+139,7,226
+139,8,99
 140,1,140
-140,2,222
+140,2,140
+140,3,222
+140,7,227
+140,8,90
 141,1,141
-141,2,223
+141,2,141
+141,3,223
+141,7,228
+141,8,91
 142,1,142
-142,2,224
+142,2,142
+142,3,224
+142,7,229
+142,8,171
 143,1,143
-143,2,225
-143,4,113
+143,2,143
+143,3,225
+143,5,113
+143,6,113
+143,7,230
 144,1,144
-144,2,235
+144,2,144
+144,3,235
+144,7,240
+144,8,74
 145,1,145
-145,2,236
+145,2,145
+145,3,236
+145,7,241
+145,8,75
 146,1,146
-146,2,237
+146,2,146
+146,3,237
+146,7,242
+146,8,73
 147,1,147
-147,2,241
+147,2,147
+147,3,241
+147,7,246
+147,8,88
 148,1,148
-148,2,242
+148,2,148
+148,3,242
+148,7,247
+148,8,89
 149,1,149
-149,2,243
+149,2,149
+149,3,243
+149,7,248
+149,8,66
 150,1,150
-150,2,249
+150,2,150
+150,3,249
+150,7,254
+150,8,131
 151,1,151
-151,2,250
+151,2,151
+151,3,250
+151,7,255
+151,8,21
 152,1,152
-152,2,1
+152,3,1
+152,7,1
 153,1,153
-153,2,2
+153,3,2
+153,7,2
 154,1,154
-154,2,3
+154,3,3
+154,7,3
 155,1,155
-155,2,4
+155,3,4
+155,7,4
 156,1,156
-156,2,5
+156,3,5
+156,7,5
 157,1,157
-157,2,6
+157,3,6
+157,7,6
 158,1,158
-158,2,7
+158,3,7
+158,7,7
 159,1,159
-159,2,8
+159,3,8
+159,7,8
 160,1,160
-160,2,9
+160,3,9
+160,7,9
 161,1,161
-161,2,19
+161,3,19
+161,7,19
 162,1,162
-162,2,20
+162,3,20
+162,7,20
 163,1,163
-163,2,15
-163,4,106
+163,3,15
+163,5,106
+163,6,106
+163,7,15
 164,1,164
-164,2,16
-164,4,107
+164,3,16
+164,5,107
+164,6,107
+164,7,16
 165,1,165
-165,2,30
+165,3,30
+165,7,30
 166,1,166
-166,2,31
+166,3,31
+166,7,31
 167,1,167
-167,2,32
+167,3,32
+167,7,32
 168,1,168
-168,2,33
+168,3,33
+168,7,33
 169,1,169
-169,2,39
-169,3,65
-169,4,30
+169,3,39
+169,4,65
+169,5,30
+169,6,30
+169,7,39
 170,1,170
-170,2,174
-170,3,181
+170,3,174
+170,4,181
+170,7,176
 171,1,171
-171,2,175
-171,3,182
+171,3,175
+171,4,182
+171,7,177
 172,1,172
-172,2,21
-172,3,155
-172,4,103
+172,3,21
+172,4,155
+172,5,103
+172,6,103
+172,7,21
 173,1,173
-173,2,40
-173,4,99
+173,3,40
+173,5,99
+173,6,99
+173,7,40
 174,1,174
-174,2,43
-174,3,137
+174,3,43
+174,4,137
+174,7,43
 175,1,175
-175,2,46
-175,4,173
+175,3,46
+175,6,173
+175,7,46
 176,1,176
-176,2,47
-176,4,174
+176,3,47
+176,6,174
+176,7,47
 177,1,177
-177,2,159
-177,3,162
+177,3,159
+177,4,162
+177,7,161
 178,1,178
-178,2,160
-178,3,163
+178,3,160
+178,4,163
+178,7,162
 179,1,179
-179,2,53
+179,3,53
+179,7,53
 180,1,180
-180,2,54
+180,3,54
+180,7,54
 181,1,181
-181,2,55
+181,3,55
+181,7,55
 182,1,182
-182,2,86
-182,3,91
+182,3,86
+182,4,91
+182,7,86
 183,1,183
-183,2,130
-183,3,55
-183,4,125
+183,3,130
+183,4,55
+183,5,125
+183,6,125
+183,7,132
 184,1,184
-184,2,131
-184,3,56
-184,4,126
+184,3,131
+184,4,56
+184,5,126
+184,6,126
+184,7,133
 185,1,185
-185,2,106
-185,4,93
+185,3,106
+185,5,93
+185,6,93
+185,7,107
 186,1,186
-186,2,75
+186,3,75
+186,7,75
 187,1,187
-187,2,67
+187,3,67
+187,7,67
 188,1,188
-188,2,68
+188,3,68
+188,7,68
 189,1,189
-189,2,69
+189,3,69
+189,7,69
 190,1,190
-190,2,122
-190,4,63
+190,3,122
+190,5,63
+190,6,63
+190,7,123
 191,1,191
-191,2,102
+191,3,102
+191,7,103
 192,1,192
-192,2,103
+192,3,103
+192,7,104
 193,1,193
-193,2,101
-193,4,183
+193,3,101
+193,6,183
+193,7,101
 194,1,194
-194,2,56
-194,4,117
+194,3,56
+194,5,117
+194,6,117
+194,7,56
 195,1,195
-195,2,57
-195,4,118
+195,3,57
+195,5,118
+195,6,118
+195,7,57
 196,1,196
-196,2,184
-196,4,167
+196,3,184
+196,6,167
+196,7,188
 197,1,197
-197,2,185
-197,4,168
+197,3,185
+197,6,168
+197,7,189
 198,1,198
-198,2,208
-198,4,74
+198,3,208
+198,5,74
+198,6,74
+198,7,213
 199,1,199
-199,2,82
+199,3,82
+199,7,82
 200,1,200
-200,2,214
-200,4,72
+200,3,214
+200,5,72
+200,6,72
+200,7,219
 201,1,201
-201,2,61
-201,4,114
+201,3,61
+201,5,114
+201,6,114
+201,7,61
 202,1,202
-202,2,107
-202,3,161
+202,3,107
+202,4,161
+202,7,108
 203,1,203
-203,2,147
-203,3,164
-203,4,121
+203,3,147
+203,4,164
+203,5,121
+203,6,121
+203,7,149
 204,1,204
-204,2,93
+204,3,93
+204,7,93
 205,1,205
-205,2,94
+205,3,94
+205,7,94
 206,1,206
-206,2,52
+206,3,52
+206,7,52
 207,1,207
-207,2,189
-207,4,153
+207,3,189
+207,6,153
+207,7,193
 208,1,208
-208,2,63
-208,4,35
+208,3,63
+208,5,35
+208,6,35
+208,7,63
 209,1,209
-209,2,123
+209,3,123
+209,7,125
 210,1,210
-210,2,124
+210,3,124
+210,7,126
 211,1,211
-211,2,161
+211,3,161
+211,7,163
 212,1,212
-212,2,111
-212,4,196
+212,3,111
+212,6,196
+212,7,112
 213,1,213
-213,2,166
+213,3,166
+213,7,168
 214,1,214
-214,2,113
-214,3,168
-214,4,62
+214,3,113
+214,4,168
+214,5,62
+214,6,62
+214,7,114
 215,1,215
-215,2,213
-215,4,144
+215,3,213
+215,5,144
+215,6,144
+215,7,218
 216,1,216
-216,2,193
+216,3,193
+216,7,198
 217,1,217
-217,2,194
+217,3,194
+217,7,199
 218,1,218
-218,2,211
-218,3,103
+218,3,211
+218,4,103
+218,7,216
 219,1,219
-219,2,212
-219,3,104
+219,3,212
+219,4,104
+219,7,217
 220,1,220
-220,2,191
-220,4,203
+220,3,191
+220,6,203
+220,7,195
 221,1,221
-221,2,192
-221,4,204
+221,3,192
+221,6,204
+221,7,196
 222,1,222
-222,2,171
-222,3,180
+222,3,171
+222,4,180
+222,7,173
 223,1,223
-223,2,172
-223,4,132
+223,3,172
+223,5,132
+223,6,132
+223,7,174
 224,1,224
-224,2,173
-224,4,133
+224,3,173
+224,5,133
+224,6,133
+224,7,175
 225,1,225
-225,2,190
+225,3,190
+225,7,194
 226,1,226
-226,2,197
-226,4,141
+226,3,197
+226,5,141
+226,6,141
+226,7,202
 227,1,227
-227,2,198
-227,3,115
+227,3,198
+227,4,115
+227,7,203
 228,1,228
-228,2,209
-228,4,176
+228,3,209
+228,6,176
+228,7,214
 229,1,229
-229,2,210
-229,4,177
+229,3,210
+229,6,177
+229,7,215
 230,1,230
-230,2,188
-230,3,186
+230,3,188
+230,4,186
+230,7,192
 231,1,231
-231,2,195
-231,3,165
+231,3,195
+231,4,165
+231,7,200
 232,1,232
-232,2,196
-232,3,166
+232,3,196
+232,4,166
+232,7,201
 233,1,233
-233,2,216
-233,4,193
+233,3,216
+233,6,193
+233,7,221
 234,1,234
-234,2,129
+234,3,129
+234,7,131
 235,1,235
-235,2,157
+235,3,157
+235,7,159
 236,1,236
-236,2,143
+236,3,143
+236,7,145
 237,1,237
-237,2,146
+237,3,146
+237,7,148
 238,1,238
-238,2,152
+238,3,152
+238,7,154
 239,1,239
-239,2,154
-239,4,197
+239,3,154
+239,6,197
+239,7,156
 240,1,240
-240,2,150
-240,4,200
+240,3,150
+240,6,200
+240,7,152
 241,1,241
-241,2,149
+241,3,149
+241,7,151
 242,1,242
-242,2,218
-242,4,98
+242,3,218
+242,5,98
+242,6,98
+242,7,223
 243,1,243
-243,2,238
+243,3,238
+243,7,243
 244,1,244
-244,2,239
+244,3,239
+244,7,244
 245,1,245
-245,2,240
+245,3,240
+245,7,245
 246,1,246
-246,2,244
+246,3,244
+246,7,249
 247,1,247
-247,2,245
+247,3,245
+247,7,250
 248,1,248
-248,2,246
+248,3,246
+248,7,251
 249,1,249
-249,2,247
+249,3,247
+249,7,252
 250,1,250
-250,2,248
+250,3,248
+250,7,253
 251,1,251
-251,2,251
+251,3,251
+251,7,256
 252,1,252
-252,3,1
+252,4,1
 253,1,253
-253,3,2
+253,4,2
 254,1,254
-254,3,3
+254,4,3
 255,1,255
-255,3,4
+255,4,4
 256,1,256
-256,3,5
+256,4,5
 257,1,257
-257,3,6
+257,4,6
 258,1,258
-258,3,7
+258,4,7
 259,1,259
-259,3,8
+259,4,8
 260,1,260
-260,3,9
+260,4,9
 261,1,261
-261,3,10
+261,4,10
 262,1,262
-262,3,11
+262,4,11
 263,1,263
-263,3,12
+263,4,12
 264,1,264
-264,3,13
+264,4,13
 265,1,265
-265,3,14
-265,4,48
+265,4,14
+265,5,48
+265,6,48
 266,1,266
-266,3,15
-266,4,49
+266,4,15
+266,5,49
+266,6,49
 267,1,267
-267,3,16
-267,4,50
+267,4,16
+267,5,50
+267,6,50
 268,1,268
-268,3,17
-268,4,51
+268,4,17
+268,5,51
+268,6,51
 269,1,269
-269,3,18
-269,4,52
+269,4,18
+269,5,52
+269,6,52
 270,1,270
-270,3,19
+270,4,19
 271,1,271
-271,3,20
+271,4,20
 272,1,272
-272,3,21
+272,4,21
 273,1,273
-273,3,22
+273,4,22
 274,1,274
-274,3,23
+274,4,23
 275,1,275
-275,3,24
+275,4,24
 276,1,276
-276,3,25
+276,4,25
 277,1,277
-277,3,26
+277,4,26
 278,1,278
-278,3,27
-278,4,119
+278,4,27
+278,5,119
+278,6,119
 279,1,279
-279,3,28
-279,4,120
+279,4,28
+279,5,120
+279,6,120
 280,1,280
-280,3,29
-280,4,157
+280,4,29
+280,6,157
 281,1,281
-281,3,30
-281,4,158
+281,4,30
+281,6,158
 282,1,282
-282,3,31
-282,4,159
+282,4,31
+282,6,159
 283,1,283
-283,3,32
+283,4,32
 284,1,284
-284,3,33
+284,4,33
 285,1,285
-285,3,34
+285,4,34
 286,1,286
-286,3,35
+286,4,35
 287,1,287
-287,3,36
+287,4,36
 288,1,288
-288,3,37
+288,4,37
 289,1,289
-289,3,38
+289,4,38
 290,1,290
-290,3,42
+290,4,42
 291,1,291
-291,3,43
+291,4,43
 292,1,292
-292,3,44
+292,4,44
 293,1,293
-293,3,45
+293,4,45
 294,1,294
-294,3,46
+294,4,46
 295,1,295
-295,3,47
+295,4,47
 296,1,296
-296,3,48
+296,4,48
 297,1,297
-297,3,49
+297,4,49
 298,1,298
-298,3,54
-298,4,124
+298,4,54
+298,5,124
+298,6,124
 299,1,299
-299,3,60
-299,4,155
+299,4,60
+299,6,155
 300,1,300
-300,3,61
+300,4,61
 301,1,301
-301,3,62
+301,4,62
 302,1,302
-302,3,68
+302,4,68
 303,1,303
-303,3,69
+303,4,69
 304,1,304
-304,3,70
+304,4,70
 305,1,305
-305,3,71
+305,4,71
 306,1,306
-306,3,72
+306,4,72
 307,1,307
-307,3,76
-307,4,86
+307,4,76
+307,5,86
+307,6,86
 308,1,308
-308,3,77
-308,4,87
+308,4,77
+308,5,87
+308,6,87
 309,1,309
-309,3,78
+309,4,78
 310,1,310
-310,3,79
+310,4,79
 311,1,311
-311,3,80
+311,4,80
 312,1,312
-312,3,81
+312,4,81
 313,1,313
-313,3,86
+313,4,86
 314,1,314
-314,3,87
+314,4,87
 315,1,315
-315,3,94
-315,4,26
+315,4,94
+315,5,26
+315,6,26
 316,1,316
-316,3,95
+316,4,95
 317,1,317
-317,3,96
+317,4,96
 318,1,318
-318,3,97
+318,4,97
 319,1,319
-319,3,98
+319,4,98
 320,1,320
-320,3,99
+320,4,99
 321,1,321
-321,3,100
+321,4,100
 322,1,322
-322,3,101
+322,4,101
 323,1,323
-323,3,102
+323,4,102
 324,1,324
-324,3,105
+324,4,105
 325,1,325
-325,3,110
+325,4,110
 326,1,326
-326,3,111
+326,4,111
 327,1,327
-327,3,114
+327,4,114
 328,1,328
-328,3,116
+328,4,116
 329,1,329
-329,3,117
+329,4,117
 330,1,330
-330,3,118
+330,4,118
 331,1,331
-331,3,119
+331,4,119
 332,1,332
-332,3,120
+332,4,120
 333,1,333
-333,3,121
-333,4,171
+333,4,121
+333,6,171
 334,1,334
-334,3,122
-334,4,172
+334,4,122
+334,6,172
 335,1,335
-335,3,123
+335,4,123
 336,1,336
-336,3,124
+336,4,124
 337,1,337
-337,3,125
+337,4,125
 338,1,338
-338,3,126
+338,4,126
 339,1,339
-339,3,127
-339,4,80
+339,4,127
+339,5,80
+339,6,80
 340,1,340
-340,3,128
-340,4,81
+340,4,128
+340,5,81
+340,6,81
 341,1,341
-341,3,129
+341,4,129
 342,1,342
-342,3,130
+342,4,130
 343,1,343
-343,3,131
+343,4,131
 344,1,344
-344,3,132
+344,4,132
 345,1,345
-345,3,133
+345,4,133
 346,1,346
-346,3,134
+346,4,134
 347,1,347
-347,3,135
+347,4,135
 348,1,348
-348,3,136
+348,4,136
 349,1,349
-349,3,140
-349,4,138
+349,4,140
+349,5,138
+349,6,138
 350,1,350
-350,3,141
-350,4,139
+350,4,141
+350,5,139
+350,6,139
 351,1,351
-351,3,142
+351,4,142
 352,1,352
-352,3,145
+352,4,145
 353,1,353
-353,3,146
+353,4,146
 354,1,354
-354,3,147
+354,4,147
 355,1,355
-355,3,148
-355,4,189
+355,4,148
+355,6,189
 356,1,356
-356,3,149
-356,4,190
+356,4,149
+356,6,190
 357,1,357
-357,3,150
-357,4,185
+357,4,150
+357,6,185
 358,1,358
-358,3,151
-358,4,83
+358,4,151
+358,5,83
+358,6,83
 359,1,359
-359,3,152
-359,4,209
+359,4,152
+359,6,209
 360,1,360
-360,3,160
+360,4,160
 361,1,361
-361,3,171
-361,4,206
+361,4,171
+361,6,206
 362,1,362
-362,3,172
-362,4,207
+362,4,172
+362,6,207
 363,1,363
-363,3,173
+363,4,173
 364,1,364
-364,3,174
+364,4,174
 365,1,365
-365,3,175
+365,4,175
 366,1,366
-366,3,176
+366,4,176
 367,1,367
-367,3,177
+367,4,177
 368,1,368
-368,3,178
+368,4,178
 369,1,369
-369,3,179
+369,4,179
 370,1,370
-370,3,183
+370,4,183
 371,1,371
-371,3,187
+371,4,187
 372,1,372
-372,3,188
+372,4,188
 373,1,373
-373,3,189
+373,4,189
 374,1,374
-374,3,190
+374,4,190
 375,1,375
-375,3,191
+375,4,191
 376,1,376
-376,3,192
+376,4,192
 377,1,377
-377,3,193
+377,4,193
 378,1,378
-378,3,194
+378,4,194
 379,1,379
-379,3,195
+379,4,195
 380,1,380
-380,3,196
+380,4,196
 381,1,381
-381,3,197
+381,4,197
 382,1,382
-382,3,198
+382,4,198
 383,1,383
-383,3,199
+383,4,199
 384,1,384
-384,3,200
+384,4,200
 385,1,385
-385,3,201
+385,4,201
 386,1,386
-386,3,202
+386,4,202
 387,1,387
-387,4,1
+387,5,1
+387,6,1
 388,1,388
-388,4,2
+388,5,2
+388,6,2
 389,1,389
-389,4,3
+389,5,3
+389,6,3
 390,1,390
-390,4,4
+390,5,4
+390,6,4
 391,1,391
-391,4,5
+391,5,5
+391,6,5
 392,1,392
-392,4,6
+392,5,6
+392,6,6
 393,1,393
-393,4,7
+393,5,7
+393,6,7
 394,1,394
-394,4,8
+394,5,8
+394,6,8
 395,1,395
-395,4,9
+395,5,9
+395,6,9
 396,1,396
-396,4,10
+396,5,10
+396,6,10
 397,1,397
-397,4,11
+397,5,11
+397,6,11
 398,1,398
-398,4,12
+398,5,12
+398,6,12
 399,1,399
-399,4,13
+399,5,13
+399,6,13
 400,1,400
-400,4,14
+400,5,14
+400,6,14
 401,1,401
-401,4,15
+401,5,15
+401,6,15
 402,1,402
-402,4,16
+402,5,16
+402,6,16
 403,1,403
-403,4,17
+403,5,17
+403,6,17
 404,1,404
-404,4,18
+404,5,18
+404,6,18
 405,1,405
-405,4,19
+405,5,19
+405,6,19
 406,1,406
-406,4,25
+406,5,25
+406,6,25
 407,1,407
-407,4,27
+407,5,27
+407,6,27
 408,1,408
-408,4,36
+408,5,36
+408,6,36
 409,1,409
-409,4,37
+409,5,37
+409,6,37
 410,1,410
-410,4,38
+410,5,38
+410,6,38
 411,1,411
-411,4,39
+411,5,39
+411,6,39
 412,1,412
-412,4,45
+412,5,45
+412,6,45
 413,1,413
-413,4,46
+413,5,46
+413,6,46
 414,1,414
-414,4,47
+414,5,47
+414,6,47
 415,1,415
-415,4,53
+415,5,53
+415,6,53
 416,1,416
-416,4,54
+416,5,54
+416,6,54
 417,1,417
-417,4,55
+417,5,55
+417,6,55
 418,1,418
-418,4,56
+418,5,56
+418,6,56
 419,1,419
-419,4,57
+419,5,57
+419,6,57
 420,1,420
-420,4,58
+420,5,58
+420,6,58
 421,1,421
-421,4,59
+421,5,59
+421,6,59
 422,1,422
-422,4,60
+422,5,60
+422,6,60
 423,1,423
-423,4,61
+423,5,61
+423,6,61
 424,1,424
-424,4,64
+424,5,64
+424,6,64
+424,7,124
 425,1,425
-425,4,65
+425,5,65
+425,6,65
 426,1,426
-426,4,66
+426,5,66
+426,6,66
 427,1,427
-427,4,67
+427,5,67
+427,6,67
 428,1,428
-428,4,68
+428,5,68
+428,6,68
 429,1,429
-429,4,73
+429,5,73
+429,6,73
 430,1,430
-430,4,75
+430,5,75
+430,6,75
 431,1,431
-431,4,76
+431,5,76
+431,6,76
 432,1,432
-432,4,77
+432,5,77
+432,6,77
 433,1,433
-433,4,82
+433,5,82
+433,6,82
 434,1,434
-434,4,84
+434,5,84
+434,6,84
 435,1,435
-435,4,85
+435,5,85
+435,6,85
 436,1,436
-436,4,88
+436,5,88
+436,6,88
 437,1,437
-437,4,89
+437,5,89
+437,6,89
 438,1,438
-438,4,92
+438,5,92
+438,6,92
 439,1,439
-439,4,94
+439,5,94
+439,6,94
 440,1,440
-440,4,96
+440,5,96
+440,6,96
 441,1,441
-441,4,102
+441,5,102
+441,6,102
 442,1,442
-442,4,108
+442,5,108
+442,6,108
 443,1,443
-443,4,109
+443,5,109
+443,6,109
 444,1,444
-444,4,110
+444,5,110
+444,6,110
 445,1,445
-445,4,111
+445,5,111
+445,6,111
 446,1,446
-446,4,112
+446,5,112
+446,6,112
 447,1,447
-447,4,115
+447,5,115
+447,6,115
 448,1,448
-448,4,116
+448,5,116
+448,6,116
 449,1,449
-449,4,122
+449,5,122
+449,6,122
 450,1,450
-450,4,123
+450,5,123
+450,6,123
 451,1,451
-451,4,127
+451,5,127
+451,6,127
 452,1,452
-452,4,128
+452,5,128
+452,6,128
 453,1,453
-453,4,129
+453,5,129
+453,6,129
 454,1,454
-454,4,130
+454,5,130
+454,6,130
 455,1,455
-455,4,131
+455,5,131
+455,6,131
 456,1,456
-456,4,134
+456,5,134
+456,6,134
 457,1,457
-457,4,135
+457,5,135
+457,6,135
 458,1,458
-458,4,140
+458,5,140
+458,6,140
 459,1,459
-459,4,142
+459,5,142
+459,6,142
 460,1,460
-460,4,143
+460,5,143
+460,6,143
 461,1,461
-461,4,145
+461,5,145
+461,6,145
 462,1,462
-462,4,180
+462,6,180
 463,1,463
-463,4,162
+463,6,162
+463,7,181
 464,1,464
-464,4,188
+464,6,188
 465,1,465
-465,4,182
+465,6,182
+465,7,183
 466,1,466
-466,4,199
+466,6,199
 467,1,467
-467,4,202
+467,6,202
 468,1,468
-468,4,175
+468,6,175
 469,1,469
-469,4,184
+469,6,184
+469,7,102
 470,1,470
-470,4,169
+470,6,169
 471,1,471
-471,4,170
+471,6,170
 472,1,472
-472,4,154
+472,6,154
 473,1,473
-473,4,205
+473,6,205
+473,7,197
 474,1,474
-474,4,194
+474,6,194
 475,1,475
-475,4,160
+475,6,160
 476,1,476
-476,4,156
+476,6,156
 477,1,477
-477,4,191
+477,6,191
 478,1,478
-478,4,208
+478,6,208
 479,1,479
-479,4,152
+479,6,152
 480,1,480
-480,4,146
+480,5,146
+480,6,146
 481,1,481
-481,4,147
+481,5,147
+481,6,147
 482,1,482
-482,4,148
+482,5,148
+482,6,148
 483,1,483
-483,4,149
+483,5,149
+483,6,149
 484,1,484
-484,4,150
+484,5,150
+484,6,150
 485,1,485
 486,1,486
 487,1,487
-487,4,210
+487,6,210
 488,1,488
 489,1,489
 490,1,490
-490,4,151
+490,5,151
+490,6,151
 491,1,491
 492,1,492
 493,1,493
-496,3,202
-497,3,202
-498,3,202
-499,4,46
-500,4,46
+496,4,202
+497,4,202
+498,4,202
+499,5,46
+499,6,46
+500,5,46
+500,6,46

diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py
index 24008e1..71b0e5b 100644 (file)
--- a/pokedex/db/tables.py
+++ b/pokedex/db/tables.py
@@ -264,6 +264,17 @@ class Move(TableBase):
     contest_effect_id = Column(Integer, ForeignKey('contest_effects.id'), nullable=True)
     super_contest_effect_id = Column(Integer, ForeignKey('super_contest_effects.id'), nullable=False)
 
+class Pokedex(TableBase):
+    __tablename__ = 'pokedexes'
+    id = Column(Integer, primary_key=True, nullable=False)
+    name = Column(Unicode(16), nullable=False)
+    description = Column(Unicode(512))
+
+class PokedexVersionGroup(TableBase):
+    __tablename__ = 'pokedex_version_groups'
+    pokedex_id = Column(Integer, ForeignKey('pokedexes.id'), primary_key=True, nullable=False, autoincrement=False)
+    version_group_id = Column(Integer, ForeignKey('version_groups.id'), primary_key=True, nullable=False, autoincrement=False)
+
 class Pokemon(TableBase):
     """The core to this whole mess.
 
@@ -339,7 +350,7 @@ class PokemonAbility(TableBase):
 class PokemonDexNumber(TableBase):
     __tablename__ = 'pokemon_dex_numbers'
     pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False, autoincrement=False)
-    generation_id = Column(Integer, ForeignKey('generations.id'), primary_key=True, nullable=False, autoincrement=False)
+    pokedex_id = Column(Integer, ForeignKey('pokedexes.id'), primary_key=True, nullable=False, autoincrement=False)
     pokedex_number = Column(Integer, nullable=False)
 
 class PokemonEggGroup(TableBase):
@@ -533,6 +544,8 @@ MoveFlavorText.generation = relation(Generation)
 
 MoveName.language = relation(Language)
 
+Pokedex.version_groups = relation(VersionGroup, secondary=PokedexVersionGroup.__table__)
+
 Pokemon.abilities = relation(Ability, secondary=PokemonAbility.__table__,
                                       order_by=PokemonAbility.slot,
                                       backref='pokemon')
@@ -556,7 +569,7 @@ Pokemon.shape = relation(PokemonShape, backref='pokemon')
 Pokemon.stats = relation(PokemonStat, backref='pokemon')
 Pokemon.types = relation(Type, secondary=PokemonType.__table__)
 
-PokemonDexNumber.generation = relation(Generation)
+PokemonDexNumber.pokedex = relation(Pokedex)
 
 PokemonFlavorText.version = relation(Version)