diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-16 11:27:10 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-16 11:27:10 -0500 |
| commit | 190a2cba61c498eb258dc5743ba613168f15f677 (patch) | |
| tree | 090781e56a9f32c0582bd56d167cc0d69a8d88f5 /constants/battle_script_constants.inc | |
| parent | b1c6f80e10ca18d18ca11091449a9969e2b9aa05 (diff) | |
| parent | 224fdbf026cfb0ff88aac519875a39fb038e4bb1 (diff) | |
Merge branch 'master' into link
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 |