aboutsummaryrefslogtreecommitdiffstats
path: root/data
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
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')
-rw-r--r--data/text/text_1.asm2
-rw-r--r--data/text/text_2.asm46
-rw-r--r--data/text/text_3.asm8
-rw-r--r--data/text/text_4.asm4
-rw-r--r--data/text/text_5.asm10
-rw-r--r--data/text/text_6.asm8
-rw-r--r--data/text/text_7.asm6
7 files changed, 42 insertions, 42 deletions
diff --git a/data/text/text_1.asm b/data/text/text_1.asm
index 2acc6f68..538396eb 100644
--- a/data/text/text_1.asm
+++ b/data/text/text_1.asm
@@ -14,7 +14,7 @@ _CardKeyFailText::
done
_TrainerNameText::
- text_ram wcd6d
+ text_ram wNameBuffer
text ": @"
text_end
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
diff --git a/data/text/text_3.asm b/data/text/text_3.asm
index 1d40d6b7..ba09a0f6 100644
--- a/data/text/text_3.asm
+++ b/data/text/text_3.asm
@@ -40,7 +40,7 @@ _EvolvedText::
_IntoText::
text_start
line "into @"
- text_ram wcd6d
+ text_ram wNameBuffer
text "!"
done
@@ -181,14 +181,14 @@ _MimicLearnedMoveText::
text "<USER>"
line "learned"
cont "@"
- text_ram wcd6d
+ text_ram wNameBuffer
text "!"
prompt
_MoveWasDisabledText::
text "<TARGET>'s"
line "@"
- text_ram wcd6d
+ text_ram wNameBuffer
text " was"
cont "disabled!"
prompt
@@ -291,7 +291,7 @@ _TransformedText::
text "<USER>"
line "transformed into"
cont "@"
- text_ram wcd6d
+ text_ram wNameBuffer
text "!"
prompt
diff --git a/data/text/text_4.asm b/data/text/text_4.asm
index 39c7ab91..f1c73a88 100644
--- a/data/text/text_4.asm
+++ b/data/text/text_4.asm
@@ -4,7 +4,7 @@ _PokemartGreetingText::
done
_PokemonFaintedText::
- text_ram wcd6d
+ text_ram wNameBuffer
text_start
line "fainted!"
done
@@ -145,7 +145,7 @@ _ForgotAndText::
text_ram wLearnMoveMonName
text " forgot"
line "@"
- text_ram wcd6d
+ text_ram wNameBuffer
text "!"
para "And..."
diff --git a/data/text/text_5.asm b/data/text/text_5.asm
index fb0cac66..1eee599c 100644
--- a/data/text/text_5.asm
+++ b/data/text/text_5.asm
@@ -9,13 +9,13 @@ _CableClubNPCMakingPreparationsText::
done
_UsedStrengthText::
- text_ram wcd6d
+ text_ram wNameBuffer
text " used"
line "STRENGTH.@"
text_end
_CanMoveBouldersText::
- text_ram wcd6d
+ text_ram wNameBuffer
text " can"
line "move boulders."
prompt
@@ -41,13 +41,13 @@ _WarpToLastPokemonCenterText::
done
_CannotUseTeleportNowText::
- text_ram wcd6d
+ text_ram wNameBuffer
text " can't"
line "use TELEPORT now."
prompt
_CannotFlyHereText::
- text_ram wcd6d
+ text_ram wNameBuffer
text " can't"
line "FLY here."
prompt
@@ -75,7 +75,7 @@ _CannotGetOffHereText::
_GotMonText::
text "<PLAYER> got"
line "@"
- text_ram wcd6d
+ text_ram wNameBuffer
text "!@"
text_end
diff --git a/data/text/text_6.asm b/data/text/text_6.asm
index 194afa7b..8109b659 100644
--- a/data/text/text_6.asm
+++ b/data/text/text_6.asm
@@ -59,7 +59,7 @@ _ItemUseBallText06::
_SurfingGotOnText::
text "<PLAYER> got on"
line "@"
- text_ram wcd6d
+ text_ram wNameBuffer
text "!"
prompt
@@ -69,7 +69,7 @@ _SurfingNoPlaceToGetOffText::
prompt
_VitaminStatRoseText::
- text_ram wcd6d
+ text_ram wNameBuffer
text "'s"
line "@"
text_ram wStringBuffer
@@ -174,7 +174,7 @@ _TeachMachineMoveText::
done
_MonCannotLearnMachineMoveText::
- text_ram wcd6d
+ text_ram wNameBuffer
text " is not"
line "compatible with"
cont "@"
@@ -220,7 +220,7 @@ _NoCyclingAllowedHereText::
_NoSurfingHereText::
text "No SURFing on"
line "@"
- text_ram wcd6d
+ text_ram wNameBuffer
text " here!"
prompt
diff --git a/data/text/text_7.asm b/data/text/text_7.asm
index fcb27d20..54629faf 100644
--- a/data/text/text_7.asm
+++ b/data/text/text_7.asm
@@ -29,7 +29,7 @@ _GotOffBicycleText2::
_ThrewAwayItemText::
text "Threw away"
line "@"
- text_ram wcd6d
+ text_ram wNameBuffer
text "."
prompt
@@ -46,7 +46,7 @@ _TooImportantToTossText::
prompt
_AlreadyKnowsText::
- text_ram wcd6d
+ text_ram wNameBuffer
text " knows"
line "@"
text_ram wStringBuffer
@@ -194,7 +194,7 @@ _NothingToCutText::
prompt
_UsedCutText::
- text_ram wcd6d
+ text_ram wNameBuffer
text " hacked"
line "away with CUT!"
prompt