From d83aefb30af180eae03bbd65878e8de45166f3d0 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Fri, 12 Jan 2018 01:40:20 -0500 Subject: Use more constants in scripts --- macros/scripts/events.asm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'macros/scripts/events.asm') diff --git a/macros/scripts/events.asm b/macros/scripts/events.asm index 694a7cd12..40a5bbf46 100644 --- a/macros/scripts/events.asm +++ b/macros/scripts/events.asm @@ -424,9 +424,9 @@ readcoins: MACRO db \1 ; memory ENDM - enum RAM2MEM_command ; $3f -RAM2MEM: MACRO - db RAM2MEM_command + enum vartomem_command ; $3f +vartomem: MACRO + db vartomem_command db \1 ; memory ENDM @@ -483,7 +483,11 @@ ENDM enum refreshscreen_command ; $48 refreshscreen: MACRO db refreshscreen_command +if _NARG == 1 db \1 ; dummy +else + db 0 +endc ENDM enum closetext_command ; $49 -- cgit v1.2.3 From 6c7e88513a9b759584de2b50c5b67ecf94203607 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 15 Jan 2018 14:11:11 -0500 Subject: Long lists of db/dw series with struct-defining macros belong in data/ --- macros/scripts/events.asm | 5 ----- 1 file changed, 5 deletions(-) (limited to 'macros/scripts/events.asm') diff --git a/macros/scripts/events.asm b/macros/scripts/events.asm index 40a5bbf46..9bca1c004 100644 --- a/macros/scripts/events.asm +++ b/macros/scripts/events.asm @@ -101,11 +101,6 @@ special: MACRO dw (\1Special - SpecialsPointers) / 3 ENDM -add_special: MACRO -\1Special:: - dba \1 -ENDM - enum ptcallasm_command ; $10 ptcallasm: MACRO db ptcallasm_command -- cgit v1.2.3