summaryrefslogtreecommitdiff
path: root/battle/effect_commands.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2014-06-23 12:45:30 -0700
committeryenatch <yenatch@gmail.com>2014-06-23 12:45:30 -0700
commit32a5f21cc7c35b2580ae2c5f3709676dd8ca8405 (patch)
treec6e5bb6c91663ac888cfd4277d0e648c6a5c6435 /battle/effect_commands.asm
parent6fee80528af6be1c22fee42e2560023823f7da8f (diff)
More PartyMon labels for relative addressing.
Diffstat (limited to 'battle/effect_commands.asm')
-rw-r--r--battle/effect_commands.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm
index dc82b4500..ab1113237 100644
--- a/battle/effect_commands.asm
+++ b/battle/effect_commands.asm
@@ -5092,7 +5092,7 @@ BattleCommand4a: ; 35c0f
ld a, [AttackMissed]
and a
jp nz, .asm_35c91
- ld bc, $0030
+ ld bc, PartyMon2 - PartyMon1 ; ????
ld hl, EnemyMonMoves
ld a, [hBattleTurn]
and a
@@ -5106,7 +5106,7 @@ BattleCommand4a: ; 35c0f
cp STRUGGLE
jr z, .asm_35c91
ld b, a
- ld c, $ff
+ ld c, -1
.asm_35c33
inc c
ld a, [hli]
@@ -5114,9 +5114,9 @@ BattleCommand4a: ; 35c0f
jr nz, .asm_35c33
ld [$d265], a
dec hl
- ld b, $0
+ ld b, 0
push bc
- ld c, $6
+ ld c, BattleMonPP - BattleMonMoves
add hl, bc
pop bc
ld a, [hl]
@@ -7380,7 +7380,7 @@ Function36994: ; 36994
ld a, [PartyCount]
ld d, a
ld e, 0
- ld bc, $30
+ ld bc, PartyMon2 - PartyMon1
.asm_3699d
ld a, [CurBattleMon]
cp e