From 22c4561b355a6fee7eed548d4d50b27c7ce20a7a Mon Sep 17 00:00:00 2001
From: emaskyesmogon <79380228+emaskyesmogon@users.noreply.github.com>
Date: Fri, 30 Sep 2022 09:37:46 -0600
Subject: [PATCH] New Evo Items

Based Martha can fix
---
 constants/item_constants.asm  |  8 +++++---
 data/items/names.asm          |  6 ++++--
 data/items/prices.asm         |  6 ++++--
 data/items/use_party.asm      |  6 ++++--
 data/pokemon/evos_moves.asm   | 25 +++++++++++++------------
 engine/debug/debug_party.asm  |  4 ++--
 engine/items/item_effects.asm |  6 ++++--
 scripts/CeladonMart4F.asm     |  2 +-
 8 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/constants/item_constants.asm b/constants/item_constants.asm
index 31ab47f4..5bde9d1f 100644
--- a/constants/item_constants.asm
+++ b/constants/item_constants.asm
@@ -52,7 +52,7 @@ DEF SAFARI_ROCK EQU $16 ; overload
 	const DOME_FOSSIL   ; $29
 	const HELIX_FOSSIL  ; $2A
 	const SECRET_KEY    ; $2B
-	const SUN_STONE     ; $2C
+	const HEART_STONE   ; $2C
 	const BIKE_VOUCHER  ; $2D
 	const X_ACCURACY    ; $2E
 	const LEAF_STONE    ; $2F
@@ -109,8 +109,10 @@ DEF NUM_ITEMS EQU const_value - 1
 	const FLOOR_10F     ; $5F
 	const FLOOR_11F     ; $60
 	const FLOOR_B4F     ; $61
-	const SHINY_STONE   ; $62
-	const ICE_STONE     ; $63
+	const ICE_STONE     ; $62
+	const PROTECTOR		; $63
+	const POISON_STONE  ; $64
+	const BLKAUGERITE   ; $65
 DEF NUM_FLOORS EQU const_value - 1 - NUM_ITEMS
 
 	const_next $C4
diff --git a/data/items/names.asm b/data/items/names.asm
index af9f9bf9..0aff9692 100644
--- a/data/items/names.asm
+++ b/data/items/names.asm
@@ -43,7 +43,7 @@ ItemNames::
 	li "DOME FOSSIL"
 	li "HELIX FOSSIL"
 	li "SECRET KEY"
-	li "SUN STONE"
+	li "HEART STONE"
 	li "BIKE VOUCHER"
 	li "X ACCURACY"
 	li "LEAF STONE"
@@ -98,6 +98,8 @@ ItemNames::
 	li "10F"
 	li "11F"
 	li "B4F"
-	li "SHINY STONE"
 	li "ICE STONE"
+	li "PROTECTOR"
+	li "POISON STONE"
+	li "BLKAUGERITE"
 	assert_list_length NUM_ITEMS + NUM_FLOORS
diff --git a/data/items/prices.asm b/data/items/prices.asm
index 9d52fcdc..e4a9c2c2 100644
--- a/data/items/prices.asm
+++ b/data/items/prices.asm
@@ -43,7 +43,7 @@ ItemPrices::
 	bcd3 0     ; DOME_FOSSIL
 	bcd3 0     ; HELIX_FOSSIL
 	bcd3 0     ; SECRET_KEY
-	bcd3 2100  ; SUN_STONE
+	bcd3 2100  ; HEART_STONE
 	bcd3 0     ; BIKE_VOUCHER
 	bcd3 950   ; X_ACCURACY
 	bcd3 2100  ; LEAF_STONE
@@ -98,6 +98,8 @@ ItemPrices::
 	bcd3 0     ; FLOOR_10F
 	bcd3 0     ; FLOOR_11F
 	bcd3 0     ; FLOOR_B4F
-	bcd3 2100  ; SHINY_STONE
 	bcd3 2100  ; ICE_STONE
+	bcd3 3000  ; PROTECTOR
+	bcd3 2100  ; POISON_STONE
+	bcd3 2100  ; BLKAUGERITE
 	assert_table_length NUM_ITEMS + NUM_FLOORS
