diff --git a/data/battle_scripts/subscripts/subscript_0129_MEMENTO.s b/data/battle_scripts/subscripts/subscript_0129_MEMENTO.s index e1ddf1e2e..3c537ba91 100644 --- a/data/battle_scripts/subscripts/subscript_0129_MEMENTO.s +++ b/data/battle_scripts/subscripts/subscript_0129_MEMENTO.s @@ -14,7 +14,9 @@ _013: CheckSubstitute BATTLER_CATEGORY_DEFENDER, _062 UpdateVar OPCODE_FLAG_ON, BSCRIPT_VAR_BATTLE_STATUS, BATTLE_STATUS_MOVE_ANIMATIONS_OFF|BATTLE_STATUS_NO_ATTACK_MESSAGE UpdateVarFromVar OPCODE_SET, BSCRIPT_VAR_BATTLER_STAT_CHANGE, BSCRIPT_VAR_BATTLER_TARGET + CheckShouldNotTurnOffMultiStatAnim BATTLER_CATEGORY_DEFENDER, _skipShown UpdateVar OPCODE_FLAG_ON, BSCRIPT_VAR_BATTLE_STATUS_2, BATTLE_STATUS2_STAT_STAGE_CHANGE_SHOWN +_skipShown: CompareMonDataToValue OPCODE_EQU, BATTLER_CATEGORY_DEFENDER, BMON_DATA_STAT_CHANGE_ATK, 0, _043 UpdateVar OPCODE_SET, BSCRIPT_VAR_SIDE_EFFECT_PARAM, MOVE_SUBSCRIPT_PTR_ATTACK_DOWN_2_STAGES Call BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE diff --git a/data/battle_scripts/subscripts/subscript_0148_TARGET_ATK_AND_DEF_DOWN_1_STAGE.s b/data/battle_scripts/subscripts/subscript_0148_TARGET_ATK_AND_DEF_DOWN_1_STAGE.s index ecd80f394..9c38c7566 100644 --- a/data/battle_scripts/subscripts/subscript_0148_TARGET_ATK_AND_DEF_DOWN_1_STAGE.s +++ b/data/battle_scripts/subscripts/subscript_0148_TARGET_ATK_AND_DEF_DOWN_1_STAGE.s @@ -8,7 +8,9 @@ _000: _011: CompareVarToValue OPCODE_FLAG_SET, BSCRIPT_VAR_MOVE_STATUS_FLAGS, MOVE_STATUS_SEMI_INVULNERABLE|MOVE_STATUS_MISSED, _045 + CheckShouldNotTurnOffMultiStatAnim BATTLER_CATEGORY_DEFENDER, _skipShown UpdateVar OPCODE_FLAG_ON, BSCRIPT_VAR_BATTLE_STATUS_2, BATTLE_STATUS2_STAT_STAGE_CHANGE_SHOWN +_skipShown: UpdateVar OPCODE_SET, BSCRIPT_VAR_SIDE_EFFECT_PARAM, MOVE_SUBSCRIPT_PTR_ATTACK_DOWN_1_STAGE Call BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE UpdateVar OPCODE_FLAG_ON, BSCRIPT_VAR_BATTLE_STATUS, BATTLE_STATUS_MESSAGES_OFF diff --git a/data/battle_scripts/subscripts/subscript_0351_SPICY_EXTRACT.s b/data/battle_scripts/subscripts/subscript_0351_SPICY_EXTRACT.s index 983e2c31f..529f2e85c 100644 --- a/data/battle_scripts/subscripts/subscript_0351_SPICY_EXTRACT.s +++ b/data/battle_scripts/subscripts/subscript_0351_SPICY_EXTRACT.s @@ -11,13 +11,13 @@ _013: Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION UpdateVar OPCODE_FLAG_ON, BSCRIPT_VAR_BATTLE_STATUS, BATTLE_STATUS_MESSAGES_OFF UpdateVar OPCODE_FLAG_ON, BSCRIPT_VAR_BATTLE_STATUS, BATTLE_STATUS_MOVE_ANIMATIONS_OFF|BATTLE_STATUS_NO_ATTACK_MESSAGE - UpdateVar OPCODE_FLAG_ON, BSCRIPT_VAR_BATTLE_STATUS_2, BATTLE_STATUS2_STAT_STAGE_CHANGE_SHOWN + //UpdateVar OPCODE_FLAG_ON, BSCRIPT_VAR_BATTLE_STATUS_2, BATTLE_STATUS2_STAT_STAGE_CHANGE_SHOWN UpdateVar OPCODE_SET, BSCRIPT_VAR_SIDE_EFFECT_PARAM, MOVE_SUBSCRIPT_PTR_ATTACK_UP_2_STAGES Call BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE UpdateVar OPCODE_SET, BSCRIPT_VAR_SIDE_EFFECT_PARAM, MOVE_SUBSCRIPT_PTR_DEFENSE_DOWN_2_STAGES Call BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE UpdateVar OPCODE_FLAG_OFF, BSCRIPT_VAR_BATTLE_STATUS_2, BATTLE_STATUS2_UPDATE_STAT_STAGES - UpdateVar OPCODE_FLAG_OFF, BSCRIPT_VAR_BATTLE_STATUS_2, BATTLE_STATUS2_STAT_STAGE_CHANGE_SHOWN + //UpdateVar OPCODE_FLAG_OFF, BSCRIPT_VAR_BATTLE_STATUS_2, BATTLE_STATUS2_STAT_STAGE_CHANGE_SHOWN End _048: