Skip to content

Commit 0019a09

Browse files
committed
Add missing special encounters gens 3-5
Added missing special encounters (mostly static overworld pokemon) along with corresponding missing location, location areas, and encounter conditions to support them. Two entries have been added to the pokemon table to support the female version of jellicent and frillish, since this alternative form wasn't in that table yet for some reason.
1 parent 637b6fa commit 0019a09

9 files changed

Lines changed: 206 additions & 6 deletions

data/v2/csv/encounter_condition_value_map.csv

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17808,3 +17808,37 @@ encounter_id,encounter_condition_value_id
1780817808
62493,71
1780917809
62494,71
1781017810
62495,71
17811+
66651,72
17812+
66652,72
17813+
66659,73
17814+
66660,73
17815+
66661,74
17816+
66662,74
17817+
66665,75
17818+
66666,75
17819+
66667,75
17820+
66668,75
17821+
66669,75
17822+
66670,75
17823+
66673,58
17824+
66674,58
17825+
66675,76
17826+
66676,76
17827+
66709,77
17828+
66710,77
17829+
66711,72
17830+
66712,72
17831+
66715,72
17832+
66716,72
17833+
66719,72
17834+
66720,72
17835+
66723,72
17836+
66724,72
17837+
66725,78
17838+
66726,79
17839+
66727,80
17840+
66728,80
17841+
66729,64
17842+
66729,81
17843+
66730,64
17844+
66730,81

data/v2/csv/encounter_condition_value_prose.csv

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,3 +161,13 @@ encounter_condition_value_id,local_language_id,name
161161
70,5,Après avoir rapporté la pièce de machine à la centrale
162162
71,9,Have an Event Arceus in the party
163163
71,5,En ayant un Arceus événementiel dans l’équipe
164+
72,9,This special Pokémon couldn't be captured in previous encounters (either fainted or ran from battle)
165+
73,9,Have Ice Key in bag
166+
74,9,Have Iron Key in bag
167+
75,9,Spoke to Professor Juniper in the Cave of Being
168+
76,9,Have Lunar Wing in bag
169+
77,9,Obtained Quake Badge
170+
78,9,Have Light Stone in bag
171+
79,9,Have Dark Stone in bag
172+
80,9,Captured Reshiram or Zekrom previously
173+
81,9,Defeated Ghetsis

data/v2/csv/encounter_condition_values.csv

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,3 +70,13 @@ id,encounter_condition_id,identifier,is_default
7070
69,10,other-talked-to-32-people-underground,0
7171
70,9,story-progress-returned-machine-part,0
7272
71,10,other-event-arceus-in-party,0
73+
72,14,special-encounter-couldnt-capture-before,0
74+
73,11,item-ice-key,0
75+
74,11,item-iron-key,0
76+
75,9,story-progress-juniper-cave-of-being,0
77+
76,11,item-lunar-wing,0
78+
77,9,story-progress-quake-badge,0
79+
78,11,item-light-stone
80+
79,11,item-dark-stone
81+
80,10,other-captured-reshiram-or-zekrom
82+
81,9,defeated-ghetsis

data/v2/csv/encounter_conditions.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ id,identifier
1212
11,item
1313
12,weekday
1414
13,first-party-pokemon
15+
14,special-encounter

data/v2/csv/encounters.csv

