From aba713230814cabca2963e71ca35deff94e9efa1 Mon Sep 17 00:00:00 2001
From: Madmadness65 <blaze.the.fireman@gmail.com>
Date: Mon, 22 Jul 2024 13:55:03 -0500
Subject: [PATCH] Re-add changes accidentally deleted by #2617

---
 .../images/pokemon/variant/133-partner.json   | 24 +++++++++++++++++++
 .../images/pokemon/variant/_masterlist.json   | 10 ++++++++
 .../pokemon/variant/back/133-partner.json     | 22 +++++++++++++++++
 src/battle.ts                                 | 13 +++++++++-
 4 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 public/images/pokemon/variant/133-partner.json
 create mode 100644 public/images/pokemon/variant/back/133-partner.json

diff --git a/public/images/pokemon/variant/133-partner.json b/public/images/pokemon/variant/133-partner.json
new file mode 100644
index 00000000000..1939d16ec22
--- /dev/null
+++ b/public/images/pokemon/variant/133-partner.json
@@ -0,0 +1,24 @@
+{
+	"1": {
+		"a5634a": "5982b7",
+		"734a4a": "334b7d",
+		"d69c4a": "90c1f1",
+		"000000": "000000",
+		"523121": "13235c",
+		"e6c594": "9db5d8",
+		"bd9c7b": "5f6f94",
+		"ffffff": "ffffff",
+		"ffe6ad": "d7ebff"
+	},
+	"2": {
+		"a5634a": "915ea3",
+		"734a4a": "5e3372",
+		"d69c4a": "bf88cb",
+		"000000": "000000",
+		"523121": "461144",
+		"e6c594": "d7b8ba",
+		"bd9c7b": "a07c83",
+		"ffffff": "ffffff",
+		"ffe6ad": "f3e6e3"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/_masterlist.json b/public/images/pokemon/variant/_masterlist.json
index a60e25a7c9d..c936fc8d0a1 100644
--- a/public/images/pokemon/variant/_masterlist.json
+++ b/public/images/pokemon/variant/_masterlist.json
@@ -364,6 +364,11 @@
 		1,
 		1
 	],
+	"133-partner": [
+		0,
+		1,
+		1
+	],
 	"134": [
 		0,
 		1,
@@ -3732,6 +3737,11 @@
 			1,
 			1
 		],
+		"133-partner": [
+			0,
+			1,
+			1
+		],
 		"134": [
 			0,
 			1,
diff --git a/public/images/pokemon/variant/back/133-partner.json b/public/images/pokemon/variant/back/133-partner.json
new file mode 100644
index 00000000000..d48eaad4364
--- /dev/null
+++ b/public/images/pokemon/variant/back/133-partner.json
@@ -0,0 +1,22 @@
+{
+	"1": {
+		"734a4a": "13235c",
+		"523121": "0b1145",
+		"d69c4a": "90c1f1",
+		"a5634a": "5982b7",
+		"000000": "000000",
+		"ffe6ad": "d7ebff",
+		"bd9c7b": "5f6f94",
+		"e6c594": "8ca8d2"
+	},
+	"2": {
+		"734a4a": "5e3372",
+		"523121": "461144",
+		"d69c4a": "bf88cb",
+		"a5634a": "915ea3",
+		"000000": "000000",
+		"ffe6ad": "f3e6e3",
+		"bd9c7b": "a07c83",
+		"e6c594": "cfa7a9"
+	}
+}
\ No newline at end of file
diff --git a/src/battle.ts b/src/battle.ts
index 1e0605bdc64..b8df7635472 100644
--- a/src/battle.ts
+++ b/src/battle.ts
@@ -294,9 +294,20 @@ export default class Battle {
           if (pokemon.species.speciesId === Species.TAPU_KOKO || pokemon.species.speciesId === Species.TAPU_LELE || pokemon.species.speciesId === Species.TAPU_BULU || pokemon.species.speciesId === Species.TAPU_FINI) {
             return "battle_legendary_tapu";
           }
-          if (pokemon.species.speciesId === Species.COSMOG || pokemon.species.speciesId === Species.COSMOEM || pokemon.species.speciesId === Species.SOLGALEO || pokemon.species.speciesId === Species.LUNALA || pokemon.species.speciesId === Species.NECROZMA) {
+          if (pokemon.species.speciesId === Species.COSMOG || pokemon.species.speciesId === Species.COSMOEM || pokemon.species.speciesId === Species.SOLGALEO || pokemon.species.speciesId === Species.LUNALA) {
             return "battle_legendary_sol_lun";
           }
+          if (pokemon.species.speciesId === Species.NECROZMA) {
+            if (pokemon.getFormKey() === "") {
+              return "battle_legendary_sol_lun";
+            }
+            if (pokemon.getFormKey() === "dusk-mane" || pokemon.getFormKey() === "dawn-wings") {
+              return "battle_legendary_dusk_dawn";
+            }
+            if (pokemon.getFormKey() === "ultra") {
+              return "battle_legendary_ultra_nec";
+            }
+          }
           if (pokemon.species.speciesId === Species.NIHILEGO || pokemon.species.speciesId === Species.BUZZWOLE || pokemon.species.speciesId === Species.PHEROMOSA || pokemon.species.speciesId === Species.XURKITREE || pokemon.species.speciesId === Species.CELESTEELA || pokemon.species.speciesId === Species.KARTANA || pokemon.species.speciesId === Species.GUZZLORD || pokemon.species.speciesId === Species.POIPOLE || pokemon.species.speciesId === Species.NAGANADEL || pokemon.species.speciesId === Species.STAKATAKA || pokemon.species.speciesId === Species.BLACEPHALON) {
             return "battle_legendary_ub";
           }