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

2018-05-06 22:45:07 -04:00
parent aa51dbc612 59c4d824e6
commit 8acc8d6e30
23 changed files with 54 additions and 53 deletions
--- a/data/moves/animations.asm
+++ b/data/moves/animations.asm
@@ -303,7 +303,7 @@ BattleAnim_SweetScent2: ; c929c
 	anim_ret
 ; c92c1

-BattleAnim_ThrowPokeBall
+BattleAnim_ThrowPokeBall:
 	anim_if_param_equal NO_ITEM, .TheTrainerBlockedTheBall
 	anim_if_param_equal MASTER_BALL, .MasterBall
 	anim_if_param_equal ULTRA_BALL, .UltraBall
--- a/data/wild/flee_mons.asm
+++ b/data/wild/flee_mons.asm
@@ -31,6 +31,5 @@ OftenFleeMons: ; 3c5a8
 AlwaysFleeMons: ; 3c5b1
 	db RAIKOU
 	db ENTEI
-;	db SUICUNE
 	db -1
 ; 3c5b4