Merge branch 'main' into main

data/Dungeon Tokens/overview.md

@@ -3,5 +3,4 @@
 Helper | Cost per hatch | Purchase price | Shop
 :---: | :---: | :---: | :---:
 [[Hatchery_Helpers/Parker]] [[File:trainer-27.png\|25px]] | 1,000 [[File:dungeonToken.svg\|25px]] | Unlocks after 1,000 eggs hatched | \-
-[[Hatchery_Helpers/Dakota]] [[File:trainer-115.png\|25px]] | 10,000 [[File:dungeonToken.svg\|25px]] | 100,000 [[File:dungeonToken.svg\|25px]] | [[Towns/Mahogany Town]]
-
+[[Hatchery_Helpers/Dakota]] [[File:trainer-115.png\|25px]] | 10,000 [[File:dungeonToken.svg\|25px]] | 100,000 [[File:dungeonToken.svg\|25px]] | [[Towns/Mahogany Town]] | \-

data/Items/Dowsing Machine.md

@@ -1,7 +1,7 @@
 ### Chance of Gaining More Items
 The Dowsing Machine gives a chance of gaining extra items from Dungeon chests. The specific chance depends on the item's Tier and follows this formula:
 
-**Activation Chance** = (0.5 / (4 / Tier + 1))
+**Activation Chance** = (0.5 / (4 / (Tier + 1)))
 
 The **Tier** variable takes a value from 4 (Common) to 0 (Mythic). This translates to this table:
 

data/Items/Wishing Piece.md

@@ -0,0 +1,32 @@
+Obtained from Max Raid Temporary Battles, only 10 can be acquired each day and 240 are needed in total.
+Namely, the following temporary battles grant the player a wishing piece :
+- [[Temporary Battles/Max Raid Venusaur]]
+- [[Temporary Battles/Max Raid Charizard]]
+- [[Temporary Battles/Max Raid Blastoise]]
+- [[Temporary Battles/Max Raid Butterfree]]
+- [[Temporary Battles/Max Raid Pikachu]]
+- [[Temporary Battles/Max Raid Meowth]]
+- [[Temporary Battles/Max Raid Machamp]]
+- [[Temporary Battles/Max Raid Gengar]]
+- [[Temporary Battles/Max Raid Kingler]]
+- [[Temporary Battles/Max Raid Lapras]]
+- [[Temporary Battles/Max Raid Eevee]]
+- [[Temporary Battles/Max Raid Snorlax]]
+- [[Temporary Battles/Max Raid Garbodor]]
+- [[Temporary Battles/Max Raid Rillaboom]]
+- [[Temporary Battles/Max Raid Cinderace]]
+- [[Temporary Battles/Max Raid Inteleon]]
+- [[Temporary Battles/Max Raid Corviknight]]
+- [[Temporary Battles/Max Raid Orbeetle]]
+- [[Temporary Battles/Max Raid Drednaw]]
+- [[Temporary Battles/Max Raid Coalossal]]
+- [[Temporary Battles/Max Raid Flapple]]
+- [[Temporary Battles/Max Raid Appletun]]
+- [[Temporary Battles/Max Raid Sandaconda]]
+- [[Temporary Battles/Max Raid Toxtricity]]
+- [[Temporary Battles/Max Raid Centiskorch]]
+- [[Temporary Battles/Max Raid Hatterene]]
+- [[Temporary Battles/Max Raid Grimmsnarl]]
+- [[Temporary Battles/Max Raid Alcremie]]
+- [[Temporary Battles/Max Raid Copperajah]]
+- [[Temporary Battles/Max Raid Duraludon]]

data/Pokémon/Burmy (Sand).md

@@ -1,38 +1,40 @@
-### List of Locations with Cave Environment
+### List of Locations with Cave and Gem Cave Environment
 #### Gyms
 |Region|Gyms|
 |---|---|
-|Kanto|[[Gyms/Pewter City]]
-|Johto|[[Gyms/Cianwood City]]
-|Hoenn|[[Gyms/Rustboro City]], [[Gyms/Dewford Town]]
-|Sinnoh|[[Gyms/Oreburgh City]]
-|Unova|N/A
-|Kalos|N/A
-|Alola|N/A
-|Galar|N/A
+|Kanto|[[Gyms/Pewter City]], [[Gyms/Viridian City]] |
+|Johto|[[Gyms/Cianwood City]], [[Gyms/Blackthorn City]] |
+|Hoenn|[[Gyms/Rustboro City]], [[Gyms/Dewford Town]] |
+|Sinnoh|[[Gyms/Oreburgh City]] |
+|Unova|N/A|
+|Kalos|N/A|
+|Alola|N/A|
+|Galar|N/A|
 
 #### Routes
 |Region|Routes|
 |---|---|
