768 Commits

Author	SHA1	Message	Date
GriffinR	0851c34bac	Add berry tree id constants	2021-02-05 15:25:12 -05:00
ghoulslash	a00db597ba	Merge pull request #1383 from ultima-soul/battle_engine_sync ... Battle Engine Upstream Sync	2021-02-02 10:02:31 -07:00
Evan	00cbe61e13	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen8_abilities	2021-02-02 09:00:12 -07:00
Evan	f4d4cf262e	fix screen cleaner, curious medicine, as one	2021-02-02 09:00:07 -07:00
ultima-soul	2a20d50904	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-02-01 15:54:08 -08:00
Evan	1c75483f51	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ripen	2021-01-31 23:31:38 -07:00
Evan	f428e5e2dc	some quick claw/custap berry fixes	2021-01-31 23:31:27 -07:00
Lukien	9704049818	Merge remote-tracking branch 'upstream/battle_engine' into battle_engine	2021-01-31 22:46:27 -05:00
Lukien	f69bff6605	Update battle_util.c ... Added weather check for the ability Sand Force.	2021-01-31 22:43:16 -05:00
Evan	be0326301d	erge branch 'thaw' of https://github.com/ghoulslash/pokeemerald into thaw	2021-01-31 14:55:56 -07:00
Evan	552f548700	fix IsThawingMove	2021-01-31 14:55:44 -07:00
ghoulslash	9499469337	Update src/battle_util.c ... Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>	2021-01-31 14:43:24 -07:00
Evan	c009b51ae8	add grassy glide, misty explosion, steel roller, obstruct, behemoth, decorate, snipe shot	2021-01-28 13:27:00 -07:00
Evan	a37acb8345	coaching, lash out, burning jealousy	2021-01-28 12:21:11 -07:00
Evan	a104c156cc	thaw move list function	2021-01-28 09:00:46 -07:00
Evan	c003f1c023	check move effectiveness with status effects	2021-01-26 15:41:59 -07:00
LOuroboros	c4a7205b6f	Added As One to the untraceable abilities list	2021-01-25 15:37:11 -03:00
LOuroboros	7c9ddd23c1	Updated the list of untraceable abilities	2021-01-25 14:55:51 -03:00
ultima-soul	833218cc5b	Merge pull request #1354 from SBird1337/fix/wrap ... Fix wrap-style move damage	2021-01-25 09:50:12 -08:00
Evan	60f3ad77fe	fix prankster blocking self-targeting moves	2021-01-23 12:40:17 -07:00
GriffinR	4eca05ccf5	Document remainder of battle_controllers.c	2021-01-22 02:48:22 -05:00
Evan	d8d00ba967	fix orb check	2021-01-21 21:28:19 -07:00
Evan	4611c71bd1	merge with be	2021-01-21 08:55:14 -07:00
Evan	8ec12c665c	merge with be	2021-01-20 17:36:13 -07:00
Evan	e61309dce6	merge with be	2021-01-20 17:34:24 -07:00
LOuroboros	2a888a7b3e	Corrected base species check for Thick Club's effect ... Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>	2021-01-20 19:30:48 -03:00
Evan	16d54b6d32	merge with be, add form checks to CanBattlerGetOrLoseItem	2021-01-20 14:28:03 -07:00
LOuroboros	a6b03d45a8	Made the Thick Club's effect use the new GET_BASE_SPECIES_ID macro	2021-01-20 18:16:02 -03:00
LOuroboros	c90cbc0021	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into thick_club	2021-01-20 18:15:37 -03:00
Evan	a49b5d1ad0	prankster updated to gen 7	2021-01-16 16:14:36 -07:00
Evan	c2dfc571b2	misty terrain blocks confusion	2021-01-16 12:21:04 -07:00
Evan	10b1d33d13	handle battler being affected by terrain	2021-01-16 12:05:51 -07:00
Evan	4a5a3ea6af	add safeguard checks	2021-01-16 11:47:29 -07:00
Evan	9e29d303ec	electric and misty terrain preventions	2021-01-16 11:40:02 -07:00
Evan	449c2bcc34	add config option	2021-01-15 18:28:10 -07:00
Evan	0d8f804194	update mental herb to gen 5	2021-01-15 18:11:55 -07:00
sbird	5d02cc2059	[battle_engine] fix wrap style move damage	2021-01-15 16:04:09 +01:00
LOuroboros	c2f718d3d3	Implemented Cramorant's Gulp Missile form change	2021-01-14 17:23:09 -03:00
Evan	9902f6e603	merge with be	2021-01-13 14:32:14 -07:00
GriffinR	b9e1b050e1	Label remaining battle types	2021-01-13 15:20:29 -05:00
Evan	56395a060f	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai	2021-01-13 09:23:07 -07:00
surskitty	a0f1dcb9cf	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine	2021-01-10 15:40:21 -05:00
Evan	d4e4405cf5	merge with be	2021-01-10 09:04:21 -07:00
Evan	c95bfae701	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen8_hold_effects	2021-01-10 09:02:21 -07:00
Evan	e748db8ef4	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai	2021-01-10 08:58:16 -07:00
ultima-soul	b5b4efdaa0	Merge pull request #1314 from LOuroboros/battle_debug_constant ... battle_config.h tweaks	2021-01-09 12:36:37 -08:00
ultima-soul	1caed479de	Merge pull request #1298 from ghoulslash/mummy ... Fix Early Mummy Activation	2021-01-09 12:33:04 -08:00
Evan	6dabff1ee3	merge with be	2021-01-07 21:24:21 -07:00
Evan	2bd5167a6c	eject pack	2021-01-07 21:11:56 -07:00
Evan	5eb49722c0	add red card effect	2021-01-07 19:33:39 -07:00