Merge branch 'master' of https://github.com/pret/pokecrystal

2018-07-27 11:21:31 +02:00
parent a91b59ab5d 748d424980
commit 9aa6b55d7b
30 changed files with 198 additions and 195 deletions
--- a/engine/battle/effect_commands.asm
+++ b/engine/battle/effect_commands.asm
@@ -6154,7 +6154,7 @@ BattleCommand_Heal:
 	push de
 	push bc
 	ld c, 2
-	call StringCmp
+	call CompareBytes
 	pop bc
 	pop de
 	pop hl
@@ -6573,7 +6573,7 @@ BattleCommand_TimeBasedHealContinue:

 ; Don't bother healing if HP is already full.
 	push bc
-	call StringCmp
+	call CompareBytes
 	pop bc
 	jr z, .Full