292 Commits

Author	SHA1	Message	Date
ghoulslash	98b4b821dc	merge with be	2021-11-01 13:55:55 -04:00
ghoulslash	a1e64fce4f	handle simple beam, gastro acid	2021-11-01 13:50:57 -04:00
ghoulslash	b5d20da927	merge with be	2021-11-01 11:36:18 -04:00
BuffelSaft	fb25e1ac98	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike	2021-11-01 22:37:23 +13:00
ghoulslash	468ee66cd8	fix synthesis and leaf guard w utility umbrella	2021-10-30 11:04:50 -04:00
ghoulslash	af914ee7ed	merge w be	2021-10-29 22:33:50 -04:00
ghoulslash	f342e7c590	merge with be	2021-10-28 17:03:10 -04:00
LOuroboros	a77f058146	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser	2021-10-28 14:24:43 -03:00
LOuroboros	82101d3581	Optimizations	2021-10-28 14:02:43 -03:00
LOuroboros	28522f3ffb	Fixed Hyperspace Fury not breaking through protections ... Also repositioned VARIOUS_JUMP_IF_SPECIES.	2021-10-28 12:09:44 -03:00
ghoulslash	bebaded415	merge with be	2021-10-27 16:48:38 -04:00
LOuroboros	fc7f1acf20	Merge branch 'Photon_Geyser' of https://github.com/MissingNoL/pokeemerald-expansion into photonGeyser	2021-10-27 11:13:59 -03:00
LOuroboros	1ab8c84f41	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into hyperspaceFury	2021-10-26 21:23:21 -03:00
Eduardo Quezada D'Ottone	76b6250104	Merge branch 'battle_engine' into plasmaFists	2021-10-23 11:06:34 -03:00
LOuroboros	a6315ffc75	Implemented Plasma Fists	2021-10-19 09:50:18 -03:00
LOuroboros	d9b8e11a9c	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalReversionBE	2021-10-19 07:47:42 -03:00
BuffelSaft	e59be67023	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike	2021-10-15 16:25:11 +13:00
Eduardo Quezada D'Ottone	21837b659a	Merge branch 'battle_engine' into bug_bite	2021-10-14 19:46:50 -03:00
BuffelSaft	fc6e8f598c	Merge branch 'battle_engine' into battle_bond	2021-10-14 16:24:59 +13:00
BuffelSaft	bb8d0e3d6b	Fix Battle Bond ... Battle Bond Greninja transforms only after a KO, and doesn't revert when switched out.	2021-10-14 16:18:11 +13:00
ghoulslash	a3d2bdc9cf	merge with be	2021-10-13 18:30:53 -04:00
GriffinR	def6cc8158	Label battle script macro arguments	2021-10-13 17:44:04 -04:00
GriffinR	fc15b0d5f0	Add controller buffer constants, finish misc battle doc	2021-10-13 16:21:39 -04:00
ghoulslash	996301d5d3	add mirror armor	2021-10-12 18:04:34 -04:00
ghoulslash	bbd09fdcf7	add wandering spirit	2021-10-12 10:32:51 -04:00
ghoulslash	06bcfea3b8	merge with be	2021-10-10 19:56:33 -04:00
LOuroboros	91a68cd5db	Implemented Primal Reversion	2021-10-09 00:36:41 -03:00
BuffelSaft	07bdd2ffe6	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike	2021-10-09 15:18:51 +13:00
ghoulslash	ce455ac7e7	merge with be	2021-10-08 07:44:32 -04:00
ghoulslash	9a4e0cf757	magician fixes, handle edge cases	2021-10-07 17:37:47 -04:00
ghoulslash	4aeadd96c9	merge with be	2021-10-06 14:49:23 -04:00
ghoulslash	4382420dd2	merge with be	2021-10-06 13:32:59 -04:00
LOuroboros	b85b3094c8	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalAbilitiesDev	2021-10-03 07:05:56 -03:00
ghoulslash	761006a164	merge with be	2021-09-26 19:19:32 -04:00
GriffinR	a66d7e1b43	Document some single-remaining symbols	2021-09-24 17:14:20 -04:00
ghoulslash	2f69748e0d	merge with be	2021-09-23 14:38:01 -04:00
ghoulslash	94ec25319f	syntax fixes. Use BlocksPrankster for perish song battle script	2021-09-23 14:35:37 -04:00
BuffelSaft	530998c4b7	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike	2021-09-23 16:41:35 +12:00
BuffelSaft	2f03ac31b9	Multihit refactor and Parental Bond ... Port multihit system from the CFRU, implement Parental Bond, refactor certain moves as required and implement all remaining multi hit moves except Dragon Darts.	2021-09-23 14:31:21 +12:00
ghoulslash	13062b5a8f	fix lash out, obstruct, and decorate	2021-09-22 09:43:40 -04:00
ghoulslash	0ea6c65b83	merge with be	2021-09-17 09:10:09 -04:00
ghoulslash	b916d7991c	merge with be	2021-09-16 21:52:29 -04:00
ghoulslash	af8d86f0c9	merge with be	2021-09-16 13:33:35 -04:00
ghoulslash	c2e0990aab	fix some merge conflicts	2021-09-16 13:29:36 -04:00
ghoulslash	9d8672e3df	merge with be	2021-09-16 13:12:59 -04:00
ghoulslash	9c94eb6140	but it failed check for rototiller	2021-09-16 10:24:32 -04:00
ghoulslash	aa475ab300	merge with be	2021-09-15 16:42:23 -04:00
ghoulslash	60713a8f2d	fix room service activation msg, stat target	2021-09-14 12:50:36 -04:00
ghoulslash	95af97593b	fix some comment styling. fix throat spray for multi-target moves	2021-09-14 11:53:35 -04:00
ghoulslash	6ce1227447	fix throat spray bugs. move shell bell, throat spray etc to life orb moveend case	2021-09-03 11:05:11 -04:00