Pret merge (17 of January) #6045
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
Removed an extra are
Update vars.h (cleanup)
missing const in extern gBasicHitSplatSpriteTemplate
extern gAncientPowerRockSpriteTemplate fix
remove undef TASK_NONE from list_menu
Fix CaveTransition pals
Replace the magic number opcodes in field script command macros with these new constants
* Missing bard song limit constants * Index bard sound arrays with word constants * Document bard music
|
Ready for review! |
AlexOn1ine
approved these changes
Jan 18, 2025
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.
This is a pret merge - DO NOT SQUASH!
Description
Conflicts:
event.incscript_cmd_table.incmauville_old_man.cbard_music/moves.hbard_music/pokemon.hDiscord contact info
bassoonian