929 Commits

Author	SHA1	Message	Date
Evan	f172245ad6	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into totem	2021-01-01 08:49:43 -07:00
ExpoSeed	24362e8bed	Merge pull request #1250 from ghoulslash/infestation ... infestation between turn anim	2020-12-31 18:06:13 -06:00
ghoulslash	450ac70ab2	Merge pull request #1288 from LOuroboros/comments ... Some more small battle_config.h tweaks	2020-12-23 10:27:09 -07:00
ghoulslash	0af8cab87e	Merge pull request #1283 from LOuroboros/ct_moves_data ... Added the data of SwSh's Crown Tundra's moves	2020-12-21 23:13:23 -07:00
Evan	b85dacce9d	fix conflicts	2020-12-14 08:50:41 -07:00
Evan	ead8637e4f	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into infestation	2020-12-13 17:09:04 -07:00
Eduardo Quezada D'Ottone	47d96aed3c	Merge pull request #1285 from LOuroboros/spite ... Updated Spite	2020-12-12 22:27:26 -03:00
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	31d483ef44	Some more battle_config.h tweaks	2020-12-12 11:35:05 -03:00
LOuroboros	c5e04cf243	Removed the unnecessary Dragon Energy effect ... The move is an Eruption clone, whose effect was already done. Thanks to BuffelSaft for the heads up. I took the chance and fixed its target too.	2020-12-12 01:35:54 -03:00
LOuroboros	33d7f22494	Improved the comment of B_STANCE_CHANGE_FAIL	2020-12-11 21:54:17 -03:00
LOuroboros	17a9555715	Oopsie.	2020-12-11 21:43:18 -03:00
LOuroboros	9ec2e44f4c	Updated Spite	2020-12-11 21:36:59 -03:00
LOuroboros	0ac026e6ca	Added the data of SwSh's Crown Tundra's moves ... And Dragon Energy's effect. Eerie Spell's is the only one missing out of this bunch.	2020-12-11 20:49:23 -03: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	21cab1b7a7	better negative totem boost system, totems occur before switch in abilities	2020-12-05 21:00:51 -07:00
Evan	4ad5e368a9	fix merge conflicts	2020-12-01 17:57:57 -05:00
Evan	1e68c46890	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into infestation	2020-12-01 17:51:38 -05: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
Evan	7c6e74ab69	update terrain bg config option comment	2020-11-24 21:17:31 -05:00
Evan	6c0878b5fe	infestation between turn anim	2020-11-24 17:21:59 -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
Evan	99d9a36860	add totem boosts	2020-11-19 10:35:37 -07: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	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	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