diff options
| author | surskitty <surskitty@gmail.com> | 2017-12-11 17:37:34 -0500 |
|---|---|---|
| committer | surskitty <surskitty@gmail.com> | 2017-12-11 17:37:34 -0500 |
| commit | 98128cd4d8457948e7136a16e08bacff0bc3529d (patch) | |
| tree | 171c67509afba62571266bd6bebbfdb829d2a876 /battle/bg_effects.asm | |
| parent | 069ae7e2f3bc4f3939a4b97d6200a3fcdacc904b (diff) | |
| parent | 94c7def4883fbdbcd3987a067443a2069b8bb610 (diff) | |
Merge branch 'master' of github.com:pret/pokecrystal
Diffstat (limited to 'battle/bg_effects.asm')
| -rw-r--r-- | battle/bg_effects.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/battle/bg_effects.asm b/battle/bg_effects.asm index 22807f77d..fdb27af13 100644 --- a/battle/bg_effects.asm +++ b/battle/bg_effects.asm @@ -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 |