diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 3cf9113196..706025f623 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -69,7 +69,7 @@ gBattleScriptsForMoveEffects:: .4byte BattleScript_EffectRecoilIfMiss @ EFFECT_RECOIL_IF_MISS .4byte BattleScript_EffectMist @ EFFECT_MIST .4byte BattleScript_EffectFocusEnergy @ EFFECT_FOCUS_ENERGY - .4byte BattleScript_EffectHit @ EFFECT_RECOIL_25 + .4byte BattleScript_EffectHit @ EFFECT_RECOIL .4byte BattleScript_EffectConfuse @ EFFECT_CONFUSE .4byte BattleScript_EffectAttackUp2 @ EFFECT_ATTACK_UP_2 .4byte BattleScript_EffectDefenseUp2 @ EFFECT_DEFENSE_UP_2 @@ -123,7 +123,6 @@ gBattleScriptsForMoveEffects:: .4byte BattleScript_EffectSpite @ EFFECT_SPITE .4byte BattleScript_EffectHit @ EFFECT_FALSE_SWIPE .4byte BattleScript_EffectHealBell @ EFFECT_HEAL_BELL - .4byte BattleScript_EffectHit @ EFFECT_ALWAYS_CRIT .4byte BattleScript_EffectTripleKick @ EFFECT_TRIPLE_KICK .4byte BattleScript_EffectThief @ EFFECT_THIEF .4byte BattleScript_EffectMeanLook @ EFFECT_MEAN_LOOK @@ -215,7 +214,6 @@ gBattleScriptsForMoveEffects:: .4byte BattleScript_EffectSnatch @ EFFECT_SNATCH .4byte BattleScript_EffectHit @ EFFECT_LOW_KICK .4byte BattleScript_EffectSecretPower @ EFFECT_SECRET_POWER - .4byte BattleScript_EffectHit @ EFFECT_RECOIL_33 .4byte BattleScript_EffectTeeterDance @ EFFECT_TEETER_DANCE .4byte BattleScript_EffectHitEscape @ EFFECT_HIT_ESCAPE .4byte BattleScript_EffectMudSport @ EFFECT_MUD_SPORT @@ -307,9 +305,7 @@ gBattleScriptsForMoveEffects:: .4byte BattleScript_EffectGrowth @ EFFECT_GROWTH .4byte BattleScript_EffectCloseCombat @ EFFECT_CLOSE_COMBAT .4byte BattleScript_EffectLastResort @ EFFECT_LAST_RESORT - .4byte BattleScript_EffectHit @ EFFECT_RECOIL_33_STATUS .4byte BattleScript_EffectFlinchStatus @ EFFECT_FLINCH_STATUS - .4byte BattleScript_EffectHit @ EFFECT_RECOIL_50 .4byte BattleScript_EffectShellSmash @ EFFECT_SHELL_SMASH .4byte BattleScript_EffectShiftGear @ EFFECT_SHIFT_GEAR .4byte BattleScript_EffectDefenseUp3 @ EFFECT_DEFENSE_UP_3 diff --git a/include/battle.h b/include/battle.h index 5b258d156f..37f5b22ef1 100644 --- a/include/battle.h +++ b/include/battle.h @@ -764,11 +764,7 @@ STATIC_ASSERT(sizeof(((struct BattleStruct *)0)->palaceFlags) * 8 >= MAX_BATTLER #define IS_MOVE_SPECIAL(move)(GetBattleMoveSplit(move) == SPLIT_SPECIAL) #define IS_MOVE_STATUS(move)(gBattleMoves[move].split == SPLIT_STATUS) -#define IS_EFFECT_RECOIL(effect)(effect == EFFECT_RECOIL_25 \ - || effect == EFFECT_RECOIL_IF_MISS \ - || effect == EFFECT_RECOIL_50 \ - || effect == EFFECT_RECOIL_33 \ - || effect == EFFECT_RECOIL_33_STATUS) +#define IS_EFFECT_RECOIL(effect)(effect == EFFECT_RECOIL || effect == EFFECT_RECOIL_IF_MISS) #define IS_MOVE_RECOIL(move)(IS_EFFECT_RECOIL(gBattleMoves[move].effect)) diff --git a/include/constants/battle_move_effects.h b/include/constants/battle_move_effects.h index beebe59462..a0b0fb1d4c 100644 --- a/include/constants/battle_move_effects.h +++ b/include/constants/battle_move_effects.h @@ -48,7 +48,7 @@ #define EFFECT_RECOIL_IF_MISS 44 #define EFFECT_MIST 45 #define EFFECT_FOCUS_ENERGY 46 -#define EFFECT_RECOIL_25 47 +#define EFFECT_RECOIL 47 #define EFFECT_CONFUSE 48 #define EFFECT_ATTACK_UP_2 49 #define EFFECT_DEFENSE_UP_2 50 @@ -102,325 +102,321 @@ #define EFFECT_SPITE 98 #define EFFECT_FALSE_SWIPE 99 #define EFFECT_HEAL_BELL 100 -#define EFFECT_ALWAYS_CRIT 101 -#define EFFECT_TRIPLE_KICK 102 -#define EFFECT_THIEF 103 -#define EFFECT_MEAN_LOOK 104 -#define EFFECT_NIGHTMARE 105 -#define EFFECT_MINIMIZE 106 -#define EFFECT_CURSE 107 -#define EFFECT_HEALING_WISH 108 -#define EFFECT_PROTECT 109 -#define EFFECT_SPIKES 110 -#define EFFECT_FORESIGHT 111 -#define EFFECT_PERISH_SONG 112 -#define EFFECT_SANDSTORM 113 -#define EFFECT_ENDURE 114 -#define EFFECT_ROLLOUT 115 -#define EFFECT_SWAGGER 116 -#define EFFECT_FURY_CUTTER 117 -#define EFFECT_ATTRACT 118 -#define EFFECT_RETURN 119 -#define EFFECT_PRESENT 120 -#define EFFECT_FRUSTRATION 121 -#define EFFECT_SAFEGUARD 122 -#define EFFECT_MAGNITUDE 123 -#define EFFECT_BATON_PASS 124 -#define EFFECT_PURSUIT 125 -#define EFFECT_RAPID_SPIN 126 -#define EFFECT_SONICBOOM 127 -#define EFFECT_CAPTIVATE 128 -#define EFFECT_MORNING_SUN 129 -#define EFFECT_SYNTHESIS 130 -#define EFFECT_MOONLIGHT 131 -#define EFFECT_HIDDEN_POWER 132 -#define EFFECT_RAIN_DANCE 133 -#define EFFECT_SUNNY_DAY 134 -#define EFFECT_DEFENSE_UP_HIT 135 -#define EFFECT_ATTACK_UP_HIT 136 -#define EFFECT_ALL_STATS_UP_HIT 137 -#define EFFECT_FELL_STINGER 138 -#define EFFECT_BELLY_DRUM 139 -#define EFFECT_PSYCH_UP 140 -#define EFFECT_MIRROR_COAT 141 -#define EFFECT_SKULL_BASH 142 -#define EFFECT_EARTHQUAKE 143 -#define EFFECT_FUTURE_SIGHT 144 -#define EFFECT_GUST 145 -#define EFFECT_SOLAR_BEAM 146 -#define EFFECT_THUNDER 147 -#define EFFECT_TELEPORT 148 -#define EFFECT_BEAT_UP 149 -#define EFFECT_SEMI_INVULNERABLE 150 -#define EFFECT_DEFENSE_CURL 151 -#define EFFECT_SOFTBOILED 152 -#define EFFECT_FAKE_OUT 153 -#define EFFECT_UPROAR 154 -#define EFFECT_STOCKPILE 155 -#define EFFECT_SPIT_UP 156 -#define EFFECT_SWALLOW 157 -#define EFFECT_WORRY_SEED 158 -#define EFFECT_HAIL 159 -#define EFFECT_TORMENT 160 -#define EFFECT_FLATTER 161 -#define EFFECT_WILL_O_WISP 162 -#define EFFECT_MEMENTO 163 -#define EFFECT_FACADE 164 -#define EFFECT_FOCUS_PUNCH 165 -#define EFFECT_SMELLING_SALTS 166 -#define EFFECT_FOLLOW_ME 167 -#define EFFECT_NATURE_POWER 168 -#define EFFECT_CHARGE 169 -#define EFFECT_TAUNT 170 -#define EFFECT_HELPING_HAND 171 -#define EFFECT_TRICK 172 -#define EFFECT_ROLE_PLAY 173 -#define EFFECT_WISH 174 -#define EFFECT_ASSIST 175 -#define EFFECT_INGRAIN 176 -#define EFFECT_SUPERPOWER 177 -#define EFFECT_MAGIC_COAT 178 -#define EFFECT_RECYCLE 179 -#define EFFECT_REVENGE 180 -#define EFFECT_BRICK_BREAK 181 -#define EFFECT_YAWN 182 -#define EFFECT_KNOCK_OFF 183 -#define EFFECT_ENDEAVOR 184 -#define EFFECT_ERUPTION 185 -#define EFFECT_SKILL_SWAP 186 -#define EFFECT_IMPRISON 187 -#define EFFECT_REFRESH 188 -#define EFFECT_GRUDGE 189 -#define EFFECT_SNATCH 190 -#define EFFECT_LOW_KICK 191 -#define EFFECT_SECRET_POWER 192 -#define EFFECT_RECOIL_33 193 -#define EFFECT_TEETER_DANCE 194 -#define EFFECT_HIT_ESCAPE 195 -#define EFFECT_MUD_SPORT 196 -#define EFFECT_POISON_FANG 197 -#define EFFECT_WEATHER_BALL 198 -#define EFFECT_OVERHEAT 199 -#define EFFECT_TICKLE 200 -#define EFFECT_COSMIC_POWER 201 -#define EFFECT_SKY_UPPERCUT 202 -#define EFFECT_BULK_UP 203 -#define EFFECT_PLACEHOLDER 204 -#define EFFECT_WATER_SPORT 205 -#define EFFECT_CALM_MIND 206 -#define EFFECT_DRAGON_DANCE 207 -#define EFFECT_CAMOUFLAGE 208 +#define EFFECT_TRIPLE_KICK 101 +#define EFFECT_THIEF 102 +#define EFFECT_MEAN_LOOK 103 +#define EFFECT_NIGHTMARE 104 +#define EFFECT_MINIMIZE 105 +#define EFFECT_CURSE 106 +#define EFFECT_HEALING_WISH 107 +#define EFFECT_PROTECT 108 +#define EFFECT_SPIKES 109 +#define EFFECT_FORESIGHT 110 +#define EFFECT_PERISH_SONG 111 +#define EFFECT_SANDSTORM 112 +#define EFFECT_ENDURE 113 +#define EFFECT_ROLLOUT 114 +#define EFFECT_SWAGGER 115 +#define EFFECT_FURY_CUTTER 116 +#define EFFECT_ATTRACT 117 +#define EFFECT_RETURN 118 +#define EFFECT_PRESENT 119 +#define EFFECT_FRUSTRATION 120 +#define EFFECT_SAFEGUARD 121 +#define EFFECT_MAGNITUDE 122 +#define EFFECT_BATON_PASS 123 +#define EFFECT_PURSUIT 124 +#define EFFECT_RAPID_SPIN 125 +#define EFFECT_SONICBOOM 126 +#define EFFECT_CAPTIVATE 127 +#define EFFECT_MORNING_SUN 128 +#define EFFECT_SYNTHESIS 129 +#define EFFECT_MOONLIGHT 130 +#define EFFECT_HIDDEN_POWER 131 +#define EFFECT_RAIN_DANCE 132 +#define EFFECT_SUNNY_DAY 133 +#define EFFECT_DEFENSE_UP_HIT 134 +#define EFFECT_ATTACK_UP_HIT 135 +#define EFFECT_ALL_STATS_UP_HIT 136 +#define EFFECT_FELL_STINGER 137 +#define EFFECT_BELLY_DRUM 138 +#define EFFECT_PSYCH_UP 139 +#define EFFECT_MIRROR_COAT 140 +#define EFFECT_SKULL_BASH 141 +#define EFFECT_EARTHQUAKE 142 +#define EFFECT_FUTURE_SIGHT 143 +#define EFFECT_GUST 144 +#define EFFECT_SOLAR_BEAM 145 +#define EFFECT_THUNDER 146 +#define EFFECT_TELEPORT 147 +#define EFFECT_BEAT_UP 148 +#define EFFECT_SEMI_INVULNERABLE 149 +#define EFFECT_DEFENSE_CURL 150 +#define EFFECT_SOFTBOILED 151 +#define EFFECT_FAKE_OUT 152 +#define EFFECT_UPROAR 153 +#define EFFECT_STOCKPILE 154 +#define EFFECT_SPIT_UP 155 +#define EFFECT_SWALLOW 156 +#define EFFECT_WORRY_SEED 157 +#define EFFECT_HAIL 158 +#define EFFECT_TORMENT 159 +#define EFFECT_FLATTER 160 +#define EFFECT_WILL_O_WISP 161 +#define EFFECT_MEMENTO 162 +#define EFFECT_FACADE 163 +#define EFFECT_FOCUS_PUNCH 164 +#define EFFECT_SMELLING_SALTS 165 +#define EFFECT_FOLLOW_ME 166 +#define EFFECT_NATURE_POWER 167 +#define EFFECT_CHARGE 168 +#define EFFECT_TAUNT 169 +#define EFFECT_HELPING_HAND 170 +#define EFFECT_TRICK 171 +#define EFFECT_ROLE_PLAY 172 +#define EFFECT_WISH 173 +#define EFFECT_ASSIST 174 +#define EFFECT_INGRAIN 175 +#define EFFECT_SUPERPOWER 176 +#define EFFECT_MAGIC_COAT 177 +#define EFFECT_RECYCLE 178 +#define EFFECT_REVENGE 179 +#define EFFECT_BRICK_BREAK 180 +#define EFFECT_YAWN 181 +#define EFFECT_KNOCK_OFF 182 +#define EFFECT_ENDEAVOR 183 +#define EFFECT_ERUPTION 184 +#define EFFECT_SKILL_SWAP 185 +#define EFFECT_IMPRISON 186 +#define EFFECT_REFRESH 187 +#define EFFECT_GRUDGE 188 +#define EFFECT_SNATCH 189 +#define EFFECT_LOW_KICK 190 +#define EFFECT_SECRET_POWER 191 +#define EFFECT_TEETER_DANCE 192 +#define EFFECT_HIT_ESCAPE 193 +#define EFFECT_MUD_SPORT 194 +#define EFFECT_POISON_FANG 195 +#define EFFECT_WEATHER_BALL 196 +#define EFFECT_OVERHEAT 197 +#define EFFECT_TICKLE 198 +#define EFFECT_COSMIC_POWER 199 +#define EFFECT_SKY_UPPERCUT 200 +#define EFFECT_BULK_UP 201 +#define EFFECT_PLACEHOLDER 202 +#define EFFECT_WATER_SPORT 203 +#define EFFECT_CALM_MIND 204 +#define EFFECT_DRAGON_DANCE 205 +#define EFFECT_CAMOUFLAGE 206 // New move effects -#define EFFECT_PLEDGE 209 -#define EFFECT_FLING 210 -#define EFFECT_NATURAL_GIFT 211 -#define EFFECT_WAKE_UP_SLAP 212 -#define EFFECT_WRING_OUT 213 -#define EFFECT_HEX 214 -#define EFFECT_ASSURANCE 215 -#define EFFECT_TRUMP_CARD 216 -#define EFFECT_ACROBATICS 217 -#define EFFECT_HEAT_CRASH 218 -#define EFFECT_PUNISHMENT 219 -#define EFFECT_STORED_POWER 220 -#define EFFECT_ELECTRO_BALL 221 -#define EFFECT_GYRO_BALL 222 -#define EFFECT_ECHOED_VOICE 223 -#define EFFECT_PAYBACK 224 -#define EFFECT_ROUND 225 -#define EFFECT_BRINE 226 -#define EFFECT_VENOSHOCK 227 -#define EFFECT_RETALIATE 228 -#define EFFECT_BULLDOZE 229 -#define EFFECT_FOUL_PLAY 230 -#define EFFECT_PSYSHOCK 231 -#define EFFECT_ROOST 232 -#define EFFECT_GRAVITY 233 -#define EFFECT_MIRACLE_EYE 234 -#define EFFECT_TAILWIND 235 -#define EFFECT_EMBARGO 236 -#define EFFECT_AQUA_RING 237 -#define EFFECT_TRICK_ROOM 238 -#define EFFECT_WONDER_ROOM 239 -#define EFFECT_MAGIC_ROOM 240 -#define EFFECT_MAGNET_RISE 241 -#define EFFECT_TOXIC_SPIKES 242 -#define EFFECT_GASTRO_ACID 243 -#define EFFECT_STEALTH_ROCK 244 -#define EFFECT_TELEKINESIS 245 -#define EFFECT_POWER_SWAP 246 -#define EFFECT_GUARD_SWAP 247 -#define EFFECT_HEART_SWAP 248 -#define EFFECT_POWER_SPLIT 249 -#define EFFECT_GUARD_SPLIT 250 -#define EFFECT_STICKY_WEB 251 -#define EFFECT_METAL_BURST 252 -#define EFFECT_LUCKY_CHANT 253 -#define EFFECT_SUCKER_PUNCH 254 -#define EFFECT_SPECIAL_DEFENSE_DOWN_HIT_2 255 -#define EFFECT_SIMPLE_BEAM 256 -#define EFFECT_ENTRAINMENT 257 -#define EFFECT_HEAL_PULSE 258 -#define EFFECT_QUASH 259 -#define EFFECT_ION_DELUGE 260 -#define EFFECT_FREEZE_DRY 261 -#define EFFECT_TOPSY_TURVY 262 -#define EFFECT_MISTY_TERRAIN 263 -#define EFFECT_GRASSY_TERRAIN 264 -#define EFFECT_ELECTRIC_TERRAIN 265 -#define EFFECT_PSYCHIC_TERRAIN 266 -#define EFFECT_ATTACK_ACCURACY_UP 267 -#define EFFECT_ATTACK_SPATK_UP 268 -#define EFFECT_HURRICANE 269 -#define EFFECT_TWO_TYPED_MOVE 270 -#define EFFECT_ME_FIRST 271 -#define EFFECT_SPEED_UP_HIT 272 -#define EFFECT_QUIVER_DANCE 273 -#define EFFECT_COIL 274 -#define EFFECT_ELECTRIFY 275 -#define EFFECT_REFLECT_TYPE 276 -#define EFFECT_SOAK 277 -#define EFFECT_GROWTH 278 -#define EFFECT_CLOSE_COMBAT 279 -#define EFFECT_LAST_RESORT 280 -#define EFFECT_RECOIL_33_STATUS 281 -#define EFFECT_FLINCH_STATUS 282 -#define EFFECT_RECOIL_50 283 -#define EFFECT_SHELL_SMASH 284 -#define EFFECT_SHIFT_GEAR 285 -#define EFFECT_DEFENSE_UP_3 286 -#define EFFECT_NOBLE_ROAR 287 -#define EFFECT_VENOM_DRENCH 288 -#define EFFECT_TOXIC_THREAD 289 -#define EFFECT_CLEAR_SMOG 290 -#define EFFECT_HIT_SWITCH_TARGET 291 -#define EFFECT_FINAL_GAMBIT 292 -#define EFFECT_CHANGE_TYPE_ON_ITEM 293 -#define EFFECT_AUTOTOMIZE 294 -#define EFFECT_COPYCAT 295 -#define EFFECT_DEFOG 296 -#define EFFECT_HIT_ENEMY_HEAL_ALLY 297 -#define EFFECT_SMACK_DOWN 298 -#define EFFECT_SYNCHRONOISE 299 -#define EFFECT_PSYCHO_SHIFT 300 -#define EFFECT_POWER_TRICK 301 -#define EFFECT_FLAME_BURST 302 -#define EFFECT_AFTER_YOU 303 -#define EFFECT_BESTOW 304 -#define EFFECT_ROTOTILLER 305 -#define EFFECT_FLOWER_SHIELD 306 -#define EFFECT_HIT_PREVENT_ESCAPE 307 -#define EFFECT_SPEED_SWAP 308 -#define EFFECT_DEFENSE_UP2_HIT 309 -#define EFFECT_REVELATION_DANCE 310 -#define EFFECT_AURORA_VEIL 311 -#define EFFECT_THIRD_TYPE 312 -#define EFFECT_FEINT 313 -#define EFFECT_SPARKLING_ARIA 314 -#define EFFECT_ACUPRESSURE 315 -#define EFFECT_AROMATIC_MIST 316 -#define EFFECT_POWDER 317 -#define EFFECT_SP_ATTACK_UP_HIT 318 -#define EFFECT_BELCH 319 -#define EFFECT_PARTING_SHOT 320 -#define EFFECT_SPECTRAL_THIEF 321 -#define EFFECT_V_CREATE 322 -#define EFFECT_MAT_BLOCK 323 -#define EFFECT_STOMPING_TANTRUM 324 -#define EFFECT_CORE_ENFORCER 325 -#define EFFECT_INSTRUCT 326 -#define EFFECT_THROAT_CHOP 327 -#define EFFECT_LASER_FOCUS 328 -#define EFFECT_MAGNETIC_FLUX 329 -#define EFFECT_GEAR_UP 330 -#define EFFECT_INCINERATE 331 -#define EFFECT_BUG_BITE 332 -#define EFFECT_STRENGTH_SAP 333 -#define EFFECT_MIND_BLOWN 334 -#define EFFECT_PURIFY 335 -#define EFFECT_BURN_UP 336 -#define EFFECT_SHORE_UP 337 -#define EFFECT_GEOMANCY 338 -#define EFFECT_FAIRY_LOCK 339 -#define EFFECT_ALLY_SWITCH 340 -#define EFFECT_RELIC_SONG 341 -#define EFFECT_ATTACKER_DEFENSE_DOWN_HIT 342 -#define EFFECT_BODY_PRESS 343 -#define EFFECT_EERIE_SPELL 344 -#define EFFECT_JUNGLE_HEALING 345 -#define EFFECT_COACHING 346 -#define EFFECT_LASH_OUT 347 -#define EFFECT_GRASSY_GLIDE 348 -#define EFFECT_DYNAMAX_DOUBLE_DMG 349 -#define EFFECT_DECORATE 350 -#define EFFECT_SNIPE_SHOT 351 -#define EFFECT_RECOIL_HP_25 352 -#define EFFECT_STUFF_CHEEKS 353 -#define EFFECT_GRAV_APPLE 354 -#define EFFECT_EVASION_UP_HIT 355 -#define EFFECT_GLITZY_GLOW 356 -#define EFFECT_BADDY_BAD 357 -#define EFFECT_SAPPY_SEED 358 -#define EFFECT_FREEZY_FROST 359 -#define EFFECT_SPARKLY_SWIRL 360 -#define EFFECT_PLASMA_FISTS 361 -#define EFFECT_HYPERSPACE_FURY 362 -#define EFFECT_AURA_WHEEL 363 -#define EFFECT_PHOTON_GEYSER 364 -#define EFFECT_SHELL_SIDE_ARM 365 -#define EFFECT_TERRAIN_PULSE 366 -#define EFFECT_JAW_LOCK 367 -#define EFFECT_NO_RETREAT 368 -#define EFFECT_TAR_SHOT 369 -#define EFFECT_POLTERGEIST 370 -#define EFFECT_OCTOLOCK 371 -#define EFFECT_CLANGOROUS_SOUL 372 -#define EFFECT_BOLT_BEAK 373 -#define EFFECT_SKY_DROP 374 -#define EFFECT_EXPANDING_FORCE 375 -#define EFFECT_METEOR_BEAM 376 -#define EFFECT_RISING_VOLTAGE 377 -#define EFFECT_BEAK_BLAST 378 -#define EFFECT_COURT_CHANGE 379 -#define EFFECT_STEEL_BEAM 380 -#define EFFECT_EXTREME_EVOBOOST 381 -#define EFFECT_HIT_SET_REMOVE_TERRAIN 382 // genesis supernova -#define EFFECT_DARK_VOID 383 -#define EFFECT_SLEEP_HIT 384 -#define EFFECT_DOUBLE_SHOCK 385 -#define EFFECT_SPECIAL_ATTACK_UP_HIT 386 -#define EFFECT_VICTORY_DANCE 387 -#define EFFECT_TEATIME 388 -#define EFFECT_ATTACK_UP_USER_ALLY 389 // Howl 8th Gen -#define EFFECT_SHELL_TRAP 390 -#define EFFECT_PSYBLADE 391 -#define EFFECT_HYDRO_STEAM 392 -#define EFFECT_HIT_SET_ENTRY_HAZARD 393 -#define EFFECT_DIRE_CLAW 394 -#define EFFECT_BARB_BARRAGE 395 -#define EFFECT_REVIVAL_BLESSING 396 -#define EFFECT_FROSTBITE_HIT 397 -#define EFFECT_SNOWSCAPE 398 -#define EFFECT_TRIPLE_ARROWS 399 -#define EFFECT_INFERNAL_PARADE 400 -#define EFFECT_TAKE_HEART 401 -#define EFFECT_AXE_KICK 402 -#define EFFECT_COLLISION_COURSE 403 -#define EFFECT_SPIN_OUT 404 -#define EFFECT_MAKE_IT_RAIN 405 -#define EFFECT_CORROSIVE_GAS 406 -#define EFFECT_POPULATION_BOMB 407 -#define EFFECT_MORTAL_SPIN 408 -#define EFFECT_SALT_CURE 409 -#define EFFECT_CHILLY_RECEPTION 410 -#define EFFECT_MATCHA_GOTCHA 411 -#define EFFECT_SYRUP_BOMB 412 -#define EFFECT_MAX_MOVE 413 -#define EFFECT_GLAIVE_RUSH 414 -#define EFFECT_RAGING_BULL 415 -#define EFFECT_RAGE_FIST 416 +#define EFFECT_PLEDGE 207 +#define EFFECT_FLING 208 +#define EFFECT_NATURAL_GIFT 209 +#define EFFECT_WAKE_UP_SLAP 210 +#define EFFECT_WRING_OUT 211 +#define EFFECT_HEX 212 +#define EFFECT_ASSURANCE 213 +#define EFFECT_TRUMP_CARD 214 +#define EFFECT_ACROBATICS 215 +#define EFFECT_HEAT_CRASH 216 +#define EFFECT_PUNISHMENT 217 +#define EFFECT_STORED_POWER 218 +#define EFFECT_ELECTRO_BALL 219 +#define EFFECT_GYRO_BALL 220 +#define EFFECT_ECHOED_VOICE 221 +#define EFFECT_PAYBACK 222 +#define EFFECT_ROUND 223 +#define EFFECT_BRINE 224 +#define EFFECT_VENOSHOCK 225 +#define EFFECT_RETALIATE 226 +#define EFFECT_BULLDOZE 227 +#define EFFECT_FOUL_PLAY 228 +#define EFFECT_PSYSHOCK 229 +#define EFFECT_ROOST 230 +#define EFFECT_GRAVITY 231 +#define EFFECT_MIRACLE_EYE 232 +#define EFFECT_TAILWIND 233 +#define EFFECT_EMBARGO 234 +#define EFFECT_AQUA_RING 235 +#define EFFECT_TRICK_ROOM 236 +#define EFFECT_WONDER_ROOM 237 +#define EFFECT_MAGIC_ROOM 238 +#define EFFECT_MAGNET_RISE 239 +#define EFFECT_TOXIC_SPIKES 240 +#define EFFECT_GASTRO_ACID 241 +#define EFFECT_STEALTH_ROCK 242 +#define EFFECT_TELEKINESIS 243 +#define EFFECT_POWER_SWAP 244 +#define EFFECT_GUARD_SWAP 245 +#define EFFECT_HEART_SWAP 246 +#define EFFECT_POWER_SPLIT 247 +#define EFFECT_GUARD_SPLIT 248 +#define EFFECT_STICKY_WEB 249 +#define EFFECT_METAL_BURST 250 +#define EFFECT_LUCKY_CHANT 251 +#define EFFECT_SUCKER_PUNCH 252 +#define EFFECT_SPECIAL_DEFENSE_DOWN_HIT_2 253 +#define EFFECT_SIMPLE_BEAM 254 +#define EFFECT_ENTRAINMENT 255 +#define EFFECT_HEAL_PULSE 256 +#define EFFECT_QUASH 257 +#define EFFECT_ION_DELUGE 258 +#define EFFECT_FREEZE_DRY 259 +#define EFFECT_TOPSY_TURVY 260 +#define EFFECT_MISTY_TERRAIN 261 +#define EFFECT_GRASSY_TERRAIN 262 +#define EFFECT_ELECTRIC_TERRAIN 263 +#define EFFECT_PSYCHIC_TERRAIN 264 +#define EFFECT_ATTACK_ACCURACY_UP 265 +#define EFFECT_ATTACK_SPATK_UP 266 +#define EFFECT_HURRICANE 267 +#define EFFECT_TWO_TYPED_MOVE 268 +#define EFFECT_ME_FIRST 269 +#define EFFECT_SPEED_UP_HIT 270 +#define EFFECT_QUIVER_DANCE 271 +#define EFFECT_COIL 272 +#define EFFECT_ELECTRIFY 273 +#define EFFECT_REFLECT_TYPE 274 +#define EFFECT_SOAK 275 +#define EFFECT_GROWTH 276 +#define EFFECT_CLOSE_COMBAT 277 +#define EFFECT_LAST_RESORT 278 +#define EFFECT_FLINCH_STATUS 279 +#define EFFECT_SHELL_SMASH 280 +#define EFFECT_SHIFT_GEAR 281 +#define EFFECT_DEFENSE_UP_3 282 +#define EFFECT_NOBLE_ROAR 283 +#define EFFECT_VENOM_DRENCH 284 +#define EFFECT_TOXIC_THREAD 285 +#define EFFECT_CLEAR_SMOG 286 +#define EFFECT_HIT_SWITCH_TARGET 287 +#define EFFECT_FINAL_GAMBIT 288 +#define EFFECT_CHANGE_TYPE_ON_ITEM 289 +#define EFFECT_AUTOTOMIZE 290 +#define EFFECT_COPYCAT 291 +#define EFFECT_DEFOG 292 +#define EFFECT_HIT_ENEMY_HEAL_ALLY 293 +#define EFFECT_SMACK_DOWN 294 +#define EFFECT_SYNCHRONOISE 295 +#define EFFECT_PSYCHO_SHIFT 296 +#define EFFECT_POWER_TRICK 297 +#define EFFECT_FLAME_BURST 298 +#define EFFECT_AFTER_YOU 299 +#define EFFECT_BESTOW 300 +#define EFFECT_ROTOTILLER 301 +#define EFFECT_FLOWER_SHIELD 302 +#define EFFECT_HIT_PREVENT_ESCAPE 303 +#define EFFECT_SPEED_SWAP 304 +#define EFFECT_DEFENSE_UP2_HIT 305 +#define EFFECT_REVELATION_DANCE 306 +#define EFFECT_AURORA_VEIL 307 +#define EFFECT_THIRD_TYPE 308 +#define EFFECT_FEINT 309 +#define EFFECT_SPARKLING_ARIA 310 +#define EFFECT_ACUPRESSURE 311 +#define EFFECT_AROMATIC_MIST 312 +#define EFFECT_POWDER 313 +#define EFFECT_SP_ATTACK_UP_HIT 314 +#define EFFECT_BELCH 315 +#define EFFECT_PARTING_SHOT 316 +#define EFFECT_SPECTRAL_THIEF 317 +#define EFFECT_V_CREATE 318 +#define EFFECT_MAT_BLOCK 319 +#define EFFECT_STOMPING_TANTRUM 320 +#define EFFECT_CORE_ENFORCER 321 +#define EFFECT_INSTRUCT 322 +#define EFFECT_THROAT_CHOP 323 +#define EFFECT_LASER_FOCUS 324 +#define EFFECT_MAGNETIC_FLUX 325 +#define EFFECT_GEAR_UP 326 +#define EFFECT_INCINERATE 327 +#define EFFECT_BUG_BITE 328 +#define EFFECT_STRENGTH_SAP 329 +#define EFFECT_MIND_BLOWN 330 +#define EFFECT_PURIFY 331 +#define EFFECT_BURN_UP 332 +#define EFFECT_SHORE_UP 333 +#define EFFECT_GEOMANCY 334 +#define EFFECT_FAIRY_LOCK 335 +#define EFFECT_ALLY_SWITCH 336 +#define EFFECT_RELIC_SONG 337 +#define EFFECT_ATTACKER_DEFENSE_DOWN_HIT 338 +#define EFFECT_BODY_PRESS 339 +#define EFFECT_EERIE_SPELL 340 +#define EFFECT_JUNGLE_HEALING 341 +#define EFFECT_COACHING 342 +#define EFFECT_LASH_OUT 343 +#define EFFECT_GRASSY_GLIDE 344 +#define EFFECT_DYNAMAX_DOUBLE_DMG 345 +#define EFFECT_DECORATE 346 +#define EFFECT_SNIPE_SHOT 347 +#define EFFECT_RECOIL_HP_25 348 +#define EFFECT_STUFF_CHEEKS 349 +#define EFFECT_GRAV_APPLE 350 +#define EFFECT_EVASION_UP_HIT 351 +#define EFFECT_GLITZY_GLOW 352 +#define EFFECT_BADDY_BAD 353 +#define EFFECT_SAPPY_SEED 354 +#define EFFECT_FREEZY_FROST 355 +#define EFFECT_SPARKLY_SWIRL 356 +#define EFFECT_PLASMA_FISTS 357 +#define EFFECT_HYPERSPACE_FURY 358 +#define EFFECT_AURA_WHEEL 359 +#define EFFECT_PHOTON_GEYSER 360 +#define EFFECT_SHELL_SIDE_ARM 361 +#define EFFECT_TERRAIN_PULSE 362 +#define EFFECT_JAW_LOCK 363 +#define EFFECT_NO_RETREAT 364 +#define EFFECT_TAR_SHOT 365 +#define EFFECT_POLTERGEIST 366 +#define EFFECT_OCTOLOCK 367 +#define EFFECT_CLANGOROUS_SOUL 368 +#define EFFECT_BOLT_BEAK 369 +#define EFFECT_SKY_DROP 370 +#define EFFECT_EXPANDING_FORCE 371 +#define EFFECT_METEOR_BEAM 372 +#define EFFECT_RISING_VOLTAGE 373 +#define EFFECT_BEAK_BLAST 374 +#define EFFECT_COURT_CHANGE 375 +#define EFFECT_STEEL_BEAM 376 +#define EFFECT_EXTREME_EVOBOOST 377 +#define EFFECT_HIT_SET_REMOVE_TERRAIN 378 +#define EFFECT_DARK_VOID 379 +#define EFFECT_SLEEP_HIT 380 +#define EFFECT_DOUBLE_SHOCK 381 +#define EFFECT_SPECIAL_ATTACK_UP_HIT 382 +#define EFFECT_VICTORY_DANCE 383 +#define EFFECT_TEATIME 384 +#define EFFECT_ATTACK_UP_USER_ALLY 385 +#define EFFECT_SHELL_TRAP 386 +#define EFFECT_PSYBLADE 387 +#define EFFECT_HYDRO_STEAM 388 +#define EFFECT_HIT_SET_ENTRY_HAZARD 389 +#define EFFECT_DIRE_CLAW 390 +#define EFFECT_BARB_BARRAGE 391 +#define EFFECT_REVIVAL_BLESSING 392 +#define EFFECT_FROSTBITE_HIT 393 +#define EFFECT_SNOWSCAPE 394 +#define EFFECT_TRIPLE_ARROWS 395 +#define EFFECT_INFERNAL_PARADE 396 +#define EFFECT_TAKE_HEART 397 +#define EFFECT_AXE_KICK 398 +#define EFFECT_COLLISION_COURSE 399 +#define EFFECT_SPIN_OUT 400 +#define EFFECT_MAKE_IT_RAIN 401 +#define EFFECT_CORROSIVE_GAS 402 +#define EFFECT_POPULATION_BOMB 403 +#define EFFECT_MORTAL_SPIN 404 +#define EFFECT_SALT_CURE 405 +#define EFFECT_CHILLY_RECEPTION 406 +#define EFFECT_MATCHA_GOTCHA 407 +#define EFFECT_SYRUP_BOMB 408 +#define EFFECT_MAX_MOVE 409 +#define EFFECT_GLAIVE_RUSH 410 +#define EFFECT_RAGING_BULL 411 +#define EFFECT_RAGE_FIST 412 -#define NUM_BATTLE_MOVE_EFFECTS 417 +#define NUM_BATTLE_MOVE_EFFECTS 413 #endif // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 724fe8c0b6..4f36d1b543 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -230,6 +230,9 @@ #define SPLIT_SPECIAL 0x1 #define SPLIT_STATUS 0x2 +// Just for readability +#define ALWAYS_CRIT 3 + // Growth rates #define GROWTH_MEDIUM_FAST 0 #define GROWTH_ERRATIC 1 diff --git a/include/pokemon.h b/include/pokemon.h index dbf4c41c3b..87630814db 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -407,15 +407,22 @@ struct BattleMove { u16 effect; u8 power; - u8 type; - u8 accuracy; - u8 pp; + u8 type:5; + u8 split:3; + + u16 accuracy:7; + u16 recoil:7; + u16 critBoost:2; u8 secondaryEffectChance; - u16 target; s8 priority; - u8 split; - u16 argument; - u8 zMoveEffect; + + u16 target; + u8 pp; + union { + u8 effect; + u8 powerOverride; + } zMove; + // Flags u32 makesContact:1; u32 ignoresProtect:1; @@ -423,7 +430,6 @@ struct BattleMove u32 snatchAffected:1; u32 mirrorMoveBanned:1; u32 ignoresKingsRock:1; - u32 highCritRatio:1; u32 twoTurnMove:1; u32 punchingMove:1; u32 sheerForceBoost:1; @@ -461,6 +467,8 @@ struct BattleMove u32 encoreBanned:1; u32 parentalBondBanned:1; u32 skyBattleBanned:1; + + u16 argument; }; #define SPINDA_SPOT_WIDTH 16 diff --git a/src/battle_ai_main.c b/src/battle_ai_main.c index 4f7d04438b..4037d3b6f7 100644 --- a/src/battle_ai_main.c +++ b/src/battle_ai_main.c @@ -1854,29 +1854,10 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) if (aiData->abilities[battlerAtk] != ABILITY_MAGIC_GUARD && AI_DATA->moveAccuracy[battlerAtk][battlerDef][AI_THINKING_STRUCT->movesetIndex] < 75) ADJUST_SCORE(-6); break; - case EFFECT_RECOIL_25: + case EFFECT_RECOIL: if (AI_IsDamagedByRecoil(battlerAtk)) { - u32 recoilDmg = max(1, aiData->simulatedDmg[battlerAtk][battlerDef][AI_THINKING_STRUCT->movesetIndex] / 4); - if (!ShouldUseRecoilMove(battlerAtk, battlerDef, recoilDmg, AI_THINKING_STRUCT->movesetIndex)) - ADJUST_SCORE(-10); - break; - } - break; - case EFFECT_RECOIL_33: - case EFFECT_RECOIL_33_STATUS: - if (AI_IsDamagedByRecoil(battlerAtk)) - { - u32 recoilDmg = max(1, aiData->simulatedDmg[battlerAtk][battlerDef][AI_THINKING_STRUCT->movesetIndex] / 3); - if (!ShouldUseRecoilMove(battlerAtk, battlerDef, recoilDmg, AI_THINKING_STRUCT->movesetIndex)) - ADJUST_SCORE(-10); - break; - } - break; - case EFFECT_RECOIL_50: - if (AI_IsDamagedByRecoil(battlerAtk)) - { - u32 recoilDmg = max(1, aiData->simulatedDmg[battlerAtk][battlerDef][AI_THINKING_STRUCT->movesetIndex] / 2); + u32 recoilDmg = max(1, aiData->simulatedDmg[battlerAtk][battlerDef][AI_THINKING_STRUCT->movesetIndex] * max(1, gBattleMoves[move].recoil) / 100); if (!ShouldUseRecoilMove(battlerAtk, battlerDef, recoilDmg, AI_THINKING_STRUCT->movesetIndex)) ADJUST_SCORE(-10); break; @@ -2727,21 +2708,6 @@ static s32 AI_DoubleBattle(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) ADJUST_SCORE(1); } break; - case EFFECT_ALWAYS_CRIT: - // Ally decided to use Frost Breath on us. we must have Anger Point as our ability - if (aiData->abilities[battlerAtk] == ABILITY_ANGER_POINT) - { - if (AI_WhoStrikesFirst(battlerAtk, battlerAtkPartner, move) == AI_IS_SLOWER) // Partner moving first - { - // discourage raising our attack since it's about to be maxed out - if (IsAttackBoostMoveEffect(effect)) - ADJUST_SCORE(-3); - // encourage moves hitting multiple opponents - if (!IS_MOVE_STATUS(move) && (moveTarget & (MOVE_TARGET_BOTH | MOVE_TARGET_FOES_AND_ALLY))) - ADJUST_SCORE(3); - } - } - break; // Don't change weather if ally already decided to do so. case EFFECT_SUNNY_DAY: case EFFECT_HAIL: @@ -2754,6 +2720,20 @@ static s32 AI_DoubleBattle(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) } } // check partner move effect + // Adjust for always crit moves + if (gBattleMoves[aiData->partnerMove].critBoost == ALWAYS_CRIT && aiData->abilities[battlerAtk] == ABILITY_ANGER_POINT) + { + if (AI_WhoStrikesFirst(battlerAtk, battlerAtkPartner, move) == AI_IS_SLOWER) // Partner moving first + { + // discourage raising our attack since it's about to be maxed out + if (IsAttackBoostMoveEffect(effect)) + ADJUST_SCORE(-3); + // encourage moves hitting multiple opponents + if (!IS_MOVE_STATUS(move) && (moveTarget & (MOVE_TARGET_BOTH | MOVE_TARGET_FOES_AND_ALLY))) + ADJUST_SCORE(3); + } + } + // consider our move effect relative to partner state switch (effect) { @@ -4996,7 +4976,7 @@ static s32 AI_Risky(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) if (IS_TARGETING_PARTNER(battlerAtk, battlerDef)) return score; - if (gBattleMoves[move].highCritRatio) + if (gBattleMoves[move].critBoost > 0) ADJUST_SCORE(2); switch (gBattleMoves[move].effect) diff --git a/src/battle_ai_util.c b/src/battle_ai_util.c index 967d31bc07..27be0f2549 100644 --- a/src/battle_ai_util.c +++ b/src/battle_ai_util.c @@ -775,7 +775,9 @@ s32 AI_CalcDamage(u32 move, u32 battlerAtk, u32 battlerDef, u8 *typeEffectivenes dmg = 20 * (aiData->abilities[battlerAtk] == ABILITY_PARENTAL_BOND ? 2 : 1); break; case EFFECT_MULTI_HIT: - dmg *= (aiData->abilities[battlerAtk] == ABILITY_SKILL_LINK ? 5 : 3); + dmg *= (aiData->abilities[battlerAtk] == ABILITY_SKILL_LINK + && !(move == MOVE_WATER_SHURIKEN && gBattleMons[battlerAtk].species == SPECIES_GRENINJA_ASH) + ? 5 : 3); break; case EFFECT_ENDEAVOR: // If target has less HP than user, Endeavor does no damage @@ -807,8 +809,6 @@ s32 AI_CalcDamage(u32 move, u32 battlerAtk, u32 battlerDef, u8 *typeEffectivenes // Handle other multi-strike moves if (gBattleMoves[move].strikeCount > 1 && gBattleMoves[move].effect != EFFECT_TRIPLE_KICK) dmg *= gBattleMoves[move].strikeCount; - else if (move == MOVE_WATER_SHURIKEN && gBattleMons[battlerAtk].species == SPECIES_GRENINJA_ASH) - dmg *= 3; if (dmg == 0) dmg = 1; @@ -969,11 +969,8 @@ static bool32 AI_IsMoveEffectInMinus(u32 battlerAtk, u32 battlerDef, u32 move, s case EFFECT_MIND_BLOWN: case EFFECT_STEEL_BEAM: return TRUE; - case EFFECT_RECOIL_25: case EFFECT_RECOIL_IF_MISS: - case EFFECT_RECOIL_50: - case EFFECT_RECOIL_33: - case EFFECT_RECOIL_33_STATUS: + case EFFECT_RECOIL: if (AI_IsDamagedByRecoil(battlerAtk)) return TRUE; break; @@ -2234,7 +2231,17 @@ bool32 HasSoundMove(u32 battler) bool32 HasHighCritRatioMove(u32 battler) { - CHECK_MOVE_FLAG(highCritRatio); + s32 i; + u16 *moves = GetMovesArray(battler); + + for (i = 0; i < MAX_MON_MOVES; i++) + { + if (moves[i] != MOVE_NONE && moves[i] != MOVE_UNAVAILABLE && gBattleMoves[moves[i]].critBoost > 0 + && gBattleMoves[moves[i]].critBoost < ALWAYS_CRIT) // don't count always crit moves + return TRUE; + } + + return FALSE; } bool32 HasMagicCoatAffectedMove(u32 battler) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 1f9b48f478..d6eb928b9b 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -1892,20 +1892,20 @@ s32 CalcCritChanceStageArgs(u32 battlerAtk, u32 battlerDef, u32 move, bool32 rec s32 critChance = 0; if (gSideStatuses[battlerDef] & SIDE_STATUS_LUCKY_CHANT || gStatuses3[battlerAtk] & STATUS3_CANT_SCORE_A_CRIT - || abilityDef == ABILITY_BATTLE_ARMOR || abilityDef == ABILITY_SHELL_ARMOR) + || abilityDef == ABILITY_BATTLE_ARMOR || abilityDef == ABILITY_SHELL_ARMOR) { critChance = -1; } else if (gStatuses3[battlerAtk] & STATUS3_LASER_FOCUS - || gBattleMoves[move].effect == EFFECT_ALWAYS_CRIT - || (abilityAtk == ABILITY_MERCILESS && gBattleMons[battlerDef].status1 & STATUS1_PSN_ANY)) + || gBattleMoves[gCurrentMove].critBoost == ALWAYS_CRIT + || (abilityAtk == ABILITY_MERCILESS && gBattleMons[battlerDef].status1 & STATUS1_PSN_ANY)) { critChance = -2; } else { critChance = 2 * ((gBattleMons[battlerAtk].status2 & STATUS2_FOCUS_ENERGY) != 0) - + (gBattleMoves[gCurrentMove].highCritRatio) + + gBattleMoves[gCurrentMove].critBoost + (holdEffectAtk == HOLD_EFFECT_SCOPE_LENS) + 2 * (holdEffectAtk == HOLD_EFFECT_LUCKY_PUNCH && gBattleMons[battlerAtk].species == SPECIES_CHANSEY) + 2 * BENEFITS_FROM_LEEK(battlerAtk, holdEffectAtk) @@ -5349,28 +5349,13 @@ static void Cmd_moveend(void) { switch (gBattleMoves[gCurrentMove].effect) { - case EFFECT_RECOIL_25: // Take Down, 25% recoil - gBattleMoveDamage = max(1, gBattleScripting.savedDmg / 4); + case EFFECT_RECOIL: + gBattleMoveDamage = max(1, gBattleScripting.savedDmg * max(1, gBattleMoves[gCurrentMove].recoil) / 100); BattleScriptPushCursor(); - gBattlescriptCurrInstr = BattleScript_MoveEffectRecoil; - effect = TRUE; - break; - case EFFECT_RECOIL_33: // Double Edge, 33 % recoil - gBattleMoveDamage = max(1, gBattleScripting.savedDmg / 3); - BattleScriptPushCursor(); - gBattlescriptCurrInstr = BattleScript_MoveEffectRecoil; - effect = TRUE; - break; - case EFFECT_RECOIL_50: // Head Smash, 50 % recoil - gBattleMoveDamage = max(1, gBattleScripting.savedDmg / 2); - BattleScriptPushCursor(); - gBattlescriptCurrInstr = BattleScript_MoveEffectRecoil; - effect = TRUE; - break; - case EFFECT_RECOIL_33_STATUS: // Flare Blitz - can burn, Volt Tackle - can paralyze - gBattleMoveDamage = max(1, gBattleScripting.savedDmg / 3); - BattleScriptPushCursor(); - gBattlescriptCurrInstr = BattleScript_MoveEffectRecoilWithStatus; + if (gBattleMoves[gCurrentMove].argument) // Flare Blitz - can burn, Volt Tackle - can paralyze + gBattlescriptCurrInstr = BattleScript_MoveEffectRecoilWithStatus; + else + gBattlescriptCurrInstr = BattleScript_MoveEffectRecoil; effect = TRUE; break; } diff --git a/src/battle_tv.c b/src/battle_tv.c index af485df70d..439c699089 100644 --- a/src/battle_tv.c +++ b/src/battle_tv.c @@ -134,7 +134,7 @@ static const u16 sPoints_MoveEffect[NUM_BATTLE_MOVE_EFFECTS] = [EFFECT_RECOIL_IF_MISS] = 1, [EFFECT_MIST] = 5, [EFFECT_FOCUS_ENERGY] = 1, - [EFFECT_RECOIL_25] = 2, + [EFFECT_RECOIL] = 2, [EFFECT_CONFUSE] = 4, [EFFECT_ATTACK_UP_2] = 1, [EFFECT_DEFENSE_UP_2] = 1, @@ -280,7 +280,6 @@ static const u16 sPoints_MoveEffect[NUM_BATTLE_MOVE_EFFECTS] = [EFFECT_SNATCH] = 1, [EFFECT_LOW_KICK] = 1, [EFFECT_SECRET_POWER] = 1, - [EFFECT_RECOIL_33] = 2, [EFFECT_TEETER_DANCE] = 6, // [EFFECT_BLAZE_KICK] = 1, [EFFECT_MUD_SPORT] = 4, @@ -368,9 +367,7 @@ static const u16 sPoints_MoveEffect[NUM_BATTLE_MOVE_EFFECTS] = [EFFECT_GROWTH] = 0, // TODO: Assign points [EFFECT_CLOSE_COMBAT] = 0, // TODO: Assign points [EFFECT_LAST_RESORT] = 0, // TODO: Assign points - [EFFECT_RECOIL_33_STATUS] = 0, // TODO: Assign points [EFFECT_FLINCH_STATUS] = 0, // TODO: Assign points - [EFFECT_RECOIL_50] = 0, // TODO: Assign points [EFFECT_SHELL_SMASH] = 0, // TODO: Assign points [EFFECT_SHIFT_GEAR] = 0, // TODO: Assign points [EFFECT_DEFENSE_UP_3] = 0, // TODO: Assign points diff --git a/src/battle_util.c b/src/battle_util.c index cb46689608..ff3eb46730 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -3777,7 +3777,7 @@ u8 AtkCanceller_UnableToUseMove(u32 moveType) gBattleScripting.battler = gBattlerAttacker; if (gBattleStruct->zmove.activeSplit == SPLIT_STATUS) { - gBattleStruct->zmove.effect = gBattleMoves[gBattleStruct->zmove.baseMoves[gBattlerAttacker]].zMoveEffect; + gBattleStruct->zmove.effect = gBattleMoves[gBattleStruct->zmove.baseMoves[gBattlerAttacker]].zMove.effect; BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_ZMoveActivateStatus; } diff --git a/src/battle_z_move.c b/src/battle_z_move.c index 7069d17386..91911a02c2 100644 --- a/src/battle_z_move.c +++ b/src/battle_z_move.c @@ -406,7 +406,7 @@ bool32 MoveSelectionDisplayZMove(u16 zmove, u32 battler) if (IS_MOVE_STATUS(move)) { - u8 zEffect = gBattleMoves[move].zMoveEffect; + u8 zEffect = gBattleMoves[move].zMove.effect; gDisplayedStringBattle[0] = EOS; @@ -692,38 +692,30 @@ u16 GetZMovePower(u16 move) if (gBattleMoves[move].effect == EFFECT_OHKO) return 180; - switch (move) + if (gBattleMoves[move].zMove.powerOverride > 0) + return gBattleMoves[move].zMove.powerOverride; + else { - case MOVE_MEGA_DRAIN: return 120; - case MOVE_CORE_ENFORCER: return 140; - case MOVE_WEATHER_BALL: return 160; - case MOVE_HEX: return 160; - case MOVE_FLYING_PRESS: return 170; - case MOVE_GEAR_GRIND: return 180; - case MOVE_V_CREATE: return 220; - default: - { - if (gBattleMoves[move].power >= 140) - return 200; - else if (gBattleMoves[move].power >= 130) - return 195; - else if (gBattleMoves[move].power >= 120) - return 190; - else if (gBattleMoves[move].power >= 110) - return 185; - else if (gBattleMoves[move].power >= 100) - return 180; - else if (gBattleMoves[move].power >= 90) - return 175; - else if (gBattleMoves[move].power >= 80) - return 160; - else if (gBattleMoves[move].power >= 70) - return 140; - else if (gBattleMoves[move].power >= 60) - return 120; - else - return 100; - } + if (gBattleMoves[move].power >= 140) + return 200; + else if (gBattleMoves[move].power >= 130) + return 195; + else if (gBattleMoves[move].power >= 120) + return 190; + else if (gBattleMoves[move].power >= 110) + return 185; + else if (gBattleMoves[move].power >= 100) + return 180; + else if (gBattleMoves[move].power >= 90) + return 175; + else if (gBattleMoves[move].power >= 80) + return 160; + else if (gBattleMoves[move].power >= 70) + return 140; + else if (gBattleMoves[move].power >= 60) + return 120; + else + return 100; } } diff --git a/src/data/battle_frontier/battle_pyramid_wild_requirements.h b/src/data/battle_frontier/battle_pyramid_wild_requirements.h index 1b9e359f1f..19e72d1e8a 100644 --- a/src/data/battle_frontier/battle_pyramid_wild_requirements.h +++ b/src/data/battle_frontier/battle_pyramid_wild_requirements.h @@ -110,7 +110,7 @@ static const u16 sWeatherChangingMoves[] = { MOVE_SUNNY_DAY, }; -// EFFECT_RECHARGE, EFFECT_RECOIL_33 +// EFFECT_RECHARGE, EFFECT_RECOIL static const u16 sPowerfulNormalMoves[] = { MOVE_HYPER_BEAM, MOVE_GIGA_IMPACT, diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index 6710af8e39..c52a78dbf8 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -26,7 +26,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS == GEN_4, }, @@ -41,10 +40,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, + .critBoost = 1, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, - .highCritRatio = TRUE, }, [MOVE_DOUBLE_SLAP] = @@ -58,7 +56,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -73,7 +70,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .punchingMove = TRUE, }, @@ -89,7 +85,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .punchingMove = TRUE, }, @@ -105,7 +100,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_FIRE_PUNCH] = @@ -119,7 +113,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .punchingMove = TRUE, .sheerForceBoost = TRUE, @@ -140,7 +133,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .punchingMove = TRUE, .sheerForceBoost = TRUE, @@ -157,7 +149,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .punchingMove = TRUE, .sheerForceBoost = TRUE, @@ -174,7 +165,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -189,7 +179,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -204,7 +193,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -218,9 +206,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_BOTH, .priority = 0, + .critBoost = 1, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, - .highCritRatio = TRUE, .twoTurnMove = TRUE, .sleepTalkBanned = TRUE, .instructBanned = TRUE, @@ -242,7 +229,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESET_STATS, + .zMove = { .effect = Z_EFFECT_RESET_STATS }, .danceMove = TRUE, .snatchAffected = TRUE, }, @@ -258,7 +245,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .slicingMove = TRUE, }, @@ -274,7 +260,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .ignoresKingsRock = (B_UPDATED_MOVE_FLAGS == GEN_4) || (B_UPDATED_MOVE_FLAGS < GEN_3), .damagesAirborneDoubleDamage = TRUE, .windMove = TRUE, @@ -291,7 +276,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -310,7 +294,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = -6, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPDEF_UP_1, + .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .windMove = TRUE, .ignoresProtect = B_UPDATED_MOVE_FLAGS >= GEN_6, .ignoresSubstitute = TRUE, @@ -334,7 +318,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .twoTurnMove = TRUE, .makesContact = TRUE, .gravityBanned = TRUE, @@ -358,7 +341,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_3, }, @@ -374,7 +356,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .skyBattleBanned = TRUE, }, @@ -398,7 +379,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -413,7 +393,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, .minimizeDoubleDamage = TRUE, @@ -431,7 +410,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .strikeCount = 2, }, @@ -447,7 +425,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -470,7 +447,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .gravityBanned = TRUE, }, @@ -486,7 +462,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_3, .sheerForceBoost = TRUE, @@ -503,7 +478,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_EVSN_UP_1, + .zMove = { .effect = Z_EFFECT_EVSN_UP_1 }, .magicCoatAffected = TRUE, }, @@ -518,7 +493,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -534,7 +508,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -549,7 +522,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -564,7 +536,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -587,7 +558,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -602,7 +572,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, .minimizeDoubleDamage = B_UPDATED_MOVE_FLAGS >= GEN_6, @@ -624,22 +593,21 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, [MOVE_TAKE_DOWN] = { - .effect = EFFECT_RECOIL_25, + .effect = EFFECT_RECOIL, .power = 90, .type = TYPE_NORMAL, .accuracy = 85, + .recoil = 25, .pp = 20, .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -659,23 +627,22 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_RANDOM, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .instructBanned = TRUE, }, [MOVE_DOUBLE_EDGE] = { - .effect = EFFECT_RECOIL_33, + .effect = EFFECT_RECOIL, .power = 120, .type = TYPE_NORMAL, .accuracy = 100, + .recoil = 33, .pp = 15, .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -690,7 +657,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_ATK_UP_1, + .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .magicCoatAffected = TRUE, }, @@ -705,7 +672,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -720,7 +686,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_5, // && B_UPDATED_MOVE_FLAGS > GEN_2 .strikeCount = 2, @@ -742,7 +707,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_LEER] = @@ -756,7 +720,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_ATK_UP_1, + .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .magicCoatAffected = TRUE, }, @@ -771,7 +735,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, .bitingMove = TRUE, @@ -788,7 +751,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_DEF_UP_1, + .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = TRUE, .soundMove = TRUE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, @@ -809,7 +772,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = -6, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_DEF_UP_1, + .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresProtect = B_UPDATED_MOVE_FLAGS >= GEN_6, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, @@ -829,7 +792,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPD_UP_1, + .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .magicCoatAffected = TRUE, .soundMove = TRUE, @@ -846,7 +809,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPD_UP_1, + .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .magicCoatAffected = TRUE, .soundMove = TRUE, @@ -863,7 +826,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_DISABLE] = @@ -883,7 +845,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESET_STATS, + .zMove = { .effect = Z_EFFECT_RESET_STATS }, .ignoresSubstitute = TRUE, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, }, @@ -903,7 +865,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -918,7 +879,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -937,7 +897,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -952,7 +911,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RECOVER_HP, + .zMove = { .effect = Z_EFFECT_RECOVER_HP }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, @@ -969,7 +928,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_HYDRO_PUMP] = @@ -987,7 +945,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_SURF] = @@ -1009,7 +966,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .damagesUnderwater = TRUE, .skyBattleBanned = TRUE, }, @@ -1035,7 +991,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -1058,7 +1013,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .windMove = TRUE, }, @@ -1074,7 +1028,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -1089,7 +1042,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -1104,7 +1056,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -1119,7 +1070,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_3, }, @@ -1134,7 +1084,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -1149,7 +1098,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -1160,15 +1108,15 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .pp = 25, #endif - .effect = EFFECT_RECOIL_25, + .effect = EFFECT_RECOIL, .power = 80, .type = TYPE_FIGHTING, .accuracy = 80, + .recoil = 25, .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -1183,7 +1131,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -1198,7 +1145,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_DEPENDS, .priority = -5, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_5, // && B_UPDATED_MOVE_FLAGS > GEN_2 .meFirstBanned = TRUE, @@ -1218,7 +1164,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .skyBattleBanned = TRUE, }, @@ -1234,7 +1179,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -1253,7 +1197,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_5, // && B_UPDATED_MOVE_FLAGS > GEN_2 .healBlockBanned = B_HEAL_BLOCKING >= GEN_6, }, @@ -1273,7 +1216,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_5, // && B_UPDATED_MOVE_FLAGS > GEN_2 .healBlockBanned = B_HEAL_BLOCKING >= GEN_6, }, @@ -1289,7 +1231,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESET_STATS, + .zMove = { .effect = Z_EFFECT_RESET_STATS }, .magicCoatAffected = TRUE, }, @@ -1312,7 +1254,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPATK_UP_1, + .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, @@ -1328,9 +1270,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_BOTH, .priority = 0, + .critBoost = 1, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, - .highCritRatio = TRUE, .slicingMove = TRUE, }, @@ -1345,7 +1286,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .twoTurnMove = TRUE, .sleepTalkBanned = TRUE, .instructBanned = TRUE, @@ -1362,7 +1302,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_DEF_UP_1, + .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = TRUE, .powderMove = TRUE, }, @@ -1378,7 +1318,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPDEF_UP_1, + .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .magicCoatAffected = TRUE, .powderMove = TRUE, }, @@ -1394,7 +1334,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPD_UP_1, + .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .magicCoatAffected = TRUE, .powderMove = TRUE, }, @@ -1418,7 +1358,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_RANDOM, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .danceMove = TRUE, .instructBanned = TRUE, @@ -1439,7 +1378,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPD_UP_1, + .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .magicCoatAffected = TRUE, }, @@ -1454,7 +1393,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .ignoresKingsRock = (B_UPDATED_MOVE_FLAGS == GEN_4) || (B_UPDATED_MOVE_FLAGS < GEN_3), }, @@ -1474,7 +1412,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_3, }, @@ -1489,7 +1426,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -1508,7 +1444,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -1527,7 +1462,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPDEF_UP_1, + .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .magicCoatAffected = TRUE, }, @@ -1546,7 +1481,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .damagesAirborne = TRUE, }, @@ -1562,7 +1496,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_EARTHQUAKE] = @@ -1576,7 +1509,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_3, .damagesUnderground = TRUE, .skyBattleBanned = TRUE, @@ -1593,7 +1525,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .damagesUnderground = TRUE, .skyBattleBanned = TRUE, }, @@ -1613,7 +1544,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .twoTurnMove = TRUE, .makesContact = TRUE, .sleepTalkBanned = TRUE, @@ -1637,7 +1567,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_DEF_UP_1, + .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = TRUE, }, @@ -1652,7 +1582,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -1667,7 +1596,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -1682,7 +1610,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPD_UP_1, + .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .magicCoatAffected = TRUE, }, @@ -1697,7 +1625,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_ATK_UP_1, + .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, @@ -1714,7 +1642,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESET_STATS, + .zMove = { .effect = Z_EFFECT_RESET_STATS }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, @@ -1731,7 +1659,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 1, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -1746,7 +1673,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -1761,7 +1687,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = -6, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RECOVER_HP, + .zMove = { .effect = Z_EFFECT_RECOVER_HP }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, }, @@ -1777,7 +1703,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_MIMIC] = @@ -1791,7 +1716,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_ACC_UP_1, + .zMove = { .effect = Z_EFFECT_ACC_UP_1 }, .ignoresSubstitute = TRUE, .mimicBanned = TRUE, .metronomeBanned = TRUE, // B_UPDATED_MOVE_FLAGS >= GEN_2 @@ -1813,7 +1738,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_ATK_UP_1, + .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .magicCoatAffected = TRUE, .soundMove = TRUE, @@ -1830,7 +1755,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESET_STATS, + .zMove = { .effect = Z_EFFECT_RESET_STATS }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, @@ -1853,7 +1778,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESET_STATS, + .zMove = { .effect = Z_EFFECT_RESET_STATS }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .healBlockBanned = TRUE, @@ -1871,7 +1796,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_DEF_UP_1, + .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, @@ -1892,7 +1817,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESET_STATS, + .zMove = { .effect = Z_EFFECT_RESET_STATS }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, @@ -1909,7 +1834,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_EVSN_UP_1, + .zMove = { .effect = Z_EFFECT_EVSN_UP_1 }, .magicCoatAffected = TRUE, }, @@ -1924,7 +1849,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPATK_UP_1, + .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .magicCoatAffected = TRUE, }, @@ -1939,7 +1864,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_DEF_UP_1, + .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, @@ -1956,7 +1881,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_ACC_UP_1, + .zMove = { .effect = Z_EFFECT_ACC_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, @@ -1977,7 +1902,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESET_STATS, + .zMove = { .effect = Z_EFFECT_RESET_STATS }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, @@ -1994,7 +1919,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPDEF_UP_1, + .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, @@ -2011,7 +1936,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RECOVER_HP, + .zMove = { .effect = Z_EFFECT_RECOVER_HP }, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, @@ -2028,7 +1953,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_DEF_UP_1, + .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, @@ -2045,7 +1970,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_ACC_UP_1, + .zMove = { .effect = Z_EFFECT_ACC_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, @@ -2067,7 +1992,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sleepTalkBanned = TRUE, .instructBanned = TRUE, @@ -2085,7 +2009,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_DEPENDS, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_NONE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .mimicBanned = TRUE, @@ -2108,7 +2031,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_DEPENDS, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_ATK_UP_2, + .zMove = { .effect = Z_EFFECT_ATK_UP_2 }, .mimicBanned = TRUE, .metronomeBanned = B_UPDATED_MOVE_FLAGS >= GEN_4, .copycatBanned = TRUE, @@ -2129,7 +2052,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .parentalBondBanned = TRUE, }, @@ -2144,7 +2066,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .ballisticMove = TRUE, }, @@ -2163,7 +2084,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -2183,7 +2103,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -2198,7 +2117,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -2213,7 +2131,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -2232,7 +2149,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -2251,7 +2167,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -2272,7 +2187,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_3, }, @@ -2288,7 +2202,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_SKULL_BASH] = @@ -2307,7 +2220,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .twoTurnMove = TRUE, .makesContact = TRUE, .sleepTalkBanned = TRUE, @@ -2325,7 +2237,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_CONSTRICT] = @@ -2339,7 +2250,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -2355,7 +2265,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESET_STATS, + .zMove = { .effect = Z_EFFECT_RESET_STATS }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .snatchAffected = TRUE, @@ -2372,7 +2282,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_EVSN_UP_1, + .zMove = { .effect = Z_EFFECT_EVSN_UP_1 }, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, }, @@ -2391,7 +2301,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESET_STATS, + .zMove = { .effect = Z_EFFECT_RESET_STATS }, .healBlockBanned = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -2417,7 +2327,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .gravityBanned = TRUE, }, @@ -2439,7 +2348,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPDEF_UP_1, + .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .magicCoatAffected = TRUE, }, @@ -2454,7 +2363,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .healBlockBanned = B_HEAL_BLOCKING >= GEN_6, }, @@ -2477,7 +2385,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_DEF_UP_1, + .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = TRUE, }, @@ -2492,7 +2400,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .ballisticMove = TRUE, }, @@ -2512,7 +2419,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_5, // && B_UPDATED_MOVE_FLAGS > GEN_2 .healBlockBanned = B_HEAL_BLOCKING >= GEN_6, @@ -2529,7 +2435,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPD_UP_1, + .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .magicCoatAffected = TRUE, }, @@ -2545,7 +2451,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_PHYSICAL, .argument = MOVE_EFFECT_FLINCH, - .zMoveEffect = Z_EFFECT_NONE, .twoTurnMove = TRUE, .sheerForceBoost = TRUE, .sleepTalkBanned = TRUE, @@ -2563,7 +2468,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RECOVER_HP, + .zMove = { .effect = Z_EFFECT_RECOVER_HP }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .mimicBanned = TRUE, @@ -2589,7 +2494,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -2604,7 +2508,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .punchingMove = TRUE, .sheerForceBoost = TRUE, @@ -2621,7 +2524,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESET_STATS, + .zMove = { .effect = Z_EFFECT_RESET_STATS }, .magicCoatAffected = TRUE, .powderMove = TRUE, }, @@ -2641,7 +2544,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_EVSN_UP_1, + .zMove = { .effect = Z_EFFECT_EVSN_UP_1 }, .magicCoatAffected = TRUE, }, @@ -2660,7 +2563,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_SPLASH] = @@ -2674,7 +2576,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_ATK_UP_3, + .zMove = { .effect = Z_EFFECT_ATK_UP_3 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .gravityBanned = TRUE, @@ -2695,7 +2597,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESET_STATS, + .zMove = { .effect = Z_EFFECT_RESET_STATS }, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -2719,10 +2621,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, + .critBoost = 1, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, - .highCritRatio = TRUE, }, [MOVE_EXPLOSION] = @@ -2736,7 +2637,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .parentalBondBanned = TRUE, }, @@ -2751,7 +2651,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -2766,7 +2665,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .strikeCount = 2, }, @@ -2785,7 +2683,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESET_STATS, + .zMove = { .effect = Z_EFFECT_RESET_STATS }, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -2803,7 +2701,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -2818,7 +2715,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, .bitingMove = TRUE, @@ -2835,7 +2731,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_ATK_UP_1, + .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -2852,7 +2748,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_ALL_STATS_UP_1, + .zMove = { .effect = Z_EFFECT_ALL_STATS_UP_1 }, .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -2869,7 +2765,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -2884,7 +2779,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_5, // && B_UPDATED_MOVE_FLAGS > GEN_2 }, @@ -2899,10 +2793,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, + .critBoost = 1, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, - .highCritRatio = TRUE, .slicingMove = TRUE, }, @@ -2917,7 +2810,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESET_STATS, + .zMove = { .effect = Z_EFFECT_RESET_STATS }, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -2931,16 +2824,16 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .effect = EFFECT_RECOIL_HP_25, #else .accuracy = 100, - .effect = EFFECT_RECOIL_25, + .effect = EFFECT_RECOIL, #endif .power = 50, .type = TYPE_NORMAL, + .recoil = 25, .pp = 1, .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS >= GEN_4, .meFirstBanned = TRUE, @@ -2964,7 +2857,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_ALL_STATS_UP_1, + .zMove = { .effect = Z_EFFECT_ALL_STATS_UP_1 }, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, @@ -2988,7 +2881,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .strikeCount = 3, }, @@ -3009,7 +2901,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_5, // && B_UPDATED_MOVE_FLAGS > GEN_2 .meFirstBanned = TRUE, @@ -3029,7 +2920,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_DEF_UP_1, + .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresProtect = (B_UPDATED_MOVE_FLAGS >= GEN_6) || (B_UPDATED_MOVE_FLAGS <= GEN_3), .magicCoatAffected = TRUE, }, @@ -3049,7 +2940,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPATK_UP_1, + .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, }, [MOVE_NIGHTMARE] = @@ -3067,7 +2958,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPATK_UP_1, + .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .ignoresProtect = B_UPDATED_MOVE_FLAGS <= GEN_3, }, @@ -3082,7 +2973,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, .thawsUser = TRUE, @@ -3103,7 +2993,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .sheerForceBoost = TRUE, .soundMove = TRUE, @@ -3125,7 +3014,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_CURSE, + .zMove = { .effect = Z_EFFECT_CURSE }, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, @@ -3142,7 +3031,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -3157,7 +3045,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RECOVER_HP, + .zMove = { .effect = Z_EFFECT_RECOVER_HP }, .ignoresProtect = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, @@ -3173,9 +3061,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, + .critBoost = 1, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, - .highCritRatio = TRUE, }, [MOVE_COTTON_SPORE] = @@ -3197,7 +3084,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESET_STATS, + .zMove = { .effect = Z_EFFECT_RESET_STATS }, .magicCoatAffected = TRUE, .powderMove = TRUE, }, @@ -3213,7 +3100,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -3228,7 +3114,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RECOVER_HP, + .zMove = { .effect = Z_EFFECT_RECOVER_HP }, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresSubstitute = TRUE, }, @@ -3248,7 +3134,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -3267,7 +3152,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESET_STATS, + .zMove = { .effect = Z_EFFECT_RESET_STATS }, .protectionMove = TRUE, .metronomeBanned = TRUE, .copycatBanned = TRUE, @@ -3285,7 +3170,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 1, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .punchingMove = TRUE, }, @@ -3305,7 +3189,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPD_UP_1, + .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .magicCoatAffected = TRUE, }, @@ -3323,7 +3207,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_SWEET_KISS] = @@ -3341,7 +3224,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPATK_UP_1, + .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .magicCoatAffected = TRUE, }, @@ -3356,7 +3239,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RECOVER_HP, + .zMove = { .effect = Z_EFFECT_RECOVER_HP }, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -3373,7 +3256,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .ballisticMove = TRUE, }, @@ -3389,7 +3271,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -3404,7 +3285,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .ballisticMove = TRUE, }, @@ -3420,7 +3300,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_OPPONENTS_FIELD, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_DEF_UP_1, + .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, @@ -3443,7 +3323,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .ballisticMove = TRUE, }, @@ -3463,7 +3342,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_BOOST_CRITS, + .zMove = { .effect = Z_EFFECT_BOOST_CRITS }, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresSubstitute = TRUE, }, @@ -3479,7 +3358,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_FOLLOW_ME, + .zMove = { .effect = Z_EFFECT_FOLLOW_ME }, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, @@ -3499,7 +3378,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESET_STATS, + .zMove = { .effect = Z_EFFECT_RESET_STATS }, .ignoresProtect = TRUE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .mirrorMoveBanned = TRUE, @@ -3517,7 +3396,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .windMove = TRUE, }, @@ -3537,7 +3415,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_EVSN_UP_1, + .zMove = { .effect = Z_EFFECT_EVSN_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .protectionMove = TRUE, @@ -3561,7 +3439,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_LOCK_ON] = @@ -3579,7 +3456,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPD_UP_1, + .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, }, [MOVE_OUTRAGE] = @@ -3601,7 +3478,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_RANDOM, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .instructBanned = TRUE, }, @@ -3617,7 +3493,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPD_UP_1, + .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .windMove = TRUE, @@ -3642,7 +3518,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_5, // && B_UPDATED_MOVE_FLAGS > GEN_2 .healBlockBanned = B_HEAL_BLOCKING >= GEN_6, }, @@ -3662,7 +3537,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESET_STATS, + .zMove = { .effect = Z_EFFECT_RESET_STATS }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .protectionMove = TRUE, @@ -3686,7 +3561,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_DEF_UP_1, + .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = TRUE, }, @@ -3701,7 +3576,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .instructBanned = TRUE, .parentalBondBanned = TRUE, @@ -3718,7 +3592,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -3737,7 +3610,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESET_STATS, + .zMove = { .effect = Z_EFFECT_RESET_STATS }, .magicCoatAffected = TRUE, }, @@ -3756,7 +3629,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESET_STATS, + .zMove = { .effect = Z_EFFECT_RESET_STATS }, .healBlockBanned = TRUE, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -3774,7 +3647,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -3796,7 +3668,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .slicingMove = TRUE, }, @@ -3812,7 +3683,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -3828,7 +3698,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPDEF_UP_1, + .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .ignoresProtect = (B_UPDATED_MOVE_FLAGS >= GEN_6) || (B_UPDATED_MOVE_FLAGS <= GEN_3), .magicCoatAffected = TRUE, }, @@ -3844,7 +3714,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESET_STATS, + .zMove = { .effect = Z_EFFECT_RESET_STATS }, .magicCoatAffected = TRUE, .ignoresSubstitute = TRUE, }, @@ -3860,7 +3730,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_DEPENDS, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_BOOST_CRITS, + .zMove = { .effect = Z_EFFECT_BOOST_CRITS }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, @@ -3883,7 +3753,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER | MOVE_TARGET_ALLY, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RECOVER_HP, + .zMove = { .effect = Z_EFFECT_RECOVER_HP }, .snatchAffected = TRUE, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, @@ -3902,7 +3772,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -3917,7 +3786,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_5, // && B_UPDATED_MOVE_FLAGS > GEN_2 }, @@ -3932,7 +3800,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -3947,7 +3814,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPD_UP_1, + .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -3964,7 +3831,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_DEF_UP_1, + .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, }, [MOVE_SACRED_FIRE] = @@ -3978,7 +3845,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .thawsUser = TRUE, }, @@ -3994,7 +3860,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .damagesUnderground = TRUE, .skyBattleBanned = TRUE, }, @@ -4010,7 +3875,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .punchingMove = TRUE, .sheerForceBoost = TRUE, @@ -4027,7 +3891,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -4042,7 +3905,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_3, }, @@ -4058,7 +3920,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESET_STATS, + .zMove = { .effect = Z_EFFECT_RESET_STATS }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, }, @@ -4074,7 +3936,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPD_UP_1, + .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .encoreBanned = TRUE, .ignoresSubstitute = TRUE, @@ -4091,7 +3953,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_5, // && B_UPDATED_MOVE_FLAGS > GEN_2 }, @@ -4111,7 +3972,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -4130,7 +3990,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_ACC_UP_1, + .zMove = { .effect = Z_EFFECT_ACC_UP_1 }, .magicCoatAffected = TRUE, }, @@ -4145,7 +4005,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -4161,7 +4020,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -4177,7 +4035,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = -1, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -4192,7 +4049,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESET_STATS, + .zMove = { .effect = Z_EFFECT_RESET_STATS }, .healBlockBanned = TRUE, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -4210,7 +4067,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESET_STATS, + .zMove = { .effect = Z_EFFECT_RESET_STATS }, .healBlockBanned = TRUE, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -4232,7 +4089,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESET_STATS, + .zMove = { .effect = Z_EFFECT_RESET_STATS }, .healBlockBanned = TRUE, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -4250,7 +4107,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_CROSS_CHOP] = @@ -4263,10 +4119,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, + .critBoost = 1, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, - .highCritRatio = TRUE, }, [MOVE_TWISTER] = @@ -4280,7 +4135,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .damagesAirborneDoubleDamage = TRUE, .windMove = TRUE, @@ -4297,7 +4151,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPD_UP_1, + .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, }, @@ -4313,7 +4167,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPD_UP_1, + .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, }, @@ -4333,7 +4187,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, .bitingMove = TRUE, @@ -4350,7 +4203,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_DEPENDS, .priority = -5, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS >= GEN_4, .meFirstBanned = TRUE, .metronomeBanned = TRUE, @@ -4368,7 +4220,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RECOVER_HP, + .zMove = { .effect = Z_EFFECT_RECOVER_HP }, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, @@ -4390,7 +4242,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -4408,7 +4259,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -4423,7 +4273,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .ballisticMove = TRUE, }, @@ -4449,7 +4298,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, }, @@ -4469,7 +4317,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -4490,7 +4337,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .damagesUnderwater = TRUE, }, @@ -4509,7 +4355,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_FAKE_OUT] = @@ -4531,7 +4376,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -4550,7 +4394,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_RANDOM, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .soundMove = TRUE, .sleepTalkBanned = TRUE, @@ -4572,7 +4415,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RECOVER_HP, + .zMove = { .effect = Z_EFFECT_RECOVER_HP }, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -4593,7 +4436,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .mirrorMoveBanned = TRUE, }, @@ -4608,7 +4450,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESET_STATS, + .zMove = { .effect = Z_EFFECT_RESET_STATS }, .healBlockBanned = TRUE, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -4630,7 +4472,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .windMove = TRUE, }, @@ -4646,7 +4487,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPD_UP_1, + .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, }, @@ -4662,7 +4503,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_DEF_UP_1, + .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, }, @@ -4677,7 +4518,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPDEF_UP_1, + .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .magicCoatAffected = TRUE, }, @@ -4696,7 +4537,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_ATK_UP_1, + .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .magicCoatAffected = TRUE, }, @@ -4711,7 +4552,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESTORE_REPLACEMENT_HP, + .zMove = { .effect = Z_EFFECT_RESTORE_REPLACEMENT_HP }, }, [MOVE_FACADE] = @@ -4725,7 +4566,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -4740,7 +4580,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = -3, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .mirrorMoveBanned = TRUE, .punchingMove = TRUE, @@ -4768,7 +4607,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_PHYSICAL, .argument = STATUS1_PARALYSIS, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -4787,7 +4625,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESET_STATS, + .zMove = { .effect = Z_EFFECT_RESET_STATS }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, @@ -4806,7 +4644,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_DEPENDS, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_NONE, .metronomeBanned = B_UPDATED_MOVE_FLAGS >= GEN_4, .copycatBanned = TRUE, .sleepTalkBanned = TRUE, @@ -4827,7 +4664,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPDEF_UP_1, + .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -4844,7 +4681,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_ATK_UP_1, + .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .ignoresSubstitute = TRUE, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, }, @@ -4864,7 +4701,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .priority = 5, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESET_STATS, + .zMove = { .effect = Z_EFFECT_RESET_STATS }, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, @@ -4884,7 +4721,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPD_UP_2, + .zMove = { .effect = Z_EFFECT_SPD_UP_2 }, .metronomeBanned = TRUE, .copycatBanned = TRUE, .assistBanned = TRUE, @@ -4901,7 +4738,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPD_UP_1, + .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, @@ -4918,7 +4755,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPDEF_UP_1, + .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .healBlockBanned = TRUE, .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresProtect = TRUE, @@ -4936,7 +4773,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_DEPENDS, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_NONE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .metronomeBanned = B_UPDATED_MOVE_FLAGS >= GEN_4, @@ -4959,7 +4795,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPDEF_UP_1, + .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -4977,7 +4813,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -4992,7 +4827,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_DEPENDS, .priority = 4, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPDEF_UP_2, + .zMove = { .effect = Z_EFFECT_SPDEF_UP_2 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, }, @@ -5008,7 +4843,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPD_UP_2, + .zMove = { .effect = Z_EFFECT_SPD_UP_2 }, .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -5025,7 +4860,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = -4, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -5040,7 +4874,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -5055,7 +4888,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPD_UP_1, + .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .magicCoatAffected = TRUE, }, @@ -5074,7 +4907,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -5089,7 +4921,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .parentalBondBanned = TRUE, }, @@ -5105,7 +4936,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_SKILL_SWAP] = @@ -5119,7 +4949,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPD_UP_1, + .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresSubstitute = TRUE, }, @@ -5134,7 +4964,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPDEF_UP_2, + .zMove = { .effect = Z_EFFECT_SPDEF_UP_2 }, .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, @@ -5153,7 +4983,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RECOVER_HP, + .zMove = { .effect = Z_EFFECT_RECOVER_HP }, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -5170,7 +5000,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_FOLLOW_ME, + .zMove = { .effect = Z_EFFECT_FOLLOW_ME }, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, @@ -5187,7 +5017,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_DEPENDS, .priority = 4, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPD_UP_2, + .zMove = { .effect = Z_EFFECT_SPD_UP_2 }, .ignoresSubstitute = TRUE, .forcePressure = TRUE, .metronomeBanned = TRUE, @@ -5206,7 +5036,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -5225,7 +5054,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .twoTurnMove = TRUE, .makesContact = TRUE, .sleepTalkBanned = TRUE, @@ -5245,7 +5073,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -5260,7 +5087,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_EVSN_UP_1, + .zMove = { .effect = Z_EFFECT_EVSN_UP_1 }, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -5281,7 +5108,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESET_STATS, + .zMove = { .effect = Z_EFFECT_RESET_STATS }, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -5298,7 +5125,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -5313,7 +5139,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .ballisticMove = TRUE, }, @@ -5329,7 +5154,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_DEF_UP_1, + .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = TRUE, .danceMove = TRUE, }, @@ -5345,7 +5170,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPATK_UP_1, + .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .danceMove = TRUE, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_4, }, @@ -5360,10 +5185,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, + .critBoost = 1, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, - .highCritRatio = TRUE, .sheerForceBoost = TRUE, }, @@ -5378,7 +5202,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPDEF_UP_1, + .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .skyBattleBanned = TRUE, @@ -5395,7 +5219,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .ballisticMove = TRUE, .instructBanned = TRUE, @@ -5413,7 +5236,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, .minimizeDoubleDamage = B_UPDATED_MOVE_FLAGS < GEN_4, @@ -5434,7 +5256,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESET_STATS, + .zMove = { .effect = Z_EFFECT_RESET_STATS }, .healBlockBanned = TRUE, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -5452,7 +5274,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .soundMove = TRUE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, }, @@ -5472,7 +5293,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, .bitingMove = TRUE, @@ -5489,7 +5309,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -5505,7 +5324,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_HYDRO_CANNON] = @@ -5519,7 +5337,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_METEOR_MASH] = @@ -5538,7 +5355,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .punchingMove = TRUE, .sheerForceBoost = TRUE, @@ -5555,7 +5371,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, .minimizeDoubleDamage = B_UPDATED_MOVE_FLAGS < GEN_4, @@ -5572,7 +5387,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .ballisticMove = TRUE, }, @@ -5587,7 +5401,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER | MOVE_TARGET_ALLY, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RECOVER_HP, + .zMove = { .effect = Z_EFFECT_RECOVER_HP }, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -5604,7 +5418,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPATK_UP_1, + .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .magicCoatAffected = TRUE, }, @@ -5622,9 +5436,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_BOTH, .priority = 0, + .critBoost = 1, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, - .highCritRatio = TRUE, .windMove = TRUE, .slicingMove = TRUE, }, @@ -5647,7 +5460,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_ODOR_SLEUTH] = @@ -5665,7 +5477,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_ATK_UP_1, + .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .ignoresSubstitute = TRUE, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, }, @@ -5687,7 +5499,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -5702,7 +5513,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .windMove = B_EXTRAPOLATED_MOVE_FLAGS, }, @@ -5718,7 +5528,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPATK_UP_1, + .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .magicCoatAffected = TRUE, .soundMove = TRUE, @@ -5735,7 +5545,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPD_UP_1, + .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .magicCoatAffected = TRUE, .soundMove = TRUE, @@ -5752,7 +5562,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_DEF_UP_1, + .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = TRUE, }, @@ -5767,7 +5577,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPDEF_UP_1, + .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -5784,7 +5594,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_SIGNAL_BEAM] = @@ -5798,7 +5607,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -5813,7 +5621,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .punchingMove = TRUE, }, @@ -5833,7 +5640,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .minimizeDoubleDamage = B_UPDATED_MOVE_FLAGS < GEN_4, }, @@ -5849,7 +5655,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .punchingMove = TRUE, .damagesAirborne = TRUE, @@ -5871,7 +5676,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_SHEER_COLD] = @@ -5885,7 +5689,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_MUDDY_WATER] = @@ -5903,7 +5706,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .skyBattleBanned = TRUE, }, @@ -5923,7 +5725,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .ballisticMove = TRUE, }, @@ -5938,7 +5739,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .slicingMove = TRUE, }, @@ -5958,7 +5758,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_IRON_DEFENSE] = @@ -5972,7 +5771,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESET_STATS, + .zMove = { .effect = Z_EFFECT_RESET_STATS }, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -5989,7 +5788,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_DEF_UP_1, + .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresProtect = (B_UPDATED_MOVE_FLAGS >= GEN_6) || (B_UPDATED_MOVE_FLAGS <= GEN_3), .magicCoatAffected = TRUE, }, @@ -6009,7 +5808,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_ATK_UP_1, + .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -6027,7 +5826,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -6042,7 +5840,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .skyBattleBanned = TRUE, }, @@ -6057,7 +5854,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_ATK_UP_1, + .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -6075,7 +5872,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_PHYSICAL, .argument = MOVE_EFFECT_PARALYSIS, - .zMoveEffect = Z_EFFECT_NONE, .twoTurnMove = TRUE, .makesContact = TRUE, .sheerForceBoost = TRUE, @@ -6096,7 +5892,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -6110,10 +5905,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, + .critBoost = 1, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, - .highCritRatio = TRUE, .sheerForceBoost = TRUE, }, @@ -6142,7 +5936,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .meFirstBanned = TRUE, .metronomeBanned = TRUE, .copycatBanned = TRUE, @@ -6152,20 +5945,18 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_VOLT_TACKLE] = { #if B_UPDATED_MOVE_DATA >= GEN_4 - .effect = EFFECT_RECOIL_33_STATUS, .argument = STATUS1_PARALYSIS, - #else - .effect = EFFECT_RECOIL_33, #endif + .effect = EFFECT_RECOIL, .power = 120, .type = TYPE_ELECTRIC, .accuracy = 100, + .recoil = 33, .pp = 15, .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -6181,7 +5972,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_WATER_SPORT] = @@ -6195,7 +5985,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPDEF_UP_1, + .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .skyBattleBanned = TRUE, @@ -6212,7 +6002,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESET_STATS, + .zMove = { .effect = Z_EFFECT_RESET_STATS }, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -6232,10 +6022,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, + .critBoost = 1, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, - .highCritRatio = TRUE, .slicingMove = TRUE, }, @@ -6250,7 +6039,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESET_STATS, + .zMove = { .effect = Z_EFFECT_RESET_STATS }, .danceMove = TRUE, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -6272,7 +6061,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .ballisticMove = B_UPDATED_MOVE_FLAGS >= GEN_6, }, @@ -6287,7 +6075,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_WATER_PULSE] = @@ -6301,7 +6088,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .pulseMove = TRUE, }, @@ -6322,7 +6108,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, }, @@ -6338,7 +6123,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_ROOST] = @@ -6356,7 +6140,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESET_STATS, + .zMove = { .effect = Z_EFFECT_RESET_STATS }, .healBlockBanned = TRUE, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -6374,7 +6158,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPATK_UP_1, + .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .skyBattleBanned = TRUE, @@ -6391,7 +6175,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPATK_UP_1, + .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .ignoresSubstitute = TRUE, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, }, @@ -6412,7 +6196,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_PHYSICAL, .argument = STATUS1_SLEEP, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -6427,7 +6210,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .punchingMove = TRUE, }, @@ -6443,7 +6225,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .ballisticMove = TRUE, }, @@ -6459,7 +6240,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_NONE, .healBlockBanned = TRUE, .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresProtect = TRUE, @@ -6477,7 +6257,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_NATURAL_GIFT] = @@ -6491,7 +6270,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_FEINT] = @@ -6509,7 +6287,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 2, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .ignoresProtect = TRUE, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_6, .metronomeBanned = TRUE, @@ -6528,7 +6305,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -6547,7 +6323,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_BOOST_CRITS, + .zMove = { .effect = Z_EFFECT_BOOST_CRITS }, .snatchAffected = TRUE, .windMove = TRUE, .ignoresProtect = TRUE, @@ -6565,7 +6341,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER | MOVE_TARGET_ALLY, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_BOOST_CRITS, + .zMove = { .effect = Z_EFFECT_BOOST_CRITS }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .snatchAffected = B_UPDATED_MOVE_FLAGS < GEN_5, @@ -6582,7 +6358,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_DEPENDS, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .meFirstBanned = TRUE, }, @@ -6597,7 +6372,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -6612,7 +6386,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -6627,7 +6400,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -6646,7 +6418,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -6661,7 +6432,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPATK_UP_1, + .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, }, @@ -6676,7 +6447,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .parentalBondBanned = TRUE, }, @@ -6695,7 +6465,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPATK_UP_2, + .zMove = { .effect = Z_EFFECT_SPATK_UP_2 }, }, [MOVE_TRUMP_CARD] = @@ -6709,7 +6479,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -6724,7 +6493,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPATK_UP_2, + .zMove = { .effect = Z_EFFECT_SPATK_UP_2 }, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, }, @@ -6753,7 +6522,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_ATK_UP_1, + .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -6770,7 +6539,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPD_UP_1, + .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .magicCoatAffected = TRUE, }, @@ -6785,7 +6554,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_EVSN_UP_1, + .zMove = { .effect = Z_EFFECT_EVSN_UP_1 }, .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -6802,7 +6571,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPD_UP_2, + .zMove = { .effect = Z_EFFECT_SPD_UP_2 }, .ignoresSubstitute = TRUE, .metronomeBanned = TRUE, .mirrorMoveBanned = TRUE, @@ -6826,7 +6595,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_DEPENDS, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_ACC_UP_1, + .zMove = { .effect = Z_EFFECT_ACC_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, @@ -6849,7 +6618,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPD_UP_1, + .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresSubstitute = TRUE, }, @@ -6864,7 +6633,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPD_UP_1, + .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresSubstitute = TRUE, }, @@ -6879,7 +6648,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -6898,7 +6666,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -6913,7 +6680,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPD_UP_1, + .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .magicCoatAffected = TRUE, }, @@ -6932,7 +6699,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 1, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -6947,7 +6713,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_OPPONENTS_FIELD, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_DEF_UP_1, + .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, @@ -6966,7 +6732,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_BOOST_CRITS, + .zMove = { .effect = Z_EFFECT_BOOST_CRITS }, .ignoresSubstitute = TRUE, }, @@ -6981,7 +6747,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_DEF_UP_1, + .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -6998,7 +6764,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_EVSN_UP_1, + .zMove = { .effect = Z_EFFECT_EVSN_UP_1 }, .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -7007,17 +6773,17 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_FLARE_BLITZ] = { - .effect = EFFECT_RECOIL_33_STATUS, + .effect = EFFECT_RECOIL, .power = 120, .type = TYPE_FIRE, .accuracy = 100, + .recoil = 33, .pp = 15, .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, .argument = STATUS1_BURN, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, .thawsUser = TRUE, @@ -7034,7 +6800,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -7054,7 +6819,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .pulseMove = TRUE, .ballisticMove = TRUE, }, @@ -7070,7 +6834,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESET_STATS, + .zMove = { .effect = Z_EFFECT_RESET_STATS }, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -7087,7 +6851,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -7103,7 +6866,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .pulseMove = TRUE, }, @@ -7118,10 +6880,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, + .critBoost = 1, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, - .highCritRatio = TRUE, .slicingMove = TRUE, }, @@ -7136,7 +6897,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -7151,7 +6911,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .ballisticMove = TRUE, }, @@ -7170,7 +6929,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .slicingMove = TRUE, }, @@ -7186,7 +6944,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .slicingMove = TRUE, }, @@ -7202,7 +6959,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .soundMove = TRUE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, @@ -7223,7 +6979,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .pulseMove = TRUE, }, @@ -7238,7 +6993,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, .minimizeDoubleDamage = B_UPDATED_MOVE_FLAGS >= GEN_6, @@ -7259,7 +7013,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_DRAIN_PUNCH] = @@ -7278,7 +7031,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .punchingMove = TRUE, .healBlockBanned = B_HEAL_BLOCKING >= GEN_6, @@ -7295,7 +7047,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 1, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_FOCUS_BLAST] = @@ -7309,7 +7060,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .ballisticMove = TRUE, }, @@ -7329,23 +7079,22 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .ballisticMove = TRUE, }, [MOVE_BRAVE_BIRD] = { - .effect = EFFECT_RECOIL_33, + .effect = EFFECT_RECOIL, .power = 120, .type = TYPE_FLYING, .accuracy = 100, + .recoil = 33, .pp = 15, .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -7360,7 +7109,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .skyBattleBanned = TRUE, }, @@ -7376,7 +7124,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPD_UP_2, + .zMove = { .effect = Z_EFFECT_SPD_UP_2 }, .metronomeBanned = TRUE, .copycatBanned = TRUE, .assistBanned = TRUE, @@ -7393,7 +7141,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -7408,7 +7155,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESET_STATS, + .zMove = { .effect = Z_EFFECT_RESET_STATS }, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -7425,7 +7172,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 1, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .punchingMove = TRUE, }, @@ -7441,7 +7187,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = -4, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -7456,7 +7201,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 1, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_SHADOW_CLAW] = @@ -7469,10 +7213,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, + .critBoost = 1, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, - .highCritRatio = TRUE, }, [MOVE_THUNDER_FANG] = @@ -7487,7 +7230,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_PHYSICAL, .argument = STATUS1_PARALYSIS, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, .bitingMove = TRUE, @@ -7509,7 +7251,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, .bitingMove = TRUE, @@ -7527,7 +7268,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_PHYSICAL, .argument = STATUS1_BURN, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, .bitingMove = TRUE, @@ -7544,7 +7284,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 1, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -7559,7 +7298,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .ballisticMove = TRUE, }, @@ -7574,9 +7312,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, + .critBoost = 1, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, - .highCritRatio = TRUE, .slicingMove = TRUE, }, @@ -7591,7 +7328,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -7607,7 +7343,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -7622,7 +7357,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -7637,7 +7371,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -7653,7 +7386,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_ACC_UP_1, + .zMove = { .effect = Z_EFFECT_ACC_UP_1 }, //.ignoresSubstitute = TRUE, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, }, @@ -7669,7 +7402,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_ALL_BATTLERS, .priority = -7, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_ACC_UP_1, + .zMove = { .effect = Z_EFFECT_ACC_UP_1 }, .ignoresProtect = TRUE, }, @@ -7688,7 +7421,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_DISCHARGE] = @@ -7702,7 +7434,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -7717,7 +7448,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -7736,7 +7466,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_POWER_WHIP] = @@ -7750,7 +7479,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -7765,7 +7493,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .ballisticMove = TRUE, }, @@ -7779,10 +7506,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, + .critBoost = 1, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, - .highCritRatio = TRUE, .sheerForceBoost = TRUE, .slicingMove = TRUE, }, @@ -7802,7 +7528,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -7817,7 +7542,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -7833,7 +7557,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .ballisticMove = TRUE, }, @@ -7847,9 +7570,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, + .critBoost = 1, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, - .highCritRatio = TRUE, }, [MOVE_CAPTIVATE] = @@ -7863,7 +7585,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPDEF_UP_2, + .zMove = { .effect = Z_EFFECT_SPDEF_UP_2 }, .magicCoatAffected = TRUE, }, @@ -7878,7 +7600,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_OPPONENTS_FIELD, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_DEF_UP_1, + .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -7896,7 +7618,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .skyBattleBanned = TRUE, }, @@ -7920,7 +7641,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .soundMove = TRUE, @@ -7945,7 +7665,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_SPECIAL, .argument = HOLD_EFFECT_PLATE, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_BUG_BITE] = @@ -7959,7 +7678,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -7974,22 +7692,21 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, [MOVE_WOOD_HAMMER] = { - .effect = EFFECT_RECOIL_33, + .effect = EFFECT_RECOIL, .power = 120, .type = TYPE_GRASS, .accuracy = 100, + .recoil = 33, .pp = 15, .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -8004,7 +7721,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 1, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -8018,9 +7734,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, + .critBoost = 1, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, - .highCritRatio = TRUE, }, [MOVE_DEFEND_ORDER] = @@ -8034,7 +7749,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_DEF_UP_1, + .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -8051,7 +7766,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESET_STATS, + .zMove = { .effect = Z_EFFECT_RESET_STATS }, .healBlockBanned = TRUE, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -8060,16 +7775,16 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEAD_SMASH] = { - .effect = EFFECT_RECOIL_50, + .effect = EFFECT_RECOIL, .power = 150, .type = TYPE_ROCK, .accuracy = 80, + .recoil = 50, .pp = 5, .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -8084,7 +7799,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .strikeCount = 2, }, @@ -8100,7 +7814,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_SPACIAL_REND] = @@ -8113,9 +7826,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, + .critBoost = 1, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, - .highCritRatio = TRUE, }, [MOVE_LUNAR_DANCE] = @@ -8129,7 +7841,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_NONE, .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -8148,7 +7859,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -8171,7 +7881,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_DARK_VOID] = @@ -8189,7 +7898,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESET_STATS, + .zMove = { .effect = Z_EFFECT_RESET_STATS }, .magicCoatAffected = TRUE, }, @@ -8204,7 +7913,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -8219,7 +7927,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .windMove = B_EXTRAPOLATED_MOVE_FLAGS, }, @@ -8235,7 +7942,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .argument = MOVE_EFFECT_FEINT, .twoTurnMove = TRUE, @@ -8257,7 +7963,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_ATK_UP_1, + .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -8275,7 +7981,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 3, .split = SPLIT_STATUS, .argument = TRUE, // Protects the whole side. - .zMoveEffect = Z_EFFECT_DEF_UP_1, + .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -8294,7 +8000,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPD_UP_1, + .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .mirrorMoveBanned = TRUE, }, @@ -8309,7 +8015,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPD_UP_1, + .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .mirrorMoveBanned = TRUE, }, @@ -8328,7 +8034,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_ALL_BATTLERS, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPDEF_UP_1, + .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .ignoresProtect = TRUE, }, @@ -8343,7 +8049,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_VENOSHOCK] = @@ -8357,7 +8062,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_AUTOTOMIZE] = @@ -8371,7 +8075,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESET_STATS, + .zMove = { .effect = Z_EFFECT_RESET_STATS }, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -8392,7 +8096,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESET_STATS, + .zMove = { .effect = Z_EFFECT_RESET_STATS }, .powderMove = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -8412,7 +8116,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPATK_UP_1, + .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .magicCoatAffected = TRUE, .gravityBanned = TRUE, }, @@ -8432,7 +8136,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_ALL_BATTLERS, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPDEF_UP_1, + .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .ignoresProtect = TRUE, }, @@ -8447,7 +8151,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .damagesAirborne = TRUE, .skyBattleBanned = TRUE, }, @@ -8459,15 +8162,15 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .power = 40, #endif - .effect = EFFECT_ALWAYS_CRIT, + .effect = EFFECT_HIT, .type = TYPE_FIGHTING, .accuracy = 100, .pp = 10, .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, + .critBoost = ALWAYS_CRIT, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -8482,7 +8185,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_SLUDGE_WAVE] = @@ -8496,7 +8198,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -8511,7 +8212,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESET_STATS, + .zMove = { .effect = Z_EFFECT_RESET_STATS }, .danceMove = TRUE, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -8529,7 +8230,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .minimizeDoubleDamage = B_UPDATED_MOVE_FLAGS >= GEN_7, .skyBattleBanned = TRUE, @@ -8551,7 +8251,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_ELECTRO_BALL] = @@ -8565,7 +8264,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .ballisticMove = TRUE, }, @@ -8580,7 +8278,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPATK_UP_1, + .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .magicCoatAffected = TRUE, }, @@ -8595,7 +8293,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -8611,7 +8308,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESET_STATS, + .zMove = { .effect = Z_EFFECT_RESET_STATS }, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -8632,7 +8329,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -8648,7 +8344,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .ballisticMove = TRUE, }, @@ -8664,7 +8359,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -8679,7 +8373,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPATK_UP_1, + .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .magicCoatAffected = TRUE, }, @@ -8694,7 +8388,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPDEF_UP_1, + .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .magicCoatAffected = TRUE, }, @@ -8709,7 +8403,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPD_UP_1, + .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, @@ -8727,7 +8421,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .soundMove = TRUE, }, @@ -8743,7 +8436,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .soundMove = TRUE, }, @@ -8759,7 +8451,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .ignoresTargetDefenseEvasionStages = TRUE, }, @@ -8775,7 +8466,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_STORED_POWER] = @@ -8789,7 +8479,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_QUICK_GUARD] = @@ -8804,7 +8493,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 3, .split = SPLIT_STATUS, .argument = TRUE, // Protects the whole side. - .zMoveEffect = Z_EFFECT_DEF_UP_1, + .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -8827,7 +8516,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPD_UP_2, + .zMove = { .effect = Z_EFFECT_SPD_UP_2 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, }, @@ -8843,7 +8532,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .thawsUser = TRUE, }, @@ -8859,7 +8547,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESET_STATS, + .zMove = { .effect = Z_EFFECT_RESET_STATS }, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -8876,7 +8564,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESET_STATS, + .zMove = { .effect = Z_EFFECT_RESET_STATS }, .magicCoatAffected = TRUE, .mirrorMoveBanned = TRUE, .healBlockBanned = TRUE, @@ -8898,7 +8586,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_SKY_DROP] = @@ -8912,7 +8599,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .twoTurnMove = TRUE, .makesContact = TRUE, .gravityBanned = TRUE, @@ -8932,7 +8618,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESET_STATS, + .zMove = { .effect = Z_EFFECT_RESET_STATS }, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -8949,7 +8635,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = -6, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .copycatBanned = TRUE, .assistBanned = TRUE, @@ -8970,7 +8655,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_QUASH] = @@ -8984,7 +8668,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPD_UP_1, + .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .metronomeBanned = TRUE, }, @@ -8999,7 +8683,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -9014,7 +8697,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPATK_UP_1, + .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, }, @@ -9030,7 +8713,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -9045,7 +8727,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .mirrorMoveBanned = TRUE, .parentalBondBanned = TRUE, }, @@ -9061,7 +8742,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPD_UP_2, + .zMove = { .effect = Z_EFFECT_SPD_UP_2 }, .ignoresProtect = B_UPDATED_MOVE_FLAGS >= GEN_6, .ignoresSubstitute = TRUE, .metronomeBanned = TRUE, @@ -9080,7 +8761,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -9099,7 +8779,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .skyBattleBanned = TRUE, }, @@ -9118,7 +8797,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .skyBattleBanned = TRUE, }, @@ -9137,7 +8815,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .skyBattleBanned = TRUE, }, @@ -9152,7 +8829,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_STRUGGLE_BUG] = @@ -9170,7 +8846,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -9185,7 +8860,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .skyBattleBanned = TRUE, }, @@ -9197,15 +8871,15 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .power = 40, #endif - .effect = EFFECT_ALWAYS_CRIT, + .effect = EFFECT_HIT, .type = TYPE_ICE, .accuracy = 90, .pp = 10, .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, + .critBoost = ALWAYS_CRIT, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_DRAGON_TAIL] = @@ -9219,7 +8893,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = -6, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .copycatBanned = TRUE, .assistBanned = TRUE, @@ -9236,7 +8909,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_ATK_UP_1, + .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE @@ -9253,22 +8926,21 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, [MOVE_WILD_CHARGE] = { - .effect = EFFECT_RECOIL_25, + .effect = EFFECT_RECOIL, .power = 90, .type = TYPE_ELECTRIC, .accuracy = 100, + .recoil = 25, .pp = 15, .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -9282,10 +8954,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, + .critBoost = 1, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, - .highCritRatio = TRUE, }, [MOVE_DUAL_CHOP] = @@ -9299,7 +8970,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .strikeCount = 2, }, @@ -9315,7 +8985,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -9331,7 +9000,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .healBlockBanned = B_HEAL_BLOCKING >= GEN_6, }, @@ -9351,7 +9019,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .ignoresTargetDefenseEvasionStages = TRUE, .slicingMove = TRUE, @@ -9368,7 +9035,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, .slicingMove = TRUE, @@ -9385,7 +9051,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .minimizeDoubleDamage = B_UPDATED_MOVE_FLAGS >= GEN_6, }, @@ -9401,7 +9066,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, //.windMove = TRUE, }, @@ -9417,7 +9081,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, .minimizeDoubleDamage = TRUE, @@ -9434,7 +9097,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESET_STATS, + .zMove = { .effect = Z_EFFECT_RESET_STATS }, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -9451,7 +9114,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -9466,7 +9128,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_TAIL_SLAP] = @@ -9480,7 +9141,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -9499,7 +9159,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .windMove = TRUE, .damagesAirborne = TRUE, @@ -9507,16 +9166,16 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_HEAD_CHARGE] = { - .effect = EFFECT_RECOIL_25, + .effect = EFFECT_RECOIL, .power = 120, .type = TYPE_NORMAL, .accuracy = 100, + .recoil = 25, .pp = 15, .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -9531,7 +9190,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .strikeCount = 2, }, @@ -9547,7 +9205,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .ballisticMove = TRUE, }, @@ -9568,7 +9225,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_SPECIAL, .argument = HOLD_EFFECT_DRIVE, - .zMoveEffect = Z_EFFECT_NONE, .metronomeBanned = TRUE, }, @@ -9583,7 +9239,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, + .argument = STATUS1_SLEEP, .sheerForceBoost = TRUE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .soundMove = TRUE, @@ -9601,7 +9257,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .slicingMove = TRUE, .metronomeBanned = TRUE, }, @@ -9617,7 +9272,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -9632,7 +9286,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -9648,7 +9301,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -9663,7 +9315,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .danceMove = TRUE, }, @@ -9680,7 +9331,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_PHYSICAL, .argument = MOVE_EFFECT_PARALYSIS, - .zMoveEffect = Z_EFFECT_NONE, .twoTurnMove = TRUE, .sheerForceBoost = TRUE, .metronomeBanned = TRUE, @@ -9700,7 +9350,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_SPECIAL, .argument = MOVE_EFFECT_BURN, - .zMoveEffect = Z_EFFECT_NONE, .twoTurnMove = TRUE, .sheerForceBoost = TRUE, .metronomeBanned = TRUE, @@ -9719,7 +9368,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .soundMove = TRUE, @@ -9737,7 +9385,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -9752,7 +9399,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .metronomeBanned = TRUE, }, @@ -9768,7 +9414,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .thawsUser = TRUE, }, @@ -9783,7 +9428,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_FLYING_PRESS] = @@ -9802,7 +9446,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_PHYSICAL, .argument = TYPE_FLYING, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .minimizeDoubleDamage = TRUE, .gravityBanned = TRUE, @@ -9821,7 +9464,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .argument = TRUE, // Protects the whole side. - .zMoveEffect = Z_EFFECT_DEF_UP_1, + .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -9842,7 +9485,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .mirrorMoveBanned = TRUE, .meFirstBanned = TRUE, .metronomeBanned = TRUE, @@ -9864,7 +9506,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_ATK_UP_1, + .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .skyBattleBanned = TRUE, @@ -9881,7 +9523,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_OPPONENTS_FIELD, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPD_UP_1, + .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .magicCoatAffected = TRUE, @@ -9903,7 +9545,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -9919,7 +9560,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_PHYSICAL, .argument = MOVE_EFFECT_FEINT, - .zMoveEffect = Z_EFFECT_NONE, .twoTurnMove = TRUE, .ignoresProtect = TRUE, .makesContact = TRUE, @@ -9941,7 +9581,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .argument = TYPE_GHOST, - .zMoveEffect = Z_EFFECT_ALL_STATS_UP_1, + .zMove = { .effect = Z_EFFECT_ALL_STATS_UP_1 }, .magicCoatAffected = TRUE, }, @@ -9956,7 +9596,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_DEF_UP_1, + .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .magicCoatAffected = TRUE, .soundMove = TRUE, @@ -9973,7 +9613,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_ALL_BATTLERS, .priority = 1, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPATK_UP_1, + .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, }, @@ -9993,7 +9633,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .healBlockBanned = B_HEAL_BLOCKING >= GEN_6, }, @@ -10009,7 +9648,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .argument = TYPE_GRASS, - .zMoveEffect = Z_EFFECT_ALL_STATS_UP_1, + .zMove = { .effect = Z_EFFECT_ALL_STATS_UP_1 }, .magicCoatAffected = TRUE, }, @@ -10024,7 +9663,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .windMove = TRUE, }, @@ -10039,7 +9677,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -10054,7 +9691,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .soundMove = TRUE, }, @@ -10070,7 +9706,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESTORE_REPLACEMENT_HP, + .zMove = { .effect = Z_EFFECT_RESTORE_REPLACEMENT_HP }, .magicCoatAffected = TRUE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .soundMove = TRUE, @@ -10091,7 +9727,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_ATK_UP_1, + .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .magicCoatAffected = TRUE, }, @@ -10107,7 +9743,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_SPECIAL, .argument = 75, // restores 75% HP instead of 50% HP - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .healBlockBanned = B_HEAL_BLOCKING >= GEN_6, }, @@ -10124,7 +9759,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 3, .split = SPLIT_STATUS, .argument = TRUE, // Protects the whole side. - .zMoveEffect = Z_EFFECT_SPDEF_UP_1, + .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, @@ -10141,7 +9776,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_DEF_UP_1, + .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, }, @@ -10157,7 +9792,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_DEF_UP_1, + .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .skyBattleBanned = TRUE, @@ -10174,7 +9809,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPDEF_UP_1, + .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .skyBattleBanned = TRUE, @@ -10191,7 +9826,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPATK_UP_1, + .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, }, [MOVE_PLAY_ROUGH] = @@ -10205,7 +9840,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -10221,7 +9855,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .windMove = TRUE, }, @@ -10236,7 +9869,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -10251,7 +9883,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .soundMove = TRUE, }, @@ -10267,7 +9898,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_DEF_UP_1, + .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, }, @@ -10283,7 +9914,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 4, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESET_STATS, + .zMove = { .effect = Z_EFFECT_RESET_STATS }, .protectionMove = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -10304,7 +9935,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_DEF_UP_1, + .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, .magicCoatAffected = TRUE, @@ -10321,7 +9952,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPDEF_UP_1, + .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .ignoresProtect = TRUE, .magicCoatAffected = TRUE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, @@ -10343,7 +9974,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .metronomeBanned = TRUE, }, @@ -10359,7 +9989,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .thawsUser = TRUE, .metronomeBanned = TRUE, @@ -10376,7 +10005,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, .metronomeBanned = TRUE, @@ -10397,7 +10025,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 1, - .zMoveEffect = Z_EFFECT_NONE, }, @@ -10416,7 +10043,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -10431,7 +10057,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 4, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_DEF_UP_1, + .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .protectionMove = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -10451,7 +10077,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_ALLY, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPDEF_UP_2, + .zMove = { .effect = Z_EFFECT_SPDEF_UP_2 }, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, @@ -10468,7 +10094,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPDEF_UP_1, + .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .magicCoatAffected = TRUE, }, @@ -10483,7 +10109,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_DEF_UP_1, + .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = TRUE, }, @@ -10498,7 +10124,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 1, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPDEF_UP_2, + .zMove = { .effect = Z_EFFECT_SPDEF_UP_2 }, .powderMove = TRUE, .magicCoatAffected = TRUE, }, @@ -10514,7 +10140,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_ALL_STATS_UP_1, + .zMove = { .effect = Z_EFFECT_ALL_STATS_UP_1 }, .twoTurnMove = TRUE, .sleepTalkBanned = TRUE, .instructBanned = TRUE, @@ -10532,7 +10158,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPDEF_UP_1, + .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .snatchAffected = TRUE, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, @@ -10550,7 +10176,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_ALL_STATS_UP_1, + .zMove = { .effect = Z_EFFECT_ALL_STATS_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, }, @@ -10566,7 +10192,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPD_UP_1, + .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .skyBattleBanned = TRUE, @@ -10583,7 +10209,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_CELEBRATE] = @@ -10597,7 +10222,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_ALL_STATS_UP_1, + .zMove = { .effect = Z_EFFECT_ALL_STATS_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, @@ -10619,7 +10244,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_ALLY, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_ALL_STATS_UP_1, + .zMove = { .effect = Z_EFFECT_ALL_STATS_UP_1 }, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, .metronomeBanned = TRUE, @@ -10641,7 +10266,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 1, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_DEF_UP_1, + .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = TRUE, }, @@ -10656,7 +10281,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -10672,7 +10296,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -10687,7 +10310,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -10702,7 +10324,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .punchingMove = TRUE, .sheerForceBoost = TRUE, @@ -10720,7 +10341,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_SPECIAL, .argument = 75, // restores 75% HP instead of 50% HP - .zMoveEffect = Z_EFFECT_NONE, .healBlockBanned = B_HEAL_BLOCKING >= GEN_6, }, @@ -10735,7 +10355,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .damagesAirborne = TRUE, .ignoreTypeIfFlyingAndUngrounded = TRUE, .metronomeBanned = TRUE, @@ -10753,7 +10372,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .metronomeBanned = TRUE, .skyBattleBanned = TRUE, }, @@ -10769,22 +10387,21 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .skyBattleBanned = TRUE, }, [MOVE_LIGHT_OF_RUIN] = { - .effect = EFFECT_RECOIL_50, + .effect = EFFECT_RECOIL, .power = 140, .type = TYPE_FAIRY, .accuracy = 90, + .recoil = 50, .pp = 5, .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .metronomeBanned = TRUE, }, @@ -10799,7 +10416,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .pulseMove = TRUE, .metronomeBanned = TRUE, }, @@ -10815,7 +10431,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .metronomeBanned = TRUE, }, @@ -10830,7 +10445,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .metronomeBanned = TRUE, }, @@ -10866,7 +10480,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESET_STATS, + .zMove = { .effect = Z_EFFECT_RESET_STATS }, .healBlockBanned = TRUE, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -10884,7 +10498,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 2, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -10899,7 +10512,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 4, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_DEF_UP_1, + .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .protectionMove = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -10919,7 +10532,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -10934,7 +10546,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .ignoresTargetDefenseEvasionStages = TRUE, }, @@ -10951,7 +10562,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_SPECIAL, .argument = STATUS1_BURN, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .soundMove = TRUE, @@ -10968,7 +10578,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .punchingMove = TRUE, }, @@ -10984,7 +10593,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESET_STATS, + .zMove = { .effect = Z_EFFECT_RESET_STATS }, .argument = MOVE_EFFECT_FLORAL_HEALING, .mirrorMoveBanned = TRUE, .healBlockBanned = TRUE, @@ -11002,7 +10611,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -11017,7 +10625,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_DEF_UP_1, + .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = TRUE, .healBlockBanned = B_HEAL_BLOCKING >= GEN_6, }, @@ -11033,7 +10641,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .twoTurnMove = TRUE, .makesContact = TRUE, .slicingMove = TRUE, @@ -11052,7 +10659,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_SPOTLIGHT] = @@ -11066,7 +10672,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 3, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPDEF_UP_1, + .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .magicCoatAffected = TRUE, .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, @@ -11085,7 +10691,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPD_UP_1, + .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .magicCoatAffected = TRUE, }, @@ -11100,7 +10706,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_ATK_UP_1, + .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -11117,7 +10723,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPATK_UP_1, + .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .snatchAffected = TRUE, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, @@ -11135,7 +10741,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -11151,7 +10756,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .ballisticMove = TRUE, }, @@ -11166,7 +10770,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -11182,7 +10785,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPATK_UP_1, + .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, }, @@ -11198,7 +10801,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -11214,7 +10816,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -11230,7 +10831,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -11245,7 +10845,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .thawsUser = TRUE, }, @@ -11260,7 +10859,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPD_UP_1, + .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresSubstitute = TRUE, }, @@ -11275,7 +10874,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -11290,7 +10888,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_ALL_STATS_UP_1, + .zMove = { .effect = Z_EFFECT_ALL_STATS_UP_1 }, .mirrorMoveBanned = TRUE, .healBlockBanned = TRUE, .magicCoatAffected = TRUE, @@ -11307,7 +10905,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .danceMove = TRUE, }, @@ -11322,7 +10919,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, + .zMove = { .powerOverride = 140 }, }, [MOVE_TROP_KICK] = @@ -11336,7 +10933,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -11352,7 +10948,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPATK_UP_1, + .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, @@ -11370,7 +10966,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = -3, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .mirrorMoveBanned = TRUE, .ballisticMove = TRUE, .meFirstBanned = TRUE, @@ -11392,7 +10987,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .soundMove = TRUE, }, @@ -11408,7 +11002,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -11423,7 +11016,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -11438,7 +11030,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPD_UP_1, + .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -11455,7 +11047,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = -3, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .mirrorMoveBanned = TRUE, .meFirstBanned = TRUE, .metronomeBanned = TRUE, @@ -11476,7 +11067,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .metronomeBanned = TRUE, }, @@ -11491,7 +11081,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .bitingMove = TRUE, }, @@ -11507,7 +11096,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .skyBattleBanned = B_EXTRAPOLATED_MOVE_FLAGS, }, @@ -11523,7 +11111,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -11538,7 +11125,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 1, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -11553,7 +11139,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -11569,7 +11154,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_SPECTRAL_THIEF] = @@ -11583,7 +11167,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .ignoresSubstitute = TRUE, .makesContact = TRUE, .metronomeBanned = TRUE, @@ -11600,7 +11183,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .ignoresTargetAbility = TRUE, .metronomeBanned = B_UPDATED_MOVE_FLAGS >= GEN_8, @@ -11617,7 +11199,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .ignoresTargetAbility = TRUE, .metronomeBanned = B_UPDATED_MOVE_FLAGS >= GEN_8, }, @@ -11633,7 +11214,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_DEF_UP_1, + .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresProtect = TRUE, .magicCoatAffected = TRUE, }, @@ -11649,7 +11230,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -11664,7 +11244,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .metronomeBanned = B_UPDATED_MOVE_FLAGS >= GEN_8, }, @@ -11684,7 +11263,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_PHYSICAL, .argument = HOLD_EFFECT_MEMORY, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -11699,7 +11277,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .metronomeBanned = TRUE, }, @@ -11714,7 +11291,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .punchingMove = TRUE, .metronomeBanned = TRUE, @@ -11731,7 +11307,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .ignoresTargetAbility = TRUE, .metronomeBanned = TRUE, }, @@ -11744,7 +11319,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .pp = 10, .sheerForceBoost = TRUE, #else - .effect = EFFECT_ALWAYS_CRIT, .power = 50, .pp = 15, #endif @@ -11753,8 +11327,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 2, + .critBoost = ALWAYS_CRIT, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_8, .metronomeBanned = TRUE, @@ -11771,7 +11345,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_8, .metronomeBanned = TRUE, @@ -11788,7 +11361,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_8, @@ -11807,7 +11379,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_8, .metronomeBanned = TRUE, }, @@ -11829,7 +11400,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_8, .metronomeBanned = TRUE, .healBlockBanned = B_HEAL_BLOCKING >= GEN_6, @@ -11851,7 +11421,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_8, .metronomeBanned = TRUE, }, @@ -11872,7 +11441,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_8, .thawsUser = TRUE, @@ -11895,7 +11463,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_8, .metronomeBanned = TRUE, }, @@ -11916,7 +11483,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_8, .metronomeBanned = TRUE, }, @@ -11938,7 +11504,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_8, .magicCoatAffected = TRUE, .metronomeBanned = TRUE, @@ -11961,7 +11526,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_8, .metronomeBanned = TRUE, }, @@ -11983,7 +11547,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_8, .metronomeBanned = TRUE, }, @@ -11999,7 +11562,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_8, .metronomeBanned = TRUE, @@ -12016,7 +11578,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .punchingMove = TRUE, .sheerForceBoost = TRUE, @@ -12036,7 +11597,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, .copycatBanned = TRUE, @@ -12058,9 +11618,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, + .critBoost = 1, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, - .highCritRatio = TRUE, }, [MOVE_JAW_LOCK] = @@ -12074,7 +11633,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .bitingMove = TRUE, }, @@ -12090,7 +11648,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_NONE, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -12107,7 +11664,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_NONE, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -12124,7 +11680,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_NONE, .magicCoatAffected = TRUE, }, @@ -12140,7 +11695,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_STATUS, .argument = TYPE_PSYCHIC, - .zMoveEffect = Z_EFFECT_NONE, .magicCoatAffected = TRUE, .powderMove = TRUE, }, @@ -12156,7 +11710,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .strikeCount = 2, .parentalBondBanned = TRUE, }, @@ -12172,7 +11725,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_NONE, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, @@ -12189,7 +11741,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_BOLT_BEAK] = @@ -12203,7 +11754,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -12218,7 +11768,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .bitingMove = TRUE, }, @@ -12234,7 +11783,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_NONE, .ignoresProtect = TRUE, }, @@ -12249,7 +11797,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_NONE, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -12269,7 +11816,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .metronomeBanned = TRUE, .skyBattleBanned = B_EXTRAPOLATED_MOVE_FLAGS, @@ -12286,7 +11832,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_NONE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, @@ -12303,7 +11848,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .metronomeBanned = TRUE, }, @@ -12319,7 +11863,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .metronomeBanned = TRUE, .skyBattleBanned = B_EXTRAPOLATED_MOVE_FLAGS, @@ -12336,7 +11879,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .thawsUser = TRUE, .ballisticMove = TRUE, @@ -12354,7 +11896,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .slicingMove = TRUE, .metronomeBanned = TRUE, @@ -12374,7 +11915,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .metronomeBanned = TRUE, .copycatBanned = TRUE, @@ -12393,7 +11933,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .metronomeBanned = TRUE, }, @@ -12408,7 +11947,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, .metronomeBanned = TRUE, @@ -12425,7 +11963,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .metronomeBanned = TRUE, }, @@ -12441,7 +11978,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .soundMove = TRUE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .metronomeBanned = TRUE, @@ -12458,7 +11994,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .metronomeBanned = TRUE, }, @@ -12474,7 +12009,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .metronomeBanned = TRUE, }, @@ -12490,7 +12024,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, .metronomeBanned = TRUE, @@ -12507,7 +12040,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .metronomeBanned = TRUE, }, @@ -12523,7 +12055,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_NONE, .snatchAffected = TRUE, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, @@ -12543,7 +12074,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 4, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_NONE, .protectionMove = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -12562,7 +12092,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .metronomeBanned = TRUE, }, @@ -12578,7 +12107,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .metronomeBanned = TRUE, .instructBanned = TRUE, }, @@ -12594,7 +12122,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .metronomeBanned = TRUE, }, @@ -12609,7 +12136,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .metronomeBanned = TRUE, }, @@ -12624,7 +12150,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_STEEL_ROLLER] = @@ -12638,7 +12163,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .argument = ARG_TRY_REMOVE_TERRAIN_FAIL, // Remove a field terrain if there is one and hit, otherwise fail. .skyBattleBanned = TRUE, @@ -12655,7 +12179,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .argument = MOVE_EFFECT_SCALE_SHOT, }, @@ -12670,7 +12193,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .twoTurnMove = TRUE, .instructBanned = TRUE, }, @@ -12686,7 +12208,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -12701,7 +12222,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_GRASSY_GLIDE] = @@ -12719,7 +12239,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .skyBattleBanned = B_EXTRAPOLATED_MOVE_FLAGS, }, @@ -12735,7 +12254,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_TERRAIN_PULSE] = @@ -12749,7 +12267,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .pulseMove = TRUE, }, @@ -12764,7 +12281,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -12780,7 +12296,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -12795,7 +12310,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -12810,7 +12324,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_CORROSIVE_GAS] = @@ -12824,7 +12337,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_NONE, .magicCoatAffected = TRUE, }, @@ -12839,7 +12351,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_ALLY, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_NONE, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, @@ -12856,7 +12367,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, }, @@ -12871,7 +12381,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .strikeCount = 3, }, @@ -12887,7 +12396,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .strikeCount = 2, }, @@ -12903,7 +12411,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .thawsUser = TRUE, }, @@ -12919,7 +12426,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_NONE, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, @@ -12934,15 +12440,15 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .power = 80, #endif - .effect = EFFECT_ALWAYS_CRIT, + .effect = EFFECT_HIT, .type = TYPE_DARK, .accuracy = 100, .pp = 5, .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, + .critBoost = ALWAYS_CRIT, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .punchingMove = TRUE, .metronomeBanned = TRUE, @@ -12950,16 +12456,16 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_SURGING_STRIKES] = { - .effect = EFFECT_ALWAYS_CRIT, + .effect = EFFECT_HIT, .power = 25, .type = TYPE_WATER, .accuracy = 100, .pp = 5, + .critBoost = ALWAYS_CRIT, .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .punchingMove = TRUE, .strikeCount = 3, @@ -12977,7 +12483,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .metronomeBanned = TRUE, }, @@ -12992,7 +12497,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .metronomeBanned = TRUE, }, @@ -13011,7 +12515,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .metronomeBanned = TRUE, }, @@ -13027,7 +12530,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .metronomeBanned = TRUE, }, @@ -13042,7 +12544,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, .metronomeBanned = TRUE, @@ -13063,7 +12564,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .metronomeBanned = TRUE, }, @@ -13078,7 +12578,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .metronomeBanned = TRUE, }, @@ -13093,7 +12592,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .soundMove = TRUE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, @@ -13114,7 +12612,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -13130,7 +12627,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -13146,7 +12642,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_NONE, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -13164,7 +12659,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .argument = MOVE_EFFECT_STEALTH_ROCK, .sheerForceBoost = TRUE, @@ -13186,7 +12680,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .windMove = TRUE, .metronomeBanned = TRUE, @@ -13203,7 +12696,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -13222,7 +12714,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_RANDOM, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .metronomeBanned = TRUE, }, @@ -13233,15 +12724,15 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = #else .power = 75, #endif - .effect = EFFECT_RECOIL_33, + .effect = EFFECT_RECOIL, .type = TYPE_WATER, .accuracy = 100, + .recoil = 33, .pp = 10, .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .skyBattleBanned = B_EXTRAPOLATED_MOVE_FLAGS, }, @@ -13261,7 +12752,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_MOUNTAIN_GALE] = @@ -13275,7 +12765,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -13290,7 +12779,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_NONE, .danceMove = TRUE, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -13312,7 +12800,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .punchingMove = TRUE, }, @@ -13332,7 +12819,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -13351,9 +12837,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, + .critBoost = 1, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, - .highCritRatio = TRUE, .sheerForceBoost = TRUE, }, @@ -13372,7 +12857,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -13387,7 +12871,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_NONE, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -13405,12 +12888,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .effect = EFFECT_TRIPLE_ARROWS, .type = TYPE_FIGHTING, .accuracy = 100, + .critBoost = 1, .secondaryEffectChance = 100, // 50% Defense down, 30% Flinch. Can be modified in 'SetMoveEffect' .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, - .highCritRatio = TRUE, .sheerForceBoost = TRUE, }, @@ -13425,7 +12907,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -13440,7 +12921,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .argument = MOVE_EFFECT_SPIKES, .sheerForceBoost = TRUE, @@ -13463,7 +12943,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .windMove = TRUE, }, @@ -13484,7 +12963,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .windMove = TRUE, }, @@ -13505,7 +12983,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .windMove = TRUE, }, @@ -13521,7 +12998,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_NONE, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -13539,7 +13015,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_NONE, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -13556,7 +13031,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .metronomeBanned = TRUE, // Only since it isn't implemented yet .forcePressure = TRUE, }, @@ -13572,7 +13046,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 4, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_NONE, .protectionMove = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -13590,7 +13063,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -13606,7 +13078,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .metronomeBanned = TRUE, // Only since it isn't implemented yet }, @@ -13621,7 +13092,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, }, @@ -13636,7 +13106,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, @@ -13653,7 +13122,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 1, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .punchingMove = TRUE, .sheerForceBoost = TRUE, @@ -13671,7 +13139,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_NONE, .magicCoatAffected = TRUE, .metronomeBanned = TRUE, }, @@ -13687,7 +13154,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .skyBattleBanned = B_EXTRAPOLATED_MOVE_FLAGS, }, @@ -13703,7 +13169,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .slicingMove = TRUE, .metronomeBanned = TRUE, @@ -13721,7 +13186,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .argument = ARG_TRY_REMOVE_TERRAIN_HIT, // Remove the active field terrain if there is one. .skyBattleBanned = B_EXTRAPOLATED_MOVE_FLAGS, @@ -13738,7 +13202,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .metronomeBanned = TRUE, // Only since it isn't implemented yet }, @@ -13754,7 +13217,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_NONE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, @@ -13771,7 +13233,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .metronomeBanned = TRUE, }, @@ -13787,7 +13248,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .strikeCount = 3, }, @@ -13803,7 +13263,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .makesContact = TRUE, }, @@ -13819,7 +13278,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_NONE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, @@ -13836,7 +13294,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RECOVER_HP, + .zMove = { .effect = Z_EFFECT_RECOVER_HP }, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -13854,14 +13312,13 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .slicingMove = TRUE, }, [MOVE_FLOWER_TRICK] = { - .effect = EFFECT_ALWAYS_CRIT, + .effect = EFFECT_HIT, .power = 70, .type = TYPE_GRASS, .accuracy = 0, @@ -13869,8 +13326,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, + .critBoost = ALWAYS_CRIT, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, }, [MOVE_TORCH_SONG] = @@ -13884,7 +13341,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .soundMove = TRUE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, @@ -13901,7 +13357,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .sheerForceBoost = TRUE, .danceMove = TRUE, @@ -13918,7 +13373,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .metronomeBanned = TRUE, }, @@ -13934,7 +13388,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .metronomeBanned = TRUE, }, @@ -13949,7 +13402,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .metronomeBanned = TRUE, }, @@ -13964,7 +13416,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .metronomeBanned = TRUE, }, @@ -13980,7 +13431,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .metronomeBanned = TRUE, }, @@ -13996,7 +13446,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_RESET_STATS, + .zMove = { .effect = Z_EFFECT_RESET_STATS }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, @@ -14013,7 +13463,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPD_UP_1, + .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, @@ -14030,7 +13480,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_NONE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, @@ -14047,7 +13496,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = Z_EFFECT_SPD_UP_1, + .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, @@ -14064,7 +13513,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .metronomeBanned = TRUE, }, @@ -14080,7 +13528,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .metronomeBanned = TRUE, }, @@ -14096,7 +13543,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .metronomeBanned = TRUE, }, @@ -14111,7 +13557,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .ignoresProtect = TRUE, .metronomeBanned = TRUE, @@ -14128,7 +13573,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .strikeCount = 2, .metronomeBanned = TRUE, }, @@ -14144,7 +13588,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .punchingMove = TRUE, .metronomeBanned = TRUE, @@ -14161,7 +13604,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .metronomeBanned = TRUE, }, @@ -14176,7 +13618,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .slicingMove = TRUE, .healBlockBanned = B_EXTRAPOLATED_MOVE_FLAGS, @@ -14193,7 +13634,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .metronomeBanned = TRUE, }, @@ -14209,7 +13649,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .cantUseTwice = TRUE, }, @@ -14224,7 +13663,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_DEPENDS, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .meFirstBanned = TRUE, .metronomeBanned = TRUE, @@ -14240,10 +13678,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, + .critBoost = 1, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .slicingMove = TRUE, - .highCritRatio = TRUE, }, [MOVE_BLAZING_TORQUE] = @@ -14257,7 +13694,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .mirrorMoveBanned = TRUE, .meFirstBanned = TRUE, @@ -14281,7 +13717,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .mirrorMoveBanned = TRUE, .meFirstBanned = TRUE, @@ -14305,7 +13740,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .mirrorMoveBanned = TRUE, .meFirstBanned = TRUE, @@ -14329,7 +13763,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .mirrorMoveBanned = TRUE, .meFirstBanned = TRUE, @@ -14353,7 +13786,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .sheerForceBoost = TRUE, .mirrorMoveBanned = TRUE, .meFirstBanned = TRUE, @@ -14377,7 +13809,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = Z_EFFECT_NONE, .makesContact = TRUE, .slicingMove = TRUE, }, @@ -14393,7 +13824,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .thawsUser = TRUE, }, @@ -14408,7 +13838,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .cantUseTwice = TRUE, }, @@ -14423,7 +13852,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .thawsUser = TRUE, .metronomeBanned = TRUE, .healBlockBanned = B_EXTRAPOLATED_MOVE_FLAGS, @@ -14440,7 +13868,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = Z_EFFECT_NONE, .ballisticMove = TRUE, .metronomeBanned = TRUE, }, @@ -14456,9 +13883,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, + .critBoost = 1, .argument = HOLD_EFFECT_MASK, - .zMoveEffect = Z_EFFECT_NONE, - .highCritRatio = TRUE, .metronomeBanned = TRUE, }, @@ -14474,7 +13900,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, //determined from move type - .zMoveEffect = 0, }, [MOVE_ALL_OUT_PUMMELING] = { @@ -14487,7 +13912,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = 0, }, [MOVE_SUPERSONIC_SKYSTRIKE] = { @@ -14500,7 +13924,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = 0, }, [MOVE_ACID_DOWNPOUR] = { @@ -14513,7 +13936,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = 0, }, [MOVE_TECTONIC_RAGE] = { @@ -14526,7 +13948,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = 0, .skyBattleBanned = B_EXTRAPOLATED_MOVE_FLAGS, }, [MOVE_CONTINENTAL_CRUSH] = @@ -14540,7 +13961,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = 0, }, [MOVE_SAVAGE_SPIN_OUT] = { @@ -14553,7 +13973,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = 0, }, [MOVE_NEVER_ENDING_NIGHTMARE] = { @@ -14566,7 +13985,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = 0, }, [MOVE_CORKSCREW_CRASH] = { @@ -14579,7 +13997,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = 0, }, [MOVE_INFERNO_OVERDRIVE] = { @@ -14592,7 +14009,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = 0, }, [MOVE_HYDRO_VORTEX] = { @@ -14605,7 +14021,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = 0, }, [MOVE_BLOOM_DOOM] = { @@ -14618,7 +14033,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = 0, }, [MOVE_GIGAVOLT_HAVOC] = { @@ -14631,7 +14045,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = 0, }, [MOVE_SHATTERED_PSYCHE] = { @@ -14644,7 +14057,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = 0, }, [MOVE_SUBZERO_SLAMMER] = { @@ -14657,7 +14069,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = 0, }, [MOVE_DEVASTATING_DRAKE] = { @@ -14670,7 +14081,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = 0, }, [MOVE_BLACK_HOLE_ECLIPSE] = { @@ -14683,7 +14093,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = 0, }, [MOVE_TWINKLE_TACKLE] = { @@ -14696,7 +14105,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = 0, }, [MOVE_CATASTROPIKA] = { @@ -14709,7 +14117,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = 0, }, [MOVE_10000000_VOLT_THUNDERBOLT] = { @@ -14721,9 +14128,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, + .critBoost = 2, .split = SPLIT_SPECIAL, - .zMoveEffect = 0, - .highCritRatio = TRUE, }, [MOVE_STOKED_SPARKSURFER] = { @@ -14736,7 +14142,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = 0, }, [MOVE_EXTREME_EVOBOOST] = { @@ -14749,7 +14154,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_USER, .priority = 0, .split = SPLIT_STATUS, - .zMoveEffect = 0, }, [MOVE_PULVERIZING_PANCAKE] = { @@ -14762,7 +14166,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = 0, }, [MOVE_GENESIS_SUPERNOVA] = { @@ -14776,7 +14179,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_SPECIAL, .argument = ARG_SET_PSYCHIC_TERRAIN, // Set Psychic Terrain. If there's a different field terrain active, overwrite it. - .zMoveEffect = 0, }, [MOVE_SINISTER_ARROW_RAID] = { @@ -14789,7 +14191,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = 0, }, [MOVE_MALICIOUS_MOONSAULT] = { @@ -14802,7 +14203,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = 0, }, [MOVE_OCEANIC_OPERETTA] = { @@ -14815,7 +14215,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = 0, }, [MOVE_SPLINTERED_STORMSHARDS] = { @@ -14829,7 +14228,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .priority = 0, .split = SPLIT_PHYSICAL, .argument = ARG_TRY_REMOVE_TERRAIN_HIT, // Remove the active field terrain if there is one. - .zMoveEffect = 0, }, [MOVE_LETS_SNUGGLE_FOREVER] = { @@ -14842,7 +14240,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = 0, }, [MOVE_CLANGOROUS_SOULBLAZE] = { @@ -14855,7 +14252,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = 0, .soundMove = TRUE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, }, @@ -14870,7 +14266,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = 0, }, [MOVE_SEARING_SUNRAZE_SMASH] = { @@ -14883,7 +14278,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = 0, }, [MOVE_MENACING_MOONRAZE_MAELSTROM] = { @@ -14896,7 +14290,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = 0, }, [MOVE_LIGHT_THAT_BURNS_THE_SKY] = { @@ -14909,7 +14302,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_SPECIAL, - .zMoveEffect = 0, }, [MOVE_SOUL_STEALING_7_STAR_STRIKE] = { @@ -14922,7 +14314,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .split = SPLIT_PHYSICAL, - .zMoveEffect = 0, }, [MOVE_MAX_GUARD] = diff --git a/test/battle/ability/sheer_force.c b/test/battle/ability/sheer_force.c index fba494cd4d..f98b292b89 100644 --- a/test/battle/ability/sheer_force.c +++ b/test/battle/ability/sheer_force.c @@ -40,7 +40,7 @@ SINGLE_BATTLE_TEST("Sheer Force boosts power, but removes secondary effects of m MESSAGE("Wobbuffet flinched!"); } // Volt Tackle/Flare Blitz edge case: recoil happens, but target isn't statused - if (gBattleMoves[move].effect == EFFECT_RECOIL_33_STATUS) + if (gBattleMoves[move].effect == EFFECT_RECOIL) { HP_BAR(player); MESSAGE("Tauros is hit with recoil!"); diff --git a/test/battle/crit_chance.c b/test/battle/crit_chance.c index 678153a6c6..aa2dd9278c 100644 --- a/test/battle/crit_chance.c +++ b/test/battle/crit_chance.c @@ -148,11 +148,11 @@ SINGLE_BATTLE_TEST("Focus Energy increases the user's critical hit ratio by two } } -SINGLE_BATTLE_TEST("Flag highCritRatio increases the critical hit ratio by one stage") +SINGLE_BATTLE_TEST("High crit rate increases the critical hit ratio by one stage") { PASSES_RANDOMLY(1, 8, RNG_CRITICAL_HIT); GIVEN { - ASSUME(gBattleMoves[MOVE_SLASH].highCritRatio == TRUE); + ASSUME(gBattleMoves[MOVE_SLASH].critBoost == 1); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -192,10 +192,10 @@ SINGLE_BATTLE_TEST("Scope Lens increases the critical hit ratio by one stage") } } -SINGLE_BATTLE_TEST("Flag highCritRatio, Super Luck and Scope Lens cause the move to result in a critical hit") +SINGLE_BATTLE_TEST("High crit rate, Super Luck and Scope Lens cause the move to result in a critical hit") { GIVEN { - ASSUME(gBattleMoves[MOVE_SLASH].highCritRatio == TRUE); + ASSUME(gBattleMoves[MOVE_SLASH].critBoost == 1); ASSUME(gItems[ITEM_SCOPE_LENS].holdEffect == HOLD_EFFECT_SCOPE_LENS); PLAYER(SPECIES_WOBBUFFET) { Ability(ABILITY_SUPER_LUCK); Item(ITEM_SCOPE_LENS); }; OPPONENT(SPECIES_WOBBUFFET); diff --git a/test/battle/hold_effect/critical_hit_up.c b/test/battle/hold_effect/critical_hit_up.c index c0cc2e864f..9435c46457 100644 --- a/test/battle/hold_effect/critical_hit_up.c +++ b/test/battle/hold_effect/critical_hit_up.c @@ -51,7 +51,7 @@ SINGLE_BATTLE_TEST("Lansat Berry raises the holder's critical-hit-ratio by two s { PASSES_RANDOMLY(1, 2, RNG_CRITICAL_HIT); GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].highCritRatio == FALSE); + ASSUME(gBattleMoves[MOVE_TACKLE].critBoost == 0); ASSUME(B_CRIT_CHANCE >= GEN_6); PLAYER(SPECIES_WOBBUFFET) { MaxHP(160); HP(80); Item(ITEM_LANSAT_BERRY); } OPPONENT(SPECIES_WOBBUFFET); diff --git a/test/battle/move.c b/test/battle/move.c index 03ed84f53c..7174df23ef 100644 --- a/test/battle/move.c +++ b/test/battle/move.c @@ -99,7 +99,7 @@ SINGLE_BATTLE_TEST("Critical hits occur at a 1/24 rate") SINGLE_BATTLE_TEST("Slash's critical hits occur at a 1/8 rate") { ASSUME(B_CRIT_CHANCE >= GEN_7); - ASSUME(gBattleMoves[MOVE_SLASH].highCritRatio); + ASSUME(gBattleMoves[MOVE_SLASH].critBoost == 1); PASSES_RANDOMLY(1, 8, RNG_CRITICAL_HIT); GIVEN { PLAYER(SPECIES_WOBBUFFET); diff --git a/test/battle/move_effect/protect.c b/test/battle/move_effect/protect.c index c187d6d573..69e2ed3489 100644 --- a/test/battle/move_effect/protect.c +++ b/test/battle/move_effect/protect.c @@ -206,10 +206,10 @@ SINGLE_BATTLE_TEST("Recoil damage is not applied if target was protected") GIVEN { - ASSUME(gBattleMoves[MOVE_VOLT_TACKLE].effect == EFFECT_RECOIL_33_STATUS); - ASSUME(gBattleMoves[MOVE_HEAD_SMASH].effect == EFFECT_RECOIL_50); - ASSUME(gBattleMoves[MOVE_TAKE_DOWN].effect == EFFECT_RECOIL_25); - ASSUME(gBattleMoves[MOVE_DOUBLE_EDGE].effect == EFFECT_RECOIL_33); + ASSUME(gBattleMoves[MOVE_VOLT_TACKLE].effect == EFFECT_RECOIL); + ASSUME(gBattleMoves[MOVE_HEAD_SMASH].effect == EFFECT_RECOIL); + ASSUME(gBattleMoves[MOVE_TAKE_DOWN].effect == EFFECT_RECOIL); + ASSUME(gBattleMoves[MOVE_DOUBLE_EDGE].effect == EFFECT_RECOIL); PLAYER(SPECIES_RAPIDASH); OPPONENT(SPECIES_BEAUTIFLY); } WHEN { diff --git a/test/battle/move_effect/recoil.c b/test/battle/move_effect/recoil.c new file mode 100644 index 0000000000..5d42451021 --- /dev/null +++ b/test/battle/move_effect/recoil.c @@ -0,0 +1,89 @@ +#include "global.h" +#include "test/battle.h" + +SINGLE_BATTLE_TEST("Take Down deals 25% of recoil damage to the user") +{ + s16 directDamage; + s16 recoilDamage; + + GIVEN { + ASSUME(gBattleMoves[MOVE_TAKE_DOWN].effect == EFFECT_RECOIL); + ASSUME(gBattleMoves[MOVE_TAKE_DOWN].recoil == 25); + PLAYER(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(player, MOVE_TAKE_DOWN); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_TAKE_DOWN, player); + HP_BAR(opponent, captureDamage: &directDamage); + HP_BAR(player, captureDamage: &recoilDamage); + } THEN { + EXPECT_MUL_EQ(directDamage, UQ_4_12(0.25), recoilDamage); + } +} + +SINGLE_BATTLE_TEST("Double Edge deals 33% of recoil damage to the user") +{ + s16 directDamage; + s16 recoilDamage; + + GIVEN { + ASSUME(gBattleMoves[MOVE_DOUBLE_EDGE].effect == EFFECT_RECOIL); + ASSUME(gBattleMoves[MOVE_DOUBLE_EDGE].recoil == 33); + PLAYER(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(player, MOVE_DOUBLE_EDGE); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_DOUBLE_EDGE, player); + HP_BAR(opponent, captureDamage: &directDamage); + HP_BAR(player, captureDamage: &recoilDamage); + } THEN { + EXPECT_MUL_EQ(directDamage, UQ_4_12(0.33), recoilDamage); + } +} + +SINGLE_BATTLE_TEST("Head Smash deals 50% of recoil damage to the user") +{ + s16 directDamage; + s16 recoilDamage; + + GIVEN { + ASSUME(gBattleMoves[MOVE_HEAD_SMASH].effect == EFFECT_RECOIL); + ASSUME(gBattleMoves[MOVE_HEAD_SMASH].recoil == 50); + PLAYER(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(player, MOVE_HEAD_SMASH); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_HEAD_SMASH, player); + HP_BAR(opponent, captureDamage: &directDamage); + HP_BAR(player, captureDamage: &recoilDamage); + } THEN { + EXPECT_MUL_EQ(directDamage, UQ_4_12(0.50), recoilDamage); + } +} + +SINGLE_BATTLE_TEST("Flare Blitz deals 33% of recoil damage to the user and can burn target") +{ + s16 directDamage; + s16 recoilDamage; + + GIVEN { + ASSUME(gBattleMoves[MOVE_FLARE_BLITZ].effect == EFFECT_RECOIL); + ASSUME(gBattleMoves[MOVE_FLARE_BLITZ].recoil == 33); + ASSUME(gBattleMoves[MOVE_FLARE_BLITZ].argument == STATUS1_BURN); + PLAYER(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WOBBUFFET); + } WHEN { + TURN { MOVE(player, MOVE_FLARE_BLITZ); } + } SCENE { + ANIMATION(ANIM_TYPE_MOVE, MOVE_FLARE_BLITZ, player); + HP_BAR(opponent, captureDamage: &directDamage); + ANIMATION(ANIM_TYPE_STATUS, B_ANIM_STATUS_BRN, opponent); + STATUS_ICON(opponent, burn: TRUE); + HP_BAR(player, captureDamage: &recoilDamage); + } THEN { + EXPECT_MUL_EQ(directDamage, UQ_4_12(0.33), recoilDamage); + } +} diff --git a/test/battle/move_effect/triple_arrows.c b/test/battle/move_effect/triple_arrows.c index eb8e1c666f..5778b593d4 100644 --- a/test/battle/move_effect/triple_arrows.c +++ b/test/battle/move_effect/triple_arrows.c @@ -46,7 +46,7 @@ SINGLE_BATTLE_TEST("Triple Arrows makes the foe flinch 30% of the time") SINGLE_BATTLE_TEST("Triple Arrows lands a critical hit") { ASSUME(B_CRIT_CHANCE >= GEN_7); - ASSUME(gBattleMoves[MOVE_TRIPLE_ARROWS].highCritRatio == TRUE); + ASSUME(gBattleMoves[MOVE_TRIPLE_ARROWS].critBoost == 1); PASSES_RANDOMLY(1, 8, RNG_CRITICAL_HIT); GIVEN { PLAYER(SPECIES_WOBBUFFET); diff --git a/test/battle/move_flags/strike_count.c b/test/battle/move_flags/strike_count.c index d134e58c80..b00864bcca 100644 --- a/test/battle/move_flags/strike_count.c +++ b/test/battle/move_flags/strike_count.c @@ -50,6 +50,7 @@ SINGLE_BATTLE_TEST("Surging Strikes hits 3 times with each hit being a critical GIVEN { ASSUME(gBattleMoves[MOVE_SURGING_STRIKES].strikeCount == 3); + ASSUME(gBattleMoves[MOVE_SURGING_STRIKES].critBoost == ALWAYS_CRIT); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN {