diff options
| author | yenatch <yenatch@gmail.com> | 2016-01-29 01:00:48 -0500 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2016-01-29 01:00:48 -0500 |
| commit | 11173a3807bde4e2d5b681717258b5b14f5f2d43 (patch) | |
| tree | 8e1692fe02b30ceeb2d797c001e0594175e29b78 /battle/objects/functions.asm | |
| parent | 289d3dea86b82c4ce7eb7268ef33980688306587 (diff) | |
| parent | 5322b56a8357e5e5a8847f3329b52faa3f7016d8 (diff) | |
Merge pull request #333 from PikalaxALT/master
Split base stats, rearrange wram.asm, naming screen
Diffstat (limited to 'battle/objects/functions.asm')
| -rwxr-xr-x | battle/objects/functions.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/battle/objects/functions.asm b/battle/objects/functions.asm index 7c1aa3764..474b332ef 100755 --- a/battle/objects/functions.asm +++ b/battle/objects/functions.asm @@ -274,7 +274,7 @@ BattleAnimFunction_12: ; cd15c (33:515c) dw .ten dw .eleven .zero - call GetBallAnimFunction + call GetBallAnimPal call BattleAnim_IncAnonJumptableIndex ret @@ -342,7 +342,7 @@ BattleAnimFunction_12: ; cd15c (33:515c) ret .seven - call GetBallAnimFunction + call GetBallAnimPal ld a, $a call ReinitBattleAnimFrameset call BattleAnim_IncAnonJumptableIndex @@ -382,7 +382,7 @@ BattleAnimFunction_13: ; cd212 (33:5212) dw .one dw .two .zero - call GetBallAnimFunction + call GetBallAnimPal call BattleAnim_IncAnonJumptableIndex ret @@ -415,7 +415,7 @@ BattleAnimFunction_13: ; cd212 (33:5212) call DeinitBattleAnimation ret -GetBallAnimFunction: ; cd249 (33:5249) +GetBallAnimPal: ; cd249 (33:5249) ld hl, .balls ld a, [rSVBK] push af |