diff options
Diffstat (limited to 'text')
-rw-r--r-- | text/battle.asm | 8 | ||||
-rw-r--r-- | text/common_2.asm | 18 | ||||
-rw-r--r-- | text/common_3.asm | 2 | ||||
-rw-r--r-- | text/common_4.asm | 10 |
4 files changed, 19 insertions, 19 deletions
diff --git a/text/battle.asm b/text/battle.asm index 3f29835aa..a05159568 100644 --- a/text/battle.asm +++ b/text/battle.asm @@ -44,7 +44,7 @@ WantsToBattleText:: ; 0x807a9 prompt ; 0x807bd -BattleText_0x807bd: ; 0x807bd +BattleText_WildFled: ; 0x807bd text "Wild @" text_from_ram EnemyMonNick text "" @@ -52,7 +52,7 @@ BattleText_0x807bd: ; 0x807bd prompt ; 0x807cf -BattleText_0x807cf: ; 0x807cf +BattleText_EnemyFled: ; 0x807cf text "Enemy @" text_from_ram EnemyMonNick text "" @@ -271,7 +271,7 @@ BattleText_0x80aca: ; 0x80aca done ; 0x80af8 -BattleText_0x80af8: ; 0x80af8 +BattleText_EnemySentOut: ; 0x80af8 text "<ENEMY>" line "sent out" cont "@" @@ -1282,7 +1282,7 @@ IgnoredOrders2Text: ; 0x81850 prompt ; 0x81863 -BattleText_0x81863: ; 0x81863 +BattleText_LinkErrorBattleCanceled: ; 0x81863 text "Link error…" para "The battle has" diff --git a/text/common_2.asm b/text/common_2.asm index 60a92f0c3..5e0665bd4 100644 --- a/text/common_2.asm +++ b/text/common_2.asm @@ -1295,7 +1295,7 @@ UnknownText_0x1bcf99: ; 0x1bcf99 done ; 0x1bcf9c -UnknownText_0x1bcf9c: ; 0x1bcf9c +Text_EnemyWithdrew: ; 0x1bcf9c text "<ENEMY>" line "withdrew" cont "@" @@ -1304,7 +1304,7 @@ UnknownText_0x1bcf9c: ; 0x1bcf9c prompt ; 0x1bcfaf -UnknownText_0x1bcfaf: ; 0x1bcfaf +Text_EnemyUsedOn: ; 0x1bcfaf text "<ENEMY>" line "used @" text_from_ram wd050 @@ -1315,19 +1315,19 @@ UnknownText_0x1bcfaf: ; 0x1bcfaf prompt ; 0x1bcfc7 -UnknownText_0x1bcfc7: ; 0x1bcfc7 +Text_ThatCantBeUsedRightNow: ; 0x1bcfc7 text "That can't be used" line "right now." prompt ; 0x1bcfe5 -UnknownText_0x1bcfe5: ; 0x1bcfe5 +Text_ThatItemCantBePutInThePack: ; 0x1bcfe5 text "That item can't be" line "put in the PACK." done ; 0x1bd009 -UnknownText_0x1bd009: ; 0x1bd009 +Text_TheItemWasPutInThePack: ; 0x1bd009 text "The @" text_from_ram StringBuffer1 text "" @@ -1336,18 +1336,18 @@ UnknownText_0x1bd009: ; 0x1bd009 done ; 0x1bd029 -UnknownText_0x1bd029: ; 0x1bd029 +Text_RemainingTime: ; 0x1bd029 text "Remaining Time" done ; 0x1bd039 -UnknownText_0x1bd039: ; 0x1bd039 +Text_YourPkmnsHPWasHealed: ; 0x1bd039 text "Your #MON's HP" line "was healed." prompt ; 0x1bd054 -UnknownText_0x1bd054: ; 0x1bd054 +Text_Warping: ; 0x1bd054 text "Warping…" done ; 0x1bd05e @@ -1372,7 +1372,7 @@ UnknownText_0x1bd09a: ; 0x1bd09a prompt ; 0x1bd0bd -UnknownText_0x1bd0bd: ; 0x1bd0bd +Text_BreedingIsNotPossible: ; 0x1bd0bd text "Breeding is not" line "possible." prompt diff --git a/text/common_3.asm b/text/common_3.asm index c73e91d74..e010d1fec 100644 --- a/text/common_3.asm +++ b/text/common_3.asm @@ -1074,7 +1074,7 @@ UnknownText_0x1c0fdd: ; 1c0fdd done ; 1c0feb -UnknownText_0x1c0feb: ; 1c0feb +Text_WasSentToBillsPC: ; 1c0feb text_from_ram StringBuffer1 text " was" line "sent to BILL's PC." diff --git a/text/common_4.asm b/text/common_4.asm index 09bfff312..c96d032f8 100644 --- a/text/common_4.asm +++ b/text/common_4.asm @@ -1262,7 +1262,7 @@ UnknownText_0x1c5937: ; 0x1c5937 done ; 0x1c5944 -UnknownText_0x1c5944: ; 0x1c5944 +Text_ExcuseMeYoureNotReady: ; 0x1c5944 text "Excuse me." line "You're not ready." para "" @@ -1289,14 +1289,14 @@ UnknownText_0x1c59a3: ; 0x1c59a3 done ; 0x1c59c3 -UnknownText_0x1c59c3: ; 0x1c59c3 +Text_OnlyThreePkmnMayBeEntered: ; 0x1c59c3 text "Only three #MON" line "may be entered." para "" done ; 0x1c59e5 -UnknownText_0x1c59e5: ; 0x1c59e5 +Text_ThePkmnMustAllBeDifferentKinds: ; 0x1c59e5 text "The @" text_from_ram StringBuffer2 text " #MON" @@ -1306,7 +1306,7 @@ UnknownText_0x1c59e5: ; 0x1c59e5 done ; 0x1c5a13 -UnknownText_0x1c5a13: ; 0x1c5a13 +Text_ThePkmnMustNotHoldTheSameItems: ; 0x1c5a13 text "The @" text_from_ram StringBuffer2 text " #MON" @@ -1316,7 +1316,7 @@ UnknownText_0x1c5a13: ; 0x1c5a13 done ; 0x1c5a42 -UnknownText_0x1c5a42: ; 0x1c5a42 +Text_YouCantTakeAnEgg: ; 0x1c5a42 text "You can't take an" line "EGG!" para "" |