From 42f8f5e1a2e2008635510124a1d051cc1f2d24e3 Mon Sep 17 00:00:00 2001
From: darkfire006 <blazer257@live.com>
Date: Wed, 29 Sep 2021 18:09:41 -0500
Subject: [PATCH] Shinyness clean up

condense redundant commands into the add command
---
 .../Data/Scripts/goldenrod/gate_spearow.dat   | Bin 3590 -> 3518 bytes
 P3D/Content/Data/Scripts/ilex/spiky.dat       |   3 +--
 P3D/Content/Data/Scripts/kolben/maid.dat      |   3 +--
 P3D/Content/Data/Scripts/kolben/omega.dat     |   6 ++----
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/P3D/Content/Data/Scripts/goldenrod/gate_spearow.dat b/P3D/Content/Data/Scripts/goldenrod/gate_spearow.dat
index 952fee0eba7ebf9a803fb814e01a9ca7e3afec8f..9e4c19d4deede85550b65e74b976d9af315171b1 100644
GIT binary patch
delta 29
jcmZpZ*(bfBfSFx~!GHmXCkwL4Z|-AW$GEwNwTc4(bhHQH

delta 45
zcmdld-6pf4fO+yI7KzOhn71%;7BgfpWHRJ2R8ID1RcADqe33<R@&snK%`U7}8~{}0
B4Y>dS

diff --git a/P3D/Content/Data/Scripts/ilex/spiky.dat b/P3D/Content/Data/Scripts/ilex/spiky.dat
index 8e8a2a3a6..513dc0e5d 100644
--- a/P3D/Content/Data/Scripts/ilex/spiky.dat
+++ b/P3D/Content/Data/Scripts/ilex/spiky.dat
@@ -47,10 +47,9 @@ version=2
 	
 	@register.register(spiky)
 	@pokemon.cry(172)
-	@pokemon.add(172,50,Obtained at,161,Ilex Forest)
+	@pokemon.add(172,50,Obtained at,161,Ilex Forest,0,<player.name>,0,0)
 	@pokemon.setadditionalvalue(<pokemon.count>-1,spiky-eared)
 
-	@pokemon.setshiny(<pokemon.count>-1,0)
 	@pokemon.setgender(<pokemon.count>-1,1)
 	@pokemon.clearattacks(<pokemon.count>-1)
 	@pokemon.addattack(<pokemon.count>-1,231)
diff --git a/P3D/Content/Data/Scripts/kolben/maid.dat b/P3D/Content/Data/Scripts/kolben/maid.dat
index 0b5c6cc35..d6e8861c1 100644
--- a/P3D/Content/Data/Scripts/kolben/maid.dat
+++ b/P3D/Content/Data/Scripts/kolben/maid.dat
@@ -9,10 +9,9 @@ version=2
 		:if:<pokemon.count>>5
 			@text.show(Oh, your party is full.~Go open some space to claim~your Pokémon!)
 		:else
-			@pokemon.add(172,40,A gift from Omega,45,at Kolben Tower,0,Omega)
+			@pokemon.add(172,40,A gift from Omega,45,at Kolben Tower,0,Omega,0,1)
 			@text.show(Ah yes, your prize.*This Pichu is special:~I heard it was found~near the shrine in~Ilex Forest.*I wonder what happens if~you take it back there.*Anyway, here it is!)
 			
-			@pokemon.setshiny(<pokemon.count>-1,1)
 			@pokemon.setgender(<pokemon.count>-1,0)
 			@pokemon.clearattacks(<pokemon.count>-1)
 			@pokemon.addattack(<pokemon.count>-1,344)
diff --git a/P3D/Content/Data/Scripts/kolben/omega.dat b/P3D/Content/Data/Scripts/kolben/omega.dat
index 8d0fb09d8..fa4144394 100644
--- a/P3D/Content/Data/Scripts/kolben/omega.dat
+++ b/P3D/Content/Data/Scripts/kolben/omega.dat
@@ -22,9 +22,8 @@ version=2
 									@text.show(Oh, your party is full.~Go open some space to claim~your Pokémon!)
 									:end
 								:else
-									@pokemon.add(172,50,A gift from Omega,45,at Kolben Tower,0,Omega)
+									@pokemon.add(172,50,A gift from Omega,45,at Kolben Tower,0,Omega,0,1)
 									@text.show(Ah yes, your prize.*This Pichu is special:~I found it near the Ilex~Forest shrine.*I wonder what happens if~you take it back there.*Anyway, here it is!)
-									@pokemon.setshiny(<pokemon.count>-1,1)
 									@pokemon.setgender(<pokemon.count>-1,0)
 									@pokemon.clearattacks(<pokemon.count>-1)
 									@pokemon.addattack(<pokemon.count>-1,344)
@@ -57,9 +56,8 @@ version=2
 			@text.show(Oh, your party is full.~Go open some space to claim~your Pokémon!)
 			:end
 		:else
-			@pokemon.add(172,50,A gift from Omega,45,at Kolben Tower,0,Omega)
+			@pokemon.add(172,50,A gift from Omega,45,at Kolben Tower,0,Omega,0,1)
 			@text.show(Ah yes, your prize.*This Pichu is special:~I found it near the Ilex~Forest shrine.*I wonder what happens if~you take it back there.*Anyway, here it is!)
-			@pokemon.setshiny(<pokemon.count>-1,1)
 			@pokemon.setgender(<pokemon.count>-1,0)
 			@pokemon.clearattacks(<pokemon.count>-1)
 			@pokemon.addattack(<pokemon.count>-1,344)