Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Bug Catching Contest End Early FadeInPalettes #931

Merged
merged 1 commit into from
Feb 17, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion maps/Route36NationalParkGate.asm
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,18 @@ Route36NationalParkGateLeftTheContestEarly:
closetext
special Special_FadeBlackQuickly
special Special_ReloadSpritesNoPalettes
callasm DisableDynPalUpdates
scall .CopyContestants
disappear ROUTE36NATIONALPARKGATE_OFFICER1
appear ROUTE36NATIONALPARKGATE_OFFICER2
applymovement PLAYER, Route36NationalParkGatePlayerWaitWithContestantsMovement
pause 15
special Special_FadeInQuickly
callasm SetBlackObjectPals
callasm ClearSavedObjPals
callasm EnableDynPalUpdatesNoApply
callasm _UpdateSprites
callasm DelayFrame
callasm FadeInPalettes
jumpstd bugcontestresults

.GoBackToContest:
Expand Down