diff options
| author | yenatch <yenatch@gmail.com> | 2018-01-22 01:06:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-22 01:06:48 -0500 |
| commit | c60f1331fef22b886adf3472d2b4f348832cfaf7 (patch) | |
| tree | 5a471fad61e406f5b3ca1aba67ced0186de01c52 /engine/battle/hidden_power.asm | |
| parent | f27f79488a460f0a89670f3611e1e9e175baf5d6 (diff) | |
| parent | 7fba864883732ccecb1221ae7ff97492d112362a (diff) | |
Merge pull request #456 from Rangi42/master
OAM data documentation; move more content into data/; move palettes into gfx/; more code+script constants; consistent map naming
Diffstat (limited to 'engine/battle/hidden_power.asm')
| -rw-r--r-- | engine/battle/hidden_power.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engine/battle/hidden_power.asm b/engine/battle/hidden_power.asm index c75a67ab3..a1d3957e4 100644 --- a/engine/battle/hidden_power.asm +++ b/engine/battle/hidden_power.asm @@ -16,12 +16,12 @@ HiddenPowerDamage: ; fbced ; Attack ld a, [hl] swap a - and 8 + and %1000 ; Defense ld b, a ld a, [hli] - and 8 + and %1000 srl a or b @@ -29,7 +29,7 @@ HiddenPowerDamage: ; fbced ld b, a ld a, [hl] swap a - and 8 + and %1000 srl a srl a or b @@ -37,7 +37,7 @@ HiddenPowerDamage: ; fbced ; Special ld b, a ld a, [hl] - and 8 + and %1000 srl a srl a srl a @@ -52,7 +52,7 @@ HiddenPowerDamage: ; fbced ; Add Special & 3 ld b, a ld a, [hld] - and 3 + and %0011 add b ; Divide by 2 and add 30 + 1 @@ -67,12 +67,12 @@ HiddenPowerDamage: ; fbced ; Def & 3 ld a, [hl] - and 3 + and %0011 ld b, a ; + (Atk & 3) << 2 ld a, [hl] - and 3 << 4 + and %0011 << 4 swap a add a add a |