diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-18 01:12:47 -0500 |
|---|---|---|
| committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-18 01:12:47 -0500 |
| commit | 5695617d64335474ead8a7e25c539daebcc55fa5 (patch) | |
| tree | 0e9791a86b6aff83ab99aa9dd9878558f89fb824 /asm | |
| parent | 08579edbcd596c9659fe25490480c6f96e2b4288 (diff) | |
| parent | e95140270be790b03e693f539770abfd6473916e (diff) | |
Merge branch 'master' into multiplayer-stuff
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/macros/battle_script.inc | 12 | ||||
| -rw-r--r-- | asm/macros/event.inc | 2 |
2 files changed, 7 insertions, 7 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 diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 091c32a2a..fa0b3fa06 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -313,7 +313,7 @@ .endm @ Runs time based events. In FireRed, this command is a nop. - .macro dodailyevents + .macro dotimebasedevents .byte 0x2d .endm |