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

Johto Safari Zone, fix encounters/methods, roaming Pokemon and new encounters #738

Merged
merged 34 commits into from
Aug 30, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
39c7bf7
Johto Safari Zone, encounters, methods location and location areas
SimplyBLGDev Jul 23, 2022
4b5e21f
Add encounter conditions to crystal route 13
SimplyBLGDev Jul 23, 2022
16cd2be
Add National Dex requirements to appropriate HGSS safari encounters
SimplyBLGDev Jul 23, 2022
7dfdd85
Add encounter slots for Johto Safari Zone
SimplyBLGDev Jul 24, 2022
8d43792
Add Celebi encounter to VC Crystal
SimplyBLGDev Jul 24, 2022
fa68edb
Add Missing FR/LG Legendary encounters
SimplyBLGDev Jul 24, 2022
c7795d7
Add missing encounters to Mt. Ember summit
SimplyBLGDev Jul 24, 2022
104c13d
Replace Roaming Pokémon encounter method
SimplyBLGDev Jul 24, 2022
143aaec
Add Roaming Pokémon in D/P/Pt
SimplyBLGDev Jul 24, 2022
699f0a5
Add missing legendary encounters in HG/SS
SimplyBLGDev Jul 24, 2022
df8488d
Add HG/SS Groudon, Kyogre and Rayquaza encounters
SimplyBLGDev Jul 24, 2022
f5d5b2c
Add missing legendary encounters for D/P/Pt
SimplyBLGDev Jul 24, 2022
bd00fca
Add Missing gift Pokémon in R/B/Y
SimplyBLGDev Jul 24, 2022
c344cc8
Add Missing gift Pokémon in R/S/E
SimplyBLGDev Jul 24, 2022
8d6f339
Add Missing gift Pokémon in FR/LG
SimplyBLGDev Jul 24, 2022
0496b6d
Add missing conditions gift Pokémon D/P/Pt, remove wrong encounters
SimplyBLGDev Jul 24, 2022
fe15740
Add missing conditions gift Pokémon HG/SS
SimplyBLGDev Jul 24, 2022
8566421
Move gift Hoenn starters from 7f to silph co. HG/SS
SimplyBLGDev Jul 24, 2022
7c1f2cf
Add missing gift Pokémon in HG/SS
SimplyBLGDev Jul 24, 2022
2dd520e
Add missing gift Pokémon in Crystal
SimplyBLGDev Jul 24, 2022
62bc7aa
Add Shiny Gyarados encounter in G/S/C
SimplyBLGDev Jul 24, 2022
88806d3
Add Shiny Gyarados encounter in HG/SS
SimplyBLGDev Jul 24, 2022
ec95156
Add missing legendary encounters D/P/Pt
SimplyBLGDev Jul 24, 2022
4189d28
Update Johto Safari Zone encounter slots and chances
SimplyBLGDev Jul 24, 2022
daf5123
Add missing static encounters in R/B/Y
SimplyBLGDev Jul 24, 2022
153c608
Add missing static encounters in G/S/C
SimplyBLGDev Jul 24, 2022
21b71c3
Add missing static encounters in R/S/E
SimplyBLGDev Jul 24, 2022
d768dfc
Add Feebas encounters in R/S/E
SimplyBLGDev Jul 24, 2022
9dced11
Add missing gift Pokémon encounter conditions FR/LG
SimplyBLGDev Jul 24, 2022
e4ad8fc
Add missing static encounters in D/P/Pt
SimplyBLGDev Jul 25, 2022
f9cfb50
Remove duplicated encounter in Crystal Dragon's Den
SimplyBLGDev Jul 25, 2022
272ec43
Add missing static Pokémon in FR/LG
SimplyBLGDev Jul 25, 2022
ef10632
Add missing static encounters, mythicals, encounter conditoins to HG/…
SimplyBLGDev Jul 25, 2022
3d452dd
Merge branch 'master' into simply-fix-missing-encounters
SimplyBLGDev Aug 24, 2022
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
Prev Previous commit
Next Next commit
Add missing static encounters, mythicals, encounter conditoins to HG/…
…SS, fix incorrect condition values
  • Loading branch information