Lines changed: 131 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61124,3 +61124,134 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
6112461124
66603,29,1156,1139,104,16,19
6112561125
66604,29,1156,875,240,16,19
6112661126
66605,29,1156,845,115,16,19
61127+
66606,7,388,565,100,25,25
61128+
66607,8,388,565,100,25,25
61129+
66608,9,388,566,100,25,25
61130+
66609,7,388,565,100,25,25
61131+
66610,8,388,565,100,25,25
61132+
66611,9,388,566,100,25,25
61133+
66612,7,388,565,100,25,25
61134+
66613,8,388,565,100,25,25
61135+
66614,9,388,566,100,25,25
61136+
66615,8,1166,565,101,30,30
61137+
66616,9,1166,566,101,30,30
61138+
66617,8,1166,565,101,30,30
61139+
66618,9,1166,566,101,30,30
61140+
66619,7,1167,565,101,30,30
61141+
66620,7,1167,565,101,30,30
61142+
66615,8,1165,565,101,30,30
61143+
66616,9,1165,566,101,30,30
61144+
66617,8,1165,565,101,30,30
61145+
66618,9,1165,566,101,30,30
61146+
66619,7,1166,565,101,30,30
61147+
66620,7,1166,565,101,30,30
61148+
66621,17,1167,571,494,15,15
61149+
66622,18,1167,571,494,15,15
61150+
66623,17,580,571,518,50,50
61151+
66624,18,580,571,518,50,50
61152+
66625,17,652,571,571,25,25
61153+
66626,18,652,571,571,25,25
61154+
66627,17,629,571,590,20,20
61155+
66628,18,629,571,590,20,20
61156+
66629,17,629,571,590,20,20
61157+
66630,18,629,571,590,20,20
61158+
66631,17,643,571,590,30,30
61159+
66632,18,643,571,590,30,30
61160+
66633,17,643,571,590,30,30
61161+
66634,18,643,571,590,30,30
61162+
66635,17,643,571,591,40,40
61163+
66636,18,643,571,591,40,40
61164+
66637,17,643,571,591,40,40
61165+
66638,18,643,571,591,40,40
61166+
66639,17,588,571,637,70,70
61167+
66640,18,588,571,637,70,70
61168+
66641,17,630,571,638,42,42
61169+
66642,18,630,571,638,42,42
61170+
66643,17,602,571,639,42,42
61171+
66644,18,602,571,639,42,42
61172+
66645,17,1168,571,640,42,42
61173+
66646,18,1168,571,640,42,42
61174+
66647,17,1176,571,641,40,40
61175+
66648,18,1176,571,642,40,40
61176+
66649,17,1170,571,643,50,50
61177+
66650,18,1170,571,644,50,50
61178+
66651,17,1171,571,643,50,50
61179+
66652,18,1171,571,644,50,50
61180+
66653,17,649,571,645,70,70
61181+
66654,18,649,571,645,70,70
61182+
66655,17,617,571,646,75,75
61183+
66656,18,617,571,646,75,75
61184+
66657,21,696,572,377,65,65
61185+
66658,22,696,572,377,65,65
61186+
66659,21,696,572,378,65,65
61187+
66660,22,696,572,378,65,65
61188+
66661,21,696,572,379,65,65
61189+
66662,22,696,572,379,65,65
61190+
66663,22,579,572,380,68,68
61191+
66664,21,579,572,381,68,68
61192+
66665,21,792,572,480,65,65
61193+
66666,22,792,572,480,65,65
61194+
66667,21,636,572,481,65,65
61195+
66668,22,636,572,481,65,65
61196+
66669,21,706,572,482,65,65
61197+
66670,22,706,572,482,65,65
61198+
66671,21,1172,572,485,68,68
61199+
66672,22,1172,572,485,68,68
61200+
66673,21,1173,572,486,68,68
61201+
66674,22,1173,572,486,68,68
61202+
66675,21,622,572,488,68,68
61203+
66676,22,622,572,488,68,68
61204+
66677,21,700,572,558,42,42
61205+
66678,22,700,572,558,42,42
61206+
66679,21,629,572,590,29,29
61207+
66680,22,629,572,590,29,29
61208+
66681,21,629,572,590,29,29
61209+
66682,22,629,572,590,29,29
61210+
66683,21,629,572,590,29,29
61211+
66684,22,629,572,590,29,29
61212+
66685,21,632,572,590,36,36
61213+
66686,22,632,572,590,36,36
61214+
66687,21,632,572,590,36,36
61215+
66688,22,632,572,590,36,36
61216+
66689,21,645,572,591,47,47
61217+
66690,22,645,572,591,47,47
61218+
66691,21,645,572,591,47,47
61219+
66692,22,645,572,591,47,47
61220+
66693,21,705,572,591,47,47
61221+
66694,22,705,572,591,47,47
61222+
66695,21,705,572,591,47,47
61223+
66696,22,705,572,591,47,47
61224+
66697,21,706,572,591,56,56
61225+
66698,22,706,572,591,56,56
61226+
66699,21,706,572,591,56,56
61227+
66700,22,706,572,591,56,56
61228+
66701,21,706,572,591,56,56
61229+
66702,22,706,572,591,56,56
61230+
66703,21,619,572,593,40,40
61231+
66704,22,619,572,10279,40,40
61232+
66705,21,702,572,612,60,60
61233+
66706,22,702,572,612,60,60
61234+
66707,22,627,572,628,25,25
61235+
66708,21,627,572,630,25,25
61236+
66709,21,588,572,637,35,35
61237+
66710,22,588,572,637,35,35
61238+
66711,21,588,572,637,65,65
61239+
66712,22,588,572,637,65,65
61240+
66713,21,647,572,638,45,45
61241+
66714,22,647,572,638,45,45
61242+
66715,21,647,572,638,65,65
61243+
66716,22,647,572,638,65,65
61244+
66717,21,705,572,639,45,45
61245+
66718,22,705,572,639,45,45
61246+
66719,21,705,572,639,65,65
61247+
66720,22,705,572,639,65,65
61248+
66721,21,645,572,640,45,45
61249+
66722,22,645,572,640,45,45
61250+
66723,21,645,572,640,65,65
61251+
66724,22,645,572,640,65,65
61252+
66725,22,1171,572,643,70,70
61253+
66726,21,1171,572,644,70,70
61254+
66727,21,617,572,646,70,70
61255+
66728,22,617,572,646,70,70
61256+
66729,17,579,571,518,50,50
61257+
66730,18,579,571,518,50,50

