thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-11-11 15:54:49 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #22 from thornAvery/master

Browse source 
fixed candy jar
This commit is contained in:
Llinos Evans 2023-10-04 08:17:59 +01:00 committed by GitHub
parent d96bf21181 89847a3bfc
commit 490987225e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
engine/battle/core.asm
View file

@ -844,7 +844,7 @@ FaintEnemyPokemon:
; This checks if the opponent is Meltan, the Jar isn't full, and it's in the bag. ; 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. ; If so, it increments the amount of candies in the jar. Once full, it stops counting.
ld a, [wEnemyMonSpecies] ; Load species. ld a, [wEnemyMonSpecies] ; Load species.
cp $E7 ; Is it Meltan? cp $E4 ; Is it Meltan?
jr nz, .skip ; Continue as normal if not. 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? ld b, CANDY_JAR ; Ok, we have a Meltan on our hands. Is the Jar in the bag?