142 Commits

Author	SHA1	Message	Date
ExpoSeed	9e2c8a95c1	Sync bev2 with pret	2020-10-11 01:01:47 -05:00
GriffinR	5259898325	Replace POKEMON_SLOTS_NUMBER	2020-10-01 17:07:12 -05:00
DizzyEggg	97d0643110	Merge with master	2020-09-08 12:48:28 +02:00
PokeCodec	28ef2fb774	Switch to button macros	2020-09-04 21:11:55 -04:00
DizzyEggg	f70a9ce153	Merge with master	2020-08-27 12:01:28 +02:00
GriffinR	3014241179	Give songs meaningful english names	2020-08-20 19:06:14 -04:00
GriffinR	e06de33cbd	Merge branch 'master' into doc-overworld	2020-07-28 17:46:17 -04:00
PokeCodec	c5aa91741b	Change signedness and add casts to avoid implicit conversion warnings	2020-07-24 22:18:57 -04:00
DizzyEggg	62dc94e9c8	Merge with master	2020-07-15 10:13:19 +02:00
GriffinR	e129d04b93	Merge branch 'master' into doc-overworld	2020-07-15 00:40:47 -04:00
DizzyEggg	4c3f40a361	Merge with master	2020-07-11 12:59:23 +02:00
GriffinR	beeb673ba1	Merge branch 'master' of https://github.com/pret/pokeemerald into add-flagvarsave	2020-07-08 16:03:32 -04:00
GriffinR	ebb6c4ee66	Merge branch 'master' into doc-overworld	2020-07-08 15:51:58 -04:00
GriffinR	06025e887f	Allow flag/var counts to be updated alongside values	2020-06-24 17:00:19 -04:00
GriffinR	18d57a3802	Document some overworld and field effects	2020-06-23 15:48:53 -04:00
GriffinR	c2a07276ae	Merge branch 'master' into doc-link	2020-06-13 16:15:11 -04:00
Sierraffinity	74edaed426	Begin item_menu.c cleanup	2020-06-10 13:07:42 -07:00
GriffinR	4fe507e453	Document union_room.c	2020-05-31 13:11:18 -04:00
DizzyEggg	013f9b6a17	merge wiith masteer and summary screen change	2020-05-29 12:50:54 +02:00
DizzyEggg	bdebab834c	Document pokemon summary screen	2020-05-18 14:03:01 +02:00
DizzyEggg	060b795d8e	Merge with master	2020-04-11 19:48:24 +02:00
GriffinR	7a5deff0bc	Add misc party constant usage	2020-04-09 15:18:53 -04:00
PikalaxALT	7a059c75a6	Merge pull request #968 from GriffinRichards/doc-regionmap ... Document some pokenav and region map	2020-03-17 10:38:20 -04:00
DizzyEggg	108f6b711f	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2	2020-02-23 10:58:26 +01:00
PikalaxALT	91dd7f5cc3	Port librfu from firered	2020-02-16 13:49:36 -05:00
DizzyEggg	834b7b52d3	Merge with master	2020-02-08 09:38:29 +01:00
GriffinR	86354f1d50	Document some pokenav and region map	2020-02-05 21:04:43 -05:00
GriffinR	27c4329e45	Use friendship event constants	2020-02-04 12:16:15 -06:00
DizzyEggg	4c9ea32d19	Merge with master	2019-12-30 18:52:23 +01:00
huderlem	8d64bc9df8	Merge pull request #944 from GriffinRichards/doc-itemuse ... Document item_use.c	2019-12-25 11:59:07 -06:00
huderlem	ee61726136	Merge pull request #936 from GriffinRichards/doc-tower ... Document Battle Tower scripts	2019-12-25 11:39:20 -06:00
DizzyEggg	9e3d5672e6	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2	2019-12-23 16:40:21 +01:00
GriffinR	749965d56b	Document item_use.c	2019-12-21 21:39:30 -05:00
GriffinR	ddfa0c6298	Document Battle Tower scripts	2019-12-17 20:56:13 -05:00
GriffinR	d1cf9006fb	Document some warp/field screen effect	2019-12-17 05:23:07 -05:00
GriffinR	ed1ff0ad77	Document misc strings and text colors	2019-12-10 19:29:23 -06:00
DizzyEggg	1d8cc9b741	Fix merge conflicts	2019-11-03 19:55:19 +01:00
GriffinR	27169f634b	Review changes for party menu doc	2019-10-31 21:33:01 -04:00
GriffinR	b33db9b96c	Move party menu data	2019-10-31 14:16:43 -04:00
GriffinR	aec7eb6089	Clean up party_menu doc	2019-10-31 14:11:55 -04:00
GriffinR	e01ec84837	Document party_menu second pass	2019-10-31 03:25:56 -04:00
GriffinR	6db014cc32	Document party_menu first pass	2019-10-25 15:41:06 -04:00
DizzyEggg	e736c369d6	Merge with master	2019-10-19 17:47:55 +02:00
GriffinR	a081124a20	Merge branch 'master' into doc-inc	2019-10-13 15:26:44 -04:00
Marcus Huderle	8df4982b3f	Merge remote-tracking branch 'upstream/master' into document-trade	2019-10-12 15:39:17 -05:00
GriffinR	1b7607bd91	Document cable_club.inc	2019-10-12 15:14:57 -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	2c062dc764	More trade documentation	2019-10-09 05:56:44 -04:00