diff options
| author | yenatch <yenatch@gmail.com> | 2013-05-03 21:04:34 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2013-05-03 21:04:34 -0400 |
| commit | 8b1afa22651ebd548295dbe1c363bc8ab3ac5788 (patch) | |
| tree | 3810e61eaf83a5ed4ec0a04fa5e9a55008f816e4 | |
| parent | c539a96f7817fc234d600be2a98c9bc7ac3f3d6a (diff) | |
Fix a wram mislabel (EnemyDisabledMove)
| -rw-r--r-- | battle/effect_commands.asm | 10 | ||||
| -rw-r--r-- | wram.asm | 3 |
2 files changed, 7 insertions, 6 deletions
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 @@ -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 |