Commit graph

320 commits

Author SHA1 Message Date
uwx
9957ff9a3a Fix enamorus-therian parenting 2022-09-22 04:23:53 -03:00
Alessandro Pezzè
51468e03a9
Merge branch 'master' into patch-1 2022-09-21 19:29:57 +02:00
Alessandro Pezzè
277b736be5
Merge branch 'master' into simply-encounter-updates 2022-09-21 19:01:52 +02:00
uwx
20261d25f1
Fix basculegion-female parenting 2022-09-21 07:44:44 -03:00
bigjra441
b7873bb279 Added Ursaluna abilities 2022-09-15 10:53:52 -04:00
Simply BLG
975df0a2c4 Add missing static encounters to RSE
+ Voltorb and Electrodes at New Mauville
2022-09-15 11:05:23 -03:00
Simply BLG
7412d9922e Fix Johto Safari Zone encounters, encounter slots
After some more investigating and talking to the bulbapedia maintainers of the Johto Safari Zone page I've been able to gain additional insight on the mechanics and the encounter slots of the safari zone, as such I applied what I learned and had to correct large chunks of data here.
+ Update encounter slots
+ Repositioned encounter slots IDs
+ Updated encounter conditions (Johto Safari Zone's encounter aren't affected by the presence of the national dex)
2022-09-15 10:35:23 -03:00
Simply BLG
c9cb78bd0a Move FR/LG Moltres to Mt. Ember summit 2022-08-31 12:14:16 -03:00
Simply BLG
73726ca55b Add no natdex to Johto Safari Zone encounters
Also remove superflous prefixes to Johto Safari Zone location area names
2022-08-31 11:59:18 -03:00
Simply BLG
3d452dd28a
Merge branch 'master' into simply-fix-missing-encounters 2022-08-24 19:26:09 -03:00
Naramsim
c9f49c95f5 reformat: black 2022-08-08 15:49:09 +02:00
Alessandro Pezzè
c2a781e5de try: use env var 2022-08-08 11:35:35 +02:00
Simply BLG
ef106328f8 Add missing static encounters, mythicals, encounter conditoins to HG/SS, fix incorrect condition values 2022-07-25 09:24:48 -03:00
Simply BLG
272ec4329d Add missing static Pokémon in FR/LG
+ Voltorb in Power plant
2022-07-25 08:52:34 -03:00
Simply BLG
f9cfb50331 Remove duplicated encounter in Crystal Dragon's Den 2022-07-24 22:43:13 -03:00
Simply BLG
e4ad8fc5e4 Add missing static encounters in D/P/Pt
+ Spiritomb in Route 209
+ Rotom in Old Chateau
2022-07-24 21:15:14 -03:00
Simply BLG
9dced11f15 Add missing gift Pokémon encounter conditions FR/LG
+ Added high friendship requirement for Togepi Egg in Water Labyrinth
2022-07-24 20:57:00 -03:00
Simply BLG
d768dfcf7a Add Feebas encounters in R/S/E 2022-07-24 20:49:10 -03:00
Simply BLG
21b71c3661 Add missing static encounters in R/S/E
+ Kecleon in Route 119 and 120 with Devon Scope
2022-07-24 20:44:07 -03:00
Simply BLG
153c6087b8 Add missing static encounters in G/S/C
+ Voltorb, Electrode, Koffing in Rocket HQ
+ Lapras on Fridays in Union Cave
2022-07-24 20:18:05 -03:00
Simply BLG
daf51232cf Add missing static encounters in R/B/Y
+ Voltorb and electrodes in Power Plant
2022-07-24 20:02:32 -03:00
Simply BLG
4189d288b9 Update Johto Safari Zone encounter slots and chances
After some research I found that the Johto Safari zone uses different encounter slots for morning, day and night and I also arrived at these chances for them, I modified the encounters and added the new encounter slots as appropriate, these chances could be wrong but I experimentally tested them and believe that these chances are correct, the chances I found are as follow:
+ When walking there are 10 slots with 10% chance each
+ When fishing with an old-rod, good-rod, super-rod or when surfing the chances are as follow:
| Morning | Day | Night |
|---------|-----|-------|
| 10%     | 10% | 5%    |
| 10%     | 10% | 10%   |
| 10%     | 5%  | 5%    |
| 10%     | 10% | 10%   |
| 5%      | 5%  | 15%   |
| 10%     | 10% | 15%   |
| 5%      | 15% | 0%    |
| 10%     | 15% | 0%    |
| 15%     | 0%  | 10%   |
| 15%     | 0%  | 10%   |
| 0%      | 10% | 10%   |
| 0%      | 10% | 10%   |
Will update if more precise information becomes available
2022-07-24 14:40:07 -03:00
Simply BLG
ec95156acd Add missing legendary encounters D/P/Pt 2022-07-24 13:22:20 -03:00
Simply BLG
88806d3248 Add Shiny Gyarados encounter in HG/SS 2022-07-24 13:12:10 -03:00
Simply BLG
62bc7aaee9 Add Shiny Gyarados encounter in G/S/C 2022-07-24 13:11:27 -03:00
Simply BLG
2dd520e13d Add missing gift Pokémon in Crystal
+ Dratini in Dragon's Den
2022-07-24 13:07:51 -03:00
Simply BLG
7c1f2cffd1 Add missing gift Pokémon in HG/SS
+ Dratini in Dragon's Den
+ Tentacool in Cianwood Pokémon Center
2022-07-24 13:06:23 -03:00
Simply BLG
85664210db Move gift Hoenn starters from 7f to silph co. HG/SS 2022-07-24 12:59:54 -03:00
Simply BLG
fe15740f85 Add missing conditions gift Pokémon HG/SS
+ Passwords for Mareep, Wooper, Slugma Eggs
+ Zephyr Badge Togepi Egg
+ Defeat Red Bulbasaur, Charmander, Squirtle, Treecko, Torchic, Mudkip
+ Receive Kanto starter Treecko, Torchic, Mudkip
2022-07-24 12:58:21 -03:00
Simply BLG
0496b6d33a Add missing conditions gift Pokémon D/P/Pt, remove wrong encounters
+ National Dex requirement for Hearthome Eeevee D/P
+ Defeat Jupiter Eterna City Togepi Egg
+ Remove Togepi Egg from D/P (was incorrect)
+ Clear Team Galactic Iron Island Riolu Egg
2022-07-24 12:36:21 -03:00
Simply BLG
8d6f339d09 Add Missing gift Pokémon in FR/LG
+ Magikarp in Route 3
+ Fossils in Cinnabar Lab
2022-07-24 12:18:54 -03:00
Simply BLG
c344cc8a07 Add Missing gift Pokémon in R/S/E
+ Fossils in Rustboro city
2022-07-24 12:14:27 -03:00
Simply BLG
bd00fca16f Add Missing gift Pokémon in R/B/Y
+ Magikarp in Route 3
+ Fossil Pokémon in Cinnabar Lab
2022-07-24 12:05:31 -03:00
Simply BLG
f5d5b2cb53 Add missing legendary encounters for D/P/Pt
And necessary dependencies
2022-07-23 23:38:36 -03:00
Simply BLG
df8488dce4 Add HG/SS Groudon, Kyogre and Rayquaza encounters 2022-07-23 23:16:37 -03:00
Simply BLG
699f0a530b Add missing legendary encounters in HG/SS 2022-07-23 23:10:35 -03:00
Simply BLG
143aaecc35 Add Roaming Pokémon in D/P/Pt 2022-07-23 22:50:32 -03:00
Simply BLG
104c13da02 Replace Roaming Pokémon encounter method
Roaming Pokémon can be encountered exclusively on grass or water in different situations in different games and at different encounter rates, which is something that wasn't reflected in the previous encounter method (which used to be only one).

