From 10f9559eab8c93b94abb8ae8d1083704ad4e169a Mon Sep 17 00:00:00 2001
From: dannye <33dannye@gmail.com>
Date: Wed, 20 May 2020 19:40:33 -0500
Subject: Sync with pokered

---
 engine/pikachu_emotions.asm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engine/pikachu_emotions.asm')

diff --git a/engine/pikachu_emotions.asm b/engine/pikachu_emotions.asm
index b3b64970..1518b28e 100755
--- a/engine/pikachu_emotions.asm
+++ b/engine/pikachu_emotions.asm
@@ -281,9 +281,9 @@ MapSpecificPikachuExpression:
 	ldpikaemotion a, PikachuEmotion28
 	jr c, .play_emotion
 	ld a, [wCurMap]
-	cp POKEMONTOWER_1
+	cp POKEMON_TOWER_1F
 	jr c, .notInLavenderTower
-	cp POKEMONTOWER_7 + 1
+	cp POKEMON_TOWER_7F + 1
 	ldpikaemotion a, PikachuEmotion22
 	jr c, .play_emotion
 .notInLavenderTower
-- 
cgit v1.3.1-sl0p