From 34559f1b39cd9223a3f0ad6ddd64660891356fbb Mon Sep 17 00:00:00 2001 From: thornAvery <145814585+thornAvery@users.noreply.github.com> Date: Sat, 11 Nov 2023 14:15:41 +1100 Subject: [PATCH] fix meltan again bringing in the new pokemon through the index off --- engine/battle/core.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 7e459be3..a52f2d37 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -844,7 +844,7 @@ FaintEnemyPokemon: ; This checks if the opponent is Meltan, the Jar isn't full, and it's in the bag. ; If so, it increments the amount of candies in the jar. Once full, it stops counting. ld a, [wEnemyMonSpecies] ; Load species. - cp $E4 ; Is it Meltan? + cp $E6 ; Is it Meltan? jr nz, .skip ; Continue as normal if not. ld b, CANDY_JAR ; Ok, we have a Meltan on our hands. Is the Jar in the bag?