New upcoming merge #8
Merged
Conversation
This file contains 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
Those offsets into gHeap are actually just inside of eContestTempSave.
…rn-blink-effect-offsets Remove usage of gHeap in sSpritePalettes_ContestantsTurnBlinkEffect
Co-authored-by: Hedara <hedara90@gmail.com>
…p depending on the wrong target mon type category.
BUGFIX: Fix Counter and Mirror Coat checking the wrong category
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Add TRY_DRAW_SPOT_PIXEL
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Hedara <hedara90@gmail.com> Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
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.
Merged
upcominginto branch and fixed conflict, tests pass locally.