aboutsummaryrefslogtreecommitdiffstats
path: root/engine/movie/trade.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 /engine/movie/trade.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 'engine/movie/trade.asm')
-rwxr-xr-xengine/movie/trade.asm32
1 files changed, 16 insertions, 16 deletions
diff --git a/engine/movie/trade.asm b/engine/movie/trade.asm
index 6af6f2e3..8b596e5e 100755
--- a/engine/movie/trade.asm
+++ b/engine/movie/trade.asm
@@ -785,8 +785,8 @@ PrintTradeWentToText:
jp Trade_SlideTextBoxOffScreen
TradeWentToText:
- TX_FAR _TradeWentToText
- db "@"
+ text_far _TradeWentToText
+ text_end
PrintTradeForSendsText:
ld hl, TradeForText
@@ -797,12 +797,12 @@ PrintTradeForSendsText:
jp Trade_Delay80
TradeForText:
- TX_FAR _TradeForText
- db "@"
+ text_far _TradeForText
+ text_end
TradeSendsText:
- TX_FAR _TradeSendsText
- db "@"
+ text_far _TradeSendsText
+ text_end
PrintTradeFarewellText:
ld hl, TradeWavesFarewellText
@@ -814,12 +814,12 @@ PrintTradeFarewellText:
jp Trade_SlideTextBoxOffScreen
TradeWavesFarewellText:
- TX_FAR _TradeWavesFarewellText
- db "@"
+ text_far _TradeWavesFarewellText
+ text_end
TradeTransferredText:
- TX_FAR _TradeTransferredText
- db "@"
+ text_far _TradeTransferredText
+ text_end
PrintTradeTakeCareText:
ld hl, TradeTakeCareText
@@ -827,8 +827,8 @@ PrintTradeTakeCareText:
jp Trade_Delay80
TradeTakeCareText:
- TX_FAR _TradeTakeCareText
- db "@"
+ text_far _TradeTakeCareText
+ text_end
PrintTradeWillTradeText:
ld hl, TradeWillTradeText
@@ -839,12 +839,12 @@ PrintTradeWillTradeText:
jp Trade_Delay80
TradeWillTradeText:
- TX_FAR _TradeWillTradeText
- db "@"
+ text_far _TradeWillTradeText
+ text_end
TradeforText:
- TX_FAR _TradeforText
- db "@"
+ text_far _TradeforText
+ text_end
Trade_ShowAnimation:
ld [wAnimationID], a