diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-05-06 22:45:07 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-05-06 22:45:07 -0400 |
| commit | 8acc8d6e30392a30a8353923219db71527f3a9bb (patch) | |
| tree | e0249b97485ddae4fdc0a410c5ad5add6f711d3e /data | |
| parent | aa51dbc61245d5b4949c1872b3d3e915a981ded3 (diff) | |
| parent | 59c4d824e65409f6de211d6e0fd354ca4ef6c61e (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
Diffstat (limited to 'data')
| -rw-r--r-- | data/moves/animations.asm | 2 | ||||
| -rw-r--r-- | data/wild/flee_mons.asm | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/data/moves/animations.asm b/data/moves/animations.asm index 030aa2fa3..037e5f1d2 100644 --- 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 diff --git a/data/wild/flee_mons.asm b/data/wild/flee_mons.asm index 1b1cea036..2c235d2e6 100644 --- 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 |