minor fixes to Big Pink#2093
Merged
kjbranch merged 1 commit intovg-json-data:masterfrom Jun 12, 2025
Merged
Conversation
kjbranch
approved these changes
Jun 12, 2025
Contributor
kjbranch
left a comment
kjbranch
left a comment
There was a problem hiding this comment.
Good catch. In general, having two PRs in the same room is not going to cause conflicts, unless theyre changing a major portion of the room or significant changes to adjacent strats.
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
2 participants
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.
As I recently learned, those enemies are not called Zebbos but Zebs.
Since the devnote was part of a 2->12 strat, I think
1->15->12is probably an oversight?No idea if this pr is problematic since there's another one open for the same file right now.