Merge branch 'oras'

2024-06-28 17:32:42 +00:00 · 2015-08-20 14:36:13 -07:00 · 2015-08-20 14:36:13 -07:00 · a9503c2436
parent 7d1b8cc4f8 fdd6995721
commit a9503c2436
26 changed files with 106915 additions and 1634 deletions
--- a/pokedex/data/csv/abilities.csv
+++ b/pokedex/data/csv/abilities.csv
@ -187,6 +187,9 @@ id,identifier,generation_id,is_main_series
 186,dark-aura,6,1
 187,fairy-aura,6,1
 188,aura-break,6,1
+189,primordial-sea,6,1
+190,desolate-land,6,1
+191,delta-stream,6,1
 10001,mountaineer,5,0
 10002,wave-rider,5,0
 10003,skater,5,0
--- a/pokedex/data/csv/ability_flavor_text.csv
+++ b/pokedex/data/csv/ability_flavor_text.csv
--- a/pokedex/data/csv/ability_names.csv
+++ b/pokedex/data/csv/ability_names.csv
@ -1315,6 +1315,27 @@ ability_id,local_language_id,name
 188,7,Rompeaura
 188,8,Frangiaura
 188,9,Aura Break
+189,1,はじまりのうみ
+189,3,시작의바다
+189,5,Mer Primaire
+189,6,Urmeer
+189,7,Mar del Albor
+189,8,Mare Primordiale
+189,9,Primordial Sea
+190,1,おわりのだいち
+190,3,끝의대지
+190,5,Terre Finale
+190,6,Endland
+190,7,Tierra del Ocaso
+190,8,Terra Estrema
+190,9,Desolate Land
+191,1,デルタストリーム
+191,3,델타스트림
+191,5,Souffle Delta
+191,6,Delta-Wind
+191,7,Ráfaga Delta
+191,8,Flusso Delta
+191,9,Delta Stream
 10001,9,Mountaineer
 10002,9,Wave Rider
 10003,9,Skater
--- a/pokedex/data/csv/ability_prose.csv
+++ b/pokedex/data/csv/ability_prose.csv
@ -567,3 +567,6 @@ The type change takes place just before the move is used."
 186,9,Strengthens []{type:dark} moves to 1.33× their power for all friendly and opposing Pokémon.,Strengthens []{type:dark} moves for all friendly and opposing Pokémon.
 187,9,Strengthens []{type:fairy} moves to 1.33× their power for all friendly and opposing Pokémon.,Strengthens []{type:fairy} moves for all friendly and opposing Pokémon.
 188,9,Makes []{ability:dark-aura} and []{ability:fairy-aura} weaken moves of their respective types.,"While this Pokémon is on the field, []{ability:dark-aura} and []{ability:fairy-aura} weaken moves of their respective types to 2/3 their power, rather than strengthening them."
+189,9,,
+190,9,,
+191,9,,
--- a/pokedex/data/csv/machines.csv
+++ b/pokedex/data/csv/machines.csv
@ -14,6 +14,7 @@ machine_number,version_group_id,item_id,move_id
 1,13,305,264
 1,14,305,468
 1,15,305,468
+1,16,305,468
 2,1,306,13
 2,2,306,13
 2,3,306,29
@ -29,6 +30,7 @@ machine_number,version_group_id,item_id,move_id
 2,13,306,337
 2,14,306,337
 2,15,306,337
+2,16,306,337
 3,1,307,14
 3,2,307,14
 3,3,307,174
@ -44,6 +46,7 @@ machine_number,version_group_id,item_id,move_id
 3,13,307,352
 3,14,307,473
 3,15,307,473
+3,16,307,473
 4,1,308,18
 4,2,308,18
 4,3,308,205
@ -59,6 +62,7 @@ machine_number,version_group_id,item_id,move_id
 4,13,308,347
 4,14,308,347
 4,15,308,347
+4,16,308,347
 5,1,309,25
 5,2,309,25
 5,3,309,46
@ -74,6 +78,7 @@ machine_number,version_group_id,item_id,move_id
 5,13,309,46
 5,14,309,46
 5,15,309,46
+5,16,309,46
 6,1,310,92
 6,2,310,92
 6,3,310,92
@ -89,6 +94,7 @@ machine_number,version_group_id,item_id,move_id
 6,13,310,92
 6,14,310,92
 6,15,310,92
+6,16,310,92
 7,1,311,32
 7,2,311,32
 7,3,311,192
@ -104,6 +110,7 @@ machine_number,version_group_id,item_id,move_id
 7,13,311,258
 7,14,311,258
 7,15,311,258
+7,16,311,258
 8,1,312,34
 8,2,312,34
 8,3,312,249
@ -119,6 +126,7 @@ machine_number,version_group_id,item_id,move_id
 8,13,312,339
 8,14,312,339
 8,15,312,339
+8,16,312,339
 9,1,313,36
 9,2,313,36
 9,3,313,244
@ -134,6 +142,7 @@ machine_number,version_group_id,item_id,move_id
 9,13,313,331
 9,14,313,474
 9,15,313,474
+9,16,313,474
 10,1,314,38
 10,2,314,38
 10,3,314,237
