Merge branch 'main' into environment-evo-data

bundle.js

@@ -79582,7 +79582,7 @@ const getOakItemBonus = (oakItem, level) => {
         case OakItemType.Blaze_Cassette:
             return `x${bonus} Hatching Speed`;
         case OakItemType.Cell_Battery:
-            return `x${bonus} Energy Regeneration`;
+            return `Tier ${bonus} Discharge Patterns`;
         case OakItemType.Squirtbottle:
             return `x${bonus} Mutation Rate`;
         case OakItemType.Sprinklotad:
@@ -79619,7 +79619,7 @@ const getOakItemUpgradeReqText = (oakItemType, val) => {
         case OakItemType.Blaze_Cassette:
             return `Hatch ${val} Eggs`;
         case OakItemType.Cell_Battery:
-            return `Mine ${val} items in the Underground`;
+            return `Use Discharge ${val} times`;
         case OakItemType.Squirtbottle:
             return `Trigger ${val} berry mutations`;
         case OakItemType.Sprinklotad:

data/Berries/Bluk.md

@@ -39,11 +39,11 @@ Bluk Berries can mutate into the following Berries.
 ### Acquisition
 Bluk Berries can be obtained from the following dungeons.
 
-| Location	                        | Tier	    | Requirement   |
-| :---:                             | :---:     | :---:         |
-| [[Dungeons/Berry Forest]]	        | Epic  	| `N/A`         |
-| [[Dungeons/Pattern Bush]]	        | Epic  	| `N/A`         |
-| [[Dungeons/Radio Tower]]	        | Epic  	| `N/A`         |
-| [[Dungeons/Seafloor Cavern]]      | Epic  	| `N/A`         |
-| [[Dungeons/Eterna Forest]]        | Common	| `N/A`         |
-| [[Dungeons/Sea Spirit's Den]]     | Common	| `N/A`         |
+| Location	                        | Tier	    |Region              |
+| :---:                             | :---:     |:---:            |
+| [[Dungeons/Berry Forest]]	        | Epic  	| [[Regions/Kanto]](Sevii Islands 123)|
+| [[Dungeons/Pattern Bush]]	        | Epic  	| [[Regions/Kanto]](Sevii Islands 4567)|
+| [[Dungeons/Radio Tower]]	        | Epic  	| [[Regions/Johto]]|
+| [[Dungeons/Seafloor Cavern]]      | Epic  	| [[Regions/Hoenn]]|
+| [[Dungeons/Eterna Forest]]        | Common	| [[Regions/Sinnoh]]|
+| [[Dungeons/Sea Spirit's Den]]     | Common	| [[Regions/Kalso]]|

data/Berries/Cheri.md

@@ -12,18 +12,18 @@ Cheri Berries can mutate into the following Berries.
 ### Acquisition
 Cheri Berries can drop from any route and can also be obtained from the following dungeons.
 
-| Location	                        | Tier	    | Requirement   |
+| Location	                        | Region | Tier	    |
 | :---:                             | :---:     | :---:         |
-| [[Dungeons/Power Plant]]	        | Common    | `N/A`         |
-| [[Dungeons/Berry Forest]]	        | Common	| `N/A`         |
-| [[Dungeons/Pattern Bush]]	        | Common	| `N/A`         |
-| [[Dungeons/New Mauville]]	        | Common	| `N/A`         |
-| [[Dungeons/Eterna Forest]]	    | Common	| `N/A`         |
-| [[Dungeons/Hall of Origin]]       | Common	| `N/A`         |
-| [[Dungeons/Floccesy Ranch]]	    | Common	| `N/A`         |
-| [[Dungeons/Pikachu Valley]]	    | Common	| `N/A`         |
-| [[Dungeons/Ruins of Conflict]]    | Common	| `N/A`         |
-| [[Dungeons/Ruins of Life]]	    | Common	| `N/A`         |
-| [[Dungeons/Glimwood Tangle]]	    | Common	| `N/A`         |
+| [[Dungeons/Power Plant]]	        | Kanto | Common    |
+| [[Dungeons/Berry Forest]]	        | Kanto |Common	|
+| [[Dungeons/Pattern Bush]]	        | Kanto | Common	|
+| [[Dungeons/New Mauville]]	        | Hoenn | Common	|
+| [[Dungeons/Eterna Forest]]	    | Sinnoh | Common	|
+| [[Dungeons/Hall of Origin]]       | Sinnoh | Common	|
+| [[Dungeons/Floccesy Ranch]]	    | Unova | Common	|
+| [[Dungeons/Pikachu Valley]]	    | Alola | Common	|
+| [[Dungeons/Ruins of Conflict]]    | Alola | Common	|
+| [[Dungeons/Ruins of Life]]	    | Alola | Common	|
+| [[Dungeons/Glimwood Tangle]]	    | Galar | Common	|
 
 Can also obtain 100 Cheri by using FARMINGBOOST code.

data/Berries/Chesto.md

@@ -12,13 +12,13 @@ Chesto Berries can mutate into the following Berries.
 ### Acquisition
 Chesto Berries can drop from any route and can also be obtained from the following dungeons.
 
-| Location	                                | Tier	    | Requirement   |
+| Location	                                | Region | Tier	    |
 | :---:                                     | :---:     | :---:         |
-| [[Dungeons/Pokémon Tower]]                | Common    | `N/A`         |
-| [[Dungeons/Berry Forest]]	                | Common	| `N/A`         |
-| [[Dungeons/Pattern Bush]]	                | Common	| `N/A`         |
-| [[Dungeons/Pinwheel Forest]]	            | Common	| `N/A`         |
-| [[Dungeons/Pokémon Village]]	            | Common	| `N/A`         |
-| [[Dungeons/Aether Foundation]]            | Common	| `N/A`         |
-| [[Dungeons/Lake of the Sunne and Moone]]  | Common	| `N/A`         |
-| [[Dungeons/Slumbering Weald Shrine]]	    | Common	| `N/A`         |
+| [[Dungeons/Pokémon Tower]]                | Kanto | Common    |
+| [[Dungeons/Berry Forest]]	                | Kanto | Common	|
+| [[Dungeons/Pattern Bush]]	                | Kanto | Common	|
+| [[Dungeons/Pinwheel Forest]]	            | Unova | Common	|
+| [[Dungeons/Pokémon Village]]	            | Kalos | Common	|
+| [[Dungeons/Aether Foundation]]            | Alola | Common	|
+| [[Dungeons/Lake of the Sunne and Moone]]  | Alola | Common	|
+| [[Dungeons/Slumbering Weald Shrine]]	    | Galar | Common	|

data/Berries/Lum.md

@@ -38,17 +38,17 @@ All planting times refer to the "Until Ripe" value of the first Berry planted.
 ### Acquisition
 Lum Berries can be obtained from the following dungeons.
 
-| Location	                        | Tier	    | Requirement   |
-| :---:                             | :---:     | :---:         |
-| [[Dungeons/Berry Forest]]	        | Mythic  	| 400 Clears    |
-| [[Dungeons/Pattern Bush]]	        | Mythic  	| 150 Clears    |
-| [[Dungeons/Radio Tower]]	        | Mythic  	| 250 Clears    |
-| [[Dungeons/Cave of Origin]]       | Mythic  	| 150 Clears    |
-| [[Dungeons/Relic Cave]] | Mythic | N/A |
-| [[Dungeons/Under Colosseum]] | Legendary | 50 Clears |
-| [[Dungeons/Moor of Icirrus]]       | Mythic  	| 200 Clears    |
-| [[Dungeons/Pinwheel Forest]]      | Mythic  	| 200 Clears    |
-| [[Dungeons/Thrifty Megamart]]     | Mythic  	| 100 Clears    |
+| Location	                        | Region | Tier	    | Requirement   |
+| :---:                             | :---:  | :---:     | :---:         |
+| [[Dungeons/Berry Forest]]	        | Kanto  | Mythic  	| 400 Clears    |
+| [[Dungeons/Pattern Bush]]	        | Kanto  | Mythic  	| 150 Clears    |
+| [[Dungeons/Radio Tower]]	        | Johto  | Mythic  	| 250 Clears    |
+| [[Dungeons/Cave of Origin]]       | Hoenn  | Mythic  	| 150 Clears    |
+| [[Dungeons/Relic Cave]] | Hoenn  | Mythic | N/A |
+| [[Dungeons/Under Colosseum]] | Hoenn  | Legendary | 50 Clears |
+| [[Dungeons/Moor of Icirrus]]       | Unova  | Mythic  	| 200 Clears    |
+| [[Dungeons/Pinwheel Forest]]      | Unova  | Mythic  	| 200 Clears    |
+| [[Dungeons/Thrifty Megamart]]     | Alola  | Mythic  	| 100 Clears    |
 
 #### Dropped by
 | :---|

data/Berries/Petaya.md

@@ -13,7 +13,7 @@ You can fill your farm in the following way to obtain Petaya berries. Note that
 :::
 
 ### External Timers
-Please note that these timers are from the moment Haban is planted, so, for example, 2 hours 40 minutes **after** planting Haban and Babiri, you should plant Yache. These are **not** time until Haban is ripe. For those, please refer to the **Timing Table** section lower in the page.
+Please note that these timers are from the moment Haban is planted, so, for example, 2 hours 40 minutes **after** planting Haban and Babiri, you should plant Yache. These are **not** time until Haban is ripe. For those, please refer to the **[Timing Table](#timing-table)** section lower in the page.
 
 |Berry | Time | Boost Mulch Needed|
 |---|---|---|
@@ -49,12 +49,10 @@ Before you start this process, you need to be prepared to spend around 11 hours
 
 * It is very important that the [[Berries/Babiri]] finishes growing before the [[Berries/Occa]], [[Berries/Colbur]], and [[Berries/Kebia]]. As such, it is planted to finish very early since it also has a very long lifespan. When using the tables below, base your planting on the time left for [[Berries/Haban]] to finish. Don't use a different berry for timing.
 
-### Critical information for when all berries have ripened
-After all 18 berries are ripe, the requirements for Petaya to spawn have been fully met. At this point, immediately switch out your [[Oak Items/Sprayduck]] for the [[Oak Items/Squirtbottle]], if possible, otherwise another Oak Item if not. It is highly recommended that you make a save here so you don't have to go through the whole setup again in case nothing mutates. Petaya can spawn on any of the seven open plots in your farm. The seven empty plots should all be permanently applied with surprise mulch. Note that even though the [[Berries/Kebia]] has the ability to overtake other berries, it can only do so at the taller or later stages, so you will be able to let the mutation keep going if you want to mutate multiple Petaya before the [[Berries/Wacan]] withers. Specifically, you have 6 hours from time of mutation to remove the [[Berries/Kebia]] before it threatens to take over your newly mutated Petaya unless it mutates on one of the two edge plots.
-If you intend to use [[Items/Freeze Mulch]] to make the setup live longer, you must **never** freeze [[Berries/Babiri]], [[Berries/Kebia]] and [[Berries/Payapa]] since this mulch gets rid of auras. Freezing Babiri would remove its protection causing the nearby parasites to mutate berries into themselves, ruining the setup. Freezing Kebia and Payapa would remove their mutation chance up aura while leaving their ability to parasite intact since that's not considered an aura. As for the rest of the berries, those can be frozen without causing any issues.
+* Remember to check the [critical information](#critical-info) section once the setup is fully ripe!
 
 ### Petaya with Freeze Mulch (easy mode)
-Mutating a Petaya with Freeze Mulch makes the entire thing incredibly easy.  What you need to do is plant all the berries simultaneously, as seen in the mutation formation, and then simply apply the appropriate amount of freeze mulch to the berry seeds, such that when the freeze mulch runs out the berry would start growing as if you had just planted it according to the timing table.  Below is a table for how much freeze mulch each berry needs for the timings to be correct.  Kasib and Kebia have such a short growth time (5 and 10 minutes without Sprayduck) that it's probably worth just planting them when the rest of the berries are nearly ripe, hence the optional.
+Mutating a Petaya with Freeze Mulch makes the entire thing incredibly easy.  What you need to do is plant all the berries simultaneously, as seen in the mutation formation, and then simply apply the appropriate amount of Freeze Mulch to the berry seeds, such that when the freeze mulch runs out the berry would start growing as if you had just planted it according to the timing table.  Below is a table for how much Freeze Mulch each berry needs for the timings to be correct.  Kasib and Kebia have such a short growth time (5 and 10 minutes without Sprayduck) that it's probably worth just planting them when the rest of the berries are nearly ripe, hence the optional.
 
 **Note: This table assumes you have given Haban 128 Boost Mulch and Babiri 52 Boost Mulch, and maxed [[Oak Items/Sprayduck]] is equipped.**
 
@@ -79,12 +77,9 @@ Mutating a Petaya with Freeze Mulch makes the entire thing incredibly easy.  Wha
 | [[Berries/Kebia]] | 126 (optional) | 10:30:00 |
 | [[Berries/Kasib]] | 126 (optional) | 10:30:00 |
 
-In total 1,006 (or 1,258 counting the optional 2 last berries) Freeze Mulches are needed to use this method.
-
-### What to do if Petaya doesn't spawn before other berries start dying
-The berry that will die first is [[Berries/Wacan]] — it will die around 1 hours 25 mins after it ripens. This ''should'' be enough for you to get a Petaya to spawn. If the [[Berries/Wacan]] dies before mutation, you will have to replant [[Berries/Chilan]], [[Berries/Tanga]], and [[Berries/Wacan]]. If you start within 38 minutes of [[Berries/Wacan]] dying (1 hour 15 minutes with boost mulch), you ''should'' be able to get one more full [[Berries/Wacan]] cycle before the [[Berries/Coba]] dies and you have to start over. The ability to do this increases overall chance of mutation to 99% or 84.4% without [[Oak Items/Squirtbottle]].
+In total 1,006 (or 1,258 counting the optional 2 last berries) Freeze Mulches are needed to use this method. Remember to check the [critical information](#critical-info) section once the setup is fully ripe!
 
-### Timing Table
+### Timing Table {#timing-table}
 All planting times use the time-to-ripe remaining of the first planted berry for subsequent planting times
 | Berry | Planting Time with No Modifier | Planting Time with Mulch or Sprayduck | Planting Time with  Mulch & Sprayduck |
 |:---:|:---:|:---:|:---:|
@@ -107,7 +102,14 @@ All planting times use the time-to-ripe remaining of the first planted berry for
 | [[File:Kebia.png\|32px]] [[Berries/Kebia]] | 00:10:00  | 00:06:40  |	00:04:27 |
 | [[File:Kasib.png\|32px]] [[Berries/Kasib]] | 00:05:00	 | 00:03:20  |	00:02:13 |
 
-If [[Berries/Wacan]] dies, harvest and replant [[Berries/Chilan]], [[Berries/Tanga]], and [[Berries/Wacan]] following this table to get the setup again. Note that you will want to make sure [[Berries/Coba]] and [[Berries/Shuca]] have at least about 2 hours 46 mins left on their timers (3 hours 26 mins without boost mulch) for another full [[Berries/Wacan]] cycle. You may want to replant [[Berries/Kasib]] as well to avoid [[Berries/Shuca]] dying before [[Berries/Coba]], but this is not very important at this time.
+### Critical information for when all berries have ripened {#critical-info}
+After all 18 berries are ripe, the requirements for Petaya to spawn have been fully met. At this point, immediately switch out your [[Oak Items/Sprayduck]] for the [[Oak Items/Squirtbottle]], if possible, otherwise another Oak Item if not. It is highly recommended that you make a save here so you don't have to go through the whole setup again in case nothing mutates. Petaya can spawn on any of the seven open plots in your farm. The seven empty plots should all be permanently applied with surprise mulch. Note that even though the [[Berries/Kebia]] has the ability to overtake other berries, it can only do so at the taller or later stages, so you will be able to let the mutation keep going if you want to mutate multiple Petaya before the [[Berries/Wacan]] withers. Specifically, you have 6 hours from time of mutation to remove the [[Berries/Kebia]] before it threatens to take over your newly mutated Petaya unless it mutates on one of the two edge plots.
+If you intend to use [[Items/Freeze Mulch]] to make the setup live longer, you must **never** freeze [[Berries/Babiri]], [[Berries/Kebia]] and [[Berries/Payapa]] since this mulch gets rid of auras. Freezing Babiri would remove its protection causing the nearby parasites to mutate berries into themselves, ruining the setup. Freezing Kebia and Payapa would remove their mutation chance up aura while leaving their ability to parasite intact since that's not considered an aura. As for the rest of the berries, those can be frozen without causing any issues.
+
+### What to do if Petaya doesn't spawn before other berries start dying
+The berry that will die first is [[Berries/Wacan]] — it will die around 1 hours 25 mins after it ripens. This ''should'' be enough for you to get a Petaya to spawn. If the [[Berries/Wacan]] dies before mutation, you will have to replant [[Berries/Chilan]], [[Berries/Tanga]], and [[Berries/Wacan]]. If you start within 38 minutes of [[Berries/Wacan]] dying (1 hour 15 minutes with boost mulch), you ''should'' be able to get one more full [[Berries/Wacan]] cycle before the [[Berries/Coba]] dies and you have to start over. The ability to do this increases overall chance of mutation to 99% or 84.4% without [[Oak Items/Squirtbottle]].
+
+When [[Berries/Wacan]] dies, harvest and replant [[Berries/Chilan]], [[Berries/Tanga]], and [[Berries/Wacan]] following this table to get the setup again. Note that you will want to make sure [[Berries/Coba]] and [[Berries/Shuca]] have at least about 2 hours 46 mins left on their timers (3 hours 26 mins without boost mulch) for another full [[Berries/Wacan]] cycle. You may want to replant [[Berries/Kasib]] as well to avoid [[Berries/Shuca]] dying before [[Berries/Coba]], but this is not very important at this time.
 
 All planting times use the time-to-ripe remaining of the first planted berry for subsequent planting times
 | Berry | Planting Time with No Modifier|  Planting Time with Mulch | Planting Time with Mulch & Sprayduck|

data/Dungeon Tokens/overview_description.md

@@ -6,7 +6,7 @@ Dungeon Tokens [[File:dungeonToken.svg|25px]] are blue tokens earned when a Pok
 
 Dungeon Tokens are obtained via the following formula. Each Dungeon has an associated route that is approximately the same difficulty that is used in this calculation.
 
-$$ \text{Dungeon Tokens} = \max\Bigg( 1, 6 \times \frac{\text{route} \times 2}{\frac{2.8}{1 + \frac{\text{region}}{3}}}\Bigg) \times \text{Achievement Bonus} $$
+$$ \text{Dungeon Tokens} = \max\Bigg( 1, 6 \times (\frac{\text{route} \times 2}{\frac{2.8}{1 + \frac{\text{region}}{3}}})^{1.08}\Bigg) \times \text{Achievement Bonus} $$
 
 A rate of Average Dungeon Tokens Gained per Second has been calculated for each route in order to calculate the most efficient routes for Dungeon Token Farming in each region. The formula used to calculate the rates detailed on this page is as follows:
 

data/Farm/Setups.md

@@ -306,7 +306,7 @@ Purple spots are where the player is meant to harvest the berry and replace with
 :::
 
 ### Infinite Farm
-This setup is another way to have a Farm that boosts egg steps gain. The combination of [[Berries/Haban]] and [[Berries/Lum]] in this formation make [[Berries/Petaya]] live forever once the setup fully ripens. While not as efficient as other setups in the [[Hatchery]] page, it works for those who want to forget about the Farm.
+This setup is another way to have a Farm that boosts egg steps gain. The combination of [[Berries/Haban]] and [[Berries/Lum]] in this formation make [[Berries/Petaya]] live for approximately 3.5 years once the setup fully ripens. While not as efficient as other setups in the [[Hatchery]] page, it works for those who want to forget about the Farm.
 
 Note that replacing the [[Berries/Chople]] with a different berry like [[Berries/Rowap]] or [[Berries/Starf]] will make the bonus only be 1.70x.
 

data/Quest Lines/Typing some Memories.md

@@ -1,2 +1,2 @@
 ## Hints
-For step 3, you have to talk to Kahuna Hala in [[Towns/Iki Town]], Kahuna Olivia in [[Towns/Konikoni City]], Kahuna Nanu in [[Towns/Malie City]] and Kahuna Hapu in [[Towns/Exeggutor Island]].
+For step 3, you have to talk to Kahuna Hala in [[Towns/Iki Town]], Kahuna Olivia in [[Towns/Konikoni City]], Kahuna Nanu in [[Towns/Malie City]] and Kahuna Hapu in [[Towns/Seafolk Village]].

data/Towns/Disguised Shop.md

@@ -0,0 +1,2 @@
+# Location hint
+Near [[Towns/Geosenge Town]].

data/Towns/Fish Shop.md

@@ -0,0 +1,2 @@
+# # Location hint
+In the water near [[Towns/ Mauville City]]

data/Towns/Magikarp's Eye.md

@@ -0,0 +1,2 @@
+## Location hint
+It's in the name.

data/Towns/Route 4 Pokémon Center.md

@@ -0,0 +1,2 @@
+# # Location hint
+Near [[Dungeons/Mt. Moon]].

data/Towns/Secret Berry Shop.md

@@ -0,0 +1,2 @@
+# # Location hint
+Near [[Routes/Sinnoh Route 217]].

data/Towns/Wind Chime Shop.md

@@ -0,0 +1,2 @@
+# Location hint
+Near [[Towns/Fortree City]]

index.html

@@ -247,6 +247,6 @@ <h5 class="modal-title">Settings</h5>
         </template>
 
         <!-- Main wiki script -->
-        <script src="bundle.js?t=1731832407882"></script>
+        <script src="bundle.js?t=1732476076817"></script>
     </body>
 </html>