data/v2/csv/location_area_prose.csv

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -983,7 +983,7 @@ location_area_id,local_language_id,name
983983
600,5,Route Victoire (zone inconnue 54)
984984
601,9,Victory Road (unknown area 55)
985985
601,5,Route Victoire (zone inconnue 55)
986-
602,9,Victory Road (unknown area 56)
986+
602,9,Victory Road (4f Middle Room)
987987
602,5,Route Victoire (zone inconnue 56)
988988
603,9,Victory Road (unknown area 57)
989989
603,5,Route Victoire (zone inconnue 57)
@@ -1463,3 +1463,5 @@ location_area_id,local_language_id,name
14631463
841,5,Repaire Rocket d'Acajou
14641464
842,9,Sinjoy Ruins
14651465
842,5,Ruines Sinjoh
1466+
1167,9,Ligthouse Basement
1467+
1169,9,Rumination Field

data/v2/csv/location_areas.csv

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ id,location_id,game_index,identifier
482482
590,379,41,1f
483483
591,379,42,b1f
484484
592,379,43,b2f
485-
593,380,44,
485+
593,380,44,b1f-3f
486486
594,381,48,entrance
487487
595,381,49,outside
488488
596,381,50,1f
@@ -491,9 +491,9 @@ id,location_id,game_index,identifier
491491
599,382,53,unknown-area-53
492492
600,382,54,unknown-area-54
493493
601,382,55,unknown-area-55
494-
602,382,56,unknown-area-56
494+
602,382,56,4f-middle-room
495495
603,382,57,unknown-area-57
496-
604,382,58,unknown-area-58
496+
604,382,58,1f-unknown-room
497497
605,382,59,unknown-area-59
498498
606,382,60,unknown-area-60
499499
607,382,61,unknown-area-61
@@ -1052,4 +1052,13 @@ id,location_id,game_index,identifier
10521052
1161,1053,0,
10531053
1162,1050,0,
10541054
1163,750,0,all-areas
1055-
1164,762,0,all-areas
1055+
1164,762,0,all-areas
1056+
1165,692,0,
1057+
1166,694,0,
1058+
1167,404,0,lighthouse-basement
1059+
1168,375,0,rumination-field
1060+
1169,1054,0,
1061+
1170,387,0,throne-room
1062+
1171,381,0,7f
1063+
1172,546,0,b1f
1064+
1173,380,0,b4f

data/v2/csv/locations.csv

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1034,4 +1034,5 @@ id,region_id,identifier
10341034
1050,7,ultra-megalopolis
10351035
1051,7,ultra-space-wilds
10361036
1052,7,poke-pelago
1037-
1053,7,team-rockets-castle
1037+
1053,7,team-rockets-castle
1038+
1054,5,roaming-unova

data/v2/csv/pokemon.csv

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1301,3 +1301,5 @@ id,identifier,species_id,height,weight,base_experience,order,is_default
13011301
10275,ogerpon-cornerstone-mask,1017,12,398,275,,0
13021302
10276,terapagos-terastal,1024,3,160,90,,0
13031303
10277,terapagos-stellar,1024,17,770,90,,0
1304+
10278,frillish-female,592,12,330,67,,0
1305+
10279,jellicent-female,593,22,1350,168,,0

0 commit comments

Comments
 (0)