Skip to content

Commit

Permalink
Merge branch 'main' into loading-error-notification
Browse files Browse the repository at this point in the history
  • Loading branch information
CypherX authored Dec 1, 2023
2 parents c14b784 + e628b35 commit 8a325fa
Show file tree
Hide file tree
Showing 320 changed files with 1,046 additions and 792 deletions.
1,471 changes: 806 additions & 665 deletions bundle.js

Large diffs are not rendered by default.

13 changes: 7 additions & 6 deletions data/Items/Thunder Stone.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
## Use
Base Pokémon |Evolves into |Available in
:---|:---|:---
[[Pokemon/Pikachu]] |[[Pokemon/Raichu]] |All regions but Alola
[[Pokemon/Pikachu]] |[[Pokemon/Alolan Raichu]] |Alola
[[Pokemon/Magneton]] |[[Pokemon/Magnezone]] |Galar only
[[Pokemon/Eevee]] |[[Pokemon/Jolteon]] |All regions
[[Pokemon/Eelektrik]] |[[Pokemon/Eelektross]] |Unova onward
[[Pokemon/Charjabug]] |[[Pokemon/Vikabolt]] |Galar only
[[File:pokemon/25.png\|25px]] [[Pokemon/Pikachu]] | [[File:pokemon/26.png\|25px]] [[Pokemon/Raichu]] |All regions but Alola
[[File:pokemon/25.png\|25px]] [[Pokemon/Pikachu]] | [[File:pokemon/26.01.png\|25px]] [[Pokemon/Alolan Raichu]] |Alola
[[File:pokemon/25.15.png\|25px]] [[Pokemon/Detective_Pikachu]] | [[File:pokemon/26.02.png\|25px]] [[Pokemon/Detective_Raichu]] |All regions after completing [[Quest_Lines/Detective_Pikachu]] quest line
[[File:pokemon/82.png\|25px]] [[Pokemon/Magneton]] | [[File:pokemon/462.png\|25px]] [[Pokemon/Magnezone]] |Galar only
[[File:pokemon/133.png\|25px]] [[Pokemon/Eevee]] | [[File:pokemon/135.png\|25px]] [[Pokemon/Jolteon]] |All regions
[[File:pokemon/603.png\|25px]] [[Pokemon/Eelektrik]] | [[File:pokemon/604.png\|25px]] [[Pokemon/Eelektross]] |Unova onward
[[File:pokemon/737.png\|25px]] [[Pokemon/Charjabug]] | [[File:pokemon/738.png\|25px]] [[Pokemon/Vikavolt]] |Galar only
2 changes: 1 addition & 1 deletion data/Shadow Pokémon/overview_description.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Shadow Pokémon are Pokémon with a shadowy aura that can be encountered in Orre, a subregion from [[Regions/Hoenn]]. They can only be encountered as part of a trainer battle and never as a wild encounter.
Shadow Pokémon are Pokémon with a shadowy aura that can be encountered in Orre, a subregion from [[Regions/Hoenn]]. They can only be encountered as part of a trainer battle and never as a wild encounter. There are a total of **131** Pokémon that can be obtained as shadows.

These Pokémon have a **0.8x** multiplier to its attack. However, they can be purified which will change the multiplier to **1.2x** instead, making Purified Pokémon stronger than a regular one.

Expand Down
1 change: 1 addition & 0 deletions images/Akala_Stamp.svg
1 change: 1 addition & 0 deletions images/Azure.svg
1 change: 0 additions & 1 deletion images/Balance.png

This file was deleted.

1 change: 1 addition & 0 deletions images/Balance.svg
1 change: 0 additions & 1 deletion images/Basic.png

This file was deleted.

1 change: 1 addition & 0 deletions images/Basic.svg
1 change: 0 additions & 1 deletion images/Beacon.png

This file was deleted.

1 change: 1 addition & 0 deletions images/Beacon.svg
1 change: 0 additions & 1 deletion images/Bolt.png

This file was deleted.

1 change: 1 addition & 0 deletions images/Bolt.svg
1 change: 0 additions & 1 deletion images/Boulder.png

This file was deleted.

1 change: 1 addition & 0 deletions images/Boulder.svg
1 change: 0 additions & 1 deletion images/Bug.png

This file was deleted.

1 change: 1 addition & 0 deletions images/Bug.svg
1 change: 0 additions & 1 deletion images/Bug_Gym.png

