forked from DizzyEggg/pokeemerald
-
Notifications
You must be signed in to change notification settings - Fork 1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Version 1.4.0 #2711
Merged
mrgriffin
merged 554 commits into
rh-hideout:master
from
AsparagusEduardo:RHH/pr/version/1.4.0
Feb 19, 2023
Merged
Version 1.4.0 #2711
mrgriffin
merged 554 commits into
rh-hideout:master
from
AsparagusEduardo:RHH/pr/version/1.4.0
Feb 19, 2023
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
Updated HOLD_EFFECT_ZOOM_LENS check
…_20230103 # Conflicts: # include/link_rfu.h
Reshape sBattlePointAwards to be easier to read
Document wonder news
…20230103 For me, it was tuesday. (pret merge 2023/01/03)
Fixed reusable repels/lures function forcefully using items while menu config is on
Updated AnimTask_PrimalReversion
…getDmg Config to restore Gen 3's damage reduction to multi target moves
…e/palleteConversion2 # Conflicts: # include/config/pokemon.h
# Conflicts: # src/data/pokemon/species_info.h # src/data/pokemon_graphics/front_pic_anims.h
Gen 1-5 Palette Conversion Redemption
Removed Unown hack
# Conflicts: # include/constants/battle_move_effects.h
…nown Revert "Removed Unown hack"
Rolled EFFECT_SCALD into EFFECT_BURN_HIT with a config for its Gen6+ change
…able, allowing for custom combinations
# Conflicts: # include/config/pokemon.h
…Baby Refactored incense baby checks into table and added Gen 9 config.
-Removed unnecessary special handling of terrain-inducing overworld weather states from ChangeTypeBasedOnTerrain. -Mimicry now activates normally for terrain-inducing overworld weather states. -Weather abilities now activate normally when switchineffects is called, and at the beginning of a battle. -Terrain abilities now activate normally at the beginning of a battle.
* fix follow me working in singles
Fix Shield Down Ability pop-up
Fix Clanging Scales target and effect
Fix 1 vs 2 battles with eggs
Fix Mirror Armor against Clear Body
Fix Battle Bond activating multiple times in battle
Improve Hydra output
Fix After You
It's ya boi, pret merge! (pret merge 2023/02/16)
CMD_ARGS for regular commands, VARIOUS_ARGS for various commands, and NATIVE_ARGS for callnative commands.
* Howl gen8 effect
* Fix Magic bounce powder moves against grass types
Readable BattleScript command arguments
Co-authored-by: ghoulslash <[email protected]>
… Rare Candies. (#2565)
* Removed unused ifdefs and made actually check for Z Power Ring * Config to have Shuckle make Berry Juice from Oran Berries * Ordered species-specific configs
…ixes (#2649) * add createvisualtaskontargets, createspriteontargets to fix electroweb, fiery wrath anims * add missing semicolon * add Cmd_createspriteontargets_onpos for heal block, fix heal block targeting * remove duplicate func * improve origin pulse anim * fix IsDoubleBattle call * venom drench acid uses average battler positions * add GetSubpriorityForMoveAnim * add GetBattleAnimMoveTargets for CreateSpriteOnTargets and Cmd_createvisualtaskontargets --------- Co-authored-by: ghoulslash <[email protected]>
* try illusion fix * fix
Updated Psyshield Bash's accuracy
mrgriffin
approved these changes
Feb 19, 2023
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.
Description
Added
General
test\test_battle.h
.Moves
EFFECT_SLEEP_HIT
)EFFECT_DOUBLE_SHOCK
)EFFECT_PROTECT
but the condition to check the move in specific) by @ghoulslash in Silk Trap Effect #2512 and Silk trap Animation #2610EFFECT_SPECIAL_ATTACK_UP_HIT
)EFFECT_VICTORY_DANCE
)B_ROOST_PURE_FLYING
) by @mrgriffin in Minor Roost fixes/cleanup #2530Abilities
Items
Changed
Graphical changes
Refactors
SPECIES_FLAG_SHINY_LOCKED
in favor of actual flags to control when to generate Shiny/Non-Shiny mon (P_FLAG_FORCE_SHINY
andP_FLAG_FORCE_NO_SHINY
) by @AsparagusEduardo in Refactored Shiny configs + cleanup #2453ENDTURN_PLASMA_FISTS
loop by @LOuroboros in Cleaned redundant ENDTURN_PLASMA_FISTS loop #2520EFFECT_SCALD
intoEFFECT_BURN_HIT
with a config for its Gen6+ change by @AsparagusEduardo in Rolled EFFECT_SCALD into EFFECT_BURN_HIT with a config for its Gen6+ change #2326EFFECT_HIT_SWITCH_TARGET
instead of Dragon Tail and Circle Throw specifically by @AsparagusEduardo in Cleaned up move effect checks for Dragon Tail/Circle Throw #2439Cleanup
include/constants/x_config.h → include/config/x.h
) by @AsparagusEduardo in Refactored Shiny configs + cleanup #2453roostTypes
element by @mrgriffin in Minor Roost fixes/cleanup #2530CheckFocusPunch_ClearVarsBeforeTurnStarts
toCheckChosenMoveForEffectsBeforeTurnStarts
because that function doesn't just check for Focus Punch anymore, and it doesn't clear any variables either. by @LOuroboros in Applied minor tweaks #2544SpeciesInfo
(BaseStats
) struct offset labels by @DizzyEggg in Fix SpeciesInfo(base stats) struct offset labels #2666Other
FLAG_SYS_POKEMON_GET
giving yourself a Pokémon by @Bassoonian in Set FLAG_SYS_POKEMON_GET when debug gifting yourself a Pokémon #2475Fixed
Softlocks
Graphics
BattleScript_TrainerSlideMsgRet
by @ghoulslash in Set battler before BattleScript_TrainerSlideMsgRet #2466Battle Mechanics
TryChangeBattleTerrain
by @LOuroboros in Fixed potential error in TryChangeBattleTerrain #2469MOVE_EFFECT_FEINT
by @LOuroboros in Fixed potential bug for moves that use MOVE_EFFECT_FEINT #2516HOLD_EFFECT_ZOOM_LENS
check that caused every move's attack to be increased by the hold effect parameter by @LOuroboros in Fixed HOLD_EFFECT_ZOOM_LENS check #2557Move Animations
MOVE_TARGET_BOTH
by @ghoulslash in Fix Poison Gas Anim for MOVE_TARGET_BOTH #2608Battle AI
Other
SPECIES_KYUREM_WHITE
onward to play the wrong cries by @AsparagusEduardo in Fix cry table alignment due to missing placeholder Enamorus Therian cry #2462B_DOUBLE_WILD_CHANCE
becoming 1% less than what's set by @AsparagusEduardo in Fixed B_DOUBLE_WILD_CHANCE becoming 1% less than what's set #2526Pret merges
New Contributors
Full Changelog: expansion/1.3.0...expansion/1.4.0
Discord contact info
AsparagusEduardo#6051