diff options
Diffstat (limited to 'text')
| -rw-r--r-- | text/battle.asm | 8 | ||||
| -rw-r--r-- | text/common_1.asm | 48 |
2 files changed, 28 insertions, 28 deletions
diff --git a/text/battle.asm b/text/battle.asm index 42bf2b7c0..b9b121455 100644 --- a/text/battle.asm +++ b/text/battle.asm @@ -104,7 +104,7 @@ PerishCountText: ; 0x80864 prompt ; 0x80880 -BattleText_0x80880: ; 0x80880 +BattleText_TargetRecoveredWithItem: ; 0x80880 text "<TARGET>" line "recovered with" cont "@" @@ -122,7 +122,7 @@ BattleText_UserRecoveredPPUsing: ; 0x80899 prompt ; 0x808b6 -BattleText_0x808b6: ; 0x808b6 +BattleText_TargetWasHitByFutureSight: ; 0x808b6 text "<TARGET>" line "was hit by FUTURE" cont "SIGHT!" @@ -135,14 +135,14 @@ BattleText_SafeguardFaded: ; 0x808d2 prompt ; 0x808e7 -BattleText_PkmnnLightScreenFell: ; 0x808e7 +BattleText_PkmnLightScreenFell: ; 0x808e7 text_from_ram StringBuffer1 text " #MON's" line "LIGHT SCREEN fell!" prompt ; 0x80905 -BattleText_0x80905: ; 0x80905 +BattleText_PkmnReflectFaded: ; 0x80905 text_from_ram StringBuffer1 text " #MON's" line "REFLECT faded!" diff --git a/text/common_1.asm b/text/common_1.asm index 21150ab53..34694b31e 100644 --- a/text/common_1.asm +++ b/text/common_1.asm @@ -368,10 +368,10 @@ UnknownText_0x1bc6c7:: done UnknownText_0x1bc6e9:: - text_from_ram wc6d1 + text_from_ram wPlayerTrademonSpeciesName text " was" line "sent to @" - text_from_ram wc719 + text_from_ram wOTTrademonSenderName text "." done @@ -380,104 +380,104 @@ UnknownText_0x1bc701:: done UnknownText_0x1bc703:: - text_from_ram wc719 + text_from_ram wOTTrademonSenderName text " bids" line "farewell to" done UnknownText_0x1bc719:: - text_from_ram wc703 + text_from_ram wOTTrademonSpeciesName text "." done UnknownText_0x1bc71f:: text "Take good care of" line "@" - text_from_ram wc703 + text_from_ram wOTTrademonSpeciesName text "." done UnknownText_0x1bc739:: text "For @" - text_from_ram wc6e7 + text_from_ram wPlayerTrademonSenderName text "'s" line "@" - text_from_ram wc6d1 + text_from_ram wPlayerTrademonSpeciesName text "," done UnknownText_0x1bc74c:: - text_from_ram wc719 + text_from_ram wOTTrademonSenderName text " sends" line "@" - text_from_ram wc703 + text_from_ram wOTTrademonSpeciesName text "." done UnknownText_0x1bc75e:: - text_from_ram wc719 + text_from_ram wOTTrademonSenderName text " will" line "trade @" - text_from_ram wc703 + text_from_ram wOTTrademonSpeciesName db "@@" UnknownText_0x1bc774:: text "for @" - text_from_ram wc6e7 + text_from_ram wPlayerTrademonSenderName text "'s" line "@" - text_from_ram wc6d1 + text_from_ram wPlayerTrademonSpeciesName text "." done UnknownText_0x1bc787:: - text_from_ram wc6e7 + text_from_ram wPlayerTrademonSenderName text " will" line "trade @" - text_from_ram wc6d1 + text_from_ram wPlayerTrademonSpeciesName db "@@" UnknownText_0x1bc79d:: text "for @" - text_from_ram wc719 + text_from_ram wOTTrademonSenderName text "'s" line "@" - text_from_ram wc703 + text_from_ram wOTTrademonSpeciesName text "." done UnknownText_0x1bc7b0:: - text_from_ram wc6e7 + text_from_ram wPlayerTrademonSenderName text "'s" line "@" - text_from_ram wc6d1 + text_from_ram wPlayerTrademonSpeciesName text " trade…" done UnknownText_0x1bc7c3:: text "Take good care of" line "@" - text_from_ram wc703 + text_from_ram wOTTrademonSpeciesName text "." done UnknownText_0x1bc7dd:: - text_from_ram wc6e7 + text_from_ram wPlayerTrademonSenderName text "'s" line "@" - text_from_ram wc6d1 + text_from_ram wPlayerTrademonSpeciesName text " trade…" done UnknownText_0x1bc7f0:: text "Take good care of" line "@" - text_from_ram wc703 + text_from_ram wOTTrademonSpeciesName text "." done UnknownText_0x1bc80a:: - text_from_ram wc703 + text_from_ram wOTTrademonSpeciesName text " came" line "back!" done |