870 Commits

Author	SHA1	Message	Date
Eduardo Quezada D'Ottone	e880e4afdd	Merge branch 'battle_engine' into be_recalc_turn_order_after_actions	2022-01-22 19:01:45 -03:00
ghoulslash	7182f290c1	fix harvest activation msg	2022-01-16 12:39:08 -05:00
ghoulslash	f3b9e6bb63	Merge pull request #1976 from kleeenexfeu/patch-2 ... [battle_engine] Moxie interaction with spread move/follow me fix	2022-01-16 10:58:50 -05:00
LOuroboros	24b5a5709a	Allow Galarian Darmanitan's Zen Mode to work	2022-01-10 23:01:18 -03:00
Eduardo Quezada D'Ottone	eba4c36189	Merge pull request #2024 from TheXaman/rhh_BE_B_SLEEP_TURNS ... Yawn now uses B_SLEEP_TURNS	2022-01-07 21:56:06 -03:00
Eduardo Quezada D'Ottone	97baedbd5e	Merge pull request #1923 from WiserVisor/battle_engine ... Added Sky Drop to Battle Engine	2022-01-07 18:14:40 -03:00
TheXaman	328b501394	Update src/battle_util.c ... Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2022-01-05 18:54:42 +01:00
TheXaman	9733f92c7f	Yawn now uses B_SLEEP_TURNS, resolves #1873	2022-01-05 18:48:01 +01:00
WiserVisor	8923ffb3af	Merge branch 'battle_engine' into battle_engine	2021-12-23 15:29:10 -08:00
W1serV1ser	58a5a9cbec	Simplified skyDropTargets storage and made other minor improvements ... A lot of these changes are based on ghoulslash's version of Sky Drop.	2021-12-23 15:27:11 -08:00
Eduardo Quezada D'Ottone	4ab4250d5d	Merge branch 'battle_engine' into be/sports	2021-12-19 20:42:15 -03:00
Eduardo Quezada D'Ottone	6d17156f74	Merge pull request #1934 from BuffelSaft/fix-burmy ... Fix Burmy form change	2021-12-19 20:18:19 -03:00
Eduardo Quezada D'Ottone	4ca9f406f6	Merge pull request #1947 from LOuroboros/lightBall ... Updated Light Ball's effect and improved readability	2021-12-18 15:03:18 -03:00
Eduardo Quezada D'Ottone	3a24bc8298	Merge branch 'battle_engine' into DizzyEggg-patch-1	2021-12-18 14:52:19 -03:00
Eduardo Quezada D'Ottone	a075cca448	Merge branch 'battle_engine' into fix-burmy	2021-12-18 13:38:12 -03:00
Eduardo Quezada D'Ottone	aa2b2e6a70	Merge pull request #1929 from ultima-soul/battle_engine_sync ... Battle Engine Upstream Sync	2021-12-09 20:02:45 -03:00
ultima-soul	a5afdac0ae	Resolved review suggestions for upstream Battle Engine sync.	2021-12-08 12:08:16 -08:00
DizzyEggg	0a7dd2edd6	Fix Intimidate affecting fainted mons	2021-12-07 12:19:27 +01:00
kleeenexfeu	340d505116	Moxie/follow me fix	2021-12-04 17:41:31 +01:00
ultima-soul	7369f60c06	Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into battle_engine_sync	2021-12-03 17:30:45 -08:00
ghoulslash	e2af9ec3b4	ice type immunity to sheer cold	2021-11-26 11:49:49 -05:00
LOuroboros	68c557fd46	Updated Light Ball's effect and improved readability	2021-11-24 19:04:15 -03:00
ghoulslash	5c52abd856	gen3 sport move functionality behind config	2021-11-23 21:20:32 -05:00
ghoulslash	b5bc8bb346	fix B_SPORT_DMG_REDUCTION	2021-11-23 18:37:27 -05:00
ghoulslash	e3ddad2d11	add sport effects back	2021-11-23 18:36:10 -05:00
kleeenexfeu	1a3561bb0b	space	2021-11-23 13:48:03 +01:00
kleeenexfeu	6ceffaaf3e	recalculate turn order after relevant actions	2021-11-23 13:46:36 +01:00
BuffelSaft	62f01e89d7	Fix Burmy form change ... Wasn't properly tracking if Burmy had appeared in battle; gSentPokesToOpponent is used only for exp calculation and is cleared when an opponent faints, so a new var was needed.	2021-11-23 00:46:43 +13:00
W1serV1ser	5d1228fc2e	More spacing and format fixes	2021-11-21 15:42:31 -08:00
ultima-soul	3ed51d6d91	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-11-21 10:40:26 -08:00
ghoulslash	3fb62f74c6	fix rampage cancelling	2021-11-20 18:35:56 -05:00
W1serV1ser	844a0217f7	Fixed spacing, added braces, and reverted comment	2021-11-20 12:04:21 -08:00
W1serV1ser	c2f81cd5f5	Added Sky Drop	2021-11-20 11:44:48 -08:00
ghoulslash	fb468b6776	fix unseen fist check	2021-11-19 16:32:00 -05:00
Eduardo Quezada D'Ottone	ef3f573cc2	Merge pull request #1917 from BuffelSaft/unseen_fist ... Implement Unseen Fist	2021-11-19 17:29:25 -03:00
BuffelSaft	c4f27174c3	Implement Unseen Fist ... Unseen Fist allows contact moves to bypass protect effects, but doesn't lift the effect.	2021-11-19 16:21:33 +13:00
Eduardo Quezada D'Ottone	0af63c04eb	Removed redundant uses of STATUS3_GASTRO_ACID check.	2021-11-15 23:29:54 -03:00
ghoulslash	0e397c43fe	Merge pull request #1898 from AsparagusEduardo/BE_postIETweaks ... Adjusted elements to simplify the conflicts between BE and IE	2021-11-15 08:27:28 -05:00
BuffelSaft	d4fa346540	Fix Dark Aura and Fairy Aura ... Damage boost should be 33%, not 25%.	2021-11-15 21:40:20 +13:00
ghoulslash	8b296b97a8	Merge pull request #1887 from BuffelSaft/knock-off ... Fix Knock Off, add config	2021-11-14 08:27:51 -05:00
Eduardo Quezada D'Ottone	5b63f53262	Merge pull request #1834 from ghoulslash/be/neutralizing_gas ... Add Neutralizing Gas	2021-11-14 00:27:16 -03:00
BuffelSaft	cedc2e07bd	Fix Cherrim softlock ... Fix typo that caused infinite loop.	2021-11-14 13:31:06 +13:00
Eduardo Quezada D'Ottone	bcbdb353f5	Adjusted elements to simplify the conflicts between BE and IE	2021-11-13 12:10:20 -03:00
ghoulslash	940a165be7	merge w be	2021-11-13 09:09:15 -05:00
ghoulslash	23104a02e7	Merge pull request #1891 from AsparagusEduardo/BE_assaultVestText ... Fix Assault Vest's battle message and effect on Me First	2021-11-13 09:06:12 -05:00
Eduardo Quezada D'Ottone	ad393385ac	Oops	2021-11-13 10:58:18 -03:00
kleeenexfeu	b3b3cd2c67	IsBattlerProtected	2021-11-13 13:48:08 +01:00
kleeenexfeu	90b6c7d56c	Remove unwanted check ... According to bulbapedia this check shouldn't exist. It was just preventing effectiveness from being calculated when a move bypassing protection would go through king's shield	2021-11-13 13:24:30 +01:00
kleeenexfeu	10c390b9ec	Effectiveness is calculated for moves bypassing king's shield ... I'm curious what this is for. Before the change it just prevented moves that bypass protections from dealing super effective/not very effective damage to an aegislash using king's shield. So I just added a check with IsBattlerProtected, but in my opinion this line should be entirely removed. Unless I'm missing something.	2021-11-13 11:53:49 +01:00
kleeenexfeu	fdff1ae1b6	Update src/battle_util.c ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2021-11-12 23:34:44 +01:00