This file was deleted.

1 change: 1 addition & 0 deletions images/Bug_Gym.svg
1 change: 1 addition & 0 deletions images/Buginium Z.svg
1 change: 1 addition & 0 deletions images/Burn_Drive.png
1 change: 0 additions & 1 deletion images/Cascade.png

This file was deleted.

1 change: 1 addition & 0 deletions images/Cascade.svg
1 change: 1 addition & 0 deletions images/Champion_Stamp.svg
Binary file removed images/Charmander_infected.png
Binary file not shown.
1 change: 1 addition & 0 deletions images/Chill_Drive.png
1 change: 1 addition & 0 deletions images/Christmas_present.png
1 change: 0 additions & 1 deletion images/Cipher Peon (hexagon).png

This file was deleted.

1 change: 1 addition & 0 deletions images/Cipher Peon Blusix.png
1 change: 1 addition & 0 deletions images/Cipher Peon Browsix.png
1 change: 1 addition & 0 deletions images/Cipher Peon Greesix.png
1 change: 1 addition & 0 deletions images/Cipher Peon Purpsix.png
1 change: 1 addition & 0 deletions images/Cipher Peon Resix.png
1 change: 1 addition & 0 deletions images/Cipher Peon Yellosix.png
1 change: 0 additions & 1 deletion images/Cliff.png

This file was deleted.

1 change: 1 addition & 0 deletions images/Cliff.svg
1 change: 0 additions & 1 deletion images/Coal.png

This file was deleted.

1 change: 1 addition & 0 deletions images/Coal.svg
1 change: 0 additions & 1 deletion images/Cobble.png

This file was deleted.

1 change: 1 addition & 0 deletions images/Cobble.svg
1 change: 0 additions & 1 deletion images/Coral-Eye.png

This file was deleted.

1 change: 1 addition & 0 deletions images/Coral-Eye.svg
1 change: 0 additions & 1 deletion images/Dark_Star.png

This file was deleted.

1 change: 1 addition & 0 deletions images/Dark_Star.svg
1 change: 1 addition & 0 deletions images/Darkinium Z.svg
1 change: 0 additions & 1 deletion images/DarkiniumZ.png

This file was deleted.

1 change: 1 addition & 0 deletions images/Douse_Drive.png
1 change: 0 additions & 1 deletion images/Dragon_Titan.png

This file was deleted.

1 change: 1 addition & 0 deletions images/Dragon_Titan.svg
1 change: 1 addition & 0 deletions images/Dragonium Z.svg
1 change: 0 additions & 1 deletion images/DragoniumZ.png

This file was deleted.

Binary file removed images/DreamOrbsOpening.png
Binary file not shown.
1 change: 0 additions & 1 deletion images/Dynamo.png

This file was deleted.

1 change: 1 addition & 0 deletions images/Dynamo.svg
1 change: 0 additions & 1 deletion images/E4_League.png

This file was deleted.

1 change: 1 addition & 0 deletions images/E4_League.svg
1 change: 0 additions & 1 deletion images/Earth.png

This file was deleted.

1 change: 1 addition & 0 deletions images/Earth.svg
1 change: 0 additions & 1 deletion images/Electric_Gym.png

This file was deleted.

1 change: 1 addition & 0 deletions images/Electric_Gym.svg
1 change: 1 addition & 0 deletions images/Electrium Z.svg
1 change: 0 additions & 1 deletion images/ElectriumZ.png

This file was deleted.

1 change: 1 addition & 0 deletions images/Elf Munchlax.png
1 change: 1 addition & 0 deletions images/Fairium Z.svg
1 change: 0 additions & 1 deletion images/FairiumZ.png

This file was deleted.

1 change: 0 additions & 1 deletion images/Fairy.png

This file was deleted.

1 change: 1 addition & 0 deletions images/Fairy.svg
1 change: 0 additions & 1 deletion images/Fairy_Star.png

This file was deleted.

1 change: 1 addition & 0 deletions images/Fairy_Star.svg
1 change: 0 additions & 1 deletion images/Fast_League.png

This file was deleted.

1 change: 1 addition & 0 deletions images/Fast_League.svg
1 change: 0 additions & 1 deletion images/Feather.png

This file was deleted.

1 change: 1 addition & 0 deletions images/Feather.svg
1 change: 0 additions & 1 deletion images/Fen.png

