Removed unused move effects, various ids, and one script command

This commit is contained in:
Nephrite 2023-12-30 20:35:48 +09:00
parent e34373effc
commit ff51eb2b6c
5 changed files with 416 additions and 475 deletions

View File

@ -772,7 +772,7 @@
.byte 0x8b
.endm
.macro confuseifrepeatingattackends
.macro unused0x8C
.byte 0x8c
.endm

View File

@ -45,7 +45,6 @@ gBattleScriptsForMoveEffects::
.4byte BattleScript_EffectEvasionDown @ EFFECT_EVASION_DOWN
.4byte BattleScript_EffectHaze @ EFFECT_HAZE
.4byte BattleScript_EffectBide @ EFFECT_BIDE
.4byte BattleScript_EffectHit @ EFFECT_UNUSED_23
.4byte BattleScript_EffectRoar @ EFFECT_ROAR
.4byte BattleScript_EffectHit @ EFFECT_MULTI_HIT
.4byte BattleScript_EffectConversion @ EFFECT_CONVERSION
@ -57,12 +56,10 @@ gBattleScriptsForMoveEffects::
.4byte BattleScript_EffectHit @ EFFECT_FUSION_COMBO
.4byte BattleScript_EffectSuperFang @ EFFECT_SUPER_FANG
.4byte BattleScript_EffectArgFixedDamage @ EFFECT_ARG_FIXED_DAMAGE
.4byte BattleScript_EffectHit @ EFFECT_UNUSED_35
.4byte BattleScript_EffectHealBlock @ EFFECT_HEAL_BLOCK
.4byte BattleScript_EffectRecoilIfMiss @ EFFECT_RECOIL_IF_MISS
.4byte BattleScript_EffectMist @ EFFECT_MIST
.4byte BattleScript_EffectFocusEnergy @ EFFECT_FOCUS_ENERGY
.4byte BattleScript_EffectHit @ EFFECT_UNUSED_40
.4byte BattleScript_EffectConfuse @ EFFECT_CONFUSE
.4byte BattleScript_EffectAttackUp2 @ EFFECT_ATTACK_UP_2
.4byte BattleScript_EffectDefenseUp2 @ EFFECT_DEFENSE_UP_2
@ -83,9 +80,7 @@ gBattleScriptsForMoveEffects::
.4byte BattleScript_EffectPoison @ EFFECT_POISON
.4byte BattleScript_EffectParalyze @ EFFECT_PARALYZE
.4byte BattleScript_EffectTwoTurnsAttack @ EFFECT_TWO_TURNS_ATTACK
.4byte BattleScript_EffectHit @ EFFECT_UNUSED_61
.4byte BattleScript_EffectSubstitute @ EFFECT_SUBSTITUTE
.4byte BattleScript_EffectHit @ EFFECT_UNUSED_63
.4byte BattleScript_EffectRage @ EFFECT_RAGE
.4byte BattleScript_EffectMimic @ EFFECT_MIMIC
.4byte BattleScript_EffectMetronome @ EFFECT_METRONOME
@ -108,7 +103,6 @@ gBattleScriptsForMoveEffects::
.4byte BattleScript_EffectHit @ EFFECT_FALSE_SWIPE
.4byte BattleScript_EffectHealBell @ EFFECT_HEAL_BELL
.4byte BattleScript_EffectTripleKick @ EFFECT_TRIPLE_KICK
.4byte BattleScript_EffectHit @ EFFECT_UNUSED_86
.4byte BattleScript_EffectMeanLook @ EFFECT_MEAN_LOOK
.4byte BattleScript_EffectNightmare @ EFFECT_NIGHTMARE
.4byte BattleScript_EffectMinimize @ EFFECT_MINIMIZE
@ -131,8 +125,6 @@ gBattleScriptsForMoveEffects::
.4byte BattleScript_EffectMagnitude @ EFFECT_MAGNITUDE
.4byte BattleScript_EffectBatonPass @ EFFECT_BATON_PASS
.4byte BattleScript_EffectHit @ EFFECT_PURSUIT
.4byte BattleScript_EffectHit @ EFFECT_UNUSED_109
.4byte BattleScript_EffectHit @ EFFECT_UNUSED_110
.4byte BattleScript_EffectCaptivate @ EFFECT_CAPTIVATE
.4byte BattleScript_EffectMorningSun @ EFFECT_MORNING_SUN
.4byte BattleScript_EffectSynthesis @ EFFECT_SYNTHESIS
@ -140,7 +132,6 @@ gBattleScriptsForMoveEffects::
.4byte BattleScript_EffectHit @ EFFECT_HIDDEN_POWER
.4byte BattleScript_EffectRainDance @ EFFECT_RAIN_DANCE
.4byte BattleScript_EffectSunnyDay @ EFFECT_SUNNY_DAY
.4byte BattleScript_EffectHit @ EFFECT_UNUSED_118
.4byte BattleScript_EffectHit @ EFFECT_FELL_STINGER
.4byte BattleScript_EffectBellyDrum @ EFFECT_BELLY_DRUM
.4byte BattleScript_EffectPsychUp @ EFFECT_PSYCH_UP
@ -194,7 +185,6 @@ gBattleScriptsForMoveEffects::
.4byte BattleScript_EffectGrudge @ EFFECT_GRUDGE
.4byte BattleScript_EffectSnatch @ EFFECT_SNATCH
.4byte BattleScript_EffectHit @ EFFECT_LOW_KICK
.4byte BattleScript_EffectHit @ EFFECT_UNUSED_172
.4byte BattleScript_EffectTeeterDance @ EFFECT_TEETER_DANCE
.4byte BattleScript_EffectHitEscape @ EFFECT_HIT_ESCAPE
.4byte BattleScript_EffectMudSport @ EFFECT_MUD_SPORT
@ -211,9 +201,7 @@ gBattleScriptsForMoveEffects::
.4byte BattleScript_EffectPledge @ EFFECT_PLEDGE
.4byte BattleScript_EffectFling @ EFFECT_FLING
.4byte BattleScript_EffectNaturalGift @ EFFECT_NATURAL_GIFT
.4byte BattleScript_EffectHit @ EFFECT_UNUSED_189
.4byte BattleScript_EffectHit @ EFFECT_WRING_OUT
.4byte BattleScript_EffectHit @ EFFECT_UNUSED_191
.4byte BattleScript_EffectHit @ EFFECT_ASSURANCE
.4byte BattleScript_EffectHit @ EFFECT_TRUMP_CARD
.4byte BattleScript_EffectHit @ EFFECT_ACROBATICS
@ -226,7 +214,6 @@ gBattleScriptsForMoveEffects::
.4byte BattleScript_EffectHit @ EFFECT_PAYBACK
.4byte BattleScript_EffectHit @ EFFECT_ROUND
.4byte BattleScript_EffectHit @ EFFECT_BRINE
.4byte BattleScript_EffectHit @ EFFECT_UNUSED_204
.4byte BattleScript_EffectHit @ EFFECT_RETALIATE
.4byte BattleScript_EffectHit @ EFFECT_BULLDOZE
.4byte BattleScript_EffectHit @ EFFECT_FOUL_PLAY
@ -290,23 +277,17 @@ gBattleScriptsForMoveEffects::
.4byte BattleScript_EffectCopycat @ EFFECT_COPYCAT
.4byte BattleScript_EffectDefog @ EFFECT_DEFOG
.4byte BattleScript_EffectHitEnemyHealAlly @ EFFECT_HIT_ENEMY_HEAL_ALLY
.4byte BattleScript_EffectHit @ EFFECT_UNUSED_268
.4byte BattleScript_EffectSynchronoise @ EFFECT_SYNCHRONOISE
.4byte BattleScript_EffectPsychoShift @ EFFECT_PSYCHO_SHIFT
.4byte BattleScript_EffectPowerTrick @ EFFECT_POWER_TRICK
.4byte BattleScript_EffectHit @ EFFECT_UNUSED_272
.4byte BattleScript_EffectAfterYou @ EFFECT_AFTER_YOU
.4byte BattleScript_EffectBestow @ EFFECT_BESTOW
.4byte BattleScript_EffectRototiller @ EFFECT_ROTOTILLER
.4byte BattleScript_EffectFlowerShield @ EFFECT_FLOWER_SHIELD
.4byte BattleScript_EffectHit @ EFFECT_UNUSED_277
.4byte BattleScript_EffectSpeedSwap @ EFFECT_SPEED_SWAP
.4byte BattleScript_EffectHit @ EFFECT_UNUSED_279
.4byte BattleScript_EffectHit @ EFFECT_REVELATION_DANCE
.4byte BattleScript_EffectAuroraVeil @ EFFECT_AURORA_VEIL
.4byte BattleScript_EffectThirdType @ EFFECT_THIRD_TYPE
.4byte BattleScript_EffectHit @ EFFECT_UNUSED_283
.4byte BattleScript_EffectHit @ EFFECT_UNUSED_284
.4byte BattleScript_EffectAcupressure @ EFFECT_ACUPRESSURE
.4byte BattleScript_EffectAromaticMist @ EFFECT_AROMATIC_MIST
.4byte BattleScript_EffectPowder @ EFFECT_POWDER
@ -315,12 +296,9 @@ gBattleScriptsForMoveEffects::
.4byte BattleScript_EffectMatBlock @ EFFECT_MAT_BLOCK
.4byte BattleScript_EffectHit @ EFFECT_STOMPING_TANTRUM
.4byte BattleScript_EffectInstruct @ EFFECT_INSTRUCT
.4byte BattleScript_EffectHit @ EFFECT_UNUSED_293
.4byte BattleScript_EffectLaserFocus @ EFFECT_LASER_FOCUS
.4byte BattleScript_EffectMagneticFlux @ EFFECT_MAGNETIC_FLUX
.4byte BattleScript_EffectGearUp @ EFFECT_GEAR_UP
.4byte BattleScript_EffectHit @ EFFECT_UNUSED_297
.4byte BattleScript_EffectHit @ EFFECT_UNUSED_298
.4byte BattleScript_EffectStrengthSap @ EFFECT_STRENGTH_SAP
.4byte BattleScript_EffectMindBlown @ EFFECT_MIND_BLOWN
.4byte BattleScript_EffectPurify @ EFFECT_PURIFY
@ -369,18 +347,14 @@ gBattleScriptsForMoveEffects::
.4byte BattleScript_EffectExtremeEvoboost @ EFFECT_EXTREME_EVOBOOST
.4byte BattleScript_EffectHitSetRemoveTerrain @ EFFECT_HIT_SET_REMOVE_TERRAIN
.4byte BattleScript_EffectDarkVoid @ EFFECT_DARK_VOID
.4byte BattleScript_EffectHit @ EFFECT_UNUSED_347
.4byte BattleScript_EffectVictoryDance @ EFFECT_VICTORY_DANCE
.4byte BattleScript_EffectTeatime @ EFFECT_TEATIME
.4byte BattleScript_EffectAttackUpUserAlly @ EFFECT_ATTACK_UP_USER_ALLY
.4byte BattleScript_EffectShellTrap @ EFFECT_SHELL_TRAP
.4byte BattleScript_EffectHit @ EFFECT_PSYBLADE
.4byte BattleScript_EffectHit @ EFFECT_HYDRO_STEAM
.4byte BattleScript_EffectHit @ EFFECT_UNUSED_354
.4byte BattleScript_EffectHit @ EFFECT_UNUSED_355
.4byte BattleScript_EffectRevivalBlessing @ EFFECT_REVIVAL_BLESSING
.4byte BattleScript_EffectSnow @ EFFECT_SNOWSCAPE
.4byte BattleScript_EffectHit @ EFFECT_UNUSED_358
.4byte BattleScript_EffectTakeHeart @ EFFECT_TAKE_HEART
.4byte BattleScript_EffectHit @ EFFECT_COLLISION_COURSE
.4byte BattleScript_EffectCorrosiveGas @ EFFECT_CORROSIVE_GAS

