ref: 8b1afa22651ebd548295dbe1c363bc8ab3ac5788
parent: c539a96f7817fc234d600be2a98c9bc7ac3f3d6a
author: yenatch <yenatch@gmail.com>
date: Fri May 3 17:04:34 EDT 2013
Fix a wram mislabel (EnemyDisabledMove)
--- a/battle/effect_commands.asm
+++ b/battle/effect_commands.asm
@@ -507,7 +507,7 @@
jr nz, .CheckConfused
ld [hl], a
- ld [EnemyEncoredMove], a
+ ld [EnemyDisabledMove], a
; 'disabled no more!'
ld hl, DisabledNoMoreText
@@ -612,7 +612,7 @@
.CheckDisabledMove
; We can't disable a move that doesn't exist.
- ld a, [EnemyEncoredMove]
+ ld a, [EnemyDisabledMove]
and a
jr z, .CheckParalyzed
@@ -4990,7 +4990,7 @@
ld d, a
jr z, .asm_35b4f ; 35b46 $7
ld hl, EnemyMonMove2
- ld a, [EnemyEncoredMove]
+ ld a, [EnemyDisabledMove]
ld d, a
.asm_35b4f
ld a, BATTLE_VARS_STATUS
@@ -5059,7 +5059,7 @@
ld a, [DisabledMove]
jr z, .asm_35bbe
- ld a, [EnemyEncoredMove]
+ ld a, [EnemyDisabledMove]
.asm_35bbe
ld b, a
ld a, $10
@@ -8983,7 +8983,7 @@
xor a
ld [EnemyDisableCount], a
- ld [EnemyEncoredMove], a
+ ld [EnemyDisabledMove], a
ret
.player
--- a/wram.asm
+++ b/wram.asm
@@ -690,7 +690,7 @@
DisabledMove: ; c6f5
ds 1
-EnemyEncoredMove: ; c6f6
+EnemyDisabledMove: ; c6f6
ds 1
ds 1
@@ -1082,6 +1082,7 @@
ds 1
EnemyMonMove4: ; d20b
ds 1
+EnemyMonMovesEnd
EnemyMonDVs:
EnemyMonAtkDefDV: ; d20c
--
⑨