From f0a56a30490d2d91f9a90b20acd8693ca21649ec Mon Sep 17 00:00:00 2001
From: Madmadness65 <59298170+Madmadness65@users.noreply.github.com>
Date: Fri, 8 Aug 2025 21:15:33 -0500
Subject: [PATCH] [Sprite] Add unique trainer sprite for Rocket Boss Giovanni
 (#6235)

---
 .../trainer/rocket_boss_giovanni_1.json       |  41 ++++++++++++++++++
 .../images/trainer/rocket_boss_giovanni_1.png | Bin 0 -> 698 bytes
 src/data/trainers/trainer-config.ts           |   5 +--
 3 files changed, 43 insertions(+), 3 deletions(-)
 create mode 100644 public/images/trainer/rocket_boss_giovanni_1.json
 create mode 100644 public/images/trainer/rocket_boss_giovanni_1.png

diff --git a/public/images/trainer/rocket_boss_giovanni_1.json b/public/images/trainer/rocket_boss_giovanni_1.json
new file mode 100644
index 00000000000..a53be1a20e8
--- /dev/null
+++ b/public/images/trainer/rocket_boss_giovanni_1.json
@@ -0,0 +1,41 @@
+{
+	"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$"
+	}
+}
diff --git a/public/images/trainer/rocket_boss_giovanni_1.png b/public/images/trainer/rocket_boss_giovanni_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..8adab2d057575f8d7a6620fc5808f5bc646e53ed
GIT binary patch
literal 698
zcmV;r0!96aP)<h;3K|Lk000e1NJLTq002(_002)20{{R3o$6?`0000sP)t-s00000
z001yBFh@sENJv<2Cm(o7Sb%_tm|$3;PCU4HV8BpF&c?>iD;n6Kc;2OZ_|Ulj|Nr)u
zbou}Q00DGTPE!Ct=GbNc000SaNLh0L01FcU01FcV0GgZ_0006VNkl<ZSi{xV?M}rY
z3<lu6<$#Wz9q|5d))vOxSB#@IQGS?d!ehHaVZ(4ShzP)7G>9H$7>SEkL|e`TY}ryG
z3y(`7(1UW$^dL0|VkyawoHCI?fGID-#>47Km})N|hLj|@7&*SE1w)EY#FQdFn1q4%
z9#hN=a+EPdeZris<SVZ+28#vFUM%%^1(O{dSI?*+)Le72>R4Rk7+){D4hVjQ$&cOy
z<jy?8dq0kFq>Yg==fKv;(K#6^5mboLOMK<ok%Q8sv5dwkJh&^bAC!03yvmt*o-ofd
z<af2_OK~wnJfiNd%5$s7L%bOvrALyVaQr0kVNif|s;p;^dWE4b&-*Wq6J)PG76)_}
z^dFNi2l?XB*28TN(=<J0+qyCl)m*$ypg(PPIZV&zvKda^ZH~PZLWm1k-#_-;y%rOY
zbBGme<=lFA8x~(Mq`^~dbtexUJv1d?xiDjwXlH-k%tCJ+zS$z%0{=-5eJkbqd|S#|
z*S0}?ZN~ztv*=V_IQN%5XX`CTr50@K#MyXU($@5CJl8<u_|}BUBt8tV@mhRl-g<oF
zcRXD|j6KlK(_JPHUJKB`!?5uPRvw8*I&X8^GdMH%*IV>n5dMpI0IWSV_zyffc&Zh6
z{JH|^0z7@K=@LHA-t`+BPZ1!1YY)9%x%J`jFBIBob)b8_fa>?)!E<kKeJypp<l?&(
gezO|5{_7p?6Z-=b_{c6NK>z>%07*qoM6N<$f)eOAlK=n!

literal 0
HcmV?d00001

diff --git a/src/data/trainers/trainer-config.ts b/src/data/trainers/trainer-config.ts
index 0f047157174..d29b40e0972 100644
--- a/src/data/trainers/trainer-config.ts
+++ b/src/data/trainers/trainer-config.ts
@@ -223,9 +223,8 @@ 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.GIOVANNI;
+        trainerType = TrainerType.ROCKET_BOSS_GIOVANNI_1;
         break;
       case TrainerType.MAXIE_2:
         trainerType = TrainerType.MAXIE;
@@ -895,7 +894,7 @@ export class TrainerConfig {
 
   /**
    * Helper function to check if a specialty type is set
-   * @returns true if specialtyType is defined and not Type.UNKNOWN
+   * @returns `true` if `specialtyType` is defined and not {@link PokemonType.UNKNOWN}
    */
   hasSpecialtyType(): boolean {
     return !isNullOrUndefined(this.specialtyType) && this.specialtyType !== PokemonType.UNKNOWN;