From 449fb25f2372c8d51fc156d0eeeffa4023ec38b8 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Tue, 12 Feb 2019 00:40:34 -0600 Subject: Clear up misnamed time-based flags and functions --- asm/macros/event.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'asm') 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 -- cgit v1.2.3 From cb5704453116c0a4277d15e298b8cfb7b44deeaa Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Thu, 14 Feb 2019 13:05:49 +0100 Subject: Fix two battle scripting macros --- asm/macros/battle_script.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'asm') 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 -- cgit v1.2.3