diff options
| author | JimB16 <f1@jimb.de> | 2015-08-25 01:56:30 +0200 |
|---|---|---|
| committer | JimB16 <f1@jimb.de> | 2015-08-25 01:56:30 +0200 |
| commit | 706f289c709b8dddd0c196e9d8a6900da34167ea (patch) | |
| tree | d1e204a09a966dd819e7e5fd2923a656335b5e9f /text | |
| parent | 4cd118b149439919e3c99a6fbd4c02a713123089 (diff) | |
change more labelss
Diffstat (limited to 'text')
| -rw-r--r-- | text/battle.asm | 6 | ||||
| -rw-r--r-- | text/common_2.asm | 18 |
2 files changed, 12 insertions, 12 deletions
diff --git a/text/battle.asm b/text/battle.asm index 42f4aa40c..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 "" @@ -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 |