Skip to content

Commit e536163

Browse files
committed
Unique encounter methods for each game
A rather large update to this PR, but it's in line with what jemarq04 suggested and I think it's a cleaner way to approach this: - gift-exterrnal-game removed as an encounter_method - Added an encounter_method for each way you can receive a Pokemon. Methods added: - colosseum-bonus-disc-us - colosseum-bonus-disc-jpn - pokemon-channel-pal - pokemon-ranger - pokemon-battle-revolution - new-york-pokecenter-wish-eggs Currently there's no encounterr data for pokemon-battle-revolution or for new-york-pokecenter-wish-eggs, they're set up for future stuff I'll add. After that, locations and location_areas have been changed. Most gift pokemon, be it from limited events or from external games have you receive the event in a Pokemart or pokecenter. This change in structure will now show, celebi in RSE/FRLGs encounter data something like: Location: hoenn-pokemart Method: colosseum-bonus-disc-jpn This covers the same events as before.
1 parent d0446b8 commit e536163

3 files changed

Lines changed: 20 additions & 15 deletions

File tree

data/v2/csv/encounter_methods.csv

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,9 @@ id,identifier,order
4242
41,overworld-special,41
4343
42,overworld-flying-special,42
4444
43,overworld-water-special,43
45-
44,gift-external-game, 43
45+
44,colosseum-bonus-disc-us, 44
46+
45,colosseum-bonus-disc-jpn, 45
47+
46,pokemon-channel-pal, 46
48+
47,pokemon-ranger, 47
49+
48,pokemon-battle-revolution, 48
50+
49,new-york-pokecenter-wish-eggs,49

data/v2/csv/encounters.csv

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64652,16 +64652,16 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
6465264652
70211,32,278,1178,146,3,56
6465364653
70212,31,278,1178,149,3,56
6465464654
70213,32,278,1178,149,3,56
64655-
70214,7,1204,1181,251,10,10
64656-
70215,8,1204,1181,251,10,10
64657-
70216,9,1204,1182,251,10,10
64658-
70217,7,1204,1189,25,10,10
64659-
70218,8,1204,1189,25,10,10
64660-
70219,9,1204,1190,25,10,10
64655+
70214,7,1205,1181,251,10,10
64656+
70215,8,1205,1181,251,10,10
64657+
70216,9,1205,1182,251,10,10
64658+
70217,7,1205,1189,25,10,10
64659+
70218,8,1205,1189,25,10,10
64660+
70219,9,1205,1190,25,10,10
6466164661
70220,7,1205,1183,385,5,5
6466264662
70221,8,1205,1183,385,5,5
64663-
70222,7,1206,1184,385,5,5
64664-
70223,8,1206,1184,385,5,5
64663+
70222,7,1205,1184,385,5,5
64664+
70223,8,1205,1184,385,5,5
6466564665
70224,10,1207,1185,251,10,10
6466664666
70225,11,1207,1185,251,10,10
6466764667
70226,10,1207,1191,25,10,10

data/v2/csv/locations.csv

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1069,9 +1069,9 @@ id,region_id,identifier
10691069
1085,10,savanna-biome
10701070
1086,10,savanna-plaza
10711071
1087,10,torchlit-labyrinth
1072-
1088,3,jpn-colosseum-bonus-disc-hoenn
1073-
1089,3,us-colosseum-bonus-disc
1074-
1090,3,pokemon-channel
1075-
1091,1,jpn-colosseum-bonus-disc-kanto
1076-
1092,4,pokemon-ranger-sinnoh
1077-
1093,2,pokemon-ranger-johto
1072+
1088,3,hoenn-pokemart
1073+
1089,3,hoenn-pokecenter
1074+
1090,1,kanto-pokemart
1075+
1091,1,kanto-pokecenter
1076+
1092,4,sinnoh-pokemart
1077+
1093,2,johto-pokemart

0 commit comments

Comments
 (0)