@ -149,6 +158,7 @@ machine_number,version_group_id,item_id,move_id
 10,13,314,237
 10,14,314,237
 10,15,314,237
+10,16,314,237
 11,1,315,61
 11,2,315,61
 11,3,315,241
@ -164,6 +174,7 @@ machine_number,version_group_id,item_id,move_id
 11,13,315,241
 11,14,315,241
 11,15,315,241
+11,16,315,241
 12,1,316,55
 12,2,316,55
 12,3,316,230
@ -179,6 +190,7 @@ machine_number,version_group_id,item_id,move_id
 12,13,316,269
 12,14,316,269
 12,15,316,269
+12,16,316,269
 13,1,317,58
 13,2,317,58
 13,3,317,173
@ -194,6 +206,7 @@ machine_number,version_group_id,item_id,move_id
 13,13,317,58
 13,14,317,58
 13,15,317,58
+13,16,317,58
 14,1,318,59
 14,2,318,59
 14,3,318,59
@ -209,6 +222,7 @@ machine_number,version_group_id,item_id,move_id
 14,13,318,59
 14,14,318,59
 14,15,318,59
+14,16,318,59
 15,1,319,63
 15,2,319,63
 15,3,319,63
@ -224,6 +238,7 @@ machine_number,version_group_id,item_id,move_id
 15,13,319,63
 15,14,319,63
 15,15,319,63
+15,16,319,63
 16,1,320,6
 16,2,320,6
 16,3,320,196
@ -239,6 +254,7 @@ machine_number,version_group_id,item_id,move_id
 16,13,320,113
 16,14,320,113
 16,15,320,113
+16,16,320,113
 17,1,321,66
 17,2,321,66
 17,3,321,182
@ -254,6 +270,7 @@ machine_number,version_group_id,item_id,move_id
 17,13,321,182
 17,14,321,182
 17,15,321,182
+17,16,321,182
 18,1,322,68
 18,2,322,68
 18,3,322,240
@ -269,6 +286,7 @@ machine_number,version_group_id,item_id,move_id
 18,13,322,240
 18,14,322,240
 18,15,322,240
+18,16,322,240
 19,1,323,69
 19,2,323,69
 19,3,323,202
@ -284,6 +302,7 @@ machine_number,version_group_id,item_id,move_id
 19,13,323,202
 19,14,323,477
 19,15,323,355
+19,16,323,355
 20,1,324,99
 20,2,324,99
 20,3,324,203
@ -299,6 +318,7 @@ machine_number,version_group_id,item_id,move_id
 20,13,324,219
 20,14,324,219
 20,15,324,219
+20,16,324,219
 21,1,325,72
 21,2,325,72
 21,3,325,218
@ -314,6 +334,7 @@ machine_number,version_group_id,item_id,move_id
 21,13,325,218
 21,14,325,218
 21,15,325,218
+21,16,325,218
 22,1,326,76
 22,2,326,76
 22,3,326,76
@ -329,6 +350,7 @@ machine_number,version_group_id,item_id,move_id
 22,13,326,76
 22,14,326,76
 22,15,326,76
+22,16,326,76
 23,1,327,82
 23,2,327,82
 23,3,327,231
@ -344,6 +366,7 @@ machine_number,version_group_id,item_id,move_id
 23,13,327,231
 23,14,327,479
 23,15,327,479
+23,16,327,479
 24,1,328,85
 24,2,328,85
 24,3,328,225
@ -359,6 +382,7 @@ machine_number,version_group_id,item_id,move_id
 24,13,328,85
 24,14,328,85
 24,15,328,85
+24,16,328,85
 25,1,329,87
 25,2,329,87
 25,3,329,87
@ -374,6 +398,7 @@ machine_number,version_group_id,item_id,move_id
 25,13,329,87
 25,14,329,87
 25,15,329,87
+25,16,329,87
 26,1,330,89
 26,2,330,89
 26,3,330,89
@ -389,6 +414,7 @@ machine_number,version_group_id,item_id,move_id
 26,13,330,89
 26,14,330,89
 26,15,330,89
+26,16,330,89
 27,1,331,90
 27,2,331,90
 27,3,331,216
@ -404,6 +430,7 @@ machine_number,version_group_id,item_id,move_id
 27,13,331,216
 27,14,331,216
 27,15,331,216
+27,16,331,216
 28,1,332,91
 28,2,332,91
 28,3,332,91
@ -419,6 +446,7 @@ machine_number,version_group_id,item_id,move_id
 28,13,332,91
 28,14,332,91
 28,15,332,91
+28,16,332,91
 29,1,333,94
 29,2,333,94
 29,3,333,94
@ -434,6 +462,7 @@ machine_number,version_group_id,item_id,move_id
 29,13,333,94
 29,14,333,94
 29,15,333,94
+29,16,333,94
 30,1,334,100
 30,2,334,100
 30,3,334,247
@ -449,6 +478,7 @@ machine_number,version_group_id,item_id,move_id
 30,13,334,247
 30,14,334,247
 30,15,334,247
+30,16,334,247
 31,1,335,102
 31,2,335,102
 31,3,335,189
