foster/pokered
0
0
Fork 0
mirror of https://github.com/pret/pokered.git synced 2024-10-22 22:55:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

text_linkpromptbutton -> text_waitbutton

Browse source 
Fixes #260
This commit is contained in:
Rangi 2020-07-06 12:39:29 -04:00
parent 8a79315635
commit 9c2be80bf3
12 changed files with 44 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
engine/events/hidden_objects/school_notebooks.asm
View file

@ -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:

10
engine/events/prize_menu.asm
View file

@ -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:

2
engine/menus/oaks_pc.asm
View file

@ -20,7 +20,7 @@ GetDexRatedText:
ClosedOaksPCText:
text_far _ClosedOaksPCText
text_linkpromptbutton
text_waitbutton
text_end
AccessedOaksPCText:

34
home/text.asm
View file

@ -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

6
macros/scripts/text.asm
View file

@ -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

16
scripts/CeladonMartRoof.asm
View file

@ -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:

2
scripts/CeruleanCity.asm
View file

@ -322,7 +322,7 @@ ReceivedTM28Text:
text_far _ReceivedTM28Text
sound_get_item_1
text_far _ReceivedTM28Text2
text_linkpromptbutton
text_waitbutton
text_end
TM28NoRoomText:

2
scripts/CinnabarGym.asm
View file

@ -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:

4
scripts/CopycatsHouse2F.asm
View file

@ -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:

4
scripts/MtMoonB2F.asm
View file

@ -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:

2
scripts/RocketHideoutElevator.asm
View file

@ -81,5 +81,5 @@ RocketHideoutElevatorText1:
RocketHideoutElevatorText_4578b:
text_far _RocketElevatorText_4578b
text_linkpromptbutton
text_waitbutton
text_end

2
scripts/ViridianGym.asm
View file

@ -311,7 +311,7 @@ ViridianGymText_74ad3:
ViridianGymText_74ad9:
text_far _ViridianGymText_74ad9
text_linkpromptbutton
text_waitbutton
text_end
ViridianGymText12: