Don't force the Encored move if it's cured with Mental Herb.

Author: FredrIQ

engine/battle/move_effects/attract.asm

@@ -167,7 +167,9 @@ CheckMentalHerb:
 	ld hl, CuredDisableWithItem
 	call nz, .print
 
-	jmp ConsumeUserItem
+	call ConsumeUserItem
+	xor a
+	ret
 
 .print
 	push bc

engine/battle/move_effects/encore_disable.asm

@@ -78,24 +78,26 @@ DoEncoreDisable:
 	jr z, .got_text_and_duration
 	ld hl, GotAnEncoreText
 	dec a
+	call .got_text_and_duration
+	ret z
 
 	; Force opponent to use encored move in case it moves second
-	push hl
-	push af
 	ld a, BATTLE_VARS_MOVE_OPP
 	call GetBattleVarAddr
 	ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP
 	call GetBattleVar
 	ld [hl], a
-	pop af
-	pop hl
+	ret
+
 .got_text_and_duration
 	inc c
 	swap c
 	or c
 	ld [de], a
 	call AnimateCurrentMove
 	call StdBattleTextbox
+
+	; Returns z if we had a mental herb.
 	jmp CheckOpponentMentalHerb
 
 .failed