summaryrefslogtreecommitdiff
path: root/macros/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'macros/scripts')
-rwxr-xr-xmacros/scripts/audio.asm3
-rwxr-xr-xmacros/scripts/events.asm4
-rwxr-xr-xmacros/scripts/text.asm2
3 files changed, 4 insertions, 5 deletions
diff --git a/macros/scripts/audio.asm b/macros/scripts/audio.asm
index 8a250c63..4f4d084c 100755
--- a/macros/scripts/audio.asm
+++ b/macros/scripts/audio.asm
@@ -141,8 +141,7 @@ ENDM
; stored in big endian
tempo: MACRO
db $ED
- db \1 / $100
- db \1 % $100
+ db HIGH(\1), LOW(\1)
ENDM
; arguments: left output enable mask, right output enable mask
diff --git a/macros/scripts/events.asm b/macros/scripts/events.asm
index 9e84ec62..8087c5c2 100755
--- a/macros/scripts/events.asm
+++ b/macros/scripts/events.asm
@@ -185,7 +185,7 @@ SetEvents: MACRO
SetEvent \1
REPT _NARG - 1
SetEventReuseHL \2
- shift
+ SHIFT
ENDR
ENDM
@@ -237,7 +237,7 @@ ResetEvents: MACRO
ResetEvent \1
REPT _NARG - 1
ResetEventReuseHL \2
- shift
+ SHIFT
ENDR
ENDM
diff --git a/macros/scripts/text.asm b/macros/scripts/text.asm
index efecdd1c..261ab5f4 100755
--- a/macros/scripts/text.asm
+++ b/macros/scripts/text.asm
@@ -200,7 +200,7 @@ script_mart: MACRO
db _NARG ; number of items
REPT _NARG
db \1 ; item id
- shift
+ SHIFT
ENDR
db -1 ; end
ENDM