summaryrefslogtreecommitdiff
path: root/engine/battle/battle_transition.asm
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/battle_transition.asm
parent6e12a515031027ab0412ef37a3f6e3b24adfc736 (diff)
Rename Pals labels in WRAM bank 5
Diffstat (limited to 'engine/battle/battle_transition.asm')
-rw-r--r--engine/battle/battle_transition.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/engine/battle/battle_transition.asm b/engine/battle/battle_transition.asm
index f2fef5553..85ba44072 100644
--- a/engine/battle/battle_transition.asm
+++ b/engine/battle/battle_transition.asm
@@ -26,7 +26,7 @@ Predef_StartBattle: ; 8c20f
ld a, $5
ld [rSVBK], a
- ld hl, UnknBGPals
+ ld hl, wBGPals1
ld bc, 8 palettes
xor a
call ByteFill
@@ -651,11 +651,11 @@ StartTrainerBattle_LoadPokeBallGraphics: ; 8c5dc (23:45dc)
ld [rSVBK], a
call .copypals
push hl
- ld de, UnknBGPals palette PAL_BG_TEXT
+ ld de, wBGPals1 palette PAL_BG_TEXT
ld bc, 1 palettes
call CopyBytes
pop hl
- ld de, BGPals palette PAL_BG_TEXT
+ ld de, wBGPals2 palette PAL_BG_TEXT
ld bc, 1 palettes
call CopyBytes
pop af
@@ -670,17 +670,17 @@ StartTrainerBattle_LoadPokeBallGraphics: ; 8c5dc (23:45dc)
ret
.copypals ; 8c677 (23:4677)
- ld de, UnknBGPals palette PAL_BG_TEXT
+ ld de, wBGPals1 palette PAL_BG_TEXT
call .copy
- ld de, BGPals palette PAL_BG_TEXT
+ ld de, wBGPals2 palette PAL_BG_TEXT
call .copy
- ld de, UnknOBPals palette PAL_OW_TREE
+ ld de, wOBPals1 palette PAL_OW_TREE
call .copy
- ld de, OBPals palette PAL_OW_TREE
+ ld de, wOBPals2 palette PAL_OW_TREE
call .copy
- ld de, UnknOBPals palette PAL_OW_ROCK
+ ld de, wOBPals1 palette PAL_OW_ROCK
call .copy
- ld de, OBPals palette PAL_OW_ROCK
+ ld de, wOBPals2 palette PAL_OW_ROCK
.copy ; 8c698 (23:4698)
push hl