diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-11-28 17:09:19 -0500 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-11-28 17:09:19 -0500 |
| commit | 90c7b976dca2467f47c4916b3835414bb07cc4d1 (patch) | |
| tree | f2acf7019573d3b708339c704c51b8ecca77b6ea /engine/battle/moveEffects/transform_effect.asm | |
| parent | 4cb785e0db4adb727ac1b92115ad3f74e414867f (diff) | |
engine/battle/moveEffects/substitute_effect.asm and ActivatePC
Also no more W_PLAYER/ENEMYBATTSTATUS
Diffstat (limited to 'engine/battle/moveEffects/transform_effect.asm')
| -rw-r--r-- | engine/battle/moveEffects/transform_effect.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/battle/moveEffects/transform_effect.asm b/engine/battle/moveEffects/transform_effect.asm index bf252600..d77f43a3 100644 --- a/engine/battle/moveEffects/transform_effect.asm +++ b/engine/battle/moveEffects/transform_effect.asm @@ -1,27 +1,27 @@ TransformEffect_: ; f637f (3d:637f) ld hl, wBattleMonSpecies ld de, wEnemyMonSpecies - ld bc, W_ENEMYBATTSTATUS3 - ld a, [W_ENEMYBATTSTATUS1] + ld bc, wEnemyBattleStatus3 + ld a, [wEnemyBattleStatus1] ld a, [H_WHOSETURN] and a jr nz, .hitTest ld hl, wEnemyMonSpecies ld de, wBattleMonSpecies - ld bc, W_PLAYERBATTSTATUS3 + ld bc, wPlayerBattleStatus3 ld [wPlayerMoveListIndex], a - ld a, [W_PLAYERBATTSTATUS1] + ld a, [wPlayerBattleStatus1] .hitTest bit Invulnerable, a ; is mon invulnerable to typical attacks? (fly/dig) jp nz, .failed push hl push de push bc - ld hl, W_PLAYERBATTSTATUS2 + ld hl, wPlayerBattleStatus2 ld a, [H_WHOSETURN] and a jr z, .transformEffect - ld hl, W_ENEMYBATTSTATUS2 + ld hl, wEnemyBattleStatus2 .transformEffect ; animation(s) played are different if target has Substitute up bit HasSubstituteUp, [hl] |