2901 Commits

Author	SHA1	Message	Date
Eduardo Quezada D'Ottone	db9933ce67	Merge pull request #1244 from ghoulslash/popup ... toggleable manual ability popup destruction	2020-12-12 20:36:55 -03:00
LOuroboros	33d7f22494	Improved the comment of B_STANCE_CHANGE_FAIL	2020-12-11 21:54:17 -03:00
Evan	426ea191ad	style fix	2020-12-05 21:04:12 -07:00
Evan	d5ad14c349	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into popup	2020-12-05 21:03:20 -07:00
Evan	5478179464	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_anims	2020-12-01 17:46:26 -05:00
ExpoSeed	aa7facf57b	Merge pull request #1243 from ghoulslash/abilities ... Finish Switch In Ability Activation Messages	2020-11-28 20:27:32 -06:00
Eduardo Quezada D'Ottone	7aa999af59	Merge pull request #1235 from ultima-soul/ability_expansion ... Expand Ability IDs to u16, Add SWSH Ability Data, and Remove Cacophony	2020-11-28 14:56:01 -03:00
Evan	7c6e74ab69	update terrain bg config option comment	2020-11-24 21:17:31 -05:00
Evan	ef43596a79	toggleable manual ability popup destruction	2020-11-19 15:16:27 -07:00
Evan	07a4400d50	finish switch in ability messages	2020-11-19 11:42:00 -07:00
ultima-soul	fdfe330330	Merge pull request #519 from Pyredrid/doublescriptedwilds ... Added commands for scripted double wild battles	2020-11-18 08:57:19 -08:00
Evan	5c658c6950	config option for terrain bg change	2020-11-17 20:26:09 -07:00
Evan	c026f705b3	permanent terrain move bgs	2020-11-17 19:45:27 -07:00
ultima-soul	e15a86caae	Add ifdef for Hidden Abilities from Pokémon Expansion and change gBattlerAbility back to a u8.	2020-11-17 10:32:24 -08:00
ultima-soul	63bd0ec836	Remove Cacophony and fix some Gen 8 ability descriptions to fit.	2020-11-16 15:42:09 -08:00
ultima-soul	e32659d4bb	Merge branch 'battle_engine' into ability_expansion and add Gen 8 DLC abilities.	2020-11-16 13:50:26 -08:00
Eduardo Quezada D'Ottone	4da357aef4	Fixed compatibility with Pokémon Expansion	2020-11-15 13:35:02 -03:00
ghoulslash	686ff59b11	Merge pull request #13 from AsparagusEduardo/PR-LGPE_IOA_Moves ... LGPE & Isle of Armor move data.	2020-11-15 08:29:10 -07:00
Eduardo Quezada D'Ottone	f0154028ff	Review changes 2	2020-11-14 09:01:43 -03:00
Eduardo Quezada D'Ottone	e87f0f1ddb	Review changes	2020-11-13 14:51:50 -03:00
ultima-soul	236d7145ae	Merge pull request #1220 from AsparagusEduardo/BE-SteelResistances ... Added config option for Steel type resistances.	2020-11-12 23:25:21 -08:00
ultima-soul	c3423b4212	Merge pull request #1206 from ExpoSeed/type-changing-moves ... Refactor move effects for type changing moves	2020-11-12 19:10:48 -08:00
Eduardo Quezada D'Ottone	4b9d0d8e24	Added config option for Steel type resistances.	2020-11-11 17:48:02 -03:00
ExpoSeed	0912577ea1	Merge pull request #575 from AsparagusEduardo/BE-WishMegaEvo ... Implemented Wish Mega Evolution	2020-11-11 11:05:06 -06:00
Eduardo Quezada D'Ottone	e021a4aa87	Critical Capture Config Option And Catching Charm #556 from ghoulslash ... Critical Capture Config Option And Catching Charm	2020-11-10 17:31:08 -03:00
Eduardo Quezada D'Ottone	e6f8d57f08	Merge remote-tracking branch 'RHH/battle_engine' into BE-WishMegaEvo ... # Conflicts: # include/constants/battle_string_ids.h	2020-11-10 17:28:17 -03:00
LOuroboros	bb4f00737e	B_EXPANDED_INTIMIDATE->B_UPDATED_INTIMIDATE	2020-11-10 14:26:47 -03:00
Evan	de0518121e	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine	2020-11-10 09:00:30 -07:00
LOuroboros	a25190f357	A few things. ... -Introduced a Gen. 8 styled text string for Intimidate -Added an ability popup to BattleScript_IntimidatePrevented	2020-11-10 10:34:51 -03:00
LOuroboros	e179b9b5fe	Updated Intimidate to Gen. 8 standard	2020-11-10 10:18:16 -03:00
Eduardo Quezada D'Ottone	33ed87e2cb	Capitalization	2020-11-09 14:52:18 -03:00
Eduardo Quezada D'Ottone	3a984136e7	Updated comment.	2020-11-09 14:50:18 -03:00
Eduardo Quezada D'Ottone	df4d927e31	Moved BATTLE_ENGINE define to global.h to fix reading from other branches	2020-11-09 12:45:31 -03:00
Eduardo Quezada D'Ottone	ddb6142709	Review changes 3.	2020-11-08 21:08:58 -03:00
Eduardo Quezada D'Ottone	35d5324324	Review changes.	2020-11-08 21:02:34 -03:00
Evan	03f480fa17	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine	2020-11-08 15:21:48 -07:00
Evan	980f208b78	use NATIONAL_DEX_COUNT for critical capture odds	2020-11-08 14:07:43 -07:00
ExpoSeed	d2566c8988	Refactor Multi-Attack, Judgment, and Techno Blast to use the same move effect	2020-11-07 23:34:04 -06:00
ultima-soul	99fdc13e61	Merge branch 'master' into battle_engine_sync	2020-11-07 15:59:20 -08:00
Eduardo Quezada D'Ottone	09a5d6c722	Implemented Wish Mega Evolution	2020-11-07 10:13:32 -03:00
MCboy	e31158d017	add spaces around - and remove comment from include in battle.h	2020-11-06 23:29:52 +03:30
MCboy	3b91735e63	use constants for ball throw count	2020-11-06 22:59:46 +03:30
Evan	b3d1e8b5b8	turn crit capture odds into a ratio	2020-11-03 08:57:11 -07:00
PikalaxALT	99dd461bef	Merge pull request #1189 from aaaaaa123456789/reverts ... Undo PokeCodec's PRs and port changes	2020-11-03 09:28:45 -05:00
Kurausukun	6545745e59	Merge branch 'reverts' of https://github.com/aaaaaa123456789/pokeemerald into reverts	2020-11-02 18:43:40 -05:00
Kurausukun	8bf401c227	address comments	2020-11-02 18:43:11 -05:00
Evan	e7372e7c5b	add B_ prefix to critical capture configs	2020-11-01 21:50:34 -07:00
Evan	59692e8e7f	styling fix	2020-11-01 21:08:58 -07:00
Evan	a6c3d950f6	critical capture config option and catching charm	2020-11-01 16:15:42 -07:00
Eduardo Quezada D'Ottone	5a201f006f	More exp options in battle_config (#530) from MandL27	2020-11-01 19:41:29 -03:00