52 Commits

Author	SHA1	Message	Date
DizzyEggg	bbe3a28b78	Merge with master	2019-05-01 11:10:41 +02:00
DizzyEggg	912b87564f	Compact item data, make descriptions easier to read	2019-04-16 11:25:26 -05:00
DizzyEggg	a83255d103	fix after prs	2019-04-06 00:03:03 +02:00
DizzyEggg	ef9a339fde	Merge pull request #122 from Fontbane/decap ... Decap Ability Names	2019-04-05 23:41:12 +02:00
Fontbane	2743b069da	Decap Ability Names ... Also fixed names that are too long	2019-04-05 14:16:39 -04:00
Fontbane	fc69631a10	Field effects for Gen IV Abilities ... Also added Honey (acts like White Flute for now) and made it so the Griseous Orb can't be removed from Giratina in battle.	2019-03-25 17:49:29 -04:00
LOuroboros	25ff138ead	Reordered the Item IDs a little bit to add the Safety Goggles and also added their item data.	2019-03-07 13:52:46 -03:00
LOuroboros	3e5d64a070	Fixed the Protective Pads' description.	2019-03-07 13:47:02 -03:00
LOuroboros	f3babe1e51	Partly fixed the description of the Protective Pads, fixed their price tag and also added the data for the other Gen. 7 hold items.	2019-03-07 07:13:37 -03:00
LOuroboros	5f58b531a2	Added item data for the Gen. 5 gems.	2019-03-06 15:29:58 -03:00
DizzyEggg	5dd7ab98d1	Merge pull request #99 from LOuroboros/battle_engine_v2 ... Various Things	2019-03-02 22:42:50 +01:00
LOuroboros	6332023267	Oops. NOW I fixed the 2nd typo.	2019-03-02 12:59:38 -03:00
LOuroboros	e15c745cf5	Fixed 2 typos. Loppunite>Lopunnite and Loppunny>Lopunny.	2019-03-02 12:35:11 -03:00
LOuroboros	07f9bcad10	Swapped Keystone with Mega Bracelet.	2019-03-02 12:31:43 -03:00
DizzyEggg	159d1089a7	Crunch lowers Defense	2019-03-02 12:17:41 +01:00
DizzyEggg	ed030e5b62	Fix Aurora Veil description	2019-02-04 12:46:04 +01:00
Avara	dd44ab8150	Decapitalize item names and add new item descriptions	2019-01-27 17:33:29 +00:00
DizzyEggg	180aa839c4	Fix conflicts	2018-12-09 13:12:02 +01:00
nullableVoidPtr	8a8baaeaaa	Merge remote-tracking branch 'upstream/master'	2018-12-08 12:13:15 +08:00
DizzyEggg	470df386c9	Fix conflicts	2018-12-07 23:01:14 +01:00
Melody	2615ece23b	Use normal apostrophes like adults	2018-12-07 10:41:08 -05:00
nullableVoidPtr	4fc3fa9e44	Realign comments, clean tables in pokemon_animation.c and use SPECIES_OLD_UNOWN_ defines	2018-12-07 20:18:24 +08:00
nullableVoidPtr	f9ff7316d5	Remove uses of INVALID_ defines, clean up some arrays with constants, and spaces -> tabs	2018-12-06 10:38:28 +08:00
DizzyEggg	0d122bc831	Fix merge conflicts	2018-12-03 17:56:36 +01:00
DizzyEggg	846b5d79e4	Get rid of headers in src/data	2018-12-03 16:10:41 +01:00
Melody	eeb6446da4	add more consistent names	2018-12-02 22:36:09 -05:00
DizzyEggg	8f8e6fb88b	Merge branch 'master' into battle_engine_v2	2018-12-02 16:59:38 +01:00
Melody	c7f52c4203	cleans up trainer name defines	2018-12-01 22:49:33 -05:00
Kurausukun	98ebd7ef5a	fix indentation	2018-11-17 21:29:46 -05:00
Kurausukun	a98ecc08aa	fix Aurora Veil's name	2018-11-17 21:16:33 -05:00
LOuroboros	258f1ea606	Update move_names.h ... Decapped move names and fixed U-Turn's,	2018-09-29 10:06:10 -03:00
DizzyEggg	b8440f4a03	Merge pull request #17 from LOuroboros/patch-9 ... Update move_names.h	2018-09-29 13:49:58 +02:00
LOuroboros	aa7fab8b66	Update move_descriptions.h ... -Added 4 move descriptions that were missing (Darkest Lariat, Ice Hammer, Anchor Shot and Power Trip). -Added the table with the pointers for the Gen. 7 moves descriptions.	2018-09-23 01:41:12 -03:00
LOuroboros	80523b4257	Update move_names.h ... Gen. 7 moves' names	2018-09-23 01:01:57 -03:00
DizzyEggg	cbaf2d6b86	Merge pull request #15 from LOuroboros/patch-7 ... Update move_descriptions.h	2018-09-22 17:28:53 +02:00
DizzyEggg	bf11c35eaf	Add gen7 learsnets for pokemon	2018-09-22 13:52:38 +02:00
LOuroboros	fff4336a63	Update move_descriptions.h ... Fixed Magma Storm's description. Sorry, I didn't know that it was working like in Gen. 5+	2018-09-22 08:03:39 -03:00
LOuroboros	49cf3eb396	Update move_descriptions.h ... Descriptions for Roar of Time and Magma Storm. I think that I did things correctly, but please check before merging, just in case.	2018-09-18 00:26:22 -03:00
Diegoisawesome	6978a896d1	Merge pull request #331 from DizzyEggg/patch-3 ... Use pokeruby's formatting for move descriptions	2018-09-17 10:11:12 -05:00
Tetrable	9397618d9d	Missed a description	2018-09-16 16:40:02 +01:00
Tetrable	8d4d5b501c	Add periods to the end of ability descriptions.	2018-09-16 16:36:47 +01:00
DizzyEggg	33b6ec8c0a	Add move descriptions for moves	2018-09-16 15:59:17 +02:00
DizzyEggg	94bbfa7fa0	Use pokeruby's formatting for move descriptions	2018-09-16 15:58:13 +02:00
DizzyEggg	c3a5001945	Add Ability Descriptions: credits to BluRose :3	2018-09-16 10:18:35 +02:00
DizzyEggg	de65ddf4b6	Make it easier to edit ability text	2018-09-16 10:17:10 +02:00
DizzyEggg	490a4f993b	Merge with master	2018-09-01 12:38:38 +02:00
Diegoisawesome	26ef40553c	Move data from include to src	2018-08-23 02:32:34 -05:00
Diegoisawesome	a07d69d7c2	Finish pokemon_summary_screen	2018-08-14 22:00:35 -07:00
DizzyEggg	cc145a45f7	merge with master	2018-08-12 22:37:28 +02:00
DizzyEggg	df5009cb3e	Move move descriptions to C	2018-08-12 00:03:19 +02:00