diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-01-12 18:45:02 -0600 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-01-12 18:45:02 -0600 |
| commit | 5914540ba780d7936fd6624d6fde2d67a9f7a773 (patch) | |
| tree | a1ce27018f39d98f49d89468df426d0291e18560 /engine/battle/moveEffects/conversion_effect.asm | |
| parent | ccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff) | |
| parent | 8a5a7d8e68538b727e0c166488265f395603366e (diff) | |
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'engine/battle/moveEffects/conversion_effect.asm')
| -rw-r--r-- | engine/battle/moveEffects/conversion_effect.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/battle/moveEffects/conversion_effect.asm b/engine/battle/moveEffects/conversion_effect.asm index e4c5b4bd..8e895361 100644 --- a/engine/battle/moveEffects/conversion_effect.asm +++ b/engine/battle/moveEffects/conversion_effect.asm @@ -3,13 +3,13 @@ ConversionEffect_: ; 139a3 (4:79a3) ld de, wBattleMonType1 ld a, [H_WHOSETURN] and a - ld a, [W_ENEMYBATTSTATUS1] + ld a, [wEnemyBattleStatus1] jr z, .conversionEffect push hl ld h, d ld l, e pop de - ld a, [W_PLAYERBATTSTATUS1] + ld a, [wPlayerBattleStatus1] .conversionEffect bit Invulnerable, a ; is mon immune to typical attacks (dig/fly) jr nz, PrintButItFailedText |