@ -464,6 +494,7 @@ machine_number,version_group_id,item_id,move_id
 31,13,335,280
 31,14,335,280
 31,15,335,280
+31,16,335,280
 32,1,336,104
 32,2,336,104
 32,3,336,104
@ -479,6 +510,7 @@ machine_number,version_group_id,item_id,move_id
 32,13,336,104
 32,14,336,104
 32,15,336,104
+32,16,336,104
 33,1,337,115
 33,2,337,115
 33,3,337,8
@ -494,6 +526,7 @@ machine_number,version_group_id,item_id,move_id
 33,13,337,115
 33,14,337,115
 33,15,337,115
+33,16,337,115
 34,1,338,117
 34,2,338,117
 34,3,338,207
@ -509,6 +542,7 @@ machine_number,version_group_id,item_id,move_id
 34,13,338,351
 34,14,338,482
 34,15,338,482
+34,16,338,482
 35,1,339,118
 35,2,339,118
 35,3,339,214
@ -524,6 +558,7 @@ machine_number,version_group_id,item_id,move_id
 35,13,339,53
 35,14,339,53
 35,15,339,53
+35,16,339,53
 36,1,340,120
 36,2,340,120
 36,3,340,188
@ -539,6 +574,7 @@ machine_number,version_group_id,item_id,move_id
 36,13,340,188
 36,14,340,188
 36,15,340,188
+36,16,340,188
 37,1,341,121
 37,2,341,121
 37,3,341,201
@ -554,6 +590,7 @@ machine_number,version_group_id,item_id,move_id
 37,13,341,201
 37,14,341,201
 37,15,341,201
+37,16,341,201
 38,1,342,126
 38,2,342,126
 38,3,342,126
@ -569,6 +606,7 @@ machine_number,version_group_id,item_id,move_id
 38,13,342,126
 38,14,342,126
 38,15,342,126
+38,16,342,126
 39,1,343,129
 39,2,343,129
 39,3,343,129
@ -584,6 +622,7 @@ machine_number,version_group_id,item_id,move_id
 39,13,343,317
 39,14,343,317
 39,15,343,317
+39,16,343,317
 40,1,344,130
 40,2,344,130
 40,3,344,111
@ -599,6 +638,7 @@ machine_number,version_group_id,item_id,move_id
 40,13,344,332
 40,14,344,332
 40,15,344,332
+40,16,344,332
 41,1,345,135
 41,2,345,135
 41,3,345,9
@ -614,6 +654,7 @@ machine_number,version_group_id,item_id,move_id
 41,13,345,259
 41,14,345,259
 41,15,345,259
+41,16,345,259
 42,1,346,138
 42,2,346,138
 42,3,346,138
@ -629,6 +670,7 @@ machine_number,version_group_id,item_id,move_id
 42,13,346,263
 42,14,346,263
 42,15,346,263
+42,16,346,263
 43,1,347,143
 43,2,347,143
 43,3,347,197
@ -644,6 +686,7 @@ machine_number,version_group_id,item_id,move_id
 43,13,347,290
 43,14,347,488
 43,15,347,488
+43,16,347,488
 44,1,348,156
 44,2,348,156
 44,3,348,156
@ -659,6 +702,7 @@ machine_number,version_group_id,item_id,move_id
 44,13,348,156
 44,14,348,156
 44,15,348,156
+44,16,348,156
 45,1,349,86
 45,2,349,86
 45,3,349,213
@ -674,6 +718,7 @@ machine_number,version_group_id,item_id,move_id
 45,13,349,213
 45,14,349,213
 45,15,349,213
+45,16,349,213
 46,1,350,149
 46,2,350,149
 46,3,350,168
@ -689,6 +734,7 @@ machine_number,version_group_id,item_id,move_id
 46,13,350,168
 46,14,350,168
 46,15,350,168
+46,16,350,168
 47,1,351,153
 47,2,351,153
 47,3,351,211
@ -704,6 +750,7 @@ machine_number,version_group_id,item_id,move_id
 47,13,351,211
 47,14,351,490
 47,15,351,490
+47,16,351,490
 48,1,352,157
 48,2,352,157
 48,3,352,7
@ -719,6 +766,7 @@ machine_number,version_group_id,item_id,move_id
 48,13,352,285
 48,14,352,496
 48,15,352,496
+48,16,352,496
 49,1,353,161
 49,2,353,161
 49,3,353,210
@ -734,6 +782,7 @@ machine_number,version_group_id,item_id,move_id
 49,13,353,289
 49,14,353,497
 49,15,353,497
+49,16,353,497
 50,1,354,164
 50,2,354,164
 50,3,354,171
@ -749,272 +798,323 @@ machine_number,version_group_id,item_id,move_id
 50,13,354,315
 50,14,354,315
 50,15,354,315
+50,16,354,315
 51,8,355,355
 51,9,355,355
 51,10,355,355
 51,11,355,502
 51,14,355,502
 51,15,355,211
+51,16,355,211
 52,8,356,411
 52,9,356,411
 52,10,356,411
 52,11,356,411
 52,14,356,411
 52,15,356,411
