diff options
Diffstat (limited to 'battle')
| -rw-r--r-- | battle/core.asm | 38 | ||||
| -rwxr-xr-x | battle/objects/functions.asm | 2 |
2 files changed, 3 insertions, 37 deletions
diff --git a/battle/core.asm b/battle/core.asm index 9dd3ffd84..325ce52f9 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -820,41 +820,7 @@ TryEnemyFlee: ; 3c543 ret ; 3c59a -FleeMons: - -SometimesFleeMons: ; 3c59a - db MAGNEMITE - db GRIMER - db TANGELA - db MR__MIME - db EEVEE - db PORYGON - db DRATINI - db DRAGONAIR - db TOGETIC - db UMBREON - db UNOWN - db SNUBBULL - db HERACROSS - db -1 - -OftenFleeMons: ; 3c5a8 - db CUBONE - db ARTICUNO - db ZAPDOS - db MOLTRES - db QUAGSIRE - db DELIBIRD - db PHANPY - db TEDDIURSA - db -1 - -AlwaysFleeMons: ; 3c5b1 - db RAIKOU - db ENTEI -; db SUICUNE - db -1 -; 3c5b4 +INCLUDE "data/battle/flee_mons.asm" CompareMovePriority: ; 3c5b4 ; Compare the priority of the player and enemy's moves. @@ -876,7 +842,7 @@ GetMovePriority: ; 3c5c5 ld b, a - ; Vital throw goes last. + ; Vital Throw goes last. cp VITAL_THROW ld a, 0 ret z diff --git a/battle/objects/functions.asm b/battle/objects/functions.asm index 6a0c2ecf8..64c390cbe 100755 --- a/battle/objects/functions.asm +++ b/battle/objects/functions.asm @@ -450,7 +450,7 @@ GetBallAnimPal: ; cd249 (33:5249) ret ; cd26c (33:526c) -INCLUDE "data/ball_colors.asm" +INCLUDE "data/battle/ball_colors.asm" BattleAnimFunction_10: ; cd284 (33:5284) call BattleAnim_AnonJumptable |