View File

@ -24,354 +24,328 @@
#define EFFECT_EVASION_DOWN 20
#define EFFECT_HAZE 21
#define EFFECT_BIDE 22
#define EFFECT_UNUSED_23 23
#define EFFECT_ROAR 24
#define EFFECT_MULTI_HIT 25
#define EFFECT_CONVERSION 26
#define EFFECT_RESTORE_HP 27
#define EFFECT_TOXIC 28
#define EFFECT_LIGHT_SCREEN 29
#define EFFECT_REST 30
#define EFFECT_OHKO 31
#define EFFECT_FUSION_COMBO 32
#define EFFECT_SUPER_FANG 33
#define EFFECT_ARG_FIXED_DAMAGE 34
#define EFFECT_UNUSED_35 35
#define EFFECT_HEAL_BLOCK 36
#define EFFECT_RECOIL_IF_MISS 37
#define EFFECT_MIST 38
#define EFFECT_FOCUS_ENERGY 39
#define EFFECT_UNUSED_40 40
#define EFFECT_CONFUSE 41
#define EFFECT_ATTACK_UP_2 42
#define EFFECT_DEFENSE_UP_2 43
#define EFFECT_SPEED_UP_2 44
#define EFFECT_SPECIAL_ATTACK_UP_2 45
#define EFFECT_SPECIAL_DEFENSE_UP_2 46
#define EFFECT_ACCURACY_UP_2 47
#define EFFECT_EVASION_UP_2 48
#define EFFECT_TRANSFORM 49
#define EFFECT_ATTACK_DOWN_2 50
#define EFFECT_DEFENSE_DOWN_2 51
#define EFFECT_SPEED_DOWN_2 52
#define EFFECT_SPECIAL_ATTACK_DOWN_2 53
#define EFFECT_SPECIAL_DEFENSE_DOWN_2 54
#define EFFECT_ACCURACY_DOWN_2 55
#define EFFECT_EVASION_DOWN_2 56
#define EFFECT_REFLECT 57
#define EFFECT_POISON 58
#define EFFECT_PARALYZE 59
#define EFFECT_TWO_TURNS_ATTACK 60
#define EFFECT_UNUSED_61 61
#define EFFECT_SUBSTITUTE 62
#define EFFECT_UNUSED_63 63
#define EFFECT_RAGE 64
#define EFFECT_MIMIC 65
#define EFFECT_METRONOME 66
#define EFFECT_LEECH_SEED 67
#define EFFECT_DO_NOTHING 68
#define EFFECT_DISABLE 69
#define EFFECT_LEVEL_DAMAGE 70
#define EFFECT_PSYWAVE 71
#define EFFECT_COUNTER 72
#define EFFECT_ENCORE 73
#define EFFECT_PAIN_SPLIT 74
#define EFFECT_SNORE 75
#define EFFECT_CONVERSION_2 76
#define EFFECT_LOCK_ON 77
#define EFFECT_SKETCH 78
#define EFFECT_SLEEP_TALK 79
#define EFFECT_DESTINY_BOND 80
#define EFFECT_FLAIL 81
#define EFFECT_SPITE 82
#define EFFECT_FALSE_SWIPE 83
#define EFFECT_HEAL_BELL 84
#define EFFECT_TRIPLE_KICK 85
#define EFFECT_UNUSED_86 86
#define EFFECT_MEAN_LOOK 87
#define EFFECT_NIGHTMARE 88
#define EFFECT_MINIMIZE 89
#define EFFECT_CURSE 90
#define EFFECT_HEALING_WISH 91
#define EFFECT_PROTECT 92
#define EFFECT_SPIKES 93
#define EFFECT_FORESIGHT 94
#define EFFECT_PERISH_SONG 95
#define EFFECT_SANDSTORM 96
#define EFFECT_ENDURE 97
#define EFFECT_ROLLOUT 98
#define EFFECT_SWAGGER 99
#define EFFECT_FURY_CUTTER 100
#define EFFECT_ATTRACT 101
#define EFFECT_RETURN 102
#define EFFECT_PRESENT 103
#define EFFECT_FRUSTRATION 104
#define EFFECT_SAFEGUARD 105
#define EFFECT_MAGNITUDE 106
#define EFFECT_BATON_PASS 107
#define EFFECT_PURSUIT 108
#define EFFECT_UNUSED_109 109
#define EFFECT_UNUSED_110 110
#define EFFECT_CAPTIVATE 111
#define EFFECT_MORNING_SUN 112
#define EFFECT_SYNTHESIS 113
#define EFFECT_MOONLIGHT 114
#define EFFECT_HIDDEN_POWER 115
#define EFFECT_RAIN_DANCE 116
#define EFFECT_SUNNY_DAY 117
#define EFFECT_UNUSED_118 118
#define EFFECT_FELL_STINGER 119
#define EFFECT_BELLY_DRUM 120
#define EFFECT_PSYCH_UP 121
#define EFFECT_MIRROR_COAT 122
#define EFFECT_SKULL_BASH 123
#define EFFECT_EARTHQUAKE 124
#define EFFECT_FUTURE_SIGHT 125
#define EFFECT_GUST 126
#define EFFECT_SOLAR_BEAM 127
#define EFFECT_THUNDER 128
#define EFFECT_TELEPORT 129
#define EFFECT_BEAT_UP 130
#define EFFECT_SEMI_INVULNERABLE 131
#define EFFECT_DEFENSE_CURL 132
#define EFFECT_SOFTBOILED 133
#define EFFECT_FAKE_OUT 134
#define EFFECT_UPROAR 135
#define EFFECT_STOCKPILE 136
#define EFFECT_SPIT_UP 137
#define EFFECT_SWALLOW 138
#define EFFECT_WORRY_SEED 139
#define EFFECT_HAIL 140
#define EFFECT_TORMENT 141
#define EFFECT_FLATTER 142
#define EFFECT_WILL_O_WISP 143
#define EFFECT_MEMENTO 144
#define EFFECT_FACADE 145
#define EFFECT_FOCUS_PUNCH 146
#define EFFECT_DOUBLE_POWER_ON_ARG_STATUS 147
#define EFFECT_FOLLOW_ME 148
#define EFFECT_NATURE_POWER 149
#define EFFECT_CHARGE 150
#define EFFECT_TAUNT 151
#define EFFECT_HELPING_HAND 152
#define EFFECT_TRICK 153
#define EFFECT_ROLE_PLAY 154
#define EFFECT_WISH 155
#define EFFECT_ASSIST 156
#define EFFECT_INGRAIN 157
#define EFFECT_MAGIC_COAT 158
#define EFFECT_RECYCLE 159
#define EFFECT_REVENGE 160
#define EFFECT_BRICK_BREAK 161
#define EFFECT_YAWN 162
#define EFFECT_KNOCK_OFF 163
#define EFFECT_ENDEAVOR 164
#define EFFECT_ERUPTION 165
#define EFFECT_SKILL_SWAP 166
#define EFFECT_IMPRISON 167
#define EFFECT_REFRESH 168
#define EFFECT_GRUDGE 169
#define EFFECT_SNATCH 170
#define EFFECT_LOW_KICK 171
#define EFFECT_UNUSED_172 172
#define EFFECT_TEETER_DANCE 173
#define EFFECT_HIT_ESCAPE 174
#define EFFECT_MUD_SPORT 175
#define EFFECT_WEATHER_BALL 176
#define EFFECT_TICKLE 177
#define EFFECT_COSMIC_POWER 178
#define EFFECT_SKY_UPPERCUT 179
#define EFFECT_BULK_UP 180
#define EFFECT_PLACEHOLDER 181
#define EFFECT_WATER_SPORT 182
#define EFFECT_CALM_MIND 183
#define EFFECT_DRAGON_DANCE 184
#define EFFECT_CAMOUFLAGE 185
#define EFFECT_PLEDGE 186
#define EFFECT_FLING 187
#define EFFECT_NATURAL_GIFT 188
#define EFFECT_UNUSED_189 189
#define EFFECT_WRING_OUT 190
#define EFFECT_UNUSED_191 191
#define EFFECT_ASSURANCE 192
#define EFFECT_TRUMP_CARD 193
#define EFFECT_ACROBATICS 194
#define EFFECT_HEAT_CRASH 195
#define EFFECT_PUNISHMENT 196
#define EFFECT_STORED_POWER 197
#define EFFECT_ELECTRO_BALL 198
#define EFFECT_GYRO_BALL 199
#define EFFECT_ECHOED_VOICE 200
#define EFFECT_PAYBACK 201
#define EFFECT_ROUND 202
#define EFFECT_BRINE 203
#define EFFECT_UNUSED_204 204
#define EFFECT_RETALIATE 205
#define EFFECT_BULLDOZE 206
#define EFFECT_FOUL_PLAY 207
#define EFFECT_PSYSHOCK 208
#define EFFECT_ROOST 209
#define EFFECT_GRAVITY 210
#define EFFECT_MIRACLE_EYE 211
#define EFFECT_TAILWIND 212
#define EFFECT_EMBARGO 213
#define EFFECT_AQUA_RING 214
#define EFFECT_TRICK_ROOM 215
#define EFFECT_WONDER_ROOM 216
#define EFFECT_MAGIC_ROOM 217
#define EFFECT_MAGNET_RISE 218
#define EFFECT_TOXIC_SPIKES 219
#define EFFECT_GASTRO_ACID 220
#define EFFECT_STEALTH_ROCK 221
#define EFFECT_TELEKINESIS 222
#define EFFECT_POWER_SWAP 223
#define EFFECT_GUARD_SWAP 224
#define EFFECT_HEART_SWAP 225
#define EFFECT_POWER_SPLIT 226
#define EFFECT_GUARD_SPLIT 227
#define EFFECT_STICKY_WEB 228
#define EFFECT_METAL_BURST 229
#define EFFECT_LUCKY_CHANT 230
#define EFFECT_SUCKER_PUNCH 231
#define EFFECT_SIMPLE_BEAM 232
#define EFFECT_ENTRAINMENT 233
#define EFFECT_HEAL_PULSE 234
#define EFFECT_QUASH 235
#define EFFECT_ION_DELUGE 236
#define EFFECT_FREEZE_DRY 237
#define EFFECT_TOPSY_TURVY 238
#define EFFECT_MISTY_TERRAIN 239
#define EFFECT_GRASSY_TERRAIN 240
#define EFFECT_ELECTRIC_TERRAIN 241
#define EFFECT_PSYCHIC_TERRAIN 242
#define EFFECT_ATTACK_ACCURACY_UP 243
#define EFFECT_ATTACK_SPATK_UP 244
#define EFFECT_HURRICANE 245
#define EFFECT_TWO_TYPED_MOVE 246
#define EFFECT_ME_FIRST 247
#define EFFECT_QUIVER_DANCE 248
#define EFFECT_COIL 249
#define EFFECT_ELECTRIFY 250
#define EFFECT_REFLECT_TYPE 251
#define EFFECT_SOAK 252
#define EFFECT_GROWTH 253
#define EFFECT_LAST_RESORT 254
#define EFFECT_SHELL_SMASH 255
#define EFFECT_SHIFT_GEAR 256
#define EFFECT_DEFENSE_UP_3 257
#define EFFECT_NOBLE_ROAR 258
#define EFFECT_VENOM_DRENCH 259
#define EFFECT_TOXIC_THREAD 260
#define EFFECT_HIT_SWITCH_TARGET 261
#define EFFECT_FINAL_GAMBIT 262
#define EFFECT_CHANGE_TYPE_ON_ITEM 263
#define EFFECT_AUTOTOMIZE 264
#define EFFECT_COPYCAT 265
#define EFFECT_DEFOG 266
#define EFFECT_HIT_ENEMY_HEAL_ALLY 267
#define EFFECT_UNUSED_268 268
#define EFFECT_SYNCHRONOISE 269
#define EFFECT_PSYCHO_SHIFT 270
#define EFFECT_POWER_TRICK 271
#define EFFECT_UNUSED_272 272
#define EFFECT_AFTER_YOU 273
#define EFFECT_BESTOW 274
#define EFFECT_ROTOTILLER 275
#define EFFECT_FLOWER_SHIELD 276
#define EFFECT_UNUSED_277 277
#define EFFECT_SPEED_SWAP 278
#define EFFECT_UNUSED_279 279
#define EFFECT_REVELATION_DANCE 280
#define EFFECT_AURORA_VEIL 281
#define EFFECT_THIRD_TYPE 282
#define EFFECT_UNUSED_283 283
#define EFFECT_UNUSED_284 284
#define EFFECT_ACUPRESSURE 285
#define EFFECT_AROMATIC_MIST 286
#define EFFECT_POWDER 287
#define EFFECT_BELCH 288
#define EFFECT_PARTING_SHOT 289
#define EFFECT_MAT_BLOCK 290
#define EFFECT_STOMPING_TANTRUM 291
#define EFFECT_INSTRUCT 292
#define EFFECT_UNUSED_293 293
#define EFFECT_LASER_FOCUS 294
#define EFFECT_MAGNETIC_FLUX 295
#define EFFECT_GEAR_UP 296
#define EFFECT_UNUSED_297 297
#define EFFECT_UNUSED_298 298
#define EFFECT_STRENGTH_SAP 299
#define EFFECT_MIND_BLOWN 300
#define EFFECT_PURIFY 301
#define EFFECT_FAIL_IF_NOT_ARG_TYPE 302
#define EFFECT_SHORE_UP 303
#define EFFECT_GEOMANCY 304
#define EFFECT_FAIRY_LOCK 305
#define EFFECT_ALLY_SWITCH 306
#define EFFECT_RELIC_SONG 307
#define EFFECT_BODY_PRESS 308
#define EFFECT_EERIE_SPELL 309
#define EFFECT_JUNGLE_HEALING 310
#define EFFECT_COACHING 311
#define EFFECT_LASH_OUT 312
#define EFFECT_GRASSY_GLIDE 313
#define EFFECT_DYNAMAX_DOUBLE_DMG 314
#define EFFECT_DECORATE 315
#define EFFECT_SNIPE_SHOT 316
#define EFFECT_RECOIL_HP_25 317
#define EFFECT_STUFF_CHEEKS 318
#define EFFECT_GRAV_APPLE 319
#define EFFECT_GLITZY_GLOW 320
#define EFFECT_BADDY_BAD 321
#define EFFECT_SAPPY_SEED 322
#define EFFECT_FREEZY_FROST 323
#define EFFECT_SPARKLY_SWIRL 324
#define EFFECT_PLASMA_FISTS 325
#define EFFECT_HYPERSPACE_FURY 326
#define EFFECT_AURA_WHEEL 327
#define EFFECT_PHOTON_GEYSER 328
#define EFFECT_SHELL_SIDE_ARM 329
#define EFFECT_TERRAIN_PULSE 330
#define EFFECT_NO_RETREAT 331
#define EFFECT_TAR_SHOT 332
#define EFFECT_POLTERGEIST 333
#define EFFECT_OCTOLOCK 334
#define EFFECT_CLANGOROUS_SOUL 335
#define EFFECT_BOLT_BEAK 336
#define EFFECT_SKY_DROP 337
#define EFFECT_EXPANDING_FORCE 338
#define EFFECT_METEOR_BEAM 339
#define EFFECT_RISING_VOLTAGE 340
#define EFFECT_BEAK_BLAST 341
#define EFFECT_COURT_CHANGE 342
#define EFFECT_STEEL_BEAM 343
#define EFFECT_EXTREME_EVOBOOST 344
#define EFFECT_HIT_SET_REMOVE_TERRAIN 345
#define EFFECT_DARK_VOID 346
#define EFFECT_UNUSED_347 347
#define EFFECT_VICTORY_DANCE 348
#define EFFECT_TEATIME 349
#define EFFECT_ATTACK_UP_USER_ALLY 350
#define EFFECT_SHELL_TRAP 351
#define EFFECT_PSYBLADE 352
#define EFFECT_HYDRO_STEAM 353
#define EFFECT_UNUSED_354 354
#define EFFECT_UNUSED_355 355
#define EFFECT_REVIVAL_BLESSING 356
#define EFFECT_SNOWSCAPE 357
#define EFFECT_UNUSED_358 358
#define EFFECT_TAKE_HEART 359
#define EFFECT_COLLISION_COURSE 360
#define EFFECT_CORROSIVE_GAS 361
#define EFFECT_POPULATION_BOMB 362
#define EFFECT_SALT_CURE 363
#define EFFECT_CHILLY_RECEPTION 364
#define EFFECT_MAX_MOVE 365
#define EFFECT_GLAIVE_RUSH 366
#define EFFECT_RAGING_BULL 367
#define EFFECT_RAGE_FIST 368
#define EFFECT_DOODLE 369
#define EFFECT_ROAR 23
#define EFFECT_MULTI_HIT 24
#define EFFECT_CONVERSION 25
#define EFFECT_RESTORE_HP 26
#define EFFECT_TOXIC 27
#define EFFECT_LIGHT_SCREEN 28
#define EFFECT_REST 29
#define EFFECT_OHKO 30
#define EFFECT_FUSION_COMBO 31
#define EFFECT_SUPER_FANG 32
#define EFFECT_ARG_FIXED_DAMAGE 33
#define EFFECT_HEAL_BLOCK 34
#define EFFECT_RECOIL_IF_MISS 35
#define EFFECT_MIST 36
#define EFFECT_FOCUS_ENERGY 37
#define EFFECT_CONFUSE 38
#define EFFECT_ATTACK_UP_2 39
#define EFFECT_DEFENSE_UP_2 40
#define EFFECT_SPEED_UP_2 41
#define EFFECT_SPECIAL_ATTACK_UP_2 42
#define EFFECT_SPECIAL_DEFENSE_UP_2 43
#define EFFECT_ACCURACY_UP_2 44
#define EFFECT_EVASION_UP_2 45
#define EFFECT_TRANSFORM 46
#define EFFECT_ATTACK_DOWN_2 47
#define EFFECT_DEFENSE_DOWN_2 48
#define EFFECT_SPEED_DOWN_2 49
#define EFFECT_SPECIAL_ATTACK_DOWN_2 50
#define EFFECT_SPECIAL_DEFENSE_DOWN_2 51
#define EFFECT_ACCURACY_DOWN_2 52
#define EFFECT_EVASION_DOWN_2 53
#define EFFECT_REFLECT 54
#define EFFECT_POISON 55
#define EFFECT_PARALYZE 56
#define EFFECT_TWO_TURNS_ATTACK 57
#define EFFECT_SUBSTITUTE 58
#define EFFECT_RAGE 59
#define EFFECT_MIMIC 60
#define EFFECT_METRONOME 61
#define EFFECT_LEECH_SEED 62
#define EFFECT_DO_NOTHING 63
#define EFFECT_DISABLE 64
#define EFFECT_LEVEL_DAMAGE 65
#define EFFECT_PSYWAVE 66
#define EFFECT_COUNTER 67
#define EFFECT_ENCORE 68
#define EFFECT_PAIN_SPLIT 69
#define EFFECT_SNORE 70
#define EFFECT_CONVERSION_2 71
#define EFFECT_LOCK_ON 72
#define EFFECT_SKETCH 73
#define EFFECT_SLEEP_TALK 74
#define EFFECT_DESTINY_BOND 75
#define EFFECT_FLAIL 76
#define EFFECT_SPITE 77
#define EFFECT_FALSE_SWIPE 78
#define EFFECT_HEAL_BELL 79
#define EFFECT_TRIPLE_KICK 80
#define EFFECT_MEAN_LOOK 81
#define EFFECT_NIGHTMARE 82
#define EFFECT_MINIMIZE 83
#define EFFECT_CURSE 84
#define EFFECT_HEALING_WISH 85
#define EFFECT_PROTECT 86
#define EFFECT_SPIKES 87
#define EFFECT_FORESIGHT 88
#define EFFECT_PERISH_SONG 89
#define EFFECT_SANDSTORM 90
#define EFFECT_ENDURE 91
#define EFFECT_ROLLOUT 92
#define EFFECT_SWAGGER 93
#define EFFECT_FURY_CUTTER 94
#define EFFECT_ATTRACT 95
#define EFFECT_RETURN 96
#define EFFECT_PRESENT 97
#define EFFECT_FRUSTRATION 98
#define EFFECT_SAFEGUARD 99
#define EFFECT_MAGNITUDE 100
#define EFFECT_BATON_PASS 101
#define EFFECT_PURSUIT 102
#define EFFECT_CAPTIVATE 103
#define EFFECT_MORNING_SUN 104
#define EFFECT_SYNTHESIS 105
#define EFFECT_MOONLIGHT 106
#define EFFECT_HIDDEN_POWER 107
#define EFFECT_RAIN_DANCE 108
#define EFFECT_SUNNY_DAY 109
#define EFFECT_FELL_STINGER 110
#define EFFECT_BELLY_DRUM 111
#define EFFECT_PSYCH_UP 112
#define EFFECT_MIRROR_COAT 113
#define EFFECT_SKULL_BASH 114
#define EFFECT_EARTHQUAKE 115
#define EFFECT_FUTURE_SIGHT 116
#define EFFECT_GUST 117
#define EFFECT_SOLAR_BEAM 118
#define EFFECT_THUNDER 119
#define EFFECT_TELEPORT 120
#define EFFECT_BEAT_UP 121
#define EFFECT_SEMI_INVULNERABLE 122
#define EFFECT_DEFENSE_CURL 123
#define EFFECT_SOFTBOILED 124
#define EFFECT_FAKE_OUT 125
#define EFFECT_UPROAR 126
#define EFFECT_STOCKPILE 127
#define EFFECT_SPIT_UP 128
#define EFFECT_SWALLOW 129
#define EFFECT_WORRY_SEED 130
#define EFFECT_HAIL 131
#define EFFECT_TORMENT 132
#define EFFECT_FLATTER 133
#define EFFECT_WILL_O_WISP 134
#define EFFECT_MEMENTO 135
#define EFFECT_FACADE 136
#define EFFECT_FOCUS_PUNCH 137
#define EFFECT_DOUBLE_POWER_ON_ARG_STATUS 138
#define EFFECT_FOLLOW_ME 139
#define EFFECT_NATURE_POWER 140
#define EFFECT_CHARGE 141
#define EFFECT_TAUNT 142
#define EFFECT_HELPING_HAND 143
#define EFFECT_TRICK 144
#define EFFECT_ROLE_PLAY 145
#define EFFECT_WISH 146
#define EFFECT_ASSIST 147
#define EFFECT_INGRAIN 148
#define EFFECT_MAGIC_COAT 149
#define EFFECT_RECYCLE 150
#define EFFECT_REVENGE 151
#define EFFECT_BRICK_BREAK 152
#define EFFECT_YAWN 153
#define EFFECT_KNOCK_OFF 154
#define EFFECT_ENDEAVOR 155
#define EFFECT_ERUPTION 156
#define EFFECT_SKILL_SWAP 157
#define EFFECT_IMPRISON 158
#define EFFECT_REFRESH 159
#define EFFECT_GRUDGE 160
#define EFFECT_SNATCH 161
#define EFFECT_LOW_KICK 162
#define EFFECT_TEETER_DANCE 163
#define EFFECT_HIT_ESCAPE 164
#define EFFECT_MUD_SPORT 165
#define EFFECT_WEATHER_BALL 166
#define EFFECT_TICKLE 167
#define EFFECT_COSMIC_POWER 168
#define EFFECT_SKY_UPPERCUT 169
#define EFFECT_BULK_UP 170
#define EFFECT_PLACEHOLDER 171
#define EFFECT_WATER_SPORT 172
#define EFFECT_CALM_MIND 173
#define EFFECT_DRAGON_DANCE 174
#define EFFECT_CAMOUFLAGE 175
#define EFFECT_PLEDGE 176
#define EFFECT_FLING 177
#define EFFECT_NATURAL_GIFT 178
#define EFFECT_WRING_OUT 179
#define EFFECT_ASSURANCE 180
#define EFFECT_TRUMP_CARD 181
#define EFFECT_ACROBATICS 182
#define EFFECT_HEAT_CRASH 183
#define EFFECT_PUNISHMENT 184
#define EFFECT_STORED_POWER 185
#define EFFECT_ELECTRO_BALL 186
#define EFFECT_GYRO_BALL 187
#define EFFECT_ECHOED_VOICE 188
#define EFFECT_PAYBACK 189
#define EFFECT_ROUND 190
#define EFFECT_BRINE 191
#define EFFECT_RETALIATE 192
#define EFFECT_BULLDOZE 193
#define EFFECT_FOUL_PLAY 194
#define EFFECT_PSYSHOCK 195
#define EFFECT_ROOST 196
#define EFFECT_GRAVITY 197
#define EFFECT_MIRACLE_EYE 198
#define EFFECT_TAILWIND 199
#define EFFECT_EMBARGO 200
#define EFFECT_AQUA_RING 201
#define EFFECT_TRICK_ROOM 202
#define EFFECT_WONDER_ROOM 203
#define EFFECT_MAGIC_ROOM 204
#define EFFECT_MAGNET_RISE 205
#define EFFECT_TOXIC_SPIKES 206
#define EFFECT_GASTRO_ACID 207
#define EFFECT_STEALTH_ROCK 208
#define EFFECT_TELEKINESIS 209
#define EFFECT_POWER_SWAP 210
#define EFFECT_GUARD_SWAP 211
#define EFFECT_HEART_SWAP 212
#define EFFECT_POWER_SPLIT 213
#define EFFECT_GUARD_SPLIT 214
#define EFFECT_STICKY_WEB 215
#define EFFECT_METAL_BURST 216
#define EFFECT_LUCKY_CHANT 217
#define EFFECT_SUCKER_PUNCH 218
#define EFFECT_SIMPLE_BEAM 219
#define EFFECT_ENTRAINMENT 220
#define EFFECT_HEAL_PULSE 221
#define EFFECT_QUASH 222
#define EFFECT_ION_DELUGE 223
#define EFFECT_FREEZE_DRY 224
#define EFFECT_TOPSY_TURVY 225
#define EFFECT_MISTY_TERRAIN 226
#define EFFECT_GRASSY_TERRAIN 227
#define EFFECT_ELECTRIC_TERRAIN 228
#define EFFECT_PSYCHIC_TERRAIN 229
#define EFFECT_ATTACK_ACCURACY_UP 230
#define EFFECT_ATTACK_SPATK_UP 231
#define EFFECT_HURRICANE 232
#define EFFECT_TWO_TYPED_MOVE 233
#define EFFECT_ME_FIRST 234
#define EFFECT_QUIVER_DANCE 235
#define EFFECT_COIL 236
#define EFFECT_ELECTRIFY 237
#define EFFECT_REFLECT_TYPE 238
#define EFFECT_SOAK 239
#define EFFECT_GROWTH 240
#define EFFECT_LAST_RESORT 241
#define EFFECT_SHELL_SMASH 242
#define EFFECT_SHIFT_GEAR 243
#define EFFECT_DEFENSE_UP_3 244
#define EFFECT_NOBLE_ROAR 245
#define EFFECT_VENOM_DRENCH 246
#define EFFECT_TOXIC_THREAD 247
#define EFFECT_HIT_SWITCH_TARGET 248
#define EFFECT_FINAL_GAMBIT 249
#define EFFECT_CHANGE_TYPE_ON_ITEM 250
#define EFFECT_AUTOTOMIZE 251
#define EFFECT_COPYCAT 252
#define EFFECT_DEFOG 253
#define EFFECT_HIT_ENEMY_HEAL_ALLY 254
#define EFFECT_SYNCHRONOISE 255
#define EFFECT_PSYCHO_SHIFT 256
#define EFFECT_POWER_TRICK 257
#define EFFECT_AFTER_YOU 258
#define EFFECT_BESTOW 259
#define EFFECT_ROTOTILLER 260
#define EFFECT_FLOWER_SHIELD 261
#define EFFECT_SPEED_SWAP 262
#define EFFECT_REVELATION_DANCE 263
#define EFFECT_AURORA_VEIL 264
#define EFFECT_THIRD_TYPE 265
#define EFFECT_ACUPRESSURE 266
#define EFFECT_AROMATIC_MIST 267
#define EFFECT_POWDER 268
#define EFFECT_BELCH 269
#define EFFECT_PARTING_SHOT 270
#define EFFECT_MAT_BLOCK 271
#define EFFECT_STOMPING_TANTRUM 272
#define EFFECT_INSTRUCT 273
#define EFFECT_LASER_FOCUS 274
#define EFFECT_MAGNETIC_FLUX 275
#define EFFECT_GEAR_UP 276
#define EFFECT_STRENGTH_SAP 277
#define EFFECT_MIND_BLOWN 278
#define EFFECT_PURIFY 279
#define EFFECT_FAIL_IF_NOT_ARG_TYPE 280
#define EFFECT_SHORE_UP 281
#define EFFECT_GEOMANCY 282
#define EFFECT_FAIRY_LOCK 283
#define EFFECT_ALLY_SWITCH 284
#define EFFECT_RELIC_SONG 285
#define EFFECT_BODY_PRESS 286
#define EFFECT_EERIE_SPELL 287
#define EFFECT_JUNGLE_HEALING 288
#define EFFECT_COACHING 289
#define EFFECT_LASH_OUT 290
#define EFFECT_GRASSY_GLIDE 291
#define EFFECT_DYNAMAX_DOUBLE_DMG 292
#define EFFECT_DECORATE 293
#define EFFECT_SNIPE_SHOT 294
#define EFFECT_RECOIL_HP_25 295
#define EFFECT_STUFF_CHEEKS 296
#define EFFECT_GRAV_APPLE 297
#define EFFECT_GLITZY_GLOW 298
#define EFFECT_BADDY_BAD 299
#define EFFECT_SAPPY_SEED 300
#define EFFECT_FREEZY_FROST 301
#define EFFECT_SPARKLY_SWIRL 302
#define EFFECT_PLASMA_FISTS 303
#define EFFECT_HYPERSPACE_FURY 304
#define EFFECT_AURA_WHEEL 305
#define EFFECT_PHOTON_GEYSER 306
#define EFFECT_SHELL_SIDE_ARM 307
#define EFFECT_TERRAIN_PULSE 308
#define EFFECT_NO_RETREAT 309
#define EFFECT_TAR_SHOT 310
#define EFFECT_POLTERGEIST 311
#define EFFECT_OCTOLOCK 312
#define EFFECT_CLANGOROUS_SOUL 313
#define EFFECT_BOLT_BEAK 314
#define EFFECT_SKY_DROP 315
#define EFFECT_EXPANDING_FORCE 316
#define EFFECT_METEOR_BEAM 317
#define EFFECT_RISING_VOLTAGE 318
#define EFFECT_BEAK_BLAST 319
#define EFFECT_COURT_CHANGE 320
#define EFFECT_STEEL_BEAM 321
#define EFFECT_EXTREME_EVOBOOST 322
#define EFFECT_HIT_SET_REMOVE_TERRAIN 323
#define EFFECT_DARK_VOID 324
#define EFFECT_VICTORY_DANCE 325
#define EFFECT_TEATIME 326
#define EFFECT_ATTACK_UP_USER_ALLY 327
#define EFFECT_SHELL_TRAP 328
#define EFFECT_PSYBLADE 329
#define EFFECT_HYDRO_STEAM 330
#define EFFECT_REVIVAL_BLESSING 331
#define EFFECT_SNOWSCAPE 332
#define EFFECT_TAKE_HEART 333
#define EFFECT_COLLISION_COURSE 334
#define EFFECT_CORROSIVE_GAS 335
#define EFFECT_POPULATION_BOMB 336
#define EFFECT_SALT_CURE 337
#define EFFECT_CHILLY_RECEPTION 338
#define EFFECT_MAX_MOVE 339
#define EFFECT_GLAIVE_RUSH 340
#define EFFECT_RAGING_BULL 341
#define EFFECT_RAGE_FIST 342
#define EFFECT_DOODLE 343
#define NUM_BATTLE_MOVE_EFFECTS 370
#define NUM_BATTLE_MOVE_EFFECTS 344
#endif // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H

View File

@ -151,96 +151,95 @@
#define VARIOUS_POWER_TRICK 59
#define VARIOUS_AFTER_YOU 60
#define VARIOUS_BESTOW 61
#define VARIOUS_UNUSED_62 62
#define VARIOUS_JUMP_IF_NOT_GROUNDED 63
#define VARIOUS_HANDLE_TRAINER_SLIDE_MSG 64
#define VARIOUS_TRY_TRAINER_SLIDE_MSG_FIRST_OFF 65
#define VARIOUS_TRY_TRAINER_SLIDE_MSG_LAST_ON 66
#define VARIOUS_SET_AURORA_VEIL 67
#define VARIOUS_TRY_THIRD_TYPE 68
#define VARIOUS_ACUPRESSURE 69
#define VARIOUS_SET_POWDER 70
#define VARIOUS_SPECTRAL_THIEF 71
#define VARIOUS_GRAVITY_ON_AIRBORNE_MONS 72
#define VARIOUS_CHECK_IF_GRASSY_TERRAIN_HEALS 73
#define VARIOUS_JUMP_IF_ROAR_FAILS 74
#define VARIOUS_TRY_INSTRUCT 75
#define VARIOUS_JUMP_IF_NOT_BERRY 76
#define VARIOUS_TRACE_ABILITY 77
#define VARIOUS_UPDATE_NICK 78
#define VARIOUS_TRY_ILLUSION_OFF 79
#define VARIOUS_SET_SPRITEIGNORE0HP 80
#define VARIOUS_HANDLE_FORM_CHANGE 81
#define VARIOUS_GET_STAT_VALUE 82
#define VARIOUS_JUMP_IF_FULL_HP 83
#define VARIOUS_LOSE_TYPE 84
#define VARIOUS_TRY_ACTIVATE_SOULHEART 85
#define VARIOUS_TRY_ACTIVATE_RECEIVER 86
#define VARIOUS_TRY_ACTIVATE_BEAST_BOOST 87
#define VARIOUS_TRY_FRISK 88
#define VARIOUS_JUMP_IF_SHIELDS_DOWN_PROTECTED 89
#define VARIOUS_TRY_FAIRY_LOCK 90
#define VARIOUS_JUMP_IF_NO_ALLY 91
#define VARIOUS_POISON_TYPE_IMMUNITY 92
#define VARIOUS_JUMP_IF_NO_HOLD_EFFECT 93
#define VARIOUS_INFATUATE_WITH_BATTLER 94
#define VARIOUS_SET_LAST_USED_ITEM 95
#define VARIOUS_PARALYZE_TYPE_IMMUNITY 96
#define VARIOUS_JUMP_IF_ABSENT 97
#define VARIOUS_DESTROY_ABILITY_POPUP 98
#define VARIOUS_TOTEM_BOOST 99
#define VARIOUS_TRY_ACTIVATE_GRIM_NEIGH 100
#define VARIOUS_MOVEEND_ITEM_EFFECTS 101
#define VARIOUS_TERRAIN_SEED 102
#define VARIOUS_MAKE_INVISIBLE 103
#define VARIOUS_ROOM_SERVICE 104
#define VARIOUS_EERIE_SPELL_PP_REDUCE 105
#define VARIOUS_JUMP_IF_TEAM_HEALTHY 106
#define VARIOUS_TRY_HEAL_QUARTER_HP 107
#define VARIOUS_REMOVE_TERRAIN 108
#define VARIOUS_JUMP_IF_PRANKSTER_BLOCKED 109
#define VARIOUS_TRY_TO_CLEAR_PRIMAL_WEATHER 110
#define VARIOUS_GET_ROTOTILLER_TARGETS 111
#define VARIOUS_JUMP_IF_NOT_ROTOTILLER_AFFECTED 112
#define VARIOUS_TRY_ACTIVATE_BATTLE_BOND 113
#define VARIOUS_CONSUME_BERRY 114
#define VARIOUS_JUMP_IF_CANT_REVERT_TO_PRIMAL 115
#define VARIOUS_JUMP_IF_SPECIES 116
#define VARIOUS_UPDATE_ABILITY_POPUP 117
#define VARIOUS_JUMP_IF_WEATHER_AFFECTED 118
#define VARIOUS_JUMP_IF_LEAF_GUARD_PROTECTED 119
#define VARIOUS_SET_ATTACKER_STICKY_WEB_USER 120
#define VARIOUS_PHOTON_GEYSER_CHECK 121
#define VARIOUS_SHELL_SIDE_ARM_CHECK 122
#define VARIOUS_TRY_NO_RETREAT 123
#define VARIOUS_TRY_TAR_SHOT 124
#define VARIOUS_CAN_TAR_SHOT_WORK 125
#define VARIOUS_CHECK_POLTERGEIST 126
#define VARIOUS_CUT_1_3_HP_RAISE_STATS 127
#define VARIOUS_TRY_END_NEUTRALIZING_GAS 128
#define VARIOUS_JUMP_IF_UNDER_200 129
#define VARIOUS_SET_SKY_DROP 130
#define VARIOUS_CLEAR_SKY_DROP 131
#define VARIOUS_SKY_DROP_YAWN 132
#define VARIOUS_JUMP_IF_HOLD_EFFECT 133
#define VARIOUS_CURE_CERTAIN_STATUSES 134
#define VARIOUS_TRY_RESET_NEGATIVE_STAT_STAGES 135
#define VARIOUS_JUMP_IF_LAST_USED_ITEM_BERRY 136
#define VARIOUS_JUMP_IF_LAST_USED_ITEM_HOLD_EFFECT 137
#define VARIOUS_SAVE_BATTLER_ITEM 138
#define VARIOUS_RESTORE_BATTLER_ITEM 139
#define VARIOUS_BATTLER_ITEM_TO_LAST_USED_ITEM 140
#define VARIOUS_SET_BEAK_BLAST 141
#define VARIOUS_SWAP_SIDE_STATUSES 142
#define VARIOUS_SWAP_STATS 143
#define VARIOUS_TEATIME_INVUL 144
#define VARIOUS_TEATIME_TARGETS 145
#define VARIOUS_TRY_WIND_RIDER_POWER 146
#define VARIOUS_ACTIVATE_WEATHER_CHANGE_ABILITIES 147
#define VARIOUS_ACTIVATE_TERRAIN_CHANGE_ABILITIES 148
#define VARIOUS_STORE_HEALING_WISH 149
#define VARIOUS_HIT_SWITCH_TARGET_FAILED 150
#define VARIOUS_TRY_REVIVAL_BLESSING 151
#define VARIOUS_JUMP_IF_NOT_GROUNDED 62
#define VARIOUS_HANDLE_TRAINER_SLIDE_MSG 63
#define VARIOUS_TRY_TRAINER_SLIDE_MSG_FIRST_OFF 64
#define VARIOUS_TRY_TRAINER_SLIDE_MSG_LAST_ON 65
#define VARIOUS_SET_AURORA_VEIL 66
#define VARIOUS_TRY_THIRD_TYPE 67
#define VARIOUS_ACUPRESSURE 68
#define VARIOUS_SET_POWDER 69
#define VARIOUS_SPECTRAL_THIEF 70
#define VARIOUS_GRAVITY_ON_AIRBORNE_MONS 71
#define VARIOUS_CHECK_IF_GRASSY_TERRAIN_HEALS 72
#define VARIOUS_JUMP_IF_ROAR_FAILS 73
#define VARIOUS_TRY_INSTRUCT 74
#define VARIOUS_JUMP_IF_NOT_BERRY 75
#define VARIOUS_TRACE_ABILITY 76
#define VARIOUS_UPDATE_NICK 77
#define VARIOUS_TRY_ILLUSION_OFF 78
#define VARIOUS_SET_SPRITEIGNORE0HP 79
#define VARIOUS_HANDLE_FORM_CHANGE 80
#define VARIOUS_GET_STAT_VALUE 81
#define VARIOUS_JUMP_IF_FULL_HP 82
#define VARIOUS_LOSE_TYPE 83
#define VARIOUS_TRY_ACTIVATE_SOULHEART 84
#define VARIOUS_TRY_ACTIVATE_RECEIVER 85
#define VARIOUS_TRY_ACTIVATE_BEAST_BOOST 86
#define VARIOUS_TRY_FRISK 87
#define VARIOUS_JUMP_IF_SHIELDS_DOWN_PROTECTED 88
#define VARIOUS_TRY_FAIRY_LOCK 89
#define VARIOUS_JUMP_IF_NO_ALLY 90
#define VARIOUS_POISON_TYPE_IMMUNITY 91
#define VARIOUS_JUMP_IF_NO_HOLD_EFFECT 92
#define VARIOUS_INFATUATE_WITH_BATTLER 93
#define VARIOUS_SET_LAST_USED_ITEM 94
#define VARIOUS_PARALYZE_TYPE_IMMUNITY 95
#define VARIOUS_JUMP_IF_ABSENT 96
#define VARIOUS_DESTROY_ABILITY_POPUP 97
#define VARIOUS_TOTEM_BOOST 98
#define VARIOUS_TRY_ACTIVATE_GRIM_NEIGH 99
#define VARIOUS_MOVEEND_ITEM_EFFECTS 100
#define VARIOUS_TERRAIN_SEED 101
#define VARIOUS_MAKE_INVISIBLE 102
#define VARIOUS_ROOM_SERVICE 103
#define VARIOUS_EERIE_SPELL_PP_REDUCE 104
#define VARIOUS_JUMP_IF_TEAM_HEALTHY 105
#define VARIOUS_TRY_HEAL_QUARTER_HP 106
#define VARIOUS_REMOVE_TERRAIN 107
#define VARIOUS_JUMP_IF_PRANKSTER_BLOCKED 108
#define VARIOUS_TRY_TO_CLEAR_PRIMAL_WEATHER 109
#define VARIOUS_GET_ROTOTILLER_TARGETS 110
#define VARIOUS_JUMP_IF_NOT_ROTOTILLER_AFFECTED 111
#define VARIOUS_TRY_ACTIVATE_BATTLE_BOND 112
#define VARIOUS_CONSUME_BERRY 113
#define VARIOUS_JUMP_IF_CANT_REVERT_TO_PRIMAL 114
#define VARIOUS_JUMP_IF_SPECIES 115
#define VARIOUS_UPDATE_ABILITY_POPUP 116
#define VARIOUS_JUMP_IF_WEATHER_AFFECTED 117
#define VARIOUS_JUMP_IF_LEAF_GUARD_PROTECTED 118
#define VARIOUS_SET_ATTACKER_STICKY_WEB_USER 119
#define VARIOUS_PHOTON_GEYSER_CHECK 120
#define VARIOUS_SHELL_SIDE_ARM_CHECK 121
#define VARIOUS_TRY_NO_RETREAT 122
#define VARIOUS_TRY_TAR_SHOT 123
#define VARIOUS_CAN_TAR_SHOT_WORK 124
#define VARIOUS_CHECK_POLTERGEIST 125
#define VARIOUS_CUT_1_3_HP_RAISE_STATS 126
#define VARIOUS_TRY_END_NEUTRALIZING_GAS 127
#define VARIOUS_JUMP_IF_UNDER_200 128
#define VARIOUS_SET_SKY_DROP 129
#define VARIOUS_CLEAR_SKY_DROP 130
#define VARIOUS_SKY_DROP_YAWN 131
#define VARIOUS_JUMP_IF_HOLD_EFFECT 132
#define VARIOUS_CURE_CERTAIN_STATUSES 133
#define VARIOUS_TRY_RESET_NEGATIVE_STAT_STAGES 134
#define VARIOUS_JUMP_IF_LAST_USED_ITEM_BERRY 135
#define VARIOUS_JUMP_IF_LAST_USED_ITEM_HOLD_EFFECT 136
#define VARIOUS_SAVE_BATTLER_ITEM 137
#define VARIOUS_RESTORE_BATTLER_ITEM 138
#define VARIOUS_BATTLER_ITEM_TO_LAST_USED_ITEM 139
#define VARIOUS_SET_BEAK_BLAST 140
#define VARIOUS_SWAP_SIDE_STATUSES 141
#define VARIOUS_SWAP_STATS 142
#define VARIOUS_TEATIME_INVUL 143
#define VARIOUS_TEATIME_TARGETS 144
#define VARIOUS_TRY_WIND_RIDER_POWER 145
#define VARIOUS_ACTIVATE_WEATHER_CHANGE_ABILITIES 146
#define VARIOUS_ACTIVATE_TERRAIN_CHANGE_ABILITIES 147
#define VARIOUS_STORE_HEALING_WISH 148
#define VARIOUS_HIT_SWITCH_TARGET_FAILED 149
#define VARIOUS_TRY_REVIVAL_BLESSING 150
// Cmd_manipulatedamage
#define DMG_CHANGE_SIGN 0

