diff --git a/engine/events/hidden_objects/school_notebooks.asm b/engine/events/hidden_objects/school_notebooks.asm
index 9fccf6c0..96a44ab5 100644
--- a/engine/events/hidden_objects/school_notebooks.asm
+++ b/engine/events/hidden_objects/school_notebooks.asm
@@ -7,7 +7,7 @@ PrintNotebookText:
 
 TMNotebook::
 	text_far TMNotebookText
-	text_linkpromptbutton
+	text_waitbutton
 	text_end
 
 ViridianSchoolNotebook::
@@ -45,7 +45,7 @@ TurnPageText:
 
 ViridianSchoolNotebookText5:
 	text_far _ViridianSchoolNotebookText5
-	text_linkpromptbutton
+	text_waitbutton
 	text_end
 
 ViridianSchoolNotebookText1:
diff --git a/engine/events/prize_menu.asm b/engine/events/prize_menu.asm
index c79fdbbc..0030aafb 100755
--- a/engine/events/prize_menu.asm
+++ b/engine/events/prize_menu.asm
@@ -44,7 +44,7 @@ CeladonPrizeMenu::
 
 RequireCoinCaseTextPtr:
 	text_far _RequireCoinCaseText
-	text_linkpromptbutton
+	text_waitbutton
 	text_end
 
 ExchangeCoinsForPrizesTextPtr:
@@ -264,7 +264,7 @@ UnknownPrizeData:
 
 HereYouGoTextPtr:
 	text_far _HereYouGoText
-	text_linkpromptbutton
+	text_waitbutton
 	text_end
 
 SoYouWantPrizeTextPtr:
@@ -273,17 +273,17 @@ SoYouWantPrizeTextPtr:
 
 SorryNeedMoreCoinsText:
 	text_far _SorryNeedMoreCoinsText
-	text_linkpromptbutton
+	text_waitbutton
 	text_end
 
 PrizeRoomBagIsFullTextPtr:
 	text_far _OopsYouDontHaveEnoughRoomText
-	text_linkpromptbutton
+	text_waitbutton
 	text_end
 
 OhFineThenTextPtr:
 	text_far _OhFineThenText
-	text_linkpromptbutton
+	text_waitbutton
 	text_end
 
 GetPrizeMonLevel:
diff --git a/engine/menus/oaks_pc.asm b/engine/menus/oaks_pc.asm
index cdb97aca..7743e5df 100755
--- a/engine/menus/oaks_pc.asm
+++ b/engine/menus/oaks_pc.asm
@@ -20,7 +20,7 @@ GetDexRatedText:
 
 ClosedOaksPCText:
 	text_far _ClosedOaksPCText
-	text_linkpromptbutton
+	text_waitbutton
 	text_end
 
 AccessedOaksPCText:
diff --git a/home/text.asm b/home/text.asm
index d0fc8042..2047eaaa 100644
--- a/home/text.asm
+++ b/home/text.asm
@@ -431,7 +431,7 @@ TextCommand_PROMPT_BUTTON::
 ; wait for button press; show arrow
 	ld a, [wLinkState]
 	cp LINK_STATE_BATTLING
-	jp z, TextCommand_LINK_PROMPT_BUTTON
+	jp z, TextCommand_WAIT_BUTTON
 	ld a, "▼"
 	Coorda 18, 16 ; place down arrow in lower right corner of dialogue text box
 	push bc
@@ -579,8 +579,8 @@ TextCommand_DOTS::
 	pop hl
 	jp NextTextCommand
 
-TextCommand_LINK_PROMPT_BUTTON::
-; wait for button press; display arrow
+TextCommand_WAIT_BUTTON::
+; wait for button press; don't show arrow
 	push bc
 	call ManualTextScroll
 	pop bc
@@ -615,18 +615,18 @@ TextCommand_FAR::
 
 TextCommandJumpTable::
 ; 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_GET_ITEM_1 (also handles other TX_SOUND_* commands)
-	dw TextCommand_DOTS               ; TX_DOTS
-	dw TextCommand_LINK_PROMPT_BUTTON ; TX_LINK_PROMPT_BUTTON
+	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_GET_ITEM_1 (also handles other TX_SOUND_* commands)
+	dw TextCommand_DOTS          ; TX_DOTS
+	dw TextCommand_WAIT_BUTTON   ; TX_WAIT_BUTTON
 	; greater TX_* constants are handled directly by NextTextCommand
diff --git a/macros/scripts/text.asm b/macros/scripts/text.asm
index 4bf2c1bc..efecdd1c 100755
--- a/macros/scripts/text.asm
+++ b/macros/scripts/text.asm
@@ -92,9 +92,9 @@ text_dots: MACRO
 	db \1 ; number of ellipses to draw
 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_POKEDEX_RATING ; $0e
diff --git a/scripts/CeladonMartRoof.asm b/scripts/CeladonMartRoof.asm
index c2bbd169..f38bb984 100755
--- a/scripts/CeladonMartRoof.asm
+++ b/scripts/CeladonMartRoof.asm
@@ -139,48 +139,48 @@ CeladonMartRoofText_484ee:
 
 CeladonMartRoofText_484f3:
 	text_far _CeladonMartRoofText_484f3
