[Feature] Unique Evil Team Admins (#3384)

* Hardcoded Pokemon should have proper names

* Add evil admin placeholder images

* Add admin names to locale files

* Add evil team admin dialogue

* current things.

* rename

* team galactic wants to be special

* Revert debug changes

* Added Trainer Names and Titles

* [Hotfix] Fix interactions of some moves not changing types (#3183)

* [Hotfix] Fix wild spawns not having their HA (#3190)

* Add evil admin placeholder images

* Add admin names to locale files

* Add evil team admin dialogue

* Added new sprites

* Make simple admin trainer pools

* Add Korean localization

* Revert this

* [Feature] Named Evil Team Admins

* Dateien removed

* Revert override

* French only needs one pair of evil team bosses :)

* Some things Temp Mentioned in the PR

* Removed NoDuplicates again...Because it only works on the speciality pool....
Also reordered the second admin wave. So we guarantee it is never the same one

* German dialogue

* Offset

* Jördis just better

* Credit for the artists (see https://www.deviantart.com/icejkai/art/Magma-Admin-Courtney-Trainer-Sprite-544510574)

* Order

* Added tsdoc and named it more clear

* Fixed formatting and made it a void function

* Changed offset to number and updated tsdoch

* Improve readability

* Removed extra lines

* Fix this

* Revert override

* colress gets his own pool because @blitzy wants it (and i agree)

* Added Rood (some plasma sage guy)

* has voucher is not false by default. So only it will be set true for evil team leaders, gym leaders, elite 4 and champions

* Apply suggestions from code review

Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
Co-authored-by: returntoice <dieandbecome@gmail.com>

* Added the localization also to japanese

* Update src/locales/ko/trainers.ts

Co-authored-by: sodam <66295123+sodaMelon@users.noreply.github.com>

* CA

* Removed Colress

* Colress Last Stand

---------

Co-authored-by: Adrian T. <68144167+torranx@users.noreply.github.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
Co-authored-by: returntoice <dieandbecome@gmail.com>
Co-authored-by: sodam <66295123+sodaMelon@users.noreply.github.com>

README.md

@@ -81,6 +81,7 @@ Check out [Github Issues](https://github.com/pagefaultgames/pokerogue/issues) to
   - kyledove
   - Brumirage
   - pkmn_realidea (Paid Commissions)
+  - IceJkai 
 
 ### 🎨 Trainer Portraits
   - pkmn_realidea (Paid Commissions)

public/images/trainer/aqua_admin_f.json

@@ -1,41 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "aqua_admin_f.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 80,
-				"h": 80
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 80,
-						"h": 80
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 80,
-						"h": 80
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:efd07ff3ed1e610150a4b8ca18974343:d9b85b9eb11182e9e4669e2bd8b08694:72b7b50231708a9486d5f315824e4df1$"
-	}
-}

public/images/trainer/archer.json

@@ -1,7 +1,7 @@
 {
 	"textures": [
 		{
-			"image": "aqua_admin_m.png",
+			"image": "archer.png",
 			"format": "RGBA8888",
 			"size": {
 				"w": 80,

public/images/trainer/ariana.json

@@ -1,7 +1,7 @@
 {
 	"textures": [
 		{
-			"image": "rocket_admin_m.png",
+			"image": "ariana.png",
 			"format": "RGBA8888",
 			"size": {
 				"w": 80,

public/images/trainer/bryony.json

@@ -1,7 +1,7 @@
 {
 	"textures": [
 		{
-			"image": "magma_admin_f.png",
+			"image": "bryony.png",
 			"format": "RGBA8888",
 			"size": {
 				"w": 80,

public/images/trainer/courtney.json

@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "courtney.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 52,
+				"h": 80
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 52,
+						"h": 80
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 52,
+						"h": 80
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 52,
+						"h": 80
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:831f5748dad92911b10a1cb358ee2dae:a3bf81bbaa3b49cad5e0e549cf94563b:bb6befc9383c9c08837183ae2a7a80c1$"
+	}
+}

public/images/trainer/flare_admin_m.json

@@ -1,41 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "flare_admin_m.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 80,
-				"h": 80
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 80,
-						"h": 80
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 80,
-						"h": 80
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:c30bf82452209a923f4becf13d275a9a:a6355b09f92c9c0388d0b919010f587f:0638dbf213f8a974eb5af76eb1e5ddeb$"
-	}
-}

public/images/trainer/galactic_admin_f.json

@@ -1,41 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "galactic_admin_f.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 80,
-				"h": 80
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 80,
-						"h": 80
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 80,
-						"h": 80
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:831f5748dad92911b10a1cb358ee2dae:a3bf81bbaa3b49cad5e0e549cf94563b:bb6befc9383c9c08837183ae2a7a80c1$"
-	}
-}

public/images/trainer/galactic_admin_m.json

@@ -1,41 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "galactic_admin_m.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 80,
-				"h": 80
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 80,
-						"h": 80
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 80,
-						"h": 80
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:3012867f03f02c4ee67a8ab3ad5a000e:77a5f60f1adc158664b3b2ee17bf30fe:7e8259b5177c0a76e5d02d6bdc66affe$"
-	}
-}

public/images/trainer/jupiter.json

@@ -1,7 +1,7 @@
 {
 	"textures": [
 		{
-			"image": "flare_admin_f.png",
+			"image": "jupiter.png",
 			"format": "RGBA8888",
 			"size": {
 				"w": 80,

public/images/trainer/magma_admin_m.json

@@ -1,41 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "magma_admin_m.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 80,
-				"h": 80
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 80,
-						"h": 80
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 80,
-						"h": 80
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:f63ad48affc076f60fae78992c96a2bf:80928b32710abcb28c07c6fc5a425d99:3b961d8852b62aaf24ceb2030c036515$"
-	}
-}

public/images/trainer/mars.json

@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "mars.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 80,
+				"h": 80
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 80,
+						"h": 80
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 80,
+						"h": 80
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 80,
+						"h": 80
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:831f5748dad92911b10a1cb358ee2dae:a3bf81bbaa3b49cad5e0e549cf94563b:bb6befc9383c9c08837183ae2a7a80c1$"
+	}
+}

public/images/trainer/matt.json

@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "matt.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 80,
+				"h": 80
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 80,
+						"h": 80
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 80,
+						"h": 80
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 80,
+						"h": 80
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:831f5748dad92911b10a1cb358ee2dae:a3bf81bbaa3b49cad5e0e549cf94563b:bb6befc9383c9c08837183ae2a7a80c1$"
+	}
+}

public/images/trainer/petrel.json

@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "petrel.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 80,
+				"h": 80
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 80,
+						"h": 80
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 80,
+						"h": 80
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 80,
+						"h": 80
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:831f5748dad92911b10a1cb358ee2dae:a3bf81bbaa3b49cad5e0e549cf94563b:bb6befc9383c9c08837183ae2a7a80c1$"
+	}
+}

public/images/trainer/proton.json

@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "proton.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 80,
+				"h": 80
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 80,
+						"h": 80
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 80,
+						"h": 80
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 80,
+						"h": 80
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:831f5748dad92911b10a1cb358ee2dae:a3bf81bbaa3b49cad5e0e549cf94563b:bb6befc9383c9c08837183ae2a7a80c1$"
+	}
+}

public/images/trainer/rocket_admin_f.json

@@ -1,41 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "rocket_admin_f.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 80,
-				"h": 80
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 80,
-						"h": 80
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 80,
-						"h": 80
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:831f5748dad92911b10a1cb358ee2dae:a3bf81bbaa3b49cad5e0e549cf94563b:bb6befc9383c9c08837183ae2a7a80c1$"
-	}
-}

public/images/trainer/saturn.json

@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "saturn.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 80,
+				"h": 80
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 80,
+						"h": 80
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 80,
+						"h": 80
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 80,
+						"h": 80
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:831f5748dad92911b10a1cb358ee2dae:a3bf81bbaa3b49cad5e0e549cf94563b:bb6befc9383c9c08837183ae2a7a80c1$"
+	}
+}

public/images/trainer/shelly.json

@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "shelly.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 80,
+				"h": 80
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 80,
+						"h": 80
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 80,
+						"h": 80
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 80,
+						"h": 80
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:831f5748dad92911b10a1cb358ee2dae:a3bf81bbaa3b49cad5e0e549cf94563b:bb6befc9383c9c08837183ae2a7a80c1$"
+	}
+}

public/images/trainer/tabitha.json

@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "tabitha.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 80,
+				"h": 80
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 80,
+						"h": 80
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 80,
+						"h": 80
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 80,
+						"h": 80
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:831f5748dad92911b10a1cb358ee2dae:a3bf81bbaa3b49cad5e0e549cf94563b:bb6befc9383c9c08837183ae2a7a80c1$"
+	}
+}

public/images/trainer/xerosic.json

@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "xerosic.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 80,
+				"h": 80
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 80,
+						"h": 80
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 80,
+						"h": 80
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 80,
+						"h": 80
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:831f5748dad92911b10a1cb358ee2dae:a3bf81bbaa3b49cad5e0e549cf94563b:bb6befc9383c9c08837183ae2a7a80c1$"
+	}
+}

src/battle.ts

@@ -425,22 +425,28 @@ export class FixedBattleConfig {
   }
 }
 
+
 /**
  * Helper function to generate a random trainer for evil team trainers and the elite 4/champion
  * @param trainerPool The TrainerType or list of TrainerTypes that can possibly be generated
  * @param randomGender whether or not to randomly (50%) generate a female trainer (for use with evil team grunts)
+ * @param seedOffset the seed offset to use for the random generation of the trainer
  * @returns the generated trainer
  */
-function getRandomTrainerFunc(trainerPool: (TrainerType | TrainerType[])[], randomGender: boolean = false): GetTrainerFunc {
+function getRandomTrainerFunc(trainerPool: (TrainerType | TrainerType[])[], randomGender: boolean = false, seedOffset: number  = 0): GetTrainerFunc {
   return (scene: BattleScene) => {
     const rand = Utils.randSeedInt(trainerPool.length);
     const trainerTypes: TrainerType[] = [];
-    for (const trainerPoolEntry of trainerPool) {
+
-      const trainerType = Array.isArray(trainerPoolEntry)
+    scene.executeWithSeedOffset(() => {
-        ? Utils.randSeedItem(trainerPoolEntry)
+      for (const trainerPoolEntry of trainerPool) {
-        : trainerPoolEntry;
+        const trainerType = Array.isArray(trainerPoolEntry)
-      trainerTypes.push(trainerType);
+          ? Utils.randSeedItem(trainerPoolEntry)
-    }
+          : trainerPoolEntry;
+        trainerTypes.push(trainerType);
+      }
+    }, seedOffset);
+
     let trainerGender = TrainerVariant.DEFAULT;
     if (randomGender) {
       trainerGender = (Utils.randInt(2) === 0) ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT;
@@ -486,13 +492,13 @@ export const classicFixedBattles: FixedBattleConfigs = {
   [64]: new FixedBattleConfig().setBattleType(BattleType.TRAINER).setSeedOffsetWave(35)
     .setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.ROCKET_GRUNT, TrainerType.MAGMA_GRUNT, TrainerType.AQUA_GRUNT, TrainerType.GALACTIC_GRUNT, TrainerType.PLASMA_GRUNT, TrainerType.FLARE_GRUNT ], true)),
   [66]: new FixedBattleConfig().setBattleType(BattleType.TRAINER).setSeedOffsetWave(35)
-    .setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.ROCKET_ADMIN, TrainerType.MAGMA_ADMIN, TrainerType.AQUA_ADMIN, TrainerType.GALACTIC_ADMIN, TrainerType.PLASMA_SAGE, TrainerType.FLARE_ADMIN ], true)),
+    .setGetTrainerFunc(getRandomTrainerFunc([[ TrainerType.ARCHER, TrainerType.ARIANA, TrainerType.PROTON, TrainerType.PETREL ], [ TrainerType.TABITHA, TrainerType.COURTNEY ], [ TrainerType.MATT, TrainerType.SHELLY ], [ TrainerType.JUPITER, TrainerType.MARS, TrainerType.SATURN ], [ TrainerType.ZINZOLIN, TrainerType.ROOD ], [ TrainerType.XEROSIC, TrainerType.BRYONY ] ], true)),
   [95]: new FixedBattleConfig().setBattleType(BattleType.TRAINER)
     .setGetTrainerFunc(scene => new Trainer(scene, TrainerType.RIVAL_4, scene.gameData.gender === PlayerGender.MALE ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT)),
   [112]: new FixedBattleConfig().setBattleType(BattleType.TRAINER).setSeedOffsetWave(35)
     .setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.ROCKET_GRUNT, TrainerType.MAGMA_GRUNT, TrainerType.AQUA_GRUNT, TrainerType.GALACTIC_GRUNT, TrainerType.PLASMA_GRUNT, TrainerType.FLARE_GRUNT ], true)),
   [114]: new FixedBattleConfig().setBattleType(BattleType.TRAINER).setSeedOffsetWave(35)
-    .setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.ROCKET_ADMIN, TrainerType.MAGMA_ADMIN, TrainerType.AQUA_ADMIN, TrainerType.GALACTIC_ADMIN, TrainerType.PLASMA_SAGE, TrainerType.FLARE_ADMIN ], true)),
+    .setGetTrainerFunc(getRandomTrainerFunc([[ TrainerType.ARCHER, TrainerType.ARIANA, TrainerType.PROTON, TrainerType.PETREL ], [ TrainerType.TABITHA, TrainerType.COURTNEY ], [ TrainerType.MATT, TrainerType.SHELLY ], [ TrainerType.JUPITER, TrainerType.MARS, TrainerType.SATURN ], [ TrainerType.ZINZOLIN, TrainerType.ROOD ], [ TrainerType.XEROSIC, TrainerType.BRYONY ] ], true,1)),
   [115]: new FixedBattleConfig().setBattleType(BattleType.TRAINER).setSeedOffsetWave(35)
     .setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.ROCKET_BOSS_GIOVANNI_1, TrainerType.MAXIE, TrainerType.ARCHIE, TrainerType.CYRUS, TrainerType.GHETSIS, TrainerType.LYSANDRE ])),
   [145]: new FixedBattleConfig().setBattleType(BattleType.TRAINER)

src/data/dialogue.ts

@@ -459,17 +459,59 @@ export const trainerTypeDialogue: TrainerTypeDialogue = {
       ]
     }
   ],
-  [TrainerType.ROCKET_ADMIN]: [
+  [TrainerType.ARCHER]: [
     {
       encounter: [
-        "dialogue:rocket_admin.encounter.1",
+        "dialogue:archer.encounter.1",
-        "dialogue:rocket_admin.encounter.2",
+        "dialogue:archer.encounter.2",
-        "dialogue:rocket_admin.encounter.3",
+        "dialogue:archer.encounter.3",
       ],
       victory: [
-        "dialogue:rocket_admin.victory.1",
+        "dialogue:archer.victory.1",
-        "dialogue:rocket_admin.victory.2",
+        "dialogue:archer.victory.2",
-        "dialogue:rocket_admin.victory.3",
+        "dialogue:archer.victory.3",
+      ]
+    }
+  ],
+  [TrainerType.ARIANA]: [
+    {
+      encounter: [
+        "dialogue:ariana.encounter.1",
+        "dialogue:ariana.encounter.2",
+        "dialogue:ariana.encounter.3",
+      ],
+      victory: [
+        "dialogue:ariana.victory.1",
+        "dialogue:ariana.victory.2",
+        "dialogue:ariana.victory.3",
+      ]
+    }
+  ],
+  [TrainerType.PROTON]: [
+    {
+      encounter: [
+        "dialogue:proton.encounter.1",
+        "dialogue:proton.encounter.2",
+        "dialogue:proton.encounter.3",
+      ],
+      victory: [
+        "dialogue:proton.victory.1",
+        "dialogue:proton.victory.2",
+        "dialogue:proton.victory.3",
+      ]
+    }
+  ],
+  [TrainerType.PETREL]: [
+    {
+      encounter: [
+        "dialogue:petrel.encounter.1",
+        "dialogue:petrel.encounter.2",
+        "dialogue:petrel.encounter.3",
+      ],
+      victory: [
+        "dialogue:petrel.victory.1",
+        "dialogue:petrel.victory.2",
+        "dialogue:petrel.victory.3",
       ]
     }
   ],
@@ -483,17 +525,31 @@ export const trainerTypeDialogue: TrainerTypeDialogue = {
       ]
     }
   ],
-  [TrainerType.MAGMA_ADMIN]: [
+  [TrainerType.TABITHA]: [
     {
       encounter: [
-        "dialogue:magma_admin.encounter.1",
+        "dialogue:tabitha.encounter.1",
-        "dialogue:magma_admin.encounter.2",
+        "dialogue:tabitha.encounter.2",
-        "dialogue:magma_admin.encounter.3",
+        "dialogue:tabitha.encounter.3",
       ],
       victory: [
-        "dialogue:magma_admin.victory.1",
+        "dialogue:tabitha.victory.1",
-        "dialogue:magma_admin.victory.2",
+        "dialogue:tabitha.victory.2",
-        "dialogue:magma_admin.victory.3",
+        "dialogue:tabitha.victory.3",
+      ]
+    }
+  ],
+  [TrainerType.COURTNEY]: [
+    {
+      encounter: [
+        "dialogue:courtney.encounter.1",
+        "dialogue:courtney.encounter.2",
+        "dialogue:courtney.encounter.3",
+      ],
+      victory: [
+        "dialogue:courtney.victory.1",
+        "dialogue:courtney.victory.2",
+        "dialogue:courtney.victory.3",
       ]
     }
   ],
@@ -507,17 +563,31 @@ export const trainerTypeDialogue: TrainerTypeDialogue = {
       ]
     }
   ],
-  [TrainerType.AQUA_ADMIN]: [
+  [TrainerType.MATT]: [
     {
       encounter: [
-        "dialogue:aqua_admin.encounter.1",
+        "dialogue:matt.encounter.1",
-        "dialogue:aqua_admin.encounter.2",
+        "dialogue:matt.encounter.2",
-        "dialogue:aqua_admin.encounter.3",
+        "dialogue:matt.encounter.3",
       ],
       victory: [
-        "dialogue:aqua_admin.victory.1",
+        "dialogue:matt.victory.1",
-        "dialogue:aqua_admin.victory.2",
+        "dialogue:matt.victory.2",
-        "dialogue:aqua_admin.victory.3",
+        "dialogue:matt.victory.3",
+      ]
+    }
+  ],
+  [TrainerType.SHELLY]: [
+    {
+      encounter: [
+        "dialogue:shelly.encounter.1",
+        "dialogue:shelly.encounter.2",
+        "dialogue:shelly.encounter.3",
+      ],
+      victory: [
+        "dialogue:shelly.victory.1",
+        "dialogue:shelly.victory.2",
+        "dialogue:shelly.victory.3",
       ]
     }
   ],
@@ -531,17 +601,45 @@ export const trainerTypeDialogue: TrainerTypeDialogue = {
       ]
     }
   ],
-  [TrainerType.GALACTIC_ADMIN]: [
+  [TrainerType.JUPITER]: [
     {
       encounter: [
-        "dialogue:galactic_admin.encounter.1",
+        "dialogue:jupiter.encounter.1",
-        "dialogue:galactic_admin.encounter.2",
+        "dialogue:jupiter.encounter.2",
-        "dialogue:galactic_admin.encounter.3",
+        "dialogue:jupiter.encounter.3",
       ],
       victory: [
-        "dialogue:galactic_admin.victory.1",
+        "dialogue:jupiter.victory.1",
-        "dialogue:galactic_admin.victory.2",
+        "dialogue:jupiter.victory.2",
-        "dialogue:galactic_admin.victory.3",
+        "dialogue:jupiter.victory.3",
+      ]
+    }
+  ],
+  [TrainerType.MARS]: [
+    {
+      encounter: [
+        "dialogue:mars.encounter.1",
+        "dialogue:mars.encounter.2",
+        "dialogue:mars.encounter.3",
+      ],
+      victory: [
+        "dialogue:mars.victory.1",
+        "dialogue:mars.victory.2",
+        "dialogue:mars.victory.3",
+      ]
+    }
+  ],
+  [TrainerType.SATURN]: [
+    {
+      encounter: [
+        "dialogue:saturn.encounter.1",
+        "dialogue:saturn.encounter.2",
+        "dialogue:saturn.encounter.3",
+      ],
+      victory: [
+        "dialogue:saturn.victory.1",
+        "dialogue:saturn.victory.2",
+        "dialogue:saturn.victory.3",
       ]
     }
   ],
@@ -555,17 +653,17 @@ export const trainerTypeDialogue: TrainerTypeDialogue = {
       ]
     }
   ],
-  [TrainerType.PLASMA_SAGE]: [
+  [TrainerType.ZINZOLIN]: [
     {
       encounter: [
-        "dialogue:plasma_sage.encounter.1",
+        "dialogue:zinzolin.encounter.1",
-        "dialogue:plasma_sage.encounter.2",
+        "dialogue:zinzolin.encounter.2",
-        "dialogue:plasma_sage.encounter.3",
+        "dialogue:zinzolin.encounter.3",
       ],
       victory: [
-        "dialogue:plasma_sage.victory.1",
+        "dialogue:zinzolin.victory.1",
-        "dialogue:plasma_sage.victory.2",
+        "dialogue:zinzolin.victory.2",
-        "dialogue:plasma_sage.victory.3",
+        "dialogue:zinzolin.victory.3",
       ]
     }
   ],
@@ -579,17 +677,31 @@ export const trainerTypeDialogue: TrainerTypeDialogue = {
       ]
     }
   ],
