Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add missing special encounters gens 3-5 #1189

Merged
merged 5 commits into from
Jan 23, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions data/v2/csv/encounter_condition_value_map.csv
Original file line number Diff line number Diff line change
Expand Up @@ -17808,3 +17808,37 @@ encounter_id,encounter_condition_value_id
62493,71
62494,71
62495,71
66651,72
66652,72
66659,73
66660,73
66661,74
66662,74
66665,75
66666,75
66667,75
66668,75
66669,75
66670,75
66673,58
66674,58
66675,76
66676,76
66709,77
66710,77
66711,72
66712,72
66715,72
66716,72
66719,72
66720,72
66723,72
66724,72
66725,78
66726,79
66727,80
66728,80
66729,64
66729,81
66730,64
66730,81
10 changes: 10 additions & 0 deletions data/v2/csv/encounter_condition_value_prose.csv
Original file line number Diff line number Diff line change
Expand Up @@ -161,3 +161,13 @@ encounter_condition_value_id,local_language_id,name
70,5,Après avoir rapporté la pièce de machine à la centrale
71,9,Have an Event Arceus in the party
71,5,En ayant un Arceus événementiel dans l’équipe
72,9,This special Pokémon couldn't be captured in previous encounters (either fainted or ran from battle)
73,9,Have Ice Key in bag
74,9,Have Iron Key in bag
75,9,Spoke to Professor Juniper in the Cave of Being
76,9,Have Lunar Wing in bag
77,9,Obtained Quake Badge
78,9,Have Light Stone in bag
79,9,Have Dark Stone in bag
80,9,Captured Reshiram or Zekrom previously
81,9,Defeated Ghetsis
10 changes: 10 additions & 0 deletions data/v2/csv/encounter_condition_values.csv
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,13 @@ id,encounter_condition_id,identifier,is_default
69,10,other-talked-to-32-people-underground,0
70,9,story-progress-returned-machine-part,0
71,10,other-event-arceus-in-party,0
72,14,special-encounter-couldnt-capture-before,0
73,11,item-ice-key,0
74,11,item-iron-key,0
75,9,story-progress-juniper-cave-of-being,0
76,11,item-lunar-wing,0
77,9,story-progress-quake-badge,0
78,11,item-light-stone
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi, we can this error in the CI:

UNIQUE constraint failed: pokemon_v2_encounter.id

I don't think it's releated to this file, but in this file maybe it's worth adding the trailing ,0 at lines 78-81