diff --git a/data/items/use_party.asm b/data/items/use_party.asm
index e440389e..fade1ef0 100644
--- a/data/items/use_party.asm
+++ b/data/items/use_party.asm
@@ -20,7 +20,7 @@ UsableItems_PartyMenu:
 	db CARBOS
 	db CALCIUM
 	db RARE_CANDY
-	db SUN_STONE
+	db HEART_STONE
 	db LEAF_STONE
 	db FULL_HEAL
 	db REVIVE
@@ -37,6 +37,8 @@ UsableItems_PartyMenu:
 	db MAX_ETHER
 	db ELIXER
 	db MAX_ELIXER
-	db SHINY_STONE
 	db ICE_STONE
+	db PROTECTOR
+	db POISON_STONE
+	db BLKAUGERITE
 	db -1 ; end
diff --git a/data/pokemon/evos_moves.asm b/data/pokemon/evos_moves.asm
index 023f0b0a..f5c10e13 100644
--- a/data/pokemon/evos_moves.asm
+++ b/data/pokemon/evos_moves.asm
@@ -223,6 +223,7 @@ EvosMovesPointerTable:
 RhydonEvosMoves:
 ; Evolutions
 	db EV_TRADE, 1, RHYPERIOR
+	db EV_ITEM, PROTECTOR, 1, RHYPERIOR 
 	db 0
 ; Learnset
 	db 30, STOMP
@@ -519,7 +520,7 @@ GastlyEvosMoves:
 ScytherEvosMoves:
 ; Evolutions
 	db EV_LEVEL, 41, SCIZOR
-	db EV_ITEM, MOON_STONE, 1, KLEAVOR
+	db EV_ITEM, BLKAUGERITE, 1, KLEAVOR
 	db 0
 ; Learnset
 	db 17, LEER
@@ -654,7 +655,7 @@ PidgeyEvosMoves:
 SlowpokeEvosMoves:
 ; Evolutions
 	db EV_LEVEL, 37, SLOWBRO
-	db EV_TRADE, 1, SLOWKING
+	db EV_ITEM, HEART_STONE, 1, SLOWKING
 	db 0
 ; Learnset
 	db 18, DISABLE
@@ -1442,11 +1443,11 @@ EeveeEvosMoves:
 	db EV_ITEM, FIRE_STONE, 1, FLAREON
 	db EV_ITEM, THUNDER_STONE, 1, JOLTEON
 	db EV_ITEM, WATER_STONE, 1, VAPOREON
-	db EV_ITEM, SUN_STONE, 1, ESPEON
-	db EV_ITEM, MOON_STONE, 1, UMBREON
+	db EV_ITEM, HEART_STONE, 1, ESPEON
+	db EV_ITEM, POISON_STONE, 1, UMBREON
 	db EV_ITEM, LEAF_STONE, 1, LEAFEON
 	db EV_ITEM, ICE_STONE, 1, GLACEON
-	db EV_ITEM, SHINY_STONE, 1, SYLVEON
+	db EV_ITEM, MOON_STONE, 1, SYLVEON
 	db 0
 ; Learnset
 	db 8, SAND_ATTACK
@@ -1550,7 +1551,7 @@ ParasEvosMoves:
 PoliwhirlEvosMoves:
 ; Evolutions
 	db EV_ITEM, WATER_STONE, 1, POLIWRATH
-	db EV_TRADE, 1, POLITOED
+	db EV_ITEM, HEART_STONE, 1, POLITOED
 	db 0
 ; Learnset
 	db 16, HYPNOSIS
@@ -1930,7 +1931,7 @@ PersianEvosMoves:
 
 MarowakEvosMoves:
 ; Evolutions
-	db EV_LEVEL, 40, GUARDIA
+	db EV_ITEM, HEART_STONE, 1, GUARDIA
 	db 0
 ; Learnset
 	db 10, BONE_CLUB
@@ -2189,7 +2190,7 @@ RaticateEvosMoves:
 NidorinoEvosMoves:
 ; Evolutions
 	db EV_ITEM, MOON_STONE, 1, NIDOREIGN
-	db EV_LEVEL, 36, NIDOKING
+	db EV_ITEM, POISON_STONE, 1, NIDOKING
 	db 0
 ; Learnset
 	db 8, HORN_ATTACK
