From a37aa6e8d286269b1af5b319e6e6fa56a690444d Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Sat, 30 May 2026 11:33:09 -0700 Subject: [PATCH] Add bug catching contest encounters --- data/v2/csv/encounter_condition_prose.csv | 1 + data/v2/csv/encounter_condition_value_map.csv | 308 ++++++++++++++++++ .../csv/encounter_condition_value_prose.csv | 2 + data/v2/csv/encounter_condition_values.csv | 2 + data/v2/csv/encounter_conditions.csv | 1 + data/v2/csv/encounter_slots.csv | 10 + data/v2/csv/encounters.csv | 80 +++++ 7 files changed, 404 insertions(+) diff --git a/data/v2/csv/encounter_condition_prose.csv b/data/v2/csv/encounter_condition_prose.csv index 01f4edaf8..2a856089a 100644 --- a/data/v2/csv/encounter_condition_prose.csv +++ b/data/v2/csv/encounter_condition_prose.csv @@ -40,3 +40,4 @@ encounter_condition_id,local_language_id,name 19,9,Honey Tree Group 20,9,Headbutt Tree Type 21,9,Listen to Mr. Backlot +22,9,Bug-Catching Contest diff --git a/data/v2/csv/encounter_condition_value_map.csv b/data/v2/csv/encounter_condition_value_map.csv index 383f04741..ddf2c863e 100644 --- a/data/v2/csv/encounter_condition_value_map.csv +++ b/data/v2/csv/encounter_condition_value_map.csv @@ -22316,3 +22316,311 @@ encounter_id,encounter_condition_value_id 75209,203 75210,37 75210,203 +75211,205 +75211,186 +75212,205 +75212,186 +75213,205 +75213,186 +75214,205 +75214,186 +75215,205 +75215,186 +75216,205 +75216,186 +75217,205 +75217,186 +75218,205 +75218,186 +75219,205 +75219,186 +75220,205 +75220,186 +75221,205 +75221,186 +75222,205 +75222,186 +75223,205 +75223,186 +75224,205 +75224,186 +75225,205 +75225,186 +75226,205 +75226,186 +75227,205 +75227,186 +75228,205 +75228,186 +75229,205 +75229,186 +75230,205 +75230,186 +75231,205 +75231,37 +75231,61 +75232,205 +75232,37 +75232,61 +75233,205 +75233,37 +75233,61 +75234,205 +75234,37 +75234,61 +75235,205 +75235,37 +75235,61 +75236,205 +75236,37 +75236,61 +75237,205 +75237,37 +75237,61 +75238,205 +75238,37 +75238,61 +75239,205 +75239,37 +75239,61 +75240,205 +75240,37 +75240,61 +75241,205 +75241,37 +75241,61 +75242,205 +75242,37 +75242,61 +75243,205 +75243,37 +75243,61 +75244,205 +75244,37 +75244,61 +75245,205 +75245,37 +75245,61 +75246,205 +75246,37 +75246,61 +75247,205 +75247,37 +75247,61 +75248,205 +75248,37 +75248,61 +75249,205 +75249,37 +75249,61 +75250,205 +75250,37 +75250,61 +75251,205 +75251,37 +75251,63 +75252,205 +75252,37 +75252,63 +75253,205 +75253,37 +75253,63 +75254,205 +75254,37 +75254,63 +75255,205 +75255,37 +75255,63 +75256,205 +75256,37 +75256,63 +75257,205 +75257,37 +75257,63 +75258,205 +75258,37 +75258,63 +75259,205 +75259,37 +75259,63 +75260,205 +75260,37 +75260,63 +75261,205 +75261,37 +75261,63 +75262,205 +75262,37 +75262,63 +75263,205 +75263,37 +75263,63 +75264,205 +75264,37 +75264,63 +75265,205 +75265,37 +75265,63 +75266,205 +75266,37 +75266,63 +75267,205 +75267,37 +75267,63 +75268,205 +75268,37 +75268,63 +75269,205 +75269,37 +75269,63 +75270,205 +75270,37 +75270,63 +75271,205 +75271,37 +75271,65 +75272,205 +75272,37 +75272,65 +75273,205 +75273,37 +75273,65 +75274,205 +75274,37 +75274,65 +75275,205 +75275,37 +75275,65 +75276,205 +75276,37 +75276,65 +75277,205 +75277,37 +75277,65 +75278,205 +75278,37 +75278,65 +75279,205 +75279,37 +75279,65 +75280,205 +75280,37 +75280,65 +75281,205 +75281,37 +75281,65 +75282,205 +75282,37 +75282,65 +75283,205 +75283,37 +75283,65 +75284,205 +75284,37 +75284,65 +75285,205 +75285,37 +75285,65 +75286,205 +75286,37 +75286,65 +75287,205 +75287,37 +75287,65 +75288,205 +75288,37 +75288,65 +75289,205 +75289,37 +75289,65 +75290,205 +75290,37 +75290,65 +14926,204 +14927,204 +14928,204 +14930,204 +14931,204 +14932,204 +14934,204 +14935,204 +14936,204 +14937,204 +14938,204 +14939,204 +14940,204 +14941,204 +14942,204 +14943,204 +14944,204 +14945,204 +14946,204 +14947,204 +14948,204 +14949,204 +14950,204 +14951,204 +14952,204 +14953,204 +14954,204 +14955,204 +14956,204 +14957,204 +14958,204 +14959,204 +14960,204 +14961,204 +14962,204 +14963,204 +14964,204 +14965,204 +14966,204 +14967,204 +14968,204 +14969,204 +14970,204 +14971,204 +19940,204 +19941,204 +19942,204 +19944,204 +19945,204 +19946,204 +19948,204 +19949,204 +19950,204 +19951,204 +19952,204 +19953,204 +19954,204 +19955,204 +19956,204 +19957,204 +19958,204 +19959,204 +19960,204 +19961,204 +19962,204 +19963,204 +19964,204 +19965,204 +19966,204 +19967,204 +19968,204 +19969,204 +19970,204 +19971,204 +19972,204 +19973,204 +19974,204 +19975,204 +19976,204 +19977,204 +19978,204 +19979,204 +19980,204 +19981,204 +19982,204 +19983,204 +19984,204 +19985,204 diff --git a/data/v2/csv/encounter_condition_value_prose.csv b/data/v2/csv/encounter_condition_value_prose.csv index 2839362a3..89a24c45b 100644 --- a/data/v2/csv/encounter_condition_value_prose.csv +++ b/data/v2/csv/encounter_condition_value_prose.csv @@ -324,3 +324,5 @@ encounter_condition_value_id,local_language_id,name 201,9,Give Hippowdon in a Trade 202,9,Mr. Backlot hasn't mentioned any Pokemon 203,9,Mr. Backlot has mentioned seeing this Pokemon in the garden +204,9,Not during the Bug-Catching Contest +205,9,During the Bug-Catching Contest diff --git a/data/v2/csv/encounter_condition_values.csv b/data/v2/csv/encounter_condition_values.csv index 89a038add..8115f8a62 100644 --- a/data/v2/csv/encounter_condition_values.csv +++ b/data/v2/csv/encounter_condition_values.csv @@ -202,3 +202,5 @@ id,encounter_condition_id,identifier,is_default 201,15,trade-hippowdon,1 202,21,backlot-not-mentioned,1 203,21,backlot-mentioned,0 +204,22,bug-catching-contest-no,1 +205,22,bug-catching-contest-yes,0 diff --git a/data/v2/csv/encounter_conditions.csv b/data/v2/csv/encounter_conditions.csv index 1ba300d67..3a38986c2 100644 --- a/data/v2/csv/encounter_conditions.csv +++ b/data/v2/csv/encounter_conditions.csv @@ -20,3 +20,4 @@ id,identifier 19,honey-tree-group 20,headbutt-tree 21,backlot +22,bug-catching-contest diff --git a/data/v2/csv/encounter_slots.csv b/data/v2/csv/encounter_slots.csv index a0225952e..4dadc4684 100644 --- a/data/v2/csv/encounter_slots.csv +++ b/data/v2/csv/encounter_slots.csv @@ -1487,3 +1487,13 @@ id,version_group_id,encounter_method_id,slot,rarity 1486,10,7,5,5 1487,10,7,6,5 1488,14,36,,100 +1489,10,1,1,20 +1490,10,1,2,20 +1491,10,1,3,10 +1492,10,1,4,10 +1493,10,1,5,10 +1494,10,1,6,10 +1495,10,1,7,5 +1496,10,1,8,5 +1497,10,1,9,5 +1498,10,1,10,5 diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv index 5cdcd997a..9d7da05b5 100644 --- a/data/v2/csv/encounters.csv +++ b/data/v2/csv/encounters.csv @@ -69346,3 +69346,83 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level 75208,14,118,130,183,22,22 75209,14,118,130,113,22,22 75210,14,118,130,298,22,22 +75211,15,207,1489,10,7,18 +75212,16,207,1489,10,7,18 +75213,15,207,1490,13,7,18 +75214,16,207,1490,13,7,18 +75215,15,207,1491,11,9,18 +75216,16,207,1491,11,9,18 +75217,15,207,1492,14,9,18 +75218,16,207,1492,14,9,18 +75219,15,207,1493,46,10,17 +75220,16,207,1493,46,10,17 +75221,15,207,1494,48,10,16 +75222,16,207,1494,48,10,16 +75223,15,207,1495,12,12,15 +75224,16,207,1495,12,12,15 +75225,15,207,1496,15,12,15 +75226,16,207,1496,15,12,15 +75227,15,207,1497,123,13,14 +75228,16,207,1497,123,13,14 +75229,15,207,1498,127,13,14 +75230,16,207,1498,127,13,14 +75231,15,207,1489,10,24,36 +75232,16,207,1489,10,24,36 +75233,15,207,1490,13,24,36 +75234,16,207,1490,13,24,36 +75235,15,207,1491,11,26,36 +75236,16,207,1491,11,26,36 +75237,15,207,1492,14,26,36 +75238,16,207,1492,14,26,36 +75239,15,207,1493,46,27,34 +75240,16,207,1493,46,27,34 +75241,15,207,1494,48,25,32 +75242,16,207,1494,48,25,32 +75243,15,207,1495,12,27,30 +75244,16,207,1495,12,27,30 +75245,15,207,1496,15,27,30 +75246,16,207,1496,15,27,30 +75247,15,207,1497,123,27,28 +75248,16,207,1497,123,27,28 +75249,15,207,1498,127,27,28 +75250,16,207,1498,127,27,28 +75251,15,207,1489,265,24,36 +75252,16,207,1489,265,24,36 +75253,15,207,1490,290,26,36 +75254,16,207,1490,290,26,36 +75255,15,207,1491,266,24,36 +75256,16,207,1491,266,24,36 +75257,15,207,1492,313,26,36 +75258,16,207,1492,313,26,36 +75259,15,207,1493,401,27,30 +75260,16,207,1493,401,27,30 +75261,15,207,1494,402,27,30 +75262,16,207,1494,402,27,30 +75263,15,207,1495,123,27,28 +75264,16,207,1495,123,27,28 +75265,15,207,1496,269,25,32 +75266,16,207,1496,269,25,32 +75267,15,207,1497,127,27,28 +75268,16,207,1497,127,27,28 +75269,15,207,1498,415,27,34 +75270,16,207,1498,415,27,34 +75271,15,207,1489,265,24,36 +75272,16,207,1489,265,24,36 +75273,15,207,1490,290,26,36 +75274,16,207,1490,290,26,36 +75275,15,207,1491,268,24,36 +75276,16,207,1491,268,24,36 +75277,15,207,1492,314,26,36 +75278,16,207,1492,314,26,36 +75279,15,207,1493,401,27,30 +75280,16,207,1493,401,27,30 +75281,15,207,1494,402,27,30 +75282,16,207,1494,402,27,30 +75283,15,207,1495,123,27,28 +75284,16,207,1495,123,27,28 +75285,15,207,1496,267,25,32 +75286,16,207,1496,267,25,32 +75287,15,207,1497,127,27,28 +75288,16,207,1497,127,27,28 +75289,15,207,1498,415,27,34 +75290,16,207,1498,415,27,34