79,11,item-dark-stone
80,10,other-captured-reshiram-or-zekrom
81,9,defeated-ghetsis
1 change: 1 addition & 0 deletions data/v2/csv/encounter_conditions.csv
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ id,identifier
11,item
12,weekday
13,first-party-pokemon
14,special-encounter
131 changes: 131 additions & 0 deletions data/v2/csv/encounters.csv
Original file line number Diff line number Diff line change
Expand Up @@ -61124,3 +61124,134 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
66603,29,1156,1139,104,16,19
66604,29,1156,875,240,16,19
66605,29,1156,845,115,16,19
66606,7,388,565,100,25,25
66607,8,388,565,100,25,25
66608,9,388,566,100,25,25
66609,7,388,565,100,25,25
66610,8,388,565,100,25,25
66611,9,388,566,100,25,25
66612,7,388,565,100,25,25
66613,8,388,565,100,25,25
66614,9,388,566,100,25,25
66615,8,1166,565,101,30,30
66616,9,1166,566,101,30,30
66617,8,1166,565,101,30,30
66618,9,1166,566,101,30,30
66619,7,1167,565,101,30,30
66620,7,1167,565,101,30,30
66615,8,1165,565,101,30,30
66616,9,1165,566,101,30,30
66617,8,1165,565,101,30,30
66618,9,1165,566,101,30,30
66619,7,1166,565,101,30,30
66620,7,1166,565,101,30,30
66621,17,1167,571,494,15,15
66622,18,1167,571,494,15,15
66623,17,580,571,518,50,50
66624,18,580,571,518,50,50
66625,17,652,571,571,25,25
66626,18,652,571,571,25,25
66627,17,629,571,590,20,20
66628,18,629,571,590,20,20
66629,17,629,571,590,20,20
66630,18,629,571,590,20,20
66631,17,643,571,590,30,30
66632,18,643,571,590,30,30
66633,17,643,571,590,30,30
66634,18,643,571,590,30,30
66635,17,643,571,591,40,40
66636,18,643,571,591,40,40
66637,17,643,571,591,40,40
66638,18,643,571,591,40,40
66639,17,588,571,637,70,70
66640,18,588,571,637,70,70
66641,17,630,571,638,42,42
66642,18,630,571,638,42,42
66643,17,602,571,639,42,42
66644,18,602,571,639,42,42
66645,17,1168,571,640,42,42
66646,18,1168,571,640,42,42
66647,17,1176,571,641,40,40
66648,18,1176,571,642,40,40
66649,17,1170,571,643,50,50
66650,18,1170,571,644,50,50
66651,17,1171,571,643,50,50
66652,18,1171,571,644,50,50
66653,17,649,571,645,70,70
66654,18,649,571,645,70,70
66655,17,617,571,646,75,75
66656,18,617,571,646,75,75
66657,21,696,572,377,65,65
66658,22,696,572,377,65,65
66659,21,696,572,378,65,65
66660,22,696,572,378,65,65
66661,21,696,572,379,65,65
66662,22,696,572,379,65,65
66663,22,579,572,380,68,68
66664,21,579,572,381,68,68
66665,21,792,572,480,65,65
66666,22,792,572,480,65,65
66667,21,636,572,481,65,65
66668,22,636,572,481,65,65
66669,21,706,572,482,65,65
66670,22,706,572,482,65,65
66671,21,1172,572,485,68,68
66672,22,1172,572,485,68,68
66673,21,1173,572,486,68,68
66674,22,1173,572,486,68,68
66675,21,622,572,488,68,68
66676,22,622,572,488,68,68
66677,21,700,572,558,42,42
66678,22,700,572,558,42,42
66679,21,629,572,590,29,29
66680,22,629,572,590,29,29
66681,21,629,572,590,29,29
66682,22,629,572,590,29,29
66683,21,629,572,590,29,29
66684,22,629,572,590,29,29
66685,21,632,572,590,36,36
66686,22,632,572,590,36,36
66687,21,632,572,590,36,36
66688,22,632,572,590,36,36
66689,21,645,572,591,47,47
66690,22,645,572,591,47,47
66691,21,645,572,591,47,47
66692,22,645,572,591,47,47
66693,21,705,572,591,47,47
66694,22,705,572,591,47,47
66695,21,705,572,591,47,47
66696,22,705,572,591,47,47
66697,21,706,572,591,56,56
66698,22,706,572,591,56,56
66699,21,706,572,591,56,56
66700,22,706,572,591,56,56
66701,21,706,572,591,56,56
66702,22,706,572,591,56,56
66703,21,619,572,593,40,40
66704,22,619,572,10279,40,40
66705,21,702,572,612,60,60
66706,22,702,572,612,60,60
66707,22,627,572,628,25,25
66708,21,627,572,630,25,25
66709,21,588,572,637,35,35
66710,22,588,572,637,35,35
66711,21,588,572,637,65,65
66712,22,588,572,637,65,65
66713,21,647,572,638,45,45
66714,22,647,572,638,45,45
66715,21,647,572,638,65,65
66716,22,647,572,638,65,65
66717,21,705,572,639,45,45
66718,22,705,572,639,45,45
66719,21,705,572,639,65,65
66720,22,705,572,639,65,65
66721,21,645,572,640,45,45
66722,22,645,572,640,45,45
66723,21,645,572,640,65,65
66724,22,645,572,640,65,65
66725,22,1171,572,643,70,70
66726,21,1171,572,644,70,70
66727,21,617,572,646,70,70
66728,22,617,572,646,70,70
66729,17,579,571,518,50,50
66730,18,579,571,518,50,50
4 changes: 3 additions & 1 deletion data/v2/csv/location_area_prose.csv
Original file line number Diff line number Diff line change
Expand Up @@ -983,7 +983,7 @@ location_area_id,local_language_id,name
600,5,Route Victoire (zone inconnue 54)
601,9,Victory Road (unknown area 55)
601,5,Route Victoire (zone inconnue 55)
602,9,Victory Road (unknown area 56)
602,9,Victory Road (4f Middle Room)
602,5,Route Victoire (zone inconnue 56)
603,9,Victory Road (unknown area 57)
603,5,Route Victoire (zone inconnue 57)
Expand Down Expand Up @@ -1463,3 +1463,5 @@ location_area_id,local_language_id,name
841,5,Repaire Rocket d'Acajou
842,9,Sinjoy Ruins
842,5,Ruines Sinjoh
1167,9,Ligthouse Basement
1169,9,Rumination Field
17 changes: 13 additions & 4 deletions data/v2/csv/location_areas.csv
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@ id,location_id,game_index,identifier
590,379,41,1f
591,379,42,b1f
592,379,43,b2f
593,380,44,
593,380,44,b1f-3f
594,381,48,entrance
595,381,49,outside
596,381,50,1f
Expand All @@ -491,9 +491,9 @@ id,location_id,game_index,identifier
599,382,53,unknown-area-53
600,382,54,unknown-area-54
601,382,55,unknown-area-55
602,382,56,unknown-area-56
602,382,56,4f-middle-room
603,382,57,unknown-area-57
604,382,58,unknown-area-58
604,382,58,1f-unknown-room
605,382,59,unknown-area-59
606,382,60,unknown-area-60
607,382,61,unknown-area-61
Expand Down Expand Up @@ -1052,4 +1052,13 @@ id,location_id,game_index,identifier
1161,1053,0,
1162,1050,0,
1163,750,0,all-areas
1164,762,0,all-areas
1164,762,0,all-areas
1165,692,0,
1166,694,0,
1167,404,0,lighthouse-basement
1168,375,0,rumination-field
1169,1054,0,
1170,387,0,throne-room
1171,381,0,7f
1172,546,0,b1f
1173,380,0,b4f
3 changes: 2 additions & 1 deletion data/v2/csv/locations.csv
Original file line number Diff line number Diff line change
Expand Up @@ -1034,4 +1034,5 @@ id,region_id,identifier
1050,7,ultra-megalopolis
1051,7,ultra-space-wilds
1052,7,poke-pelago
1053,7,team-rockets-castle
1053,7,team-rockets-castle
1054,5,roaming-unova
2 changes: 2 additions & 0 deletions data/v2/csv/pokemon.csv
Original file line number Diff line number Diff line change
Expand Up @@ -1301,3 +1301,5 @@ id,identifier,species_id,height,weight,base_experience,order,is_default
10275,ogerpon-cornerstone-mask,1017,12,398,275,,0
10276,terapagos-terastal,1024,3,160,90,,0
10277,terapagos-stellar,1024,17,770,90,,0
10278,frillish-female,592,12,330,67,,0
10279,jellicent-female,593,22,1350,168,,0
Loading