+52,16,356,411
 53,8,357,412
 53,9,357,412
 53,10,357,412
 53,11,357,412
 53,14,357,412
 53,15,357,412
+53,16,357,412
 54,8,358,206
 54,9,358,206
 54,10,358,206
 54,11,358,206
 54,14,358,206
 54,15,358,206
+54,16,358,206
 55,8,359,362
 55,9,359,362
 55,10,359,362
 55,11,359,503
 55,14,359,503
 55,15,359,503
+55,16,359,503
 56,8,360,374
 56,9,360,374
 56,10,360,374
 56,11,360,374
 56,14,360,374
 56,15,360,374
+56,16,360,374
 57,8,361,451
 57,9,361,451
 57,10,361,451
 57,11,361,451
 57,14,361,451
 57,15,361,451
+57,16,361,451
 58,8,362,203
 58,9,362,203
 58,10,362,203
 58,11,362,507
 58,14,362,507
 58,15,362,507
+58,16,362,507
 59,8,363,406
 59,9,363,406
 59,10,363,406
 59,11,363,510
 59,14,363,510
 59,15,363,510
+59,16,363,510
 60,8,364,409
 60,9,364,409
 60,10,364,409
 60,11,364,511
 60,14,364,511
 60,15,364,511
+60,16,364,511
 61,8,365,261
 61,9,365,261
 61,10,365,261
 61,11,365,261
 61,14,365,261
 61,15,365,261
+61,16,365,261
 62,8,366,318
 62,9,366,318
 62,10,366,318
 62,11,366,512
 62,14,366,512
 62,15,366,512
+62,16,366,512
 63,8,367,373
 63,9,367,373
 63,10,367,373
 63,11,367,373
 63,14,367,373
 63,15,367,373
+63,16,367,373
 64,8,368,153
 64,9,368,153
 64,10,368,153
 64,11,368,153
 64,14,368,153
 64,15,368,153
+64,16,368,153
 65,8,369,421
 65,9,369,421
 65,10,369,421
 65,11,369,421
 65,14,369,421
 65,15,369,421
+65,16,369,421
 66,8,370,371
 66,9,370,371
 66,10,370,371
 66,11,370,371
 66,14,370,371
 66,15,370,371
+66,16,370,371
 67,8,371,278
 67,9,371,278
 67,10,371,278
 67,11,371,514
 67,14,371,514
 67,15,371,514
+67,16,371,514
 68,8,372,416
 68,9,372,416
 68,10,372,416
 68,11,372,416
 68,14,372,416
 68,15,372,416
+68,16,372,416
 69,8,373,397
 69,9,373,397
 69,10,373,397
 69,11,373,397
 69,14,373,397
 69,15,373,397
+69,16,373,397
 70,8,374,148
 70,9,374,148
 70,10,374,148
 70,11,374,148
 70,14,374,148
 70,15,374,148
+70,16,374,148
 71,8,375,444
 71,9,375,444
 71,10,375,444
 71,11,375,444
 71,14,375,444
 71,15,375,444
+71,16,375,444
 72,8,376,419
 72,9,376,419
 72,10,376,419
 72,11,376,521
 72,14,376,521
 72,15,376,521
+72,16,376,521
 73,8,377,86
 73,9,377,86
 73,10,377,86
 73,11,377,86
 73,14,377,86
 73,15,377,86
+73,16,377,86
 74,8,378,360
 74,9,378,360
 74,10,378,360
 74,11,378,360
 74,14,378,360
 74,15,378,360
+74,16,378,360
 75,8,379,14
 75,9,379,14
 75,10,379,14
 75,11,379,14
 75,14,379,14
 75,15,379,14
+75,16,379,14
 76,8,380,446
 76,9,380,446
 76,10,380,446
 76,11,380,522
 76,14,380,522
 76,15,380,522
+76,16,380,522
 77,8,381,244
 77,9,381,244
 77,10,381,244
 77,11,381,244
 77,14,381,244
 77,15,381,244
+77,16,381,244
 78,8,382,445
 78,9,382,445
 78,10,382,445
 78,11,382,523
 78,14,382,523
 78,15,382,523
+78,16,382,523
 79,8,383,399
 79,9,383,399
 79,10,383,399
 79,11,383,524
 79,14,383,524
 79,15,383,524
+79,16,383,524
 80,8,384,157
 80,9,384,157
 80,10,384,157
 80,11,384,157
 80,14,384,157
 80,15,384,157
+80,16,384,157
 81,8,385,404
 81,9,385,404
 81,10,385,404
 81,11,385,404
 81,14,385,404
 81,15,385,404
+81,16,385,404
 82,8,386,214
 82,9,386,214
 82,10,386,214
 82,11,386,525
 82,14,386,525
 82,15,386,525
+82,16,386,525
 83,8,387,363
 83,9,387,363
 83,10,387,363
 83,11,387,526
 83,14,387,526
 83,15,387,611
+83,16,387,611
 84,8,388,398
 84,9,388,398
 84,10,388,398
 84,11,388,398
 84,14,388,398
 84,15,388,398
