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/battle/moveEffects/substitute_effect.asm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'engine/battle/moveEffects/substitute_effect.asm') diff --git a/engine/battle/moveEffects/substitute_effect.asm b/engine/battle/moveEffects/substitute_effect.asm index 54b752ef..a4cd0264 100644 --- a/engine/battle/moveEffects/substitute_effect.asm +++ b/engine/battle/moveEffects/substitute_effect.asm @@ -1,15 +1,15 @@ -SubstituteEffect_: ; 17dad (5:7dad) +SubstituteEffect_: ; 17c31 (5:7c31) ld c, 50 call DelayFrames ld hl, wBattleMonMaxHP ld de, wPlayerSubstituteHP - ld bc, W_PLAYERBATTSTATUS2 + ld bc, wPlayerBattleStatus2 ld a, [H_WHOSETURN] and a jr z, .notEnemy ld hl, wEnemyMonMaxHP ld de, wEnemySubstituteHP - ld bc, W_ENEMYBATTSTATUS2 + ld bc, wEnemyBattleStatus2 .notEnemy ld a, [bc] bit HasSubstituteUp, a ; user already has substitute? @@ -64,14 +64,14 @@ SubstituteEffect_: ; 17dad (5:7dad) .printText jp PrintText -SubstituteText: ; 17e1d (5:7e1d) +SubstituteText: ; 17ca1 (5:7ca1) TX_FAR _SubstituteText db "@" -HasSubstituteText: ; 17e22 (5:7e22) +HasSubstituteText: ; 17ca6 (5:7ca6) TX_FAR _HasSubstituteText db "@" -TooWeakSubstituteText: ; 17e27 (5:7e27) +TooWeakSubstituteText: ; 17cab (5:7cab) TX_FAR _TooWeakSubstituteText db "@" -- cgit v1.3.1-sl0p