diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2019-06-17 07:29:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-17 07:29:30 -0400 |
| commit | f1bab45624a3a2d5f6bf5b63e912382de0a30abd (patch) | |
| tree | a119b4a04697bba53c0f9617283ed9a467fc6236 /data | |
| parent | fbc2c55cdb2f18a933af3daf9294750f254c23a5 (diff) | |
| parent | 7e84f7240328af68723f8419d5079daea32cf21d (diff) | |
Merge pull request #638 from mid-kid/master
beep boop
Diffstat (limited to 'data')
| -rw-r--r-- | data/text/battle.asm | 3 | ||||
| -rw-r--r-- | data/text/common_2.asm | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/data/text/battle.asm b/data/text/battle.asm index 56a1cb8e1..722c3e289 100644 --- a/data/text/battle.asm +++ b/data/text/battle.asm @@ -414,9 +414,8 @@ BecameConfusedText: text "<TARGET>" line "became confused!" prompt -; ItemHealedConfusion -BattleText_ItemHealedConfusion: ; ItemHealedConfusion +BattleText_ItemHealedConfusion: text "A @" text_ram wStringBuffer1 text " rid" diff --git a/data/text/common_2.asm b/data/text/common_2.asm index 6e2d21800..29f5dc0bb 100644 --- a/data/text/common_2.asm +++ b/data/text/common_2.asm @@ -815,7 +815,7 @@ UnknownText_0x1c0df3:: UnknownText_0x1c0e24:: text "It's @" - text_ram wBreedMon1 + text_ram wBreedMon1Nick text_start line "that was left with" cont "the DAY-CARE MAN." |