summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2019-05-25 13:54:29 -0400
committerGitHub <noreply@github.com>2019-05-25 13:54:29 -0400
commite8ddecd0eb1b79f2436f1ea8a0f2163bedec7550 (patch)
tree0d512816b512f747fe7c8e795df4ca34f8efaec0 /macros
parentb24cd55f968909c3ec29c6455a32463c987f3063 (diff)
parent476f9ba40d5b59fd724ac1234b34448df372d52c (diff)
Merge pull request #636 from mid-kid/patch
Small cleanups
Diffstat (limited to 'macros')
-rw-r--r--macros/enum.asm2
-rw-r--r--macros/scripts/events.asm2
2 files changed, 1 insertions, 3 deletions
diff --git a/macros/enum.asm b/macros/enum.asm
index 009400743..003445be7 100644
--- a/macros/enum.asm
+++ b/macros/enum.asm
@@ -14,7 +14,7 @@ endc
ENDM
enum: MACRO
-\1 = __enum__
+\1 EQU __enum__
__enum__ = __enum__ + __enumdir__
ENDM
diff --git a/macros/scripts/events.asm b/macros/scripts/events.asm
index 95cf1ecff..07b6dcd3a 100644
--- a/macros/scripts/events.asm
+++ b/macros/scripts/events.asm
@@ -536,13 +536,11 @@ jumptextfaceplayer: MACRO
dw \1 ; text_pointer
ENDM
-; if _CRYSTAL
enum farjumptext_command ; $52
farjumptext: MACRO
db farjumptext_command
dba \1
ENDM
-; endc
enum jumptext_command ; $53
jumptext: MACRO