Upcoming Merge 3rd #6
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
* Wake-Up Slap test typo * Update test/battle/move_effect/wake_up_slap.c Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com> --------- Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
* Fixes recoil moves not triggering berries if possible * Update battle_script_commands.h
* First version of new defines * Fixed cloaks * Fixed cloaks * Fixed cloaks * Fixed cloaks * Fixed cloaks * Removed old defines * Removed old defines * Removed old defines and cleaned up some macros * Undid changes to documentation Deleted unused defines Updated defines Fixed tests fixed docs * moved note to top per https://github.com/rh-hideout/pokeemerald-expansion/pull/5075\#discussion_r1783641599 * fixed alignment per https://github.com/rh-hideout/pokeemerald-expansion/pull/5075\#pullrequestreview-2341613591
* Add functionality to Poké Flute and Town Map * Poke flute in-battle * Address reviews * Update item_use.c * Update battle_message.c * Update battle_script_commands.c * Update battle_script_commands.c * Update battle_script_commands.c * Update battle_script_commands.c * Update battle_script_commands.c * Update battle_script_commands.c
Co-authored-by: ghoulslash <pokevoyager0@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.
...