diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-21 19:49:52 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-21 19:49:52 -0500 |
| commit | 79b322918594737d7dc8405e2ad823335693b9ae (patch) | |
| tree | 4826b774febbed88a50d22116fd896c34447997e /src/data | |
| parent | 5ffd006acfe8ad12e88fa53a93a55b6f59e77779 (diff) | |
| parent | 68a402883f780a61f54c2f0c8740429d0b2b3a81 (diff) | |
Merge branch 'master' into pokemon_storage_system
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 |