Merge branch 'main' into feature/level-experience

data/Achievements/overview_description.md

@@ -1 +1 @@
-As the player earns achievements they will receive bonuses to [[Pokémon Dollars]], [[Dungeon Tokens]], and Experience from all sources. Click Attack and [[Flutes]] are also boosted by achievement bonus. The **Achievement Tracker** is unlocked after catching 110 unique Pokémon.
+As the player earns achievements they will receive bonuses to [[Pokémon Dollars]], [[Dungeon Tokens]], and Experience from all sources. Click Attack and [[Flutes]] are also boosted by achievement bonus. The **Achievement Tracker** is unlocked after completing [[Dungeons/Victory Road]].

data/Eggs/overview.md

@@ -1,6 +1,6 @@
 ## Egg Pool Odds {#EggPoolOdds}
 
-As you enter subsequent [[Regions]], the odds of obtaining Pokémon from Eggs from prior Regions decreases to 50% of its prior rate.
+As you enter subsequent [[Regions]], the odds of obtaining Pokémon from Eggs from prior Regions decreases to 50% of its prior rate. (i.e: In Sinnoh, there is a 50% chance to obtain Pokémon from the Sinnoh egg pool, a 25% to obtain Pokémon from the Hoenn egg pool, and a 12.5% to obtain Pokémon from the Kanto and Johto egg pool.)
 The Kanto and Johto pools are given equal odds in every region (excluding Kanto).
 The [[Items/Mystery Egg]] will pull randomly from its own pool and all typed egg pools, making it most useful when you have not obtained any egg Pokémon for that region yet.
 

data/Farm/Setups.md