-	text_linkpromptbutton
+	text_waitbutton
 	text_end
 
 CeladonMartRoofText_484f9:
 	text_far _CeladonMartRoofText_484f9
 	sound_get_item_1
 	text_far _CeladonMartRoofText_484fe
-	text_linkpromptbutton
+	text_waitbutton
 	text_end
 
 CeladonMartRoofText_48504:
 	text_far _CeladonMartRoofText_48504
-	text_linkpromptbutton
+	text_waitbutton
 	text_end
 
 CeladonMartRoofText_4850a:
 	text_far _CeladonMartRoofText_4850a
 	sound_get_item_1
 	text_far _CeladonMartRoofText_4850f
-	text_linkpromptbutton
+	text_waitbutton
 	text_end
 
 CeladonMartRoofText_48515:
 	text_far _CeladonMartRoofText_48515
-	text_linkpromptbutton
+	text_waitbutton
 	text_end
 
 ReceivedTM49Text:
 	text_far _ReceivedTM49Text
 	sound_get_item_1
 	text_far _CeladonMartRoofText_48520
-	text_linkpromptbutton
+	text_waitbutton
 	text_end
 
 CeladonMartRoofText_48526:
 	text_far _CeladonMartRoofText_48526
-	text_linkpromptbutton
+	text_waitbutton
 	text_end
 
 CeladonMartRoofText_4852c:
 	text_far _CeladonMartRoofText_4852c
-	text_linkpromptbutton
+	text_waitbutton
 	text_end
 
 CeladonMartRoofScript_PrintDrinksInBag:
diff --git a/scripts/CeruleanCity.asm b/scripts/CeruleanCity.asm
index bed09c10..bda53667 100755
--- a/scripts/CeruleanCity.asm
+++ b/scripts/CeruleanCity.asm
@@ -322,7 +322,7 @@ ReceivedTM28Text:
 	text_far _ReceivedTM28Text
 	sound_get_item_1
 	text_far _ReceivedTM28Text2
-	text_linkpromptbutton
+	text_waitbutton
 	text_end
 
 TM28NoRoomText:
diff --git a/scripts/CinnabarGym.asm b/scripts/CinnabarGym.asm
index 7d4121a6..2aa61135 100755
--- a/scripts/CinnabarGym.asm
+++ b/scripts/CinnabarGym.asm
@@ -234,7 +234,7 @@ BlaineBattleText:
 BlaineEndBattleText:
 	text_far _BlaineEndBattleText
 	sound_get_key_item ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded
-	text_linkpromptbutton
+	text_waitbutton
 	text_end
 
 BlaineFireBlastText:
diff --git a/scripts/CopycatsHouse2F.asm b/scripts/CopycatsHouse2F.asm
index e72b1467..580d9b11 100755
--- a/scripts/CopycatsHouse2F.asm
+++ b/scripts/CopycatsHouse2F.asm
@@ -56,7 +56,7 @@ ReceivedTM31Text:
 	sound_get_item_1
 TM31ExplanationText1:
 	text_far _TM31ExplanationText1
-	text_linkpromptbutton
+	text_waitbutton
 	text_end
 
 TM31ExplanationText2:
@@ -65,7 +65,7 @@ TM31ExplanationText2:
 
 TM31NoRoomText:
 	text_far _TM31NoRoomText
-	text_linkpromptbutton
+	text_waitbutton
 	text_end
 
 CopycatsHouse2FText2:
diff --git a/scripts/MtMoonB2F.asm b/scripts/MtMoonB2F.asm
index cc6828f7..50620f23 100755
--- a/scripts/MtMoonB2F.asm
+++ b/scripts/MtMoonB2F.asm
@@ -323,7 +323,7 @@ MtMoon3Script_49f69:
 MtMoon3Text_49f6f:
 	text_far _MtMoon3Text_49f6f
 	sound_get_key_item
-	text_linkpromptbutton
+	text_waitbutton
 	text_end
 
 MtMoon3Script_49f76:
@@ -333,7 +333,7 @@ MtMoon3Script_49f76:
 
 MtMoon3Text_49f7f:
 	text_far _MtMoon3Text_49f7f
-	text_linkpromptbutton
+	text_waitbutton
 	text_end
 
 MtMoon3Text_49f85:
diff --git a/scripts/RocketHideoutElevator.asm b/scripts/RocketHideoutElevator.asm
index f4317ec0..6b1294b3 100755
--- a/scripts/RocketHideoutElevator.asm
+++ b/scripts/RocketHideoutElevator.asm
@@ -81,5 +81,5 @@ RocketHideoutElevatorText1:
 
 RocketHideoutElevatorText_4578b:
 	text_far _RocketElevatorText_4578b
-	text_linkpromptbutton
+	text_waitbutton
 	text_end
diff --git a/scripts/ViridianGym.asm b/scripts/ViridianGym.asm
index f32d98c3..05430332 100755
--- a/scripts/ViridianGym.asm
+++ b/scripts/ViridianGym.asm
@@ -311,7 +311,7 @@ ViridianGymText_74ad3:
 
 ViridianGymText_74ad9:
 	text_far _ViridianGymText_74ad9
-	text_linkpromptbutton
+	text_waitbutton
 	text_end
 
 ViridianGymText12: