2546 Commits

Author	SHA1	Message	Date
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	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	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
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
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	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
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	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	933696b3cd	merge with be	2021-09-03 17:41:00 -04:00
ghoulslash	79f39a1fd0	fix eject button	2021-09-03 14:56:36 -04:00
ghoulslash	5c5276b04d	red card fixes	2021-09-03 14:29:28 -04:00
ghoulslash	93e2e09148	fix terrain seeds. create generic CompareStat function	2021-09-03 12:17:38 -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
ghoulslash	85f98300ff	use B_WAIT_TIME_SHORT and B_WAIT_TIME_LONG	2021-08-12 14:14:51 -06: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	d218322b2c	merge with be	2021-08-12 01:26:13 -04:00
ultima-soul	02c9e040df	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-08-11 16:33:10 -07:00
LOuroboros	b4c4650186	Corrected inconsistent flag label spelling	2021-08-05 17:26:03 -03:00
GriffinR	44cd9eed6b	Add align directives to all marts	2021-08-04 11:50:33 -04:00
ghoulslash	fd61770c34	water bubble prevents burn	2021-07-25 07:53:44 -06:00
ghoulslash	72d346fa46	Merge pull request #1560 from rh-hideout/DizzyEggg-patch-3 ... Fix White Smoke affecting Shell Smash's def drop	2021-07-24 07:14:08 -06:00
GriffinR	06351bf63c	Remove address comments	2021-07-20 15:18:31 -04:00
ghoulslash	a29c9f9339	Merge pull request #1569 from LOuroboros/cotton_down ... Fixed Cotton Down	2021-07-13 11:06:59 -06:00
ghoulslash	ebc187c16d	Merge pull request #1536 from DizzyEggg/gravity ... Fix Gravity's animation	2021-07-13 10:54:45 -06:00
LOuroboros	02eace4574	Fixed Cotton Down ... It will no longer affect fainted 'mons.	2021-07-13 13:54:33 -03:00
GriffinR	72bb2bd160	Merge pull request #1474 from GriffinRichards/clean-miragetower ... Clean up Mirage Tower	2021-07-10 23:26:41 -04:00
DizzyEggg	34f869ef40	Fix White Smoke affecting Shell Smash's def drop	2021-07-06 10:37:17 +02:00
GriffinR	0f538102d9	Add local id constants for C	2021-07-05 13:54:43 -04:00
GriffinR	d2701b51ab	Combine battle script labels, add EFFECT comments	2021-07-02 15:37:59 -04:00
GriffinR	64d06f4c8f	Condense battle AI scripts, minor clean up	2021-07-02 02:46:01 -04:00
GriffinR	8f43d1ebeb	Document smart shopper TV show	2021-07-02 01:45:23 -04:00
GriffinR	10886a586b	Clean up mirage tower	2021-07-01 23:46:15 -04:00
BuffelSaft	4c18cb7fe7	Remove EFFECT_THAW_HIT	2021-06-19 11:49:00 +12:00
SphericalIce	0a94dba4a7	Rename item script labels to fit the established name scheme	2021-06-13 13:21:23 +01:00
ExpoSeed	3ed06c2cc2	Remove remaining grey and replace with gray	2021-06-10 11:36:10 -05:00
DizzyEggg	59ea75f99f	Fix Ability-popup lag	2021-06-08 12:56:38 +02:00
DizzyEggg	e2f14d43db	Fix Gravity's animation	2021-06-08 12:13:40 +02:00