@@ -210,7 +210,7 @@ Here are a few highly efficient strategies on how to level up the [[Oak Items/Sq
 
 ### Occa/Kebia Planting Formation (a.k.a. Berry Wars)
 If you want to be able to gain experience more passively, then the best strategy is with Occa and Kebia berries. Colbur works for this as well, but takes longer enough to grow that it isn't as useful. This strategy will likely let you level up your Squirtbottle from 0 to 5 without having to set it up again unless you get unlucky with a full takeover.
-- _Note: When using this strategy, make sure to plant the berries so that they ripen at the same time to lower the chance of full takeover._
+- _Note: When using this strategy, make sure to plant the berries so that they ripen at the same time, so planting Kebia Berries when Occa has 10 minutes left till ripen; to lower the chance of full takeover._
 
 **Farm**
 ::: table-mutations

data/Items/Dusk Stone.md

@@ -1,7 +1,7 @@
 ## Use
 Base Pokémon |Evolves into |Available in
 :---|:---|:---
-[[File:pokemon/176.01.png\|25px]] [[Pokemon/Spooky Togetic]]  | [[File:pokemon/468.png\|25px]] [[Pokemon/Spooky Togekiss]] |Sinnoh onward
+[[File:pokemon/176.01.png\|25px]] [[Pokemon/Spooky Togetic]]  | [[File:pokemon/468.01.png\|25px]] [[Pokemon/Spooky Togekiss]] |Sinnoh onward
 [[File:pokemon/198.png\|25px]] [[Pokemon/Murkrow]]  | [[File:pokemon/430.png\|25px]] [[Pokemon/Honchkrow]] |Sinnoh onward
 [[File:pokemon/200.png\|25px]] [[Pokemon/Misdreavous]]  | [[File:pokemon/429.png\|25px]] [[Pokemon/Mismagius]] |Sinnoh onward
 [[File:pokemon/608.png\|25px]] [[Pokemon/Lampent]]  | [[File:pokemon/609.png\|25px]] [[Pokemon/Chandelure]] |Unova onward

data/Items/Sun Stone.md

@@ -1,6 +1,6 @@
 Base chance of dropping: 1 in 2048 (Routes)
 Base chance of dropping: 1 in 512 (Dungeon)
-Base chance of dropping: 1 in 341.3 (Dungeon Boss
+Base chance of dropping: 1 in 341.3 (Dungeon Boss)
 
 ## Use
 Base Pokémon |Evolves into |Available in

data/Pokémon/overview_description.md

@@ -1,4 +1,4 @@
-Pokémon are your partners in this adventure and your main source of power. Currently the game has **1,390** different Pokémon forms. Most of them based on main games, with 32 coming from side games, 53 coming from anime and films, and 18 custom forms.
+Pokémon are your partners in this adventure and your main source of power. Currently the game has **1,391** different Pokémon forms. Most of them based on main games, with 33 coming from side games, 53 coming from anime and films, and 18 custom forms.
 
 ## Statistics
 
@@ -58,7 +58,6 @@ There are exceptions to this rule:
 
 * The egg cycle values for Sand Cloak and Trash Cloak forms of Burmy and Wormadam are 1.5x higher than their Plant Cloak counterparts, since [[Pokémon/Burmy (Plant)]] evolves into [[Pokémon/Burmy (Sand)]] and [[Pokémon/Burmy (Trash)]].
 * [[Pokémon/Cherrim (Sunshine)]] has 1.5x the egg cycle value of [[Pokémon/Cherrim (Overcast)]].
-* All Mega Evolved Pokémon have 1.5x the egg cycle value of their base form.
 
 ### Other Pokémon Lists
 - [[Alternate Pokémon Forms]] page lists all alternate forms available in the game, including Regional forms, and the corresponding base Pokémon.

data/Regions/Galar.md

@@ -57,7 +57,7 @@ Mimic Pokémon are Pokémon that can be encountered by opening a chest inside [[
 |---|---|---|
 | [[File:pokemon/845.01.png\|25px]] [[Pokémon/Cramorant (Gulping)]] | Rain | [[Routes/Axew's Eye]], [[Routes/Bridge Field]], [[Routes/Stony Wilderness]], [[Routes/Lake of Outrage]], [[Routes/Galar Route 9]], [[Routes/Circhester Bay]], [[Routes/Forest of Focus]], [[Routes/Challenge Beach]], and [[Routes/Training Lowlands]] |
 | [[File:pokemon/845.02.png\|25px]] [[Pokémon/Cramorant (Gorging)]] | Thunderstorm | [[Routes/Axew's Eye]], [[Routes/Galar Route 9]], [[Routes/Circhester Bay]], [[Routes/Forest of Focus]], [[Routes/Challenge Beach]], and [[Routes/Training Lowlands]] |
-| [[File:pokemon/875.01.png\|25px]] [[Pokémon/Eiscue (Noice Face)]] | Sunny | [[Routes/Route 10]] and [[Routes/Frigid Sea]] |
+| [[File:pokemon/875.01.png\|25px]] [[Pokémon/Eiscue (Noice Face)]] | Harsh Sunlight | [[Routes/Route 10]] and [[Routes/Frigid Sea]] |
 
 ### Location-dependent Pokémon
 **Note:** Location-dependant Pokémon evolve at or above the level specified (excluding level 100) when leveled at a particular location. Pokémon at level 100 must be bred and retrained to the correct level (level 34), and then leveled at the specified location.

data/Regions/Hoenn.md

@@ -46,7 +46,7 @@ All starters can also be obtained as Wanderers using [[Berries/Occa]], [[Berries
 ### Weather-dependent Pokémon
 |Pokémon | Required Weather | Location |
 |---|---|---|
-| [[File:pokemon/351.01.png\|25px]] [[Pokémon/Castform (Sunny)]] | Sunny | [[Dungeons/Weather Institute]] |
+| [[File:pokemon/351.01.png\|25px]] [[Pokémon/Castform (Sunny)]] | Harsh Sunlight | [[Dungeons/Weather Institute]] |
 | [[File:pokemon/351.02.png\|25px]] [[Pokémon/Castform (Rainy)]] | Rainy or Thunderstorm | [[Dungeons/Weather Institute]] |
 | [[File:pokemon/351.03.png\|25px]] [[Pokémon/Castform (Snowy)]] | Snow, Blizzard, or Hail | [[Dungeons/Weather Institute]] |
 

data/Regions/Sinnoh.md

@@ -66,7 +66,7 @@ Munchlax can also be obtained as a Wanderer by using [[Berries/Chilan]] berries.
 ### Weather-dependent Pokémon
 |Pokémon | Evolution | Required Weather |
 |---|---|---|
-| [[File:pokemon/421.png\|25px]] [[Pokémon/Cherrim (Overcast)]] | [[File:pokemon/421.01.png\|25px]] [[Pokémon/Cherrim (Sunshine)]] | Sunny |
+| [[File:pokemon/421.png\|25px]] [[Pokémon/Cherrim (Overcast)]] | [[File:pokemon/421.01.png\|25px]] [[Pokémon/Cherrim (Sunshine)]] | Harsh Sunlight |
 
 ### Level-dependent Pokémon
 **Note:** Level-dependant Pokémon evolve at or above the level specified excluding level 100. Pokémon at level 100 must be bred and retrained to the correct level.

data/Weather/overview.md

@@ -2,18 +2,18 @@
 
 Pokémon | Required Weather | Route(s)
 :--- | :--- | :---
-| [[Pokemon/Castform (Sunny)]] | Sunny | [[Routes/Hoenn Route 119]]
+| [[Pokemon/Castform (Sunny)]] | Harsh Sunlight | [[Routes/Hoenn Route 119]]
 | [[Pokemon/Castform (Rainy)]] | Rain or Thunderstorm | [[Routes/Hoenn Route 119]]
 | [[Pokemon/Castform (Snowy)]] | Snow, Blizzard, Hail, or Fog | [[Routes/Hoenn Route 119]]
 | [[Pokemon/Cramorant (Gulping)]] | Rain | [[Routes/Axew's Eye]], [[Routes/Bridge Field]], [[Routes/Stony Wilderness]], [[Routes/Lake of Outrage]], [[Routes/Galar Route 9]], [[Routes/Circhester Bay]], [[Routes/Forest of Focus]], [[Routes/Challenge Beach]], [[Routes/Training Lowlands]]
 | [[Pokemon/Cramorant (Gorging)]] | Thunderstorm | [[Routes/Axew's Eye]], [[Routes/Galar Route 9]], [[Routes/Circhester Bay]], [[Routes/Forest of Focus]], [[Routes/Challenge Beach]], [[Routes/Training Lowlands]]
-| [[Pokemon/Eiscue (Noice Face)]] | Sunny | [[Routes/Galar Route 10]], [[Routes/Frigid Sea]]
+| [[Pokemon/Eiscue (Noice Face)]] | Harsh Sunlight | [[Routes/Galar Route 10]], [[Routes/Frigid Sea]]
 
 ##### **Unique Weather Encounters**
 
 Pokémon | Requirements | Required Weather | Near to | Notes
 :--- | :--- | :--- | :--- | :---
-Wild Houndoom Horde | Captured 500 [[Pokemon/Houndour]] and defeated [[Towns/Pokémon League Kalos]] | Sunny | [[Routes/Kalos Route 16]] | Awards Houndoominite to evolve [[Pokemon/Mega Houndoom]]
+Wild Houndoom Horde | Captured 500 [[Pokemon/Houndour]] and defeated [[Towns/Pokémon League Kalos]] | Harsh Sunlight | [[Routes/Kalos Route 16]] | Awards Houndoominite to evolve [[Pokemon/Mega Houndoom]]
 Wild Manectrike Horde | Captured 500 [[Pokemon/Electrike]] and defeated [[Towns/Pokémon League Kalos]] | Thunderstorm | [[Routes/Kalos Route 16]] | Awards Manectite to evolve [[Pokemon/Mega Manectric]]
-Primal Groudon | Progress through [[Quest Lines/Primal Reversion]] | Sunny | [[Routes/Hoenn Route 126]] | Awards Red Orb to evolve [[Pokemon/Primal Groudon]]
+Primal Groudon | Progress through [[Quest Lines/Primal Reversion]] | Harsh Sunlight | [[Routes/Hoenn Route 126]] | Awards Red Orb to evolve [[Pokemon/Primal Groudon]]
 Primal Kyogre | Progress through [[Quest Lines/Primal Reversion]] | Rain | [[Routes/Hoenn Route 126]] | Awards Blue Orb to evolve [[Pokemon/Primal Kyogre]]