2248 Commits

Author	SHA1	Message	Date
Eduardo Quezada D'Ottone	2b54b48b04	Merge branch 'PokemonExpansion' into PE_FormChangeHoldItems ... # Conflicts: # src/pokemon.c	2021-10-05 21:13:36 -03:00
Eduardo Quezada D'Ottone	43d42c95cf	Terrain Pulse effect implemented	2021-10-04 22:45:37 -03:00
ultima-soul	78d2215196	Improve and refactor some form change code. Separated out ability checks into their own methods. Change FORM_ITEM_USE_TIME to specify time of day instead of hardcoding.	2021-10-03 10:16:09 -07: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
GriffinR	6e62c057f5	Document remaining symbols in pokemon.c	2021-10-02 23:48:12 -04:00
Eduardo Quezada D'Ottone	978f73475b	Config for Shadow Tag vs Shadow Tag	2021-10-02 19:01:11 -03:00
Eduardo Quezada D'Ottone	57ea20bc6d	Implemented modern effect of struggle with config	2021-10-02 13:32:36 -03:00
LOuroboros	c464b1b5dd	STRINGID_ATTACKERBECAMEASHGRENINJA -> STRINGID_ATTACKERBECAMEASHSPECIES	2021-10-01 23:12:59 -03:00
LOuroboros	f3ded43a88	Implemented Battle Bond	2021-10-01 22:49:17 -03:00
Eduardo Quezada D'Ottone	5593a83783	Fixed compile	2021-09-30 22:35:28 -03:00
Eduardo Quezada D'Ottone	5bf300f97c	Fixed issue where by default mon would change into the last form due to the IE items being defined as ITEM_NONE	2021-09-30 22:12:02 -03:00
Pokestia	38a4dea402	Rename Battle Weather flags	2021-09-30 12:08:20 +02:00
ghoulslash	761006a164	merge with be	2021-09-26 19:19:32 -04:00
Eduardo Quezada D'Ottone	4fbe4da7d0	Sitrus Berry Gen4+ heal. Credit to SBird1337	2021-09-26 18:46:34 -03:00
LOuroboros	1b039062da	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gulp_missile	2021-09-25 22:20:34 -03:00
LOuroboros	234f3290c3	Added a day time exclusive equivalent to FORM_USE_ITEM ... Primarily for Shaymin, since it can only change its form with the Gracidea during the day. Special thanks to AsparagusEduardo.	2021-09-25 22:00:10 -03:00
LOuroboros	813d114132	Synced include/constants/hold_effects.h with the BE	2021-09-25 20:58:07 -03:00
GriffinR	a66d7e1b43	Document some single-remaining symbols	2021-09-24 17:14:20 -04:00
Syreldar	4c05520bf3	Fixed Retaliate's naming.	2021-09-24 16:02:26 +02:00
GriffinR	a6ab2eb883	Merge branch 'master' into trailingSpaces	2021-09-23 21:39:21 -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
ghoulslash	33972b5493	merge with be	2021-09-23 12:04:13 -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	d738297f24	merge with be	2021-09-22 16:26:09 -04:00
ghoulslash	1309eea8ec	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen8_move_effects	2021-09-22 09:43:48 -04:00
ghoulslash	13062b5a8f	fix lash out, obstruct, and decorate	2021-09-22 09:43:40 -04:00
Eduardo Quezada D'Ottone	f9d1375451	Merge pull request #1375 from ExpoSeed/PE/form-change-table ... Form change table	2021-09-22 00:04:26 -03:00
Eduardo Quezada D'Ottone	287ffff2e2	Merge branch 'battle_engine' into burmy-form-change	2021-09-21 22:34:37 -03:00
ghoulslash	0ea6c65b83	merge with be	2021-09-17 09:10:09 -04:00
ghoulslash	faa963fd04	merge with be	2021-09-17 09:07:38 -04:00
ghoulslash	b916d7991c	merge with be	2021-09-16 21:52:29 -04:00
ghoulslash	e756b0accc	merge with be	2021-09-16 21:41: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	ac42b19de7	some formatting fixes	2021-09-16 11:54:27 -04:00
ghoulslash	aac7ae3595	add MOVE_TARGET_ALL_BATTLERS	2021-09-16 10:45:33 -04:00
ghoulslash	9c94eb6140	but it failed check for rototiller	2021-09-16 10:24:32 -04:00
ghoulslash	f61d516aad	some syntax/format fixes	2021-09-15 17:15:50 -04:00
ghoulslash	aa475ab300	merge with be	2021-09-15 16:42:23 -04:00
ghoulslash	0bca01cb74	mental herb fixes	2021-09-15 12:56:58 -04:00
ghoulslash	b85586a33a	merge with be	2021-09-15 12:54:39 -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	f3f26d1a6f	merge with be	2021-09-13 19:40:28 -04:00
GriffinR	cbf8863e5b	Clean up Lilycove Lady	2021-09-09 15:24:34 -04:00
ghoulslash	d7938bc2dc	Merge branch 'prankster' of github.com:ghoulslash/pokeemerald into prankster	2021-09-09 09:44:25 -04:00
ghoulslash	b8a71cabd1	merge with be	2021-09-09 09:44:18 -04:00