fix: use normal water reflection when surfing under bridge#147
Open
aloven wants to merge 1 commit into
Open
Conversation
After returning from battle while surfing under a bridge, the reflection sprite was incorrectly using the high-bridge dark blue palette (because the player's currentMetatileBehavior reads the bridge tile at that X/Y coordinate from the upper map layer). Fix: in LoadObjectReflectionPalette, check if the object event has a surfing graphics ID (which persists through battle return, unlike the PLAYER_AVATAR_FLAG_SURFING flag which is restored later). If surfing, use the normal water reflection palette instead of the bridge palette.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description:
Fixes a visual bug where the player's reflection sprite would appear as a dark blob (bridge shadow palette) instead of a normal water reflection after returning from a battle while surfing under a bridge (e.g., Route 119/120).
Root cause:
LoadObjectReflectionPalettecheckscurrentMetatileBehaviorfor bridge type. Since the map grid returns the upper layer's metatile at that X/Y (the bridge), the function incorrectly selected the high-bridge dark blue palette. ThePLAYER_AVATAR_FLAG_SURFINGflag isn't restored yet during the ground effects initialization after battle return.Fix: Check the object event's
graphicsIdfor surfing sprite IDs (which persist through battle return). If the player has a surfing graphic, use the normal water reflection palette regardless of bridge metatile behavior.Resolves #146