This file was deleted.

1 change: 1 addition & 0 deletions images/Fen.svg
1 change: 0 additions & 1 deletion images/Fighting_Star.png

This file was deleted.

1 change: 1 addition & 0 deletions images/Fighting_Star.svg
1 change: 1 addition & 0 deletions images/Fightinium Z.svg
1 change: 0 additions & 1 deletion images/FightiniumZ.png

This file was deleted.

1 change: 0 additions & 1 deletion images/Fire_Star.png

This file was deleted.

1 change: 1 addition & 0 deletions images/Fire_Star.svg
1 change: 1 addition & 0 deletions images/Firium Z.svg
1 change: 0 additions & 1 deletion images/FiriumZ.png

This file was deleted.

1 change: 0 additions & 1 deletion images/Flying_Titan.png

This file was deleted.

1 change: 1 addition & 0 deletions images/Flying_Titan.svg
1 change: 1 addition & 0 deletions images/Flyinium Z.svg
2 changes: 1 addition & 1 deletion images/Fog.png
1 change: 1 addition & 0 deletions images/Fog.svg
2 changes: 1 addition & 1 deletion images/Forest.png
1 change: 1 addition & 0 deletions images/Forest.svg
1 change: 1 addition & 0 deletions images/Freeze.svg
1 change: 0 additions & 1 deletion images/Friend_League.png

This file was deleted.

1 change: 1 addition & 0 deletions images/Friend_League.svg
1 change: 0 additions & 1 deletion images/Galar_Dark.png

This file was deleted.

1 change: 1 addition & 0 deletions images/Galar_Dark.svg
1 change: 0 additions & 1 deletion images/Galar_Dragon.png

This file was deleted.

1 change: 1 addition & 0 deletions images/Galar_Dragon.svg
1 change: 0 additions & 1 deletion images/Galar_Fairy.png

This file was deleted.

1 change: 1 addition & 0 deletions images/Galar_Fairy.svg
1 change: 0 additions & 1 deletion images/Galar_Fighting.png

This file was deleted.

1 change: 1 addition & 0 deletions images/Galar_Fighting.svg
1 change: 0 additions & 1 deletion images/Galar_Fire.png

This file was deleted.

1 change: 1 addition & 0 deletions images/Galar_Fire.svg
1 change: 0 additions & 1 deletion images/Galar_Ghost.png

This file was deleted.

1 change: 1 addition & 0 deletions images/Galar_Ghost.svg
1 change: 0 additions & 1 deletion images/Galar_Grass.png

This file was deleted.

1 change: 1 addition & 0 deletions images/Galar_Grass.svg
1 change: 0 additions & 1 deletion images/Galar_Ice.png

This file was deleted.

1 change: 1 addition & 0 deletions images/Galar_Ice.svg
1 change: 0 additions & 1 deletion images/Galar_Rock.png

This file was deleted.

1 change: 1 addition & 0 deletions images/Galar_Rock.svg
1 change: 0 additions & 1 deletion images/Galar_Water.png

This file was deleted.

1 change: 1 addition & 0 deletions images/Galar_Water.svg
1 change: 1 addition & 0 deletions images/GenesectFight.png
1 change: 0 additions & 1 deletion images/Ghost_Gym.png

This file was deleted.

1 change: 1 addition & 0 deletions images/Ghost_Gym.svg
1 change: 1 addition & 0 deletions images/Ghostium Z.svg
1 change: 0 additions & 1 deletion images/GhostiumZ.png

This file was deleted.

1 change: 0 additions & 1 deletion images/Glacier.png

This file was deleted.

1 change: 1 addition & 0 deletions images/Glacier.svg
1 change: 0 additions & 1 deletion images/Grass_Gym.png

This file was deleted.

1 change: 1 addition & 0 deletions images/Grass_Gym.svg
1 change: 1 addition & 0 deletions images/Grassium Z.svg
1 change: 0 additions & 1 deletion images/GrassiumZ.png

This file was deleted.

1 change: 1 addition & 0 deletions images/Great Marsh.png
1 change: 0 additions & 1 deletion images/Great_League.png

This file was deleted.

1 change: 1 addition & 0 deletions images/Great_League.svg
1 change: 0 additions & 1 deletion images/Ground_Titan.png

This file was deleted.

Loading

0 comments on commit 8a325fa

Please sign in to comment.