summaryrefslogtreecommitdiff
path: root/text.asm
diff options
context:
space:
mode:
authorluckytyphlosion <alan.rj.huang@gmail.com>2015-10-29 14:23:30 -0400
committerluckytyphlosion <alan.rj.huang@gmail.com>2015-10-29 14:23:30 -0400
commitcb414f1480e9117e5d6ee0ab5cb81903e83cde9a (patch)
treee44bd6299c61335a9a0476db57b565aadcd0b4d7 /text.asm
parent2ea331ebb341505df1cd8429b140c52e345a5af4 (diff)
overworld item & movement code, cable club code, remove more instances of W_, add PIKAHAPPY_TRADE
Also make replace.sh take args
Diffstat (limited to 'text.asm')
-rw-r--r--text.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/text.asm b/text.asm
index 8dae662f..1c665229 100644
--- a/text.asm
+++ b/text.asm
@@ -263,7 +263,7 @@ _TradeWentToText::
TX_RAM wcf4b
text " went"
line "to @"
- TX_RAM W_GRASSRATE
+ TX_RAM wGrassRate
text "."
done
@@ -275,7 +275,7 @@ _TradeForText::
done
_TradeSendsText::
- TX_RAM W_GRASSRATE
+ TX_RAM wGrassRate
text " sends"
line "@"
TX_RAM wcd6d
@@ -283,7 +283,7 @@ _TradeSendsText::
done
_TradeWavesFarewellText::
- TX_RAM W_GRASSRATE
+ TX_RAM wGrassRate
text " waves"
line "farewell as"
done
@@ -302,7 +302,7 @@ _TradeTakeCareText::
done
_TradeWillTradeText::
- TX_RAM W_GRASSRATE
+ TX_RAM wGrassRate
text " will"
line "trade @"
TX_RAM wcd6d
@@ -1490,7 +1490,7 @@ _GrewLevelText::
TX_RAM wcd6d
text " grew"
line "to level @"
- TX_NUM W_CURENEMYLVL, 1, 3
+ TX_NUM wCurEnemyLVL, 1, 3
text "!@@"
_SuperEffectiveText::
@@ -1695,7 +1695,7 @@ _RareCandyText::
TX_RAM wcd6d
text " grew"
line "to level @"
- TX_NUM W_CURENEMYLVL, $1,$3
+ TX_NUM wCurEnemyLVL, $1,$3
text "!@@"
_TurnedOnPC1Text::