11803 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
GriffinR	b3e75138da	Sync wireless improvements	2022-11-09 15:14:18 -05:00
GriffinR	9e24fe6ec8	Merge pull request #1816 from LOuroboros/patch-1 ... Fixed indentation in ScrCmd_faceplayer	2022-11-08 19:07:34 -05:00
LOuroboros	a35986fd9c	Fixed indentation in ScrCmd_faceplayer	2022-11-08 21:01:50 -03:00
Eduardo Quezada D'Ottone	e6ae0bd01e	Merge pull request #2434 from LOuroboros/badDreams ... Optimized Bad Dreams' code	2022-11-08 08:16:07 -03:00
GriffinR	0a6de12b5e	Merge pull request #1814 from AsparagusEduardo/pret/pr/storageDoc ... Doc missing uses of ST_OAM_OBJ_X in Pokémon Storage System	2022-11-06 23:35:53 -05:00
Eduardo Quezada	237877e21b	Doc missing uses of ST_OAM_OBJ_X in Pokémon Storage System	2022-11-07 00:00:23 -03:00
Eduardo Quezada	2ef2134be1	Moved Hunger Switch to form change table.	2022-11-06 17:12:34 -03:00
Eduardo Quezada	62912f8caf	Battle indicator now depends on species instead of held item ... - This is to avoid a situation where a user would plop a Primal Groudon and its indicator would become Alpha if it doesn't have a Red Orb.	2022-11-06 16:01:07 -03:00
Eduardo Quezada	0eccbdf980	Primal Reversion at the beginning of a battle now happens in the switchin ability loop, making it happen by speed order.	2022-11-06 00:36:25 -03:00
Eduardo Quezada	57bdb683ec	DoBurmyFormChange handled by FORM_CHANGE_END_BATTLE_TERRAIN	2022-11-05 23:27:40 -03:00
Eduardo Quezada	99536089cf	Renamed form change defines to be consistant with which function calls which	2022-11-05 22:02:25 -03:00
Eduardo Quezada	8f289714b2	Moved form change defines and descriptions to their own header	2022-11-05 21:36:45 -03:00
Eduardo Quezada	ceb5c8a00a	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/formBattleChange ... # Conflicts: # include/battle_util.h # src/battle_util.c	2022-11-05 20:11:33 -03:00
Eduardo Quezada	42f8e8c114	Multiple refactors ... - Added a general GetBattleFormChangeTargetSpecies instead of getting specific ones for Mega Evolution and Primal Reversion. - Added FORM_CHANGE_BATTLE_HP_PERCENT, to replace ShouldChangeFormHpBased. - Cleaned ifdefs for hold effects. - Finally removed UndoMegaEvolution. - FORM_CHANGE_FAINT and FORM_CHANGE_BATTLE_END restore to the first form before a battle form change if species isn't specified. - When changing from a form with more HP to one with less, now current HP is kept to fix Zygarde edge case. (Will likely need to be reworked for Dynamax, as it behaves differently) - Uses DoesSpeciesUseHoldItemToChangeForm in CanBattlerGetOrLoseItem.	2022-11-05 20:00:12 -03:00
BuffelSaft	1da4eb3b14	Merge pull request #2428 from AsparagusEduardo/RHH/pr/feature/DarkVoid ... Config for Dark Void being only usable by Darkrai	2022-11-05 22:42:51 +13:00
BuffelSaft	bbd7b205fd	Merge pull request #2433 from ghoulslash/be/bug_bite ... Redo Bug Bite	2022-11-05 22:08:47 +13:00
LOuroboros	f56df74576	Optimized Bad Dreams' code ... Misc: -Made the ability pop up stick around until the ability's effect ends just like in ORAS. -Updated sText_BadDreamsDmg accordingly while I was at it.	2022-11-04 14:58:58 -03:00
Eduardo Quezada D'Ottone	fa8bf80905	Merge pull request #2420 from LOuroboros/teleport ... Updated CanTeleport	2022-11-04 12:40:25 -03:00
Eduardo Quezada D'Ottone	2b5aff2764	Merge pull request #2426 from tustin2121-2/patch-linker ... GF Header and Modern Builds	2022-11-04 12:27:13 -03:00
BuffelSaft	d05c74b9e9	Merge pull request #2430 from AsparagusEduardo/RHH/pr/fix/BadDreams ... Fixed Bad Dream's ability popup message	2022-11-05 03:42:44 +13:00
ghoulslash	7a0e541413	workaround for GetBattlerHoldEffectParam to handle bug bite different battler id	2022-11-04 10:29:05 -04:00
Eduardo Quezada	5b1552514e	Review changes	2022-11-04 11:10:06 -03:00
GriffinR	b1af66ebe5	Merge pull request #1812 from tustin2121/patch-linker ... GF Header and Modern Builds	2022-11-04 09:31:31 -04:00
ghoulslash	1e6903840a	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into be/bugbite	2022-11-04 09:29:45 -04:00
ghoulslash	d13431b4ab	merge w rhh master	2022-11-04 09:29:39 -04:00
ghoulslash	f3d44f04f0	Merge pull request #1927 from AsparagusEduardo/PE_monAnimations ... Ported Gen 5 & 6 mon animations from Inclement Emerald + added most missing Gen 7 form animations	2022-11-04 09:17:31 -04:00
Eduardo Quezada	8c66b318eb	Fixed Bad Dream's ability popup message	2022-11-04 00:46:07 -03:00
Eduardo Quezada	d23b5c95c9	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/monAnimations ... # Conflicts: # src/data/pokemon_graphics/front_pic_anims.h # src/pokemon.c	2022-11-03 23:31:20 -03:00
Eduardo Quezada	fbc71b3686	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030	2022-11-03 21:46:37 -03:00
Eduardo Quezada	edf4e45c4d	Config for Dark Void being only usable by Darkrai	2022-11-03 21:36:12 -03:00
Eduardo Quezada D'Ottone	9ea3ad8938	Merge pull request #2427 from BuffelSaft/fix-stat-boost-on-hit ... Fix abilities that raise target's stat after hit	2022-11-03 08:50:18 -03:00
BuffelSaft	c169a9523e	Merge branch 'upcoming' into fix-stat-boost-on-hit	2022-11-03 22:01:30 +13:00
BuffelSaft	736ca893b6	Fix abilities that raise target's stat after hit ... Fix Justified, Berserk, Rattled, Stamina and Water Compaction printing the wrong message when they activate. Steam Engine was also updated to follow the gen 5+ ability activation method style.	2022-11-03 21:54:56 +13:00
tustin2121	116364334d	Fix build of jsonproc ... - Changing uint to unsigned int, as uint is not standard.	2022-11-02 19:51:43 -05:00
tustin2121	b32413d11e	Restoring the GFHeader ... - Also adding comment about what the header does and how to maintain it.	2022-11-02 12:45:36 -04:00
tustin2121	e698a6506f	Pinning GFHeader to front of modern ... - Pinning the GF Header, crt0, and main to the front of the ROM when building modern. - Moving the gflib before other source files, to make it closer to the non-modern linker script (and therefore smaller patches).	2022-11-02 12:44:32 -04:00
tustin2121	fd87c97ef8	Adding documentation about GFHeader	2022-11-02 12:42:58 -04:00
tustin2121	8ff5ae7eb4	Pinning the GF header to the front of modern ... - Pinning the GF Header, crt0, and main to the front of the ROM when building modern. - Moving the gflib before other source files, to make it closer to the non-modern linker script (and therefore smaller patches).	2022-11-02 12:42:26 -04:00
tustin2121	f4f9329653	Fix build of jsonproc ... - Changing uint to unsigned int, as uint is not standard.	2022-11-02 12:39:32 -04:00
Eduardo Quezada	271bff5675	Gen 5+ stat recalculate in the same party loop at the end of battle that changes forms.	2022-11-02 10:06:02 -03:00
Eduardo Quezada	8b0a848424	Zen Mode triggers at the beginning of a battle	2022-11-01 23:53:04 -03:00
Eduardo Quezada	15c12af2cf	Using TryBattleFormChange in place of certain TryFormChange	2022-11-01 23:50:26 -03:00
Eduardo Quezada D'Ottone	b8371500d3	Merge pull request #1676 from BuffelSaft/multistrike ... Multi-hit refactor and Parental Bond	2022-11-01 21:16:04 -03:00
ghoulslash	53061c7d62	Merge pull request #2391 from AsparagusEduardo/RHH/pr/sugardoodoodoodoodoodooaahhoneyhoney ... Implemented Honey's Sweet Scent functionality	2022-11-01 20:09:30 -04:00
ghoulslash	c6cb54b54e	Merge pull request #2319 from AsparagusEduardo/RHH/pr/Lures ... Implemented Lures and Repel/Lure "use another" menu	2022-11-01 20:05:15 -04:00
Eduardo Quezada	797c5514d3	Mega Evolution in form change tables	2022-11-01 18:37:23 -03:00
Eduardo Quezada	fa8b1b9c05	Updated descriptions of form change constants	2022-11-01 15:02:45 -03:00
Eduardo Quezada	f5b900e2ef	Defaults Primal Reversion indicator to Alpha when item not Red Orb.	2022-11-01 15:02:22 -03:00
Eduardo Quezada	a57f6d184b	Fainting by poison in the overworld reverts forms	2022-11-01 12:24:04 -03:00
Eduardo Quezada D'Ottone	ebc9fc31d2	Merge pull request #2416 from DizzyEggg/fix_palace ... Fix battle palace bug	2022-11-01 12:16:55 -03:00