summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-07-06 12:39:29 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-07-06 12:40:36 -0400
commit9c2be80bf3fbdac6505787b00da0f4ff71839a05 (patch)
tree02483fc07e60d64a4b526ce8b402f26960ad33b2 /scripts
parent8a79315635ee9ebb6eed5c9648fe89746085d0b1 (diff)
text_linkpromptbutton -> text_waitbutton
Fixes #260
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/CeladonMartRoof.asm16
-rwxr-xr-xscripts/CeruleanCity.asm2
-rwxr-xr-xscripts/CinnabarGym.asm2
-rwxr-xr-xscripts/CopycatsHouse2F.asm4
-rwxr-xr-xscripts/MtMoonB2F.asm4
-rwxr-xr-xscripts/RocketHideoutElevator.asm2
-rwxr-xr-xscripts/ViridianGym.asm2
7 files changed, 16 insertions, 16 deletions
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: