ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 04:04:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix move effects

Browse Source 
Restore unintentionally removed MOVEEND_DEFROST, fix move effect definitions.
This commit is contained in:
BuffelSaft 2022-10-22 18:54:25 +13:00
parent 6035c5a280
commit 3775c5d00c
3 changed files with 246 additions and 252 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
include/constants/battle.h
View File

@ -307,70 +307,66 @@
#define MOVE_EFFECT_PAYDAY 0xB #define MOVE_EFFECT_PAYDAY 0xB
#define MOVE_EFFECT_CHARGING 0xC #define MOVE_EFFECT_CHARGING 0xC
#define MOVE_EFFECT_WRAP 0xD #define MOVE_EFFECT_WRAP 0xD
#define MOVE_EFFECT_RECOIL_25 0xE #define MOVE_EFFECT_ATK_PLUS_1 0xE
#define MOVE_EFFECT_ATK_PLUS_1 0xF #define MOVE_EFFECT_DEF_PLUS_1 0xF
#define MOVE_EFFECT_DEF_PLUS_1 0x10 #define MOVE_EFFECT_SPD_PLUS_1 0x10
#define MOVE_EFFECT_SPD_PLUS_1 0x11 #define MOVE_EFFECT_SP_ATK_PLUS_1 0x11
#define MOVE_EFFECT_SP_ATK_PLUS_1 0x12 #define MOVE_EFFECT_SP_DEF_PLUS_1 0x12
#define MOVE_EFFECT_SP_DEF_PLUS_1 0x13 #define MOVE_EFFECT_ACC_PLUS_1 0x13
#define MOVE_EFFECT_ACC_PLUS_1 0x14 #define MOVE_EFFECT_EVS_PLUS_1 0x14
#define MOVE_EFFECT_EVS_PLUS_1 0x15 #define MOVE_EFFECT_ATK_MINUS_1 0x15
#define MOVE_EFFECT_ATK_MINUS_1 0x16 #define MOVE_EFFECT_DEF_MINUS_1 0x16
#define MOVE_EFFECT_DEF_MINUS_1 0x17 #define MOVE_EFFECT_SPD_MINUS_1 0x17
#define MOVE_EFFECT_SPD_MINUS_1 0x18 #define MOVE_EFFECT_SP_ATK_MINUS_1 0x18
#define MOVE_EFFECT_SP_ATK_MINUS_1 0x19 #define MOVE_EFFECT_SP_DEF_MINUS_1 0x19
#define MOVE_EFFECT_SP_DEF_MINUS_1 0x1A #define MOVE_EFFECT_ACC_MINUS_1 0x1A
#define MOVE_EFFECT_ACC_MINUS_1 0x1B #define MOVE_EFFECT_EVS_MINUS_1 0x1B
#define MOVE_EFFECT_EVS_MINUS_1 0x1C #define MOVE_EFFECT_RECHARGE 0x1C
#define MOVE_EFFECT_RECHARGE 0x1D #define MOVE_EFFECT_RAGE 0x1D
#define MOVE_EFFECT_RAGE 0x1E #define MOVE_EFFECT_STEAL_ITEM 0x1E
#define MOVE_EFFECT_STEAL_ITEM 0x1F #define MOVE_EFFECT_PREVENT_ESCAPE 0x1F
#define MOVE_EFFECT_PREVENT_ESCAPE 0x20 #define MOVE_EFFECT_NIGHTMARE 0x20
#define MOVE_EFFECT_NIGHTMARE 0x21 #define MOVE_EFFECT_ALL_STATS_UP 0x21
#define MOVE_EFFECT_ALL_STATS_UP 0x22 #define MOVE_EFFECT_RAPIDSPIN 0x22
#define MOVE_EFFECT_RAPIDSPIN 0x23 #define MOVE_EFFECT_REMOVE_STATUS 0x23
#define MOVE_EFFECT_REMOVE_STATUS 0x24 #define MOVE_EFFECT_ATK_DEF_DOWN 0x24
#define MOVE_EFFECT_ATK_DEF_DOWN 0x25 #define MOVE_EFFECT_ATK_PLUS_2 0x25
#define MOVE_EFFECT_RECOIL_33 0x26 #define MOVE_EFFECT_DEF_PLUS_2 0x26
#define MOVE_EFFECT_ATK_PLUS_2 0x27 #define MOVE_EFFECT_SPD_PLUS_2 0x27
#define MOVE_EFFECT_DEF_PLUS_2 0x28 #define MOVE_EFFECT_SP_ATK_PLUS_2 0x28
#define MOVE_EFFECT_SPD_PLUS_2 0x29 #define MOVE_EFFECT_SP_DEF_PLUS_2 0x29
#define MOVE_EFFECT_SP_ATK_PLUS_2 0x2A #define MOVE_EFFECT_ACC_PLUS_2 0x2A
#define MOVE_EFFECT_SP_DEF_PLUS_2 0x2B #define MOVE_EFFECT_EVS_PLUS_2 0x2B
#define MOVE_EFFECT_ACC_PLUS_2 0x2C #define MOVE_EFFECT_ATK_MINUS_2 0x2C
#define MOVE_EFFECT_EVS_PLUS_2 0x2D #define MOVE_EFFECT_DEF_MINUS_2 0x2D
#define MOVE_EFFECT_ATK_MINUS_2 0x2E #define MOVE_EFFECT_SPD_MINUS_2 0x2E
#define MOVE_EFFECT_DEF_MINUS_2 0x2F #define MOVE_EFFECT_SP_ATK_MINUS_2 0x2F
#define MOVE_EFFECT_SPD_MINUS_2 0x30 #define MOVE_EFFECT_SP_DEF_MINUS_2 0x30
#define MOVE_EFFECT_SP_ATK_MINUS_2 0x31 #define MOVE_EFFECT_ACC_MINUS_2 0x31
#define MOVE_EFFECT_SP_DEF_MINUS_2 0x32 #define MOVE_EFFECT_EVS_MINUS_2 0x32
#define MOVE_EFFECT_ACC_MINUS_2 0x33 #define MOVE_EFFECT_THRASH 0x33
#define MOVE_EFFECT_EVS_MINUS_2 0x34 #define MOVE_EFFECT_KNOCK_OFF 0x34
#define MOVE_EFFECT_THRASH 0x35 #define MOVE_EFFECT_DEF_SPDEF_DOWN 0x35
#define MOVE_EFFECT_KNOCK_OFF 0x36 #define MOVE_EFFECT_CLEAR_SMOG 0x36
#define MOVE_EFFECT_DEF_SPDEF_DOWN 0x37 #define MOVE_EFFECT_SP_ATK_TWO_DOWN 0x37
#define MOVE_EFFECT_RECOIL_33_STATUS 0x38 #define MOVE_EFFECT_SMACK_DOWN 0x38
#define MOVE_EFFECT_RECOIL_50 0x39 #define MOVE_EFFECT_FLAME_BURST 0x39
#define MOVE_EFFECT_CLEAR_SMOG 0x3A #define MOVE_EFFECT_FEINT 0x3A
#define MOVE_EFFECT_SP_ATK_TWO_DOWN 0x3B #define MOVE_EFFECT_SPECTRAL_THIEF 0x3B
#define MOVE_EFFECT_SMACK_DOWN 0x3C #define MOVE_EFFECT_V_CREATE 0x3C
#define MOVE_EFFECT_FLAME_BURST 0x3D #define MOVE_EFFECT_HAPPY_HOUR 0x3D
#define MOVE_EFFECT_FEINT 0x3E #define MOVE_EFFECT_CORE_ENFORCER 0x3E
#define MOVE_EFFECT_SPECTRAL_THIEF 0x3F #define MOVE_EFFECT_THROAT_CHOP 0x3F
#define MOVE_EFFECT_V_CREATE 0x40 #define MOVE_EFFECT_INCINERATE 0x40
#define MOVE_EFFECT_HAPPY_HOUR 0x41 #define MOVE_EFFECT_BUG_BITE 0x41
#define MOVE_EFFECT_CORE_ENFORCER 0x42 #define MOVE_EFFECT_RECOIL_HP_25 0x42
#define MOVE_EFFECT_THROAT_CHOP 0x43 #define MOVE_EFFECT_RELIC_SONG 0x43
#define MOVE_EFFECT_INCINERATE 0x44 #define MOVE_EFFECT_TRAP_BOTH 0x44
#define MOVE_EFFECT_BUG_BITE 0x45 #define MOVE_EFFECT_SKY_DROP 0x45
#define MOVE_EFFECT_RECOIL_HP_25 0x46 #define MOVE_EFFECT_SCALE_SHOT 0x46
#define MOVE_EFFECT_RELIC_SONG 0x47 #define MOVE_EFFECT_BURN_UP 0x47
#define MOVE_EFFECT_TRAP_BOTH 0x48
#define MOVE_EFFECT_SKY_DROP 0x49
#define MOVE_EFFECT_SCALE_SHOT 0x4A
#define MOVE_EFFECT_BURN_UP 0x4B
#define NUM_MOVE_EFFECTS 0x4C #define NUM_MOVE_EFFECTS 0x48
#define MOVE_EFFECT_AFFECTS_USER 0x4000 #define MOVE_EFFECT_AFFECTS_USER 0x4000
#define MOVE_EFFECT_CERTAIN 0x8000 #define MOVE_EFFECT_CERTAIN 0x8000

