diff options
| author | surskitty <surskitty@gmail.com> | 2017-12-12 00:50:55 -0500 |
|---|---|---|
| committer | surskitty <surskitty@gmail.com> | 2017-12-12 00:50:55 -0500 |
| commit | 096afdcdaca0714612f3670a3c4a670f312c1c3f (patch) | |
| tree | 0c0bedcd311ab83262e31cf6d9d4c37257143acc /text | |
| parent | 98128cd4d8457948e7136a16e08bacff0bc3529d (diff) | |
| parent | f6942b9a136b2ee3b25159ebc4d54509a42c5266 (diff) | |
Merge branch 'master' of github.com:pret/pokecrystal
Diffstat (limited to 'text')
| -rw-r--r-- | text/battle.asm | 2 | ||||
| -rw-r--r-- | text/phone/extra2.asm (renamed from text/phone/extra3.asm) | 0 | ||||
| -rw-r--r-- | text/stdtext.asm | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/text/battle.asm b/text/battle.asm index b9b121455..7e1b06069 100644 --- a/text/battle.asm +++ b/text/battle.asm @@ -1,3 +1,5 @@ +BattleText:: + BattleText_PlayerPickedUpPayDayMoney: ; 0x80730 text "<PLAYER> picked up" line "¥@" diff --git a/text/phone/extra3.asm b/text/phone/extra2.asm index 443338465..443338465 100644 --- a/text/phone/extra3.asm +++ b/text/phone/extra2.asm diff --git a/text/stdtext.asm b/text/stdtext.asm index 33827694f..7b558cc49 100644 --- a/text/stdtext.asm +++ b/text/stdtext.asm @@ -202,7 +202,7 @@ TrashCanText: line "can break this." done -PokeCenterSignText: +PokecenterSignText: text "Heal Your #MON!" line "#MON CENTER" done |