Candy Jar finished

- Fixed a bug where the Candy Jar would load `wIsInBattle`'s 01, causing it to zero itself out every time.
- Fixed a bug where the Candy Jar would display `wMysteryBoxActive` due to the way `text_bcd` was being used. Replaced with `text_decimal` so it actually displays properly as well. No hex!!
- Added a test function for the evolution in the debug party because that's cool
This commit is contained in:
Llinos Evans 2023-05-31 23:56:22 +01:00
parent 228de2b718
commit 9c953339af
4 changed files with 11 additions and 6 deletions

View file

@ -846,15 +846,16 @@ FaintEnemyPokemon:
cp $E7 ; Is it Meltan?
jr nz, .skip ; Continue as normal if not.
; Increment the Candy Jar count.
ld a, [wCandyJarCount]
inc a
ld [wCandyJarCount], a
; For engine\overworld\clear_variables.asm
; Needed so the Mystery Box effect isn't cleared upon leaving battle.
ld a, $01
ld [wDontSwitchOffMysteryBoxYet], a
ld a, [wCandyJarCount]
inc a
ld [wCandyJarCount], a
ld hl, MeltanIncrement ; Load text to show it's going up.
call PrintText ; Yep text.
call PrintEmptyString ; vs text likes this.