summaryrefslogtreecommitdiff
path: root/scripts/CeladonMartRoof.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-07-04 17:09:35 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-07-04 21:14:46 -0400
commit139a28ff9906d728a6820fe678a2a616eb309421 (patch)
tree9a4339b97e16e10c5b007e836f1f3fadd33bd9f4 /scripts/CeladonMartRoof.asm
parent2718c36065e7eb201a149938bcdd51987c4e56b6 (diff)
Port pokecrystal's formatting of text commands and special characters
Diffstat (limited to 'scripts/CeladonMartRoof.asm')
-rwxr-xr-xscripts/CeladonMartRoof.asm84
1 files changed, 42 insertions, 42 deletions
diff --git a/scripts/CeladonMartRoof.asm b/scripts/CeladonMartRoof.asm
index 35c740b2..7c1d7039 100755
--- a/scripts/CeladonMartRoof.asm
+++ b/scripts/CeladonMartRoof.asm
@@ -134,54 +134,54 @@ RemoveItemByIDBank12:
jpba RemoveItemByID
CeladonMartRoofText_484ee:
- TX_FAR _CeladonMartRoofText_484ee
- db "@"
+ text_far _CeladonMartRoofText_484ee
+ text_end
CeladonMartRoofText_484f3:
- TX_FAR _CeladonMartRoofText_484f3
- TX_WAIT
- db "@"
+ text_far _CeladonMartRoofText_484f3
+ text_linkpromptbutton
+ text_end
CeladonMartRoofText_484f9:
- TX_FAR _CeladonMartRoofText_484f9
- TX_SFX_ITEM_1
- TX_FAR _CeladonMartRoofText_484fe
- TX_WAIT
- db "@"
+ text_far _CeladonMartRoofText_484f9
+ sound_get_item_1
+ text_far _CeladonMartRoofText_484fe
+ text_linkpromptbutton
+ text_end
CeladonMartRoofText_48504:
- TX_FAR _CeladonMartRoofText_48504
- TX_WAIT
- db "@"
+ text_far _CeladonMartRoofText_48504
+ text_linkpromptbutton
+ text_end
CeladonMartRoofText_4850a:
- TX_FAR _CeladonMartRoofText_4850a
- TX_SFX_ITEM_1
- TX_FAR _CeladonMartRoofText_4850f
- TX_WAIT
- db "@"
+ text_far _CeladonMartRoofText_4850a
+ sound_get_item_1
+ text_far _CeladonMartRoofText_4850f
+ text_linkpromptbutton
+ text_end
CeladonMartRoofText_48515:
- TX_FAR _CeladonMartRoofText_48515
- TX_WAIT
- db "@"
+ text_far _CeladonMartRoofText_48515
+ text_linkpromptbutton
+ text_end
ReceivedTM49Text:
- TX_FAR _ReceivedTM49Text
- TX_SFX_ITEM_1
- TX_FAR _CeladonMartRoofText_48520
- TX_WAIT
- db "@"
+ text_far _ReceivedTM49Text
+ sound_get_item_1
+ text_far _CeladonMartRoofText_48520
+ text_linkpromptbutton
+ text_end
CeladonMartRoofText_48526:
- TX_FAR _CeladonMartRoofText_48526
- TX_WAIT
- db "@"
+ text_far _CeladonMartRoofText_48526
+ text_linkpromptbutton
+ text_end
CeladonMartRoofText_4852c:
- TX_FAR _CeladonMartRoofText_4852c
- TX_WAIT
- db "@"
+ text_far _CeladonMartRoofText_4852c
+ text_linkpromptbutton
+ text_end
CeladonMartRoofScript_PrintDrinksInBag:
ld hl, wFilteredBagItems
@@ -214,11 +214,11 @@ CeladonMartRoof_TextPointers:
dw CeladonMartRoofText6
CeladonMartRoofText1:
- TX_FAR _CeladonMartRoofText1
- db "@"
+ text_far _CeladonMartRoofText1
+ text_end
CeladonMartRoofText2:
- TX_ASM
+ text_asm
call CeladonMartRoofScript_GetDrinksInBag
ld a, [wFilteredBagItemsCount]
and a
@@ -240,16 +240,16 @@ CeladonMartRoofText2:
jp TextScriptEnd
CeladonMartRoofText3:
- TX_FAR _CeladonMartRoofText_48598
- db "@"
+ text_far _CeladonMartRoofText_48598
+ text_end
CeladonMartRoofText4:
- TX_FAR _CeladonMartRoofText4
- db "@"
+ text_far _CeladonMartRoofText4
+ text_end
CeladonMartRoofText5:
- TX_VENDING_MACHINE
+ script_vending_machine
CeladonMartRoofText6:
- TX_FAR _CeladonMartRoofText6
- db "@"
+ text_far _CeladonMartRoofText6
+ text_end