From f342ea8e67af3f984ccd308bf993b7e8f6a663d3 Mon Sep 17 00:00:00 2001
From: Madmadness65 <blaze.the.fireman@gmail.com>
Date: Thu, 4 Jan 2024 19:28:24 -0600
Subject: [PATCH] Fix minor champion oversight

Iris is no longer listed twice for wave 190, and Geeta has been added for the future
---
 public/images/trainer/geeta.json |  41 +++++++++++++++++++++++++++++++
 public/images/trainer/geeta.png  | Bin 0 -> 1130 bytes
 src/battle.ts                    |   2 +-
 src/data/biome.ts                |   3 ++-
 src/data/trainer-type.ts         |   6 +++--
 5 files changed, 48 insertions(+), 4 deletions(-)
 create mode 100644 public/images/trainer/geeta.json
 create mode 100644 public/images/trainer/geeta.png

diff --git a/public/images/trainer/geeta.json b/public/images/trainer/geeta.json
new file mode 100644
index 00000000000..2ba7a90c5c8
--- /dev/null
+++ b/public/images/trainer/geeta.json
@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "geeta.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 79,
+				"h": 79
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 53,
+						"h": 79
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 53,
+						"h": 79
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 53,
+						"h": 79
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": ""
+	}
+}
diff --git a/public/images/trainer/geeta.png b/public/images/trainer/geeta.png
new file mode 100644
index 0000000000000000000000000000000000000000..c14ff9deb560f2d90df03cdaf75744957fb00eff
GIT binary patch
literal 1130
zcmV-w1eN=VP)<h;3K|Lk000e1NJLTq002(_002)20{{R3o$6?`00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj5S5Qn;MF0Q*At50+I5;*#*9b^ui&|4=e3Ra(fX$?5
z|K4l2cvLzmDLy%z|NsAFHZh!QV?0Hrd`VhFIC1!3SinF)R$Fu_FLKVt#(;*Rue8M-
z6HbL{{{R30Jjs4K0000TbW%=J|NsC0|NsC0|NsC0|NsC0|NsC0|NsC0|NsC009l6T
zY5)KL32;bRa{vGi!vFvd!vV){sAK>D19M44K~z{r)z^z!n?Mi+;Gq)C5-}7D>YDd|
z&Yn55Ttc|)M(tNmKNFDQ&)(Qnx!go7;VdyXw`JKc%YEeR9udPb9^4^b-2r519x#0g
zSE4h$0f05n%m)=yM{-h}<L(EA<UsBLApI0@tj!B>8hL!Q0~~T3j|t#Vnisi{0oQ|Q
zT9%DqOwaq0yeI?%=!_%i*jIo;kfRx@*E4##&WHPDo|HU+pkt^KeqshPl%RR)9rZ?X
zrvm_-szET08@yxiq&z$UET5{d5_Qm|&}PPP!3!L{>ck$Sk>+IvvTi@u9&UerEK73F
z+T#(-S-6`UPY&jlIuUF!W;ofi>7XZNd3Y|BQ}BGG7Y$B4n-Anv2JVgqn%6JqBb8cC
zd>6qK)5DtPC+>&dZ`_I{fk&Wel&NcdMYv?}2Cy(N-%-_*m+IvYk)~<du7=Qq^zb<W
z%xz#cB9~5H5K*v$2e7N1>)MHjGV3z42})OYukwlp)i_kId3)>5t#dds56vZLqH~*|
zc1CJ6i6VR4yubT%3sFOl3x+CExNQ$VH5%EEn1XHVUE6YQxW}MvR;}5dY4!NAy2SL&
zdx{?Y^?I&N)X`%#BU^JksmpB_@g_FTd4l3H$<F7v?PcO|M>UVprqL6pnodUqIh2G)
z4(T}@*z<y51Ph(vP`sYLV&ufXx88I4d5?x!V!^?~vdY7ZV0wE`29VhYCmy1!(Ynj2
z&{rKh#H#ke;W9wp)q4XNM624JlJUBgg3#eZp9jyvn*Ge{@O<d-4PGiZE92u90>jtz
zbm`sYO*z|Hy*}6c7GP!nzM2hB!LUylXbGh&nO#Qxh#@s%M}0!!TIQZ@Du}oK4j#Tr
z@EXe2bL(NB()Pi_>8y33Y9mV?yR7dxmyQ*27_#UEP(AH$xE7T~4{w9lrGZ<Xf%q3L
z#$?%3FdU?Da}WCgRt!Dsur|=H#AV3~VDOT-1yA>siI<oS?=Eo7ySITq)+6|NkKo{?
zH*nnp_|={*?W8PvV~4-e(++>FHy%dk+dV4Z<J|-PXz%JcF8f{@xa{@D|L&!O|G;DV
zlh1qj-DDe`;xSpMMVlsG;ud{dt-Ia`CN}TJ3;&lKJ^Xc@0?ulssy?o^dGZP1++*V=
wUBoXwswy6wSI);v|8Pk8Uf-`wnUTxoFZH_~|M-WNv;Y7A07*qoM6N<$f+H;@?f?J)

literal 0
HcmV?d00001

diff --git a/src/battle.ts b/src/battle.ts
index 5872ed0f0b3..ba5c66b1aef 100644
--- a/src/battle.ts
+++ b/src/battle.ts
@@ -225,7 +225,7 @@ export const fixedBattles: FixedBattleConfigs = {
     [189]: new FixedBattleConfig().setBattleType(BattleType.TRAINER).setSeedOffsetWave(186)
         .setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.LANCE, TrainerType.KAREN, TrainerType.DRAKE, TrainerType.LUCIAN, TrainerType.CAITLIN, TrainerType.DRASNA, TrainerType.KAHILI/*, TrainerType.HASSEL, TrainerType.DRAYTON*/ ])),
     [190]: new FixedBattleConfig().setBattleType(BattleType.TRAINER).setSeedOffsetWave(186)
-        .setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.BLUE, TrainerType.RED, TrainerType.LANCE_CHAMPION, TrainerType.STEVEN, TrainerType.WALLACE, TrainerType.CYNTHIA, TrainerType.IRIS, TrainerType.ALDER, TrainerType.IRIS, TrainerType.DIANTHA, TrainerType.LEON/*, TrainerType.NEMONA, TrainerType.KIERAN*/ ])),
+        .setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.BLUE, TrainerType.RED, TrainerType.LANCE_CHAMPION, TrainerType.STEVEN, TrainerType.WALLACE, TrainerType.CYNTHIA, TrainerType.ALDER, TrainerType.IRIS, TrainerType.DIANTHA, TrainerType.LEON/*, TrainerType.GEETA, TrainerType.NEMONA, TrainerType.KIERAN*/ ])),
     [195]: new FixedBattleConfig().setBattleType(BattleType.TRAINER)
         .setGetTrainerFunc(scene => new Trainer(scene, TrainerType.RIVAL_6, true))
 };
