summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
authormid-kid <esteve.varela@gmail.com>2018-10-28 17:16:55 +0100
committermid-kid <esteve.varela@gmail.com>2018-11-05 22:26:18 +0100
commit940256569b84e71c5a448709d67964735ff4a5c9 (patch)
tree33e78661f5317aa93b54e501272bb5c5040a0574 /macros
parent0af682d38ae9e60095dc2a0e11830fc8fec15d02 (diff)
text_jump → text_far
The previous name for this was rather misleading. It isn't an actual jump like you'd expect the `jp` instruction to behave as. Instead, it behaves more like a `farcall`. This also makes it consistent with its current command ID name of `TX_FAR`.
Diffstat (limited to 'macros')
-rw-r--r--macros/legacy.asm3
-rw-r--r--macros/scripts/text.asm2
2 files changed, 4 insertions, 1 deletions
diff --git a/macros/legacy.asm b/macros/legacy.asm
index 35e6e9ccb..912d9023b 100644
--- a/macros/legacy.asm
+++ b/macros/legacy.asm
@@ -163,3 +163,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)