Skip to content
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
Merged

Conversation

AsparagusEduardo
Copy link
Collaborator

@AsparagusEduardo AsparagusEduardo commented May 31, 2023

Added

General

Battle General

Move Effects

Item Effects

Battle AI

Tests

Changed

General

Graphical changes

Refactors

Cleanup

Fixed

General

Graphics

Battle Mechanics

Battle Animations

Battle AI

Pret merges

Discord contact info

AsparagusEduardo#6051

ghoulslash and others added 30 commits April 10, 2023 11:36
* 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 <[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]>
AgustinGDLV and others added 27 commits May 23, 2023 16:10
* Optimized battle gender checks

* Apply suggestions from code review

Co-authored-by: AgustinGDLV <[email protected]>

---------

Co-authored-by: AgustinGDLV <[email protected]>
* 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 <[email protected]>
Co-authored-by: Eduardo Quezada <[email protected]>
Index footprint images, convert Spinda spots to .png files
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
@AsparagusEduardo AsparagusEduardo marked this pull request as ready for review June 2, 2023 17:07
@AsparagusEduardo AsparagusEduardo merged commit 1dbf956 into rh-hideout:master Jun 2, 2023
@AsparagusEduardo AsparagusEduardo deleted the RHH/pr/version/1.5.0 branch May 14, 2024 22:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.