From 66710ac22ae132cdf1cf5c9b5356f0a987cc6ffd Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Thu, 31 Aug 2023 23:54:11 -0400 Subject: [PATCH] Updated various defines --- include/constants/battle_script_commands.h | 82 +++++++++++----------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/include/constants/battle_script_commands.h b/include/constants/battle_script_commands.h index f004d7ff1..c7e62a1f7 100644 --- a/include/constants/battle_script_commands.h +++ b/include/constants/battle_script_commands.h @@ -210,47 +210,47 @@ #define VARIOUS_TRY_ACTIVATE_BATTLE_BOND 118 #define VARIOUS_CONSUME_BERRY 119 #define VARIOUS_JUMP_IF_CANT_REVERT_TO_PRIMAL 120 -#define VARIOUS_APPLY_PLASMA_FISTS 122 -#define VARIOUS_JUMP_IF_SPECIES 123 -#define VARIOUS_UPDATE_ABILITY_POPUP 124 -#define VARIOUS_JUMP_IF_WEATHER_AFFECTED 125 -#define VARIOUS_JUMP_IF_LEAF_GUARD_PROTECTED 126 -#define VARIOUS_SET_ATTACKER_STICKY_WEB_USER 127 -#define VARIOUS_PHOTON_GEYSER_CHECK 128 -#define VARIOUS_SHELL_SIDE_ARM_CHECK 129 -#define VARIOUS_TRY_NO_RETREAT 130 -#define VARIOUS_TRY_TAR_SHOT 131 -#define VARIOUS_CAN_TAR_SHOT_WORK 132 -#define VARIOUS_CHECK_POLTERGEIST 133 -#define VARIOUS_SET_OCTOLOCK 134 -#define VARIOUS_CUT_1_3_HP_RAISE_STATS 135 -#define VARIOUS_TRY_END_NEUTRALIZING_GAS 136 -#define VARIOUS_JUMP_IF_UNDER_200 137 -#define VARIOUS_SET_SKY_DROP 138 -#define VARIOUS_CLEAR_SKY_DROP 139 -#define VARIOUS_SKY_DROP_YAWN 140 -#define VARIOUS_JUMP_IF_CANT_FLING 141 -#define VARIOUS_JUMP_IF_HOLD_EFFECT 142 -#define VARIOUS_CURE_CERTAIN_STATUSES 143 -#define VARIOUS_TRY_RESET_NEGATIVE_STAT_STAGES 144 -#define VARIOUS_JUMP_IF_LAST_USED_ITEM_BERRY 145 -#define VARIOUS_JUMP_IF_LAST_USED_ITEM_HOLD_EFFECT 146 -#define VARIOUS_SAVE_BATTLER_ITEM 147 -#define VARIOUS_RESTORE_BATTLER_ITEM 148 -#define VARIOUS_BATTLER_ITEM_TO_LAST_USED_ITEM 149 -#define VARIOUS_SET_BEAK_BLAST 150 -#define VARIOUS_SWAP_SIDE_STATUSES 151 -#define VARIOUS_SWAP_STATS 152 -#define VARIOUS_TEATIME_INVUL 156 -#define VARIOUS_TEATIME_TARGETS 157 -#define VARIOUS_TRY_WIND_RIDER_POWER 158 -#define VARIOUS_ACTIVATE_WEATHER_CHANGE_ABILITIES 159 -#define VARIOUS_ACTIVATE_TERRAIN_CHANGE_ABILITIES 160 -#define VARIOUS_STORE_HEALING_WISH 162 -#define VARIOUS_HIT_SWITCH_TARGET_FAILED 163 -#define VARIOUS_TRY_REVIVAL_BLESSING 165 -#define VARIOUS_TRY_TRAINER_SLIDE_MSG_Z_MOVE 166 -#define VARIOUS_TRY_TRAINER_SLIDE_MSG_MEGA_EVOLUTION 167 +#define VARIOUS_APPLY_PLASMA_FISTS 121 +#define VARIOUS_JUMP_IF_SPECIES 122 +#define VARIOUS_UPDATE_ABILITY_POPUP 123 +#define VARIOUS_JUMP_IF_WEATHER_AFFECTED 124 +#define VARIOUS_JUMP_IF_LEAF_GUARD_PROTECTED 125 +#define VARIOUS_SET_ATTACKER_STICKY_WEB_USER 126 +#define VARIOUS_PHOTON_GEYSER_CHECK 127 +#define VARIOUS_SHELL_SIDE_ARM_CHECK 128 +#define VARIOUS_TRY_NO_RETREAT 129 +#define VARIOUS_TRY_TAR_SHOT 130 +#define VARIOUS_CAN_TAR_SHOT_WORK 131 +#define VARIOUS_CHECK_POLTERGEIST 132 +#define VARIOUS_SET_OCTOLOCK 133 +#define VARIOUS_CUT_1_3_HP_RAISE_STATS 134 +#define VARIOUS_TRY_END_NEUTRALIZING_GAS 135 +#define VARIOUS_JUMP_IF_UNDER_200 136 +#define VARIOUS_SET_SKY_DROP 137 +#define VARIOUS_CLEAR_SKY_DROP 138 +#define VARIOUS_SKY_DROP_YAWN 139 +#define VARIOUS_JUMP_IF_CANT_FLING 140 +#define VARIOUS_JUMP_IF_HOLD_EFFECT 141 +#define VARIOUS_CURE_CERTAIN_STATUSES 142 +#define VARIOUS_TRY_RESET_NEGATIVE_STAT_STAGES 143 +#define VARIOUS_JUMP_IF_LAST_USED_ITEM_BERRY 144 +#define VARIOUS_JUMP_IF_LAST_USED_ITEM_HOLD_EFFECT 145 +#define VARIOUS_SAVE_BATTLER_ITEM 146 +#define VARIOUS_RESTORE_BATTLER_ITEM 147 +#define VARIOUS_BATTLER_ITEM_TO_LAST_USED_ITEM 148 +#define VARIOUS_SET_BEAK_BLAST 149 +#define VARIOUS_SWAP_SIDE_STATUSES 150 +#define VARIOUS_SWAP_STATS 151 +#define VARIOUS_TEATIME_INVUL 152 +#define VARIOUS_TEATIME_TARGETS 153 +#define VARIOUS_TRY_WIND_RIDER_POWER 154 +#define VARIOUS_ACTIVATE_WEATHER_CHANGE_ABILITIES 155 +#define VARIOUS_ACTIVATE_TERRAIN_CHANGE_ABILITIES 156 +#define VARIOUS_STORE_HEALING_WISH 157 +#define VARIOUS_HIT_SWITCH_TARGET_FAILED 158 +#define VARIOUS_TRY_REVIVAL_BLESSING 159 +#define VARIOUS_TRY_TRAINER_SLIDE_MSG_Z_MOVE 160 +#define VARIOUS_TRY_TRAINER_SLIDE_MSG_MEGA_EVOLUTION 161 // Cmd_manipulatedamage #define DMG_CHANGE_SIGN 0