.github/CODEOWNERS

@@ -3,6 +3,9 @@
 # everything (whole code-base) - Junior Devs
 * @pagefaultgames/junior-dev-team
 
+# github actions/templates etc. - Dev Leads
+/.github @pagefaultgames/senior-dev-team
+
 # Art Team
 /public/**/*.png @pagefaultgames/art-team
 /public/**/*.json @pagefaultgames/art-team
@@ -17,10 +20,3 @@
 
 # Balance Files; contain actual code logic and must also be owned by dev team
 /src/data/balance @pagefaultgames/balance-team @pagefaultgames/junior-dev-team
-/src/data/trainers @pagefaultgames/balance-team @pagefaultgames/junior-dev-team
-
-# GitHub actions/templates etc. - Senior Devs
-# Should be defined last in the file to make sure these always override all other definitions
-/.github @pagefaultgames/senior-dev-team
-package.json @pagefaultgames/senior-dev-team
-pnpm-lock.yaml @pagefaultgames/senior-dev-team

public/images/trainer/rocket_boss_giovanni_1.json

@@ -1,41 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "rocket_boss_giovanni_1.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 79,
-				"h": 79
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 39,
-						"h": 79
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 39,
-						"h": 79
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 39,
-						"h": 79
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:d6c5e1804414106d43a7c46f83468d39:1f3f7898a58950988acac6ee7167e012:5f742cbdaafcd5ae864f18ec2af7512a$"
-	}
-}

src/data/trainers/trainer-config.ts

@@ -223,8 +223,9 @@ export class TrainerConfig {
       case TrainerType.LARRY_ELITE:
         trainerType = TrainerType.LARRY;
         break;
+      case TrainerType.ROCKET_BOSS_GIOVANNI_1:
       case TrainerType.ROCKET_BOSS_GIOVANNI_2:
-        trainerType = TrainerType.ROCKET_BOSS_GIOVANNI_1;
+        trainerType = TrainerType.GIOVANNI;
         break;
       case TrainerType.MAXIE_2:
         trainerType = TrainerType.MAXIE;
@@ -894,7 +895,7 @@ export class TrainerConfig {
 
   /**
    * Helper function to check if a specialty type is set
-   * @returns `true` if `specialtyType` is defined and not {@link PokemonType.UNKNOWN}
+   * @returns true if specialtyType is defined and not Type.UNKNOWN
    */
   hasSpecialtyType(): boolean {
     return !isNullOrUndefined(this.specialtyType) && this.specialtyType !== PokemonType.UNKNOWN;
@@ -1870,12 +1871,10 @@ export const trainerConfigs: TrainerConfigs = {
         SpeciesId.CLEFFA,
         SpeciesId.WOOPER,
         SpeciesId.TEDDIURSA,
-        SpeciesId.REMORAID,
         SpeciesId.HOUNDOUR,
         SpeciesId.SILCOON,
         SpeciesId.PLUSLE,
         SpeciesId.VOLBEAT,
-        SpeciesId.SPINDA,
         SpeciesId.BONSLY,
         SpeciesId.PETILIL,
         SpeciesId.SPRITZEE,
@@ -1892,12 +1891,10 @@ export const trainerConfigs: TrainerConfigs = {
           SpeciesId.IGGLYBUFF,
           SpeciesId.PALDEA_WOOPER,
           SpeciesId.PHANPY,
-          SpeciesId.MANTYKE,
           SpeciesId.ELECTRIKE,
           SpeciesId.CASCOON,
           SpeciesId.MINUN,
           SpeciesId.ILLUMISE,
-          SpeciesId.SPINDA,
           SpeciesId.MIME_JR,
           SpeciesId.COTTONEE,
           SpeciesId.SWIRLIX,