8057 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	0cd7f3ffcd	Merge pull request #1635 from rh-hideout/DizzyEggg-galvanize_explosion ... fix galvanize explosion + lightning rod	2021-09-09 12:04:42 -06:00
DizzyEggg	c5b810b508	Merge pull request #1643 from ghoulslash/echoed_voice ... better echoed voice power boost	2021-09-09 19:59:45 +02: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	9d3f906fda	Merge pull request #1537 from DizzyEggg/intimidate_popup ... Fix lag caused by ability pop-up while it's set to False	2021-09-09 09:34:50 -06:00
DizzyEggg	90c837deb6	Merge pull request #1642 from ghoulslash/echoed_voice ... Fix echoed voice power boost	2021-09-09 17:32:27 +02:00
ghoulslash	6915b029bd	fix echoed voice power boost	2021-09-09 11:15:58 -04:00
DizzyEggg	9ad4feecf2	Merge pull request #1641 from ghoulslash/power_herb ... Fix Item Activation Messages	2021-09-09 16:29:40 +02: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
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
DizzyEggg	6a8f55dabf	fix galvanice explosion	2021-09-08 12:38:46 +02:00
ghoulslash	acee60ff3c	Merge pull request #1633 from BuffelSaft/smellysalt ... Fix MOVE_EFFECT_REMOVE_STATUS	2021-09-07 06:34:45 -06: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
ghoulslash	949c4ef63b	add ability popup	2021-09-06 09:24:15 -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
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
BuffelSaft	7d251c39f7	Correct Liquidation and Sparkling Aria ... Liquidation is affected by Sheer Force, Sparkling Aria should hit both foes and ally.	2021-09-02 16:05:36 +12:00
ghoulslash	dd83e37261	Merge pull request #1615 from LOuroboros/choiceUTurn ... Fixed U-turn and Choice Items interaction	2021-09-01 06:00:02 -06:00
BuffelSaft	3371773e5c	Move touchedProtectLike to protect structs ... This makes more sense than putting it in DisableStruct.	2021-09-01 21:34:47 +12:00
BuffelSaft	eb0f0b7ce8	Fix Sucker Punch vs Protect moves ... Might as well do this here too. Sucker Punch should fail against Protect, not trigger Protect's effects.	2021-09-01 21:32:07 +12:00
BuffelSaft	ea6ce80ad4	Fix protect-like moves ... Make Protect-like moves (King's Shield etc.) activate only if the attacker would've touched the target. This does not handle Sucker Punch, because that's not working correctly with Protect currently and will need to be addressed separately.	2021-09-01 19:57:03 +12:00
LOuroboros	d60545af7a	Fixed U-turn and Choice Items interaction	2021-08-31 23:49:23 -03:00
ExpoSeed	a58641cd70	Merge pull request #1603 from LOuroboros/megaEvoString ... Tweaked sText_MegaEvoEvolved	2021-08-26 19:33:39 -05:00
ExpoSeed	1f75f6e201	Merge pull request #1605 from LOuroboros/canEvolve ... Corrected `CanEvolve` function	2021-08-26 19:32:22 -05:00
ghoulslash	b6d0996467	Merge pull request #1606 from BuffelSaft/venoshock ... Fix Venoshock	2021-08-25 13:53:24 -06: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
LOuroboros	2c35006627	Tweaked sText_MegaEvoEvolved	2021-08-24 18:33:56 -03:00
ExpoSeed	38120afbac	Merge pull request #1593 from ultima-soul/battle_engine_sync ... Battle Engine Upstream Sync	2021-08-16 19:47:35 -05:00
ultima-soul	b620349da0	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-08-16 15:43:27 -07:00
GriffinR	ee5eee6ccc	Merge pull request #1493 from GriffinRichards/doc-itemmenu2 ... Document item menu	2021-08-15 12:01:57 -04:00