Multiple bug fixes

* Moves the Mystery Box activation into Event Constants. This means that now, the Mystery Box activation is handled in the save, preventing some jank from happening when resetting.
* The "don't switch off the box yet" variable is now always unset after entering a map. Meltan itself allows the variable to keep being re-set, which is super handy. Now, whenever you enter and exit maps, it'll work properly.
* Flying, using an Escape Rope, and using Dig, all now unset the Mystery Box. If for some reason everything fucks up, this'll fix it.
* Fixed a text bug with the scientist in Celadon University.
* Fixed a menu alignment issue with the Vermilion Beauty.
* Attempted to fix the Battle Tent exit. Failed. This is a really, really bad bug, hopefully this gets sorted sometime.
This commit is contained in:
Llinos Evans 2023-08-31 02:48:01 +01:00
parent f6cdf8d428
commit 138bfd7042
9 changed files with 26 additions and 22 deletions

View file

@ -88,9 +88,8 @@ TryDoWildEncounter:
; This used to be in engine/battle/core.asm.
; However, it was a bit buggy as the implementation was forced.
; So instead, we do this:
ld a, [wMysteryBoxActive] ; Load the box.
cp $01 ; Check if it's active.
jr z, .meltanEncounter ; If so, skip this.
CheckEvent EVENT_MYSTERY_BOX_ACTIVATED
jr nz, .meltanEncounter ; If so, skip this.
ld b, 0
add hl, bc
ld a, [hli]