From 269f2c3ba72776e975f5b00d9a1361cadbda42a7 Mon Sep 17 00:00:00 2001
From: dannye <corrnondacqb@yahoo.com>
Date: Sat, 11 Jun 2016 15:45:24 -0500
Subject: Sync with pokered from August 29, 2015 to April 6, 2016

---
 engine/battle/common_text.asm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'engine/battle/common_text.asm')

diff --git a/engine/battle/common_text.asm b/engine/battle/common_text.asm
index 0ca9ce96..a0c44346 100644
--- a/engine/battle/common_text.asm
+++ b/engine/battle/common_text.asm
@@ -9,8 +9,8 @@ PrintBeginningBattleText: ; f4000 (3d:4000)
 	jr c, .pokemonTower
 .notPokemonTower
 	ld a,[wBattleType]
-	cp $4 ; new battle type?
-	jr nz,.notnewbattletype
+	cp BATTLE_TYPE_PIKACHU
+	jr nz,.notPikachuBattle
 	callab IsPlayerPikachuAsleepInParty
 	ld e,$24
 	jr c,.asm_f4026
@@ -18,7 +18,7 @@ PrintBeginningBattleText: ; f4000 (3d:4000)
 .asm_f4026
 	callab PlayPikachuSoundClip
 	jr .continue
-.notnewbattletype
+.notPikachuBattle
 	ld a, [wEnemyMonSpecies2]
 	call PlayCry
 .continue
-- 
cgit v1.3.1-sl0p