599 Commits

Author	SHA1	Message	Date
ghoulslash	fc84ebbd3e	redo prankster checks to handle assist	2021-09-22 08:06:42 -04:00
ghoulslash	9c79ba05fc	allies do not block prankster	2021-09-21 11:38:37 -04:00
ghoulslash	32d19a9b19	syntax fixes. add B_PRANKSTER_DARK_TYPES check to perish song	2021-09-20 21:36:10 -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	40fcd257a0	fixes	2021-09-16 19:36:06 -04:00
ghoulslash	806be64935	format fixes	2021-09-16 17:10:41 -04:00
ghoulslash	ac42b19de7	some formatting fixes	2021-09-16 11:54:27 -04:00
ghoulslash	a50f03a06b	magic bounce overrides prankster blockage	2021-09-16 11:53:24 -04:00
ghoulslash	85f3982fb9	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into prankster	2021-09-15 17:52:45 -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	705b765067	update multistring chooser labels in GetMentalHerbEffect	2021-09-15 14:51:24 -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	c4ce4c150d	fix eject pack	2021-09-14 15:38:16 -04:00
ghoulslash	55c3e152cf	replace some BufferStatChange, fix room service and terrain seeds	2021-09-14 15:07:15 -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
ghoulslash	f9cc09dc48	tweak formula	2021-09-09 13:54:16 -04:00
ghoulslash	92429c7649	better echoed voice power boost	2021-09-09 13:38:46 -04:00
ghoulslash	6915b029bd	fix echoed voice power boost	2021-09-09 11:15:58 -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
ghoulslash	e93ad2e255	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into water_bubble	2021-09-06 09:24:28 -04:00
DizzyEggg	68c33895fd	Merge pull request #1622 from BuffelSaft/money-boost ... Fix stacking effect on HOLD_EFFECT_DOUBLE_PRIZE	2021-09-06 11:32:53 +02:00
BuffelSaft	734e0aa74d	Add brackets ... Oops!	2021-09-06 20:56:02 +12:00
DizzyEggg	cdec3077b2	Merge pull request #1630 from BuffelSaft/disguise2 ... Fix many Disguise bugs	2021-09-06 10:32:37 +02:00
BuffelSaft	bdbb4b5f7e	Fix many Disguise bugs ... Use an unused hitmarker flag to indicate that an HP change shouldn't break Disguise.	2021-09-06 18:27:42 +12:00
ghoulslash	a9cbaa5966	fix mental herb encore, heal block	2021-09-04 08:40:43 -04:00
ghoulslash	d66f3910d9	Merge branch 'mental_herb' of github.com:ghoulslash/pokeemerald into mental_herb	2021-09-03 17:41:09 -04:00
ghoulslash	933696b3cd	merge with be	2021-09-03 17:41:00 -04:00
ghoulslash	c7a587913b	replace statStages checks with CompareStat	2021-09-03 13:13:02 -04:00
ghoulslash	93e2e09148	fix terrain seeds. create generic CompareStat function	2021-09-03 12:17:38 -04:00
ghoulslash	7f4accdae4	fix room service switching in effect	2021-09-03 11:16:16 -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
ghoulslash	7c53214dad	merge with be	2021-09-02 15:33:42 -04:00
ultima-soul	a10a02a536	Merge pull request #1221 from ghoulslash/battle_engine ... Implement Pickpocket	2021-09-02 11:33:34 -07:00
BuffelSaft	13636f8691	Fix stacking effect on HOLD_EFFECT_DOUBLE_PRIZE ... moneyMultiplier should only ever be 1, 2 or 4. This adds some flags to moneyMultiplier that prevent HOLD_EFFECT_DOUBLE_PRIZE and Happy Hour from infinitely increasing it.	2021-09-02 16:15:58 +12:00
ExpoSeed	1f75f6e201	Merge pull request #1605 from LOuroboros/canEvolve ... Corrected `CanEvolve` function	2021-08-26 19:32:22 -05:00
BuffelSaft	bb89d03a1d	Fix Venoshock ... Damage should double if target is poisoned, not attacker.	2021-08-25 22:57:10 +12:00
LOuroboros	e42d329fc6	Small tweak	2021-08-25 02:16:38 -03:00
LOuroboros	d270892a6b	Corrected CanEvolve function	2021-08-25 01:56:25 -03:00
ghoulslash	0bbbd1e7a9	fix electric/misty yawn/rest interactions	2021-08-12 14:08:41 -06:00
ghoulslash	c7c0fbc296	merge with be, make AI CanBeStatused functions separate from general util ones	2021-08-12 13:37:53 -06:00
ghoulslash	7b0e60c705	some tweaks	2021-08-12 12:44:53 -06:00
ghoulslash	d218322b2c	merge with be	2021-08-12 01:26:13 -04:00
ghoulslash	fd61770c34	water bubble prevents burn	2021-07-25 07:53:44 -06:00