Manual merge

index.css

@@ -19,9 +19,21 @@ html {
 
 body {
   margin: 0;
+  display:flex;
+  flex-direction: column;
+  align-items: center;
   background: #484050;
 }
 
+#links {
+  width: 90%;
+  text-align: center;
+  position: fixed;
+  bottom: 0;
+  display: flex;
+  justify-content: space-around;
+}
+
 #app {
   display: flex;
   justify-content: center;
@@ -195,6 +207,17 @@ input:-internal-autofill-selected {
   }
 }
 
+#tnc-links {
+  font-size: larger;
+  position: relative;
+}
+
+a {
+  color: #328cea;
+  margin-right: 4px;
+  margin-left: 4px;
+}
+
 /* Firefox old*/
 @-moz-keyframes blink {
     0% {

index.html

@@ -39,6 +39,7 @@
 	</style>
 	<link rel="stylesheet" type="text/css" href="./index.css" />
 	<link rel="manifest" href="./manifest.webmanifest">
+	<script type="text/javascript" src="https://app.termly.io/resource-blocker/c5dbfa2f-9723-4c0f-a84b-2895124e851f?autoBlock=on"></script>
   <script>
     if ("serviceWorker" in navigator) {
       window.addEventListener("load", function () {
@@ -125,5 +126,4 @@
 	<script src="./src/touch-controls.ts" type="module"></script>
 	<script src="./src/debug.js" type="module"></script>
 </body>
-
 </html>

src/data/egg.ts

@@ -212,7 +212,7 @@ export class Egg {
     let abilityIndex = undefined;
     if (pokemonSpecies.abilityHidden && (this._overrideHiddenAbility
       || (this._sourceType === EggSourceType.SAME_SPECIES_EGG && !Utils.randSeedInt(SAME_SPECIES_EGG_HA_RATE)))) {
-      abilityIndex = pokemonSpecies.ability2 ? 2 : 1;
+      abilityIndex = 2;
     }
 
     // This function has way to many optional parameters