diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-17 08:37:33 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-17 08:37:33 -0400 |
| commit | 9a48c7ba6bfe534082b372a26c836c789c66c26c (patch) | |
| tree | 7b3ae89ed91aa0f34c9b330bf2a8823a6d278dad /macros | |
| parent | a6916c47b02d440c0127f4f135107875607bea48 (diff) | |
return → endcallback, reloadandreturn → reloadend
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/legacy.asm | 2 | ||||
| -rw-r--r-- | macros/scripts/events.asm | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/macros/legacy.asm b/macros/legacy.asm index 016f0eff..18273ee3 100644 --- a/macros/legacy.asm +++ b/macros/legacy.asm @@ -113,6 +113,8 @@ if_not_equal EQUS "ifnotequal" if_greater_than EQUS "ifgreater" if_less_than EQUS "ifless" end_all EQUS "endall" +return EQUS "endcallback" +reloadandreturn EQUS "reloadend" checkmaptriggers EQUS "checkmapscene" domaptrigger EQUS "setmapscene" diff --git a/macros/scripts/events.asm b/macros/scripts/events.asm index dc348178..606dd5dd 100644 --- a/macros/scripts/events.asm +++ b/macros/scripts/events.asm @@ -894,9 +894,9 @@ stopandsjump: MACRO dw \1 ; pointer ENDM - const return_command ; $8f -return: MACRO - db return_command + const endcallback_command ; $8f +endcallback: MACRO + db endcallback_command ENDM const end_command ; $90 @@ -904,9 +904,9 @@ end: MACRO db end_command ENDM - const reloadandreturn_command ; $91 -reloadandreturn: MACRO - db reloadandreturn_command + const reloadend_command ; $91 +reloadend: MACRO + db reloadend_command db \1 ; which_method ENDM |