diff options
Diffstat (limited to 'text')
| -rw-r--r-- | text/battle.asm | 50 | ||||
| -rw-r--r-- | text/battle_tower.asm | 6 | ||||
| -rw-r--r-- | text/common_2.asm | 18 | ||||
| -rw-r--r-- | text/common_3.asm | 12 | ||||
| -rw-r--r-- | text/common_4.asm | 10 |
5 files changed, 47 insertions, 49 deletions
diff --git a/text/battle.asm b/text/battle.asm index 3f29835aa..55d8418b6 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 "" @@ -113,7 +113,7 @@ BattleText_0x80880: ; 0x80880 prompt ; 0x80899 -BattleText_0x80899: ; 0x80899 +BattleText_UserRecoveredPPUsing: ; 0x80899 text "<USER>" line "recovered PP using" cont "@" @@ -129,13 +129,13 @@ BattleText_0x808b6: ; 0x808b6 prompt ; 0x808d2 -BattleText_0x808d2: ; 0x808d2 +BattleText_SafeguardFaded: ; 0x808d2 text "<USER>'s" line "SAFEGUARD faded!" prompt ; 0x808e7 -BattleText_0x808e7: ; 0x808e7 +BattleText_PkmnnLightScreenFell: ; 0x808e7 text_from_ram StringBuffer1 text " #MON's" line "LIGHT SCREEN fell!" @@ -149,42 +149,42 @@ BattleText_0x80905: ; 0x80905 prompt ; 0x8091f -BattleText_0x8091f: ; 0x8091f +BattleText_RainContinuesToFall: ; 0x8091f text "Rain continues to" line "fall." prompt ; 0x80938 -BattleText_0x80938: ; 0x80938 +BattleText_TheSunlightIsStrong: ; 0x80938 text "The sunlight is" line "strong." prompt ; 0x80951 -BattleText_0x80951: ; 0x80951 +BattleText_TheSandstormRages: ; 0x80951 text "The SANDSTORM" line "rages." prompt ; 0x80967 -BattleText_0x80967: ; 0x80967 +BattleText_TheRainStopped: ; 0x80967 text "The rain stopped." prompt ; 0x8097a -BattleText_0x8097a: ; 0x8097a +BattleText_TheSunlightFaded: ; 0x8097a text "The sunlight" line "faded." prompt ; 0x8098f -BattleText_0x8098f: ; 0x8098f +BattleText_TheSandstormSubsided: ; 0x8098f text "The SANDSTORM" line "subsided." prompt ; 0x809a8 -BattleText_0x809a8: ; 0x809a8 +BattleText_EnemyPkmnFainted: ; 0x809a8 text "Enemy @" text_from_ram EnemyMonNick text "" @@ -199,7 +199,7 @@ GotMoneyForWinningText: line "for winning!" prompt -BattleText_0x809da: ; 0x809da +BattleText_EnemyWasDefeated: ; 0x809da text "<ENEMY>" line "was defeated!" prompt @@ -234,14 +234,14 @@ BattleText_0x80a4f: ; 0x80a4f prompt ; 0x80a75 -BattleText_0x80a75: ; 0x80a75 +BattleText_PkmnFainted: ; 0x80a75 text_from_ram BattleMonNick text "" line "fainted!" prompt ; 0x80a83 -BattleText_0x80a83: ; 0x80a83 +BattleText_UseNextMon: ; 0x80a83 text "Use next #MON?" done ; 0x80a93 @@ -259,7 +259,7 @@ LostAgainstText: ; 0x80ab9 prompt ; 0x80aca -BattleText_0x80aca: ; 0x80aca +BattleText_EnemyIsAboutToUseWillPlayerChangePkmn: ; 0x80aca text "<ENEMY>" line "is about to use" cont "@" @@ -271,7 +271,7 @@ BattleText_0x80aca: ; 0x80aca done ; 0x80af8 -BattleText_0x80af8: ; 0x80af8 +BattleText_EnemySentOut: ; 0x80af8 text "<ENEMY>" line "sent out" cont "@" @@ -280,34 +280,32 @@ BattleText_0x80af8: ; 0x80af8 done ; 0x80b0b -BattleText_0x80b0b: ; 0x80b0b +BattleText_TheresNoWillToBattle: ; 0x80b0b text "There's no will to" line "battle!" prompt ; 0x80b26 -BattleText_0x80b26: ; 0x80b26 +BattleText_AnEGGCantBattle: ; 0x80b26 text "An EGG can't" line "battle!" prompt ; 0x80b3b -BattleText_0x80b3b: ; 0x80b3b +BattleText_CantEscape2: ; 0x80b3b text "Can't escape!" prompt ; 0x80b49 -BattleText_0x80b49: ; 0x80b49 +BattleText_TheresNoEscapeFromTrainerBattle: ; 0x80b49 text "No! There's no" line "running from a" cont "trainer battle!" prompt -; 0x80b77 -BattleText_0x80b77: ; 0x80b77 +BattleText_GotAwaySafely: ; 0x80b77 text "Got away safely!" prompt -; 0x80b89 BattleText_0x80b89: ; 0x80b89 text "<USER>" @@ -318,7 +316,7 @@ BattleText_0x80b89: ; 0x80b89 prompt ; 0x80ba0 -BattleText_0x80ba0: ; 0x80ba0 +BattleText_CantEscape: ; 0x80ba0 text "Can't escape!" prompt ; 0x80bae @@ -1282,7 +1280,7 @@ IgnoredOrders2Text: ; 0x81850 prompt ; 0x81863 -BattleText_0x81863: ; 0x81863 +BattleText_LinkErrorBattleCanceled: ; 0x81863 text "Link error…" para "The battle has" diff --git a/text/battle_tower.asm b/text/battle_tower.asm index 9ef4f0299..af90b2666 100644 --- a/text/battle_tower.asm +++ b/text/battle_tower.asm @@ -1,5 +1,5 @@ -UnknownText_0x1ec000: ; 0x1ec000 +BattleTowerText_0x1ec000: ; 0x1ec000 text "Hello, glad to" line "meet you!" @@ -8,7 +8,7 @@ UnknownText_0x1ec000: ; 0x1ec000 done ; 0x1ec03b -UnknownText_0x1ec03b: ; 0x1ec03b +BattleTowerText_0x1ec03b: ; 0x1ec03b text "Thank you! A most" line "enjoyable battle!" done @@ -20,7 +20,7 @@ UnknownText_0x1ec060: ; 0x1ec060 done ; 0x1ec080 -UnknownText_0x1ec080: ; 0x1ec080 +BattleTowerText_0x1ec080: ; 0x1ec080 text "Work, work, work…" line "I'm always busy!" done 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..02adfea43 100644 --- a/text/common_3.asm +++ b/text/common_3.asm @@ -129,29 +129,29 @@ UnknownText_0x1c02c9: ; 1c02c9 prompt ; 1c02df -UnknownText_0x1c02df: ; 1c02df +Text_GoPkmn: ; 1c02df text "Go! @" db "@" ; 1c02e6 -UnknownText_0x1c02e6: ; 1c02e6 +Text_DoItPkmn: ; 1c02e6 text "Do it! @" db "@" ; 1c02f0 -UnknownText_0x1c02f0: ; 1c02f0 +Text_GoForItPkmn: ; 1c02f0 text "Go for it," line "@" db "@" ; 1c02fe -UnknownText_0x1c02fe: ; 1c02fe +Text_YourFoesWeakGetmPkmn: ; 1c02fe text "Your foe's weak!" line "Get'm, @" db "@" ; 1c0317 -UnknownText_0x1c0317: ; 1c0317 +Text_BattleMonNick01: ; 1c0317 text_from_ram BattleMonNick text "!" done @@ -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 "" |