+ Added Roaming grass encounter method
+ Added Roaming water encounter method
+ Moved Crystal, Firered, Leafgreen, Ruby, Sapphire and Emerald roaming Pokémon to the new encounter methods
2022-07-23 22:35:17 -03:00
Simply BLG
c7795d7b7d Add missing encounters to Mt. Ember summit
Rock smash encounters at Mt. Ember summit FR/LG
2022-07-23 22:06:55 -03:00
Simply BLG
fa68edb09d Add Missing FR/LG Legendary encounters
+ Moltres at Mt. Ember Summit
2022-07-23 21:57:28 -03:00
Simply BLG
8d437926b7 Add Celebi encounter to VC Crystal 2022-07-23 21:47:39 -03:00
Simply BLG
7dfdd85521 Add encounter slots for Johto Safari Zone 2022-07-23 21:14:38 -03:00
Simply BLG
16cd2be4a2 Add National Dex requirements to appropriate HGSS safari encounters 2022-07-23 20:43:28 -03:00
Simply BLG
4b5e21f589 Add encounter conditions to crystal route 13
For some reason the conditions on this specific area where missing in crystal, despite the data being present in encounters the conditions were not attached to them
2022-07-23 20:25:31 -03:00
Simply BLG
39c7bf7a6b Johto Safari Zone, encounters, methods location and location areas
After much research I was able to find out some mechanics from the johto safari zone, it uses completely different encounter slots in walking, surfing, old rod, good rod and super rod, I was able to determine that it's 10 walk slots all have a 10% chance but wasn't so lucky in finding the chance for the surfing, old rod, good rod and super rod 12 slots, I have -some- confidence that it has 10 10% chance slots and 2 0% chance slots, if more info comes to light about these slots I'll update this info at another time.