-|Kanto|N/A
-|Sevii|[[Routes/Ruin Valley]], [[Routes/Sevault Canyon]]
-|Johto|N/A
-|Hoenn|N/A
-|Sinnoh|N/A
-|Unova|N/A
-|Kalos|[[Routes/Kalos Route 9]], [[Routes/Kalos Route 13]]
-|Alola|[[Routes/Alola Route 12]], [[Routes/Mount Hokulani]], [[Routes/Poni Coast]]
-|Galar|[[Routes/Stony Wilderness]]
+|Kanto|N/A|
+|Sevii|[[Routes/Ruin Valley]], [[Routes/Sevault Canyon]]|
+|Johto|N/A|
+|Hoenn|N/A|
+|Orre|[[Routes/Cave Poké Spot]] |
+|Sinnoh|N/A|
+|Unova|N/A|
+|Kalos|[[Routes/Kalos Route 9]], [[Routes/Kalos Route 13]] |
+|Alola|[[Routes/Alola Route 12]], [[Routes/Mount Hokulani]], [[Routes/Poni Coast]] |
+|Galar|[[Routes/Stony Wilderness]] |
 
 #### Dungeons
 |Region|Dungeons|
 |---|---|
-|Kanto|[[Dungeons/Diglett's Cave]], [[Dungeons/Mt. Moon]], [[Dungeons/Rock Tunnel]], [[Dungeons/Victory Road]]
-|Sevii|[[Dungeons/Lost Cave]], [[Dungeons/Altering Cave]], [[Dungeons/Tanoby Ruins]]
-|Johto|[[Dungeons/Ruins of Alph]], [[Dungeons/Union Cave]], [[Dungeons/Mt. Mortar]], [[Dungeons/Dark Cave]], [[Dungeons/Tohjo Falls]], [[Dungeons/Victory Road Johto]]
-|Hoenn|[[Dungeons/Rusturf Tunnel]], [[Dungeons/Granite Cave]], [[Dungeons/Meteor Falls]], [[Dungeons/Jagged Pass]], [[Dungeons/Seafloor Cavern]], [[Dungeons/Victory Road Hoenn]]
-|Sinnoh|[[Dungeons/Oreburgh Gate]], [[Dungeons/Wayward Cave]], [[Dungeons/Mt. Coronet South]], [[Dungeons/Iron Island]], [[Dungeons/Mt. Coronet North]], [[Dungeons/Victory Road Sinnoh]]
-|Unova|[[Dungeons/Relic Castle]], [[Dungeons/Relic Passage]], [[Dungeons/Seaside Cave]], [[Dungeons/Victory Road Unova]], [[Dungeons/Twist Mountain]]
-|Kalos|[[Dungeons/Connecting Cave]], [[Dungeons/Terminus Cave]], [[Dungeons/Victory Road Kalos]]
-|Alola|[[Dungeons/Verdant Cavern]], [[Dungeons/Seaward Cave]], [[Dungeons/Ten Carat Hill]], [[Dungeons/Diglett's Tunnel]], [[Dungeons/Vast Poni Canyon]]
-|Galar|[[Dungeons/Warm-Up Tunnel]], [[Dungeons/Courageous Cavern]], [[Dungeons/Brawlers' Cave]], [[Dungeons/Rock Peak Ruins]], [[Dungeons/Split-Decision Ruins]], [[Dungeons/Lakeside Cave]], [[Dungeons/Tunnel to the Top]]
+|Kanto|[[Dungeons/Diglett's Cave]], [[Dungeons/Mt. Moon]], [[Dungeons/Rock Tunnel]], [[Dungeons/Victory Road]], [[Dungeons/Cerulean Cave]] |
+|Sevii|[[Dungeons/Lost Cave]], [[Dungeons/Altering Cave]], [[Dungeons/Tanoby Ruins]], [[Dungeons/Sunburst Island]] |
+|Johto|[[Dungeons/Ruins of Alph]], [[Dungeons/Union Cave]], [[Dungeons/Mt. Mortar]], [[Dungeons/Dark Cave]], [[Dungeons/Tohjo Falls]], [[Dungeons/Victory Road Johto]], [[Dungeons/Mt. Silver]], [[Dungeons/Whirl Islands]] |
+|Hoenn|[[Dungeons/Rusturf Tunnel]], [[Dungeons/Granite Cave]], [[Dungeons/Meteor Falls]], [[Dungeons/Jagged Pass]], [[Dungeons/Seafloor Cavern]], [[Dungeons/Victory Road Hoenn]], [[Dungeons/Cave of Origin]], [[Dungeons/Sky Pillar]], [[Dungeons/Sealed Chamber]] |
+|Orre| [[Dungeons/Deep Colosseum]], [[Dungeons/Under Colosseum]] |
+|Sinnoh|[[Dungeons/Oreburgh Gate]], [[Dungeons/Wayward Cave]], [[Dungeons/Mt. Coronet South]], [[Dungeons/Iron Island]], [[Dungeons/Mt. Coronet North]], [[Dungeons/Victory Road Sinnoh]], [[Dungeons/Spear Pillar]], [[Dungeons/Hall of Origin]] |
+|Unova|[[Dungeons/Relic Castle]], [[Dungeons/Relic Passage]], [[Dungeons/Seaside Cave]], [[Dungeons/Victory Road Unova]], [[Dungeons/Twist Mountain]], [[Dungeons/Chargestone Cave]], [[Dungeons/Mistaltron Cave]], [[Dungeons/Cave of Being]] |
+|Kalos|[[Dungeons/Connecting Cave]], [[Dungeons/Terminus Cave]], [[Dungeons/Victory Road Kalos]], [[Dungeons/Glittering Cave]], [[Dungeons/Reflection Cave]] |
+|Alola|[[Dungeons/Verdant Cavern]], [[Dungeons/Seaward Cave]], [[Dungeons/Ten Carat Hill]], [[Dungeons/Diglett's Tunnel]], [[Dungeons/Vast Poni Canyon]], [[Dungeons/Resolution Cave]] |
+|Galar|[[Dungeons/Warm-Up Tunnel]], [[Dungeons/Courageous Cavern]], [[Dungeons/Brawlers' Cave]], [[Dungeons/Rock Peak Ruins]], [[Dungeons/Split-Decision Ruins]], [[Dungeons/Lakeside Cave]], [[Dungeons/Tunnel to the Top]], [[Dungeons/Galar Mine]], [[Dungeons/Galar Mine No. 2]], [[Dungeons/Iron Ruins]] |

data/Pokémon/Magikarp_description.md

@@ -0,0 +1 @@
+NOTE: This Pokémon does not gain EV when bought in the Route 3 Pokémon Center.

data/Quest Lines/The Three Golems.md

@@ -0,0 +1,6 @@
+## Solution
+Left
+Left
+Straight
+Straight
+Right

data/Quest Lines/The Three Golems_description.md

@@ -1,3 +1,3 @@
 ## Prerequisites
 
-This quest will become available at the [[Towns/Littleroot Town]] Bulletin Board after defeating Jasmine in the [[Towns/Olivine City]] Gym.
+This quest will become available at the [[Towns/Littleroot Town]] Bulletin Board after defeating the [[Gyms/Mossdeep City]] Gym.

data/Weather/overview.md

@@ -2,9 +2,6 @@
 
 Pokémon | Required Weather | Route(s)
 :--- | :--- | :---
-| [[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)]] | Harsh Sunlight | [[Routes/Galar Route 10]], [[Routes/Frigid Sea]]

pages/Towns/main.html

@@ -45,7 +45,7 @@ <h3>Content:</h3>
         <div data-bind="foreach: $data.content">
             <!-- ko if: $data.__proto__.constructor.name == "Gym" -->
                 <a class="badge text-bg-secondary" href="#!" data-bind="text: $data.__proto__.constructor.name + ': ' + $data.buttonText, 
-                attr: { href: `#!Gyms/${!$data.buttonText.includes('Elite') && !$data.buttonText.includes('Supreme') && !$data.buttonText.includes('Champion')? Wiki.pageName() : $data.buttonText}` }"></a>
+                attr: { href: `#!Gyms/${$data.town}` }"></a>
             <!-- /ko -->
             <!-- ko ifnot: $data.__proto__.constructor.name == "Gym" -->
                 <span class="badge text-bg-secondary" data-bind="text: GameConstants.camelCaseToString($data.__proto__.constructor.name.replace(/(MoveTo|TownContent|Temporary)/, ''))"></span>

scripts/typeahead.js

@@ -216,6 +216,11 @@ const searchOptions = [
     type: 'Farm Hands',
     page: '',
   },
+  ...FarmHands.list.map(fh => ({
+    display: `${fh.name} (Farm Hands)`,
+    type: 'Farm Hands',
+    page: fh.name,
+  })),
   // Pokérus
   {
     display: 'Pokérus',