diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index 78a03a899..39f6b6a6a 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -507,7 +507,7 @@ CheckEnemyTurn: ; 3421f jr nz, .CheckConfused ld [hl], a - ld [EnemyEncoredMove], a + ld [EnemyDisabledMove], a ; 'disabled no more!' ld hl, DisabledNoMoreText @@ -612,7 +612,7 @@ CheckEnemyTurn: ; 3421f .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 @@ BattleCommand48: ; 35b33 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 @@ BattleCommand48: ; 35b33 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 @@ Function0x372e7: ; 372e7 xor a ld [EnemyDisableCount], a - ld [EnemyEncoredMove], a + ld [EnemyDisabledMove], a ret .player diff --git a/wram.asm b/wram.asm index 5da646c47..69e089ef5 100644 --- a/wram.asm +++ b/wram.asm @@ -690,7 +690,7 @@ AlreadyDisobeyed: ; c6f4 DisabledMove: ; c6f5 ds 1 -EnemyEncoredMove: ; c6f6 +EnemyDisabledMove: ; c6f6 ds 1 ds 1 @@ -1082,6 +1082,7 @@ EnemyMonMove3: ; d20a ds 1 EnemyMonMove4: ; d20b ds 1 +EnemyMonMovesEnd EnemyMonDVs: EnemyMonAtkDefDV: ; d20c