Bug Fixes

Fixes the following bugs:
- Restores the Museum Guy's functionality that was removed when trying to allow Brock skip. Now works fine.
- Attempt to fix Yujirou's Sabrina-like glitch. If this doesn't fix it, look at Sabrina between RB and Y
- Attempt to fix some Misty text.
- Changed Squirtle check to use EVENT_BEAT_SURGE over the ThunderBadge. Same effect, saves a line of code, generally easier.
- Reverts a really old and shoddy DV generation system back to vanilla.

Also, I changed some gym/rival teams to reflect new philosophies from Discord discussion.
This commit is contained in:
Llinos Evans 2023-07-08 10:01:27 +01:00
parent 9528f45ce2
commit 8a87ce000e
7 changed files with 71 additions and 73 deletions

View file

@ -441,8 +441,7 @@ OfficerJennySquirtle:
text_asm
CheckEvent EVENT_GOT_SQUIRTLE
jr nz, .howDoing
ld a, [wObtainedBadges]
bit 3, a ; THUNDERBADGE
CheckEvent EVENT_BEAT_LT_SURGE
jr z, .noBadge
ld hl, OfficerJennyHasBadge
call PrintText