diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-07-25 08:10:18 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-25 08:10:18 -0700 |
| commit | 919e7b4387556ce59e2d3a3bcb2ad44fe76ee8ee (patch) | |
| tree | 345f52571b2d6c5505441e914f73d576acff7c9a /data/text | |
| parent | 5883f867f00b8cc3f3630a8ab4aa2e9d21406949 (diff) | |
| parent | 7270e73fee332d53c4f30069af4525d89cd165b0 (diff) | |
Merge pull request #279 from Diegoisawesome/master
Move strings to C, misc cleanup
Diffstat (limited to 'data/text')
| -rw-r--r-- | data/text/berry_firmness_strings.inc | 14 | ||||
| -rw-r--r-- | data/text/easy_chat/easy_chat_group_names.inc | 65 |
2 files changed, 0 insertions, 79 deletions
diff --git a/data/text/berry_firmness_strings.inc b/data/text/berry_firmness_strings.inc deleted file mode 100644 index 656aa82de..000000000 --- a/data/text/berry_firmness_strings.inc +++ /dev/null @@ -1,14 +0,0 @@ -gBerryFirmnessString_VerySoft:: @ 85E923A - .string "Very soft$" - -gBerryFirmnessString_Soft:: @ 85E9244 - .string "Soft$" - -gBerryFirmnessString_Hard:: @ 85E9249 - .string "Hard$" - -gBerryFirmnessString_VeryHard:: @ 85E924E - .string "Very hard$" - -gBerryFirmnessString_SuperHard:: @ 85E9258 - .string "Super hard$" diff --git a/data/text/easy_chat/easy_chat_group_names.inc b/data/text/easy_chat/easy_chat_group_names.inc deleted file mode 100644 index ebe3dff1b..000000000 --- a/data/text/easy_chat/easy_chat_group_names.inc +++ /dev/null @@ -1,65 +0,0 @@ -gEasyChatGroupName_Pokemon:: @ 85EE98D - .string "POKéMON$" - -gEasyChatGroupName_Trainer:: @ 85EE995 - .string "TRAINER$" - -gEasyChatGroupName_Status:: @ 85EE99D - .string "STATUS$" - -gEasyChatGroupName_Battle:: @ 85EE9A4 - .string "BATTLE$" - -gEasyChatGroupName_Greetings:: @ 85EE9AB - .string "GREETINGS$" - -gEasyChatGroupName_People:: @ 85EE9B5 - .string "PEOPLE$" - -gEasyChatGroupName_Voices:: @ 85EE9BC - .string "VOICES$" - -gEasyChatGroupName_Speech:: @ 85EE9C3 - .string "SPEECH$" - -gEasyChatGroupName_Endings:: @ 85EE9CA - .string "ENDINGS$" - -gEasyChatGroupName_Feelings:: @ 85EE9D2 - .string "FEELINGS$" - -gEasyChatGroupName_Conditions:: @ 85EE9DB - .string "CONDITIONS$" - -gEasyChatGroupName_Actions:: @ 85EE9E6 - .string "ACTIONS$" - -gEasyChatGroupName_Lifestyle:: @ 85EE9EE - .string "LIFESTYLE$" - -gEasyChatGroupName_Hobbies:: @ 85EE9F8 - .string "HOBBIES$" - -gEasyChatGroupName_Time:: @ 85EEA00 - .string "TIME$" - -gEasyChatGroupName_Misc:: @ 85EEA05 - .string "MISC.$" - -gEasyChatGroupName_Adjectives:: @ 85EEA0B - .string "ADJECTIVES$" - -gEasyChatGroupName_Events:: @ 85EEA16 - .string "EVENTS$" - -gEasyChatGroupName_Move1:: @ 85EEA1D - .string "MOVE 1$" - -gEasyChatGroupName_Move2:: @ 85EEA24 - .string "MOVE 2$" - -gEasyChatGroupName_TrendySaying:: @ 85EEA2B - .string "TRENDY SAYING$" - -gEasyChatGroupName_Pokemon2:: @ 85EEA39 - .string "POKéMON2$" |