diff --git a/data/trainers/special_moves.asm b/data/trainers/special_moves.asm index 8eff6241..6e1b7fa8 100644 --- a/data/trainers/special_moves.asm +++ b/data/trainers/special_moves.asm @@ -2164,10 +2164,10 @@ SpecialTrainerMoves: db LORELEI, 1 ; DEWGONG - db 1, 1, THUNDER_WAVE ; AQUA_JET - db 1, 2, DREAM_EATER ; WATERFALL - db 1, 3, SPORE ; BLIZZARD - db 1, 4, ENERGY_BALL ; REST + db 1, 1, AQUA_JET + db 1, 2, WATERFALL + db 1, 3, BLIZZARD + db 1, 4, REST ; CLOYSTER db 2, 1, EXPLOSION db 2, 2, PIN_MISSILE diff --git a/engine/battle/trainer_ai.asm b/engine/battle/trainer_ai.asm index 4cae3a0c..d6ce936a 100644 --- a/engine/battle/trainer_ai.asm +++ b/engine/battle/trainer_ai.asm @@ -129,19 +129,20 @@ AIMoveChoiceModification1: ; check if it is one of the debuffing AND damaging moves, otherwise ignore all damaging moves here ; treat the accuracy one, i.e. Mud Slap, differently from the other two, ; Mud Shot and Rock Tomb, which are stronger but reduce less useful stats in Speed +; Dream Eater goes here too as it does deal damage ld a, [wEnemyMoveEffect] cp ACCURACY_DOWN_SIDE_EFFECT_CERT jp z, .debuff_Accuracy cp SPEED_DOWN_SIDE_EFFECT_CERT jp z, .debuff_Speed -; if it is not the move above, check if it deals damage + cp DREAM_EATER_EFFECT + jp z, .dreamEaterEffect +; if it is not the move above, check if it deals damage; if yes, don't process to save time ld a, [wEnemyMovePower] cp 5 ; this is here to include OHKO moves jr nc, .nextMove ; we only care about non-damaging and OHKO moves right now ; read the effect and start comparing with a list of to-be-checked ones -------- ld a, [wEnemyMoveEffect] - cp DREAM_EATER_EFFECT - jp z, .dreamEaterEffect cp CURSE_EFFECT jp z, .curseEffect cp LEECH_SEED_EFFECT