summaryrefslogtreecommitdiff
path: root/engine/battle_anims
diff options
context:
space:
mode:
authorxCrystal <rgr.crystal@gmail.com>2018-01-01 15:08:21 +0100
committerxCrystal <rgr.crystal@gmail.com>2018-01-01 20:09:53 +0100
commit37369d1ae0890c63b494937ed6234e68f46359c5 (patch)
treefbf4952ed70906c1a4b10fb8b9e5c490bc680cc8 /engine/battle_anims
parent6e12a515031027ab0412ef37a3f6e3b24adfc736 (diff)
Rename Pals labels in WRAM bank 5
Diffstat (limited to 'engine/battle_anims')
-rw-r--r--engine/battle_anims/anim_commands.asm12
-rw-r--r--engine/battle_anims/bg_effects.asm16
2 files changed, 14 insertions, 14 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
diff --git a/engine/battle_anims/bg_effects.asm b/engine/battle_anims/bg_effects.asm
index 537757b14..bb8feb1f9 100644
--- a/engine/battle_anims/bg_effects.asm
+++ b/engine/battle_anims/bg_effects.asm
@@ -2583,13 +2583,13 @@ BGEffects_LoadBGPal0_OBPal1: ; c8e52 (32:4e52)
ld a, h
push bc
push af
- ld hl, BGPals
- ld de, UnknBGPals
+ ld hl, wBGPals2
+ ld de, wBGPals1
ld b, a
ld c, $1
call CopyPals
- ld hl, OBPals palette 1
- ld de, UnknOBPals palette 1
+ ld hl, wOBPals2 palette 1
+ ld de, wOBPals1 palette 1
pop af
ld b, a
ld c, $1
@@ -2610,13 +2610,13 @@ BGEffects_LoadBGPal1_OBPal0: ; c8e7f (32:4e7f)
ld a, h
push bc
push af
- ld hl, BGPals palette 1
- ld de, UnknBGPals palette 1
+ ld hl, wBGPals2 palette 1
+ ld de, wBGPals1 palette 1
ld b, a
ld c, $1
call CopyPals
- ld hl, OBPals ; OBPals
- ld de, UnknOBPals ; wd040
+ ld hl, wOBPals2
+ ld de, wOBPals1
pop af
ld b, a
ld c, $1