diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-18 21:45:52 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-18 21:45:52 +0100 |
| commit | 3de416662b5a83d96cbe010462971ed2c246d70d (patch) | |
| tree | 7070ce944c7ef2d46cde333faec6a9930d1399c2 /data/strings.s | |
| parent | f8b40754c70679bb3ec4c0611613a0658f679225 (diff) | |
| parent | 5dc8beb034e70b4e1eba61cca4009d5e06356605 (diff) | |
wild encounter, fix merge conflicts
Diffstat (limited to 'data/strings.s')
| -rw-r--r-- | data/strings.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/strings.s b/data/strings.s index ba32469bf..484c26d6e 100644 --- a/data/strings.s +++ b/data/strings.s @@ -5121,16 +5121,16 @@ gText_YouDontHaveThreeCoins:: @ 85EF734 gText_ReelTimeHelp:: @ 85EF750 .string "REEL TIME\nHere’s your chance to take\naim and nail marks!\nReel Time continues for the\nawarded number of spins.\nIt all ends on a Big Bonus.$" -gUnknown_085EF7DA:: @ 85EF7DA +gDaycareText_GetAlongVeryWell:: @ 85EF7DA .string "The two seem to get along\nvery well.$" -gUnknown_085EF7FF:: @ 85EF7FF +gDaycareText_GetAlong:: @ 85EF7FF .string "The two seem to get along.$" -gUnknown_085EF81A:: @ 85EF81A +gDaycareText_DontLikeOther:: @ 85EF81A .string "The two don’t seem to like\neach other much.$" -gUnknown_085EF846:: @ 85EF846 +gDaycareText_PlayOther:: @ 85EF846 .string "The two prefer to play with other\nPOKéMON than each other.$" gText_NewLine2:: @ 85EF881 |