Merge upcoming #19
Merged
Merge upcoming #19
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
Now they can say something: -When their last Pokémon's HP is between 25% and 50%. -When a critical hit is dealt to their first Pokémon for the first time. -When a super effective hit is dealt to their first Pokémon for the first time. -When a STAB move is used against (but doesn't faint) the opponent's Pokémon. -When the Player's Pokémon's move doesn't affect the opponent's Pokémon. -When they're about to trigger a Mega Evolution. -When they're about to trigger a Z-Move. Misc. changes: -Split GetEnemyMonCount for readability's sake. -Optimized the size allocated to trainerSlideLowHpMsgDone.
…expansion into trainerSlideMsgUpdate
…expansion into trainerSlideMsgUpdate
…expansion into trainerSlideMsgUpdate
Now a trainer NPC can also say something before the first turn of a battle starts for good.
…expansion into trainerSlideMsgUpdate
Added Overworld_ResetBattleFlagsAndVars to Overworld_ResetStateAfterWhiteOut
… to toggle Overworld_ResetBattleFlagsAndVars
Took suggestions from rh-hideout#2875 (comment) Co-authored-by: LOuroboros <[email protected]>
* items that can be used in battle now use battlescripts * removed ExecuteTableBasedItemEffect_ * taught AI how to use items, removed AI_itemtype/flag * X-Items store stages raised in holdEffectParam * USE_ITEM in tests
Inline GetBattlerPartyData into its callers because its name is confusing and we couldn't think of a better one. This seems to fix a bug in one place where GetBattlerPartyData was being used as if it had GetBattlerParty semantics.
this came up in a conversation on discord. its not tested.
Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>
* Fix battle message strings for stats
* Fix hisuian typlosion * Fix mega metagross backsprite * Fix shiny Reuniclus * Fix Duosion mouth * Fix front mega metagross * Fix front Yanmega * Fix Electivire front sprite * Fix shiny duskull * Fix Hariyama sprite * Fix Shiny masquerain
* Reusable TMs * Forgot about Gen9 making TMs expendable again * Change importance check based on Alex's suggestion * Prevent items with importance from being bought more than once * Change importance check to ghoul's suggestion * Update include/config/item.h Co-authored-by: Eduardo Quezada D'Ottone <[email protected]> --------- Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>
Co-authored-by: LOuroboros <[email protected]>
…expansion into trainerSlideMsgUpdate
Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>
…expansion into formbattlechangecontribution
AsparagusEduardo
merged commit f87c5e7
into
AsparagusEduardo:RHH/pr/feature/formBattleChange
AsparagusEduardo
pushed a commit
that referenced
this pull request
Jan 10, 2024
Fix broken cave transition in Task_EnterCaveTransition3
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.
See title