diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-12-06 16:08:20 -0500 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-12-06 16:08:20 -0500 |
| commit | 6ddc025942a03802acf6a2731d7b46f2672ae74f (patch) | |
| tree | 97cf0f4bca92254f5e6d32bd78505bca9f6cda94 /engine/battle/moveEffects | |
| parent | c3911c80cf8400f81518532c13912c647b81b880 (diff) | |
engine/battle/trainer_ai.asm
Diffstat (limited to 'engine/battle/moveEffects')
| -rw-r--r-- | engine/battle/moveEffects/drain_hp_effect.asm | 2 | ||||
| -rw-r--r-- | engine/battle/moveEffects/haze_effect.asm | 2 | ||||
| -rw-r--r-- | engine/battle/moveEffects/heal_effect.asm | 2 | ||||
| -rw-r--r-- | engine/battle/moveEffects/paralyze_effect.asm | 2 | ||||
| -rw-r--r-- | engine/battle/moveEffects/recoil_effect.asm | 2 | ||||
| -rw-r--r-- | engine/battle/moveEffects/reflect_light_screen_effect.asm | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/engine/battle/moveEffects/drain_hp_effect.asm b/engine/battle/moveEffects/drain_hp_effect.asm index 0dc02e46..46d61196 100644 --- a/engine/battle/moveEffects/drain_hp_effect.asm +++ b/engine/battle/moveEffects/drain_hp_effect.asm @@ -87,7 +87,7 @@ DrainHPEffect_: ; 76e7 (1:76e7) and a ld a, [W_PLAYERMOVEEFFECT] jr z, .next3 - ld a, [W_ENEMYMOVEEFFECT] + ld a, [wEnemyMoveEffect] .next3 cp DREAM_EATER_EFFECT jr nz, .printText diff --git a/engine/battle/moveEffects/haze_effect.asm b/engine/battle/moveEffects/haze_effect.asm index de36ac36..e7e7a68a 100644 --- a/engine/battle/moveEffects/haze_effect.asm +++ b/engine/battle/moveEffects/haze_effect.asm @@ -32,7 +32,7 @@ HazeEffect_: ; 139a4 (4:79a4) .cureVolatileStatuses xor a ld [W_PLAYERDISABLEDMOVE], a - ld [W_ENEMYDISABLEDMOVE], a + ld [wEnemyDisabledMove], a ld hl, wPlayerDisabledMoveNumber ld [hli], a ld [hl], a diff --git a/engine/battle/moveEffects/heal_effect.asm b/engine/battle/moveEffects/heal_effect.asm index dbce6ebb..7a1983d7 100644 --- a/engine/battle/moveEffects/heal_effect.asm +++ b/engine/battle/moveEffects/heal_effect.asm @@ -7,7 +7,7 @@ HealEffect_: ; f62ba (3d:62ba) jr z, .healEffect ld de, wEnemyMonHP ld hl, wEnemyMonMaxHP - ld a, [W_ENEMYMOVENUM] + ld a, [wEnemyMoveNum] .healEffect ld b, a ld a, [de] diff --git a/engine/battle/moveEffects/paralyze_effect.asm b/engine/battle/moveEffects/paralyze_effect.asm index 9b364425..a8d39629 100644 --- a/engine/battle/moveEffects/paralyze_effect.asm +++ b/engine/battle/moveEffects/paralyze_effect.asm @@ -5,7 +5,7 @@ ParalyzeEffect_: ; f6562 (3d:6562) and a jp z, .next ld hl, wBattleMonStatus - ld de, W_ENEMYMOVETYPE + ld de, wEnemyMoveType .next ld a, [hl] and a ; does the target already have a status ailment? diff --git a/engine/battle/moveEffects/recoil_effect.asm b/engine/battle/moveEffects/recoil_effect.asm index 76394ddf..984feba7 100644 --- a/engine/battle/moveEffects/recoil_effect.asm +++ b/engine/battle/moveEffects/recoil_effect.asm @@ -4,7 +4,7 @@ RecoilEffect_: ; 138f6 (4:78f6) ld a, [W_PLAYERMOVENUM] ld hl, wBattleMonMaxHP jr z, .recoilEffect - ld a, [W_ENEMYMOVENUM] + ld a, [wEnemyMoveNum] ld hl, wEnemyMonMaxHP .recoilEffect ld d, a diff --git a/engine/battle/moveEffects/reflect_light_screen_effect.asm b/engine/battle/moveEffects/reflect_light_screen_effect.asm index 12bb3367..c3f4de7f 100644 --- a/engine/battle/moveEffects/reflect_light_screen_effect.asm +++ b/engine/battle/moveEffects/reflect_light_screen_effect.asm @@ -5,7 +5,7 @@ ReflectLightScreenEffect_: ; f645d (3d:645d) and a jr z, .reflectLightScreenEffect ld hl, wEnemyBattleStatus3 - ld de, W_ENEMYMOVEEFFECT + ld de, wEnemyMoveEffect .reflectLightScreenEffect ld a, [de] cp LIGHT_SCREEN_EFFECT |