a few small bug fixes

mainly, making the SS Anne come back after getting the Marsh Badge, cause otherwise it would be useless.
This commit is contained in:
MementoMartha 2023-04-17 17:29:58 +01:00
parent c6cd81fcc8
commit 6c43b45213
8 changed files with 43 additions and 43 deletions

View file

@ -161,7 +161,7 @@ VermilionCityTextSSAnneDeparted:
VermilionCityText3:
text_asm
ld a, [wObtainedBadges]
bit 4, a ; after obtaining soul badge the ship returns
bit 5, a ; after obtaining marsh badge the ship returns
jr nz, .default
CheckEvent EVENT_SS_ANNE_LEFT
jr nz, .shipHasDeparted
@ -244,7 +244,7 @@ VermilionCityText14:
VermilionCityText6:
text_asm
ld a, [wObtainedBadges]
bit 4, a ; after obtaining the soul badge the ship returns
bit 5, a ; after obtaining the marsh badge the ship returns
jr z, .default
ld hl, VermilionCityText15
ret

View file

@ -38,7 +38,7 @@ VermilionDock_Script:
VermilionDock_1db9b:
ld a, [wObtainedBadges]
bit 4, a ; after obtaining 4 badges the ship returns
bit 5, a ; after obtaining the marsh badge the ship returns
ret nz
SetEventForceReuseHL EVENT_SS_ANNE_LEFT
ld a, SFX_STOP_ALL_MUSIC