ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-05 19:00:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix move effect defines

Browse Source 
Had a define in a comment, which offset all the new move effects and misaligned their battle scripts.
This commit is contained in:
BuffelSaft 2021-11-01 23:51:03 +13:00
parent 0345dea918
commit 5d678bc2ce
2 changed files with 158 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
data/battle_scripts_1.s
View File

@ -3551,16 +3551,6 @@ BattleScript_EffectConfuseHit::
setmoveeffect MOVE_EFFECT_CONFUSION setmoveeffect MOVE_EFFECT_CONFUSION
goto BattleScript_EffectHit goto BattleScript_EffectHit
BattleScript_EffectTwineedle::
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
sethword sMULTIHIT_EFFECT, MOVE_EFFECT_POISON
attackstring
ppreduce
setmultihitcounter 2
initmultihitstring
goto BattleScript_MultiHitLoop
BattleScript_EffectSubstitute:: BattleScript_EffectSubstitute::
attackcanceler attackcanceler
ppreduce ppreduce

316
include/constants/battle_move_effects.h
View File

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