diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2018-01-15 21:39:07 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-15 21:39:07 -0600 |
| commit | e1fd501e16deefe643c4572efaa07a59372616e4 (patch) | |
| tree | 9993a2ad6e2c7609763f5649d5417aa4f784b9a3 /src/data | |
| parent | ed152b1566fa5c39ee72ca190c49fbfe30708036 (diff) | |
| parent | 15cffaecf34d93c99aa635586ad24fa9978a70a0 (diff) | |
Merge pull request #540 from camthesaxman/emerald_port
port some fixed battle code from pokeemerald
Diffstat (limited to 'src/data')
| -rw-r--r-- | src/data/battle_strings_de.h | 2 | ||||
| -rw-r--r-- | src/data/battle_strings_en.h | 2 |
2 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 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 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, |