@@ -2203,7 +2204,7 @@ NidorinoEvosMoves:
 NidorinaEvosMoves:
 ; Evolutions
 	db EV_ITEM, MOON_STONE, 1, NIDOREIGN
-	db EV_LEVEL, 36, NIDOQUEEN
+	db EV_ITEM, POISON_STONE, 1, NIDOQUEEN
 	db 0
 ; Learnset
 	db 8, SCRATCH
@@ -2407,8 +2408,8 @@ OddishEvosMoves:
 
 GloomEvosMoves:
 ; Evolutions
-	db EV_ITEM, LEAF_STONE, 1, VILEPLUME
-	db EV_ITEM, SUN_STONE, 1, BELLOSSOM
+	db EV_ITEM, POISON_STONE, 1, VILEPLUME
+	db EV_ITEM, LEAF_STONE, 1, BELLOSSOM
 	db 0
 ; Learnset
 	db 15, POISONPOWDER
@@ -2445,7 +2446,7 @@ BellsproutEvosMoves:
 WeepinbellEvosMoves:
 ; Evolutions
 	db EV_ITEM, LEAF_STONE, 1, VICTREEBEL
-	db EV_ITEM, SUN_STONE, 1, TSUBOMITTO
+	db EV_ITEM, POISON_STONE, 1, TSUBOMITTO
 	db 0
 ; Learnset
 	db 13, WRAP
diff --git a/engine/debug/debug_party.asm b/engine/debug/debug_party.asm
index ecf1d89b..c1e972d5 100644
--- a/engine/debug/debug_party.asm
+++ b/engine/debug/debug_party.asm
@@ -31,7 +31,7 @@ ENDC
 	db ELECTIVIRE, 56
 	db PORYGON2, 57
 IF DEF(_DEBUG)
-	db POLIWHIRL, 16 ; to test trade evos @ celadon uni - PvK
+	db SCYTHER, 16
 ENDC
 	db -1 ; end
 
@@ -143,7 +143,7 @@ DebugItemsList:
 	db FULL_RESTORE, 99
 	db MAX_REPEL, 99
 	db ESCAPE_ROPE, 99
-	db RARE_CANDY, 99
+	db BLKAUGERITE, 99
 	db MASTER_BALL, 99
 	db SECRET_KEY, 1
 	db CARD_KEY, 1
diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm
index 46e92a43..f6ea17eb 100644
--- a/engine/items/item_effects.asm
+++ b/engine/items/item_effects.asm
@@ -60,7 +60,7 @@ ItemUsePtrTable:
 	dw UnusableItem      ; DOME_FOSSIL
 	dw UnusableItem      ; HELIX_FOSSIL
 	dw UnusableItem      ; SECRET_KEY
-	dw ItemUseEvoStone   ; SUN_STONE
+	dw ItemUseEvoStone   ; HEART_STONE
 	dw UnusableItem      ; BIKE_VOUCHER
 	dw ItemUseXAccuracy  ; X_ACCURACY
 	dw ItemUseEvoStone   ; LEAF_STONE
@@ -114,8 +114,10 @@ ItemUsePtrTable:
 	dw UnusableItem      ; FLOOR_10F
 	dw UnusableItem      ; FLOOR_11F
 	dw UnusableItem      ; FLOOR_14F
-	dw ItemUseEvoStone   ; SHINY_STONE
 	dw ItemUseEvoStone   ; ICE_STONE
+	dw ItemUseEvoStone   ; PROTECTOR
+	dw ItemUseEvoStone   ; POISON_STONE
+	dw ItemUseEvoStone   ; BLKAUGERITE
 
 ItemUseBall:
 
diff --git a/scripts/CeladonMart4F.asm b/scripts/CeladonMart4F.asm
index 47509278..e42dd300 100644
--- a/scripts/CeladonMart4F.asm
+++ b/scripts/CeladonMart4F.asm
@@ -20,4 +20,4 @@ CeladonMart4Text4:
 	text_end
 
 CeladonMart4ClerkText::
-	script_mart POKE_DOLL, FIRE_STONE, THUNDER_STONE, WATER_STONE, LEAF_STONE, SUN_STONE
+	script_mart POKE_DOLL, FIRE_STONE, THUNDER_STONE, WATER_STONE, LEAF_STONE, POISON_STONE, HEART_STONE