diff options
| author | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-16 23:35:14 +0100 |
|---|---|---|
| committer | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-16 23:35:14 +0100 |
| commit | 05ab3f96218b58001aa2d90cef951f7e4087c4ae (patch) | |
| tree | 642a3ceb3f83690fb90d5c535592e1339c66664a /src/data | |
| parent | 35f04db27cd4d5689c6498ba80eaeb695f973ebc (diff) | |
| parent | e1fd501e16deefe643c4572efaa07a59372616e4 (diff) | |
Merge remote-tracking branch 'upstream/master' into various_data
Diffstat (limited to 'src/data')
| -rw-r--r--[-rwxr-xr-x] | src/data/battle_strings_de.h | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | src/data/battle_strings_en.h | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | src/data/credits_de.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | src/data/credits_en.h | 0 |
4 files changed, 2 insertions, 2 deletions
diff --git a/src/data/battle_strings_de.h b/src/data/battle_strings_de.h index a3d51f2a5..a19c0fc6c 100755..100644 --- a/src/data/battle_strings_de.h +++ b/src/data/battle_strings_de.h @@ -1218,7 +1218,7 @@ const u8 *const gBattleStringsTable[] = }; // below are lists of battle string enums and NOT pointers to the strings. -const u16 gMissStrings[] = +const u16 gMissStringIds[] = { BATTLE_TEXT_AttackMissed, BATTLE_TEXT_ProtectedItself, diff --git a/src/data/battle_strings_en.h b/src/data/battle_strings_en.h index f29e48410..67eb70ee1 100755..100644 --- a/src/data/battle_strings_en.h +++ b/src/data/battle_strings_en.h @@ -1218,7 +1218,7 @@ const u8 *const gBattleStringsTable[] = }; // below are lists of battle string enums and NOT pointers to the strings. -const u16 gMissStrings[] = +const u16 gMissStringIds[] = { BATTLE_TEXT_AttackMissed, BATTLE_TEXT_ProtectedItself, diff --git a/src/data/credits_de.h b/src/data/credits_de.h index 570c0d4c5..570c0d4c5 100755..100644 --- a/src/data/credits_de.h +++ b/src/data/credits_de.h diff --git a/src/data/credits_en.h b/src/data/credits_en.h index 8ce0bad03..8ce0bad03 100755..100644 --- a/src/data/credits_en.h +++ b/src/data/credits_en.h |