+84,16,388,398
 85,8,389,138
 85,9,389,138
 85,10,389,138
 85,11,389,138
 85,14,389,138
 85,15,389,138
+85,16,389,138
 86,8,390,447
 86,9,390,447
 86,10,390,447
 86,11,390,447
 86,14,390,447
 86,15,390,447
+86,16,390,447
 87,8,391,207
 87,9,391,207
 87,10,391,207
 87,11,391,207
 87,14,391,207
 87,15,391,207
+87,16,391,207
 88,8,392,365
 88,9,392,365
 88,10,392,365
 88,11,392,365
 88,14,392,365
 88,15,392,214
+88,16,392,214
 89,8,393,369
 89,9,393,369
 89,10,393,369
 89,11,393,369
 89,14,393,369
 89,15,393,369
+89,16,393,369
 90,8,394,164
 90,9,394,164
 90,10,394,164
 90,11,394,164
 90,14,394,164
 90,15,394,164
+90,16,394,164
 91,8,395,430
 91,9,395,430
 91,10,395,430
 91,11,395,430
 91,14,395,430
 91,15,395,430
+91,16,395,430
 92,8,396,433
 92,9,396,433
 92,10,396,433
 92,11,396,433
 92,14,396,433
 92,15,396,433
+92,16,396,433
 93,11,659,528
 93,14,659,528
 93,15,659,528
+93,16,397,528
 94,11,660,249
 94,14,660,249
 94,15,660,249
+94,16,398,290
 95,11,661,555
 95,14,661,555
 95,15,661,555
+95,16,399,555
 96,15,745,267
+96,16,400,267
 97,15,746,399
+97,16,401,399
 98,15,747,612
+98,16,402,612
 99,15,748,605
+99,16,403,605
 100,15,749,590
+100,16,404,590
 101,1,397,15
 101,2,397,15
 101,3,397,15
@ -1030,6 +1130,7 @@ machine_number,version_group_id,item_id,move_id
 101,13,397,15
 101,14,397,15
 101,15,397,15
+101,16,405,15
 102,1,398,19
 102,2,398,19
 102,3,398,19
@ -1045,6 +1146,7 @@ machine_number,version_group_id,item_id,move_id
 102,13,398,19
 102,14,398,19
 102,15,398,19
+102,16,406,19
 103,1,399,57
 103,2,399,57
 103,3,399,57
@ -1060,6 +1162,7 @@ machine_number,version_group_id,item_id,move_id
 103,13,399,57
 103,14,399,57
 103,15,399,57
+103,16,407,57
 104,1,400,70
 104,2,400,70
 104,3,400,70
@ -1075,6 +1178,7 @@ machine_number,version_group_id,item_id,move_id
 104,13,400,70
 104,14,400,70
 104,15,400,70
+104,16,408,70
 105,1,401,148
 105,2,401,148
 105,3,401,148
@ -1090,6 +1194,7 @@ machine_number,version_group_id,item_id,move_id
 105,13,401,148
 105,14,401,127
 105,15,401,127
+105,16,409,127
 106,3,402,250
 106,4,402,250
 106,5,402,249
@ -1102,6 +1207,7 @@ machine_number,version_group_id,item_id,move_id
 106,12,402,249
 106,13,402,249
 106,14,402,291
+106,16,410,249
 107,3,403,127
 107,4,403,127
 107,5,403,127
@ -1112,6 +1218,7 @@ machine_number,version_group_id,item_id,move_id
 107,10,403,127
 107,12,403,127
 107,13,403,127
+107,16,411,291
 108,5,404,291
 108,6,404,291
 108,7,404,291
--- a/pokedex/data/csv/move_flavor_text.csv
+++ b/pokedex/data/csv/move_flavor_text.csv
--- a/pokedex/data/csv/move_names.csv
+++ b/pokedex/data/csv/move_names.csv
@ -4318,6 +4318,30 @@ move_id,local_language_id,name
 617,7,Luz Aniquiladora
 617,8,Luce Nefasta
 617,9,Light of Ruin
+618,1,こんげんのはどう
+618,5,Onde Originelle
+618,6,Ursprungswoge
+618,7,Pulso Primigenio
+618,8,Primopulsar
+618,9,Origin Pulse
+619,1,だんがいのつるぎ
+619,5,Lame Pangéenne
+619,6,Abgrundsklinge
+619,7,Filo del Abismo
+619,8,Spade Telluriche
+619,9,Precipice Blades
+620,1,ガリョウテンセイ
+620,5,Draco Ascension
+620,6,Zenitstürmer
+620,7,Ascenso Draco
+620,8,Ascesa del Drago
+620,9,Dragon Ascent
+621,1,いじげんラッシュ
+621,5,Furie Dimension
+621,6,Dimensionswahn
+621,7,Cerco Dimensión
+621,8,Urtodimensionale
+621,9,Hyperspace Fury
 10001,1,ダークラッシュ
 10001,5,Charge Noire
 10001,6,Cryptoschlag
--- a/pokedex/data/csv/moves.csv
+++ b/pokedex/data/csv/moves.csv
@ -616,6 +616,10 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
 615,thousand-waves,6,5,90,10,100,0,11,2,10007,,,,
 616,lands-wrath,6,5,90,10,100,0,11,2,1,,,,
 617,light-of-ruin,6,18,140,5,90,0,10,3,270,,,,
