diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-09 21:24:47 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-09 21:24:47 +0100 |
| commit | bb1ae5f8572cbbda145bc88e9677de5988646696 (patch) | |
| tree | 9e7fa573390eb971aafc20884d0865246497458e /constants/battle_script_constants.inc | |
| parent | 6561b62986a003e83811abfc85bf07ebc6f3a1ae (diff) | |
| parent | 00896cb3b5813cb843e5e1abd4cbc9ff0ad3a632 (diff) | |
Merge branch 'master' into decompile_use_pokeblock
Diffstat (limited to 'constants/battle_script_constants.inc')
| -rw-r--r-- | constants/battle_script_constants.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/constants/battle_script_constants.inc b/constants/battle_script_constants.inc index fb0c39ab9..fe0e7dddc 100644 --- a/constants/battle_script_constants.inc +++ b/constants/battle_script_constants.inc @@ -18,7 +18,7 @@ .set ANIM_ITEM_STEAL, 0x10 .set ANIM_SNATCH_MOVE, 0x11 .set ANIM_FUTURE_SIGHT_HIT, 0x12 - .set ANIM_x13, 0x13 + .set ANIM_DOOM_DESIRE_HIT, 0x13 .set ANIM_x14, 0x14 .set ANIM_INGRAIN_HEAL, 0x15 .set ANIM_WISH_HEAL, 0x16 @@ -146,8 +146,8 @@ .equiv sANIM_ARG2, gBattleScripting + 0x11 .equiv sTRIPLE_KICK_POWER, gBattleScripting + 0x12 .equiv sMOVEEND_STATE, gBattleScripting + 0x14 - .equiv sFIELD_15, gBattleScripting + 0x15 - .equiv sFIELD_16, gBattleScripting + 0x16 + .equiv sBANK_WITH_ABILITY, gBattleScripting + 0x15 + .equiv sMULTIHIT_EFFECT, gBattleScripting + 0x16 .equiv sBANK, gBattleScripting + 0x17 .equiv sANIM_TURN, gBattleScripting + 0x18 .equiv sANIM_TARGETS_HIT, gBattleScripting + 0x19 |