+ Added Johto Safari Zone location
+ Added all 12 Safari Zone areas
+ Added all 2880 encounters from the safari zone (For both HG and SS)
2022-07-23 19:54:42 -03:00
Alessandro Pezzè
3d9ad78a12 sync:
https://github.com/PokeAPI/pokedex/pull/108
https://github.com/PokeAPI/pokedex/pull/110
https://github.com/PokeAPI/pokedex/pull/111
https://github.com/PokeAPI/pokedex/pull/112
2022-07-21 11:46:20 +02:00
Alessandro Pezzè
0f44954bda
Merge branch 'master' into enhancement_sprites_uri 2022-07-20 10:25:56 +02:00
Aniket Chakraborty
28354a973c Updated Sprite URL
Previously the sprite endpoint returned the relative path of
the image with a /media/ prefix which was not useful for API consumer.
Now it returns a URL pointing to the image present in github.com/PokeApi/Sprites.

Signed-off-by: Aniket Chakraborty <aniket2583@gmail.com>
2022-06-26 19:01:55 +05:30
LaufenderBaum
877db14657
Merge branch 'master' into update_central_kalos_pokedex 2022-06-24 12:52:34 +02:00
Alessandro Pezzè
e5f647735c sync:
6cb752f8d7
https://github.com/PokeAPI/pokedex/pull/104
https://github.com/PokeAPI/pokedex/pull/95
2022-06-22 15:23:13 +02:00
Alessandro Pezzè
010cecaa71 sync: Hisui 2022-06-22 11:04:28 +02:00
Alessandro Pezzè
3ca38c66c0 sync: Hisui 2022-06-22 09:44:30 +02:00
Nina Erkelenz
c243ba4a1e added entries 151-153 in central kalos pokedex 2022-06-12 21:42:18 +02:00
Alessandro Pezzè
e5fac8ce43 sync: Hisui 2022-06-08 17:53:51 +02:00
Alessandro Pezzè
4de4583ea0 sync: https://github.com/PokeAPI/pokedex/pull/95 2022-05-25 18:45:12 +02:00
Alessandro Pezzè
556720abc5 sync: https://github.com/PokeAPI/pokedex/pull/95 2022-05-24 22:08:31 +02:00
Alessandro Pezzè
985096d697 sync: https://github.com/PokeAPI/pokedex/pull/100 2022-05-06 15:21:17 +02:00
Alessandro Pezzè
aad6b7cbd0 sync:
https://github.com/PokeAPI/pokedex/pull/96
https://github.com/PokeAPI/pokedex/pull/94
2022-05-05 20:59:53 +02:00
Alessandro Pezzè
3748fef0bf data: add missing '2' 2022-04-04 20:56:28 +02:00
Alessandro Pezzè
4fe9073569 data: update shape for some species 2022-04-04 20:54:34 +02:00
Alessandro Pezzè
694ca00785 data: fix 0 2022-03-29 19:50:04 +02:00
Alessandro Pezzè
5ed6571569 data: fix shape 2022-03-29 19:32:52 +02:00
Alessandro Pezzè
5c4d53d896 data: restore shape_id for 8xx species 2022-03-29 18:51:40 +02:00
Alessandro Pezzè
66c9db4f0c data: update ID 2022-03-29 18:40:38 +02:00
Alessandro Pezzè
9758dc5b90 data: remove broken effect entry 2022-03-28 20:18:24 +02:00
TurtIeSocks
4d3c121ed2 Restore Venusaur Gmax Stats
Addresses #697
2022-02-21 10:44:02 -05:00
Alessandro Pezzè
b80e8f411b sync: https://github.com/PokeAPI/pokedex/pull/86 2022-02-06 22:36:31 +01:00
Alessandro Pezzè
6a56d2b286 sync: https://github.com/PokeAPI/pokedex/pull/85 2022-01-22 21:45:04 +01:00
Alessandro Pezzè
16d18d7af0 sync: https://github.com/PokeAPI/pokedex/pull/78 2021-12-27 11:08:39 +01:00
Alessandro Pezzè
05cb9d846e sync: https://github.com/PokeAPI/pokedex/pull/74 2021-12-18 20:11:40 +01:00
Alessandro Pezzè
52439d1927 fix: https://github.com/PokeAPI/pokedex/pull/75 2021-12-16 23:51:59 +01:00
Alessandro Pezzè
36ad7a3d45 sync: https://github.com/PokeAPI/pokedex/pull/73 2021-12-15 19:21:31 +01:00
Alessandro Pezzè
b2aa4baff5 fix(#533): sync data from veekun 2021-12-07 11:38:06 +01:00
Alessandro Pezzè
2dcb787ff8 feat: bring in new data 2021-12-06 21:40:17 +01:00
Christian Garza
e4affb50c9 Add transparent sprites for gen-i and gen-ii 2021-11-15 17:57:00 -08:00
Christian Garza
7e85f9139b Update sprites submodule 2021-11-14 19:48:10 -08:00
Alessandro Pezzè
bcd290be71 fix: format code 2021-10-25 19:27:41 +02:00
Rolf
eb4d313c1d Added Pokémon Home images support. 2021-10-04 20:53:15 +02:00
Umesh
cf104bf2de Fixed typo on species 186 2021-09-06 22:14:17 +05:30
stormonster
36b8e98d87 Actually removed soft hyphen properly this time 2021-09-06 12:45:30 +02:00
stormonster
acd398ce5f Fixed typo on species 236. Fixes issue #646 2021-09-06 11:02:53 +02:00
prof64
2ec8c2a47d Update pokemon_species_names.csv
Changed the apostrophe in Farfetch'd's species name from (’) to (') in English, Spanish, & Italian as per Sword and Shield.
2021-07-28 03:26:04 -04:00
Julian Lawrance
206af8a6fd Remove order column from Generation model and use ID column instead 2021-07-19 19:00:40 +01:00
Julian Lawrance
0d9bc4f2b9 Run formatter 2021-07-16 22:32:06 +01:00
Julian Lawrance
1173b43ad1 Add order field to Generation model 2021-07-16 22:29:55 +01:00
Julian Lawrance
8b9e4f171c Merge remote-tracking branch 'upstream/master' into feature/past-type-efficacy 2021-07-14 22:23:11 +01:00
Alessandro Pezzè
d0a4397d41 data: remove hp stat change 2021-07-04 19:32:41 +02:00
Alessandro Pezzè
a6d6632abd data: remove HP stat change for ancient power 2021-07-03 20:03:24 +02:00
Alessandro Pezzè
4fa15f979f sync(sprites) 2021-05-17 16:48:30 +02:00
Alessandro Pezzè
fef9cd6efc data: fix id 2021-05-13 21:03:06 +02:00
Alessandro Pezzè
ed8ccbe7e0 data: add missing move 2021-05-13 20:45:36 +02:00
Alessandro Pezzè
14af88ff3a sync: https://github.com/PokeAPI/pokedex/pull/29 2021-05-12 19:20:28 +02:00
Alessandro Pezzè
60583d8882 feat: brings in https://github.com/PokeAPI/pokedex/pull/43 2021-04-18 18:06:17 +02:00
SimplyBLGDev
0e98f90051 Add missing encounters underwater, regies
- Replaced the encounter method on the underwater encounters in RSE from 'surf' to 'seaweed'
- Added missing location areas for island cave, desert ruins and ancient tomb
- Added missing encounters for the legendary regies (Regirock, Regice and Registeel)
- Added missing encounters for Latios and Latias at Southern Island
2021-03-14 18:49:24 -03:00
SimplyBLGDev
e61049558f Add missing encounters Gen 3 edition
Added encounter methods and slots for:
- Squirt Bottle
- Wailmer Pail

Added missing locations and their areas where applicable:
- Two island
- Three island
- Three isle path
- Six island
- Seven island
- Birth island
- Navel rock
- Faraway island
- Hoenn Battle Frontier

Added missing encounters:
- Deoxis in Birth Island (FR LG & E)
- Lugia and Ho-Oh in Navel Rock (FR LG & E)
- Mew in Faraway island (E)
- Sudowoodo in Johto Route 36 (G S C HG & SS)
- Sudowoodo in Hoenn Battle Frontier (E)
2021-03-11 19:41:29 -03:00
SimplyBLGDev
2102fa319f Fix encounter slots for crystal's Pokémon encounters
Some wrong encoutner slots ID were being used bby Pokémon crystal's headbutt encounters, this resulted in erroneous chances which didn't add up to 100% in an area.
2021-03-09 18:28:21 +00:00
SimplyBLGDev
f5f3d508a5 Encounter corrections
Due to an error the headbutt importer script used the wrong tables for gold and silver, this commit re-run this tool with the correct data and solved the inconsistencies that were present in the previous commits.

- Replaced all headbutt encounters with their correct counterparts
- Relocated some encounter's IDs
- Created location area Bell Tower 1f
- Moved Pokémon Crystal's Suicune encounter from Bell Tower Roof to Bell Tower 1f (it's correct position)
2021-03-09 17:49:41 +00:00
Simply BLG
682b362983
Typo corrections on encounter_methods 2021-03-07 23:32:42 -03:00
Simply BLG
79841f2358
Typo corrections for encounter_method_prose 2021-03-07 23:32:06 -03:00
SimplyBLGDev
8b11fda6f8 Add missing special encounters
- Snorlax in GSC, HGSS
- Groudon, Kyogre and Rayquaza in RSE
- Removed unused Goldenrod city area location area
- Changed location area prose to some areas to correct duplicate location name in display
- Added proper default values for story-progress condition
- Added new condition 'other' for weirder conditions
- Added missing areas for legendary encounters in Hoenn
- Added missing locations for legendary encounters in Hoenn
2021-03-08 01:51:18 +00:00