summaryrefslogtreecommitdiff
path: root/engine/palettes.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2014-06-14 04:12:40 -0700
committeryenatch <yenatch@gmail.com>2014-06-14 04:12:40 -0700
commit53ae0e93fad9f4c3eaef92f102b1eeb531e59d68 (patch)
treecfc859d11d462e8b4bab1968360a9a85cd83154d /engine/palettes.asm
parent9eefed45f7ff3b9ee6023fb0829528e34aa0729a (diff)
Use monster struct macros in wram. Rename related labels for consistency.
Diffstat (limited to 'engine/palettes.asm')
-rwxr-xr-xengine/palettes.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/palettes.asm b/engine/palettes.asm
index 33f241d1..5eae18bd 100755
--- a/engine/palettes.asm
+++ b/engine/palettes.asm
@@ -31,11 +31,11 @@ BuildBattlePalPacket: ; 71e06 (1c:5e06)
ld bc, $10
call CopyData
ld a, [W_PLAYERBATTSTATUS3]
- ld hl, W_PLAYERMONID
+ ld hl, wBattleMonSpecies
call DeterminePaletteID
ld b, a
ld a, [W_ENEMYBATTSTATUS3]
- ld hl, W_ENEMYMONID
+ ld hl, wEnemyMonSpecies2
call DeterminePaletteID
ld c, a
ld hl, wcf2e