+618,origin-pulse,6,11,110,10,85,0,11,3,1,,,,
+619,precipice-blades,6,5,120,10,85,0,11,2,1,,,,
+620,dragon-ascent,6,3,120,5,100,0,10,2,230,,,,
+621,hyperspace-fury,6,17,100,5,,0,10,2,360,,,,
 10001,shadow-rush,3,10002,55,,100,0,10,2,10001,,,,
 10002,shadow-blast,3,10002,80,,100,0,10,3,44,,,,
 10003,shadow-blitz,3,10002,40,,100,0,10,2,1,,,,
--- a/pokedex/data/csv/pokedex_prose.csv
+++ b/pokedex/data/csv/pokedex_prose.csv
@ -8,8 +8,8 @@ pokedex_id,local_language_id,name,description
 3,5,Johto initial,"Pokédex régional de Johto dans Or/Argent/Cristal, appellé ""Nouveau"" Pokédex dans le jeu"
 3,6,Original Johto,"Gold/Silber/Kristall Johto Dex — Auch der ""Neue"" Pokédex im Spiel genannt"
 3,9,Original Johto,"Gold/Silver/Crystal Johto dex—called the ""New"" Pokédex in-game"
-4,6,Hoenn,Rubin/Saphir/Smaragd Hoenn Dex
-4,9,Hoenn,Ruby/Sapphire/Emerald Hoenn dex
+4,6,Original Hoenn,Rubin/Saphir/Smaragd Hoenn Dex
+4,9,Original Hoenn,Ruby/Sapphire/Emerald Hoenn dex
 5,5,Sinnoh initial,Pokédex régional de Sinnoh dans Diamant/Perle
 5,6,Original Sinnoh,Diamant/Perl Sinnoh Dex
 5,9,Original Sinnoh,Diamond/Pearl Sinnoh dex
@ -37,3 +37,5 @@ pokedex_id,local_language_id,name,description
 14,5,Kalos : Monts,
 14,6,Kalos-Gebirge,
 14,9,Mountain Kalos,
+15,6,Neue Hoenn,Omega Rubin/Alpha Saphir Hoenn Dex — Dex aus Rubin/Saphir/Smaragd um Neue Entwicklungen erweitert
+15,9,New Hoenn,"Omega Ruby/Alpha Sapphire Hoenn Dex—Ruby/Sapphire/Emerald's, updated to add new evolutions"
--- a/pokedex/data/csv/pokedex_version_groups.csv
+++ b/pokedex/data/csv/pokedex_version_groups.csv
@ -14,3 +14,4 @@ pokedex_id,version_group_id
 12,15
 13,15
 14,15
+15,16
--- a/pokedex/data/csv/pokedexes.csv
+++ b/pokedex/data/csv/pokedexes.csv
@ -12,3 +12,4 @@ id,region_id,identifier,is_main_series
 12,6,kalos-central,1
 13,6,kalos-coastal,1
 14,6,kalos-mountain,1
+15,3,updated-hoenn,1
--- a/pokedex/data/csv/pokemon.csv
+++ b/pokedex/data/csv/pokemon.csv
--- a/pokedex/data/csv/pokemon_abilities.csv
+++ b/pokedex/data/csv/pokemon_abilities.csv
@ -1833,3 +1833,36 @@ pokemon_id,ability_id,is_hidden,slot
 10061,180,1,3
 10062,26,0,1
 10063,26,0,1
+10064,33,0,1
+10065,31,0,1
+10066,156,0,1
+10067,182,0,1
+10068,39,0,1
+10069,131,0,1
+10070,173,0,1
+10071,75,0,1
+10072,159,0,1
+10073,99,0,1
+10074,174,0,1
+10075,156,0,1
+10076,181,0,1
+10077,189,0,1
+10078,190,0,1
+10079,191,0,1
+10080,9,0,1
+10080,31,1,3
+10081,9,0,1
+10081,31,1,3
+10082,9,0,1
+10082,31,1,3
+10083,9,0,1
+10083,31,1,3
+10084,9,0,1
+10084,31,1,3
+10085,9,0,1
+10085,31,1,3
+10086,170,0,1
+10087,125,0,1
+10088,113,0,1
+10089,184,0,1
+10090,91,0,1
--- a/pokedex/data/csv/pokemon_dex_numbers.csv
+++ b/pokedex/data/csv/pokemon_dex_numbers.csv
--- a/pokedex/data/csv/pokemon_form_generations.csv
+++ b/pokedex/data/csv/pokemon_form_generations.csv
@ -3010,3 +3010,30 @@ pokemon_form_id,generation_id,game_index
 10158,6,0
 10159,6,0
 10160,6,0
