summaryrefslogtreecommitdiff
path: root/scripts/BluesHouse.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/BluesHouse.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/BluesHouse.asm')
-rwxr-xr-xscripts/BluesHouse.asm32
1 files changed, 16 insertions, 16 deletions
diff --git a/scripts/BluesHouse.asm b/scripts/BluesHouse.asm
index f325049f..241d6f5a 100755
--- a/scripts/BluesHouse.asm
+++ b/scripts/BluesHouse.asm
@@ -25,7 +25,7 @@ BluesHouse_TextPointers:
dw BluesHouseText3
BluesHouseText1:
- TX_ASM
+ text_asm
CheckEvent EVENT_GOT_TOWN_MAP
jr nz, .GotMap
CheckEvent EVENT_GOT_POKEDEX
@@ -60,30 +60,30 @@ BluesHouseText1:
jp TextScriptEnd
DaisyInitialText:
- TX_FAR _DaisyInitialText
- db "@"
+ text_far _DaisyInitialText
+ text_end
DaisyOfferMapText:
- TX_FAR _DaisyOfferMapText
- db "@"
+ text_far _DaisyOfferMapText
+ text_end
GotMapText:
- TX_FAR _GotMapText
- TX_SFX_KEY_ITEM
- db "@"
+ text_far _GotMapText
+ sound_get_key_item
+ text_end
DaisyBagFullText:
- TX_FAR _DaisyBagFullText
- db "@"
+ text_far _DaisyBagFullText
+ text_end
DaisyUseMapText:
- TX_FAR _DaisyUseMapText
- db "@"
+ text_far _DaisyUseMapText
+ text_end
BluesHouseText2: ; Daisy, walking around
- TX_FAR _BluesHouseText2
- db "@"
+ text_far _BluesHouseText2
+ text_end
BluesHouseText3: ; map on table
- TX_FAR _BluesHouseText3
- db "@"
+ text_far _BluesHouseText3
+ text_end