diff options
| author | surskitty <surskitty@gmail.com> | 2017-12-12 00:50:55 -0500 |
|---|---|---|
| committer | surskitty <surskitty@gmail.com> | 2017-12-12 00:50:55 -0500 |
| commit | 096afdcdaca0714612f3670a3c4a670f312c1c3f (patch) | |
| tree | 0c0bedcd311ab83262e31cf6d9d4c37257143acc /battle/anim_commands.asm | |
| parent | 98128cd4d8457948e7136a16e08bacff0bc3529d (diff) | |
| parent | f6942b9a136b2ee3b25159ebc4d54509a42c5266 (diff) | |
Merge branch 'master' of github.com:pret/pokecrystal
Diffstat (limited to 'battle/anim_commands.asm')
| -rw-r--r-- | battle/anim_commands.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/battle/anim_commands.asm b/battle/anim_commands.asm index b4633d8dd..fa0ae0a71 100644 --- a/battle/anim_commands.asm +++ b/battle/anim_commands.asm @@ -1437,13 +1437,13 @@ BattleAnim_SetBGPals: ; cc91a ld de, UnknBGPals ld a, [rBGP] ld b, a - ld c, $7 + ld c, 7 call CopyPals ld hl, OBPals ld de, UnknOBPals ld a, [rBGP] ld b, a - ld c, $2 + ld c, 2 call CopyPals pop af ld [rSVBK], a @@ -1461,11 +1461,11 @@ BattleAnim_SetOBPals: ; cc94b push af ld a, $5 ld [rSVBK], a - ld hl, OBPals + $10 - ld de, UnknOBPals + $10 + ld hl, OBPals palette PAL_BATTLE_OB_GRAY + ld de, UnknOBPals palette PAL_BATTLE_OB_GRAY ld a, [rOBP0] ld b, a - ld c, $2 + ld c, 2 call CopyPals pop af ld [rSVBK], a |