+10166,6,1
+10167,6,1
+10168,6,1
+10169,6,1
+10170,6,1
+10171,6,1
+10172,6,1
+10173,6,1
+10174,6,1
+10175,6,1
+10176,6,1
+10177,6,1
+10178,6,1
+10179,6,1
+10180,6,1
+10181,6,1
+10182,6,1
+10183,6,2
+10184,6,3
+10185,6,4
+10186,6,5
+10187,6,6
+10188,6,1
+10189,6,1
+10190,6,1
+10191,6,1
+10192,6,1
--- a/pokedex/data/csv/pokemon_form_names.csv
+++ b/pokedex/data/csv/pokemon_form_names.csv
@ -1333,3 +1333,30 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10165,7,Mega-Latios,
 10165,8,MegaLatios,
 10165,9,Mega Latios,Mega Latios
+10166,9,Mega Swampert,Mega Swampert
+10167,9,Mega Sceptile,Mega Sceptile
+10168,9,Mega Sableye,Mega Sableye
+10169,9,Mega Altaria,Mega Altaria
+10170,9,Mega Gallade,Mega Gallade
+10171,9,Mega Audino,Mega Audino
+10172,9,Mega Sharpedo,Mega Sharpedo
+10173,9,Mega Slowbro,Mega Slowbro
+10174,9,Mega Steelix,Mega Steelix
+10175,9,Mega Pidgeot,Mega Pidgeot
+10176,9,Mega Glalie,Mega Glalie
+10177,9,Mega Diancie,Mega Diancie
+10178,9,Mega Metagross,Mega Metagross
+10179,9,Primal Reversion,Primal Kyogre
+10180,9,Primal Reversion,Primal Groudon
+10181,9,Mega Rayquaza,Mega Rayquaza
+10182,9,Pikachu Rock Star,Pikachu Rock Star
+10183,9,Pikachu Belle,Pikachu Belle
+10184,9,Pikachu Pop Star,Pikachu Pop Star
+10185,9,"Pikachu, Ph.D.","Pikachu, Ph.D."
+10186,9,Pikachu Libre,Pikachu Libre
+10187,9,Cosplay Pikachu,Cosplay Pikachu
+10188,9,Hoopa Unbound,Hoopa Unbound
+10189,9,Mega Camerupt,Mega Camerupt
+10190,9,Mega Lopunny,Mega Lopunny
+10191,9,Mega Salamence,Mega Salamence
+10192,9,Mega Beedrill,Mega Beedrill
--- a/pokedex/data/csv/pokemon_forms.csv
+++ b/pokedex/data/csv/pokemon_forms.csv
--- a/pokedex/data/csv/pokemon_game_indices.csv
+++ b/pokedex/data/csv/pokemon_game_indices.csv
@ -8326,3 +8326,30 @@ pokemon_id,version_id,game_index
 10023,22,703
 10024,21,705
 10024,22,705
+10064,25,799
+10065,25,800
+10066,25,801
+10067,25,802
+10068,25,803
+10069,25,804
+10070,25,805
+10071,25,806
+10072,25,807
+10073,25,808
+10074,25,809
+10075,25,810
+10076,25,811
+10077,25,812
+10078,25,813
+10079,25,814
+10080,25,815
+10081,25,816
+10082,25,817
+10083,25,818
+10084,25,819
+10085,25,820
+10086,25,821
+10087,25,822
+10088,25,823
+10089,25,824
+10090,25,825
--- a/pokedex/data/csv/pokemon_moves.csv
+++ b/pokedex/data/csv/pokemon_moves.csv
--- a/pokedex/data/csv/pokemon_species_flavor_text.csv
+++ b/pokedex/data/csv/pokemon_species_flavor_text.csv
--- a/pokedex/data/csv/pokemon_stats.csv
+++ b/pokedex/data/csv/pokemon_stats.csv
@ -4703,3 +4703,165 @@ pokemon_id,stat_id,base_stat,effort
 10063,4,160,3
 10063,5,120,0
 10063,6,110,0
