diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-16 12:49:42 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-16 12:49:42 -0500 |
| commit | 4b5424368f09ff83bfdd2454a4fd06985f5ff54d (patch) | |
| tree | d8fdc47a1a6e3f871eaae6aaaa96b28e302725cd /macros | |
| parent | fb88b2ccf8f0897f95d25b82f95444ec775aa917 (diff) | |
Little cleanup on engine/scripting.asm
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/event.asm | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/macros/event.asm b/macros/event.asm index 0f495b4b8..18483abc3 100644 --- a/macros/event.asm +++ b/macros/event.asm @@ -293,9 +293,9 @@ checktime: macro db \1 ; time endm -checkmorn EQUS "checktime 1" -checkday EQUS "checktime 2" -checknite EQUS "checktime 4" +checkmorn EQUS "checktime 1 << MORN" +checkday EQUS "checktime 1 << DAY" +checknite EQUS "checktime 1 << NITE" enum checkpoke_command checkpoke: macro @@ -496,9 +496,9 @@ loadmovesprites: macro db loadmovesprites_command endm - enum loadbytec1ce_command -loadbytec1ce: macro - db loadbytec1ce_command + enum loadbytec2cf_command +loadbytec2cf: macro + db loadbytec2cf_command db \1 ; byte endm @@ -544,12 +544,14 @@ jumptextfaceplayer: macro dw \1 ; text_pointer endm +; IF _CRYSTAL enum farjumptext_command farjumptext: macro db farjumptext_command db BANK(\1) dw \1 endm +; ENDC enum jumptext_command jumptext: macro |