diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-11-14 12:57:49 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-11-19 10:26:40 +0800 |
| commit | 1d3ae2fe78823a6a0d4d9d93a988aa5ca1092801 (patch) | |
| tree | acb385b82e1b361e36e6075b13329563fe93f415 /data/strings.s | |
| parent | 17b55f50dbcdf9797d0aecfba356bc8681dea8f5 (diff) | |
| parent | f6dfeba742c415d964b415bfefb859c3a3764930 (diff) | |
Merge branch 'master' into battle
Diffstat (limited to 'data/strings.s')
| -rw-r--r-- | data/strings.s | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/data/strings.s b/data/strings.s index 9b223df62..101946475 100644 --- a/data/strings.s +++ b/data/strings.s @@ -4535,17 +4535,17 @@ gDaycareText_PlayOther:: @ 841E3A8 .string "The two prefer to play with other\n" .string "POKéMON than each other.$" -gUnknown_841E3E3:: @ 841E3E3 +gText_TeachWhichMoveToMon:: @ 841E3E3 .string "Teach which move to {STR_VAR_1}?$" -gUnknown_841E3FB:: @ 841E3FB +gText_TeachMoveQues:: @ 841E3FB .string "Teach {STR_VAR_2}?$" -gUnknown_841E405:: @ 841E405 +gText_MonLearnedMove:: @ 841E405 .string "{STR_VAR_1} learned\n" .string "{STR_VAR_2}.$" -gUnknown_841E414:: @ 841E414 +gText_MonIsTryingToLearnMove:: @ 841E414 .string "{STR_VAR_1} is trying to learn\n" .string "{STR_VAR_2}.\p" .string "But {STR_VAR_1} can't learn more\n" @@ -4553,24 +4553,24 @@ gUnknown_841E414:: @ 841E414 .string "Delete an older move to make\n" .string "room for {STR_VAR_2}?$" -gUnknown_841E481:: @ 841E481 +gText_StopLearningMove:: @ 841E481 .string "Stop learning {STR_VAR_2}?$" -gUnknown_841E493:: @ 841E493 +gText_1_2_and_Poof:: @ 841E493 .string "{PAUSE 0x20}1, {PAUSE 0x0F}2, and {PAUSE 0x0F}‥ {PAUSE 0x0F}‥ {PAUSE 0x0F}‥ {PAUSE 0x0F}{PLAY_SE SE_KON}Poof!\p" .string "$" -gUnknown_841E4C0:: @ 841E4C0 +gText_MonForgotOldMoveAndMonLearnedNewMove:: @ 841E4C0 .string "{STR_VAR_1} forgot {STR_VAR_3}.\p" .string "And‥\p" .string "{STR_VAR_1}\n" .string "learned {STR_VAR_2}.$" -gUnknown_841E4E2:: @ 841E4E2 +gText_GiveUpTryingToTeachNewMove:: @ 841E4E2 .string "Give up trying to teach a new\n" .string "move to {STR_VAR_1}?$" -gUnknown_841E50C:: @ 841E50C +gText_WhichMoveShouldBeForgotten:: @ 841E50C .string "Which move should be forgotten?\p" .string "$" |