Mirrors/pokeapi
2
0
Fork 0
mirror of https://github.com/PokeAPI/pokeapi synced 2024-11-10 14:14:17 +00:00
Code Issues Projects Releases Packages Wiki Activity
928 commits 12 branches 8 tags 53 MiB
Commit graph

928 commits

This branch
This branch
All branches
Author SHA1 Message Date
ymoch
c4b132c9da Add Japanese form names in Hisuian region. 2022-10-31 20:44:27 +09:00
Alessandro Pezzè
899b60f00b
Merge pull request #760 from Inklay/french_pokemon_names 2022-10-24 09:19:25 +02:00
Inklay
6482040885 [ADD]: all french names for non default form Pokémon 2022-10-24 04:23:07 +02:00
Alessandro Pezzè
87f2ecf768
Merge pull request #758 from norman-codes/scale-shot-fix 2022-10-01 21:24:51 +02:00
Alessandro Pezzè
da54209c68
data: add colons 2022-10-01 21:24:23 +02:00
norman-codes
64f8fc3990 Comma Formatting Error Fixed 
Fixed the comma formatting error caused by editing the .csv file using Microsoft Excel instead of a text editor.
 2022-09-30 17:05:12 -04:00
Alessandro Pezzè
0aff861cdf
Merge branch 'master' into scale-shot-fix 2022-09-30 22:34:37 +02:00
norman-codes
0a245bad90 Changed Scale Shot Effect Text 
The effect text for Scale Shot (move ID 799) was modified to be more accurate and specific, in accordance with Issue #749.

As part of doing so, 3 files were modified:
1. move_effects.csv
The new effect_id 443 was added.

2. moves.csv
The effect_id of scale_shot was changed from 1 to 443.

3. move_effect_prose.csv
The new effect text under the ID 443 was added.
 2022-09-30 15:22:30 -04:00
Naramsim
1813af571d sync: 
https://github.com/PokeAPI/pokedex/pull/126
https://github.com/PokeAPI/pokedex/pull/122
 2022-09-29 11:27:22 +02:00
Alessandro Pezzè
4ba28ecdec
Merge pull request #756 from simonorono/hisuian_pokemon_national_dex 2022-09-26 09:32:53 +02:00
Simón Oroño
0e2ba9901d Add Hisuian Pokémon to National Pokédex 2022-09-25 09:38:12 -04:00
Alessandro Pezzè
1aea9f7dc3
Merge pull request #753 from uwx/patch-1 2022-09-22 10:41:39 +02:00
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è
710f9637eb
Merge pull request #750 from SimplyBLGDev/simply-encounter-updates 2022-09-21 19:07:16 +02:00
Alessandro Pezzè
277b736be5
Merge branch 'master' into simply-encounter-updates 2022-09-21 19:01:52 +02:00
Alessandro Pezzè
25b866ed6a
Merge pull request #751 from BIGJRA/master 2022-09-21 19:01:22 +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
Alessandro Pezzè
42b93a5ef7
Merge pull request #738 from SimplyBLGDev/simply-fix-missing-encounters 2022-08-30 11:21:44 +02:00
Simply BLG
3d452dd28a
Merge branch 'master' into simply-fix-missing-encounters 2022-08-24 19:26:09 -03:00
Alessandro Pezzè
a82763a235
Merge pull request #745 from PokeAPI/staging 2022-08-19 10:23:44 +02: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