aboutsummaryrefslogtreecommitdiffstats
path: root/text/Daycare.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 /text/Daycare.asm
parentMerge pull request #257 from Rangi42/master (diff)
parentdb $f6 == script_cable_club_receptionist (diff)
downloadpokeyellow-c57c93d2b2fb06cadafefda37c0974ba1ec9e6c0.tar.gz
pokeyellow-c57c93d2b2fb06cadafefda37c0974ba1ec9e6c0.tar.xz
pokeyellow-c57c93d2b2fb06cadafefda37c0974ba1ec9e6c0.zip
Merge pull request #259 from Rangi42/master
Port pokecrystal's formatting of text commands and special characters
Diffstat (limited to 'text/Daycare.asm')
-rw-r--r--text/Daycare.asm20
1 files changed, 10 insertions, 10 deletions
diff --git a/text/Daycare.asm b/text/Daycare.asm
index 2759c798..197927dd 100644
--- a/text/Daycare.asm
+++ b/text/Daycare.asm
@@ -13,8 +13,8 @@ _DayCareWhichMonText::
_DayCareWillLookAfterMonText::
text "Fine, I'll look"
line "after @"
- TX_RAM wcd6d
- text ""
+ text_ram wcd6d
+ text_start
cont "for a while."
prompt
@@ -25,13 +25,13 @@ _DayCareComeSeeMeInAWhileText::
_DayCareMonHasGrownText::
text "Your @"
- TX_RAM wcd6d
- text ""
+ text_ram wcd6d
+ text_start
line "has grown a lot!"
para "By level, it's"
line "grown by @"
- TX_NUM wDayCareNumLevelsGrown,$1,$3
+ text_decimal wDayCareNumLevelsGrown, 1, 3
text "!"
para "Aren't I great?"
@@ -39,8 +39,8 @@ _DayCareMonHasGrownText::
_DayCareOweMoneyText::
text "You owe me ¥@"
- TX_BCD wDayCareTotalCost, $c2
- text ""
+ text_bcd wDayCareTotalCost, 2 | LEADING_ZEROES | LEFT_ALIGN
+ text_start
line "for the return"
cont "of this #MON."
done
@@ -48,15 +48,15 @@ _DayCareOweMoneyText::
_DayCareGotMonBackText::
text "<PLAYER> got"
line "@"
- TX_RAM wDayCareMonName
+ text_ram wDayCareMonName
text " back!"
done
_DayCareMonNeedsMoreTimeText::
text "Back already?"
line "Your @"
- TX_RAM wcd6d
- text ""
+ text_ram wcd6d
+ text_start
cont "needs some more"
cont "time with me."
prompt