diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2018-11-11 17:07:17 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-11 17:07:17 -0500 |
| commit | ffd2b709023d4466c29a228b631db06284e04891 (patch) | |
| tree | d2db5b0200e7a5fe783143e6f2cdbd2fd6a1fca2 /macros | |
| parent | ab2f46baefda1eac7d2e71929f17525f2a4a5afd (diff) | |
| parent | a469a92c2633665c011e5c540e1cc593544abe11 (diff) | |
Merge pull request #573 from mid-kid/master
text_jump → text_far
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/legacy.asm | 3 | ||||
| -rw-r--r-- | macros/scripts/text.asm | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/macros/legacy.asm b/macros/legacy.asm index 7f53dd565..ceb944e85 100644 --- a/macros/legacy.asm +++ b/macros/legacy.asm @@ -164,3 +164,6 @@ step_sleep_5 EQUS "step_sleep 5" step_sleep_6 EQUS "step_sleep 6" step_sleep_7 EQUS "step_sleep 7" step_sleep_8 EQUS "step_sleep 8" + +; macros/scripts/text.asm +text_jump EQUS "text_far" diff --git a/macros/scripts/text.asm b/macros/scripts/text.asm index d1fec35db..3c23c4b16 100644 --- a/macros/scripts/text.asm +++ b/macros/scripts/text.asm @@ -131,7 +131,7 @@ current_day: MACRO ENDM enum TX_FAR ; $16 -text_jump: MACRO +text_far: MACRO db TX_FAR dw \1 db BANK(\1) |