358
include/constants/battle_move_effects.h
View File

@ -215,186 +215,184 @@
#define EFFECT_CAMOUFLAGE 211 #define EFFECT_CAMOUFLAGE 211
// New move effects // New move effects
#define EFFECT_PLEDGE 214 #define EFFECT_PLEDGE 212
#define EFFECT_FLING 215 #define EFFECT_FLING 213
#define EFFECT_NATURAL_GIFT 216 #define EFFECT_NATURAL_GIFT 214
#define EFFECT_WAKE_UP_SLAP 217 #define EFFECT_WAKE_UP_SLAP 215
#define EFFECT_WRING_OUT 218 #define EFFECT_WRING_OUT 216
#define EFFECT_HEX 219 #define EFFECT_HEX 217
#define EFFECT_ASSURANCE 220 #define EFFECT_ASSURANCE 218
#define EFFECT_TRUMP_CARD 221 #define EFFECT_TRUMP_CARD 219
#define EFFECT_ACROBATICS 222 #define EFFECT_ACROBATICS 220
#define EFFECT_HEAT_CRASH 223 #define EFFECT_HEAT_CRASH 221
#define EFFECT_PUNISHMENT 224 #define EFFECT_PUNISHMENT 222
#define EFFECT_STORED_POWER 225 #define EFFECT_STORED_POWER 223
#define EFFECT_ELECTRO_BALL 226 #define EFFECT_ELECTRO_BALL 224
#define EFFECT_GYRO_BALL 227 #define EFFECT_GYRO_BALL 225
#define EFFECT_ECHOED_VOICE 228 #define EFFECT_ECHOED_VOICE 226
#define EFFECT_PAYBACK 229 #define EFFECT_PAYBACK 227
#define EFFECT_ROUND 230 #define EFFECT_ROUND 228
#define EFFECT_BRINE 231 #define EFFECT_BRINE 229
#define EFFECT_VENOSHOCK 232 #define EFFECT_VENOSHOCK 230
#define EFFECT_RETALIATE 233 #define EFFECT_RETALIATE 231
#define EFFECT_BULLDOZE 234 #define EFFECT_BULLDOZE 232
#define EFFECT_FOUL_PLAY 235 #define EFFECT_FOUL_PLAY 233
#define EFFECT_PSYSHOCK 236 #define EFFECT_PSYSHOCK 234
#define EFFECT_ROOST 237 #define EFFECT_ROOST 235
#define EFFECT_GRAVITY 238 #define EFFECT_GRAVITY 236
#define EFFECT_MIRACLE_EYE 239 #define EFFECT_MIRACLE_EYE 237
#define EFFECT_TAILWIND 240 #define EFFECT_TAILWIND 238
#define EFFECT_EMBARGO 241 #define EFFECT_EMBARGO 239
#define EFFECT_AQUA_RING 242 #define EFFECT_AQUA_RING 240
#define EFFECT_TRICK_ROOM 243 #define EFFECT_TRICK_ROOM 241
#define EFFECT_WONDER_ROOM 244 #define EFFECT_WONDER_ROOM 242
#define EFFECT_MAGIC_ROOM 245 #define EFFECT_MAGIC_ROOM 243
#define EFFECT_MAGNET_RISE 246 #define EFFECT_MAGNET_RISE 244
#define EFFECT_TOXIC_SPIKES 247 #define EFFECT_TOXIC_SPIKES 245
#define EFFECT_GASTRO_ACID 248 #define EFFECT_GASTRO_ACID 246
#define EFFECT_STEALTH_ROCK 249 #define EFFECT_STEALTH_ROCK 247
#define EFFECT_TELEKINESIS 250 #define EFFECT_TELEKINESIS 248
#define EFFECT_POWER_SWAP 251 #define EFFECT_POWER_SWAP 249
#define EFFECT_GUARD_SWAP 252 #define EFFECT_GUARD_SWAP 250
#define EFFECT_HEART_SWAP 253 #define EFFECT_HEART_SWAP 251
#define EFFECT_POWER_SPLIT 254 #define EFFECT_POWER_SPLIT 252
#define EFFECT_GUARD_SPLIT 255 #define EFFECT_GUARD_SPLIT 253
#define EFFECT_STICKY_WEB 256 #define EFFECT_STICKY_WEB 254
#define EFFECT_METAL_BURST 257 #define EFFECT_METAL_BURST 255
#define EFFECT_LUCKY_CHANT 258 #define EFFECT_LUCKY_CHANT 256
#define EFFECT_SUCKER_PUNCH 259 #define EFFECT_SUCKER_PUNCH 257
#define EFFECT_SPECIAL_DEFENSE_DOWN_HIT_2 260 #define EFFECT_SPECIAL_DEFENSE_DOWN_HIT_2 258
#define EFFECT_SIMPLE_BEAM 261 #define EFFECT_SIMPLE_BEAM 259
#define EFFECT_ENTRAINMENT 262 #define EFFECT_ENTRAINMENT 260
#define EFFECT_HEAL_PULSE 263 #define EFFECT_HEAL_PULSE 261
#define EFFECT_QUASH 264 #define EFFECT_QUASH 262
#define EFFECT_ION_DELUGE 265 #define EFFECT_ION_DELUGE 263
#define EFFECT_FREEZE_DRY 266 #define EFFECT_FREEZE_DRY 264
#define EFFECT_TOPSY_TURVY 267 #define EFFECT_TOPSY_TURVY 265
#define EFFECT_MISTY_TERRAIN 268 #define EFFECT_MISTY_TERRAIN 266
#define EFFECT_GRASSY_TERRAIN 269 #define EFFECT_GRASSY_TERRAIN 267
#define EFFECT_ELECTRIC_TERRAIN 270 #define EFFECT_ELECTRIC_TERRAIN 268
#define EFFECT_PSYCHIC_TERRAIN 271 #define EFFECT_PSYCHIC_TERRAIN 269
#define EFFECT_ATTACK_ACCURACY_UP 272 #define EFFECT_ATTACK_ACCURACY_UP 270
#define EFFECT_ATTACK_SPATK_UP 273 #define EFFECT_ATTACK_SPATK_UP 271
#define EFFECT_HURRICANE 274 #define EFFECT_HURRICANE 272
#define EFFECT_TWO_TYPED_MOVE 275 #define EFFECT_TWO_TYPED_MOVE 273
#define EFFECT_ME_FIRST 276 #define EFFECT_ME_FIRST 274
#define EFFECT_SPEED_UP_HIT 277 #define EFFECT_SPEED_UP_HIT 275
#define EFFECT_QUIVER_DANCE 278 #define EFFECT_QUIVER_DANCE 276
#define EFFECT_COIL 279 #define EFFECT_COIL 277
#define EFFECT_ELECTRIFY 280 #define EFFECT_ELECTRIFY 278
#define EFFECT_SCALD 281 #define EFFECT_SCALD 279
#define EFFECT_REFLECT_TYPE 282 #define EFFECT_REFLECT_TYPE 280
#define EFFECT_SOAK 283 #define EFFECT_SOAK 281
#define EFFECT_GROWTH 284 #define EFFECT_GROWTH 282
#define EFFECT_CLOSE_COMBAT 285 #define EFFECT_CLOSE_COMBAT 283
#define EFFECT_LAST_RESORT 286 #define EFFECT_LAST_RESORT 284
#define EFFECT_RECOIL_33_STATUS 287 #define EFFECT_RECOIL_33_STATUS 285
#define EFFECT_FLINCH_STATUS 288 #define EFFECT_FLINCH_STATUS 286
#define EFFECT_RECOIL_50 289 #define EFFECT_RECOIL_50 287
#define EFFECT_SHELL_SMASH 290 #define EFFECT_SHELL_SMASH 288
#define EFFECT_SHIFT_GEAR 291 #define EFFECT_SHIFT_GEAR 289
#define EFFECT_DEFENSE_UP_3 292 #define EFFECT_DEFENSE_UP_3 290
#define EFFECT_NOBLE_ROAR 293 #define EFFECT_NOBLE_ROAR 291
#define EFFECT_VENOM_DRENCH 294 #define EFFECT_VENOM_DRENCH 292
#define EFFECT_TOXIC_THREAD 295 #define EFFECT_TOXIC_THREAD 293
#define EFFECT_CLEAR_SMOG 296 #define EFFECT_CLEAR_SMOG 294
#define EFFECT_HIT_SWITCH_TARGET 297 #define EFFECT_HIT_SWITCH_TARGET 295
#define EFFECT_FINAL_GAMBIT 298 #define EFFECT_FINAL_GAMBIT 296
#define EFFECT_CHANGE_TYPE_ON_ITEM 299 #define EFFECT_CHANGE_TYPE_ON_ITEM 297
#define EFFECT_AUTOTOMIZE 300 #define EFFECT_AUTOTOMIZE 298
#define EFFECT_COPYCAT 301 #define EFFECT_COPYCAT 299
#define EFFECT_DEFOG 302 #define EFFECT_DEFOG 300
#define EFFECT_HIT_ENEMY_HEAL_ALLY 303 #define EFFECT_HIT_ENEMY_HEAL_ALLY 301
#define EFFECT_SMACK_DOWN 304 #define EFFECT_SMACK_DOWN 302
#define EFFECT_SYNCHRONOISE 305 #define EFFECT_SYNCHRONOISE 303
#define EFFECT_PSYCHO_SHIFT 306 #define EFFECT_PSYCHO_SHIFT 304
#define EFFECT_POWER_TRICK 307 #define EFFECT_POWER_TRICK 305
#define EFFECT_FLAME_BURST 308 #define EFFECT_FLAME_BURST 306
#define EFFECT_AFTER_YOU 309 #define EFFECT_AFTER_YOU 307
#define EFFECT_BESTOW 310 #define EFFECT_BESTOW 308
#define EFFECT_ROTOTILLER 311 #define EFFECT_ROTOTILLER 309
#define EFFECT_FLOWER_SHIELD 312 #define EFFECT_FLOWER_SHIELD 310
#define EFFECT_HIT_PREVENT_ESCAPE 313 #define EFFECT_HIT_PREVENT_ESCAPE 311
#define EFFECT_SPEED_SWAP 314 #define EFFECT_SPEED_SWAP 312
#define EFFECT_DEFENSE_UP2_HIT 315 #define EFFECT_DEFENSE_UP2_HIT 313
#define EFFECT_REVELATION_DANCE 316 #define EFFECT_REVELATION_DANCE 314
#define EFFECT_AURORA_VEIL 317 #define EFFECT_AURORA_VEIL 315
#define EFFECT_THIRD_TYPE 318 #define EFFECT_THIRD_TYPE 316
#define EFFECT_FEINT 319 #define EFFECT_FEINT 317
#define EFFECT_SPARKLING_ARIA 320 #define EFFECT_SPARKLING_ARIA 318
#define EFFECT_ACUPRESSURE 321 #define EFFECT_ACUPRESSURE 319
#define EFFECT_AROMATIC_MIST 322 #define EFFECT_AROMATIC_MIST 320
#define EFFECT_POWDER 323 #define EFFECT_POWDER 321
#define EFFECT_SP_ATTACK_UP_HIT 324 #define EFFECT_SP_ATTACK_UP_HIT 322
#define EFFECT_BELCH 325 #define EFFECT_BELCH 323
#define EFFECT_PARTING_SHOT 326 #define EFFECT_PARTING_SHOT 324
#define EFFECT_SPECTRAL_THIEF 327 #define EFFECT_SPECTRAL_THIEF 325
#define EFFECT_V_CREATE 328 #define EFFECT_V_CREATE 326
#define EFFECT_MAT_BLOCK 329 #define EFFECT_MAT_BLOCK 327
#define EFFECT_STOMPING_TANTRUM 330 #define EFFECT_STOMPING_TANTRUM 328
#define EFFECT_CORE_ENFORCER 331 #define EFFECT_CORE_ENFORCER 329
#define EFFECT_INSTRUCT 332 #define EFFECT_INSTRUCT 330
#define EFFECT_THROAT_CHOP 333 #define EFFECT_THROAT_CHOP 331
#define EFFECT_LASER_FOCUS 334 #define EFFECT_LASER_FOCUS 332
#define EFFECT_MAGNETIC_FLUX 335 #define EFFECT_MAGNETIC_FLUX 333
#define EFFECT_GEAR_UP 336 #define EFFECT_GEAR_UP 334
#define EFFECT_INCINERATE 337 #define EFFECT_INCINERATE 335
#define EFFECT_BUG_BITE 338 #define EFFECT_BUG_BITE 336
#define EFFECT_STRENGTH_SAP 339 #define EFFECT_STRENGTH_SAP 337
#define EFFECT_MIND_BLOWN 340 #define EFFECT_MIND_BLOWN 338
#define EFFECT_PURIFY 341 #define EFFECT_PURIFY 339
#define EFFECT_BURN_UP 342 #define EFFECT_BURN_UP 340
#define EFFECT_SHORE_UP 343 #define EFFECT_SHORE_UP 341
#define EFFECT_GEOMANCY 344 #define EFFECT_GEOMANCY 342
#define EFFECT_FAIRY_LOCK 345 #define EFFECT_FAIRY_LOCK 343
#define EFFECT_ALLY_SWITCH 346 #define EFFECT_ALLY_SWITCH 344
#define EFFECT_RELIC_SONG 347 #define EFFECT_RELIC_SONG 345
#define EFFECT_ATTACKER_DEFENSE_DOWN_HIT 348 #define EFFECT_ATTACKER_DEFENSE_DOWN_HIT 346
#define EFFECT_BODY_PRESS 349 #define EFFECT_BODY_PRESS 347
#define EFFECT_EERIE_SPELL 350 #define EFFECT_EERIE_SPELL 348
#define EFFECT_JUNGLE_HEALING 351 #define EFFECT_JUNGLE_HEALING 349
#define EFFECT_COACHING 352 #define EFFECT_COACHING 350
#define EFFECT_LASH_OUT 353 #define EFFECT_LASH_OUT 351
#define EFFECT_GRASSY_GLIDE 354 #define EFFECT_GRASSY_GLIDE 352
#define EFFECT_REMOVE_TERRAIN 355 #define EFFECT_REMOVE_TERRAIN 353
#define EFFECT_DYNAMAX_DOUBLE_DMG 356 #define EFFECT_DYNAMAX_DOUBLE_DMG 354
#define EFFECT_DECORATE 357 #define EFFECT_DECORATE 355
#define EFFECT_SNIPE_SHOT 358 #define EFFECT_SNIPE_SHOT 356
#define EFFECT_TRIPLE_HIT 359 #define EFFECT_RECOIL_HP_25 357
#define EFFECT_RECOIL_HP_25 360 #define EFFECT_STUFF_CHEEKS 358
#define EFFECT_STUFF_CHEEKS 361 #define EFFECT_GRAV_APPLE 359
#define EFFECT_GRAV_APPLE 362 #define EFFECT_EVASION_UP_HIT 360
#define EFFECT_EVASION_UP_HIT 363 #define EFFECT_GLITZY_GLOW 361
#define EFFECT_DOUBLE_IRON_BASH 364 #define EFFECT_BADDY_BAD 362
#define EFFECT_GLITZY_GLOW 365 #define EFFECT_SAPPY_SEED 363
#define EFFECT_BADDY_BAD 366 #define EFFECT_FREEZY_FROST 364
#define EFFECT_SAPPY_SEED 367 #define EFFECT_SPARKLY_SWIRL 365
#define EFFECT_FREEZY_FROST 368 #define EFFECT_PLASMA_FISTS 366
#define EFFECT_SPARKLY_SWIRL 369 #define EFFECT_HYPERSPACE_FURY 367
#define EFFECT_PLASMA_FISTS 370 #define EFFECT_AURA_WHEEL 368
#define EFFECT_HYPERSPACE_FURY 371 #define EFFECT_PHOTON_GEYSER 369
#define EFFECT_AURA_WHEEL 372 #define EFFECT_SHELL_SIDE_ARM 370
#define EFFECT_PHOTON_GEYSER 373 #define EFFECT_TERRAIN_PULSE 371
#define EFFECT_SHELL_SIDE_ARM 374 #define EFFECT_JAW_LOCK 372
#define EFFECT_TERRAIN_PULSE 375 #define EFFECT_NO_RETREAT 373
#define EFFECT_JAW_LOCK 376 #define EFFECT_TAR_SHOT 374
#define EFFECT_NO_RETREAT 377 #define EFFECT_POLTERGEIST 375
#define EFFECT_TAR_SHOT 378 #define EFFECT_OCTOLOCK 376
#define EFFECT_POLTERGEIST 379 #define EFFECT_CLANGOROUS_SOUL 377
#define EFFECT_OCTOLOCK 380 #define EFFECT_BOLT_BEAK 378
#define EFFECT_CLANGOROUS_SOUL 381 #define EFFECT_SKY_DROP 379
#define EFFECT_BOLT_BEAK 382 #define EFFECT_EXPANDING_FORCE 380
#define EFFECT_SKY_DROP 383 #define EFFECT_SCALE_SHOT 381
#define EFFECT_EXPANDING_FORCE 384 #define EFFECT_METEOR_BEAM 382
#define EFFECT_SCALE_SHOT 385 #define EFFECT_RISING_VOLTAGE 383
#define EFFECT_METEOR_BEAM 386 #define EFFECT_BEAK_BLAST 384
#define EFFECT_RISING_VOLTAGE 387 #define EFFECT_COURT_CHANGE 385
#define EFFECT_BEAK_BLAST 388 #define EFFECT_STEEL_BEAM 386
#define EFFECT_COURT_CHANGE 389 #define EFFECT_EXTREME_EVOBOOST 387
#define EFFECT_STEEL_BEAM 390 #define EFFECT_DAMAGE_SET_TERRAIN 388 // genesis supernova
#define EFFECT_EXTREME_EVOBOOST 391
#define EFFECT_DAMAGE_SET_TERRAIN 392 // genesis supernova
#define NUM_BATTLE_MOVE_EFFECTS 393 #define NUM_BATTLE_MOVE_EFFECTS 389
#endif // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H #endif // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H

