390 Commits

Author	SHA1	Message	Date
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
GriffinR	06bb4ba402	Document Secret Power TM script	2019-11-09 08:41:43 -06:00
GriffinR	a38bff8c17	Document Slateport scripts	2019-11-09 08:37:06 -06:00
GriffinR	1174a20a17	Document Fallarbor and Verdanturf scripts	2019-11-09 08:37:06 -06:00
huderlem	906a1ec4ab	Merge pull request #883 from GriffinRichards/fix-colossname ... Fix Battle Colosseum names	2019-11-08 17:24:05 -06:00
GriffinR	9140594b23	Merge branch 'master' into doc-littleroot	2019-11-08 03:07:50 -05:00
GriffinR	e19b9c9d46	Resolve Littleroot merge conflict	2019-11-08 03:07:19 -05:00
GriffinR	bef24a45f0	Document Littleroot scripts	2019-11-08 02:47:55 -05:00
huderlem	1ceee6ef70	Merge pull request #884 from GriffinRichards/doc-halloffame ... Document a few towns/cities	2019-11-07 19:55:19 -06:00
GriffinR	de933000e3	Document Lavaridge scripts	2019-11-07 15:21:32 -05:00
GriffinR	03a7995570	Move hall of fame script	2019-11-07 13:28:33 -05:00
GriffinR	35ed8de51b	Fix Battle Colosseum names	2019-11-07 12:37:11 -05:00
GriffinR	3a00b66407	Document cave scripts	2019-11-07 07:57:51 -05:00
GriffinR	37bd93ec6c	Rename mystery event msg scripts	2019-11-06 16:38:02 -06:00
GriffinR	e7f6459a89	Split mystery event msg	2019-11-06 16:38:02 -06:00
GriffinR	d9da932dad	Document Rustboro scripts	2019-11-05 16:43:57 -06:00
GriffinR	033c6cea3b	Use YES/NO constants for MSGBOX_YESNO	2019-11-02 16:36:43 -05:00
GriffinR	5f1fcdd023	Document aqua/magma area scripts	2019-11-01 17:22:45 -05:00
huderlem	6eaac9ea9d	Merge pull request #863 from GriffinRichards/doc-partymenu ... Document party menu	2019-10-31 21:36:56 -05:00
GriffinR	8055548fa4	Document legendary scripts	2019-10-31 18:28:34 -05:00
GriffinR	b1ea2592c3	Merge branch 'master' into doc-partymenu	2019-10-31 14:22:51 -04:00
GriffinR	67ce8c9cc2	Clean up players_house doc	2019-10-30 17:51:35 -05:00
GriffinR	93e2851fc1	Document players_house.inc and Littleroot house scripts	2019-10-30 17:51:35 -05:00
Marcus Huderle	13f9760187	Document route 109 scripts	2019-10-26 12:55:53 -05:00
GriffinR	f35a3f73b2	Document gabby_and_ty.inc	2019-10-26 09:32:04 -05:00
GriffinR	6db014cc32	Document party_menu first pass	2019-10-25 15:41:06 -04:00
GriffinR	7d24f2d62c	Document record_mix.inc and clean surf.inc	2019-10-22 17:57:28 -05:00
GriffinR	ca2c6fa9b1	Document pc_transfer.inc	2019-10-22 17:57:28 -05:00
GriffinR	9a86769847	Document obtain_item.inc	2019-10-22 17:57:28 -05:00
GriffinR	c0aaa01424	Document flash.inc	2019-10-22 17:57:28 -05:00
GriffinR	fa4940ee44	Clean up lilycove_lady.inc doc	2019-10-21 20:19:37 -05:00
GriffinR	6923f0e369	Document lilycove_lady.inc	2019-10-21 20:19:37 -05:00
GriffinR	c70162086b	Split some smaller files from event_scripts	2019-10-21 17:22:19 -05:00
GriffinR	973e6f9667	Document mauville_man.inc	2019-10-21 17:21:53 -05:00
Marcus Huderle	04ea8eea5a	Document rest of Petalburg scripts	2019-10-20 12:36:35 -05:00
GriffinR	ac399ade4a	Document safari zone scripts	2019-10-20 09:53:21 -05:00
GriffinR	0db188b487	Clean up berry_tree.inc and misc adjacent documentation	2019-10-20 09:46:46 -05:00
DizzyEggg	1d10d44a4d	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion	2019-10-19 15:17:45 +02:00
GriffinR	b4a9298205	Merge branch 'master' into document-gyms2	2019-10-16 04:22:34 -04:00
GriffinR	1b41b8b7ca	Document Petalburg, Fortree, Sootopolis, and some of Mossdeep Gyms	2019-10-15 05:05:57 -04:00
GriffinR	928cdf2531	Merge branch 'master' into doc-inc2	2019-10-14 19:25:10 -04:00
GriffinR	30ef494163	Merge branch 'master' into doc-inc2	2019-10-13 15:44:07 -04:00
GriffinR	bb23128b77	Merge conflict resolves into review changes	2019-10-13 15:33:19 -04:00
GriffinR	144c5888a1	Fix map script names	2019-10-13 15:29:53 -04:00
GriffinR	a081124a20	Merge branch 'master' into doc-inc	2019-10-13 15:26:44 -04:00
GriffinR	4e2be7ff5e	Review changes for #835	2019-10-12 15:14:57 -05:00
GriffinR	1c99f5b7c9	Split text from cable_club.inc	2019-10-12 15:14:57 -05:00
GriffinR	1b7607bd91	Document cable_club.inc	2019-10-12 15:14:57 -05:00
GriffinR	70d1d8956e	Document elite_four.inc and the E4 map scripts	2019-10-08 02:25:31 -04:00
GriffinR	d8f5e73bb7	Merge branch 'master' into doc-inc	2019-10-07 17:37:04 -04:00
GriffinR	bcf74df27f	Use B_OUTCOME constants for GetBattleOutcome	2019-10-07 16:36:47 -05:00
GriffinR	7ba11b7a1b	Use VAR_FACING constants	2019-10-07 16:36:02 -05:00
GriffinR	628301d6d5	Document unusual_weather.inc	2019-10-07 11:29:14 -04:00
GriffinR	9553ec1d28	Document mevent.inc	2019-10-07 10:34:12 -04:00
GriffinR	0df304d629	Document roulette.inc	2019-10-07 02:00:16 -04:00
GriffinR	81ee8f07ef	Document pc.inc and prof_birch.inc	2019-10-07 01:13:34 -04:00
GriffinR	c4deb4db96	Document field_poison	2019-10-06 20:04:30 -04:00
GriffinR	f179ab95c0	Document move tutors	2019-10-06 17:30:17 -04:00
GriffinR	02070eaf73	Document kecleon	2019-10-06 16:06:34 -04:00
GriffinR	748a1dbdd4	Document cave hole	2019-10-06 14:16:37 -04:00
GriffinR	d914c1d659	Document common movements	2019-10-06 13:55:30 -04:00
DizzyEggg	cb6bafcb7f	Merge with master	2019-10-06 14:40:12 +02:00
GriffinR	749247b910	Convert 4 spaces in .inc to tab	2019-10-05 10:52:48 -04:00
GriffinR	2ac3ad3e60	Review changes for #819 and merge	2019-10-02 12:40:00 -04:00
GriffinR	67152b9242	Split off more files from event_scripts	2019-09-28 02:37:01 -04:00
GriffinR	75869a880c	Move running shoes script	2019-09-27 15:27:08 -04:00
GriffinR	12cc7ef34c	Split more files from event_scripts	2019-09-27 14:20:51 -04:00
GriffinR	86f1f9066a	Split some files from event_scripts	2019-09-27 12:22:58 -04:00
GriffinR	0c1f1281da	Review changes for #778	2019-09-27 10:08:47 -04:00
GriffinR	1491b1855b	Merge branch 'master' into document-eventscripts	2019-09-26 15:03:22 -04:00
GriffinR	37373c1b21	Review changes for #817	2019-09-25 18:46:25 -05:00
GriffinR	4e98a0cc4b	Remove Egg parent constants	2019-09-25 18:46:25 -05:00
GriffinR	801ca37f04	Document day_care.inc and related	2019-09-25 18:46:25 -05:00
GriffinR	de6e1e9ecf	Use multi constants from merge	2019-09-23 00:36:49 -04:00
GriffinR	a180d2af49	Merge branch 'master' into document-eventscripts	2019-09-22 12:18:48 -04:00
GriffinR	8e4e344c7d	Merge branch 'master' into document-scriptmenu	2019-09-22 09:45:44 -04:00
GriffinR	80f58f7b24	Document PLAYER_HAS constants, consolidate poke constants	2019-09-22 08:14:22 -05:00
GriffinR	b6dffcf8b7	Clean up script_menu documentation	2019-09-19 19:23:24 -04:00
GriffinR	de0084ef7a	Document multichoice ids	2019-09-19 00:56:51 -04:00
GriffinR	b596322ca2	Initial script_menu documentation	2019-09-18 18:57:25 -04:00
GriffinR	58b8d7c297	Merge branch 'master' into document-eventscripts	2019-09-17 18:01:20 -04:00
GriffinR	aac9658a8e	Document some field_specials data	2019-09-17 16:50:17 -05:00
GriffinR	945d3d3a27	Merge branch 'master' into document-eventscripts	2019-09-17 00:10:23 -04:00
GriffinR	06af24bce5	Use misc ScrCmd constants	2019-09-16 19:44:47 -05:00
GriffinR	f4160ded98	Fix misnamed function	2019-09-16 00:29:59 -04:00
GriffinR	826fc3154e	condense secret base mapscript labels	2019-09-06 13:01:45 -04:00
GriffinR	cb82d868af	fix secret base jsons	2019-09-06 02:49:26 -04:00
GriffinR	9fbcd552de	document remainder of secret_base scripts, delete unneeded scripts.incs	2019-09-06 02:12:00 -04:00
GriffinR	8c6b5648d4	document secret_base_1.inc	2019-09-05 16:16:21 -04:00