137 Commits

Author	SHA1	Message	Date
ultima-soul	2a20d50904	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-02-01 15:54:08 -08:00
ExpoSeed	7dadcb94b8	Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD	2021-01-03 17:14:43 -06:00
GriffinR	88e951bfe3	Label some ReturnToField funcs	2021-01-01 17:11:06 -05:00
Kurausukun	58976ebaa8	Merge remote-tracking branch 'upstream/master' into berry_crush	2020-12-10 23:30:52 -05:00
Aaron B-D	b83a87c8e8	Added scripted double wild battles	2020-10-19 14:47:32 -04:00
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
Kaz	171154a097	Convert to -g; will be required for eliminating fakematches.	2020-09-16 19:36:30 -04:00
DizzyEggg	97d0643110	Merge with master	2020-09-08 12:48:28 +02:00
DizzyEggg	f70a9ce153	Merge with master	2020-08-27 12:01:28 +02:00
GriffinR	ee72696b53	Sync encounter musics with encounter music types	2020-08-20 21:03:24 -04:00
GriffinR	3014241179	Give songs meaningful english names	2020-08-20 19:06:14 -04:00
GriffinR	65bd2faf94	Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest	2020-08-16 05:59:10 -04:00
GriffinR	3779422489	Split contest funcs from script_pokemon_util	2020-08-13 17:42:12 -04:00
DizzyEggg	0066640a1e	Merge with master	2020-07-27 14:51:39 +02:00
DizzyEggg	4c3f40a361	Merge with master	2020-07-11 12:59:23 +02:00
GriffinR	72edc46ab6	Document unk_transition	2020-07-02 15:45:37 -04:00
GriffinR	aaf5d91c18	Document field_message_box.c	2020-06-03 19:47:45 -05:00
DizzyEggg	5db3449b50	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2	2020-03-06 11:40:41 +01:00
GriffinR	b6c9ad505d	Minor fixes in trainer_battle.inc	2020-03-03 14:47:14 -05:00
DizzyEggg	108f6b711f	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2	2020-02-23 10:58:26 +01:00
GriffinR	956090b05f	Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj	2020-02-12 13:05:57 -05:00
GriffinR	084bd66924	Document Trainer Card	2020-02-08 14:31:17 -06:00
DizzyEggg	d8aab3d112	Merge with master	2020-01-18 18:17:25 +01:00
GriffinR	655910a16f	Merge branch 'master' into fix-eventobj	2020-01-12 22:42:43 -05:00
GriffinR	635267ce32	Merge branch 'master' into fix-eventobj	2020-01-08 05:51:49 -05:00
GriffinR	e5df61e362	Merge branch 'master' into doc-dome	2020-01-08 01:15:36 -05:00
DizzyEggg	4c9ea32d19	Merge with master	2019-12-30 18:52:23 +01:00
Fontbane	31b4656324	Labels better	2019-12-25 22:39:06 -05: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	ff2d8a9c4e	Add frontier trainer constants	2019-12-20 21:14:05 -05:00
GriffinR	db8a5c6c2b	Merge branch 'master' into fix-eventobj	2019-12-15 11:47:27 -05:00
GriffinR	0086cd1efa	More pokenav match call documentation	2019-12-08 15:25:21 -05:00
GriffinR	cc9b923dc2	More pokenav match call documentation	2019-12-06 02:35:08 -05:00
DizzyEggg	8cc0439182	merge master	2019-11-22 22:47:19 +01:00
GriffinR	7034f59c14	Rename EventObj to ObjEvent	2019-11-21 00:14:40 -05:00
GriffinR	ec3e86f1d2	Standardize Event Object to Object Event	2019-11-20 22:55:44 -05:00
GriffinR	5e01871f8b	Document Trainer Hill	2019-11-16 13:02:35 -06:00
DizzyEggg	b4ac979600	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2	2019-11-10 12:09:43 +01:00
Thomas Winwood	a727c16012	Use descriptive constant for ScriptGiveMon call	2019-11-09 08:37:45 -06:00
DizzyEggg	1d8cc9b741	Fix merge conflicts	2019-11-03 19:55:19 +01:00
GriffinR	dd01942c4f	Document aqua/magma hideout scripts	2019-11-01 17:22:45 -05:00
GriffinR	0db188b487	Clean up berry_tree.inc and misc adjacent documentation	2019-10-20 09:46:46 -05:00
DizzyEggg	e736c369d6	Merge with master	2019-10-19 17:47:55 +02:00
GriffinR	c4deb4db96	Document field_poison	2019-10-06 20:04:30 -04:00
DizzyEggg	e4787bacbc	merge	2019-08-19 14:50:47 +02:00
GriffinR	3c2576d3a3	trainer rematch macro	2019-08-16 13:48:45 -04:00
DizzyEggg	bbe3a28b78	Merge with master	2019-05-01 11:10:41 +02:00
Fontbane	2c076f1f3e	Doc most OnTransitions	2019-04-22 17:23:59 -05:00
DizzyEggg	f8713f9c15	Merge with master	2019-04-06 20:43:13 +02:00