370 Commits

Author	SHA1	Message	Date
DizzyEggg	9e3d5672e6	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2	2019-12-23 16:40:21 +01:00
Diegoisawesome	026e1108b2	Merge pull request #935 from GriffinRichards/doc-warp ... Document some warp/field screen effect	2019-12-20 23:44:56 -08:00
jiangzhengwenjz	681d929892	DrawTradeMenuPartyInfo	2019-12-21 06:09:59 +08:00
GriffinR	d1cf9006fb	Document some warp/field screen effect	2019-12-17 05:23:07 -05:00
GriffinR	47b0d8a597	Merge branch 'master' into doc-matchcall	2019-12-10 20:43:27 -05:00
GriffinR	b7ab9cbf4c	Update JP translation and fix typo	2019-12-10 19:29:23 -06:00
GriffinR	ed1ff0ad77	Document misc strings and text colors	2019-12-10 19:29:23 -06:00
DizzyEggg	ac499bc896	Merge with master	2019-12-09 08:16:18 +01:00
GriffinR	2756771958	More usage of ST_OAM constants and SPRITE macros	2019-12-06 19:05:44 -06:00
GriffinR	c40879aa36	Use ST_OAM constants for OamData definitions	2019-12-06 19:05:44 -06:00
GriffinR	548af3c0f1	Document a bit of Match Call	2019-12-05 15:33:36 -05:00
DizzyEggg	dcb5d16cb3	Merge with master	2019-11-29 21:47:31 +01:00
AJ Fontaine	2d1a780dd8	Fix Hondrew Berry typo	2019-11-28 11:44:13 -05:00
GriffinR	63ee15fc28	Document Frontier Util	2019-11-25 18:37:48 -06:00
DizzyEggg	8cc0439182	merge master	2019-11-22 22:47:19 +01: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
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
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
GriffinR	66a68159b1	Continue trade doc	2019-10-05 10:41:37 -04:00
GriffinR	dadb1cb9f1	More trade/union room doc, incidental party_menu doc	2019-10-04 23:31:25 -04:00
GriffinR	6b556900f8	Move union room data, more trade doc	2019-10-04 17:24:03 -04:00
GriffinR	2b0c944286	Document more of trade	2019-10-04 07:42:45 -04:00
GriffinR	4a7f061885	Document some of trade	2019-10-03 19:39:37 -04:00
GriffinR	c3c8fb40cf	Move trade data, some trade.c clean up documentation	2019-10-03 01:16:22 -04:00
GriffinR	de6e1e9ecf	Use multi constants from merge	2019-09-23 00:36:49 -04:00
GriffinR	b6dffcf8b7	Clean up script_menu documentation	2019-09-19 19:23:24 -04:00
GriffinR	9fb24bbbce	Remainder of script_menu documentation	2019-09-19 18:31:09 -04:00