\ No newline at end of file
diff --git a/src/data/biome.ts b/src/data/biome.ts
index 0322b1efcb6..de970647835 100644
--- a/src/data/biome.ts
+++ b/src/data/biome.ts
@@ -7351,7 +7351,8 @@ export const biomeTrainerPools: BiomeTrainerPools = {
     [ TrainerType.IRIS, [] ],
     [ TrainerType.DIANTHA, [] ],
     [ TrainerType.LEON, [] ],
-    /*[ TrainerType.NEMONA, [] ],
+    /*[ TrainerType.GEETA, [] ],
+    [ TrainerType.NEMONA, [] ],
     [ TrainerType.KIERAN, [] ],*/
     [ TrainerType.RIVAL, [] ]
   ];
diff --git a/src/data/trainer-type.ts b/src/data/trainer-type.ts
index 6bf59428288..9c7d7a30ac8 100644
--- a/src/data/trainer-type.ts
+++ b/src/data/trainer-type.ts
@@ -178,7 +178,8 @@ export enum TrainerType {
   IRIS,
   DIANTHA,
   LEON,
-  /*NEMONA,
+  /*GEETA,
+  NEMONA,
   KIERAN,*/
 
   RIVAL = 375,
@@ -1053,7 +1054,8 @@ export const trainerConfigs: TrainerConfigs = {
   [TrainerType.IRIS]: new TrainerConfig(++t).initForChampion([ Species.HAXORUS, Species.YVELTAL, Species.DRUDDIGON, Species.ARON, Species.LAPRAS ]),
   [TrainerType.DIANTHA]: new TrainerConfig(++t).initForChampion([ Species.HAWLUCHA, Species.XERNEAS, Species.GOURGEIST, Species.GOODRA, Species.GARDEVOIR ]),
   [TrainerType.LEON]: new TrainerConfig(++t).initForChampion([ Species.DRAGAPULT, [ Species.ZACIAN, Species.ZAMAZENTA ], Species.SEISMITOAD, Species.AEGISLASH, Species.MR_RIME ]),
-  /*[TrainerType.NEMONA]: new TrainerConfig(++t).initForChampion([ Species.LYCANROC, Species.KORAIDON, Species.KOMMO_O, Species.PAWMOT, Species.DUSKNOIR ]),
+  /*[TrainerType.GEETA]: new TrainerConfig(++t).initForChampion([ Species.GLIMMORA, Species.ESPATHRA, Species.GOGOAT, Species.VELUZA, Species.KINGAMBIT ]),
+  [TrainerType.NEMONA]: new TrainerConfig(++t).initForChampion([ Species.LYCANROC, Species.KORAIDON, Species.KOMMO_O, Species.PAWMOT, Species.DUSKNOIR ]),
   [TrainerType.KIERAN]: new TrainerConfig(++t).initForChampion([ Species.POLITOED, Species.MIRAIDON, Species.HYDRAPPLE, Species.PORYGON_Z, Species.GRIMMSNARL ]),*/
 
   [TrainerType.RIVAL]: new TrainerConfig((t = TrainerType.RIVAL)).setStaticParty().setEncounterBgm(TrainerType.RIVAL).setBattleBgm('battle_rival').setPartyTemplates(trainerPartyTemplates.RIVAL).setEncounterMessages([