diff options
Diffstat (limited to 'battle/bg_effects.asm')
| -rw-r--r-- | battle/bg_effects.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/battle/bg_effects.asm b/battle/bg_effects.asm index 22807f77d..cfd342df7 100644 --- a/battle/bg_effects.asm +++ b/battle/bg_effects.asm @@ -550,7 +550,7 @@ BattleBGEffect_HeadFollow: ; c8281 (32:4281) ret _QueueBattleAnimation: ; c82ee (32:42ee) - callab QueueBattleAnimation + callfar QueueBattleAnimation ret BattleBGEffect_27: ; c82f5 (32:42f5) @@ -868,7 +868,7 @@ BattleBGEffect_RunPicResizeScript: ; c83ed (32:43ed) .BGSquares: bgsquare: MACRO - dn \1,\2 + dn \1, \2 dw \3 endm @@ -1538,10 +1538,10 @@ Tackle_BGEffect25_2d_two: Functionc88a5: ; c88a5 (32:48a5) push af - ld a, [FXAnimIDHi] ; FXAnimIDHi + ld a, [FXAnimID + 1] ; FXAnimID + 1 or a jr nz, .not_rollout - ld a, [FXAnimIDLo] ; FXAnimID + ld a, [FXAnimID] ; FXAnimID cp ROLLOUT jr z, .rollout .not_rollout @@ -2581,8 +2581,8 @@ BGEffects_LoadBGPal0_OBPal1: ; c8e52 (32:4e52) ld a, h push bc push af - ld hl, BGPals ; BGPals - ld de, UnknBGPals ; wd000 + ld hl, BGPals + ld de, UnknBGPals ld b, a ld c, $1 call CopyPals @@ -2944,13 +2944,13 @@ BattleBGEffects_CheckSGB: ; c9059 (32:5059) BattleBGEffects_Sine: ; c905d (32:505d) ld e, a - callab BattleAnim_Sine_e + callfar BattleAnim_Sine_e ld a, e ret BattleBGEffects_Cosine: ; c9066 (32:5066) ld e, a - callab BattleAnim_Cosine_e + callfar BattleAnim_Cosine_e ld a, e ret |