diff --git a/constants/item_constants.asm b/constants/item_constants.asm
index 5bde9d1f..0e6fa0fc 100644
--- a/constants/item_constants.asm
+++ b/constants/item_constants.asm
@@ -112,7 +112,7 @@ DEF NUM_ITEMS EQU const_value - 1
 	const ICE_STONE     ; $62
 	const PROTECTOR		; $63
 	const POISON_STONE  ; $64
-	const BLKAUGERITE   ; $65
+	const BLK_AUGURITE   ; $65
 DEF NUM_FLOORS EQU const_value - 1 - NUM_ITEMS
 
 	const_next $C4
diff --git a/data/items/key_items.asm b/data/items/key_items.asm
index 6c9451ee..e88abbd6 100644
--- a/data/items/key_items.asm
+++ b/data/items/key_items.asm
@@ -83,4 +83,22 @@ KeyItemFlags:
 	dbit FALSE ; MAX_ETHER
 	dbit FALSE ; ELIXER
 	dbit FALSE ; MAX_ELIXER
-	end_bit_array NUM_ITEMS
+	dbit TRUE  ; FLOOR_B2F
+	dbit TRUE  ; FLOOR_B1F
+	dbit TRUE  ; FLOOR_1F
+	dbit TRUE  ; FLOOR_2F
+	dbit TRUE  ; FLOOR_3F
+	dbit TRUE  ; FLOOR_4F
+	dbit TRUE ; FLOOR_5F
+	dbit TRUE  ; FLOOR_6F
+	dbit TRUE  ; FLOOR_7F
+	dbit TRUE  ; FLOOR_8F
+	dbit TRUE  ; FLOOR_9F
+	dbit TRUE  ; FLOOR_10F
+	dbit TRUE  ; FLOOR_11F
+	dbit TRUE  ; FLOOR_B4F
+	dbit FALSE ; ICE_STONE
+	dbit FALSE ; PROTECTOR
+	dbit FALSE ; POISON_STONE
+	dbit FALSE ; BLK_AUGURITE
+	end_bit_array NUM_ITEMS + NUM_FLOORS
diff --git a/data/items/names.asm b/data/items/names.asm
index 0aff9692..698abfd4 100644
--- a/data/items/names.asm
+++ b/data/items/names.asm
@@ -101,5 +101,5 @@ ItemNames::
 	li "ICE STONE"
 	li "PROTECTOR"
 	li "POISON STONE"
-	li "BLKAUGERITE"
+	li "BLK AUGURITE"
 	assert_list_length NUM_ITEMS + NUM_FLOORS
diff --git a/data/items/prices.asm b/data/items/prices.asm
index e4a9c2c2..f3b90eb2 100644
--- a/data/items/prices.asm
+++ b/data/items/prices.asm
@@ -101,5 +101,5 @@ ItemPrices::
 	bcd3 2100  ; ICE_STONE
 	bcd3 3000  ; PROTECTOR
 	bcd3 2100  ; POISON_STONE
-	bcd3 2100  ; BLKAUGERITE
+	bcd3 2100  ; BLK_AUGURITE
 	assert_table_length NUM_ITEMS + NUM_FLOORS
diff --git a/data/items/use_party.asm b/data/items/use_party.asm
index fade1ef0..62e55ef5 100644
--- a/data/items/use_party.asm
+++ b/data/items/use_party.asm
@@ -40,5 +40,5 @@ UsableItems_PartyMenu:
 	db ICE_STONE
 	db PROTECTOR
 	db POISON_STONE
-	db BLKAUGERITE
+	db BLK_AUGURITE
 	db -1 ; end
diff --git a/data/pokemon/evos_moves.asm b/data/pokemon/evos_moves.asm
index f5c10e13..6575262a 100644
--- a/data/pokemon/evos_moves.asm
+++ b/data/pokemon/evos_moves.asm
@@ -222,7 +222,6 @@ EvosMovesPointerTable:
 
 RhydonEvosMoves:
 ; Evolutions
-	db EV_TRADE, 1, RHYPERIOR
 	db EV_ITEM, PROTECTOR, 1, RHYPERIOR 
 	db 0
 ; Learnset
@@ -300,12 +299,8 @@ NidokingEvosMoves:
 	db 0
 ; Learnset
 	db 8, HORN_ATTACK
-	db 12, DOUBLE_KICK
-	db 19, POISON_STING
-	db 26, FOCUS_ENERGY
-	db 34, FURY_ATTACK
-	db 41, THRASH
-	db 46, HORN_DRILL
+	db 14, POISON_STING
+	db 23, THRASH
 	db 0
 
 SlowbroEvosMoves:
@@ -406,12 +401,8 @@ NidoqueenEvosMoves:
 	db 0
 ; Learnset
 	db 8, SCRATCH
-	db 12, DOUBLE_KICK
-	db 19, POISON_STING
-	db 25, TAIL_WHIP
-	db 34, BITE
-	db 41, BODY_SLAM
-	db 46, FURY_SWIPES
+	db 14, POISON_STING
+	db 23, BODY_SLAM
 	db 0
 
 CuboneEvosMoves:
@@ -520,7 +511,7 @@ GastlyEvosMoves:
 ScytherEvosMoves:
 ; Evolutions
 	db EV_LEVEL, 41, SCIZOR
-	db EV_ITEM, BLKAUGERITE, 1, KLEAVOR
+	db EV_ITEM, BLK_AUGURITE, 1, KLEAVOR
 	db 0
 ; Learnset
 	db 17, LEER
diff --git a/engine/debug/debug_party.asm b/engine/debug/debug_party.asm
index c1e972d5..8ce02160 100644
--- a/engine/debug/debug_party.asm
+++ b/engine/debug/debug_party.asm
@@ -143,8 +143,9 @@ DebugItemsList:
 	db FULL_RESTORE, 99
 	db MAX_REPEL, 99
 	db ESCAPE_ROPE, 99
-	db BLKAUGERITE, 99
+	db RARE_CANDY, 99
 	db MASTER_BALL, 99
+	db BLK_AUGURITE, 99
 	db SECRET_KEY, 1
 	db CARD_KEY, 1
 	db S_S_TICKET, 1
diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm
index f6ea17eb..8ea45f13 100644
--- a/engine/items/item_effects.asm
+++ b/engine/items/item_effects.asm
@@ -117,7 +117,7 @@ ItemUsePtrTable:
 	dw ItemUseEvoStone   ; ICE_STONE
 	dw ItemUseEvoStone   ; PROTECTOR
 	dw ItemUseEvoStone   ; POISON_STONE
-	dw ItemUseEvoStone   ; BLKAUGERITE
+	dw ItemUseEvoStone   ; BLK_AUGURITE
 
 ItemUseBall:
 
diff --git a/scripts/CeladonMart4F.asm b/scripts/CeladonMart4F.asm
index e42dd300..36d611c4 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, POISON_STONE, HEART_STONE
+	script_mart POKE_DOLL, FIRE_STONE, THUNDER_STONE, WATER_STONE, LEAF_STONE, ICE_STONE, POISON_STONE, HEART_STONE