From 4e39d15785bbacd408d3743ac6b237617d138c65 Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Fri, 10 Jul 2026 23:28:29 -0700 Subject: [PATCH 1/3] Fix issues with ef106328f --- data/v2/csv/encounter_condition_value_map.csv | 1 - data/v2/csv/encounters.csv | 52 +++++++++---------- 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/data/v2/csv/encounter_condition_value_map.csv b/data/v2/csv/encounter_condition_value_map.csv index db4493a69..4ec484368 100644 --- a/data/v2/csv/encounter_condition_value_map.csv +++ b/data/v2/csv/encounter_condition_value_map.csv @@ -17801,7 +17801,6 @@ encounter_id,encounter_condition_value_id 62489,64 58115,70 58116,70 -62489,71 62490,71 62491,71 62492,71 diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 8d142f236..ed91c8b3f 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -56885,36 +56885,36 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 62460,15,841,570,109,21,21 62461,15,841,570,109,21,21 62462,15,841,570,109,21,21 -62463,14,841,570,74,21,21 -62464,14,841,570,74,21,21 -62465,14,841,570,74,21,21 -62466,14,841,570,74,21,21 -62467,14,841,570,74,21,21 -62468,14,841,570,100,23,23 -62469,14,841,570,100,23,23 -62470,14,841,570,100,23,23 -62471,14,841,570,100,23,23 -62472,14,841,570,100,23,23 -62473,14,841,570,100,23,23 -62474,14,841,570,101,23,23 -62475,14,841,570,101,23,23 -62476,14,841,570,101,23,23 -62477,14,841,570,109,21,21 -62478,14,841,570,109,21,21 -62479,14,841,570,109,21,21 -62480,14,841,570,109,21,21 -62481,14,841,570,109,21,21 +62463,16,841,570,74,21,21 +62464,16,841,570,74,21,21 +62465,16,841,570,74,21,21 +62466,16,841,570,74,21,21 +62467,16,841,570,74,21,21 +62468,16,841,570,100,23,23 +62469,16,841,570,100,23,23 +62470,16,841,570,100,23,23 +62471,16,841,570,100,23,23 +62472,16,841,570,100,23,23 +62473,16,841,570,100,23,23 +62474,16,841,570,101,23,23 +62475,16,841,570,101,23,23 +62476,16,841,570,101,23,23 +62477,16,841,570,109,21,21 +62478,16,841,570,109,21,21 +62479,16,841,570,109,21,21 +62480,16,841,570,109,21,21 +62481,16,841,570,109,21,21 62482,15,841,570,101,23,23 62483,15,841,570,101,23,23 62484,15,841,570,101,23,23 -62485,14,841,570,101,23,23 -62486,14,841,570,101,23,23 -62487,14,841,570,101,23,23 -62488,14,200,570,131,20,20 +62485,16,841,570,101,23,23 +62486,16,841,570,101,23,23 +62487,16,841,570,101,23,23 +62488,16,200,570,131,20,20 62489,15,200,570,131,20,20 -62490,14,842,570,482,1,1 -62491,14,842,570,483,1,1 -62492,14,842,570,487,1,1 +62490,16,842,570,482,1,1 +62491,16,842,570,483,1,1 +62492,16,842,570,487,1,1 62493,15,842,570,482,1,1 62494,15,842,570,483,1,1 62495,15,842,570,487,1,1 From fc8c41ce24e2f17a2ccb3c197ae6eaa25c8edce5 Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Sat, 11 Jul 2026 19:54:17 -0700 Subject: [PATCH 2/3] Fix pokemon id off-by-one --- data/v2/csv/encounters.csv | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index ed91c8b3f..a0d985391 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -56912,11 +56912,11 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 62487,16,841,570,101,23,23 62488,16,200,570,131,20,20 62489,15,200,570,131,20,20 -62490,16,842,570,482,1,1 -62491,16,842,570,483,1,1 +62490,16,842,570,483,1,1 +62491,16,842,570,484,1,1 62492,16,842,570,487,1,1 -62493,15,842,570,482,1,1 -62494,15,842,570,483,1,1 +62493,15,842,570,483,1,1 +62494,15,842,570,484,1,1 62495,15,842,570,487,1,1 62496,7,388,565,100,25,25 62497,27,388,575,100,25,25 From 16091eaa874b07022946c5208734534a3b549b35 Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Sun, 12 Jul 2026 09:07:37 -0700 Subject: [PATCH 3/3] Add missing Giratina encounters in Platinum --- data/v2/csv/encounter_condition_value_map.csv | 1 + data/v2/csv/encounter_condition_value_prose.csv | 1 + data/v2/csv/encounter_condition_values.csv | 1 + data/v2/csv/encounters.csv | 2 ++ data/v2/csv/location_area_prose.csv | 1 + data/v2/csv/location_areas.csv | 1 + 6 files changed, 7 insertions(+) diff --git a/data/v2/csv/encounter_condition_value_map.csv b/data/v2/csv/encounter_condition_value_map.csv index d25b1b91b..2a3fd6802 100644 --- a/data/v2/csv/encounter_condition_value_map.csv +++ b/data/v2/csv/encounter_condition_value_map.csv @@ -61877,3 +61877,4 @@ encounter_id,encounter_condition_value_id 95628,256 95629,255 95629,35 +95631,323 diff --git a/data/v2/csv/encounter_condition_value_prose.csv b/data/v2/csv/encounter_condition_value_prose.csv index 496a71a0a..40caaabac 100644 --- a/data/v2/csv/encounter_condition_value_prose.csv +++ b/data/v2/csv/encounter_condition_value_prose.csv @@ -443,3 +443,4 @@ encounter_condition_value_id,local_language_id,name 320,9,At least 49 Water block points placed 321,9,Have Cover Fossil in bag 322,9,Have Plume Fossil in bag +323,9,Did not catch Giratina in the Distortion World diff --git a/data/v2/csv/encounter_condition_values.csv b/data/v2/csv/encounter_condition_values.csv index eea610f5f..bad0a5f8b 100644 --- a/data/v2/csv/encounter_condition_values.csv +++ b/data/v2/csv/encounter_condition_values.csv @@ -321,3 +321,4 @@ id,encounter_condition_id,identifier,is_default 320,26,johto-safari-blocks-water-min-49,0 321,11,item-cover-fossil,0 322,11,item-plume-fossil,0 +323,10,other-giratina-not-caught-in-distortion-world,0 diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 00b505351..cfb4e922e 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -89761,3 +89761,5 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 95627,50,894,2498,593,60,60 95628,50,894,2499,691,40,45 95629,50,894,2499,691,60,60 +95630,14,1379,569,487,47,47 +95631,14,82,569,487,47,47 diff --git a/data/v2/csv/location_area_prose.csv b/data/v2/csv/location_area_prose.csv index 7c1e9dfaa..d73739037 100644 --- a/data/v2/csv/location_area_prose.csv +++ b/data/v2/csv/location_area_prose.csv @@ -2504,3 +2504,4 @@ location_area_id,local_language_id,name 1376,9,Random caves across the Isle of Armor 1377,9,Nacrene Museum 1378,9,Giant's Mirror (Area 2) +1379,9,Distortion World diff --git a/data/v2/csv/location_areas.csv b/data/v2/csv/location_areas.csv index 37255e0ed..b0c05ddcf 100644 --- a/data/v2/csv/location_areas.csv +++ b/data/v2/csv/location_areas.csv @@ -1251,3 +1251,4 @@ id,location_id,game_index,identifier 1376,1116,0, 1377,349,0,nacrene-museum 1378,902,0,area-2 +1379,219,0,