mirror of
https://github.com/PokeAPI/pokeapi
synced 2024-11-10 06:04:18 +00:00
Merge pull request #1016 from DaltonSW/gen-7-encounters
Gen 7 encounters
This commit is contained in:
commit
1ff2e64b45
5 changed files with 4539 additions and 2 deletions
|
@ -30,3 +30,9 @@ id,identifier,order
|
|||
29,roaming-water,29
|
||||
30,devon-scope,30
|
||||
31,feebas-tile-fishing,31
|
||||
32,island-scan,32
|
||||
33,sos-encounter,33
|
||||
34,bubbling-spots,34
|
||||
35,berry-piles,35
|
||||
36,npc-trade,36
|
||||
37,sos-from-bubbling-spot,37
|
||||
|
|
|
|
@ -711,3 +711,430 @@ id,version_group_id,encounter_method_id,slot,rarity
|
|||
710,6,30,1,100
|
||||
711,5,31,1,50
|
||||
712,6,31,1,50
|
||||
713,17,18,1,100
|
||||
714,17,32,1,100
|
||||
715,17,1,1,50
|
||||
716,17,1,2,30
|
||||
717,17,1,3,30
|
||||
718,17,1,4,15
|
||||
719,17,1,5,5
|
||||
720,18,34,1,40
|
||||
721,18,34,2,35
|
||||
722,18,34,3,25
|
||||
723,18,32,1,100
|
||||
724,18,33,1,15
|
||||
725,18,33,2,15
|
||||
726,18,33,3,15
|
||||
727,18,37,1,15
|
||||
728,18,37,2,15
|
||||
729,18,4,1,55
|
||||
730,18,4,2,40
|
||||
731,18,4,3,5
|
||||
732,18,1,1,50
|
||||
733,18,1,2,30
|
||||
734,18,1,3,20
|
||||
735,18,1,4,20
|
||||
736,18,1,5,20
|
||||
737,18,1,6,15
|
||||
738,18,1,7,15
|
||||
739,17,1,1,30
|
||||
740,17,1,4,20
|
||||
741,17,1,5,20
|
||||
742,17,1,6,20
|
||||
743,18,1,1,20
|
||||
744,18,1,2,20
|
||||
745,18,1,7,10
|
||||
746,18,1,8,10
|
||||
747,18,1,9,5
|
||||
748,17,5,1,40
|
||||
749,17,5,2,40
|
||||
750,17,5,3,20
|
||||
751,17,1,2,50
|
||||
752,17,1,4,30
|
||||
753,17,1,5,30
|
||||
754,17,1,7,20
|
||||
755,17,33,1,15
|
||||
756,17,33,2,15
|
||||
757,17,33,3,15
|
||||
758,17,33,4,15
|
||||
759,17,33,5,15
|
||||
760,17,1,3,20
|
||||
761,17,1,5,10
|
||||
762,17,1,6,10
|
||||
763,17,1,7,10
|
||||
764,17,1,8,10
|
||||
765,17,1,9,5
|
||||
766,18,1,1,30
|
||||
767,18,1,6,10
|
||||
768,18,20,1,100
|
||||
769,18,20,2,100
|
||||
770,18,1,3,10
|
||||
771,18,1,4,10
|
||||
772,17,1,5,15
|
||||
773,18,18,1,100
|
||||
774,18,18,2,100
|
||||
775,18,18,3,100
|
||||
776,18,1,1,35
|
||||
777,18,1,2,35
|
||||
778,18,1,3,35
|
||||
779,18,1,4,30
|
||||
780,17,35,1,100
|
||||
781,17,34,1,80
|
||||
782,17,34,2,20
|
||||
783,18,35,1,100
|
||||
784,18,34,1,50
|
||||
785,18,34,2,30
|
||||
786,18,34,3,20
|
||||
787,18,1,3,30
|
||||
788,17,1,1,20
|
||||
789,17,1,2,20
|
||||
790,17,1,9,10
|
||||
791,17,1,1,40
|
||||
792,17,1,4,10
|
||||
793,17,4,1,79
|
||||
794,17,4,2,20
|
||||
795,17,4,3,1
|
||||
796,17,34,1,50
|
||||
797,17,34,2,30
|
||||
798,17,34,3,20
|
||||
799,17,37,1,15
|
||||
800,18,5,1,30
|
||||
801,18,5,2,30
|
||||
802,18,5,3,20
|
||||
803,18,5,4,20
|
||||
804,18,1,5,10
|
||||
805,18,34,1,35
|
||||
806,18,34,4,10
|
||||
807,18,33,4,15
|
||||
808,18,37,3,15
|
||||
809,18,4,1,50
|
||||
810,18,4,4,5
|
||||
811,18,5,1,40
|
||||
812,18,5,2,40
|
||||
813,17,18,2,100
|
||||
814,17,18,3,100
|
||||
815,17,18,4,100
|
||||
816,17,1,1,100
|
||||
817,17,33,1,10
|
||||
818,17,33,2,10
|
||||
819,17,33,3,100
|
||||
820,18,33,1,10
|
||||
821,18,33,2,10
|
||||
822,18,33,3,100
|
||||
823,18,1,7,5
|
||||
824,17,33,3,1
|
||||
825,18,33,3,1
|
||||
826,18,1,1,40
|
||||
827,18,1,6,20
|
||||
828,18,33,5,15
|
||||
829,17,36,1,100
|
||||
830,18,36,1,100
|
||||
831,17,34,1,70
|
||||
832,17,34,2,70
|
||||
833,17,34,3,30
|
||||
834,18,34,3,30
|
||||
835,18,34,4,15
|
||||
836,18,34,5,5
|
||||
837,18,34,6,5
|
||||
838,18,1,9,10
|
||||
839,18,1,10,10
|
||||
840,18,1,11,10
|
||||
841,18,34,1,70
|
||||
842,17,1,1,49
|
||||
843,17,1,6,1
|
||||
844,18,1,3,29
|
||||
845,18,1,5,1
|
||||
846,17,1,2,25
|
||||
847,18,1,2,25
|
||||
848,18,1,10,5
|
||||
849,17,34,1,100
|
||||
850,17,1,6,9
|
||||
851,17,1,7,1
|
||||
852,18,34,1,100
|
||||
853,18,1,6,9
|
||||
854,18,1,7,1
|
||||
855,17,5,1,30
|
||||
856,17,5,2,30
|
||||
857,17,5,4,20
|
||||
858,18,34,2,45
|
||||
859,18,34,3,35
|
||||
860,18,34,4,20
|
||||
861,18,18,4,100
|
||||
862,18,18,5,100
|
||||
863,18,18,6,100
|
||||
864,18,18,7,100
|
||||
865,18,18,8,100
|
||||
866,18,18,9,100
|
||||
867,18,18,10,100
|
||||
868,17,34,1,60
|
||||
869,17,20,1,100
|
||||
870,17,1,6,5
|
||||
871,18,34,4,5
|
||||
872,18,33,6,15
|
||||
873,18,4,2,30
|
||||
874,18,4,3,15
|
||||
875,18,1,4,15
|
||||
876,18,1,5,15
|
||||
877,17,4,1,70
|
||||
878,17,4,2,15
|
||||
879,17,4,3,10
|
||||
880,17,4,4,5
|
||||
881,18,4,2,20
|
||||
882,18,4,4,15
|
||||
883,18,4,1,49
|
||||
884,18,4,3,10
|
||||
885,18,4,4,1
|
||||
886,18,5,2,25
|
||||
887,18,5,5,5
|
||||
888,18,33,7,15
|
||||
889,17,34,2,45
|
||||
890,17,34,3,5
|
||||
891,17,37,2,15
|
||||
892,17,4,2,29
|
||||
893,17,5,3,40
|
||||
894,18,34,2,25
|
||||
895,18,4,1,44
|
||||
896,18,4,3,25
|
||||
897,18,5,3,40
|
||||
898,18,1,7,20
|
||||
899,17,1,1,70
|
||||
900,17,1,3,100
|
||||
901,18,1,1,60
|
||||
902,17,33,1,11
|
||||
903,18,33,1,11
|
||||
904,17,34,3,10
|
||||
905,17,37,1,10
|
||||
906,17,37,2,10
|
||||
907,17,37,3,1
|
||||
908,18,34,2,20
|
||||
909,18,34,3,10
|
||||
910,18,37,1,11
|
||||
911,18,37,2,10
|
||||
912,18,37,3,1
|
||||
913,18,37,4,15
|
||||
914,18,37,5,15
|
||||
915,18,37,6,15
|
||||
916,18,1,1,70
|
||||
917,17,1,1,80
|
||||
918,18,5,3,30
|
||||
919,18,5,4,10
|
||||
920,18,1,2,40
|
||||
921,18,1,3,40
|
||||
922,18,34,2,15
|
||||
923,18,34,3,15
|
||||
924,18,34,5,15
|
||||
925,18,4,1,25
|
||||
926,18,4,2,25
|
||||
927,18,4,5,5
|
||||
928,18,4,6,5
|
||||
929,18,5,2,20
|
||||
930,17,1,1,25
|
||||
931,17,1,8,5
|
||||
932,18,1,1,25
|
||||
933,18,4,1,35
|
||||
934,18,4,2,35
|
||||
935,18,1,1,39
|
||||
936,18,1,4,1
|
||||
937,17,1,7,5
|
||||
938,18,33,8,15
|
||||
939,18,33,9,15
|
||||
940,18,1,1,21
|
||||
941,18,1,11,4
|
||||
942,18,1,12,1
|
||||
943,17,33,6,15
|
||||
944,17,33,7,15
|
||||
945,17,33,8,15
|
||||
946,17,33,9,15
|
||||
947,17,33,4,1
|
||||
948,17,4,1,60
|
||||
949,17,4,2,40
|
||||
950,17,1,9,100
|
||||
951,18,33,4,1
|
||||
952,18,4,1,40
|
||||
953,17,1,5,9
|
||||
954,17,1,7,100
|
||||
955,17,34,1,40
|
||||
956,17,34,4,20
|
||||
957,17,4,1,78
|
||||
958,17,4,4,1
|
||||
959,18,34,6,15
|
||||
960,18,34,7,15
|
||||
961,18,34,8,5
|
||||
962,17,1,4,100
|
||||
963,18,33,2,11
|
||||
964,17,1,2,40
|
||||
965,17,1,3,5
|
||||
966,17,1,4,5
|
||||
967,18,1,4,5
|
||||
968,18,1,5,5
|
||||
969,17,34,2,50
|
||||
970,17,4,1,99
|
||||
971,17,4,2,1
|
||||
972,18,34,1,60
|
||||
973,18,34,2,40
|
||||
974,18,4,1,90
|
||||
975,18,4,2,10
|
||||
976,17,18,1,7
|
||||
977,17,18,2,7
|
||||
978,17,18,3,7
|
||||
979,17,18,4,4
|
||||
980,17,18,5,4
|
||||
981,17,18,6,4
|
||||
982,17,18,7,4
|
||||
983,17,18,8,4
|
||||
984,17,18,9,4
|
||||
985,17,18,10,4
|
||||
986,17,18,11,4
|
||||
987,17,18,12,4
|
||||
988,17,18,13,4
|
||||
989,17,18,14,4
|
||||
990,17,18,15,4
|
||||
991,17,18,16,4
|
||||
992,17,18,17,4
|
||||
993,17,18,18,2
|
||||
994,17,18,19,2
|
||||
995,17,18,20,2
|
||||
996,17,18,21,2
|
||||
997,17,18,22,2
|
||||
998,17,18,23,2
|
||||
999,17,18,24,2
|
||||
1000,17,18,25,2
|
||||
1001,17,18,18,4
|
||||
1002,18,18,1,7
|
||||
1003,18,18,2,7
|
||||
1004,18,18,3,7
|
||||
1005,18,18,4,4
|
||||
1006,18,18,5,4
|
||||
1007,18,18,6,4
|
||||
1008,18,18,7,4
|
||||
1009,18,18,8,4
|
||||
1010,18,18,9,4
|
||||
1011,18,18,10,4
|
||||
1012,18,18,11,4
|
||||
1013,18,18,12,4
|
||||
1014,18,18,13,4
|
||||
1015,18,18,14,4
|
||||
1016,18,18,15,4
|
||||
1017,18,18,16,4
|
||||
1018,18,18,17,4
|
||||
1019,18,18,18,2
|
||||
1020,18,18,19,2
|
||||
1021,18,18,20,2
|
||||
1022,18,18,21,2
|
||||
1023,18,18,22,2
|
||||
1024,18,18,23,2
|
||||
1025,18,18,24,2
|
||||
1026,18,18,25,2
|
||||
1027,18,18,18,4
|
||||
1028,17,18,1,8
|
||||
1029,17,18,2,8
|
||||
1030,17,18,3,5
|
||||
1031,17,18,4,5
|
||||
1032,17,18,5,5
|
||||
1033,17,18,6,5
|
||||
1034,17,18,7,5
|
||||
1035,17,18,8,5
|
||||
1036,17,18,9,5
|
||||
1037,17,18,10,5
|
||||
1038,17,18,11,5
|
||||
1039,17,18,12,5
|
||||
1040,17,18,13,5
|
||||
1041,17,18,14,5
|
||||
1042,17,18,15,5
|
||||
1043,17,18,16,3
|
||||
1044,17,18,17,3
|
||||
1045,17,18,18,3
|
||||
1046,17,18,19,3
|
||||
1047,17,18,20,3
|
||||
1048,17,18,21,3
|
||||
1049,18,18,1,8
|
||||
1050,18,18,2,5
|
||||
1051,18,18,3,5
|
||||
1052,18,18,4,5
|
||||
1053,18,18,5,5
|
||||
1054,18,18,6,5
|
||||
1055,18,18,7,5
|
||||
1056,18,18,8,5
|
||||
1057,18,18,9,5
|
||||
1058,18,18,10,5
|
||||
1059,18,18,11,5
|
||||
1060,18,18,12,5
|
||||
1061,18,18,13,5
|
||||
1062,18,18,14,5
|
||||
1063,18,18,15,5
|
||||
1064,18,18,16,3
|
||||
1065,18,18,17,3
|
||||
1066,18,18,18,3
|
||||
1067,18,18,19,3
|
||||
1068,18,18,20,3
|
||||
1069,18,18,21,3
|
||||
1070,17,18,3,8
|
||||
1071,17,18,4,8
|
||||
1072,17,18,5,8
|
||||
1073,17,18,6,6
|
||||
1074,17,18,7,6
|
||||
1075,17,18,8,6
|
||||
1076,17,18,9,6
|
||||
1077,17,18,10,6
|
||||
1078,17,18,11,6
|
||||
1079,17,18,12,6
|
||||
1080,17,18,13,6
|
||||
1081,17,18,14,3
|
||||
1082,17,18,15,3
|
||||
1083,18,18,2,8
|
||||
1084,18,18,3,8
|
||||
1085,18,18,4,8
|
||||
1086,18,18,5,8
|
||||
1087,18,18,6,8
|
||||
1088,18,18,15,3
|
||||
1089,17,34,2,40
|
||||
1090,18,34,4,40
|
||||
1091,18,34,5,30
|
||||
1092,18,34,6,20
|
||||
1093,18,34,7,10
|
||||
1094,17,37,3,15
|
||||
1095,17,37,4,15
|
||||
1096,17,4,1,59
|
||||
1097,18,4,1,59
|
||||
1098,18,4,3,1
|
||||
1099,18,1,8,100
|
||||
1100,17,34,3,70
|
||||
1101,17,34,4,30
|
||||
1102,17,34,5,30
|
||||
1103,18,34,2,70
|
||||
1104,18,34,3,50
|
||||
1105,18,34,4,30
|
||||
1106,17,34,1,90
|
||||
1107,17,34,2,10
|
||||
1108,17,34,3,50
|
||||
1109,17,34,4,40
|
||||
1110,17,34,5,10
|
||||
1111,17,5,2,25
|
||||
1112,17,5,5,5
|
||||
1113,18,1,3,15
|
||||
1114,17,5,1,80
|
||||
1115,17,5,2,20
|
||||
1116,18,5,1,55
|
||||
1117,18,5,3,10
|
||||
1118,18,5,4,5
|
||||
1119,17,1,6,100
|
||||
1120,17,1,3,15
|
||||
1121,18,20,3,100
|
||||
1122,18,20,4,100
|
||||
1123,18,20,5,100
|
||||
1124,18,20,6,100
|
||||
1125,18,20,7,15
|
||||
1126,18,20,8,15
|
||||
1127,18,20,9,15
|
||||
1128,18,20,10,15
|
||||
1129,18,20,11,15
|
||||
1130,18,20,7,100
|
||||
1131,18,20,8,100
|
||||
1132,18,20,12,15
|
||||
1133,18,20,13,15
|
||||
1134,18,4,1,45
|
||||
1135,18,5,1,80
|
||||
1136,18,1,8,5
|
||||
1137,17,1,3,24
|
||||
1138,17,1,5,1
|
||||
1139,18,1,3,24
|
||||
|
|
|
File diff suppressed because it is too large
Load diff
|
@ -1044,5 +1044,12 @@ id,location_id,game_index,identifier
|
|||
1153,789,0,outside
|
||||
1154,1043,0,trial-site
|
||||
1155,1043,0,totems-den
|
||||
1156,746,0,main
|
||||
1157,746,0,totems-den
|
||||
1156,746,0,
|
||||
1157,746,0,totems-den
|
||||
1158,1052,0,poni-island-reached
|
||||
1159,1052,0,ulaula-island-reached
|
||||
1160,1052,0,elite-four-defeated
|
||||
1161,1053,0,
|
||||
1162,1050,0,
|
||||
1163,750,0,all-areas
|
||||
1164,762,0,all-areas
|
|
|
@ -1033,3 +1033,5 @@ id,region_id,identifier
|
|||
1049,7,ulaula-beach
|
||||
1050,7,ultra-megalopolis
|
||||
1051,7,ultra-space-wilds
|
||||
1052,7,poke-pelago
|
||||
1053,7,team-rockets-castle
|
|
Loading…
Reference in a new issue