+10064,1,100,0
+10064,2,150,3
+10064,3,110,0
+10064,4,95,0
+10064,5,110,0
+10064,6,70,0
+10065,1,70,0
+10065,2,110,0
+10065,3,75,0
+10065,4,145,0
+10065,5,85,0
+10065,6,145,3
+10066,1,50,0
+10066,2,85,1
+10066,3,125,1
+10066,4,85,0
+10066,5,115,0
+10066,6,20,0
+10067,1,75,0
+10067,2,110,0
+10067,3,110,0
+10067,4,110,0
+10067,5,105,2
+10067,6,80,0
+10068,1,68,0
+10068,2,165,3
+10068,3,95,0
+10068,4,65,0
+10068,5,115,0
+10068,6,110,0
+10069,1,103,2
+10069,2,60,0
+10069,3,126,0
+10069,4,80,0
+10069,5,126,0
+10069,6,50,0
+10070,1,70,0
+10070,2,140,2
+10070,3,70,0
+10070,4,110,0
+10070,5,65,0
+10070,6,105,0
+10071,1,95,0
+10071,2,75,0
+10071,3,180,2
+10071,4,130,0
+10071,5,80,0
+10071,6,30,0
+10072,1,75,0
+10072,2,125,0
+10072,3,230,2
+10072,4,55,0
+10072,5,95,0
+10072,6,30,0
+10073,1,83,0
+10073,2,80,0
+10073,3,80,0
+10073,4,135,0
+10073,5,80,0
+10073,6,121,3
+10074,1,80,2
+10074,2,120,0
+10074,3,80,0
+10074,4,120,0
+10074,5,80,0
+10074,6,100,0
+10075,1,50,0
+10075,2,160,0
+10075,3,110,1
+10075,4,160,0
+10075,5,110,2
+10075,6,110,0
+10076,1,80,0
+10076,2,145,0
+10076,3,150,3
+10076,4,105,0
+10076,5,110,0
+10076,6,110,0
+10077,1,100,0
+10077,2,150,0
+10077,3,90,0
+10077,4,180,3
+10077,5,160,0
+10077,6,90,0
+10078,1,100,0
+10078,2,180,3
+10078,3,160,0
+10078,4,150,0
+10078,5,90,0
+10078,6,90,0
+10079,1,105,0
+10079,2,180,2
+10079,3,100,0
+10079,4,180,1
+10079,5,100,0
+10079,6,115,0
+10080,1,35,0
+10080,2,55,0
+10080,3,40,0
+10080,4,50,0
+10080,5,50,0
+10080,6,90,2
+10081,1,35,0
+10081,2,55,0
+10081,3,40,0
+10081,4,50,0
+10081,5,50,0
+10081,6,90,2
+10082,1,35,0
+10082,2,55,0
+10082,3,40,0
+10082,4,50,0
+10082,5,50,0
+10082,6,90,2
+10083,1,35,0
+10083,2,55,0
+10083,3,40,0
+10083,4,50,0
+10083,5,50,0
+10083,6,90,2
+10084,1,35,0
+10084,2,55,0
+10084,3,40,0
+10084,4,50,0
+10084,5,50,0
+10084,6,90,2
+10085,1,35,0
+10085,2,55,0
+10085,3,40,0
+10085,4,50,0
+10085,5,50,0
+10085,6,90,2
+10086,1,80,0
+10086,2,160,0
+10086,3,60,0
+10086,4,170,3
+10086,5,130,0
+10086,6,80,0
+10087,1,70,0
+10087,2,120,1
+10087,3,100,0
+10087,4,145,1
+10087,5,105,0
+10087,6,20,0
+10088,1,65,0
+10088,2,136,0
+10088,3,94,0
+10088,4,54,0
+10088,5,96,0
+10088,6,135,2
+10089,1,95,0
+10089,2,145,3
+10089,3,130,0
+10089,4,120,0
+10089,5,90,0
+10089,6,120,0
+10090,1,65,0
+10090,2,150,2
+10090,3,40,0
+10090,4,15,0
+10090,5,80,1
+10090,6,145,0
--- a/pokedex/data/csv/pokemon_types.csv
+++ b/pokedex/data/csv/pokemon_types.csv
@ -1178,3 +1178,49 @@ pokemon_id,type_id,slot
 10062,14,2
 10063,16,1
 10063,14,2
+10064,11,1
+10064,5,2
+10065,12,1
+10065,16,2
+10066,17,1
+10066,8,2
+10067,16,1
+10067,18,2
+10068,14,1
+10068,2,2
+10069,1,1
+10069,18,2
+10070,11,1
+10070,17,2
+10071,11,1
+10071,14,2
+10072,9,1
+10072,5,2
+10073,1,1
+10073,3,2
+10074,15,1
+10075,6,1
+10075,18,2
+10076,9,1
+10076,14,2
+10077,11,1
+10078,5,1
+10078,10,2
+10079,16,1
+10079,3,2
+10080,13,1
+10081,13,1
+10082,13,1
+10083,13,1
+10084,13,1
+10085,13,1
+10086,14,1
+10086,17,2
+10087,10,1
+10087,5,2
+10088,1,1
+10088,2,2
+10089,16,1
+10089,3,2
+10090,7,1
+10090,4,2
--- a/pokedex/data/csv/version_group_regions.csv
+++ b/pokedex/data/csv/version_group_regions.csv
@ -15,3 +15,4 @@ version_group_id,region_id
 11,5
 14,5
 15,6
+16,3
--- a/pokedex/data/csv/version_groups.csv
+++ b/pokedex/data/csv/version_groups.csv
@ -14,3 +14,4 @@ id,identifier,generation_id,order
 13,xd,3,8
 14,black-2-white-2,5,14
 15,x-y,6,15
+16,omega-ruby-alpha-sapphire,6,16
--- a/pokedex/data/csv/version_names.csv
+++ b/pokedex/data/csv/version_names.csv
@ -95,3 +95,9 @@ version_id,local_language_id,name
 24,5,Y
 24,6,Y
 24,9,Y
+25,1,オメガルビー
+25,6,Omega Rubin
+25,9,Omega Ruby
+26,1,アルファサファイア
+26,6,Alpha Siphir
+26,9,Alpha Sapphire
--- a/pokedex/data/csv/versions.csv
+++ b/pokedex/data/csv/versions.csv
@ -23,3 +23,5 @@ id,version_group_id,identifier
 22,14,white-2
 23,15,x
 24,15,y
+25,16,omega-ruby
+26,16,alpha-sapphire