diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle_string_ids.h | 12 | ||||
| -rw-r--r-- | include/constants/battle_anim.h | 4 |
2 files changed, 9 insertions, 7 deletions
diff --git a/include/battle_string_ids.h b/include/battle_string_ids.h index f3c017b87..c646b2ebf 100644 --- a/include/battle_string_ids.h +++ b/include/battle_string_ids.h @@ -283,13 +283,13 @@ #define STRINGID_PKMNTURNEDAWAY 280 #define STRINGID_PKMNPRETENDNOTNOTICE 281 #define STRINGID_ENEMYABOUTTOSWITCHPKMN 282 -#define STRINGID_CREPTCLOSER 283 -#define STRINGID_CANTGETCLOSER 284 +#define STRINGID_THREWROCK 283 +#define STRINGID_THREWBAIT 284 #define STRINGID_PKMNWATCHINGCAREFULLY 285 -#define STRINGID_PKMNCURIOUSABOUTX 286 -#define STRINGID_PKMNENTHRALLEDBYX 287 -#define STRINGID_PKMNIGNOREDX 288 -#define STRINGID_THREWPOKEBLOCKATPKMN 289 +#define STRINGID_PKMNANGRY 286 +#define STRINGID_PKMNEATING 287 +#define STRINGID_DUMMY288 288 +#define STRINGID_DUMMY289 289 #define STRINGID_OUTOFSAFARIBALLS 290 #define STRINGID_PKMNSITEMCUREDPARALYSIS 291 #define STRINGID_PKMNSITEMCUREDPOISON 292 diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h index b9b176956..962cad668 100644 --- a/include/constants/battle_anim.h +++ b/include/constants/battle_anim.h @@ -351,7 +351,7 @@ #define B_ANIM_STATS_CHANGE 0x1 #define B_ANIM_SUBSTITUTE_FADE 0x2 #define B_ANIM_SUBSTITUTE_APPEAR 0x3 -#define B_ANIM_POKEBLOCK_THROW 0x4 +#define B_ANIM_BAIT_THROW 0x4 #define B_ANIM_ITEM_KNOCKOFF 0x5 #define B_ANIM_TURN_TRAP 0x6 #define B_ANIM_ITEM_EFFECT 0x7 @@ -373,6 +373,8 @@ #define B_ANIM_MON_SCARED 0x17 #define B_ANIM_GHOST_GET_OUT 0x18 #define B_ANIM_SILPH_SCOPED 0x19 +#define B_ANIM_ROCK_THROW 0x1A +#define B_ANIM_SAFARI_REACTION 0x1B // special animations table #define B_ANIM_LVL_UP 0x0 |