mirror of
https://github.com/veekun/pokedex.git
synced 2024-08-20 18:16:34 +00:00
Merge victory-road-3 into victory-road-2
This commit is contained in:
parent
52f5b94a67
commit
9ff5609890
6 changed files with 78 additions and 87 deletions
|
@ -27664,42 +27664,42 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
|
||||||
31374,10,462,228,51,29,29
|
31374,10,462,228,51,29,29
|
||||||
31375,10,462,229,50,17,17
|
31375,10,462,229,50,17,17
|
||||||
31376,10,462,230,51,31,31
|
31376,10,462,230,51,31,31
|
||||||
31377,10,463,219,66,32,32
|
31377,10,331,219,66,32,32
|
||||||
31378,10,463,220,74,32,32
|
31378,10,331,220,74,32,32
|
||||||
31379,10,463,221,95,40,40
|
31379,10,331,221,95,40,40
|
||||||
31380,10,463,222,95,43,43
|
31380,10,331,222,95,43,43
|
||||||
31381,10,463,223,95,46,46
|
31381,10,331,223,95,46,46
|
||||||
31382,10,463,224,41,32,32
|
31382,10,331,224,41,32,32
|
||||||
31383,10,463,225,24,44,44
|
31383,10,331,225,24,44,44
|
||||||
31384,10,463,226,42,44,44
|
31384,10,331,226,42,44,44
|
||||||
31385,10,463,227,105,44,44
|
31385,10,331,227,105,44,44
|
||||||
31386,10,463,228,67,44,44
|
31386,10,331,228,67,44,44
|
||||||
31387,10,463,229,67,46,46
|
31387,10,331,229,67,46,46
|
||||||
31388,10,463,230,105,46,46
|
31388,10,331,230,105,46,46
|
||||||
31389,10,464,219,66,34,34
|
31389,10,332,219,66,34,34
|
||||||
31390,10,464,220,74,34,34
|
31390,10,332,220,74,34,34
|
||||||
31391,10,464,221,57,42,42
|
31391,10,332,221,57,42,42
|
||||||
31392,10,464,222,95,45,45
|
31392,10,332,222,95,45,45
|
||||||
31393,10,464,223,95,48,48
|
31393,10,332,223,95,48,48
|
||||||
31394,10,464,224,41,34,34
|
31394,10,332,224,41,34,34
|
||||||
31395,10,464,225,24,46,46
|
31395,10,332,225,24,46,46
|
||||||
31396,10,464,226,42,46,46
|
31396,10,332,226,42,46,46
|
||||||
31397,10,464,227,105,46,46
|
31397,10,332,227,105,46,46
|
||||||
31398,10,464,228,67,46,46
|
31398,10,332,228,67,46,46
|
||||||
31399,10,464,229,67,48,48
|
31399,10,332,229,67,48,48
|
||||||
31400,10,464,230,105,48,48
|
31400,10,332,230,105,48,48
|
||||||
31401,10,465,219,66,32,32
|
31401,10,333,219,66,32,32
|
||||||
31402,10,465,220,74,32,32
|
31402,10,333,220,74,32,32
|
||||||
31403,10,465,221,95,40,40
|
31403,10,333,221,95,40,40
|
||||||
31404,10,465,222,95,43,43
|
31404,10,333,222,95,43,43
|
||||||
31405,10,465,223,95,46,46
|
31405,10,333,223,95,46,46
|
||||||
31406,10,465,224,41,32,32
|
31406,10,333,224,41,32,32
|
||||||
31407,10,465,225,24,44,44
|
31407,10,333,225,24,44,44
|
||||||
31408,10,465,226,42,44,44
|
31408,10,333,226,42,44,44
|
||||||
31409,10,465,227,105,44,44
|
31409,10,333,227,105,44,44
|
||||||
31410,10,465,228,67,44,44
|
31410,10,333,228,67,44,44
|
||||||
31411,10,465,229,67,46,46
|
31411,10,333,229,67,46,46
|
||||||
31412,10,465,230,105,46,46
|
31412,10,333,230,105,46,46
|
||||||
31413,10,466,219,109,28,28
|
31413,10,466,219,109,28,28
|
||||||
31414,10,466,220,20,32,32
|
31414,10,466,220,20,32,32
|
||||||
31415,10,466,221,109,30,30
|
31415,10,466,221,109,30,30
|
||||||
|
@ -29731,42 +29731,42 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
|
||||||
33417,11,462,228,51,29,29
|
33417,11,462,228,51,29,29
|
||||||
33418,11,462,229,50,17,17
|
33418,11,462,229,50,17,17
|
||||||
33419,11,462,230,51,31,31
|
33419,11,462,230,51,31,31
|
||||||
33420,11,463,219,66,32,32
|
33420,11,331,219,66,32,32
|
||||||
33421,11,463,220,74,32,32
|
33421,11,331,220,74,32,32
|
||||||
33422,11,463,221,95,40,40
|
33422,11,331,221,95,40,40
|
||||||
33423,11,463,222,95,43,43
|
33423,11,331,222,95,43,43
|
||||||
33424,11,463,223,95,46,46
|
33424,11,331,223,95,46,46
|
||||||
33425,11,463,224,41,32,32
|
33425,11,331,224,41,32,32
|
||||||
33426,11,463,225,28,44,44
|
33426,11,331,225,28,44,44
|
||||||
33427,11,463,226,42,44,44
|
33427,11,331,226,42,44,44
|
||||||
33428,11,463,227,105,44,44
|
33428,11,331,227,105,44,44
|
||||||
33429,11,463,228,67,44,44
|
33429,11,331,228,67,44,44
|
||||||
33430,11,463,229,67,46,46
|
33430,11,331,229,67,46,46
|
||||||
33431,11,463,230,105,46,46
|
33431,11,331,230,105,46,46
|
||||||
33432,11,464,219,66,34,34
|
33432,11,332,219,66,34,34
|
||||||
33433,11,464,220,74,34,34
|
33433,11,332,220,74,34,34
|
||||||
33434,11,464,221,57,42,42
|
33434,11,332,221,57,42,42
|
||||||
33435,11,464,222,95,45,45
|
33435,11,332,222,95,45,45
|
||||||
33436,11,464,223,95,48,48
|
33436,11,332,223,95,48,48
|
||||||
33437,11,464,224,41,34,34
|
33437,11,332,224,41,34,34
|
||||||
33438,11,464,225,28,46,46
|
33438,11,332,225,28,46,46
|
||||||
33439,11,464,226,42,46,46
|
33439,11,332,226,42,46,46
|
||||||
33440,11,464,227,105,46,46
|
33440,11,332,227,105,46,46
|
||||||
33441,11,464,228,67,46,46
|
33441,11,332,228,67,46,46
|
||||||
33442,11,464,229,67,48,48
|
33442,11,332,229,67,48,48
|
||||||
33443,11,464,230,105,48,48
|
33443,11,332,230,105,48,48
|
||||||
33444,11,465,219,66,32,32
|
33444,11,333,219,66,32,32
|
||||||
33445,11,465,220,74,32,32
|
33445,11,333,220,74,32,32
|
||||||
33446,11,465,221,95,40,40
|
33446,11,333,221,95,40,40
|
||||||
33447,11,465,222,95,43,43
|
33447,11,333,222,95,43,43
|
||||||
33448,11,465,223,95,46,46
|
33448,11,333,223,95,46,46
|
||||||
33449,11,465,224,41,32,32
|
33449,11,333,224,41,32,32
|
||||||
33450,11,465,225,28,44,44
|
33450,11,333,225,28,44,44
|
||||||
33451,11,465,226,42,44,44
|
33451,11,333,226,42,44,44
|
||||||
33452,11,465,227,105,44,44
|
33452,11,333,227,105,44,44
|
||||||
33453,11,465,228,67,44,44
|
33453,11,333,228,67,44,44
|
||||||
33454,11,465,229,67,46,46
|
33454,11,333,229,67,46,46
|
||||||
33455,11,465,230,105,46,46
|
33455,11,333,230,105,46,46
|
||||||
33456,11,466,219,88,28,28
|
33456,11,466,219,88,28,28
|
||||||
33457,11,466,220,20,32,32
|
33457,11,466,220,20,32,32
|
||||||
33458,11,466,221,88,30,30
|
33458,11,466,221,88,30,30
|
||||||
|
|
Can't render this file because it is too large.
|
|
@ -2666,9 +2666,9 @@ location_area_id,encounter_method_id,version_id,rate
|
||||||
461,5,11,1
|
461,5,11,1
|
||||||
462,1,10,5
|
462,1,10,5
|
||||||
462,1,11,5
|
462,1,11,5
|
||||||
463,1,10,7
|
331,1,10,7
|
||||||
464,1,10,7
|
332,1,10,7
|
||||||
465,1,10,7
|
333,1,10,7
|
||||||
341,1,10,7
|
341,1,10,7
|
||||||
341,1,11,7
|
341,1,11,7
|
||||||
342,1,10,7
|
342,1,10,7
|
||||||
|
@ -3259,9 +3259,9 @@ location_area_id,encounter_method_id,version_id,rate
|
||||||
571,1,11,7
|
571,1,11,7
|
||||||
572,1,10,5
|
572,1,10,5
|
||||||
572,1,11,7
|
572,1,11,7
|
||||||
463,1,11,7
|
331,1,11,7
|
||||||
464,1,11,7
|
332,1,11,7
|
||||||
465,1,11,7
|
333,1,11,7
|
||||||
576,4,17,50
|
576,4,17,50
|
||||||
576,4,18,50
|
576,4,18,50
|
||||||
576,4,21,50
|
576,4,21,50
|
||||||
|
|
|
|
@ -417,9 +417,6 @@ location_area_id,local_language_id,name
|
||||||
460,9,B2F
|
460,9,B2F
|
||||||
461,9,
|
461,9,
|
||||||
462,9,
|
462,9,
|
||||||
463,9,1F
|
|
||||||
464,9,2F
|
|
||||||
465,9,3F
|
|
||||||
472,9,1F
|
472,9,1F
|
||||||
473,9,2F
|
473,9,2F
|
||||||
474,9,B1F
|
474,9,B1F
|
||||||
|
|
|
|
@ -417,9 +417,6 @@ id,location_id,game_index,identifier
|
||||||
460,80,10,b2f
|
460,80,10,b2f
|
||||||
461,498,11,
|
461,498,11,
|
||||||
462,73,12,
|
462,73,12,
|
||||||
463,499,13,1f
|
|
||||||
464,499,14,2f
|
|
||||||
465,499,15,3f
|
|
||||||
472,147,24,1f
|
472,147,24,1f
|
||||||
473,147,25,2f
|
473,147,25,2f
|
||||||
474,147,26,b1f
|
474,147,26,b1f
|
||||||
|
|
|
|
@ -1058,8 +1058,6 @@ location_id,local_language_id,name,
|
||||||
497,9,Viapos Chamber,
|
497,9,Viapos Chamber,
|
||||||
498,5,L'Océane,
|
498,5,L'Océane,
|
||||||
498,9,S.S. Anne,
|
498,9,S.S. Anne,
|
||||||
499,5,Route Victoire,
|
|
||||||
499,9,Victory Road,
|
|
||||||
500,5,Mont Braise,
|
500,5,Mont Braise,
|
||||||
500,9,Mt. Ember,
|
500,9,Mt. Ember,
|
||||||
501,5,Bois Baies,
|
501,5,Bois Baies,
|
||||||
|
|
|
|
@ -486,7 +486,6 @@ id,region_id,identifier
|
||||||
496,1,rixy-chamber
|
496,1,rixy-chamber
|
||||||
497,1,viapos-chamber
|
497,1,viapos-chamber
|
||||||
498,1,ss-anne
|
498,1,ss-anne
|
||||||
499,1,kanto-victory-road-3
|
|
||||||
500,1,mt-ember
|
500,1,mt-ember
|
||||||
501,1,berry-forest
|
501,1,berry-forest
|
||||||
502,1,icefall-cave
|
502,1,icefall-cave
|
||||||
|
|
|
Loading…
Reference in a new issue