18
include/constants/battle_script_commands.h
View File

@ -298,15 +298,15 @@
#define MOVEEND_ATTACKER_VISIBLE 10 #define MOVEEND_ATTACKER_VISIBLE 10
#define MOVEEND_TARGET_VISIBLE 11 #define MOVEEND_TARGET_VISIBLE 11
#define MOVEEND_ITEM_EFFECTS_TARGET 12 #define MOVEEND_ITEM_EFFECTS_TARGET 12
#define MOVEEND_MOVE_EFFECTS2 13 #define MOVEEND_ITEM_EFFECTS_ALL 13
#define MOVEEND_ITEM_EFFECTS_ALL 14 #define MOVEEND_KINGSROCK 14 // These item effects will occur each strike of a multi-hit move
#define MOVEEND_KINGSROCK 15 // These item effects will occur each strike of a multi-hit move #define MOVEEND_SUBSTITUTE 15
#define MOVEEND_SUBSTITUTE 16 #define MOVEEND_SKY_DROP_CONFUSE 16
#define MOVEEND_SKY_DROP_CONFUSE 17 #define MOVEEND_UPDATE_LAST_MOVES 17
#define MOVEEND_UPDATE_LAST_MOVES 18 #define MOVEEND_MIRROR_MOVE 18
#define MOVEEND_MIRROR_MOVE 19 #define MOVEEND_NEXT_TARGET 19 // Everything up until here is handled for each strike of a multi-hit move
#define MOVEEND_NEXT_TARGET 20 // Everything up until here is handled for each strike of a multi-hit move #define MOVEEND_MULTIHIT_MOVE 20
#define MOVEEND_MULTIHIT_MOVE 21 #define MOVEEND_DEFROST 21
#define MOVEEND_MOVE_EFFECTS2 22 #define MOVEEND_MOVE_EFFECTS2 22
#define MOVEEND_RECOIL 23 #define MOVEEND_RECOIL 23
#define MOVEEND_MAGICIAN 24 // Occurs after final multi-hit strike, and after other items/abilities would activate #define MOVEEND_MAGICIAN 24 // Occurs after final multi-hit strike, and after other items/abilities would activate