diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-24 17:39:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-24 17:39:50 -0500 |
| commit | e400fe5142731422b0f542749d913d569997159e (patch) | |
| tree | 004b17f7b444c4bbc8bbb80e3b189a48287ed4b7 /battle/anim_commands.asm | |
| parent | 70e6b5947b5cc9ca9fd93c720c7f97d9e018da2d (diff) | |
| parent | 3e7f3bbeb6dd2d3cff6343dea2298502faa14185 (diff) | |
Merge pull request #423 from roukaour/master
Fix issues #262, #345, #347, #396, #408, and #412
Diffstat (limited to 'battle/anim_commands.asm')
| -rw-r--r-- | battle/anim_commands.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/battle/anim_commands.asm b/battle/anim_commands.asm index 530f30d2b..510f44d2b 100644 --- a/battle/anim_commands.asm +++ b/battle/anim_commands.asm @@ -61,7 +61,7 @@ BattleAnimRunScript: ; cc11c and a jr nz, .hi_byte - callba CheckBattleScene + farcall CheckBattleScene jr c, .disabled call BattleAnimClearHud @@ -169,7 +169,7 @@ BattleAnimRestoreHuds: ; cc1bb ld hl, UpdateBattleHuds ld a, BANK(UpdatePlayerHUD) - rst FarCall ; Why the heck is this a callab? + rst FarCall ; Why not "call UpdateBattleHuds"? pop af ld [rSVBK], a @@ -907,7 +907,7 @@ BattleAnimCmd_PlayerHeadObj: ; cc57e (33:457e) ret BattleAnimCmd_CheckPokeball: ; cc5d0 (33:45d0) - callab GetPokeBallWobble + callfar GetPokeBallWobble ld a, c ld [BattleAnimVar], a ret @@ -932,7 +932,7 @@ BattleAnimCmd_Transform: ; cc5dc (33:45dc) ld hl, BattleMonDVs ; BattleMonDVs predef GetUnownLetter ld de, VTiles0 tile $00 - predef GetFrontpic + predef GetMonFrontpic jr .done .player @@ -941,7 +941,7 @@ BattleAnimCmd_Transform: ; cc5dc (33:45dc) ld hl, EnemyMonDVs ; EnemyMonDVs predef GetUnownLetter ld de, VTiles0 tile $00 - predef GetBackpic + predef GetMonBackpic .done pop af @@ -1128,11 +1128,11 @@ BattleAnimCmd_DropSub: ; cc750 (33:4750) and a jr z, .player - callab DropEnemySub + callfar DropEnemySub jr .done .player - callab DropPlayerSub + callfar DropPlayerSub .done pop af @@ -1159,14 +1159,14 @@ BattleAnimCmd_BeatUp: ; cc776 (33:4776) ld hl, BattleMonDVs predef GetUnownLetter ld de, VTiles2 tile $00 - predef GetFrontpic + predef GetMonFrontpic jr .done .player ld hl, EnemyMonDVs predef GetUnownLetter ld de, VTiles2 tile $31 - predef GetBackpic + predef GetMonBackpic .done pop af @@ -1221,7 +1221,7 @@ BattleAnimCmd_Sound: ; cc7cd (33:47cd) call GetBattleAnimByte ld e, a ld d, 0 - callab PlayStereoSFX + callfar PlayStereoSFX ret ; cc7f8 (33:47f8) @@ -1311,7 +1311,7 @@ endr ld a, 1 ld [wStereoPanningMask], a - callab _PlayCryHeader + callfar _PlayCryHeader .done pop af |