forked from DizzyEggg/pokeemerald
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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.5.0 #3040
Merged
AsparagusEduardo
merged 620 commits into
rh-hideout:master
from
AsparagusEduardo:RHH/pr/version/1.5.0
Jun 2, 2023
Merged
Version 1.5.0 #3040
AsparagusEduardo
merged 620 commits into
rh-hideout:master
from
AsparagusEduardo:RHH/pr/version/1.5.0
Jun 2, 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
* implemented Revival Blessing
# Conflicts: # src/data/pokemon/evolution.h # src/field_poison.c
* 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 <eduardo602002@gmail.com>
* 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 <eduardo602002@gmail.com> --------- Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
* Optimized battle gender checks * Apply suggestions from code review Co-authored-by: AgustinGDLV <103095241+AgustinGDLV@users.noreply.github.com> --------- Co-authored-by: AgustinGDLV <103095241+AgustinGDLV@users.noreply.github.com>
* replace launchtemplate with createsprite using fix_launchtemplate.py * tidy up script * fix comment handing in fix_launchtemplate.py * fix double comma after sprite template * remove py script * convert launchtask -> createvisualtask * fix launchtask->createvisualtask issue * fix ANIM_PAL ORs * remove launchtemplate, launchtask macros * fix pal macros in z moves * fix bloom doom * add F_PAL_ALL_BUT_DEF * remove all ANIM_PAL_ usages * devestating drake fix * convert launchsoundtask and setblends * Reworked CFRU macro PR --------- Co-authored-by: ghoulslash <pokevoyager0@gmail.com> Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
Index footprint images, convert Spinda spots to .png files
Add some missing palette macro use
minor correction to the z-move fix Add comment to EFFECT_TRIPLE_KICK
# Conflicts: # data/battle_scripts_1.s # data/scripts/debug.inc # src/battle_util.c # test/ability_contrary.c
* Separate build directory for tests and TESTING define * fixup! Separate build directory for tests and TESTING define * fixup! Separate build directory for tests and TESTING define * fixup! Separate build directory for tests and TESTING define
…0602 # Conflicts: # graphics/pokemon/mawile/footprint.png # src/battle_gfx_sfx_util.c # src/fldeff_sweetscent.c # src/pokedex.c
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.
Added
General
Battle General
B_RESTORE_HELD_BATTLE_ITEMS
that restore non-berry single-use items after a battle by @AlexOn1ine in Adds defineB_RESTORE_HELD_BATTLE_ITEMS
following Gen9 #2932B_DOUBLE_WILD_REQUIRE_2_MONS
config.Move Effects
Item Effects
Battle AI
AI_FLAG_OMNISCIENT
flag by @ghoulslash in Add AI_FLAG_OMNISCIENT #2872Tests
PASSES_RANDOMLY
by @mrgriffin in Speed up PASSES_RANDOMLY via structured RNG #2720TESTING
define by @mrgriffin Separate build directory for tests and TESTING define #3002Changed
General
FLAG_SYS_POKEMON_GET
.Graphical changes
Refactors
zMovePower
field ingBattleMoves
in favor of a function. by @AsparagusEduardo in Removed zMovePower field in gBattleMoves in favor of a function. #2794ITEM_HAS_EFFECT
, allowing for items in of any ID to have effects by @AsparagusEduardo in Removed ITEM_HAS_EFFECT #2840Cleanup
Cmd_pickup
by @DizzyEggg in correct Cmd_pickup #2705BattleScript_TargetAbilityStatRaiseOnMoveEnd
by @DizzyEggg in Remove unused script BattleScript_TargetAbilityStatRaiseOnMoveEnd #2727assistPossibleMoves
fromBattleStruct
by @DizzyEggg in remove assist array from battle struct #2816Fixed
General
lvlDivBy10
value by @DizzyEggg in correct Cmd_pickup #2705B_UPDATED_MOVE_DATA
is set to Gen 9 by @fdeblasio in Updated Esper Wing's accuracy if B_UPDATED_MOVE_DATA is Gen9 #3004Graphics
Battle Mechanics
Battle Animations
GetBattleAnimMoveTargets
getting the wrong indices when the attacker is not the player by @ghoulslash in https://github.com/rh-hideout/Battle AI
Pret merges
Discord contact info
AsparagusEduardo#6051