diff options
| -rw-r--r-- | home/text.asm | 52 | ||||
| -rw-r--r-- | macros/legacy.asm | 6 | ||||
| -rw-r--r-- | macros/scripts/text.asm | 6 |
3 files changed, 32 insertions, 32 deletions
diff --git a/home/text.asm b/home/text.asm index 49dc0e5d..f21b940c 100644 --- a/home/text.asm +++ b/home/text.asm @@ -603,29 +603,29 @@ DoTextUntilTerminator:: TextCommands:: ; entries correspond to TX_* constants (see macros/scripts/text.asm) - dw TextCommand_START ; TX_START - dw TextCommand_RAM ; TX_RAM - dw TextCommand_BCD ; TX_BCD - dw TextCommand_MOVE ; TX_MOVE - dw TextCommand_BOX ; TX_BOX - dw TextCommand_LOW ; TX_LOW - dw TextCommand_PROMPT_BUTTON ; TX_PROMPT_BUTTON - dw TextCommand_SCROLL ; TX_SCROLL - dw TextCommand_START_ASM ; TX_START_ASM - dw TextCommand_NUM ; TX_NUM - dw TextCommand_PAUSE ; TX_PAUSE - dw TextCommand_SOUND ; TX_SOUND_DEX_FANFARE_50_79 - dw TextCommand_DOTS ; TX_DOTS - dw TextCommand_LINK_PROMPT_BUTTON ; TX_LINK_PROMPT_BUTTON - dw TextCommand_SOUND ; TX_SOUND_DEX_FANFARE_20_49 - dw TextCommand_SOUND ; TX_SOUND_ITEM - dw TextCommand_SOUND ; TX_SOUND_CAUGHT_MON - dw TextCommand_SOUND ; TX_SOUND_DEX_FANFARE_80_109 - dw TextCommand_SOUND ; TX_SOUND_FANFARE - dw TextCommand_SOUND ; TX_SOUND_SLOT_MACHINE_START - dw TextCommand_STRINGBUFFER ; TX_STRINGBUFFER - dw TextCommand_DAY ; TX_DAY - dw TextCommand_FAR ; TX_FAR + dw TextCommand_START ; TX_START + dw TextCommand_RAM ; TX_RAM + dw TextCommand_BCD ; TX_BCD + dw TextCommand_MOVE ; TX_MOVE + dw TextCommand_BOX ; TX_BOX + dw TextCommand_LOW ; TX_LOW + dw TextCommand_PROMPT_BUTTON ; TX_PROMPT_BUTTON + dw TextCommand_SCROLL ; TX_SCROLL + dw TextCommand_START_ASM ; TX_START_ASM + dw TextCommand_NUM ; TX_NUM + dw TextCommand_PAUSE ; TX_PAUSE + dw TextCommand_SOUND ; TX_SOUND_DEX_FANFARE_50_79 + dw TextCommand_DOTS ; TX_DOTS + dw TextCommand_WAIT_BUTTON ; TX_WAIT_BUTTON + dw TextCommand_SOUND ; TX_SOUND_DEX_FANFARE_20_49 + dw TextCommand_SOUND ; TX_SOUND_ITEM + dw TextCommand_SOUND ; TX_SOUND_CAUGHT_MON + dw TextCommand_SOUND ; TX_SOUND_DEX_FANFARE_80_109 + dw TextCommand_SOUND ; TX_SOUND_FANFARE + dw TextCommand_SOUND ; TX_SOUND_SLOT_MACHINE_START + dw TextCommand_STRINGBUFFER ; TX_STRINGBUFFER + dw TextCommand_DAY ; TX_DAY + dw TextCommand_FAR ; TX_FAR TextCommand_START:: ; write text until "@" @@ -730,7 +730,7 @@ TextCommand_PROMPT_BUTTON:: ; wait for button press; show arrow ld a, [wLinkMode] cp LINK_COLOSSEUM - jp z, TextCommand_LINK_PROMPT_BUTTON + jp z, TextCommand_WAIT_BUTTON push hl call LoadBlinkingCursor @@ -877,8 +877,8 @@ TextCommand_DOTS:: pop hl ret -TextCommand_LINK_PROMPT_BUTTON:: -; wait for button press; display arrow +TextCommand_WAIT_BUTTON:: +; wait for button press; don't show arrow push hl push bc call PromptButton diff --git a/macros/legacy.asm b/macros/legacy.asm index 3f9fad20..016f0eff 100644 --- a/macros/legacy.asm +++ b/macros/legacy.asm @@ -316,9 +316,9 @@ start_asm EQUS "text_asm" deciram EQUS "text_decimal" interpret_data EQUS "text_pause" limited_interpret_data EQUS "text_dots" -text_waitbutton EQUS "text_promptbutton" -link_wait_button EQUS "text_linkpromptbutton" -text_linkwaitbutton EQUS "text_linkpromptbutton" +link_wait_button EQUS "text_waitbutton" +text_linkwaitbutton EQUS "text_waitbutton" +text_linkpromptbutton EQUS "text_waitbutton" current_day EQUS "text_today" text_jump EQUS "text_far" diff --git a/macros/scripts/text.asm b/macros/scripts/text.asm index bb1701f8..67acf3e7 100644 --- a/macros/scripts/text.asm +++ b/macros/scripts/text.asm @@ -84,9 +84,9 @@ text_dots: MACRO db \1 ENDM - enum TX_LINK_PROMPT_BUTTON ; $0d -text_linkpromptbutton: MACRO - db TX_LINK_PROMPT_BUTTON + enum TX_WAIT_BUTTON ; $0d +text_waitbutton: MACRO + db TX_WAIT_BUTTON ENDM enum TX_SOUND_DEX_FANFARE_20_49 ; $0e |