aboutsummaryrefslogtreecommitdiffstats
path: root/engine/battle/5.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/battle/5.asm
parentUse MAX_LEVEL instead of 100/$64 (diff)
downloadpokeyellow-53ae0e93fad9f4c3eaef92f102b1eeb531e59d68.tar.gz
pokeyellow-53ae0e93fad9f4c3eaef92f102b1eeb531e59d68.tar.xz
pokeyellow-53ae0e93fad9f4c3eaef92f102b1eeb531e59d68.zip
Use monster struct macros in wram. Rename related labels for consistency.
Diffstat (limited to 'engine/battle/5.asm')
-rwxr-xr-xengine/battle/5.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/battle/5.asm b/engine/battle/5.asm
index 18e74ff1..6c7a642e 100755
--- a/engine/battle/5.asm
+++ b/engine/battle/5.asm
@@ -1,13 +1,13 @@
SubstituteEffectHandler: ; 17dad (5:7dad)
ld c, 50
call DelayFrames
- ld hl, W_PLAYERMONMAXHP
+ ld hl, wBattleMonMaxHP
ld de, wPlayerSubstituteHP
ld bc, W_PLAYERBATTSTATUS2
ld a, [$fff3] ;whose turn?
and a
jr z, .notEnemy
- ld hl, W_ENEMYMONMAXHP
+ ld hl, wEnemyMonMaxHP
ld de, wEnemySubstituteHP
ld bc, W_ENEMYBATTSTATUS2
.notEnemy