1570 Commits

Author	SHA1	Message	Date
GriffinR	f559fa3fe2	Merge master into ObjEvent rename	2019-11-25 20:00:04 -05:00
GriffinR	63ee15fc28	Document Frontier Util	2019-11-25 18:37:48 -06:00
DizzyEggg	b70cde8f1b	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion	2019-11-22 23:11:17 +01:00
DizzyEggg	f3f9e47f96	Merge	2019-11-22 23:10:04 +01:00
DizzyEggg	8cc0439182	merge master	2019-11-22 22:47:19 +01:00
GriffinR	570881b119	Rename event_object directories	2019-11-21 00:44:55 -05:00
GriffinR	98b81722e7	Rename field_objet_palettes	2019-11-20 23:54:22 -05:00
GriffinR	82cb741d8b	Standardize EVENT_OBJECT to OBJECT_EVENT	2019-11-20 23:12:51 -05:00
GriffinR	ec3e86f1d2	Standardize Event Object to Object Event	2019-11-20 22:55:44 -05:00
GriffinR	81507fc8b7	Move Apprentice data	2019-11-20 19:04:25 -05:00
GriffinR	a486c8affd	Begin documenting Apprentice, merge with master	2019-11-18 12:47:10 -05:00
GriffinR	3bbdee61b8	Clean up Trainer Hill doc	2019-11-16 13:02:35 -06:00
GriffinR	5e01871f8b	Document Trainer Hill	2019-11-16 13:02:35 -06:00
GriffinR	2c3726a328	Document contest strings	2019-11-16 12:50:01 -06:00
GriffinR	248b85c3cb	Document Frontier Exchange Corner scripts	2019-11-16 12:00:35 -06:00
GriffinR	fc3783b739	WIP Document apprentice	2019-11-16 12:28:49 -05:00
GriffinR	ef8370566f	Document Contest scripts	2019-11-13 18:20:55 -06:00
LOuroboros	884f542798	Fixed a typo and added entries for the Alolan Forms in src/pokemon.c	2019-11-13 14:29:26 -03:00
LOuroboros	8bde7eec1b	Defined the animations for the front sprites of the Alolan Forms.	2019-11-13 13:00:31 -03:00
LOuroboros	cbc50eac50	Defined the paths of the sprites for the Alolan Forms.	2019-11-13 11:45:38 -03:00
LOuroboros	f47bc95990	Set the TM/HM learnsets for the Alolan Forms.	2019-11-12 22:38:13 -03:00
LOuroboros	788efccf79	Set the level up learnsets for the Alolan Forms.	2019-11-12 19:04:06 -03:00
LOuroboros	05013586d7	Set the evolution conditions for the Alolan Forms.	2019-11-12 18:25:28 -03:00
LOuroboros	1791ec28c9	Set the egg moves for the Alolan Forms.	2019-11-12 17:26:54 -03:00
LOuroboros	fecc6737e0	Added the Alolan Forms' base stats.	2019-11-12 16:58:44 -03:00
LOuroboros	5f24eb1f5e	Set the InGame names for the Alolan Forms.	2019-11-12 14:36:42 -03:00
LOuroboros	8038389ad2	Added coordinates and entries for the Alolan Forms in the sprite data tables.	2019-11-12 13:07:00 -03:00
DizzyEggg	ab2de0342b	Merge pull request #201 from AsparagusEduardo/PokedexOrders ... Updated Alphabetical, Weight and Height orders.	2019-11-10 16:50:20 +01:00
DizzyEggg	c65900b67a	merge	2019-11-10 14:13:23 +01:00
DizzyEggg	791ed999d9	Merge	2019-11-10 12:40:11 +01:00
DizzyEggg	ea6736cd8d	merge	2019-11-10 12:09:14 +01:00
GriffinR	5c627518b3	Rename Grunts to use location-specific names	2019-11-04 16:45:00 -06:00
DizzyEggg	1d8cc9b741	Fix merge conflicts	2019-11-03 19:55:19 +01:00
GriffinR	b1ea2592c3	Merge branch 'master' into doc-partymenu	2019-10-31 14:22:51 -04:00
GriffinR	b33db9b96c	Move party menu data	2019-10-31 14:16:43 -04:00
GriffinR	973e6f9667	Document mauville_man.inc	2019-10-21 17:21:53 -05:00
DizzyEggg	621dd4f0bf	Fix Sheer Force moves and effects happening	2019-10-21 14:48:03 +02:00
DizzyEggg	e736c369d6	Merge with master	2019-10-19 17:47:55 +02:00
DizzyEggg	4bbbbdc50a	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion	2019-10-19 15:30:14 +02:00
DizzyEggg	1d10d44a4d	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion	2019-10-19 15:17:45 +02:00
garak	9b9b14ad0a	remove empty groups from wild encounter fields json objects	2019-10-14 18:12:03 -05:00
garak	c73e20b6af	add subgroups for fishing rods to encounter json	2019-10-14 18:12:03 -05:00
Marcus Huderle	8df4982b3f	Merge remote-tracking branch 'upstream/master' into document-trade	2019-10-12 15:39:17 -05:00
GriffinR	3514f9dd6b	Clean up trade.c doc	2019-10-10 18:46:42 -04:00
DizzyEggg	bae5d2038f	Update with master	2019-10-10 16:18:48 +02:00
GriffinR	07fa82c911	Last non-anim trade.c doc	2019-10-10 03:50:51 -04:00
GriffinR	32aa87c7e1	More trade doc, fix switch indentations	2019-10-09 14:21:29 -04:00
GriffinR	2c062dc764	More trade documentation	2019-10-09 05:56:44 -04:00
GriffinR	d1bcd60b58	Document more trade.c	2019-10-08 20:25:46 -04:00
Marcus Huderle	799edaf3e6	Document hide/show reflection movement actions	2019-10-06 14:17:34 -05:00