diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2019-02-14 10:35:12 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-14 10:35:12 -0600 |
| commit | e95140270be790b03e693f539770abfd6473916e (patch) | |
| tree | 0d0ce1ffba9b43c535d54e22b4abdcc893da0fbc /asm/macros/battle_script.inc | |
| parent | efc54948345235bdc7d2961d547498612ea8426c (diff) | |
| parent | cb5704453116c0a4277d15e298b8cfb7b44deeaa (diff) | |
Merge pull request #556 from DizzyEggg/patch-2
Fix two battle scripting macros
Diffstat (limited to 'asm/macros/battle_script.inc')
| -rw-r--r-- | asm/macros/battle_script.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc index 6b0e285b6..6370ef569 100644 --- a/asm/macros/battle_script.inc +++ b/asm/macros/battle_script.inc @@ -1341,15 +1341,15 @@ .endm .macro sethword dst:req, value:req - setbyte \dst, \value & 0xFF - setbyte \dst + 1, (\value >> 8) & 0xFF + setbyte \dst, (\value) & 0xFF + setbyte \dst + 1, ((\value) >> 8) & 0xFF .endm .macro setword dst:req, value:req - setbyte \dst, \value & 0xFF - setbyte \dst + 1, (\value >> 8) & 0xFF - setbyte \dst + 2, (\value >> 16) & 0xFF - setbyte \dst + 3, (\value >> 24) & 0xFF + setbyte \dst, (\value) & 0xFF + setbyte \dst + 1, ((\value) >> 8) & 0xFF + setbyte \dst + 2, ((\value) >> 16) & 0xFF + setbyte \dst + 3, ((\value) >> 24) & 0xFF .endm .macro copybyte dst:req, src:req |