diff options
| author | yenatch <yenatch@gmail.com> | 2018-05-06 22:27:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-06 22:27:22 -0400 |
| commit | 59c4d824e65409f6de211d6e0fd354ca4ef6c61e (patch) | |
| tree | dea75336bac86e9c6361656d8ab8439fea9c82ec /data | |
| parent | a63d9dfd4f4b214034c9a88a14b53635c10914d9 (diff) | |
| parent | acdb3020359de30ccde3bd1227883902b18b60a9 (diff) | |
Merge pull request #509 from mid-kid/master
A fix-various-little-things PR
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 |