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 00000000000..c14ff9deb56
Binary files /dev/null and b/public/images/trainer/geeta.png differ
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([