View File

@ -497,7 +497,7 @@ static void Cmd_setdrainedhp(void);
static void Cmd_statbuffchange(void);
static void Cmd_normalisebuffs(void);
static void Cmd_setbide(void);
static void Cmd_confuseifrepeatingattackends(void);
static void Cmd_unused0x8C(void);
static void Cmd_setmultihitcounter(void);
static void Cmd_initmultihitstring(void);
static void Cmd_forcerandomswitch(void);
@ -748,7 +748,7 @@ void (* const gBattleScriptingCommandsTable[])(void) =
Cmd_trysetrest, //0x81
Cmd_jumpifnotfirstturn, //0x82
Cmd_setmiracleeye, //0x83
Cmd_jumpifuproarwakes, //0x84
Cmd_jumpifuproarwakes, //0x84
Cmd_stockpile, //0x85
Cmd_stockpiletobasedamage, //0x86
Cmd_stockpiletohpheal, //0x87
@ -756,7 +756,7 @@ void (* const gBattleScriptingCommandsTable[])(void) =
Cmd_statbuffchange, //0x89
Cmd_normalisebuffs, //0x8A
Cmd_setbide, //0x8B
Cmd_confuseifrepeatingattackends, //0x8C
Cmd_unused0x8C, //0x8C
Cmd_setmultihitcounter, //0x8D
Cmd_initmultihitstring, //0x8E
Cmd_forcerandomswitch, //0x8F
@ -11681,14 +11681,8 @@ static void Cmd_setbide(void)
gBattlescriptCurrInstr = cmd->nextInstr;
}
static void Cmd_confuseifrepeatingattackends(void)
static void Cmd_unused0x8C(void)
{
CMD_ARGS();
if (!(gBattleMons[gBattlerAttacker].status2 & STATUS2_LOCK_CONFUSE) && !gSpecialStatuses[gBattlerAttacker].dancerUsedMove)
gBattleScripting.moveEffect = (MOVE_EFFECT_THRASH | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN);
gBattlescriptCurrInstr = cmd->nextInstr;
}
static void Cmd_setmultihitcounter(void)