summaryrefslogtreecommitdiff
path: root/scripts/BikeShop.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-07-05 19:58:21 -0400
committerGitHub <noreply@github.com>2020-07-05 19:58:21 -0400
commitc57c93d2b2fb06cadafefda37c0974ba1ec9e6c0 (patch)
tree531d6b30d5a606ae963024825ed6e614843000a6 /scripts/BikeShop.asm
parent2718c36065e7eb201a149938bcdd51987c4e56b6 (diff)
parent5fe8aab3445cb76d8e1c4be954c0392f40798950 (diff)
Merge pull request #259 from Rangi42/master
Port pokecrystal's formatting of text commands and special characters
Diffstat (limited to 'scripts/BikeShop.asm')
-rwxr-xr-xscripts/BikeShop.asm52
1 files changed, 26 insertions, 26 deletions
diff --git a/scripts/BikeShop.asm b/scripts/BikeShop.asm
index 2661ca70..07e96c1b 100755
--- a/scripts/BikeShop.asm
+++ b/scripts/BikeShop.asm
@@ -7,7 +7,7 @@ BikeShop_TextPointers:
dw BikeShopText3
BikeShopText1:
- TX_ASM
+ text_asm
CheckEvent EVENT_GOT_BICYCLE
jr z, .asm_260d4
ld hl, BikeShopText_1d82f
@@ -86,50 +86,50 @@ BikeShopMenuPrice:
db "¥1000000@"
BikeShopText_1d810:
- TX_FAR _BikeShopText_1d810
- db "@"
+ text_far _BikeShopText_1d810
+ text_end
BikeShopText_1d815:
- TX_FAR _BikeShopText_1d815
- db "@"
+ text_far _BikeShopText_1d815
+ text_end
BikeShopCantAffordText:
- TX_FAR _BikeShopCantAffordText
- db "@"
+ text_far _BikeShopCantAffordText
+ text_end
BikeShopText_1d81f:
- TX_FAR _BikeShopText_1d81f
- db "@"
+ text_far _BikeShopText_1d81f
+ text_end
BikeShopText_1d824:
- TX_FAR _BikeShopText_1d824
- TX_SFX_KEY_ITEM
- db "@"
+ text_far _BikeShopText_1d824
+ sound_get_key_item
+ text_end
BikeShopComeAgainText:
- TX_FAR _BikeShopComeAgainText
- db "@"
+ text_far _BikeShopComeAgainText
+ text_end
BikeShopText_1d82f:
- TX_FAR _BikeShopText_1d82f
- db "@"
+ text_far _BikeShopText_1d82f
+ text_end
BikeShopText_1d834:
- TX_FAR _BikeShopText_1d834
- db "@"
+ text_far _BikeShopText_1d834
+ text_end
BikeShopText2:
- TX_ASM
+ text_asm
ld hl, BikeShopText_1d843
call PrintText
jp TextScriptEnd
BikeShopText_1d843:
- TX_FAR _BikeShopText_1d843
- db "@"
+ text_far _BikeShopText_1d843
+ text_end
BikeShopText3:
- TX_ASM
+ text_asm
CheckEvent EVENT_GOT_BICYCLE
ld hl, BikeShopText_1d861
jr nz, .asm_34d2d
@@ -139,9 +139,9 @@ BikeShopText3:
jp TextScriptEnd
BikeShopText_1d85c:
- TX_FAR _BikeShopText_1d85c
- db "@"
+ text_far _BikeShopText_1d85c
+ text_end
BikeShopText_1d861:
- TX_FAR _BikeShopText_1d861
- db "@"
+ text_far _BikeShopText_1d861
+ text_end