SimplyBLGDev committed Jul 25, 2022
commit ef106328f8549e88ca2ace844a3d0e3fb530bf15
11 changes: 11 additions & 0 deletions data/v2/csv/encounter_condition_value_map.csv
Original file line number Diff line number Diff line change
Expand Up @@ -20677,3 +20677,14 @@ encounter_id,encounter_condition_value_id
62439,5
62440,5
62441,5
62488,64
62489,64
58115,70
58116,70
62489,71
62490,71
62491,71
62492,71
62493,71
62494,71
62495,71
2 changes: 2 additions & 0 deletions data/v2/csv/encounter_condition_value_prose.csv
Original file line number Diff line number Diff line change
Expand Up @@ -88,3 +88,5 @@ encounter_condition_value_id,local_language_id,name
67,9,Beat Mars for the first time
68,9,Have Odd Keystone in bag
69,9,Has talked to at least 32 people in the underground
70,9,Returned Machine Part to Power Plant
10,9,Have an Event Arceus in the party
12 changes: 7 additions & 5 deletions data/v2/csv/encounter_condition_values.csv
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ id,encounter_condition_id,identifier,is_default
39,10,other-snorlax-11-beat-league,0
40,10,other-virtual-console,0
41,9,story-progress-cure-eldritch-nightmares,0
42,9,other-talk-to-cynthias-grandmother,0
42,10,other-talk-to-cynthias-grandmother,0
43,11,item-none,1
44,11,item-adamant-orb,0
45,11,item-lustrous-orb,0
Expand All @@ -51,12 +51,12 @@ id,encounter_condition_id,identifier,is_default
50,11,item-claw-fossil,0
51,9,story-progress-defeat-jupiter,0
52,9,story-progress-beat-team-galactic-iron-island,0
53,9,other-correct-password,0
53,10,other-correct-password,0
54,9,story-progress-zephyr-badge,0
55,9,story-progress-beat-red,0
56,9,other-received-kanto-starter,0
56,10,other-received-kanto-starter,0
57,9,story-progress-receive-tm-from-claire,0
58,9,other-regirock-regice-registeel-in-party,0
58,10,other-regirock-regice-registeel-in-party,0
59,12,weekday-sunday,0
60,12,weekday-monday,0
61,12,weekday-tuesday,0
Expand All @@ -67,4 +67,6 @@ id,encounter_condition_id,identifier,is_default
66,13,first-party-pokemon-high-friendship,0
67,9,story-progress-defeat-mars,0
68,11,item-odd-keystone,0
69,9,other-talked-to-32-people-underground,0
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
52 changes: 52 additions & 0 deletions data/v2/csv/encounters.csv
Original file line number Diff line number Diff line change
Expand Up @@ -58722,3 +58722,55 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
62441,14,131,569,479,20,20
62442,10,330,567,101,34,34
62443,11,330,567,101,34,34
62444,15,841,570,74,21,21
62445,15,841,570,74,21,21
62446,15,841,570,74,21,21
62447,15,841,570,74,21,21
62448,15,841,570,74,21,21
62449,15,841,570,100,23,23
62450,15,841,570,100,23,23
62451,15,841,570,100,23,23
62452,15,841,570,100,23,23
62453,15,841,570,100,23,23
62454,15,841,570,100,23,23
62455,15,841,570,101,23,23
62456,15,841,570,101,23,23
62457,15,841,570,101,23,23
62458,15,841,570,109,21,21
62459,15,841,570,109,21,21
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
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
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
62493,15,842,570,482,1,1
62494,15,842,570,483,1,1
62495,15,842,570,487,1,1
2 changes: 2 additions & 0 deletions data/v2/csv/location_area_prose.csv
Original file line number Diff line number Diff line change
Expand Up @@ -697,3 +697,5 @@ location_area_id,local_language_id,name
838,9,
839,9,
840,9,
841,9,
842,9,
1 change: 1 addition & 0 deletions data/v2/csv/location_areas.csv
Original file line number Diff line number Diff line change
Expand Up @@ -730,3 +730,4 @@ id,location_id,game_index,identifier
839,179,0,
840,188,0,
841,237,0,
842,247,0,