1693 Commits

Author	SHA1	Message	Date
LOuroboros	c8a7f2a32c	Oops. I've put the .secondaryId field for the Muscle Wing twice.	2019-05-17 07:56:54 -03:00
LOuroboros	2592d38303	Added the data, sprites and sprites data of the Wings.	2019-05-17 07:52:41 -03:00
DizzyEggg	ad6093f5bc	Merge with master, fix conflicts	2019-05-17 10:15:30 +02:00
DizzyEggg	f22f7866ac	Merge with master, fix conficts	2019-05-17 09:52:20 +02:00
DizzyEggg	ca51bc23bf	Merge branch 'master' into item_expansion	2019-05-17 09:36:35 +02:00
DizzyEggg	188f2aa29e	ability random define for battle pyramind	2019-05-16 17:09:43 -05:00
DizzyEggg	4ae1e014bc	Change abilities in base stats to array	2019-05-16 17:09:43 -05:00
DizzyEggg	33979f0fa6	use ability num instead of alt ability	2019-05-16 17:09:43 -05:00
DizzyEggg	26e4b52fe8	Dummy learnsets for forms	2019-05-16 10:16:00 +02:00
DizzyEggg	6367269ce9	Add dummy learnsets	2019-05-15 13:47:33 +02:00
DizzyEggg	94045ace0b	Merge branch 'master' into battle_engine_v2	2019-05-15 13:31:53 +02:00
DizzyEggg	6f5e9a1944	Merge branch 'master' into item_expansion	2019-05-14 14:02:07 +02:00
DizzyEggg	38b320eaa5	Data for hidden abilities	2019-05-14 13:20:10 +02:00
DizzyEggg	5682f98605	Merge branch 'master' into pokemon_expansion	2019-05-14 09:12:45 +02:00
DizzyEggg	9abdf224cb	Coords for megas	2019-05-12 08:49:57 +02:00
DizzyEggg	824a95fe07	Incinerate	2019-05-10 15:12:33 +02:00
Marcus Huderle	0babaa8c07	Convert wild encounter data to JSON	2019-05-08 17:06:39 -05:00
DizzyEggg	a22495d7cb	Gen4 mon animations	2019-05-05 10:09:52 +02:00
DizzyEggg	5b23f3787e	Tweak up batle item's secondary ids	2019-05-04 09:15:10 +02:00
DizzyEggg	c0470c3932	Remove skarmory mega evo	2019-05-03 17:31:23 +02:00
DizzyEggg	d0f91a996d	Tweak up mega evo	2019-05-02 23:10:01 +02:00
LOuroboros	eaafcd539d	Fixed the Power Items' hold effects.	2019-05-02 15:47:43 -03:00
LOuroboros	fbdcbfd33d	Fixed Silvally's Memory items' hold effects.	2019-05-02 15:39:47 -03:00
LOuroboros	713e660666	Updated the price tags of the X Items to their USUM standard.	2019-05-02 15:19:30 -03:00
LOuroboros	36d8371950	Added the sprites and the data for the missing items.	2019-05-02 15:11:06 -03:00
DizzyEggg	a7f2fa67ef	Merge pull request #142 from thechurchofcage/beta ... Magnetic Flux + Gear Up	2019-05-01 11:11:46 +02:00
DizzyEggg	bbe3a28b78	Merge with master	2019-05-01 11:10:41 +02:00
LOuroboros	90e94f50d9	Defined a hold effect for every battle-related item, and added all the missing items' data.	2019-04-30 22:07:43 -03:00
LOuroboros	e77960d2f3	Updated the effects of the Sea and Lax Incenses, and added the item data of the Gen. 4 incenses.	2019-04-30 20:07:12 -03:00
LOuroboros	cda17700c3	Defined a lot of hold effects and added more items data.	2019-04-30 19:41:10 -03:00
LOuroboros	71472b1439	Power items data.	2019-04-30 16:07:48 -03:00
LOuroboros	a48c8f6aba	Sachet and Whipped Dream data.	2019-04-30 15:42:36 -03:00
LOuroboros	3316427728	Dubious Disc, Reaper Cloth, Razor Claw, Razor Fang and Prism Scale data.	2019-04-30 15:34:38 -03:00
LOuroboros	e0540dff46	Oval Stone, Protector, Electirizer and Magmarizer data.	2019-04-30 15:00:51 -03:00
LOuroboros	850c93ec64	Rare Bone data.	2019-04-30 14:44:39 -03:00
LOuroboros	3d12e76411	Added Oricorio's Nectars' data.	2019-04-30 14:25:52 -03:00
LOuroboros	f521bec102	Added the 7 Apricorns' data.	2019-04-30 14:09:51 -03:00
LOuroboros	b1ab37820b	Dawn, Dusk, Shiny and Ice Stones data.	2019-04-30 13:39:58 -03:00
LOuroboros	c5f6f5e588	Renamed X Special to X Special Attack and added the item data for Old Gateau and X Special Defense.	2019-04-30 13:06:08 -03:00
LOuroboros	8e3f2d1e2d	Sweet Heart and Big Malasada data.	2019-04-30 12:38:51 -03:00
DizzyEggg	fdb328fbd3	Gfx for megas	2019-04-29 14:27:36 +02:00
DizzyEggg	f19b56404b	Fix Meowstic f anim	2019-04-23 18:19:46 +02:00
DizzyEggg	2d670fa803	Rotom forms and meowstic female	2019-04-23 13:00:40 +02:00
DizzyEggg	0666da6145	Merge branch 'master' into pokemon_expansion	2019-04-22 14:12:18 +02:00
DizzyEggg	f1e420ff69	Move tutor and tms compatibility for all mons	2019-04-22 14:10:40 +02:00
Papa Cancer	3cde800bd0	Magnetic Flux + Gear Up ... Both have the same effect so they're in one commit. Uses custom script to check both user and partner for stats and abilities. Magnetic Flux uses Charge animation.	2019-04-20 20:17:56 +01:00
Papa Cancer	b50007e861	Instruct ... Re-PR'd due to excess "merges"	2019-04-20 20:11:49 +01:00
Papa Cancer	7e99272482	Laser Focus ... Re-PR'd due to excess "merges"	2019-04-20 20:02:52 +01:00
Papa Cancer	c4acc3dbf8	Merge branch 'battle_engine_v2' into beta	2019-04-20 16:49:57 +01:00
Papa Cancer	e310d0f10e	Core Enforcer ... New code - uses Gastro Acid script instead through own move effect	2019-04-18 12:10:18 +01:00