aboutsummaryrefslogtreecommitdiffstats
path: root/data/text/text_2.asm
diff options
context:
space:
mode:
authorSylvie <35663410+Rangi42@users.noreply.github.com>2024-07-24 12:21:59 -0400
committerGitHub <noreply@github.com>2024-07-24 12:21:59 -0400
commit6e3ab0a9e97ff14123ac65f56cb4b4ddab45b695 (patch)
tree32feac5e86fbac9eec6f40c14a19c8bd89c1b52d /data/text/text_2.asm
parentIdentify various flag labels and bit constants (#454) (diff)
downloadpokeyellow-6e3ab0a9e97ff14123ac65f56cb4b4ddab45b695.tar.gz
pokeyellow-6e3ab0a9e97ff14123ac65f56cb4b4ddab45b695.tar.xz
pokeyellow-6e3ab0a9e97ff14123ac65f56cb4b4ddab45b695.zip
Identify wcd6d as wNameBuffer and others (#455)
Diffstat (limited to 'data/text/text_2.asm')
-rw-r--r--data/text/text_2.asm46
1 files changed, 23 insertions, 23 deletions
diff --git a/data/text/text_2.asm b/data/text/text_2.asm
index d4b1b7db..4362e0f2 100644
--- a/data/text/text_2.asm
+++ b/data/text/text_2.asm
@@ -10,7 +10,7 @@ _AIBattleUseItemText::
text_ram wTrainerName
text_start
line "used @"
- text_ram wcd6d
+ text_ram wNameBuffer
text_start
cont "on @"
text_ram wEnemyMonNick
@@ -36,7 +36,7 @@ _TradeSendsText::
text_ram wLinkEnemyTrainerName
text " sends"
line "@"
- text_ram wcd6d
+ text_ram wNameBuffer
text "."
done
@@ -47,7 +47,7 @@ _TradeWavesFarewellText::
done
_TradeTransferredText::
- text_ram wcd6d
+ text_ram wNameBuffer
text " is"
line "transferred."
done
@@ -55,7 +55,7 @@ _TradeTransferredText::
_TradeTakeCareText::
text "Take good care of"
line "@"
- text_ram wcd6d
+ text_ram wNameBuffer
text "."
done
@@ -63,7 +63,7 @@ _TradeWillTradeText::
text_ram wLinkEnemyTrainerName
text " will"
line "trade @"
- text_ram wcd6d
+ text_ram wNameBuffer
text_start
done
@@ -751,7 +751,7 @@ _VermilionGymTrashFailText::
_FoundHiddenItemText::
text "<PLAYER> found"
line "@"
- text_ram wcd6d
+ text_ram wNameBuffer
text "!@"
text_end
@@ -1070,7 +1070,7 @@ _CantMoveText::
_MoveIsDisabledText::
text "<USER>'s"
line "@"
- text_ram wcd6d
+ text_ram wNameBuffer
text " is"
cont "disabled!"
prompt
@@ -1205,7 +1205,7 @@ _HitXTimesText::
prompt
_GainedText::
- text_ram wcd6d
+ text_ram wNameBuffer
text " gained"
line "@"
text_end
@@ -1226,7 +1226,7 @@ _ExpPointsText::
prompt
_GrewLevelText::
- text_ram wcd6d
+ text_ram wNameBuffer
text " grew"
line "to level @"
text_decimal wCurEnemyLevel, 1, 3
@@ -1382,7 +1382,7 @@ _PartyMenuSwapMonText::
done
_PotionText::
- text_ram wcd6d
+ text_ram wNameBuffer
text_start
line "recovered by @"
text_decimal wHPBarHPDifference, 2, 3
@@ -1390,49 +1390,49 @@ _PotionText::
done
_AntidoteText::
- text_ram wcd6d
+ text_ram wNameBuffer
text " was"
line "cured of poison!"
done
_ParlyzHealText::
- text_ram wcd6d
+ text_ram wNameBuffer
text "'s"
line "rid of paralysis!"
done
_BurnHealText::
- text_ram wcd6d
+ text_ram wNameBuffer
text "'s"
line "burn was healed!"
done
_IceHealText::
- text_ram wcd6d
+ text_ram wNameBuffer
text " was"
line "defrosted!"
done
_AwakeningText::
- text_ram wcd6d
+ text_ram wNameBuffer
text_start
line "woke up!"
done
_FullHealText::
- text_ram wcd6d
+ text_ram wNameBuffer
text "'s"
line "health returned!"
done
_ReviveText::
- text_ram wcd6d
+ text_ram wNameBuffer
text_start
line "is revitalized!"
done
_RareCandyText::
- text_ram wcd6d
+ text_ram wNameBuffer
text " grew"
line "to level @"
text_decimal wCurEnemyLevel, 1, 3
@@ -1487,7 +1487,7 @@ _DepositHowManyText::
done
_ItemWasStoredText::
- text_ram wcd6d
+ text_ram wNameBuffer
text " was"
line "stored via PC."
prompt
@@ -1514,7 +1514,7 @@ _WithdrawHowManyText::
_WithdrewItemText::
text "Withdrew"
line "@"
- text_ram wcd6d
+ text_ram wNameBuffer
text "."
prompt
@@ -1642,7 +1642,7 @@ _HereYouGoText::
_SoYouWantPrizeText::
text "So, you want"
line "@"
- text_ram wcd6d
+ text_ram wNameBuffer
text "?"
done
@@ -1756,7 +1756,7 @@ _DoYouWantToNicknameText::
text "Do you want to"
line "give a nickname"
cont "to @"
- text_ram wcd6d
+ text_ram wNameBuffer
text "?"
done
@@ -1775,7 +1775,7 @@ _WillBeTradedText::
text_ram wNameOfPlayerMonToBeTraded
text " and"
line "@"
- text_ram wcd6d
+ text_ram wNameBuffer
text " will"
cont "be traded."
done