diff options
| author | yenatch <yenatch@gmail.com> | 2015-04-09 12:25:29 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-04-09 12:25:29 -0400 |
| commit | 941d2b9eb8a59b42ea71a08b34b25c06477cf36d (patch) | |
| tree | b304682416ef55ddb763759cab6d03aeb1af5f55 /engine/battle/moveEffects/reflect_light_screen_effect.asm | |
| parent | c2efe700ac1c5cca88bac710b98388a99665741e (diff) | |
| parent | 9739c26ed7fa89492cbc8609445d292ced48ee65 (diff) | |
Merge pull request #93 from xCrystal/master
Document some move effects
Diffstat (limited to 'engine/battle/moveEffects/reflect_light_screen_effect.asm')
| -rw-r--r-- | engine/battle/moveEffects/reflect_light_screen_effect.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/battle/moveEffects/reflect_light_screen_effect.asm b/engine/battle/moveEffects/reflect_light_screen_effect.asm index 39a2c154..7da98699 100644 --- a/engine/battle/moveEffects/reflect_light_screen_effect.asm +++ b/engine/battle/moveEffects/reflect_light_screen_effect.asm @@ -3,10 +3,10 @@ ReflectLightScreenEffect_: ; 3bb97 (e:7b97) ld de, W_PLAYERMOVEEFFECT ld a, [H_WHOSETURN] and a - jr z, .asm_3bba8 + jr z, .reflectLightScreenEffect ld hl, W_ENEMYBATTSTATUS3 ld de, W_ENEMYMOVEEFFECT -.asm_3bba8 +.reflectLightScreenEffect ld a, [de] cp LIGHT_SCREEN_EFFECT jr nz, .reflect @@ -14,13 +14,13 @@ ReflectLightScreenEffect_: ; 3bb97 (e:7b97) jr nz, .moveFailed set HasLightScreenUp, [hl] ; mon is now protected by light screen ld hl, LightScreenProtectedText - jr .asm_3bbc1 + jr .playAnim .reflect bit HasReflectUp, [hl] ; is mon already protected by reflect? jr nz, .moveFailed set HasReflectUp, [hl] ; mon is now protected by reflect ld hl, ReflectGainedArmorText -.asm_3bbc1 +.playAnim push hl ld hl, PlayCurrentMoveAnimation call BankswitchEtoF |