5650 Commits

Author	SHA1	Message	Date
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	b6862a4153	fix jumptocalledmove for assist + attackcanceler	2021-09-16 14:01:19 -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	2067f563cd	cannot block your own prankster elevated perish song	2021-09-16 11:47:05 -04:00
ghoulslash	aeafd9e222	perish song + prankster interaction	2021-09-16 11:34:01 -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	845e333ba1	fix electric/misty terrain interactions with yawn/rest failures	2021-09-15 17:11:42 -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	801ba039d6	fix red card	2021-09-14 19:18:53 -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	875bc52d48	fix resist berry item print msg	2021-09-09 10:15:18 -04:00
ghoulslash	5c9c425590	fix power herb actiation message	2021-09-09 10:03:24 -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
DizzyEggg	4c9660bff1	Merge pull request #1579 from ghoulslash/embargo ... Add Embargo Effect	2021-09-08 20:03:08 +02:00
DizzyEggg	decf65a025	Merge pull request #1580 from ghoulslash/water_bubble ... Water Bubble Prevents Burn	2021-09-08 20:00:45 +02:00
BuffelSaft	bd92552fb6	Add new line to burn was healed string	2021-09-07 16:39:42 +12:00
BuffelSaft	a4b630e6b5	Fix MOVE_EFFECT_REMOVE_STATUS ... Wake-Up Slap and Sparkling Aria now print the correct message when the target is cured. Also, fix Ice Hammer's effect chance.	2021-09-07 16:34:32 +12: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
DizzyEggg	fa081d1fc5	Merge pull request #1618 from BuffelSaft/protect-like ... Fix protect-like moves	2021-09-06 10:24:29 +02:00
DizzyEggg	67fd379771	Merge pull request #1632 from BuffelSaft/hammer-arm ... Fix Hammer arm's effect chance	2021-09-06 10:16:47 +02:00
BuffelSaft	4c8a12006c	Fix Hammer Arm's effect chance	2021-09-06 19:45:30 +12: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	e475813799	revert mental herb desc	2021-09-04 08:18:38 -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	b362ce7f33	Merge pull request #1621 from BuffelSaft/move-data ... Correct Liquidation and Sparkling Aria move data	2021-09-03 13:02:33 -06:00
ghoulslash	79f39a1fd0	fix eject button	2021-09-03 14:56:36 -04:00