From 7350c3708fc2463e1eb6024c03de5c85b50aa38f Mon Sep 17 00:00:00 2001
From: Remy Oukaour <remy.oukaour@gmail.com>
Date: Thu, 14 Dec 2017 12:19:26 -0500
Subject: [PATCH] Replace two numbers with constants (found by pfero)

---
 battle/core.asm            | 2 +-
 battle/effect_commands.asm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/battle/core.asm b/battle/core.asm
index bc8a37725..9dd3ffd84 100644
--- a/battle/core.asm
+++ b/battle/core.asm
@@ -4454,7 +4454,7 @@ HandleHealingItems: ; 3dcf9
 HandleHPHealingItem: ; 3dd2f
 	callab GetOpponentItem
 	ld a, b
-	cp $1
+	cp HELD_BERRY
 	ret nz
 	ld de, EnemyMonHP + 1
 	ld hl, EnemyMonMaxHP
diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm
index bcebbb6ca..e261cbe81 100644
--- a/battle/effect_commands.asm
+++ b/battle/effect_commands.asm
@@ -9806,7 +9806,7 @@ GetItemHeldEffect: ; 37dd0
 	ret z
 
 	push hl
-	ld hl, ItemAttributes + 2
+	ld hl, ItemAttributes + ITEMATTR_EFFECT
 	dec a
 	ld c, a
 	ld b, 0