pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

text_linkpromptbutton -> text_waitbutton

Browse Source 
Removes support for text_waitbutton as a legacy alias for text_promptbutton.
This commit is contained in:
Rangi 2020-07-06 12:55:31 -04:00
parent 6cdcde8b49
commit b3bd682366
4 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/text_commands.md
View File

@ -71,9 +71,9 @@ Play `SFX_DEX_FANFARE_50_79`.
Print *n* `"…"`s, pausing for 10 frames after each; interrupt if A or B is pressed. Print *n* `"…"`s, pausing for 10 frames after each; interrupt if A or B is pressed.
## `$0D`: `text_linkpromptbutton` ## `$0D`: `text_waitbutton`
Wait for button press; show arrow. Wait for button press; don't show arrow.
## `$0E`: `sound_dex_fanfare_20_49` ## `$0E`: `sound_dex_fanfare_20_49`

54
home/text.asm
View File

@ -687,29 +687,29 @@ DoTextUntilTerminator::
TextCommands:: TextCommands::
; entries correspond to TX_* constants (see macros/scripts/text.asm) ; entries correspond to TX_* constants (see macros/scripts/text.asm)
dw TextCommand_START ; TX_START dw TextCommand_START ; TX_START
dw TextCommand_RAM ; TX_RAM dw TextCommand_RAM ; TX_RAM
dw TextCommand_BCD ; TX_BCD dw TextCommand_BCD ; TX_BCD
dw TextCommand_MOVE ; TX_MOVE dw TextCommand_MOVE ; TX_MOVE
dw TextCommand_BOX ; TX_BOX dw TextCommand_BOX ; TX_BOX
dw TextCommand_LOW ; TX_LOW dw TextCommand_LOW ; TX_LOW
dw TextCommand_PROMPT_BUTTON ; TX_PROMPT_BUTTON dw TextCommand_PROMPT_BUTTON ; TX_PROMPT_BUTTON
dw TextCommand_SCROLL ; TX_SCROLL dw TextCommand_SCROLL ; TX_SCROLL
dw TextCommand_START_ASM ; TX_START_ASM dw TextCommand_START_ASM ; TX_START_ASM
dw TextCommand_NUM ; TX_NUM dw TextCommand_NUM ; TX_NUM
dw TextCommand_PAUSE ; TX_PAUSE dw TextCommand_PAUSE ; TX_PAUSE
dw TextCommand_SOUND ; TX_SOUND_DEX_FANFARE_50_79 dw TextCommand_SOUND ; TX_SOUND_DEX_FANFARE_50_79
dw TextCommand_DOTS ; TX_DOTS dw TextCommand_DOTS ; TX_DOTS
dw TextCommand_LINK_PROMPT_BUTTON ; TX_LINK_PROMPT_BUTTON dw TextCommand_WAIT_BUTTON ; TX_WAIT_BUTTON
dw TextCommand_SOUND ; TX_SOUND_DEX_FANFARE_20_49 dw TextCommand_SOUND ; TX_SOUND_DEX_FANFARE_20_49
dw TextCommand_SOUND ; TX_SOUND_ITEM dw TextCommand_SOUND ; TX_SOUND_ITEM
dw TextCommand_SOUND ; TX_SOUND_CAUGHT_MON dw TextCommand_SOUND ; TX_SOUND_CAUGHT_MON
dw TextCommand_SOUND ; TX_SOUND_DEX_FANFARE_80_109 dw TextCommand_SOUND ; TX_SOUND_DEX_FANFARE_80_109
dw TextCommand_SOUND ; TX_SOUND_FANFARE dw TextCommand_SOUND ; TX_SOUND_FANFARE
dw TextCommand_SOUND ; TX_SOUND_SLOT_MACHINE_START dw TextCommand_SOUND ; TX_SOUND_SLOT_MACHINE_START
dw TextCommand_STRINGBUFFER ; TX_STRINGBUFFER dw TextCommand_STRINGBUFFER ; TX_STRINGBUFFER
dw TextCommand_DAY ; TX_DAY dw TextCommand_DAY ; TX_DAY
dw TextCommand_FAR ; TX_FAR dw TextCommand_FAR ; TX_FAR
TextCommand_START:: TextCommand_START::
; write text until "@" ; write text until "@"
@ -814,9 +814,9 @@ TextCommand_PROMPT_BUTTON::
; wait for button press; show arrow ; wait for button press; show arrow
ld a, [wLinkMode] ld a, [wLinkMode]
cp LINK_COLOSSEUM cp LINK_COLOSSEUM
jp z, TextCommand_LINK_PROMPT_BUTTON jp z, TextCommand_WAIT_BUTTON
cp LINK_MOBILE cp LINK_MOBILE
jp z, TextCommand_LINK_PROMPT_BUTTON jp z, TextCommand_WAIT_BUTTON
push hl push hl
call LoadBlinkingCursor call LoadBlinkingCursor
@ -970,8 +970,8 @@ TextCommand_DOTS::
pop hl pop hl
ret ret
TextCommand_LINK_PROMPT_BUTTON:: TextCommand_WAIT_BUTTON::
; wait for button press; display arrow ; wait for button press; don't show arrow
push hl push hl
push bc push bc
call PromptButton call PromptButton

6
macros/legacy.asm
View File

@ -317,9 +317,9 @@ start_asm EQUS "text_asm"
deciram EQUS "text_decimal" deciram EQUS "text_decimal"
interpret_data EQUS "text_pause" interpret_data EQUS "text_pause"
limited_interpret_data EQUS "text_dots" limited_interpret_data EQUS "text_dots"
text_waitbutton EQUS "text_promptbutton" link_wait_button EQUS "text_waitbutton"
link_wait_button EQUS "text_linkpromptbutton" text_linkwaitbutton EQUS "text_waitbutton"
text_linkwaitbutton EQUS "text_linkpromptbutton" text_linkpromptbutton EQUS "text_waitbutton"
current_day EQUS "text_today" current_day EQUS "text_today"
text_jump EQUS "text_far" text_jump EQUS "text_far"

6
macros/scripts/text.asm
View File

@ -84,9 +84,9 @@ text_dots: MACRO
db \1 db \1
ENDM ENDM
enum TX_LINK_PROMPT_BUTTON ; $0d enum TX_WAIT_BUTTON ; $0d
text_linkpromptbutton: MACRO text_waitbutton: MACRO
db TX_LINK_PROMPT_BUTTON db TX_WAIT_BUTTON
ENDM ENDM
enum TX_SOUND_DEX_FANFARE_20_49 ; $0e enum TX_SOUND_DEX_FANFARE_20_49 ; $0e