From 90c7b976dca2467f47c4916b3835414bb07cc4d1 Mon Sep 17 00:00:00 2001 From: luckytyphlosion Date: Sat, 28 Nov 2015 17:09:19 -0500 Subject: engine/battle/moveEffects/substitute_effect.asm and ActivatePC Also no more W_PLAYER/ENEMYBATTSTATUS --- engine/palettes.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engine/palettes.asm') 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 -- cgit v1.3.1-sl0p