-  [TrainerType.FLARE_ADMIN]: [
+  [TrainerType.BRYONY]: [
     {
       encounter: [
-        "dialogue:flare_admin.encounter.1",
+        "dialogue:bryony.encounter.1",
-        "dialogue:flare_admin.encounter.2",
+        "dialogue:bryony.encounter.2",
-        "dialogue:flare_admin.encounter.3",
+        "dialogue:bryony.encounter.3",
       ],
       victory: [
-        "dialogue:flare_admin.victory.1",
+        "dialogue:bryony.victory.1",
-        "dialogue:flare_admin.victory.2",
+        "dialogue:bryony.victory.2",
-        "dialogue:flare_admin.victory.3",
+        "dialogue:bryony.victory.3",
+      ]
+    }
+  ],
+  [TrainerType.XEROSIC]: [
+    {
+      encounter: [
+        "dialogue:xerosic.encounter.1",
+        "dialogue:xerosic.encounter.2",
+        "dialogue:xerosic.encounter.3",
+      ],
+      victory: [
+        "dialogue:xerosic.victory.1",
+        "dialogue:xerosic.victory.2",
+        "dialogue:xerosic.victory.3",
       ]
     }
   ],

src/enums/trainer-type.ts

@@ -1,215 +1,223 @@
-
 export enum TrainerType {
-  UNKNOWN,
+    UNKNOWN,
 
-  ACE_TRAINER,
+    ACE_TRAINER,
-  ARTIST,
+    ARTIST,
-  BACKERS,
+    BACKERS,
-  BACKPACKER,
+    BACKPACKER,
-  BAKER,
+    BAKER,
-  BEAUTY,
+    BEAUTY,
-  BIKER,
+    BIKER,
-  BLACK_BELT,
+    BLACK_BELT,
-  BREEDER,
+    BREEDER,
-  CLERK,
+    CLERK,
-  CYCLIST,
+    CYCLIST,
-  DANCER,
+    DANCER,
-  DEPOT_AGENT,
+    DEPOT_AGENT,
-  DOCTOR,
+    DOCTOR,
-  FIREBREATHER,
+    FIREBREATHER,
-  FISHERMAN,
+    FISHERMAN,
-  GUITARIST,
+    GUITARIST,
-  HARLEQUIN,
+    HARLEQUIN,
-  HIKER,
+    HIKER,
-  HOOLIGANS,
+    HOOLIGANS,
-  HOOPSTER,
+    HOOPSTER,
-  INFIELDER,
+    INFIELDER,
-  JANITOR,
+    JANITOR,
-  LINEBACKER,
+    LINEBACKER,
-  MAID,
+    MAID,
-  MUSICIAN,
+    MUSICIAN,
-  HEX_MANIAC,
+    HEX_MANIAC,
-  NURSERY_AIDE,
+    NURSERY_AIDE,
-  OFFICER,
+    OFFICER,
-  PARASOL_LADY,
+    PARASOL_LADY,
-  PILOT,
+    PILOT,
-  POKEFAN,
+    POKEFAN,
-  PRESCHOOLER,
+    PRESCHOOLER,
-  PSYCHIC,
+    PSYCHIC,
-  RANGER,
+    RANGER,
-  RICH,
+    RICH,
-  RICH_KID,
+    RICH_KID,
-  ROUGHNECK,
+    ROUGHNECK,
-  SAILOR,
+    SAILOR,
-  SCIENTIST,
+    SCIENTIST,
-  SMASHER,
+    SMASHER,
-  SNOW_WORKER,
+    SNOW_WORKER,
-  STRIKER,
+    STRIKER,
-  SCHOOL_KID,
+    SCHOOL_KID,
-  SWIMMER,
+    SWIMMER,
-  TWINS,
+    TWINS,
-  VETERAN,
+    VETERAN,
-  WAITER,
+    WAITER,
-  WORKER,
+    WORKER,
-  YOUNGSTER,
+    YOUNGSTER,
-  ROCKET_GRUNT,
+    ROCKET_GRUNT,
-  ROCKET_ADMIN,
+    ARCHER,
-  MAGMA_GRUNT,
+    ARIANA,
-  MAGMA_ADMIN,
+    PROTON,
-  AQUA_GRUNT,
+    PETREL,
-  AQUA_ADMIN,
+    MAGMA_GRUNT,
-  GALACTIC_GRUNT,
+    TABITHA,
-  GALACTIC_ADMIN,
+    COURTNEY,
-  PLASMA_GRUNT,
+    AQUA_GRUNT,
-  PLASMA_SAGE,
+    MATT,
-  FLARE_GRUNT,
+    SHELLY,
-  FLARE_ADMIN,
+    GALACTIC_GRUNT,
-  ROCKET_BOSS_GIOVANNI_1,
+    JUPITER,
-  ROCKET_BOSS_GIOVANNI_2,
+    MARS,
-  MAXIE,
+    SATURN,
-  MAXIE_2,
+    PLASMA_GRUNT,
-  ARCHIE,
+    ZINZOLIN,
-  ARCHIE_2,
+    ROOD,
-  CYRUS,
+    FLARE_GRUNT,
-  CYRUS_2,
+    BRYONY,
-  GHETSIS,
+    XEROSIC,
-  GHETSIS_2,
+    ROCKET_BOSS_GIOVANNI_1,
-  LYSANDRE,
+    ROCKET_BOSS_GIOVANNI_2,
-  LYSANDRE_2,
+    MAXIE,
+    MAXIE_2,
+    ARCHIE,
+    ARCHIE_2,
+    CYRUS,
+    CYRUS_2,
+    GHETSIS,
+    GHETSIS_2,
+    LYSANDRE,
+    LYSANDRE_2,
 
-  BROCK = 200,
+    BROCK = 200,
-  MISTY,
+    MISTY,
-  LT_SURGE,
+    LT_SURGE,
-  ERIKA,
+    ERIKA,
-  JANINE,
+    JANINE,
-  SABRINA,
+    SABRINA,
-  BLAINE,
+    BLAINE,
-  GIOVANNI,
+    GIOVANNI,
-  FALKNER,
+    FALKNER,
-  BUGSY,
+    BUGSY,
-  WHITNEY,
+    WHITNEY,
-  MORTY,
+    MORTY,
-  CHUCK,
+    CHUCK,
-  JASMINE,
+    JASMINE,
-  PRYCE,
+    PRYCE,
-  CLAIR,
+    CLAIR,
-  ROXANNE,
+    ROXANNE,
-  BRAWLY,
+    BRAWLY,
-  WATTSON,
+    WATTSON,
-  FLANNERY,
+    FLANNERY,
-  NORMAN,
+    NORMAN,
-  WINONA,
+    WINONA,
-  TATE,
+    TATE,
-  LIZA,
+    LIZA,
-  JUAN,
+    JUAN,
-  ROARK,
+    ROARK,
-  GARDENIA,
+    GARDENIA,
-  MAYLENE,
+    MAYLENE,
-  CRASHER_WAKE,
+    CRASHER_WAKE,
-  FANTINA,
+    FANTINA,
-  BYRON,
+    BYRON,
-  CANDICE,
+    CANDICE,
-  VOLKNER,
+    VOLKNER,
-  CILAN,
+    CILAN,
-  CHILI,
+    CHILI,
-  CRESS,
+    CRESS,
-  CHEREN,
+    CHEREN,
-  LENORA,
+    LENORA,
-  ROXIE,
+    ROXIE,
-  BURGH,
+    BURGH,
-  ELESA,
+    ELESA,
-  CLAY,
+    CLAY,
-  SKYLA,
+    SKYLA,
-  BRYCEN,
+    BRYCEN,
-  DRAYDEN,
+    DRAYDEN,
-  MARLON,
+    MARLON,
-  VIOLA,
+    VIOLA,
-  GRANT,
+    GRANT,
-  KORRINA,
+    KORRINA,
-  RAMOS,
+    RAMOS,
-  CLEMONT,
+    CLEMONT,
-  VALERIE,
+    VALERIE,
-  OLYMPIA,
+    OLYMPIA,
-  WULFRIC,
+    WULFRIC,
-  MILO,
+    MILO,
-  NESSA,
+    NESSA,
-  KABU,
+    KABU,
-  BEA,
+    BEA,
-  ALLISTER,
+    ALLISTER,
-  OPAL,
+    OPAL,
-  BEDE,
+    BEDE,
-  GORDIE,
+    GORDIE,
-  MELONY,
+    MELONY,
-  PIERS,
+    PIERS,
-  MARNIE,
+    MARNIE,
-  RAIHAN,
+    RAIHAN,
-  KATY,
+    KATY,
-  BRASSIUS,
+    BRASSIUS,
-  IONO,
+    IONO,
-  KOFU,
+    KOFU,
-  LARRY,
+    LARRY,
-  RYME,
+    RYME,
-  TULIP,
+    TULIP,
-  GRUSHA,
+    GRUSHA,
-  LORELEI = 300,
+    LORELEI = 300,
-  BRUNO,
+    BRUNO,
-  AGATHA,
+    AGATHA,
-  LANCE,
+    LANCE,
-  WILL,
+    WILL,
-  KOGA,
+    KOGA,
-  KAREN,
+    KAREN,
-  SIDNEY,
+    SIDNEY,
-  PHOEBE,
+    PHOEBE,
-  GLACIA,
+    GLACIA,
-  DRAKE,
+    DRAKE,
-  AARON,
+    AARON,
-  BERTHA,
+    BERTHA,
-  FLINT,
+    FLINT,
-  LUCIAN,
+    LUCIAN,
-  SHAUNTAL,
+    SHAUNTAL,
-  MARSHAL,
+    MARSHAL,
-  GRIMSLEY,
+    GRIMSLEY,
-  CAITLIN,
+    CAITLIN,
-  MALVA,
+    MALVA,
-  SIEBOLD,
+    SIEBOLD,
-  WIKSTROM,
+    WIKSTROM,
-  DRASNA,
+    DRASNA,
-  HALA,
+    HALA,
-  MOLAYNE,
+    MOLAYNE,
-  OLIVIA,
+    OLIVIA,
-  ACEROLA,
+    ACEROLA,
-  KAHILI,
+    KAHILI,
-  MARNIE_ELITE,
+    MARNIE_ELITE,
-  NESSA_ELITE,
+    NESSA_ELITE,
-  BEA_ELITE,
+    BEA_ELITE,
-  ALLISTER_ELITE,
+    ALLISTER_ELITE,
-  RAIHAN_ELITE,
+    RAIHAN_ELITE,
-  RIKA,
+    RIKA,
-  POPPY,
+    POPPY,
-  LARRY_ELITE,
+    LARRY_ELITE,
-  HASSEL,
+    HASSEL,
-  CRISPIN,
+    CRISPIN,
-  AMARYS,
+    AMARYS,
-  LACEY,
+    LACEY,
-  DRAYTON,
+    DRAYTON,
-  BLUE = 350,
+    BLUE = 350,
-  RED,
+    RED,
-  LANCE_CHAMPION,
+    LANCE_CHAMPION,
-  STEVEN,
+    STEVEN,
-  WALLACE,
+    WALLACE,
-  CYNTHIA,
+    CYNTHIA,
-  ALDER,
+    ALDER,
-  IRIS,
+    IRIS,
-  DIANTHA,
+    DIANTHA,
-  HAU,
+    HAU,
-  LEON,
+    LEON,
-  GEETA,
+    GEETA,
-  NEMONA,
+    NEMONA,
-  KIERAN,
+    KIERAN,
-  RIVAL = 375,
+    RIVAL = 375,
-  RIVAL_2,
+    RIVAL_2,
-  RIVAL_3,
+    RIVAL_3,
-  RIVAL_4,
+    RIVAL_4,
-  RIVAL_5,
+    RIVAL_5,
-  RIVAL_6
+    RIVAL_6
 }

src/field/trainer.ts

@@ -121,7 +121,7 @@ export default class Trainer extends Phaser.GameObjects.Container {
 
     // Determine the title to include based on the configuration and includeTitle flag.
     let title = includeTitle && this.config.title ? this.config.title : null;
-    const evilTeamTitles = ["grunt", "admin", "sage"];
+    const evilTeamTitles = ["grunt"];
     if (this.name === "" && evilTeamTitles.some(t => name.toLocaleLowerCase().includes(t))) {
       // This is a evil team grunt so we localize it by only using the "name" as the title
       title = i18next.t(`trainerClasses:${name.toLowerCase().replace(/\s/g, "_")}`);
@@ -165,6 +165,8 @@ export default class Trainer extends Phaser.GameObjects.Container {
       name = i18next.t(`trainerNames:${this.config.nameDouble.toLowerCase().replace(/\s/g, "_")}`);
     }
 
+    console.log(title ? `${title} ${name}` : name);
+
     // Return the formatted name, including the title if it is set.
     return title ? `${title} ${name}` : name;
   }

src/locales/ca-ES/dialogue.ts

@@ -383,6 +383,204 @@ export const PGMdialogue: DialogueTranslationEntries = {
       3: "I think it's me that's seasick..."
     },
   },
+
+  "archer": {
+    "encounter": {
+      1: "Before you go any further, let's see how you far against us, Team Rocket!",
+      2: "I have received reports that your skills are not insignificant. Let's see if they are true.",
+      3: "I am Archer, an Admin of Team Rocket. And I do not go easy on enemies of our organization."
+    },
+    "victory": {
+      1: "What a blunder!",
+      2: "With my current skills, I was not up to the task after all.",
+      3: "F-forgive me, Giovanni... For me to be defeated by a mere trainer..."
+    },
+  },
+  "ariana": {
+    "encounter": {
+      1: `Hold it right there! We can't someone on the loose." 
+          $It's harmful to Team Rocket's pride, you see.`,
+      2: `I don't know or care if what I'm doing is right or wrong...
+          $I just put my faith in Giovanni and do as I am told`,
+      3: "Your trip ends here. I'm going to take you down!"
+    },
+    "victory": {
+      1: `Tch, you really are strong. It's too bad. 
+          $If you were to join Team Rocket, you could become an Executive.`,
+      2: "I... I'm shattered...",
+      3: "Aaaieeeee! This can't be happening! I fought hard, but I still lost…"
+    },
+  },
+  "proton": {
+    "encounter": {
+      1: "What do you want? If you interrupt our work, don't expect any mercy!",
+      2: `What do we have here? I am often labeled as the scariest and cruelest guy in Team Rocket…
+         $I strongly urge you not to interfere with our business!`,
+      3: "I am Proton, an Admin of Team Rocket. I am here to put an end to your meddling!"
+    },
+    "victory": {
+      1: "The fortress came down!",
+      2: "You may have won this time… But all you did was make Team Rocket's wrath grow…",
+      3: "I am defeated… But I will not forget this!"
+    },
+  },
+
+  "petrel": {
+    "encounter": {
+      1: `Muhahaha, we've been waiting for you. Me? You don't know who I am? It is me, Giovanni.
+          $The majestic Giovanni himself! Wahahaha! …Huh? I don't sound anything like Giovanni?
+          $I don't even look like Giovanni? How come? I've worked so hard to mimic him!`,
+      2: "I am Petrel, an Admin of Team Rocket. I will not allow you to interfere with our plans!",
+      3: "Rocket Executive Petrel will deal with this intruder!"
+    },
+    "victory": {
+      1: "OK, OK. I'll tell you where he is.",
+      2: "I… I couldn't do a thing… Giovanni, please forgive me…",
+      3: "No, I can't let this affect me. I have to inform the others…"
+    },
+  },
+  "tabitha": {
+    "encounter": {
+      1: "Hehehe! So you've come all the way here! But you're too late!",
+      2: `Hehehe... Got here already, did you? We underestimated you! But this is it! 
+          $I'm a cut above the Grunts you've seen so far. I'm not stalling for time.
+          $I'm going to pulverize you!`,
+      3: "I'm going to give you a little taste of pain! Resign yourself to it!"
+    },
+    "victory": {
+      1: `Hehehe! You might have beaten me, but you don't stand a chance against the Boss!
+          $If you get lost now, you won't have to face a sound whipping!`,
+      2: "Hehehe... So, I lost, too...",
+      3: "Ahya! How could this be? For an Admin like me to lose to some random trainer..."
+    },
+  },
+  "courtney": {
+    "encounter": {
+      1: "The thing...The thing that you hold...That is what... That's what we of Team Magma seek...",
+      2: "... Well then...Deleting...",
+      3: "...Ha. ...Analyzing... ...Hah♪"
+    },
+    "victory": {
+      1: "... ...Change...the world.",
+      2: `As anticipated. Unanticipated. You. Target lock...completed.
+         $Commencing...experiment. You. Forever. Aha... ♪`,
+      3: "...Again? That's unanticipated. ...I knew it. You...are interesting! ...Haha. ♪"
+    },
+  },
+  "shelly": {
+    "encounter": {
+      1: `Ahahahaha! You're going to meddle in Team Aqua's affairs?
+         $You're either absolutely fearless, simply ignorant, or both!
+         $You're so cute, you're disgusting! I'll put you down`,
+      2: "What's this? Who's this spoiled brat?",
+      3: "Cool your jets. Be patient. I'll crush you shortly."
+    },
+    "victory": {
+      1: `Ahahahaha! We got meddled with unexpectedly! We're out of options.
+         $We'll have to pull out. But this isn't the last you'll see of Team Aqua!
+         $We have other plans! Don't you forget it!`,
+      2: "Ahhh?! Did I go too easy on you?!",
+      3: `Uh. Are you telling me you've upped your game even more during the fight?
+         $You're a brat with a bright future… My Pokémon and I don't have any strength left to fight…
+         $Go on… Go and be destroyed by Archie.`
+    },
+  },
+  "matt": {
+    "encounter": {
+      1: "Hoohahaha! What, you got a screw loose or something? Look at you, little Makuhita person!",
+      2: "Oho! You! You're that funny kid!",
+      3: "What are you doing here? Did you follow us?"
+    },
+    "victory": {
+      1: "All right then, until the Boss has time for you, I'll be your opponent!",
+      2: `I can feel it! I can feel it, all right! The strength coming offa you!
+          $More! I still want more! But looks like we're outta time...`,
+      3: "That was fun! I knew you'd show me a good time! I look forward to facing you again someday!"
+    },
+  },
+  "mars": {
+    "encounter": {
+      1: "I'm Mars, one of Team Galactic's top Commanders.",
+      2: "Team Galactic's vision for the future is unwavering. Opposition will be crushed without mercy!",
+      3: "Feeling nervous? You should be!"
+    },
+    "victory": {
+      1: "This can't be happening! How did I lose?!",
+      2: "You have some skill, I'll give you that.",
+      3: "Defeated... This was a costly mistake."
+    }
+  },
+  "jupiter": {
+    "encounter": {
+      1: "Jupiter, Commander of Team Galactic, at your service.",
+      2: "Resistance is futile. Team Galactic will prevail!",
+      3: "You're trembling... scared already?"
+    },
+    "victory": {
+      1: "No way... I lost?!",
+      2: "Impressive, you've got guts!",
+      3: "Losing like this... How embarrassing."
+    }
+  },
+  "saturn": {
+    "encounter": {
+      1: "I am Saturn, Commander of Team Galactic.",
+      2: "Our mission is absolute. Any hindrance will be obliterated!",
+      3: "Is that fear I see in your eyes?"
+    },
+    "victory": {
+      1: "Impossible... Defeated by you?!",
+      2: "You have proven yourself a worthy adversary.",
+      3: "Bestowed in defeat... This is unacceptable."
+    }},
+  "zinzolin": {
+    "encounter": {
+      1: "You could become a threat to Team Plasma, so we will eliminate you here and now!",
+      2: "Oh, for crying out loud... I didn't expect to have to battle in this freezing cold!",
+      3: "You're an impressive Trainer to have made it this far. But it ends here."
+    },
+    "victory": {
+      1: "Ghetsis... I have failed you...",
+      2: "It's bitter cold. I'm shivering. I'm suffering. Yet, I still stand victorious.",
+      3: "Hmph. You're a smarter Trainer than I expected, but not smart enough."
+    }
+  },
+  "rood": {
+    "encounter": {
+      1: "You are a threat to Team Plasma. We cannot let you walk away from here and now!",
+      2: "Oh, this icy wind... I never thought I'd have to fight here!",
+      3: "You are a remarkable Trainer to have made it this far. But this is where it ends."
+    },
+    "victory": {
+      1: "Ghetsis... I have failed my mission...",
+      2: "The cold is piercing. I'm shivering. I'm suffering. Yet, I have triumphed.",
+      3: "Hm. You are a talented Trainer, but unfortunately not talented enough."
+    }
+  },
+  "xerosic": {
+    "encounter": {
+      1: "Ah ha ha! It would be my pleasure. Come on, little Trainer! Let's see what you've got!",
+      2: "Hmm... You're more powerful than you look. I wonder how much energy there is inside you.",
+      3: "I've been waiting for you! I need to do a little research on you! Come, let us begin!"
+    },
+    "victory": {
+      1: "Ah, you're quite strong. Oh yes—very strong, indeed.",
+      2: "Ding-ding-ding! You did it! To the victor go the spoils!",
+      3: "Wonderful! Amazing! You have tremendous skill and bravery!"
+    }
+  },
+  "bryony": {
+    "encounter": {
+      1: "I am Bryony, and it would be my pleasure to battle you. Show me what you've got.",
+      2: "Impressive... You're more powerful than you appear. Let's see the true extent of your energy.",
+      3: "I've anticipated your arrival. It's time for a little test. Shall we begin?"
+    },
+    "victory": {
+      1: "You're quite strong. Oh yes—very strong, indeed.",
+      2: "Ding-ding-ding! You've done well. Victory is yours.",
+      3: "Wonderful! Remarkable! Your skill and bravery are commendable."
+    }
+  },
   "rocket_grunt": {
     "encounter": {
       1: "Prepare for trouble!"
@@ -391,18 +589,6 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "Team Rocket blasting off again!"
     },
   },
-  "rocket_admin": {
-    "encounter": {
-      1: "Oh? You managed to get this far? You must be quite the trainer.",
-      2: "That's quite enough of you playing hero, kid.",
-      3: "I'll show you how scary an angry adult can be!"
-    },
-    "victory": {
-      1: "No! Forgive me Giovanni!",
-      2: "How could this be?",
-      3: "Urgh... You were too strong..."
-    },
-  },
   "magma_grunt": {
     "encounter": {
       1: " If you get in the way of Team Magma, don’t expect any mercy!"
@@ -411,18 +597,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "Huh? I lost?!"
     },
   },
-  "magma_admin": {
+
-    "encounter": {
-      1: "Hehehe! So you've come all the way here! But you're too late!",
-      2: "You're going to meddle in Team Magma's affairs? You're so cute you're disgusting! I'll put you down kiddy!",
-      3: "I'm going to give you a little taste of pain! Resign yourself to it!"
-    },
-    "victory": {
-      1: "Hehehe... So I lost...",
-      2: "You're disgustingly strong!",
-      3: "Ahahaha! Ouch!"
-    },
-  },
   "aqua_grunt": {
     "encounter": {
       1: "No one who crosses Team Aqua gets any mercy, not even kids!"
@@ -431,18 +606,6 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "You're kidding me!"
     },
   },
-  "aqua_admin": {
-    "encounter": {
-      1: "I'm a cut above the grunts you've seen so far. I'm going to puvlerize you!",
-      2: "Hahn? What's this? Who's this spoiled brat?",
-      3: "What are you doing here? Did you follow us?"
-    },
-    "victory": {
-      1: "So I lost too...",
-      2: "Ahhh?! Did I go too easy on you?!",
-      3: "Wh-what was that?"
-    },
-  },
   "galactic_grunt": {
     "encounter": {
       1: "Don't mess with Team Galactic!"
@@ -451,18 +614,6 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "Shut down..."
     },
   },
-  "galactic_admin": {
-    "encounter": {
-      1: "I'm one of Team Galactic's Commanders.",
-      2: "Anything that opposes Team Galactic must be crushed! Even the very thought of opposition will not be tolerated!",
-      3: "What's the matter? Don't tell me you're shaking?"
-    },
-    "victory": {
-      1: "This can't be?! I lost?! You... you uppity brat!",
-      2: "You, my friend, are tough!",
-      3: "Losing to some child... Being careless cost me too much."
-    },
-  },
   "plasma_grunt": {
     "encounter": {
       1: "We won't tolerate people who have different ideas!"
@@ -471,18 +622,6 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "Plasmaaaaaaaaa!"
     },
   },
-  "plasma_sage": {
-    "encounter": {
-      1: "You could become a threat to Team Plasma, so we will eliminate you here!",
-      2: "Oh, for crying out loud... I didn't expect to have to fight!",
-      3: "You're an impressive Trainer to have made it this far."
-    },
-    "victory": {
-      1: "Ghetsis...",
-      2: "It's bitter cold. I'm shivering. I'm suffering.",
-      3: "Hmph. You're a smarter Trainer than I expected."
-    },
-  },
   "flare_grunt": {
     "encounter": {
       1: "Fashion is most important to us!"
@@ -491,18 +630,6 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "The future doesn't look bright for me."
     },
   },
-  "flare_admin": {
-    "encounter": {
-      1: "Ah ha ha! It would be my pleasure. Come on, little Trainer! Let's see what you've got!",
-      2: "Hmm... You're more powerful than you look. I wonder how much energy there is inside you.",
-      3: "I've been waiting for you! I need to do a little research on you! Come, let us begin!"
-    },
-    "victory": {
-      1: "You're quite strong. Oh yes-very strong, indeed.",
-      2: "Ding-ding-ding! Yup, you did it! To the victor goes the spoils!",
-      3: "Wonderful! Amazing! You have tremendous skill and bravery!"
-    },
-  },
   "rocket_boss_giovanni_1": {
     "encounter": {
       1: "So! I must say, I am impressed you got here!"
@@ -2605,7 +2732,7 @@ export const PGFbattleSpecDialogue: SimpleTranslationEntries = PGMbattleSpecDial
 // Dialogue that does not fit into any other category (e.g. tutorial messages, or the end of the game). For when the player character is male
 export const PGMmiscDialogue: SimpleTranslationEntries = {
   "ending":
-        `@c{smile}Oh? You won?@d{96} @c{smile_eclosed}I guess I should've known.\nBut, you're back now.
+      `@c{smile}Oh? You won?@d{96} @c{smile_eclosed}I guess I should've known.\nBut, you're back now.
         $@c{smile}It's over.@d{64} You ended the loop.
         $@c{serious_smile_fists}You fulfilled your dream too, didn't you?\nYou didn't lose even once.
         $@c{neutral}I'm the only one who'll remember what you did.@d{96}\nI guess that's okay, isn't it?
@@ -2613,7 +2740,7 @@ export const PGMmiscDialogue: SimpleTranslationEntries = {
         $@c{smile_eclosed}Anyway, I've had about enough of this place, haven't you? Let's head home.
         $@c{serious_smile_fists}Maybe when we get back, we can have another battle?\nIf you're up to it.`,
   "ending_female":
-        `@c{shock}You're back?@d{32} Does that mean…@d{96} you won?!\n@c{smile_ehalf}I should have known you had it in you.
+      `@c{shock}You're back?@d{32} Does that mean…@d{96} you won?!\n@c{smile_ehalf}I should have known you had it in you.
         $@c{smile_eclosed}Of course… I always had that feeling.\n@c{smile}It's over now, right? You ended the loop.
         $@c{smile_ehalf}You fulfilled your dream too, didn't you?\nYou didn't lose even once.
         $I'll be the only one to remember what you did.\n@c{angry_mopen}I'll try not to forget!

src/locales/ca-ES/trainers.ts

@@ -19,6 +19,19 @@ export const titles: SimpleTranslationEntries = {
   "galactic_boss": "Team Galactic Boss",
   "plasma_boss": "Team Plasma Boss",
   "flare_boss": "Team Flare Boss",
+
+  "rocket_admin": "Team Rocket Admin",
+  "rocket_admin_female": "Team Rocket Admin",
+  "magma_admin": "Team Magma Admin",
+  "magma_admin_female": "Team Magma Admin",
+  "aqua_admin": "Team Aqua Admin",
+  "aqua_admin_female": "Team Aqua Admin",
+  "galactic_commander": "Team Galactic Commander",
+  "galactic_commander_female": "Team Galactic Commander",
+  "plasma_sage": "Team Plasma Sage",
+  "plasma_admin": "Team Plasma Admin",
+  "flare_admin": "Team Flare Admin",
+  "flare_admin_female": "Team Flare Admin",
   // Maybe if we add the evil teams we can add "Team Rocket" and "Team Aqua" etc. here as well as "Team Rocket Boss" and "Team Aqua Admin" etc.
 } as const;
 
@@ -128,32 +141,21 @@ export const trainerClasses: SimpleTranslationEntries = {
   "rocket_grunt": "Rocket Grunt",
   "rocket_grunts": "Rocket Grunts",
   "rocket_grunt_female": "Rocket Grunt",
-  "rocket_admin": "Rocket Admin",
-  "rocket_admin_female": "Rocket Admin",
   "magma_grunt": "Magma Grunt",
   "magma_grunt_female": "Magma Grunt",
   "magma_grunts": "Magma Grunts",
-  "magma_admin": "Magma Admin",
-  "magma_admin_female": "Magma Admin",
   "aqua_grunt": "Aqua Grunt",
   "aqua_grunt_female": "Aqua Grunt",
   "aqua_grunts": "Aqua Grunts",
-  "aqua_admin": "Aqua Admin",
-  "aqua_admin_female": "Aqua Admin",
   "galactic_grunt": "Galactic Grunt",
   "galactic_grunt_female": "Galactic Grunt",
   "galactic_grunts": "Galactic Grunts",
-  "galactic_admin": "Galactic Admin",
-  "galactic_admin_female": "Galactic Admin",
   "plasma_grunt": "Plasma Grunt",
   "plasma_grunt_female": "Plasma Grunt",
   "plasma_grunts": "Plasma Grunts",
-  "plasma_sage": "Plasma Sage",
   "flare_grunt": "Flare Grunt",
   "flare_grunt_female": "Flare Grunt",
   "flare_grunts": "Flare Grunts",
-  "flare_admin": "Flare Admin",
-  "flare_admin_female": "Flare Admin",
 } as const;
 
 // Names of special trainers like gym leaders, elite four, and the champion
@@ -282,6 +284,24 @@ export const trainerNames: SimpleTranslationEntries = {
   "leon": "Leon",
   "rival": "Finn",
   "rival_female": "Ivy",
+
+  // Evil Team Admins
+  "archer": "Archer",
+  "ariana": "Ariana",
+  "proton": "Proton",
+  "petrel": "Petrel",
+  "tabitha": "Tabitha",
+  "courtney": "Courtney",
+  "shelly": "Shelly",
+  "matt": "Matt",
+  "mars": "Mars",
+  "jupiter": "Jupiter",
+  "saturn": "Saturn",
+  "zinzolin": "Zinzolin",
+  "rood": "Rood",
+  "xerosic": "Xerosic",
+  "bryony": "Bryony",
+
   "maxie": "Maxie",
   "archie": "Archie",
   "cyrus": "Cyrus",

src/locales/de/dialogue.ts

@@ -367,30 +367,212 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "Ich werde für das nächste Rennen tunen."
     },
   },
-  "rocket_grunt": {
+  "archer": {
     "encounter": {
-      1: `Jetzt gibt es Ärger!…
+      1: "Bevor du weitergehst, lass uns sehen, wie du dich gegen uns, Team Rocket, schlägst!",
-          $und es kommt noch härter!
+      2: `Ich habe Berichte erhalten, dass deine Fähigkeiten nicht unbedeutend sind.
-          $Wir wollen über die Erde regieren…
+          $Mal sehen, ob sie wahr sind.`,
-          $und naja du kennst den Rest…!`
+      3: `Ich bin Atlas, ein Vorstand von Team Rocket. 
+         $Und ich mache es den Feinden unserer Organisation nicht leicht.`
     },
     "victory": {
-      1: "Das war mal wieder ein Schuss in den Ofen!"
+      1: "Was für ein Fehler!",
-    },
+      2: "Mit meinen aktuellen Fähigkeiten war ich der Aufgabe doch nicht gewachsen.",
+      3: "V-verzeih mir, Giovanni... Dass ich von einem einfachen Trainer besiegt wurde..."
+    }
   },
-  "rocket_admin": {
+  "ariana": {
     "encounter": {
-      1: "Oh? Du wagst es, dich Team Rocket zu widersetzen? Du wirst es bereuen.",
+      1: `Halt! Wir können niemanden herumlaufen lassen. 
-      2: "Du glaubst, du kannst uns aufhalten? Naiver Narr!",
+          $Es ist schädlich für den Stolz von Team Rocket, verstehst du.`,
-      3: "Ich werde dir die wahre Macht von Team Rocket zeigen!"
+      2: `Ich weiß nicht und es ist mir egal, ob das, was ich tue, richtig oder falsch ist...
+          $Ich vertraue einfach auf Giovanni und tue, was mir gesagt wird.`,
+      3: "Dein Trip endet hier. Ich werde dich erledigen!"
     },
     "victory": {
-      1: "Nein! Verzeih mir, Giovanni!",
+      1: `Tch, du bist wirklich stark. Es ist schade. 
-      2: "Wie konnte das geschehen?",
+          $Wenn du Team Rocket beitreten würdest, könntest du ein Vorstand werden.`,
-      3: "Urgh... Du warst zu stark..."
+      2: "Ich... ich bin zerstört...",
-    },
+      3: "Aaaieeeee! Das kann nicht passieren! Ich habe hart gekämpft, aber trotzdem verloren..."
+    }
+  },
+  "proton": {
+    "encounter": {
+      1: "Was willst du? Wenn du unsere Arbeit unterbrichst, erwarte keine Gnade!",
+      2: `Was haben wir hier? Ich werde oft als der gruseligste und grausamste Typ bei Team Rocket bezeichnet…
+         $Ich rate dir dringend, dich nicht in unsere Geschäfte einzumischen!`,
+      3: "Ich bin Proton, ein Admin von Team Rocket. Ich bin hier, um deinem Einmischen ein Ende zu setzen!"
+    },
+    "victory": {
+      1: "Die Festung ist gefallen! Alle Mann zurückziehen!",
+      2: "Du hast diesmal gewonnen… Aber alles, was du getan hast, war, den Zorn von Team Rocket zu vergrößern…",
+      3: "Ich bin besiegt… Aber ich werde das nicht vergessen!"
+    }
+  },
+  "petrel": {
+    "encounter": {
+      1: `Muhahaha, wir haben auf dich gewartet. Ich? Du weißt nicht, wer ich bin? Ich bin Giovanni.
+          $Der majestätische Giovanni höchstpersönlich! Wahahaha!
+          $…Huh? Ich klinge überhaupt nicht wie Giovanni?
+          $Ich sehe nicht einmal aus wie Giovanni?
+          $Wie kommt das? Ich habe so hart daran gearbeitet, ihn nachzuahmen!`,
+      2: "Ich bin Lambda, ein Admin von Team Rocket. Ich werde nicht zulassen, dass du unsere Pläne störst!",
+      3: "Rocket Vorstand Lambda wird sich um diesen Eindringling kümmern!"
+    },
+    "victory": {
+      1: "OK, OK. Ich sage dir, wo er ist.",
+      2: "Ich… Ich konnte nichts tun… Giovanni, bitte vergib mir…",
+      3: "Nein, ich kann das nicht auf mich sitzen lassen. Ich muss die anderen informieren…"
+    }
+  },
+  "tabitha": {
+    "encounter": {
+      1: "Hehehe! Du bist also bis hierher gekommen! Aber du bist zu spät!",
+      2: `Hehehe... Schon hier, oder? Wir haben dich unterschätzt! Aber das war's! 
+          $Ich bin eine Klasse über den Rüpeln, die du bisher gesehen hast. Ich halte dich nicht hin.
+          $Ich werde dich zermalmen!`,
+      3: "Ich werde dir eine kleine Kostprobe des Schmerzes geben! Ergebe dich!"
+    },
+    "victory": {
+      1: `Hehehe! Du hast mich vielleicht besiegt, aber du hast keine Chance gegen den Boss!
+          $Wenn du jetzt aufgibst, musst du dich keiner ordentlichen Tracht Prügel stellen!`,
+      2: "Hehehe... Also habe ich auch verloren...",
+      3: "Ahya! Wie konnte das passieren? Ein Vorstand wie ich von einem zufälligen Trainer besiegt..."
+    }
+  },
+  "courtney": {
+    "encounter": {
+      1: `Das Ding... Das Ding, das du hältst... Das ist es, was...
+          $Das ist es, wonach wir von Team Magma suchen...`,
+      2: "... Nun dann... Auslöschen...",
+      3: `...?! Du... Hm... ♪ Das trifft sich ausgezeichnet... ♪
+         $Dann hole ich mir eben zuerst deine Pokémon... Her damit...`
+    },
+    "victory": {
+      1: "... ...Ändere... die Welt.",
+      2: `Wie erwartet. Unerwartet. Du. Ziel erfasst... abgeschlossen.
+         $Beginne... Experiment. Du. Für immer. Aha... ♪`,
+      3: "...Schon wieder? Das war unerwartet. ...Ich wusste es. Du... bist interessant! ...Haha. ♪"
+    }
+  },
+  "shelly": {
+    "encounter": {
+      1: `Ahahahaha! Du wirst dich in die Angelegenheiten von Team Aqua einmischen?
+         $Du bist entweder absolut furchtlos, einfach unwissend oder beides!
+         $Du bist so süß, dass es ekelhaft ist! Ich werde dich erledigen.`,
+      2: "Was ist das? Wer ist dieser verwöhnte Gör?",
+      3: "Beruhige dich. Sei geduldig. Ich werde dich gleich zermalmen."
+    },
+    "victory": {
+      1: `Ahahahaha! Wir wurden unerwartet gestört! Uns bleiben keine Optionen.
+         $Wir müssen uns zurückziehen. Aber das ist nicht das letzte Mal, dass du Team Aqua siehst!
+         $Wir haben andere Pläne! Vergiss das nicht!`,
+      2: "Ahhh?! War ich zu nachsichtig mit dir?!",
+      3: `Uh. Willst du mir sagen, dass du während des Kampfes noch besser geworden bist?
+         $Du bist ein Gör mit einer glänzenden Zukunft… 
+         $Meine Pokémon und ich haben keine Kraft mehr zu kämpfen…
+         $Geh weiter… Geh und werde von Adrian zerstört.`
+    }
+  },
+  "matt": {
+    "encounter": {
+      1: `Hoohahaha! Was, hast du eine Schraube locker oder so?
+          $Sieh dich an, kleiner Makuhita-ähnlicher Trainer!`,
+      2: "Oho! Du! Du bist das lustige Kind!",
+      3: "Was machst du hier? Bist du uns gefolgt?"
+    },
+    "victory": {
+      1: "Na gut, bis der Boss Zeit für dich hat, werde ich dein Gegner sein!",
+      2: `Ich kann es fühlen! Ich kann es spüren, das ist klar! Die Stärke, die von dir ausgeht!
+          $Mehr! Ich will noch mehr! Aber es sieht so aus, als hätten wir keine Zeit mehr...`,
+      3: `Das war Spaß! Ich wusste, dass du mir eine gute Zeit bieten würdest!
+         $Ich freue mich darauf, dich eines Tages wieder zu treffen!`
+    }
+  },
+  "mars": {
+    "encounter": {
+      1: "Ich bin Mars, eine der obersten Commander von Team Galaktik.",
+      2: "Die Vision von Team Galaktik für die Zukunft ist unbeirrt. Opposition wird gnadenlos zerschlagen!",
+      3: "Fühlst du dich nervös? Das solltest du!"
+    },
+    "victory": {
+      1: "Das kann nicht passieren! Wie habe ich verloren?!",
+      2: "Du hast etwas Können, das muss ich zugeben.",
+      3: "Besiegt... Das war ein teurer Fehler."
+    }
+  },
+  "jupiter": {
+    "encounter": {
+      1: "Jupiter, Commander von Team Galaktik, zu Diensten.",
+      2: "Widerstand ist zwecklos. Team Galaktik wird siegen!",
+      3: "Du zitterst... Schon Angst?"
+    },
+    "victory": {
+      1: "Unmöglich... Ich habe verloren?!",
+      2: "Beeindruckend, du hast Mut!",
+      3: "So zu verlieren... Wie peinlich."
+    }
+  },
+  "saturn": {
+    "encounter": {
+      1: "Ich bin Saturn, Commander von Team Galaktik.",
+      2: "Unsere Mission ist absolut. Jeder Widerstand wird vernichtet!",
+      3: "Ist das Angst, die ich in deinen Augen sehe?"
+    },
+    "victory": {
+      1: "Unmöglich... Von dir besiegt?!",
+      2: "Du hast dich als würdiger Gegner erwiesen.",
+      3: "Besiegt in der Niederlage... Das ist inakzeptabel."
+    }
+  },
+  "zinzolin": {
+    "encounter": {
+      1: "Du könntest eine Bedrohung für Team Plasma werden, also werden wir dich hier und jetzt eliminieren!",
+      2: "Oh, zum Heulen... Ich hatte nicht erwartet, in dieser eisigen Kälte kämpfen zu müssen!",
+      3: "Du bist ein beeindruckender Trainer, dass du es so weit geschafft hast. Aber hier endet es."
+    },
+    "victory": {
+      1: "G-Cis... Ich habe versagt...",
+      2: "Es ist bitterkalt. Ich zittere. Ich leide. Doch ich stehe immer noch siegreich da.",
+      3: "Hm. Du bist ein klügerer Trainer, als ich erwartet habe, aber nicht klug genug."
+    }
+  },
+  "rood": {
+    "encounter": {
+      1: "Du bist eine Bedrohung für Team Plasma. Wir können dich hier und jetzt nicht laufen lassen!",
+      2: "Oh, dieser eisige Wind... Ich hätte nie gedacht, dass ich hier kämpfen müsste!",
+      3: "Du bist ein bemerkenswerter Trainer, dass du es bis hierher geschafft hast. Aber hier wird es enden."
+    },
+    "victory": {
+      1: "G-Cis... Ich habe meine Mission nicht erfüllt...",
+      2: "Die Kälte ist durchdringend. Ich zittere. Ich leide. Doch ich habe gesiegt.",
+      3: "Hm. Du bist ein talentierter Trainer, aber leider nicht talentiert genug."
+    }
+  },
+  "xerosic": {
+    "encounter": {
+      1: "Ah ha ha! Es wäre mir ein Vergnügen. Komm schon, kleiner Trainer! Zeig mir, was du drauf hast!",
+      2: "Hm... Du bist mächtiger, als du aussiehst. Ich frage mich, wie viel Energie in dir steckt.",
+      3: "Ich habe auf dich gewartet! Ich muss ein wenig Forschung an dir betreiben! Komm, lass uns beginnen!"
+    },
+    "victory": {
+      1: "Ah, du bist ziemlich stark. Oh ja—sehr stark, in der Tat.",
+      2: "Ding-ding-ding! Du hast es geschafft! Dem Sieger gebührt die Beute!",
+      3: "Wunderbar! Erstaunlich! Du hast enorme Fähigkeiten und Mut!"
+    }
+  },
+  "bryony": {
+    "encounter": {
+      1: "Ich bin Begonia, und es wäre mir ein Vergnügen, gegen dich zu kämpfen. Zeig mir, was du drauf hast.",
+      2: "Beeindruckend... Du bist mächtiger, als du aussiehst. Zeig mir das wahre Ausmaß deiner Energie.",
+      3: "Ich habe deine Ankunft erwartet. Es ist Zeit für einen kleinen Test. Sollen wir beginnen?"
+    },
+    "victory": {
+      1: "Du bist ziemlich stark. Oh ja—sehr stark, in der Tat.",
+      2: "Ding-ding-ding! Du hast dich gut geschlagen. Der Sieg gehört dir.",
+      3: "Wunderbar! Bemerkenswert! Deine Fähigkeiten und dein Mut sind lobenswert."
+    }
   },
-
   "firebreather": {
     "encounter": {
       1: "Meine Flammen werden dich verschlingen!",
@@ -415,6 +597,17 @@ export const PGMdialogue: DialogueTranslationEntries = {
       3: "Ich glaube, ich bin der der seekrank ist..."
     },
   },
+  "rocket_grunt": {
+    "encounter": {
+      1: `Jetzt gibt es Ärger!…
+          $und es kommt noch härter!
+          $Wir wollen über die Erde regieren…
+          $und naja du kennst den Rest…!`
+    },
+    "victory": {
+      1: "Das war mal wieder ein Schuss in den Ofen!"
+    },
+  },
   "magma_grunt": {
     "encounter": {
       1: "Keiner, der sich Team Magma in den Weg stellt, bekommt Gnade, nicht einmal Kinder!"
@@ -423,20 +616,6 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "Wie kann das sein? Ich bin Teil vom mächtigen Team Magma! Wir wollen doch nur die Welt verbessern…"
     },
   },
-  "magma_admin": {
-    "encounter": {
-      1: `Hahaha! Du hast den ganzen weiten Weg auf dich genommen! Aber du bist zu spät!
-          $Unsere Mission ist schon fast abgeschlossen!`,
-      2: `Du willst dich in Team Magmas Angelegenheiten einmischen? Du bist so süß, dass es ekelhaft ist!
-          $Ich werde dich ein für alle Mal erledigen!`,
-      3: "Ich werde dir zeigen, was wahrer Schmerz ist! Mach dich bereit!",
-    },
-    "victory": {
-      1: "Hahaha! Ouch! Ich habe wohl verloren...",
-      2: "Du bist ekelhaft stark!",
-      3: "Da habe ich meine eigene Medizin zu schmecken bekommen!"
-    },
-  },
   "aqua_grunt": {
     "encounter": {
       1: "Du willst dich also mit Team Aqua anlegen? Du traust dich ja was… Dich werfe ich über Bord!",
@@ -445,18 +624,6 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "Vielleicht sollte ich wohl lieber selber über die Planke gehen…",
     },
   },
-  "aqua_admin": {
-    "encounter": {
-      1: "Ich bin eine Stufe über den Rüpeln, die du bisher gesehen hast. Ich werde dich pulverisieren!",
-      2: "Hmmm? Wer ist das? Wer ist dieses verwöhnte Gör?",
-      3: "Was machst du hier? Bist du uns gefolgt? Dann müssen wir dich wohl loswerden!"
-    },
-    "victory": {
-      1: "Also habe ich auch verloren...",
-      2: "Ahhh?! War ich zu nachsichtig mit dir?!",
-      3: "W-was war das?"
-    },
-  },
   "galactic_grunt": {
     "encounter": {
       1: "Team Galaktik wird die Welt in eine bessere Welt verwandeln! Und du wirst uns nicht aufhalten!"
@@ -465,19 +632,6 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "Zyrus wird uns für diese Niederlage bestrafen…"
     },
   },
-  "galactic_admin": {
-    "encounter": {
-      1: "Ich bin einer der Commander von Team Galaktik. Wir werden Zyrus' Traum verwirklichen!",
-      2: `Alles, was sich Team Galaktik widersetzt, muss zerschlagen werden!
-          $Selbst der Gedanke an Widerstand wird nicht toleriert!`,
-      3: "Was ist los? Sag mir nicht, dass du zitterst? Mach ich dir Angst? Gut so! Knie nieder!"
-    },
-    "victory": {
-      1: "Das kann nicht sein?! Ich habe verloren?! Du... du freches Gör!",
-      2: "Du, mein Freund, bist stark! Aber widestand ist zwecklos! Team Galaktik wird siegen!",
-      3: "Gegen ein Kind zu verlieren... Meine Unachtsamkeit wird mir nicht verziehen werden..."
-    },
-  },
   "plasma_grunt": {
     "encounter": {
       1: "Pokémon sollten frei sein! Team Plasma wird sie befreien!"
@@ -486,19 +640,6 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "Wie konnte ich verlieren? Ich dachte, ich würde die Welt retten…"
     },
   },
-  "plasma_sage": {
-    "encounter": {
-      1: "Du könntest eine Bedrohung für Team Plasma werden, also werden wir dich hier eliminieren!",
-      2: "Oh, ernsthaft... Ich hatte nicht erwartet, kämpfen zu müssen!",
-      3: `Du bist ein beeindruckender Trainer, dass du es so weit geschafft hast. 
-          $Als Weiser von Team Plasma werde ich dich besiegen!`
-    },
-    "victory": {
-      1: "G-Cis...",
-      2: "Es ist bitterkalt. Ich zittere. Ich leide.",
-      3: "Hm. Du bist ein klügerer Trainer, als ich erwartet hatte. Ich bin beeindruckt."
-    },
-  },
   "flare_grunt": {
     "encounter": {
       1: `Ich bin ein Mitglied von Team Flare! Das sieht man mir doch an. Mein Stil ist unverkennbar!
@@ -508,18 +649,6 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "Stil ist wohl doch nicht alles…"
     },
   },
-  "flare_admin": {
-    "encounter": {
-      1: "Ah ha ha! Es wäre mir ein Vergnügen. Komm schon, kleiner Trainer! Zeig mir, was du drauf hast!",
-      2: "Wir von Team Flare sind die einzigen, die die Schönheit der Welt wirklich schätzen!",
-      3: "Ich habe auf dich gewartet! Lass mich ein wenig an dir forschen! Komm, lass uns beginnen!"
-    },
-    "victory": {
-      1: "Du bist ziemlich stark. Oh ja, sehr stark, in der Tat.",
-      2: "Es scheint als hätte ich mich geirrt… Der Sieger steht fest.",
-      3: "Wunderbar! Erstaunlich! Du hast enormes Geschick und dieser Mut!"
-    },
-  },
   "rocket_boss_giovanni_1": {
     "encounter": {
       1: `Ich bin beeindruckt, du hast es bis hierher geschafft!

src/locales/de/trainers.ts

@@ -19,6 +19,19 @@ export const titles: SimpleTranslationEntries = {
   "galactic_boss": "Galaktik-Boss",
   "plasma_boss": "Weiser von Team Plasma", // This is on purpose, since "Ghetsis" is never mentioned as the boss of team plasma in the game but as "Weiser"
   "flare_boss": "Flare-Boss",
+
+  "rocket_admin": "Team Rocket Vorstand",
+  "rocket_admin_female": "Team Rocket Vorstand",
+  "magma_admin": "Team Magma Vorstand",
+  "magma_admin_female": "Team Magma Vorstand",
+  "aqua_admin": "Team Aqua Vorstand",
+  "aqua_admin_female": "Team Aqua Vorstand",
+  "galactic_commander": "Team Galaktik Commander",
+  "galactic_commander_female": "Team Galaktik Commander",
+  "plasma_sage": "Weiser von Team Plasma",
+  "plasma_admin": "Team Plasma Vorstand",
+  "flare_admin": "Team Flare Vorstand",
+  "flare_admin_female": "Team Flare Vorstand",
   // Maybe if we add the evil teams we can add "Team Rocket" and "Team Aqua" etc. here as well as "Team Rocket Boss" and "Team Aqua Admin" etc.
 } as const;
 
@@ -128,32 +141,21 @@ export const trainerClasses: SimpleTranslationEntries = {
   "rocket_grunt": "Rüpel von Team Rocket",
   "rocket_grunt_female": "Rüpel von Team Rocket",
   "rocket_grunts": "Rüpel von Team Rocket",
-  "rocket_admin": "Team Rocket Vorstand",
-  "rocket_admin_female": "Team Rocket Vorstand",
   "magma_grunt": "Rüpel von Team Magma",
   "magma_grunt_female": "Rüpel von Team Magma",
   "magma_grunts": "Rüpel von Team Magma",
-  "magma_admin": "Team Magma Vorstand",
-  "magma_admin_female": "Team Magma Vorstand",
   "aqua_grunt": "Rüpel von Team Aqua",
   "aqua_grunt_female": "Rüpel von Team Aqua",
   "aqua_grunts": "Rüpel von Team Aqua",
-  "aqua_admin": "Team Aqua Vorstand",
-  "aqua_admin_female": "Team Aqua Vorstand",
   "galactic_grunt": "Rüpel von Team Galaktik",
   "galactic_grunt_female": "Rüpel von Team Galaktik",
   "galactic_grunts": "Rüpel von Team Galaktik",
-  "galactic_admin": "Team Galaktik Commander",
-  "galactic_admin_female": "Team Galaktik Commander",
   "plasma_grunt": "Rüpel von Team Plasma",
   "plasma_grunt_female": "Rüpel von Team Plasma",
   "plasma_grunts": "Rüpel von Team Plasma",
-  "plasma_sage": "Weiser von Team Plasma",
   "flare_grunt": "Rüpel von Team Flare",
   "flare_grunt_female": "Rüpel von Team Flare",
   "flare_grunts": "Rüpel von Team Flare",
-  "flare_admin": "Team Flare Vorstand",
-  "flare_admin_female": "Team Flare Vorstand",
 } as const;
 
 // Names of special trainers like gym leaders, elite four, and the champion
@@ -282,6 +284,24 @@ export const trainerNames: SimpleTranslationEntries = {
   "leon": "Delion",
   "rival": "Finn",
   "rival_female": "Ivy",
+
+  // Evil Team Admins
+  "archer": "Atlas",
+  "ariana": "Athena",
+  "proton": "Lance",
+  "petrel": "Lambda",
+  "tabitha": "Kalle",
+  "courtney": "Jördis",
+  "shelly": "Kordula",
+  "matt": "Wolfgang",
+  "mars": "Mars",
+  "jupiter": "Jupiter",
+  "saturn": "Saturn",
+  "zinzolin": "Violaceus",
+  "rood": "Rubius",
+  "xerosic": "Xeros",
+  "bryony": "Begonia",
+
   "maxie": "Marc",
   "archie": "Adrian",
   "cyrus": "Zyrus",

src/locales/en/dialogue.ts

@@ -383,6 +383,204 @@ export const PGMdialogue: DialogueTranslationEntries = {
       3: "I think it's me that's seasick..."
     },
   },
+
+  "archer": {
+    "encounter": {
+      1: "Before you go any further, let's see how you far against us, Team Rocket!",
+      2: "I have received reports that your skills are not insignificant. Let's see if they are true.",
+      3: "I am Archer, an Admin of Team Rocket. And I do not go easy on enemies of our organization."
+    },
+    "victory": {
+      1: "What a blunder!",
+      2: "With my current skills, I was not up to the task after all.",
+      3: "F-forgive me, Giovanni... For me to be defeated by a mere trainer..."
+    },
+  },
+  "ariana": {
+    "encounter": {
+      1: `Hold it right there! We can't someone on the loose." 
+          $It's harmful to Team Rocket's pride, you see.`,
+      2: `I don't know or care if what I'm doing is right or wrong...
+          $I just put my faith in Giovanni and do as I am told`,
+      3: "Your trip ends here. I'm going to take you down!"
+    },
+    "victory": {
+      1: `Tch, you really are strong. It's too bad. 
+          $If you were to join Team Rocket, you could become an Executive.`,
+      2: "I... I'm shattered...",
+      3: "Aaaieeeee! This can't be happening! I fought hard, but I still lost…"
+    },
+  },
+  "proton": {
+    "encounter": {
+      1: "What do you want? If you interrupt our work, don't expect any mercy!",
+      2: `What do we have here? I am often labeled as the scariest and cruelest guy in Team Rocket…
+         $I strongly urge you not to interfere with our business!`,
+      3: "I am Proton, an Admin of Team Rocket. I am here to put an end to your meddling!"
+    },
+    "victory": {
+      1: "The fortress came down!",
+      2: "You may have won this time… But all you did was make Team Rocket's wrath grow…",
+      3: "I am defeated… But I will not forget this!"
+    },
+  },
+
+  "petrel": {
+    "encounter": {
+      1: `Muhahaha, we've been waiting for you. Me? You don't know who I am? It is me, Giovanni.
+          $The majestic Giovanni himself! Wahahaha! …Huh? I don't sound anything like Giovanni?
+          $I don't even look like Giovanni? How come? I've worked so hard to mimic him!`,
+      2: "I am Petrel, an Admin of Team Rocket. I will not allow you to interfere with our plans!",
+      3: "Rocket Executive Petrel will deal with this intruder!"
+    },
+    "victory": {
+      1: "OK, OK. I'll tell you where he is.",
+      2: "I… I couldn't do a thing… Giovanni, please forgive me…",
+      3: "No, I can't let this affect me. I have to inform the others…"
+    },
+  },
+  "tabitha": {
+    "encounter": {
+      1: "Hehehe! So you've come all the way here! But you're too late!",
+      2: `Hehehe... Got here already, did you? We underestimated you! But this is it! 
+          $I'm a cut above the Grunts you've seen so far. I'm not stalling for time.
+          $I'm going to pulverize you!`,
+      3: "I'm going to give you a little taste of pain! Resign yourself to it!"
+    },
+    "victory": {
+      1: `Hehehe! You might have beaten me, but you don't stand a chance against the Boss!
+          $If you get lost now, you won't have to face a sound whipping!`,
+      2: "Hehehe... So, I lost, too...",
+      3: "Ahya! How could this be? For an Admin like me to lose to some random trainer..."
+    },
+  },
+  "courtney": {
+    "encounter": {
+      1: "The thing...The thing that you hold...That is what... That's what we of Team Magma seek...",
+      2: "... Well then...Deleting...",
+      3: "...Ha. ...Analyzing... ...Hah♪"
+    },
+    "victory": {
+      1: "... ...Change...the world.",
+      2: `As anticipated. Unanticipated. You. Target lock...completed.
+         $Commencing...experiment. You. Forever. Aha... ♪`,
+      3: "...Again? That's unanticipated. ...I knew it. You...are interesting! ...Haha. ♪"
+    },
+  },
+  "shelly": {
+    "encounter": {
+      1: `Ahahahaha! You're going to meddle in Team Aqua's affairs?
+         $You're either absolutely fearless, simply ignorant, or both!
+         $You're so cute, you're disgusting! I'll put you down`,
+      2: "What's this? Who's this spoiled brat?",
+      3: "Cool your jets. Be patient. I'll crush you shortly."
+    },
+    "victory": {
+      1: `Ahahahaha! We got meddled with unexpectedly! We're out of options.
+         $We'll have to pull out. But this isn't the last you'll see of Team Aqua!
+         $We have other plans! Don't you forget it!`,
+      2: "Ahhh?! Did I go too easy on you?!",
+      3: `Uh. Are you telling me you've upped your game even more during the fight?
+         $You're a brat with a bright future… My Pokémon and I don't have any strength left to fight…
+         $Go on… Go and be destroyed by Archie.`
+    },
+  },
+  "matt": {
+    "encounter": {
+      1: "Hoohahaha! What, you got a screw loose or something? Look at you, little Makuhita person!",
+      2: "Oho! You! You're that funny kid!",
+      3: "What are you doing here? Did you follow us?"
+    },
+    "victory": {
+      1: "All right then, until the Boss has time for you, I'll be your opponent!",
+      2: `I can feel it! I can feel it, all right! The strength coming offa you!
+          $More! I still want more! But looks like we're outta time...`,
+      3: "That was fun! I knew you'd show me a good time! I look forward to facing you again someday!"
+    },
+  },
+  "mars": {
+    "encounter": {
+      1: "I'm Mars, one of Team Galactic's top Commanders.",
+      2: "Team Galactic's vision for the future is unwavering. Opposition will be crushed without mercy!",
+      3: "Feeling nervous? You should be!"
+    },
+    "victory": {
+      1: "This can't be happening! How did I lose?!",
+      2: "You have some skill, I'll give you that.",
+      3: "Defeated... This was a costly mistake."
+    }
+  },
+  "jupiter": {
+    "encounter": {
+      1: "Jupiter, Commander of Team Galactic, at your service.",
+      2: "Resistance is futile. Team Galactic will prevail!",
+      3: "You're trembling... scared already?"
+    },
+    "victory": {
+      1: "No way... I lost?!",
+      2: "Impressive, you've got guts!",
+      3: "Losing like this... How embarrassing."
+    }
+  },
+  "saturn": {
+    "encounter": {
+      1: "I am Saturn, Commander of Team Galactic.",
+      2: "Our mission is absolute. Any hindrance will be obliterated!",
+      3: "Is that fear I see in your eyes?"
+    },
+    "victory": {
+      1: "Impossible... Defeated by you?!",
+      2: "You have proven yourself a worthy adversary.",
+      3: "Bestowed in defeat... This is unacceptable."
+    }},
+  "zinzolin": {
+    "encounter": {
+      1: "You could become a threat to Team Plasma, so we will eliminate you here and now!",
+      2: "Oh, for crying out loud... I didn't expect to have to battle in this freezing cold!",
+      3: "You're an impressive Trainer to have made it this far. But it ends here."
+    },
+    "victory": {
+      1: "Ghetsis... I have failed you...",
+      2: "It's bitter cold. I'm shivering. I'm suffering. Yet, I still stand victorious.",
+      3: "Hmph. You're a smarter Trainer than I expected, but not smart enough."
+    }
+  },
+  "rood": {
+    "encounter": {
+      1: "You are a threat to Team Plasma. We cannot let you walk away from here and now!",
+      2: "Oh, this icy wind... I never thought I'd have to fight here!",
+      3: "You are a remarkable Trainer to have made it this far. But this is where it ends."
+    },
+    "victory": {
+      1: "Ghetsis... I have failed my mission...",
+      2: "The cold is piercing. I'm shivering. I'm suffering. Yet, I have triumphed.",
+      3: "Hm. You are a talented Trainer, but unfortunately not talented enough."
+    }
+  },
+  "xerosic": {
+    "encounter": {
+      1: "Ah ha ha! It would be my pleasure. Come on, little Trainer! Let's see what you've got!",
+      2: "Hmm... You're more powerful than you look. I wonder how much energy there is inside you.",
+      3: "I've been waiting for you! I need to do a little research on you! Come, let us begin!"
+    },
+    "victory": {
+      1: "Ah, you're quite strong. Oh yes—very strong, indeed.",
+      2: "Ding-ding-ding! You did it! To the victor go the spoils!",
+      3: "Wonderful! Amazing! You have tremendous skill and bravery!"
+    }
+  },
+  "bryony": {
+    "encounter": {
+      1: "I am Bryony, and it would be my pleasure to battle you. Show me what you've got.",
+      2: "Impressive... You're more powerful than you appear. Let's see the true extent of your energy.",
+      3: "I've anticipated your arrival. It's time for a little test. Shall we begin?"
+    },
+    "victory": {
+      1: "You're quite strong. Oh yes—very strong, indeed.",
+      2: "Ding-ding-ding! You've done well. Victory is yours.",
+      3: "Wonderful! Remarkable! Your skill and bravery are commendable."
+    }
+  },
   "rocket_grunt": {
     "encounter": {
       1: "Prepare for trouble!"
@@ -391,18 +589,6 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "Team Rocket blasting off again!"
     },
   },
-  "rocket_admin": {
-    "encounter": {
-      1: "Oh? You managed to get this far? You must be quite the trainer.",
-      2: "That's quite enough of you playing hero, kid.",
-      3: "I'll show you how scary an angry adult can be!"
-    },
-    "victory": {
-      1: "No! Forgive me Giovanni!",
-      2: "How could this be?",
-      3: "Urgh... You were too strong..."
-    },
-  },
   "magma_grunt": {
     "encounter": {
       1: " If you get in the way of Team Magma, don’t expect any mercy!"
@@ -411,18 +597,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "Huh? I lost?!"
     },
   },
-  "magma_admin": {
+
-    "encounter": {
-      1: "Hehehe! So you've come all the way here! But you're too late!",
-      2: "You're going to meddle in Team Magma's affairs? You're so cute you're disgusting! I'll put you down kiddy!",
-      3: "I'm going to give you a little taste of pain! Resign yourself to it!"
-    },
-    "victory": {
-      1: "Hehehe... So I lost...",
-      2: "You're disgustingly strong!",
-      3: "Ahahaha! Ouch!"
-    },
-  },
   "aqua_grunt": {
     "encounter": {
       1: "No one who crosses Team Aqua gets any mercy, not even kids!"
@@ -431,18 +606,6 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "You're kidding me!"
     },
   },
-  "aqua_admin": {
-    "encounter": {
-      1: "I'm a cut above the grunts you've seen so far. I'm going to puvlerize you!",
-      2: "Hahn? What's this? Who's this spoiled brat?",
-      3: "What are you doing here? Did you follow us?"
-    },
-    "victory": {
-      1: "So I lost too...",
-      2: "Ahhh?! Did I go too easy on you?!",
-      3: "Wh-what was that?"
-    },
-  },
   "galactic_grunt": {
     "encounter": {
       1: "Don't mess with Team Galactic!"
@@ -451,18 +614,6 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "Shut down..."
     },
   },
-  "galactic_admin": {
-    "encounter": {
-      1: "I'm one of Team Galactic's Commanders.",
-      2: "Anything that opposes Team Galactic must be crushed! Even the very thought of opposition will not be tolerated!",
-      3: "What's the matter? Don't tell me you're shaking?"
-    },
-    "victory": {
-      1: "This can't be?! I lost?! You... you uppity brat!",
-      2: "You, my friend, are tough!",
-      3: "Losing to some child... Being careless cost me too much."
-    },
-  },
   "plasma_grunt": {
     "encounter": {
       1: "We won't tolerate people who have different ideas!"
@@ -471,18 +622,6 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "Plasmaaaaaaaaa!"
     },
   },
-  "plasma_sage": {
-    "encounter": {
-      1: "You could become a threat to Team Plasma, so we will eliminate you here!",
-      2: "Oh, for crying out loud... I didn't expect to have to fight!",
-      3: "You're an impressive Trainer to have made it this far."
-    },
-    "victory": {
-      1: "Ghetsis...",
-      2: "It's bitter cold. I'm shivering. I'm suffering.",
-      3: "Hmph. You're a smarter Trainer than I expected."
-    },
-  },
   "flare_grunt": {
     "encounter": {
       1: "Fashion is most important to us!"
@@ -491,18 +630,6 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "The future doesn't look bright for me."
     },
   },
-  "flare_admin": {
-    "encounter": {
-      1: "Ah ha ha! It would be my pleasure. Come on, little Trainer! Let's see what you've got!",
-      2: "Hmm... You're more powerful than you look. I wonder how much energy there is inside you.",
-      3: "I've been waiting for you! I need to do a little research on you! Come, let us begin!"
-    },
-    "victory": {
-      1: "You're quite strong. Oh yes-very strong, indeed.",
-      2: "Ding-ding-ding! Yup, you did it! To the victor goes the spoils!",
-      3: "Wonderful! Amazing! You have tremendous skill and bravery!"
-    },
-  },
   "rocket_boss_giovanni_1": {
     "encounter": {
       1: "So! I must say, I am impressed you got here!"

src/locales/en/trainers.ts

@@ -19,6 +19,19 @@ export const titles: SimpleTranslationEntries = {
   "galactic_boss": "Team Galactic Boss",
   "plasma_boss": "Team Plasma Boss",
   "flare_boss": "Team Flare Boss",
+
+  "rocket_admin": "Team Rocket Admin",
+  "rocket_admin_female": "Team Rocket Admin",
+  "magma_admin": "Team Magma Admin",
+  "magma_admin_female": "Team Magma Admin",
+  "aqua_admin": "Team Aqua Admin",
+  "aqua_admin_female": "Team Aqua Admin",
+  "galactic_commander": "Team Galactic Commander",
+  "galactic_commander_female": "Team Galactic Commander",
+  "plasma_sage": "Team Plasma Sage",
+  "plasma_admin": "Team Plasma Admin",
+  "flare_admin": "Team Flare Admin",
+  "flare_admin_female": "Team Flare Admin",
   // Maybe if we add the evil teams we can add "Team Rocket" and "Team Aqua" etc. here as well as "Team Rocket Boss" and "Team Aqua Admin" etc.
 } as const;
 
@@ -128,32 +141,21 @@ export const trainerClasses: SimpleTranslationEntries = {
   "rocket_grunt": "Rocket Grunt",
   "rocket_grunts": "Rocket Grunts",
   "rocket_grunt_female": "Rocket Grunt",
-  "rocket_admin": "Rocket Admin",
-  "rocket_admin_female": "Rocket Admin",
   "magma_grunt": "Magma Grunt",
   "magma_grunt_female": "Magma Grunt",
   "magma_grunts": "Magma Grunts",
-  "magma_admin": "Magma Admin",
-  "magma_admin_female": "Magma Admin",
   "aqua_grunt": "Aqua Grunt",
   "aqua_grunt_female": "Aqua Grunt",
   "aqua_grunts": "Aqua Grunts",
-  "aqua_admin": "Aqua Admin",
-  "aqua_admin_female": "Aqua Admin",
   "galactic_grunt": "Galactic Grunt",
   "galactic_grunt_female": "Galactic Grunt",
   "galactic_grunts": "Galactic Grunts",
-  "galactic_admin": "Galactic Admin",
-  "galactic_admin_female": "Galactic Admin",
   "plasma_grunt": "Plasma Grunt",
   "plasma_grunt_female": "Plasma Grunt",
   "plasma_grunts": "Plasma Grunts",
-  "plasma_sage": "Plasma Sage",
   "flare_grunt": "Flare Grunt",
   "flare_grunt_female": "Flare Grunt",
   "flare_grunts": "Flare Grunts",
-  "flare_admin": "Flare Admin",
-  "flare_admin_female": "Flare Admin",
 } as const;
 
 // Names of special trainers like gym leaders, elite four, and the champion
@@ -282,6 +284,24 @@ export const trainerNames: SimpleTranslationEntries = {
   "leon": "Leon",
   "rival": "Finn",
   "rival_female": "Ivy",
+
+  // Evil Team Admins
+  "archer": "Archer",
+  "ariana": "Ariana",
+  "proton": "Proton",
+  "petrel": "Petrel",
+  "tabitha": "Tabitha",
+  "courtney": "Courtney",
+  "shelly": "Shelly",
+  "matt": "Matt",
+  "mars": "Mars",
+  "jupiter": "Jupiter",
+  "saturn": "Saturn",
+  "zinzolin": "Zinzolin",
+  "rood": "Rood",
+  "xerosic": "Xerosic",
+  "bryony": "Bryony",
+
   "maxie": "Maxie",
   "archie": "Archie",
   "cyrus": "Cyrus",

src/locales/es/dialogue.ts

@@ -383,6 +383,203 @@ export const PGMdialogue: DialogueTranslationEntries = {
       3: "Creo que soy yo quien está mareado..."
     },
   },
+  "archer": {
+    "encounter": {
+      1: "Before you go any further, let's see how you far against us, Team Rocket!",
+      2: "I have received reports that your skills are not insignificant. Let's see if they are true.",
+      3: "I am Archer, an Admin of Team Rocket. And I do not go easy on enemies of our organization."
+    },
+    "victory": {
+      1: "What a blunder!",
+      2: "With my current skills, I was not up to the task after all.",
+      3: "F-forgive me, Giovanni... For me to be defeated by a mere trainer..."
+    },
+  },
+  "ariana": {
+    "encounter": {
+      1: `Hold it right there! We can't someone on the loose." 
+          $It's harmful to Team Rocket's pride, you see.`,
+      2: `I don't know or care if what I'm doing is right or wrong...
+          $I just put my faith in Giovanni and do as I am told`,
+      3: "Your trip ends here. I'm going to take you down!"
+    },
+    "victory": {
+      1: `Tch, you really are strong. It's too bad. 
+          $If you were to join Team Rocket, you could become an Executive.`,
+      2: "I... I'm shattered...",
+      3: "Aaaieeeee! This can't be happening! I fought hard, but I still lost…"
+    },
+  },
+  "proton": {
+    "encounter": {
+      1: "What do you want? If you interrupt our work, don't expect any mercy!",
+      2: `What do we have here? I am often labeled as the scariest and cruelest guy in Team Rocket…
+         $I strongly urge you not to interfere with our business!`,
+      3: "I am Proton, an Admin of Team Rocket. I am here to put an end to your meddling!"
+    },
+    "victory": {
+      1: "The fortress came down!",
+      2: "You may have won this time… But all you did was make Team Rocket's wrath grow…",
+      3: "I am defeated… But I will not forget this!"
+    },
+  },
+
+  "petrel": {
+    "encounter": {
+      1: `Muhahaha, we've been waiting for you. Me? You don't know who I am? It is me, Giovanni.
+          $The majestic Giovanni himself! Wahahaha! …Huh? I don't sound anything like Giovanni?
+          $I don't even look like Giovanni? How come? I've worked so hard to mimic him!`,
+      2: "I am Petrel, an Admin of Team Rocket. I will not allow you to interfere with our plans!",
+      3: "Rocket Executive Petrel will deal with this intruder!"
+    },
+    "victory": {
+      1: "OK, OK. I'll tell you where he is.",
+      2: "I… I couldn't do a thing… Giovanni, please forgive me…",
+      3: "No, I can't let this affect me. I have to inform the others…"
+    },
+  },
+  "tabitha": {
+    "encounter": {
+      1: "Hehehe! So you've come all the way here! But you're too late!",
+      2: `Hehehe... Got here already, did you? We underestimated you! But this is it! 
+          $I'm a cut above the Grunts you've seen so far. I'm not stalling for time.
+          $I'm going to pulverize you!`,
+      3: "I'm going to give you a little taste of pain! Resign yourself to it!"
+    },
+    "victory": {
+      1: `Hehehe! You might have beaten me, but you don't stand a chance against the Boss!
+          $If you get lost now, you won't have to face a sound whipping!`,
+      2: "Hehehe... So, I lost, too...",
+      3: "Ahya! How could this be? For an Admin like me to lose to some random trainer..."
+    },
+  },
+  "courtney": {
+    "encounter": {
+      1: "The thing...The thing that you hold...That is what... That's what we of Team Magma seek...",
+      2: "... Well then...Deleting...",
+      3: "...Ha. ...Analyzing... ...Hah♪"
+    },
+    "victory": {
+      1: "... ...Change...the world.",
+      2: `As anticipated. Unanticipated. You. Target lock...completed.
+         $Commencing...experiment. You. Forever. Aha... ♪`,
+      3: "...Again? That's unanticipated. ...I knew it. You...are interesting! ...Haha. ♪"
+    },
+  },
+  "shelly": {
+    "encounter": {
+      1: `Ahahahaha! You're going to meddle in Team Aqua's affairs?
+         $You're either absolutely fearless, simply ignorant, or both!
+         $You're so cute, you're disgusting! I'll put you down`,
+      2: "What's this? Who's this spoiled brat?",
+      3: "Cool your jets. Be patient. I'll crush you shortly."
+    },
+    "victory": {
+      1: `Ahahahaha! We got meddled with unexpectedly! We're out of options.
+         $We'll have to pull out. But this isn't the last you'll see of Team Aqua!
+         $We have other plans! Don't you forget it!`,
+      2: "Ahhh?! Did I go too easy on you?!",
+      3: `Uh. Are you telling me you've upped your game even more during the fight?
+         $You're a brat with a bright future… My Pokémon and I don't have any strength left to fight…
+         $Go on… Go and be destroyed by Archie.`
+    },
+  },
+  "matt": {
+    "encounter": {
+      1: "Hoohahaha! What, you got a screw loose or something? Look at you, little Makuhita person!",
+      2: "Oho! You! You're that funny kid!",
+      3: "What are you doing here? Did you follow us?"
+    },
+    "victory": {
+      1: "All right then, until the Boss has time for you, I'll be your opponent!",
+      2: `I can feel it! I can feel it, all right! The strength coming offa you!
+          $More! I still want more! But looks like we're outta time...`,
+      3: "That was fun! I knew you'd show me a good time! I look forward to facing you again someday!"
+    },
+  },
+  "mars": {
+    "encounter": {
+      1: "I'm Mars, one of Team Galactic's top Commanders.",
+      2: "Team Galactic's vision for the future is unwavering. Opposition will be crushed without mercy!",
+      3: "Feeling nervous? You should be!"
+    },
+    "victory": {
+      1: "This can't be happening! How did I lose?!",
+      2: "You have some skill, I'll give you that.",
+      3: "Defeated... This was a costly mistake."
+    }
+  },
+  "jupiter": {
+    "encounter": {
+      1: "Jupiter, Commander of Team Galactic, at your service.",
+      2: "Resistance is futile. Team Galactic will prevail!",
+      3: "You're trembling... scared already?"
+    },
+    "victory": {
+      1: "No way... I lost?!",
+      2: "Impressive, you've got guts!",
+      3: "Losing like this... How embarrassing."
+    }
+  },
+  "saturn": {
+    "encounter": {
+      1: "I am Saturn, Commander of Team Galactic.",
+      2: "Our mission is absolute. Any hindrance will be obliterated!",
+      3: "Is that fear I see in your eyes?"
+    },
+    "victory": {
+      1: "Impossible... Defeated by you?!",
+      2: "You have proven yourself a worthy adversary.",
+      3: "Bestowed in defeat... This is unacceptable."
+    }},
+  "zinzolin": {
+    "encounter": {
+      1: "You could become a threat to Team Plasma, so we will eliminate you here and now!",
+      2: "Oh, for crying out loud... I didn't expect to have to battle in this freezing cold!",
+      3: "You're an impressive Trainer to have made it this far. But it ends here."
+    },
+    "victory": {
+      1: "Ghetsis... I have failed you...",
+      2: "It's bitter cold. I'm shivering. I'm suffering. Yet, I still stand victorious.",
+      3: "Hmph. You're a smarter Trainer than I expected, but not smart enough."
+    }
+  },
+  "rood": {
+    "encounter": {
+      1: "You are a threat to Team Plasma. We cannot let you walk away from here and now!",
+      2: "Oh, this icy wind... I never thought I'd have to fight here!",
+      3: "You are a remarkable Trainer to have made it this far. But this is where it ends."
+    },
+    "victory": {
+      1: "Ghetsis... I have failed my mission...",
+      2: "The cold is piercing. I'm shivering. I'm suffering. Yet, I have triumphed.",
+      3: "Hm. You are a talented Trainer, but unfortunately not talented enough."
+    }
+  },
+  "xerosic": {
+    "encounter": {
+      1: "Ah ha ha! It would be my pleasure. Come on, little Trainer! Let's see what you've got!",
+      2: "Hmm... You're more powerful than you look. I wonder how much energy there is inside you.",
+      3: "I've been waiting for you! I need to do a little research on you! Come, let us begin!"
+    },
+    "victory": {
+      1: "Ah, you're quite strong. Oh yes—very strong, indeed.",
+      2: "Ding-ding-ding! You did it! To the victor go the spoils!",
+      3: "Wonderful! Amazing! You have tremendous skill and bravery!"
+    }
+  },
+  "bryony": {
+    "encounter": {
+      1: "I am Bryony, and it would be my pleasure to battle you. Show me what you've got.",
+      2: "Impressive... You're more powerful than you appear. Let's see the true extent of your energy.",
+      3: "I've anticipated your arrival. It's time for a little test. Shall we begin?"
+    },
+    "victory": {
+      1: "You're quite strong. Oh yes—very strong, indeed.",
+      2: "Ding-ding-ding! You've done well. Victory is yours.",
+      3: "Wonderful! Remarkable! Your skill and bravery are commendable."
+    }
+  },
   "rocket_grunt": {
     "encounter": {
       1: "¡Ríndete ahora, o prepárate para luchar!"

src/locales/es/trainers.ts

@@ -13,6 +13,25 @@ export const titles: SimpleTranslationEntries = {
   "rival": "Rival",
   "professor": "Profesor",
   "frontier_brain": "As del Frente Batalla",
+  "rocket_boss": "Team Rocket Boss",
+  "magma_boss": "Team Magma Boss",
+  "aqua_boss": "Team Aqua Boss",
+  "galactic_boss": "Team Galactic Boss",
+  "plasma_boss": "Team Plasma Boss",
+  "flare_boss": "Team Flare Boss",
+
+  "rocket_admin": "Team Rocket Admin",
+  "rocket_admin_female": "Team Rocket Admin",
+  "magma_admin": "Team Magma Admin",
+  "magma_admin_female": "Team Magma Admin",
+  "aqua_admin": "Team Aqua Admin",
+  "aqua_admin_female": "Team Aqua Admin",
+  "galactic_commander": "Team Galactic Commander",
+  "galactic_commander_female": "Team Galactic Commander",
+  "plasma_sage": "Team Plasma Sage",
+  "plasma_admin": "Team Plasma Admin",
+  "flare_admin": "Team Flare Admin",
+  "flare_admin_female": "Team Flare Admin",
   // Maybe if we add the evil teams we can add "Team Rocket" and "Team Aqua" etc. here as well as "Team Rocket Boss" and "Team Aqua Admin" etc.
 } as const;
 
@@ -121,31 +140,21 @@ export const trainerClasses: SimpleTranslationEntries = {
   "rocket_grunt": "Rocket Grunt",
   "rocket_grunts": "Rocket Grunts",
   "rocket_grunt_female": "Rocket Grunt",
-  "rocket_admin": "Rocket Admin",
-  "rocket_admin_female": "Rocket Admin",
   "magma_grunt": "Magma Grunt",
   "magma_grunt_female": "Magma Grunt",
   "magma_grunts": "Magma Grunts",
-  "magma_admin": "Magma Admin",
-  "magma_admin_female": "Magma Admin",
   "aqua_grunt": "Aqua Grunt",
   "aqua_grunt_female": "Aqua Grunt",
   "aqua_grunts": "Aqua Grunts",
-  "aqua_admin": "Aqua Admin",
-  "aqua_admin_female": "Aqua Admin",
   "galactic_grunt": "Galactic Grunt",
   "galactic_grunt_female": "Galactic Grunt",
   "galactic_grunts": "Galactic Grunts",
-  "galactic_admin": "Galactic Admin",
-  "galactic_admin_female": "Galactic Admin",
   "plasma_grunt": "Plasma Grunt",
   "plasma_grunt_female": "Plasma Grunt",
   "plasma_grunts": "Plasma Grunts",
   "flare_grunt": "Flare Grunt",
   "flare_grunt_female": "Flare Grunt",
   "flare_grunts": "Flare Grunts",
-  "flare_admin": "Flare Admin",
-  "flare_admin_female": "Flare Admin",
 } as const;
 
 // Names of special trainers like gym leaders, elite four, and the champion
@@ -275,6 +284,30 @@ export const trainerNames: SimpleTranslationEntries = {
   "rival": "Finn",
   "rival_female": "Ivy",
 
+  // Evil Team Admins
+  "archer": "Archer",
+  "ariana": "Ariana",
+  "proton": "Proton",
+  "petrel": "Petrel",
+  "tabitha": "Tabitha",
+  "courtney": "Courtney",
+  "shelly": "Shelly",
+  "matt": "Matt",
+  "mars": "Mars",
+  "jupiter": "Jupiter",
+  "saturn": "Saturn",
+  "zinzolin": "Zinzolin",
+  "rood": "Rood",
+  "xerosic": "Xerosic",
+  "bryony": "Bryony",
+
+  "maxie": "Maxie",
+  "archie": "Archie",
+  "cyrus": "Cyrus",
+  "ghetsis": "Ghetsis",
+  "lysandre": "Lysandre",
+
+
   // Double Names
   "blue_red_double": "Azul y Rojo",
   "red_blue_double": "Rojo y Azul",

src/locales/fr/dialogue.ts

@@ -2890,6 +2890,203 @@ export const PGFdialogue: DialogueTranslationEntries = {
       3: "I think it's me that's seasick..."
     },
   },
+  "archer": {
+    "encounter": {
+      1: "Before you go any further, let's see how you far against us, Team Rocket!",
+      2: "I have received reports that your skills are not insignificant. Let's see if they are true.",
+      3: "I am Archer, an Admin of Team Rocket. And I do not go easy on enemies of our organization."
+    },
+    "victory": {
+      1: "What a blunder!",
+      2: "With my current skills, I was not up to the task after all.",
+      3: "F-forgive me, Giovanni... For me to be defeated by a mere trainer..."
+    },
+  },
+  "ariana": {
+    "encounter": {
+      1: `Hold it right there! We can't someone on the loose." 
+          $It's harmful to Team Rocket's pride, you see.`,
+      2: `I don't know or care if what I'm doing is right or wrong...
+          $I just put my faith in Giovanni and do as I am told`,
+      3: "Your trip ends here. I'm going to take you down!"
+    },
+    "victory": {
+      1: `Tch, you really are strong. It's too bad. 
+          $If you were to join Team Rocket, you could become an Executive.`,
+      2: "I... I'm shattered...",
+      3: "Aaaieeeee! This can't be happening! I fought hard, but I still lost…"
+    },
+  },
+  "proton": {
+    "encounter": {
+      1: "What do you want? If you interrupt our work, don't expect any mercy!",
+      2: `What do we have here? I am often labeled as the scariest and cruelest guy in Team Rocket…
+         $I strongly urge you not to interfere with our business!`,
+      3: "I am Proton, an Admin of Team Rocket. I am here to put an end to your meddling!"
+    },
+    "victory": {
+      1: "The fortress came down!",
+      2: "You may have won this time… But all you did was make Team Rocket's wrath grow…",
+      3: "I am defeated… But I will not forget this!"
+    },
+  },
+
+  "petrel": {
+    "encounter": {
+      1: `Muhahaha, we've been waiting for you. Me? You don't know who I am? It is me, Giovanni.
+          $The majestic Giovanni himself! Wahahaha! …Huh? I don't sound anything like Giovanni?
+          $I don't even look like Giovanni? How come? I've worked so hard to mimic him!`,
+      2: "I am Petrel, an Admin of Team Rocket. I will not allow you to interfere with our plans!",
+      3: "Rocket Executive Petrel will deal with this intruder!"
+    },
+    "victory": {
+      1: "OK, OK. I'll tell you where he is.",
+      2: "I… I couldn't do a thing… Giovanni, please forgive me…",
+      3: "No, I can't let this affect me. I have to inform the others…"
+    },
+  },
+  "tabitha": {
+    "encounter": {
+      1: "Hehehe! So you've come all the way here! But you're too late!",
+      2: `Hehehe... Got here already, did you? We underestimated you! But this is it! 
+          $I'm a cut above the Grunts you've seen so far. I'm not stalling for time.
+          $I'm going to pulverize you!`,
+      3: "I'm going to give you a little taste of pain! Resign yourself to it!"
+    },
+    "victory": {
+      1: `Hehehe! You might have beaten me, but you don't stand a chance against the Boss!
+          $If you get lost now, you won't have to face a sound whipping!`,
+      2: "Hehehe... So, I lost, too...",
+      3: "Ahya! How could this be? For an Admin like me to lose to some random trainer..."
+    },
+  },
+  "courtney": {
+    "encounter": {
+      1: "The thing...The thing that you hold...That is what... That's what we of Team Magma seek...",
+      2: "... Well then...Deleting...",
+      3: "...Ha. ...Analyzing... ...Hah♪"
+    },
+    "victory": {
+      1: "... ...Change...the world.",
+      2: `As anticipated. Unanticipated. You. Target lock...completed.
+         $Commencing...experiment. You. Forever. Aha... ♪`,
+      3: "...Again? That's unanticipated. ...I knew it. You...are interesting! ...Haha. ♪"
+    },
+  },
+  "shelly": {
+    "encounter": {
+      1: `Ahahahaha! You're going to meddle in Team Aqua's affairs?
+         $You're either absolutely fearless, simply ignorant, or both!
+         $You're so cute, you're disgusting! I'll put you down`,
+      2: "What's this? Who's this spoiled brat?",
+      3: "Cool your jets. Be patient. I'll crush you shortly."
+    },
+    "victory": {
+      1: `Ahahahaha! We got meddled with unexpectedly! We're out of options.
+         $We'll have to pull out. But this isn't the last you'll see of Team Aqua!
+         $We have other plans! Don't you forget it!`,
+      2: "Ahhh?! Did I go too easy on you?!",
+      3: `Uh. Are you telling me you've upped your game even more during the fight?
+         $You're a brat with a bright future… My Pokémon and I don't have any strength left to fight…
+         $Go on… Go and be destroyed by Archie.`
+    },
+  },
+  "matt": {
+    "encounter": {
+      1: "Hoohahaha! What, you got a screw loose or something? Look at you, little Makuhita person!",
+      2: "Oho! You! You're that funny kid!",
+      3: "What are you doing here? Did you follow us?"
+    },
+    "victory": {
+      1: "All right then, until the Boss has time for you, I'll be your opponent!",
+      2: `I can feel it! I can feel it, all right! The strength coming offa you!
+          $More! I still want more! But looks like we're outta time...`,
+      3: "That was fun! I knew you'd show me a good time! I look forward to facing you again someday!"
+    },
+  },
+  "mars": {
+    "encounter": {
+      1: "I'm Mars, one of Team Galactic's top Commanders.",
+      2: "Team Galactic's vision for the future is unwavering. Opposition will be crushed without mercy!",
+      3: "Feeling nervous? You should be!"
+    },
+    "victory": {
+      1: "This can't be happening! How did I lose?!",
+      2: "You have some skill, I'll give you that.",
+      3: "Defeated... This was a costly mistake."
+    }
+  },
+  "jupiter": {
+    "encounter": {
+      1: "Jupiter, Commander of Team Galactic, at your service.",
+      2: "Resistance is futile. Team Galactic will prevail!",
+      3: "You're trembling... scared already?"
+    },
+    "victory": {
+      1: "No way... I lost?!",
+      2: "Impressive, you've got guts!",
+      3: "Losing like this... How embarrassing."
+    }
+  },
+  "saturn": {
+    "encounter": {
+      1: "I am Saturn, Commander of Team Galactic.",
+      2: "Our mission is absolute. Any hindrance will be obliterated!",
+      3: "Is that fear I see in your eyes?"
+    },
+    "victory": {
+      1: "Impossible... Defeated by you?!",
+      2: "You have proven yourself a worthy adversary.",
+      3: "Bestowed in defeat... This is unacceptable."
+    }},
+  "zinzolin": {
+    "encounter": {
+      1: "You could become a threat to Team Plasma, so we will eliminate you here and now!",
+      2: "Oh, for crying out loud... I didn't expect to have to battle in this freezing cold!",
+      3: "You're an impressive Trainer to have made it this far. But it ends here."
+    },
+    "victory": {
+      1: "Ghetsis... I have failed you...",
+      2: "It's bitter cold. I'm shivering. I'm suffering. Yet, I still stand victorious.",
+      3: "Hmph. You're a smarter Trainer than I expected, but not smart enough."
+    }
+  },
+  "rood": {
+    "encounter": {
+      1: "You are a threat to Team Plasma. We cannot let you walk away from here and now!",
+      2: "Oh, this icy wind... I never thought I'd have to fight here!",
+      3: "You are a remarkable Trainer to have made it this far. But this is where it ends."
+    },
+    "victory": {
+      1: "Ghetsis... I have failed my mission...",
+      2: "The cold is piercing. I'm shivering. I'm suffering. Yet, I have triumphed.",
+      3: "Hm. You are a talented Trainer, but unfortunately not talented enough."
+    }
+  },
+  "xerosic": {
+    "encounter": {
+      1: "Ah ha ha! It would be my pleasure. Come on, little Trainer! Let's see what you've got!",
+      2: "Hmm... You're more powerful than you look. I wonder how much energy there is inside you.",
+      3: "I've been waiting for you! I need to do a little research on you! Come, let us begin!"
+    },
+    "victory": {
+      1: "Ah, you're quite strong. Oh yes—very strong, indeed.",
+      2: "Ding-ding-ding! You did it! To the victor go the spoils!",
+      3: "Wonderful! Amazing! You have tremendous skill and bravery!"
+    }
+  },
+  "bryony": {
+    "encounter": {
+      1: "I am Bryony, and it would be my pleasure to battle you. Show me what you've got.",
+      2: "Impressive... You're more powerful than you appear. Let's see the true extent of your energy.",
+      3: "I've anticipated your arrival. It's time for a little test. Shall we begin?"
+    },
+    "victory": {
+      1: "You're quite strong. Oh yes—very strong, indeed.",
+      2: "Ding-ding-ding! You've done well. Victory is yours.",
+      3: "Wonderful! Remarkable! Your skill and bravery are commendable."
+    }
+  },
   "rocket_grunt": {
     "encounter": {
       1: "Nous sommes de retour !"
@@ -2898,18 +3095,6 @@ export const PGFdialogue: DialogueTranslationEntries = {
       1: "Une fois de plus la Team Rocket s’envole vers d’autres cieux !"
     },
   },
-  "rocket_admin": {
-    "encounter": {
-      1: "Oh? You managed to get this far? You must be quite the trainer.",
-      2: "That's quite enough of you playing hero, kid.",
-      3: "I'll show you how scary an angry adult can be!"
-    },
-    "victory": {
-      1: "No! Forgive me Giovanni!",
-      2: "How could this be?",
-      3: "Urgh... You were too strong..."
-    },
-  },
   "magma_grunt": {
     "encounter": {
       1: "N’espère pas recevoir de la pitié si tu te mets sur le chemin de la Team Magma !"
@@ -2918,18 +3103,6 @@ export const PGFdialogue: DialogueTranslationEntries = {
       1: "Je…?\nJ’ai perdu ?!"
     },
   },
-  "magma_admin": {
-    "encounter": {
-      1: "Hehehe! So you've come all the way here! But you're too late!",
-      2: "You're going to meddle in Team Magma's affairs? You're so cute you're disgusting! I'll put you down kiddy!",
-      3: "I'm going to give you a little taste of pain! Resign yourself to it!"
-    },
-    "victory": {
-      1: "Hehehe... So I lost...",
-      2: "You're disgustingly strong!",
-      3: "Ahahaha! Ouch!"
-    },
-  },
   "aqua_grunt": {
     "encounter": {
       1: "Aucune pitié si tu te mets sur le chemin de la Team Aqua, même pour une gamine !"
@@ -2938,18 +3111,6 @@ export const PGFdialogue: DialogueTranslationEntries = {
       1: "Comment ça ?"
     },
   },
-  "aqua_admin": {
-    "encounter": {
-      1: "I'm a cut above the grunts you've seen so far. I'm going to puvlerize you!",
-      2: "Hahn? What's this? Who's this spoiled brat?",
-      3: "What are you doing here? Did you follow us?"
-    },
-    "victory": {
-      1: "So I lost too...",
-      2: "Ahhh?! Did I go too easy on you?!",
-      3: "Wh-what was that?"
-    },
-  },
   "galactic_grunt": {
     "encounter": {
       1: "Ne te mets pas en travers de la Team Galaxie !"
@@ -2958,18 +3119,6 @@ export const PGFdialogue: DialogueTranslationEntries = {
       1: "Désactivation…"
     },
   },
-  "galactic_admin": {
-    "encounter": {
-      1: "I'm one of Team Galactic's Commanders.",
-      2: "Anything that opposes Team Galactic must be crushed! Even the very thought of opposition will not be tolerated!",
-      3: "What's the matter? Don't tell me you're shaking?"
-    },
-    "victory": {
-      1: "This can't be?! I lost?! You... you uppity brat!",
-      2: "You, my friend, are tough!",
-      3: "Losing to some child... Being careless cost me too much."
-    },
-  },
   "plasma_grunt": {
     "encounter": {
       1: "Pas de quatiers à ceux qui ne suivent pas notre idéal !"
@@ -2978,18 +3127,6 @@ export const PGFdialogue: DialogueTranslationEntries = {
       1: "Plasmaaaaaaaaa !"
     },
   },
-  "plasma_sage": {
-    "encounter": {
-      1: "You could become a threat to Team Plasma, so we will eliminate you here!",
-      2: "Oh, for crying out loud... I didn't expect to have to fight!",
-      3: "You're an impressive Trainer to have made it this far."
-    },
-    "victory": {
-      1: "Ghetsis...",
-      2: "It's bitter cold. I'm shivering. I'm suffering.",
-      3: "Hmph. You're a smarter Trainer than I expected."
-    },
-  },
   "flare_grunt": {
     "encounter": {
       1: "Le style et le bon gout, il n’y a que ça qui compte !"
@@ -2998,18 +3135,6 @@ export const PGFdialogue: DialogueTranslationEntries = {
       1: "Mon futur me semble guère radieux."
     },
   },
-  "flare_admin": {
-    "encounter": {
-      1: "Ah ha ha! It would be my pleasure. Come on, little Trainer! Let's see what you've got!",
-      2: "Hmm... You're more powerful than you look. I wonder how much energy there is inside you.",
-      3: "I've been waiting for you! I need to do a little research on you! Come, let us begin!"
-    },
-    "victory": {
-      1: "You're quite strong. Oh yes-very strong, indeed.",
-      2: "Ding-ding-ding! Yup, you did it! To the victor goes the spoils!",
-      3: "Wonderful! Amazing! You have tremendous skill and bravery!"
-    },
-  },
   "rocket_boss_giovanni_1": {
     "encounter": {
       1: "Bien. Je dois admettre que je suis impressionné de te voir ici !"

src/locales/fr/trainers.ts

@@ -19,6 +19,19 @@ export const titles: SimpleTranslationEntries = {
   "galactic_boss": "Leader de la Team Galaxie",
   "plasma_boss": "Leader de la Team Plasma",
   "flare_boss": "Leader de la Team Flare",
+
+  "rocket_admin": "Admin Team Rocket",
+  "rocket_admin_female": "Admin Team Rocket",
+  "magma_admin": "Admin Team Magma",
+  "magma_admin_female": "Admin Team Magma",
+  "aqua_admin": "Admin Team Aqua",
+  "aqua_admin_female": "Admin Team Aqua",
+  "galactic_commander": "Admin Team Galaxie",
+  "galactic_commander_female": "Admin Team Galaxie",
+  "plasma_sage": "Sage Plasma",
+  "plasma_admin": "Admin Team Plasma",
+  "flare_admin": "Manager de la Team Flare",
+  "flare_admin_female": "Manageuse de la Team Flare",
   // Maybe if we add the evil teams we can add "Team Rocket" and "Team Aqua" etc. here as well as "Team Rocket Boss" and "Team Aqua Admin" etc.
 } as const;
 
@@ -128,32 +141,21 @@ export const trainerClasses: SimpleTranslationEntries = {
   "rocket_grunt": "Sbire de la Team Rocket",
   "rocket_grunt_female": "Sbire de la Team Rocket",
   "rocket_grunts": "Sbires de la Team Rocket",
-  "rocket_admin": "Rocket Admin",
-  "rocket_admin_female": "Rocket Admin",
   "magma_grunt": "Sbire de la Team Magma",
   "magma_grunt_female": "Sbire de la Team Magma",
   "magma_grunts": "Sbires de la Team Magma",
-  "magma_admin": "Magma Admin",
-  "magma_admin_female": "Magma Admin",
   "aqua_grunt": "Sbire de la Team Aqua",
   "aqua_grunt_female": "Sbire de la Team Aqua",
   "aqua_grunts": "Sbires de la Team Aqua",
-  "aqua_admin": "Aqua Admin",
-  "aqua_admin_female": "Aqua Admin",
   "galactic_grunt": "Sbire de la Team Galaxie",
   "galactic_grunt_female": "Sbire de la Team Galaxie",
   "galactic_grunts": "Sbires de la Team Galaxie",
-  "galactic_admin": "Galactic Admin",
-  "galactic_admin_female": "Galactic Admin",
   "plasma_grunt": "Sbire de la Team Plasma",
   "plasma_grunt_female": "Sbire de la Team Plasma",
   "plasma_grunts": "Sbires de la Team Plasma",
-  "plasma_sage": "Plasma Sage",
   "flare_grunt": "Sbire de la Team Flare",
   "flare_grunt_female": "Sbire de la Team Flare",
   "flare_grunts": "Sbires de la Team Flare",
-  "flare_admin": "Manager de la Team Flare",
-  "flare_admin_female": "Manageuse de la Team Flare",
 } as const;
 
 // Names of special trainers like gym leaders, elite four, and the champion
@@ -288,6 +290,25 @@ export const trainerNames: SimpleTranslationEntries = {
   "ghetsis": "Ghetis",
   "lysandre": "Lysandre",
 
+  // Evil Team Admins
+  "archer": "Amos",
+  "ariana": "Ariane",
+  "proton": "Lance",
+  "petrel": "Lambda",
+  "tabitha": "Kelvin",
+  "courtney": "Courtney",
+  "shelly": "Sarah",
+  "matt": "Matthieu",
+  "mars": "Mars",
+  "jupiter": "Jupiter",
+  "saturn": "Saturne",
+  "zinzolin": "Lilien",
+  "rood": "Carmine",
+  "xerosic": "Xanthin",
+  "bryony": "Brasénie",
+
+
+
   // Double Names
   "blue_red_double": "Blue & Red",
   "red_blue_double": "Red & Blue",

src/locales/it/dialogue.ts

@@ -383,6 +383,203 @@ export const PGMdialogue: DialogueTranslationEntries = {
       3: "I think it's me that's seasick..."
     },
   },
+  "archer": {
+    "encounter": {
+      1: "Before you go any further, let's see how you far against us, Team Rocket!",
+      2: "I have received reports that your skills are not insignificant. Let's see if they are true.",
+      3: "I am Archer, an Admin of Team Rocket. And I do not go easy on enemies of our organization."
+    },
+    "victory": {
+      1: "What a blunder!",
+      2: "With my current skills, I was not up to the task after all.",
+      3: "F-forgive me, Giovanni... For me to be defeated by a mere trainer..."
+    },
+  },
+  "ariana": {
+    "encounter": {
+      1: `Hold it right there! We can't someone on the loose." 
+          $It's harmful to Team Rocket's pride, you see.`,
+      2: `I don't know or care if what I'm doing is right or wrong...
+          $I just put my faith in Giovanni and do as I am told`,
+      3: "Your trip ends here. I'm going to take you down!"
+    },
+    "victory": {
+      1: `Tch, you really are strong. It's too bad. 
+          $If you were to join Team Rocket, you could become an Executive.`,
+      2: "I... I'm shattered...",
+      3: "Aaaieeeee! This can't be happening! I fought hard, but I still lost…"
+    },
+  },
+  "proton": {
+    "encounter": {
+      1: "What do you want? If you interrupt our work, don't expect any mercy!",
+      2: `What do we have here? I am often labeled as the scariest and cruelest guy in Team Rocket…
+         $I strongly urge you not to interfere with our business!`,
+      3: "I am Proton, an Admin of Team Rocket. I am here to put an end to your meddling!"
+    },
+    "victory": {
+      1: "The fortress came down!",
+      2: "You may have won this time… But all you did was make Team Rocket's wrath grow…",
+      3: "I am defeated… But I will not forget this!"
+    },
+  },
+
+  "petrel": {
+    "encounter": {
+      1: `Muhahaha, we've been waiting for you. Me? You don't know who I am? It is me, Giovanni.
+          $The majestic Giovanni himself! Wahahaha! …Huh? I don't sound anything like Giovanni?
+          $I don't even look like Giovanni? How come? I've worked so hard to mimic him!`,
+      2: "I am Petrel, an Admin of Team Rocket. I will not allow you to interfere with our plans!",
+      3: "Rocket Executive Petrel will deal with this intruder!"
+    },
+    "victory": {
+      1: "OK, OK. I'll tell you where he is.",
+      2: "I… I couldn't do a thing… Giovanni, please forgive me…",
+      3: "No, I can't let this affect me. I have to inform the others…"
+    },
+  },
+  "tabitha": {
+    "encounter": {
+      1: "Hehehe! So you've come all the way here! But you're too late!",
+      2: `Hehehe... Got here already, did you? We underestimated you! But this is it! 
+          $I'm a cut above the Grunts you've seen so far. I'm not stalling for time.
+          $I'm going to pulverize you!`,
+      3: "I'm going to give you a little taste of pain! Resign yourself to it!"
+    },
+    "victory": {
+      1: `Hehehe! You might have beaten me, but you don't stand a chance against the Boss!
+          $If you get lost now, you won't have to face a sound whipping!`,
+      2: "Hehehe... So, I lost, too...",
+      3: "Ahya! How could this be? For an Admin like me to lose to some random trainer..."
+    },
+  },
+  "courtney": {
+    "encounter": {
+      1: "The thing...The thing that you hold...That is what... That's what we of Team Magma seek...",
+      2: "... Well then...Deleting...",
+      3: "...Ha. ...Analyzing... ...Hah♪"
+    },
+    "victory": {
+      1: "... ...Change...the world.",
+      2: `As anticipated. Unanticipated. You. Target lock...completed.
+         $Commencing...experiment. You. Forever. Aha... ♪`,
+      3: "...Again? That's unanticipated. ...I knew it. You...are interesting! ...Haha. ♪"
+    },
+  },
+  "shelly": {
+    "encounter": {
+      1: `Ahahahaha! You're going to meddle in Team Aqua's affairs?
+         $You're either absolutely fearless, simply ignorant, or both!
+         $You're so cute, you're disgusting! I'll put you down`,
+      2: "What's this? Who's this spoiled brat?",
+      3: "Cool your jets. Be patient. I'll crush you shortly."
+    },
+    "victory": {
+      1: `Ahahahaha! We got meddled with unexpectedly! We're out of options.
+         $We'll have to pull out. But this isn't the last you'll see of Team Aqua!
+         $We have other plans! Don't you forget it!`,
+      2: "Ahhh?! Did I go too easy on you?!",
+      3: `Uh. Are you telling me you've upped your game even more during the fight?
+         $You're a brat with a bright future… My Pokémon and I don't have any strength left to fight…
+         $Go on… Go and be destroyed by Archie.`
+    },
+  },
+  "matt": {
+    "encounter": {
+      1: "Hoohahaha! What, you got a screw loose or something? Look at you, little Makuhita person!",
+      2: "Oho! You! You're that funny kid!",
+      3: "What are you doing here? Did you follow us?"
+    },
+    "victory": {
+      1: "All right then, until the Boss has time for you, I'll be your opponent!",
+      2: `I can feel it! I can feel it, all right! The strength coming offa you!
+          $More! I still want more! But looks like we're outta time...`,
+      3: "That was fun! I knew you'd show me a good time! I look forward to facing you again someday!"
+    },
+  },
+  "mars": {
+    "encounter": {
+      1: "I'm Mars, one of Team Galactic's top Commanders.",
+      2: "Team Galactic's vision for the future is unwavering. Opposition will be crushed without mercy!",
+      3: "Feeling nervous? You should be!"
+    },
+    "victory": {
+      1: "This can't be happening! How did I lose?!",
+      2: "You have some skill, I'll give you that.",
+      3: "Defeated... This was a costly mistake."
+    }
+  },
+  "jupiter": {
+    "encounter": {
+      1: "Jupiter, Commander of Team Galactic, at your service.",
+      2: "Resistance is futile. Team Galactic will prevail!",
+      3: "You're trembling... scared already?"
+    },
+    "victory": {
+      1: "No way... I lost?!",
+      2: "Impressive, you've got guts!",
+      3: "Losing like this... How embarrassing."
+    }
+  },
+  "saturn": {
+    "encounter": {
+      1: "I am Saturn, Commander of Team Galactic.",
+      2: "Our mission is absolute. Any hindrance will be obliterated!",
+      3: "Is that fear I see in your eyes?"
+    },
+    "victory": {
+      1: "Impossible... Defeated by you?!",
+      2: "You have proven yourself a worthy adversary.",
+      3: "Bestowed in defeat... This is unacceptable."
+    }},
+  "zinzolin": {
+    "encounter": {
+      1: "You could become a threat to Team Plasma, so we will eliminate you here and now!",
+      2: "Oh, for crying out loud... I didn't expect to have to battle in this freezing cold!",
+      3: "You're an impressive Trainer to have made it this far. But it ends here."
+    },
+    "victory": {
+      1: "Ghetsis... I have failed you...",
+      2: "It's bitter cold. I'm shivering. I'm suffering. Yet, I still stand victorious.",
+      3: "Hmph. You're a smarter Trainer than I expected, but not smart enough."
+    }
+  },
+  "rood": {
+    "encounter": {
+      1: "You are a threat to Team Plasma. We cannot let you walk away from here and now!",
+      2: "Oh, this icy wind... I never thought I'd have to fight here!",
+      3: "You are a remarkable Trainer to have made it this far. But this is where it ends."
+    },
+    "victory": {
+      1: "Ghetsis... I have failed my mission...",
+      2: "The cold is piercing. I'm shivering. I'm suffering. Yet, I have triumphed.",
+      3: "Hm. You are a talented Trainer, but unfortunately not talented enough."
+    }
+  },
+  "xerosic": {
+    "encounter": {
+      1: "Ah ha ha! It would be my pleasure. Come on, little Trainer! Let's see what you've got!",
+      2: "Hmm... You're more powerful than you look. I wonder how much energy there is inside you.",
+      3: "I've been waiting for you! I need to do a little research on you! Come, let us begin!"
+    },
+    "victory": {
+      1: "Ah, you're quite strong. Oh yes—very strong, indeed.",
+      2: "Ding-ding-ding! You did it! To the victor go the spoils!",
+      3: "Wonderful! Amazing! You have tremendous skill and bravery!"
+    }
+  },
+  "bryony": {
+    "encounter": {
+      1: "I am Bryony, and it would be my pleasure to battle you. Show me what you've got.",
+      2: "Impressive... You're more powerful than you appear. Let's see the true extent of your energy.",
+      3: "I've anticipated your arrival. It's time for a little test. Shall we begin?"
+    },
+    "victory": {
+      1: "You're quite strong. Oh yes—very strong, indeed.",
+      2: "Ding-ding-ding! You've done well. Victory is yours.",
+      3: "Wonderful! Remarkable! Your skill and bravery are commendable."
+    }
+  },
   "rocket_grunt": {
     "encounter": {
       1: "Prepare for trouble!"
@@ -391,18 +588,6 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "Team Rocket blasting off again!"
     },
   },
-  "rocket_admin": {
-    "encounter": {
-      1: "Oh? You managed to get this far? You must be quite the trainer.",
-      2: "That's quite enough of you playing hero, kid.",
-      3: "I'll show you how scary an angry adult can be!"
-    },
-    "victory": {
-      1: "No! Forgive me Giovanni!",
-      2: "How could this be?",
-      3: "Urgh... You were too strong..."
-    },
-  },
   "magma_grunt": {
     "encounter": {
       1: " If you get in the way of Team Magma, don’t expect any mercy!"
@@ -411,18 +596,6 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "Huh? I lost?!"
     },
   },
-  "magma_admin": {
-    "encounter": {
-      1: "Hehehe! So you've come all the way here! But you're too late!",
-      2: "You're going to meddle in Team Magma's affairs? You're so cute you're disgusting! I'll put you down kiddy!",
-      3: "I'm going to give you a little taste of pain! Resign yourself to it!"
-    },
-    "victory": {
-      1: "Hehehe... So I lost...",
-      2: "You're disgustingly strong!",
-      3: "Ahahaha! Ouch!"
-    },
-  },
   "aqua_grunt": {
     "encounter": {
       1: "No one who crosses Team Aqua gets any mercy, not even kids!"
@@ -431,18 +604,6 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "You're kidding me!"
     },
   },
-  "aqua_admin": {
-    "encounter": {
-      1: "I'm a cut above the grunts you've seen so far. I'm going to puvlerize you!",
-      2: "Hahn? What's this? Who's this spoiled brat?",
-      3: "What are you doing here? Did you follow us?"
-    },
-    "victory": {
-      1: "So I lost too...",
-      2: "Ahhh?! Did I go too easy on you?!",
-      3: "Wh-what was that?"
-    },
-  },
   "galactic_grunt": {
     "encounter": {
       1: "Don't mess with Team Galactic!"
@@ -451,18 +612,6 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "Shut down..."
     },
   },
-  "galactic_admin": {
-    "encounter": {
-      1: "I'm one of Team Galactic's Commanders.",
-      2: "Anything that opposes Team Galactic must be crushed! Even the very thought of opposition will not be tolerated!",
-      3: "What's the matter? Don't tell me you're shaking?"
-    },
-    "victory": {
-      1: "This can't be?! I lost?! You... you uppity brat!",
-      2: "You, my friend, are tough!",
-      3: "Losing to some child... Being careless cost me too much."
-    },
-  },
   "plasma_grunt": {
     "encounter": {
       1: "We won't tolerate people who have different ideas!"
@@ -471,18 +620,6 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "Plasmaaaaaaaaa!"
     },
   },
-  "plasma_sage": {
-    "encounter": {
-      1: "You could become a threat to Team Plasma, so we will eliminate you here!",
-      2: "Oh, for crying out loud... I didn't expect to have to fight!",
-      3: "You're an impressive Trainer to have made it this far."
-    },
-    "victory": {
-      1: "Ghetsis...",
-      2: "It's bitter cold. I'm shivering. I'm suffering.",
-      3: "Hmph. You're a smarter Trainer than I expected."
-    },
-  },
   "flare_grunt": {
     "encounter": {
       1: "Fashion is most important to us!"
@@ -491,18 +628,6 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "The future doesn't look bright for me."
     },
   },
-  "flare_admin": {
-    "encounter": {
-      1: "Ah ha ha! It would be my pleasure. Come on, little Trainer! Let's see what you've got!",
-      2: "Hmm... You're more powerful than you look. I wonder how much energy there is inside you.",
-      3: "I've been waiting for you! I need to do a little research on you! Come, let us begin!"
-    },
-    "victory": {
-      1: "You're quite strong. Oh yes-very strong, indeed.",
-      2: "Ding-ding-ding! Yup, you did it! To the victor goes the spoils!",
-      3: "Wonderful! Amazing! You have tremendous skill and bravery!"
-    },
-  },
   "rocket_boss_giovanni_1": {
     "encounter": {
       1: "So! I must say, I am impressed you got here!"

src/locales/it/trainers.ts

@@ -13,6 +13,25 @@ export const titles: SimpleTranslationEntries = {
   "rival": "Rivale",
   "professor": "Professore",
   "frontier_brain": "Asso lotta",
+  "rocket_boss": "Team Rocket Boss",
+  "magma_boss": "Team Magma Boss",
+  "aqua_boss": "Team Aqua Boss",
+  "galactic_boss": "Team Galactic Boss",
+  "plasma_boss": "Team Plasma Boss",
+  "flare_boss": "Team Flare Boss",
+
+  "rocket_admin": "Team Rocket Admin",
+  "rocket_admin_female": "Team Rocket Admin",
+  "magma_admin": "Team Magma Admin",
+  "magma_admin_female": "Team Magma Admin",
+  "aqua_admin": "Team Aqua Admin",
+  "aqua_admin_female": "Team Aqua Admin",
+  "galactic_commander": "Team Galactic Commander",
+  "galactic_commander_female": "Team Galactic Commander",
+  "plasma_sage": "Team Plasma Sage",
+  "plasma_admin": "Team Plasma Admin",
+  "flare_admin": "Team Flare Admin",
+  "flare_admin_female": "Team Flare Admin",
   // Maybe if we add the evil teams we can add "Team Rocket" and "Team Aqua" etc. here as well as "Team Rocket Boss" and "Team Aqua Admin" etc.
 } as const;
 
@@ -122,31 +141,22 @@ export const trainerClasses: SimpleTranslationEntries = {
   "rocket_grunt": "Recluta Team Rocket",
   "rocket_grunt_female": "Recluta Team Rocket",
   "rocket_grunts": "Reclute Team Rocket",
-  "rocket_admin": "Rocket Admin",
-  "rocket_admin_female": "Rocket Admin",
   "magma_grunt": "Recluta Team Magma",
   "magma_grunt_female": "Recluta Team Magma",
   "magma_grunts": "Reclute Team Magma",
-  "magma_admin": "Magma Admin",
-  "magma_admin_female": "Magma Admin",
   "aqua_grunt": "Recluta Team Idro",
   "aqua_grunt_female": "Recluta Team Idro",
   "aqua_grunts": "Recluta Team Idro",
-  "aqua_admin": "Aqua Admin",
-  "aqua_admin_female": "Aqua Admin",
   "galactic_grunt": "Recluta Team Galassia",
   "galactic_grunt_female": "Recluta Team Galassia",
   "galactic_grunts": "Reclute Team Galassia",
-  "galactic_admin": "Galactic Admin",
-  "galactic_admin_female": "Galactic Admin",
   "plasma_grunt": "Seguace Plasma",
   "plasma_grunt_female": "Seguace Plasma",
   "plasma_grunts": "Seguaci Plasma",
   "flare_grunt": "Recluta Team Flare",
   "flare_grunt_female": "Recluta Team Flare",
   "flare_grunts": "Reclute Team Flare",
-  "flare_admin": "Flare Admin",
+
-  "flare_admin_female": "Flare Admin",
 } as const;
 
 // Names of special trainers like gym leaders, elite four, and the champion
@@ -276,6 +286,28 @@ export const trainerNames: SimpleTranslationEntries = {
   "rival": "Finn",
   "rival_female": "Ivy",
 
+  // Evil Team Admins
+  "archer": "Archer",
+  "ariana": "Ariana",
+  "proton": "Proton",
+  "petrel": "Petrel",
+  "tabitha": "Tabitha",
+  "courtney": "Courtney",
+  "shelly": "Shelly",
+  "matt": "Matt",
+  "mars": "Mars",
+  "jupiter": "Jupiter",
+  "saturn": "Saturn",
+  "zinzolin": "Zinzolin",
+  "rood": "Rood",
+  "xerosic": "Xerosic",
+  "bryony": "Bryony",
+
+  "maxie": "Maxie",
+  "archie": "Archie",
+  "cyrus": "Cyrus",
+  "ghetsis": "Ghetsis",
+  "lysandre": "Lysandre",
 
   // Double Names
   "blue_red_double": "Blu & Rosso",

src/locales/ja/dialogue.ts

@@ -383,6 +383,204 @@ export const PGMdialogue: DialogueTranslationEntries = {
       3: "I think it's me that's seasick..."
     },
   },
+
+  "archer": {
+    "encounter": {
+      1: "Before you go any further, let's see how you far against us, Team Rocket!",
+      2: "I have received reports that your skills are not insignificant. Let's see if they are true.",
+      3: "I am Archer, an Admin of Team Rocket. And I do not go easy on enemies of our organization."
+    },
+    "victory": {
+      1: "What a blunder!",
+      2: "With my current skills, I was not up to the task after all.",
+      3: "F-forgive me, Giovanni... For me to be defeated by a mere trainer..."
+    },
+  },
+  "ariana": {
+    "encounter": {
+      1: `Hold it right there! We can't someone on the loose." 
+          $It's harmful to Team Rocket's pride, you see.`,
+      2: `I don't know or care if what I'm doing is right or wrong...
+          $I just put my faith in Giovanni and do as I am told`,
+      3: "Your trip ends here. I'm going to take you down!"
+    },
+    "victory": {
+      1: `Tch, you really are strong. It's too bad. 
+          $If you were to join Team Rocket, you could become an Executive.`,
+      2: "I... I'm shattered...",
+      3: "Aaaieeeee! This can't be happening! I fought hard, but I still lost…"
+    },
+  },
+  "proton": {
+    "encounter": {
+      1: "What do you want? If you interrupt our work, don't expect any mercy!",
+      2: `What do we have here? I am often labeled as the scariest and cruelest guy in Team Rocket…
+         $I strongly urge you not to interfere with our business!`,
+      3: "I am Proton, an Admin of Team Rocket. I am here to put an end to your meddling!"
+    },
+    "victory": {
+      1: "The fortress came down!",
+      2: "You may have won this time… But all you did was make Team Rocket's wrath grow…",
+      3: "I am defeated… But I will not forget this!"
+    },
+  },
+
+  "petrel": {
+    "encounter": {
+      1: `Muhahaha, we've been waiting for you. Me? You don't know who I am? It is me, Giovanni.
+          $The majestic Giovanni himself! Wahahaha! …Huh? I don't sound anything like Giovanni?
+          $I don't even look like Giovanni? How come? I've worked so hard to mimic him!`,
+      2: "I am Petrel, an Admin of Team Rocket. I will not allow you to interfere with our plans!",
+      3: "Rocket Executive Petrel will deal with this intruder!"
+    },
+    "victory": {
+      1: "OK, OK. I'll tell you where he is.",
+      2: "I… I couldn't do a thing… Giovanni, please forgive me…",
+      3: "No, I can't let this affect me. I have to inform the others…"
+    },
+  },
+  "tabitha": {
+    "encounter": {
+      1: "Hehehe! So you've come all the way here! But you're too late!",
+      2: `Hehehe... Got here already, did you? We underestimated you! But this is it! 
+          $I'm a cut above the Grunts you've seen so far. I'm not stalling for time.
+          $I'm going to pulverize you!`,
+      3: "I'm going to give you a little taste of pain! Resign yourself to it!"
+    },
+    "victory": {
+      1: `Hehehe! You might have beaten me, but you don't stand a chance against the Boss!
+          $If you get lost now, you won't have to face a sound whipping!`,
+      2: "Hehehe... So, I lost, too...",
+      3: "Ahya! How could this be? For an Admin like me to lose to some random trainer..."
+    },
+  },
+  "courtney": {
+    "encounter": {
+      1: "The thing...The thing that you hold...That is what... That's what we of Team Magma seek...",
+      2: "... Well then...Deleting...",
+      3: "...Ha. ...Analyzing... ...Hah♪"
+    },
+    "victory": {
+      1: "... ...Change...the world.",
+      2: `As anticipated. Unanticipated. You. Target lock...completed.
+         $Commencing...experiment. You. Forever. Aha... ♪`,
+      3: "...Again? That's unanticipated. ...I knew it. You...are interesting! ...Haha. ♪"
+    },
+  },
+  "shelly": {
+    "encounter": {
+      1: `Ahahahaha! You're going to meddle in Team Aqua's affairs?
+         $You're either absolutely fearless, simply ignorant, or both!
+         $You're so cute, you're disgusting! I'll put you down`,
+      2: "What's this? Who's this spoiled brat?",
+      3: "Cool your jets. Be patient. I'll crush you shortly."
+    },
+    "victory": {
+      1: `Ahahahaha! We got meddled with unexpectedly! We're out of options.
+         $We'll have to pull out. But this isn't the last you'll see of Team Aqua!
+         $We have other plans! Don't you forget it!`,
+      2: "Ahhh?! Did I go too easy on you?!",
+      3: `Uh. Are you telling me you've upped your game even more during the fight?
+         $You're a brat with a bright future… My Pokémon and I don't have any strength left to fight…
+         $Go on… Go and be destroyed by Archie.`
+    },
+  },
+  "matt": {
+    "encounter": {
+      1: "Hoohahaha! What, you got a screw loose or something? Look at you, little Makuhita person!",
+      2: "Oho! You! You're that funny kid!",
+      3: "What are you doing here? Did you follow us?"
+    },
+    "victory": {
+      1: "All right then, until the Boss has time for you, I'll be your opponent!",
+      2: `I can feel it! I can feel it, all right! The strength coming offa you!
+          $More! I still want more! But looks like we're outta time...`,
+      3: "That was fun! I knew you'd show me a good time! I look forward to facing you again someday!"
+    },
+  },
+  "mars": {
+    "encounter": {
+      1: "I'm Mars, one of Team Galactic's top Commanders.",
+      2: "Team Galactic's vision for the future is unwavering. Opposition will be crushed without mercy!",
+      3: "Feeling nervous? You should be!"
+    },
+    "victory": {
+      1: "This can't be happening! How did I lose?!",
+      2: "You have some skill, I'll give you that.",
+      3: "Defeated... This was a costly mistake."
+    }
+  },
+  "jupiter": {
+    "encounter": {
+      1: "Jupiter, Commander of Team Galactic, at your service.",
+      2: "Resistance is futile. Team Galactic will prevail!",
+      3: "You're trembling... scared already?"
+    },
+    "victory": {
+      1: "No way... I lost?!",
+      2: "Impressive, you've got guts!",
+      3: "Losing like this... How embarrassing."
+    }
+  },
+  "saturn": {
+    "encounter": {
+      1: "I am Saturn, Commander of Team Galactic.",
+      2: "Our mission is absolute. Any hindrance will be obliterated!",
+      3: "Is that fear I see in your eyes?"
+    },
+    "victory": {
+      1: "Impossible... Defeated by you?!",
+      2: "You have proven yourself a worthy adversary.",
+      3: "Bestowed in defeat... This is unacceptable."
+    }},
+  "zinzolin": {
+    "encounter": {
+      1: "You could become a threat to Team Plasma, so we will eliminate you here and now!",
+      2: "Oh, for crying out loud... I didn't expect to have to battle in this freezing cold!",
+      3: "You're an impressive Trainer to have made it this far. But it ends here."
+    },
+    "victory": {
+      1: "Ghetsis... I have failed you...",
+      2: "It's bitter cold. I'm shivering. I'm suffering. Yet, I still stand victorious.",
+      3: "Hmph. You're a smarter Trainer than I expected, but not smart enough."
+    }
+  },
+  "rood": {
+    "encounter": {
+      1: "You are a threat to Team Plasma. We cannot let you walk away from here and now!",
+      2: "Oh, this icy wind... I never thought I'd have to fight here!",
+      3: "You are a remarkable Trainer to have made it this far. But this is where it ends."
+    },
+    "victory": {
+      1: "Ghetsis... I have failed my mission...",
+      2: "The cold is piercing. I'm shivering. I'm suffering. Yet, I have triumphed.",
+      3: "Hm. You are a talented Trainer, but unfortunately not talented enough."
+    }
+  },
+  "xerosic": {
+    "encounter": {
+      1: "Ah ha ha! It would be my pleasure. Come on, little Trainer! Let's see what you've got!",
+      2: "Hmm... You're more powerful than you look. I wonder how much energy there is inside you.",
+      3: "I've been waiting for you! I need to do a little research on you! Come, let us begin!"
+    },
+    "victory": {
+      1: "Ah, you're quite strong. Oh yes—very strong, indeed.",
+      2: "Ding-ding-ding! You did it! To the victor go the spoils!",
+      3: "Wonderful! Amazing! You have tremendous skill and bravery!"
+    }
+  },
+  "bryony": {
+    "encounter": {
+      1: "I am Bryony, and it would be my pleasure to battle you. Show me what you've got.",
+      2: "Impressive... You're more powerful than you appear. Let's see the true extent of your energy.",
+      3: "I've anticipated your arrival. It's time for a little test. Shall we begin?"
+    },
+    "victory": {
+      1: "You're quite strong. Oh yes—very strong, indeed.",
+      2: "Ding-ding-ding! You've done well. Victory is yours.",
+      3: "Wonderful! Remarkable! Your skill and bravery are commendable."
+    }
+  },
   "rocket_grunt": {
     "encounter": {
       1: "Prepare for trouble!"
@@ -391,18 +589,6 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "Team Rocket blasting off again!"
     },
   },
-  "rocket_admin": {
-    "encounter": {
-      1: "Oh? You managed to get this far? You must be quite the trainer.",
-      2: "That's quite enough of you playing hero, kid.",
-      3: "I'll show you how scary an angry adult can be!"
-    },
-    "victory": {
-      1: "No! Forgive me Giovanni!",
-      2: "How could this be?",
-      3: "Urgh... You were too strong..."
-    },
-  },
   "magma_grunt": {
     "encounter": {
       1: " If you get in the way of Team Magma, don’t expect any mercy!"
@@ -411,18 +597,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "Huh? I lost?!"
     },
   },
-  "magma_admin": {
+
-    "encounter": {
-      1: "Hehehe! So you've come all the way here! But you're too late!",
-      2: "You're going to meddle in Team Magma's affairs? You're so cute you're disgusting! I'll put you down kiddy!",
-      3: "I'm going to give you a little taste of pain! Resign yourself to it!"
-    },
-    "victory": {
-      1: "Hehehe... So I lost...",
-      2: "You're disgustingly strong!",
-      3: "Ahahaha! Ouch!"
-    },
-  },
   "aqua_grunt": {
     "encounter": {
       1: "No one who crosses Team Aqua gets any mercy, not even kids!"
@@ -431,18 +606,6 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "You're kidding me!"
     },
   },
-  "aqua_admin": {
-    "encounter": {
-      1: "I'm a cut above the grunts you've seen so far. I'm going to puvlerize you!",
-      2: "Hahn? What's this? Who's this spoiled brat?",
-      3: "What are you doing here? Did you follow us?"
-    },
-    "victory": {
-      1: "So I lost too...",
-      2: "Ahhh?! Did I go too easy on you?!",
-      3: "Wh-what was that?"
-    },
-  },
   "galactic_grunt": {
     "encounter": {
       1: "Don't mess with Team Galactic!"
@@ -451,18 +614,6 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "Shut down..."
     },
   },
-  "galactic_admin": {
-    "encounter": {
-      1: "I'm one of Team Galactic's Commanders.",
-      2: "Anything that opposes Team Galactic must be crushed! Even the very thought of opposition will not be tolerated!",
-      3: "What's the matter? Don't tell me you're shaking?"
-    },
-    "victory": {
-      1: "This can't be?! I lost?! You... you uppity brat!",
-      2: "You, my friend, are tough!",
-      3: "Losing to some child... Being careless cost me too much."
-    },
-  },
   "plasma_grunt": {
     "encounter": {
       1: "We won't tolerate people who have different ideas!"
@@ -471,18 +622,6 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "Plasmaaaaaaaaa!"
     },
   },
-  "plasma_sage": {
-    "encounter": {
-      1: "You could become a threat to Team Plasma, so we will eliminate you here!",
-      2: "Oh, for crying out loud... I didn't expect to have to fight!",
-      3: "You're an impressive Trainer to have made it this far."
-    },
-    "victory": {
-      1: "Ghetsis...",
-      2: "It's bitter cold. I'm shivering. I'm suffering.",
-      3: "Hmph. You're a smarter Trainer than I expected."
-    },
-  },
   "flare_grunt": {
     "encounter": {
       1: "Fashion is most important to us!"
@@ -491,18 +630,6 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "The future doesn't look bright for me."
     },
   },
-  "flare_admin": {
-    "encounter": {
-      1: "Ah ha ha! It would be my pleasure. Come on, little Trainer! Let's see what you've got!",
-      2: "Hmm... You're more powerful than you look. I wonder how much energy there is inside you.",
-      3: "I've been waiting for you! I need to do a little research on you! Come, let us begin!"
-    },
-    "victory": {
-      1: "You're quite strong. Oh yes-very strong, indeed.",
-      2: "Ding-ding-ding! Yup, you did it! To the victor goes the spoils!",
-      3: "Wonderful! Amazing! You have tremendous skill and bravery!"
-    },
-  },
   "rocket_boss_giovanni_1": {
     "encounter": {
       1: "So! I must say, I am impressed you got here!"
@@ -2605,7 +2732,7 @@ export const PGFbattleSpecDialogue: SimpleTranslationEntries = PGMbattleSpecDial
 // Dialogue that does not fit into any other category (e.g. tutorial messages, or the end of the game). For when the player character is male
 export const PGMmiscDialogue: SimpleTranslationEntries = {
   "ending":
-        `@c{smile}Oh? You won?@d{96} @c{smile_eclosed}I guess I should've known.\nBut, you're back now.
+      `@c{smile}Oh? You won?@d{96} @c{smile_eclosed}I guess I should've known.\nBut, you're back now.
         $@c{smile}It's over.@d{64} You ended the loop.
         $@c{serious_smile_fists}You fulfilled your dream too, didn't you?\nYou didn't lose even once.
         $@c{neutral}I'm the only one who'll remember what you did.@d{96}\nI guess that's okay, isn't it?
@@ -2613,7 +2740,7 @@ export const PGMmiscDialogue: SimpleTranslationEntries = {
         $@c{smile_eclosed}Anyway, I've had about enough of this place, haven't you? Let's head home.
         $@c{serious_smile_fists}Maybe when we get back, we can have another battle?\nIf you're up to it.`,
   "ending_female":
-        `@c{shock}You're back?@d{32} Does that mean…@d{96} you won?!\n@c{smile_ehalf}I should have known you had it in you.
+      `@c{shock}You're back?@d{32} Does that mean…@d{96} you won?!\n@c{smile_ehalf}I should have known you had it in you.
         $@c{smile_eclosed}Of course… I always had that feeling.\n@c{smile}It's over now, right? You ended the loop.
         $@c{smile_ehalf}You fulfilled your dream too, didn't you?\nYou didn't lose even once.
         $I'll be the only one to remember what you did.\n@c{angry_mopen}I'll try not to forget!

src/locales/ja/trainers.ts

@@ -1,4 +1,4 @@
-import { SimpleTranslationEntries } from "#app/interfaces/locales";
+import {SimpleTranslationEntries} from "#app/interfaces/locales";
 
 // Titles of special trainers like gym leaders, elite four, and the champion
 export const titles: SimpleTranslationEntries = {
@@ -19,6 +19,19 @@ export const titles: SimpleTranslationEntries = {
   "galactic_boss": "Team Galactic Boss",
   "plasma_boss": "Team Plasma Boss",
   "flare_boss": "Team Flare Boss",
+
+  "rocket_admin": "Team Rocket Admin",
+  "rocket_admin_female": "Team Rocket Admin",
+  "magma_admin": "Team Magma Admin",
+  "magma_admin_female": "Team Magma Admin",
+  "aqua_admin": "Team Aqua Admin",
+  "aqua_admin_female": "Team Aqua Admin",
+  "galactic_commander": "Team Galactic Commander",
+  "galactic_commander_female": "Team Galactic Commander",
+  "plasma_sage": "Team Plasma Sage",
+  "plasma_admin": "Team Plasma Admin",
+  "flare_admin": "Team Flare Admin",
+  "flare_admin_female": "Team Flare Admin",
   // Maybe if we add the evil teams we can add "Team Rocket" and "Team Aqua" etc. here as well as "Team Rocket Boss" and "Team Aqua Admin" etc.
 } as const;
 
@@ -128,32 +141,21 @@ export const trainerClasses: SimpleTranslationEntries = {
   "rocket_grunt": "Rocket Grunt",
   "rocket_grunts": "Rocket Grunts",
   "rocket_grunt_female": "Rocket Grunt",
-  "rocket_admin": "Rocket Admin",
-  "rocket_admin_female": "Rocket Admin",
   "magma_grunt": "Magma Grunt",
   "magma_grunt_female": "Magma Grunt",
   "magma_grunts": "Magma Grunts",
-  "magma_admin": "Magma Admin",
-  "magma_admin_female": "Magma Admin",
   "aqua_grunt": "Aqua Grunt",
   "aqua_grunt_female": "Aqua Grunt",
   "aqua_grunts": "Aqua Grunts",
-  "aqua_admin": "Aqua Admin",
-  "aqua_admin_female": "Aqua Admin",
   "galactic_grunt": "Galactic Grunt",
   "galactic_grunt_female": "Galactic Grunt",
   "galactic_grunts": "Galactic Grunts",
-  "galactic_admin": "Galactic Admin",
-  "galactic_admin_female": "Galactic Admin",
   "plasma_grunt": "Plasma Grunt",
   "plasma_grunt_female": "Plasma Grunt",
   "plasma_grunts": "Plasma Grunts",
-  "plasma_sage": "Plasma Sage",
   "flare_grunt": "Flare Grunt",
   "flare_grunt_female": "Flare Grunt",
   "flare_grunts": "Flare Grunts",
-  "flare_admin": "Flare Admin",
-  "flare_admin_female": "Flare Admin",
 } as const;
 
 // Names of special trainers like gym leaders, elite four, and the champion
@@ -282,6 +284,24 @@ export const trainerNames: SimpleTranslationEntries = {
   "leon": "Leon",
   "rival": "Finn",
   "rival_female": "Ivy",
+
+  // Evil Team Admins
+  "archer": "Archer",
+  "ariana": "Ariana",
+  "proton": "Proton",
+  "petrel": "Petrel",
+  "tabitha": "Tabitha",
+  "courtney": "Courtney",
+  "shelly": "Shelly",
+  "matt": "Matt",
+  "mars": "Mars",
+  "jupiter": "Jupiter",
+  "saturn": "Saturn",
+  "zinzolin": "Zinzolin",
+  "rood": "Rood",
+  "xerosic": "Xerosic",
+  "bryony": "Bryony",
+
   "maxie": "Maxie",
   "archie": "Archie",
   "cyrus": "Cyrus",

src/locales/ko/dialogue.ts

@@ -383,6 +383,203 @@ export const PGMdialogue: DialogueTranslationEntries = {
       3: "내가 뱃멀미가 나는 것 같군…"
     },
   },
+  "archer": {
+    "encounter": {
+      1: "더 나아가기 전에 우리 로켓단과 맞설 만한지 한 번 봅시다!",
+      2: "당신의 실력이 예사롭지 않다는 소식을 들었습니다. 정말인지 한 번 보지요.",
+      3: "…저는 로켓단의 간부 아폴로. 우리 조직의 적에게는 봐 주지 않습니다!"
+    },
+    "victory": {
+      1: "…이런 실수를 하다니!",
+      2: "역시 지금의 저는 무리였군요…",
+      3: "비, 비주기님, 용서해주십시오…제가 일개 트레이너한테 당하다니…"
+    },
+  },
+  "ariana": {
+    "encounter": {
+      1: `거기까지다~!! 너 같은 놈을 언제까지고 설치게 두었다가는 
+          $로켓단의 프라이드는 상처 입고 상처 입어서 상처투성이가 돼 버린다고-!`,
+      2: `내가 하는 일이 옳은지 그른지는 상관 없어…
+          $그저 비주기님을 믿고 따르는 것 뿐이니까-!`,
+      3: "네 여정은 여기서 끝이야. 내가 널 이길 테니까-!"
+    },
+    "victory": {
+      1: `어머, 강하군. 안타깝네.
+          $네가 로켓단에 있었다면 간부가 될 수 있었을 텐데.`,
+      2: "사…산산조각났네…",
+      3: "으이이이익! 온 힘을 다해서 싸웠는데…이래도 이길 수 없다니!"
+    },
+  },
+  "proton": {
+    "encounter": {
+      1: "뭐죠? 우리 일에 끼어든다면 자비를 바라지 마십시오!",
+      2: `뭐죠? 나는 로켓단에서 제일 냉혹하다고 불리는 남자…
+         $우리 일을 방해하도록 그냥 놔두지 않겠습니다!`,
+      3: "나는 로켓단의 간부 랜스. 당신의 참견도 여기까지입니다!"
+    },
+    "victory": {
+      1: "요새가 무너져내렸네요…",
+      2: "나한테 이긴 건 결국 로켓단의 분노를 강하게 했을 뿐이예요…",
+      3: "나는 졌지만, 결코 이 일을 잊지 않을 겁니다!"
+    },
+  },
+
+  "petrel": {
+    "encounter": {
+      1: `후후훗, 잘 왔구나. 오잉? 내가 누군지 알아? 비주기야.
+          $비주기님이라고, 우-하하! …엥? 전혀 안 닮았다고?
+          $비주기님으로는 안 보인다고? 제길- 열심히 연습했는데!`,
+      2: "나는 로켓단의 간부 람다. 우리 계획을 방해하는 건 용납할 수 없다!",
+      3: "이 로켓단 간부 람다가 네놈 불청객을 처리해 주지!"
+    },
+    "victory": {
+      1: "조…좋아. 비주기님이 어디 계신지 알려주지.",
+      2: "크으으… 이 내가 당해낼 수 없다니… 비주기님, 용서해주십시오…",
+      3: "안돼, 이런다고 나한테 어쩔 수는 없어. 다른 사람들에게 알려야겠어…"
+    },
+  },
+  "tabitha": {
+    "encounter": {
+      1: "우효효효! 그래 당신 여기까지 왔구나! 그치만 늦었어요!",
+      2: `우효효… 벌써 여기까지 왔네요? 우리가 당신을 과소평가했어요. 하지만 이제 시작입니다! 
+          $이 호걸님은 이제까지 본 조무래기들과는 차원이 다르답니다! 우물쭈물 시간을 끌지 않아요.
+          $확실하게 보내주마! 우효효효효효효!!`,
+      3: "여기서 어른의 무서움을 제대로 알려주지! 받아랏-!"
+    },
+    "victory": {
+      1: `우효효! 이 호걸은 이겼을지 몰라도 마적님한테는 안 될 겁니다!
+          $차라리 여기서 졌다면 무자비한 채찍질은 피했을텐데 말이죠!`,
+      2: "우효~! 이야 이건 예상 밖의 전개인데!?",
+      3: "우효! 어떻게?! 이 호걸님이 이런 일개 트레이너에게…"
+    },
+  },
+  "courtney": {
+    "encounter": {
+      1: "…그 …네가 가진 …우리…마그마단이 원하는 것",
+      2: "…………그럼 …………삭제하겠습니다",
+      3: "……애널라이즈 ……하고 싶어 ……아하하하♪"
+    },
+    "victory": {
+      1: "……바꿔줘 ……세계를",
+      2: `………예상대로 ………예상외 ………너 …………타깃 록 ………했으니까
+         $……엑스페리먼트 ……할 테니까 ………너를………계속………아핫…♪`,
+      3: "……또 ……예상외 ………… ……역시 ……너…재미있어…! ………아하하…♪"
+    },
+  },
+  "shelly": {
+    "encounter": {
+      1: `엥? 우리 아쿠아단의 일에 끼어들겠다고?
+         $…좋아! 기본적인 예의도 모르는 애송이한테는 제대로 그 버릇을 고쳐줘야지…
+         $겁먹고 도망쳐도 용서 따위 없을 줄 알아! 우하하하!`,
+      2: "아앙? 뭐야? 이 건방진 꼬맹이는…",
+      3: "침착해. 조급해 하지 말라고… 금방 박살내 줄 테니까."
+    },
+    "victory": {
+      1: `아아아아앙!? 예상치 못하게 방해받았잖아! 어쩔 수 없네.
+         $여기선 물러나야겠네. 그렇지만 네가 아쿠아단을 만나는 게 이게 마지막은 아닐 거야.
+         $우리는 다른 계획도 있거든! 잊지 마!`,
+      2: "크윽…!? 너무 봐줬나…!",
+      3: `…으윽 …싸우면서 더욱 실력이 좋아졌다고…!?
+         $장래가 무서워지는 애송이네… …나와 내 포켓몬들은 더 이상 싸울 힘이 남아 있지 않아.
+         $…가 …가서 아강님한테 아주 혼쭐이나 나 버려.`
+    },
+  },
+  "matt": {
+    "encounter": {
+      1: "후하하하하하! 뭐라 떠들고 있는 거야! 너 생긴 게 마크탕이랑 똑같네!",
+      2: "음음! 네 녀석은! 재미있는 녀석!",
+      3: "뭐야?! 우릴 따라온 거냐!"
+    },
+    "victory": {
+      1: "…그래서 말이지, 리더님이 시간이 나실 때까진 내가 상대해 주마!",
+      2: `확 확 느껴지는데! 네놈들의 강함이 말이야!
+          $제대로 붙었다고 하기엔 조금 모자라지만 이제 타임오버 같네…`,
+      3: "재밌는데!! 역시 재미있어! 넌! 또 붙게 될 때를 기대하고 있겠어!"
+    },
+  },
+  "mars": {
+    "encounter": {
+      1: "난 갤럭시단 간부인 마스! 강하고 아름답지!",
+      2: "갤럭시단의 미래에 대한 비전은 흔들림 없지. 방해한다면 무자비하게 짓밟아 주마!",
+      3: "두렵지 않아? 넌 그래야만 할 걸!"
+    },
+    "victory": {
+      1: "갤럭시단의 간부로서… 이런 일은 있을 수 없어!!",
+      2: "넌 능력 있구나. 그건 인정하지.",
+      3: "아-이런 이런! 졌잖아!"
+    }
+  },
+  "jupiter": {
+    "encounter": {
+      1: "무슨 볼일이라도? 좋아! 갤럭시단 간부인 나 주피터가 상대해주지.",
+      2: "발버둥쳐 봐야 소용 없어. 갤럭시단이 승리할 거니까!",
+      3: "너 떨고 있네… 무서운 거지?"
+    },
+    "victory": {
+      1: "일개 트레이너에게 지다니 방심이란 무섭구나.",
+      2: "다음에는 내가 울려 주고 말겠어!",
+      3: "흥! 강하네. 하지만 보스는 당할 수 없어"
+    }
+  },
+  "saturn": {
+    "encounter": {
+      1: "나는 갤럭시단의 간부 새턴. 모든 것은 모두를 위해 그리고 갤럭시단을 위해!",
+      2: "갤럭시단을 방해한다면 일말의 가능성도 모두 제거한다!",
+      3: "여기까지 왔으니 갤럭시단 나름의 접대를 해 주지."
+    },
+    "victory": {
+      1: "이럴 수가… 너한테 졌다고?!",
+      2: "…역시 강해! 갤럭시단에 맞설 만하군.",
+      3: "강하다! 하지만 불쌍하군."
+    }},
+  "zinzolin": {
+    "encounter": {
+      1: "너는 플라스마단에게 있어 불안요소가 될 것이다. 여기서 제거하겠다!",
+      2: "이런 이런… 내가 이런 곳에서 싸워야만 하다니!",
+      3: "여기까지 오다니 대단한 트레이너군. 그러나 여기가 끝이다."
+    },
+    "victory": {
+      1: "게치스님… 제가 실패했습니다…",
+      2: "그건 그렇고 힘들구먼. 나는 떨고 있다. 괴롭지만 살아 있다. 그것이야말로 살아 있다는 실감!",
+      3: "흐음. 의외로 똑똑한 트레이너군. 하지만 생각만큼은 아니야."
+    }
+  },
+  "rood": {
+    "encounter": {
+      1: "너는 플라스마단에 위협이 되는구나. 너라는 트레이너가 어떤 인물인지 승부로 알아봐야겠다.",
+      2: "오호! 싸늘하구먼… 이런 곳에서 싸울 줄이야!",
+      3: "너는 여기까지 온 것으로 보니 뛰어난 트레이너구나. 그렇다만 이젠 끝이다."
+    },
+    "victory": {
+      1: "게치스님… 임무를 실패했습니다…",
+      2: "나는 떨고 있다. 나는 괴롭지만 이겨냈다.",
+      3: "음… 너는 재능이 있는 트레이너구나. 하지만 충분하지는 않다."
+    }
+  },
+  "xerosic": {
+    "encounter": {
+      1: "오오- 네 소문은 많이 들었다. 자, 이리 와 보거라!",
+      2: "너 강하구나. 에너지를 얼마나 갖고 있지?",
+      3: "기다리고 있었어! 너를 조사하겠다. 자 시작한다!"
+    },
+    "victory": {
+      1: "강하구나, 너는. 응, 정말 강해, 너는.",
+      2: "뭣이라! 넌 굉장하군! 너의 포켓몬도 대단하군!",
+      3: "굉장하구나 너! 아주 굉장해! 나는 너를 인정하겠다!"
+    }
+  },
+  "bryony": {
+    "encounter": {
+      1: "나는 바라. 당신과 싸울 수 있어 기쁘군요. 한 번 보여주시죠.",
+      2: "인상적이군요… 보기보다 강해요. 에너지가 어디까지 뻗어나가는지 봅시다.",
+      3: "도착할 줄 알았습니다. 시작할까요?"
+    },
+    "victory": {
+      1: "어라? 이길 확률은 어디까지나 확률. 절대적이진 않네.",
+      2: "확률을 무시하는 트레이너, 네 파워의 원천은 뭐지?",
+      3: "놀랍군! 칭찬할 만 해."
+    }
+  },
   "rocket_grunt": {
     "encounter": {
       1: "트러블에 대비하도록!"
@@ -391,18 +588,6 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "로켓단은 다시 떠오를 거니까!"
     },
   },
-  "rocket_admin": {
-    "encounter": {
-      1: "어라 어라… 결국 여기까지 오셨습니까? 꽤 우수한 트레이너인가 보군요.",
-      2: "영웅 놀이는 여기까지랍니다, 꼬마야.",
-      3: "어른이 화를 내면 무섭다는 걸 보여 드리죠!"
-    },
-    "victory": {
-      1: "크으… 비주기님 용서해 주세요…!",
-      2: "어떻게 이런 일이…",
-      3: "아아… 넌 너무 강하다…"
-    },
-  },
   "magma_grunt": {
     "encounter": {
       1: " 마그마단을 방해한다면, 자비는 없닷!"
@@ -411,18 +596,6 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "하? 내가 졌어?!"
     },
   },
-  "magma_admin": {
-    "encounter": {
-      1: "……아하… ……역시 왔네…그치만 안타깝게 됐어……다 끝났거든",
-      2: "……남은……내 일은……너를……막는 것",
-      3: "……너랑……인게이지……하고 싶어……아하하하"
-    },
-    "victory": {
-      1: "……룰루리",
-      2: "……재밌쪄",
-      3: "…하아하아……으…하아하아…"
-    },
-  },
   "aqua_grunt": {
     "encounter": {
       1: "아쿠아단을 넘본 사람에게는 자비는 없다, 꼬마도 마찬가지야!"
@@ -431,18 +604,6 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "말도 안돼!"
     },
   },
-  "aqua_admin": {
-    "encounter": {
-      1: "각오하는 게 좋을 거야! 네 얼굴이 눈물로 범벅이 되게 해주겠어!",
-      2: "아앙? 뭐야? 이 건방진 꼬맹이는…",
-      3: "…아니 넌!? 일부러 여기까지 쫓아온 거야?"
-    },
-    "victory": {
-      1: "하아… 하아…완전 지쳤어",
-      2: "크윽…!? 너무 봐줬나…!",
-      3: "뭐…뭐라고!?"
-    },
-  },
   "galactic_grunt": {
     "encounter": {
       1: "갤럭시단을 방해하지 마!"
@@ -451,18 +612,6 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "사격 중지…… "
     },
   },
-  "galactic_admin": {
-    "encounter": {
-      1: "나는 갤럭시단에 있는 간부 중의 한 명.",
-      2: "갤럭시단을 방해한다면 일말의 가능성도 모두 제거한다!!",
-      3: "왜 그래? 설마 떨고 있는 거야?"
-    },
-    "victory": {
-      1: "설마! 내가 졌다고!? 건방진 아이로구나!!",
-      2: "…역시 강해!",
-      3: "어린아이에게 지다니… 방심이란 무섭구나."
-    },
-  },
   "plasma_grunt": {
     "encounter": {
       1: "다른 생각을 가진사람들은 용납하지 않겠다!"
@@ -471,18 +620,6 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "플라-스마-!"
     },
   },
-  "plasma_sage": {
-    "encounter": {
-      1: "너는 플라스마단에게 있어 불안요소가 될 것이다. 여기서 제거하겠다!",
-      2: "이런 이런… 내가 싸워야만 하다니.",
-      3: "여기까지 오다니 대단한 트레이너군."
-    },
-    "victory": {
-      1: "게치스…",
-      2: "그건 그렇고 춥구먼. 나는 떨고 있다. 괴롭지만 살아 있다.",
-      3: "흐음. 의외로 똑똑한 트레이너군."
-    },
-  },
   "flare_grunt": {
     "encounter": {
       1: "패션이 우리한텐 가장 중요하다고!"
@@ -491,18 +628,6 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "미래가 밝아 보이질 않네."
     },
   },
-  "flare_admin": {
-    "encounter": {
-      1: "왔다! 왔구나! 자! 자! 아직 끝나지 않았다!",
-      2: "너 강하구나. 에너지를 얼마나 갖고 있지?",
-      3: "기다리고 있었어! 너를 조사하겠다. 자 시작한다!"
-    },
-    "victory": {
-      1: "강하구나, 너는. 응, 정말 강해, 너는.",
-      2: "그렇지만 보스의 꿈이 이루어져 아름다운 세상이 태어날 것이다!",
-      3: "굉장하구나 너! 아주 굉장해! 나는 너를 인정하겠다"
-    },
-  },
   "rocket_boss_giovanni_1": {
     "encounter": {
       1: "그래서! 여기까지 오다니, 감탄이 절로 나오는군!"

src/locales/ko/trainers.ts

@@ -19,6 +19,19 @@ export const titles: SimpleTranslationEntries = {
   "galactic_boss": "갤럭시단 보스",
   "plasma_boss": "플라스마단 보스",
   "flare_boss": "플레어단 보스",
+
+  "rocket_admin": "로켓단 간부",
+  "rocket_admin_female": "로켓단 간부",
+  "magma_admin": "마그마단 간부",
+  "magma_admin_female": "마그마단 간부",
+  "aqua_admin": "아쿠아단 간부",
+  "aqua_admin_female": "아쿠아단 간부",
+  "galactic_commander": "갤럭시단 간부",
+  "galactic_commander_female": "갤럭시단 간부",
+  "plasma_sage": "플라스마단 현인",
+  "plasma_admin": "플라스마단 간부",
+  "flare_admin": "플레어단 간부",
+  "flare_admin_female": "플레어단 간부",
   // Maybe if we add the evil teams we can add "Team Rocket" and "Team Aqua" etc. here as well as "Team Rocket Boss" and "Team Aqua Admin" etc.
 } as const;
 
@@ -128,32 +141,22 @@ export const trainerClasses: SimpleTranslationEntries = {
   "rocket_grunt": "로켓단 조무래기",
   "rocket_grunt_female": "로켓단 조무래기",
   "rocket_grunts": "로켓단 조무래기들",
-  "rocket_admin": "로켓단 간부",
-  "rocket_admin_female": "로켓단 간부",
   "magma_grunt": "마그마단 조무래기",
   "magma_grunt_female": "마그마단 조무래기",
   "magma_grunts": "마그마단 조무래기들",
-  "magma_admin": "마그마단 간부",
-  "magma_admin_female": "마그마단 간부",
   "aqua_grunt": "아쿠아단 조무래기",
   "aqua_grunt_female": "아쿠아단 조무래기",
   "aqua_grunts": "아쿠아단 조무래기들",
-  "aqua_admin": "아쿠아단 간부",
-  "aqua_admin_female": "아쿠아단 간부",
   "galactic_grunt": "갤럭시단 조무래기",
   "galactic_grunt_female": "갤럭시단 조무래기",
   "galactic_grunts": "갤럭시단 조무래기들",
-  "galactic_admin": "갤럭시단 간부",
-  "galactic_admin_female": "갤럭시단 간부",
   "plasma_grunt": "플라스마단 조무래기",
   "plasma_grunt_female": "플라스마단 조무래기",
   "plasma_grunts": "플라스마단 조무래기들",
-  "plasma_sage": "플라스마단 현인",
   "flare_grunt": "플레어단 조무래기",
   "flare_grunt_female": "플레어단 조무래기",
   "flare_grunts": "플레어단 조무래기들",
-  "flare_admin": "플레어단 간부",
+
-  "flare_admin_female": "플레어단 간부",
 } as const;
 
 // Names of special trainers like gym leaders, elite four, and the champion
@@ -282,6 +285,25 @@ export const trainerNames: SimpleTranslationEntries = {
   "leon": "단델",
   "rival": "핀",
   "rival_female": "아이비",
+
+  // Evil Team Admins
+  "archer": "아폴로",
+  "ariana": "아테나",
+  "proton": "랜스",
+  "petrel": "람다",
+  "tabitha": "호걸",
+  "courtney": "구열",
+  "shelly": "이연",
+  "matt": "해조",
+  "mars": "마스",
+  "jupiter": "주피터",
+  "saturn": "새턴",
+  "zinzolin": "비오",
+  "rood": "로트",
+  "xerosic": "크세로시키",
+  "bryony": "바라",
+
+
   "maxie": "마적",
   "archie": "아강",
   "cyrus": "태홍",

src/locales/pt_BR/dialogue.ts

@@ -383,6 +383,203 @@ export const PGMdialogue: DialogueTranslationEntries = {
       3: "Estou achando que quem tá enjoado sou eu..."
     },
   },
+  "archer": {
+    "encounter": {
+      1: "Before you go any further, let's see how you far against us, Team Rocket!",
+      2: "I have received reports that your skills are not insignificant. Let's see if they are true.",
+      3: "I am Archer, an Admin of Team Rocket. And I do not go easy on enemies of our organization."
+    },
+    "victory": {
+      1: "What a blunder!",
+      2: "With my current skills, I was not up to the task after all.",
+      3: "F-forgive me, Giovanni... For me to be defeated by a mere trainer..."
+    },
+  },
+  "ariana": {
+    "encounter": {
+      1: `Hold it right there! We can't someone on the loose." 
+          $It's harmful to Team Rocket's pride, you see.`,
+      2: `I don't know or care if what I'm doing is right or wrong...
+          $I just put my faith in Giovanni and do as I am told`,
+      3: "Your trip ends here. I'm going to take you down!"
+    },
+    "victory": {
+      1: `Tch, you really are strong. It's too bad. 
+          $If you were to join Team Rocket, you could become an Executive.`,
+      2: "I... I'm shattered...",
+      3: "Aaaieeeee! This can't be happening! I fought hard, but I still lost…"
+    },
+  },
+  "proton": {
+    "encounter": {
+      1: "What do you want? If you interrupt our work, don't expect any mercy!",
+      2: `What do we have here? I am often labeled as the scariest and cruelest guy in Team Rocket…
+         $I strongly urge you not to interfere with our business!`,
+      3: "I am Proton, an Admin of Team Rocket. I am here to put an end to your meddling!"
+    },
+    "victory": {
+      1: "The fortress came down!",
+      2: "You may have won this time… But all you did was make Team Rocket's wrath grow…",
+      3: "I am defeated… But I will not forget this!"
+    },
+  },
+
+  "petrel": {
+    "encounter": {
+      1: `Muhahaha, we've been waiting for you. Me? You don't know who I am? It is me, Giovanni.
+          $The majestic Giovanni himself! Wahahaha! …Huh? I don't sound anything like Giovanni?
+          $I don't even look like Giovanni? How come? I've worked so hard to mimic him!`,
+      2: "I am Petrel, an Admin of Team Rocket. I will not allow you to interfere with our plans!",
+      3: "Rocket Executive Petrel will deal with this intruder!"
+    },
+    "victory": {
+      1: "OK, OK. I'll tell you where he is.",
+      2: "I… I couldn't do a thing… Giovanni, please forgive me…",
+      3: "No, I can't let this affect me. I have to inform the others…"
+    },
+  },
+  "tabitha": {
+    "encounter": {
+      1: "Hehehe! So you've come all the way here! But you're too late!",
+      2: `Hehehe... Got here already, did you? We underestimated you! But this is it! 
+          $I'm a cut above the Grunts you've seen so far. I'm not stalling for time.
+          $I'm going to pulverize you!`,
+      3: "I'm going to give you a little taste of pain! Resign yourself to it!"
+    },
+    "victory": {
+      1: `Hehehe! You might have beaten me, but you don't stand a chance against the Boss!
+          $If you get lost now, you won't have to face a sound whipping!`,
+      2: "Hehehe... So, I lost, too...",
+      3: "Ahya! How could this be? For an Admin like me to lose to some random trainer..."
+    },
+  },
+  "courtney": {
+    "encounter": {
+      1: "The thing...The thing that you hold...That is what... That's what we of Team Magma seek...",
+      2: "... Well then...Deleting...",
+      3: "...Ha. ...Analyzing... ...Hah♪"
+    },
+    "victory": {
+      1: "... ...Change...the world.",
+      2: `As anticipated. Unanticipated. You. Target lock...completed.
+         $Commencing...experiment. You. Forever. Aha... ♪`,
+      3: "...Again? That's unanticipated. ...I knew it. You...are interesting! ...Haha. ♪"
+    },
+  },
+  "shelly": {
+    "encounter": {
+      1: `Ahahahaha! You're going to meddle in Team Aqua's affairs?
+         $You're either absolutely fearless, simply ignorant, or both!
+         $You're so cute, you're disgusting! I'll put you down`,
+      2: "What's this? Who's this spoiled brat?",
+      3: "Cool your jets. Be patient. I'll crush you shortly."
+    },
+    "victory": {
+      1: `Ahahahaha! We got meddled with unexpectedly! We're out of options.
+         $We'll have to pull out. But this isn't the last you'll see of Team Aqua!
+         $We have other plans! Don't you forget it!`,
+      2: "Ahhh?! Did I go too easy on you?!",
+      3: `Uh. Are you telling me you've upped your game even more during the fight?
+         $You're a brat with a bright future… My Pokémon and I don't have any strength left to fight…
+         $Go on… Go and be destroyed by Archie.`
+    },
+  },
+  "matt": {
+    "encounter": {
+      1: "Hoohahaha! What, you got a screw loose or something? Look at you, little Makuhita person!",
+      2: "Oho! You! You're that funny kid!",
+      3: "What are you doing here? Did you follow us?"
+    },
+    "victory": {
+      1: "All right then, until the Boss has time for you, I'll be your opponent!",
+      2: `I can feel it! I can feel it, all right! The strength coming offa you!
+          $More! I still want more! But looks like we're outta time...`,
+      3: "That was fun! I knew you'd show me a good time! I look forward to facing you again someday!"
+    },
+  },
+  "mars": {
+    "encounter": {
+      1: "I'm Mars, one of Team Galactic's top Commanders.",
+      2: "Team Galactic's vision for the future is unwavering. Opposition will be crushed without mercy!",
+      3: "Feeling nervous? You should be!"
+    },
+    "victory": {
+      1: "This can't be happening! How did I lose?!",
+      2: "You have some skill, I'll give you that.",
+      3: "Defeated... This was a costly mistake."
+    }
+  },
+  "jupiter": {
+    "encounter": {
+      1: "Jupiter, Commander of Team Galactic, at your service.",
+      2: "Resistance is futile. Team Galactic will prevail!",
+      3: "You're trembling... scared already?"
+    },
+    "victory": {
+      1: "No way... I lost?!",
+      2: "Impressive, you've got guts!",
+      3: "Losing like this... How embarrassing."
+    }
+  },
+  "saturn": {
+    "encounter": {
+      1: "I am Saturn, Commander of Team Galactic.",
+      2: "Our mission is absolute. Any hindrance will be obliterated!",
+      3: "Is that fear I see in your eyes?"
+    },
+    "victory": {
+      1: "Impossible... Defeated by you?!",
+      2: "You have proven yourself a worthy adversary.",
+      3: "Bestowed in defeat... This is unacceptable."
+    }},
+  "zinzolin": {
+    "encounter": {
+      1: "You could become a threat to Team Plasma, so we will eliminate you here and now!",
+      2: "Oh, for crying out loud... I didn't expect to have to battle in this freezing cold!",
+      3: "You're an impressive Trainer to have made it this far. But it ends here."
+    },
+    "victory": {
+      1: "Ghetsis... I have failed you...",
+      2: "It's bitter cold. I'm shivering. I'm suffering. Yet, I still stand victorious.",
+      3: "Hmph. You're a smarter Trainer than I expected, but not smart enough."
+    }
+  },
+  "rood": {
+    "encounter": {
+      1: "You are a threat to Team Plasma. We cannot let you walk away from here and now!",
+      2: "Oh, this icy wind... I never thought I'd have to fight here!",
+      3: "You are a remarkable Trainer to have made it this far. But this is where it ends."
+    },
+    "victory": {
+      1: "Ghetsis... I have failed my mission...",
+      2: "The cold is piercing. I'm shivering. I'm suffering. Yet, I have triumphed.",
+      3: "Hm. You are a talented Trainer, but unfortunately not talented enough."
+    }
+  },
+  "xerosic": {
+    "encounter": {
+      1: "Ah ha ha! It would be my pleasure. Come on, little Trainer! Let's see what you've got!",
+      2: "Hmm... You're more powerful than you look. I wonder how much energy there is inside you.",
+      3: "I've been waiting for you! I need to do a little research on you! Come, let us begin!"
+    },
+    "victory": {
+      1: "Ah, you're quite strong. Oh yes—very strong, indeed.",
+      2: "Ding-ding-ding! You did it! To the victor go the spoils!",
+      3: "Wonderful! Amazing! You have tremendous skill and bravery!"
+    }
+  },
+  "bryony": {
+    "encounter": {
+      1: "I am Bryony, and it would be my pleasure to battle you. Show me what you've got.",
+      2: "Impressive... You're more powerful than you appear. Let's see the true extent of your energy.",
+      3: "I've anticipated your arrival. It's time for a little test. Shall we begin?"
+    },
+    "victory": {
+      1: "You're quite strong. Oh yes—very strong, indeed.",
+      2: "Ding-ding-ding! You've done well. Victory is yours.",
+      3: "Wonderful! Remarkable! Your skill and bravery are commendable."
+    }
+  },
   "rocket_grunt": {
     "encounter": {
       1: "Se prepara pra encrenca!"

src/locales/pt_BR/trainers.ts

@@ -19,6 +19,19 @@ export const titles: SimpleTranslationEntries = {
   "galactic_boss": "Chefe da Equipe Galáctica",
   "plasma_boss": "Chefe da Equipe Plasma",
   "flare_boss": "Chefe da Equipe Flare",
+
+  "rocket_admin": "Team Rocket Admin",
+  "rocket_admin_female": "Team Rocket Admin",
+  "magma_admin": "Team Magma Admin",
+  "magma_admin_female": "Team Magma Admin",
+  "aqua_admin": "Team Aqua Admin",
+  "aqua_admin_female": "Team Aqua Admin",
+  "galactic_commander": "Team Galactic Commander",
+  "galactic_commander_female": "Team Galactic Commander",
+  "plasma_sage": "Team Plasma Sage",
+  "plasma_admin": "Team Plasma Admin",
+  "flare_admin": "Team Flare Admin",
+  "flare_admin_female": "Team Flare Admin",
   // Maybe if we add the evil teams we can add "Team Rocket" and "Team Aqua" etc. here as well as "Team Rocket Boss" and "Team Aqua Admin" etc.
 } as const;
 
@@ -128,32 +141,21 @@ export const trainerClasses: SimpleTranslationEntries = {
   "rocket_grunt": "Recruta da Equipe Rocket",
   "rocket_grunt_female": "Recruta da Equipe Rocket",
   "rocket_grunts": "Recrutas da Equipe Rocket",
-  "rocket_admin": "Rocket Admin",
-  "rocket_admin_female": "Rocket Admin",
   "magma_grunt": "Recruta da Equipe Magma",
   "magma_grunt_female": "Recruta da Equipe Magma",
   "magma_grunts": "Recrutas da Equipe Magma",
-  "magma_admin": "Magma Admin",
-  "magma_admin_female": "Magma Admin",
   "aqua_grunt": "Recruta da Equipe Aqua",
   "aqua_grunt_female": "Recruta da Equipe Aqua",
   "aqua_grunts": "Recrutas da Equipe Aqua",
-  "aqua_admin": "Aqua Admin",
-  "aqua_admin_female": "Aqua Admin",
   "galactic_grunt": "Recruta da Equipe Galáctica",
   "galactic_grunt_female": "Recruta da Equipe Galáctica",
   "galactic_grunts": "Recrutas da Equipe Galáctica",
-  "galactic_admin": "Galactic Admin",
-  "galactic_admin_female": "Galactic Admin",
   "plasma_grunt": "Recruta da Equipe Plasma",
   "plasma_grunt_female": "Recruta da Equipe Plasma",
   "plasma_grunts": "Recrutas da Equipe Plasma",
-  "plasma_sage": "Plasma Sage",
   "flare_grunt": "Recruta da Equipe Flare",
   "flare_grunt_female": "Recruta da Equipe Flare",
   "flare_grunts": "Recrutas da Equipe Flare",
-  "flare_admin": "Flare Admin",
-  "flare_admin_female": "Flare Admin",
 } as const;
 
 // Names of special trainers like gym leaders, elite four, and the champion
@@ -282,6 +284,24 @@ export const trainerNames: SimpleTranslationEntries = {
   "leon": "Leon",
   "rival": "Finn",
   "rival_female": "Ivy",
+
+  // Evil Team Admins
+  "archer": "Archer",
+  "ariana": "Ariana",
+  "proton": "Proton",
+  "petrel": "Petrel",
+  "tabitha": "Tabitha",
+  "courtney": "Courtney",
+  "shelly": "Shelly",
+  "matt": "Matt",
+  "mars": "Mars",
+  "jupiter": "Jupiter",
+  "saturn": "Saturn",
+  "zinzolin": "Zinzolin",
+  "rood": "Rood",
+  "xerosic": "Xerosic",
+  "bryony": "Bryony",
+
   "maxie": "Maxie",
   "archie": "Archie",
   "cyrus": "Cyrus",

src/locales/zh_CN/dialogue.ts

@@ -382,6 +382,203 @@ export const PGMdialogue: DialogueTranslationEntries = {
       3: "好像是我晕船了…"
     },
   },
+  "archer": {
+    "encounter": {
+      1: "Before you go any further, let's see how you far against us, Team Rocket!",
+      2: "I have received reports that your skills are not insignificant. Let's see if they are true.",
+      3: "I am Archer, an Admin of Team Rocket. And I do not go easy on enemies of our organization."
+    },
+    "victory": {
+      1: "What a blunder!",
+      2: "With my current skills, I was not up to the task after all.",
+      3: "F-forgive me, Giovanni... For me to be defeated by a mere trainer..."
+    },
+  },
+  "ariana": {
+    "encounter": {
+      1: `Hold it right there! We can't someone on the loose." 
+          $It's harmful to Team Rocket's pride, you see.`,
+      2: `I don't know or care if what I'm doing is right or wrong...
+          $I just put my faith in Giovanni and do as I am told`,
+      3: "Your trip ends here. I'm going to take you down!"
+    },
+    "victory": {
+      1: `Tch, you really are strong. It's too bad. 
+          $If you were to join Team Rocket, you could become an Executive.`,
+      2: "I... I'm shattered...",
+      3: "Aaaieeeee! This can't be happening! I fought hard, but I still lost…"
+    },
+  },
+  "proton": {
+    "encounter": {
+      1: "What do you want? If you interrupt our work, don't expect any mercy!",
+      2: `What do we have here? I am often labeled as the scariest and cruelest guy in Team Rocket…
+         $I strongly urge you not to interfere with our business!`,
+      3: "I am Proton, an Admin of Team Rocket. I am here to put an end to your meddling!"
+    },
+    "victory": {
+      1: "The fortress came down!",
+      2: "You may have won this time… But all you did was make Team Rocket's wrath grow…",
+      3: "I am defeated… But I will not forget this!"
+    },
+  },
+
+  "petrel": {
+    "encounter": {
+      1: `Muhahaha, we've been waiting for you. Me? You don't know who I am? It is me, Giovanni.
+          $The majestic Giovanni himself! Wahahaha! …Huh? I don't sound anything like Giovanni?
+          $I don't even look like Giovanni? How come? I've worked so hard to mimic him!`,
+      2: "I am Petrel, an Admin of Team Rocket. I will not allow you to interfere with our plans!",
+      3: "Rocket Executive Petrel will deal with this intruder!"
+    },
+    "victory": {
+      1: "OK, OK. I'll tell you where he is.",
+      2: "I… I couldn't do a thing… Giovanni, please forgive me…",
+      3: "No, I can't let this affect me. I have to inform the others…"
+    },
+  },
+  "tabitha": {
+    "encounter": {
+      1: "Hehehe! So you've come all the way here! But you're too late!",
+      2: `Hehehe... Got here already, did you? We underestimated you! But this is it! 
+          $I'm a cut above the Grunts you've seen so far. I'm not stalling for time.
+          $I'm going to pulverize you!`,
+      3: "I'm going to give you a little taste of pain! Resign yourself to it!"
+    },
+    "victory": {
+      1: `Hehehe! You might have beaten me, but you don't stand a chance against the Boss!
+          $If you get lost now, you won't have to face a sound whipping!`,
+      2: "Hehehe... So, I lost, too...",
+      3: "Ahya! How could this be? For an Admin like me to lose to some random trainer..."
+    },
+  },
+  "courtney": {
+    "encounter": {
+      1: "The thing...The thing that you hold...That is what... That's what we of Team Magma seek...",
+      2: "... Well then...Deleting...",
+      3: "...Ha. ...Analyzing... ...Hah♪"
+    },
+    "victory": {
+      1: "... ...Change...the world.",
+      2: `As anticipated. Unanticipated. You. Target lock...completed.
+         $Commencing...experiment. You. Forever. Aha... ♪`,
+      3: "...Again? That's unanticipated. ...I knew it. You...are interesting! ...Haha. ♪"
+    },
+  },
+  "shelly": {
+    "encounter": {
+      1: `Ahahahaha! You're going to meddle in Team Aqua's affairs?
+         $You're either absolutely fearless, simply ignorant, or both!
+         $You're so cute, you're disgusting! I'll put you down`,
+      2: "What's this? Who's this spoiled brat?",
+      3: "Cool your jets. Be patient. I'll crush you shortly."
+    },
+    "victory": {
+      1: `Ahahahaha! We got meddled with unexpectedly! We're out of options.
+         $We'll have to pull out. But this isn't the last you'll see of Team Aqua!
+         $We have other plans! Don't you forget it!`,
+      2: "Ahhh?! Did I go too easy on you?!",
+      3: `Uh. Are you telling me you've upped your game even more during the fight?
+         $You're a brat with a bright future… My Pokémon and I don't have any strength left to fight…
+         $Go on… Go and be destroyed by Archie.`
+    },
+  },
+  "matt": {
+    "encounter": {
+      1: "Hoohahaha! What, you got a screw loose or something? Look at you, little Makuhita person!",
+      2: "Oho! You! You're that funny kid!",
+      3: "What are you doing here? Did you follow us?"
+    },
+    "victory": {
+      1: "All right then, until the Boss has time for you, I'll be your opponent!",
+      2: `I can feel it! I can feel it, all right! The strength coming offa you!
+          $More! I still want more! But looks like we're outta time...`,
+      3: "That was fun! I knew you'd show me a good time! I look forward to facing you again someday!"
+    },
+  },
+  "mars": {
+    "encounter": {
+      1: "I'm Mars, one of Team Galactic's top Commanders.",
+      2: "Team Galactic's vision for the future is unwavering. Opposition will be crushed without mercy!",
+      3: "Feeling nervous? You should be!"
+    },
+    "victory": {
+      1: "This can't be happening! How did I lose?!",
+      2: "You have some skill, I'll give you that.",
+      3: "Defeated... This was a costly mistake."
+    }
+  },
+  "jupiter": {
+    "encounter": {
+      1: "Jupiter, Commander of Team Galactic, at your service.",
+      2: "Resistance is futile. Team Galactic will prevail!",
+      3: "You're trembling... scared already?"
+    },
+    "victory": {
+      1: "No way... I lost?!",
+      2: "Impressive, you've got guts!",
+      3: "Losing like this... How embarrassing."
+    }
+  },
+  "saturn": {
+    "encounter": {
+      1: "I am Saturn, Commander of Team Galactic.",
+      2: "Our mission is absolute. Any hindrance will be obliterated!",
+      3: "Is that fear I see in your eyes?"
+    },
+    "victory": {
+      1: "Impossible... Defeated by you?!",
+      2: "You have proven yourself a worthy adversary.",
+      3: "Bestowed in defeat... This is unacceptable."
+    }},
+  "zinzolin": {
+    "encounter": {
+      1: "You could become a threat to Team Plasma, so we will eliminate you here and now!",
+      2: "Oh, for crying out loud... I didn't expect to have to battle in this freezing cold!",
+      3: "You're an impressive Trainer to have made it this far. But it ends here."
+    },
+    "victory": {
+      1: "Ghetsis... I have failed you...",
+      2: "It's bitter cold. I'm shivering. I'm suffering. Yet, I still stand victorious.",
+      3: "Hmph. You're a smarter Trainer than I expected, but not smart enough."
+    }
+  },
+  "rood": {
+    "encounter": {
+      1: "You are a threat to Team Plasma. We cannot let you walk away from here and now!",
+      2: "Oh, this icy wind... I never thought I'd have to fight here!",
+      3: "You are a remarkable Trainer to have made it this far. But this is where it ends."
+    },
+    "victory": {
+      1: "Ghetsis... I have failed my mission...",
+      2: "The cold is piercing. I'm shivering. I'm suffering. Yet, I have triumphed.",
+      3: "Hm. You are a talented Trainer, but unfortunately not talented enough."
+    }
+  },
+  "xerosic": {
+    "encounter": {
+      1: "Ah ha ha! It would be my pleasure. Come on, little Trainer! Let's see what you've got!",
+      2: "Hmm... You're more powerful than you look. I wonder how much energy there is inside you.",
+      3: "I've been waiting for you! I need to do a little research on you! Come, let us begin!"
+    },
+    "victory": {
+      1: "Ah, you're quite strong. Oh yes—very strong, indeed.",
+      2: "Ding-ding-ding! You did it! To the victor go the spoils!",
+      3: "Wonderful! Amazing! You have tremendous skill and bravery!"
+    }
+  },
+  "bryony": {
+    "encounter": {
+      1: "I am Bryony, and it would be my pleasure to battle you. Show me what you've got.",
+      2: "Impressive... You're more powerful than you appear. Let's see the true extent of your energy.",
+      3: "I've anticipated your arrival. It's time for a little test. Shall we begin?"
+    },
+    "victory": {
+      1: "You're quite strong. Oh yes—very strong, indeed.",
+      2: "Ding-ding-ding! You've done well. Victory is yours.",
+      3: "Wonderful! Remarkable! Your skill and bravery are commendable."
+    }
+  },
   "rocket_grunt": {
     "encounter": {
       1: "你要有麻烦了！"
@@ -390,18 +587,6 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "好讨厌的感觉啊！"
     },
   },
-  "rocket_admin": {
-    "encounter": {
-      1: "Oh? You managed to get this far? You must be quite the trainer.",
-      2: "That's quite enough of you playing hero, kid.",
-      3: "I'll show you how scary an angry adult can be!"
-    },
-    "victory": {
-      1: "No! Forgive me Giovanni!",
-      2: "How could this be?",
-      3: "Urgh... You were too strong..."
-    },
-  },
   "magma_grunt": {
     "encounter": {
       1: "如果你挡在熔岩队路上，那就别指望我们手下留情！"
@@ -410,18 +595,6 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "哈？我输了？！"
     },
   },
-  "magma_admin": {
-    "encounter": {
-      1: "Hehehe! So you've come all the way here! But you're too late!",
-      2: "You're going to meddle in Team Magma's affairs? You're so cute you're disgusting! I'll put you down kiddy!",
-      3: "I'm going to give you a little taste of pain! Resign yourself to it!"
-    },
-    "victory": {
-      1: "Hehehe... So I lost...",
-      2: "You're disgustingly strong!",
-      3: "Ahahaha! Ouch!"
-    },
-  },
   "aqua_grunt": {
     "encounter": {
       1: "即使是小孩，如果要和海洋队作对，也别指望我们手下留情！"
@@ -430,18 +603,6 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "你在开玩笑吧？"
     },
   },
-  "aqua_admin": {
-    "encounter": {
-      1: "I'm a cut above the grunts you've seen so far. I'm going to puvlerize you!",
-      2: "Hahn? What's this? Who's this spoiled brat?",
-      3: "What are you doing here? Did you follow us?"
-    },
-    "victory": {
-      1: "So I lost too...",
-      2: "Ahhh?! Did I go too easy on you?!",
-      3: "Wh-what was that?"
-    },
-  },
   "galactic_grunt": {
     "encounter": {
       1: "别惹银河队！"
@@ -450,18 +611,6 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "停机了…"
     },
   },
-  "galactic_admin": {
-    "encounter": {
-      1: "I'm one of Team Galactic's Commanders.",
-      2: "Anything that opposes Team Galactic must be crushed! Even the very thought of opposition will not be tolerated!",
-      3: "What's the matter? Don't tell me you're shaking?"
-    },
-    "victory": {
-      1: "This can't be?! I lost?! You... you uppity brat!",
-      2: "You, my friend, are tough!",
-      3: "Losing to some child... Being careless cost me too much."
-    },
-  },
   "plasma_grunt": {
     "encounter": {
       1: "异端不共戴天！"
@@ -470,18 +619,6 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "等离子子子子子子！"
     },
   },
-  "plasma_sage": {
-    "encounter": {
-      1: "You could become a threat to Team Plasma, so we will eliminate you here!",
-      2: "Oh, for crying out loud... I didn't expect to have to fight!",
-      3: "You're an impressive Trainer to have made it this far."
-    },
-    "victory": {
-      1: "Ghetsis...",
-      2: "It's bitter cold. I'm shivering. I'm suffering.",
-      3: "Hmph. You're a smarter Trainer than I expected."
-    },
-  },
   "flare_grunt": {
     "encounter": {
       1: "时尚最重要！"
@@ -490,18 +627,6 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "未来一片黑暗啊…"
     },
   },
-  "flare_admin": {
-    "encounter": {
-      1: "Ah ha ha! It would be my pleasure. Come on, little Trainer! Let's see what you've got!",
-      2: "Hmm... You're more powerful than you look. I wonder how much energy there is inside you.",
-      3: "I've been waiting for you! I need to do a little research on you! Come, let us begin!"
-    },
-    "victory": {
-      1: "You're quite strong. Oh yes-very strong, indeed.",
-      2: "Ding-ding-ding! Yup, you did it! To the victor goes the spoils!",
-      3: "Wonderful! Amazing! You have tremendous skill and bravery!"
-    },
-  },
   "rocket_boss_giovanni_1": {
     "encounter": {
       1: "我不得不说，能来到这里，你的确很不简单！"

src/locales/zh_CN/trainers.ts

@@ -19,6 +19,19 @@ export const titles: SimpleTranslationEntries = {
   "galactic_boss": "银河队老大",
   "plasma_boss": "等离子队老大",
   "flare_boss": "闪焰队老大",
+
+  "rocket_admin": "Team Rocket Admin",
+  "rocket_admin_female": "Team Rocket Admin",
+  "magma_admin": "Team Magma Admin",
+  "magma_admin_female": "Team Magma Admin",
+  "aqua_admin": "Team Aqua Admin",
+  "aqua_admin_female": "Team Aqua Admin",
+  "galactic_commander": "Team Galactic Commander",
+  "galactic_commander_female": "Team Galactic Commander",
+  "plasma_sage": "Team Plasma Sage",
+  "plasma_admin": "Team Plasma Admin",
+  "flare_admin": "Team Flare Admin",
+  "flare_admin_female": "Team Flare Admin",
   // Maybe if we add the evil teams we can add "Team Rocket" and "Team Aqua" etc. here as well as "Team Rocket Boss" and "Team Aqua Admin" etc.
 } as const;
 
@@ -128,32 +141,21 @@ export const trainerClasses: SimpleTranslationEntries = {
   "rocket_grunt": "火箭队手下",
   "rocket_grunt_female": "火箭队手下",
   "rocket_grunts": "火箭队手下们",
-  "rocket_admin": "Rocket Admin",
-  "rocket_admin_female": "Rocket Admin",
   "magma_grunt": "熔岩队手下",
   "magma_grunt_female": "熔岩队手下",
   "magma_grunts": "熔岩队手下们",
-  "magma_admin": "Magma Admin",
-  "magma_admin_female": "Magma Admin",
   "aqua_grunt": "海洋队手下",
   "aqua_grunt_female": "海洋队手下",
   "aqua_grunts": "海洋队手下们",
-  "aqua_admin": "Aqua Admin",
-  "aqua_admin_female": "Aqua Admin",
   "galactic_grunt": "银河队手下",
   "galactic_grunt_female": "银河队手下",
   "galactic_grunts": "银河队手下们",
-  "galactic_admin": "Galactic Admin",
-  "galactic_admin_female": "Galactic Admin",
   "plasma_grunt": "等离子队手下",
   "plasma_grunt_female": "等离子队手下",
   "plasma_grunts": "等离子队手下们",
-  "plasma_sage": "Plasma Sage",
   "flare_grunt": "闪焰队手下",
   "flare_grunt_female": "闪焰队手下",
   "flare_grunts": "闪焰队手下们",
-  "flare_admin": "Flare Admin",
-  "flare_admin_female": "Flare Admin",
 } as const;
 
 // Names of special trainers like gym leaders, elite four, and the champion
@@ -339,6 +341,23 @@ export const trainerNames: SimpleTranslationEntries = {
   "rival": "芬恩",
   "rival_female": "艾薇",
 
+  // Evil Team Admins
+  "archer": "Archer",
+  "ariana": "Ariana",
+  "proton": "Proton",
+  "petrel": "Petrel",
+  "tabitha": "Tabitha",
+  "courtney": "Courtney",
+  "shelly": "Shelly",
+  "matt": "Matt",
+  "mars": "Mars",
+  "jupiter": "Jupiter",
+  "saturn": "Saturn",
+  "zinzolin": "Zinzolin",
+  "rood": "Rood",
+  "xerosic": "Xerosic",
+  "bryony": "Bryony",
+
   // ---- 组织老大 Bosses ----
   "maxie": "赤焰松",
   "archie": "水梧桐",

src/locales/zh_TW/dialogue.ts

@@ -382,6 +382,203 @@ export const PGMdialogue: DialogueTranslationEntries = {
       3: "好像是我暈船了…"
     },
   },
+  "archer": {
+    "encounter": {
+      1: "Before you go any further, let's see how you far against us, Team Rocket!",
+      2: "I have received reports that your skills are not insignificant. Let's see if they are true.",
+      3: "I am Archer, an Admin of Team Rocket. And I do not go easy on enemies of our organization."
+    },
+    "victory": {
+      1: "What a blunder!",
+      2: "With my current skills, I was not up to the task after all.",
+      3: "F-forgive me, Giovanni... For me to be defeated by a mere trainer..."
+    },
+  },
+  "ariana": {
+    "encounter": {
+      1: `Hold it right there! We can't someone on the loose." 
+          $It's harmful to Team Rocket's pride, you see.`,
+      2: `I don't know or care if what I'm doing is right or wrong...
+          $I just put my faith in Giovanni and do as I am told`,
+      3: "Your trip ends here. I'm going to take you down!"
+    },
+    "victory": {
+      1: `Tch, you really are strong. It's too bad. 
+          $If you were to join Team Rocket, you could become an Executive.`,
+      2: "I... I'm shattered...",
+      3: "Aaaieeeee! This can't be happening! I fought hard, but I still lost…"
+    },
+  },
+  "proton": {
+    "encounter": {
+      1: "What do you want? If you interrupt our work, don't expect any mercy!",
+      2: `What do we have here? I am often labeled as the scariest and cruelest guy in Team Rocket…
+         $I strongly urge you not to interfere with our business!`,
+      3: "I am Proton, an Admin of Team Rocket. I am here to put an end to your meddling!"
+    },
+    "victory": {
+      1: "The fortress came down!",
+      2: "You may have won this time… But all you did was make Team Rocket's wrath grow…",
+      3: "I am defeated… But I will not forget this!"
+    },
+  },
+
+  "petrel": {
+    "encounter": {
+      1: `Muhahaha, we've been waiting for you. Me? You don't know who I am? It is me, Giovanni.
+          $The majestic Giovanni himself! Wahahaha! …Huh? I don't sound anything like Giovanni?
+          $I don't even look like Giovanni? How come? I've worked so hard to mimic him!`,
+      2: "I am Petrel, an Admin of Team Rocket. I will not allow you to interfere with our plans!",
+      3: "Rocket Executive Petrel will deal with this intruder!"
+    },
+    "victory": {
+      1: "OK, OK. I'll tell you where he is.",
+      2: "I… I couldn't do a thing… Giovanni, please forgive me…",
+      3: "No, I can't let this affect me. I have to inform the others…"
+    },
+  },
+  "tabitha": {
+    "encounter": {
+      1: "Hehehe! So you've come all the way here! But you're too late!",
+      2: `Hehehe... Got here already, did you? We underestimated you! But this is it! 
+          $I'm a cut above the Grunts you've seen so far. I'm not stalling for time.
+          $I'm going to pulverize you!`,
+      3: "I'm going to give you a little taste of pain! Resign yourself to it!"
+    },
+    "victory": {
+      1: `Hehehe! You might have beaten me, but you don't stand a chance against the Boss!
+          $If you get lost now, you won't have to face a sound whipping!`,
+      2: "Hehehe... So, I lost, too...",
+      3: "Ahya! How could this be? For an Admin like me to lose to some random trainer..."
+    },
+  },
+  "courtney": {
+    "encounter": {
+      1: "The thing...The thing that you hold...That is what... That's what we of Team Magma seek...",
+      2: "... Well then...Deleting...",
+      3: "...Ha. ...Analyzing... ...Hah♪"
+    },
+    "victory": {
+      1: "... ...Change...the world.",
+      2: `As anticipated. Unanticipated. You. Target lock...completed.
+         $Commencing...experiment. You. Forever. Aha... ♪`,
+      3: "...Again? That's unanticipated. ...I knew it. You...are interesting! ...Haha. ♪"
+    },
+  },
+  "shelly": {
+    "encounter": {
+      1: `Ahahahaha! You're going to meddle in Team Aqua's affairs?
+         $You're either absolutely fearless, simply ignorant, or both!
+         $You're so cute, you're disgusting! I'll put you down`,
+      2: "What's this? Who's this spoiled brat?",
+      3: "Cool your jets. Be patient. I'll crush you shortly."
+    },
+    "victory": {
+      1: `Ahahahaha! We got meddled with unexpectedly! We're out of options.
+         $We'll have to pull out. But this isn't the last you'll see of Team Aqua!
+         $We have other plans! Don't you forget it!`,
+      2: "Ahhh?! Did I go too easy on you?!",
+      3: `Uh. Are you telling me you've upped your game even more during the fight?
+         $You're a brat with a bright future… My Pokémon and I don't have any strength left to fight…
+         $Go on… Go and be destroyed by Archie.`
+    },
+  },
+  "matt": {
+    "encounter": {
+      1: "Hoohahaha! What, you got a screw loose or something? Look at you, little Makuhita person!",
+      2: "Oho! You! You're that funny kid!",
+      3: "What are you doing here? Did you follow us?"
+    },
+    "victory": {
+      1: "All right then, until the Boss has time for you, I'll be your opponent!",
+      2: `I can feel it! I can feel it, all right! The strength coming offa you!
+          $More! I still want more! But looks like we're outta time...`,
+      3: "That was fun! I knew you'd show me a good time! I look forward to facing you again someday!"
+    },
+  },
+  "mars": {
+    "encounter": {
+      1: "I'm Mars, one of Team Galactic's top Commanders.",
+      2: "Team Galactic's vision for the future is unwavering. Opposition will be crushed without mercy!",
+      3: "Feeling nervous? You should be!"
+    },
+    "victory": {
+      1: "This can't be happening! How did I lose?!",
+      2: "You have some skill, I'll give you that.",
+      3: "Defeated... This was a costly mistake."
+    }
+  },
+  "jupiter": {
+    "encounter": {
+      1: "Jupiter, Commander of Team Galactic, at your service.",
+      2: "Resistance is futile. Team Galactic will prevail!",
+      3: "You're trembling... scared already?"
+    },
+    "victory": {
+      1: "No way... I lost?!",
+      2: "Impressive, you've got guts!",
+      3: "Losing like this... How embarrassing."
+    }
+  },
+  "saturn": {
+    "encounter": {
+      1: "I am Saturn, Commander of Team Galactic.",
+      2: "Our mission is absolute. Any hindrance will be obliterated!",
+      3: "Is that fear I see in your eyes?"
+    },
+    "victory": {
+      1: "Impossible... Defeated by you?!",
+      2: "You have proven yourself a worthy adversary.",
+      3: "Bestowed in defeat... This is unacceptable."
+    }},
+  "zinzolin": {
+    "encounter": {
+      1: "You could become a threat to Team Plasma, so we will eliminate you here and now!",
+      2: "Oh, for crying out loud... I didn't expect to have to battle in this freezing cold!",
+      3: "You're an impressive Trainer to have made it this far. But it ends here."
+    },
+    "victory": {
+      1: "Ghetsis... I have failed you...",
+      2: "It's bitter cold. I'm shivering. I'm suffering. Yet, I still stand victorious.",
+      3: "Hmph. You're a smarter Trainer than I expected, but not smart enough."
+    }
+  },
+  "rood": {
+    "encounter": {
+      1: "You are a threat to Team Plasma. We cannot let you walk away from here and now!",
+      2: "Oh, this icy wind... I never thought I'd have to fight here!",
+      3: "You are a remarkable Trainer to have made it this far. But this is where it ends."
+    },
+    "victory": {
+      1: "Ghetsis... I have failed my mission...",
+      2: "The cold is piercing. I'm shivering. I'm suffering. Yet, I have triumphed.",
+      3: "Hm. You are a talented Trainer, but unfortunately not talented enough."
+    }
+  },
+  "xerosic": {
+    "encounter": {
+      1: "Ah ha ha! It would be my pleasure. Come on, little Trainer! Let's see what you've got!",
+      2: "Hmm... You're more powerful than you look. I wonder how much energy there is inside you.",
+      3: "I've been waiting for you! I need to do a little research on you! Come, let us begin!"
+    },
+    "victory": {
+      1: "Ah, you're quite strong. Oh yes—very strong, indeed.",
+      2: "Ding-ding-ding! You did it! To the victor go the spoils!",
+      3: "Wonderful! Amazing! You have tremendous skill and bravery!"
+    }
+  },
+  "bryony": {
+    "encounter": {
+      1: "I am Bryony, and it would be my pleasure to battle you. Show me what you've got.",
+      2: "Impressive... You're more powerful than you appear. Let's see the true extent of your energy.",
+      3: "I've anticipated your arrival. It's time for a little test. Shall we begin?"
+    },
+    "victory": {
+      1: "You're quite strong. Oh yes—very strong, indeed.",
+      2: "Ding-ding-ding! You've done well. Victory is yours.",
+      3: "Wonderful! Remarkable! Your skill and bravery are commendable."
+    }
+  },
   "rocket_grunt": {
     "encounter": {
       1: "Prepare for trouble!"
@@ -390,18 +587,6 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "Team Rocket blasting off again!"
     },
   },
-  "rocket_admin": {
-    "encounter": {
-      1: "Oh? You managed to get this far? You must be quite the trainer.",
-      2: "That's quite enough of you playing hero, kid.",
-      3: "I'll show you how scary an angry adult can be!"
-    },
-    "victory": {
-      1: "No! Forgive me Giovanni!",
-      2: "How could this be?",
-      3: "Urgh... You were too strong..."
-    },
-  },
   "magma_grunt": {
     "encounter": {
       1: " If you get in the way of Team Magma, don’t expect any mercy!"
@@ -410,18 +595,6 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "Huh? I lost?!"
     },
   },
-  "magma_admin": {
-    "encounter": {
-      1: "Hehehe! So you've come all the way here! But you're too late!",
-      2: "You're going to meddle in Team Magma's affairs? You're so cute you're disgusting! I'll put you down kiddy!",
-      3: "I'm going to give you a little taste of pain! Resign yourself to it!"
-    },
-    "victory": {
-      1: "Hehehe... So I lost...",
-      2: "You're disgustingly strong!",
-      3: "Ahahaha! Ouch!"
-    },
-  },
   "aqua_grunt": {
     "encounter": {
       1: "No one who crosses Team Aqua gets any mercy, not even kids!"
@@ -430,18 +603,6 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "You're kidding me!"
     },
   },
-  "aqua_admin": {
-    "encounter": {
-      1: "I'm a cut above the grunts you've seen so far. I'm going to puvlerize you!",
-      2: "Hahn? What's this? Who's this spoiled brat?",
-      3: "What are you doing here? Did you follow us?"
-    },
-    "victory": {
-      1: "So I lost too...",
-      2: "Ahhh?! Did I go too easy on you?!",
-      3: "Wh-what was that?"
-    },
-  },
   "galactic_grunt": {
     "encounter": {
       1: "Don't mess with Team Galactic!"
@@ -450,18 +611,6 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "Shut down..."
     },
   },
-  "galactic_admin": {
-    "encounter": {
-      1: "I'm one of Team Galactic's Commanders.",
-      2: "Anything that opposes Team Galactic must be crushed! Even the very thought of opposition will not be tolerated!",
-      3: "What's the matter? Don't tell me you're shaking?"
-    },
-    "victory": {
-      1: "This can't be?! I lost?! You... you uppity brat!",
-      2: "You, my friend, are tough!",
-      3: "Losing to some child... Being careless cost me too much."
-    },
-  },
   "plasma_grunt": {
     "encounter": {
       1: "We won't tolerate people who have different ideas!"
@@ -470,18 +619,6 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "Plasmaaaaaaaaa!"
     },
   },
-  "plasma_sage": {
-    "encounter": {
-      1: "You could become a threat to Team Plasma, so we will eliminate you here!",
-      2: "Oh, for crying out loud... I didn't expect to have to fight!",
-      3: "You're an impressive Trainer to have made it this far."
-    },
-    "victory": {
-      1: "Ghetsis...",
-      2: "It's bitter cold. I'm shivering. I'm suffering.",
-      3: "Hmph. You're a smarter Trainer than I expected."
-    },
-  },
   "flare_grunt": {
     "encounter": {
       1: "Fashion is most important to us!"
@@ -490,18 +627,6 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "The future doesn't look bright for me."
     },
   },
-  "flare_admin": {
-    "encounter": {
-      1: "Ah ha ha! It would be my pleasure. Come on, little Trainer! Let's see what you've got!",
-      2: "Hmm... You're more powerful than you look. I wonder how much energy there is inside you.",
-      3: "I've been waiting for you! I need to do a little research on you! Come, let us begin!"
-    },
-    "victory": {
-      1: "You're quite strong. Oh yes-very strong, indeed.",
-      2: "Ding-ding-ding! Yup, you did it! To the victor goes the spoils!",
-      3: "Wonderful! Amazing! You have tremendous skill and bravery!"
-    },
-  },
   "rocket_boss_giovanni_1": {
     "encounter": {
       1: "So! I must say, I am impressed you got here!"

src/locales/zh_TW/trainers.ts

@@ -13,6 +13,25 @@ export const titles: SimpleTranslationEntries = {
   "rival": "勁敵",
   "professor": "博士",
   "frontier_brain": "開拓頭腦",
+  "rocket_boss": "Team Rocket Boss",
+  "magma_boss": "Team Magma Boss",
+  "aqua_boss": "Team Aqua Boss",
+  "galactic_boss": "Team Galactic Boss",
+  "plasma_boss": "Team Plasma Boss",
+  "flare_boss": "Team Flare Boss",
+
+  "rocket_admin": "Team Rocket Admin",
+  "rocket_admin_female": "Team Rocket Admin",
+  "magma_admin": "Team Magma Admin",
+  "magma_admin_female": "Team Magma Admin",
+  "aqua_admin": "Team Aqua Admin",
+  "aqua_admin_female": "Team Aqua Admin",
+  "galactic_commander": "Team Galactic Commander",
+  "galactic_commander_female": "Team Galactic Commander",
+  "plasma_sage": "Team Plasma Sage",
+  "plasma_admin": "Team Plasma Admin",
+  "flare_admin": "Team Flare Admin",
+  "flare_admin_female": "Team Flare Admin",
   // Maybe if we add the evil teams we can add "Team Rocket" and "Team Aqua" etc. here as well as "Team Rocket Boss" and "Team Aqua Admin" etc.
 } as const;
 
@@ -120,32 +139,21 @@ export const trainerClasses: SimpleTranslationEntries = {
   "workers": "工人組合",
   "youngster": "短褲小子",
   "rocket_grunts": "火箭队手下們",
-  "rocket_admin": "Rocket Admin",
-  "rocket_admin_female": "Rocket Admin",
   "magma_grunt": "熔岩队手下",
   "magma_grunt_female": "熔岩队手下",
   "magma_grunts": "熔岩队手下們",
-  "magma_admin": "Magma Admin",
-  "magma_admin_female": "Magma Admin",
   "aqua_grunt": "海洋队手下",
   "aqua_grunt_female": "海洋队手下",
   "aqua_grunts": "海洋队手下們",
-  "aqua_admin": "Aqua Admin",
-  "aqua_admin_female": "Aqua Admin",
   "galactic_grunt": "银河队手下",
   "galactic_grunt_female": "银河队手下",
   "galactic_grunts": "银河队手下們",
-  "galactic_admin": "Galactic Admin",
-  "galactic_admin_female": "Galactic Admin",
   "plasma_grunt": "等离子队手下",
   "plasma_grunt_female": "等离子队手下",
   "plasma_grunts": "等离子队手下們",
-  "plasma_sage": "Plasma Sage",
   "flare_grunt": "闪焰队手下",
   "flare_grunt_female": "闪焰队手下",
   "flare_grunts": "闪焰队手下們",
-  "flare_admin": "Flare Admin",
-  "flare_admin_female": "Flare Admin",
 } as const;
 
 // Names of special trainers like gym leaders, elite four, and the champion
@@ -331,6 +339,29 @@ export const trainerNames: SimpleTranslationEntries = {
   "rival": "芬恩",
   "rival_female": "艾薇",
 
+  // Evil Team Admins
+  "archer": "Archer",
+  "ariana": "Ariana",
+  "proton": "Proton",
+  "petrel": "Petrel",
+  "tabitha": "Tabitha",
+  "courtney": "Courtney",
+  "shelly": "Shelly",
+  "matt": "Matt",
+  "mars": "Mars",
+  "jupiter": "Jupiter",
+  "saturn": "Saturn",
+  "zinzolin": "Zinzolin",
+  "rood": "Rood",
+  "xerosic": "Xerosic",
+  "bryony": "Bryony",
+
+  "maxie": "Maxie",
+  "archie": "Archie",
+  "cyrus": "Cyrus",
+  "ghetsis": "Ghetsis",
+  "lysandre": "Lysandre",
+
   // Double Names
   "blue_red_double": "青綠 & 赤紅",
   "red_blue_double": "赤紅 & 青綠",

src/system/voucher.ts

@@ -105,7 +105,7 @@ export function initVouchers() {
     }
 
     const bossTrainerTypes = Object.keys(trainerConfigs)
-      .filter(tt => trainerConfigs[tt].isBoss && trainerConfigs[tt].getDerivedType() !== TrainerType.RIVAL);
+      .filter(tt => trainerConfigs[tt].isBoss && trainerConfigs[tt].getDerivedType() !== TrainerType.RIVAL && trainerConfigs[tt].hasVoucher);
 
     for (const trainerType of bossTrainerTypes) {
       const voucherType = trainerConfigs[trainerType].moneyMultiplier < 10