diff options
| author | yenatch <yenatch@gmail.com> | 2018-01-01 16:54:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-01 16:54:45 -0500 |
| commit | f27f79488a460f0a89670f3611e1e9e175baf5d6 (patch) | |
| tree | 92134b1da650d7894a2fde59e0048f75d36c7dbf /engine/battle_anims/anim_commands.asm | |
| parent | 8c3905c4cdb4f24810473da51d52cc3e16062173 (diff) | |
| parent | e5fa3f9a11fb6936709cd0c36e945bd6e018cb37 (diff) | |
Merge pull request #455 from xCrystal/master
Use more palette(s) constants, rename BG/OBP wram addresses, and rBGPI+rOBPI auto-increment constants (from Rangi)
Diffstat (limited to 'engine/battle_anims/anim_commands.asm')
| -rw-r--r-- | engine/battle_anims/anim_commands.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/battle_anims/anim_commands.asm b/engine/battle_anims/anim_commands.asm index 2db8bf293..27d57e68f 100644 --- a/engine/battle_anims/anim_commands.asm +++ b/engine/battle_anims/anim_commands.asm @@ -1433,14 +1433,14 @@ BattleAnim_SetBGPals: ; cc91a push af ld a, $5 ld [rSVBK], a - ld hl, BGPals - ld de, UnknBGPals + ld hl, wBGPals2 + ld de, wBGPals1 ld a, [rBGP] ld b, a ld c, 7 call CopyPals - ld hl, OBPals - ld de, UnknOBPals + ld hl, wOBPals2 + ld de, wOBPals1 ld a, [rBGP] ld b, a ld c, 2 @@ -1461,8 +1461,8 @@ BattleAnim_SetOBPals: ; cc94b push af ld a, $5 ld [rSVBK], a - ld hl, OBPals palette PAL_BATTLE_OB_GRAY - ld de, UnknOBPals palette PAL_BATTLE_OB_GRAY + ld hl, wOBPals2 palette PAL_BATTLE_OB_GRAY + ld de, wOBPals1 palette PAL_BATTLE_OB_GRAY ld a, [rOBP0] ld b, a ld c, 2 |