378 Commits

Author	SHA1	Message	Date
SphericalIce	56e047f949	Fix Lilcove Motel typos	2021-02-14 21:38:39 +00:00
GriffinR	20b76c6071	Fix swapped route 102 berries	2021-02-10 16:26:09 -05:00
GriffinR	0851c34bac	Add berry tree id constants	2021-02-05 15:25:12 -05:00
ultima-soul	5fdb578747	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2021-02-01 15:58:18 -08:00
GriffinR	9e59581220	Document object lock and some trainer approach	2021-01-26 04:42:18 -05:00
GriffinR	0064333e4a	Clean up scrcmd.c	2021-01-26 02:16:26 -05:00
GriffinR	de52df5613	Fix some mislabeled scripts	2021-01-19 04:51:34 -05:00
ExpoSeed	d649bcabbc	Merge branch 'master' of https://github.com/pret/pokeemerald into sync-item-expansion	2020-10-12 12:43:55 -05:00
GriffinR	1472111c5d	Fix PutAwayDecorationLoop UB comment	2020-10-11 19:02:10 -04:00
ExpoSeed	d2464b59a3	Merge branch 'master' of https://github.com/pret/pokeemerald into sync-item-expansion	2020-10-05 11:42:19 -05:00
ExpoSeed	c3113b43bb	Merge branch 'item_expansion' of https://github.com/DizzyEggg/pokeemerald into sync-item-expansion	2020-10-04 02:36:07 -05:00
Eduardo Quezada	96e4b43ce5	Documenting where each of the berries are generated in new_game.inc	2020-10-03 21:52:09 -03:00
Eduardo Quezada	46ccb91155	Fixed "Ultra Rope" name.	2020-09-13 11:35:05 -03:00
GriffinR	921f389e4e	Fix Rusboro and Lavarige typos	2020-09-11 14:47:47 -04:00
DizzyEggg	271219f962	Merge with master	2020-09-08 12:00:51 +02:00
GriffinR	c830731734	Merge branch 'master' into doc-blender	2020-08-28 16:16:00 -04:00
DizzyEggg	35559d6b71	Merge with master	2020-08-27 10:58:31 +02:00
GriffinR	0ff767a9b5	Start documenting berry blender	2020-08-22 19:39:39 -04:00
GriffinR	3014241179	Give songs meaningful english names	2020-08-20 19:06:14 -04:00
GriffinR	6c34effda9	Merge pull request #1138 from GriffinRichards/doc-contest ... Document contest	2020-08-20 16:03:47 -04:00
GriffinR	503dafd210	Fix wallys parents misnamed as uncle/aunt	2020-08-18 17:51:41 -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
GriffinR	22b5b6b074	Start documenting roulette	2020-07-30 19:37:16 -04:00
DizzyEggg	11c2207839	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion	2020-07-27 14:54:32 +02:00
GriffinR	af09e73d67	Merge branch 'master' into doc-overworld	2020-07-18 20:24:09 -04:00
DizzyEggg	e03fea84d0	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion	2020-07-11 12:46:41 +02:00
GriffinR	ebb6c4ee66	Merge branch 'master' into doc-overworld	2020-07-08 15:51:58 -04:00
GriffinR	89bcf3cbd9	Merge branch 'master' into add-localids	2020-07-08 15:47:45 -04:00
GriffinR	1ce929157f	Clean up field effect doc	2020-07-02 05:05:13 -04:00
GriffinR	eb80012757	Document more misc field effects	2020-06-29 16:32:46 -04:00
GriffinR	4ea6992172	Continue documenting overworld/field effects	2020-06-29 01:26:29 -04:00
GriffinR	fac6288156	Add local object event ids for referenced objects	2020-06-22 17:18:58 -04:00
GriffinR	2859900ea9	Second pass on documenting union room	2020-06-10 17:30:59 -04:00
GriffinR	3f97763181	Document cable_club.c	2020-06-06 16:10:03 -04:00
GriffinR	fd77eb1eb9	Document wireless_communication_status_screen.c	2020-06-03 14:07:40 -04:00
DizzyEggg	09dcff81f8	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion	2020-04-15 13:28:10 +02:00
PikalaxALT	784e29352d	Merge pull request #985 from mrgriffin/decoration ... Document decoration.c	2020-03-17 10:39:37 -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	b5c54d404d	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion	2020-03-06 11:38:32 +01:00
Martin Griffin	4485d51522	Document decoration.c	2020-03-06 09:47:20 +00:00
PikalaxALT	9259b378ef	Merge pull request #991 from GriffinRichards/fix-eventticket ... Clarify event ticket flag names	2020-03-03 16:15:27 -05:00
GriffinR	b6c9ad505d	Minor fixes in trainer_battle.inc	2020-03-03 14:47:14 -05:00
GriffinR	4637085390	Clarify event ticket flag names	2020-03-03 01:36:20 -05:00
DizzyEggg	13c0c64d70	Merge with master	2020-02-23 12:41:36 +01:00
GriffinR	86354f1d50	Document some pokenav and region map	2020-02-05 21:04:43 -05:00
DizzyEggg	044f070020	Merge with master	2020-01-18 15:04:56 +01:00
GriffinR	ea8b1011d3	Merge master into fix-eventobj	2020-01-15 16:11:20 -05:00
GriffinR	22931846d6	Fix Colosseum name porymap issue	2020-01-13 20:20:48 -06:00
GriffinR	e92cc7752b	Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj	2020-01-13 20:41:57 -05:00
huderlem	6d6c57f383	Merge pull request #953 from GriffinRichards/sync-script ... Port some macro/script fixes from pokefirered	2020-01-13 19:33:47 -06:00
GriffinR	c19289596d	Give/Take to Add/Remove for silent script macros	2020-01-12 23:24:52 -05:00
GriffinR	655910a16f	Merge branch 'master' into fix-eventobj	2020-01-12 22:42:43 -05:00
GriffinR	10220d3b76	Label TryRecordMixLinkup	2020-01-12 19:39:30 -06:00
GriffinR	e736c2d2fd	Document some easy chat specials	2020-01-12 19:39:30 -06:00
GriffinR	c27a4778ee	Standardize prebattle -> intro	2020-01-12 19:39:30 -06:00
GriffinR	6a470ddfda	Some script clean up, document secret base secrets show	2020-01-12 19:39:30 -06:00
GriffinR	f2e7b1507e	Port some macro/script fixes from pokefirered	2020-01-11 14:12:31 -05:00
DizzyEggg	9a2888fdbf	Merge into master	2019-12-23 16:46:03 +01:00
GriffinR	68cdd7b1cb	Merge master into ObjEvent rename	2019-12-21 05:19:27 -05: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
GriffinR	9e08cfe55f	Remove uses of compare_var_to	2019-12-18 19:22:39 -05:00
GriffinR	949509aade	Merge branch 'master' into fix-eventobj	2019-12-18 13:16:38 -05:00
GriffinR	d1cf9006fb	Document some warp/field screen effect	2019-12-17 05:23:07 -05:00
GriffinR	96ec5e1b84	Use fadescreen constants	2019-12-15 11:42:50 -05:00
GriffinR	82f55f2381	Merge master into ObjEvent rename	2019-12-15 02:00:00 -05:00
GriffinR	6967caefb2	Split finditem_std from giveitem_std	2019-12-14 08:41:46 -06:00
GriffinR	75b0c9d7a9	Document Battle Pyramid scripts	2019-12-14 08:38:26 -06:00
GriffinR	6556b556dd	Merge branch 'master' into fix-eventobj	2019-12-11 01:09:06 -05:00
GriffinR	49f1a90534	Document Battle Pike scripts	2019-12-10 19:31:27 -06:00
DizzyEggg	871e093b65	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion	2019-12-09 08:20:29 +01:00
GriffinR	b93101bbeb	Merge master into ObjEvent rename	2019-12-06 21:37:33 -05:00
GriffinR	a4191040c9	Sync weather names	2019-12-06 19:05:28 -06:00
GriffinR	c51e0f3bae	Merge branch 'master' into fix-eventobj	2019-12-06 02:34:54 -05:00
GriffinR	7beddd16dd	Document missed scripts/text	2019-12-05 21:20:55 -06:00
GriffinR	fdae25eab2	Set up Battle Pyramid macros	2019-12-05 21:11:17 -06:00
GriffinR	41c1c9ca8a	Set up Battle Pike macros	2019-12-05 21:11:17 -06:00
DizzyEggg	6e06b08c94	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion	2019-11-29 20:55:23 +01:00
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
GriffinR	08a8dc46e3	Use macros for Trainer Hill	2019-11-25 18:37:48 -06:00
GriffinR	4dfa959fa2	Begin documenting Battle Pike and Frontier Util	2019-11-25 18:37:48 -06:00
GriffinR	2bf1e0600e	Consolidate apprentice_buff macros	2019-11-23 08:09:25 -05:00
DizzyEggg	f3f9e47f96	Merge	2019-11-22 23:10:04 +01: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	a05006421b	Document Apprentice	2019-11-20 17:36:52 -05:00
GriffinR	4e6a69c297	WIP Document Apprentice	2019-11-19 11:36:38 -05:00
GriffinR	a486c8affd	Begin documenting Apprentice, merge with master	2019-11-18 12:47:10 -05:00
GriffinR	5e01871f8b	Document Trainer Hill	2019-11-16 13:02:35 -06:00
huderlem	0a43f2ce53	Merge pull request #899 from GriffinRichards/doc-scriptclean ... Document interview and TV scripts, and misc script clean up	2019-11-16 11:34:47 -06:00
GriffinR	fc3783b739	WIP Document apprentice	2019-11-16 12:28:49 -05:00
GriffinR	525ec2025d	Document Routes 111-118	2019-11-14 17:41:01 -06:00
GriffinR	ff7e11c0b0	Merge branch 'master' into doc-scriptclean	2019-11-13 19:25:41 -05:00
GriffinR	ef8370566f	Document Contest scripts	2019-11-13 18:20:55 -06:00
GriffinR	af83b41dd1	Document Contest Hall berry blenders and misc	2019-11-13 18:20:55 -06:00
GriffinR	7455bd9b9a	Document interview and TV scripts, and misc script clean up	2019-11-12 14:20:05 -05:00
GriffinR	a3ee92a4e7	Document some frontier util funcs	2019-11-10 16:37:14 -06:00
DizzyEggg	791ed999d9	Merge	2019-11-10 12:40:11 +01:00
GriffinR	ae1767fe46	Document Mystery Event Club script	2019-11-09 08:41:43 -06:00