summaryrefslogtreecommitdiff
path: root/engine/palettes.asm
diff options
context:
space:
mode:
authorluckytyphlosion <alan.rj.huang@gmail.com>2015-11-28 17:09:19 -0500
committerluckytyphlosion <alan.rj.huang@gmail.com>2015-11-28 17:09:19 -0500
commit90c7b976dca2467f47c4916b3835414bb07cc4d1 (patch)
treef2acf7019573d3b708339c704c51b8ecca77b6ea /engine/palettes.asm
parent4cb785e0db4adb727ac1b92115ad3f74e414867f (diff)
engine/battle/moveEffects/substitute_effect.asm and ActivatePC
Also no more W_PLAYER/ENEMYBATTSTATUS
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 1b16f845..56b77411 100755
--- a/engine/palettes.asm
+++ b/engine/palettes.asm
@@ -30,7 +30,7 @@ SetPal_Battle: ; 71eda (1c:5eda)
ld de, wPalPacket
ld bc, $10
call CopyData
- ;ld a, [W_PLAYERBATTSTATUS3]
+ ;ld a, [wPlayerBattleStatus3]
ld hl, wBattleMonSpecies
ld a, [hl]
and a
@@ -42,7 +42,7 @@ SetPal_Battle: ; 71eda (1c:5eda)
.asm_71ef9
call DeterminePaletteID
ld b, a
- ;ld a, [W_ENEMYBATTSTATUS3]
+ ;ld a, [wEnemyBattleStatus3]
ld hl, wEnemyMonSpecies2
call DeterminePaletteID
ld c, a