diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-23 17:14:09 -0500 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2017-12-23 17:14:09 -0500 |
| commit | c51968f0de6b8420c141dde27339e82a42837c5b (patch) | |
| tree | 782f2b25f21adacb48fd516694b8a82864fe0b99 /battle/objects/functions.asm | |
| parent | c883ab4d34ecb4890010e808d6b6d533f5d8ad56 (diff) | |
| parent | 878092004956418bfd77bfdb9fc9dd7f640f80d2 (diff) | |
Merge remote-tracking branch 'origin/master' into master
Diffstat (limited to 'battle/objects/functions.asm')
| -rwxr-xr-x | battle/objects/functions.asm | 2 |
1 files changed, 1 insertions, 1 deletions
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 |