619 Commits

Author	SHA1	Message	Date
GriffinR	513c7c5f45	Clarify Kecleon objects	2020-11-23 14:42:47 -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	46ccb91155	Fixed "Ultra Rope" name.	2020-09-13 11:35:05 -03:00
DizzyEggg	271219f962	Merge with master	2020-09-08 12:00:51 +02:00
GriffinR	1264c4615a	Merge pull request #1158 from GriffinRichards/doc-cablecar ... Document cable car	2020-09-03 16:24:27 -04:00
GriffinR	4ad147f75d	Merge pull request #1156 from GriffinRichards/doc-rayscene ... Document Rayquaza cutscene	2020-09-01 14:46:14 -04:00
GriffinR	f5495d1220	Give proper names to underwater maps	2020-09-01 03:03:14 -04:00
GriffinR	bf61de01a7	Start documenting battle factory screen	2020-08-31 13:36:48 -04:00
GriffinR	08a8aad65a	Merge branch 'master' into doc-cablecar	2020-08-28 16:17:48 -04:00
GriffinR	0cfc279af5	Merge branch 'master' into doc-rayscene	2020-08-28 16:17:11 -04:00
GriffinR	71a066f945	Document cable car	2020-08-28 03:54:04 -04:00
DizzyEggg	35559d6b71	Merge with master	2020-08-27 10:58:31 +02:00
GriffinR	95ea0e92e7	Start documenting rayquaza_scene	2020-08-25 17:49:42 -04:00
GriffinR	d356e35b64	Fix incorrect pike curtain SE names	2020-08-20 20:23:08 -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	3ba8cabd80	Fix Brenday typo	2020-08-18 15:56:44 -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	11c2207839	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion	2020-07-27 14:54:32 +02:00
GriffinR	4a42e2a710	Merge branch 'master' into doc-overworld	2020-07-23 10:31:52 -04:00
PikalaxALT	2e077f09e4	Merge pull request #1111 from GriffinRichards/sync-flags ... Sync unused flags with pokeruby	2020-07-23 09:12:33 -04:00
GriffinR	813f0c724f	Sync flags with pokeruby	2020-07-22 18:00:41 -04:00
GriffinR	a1cc7d2bd6	Document faraway island	2020-07-19 14:12:38 -04:00
GriffinR	af09e73d67	Merge branch 'master' into doc-overworld	2020-07-18 20:24:09 -04:00
GriffinR	96fd719a19	Merge pull request #1081 from GriffinRichards/add-localids ... Add local object event ids for referenced objects	2020-07-17 18:18:47 -04:00
GriffinR	e129d04b93	Merge branch 'master' into doc-overworld	2020-07-15 00:40:47 -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	431c60c92c	Merge branch 'master' of https://github.com/pret/pokeemerald into doc-confetti	2020-07-08 15:45:31 -04:00
GriffinR	4ea6992172	Continue documenting overworld/field effects	2020-06-29 01:26:29 -04:00
GriffinR	a88676094b	Add missed deoxys rock local id	2020-06-23 15:51:23 -04:00
GriffinR	18d57a3802	Document some overworld and field effects	2020-06-23 15:48:53 -04:00
GriffinR	fac6288156	Add local object event ids for referenced objects	2020-06-22 17:18:58 -04:00
GriffinR	24569583e4	Document contest results	2020-06-18 17:50:13 -04:00
GriffinR	76f6d05173	Document confetti	2020-06-17 03:39:03 -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
DizzyEggg	f86282f423	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion	2020-04-29 08:47:51 +02:00
GriffinR	cb5b8da77b	More trainer type usage	2020-04-28 19:59:08 -05:00
GriffinR	e5757a3def	Use trainer type constants	2020-04-28 19:59:08 -05:00
GriffinR	ecd4824f67	Index heal location data, use better names	2020-04-28 19:59:08 -05:00
GriffinR	b1d26e10a8	Sync map header property names with pokefirered	2020-04-28 19:59:08 -05:00
DizzyEggg	09dcff81f8	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion	2020-04-15 13:28:10 +02:00
GriffinR	dde4a0416c	Label GCN link flags field	2020-04-13 08:42:31 -04:00
GriffinR	8e4b987699	Revert more porymap-breaking changes	2020-03-18 03:22:07 -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
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	956090b05f	Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj	2020-02-12 13:05:57 -05:00
GriffinR	eaf508ba5e	Resolve missing parens errors	2020-02-12 00:44:09 -05: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	96720db083	Remove unnecessary removeitem arguments	2020-01-12 23:29:19 -05: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
huderlem	fa5816915d	Merge pull request #949 from GriffinRichards/doc-dome ... Document Battle Dome and add facility party constants	2020-01-12 20:10:03 -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	e497fc64e3	if_undefeated macro to if_not_defeated	2020-01-12 20:20:02 -05:00
GriffinR	f2e7b1507e	Port some macro/script fixes from pokefirered	2020-01-11 14:12:31 -05:00
GriffinR	635267ce32	Merge branch 'master' into fix-eventobj	2020-01-08 05:51:49 -05:00
GriffinR	ef67f2d33b	Merge master into ObjEvent rename and prune accidental inclusions	2020-01-08 05:43:06 -05:00
GriffinR	e5df61e362	Merge branch 'master' into doc-dome	2020-01-08 01:15:36 -05:00
GriffinR	fb5bea98ce	More battle_dome.c doc	2020-01-07 22:30:37 -05:00
huderlem	3b05398975	Merge pull request #945 from Fontbane/patch-5 ... Give rival and Maxie parties better names	2019-12-28 12:06:35 -06:00
Fontbane	31b4656324	Labels better	2019-12-25 22:39:06 -05:00
huderlem	ee61726136	Merge pull request #936 from GriffinRichards/doc-tower ... Document Battle Tower scripts	2019-12-25 11:39:20 -06: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	ff2d8a9c4e	Add frontier trainer constants	2019-12-20 21:14:05 -05:00
GriffinR	63c8cf97d1	Document Battle Dome scripts and some battle_dome.c	2019-12-20 16:53:33 -05:00
GriffinR	949509aade	Merge branch 'master' into fix-eventobj	2019-12-18 13:16:38 -05:00
GriffinR	23f952b34e	Merge master into doc-tower	2019-12-17 21:17:46 -05:00
GriffinR	ddfa0c6298	Document Battle Tower scripts	2019-12-17 20:56:13 -05:00
GriffinR	4879c1eab2	Merge branch 'master' into constants-fade	2019-12-17 19:11:51 -05:00
huderlem	edb5df1716	Merge pull request #933 from GriffinRichards/doc-tents ... Document Battle Tent scripts	2019-12-17 18:09:49 -06:00
GriffinR	d1cf9006fb	Document some warp/field screen effect	2019-12-17 05:23:07 -05:00
GriffinR	db8a5c6c2b	Merge branch 'master' into fix-eventobj	2019-12-15 11:47:27 -05:00
GriffinR	96ec5e1b84	Use fadescreen constants	2019-12-15 11:42:50 -05:00
huderlem	fee36224ed	Merge pull request #925 from GriffinRichards/doc-matchcall ... Document some pokenav match call	2019-12-15 09:42:13 -06:00
GriffinR	82f55f2381	Merge master into ObjEvent rename	2019-12-15 02:00:00 -05:00
GriffinR	97b5560bdb	Document Battle Tent scripts	2019-12-15 01:47:01 -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	aa72c0ada3	Document Battle Factory scripts	2019-12-14 08:32:32 -06:00
GriffinR	6556b556dd	Merge branch 'master' into fix-eventobj	2019-12-11 01:09:06 -05:00
GriffinR	47b0d8a597	Merge branch 'master' into doc-matchcall	2019-12-10 20:43:27 -05:00
GriffinR	49f1a90534	Document Battle Pike scripts	2019-12-10 19:31:27 -06:00
GriffinR	fe16452999	Typo fix	2019-12-10 19:28:16 -06:00
GriffinR	fcd8d37d62	Document Battle Palace scripts	2019-12-10 19:28:16 -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	efaea2a3ab	Revert WEATHER_CLOUDY to WEATHER_SHADE	2019-12-06 19:05:28 -06: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	49c6ae1ac6	Add some macro comments	2019-12-05 21:11:17 -06:00
GriffinR	467a103bcc	Set up Battle Tent macros	2019-12-05 21:11:17 -06:00
GriffinR	fdae25eab2	Set up Battle Pyramid macros	2019-12-05 21:11:17 -06:00
GriffinR	9fcfbdbef5	Set up Battle Factory macros	2019-12-05 21:11:17 -06:00
GriffinR	41c1c9ca8a	Set up Battle Pike macros	2019-12-05 21:11:17 -06:00
GriffinR	9b3d1cfab6	Set up Battle Dome and Tower macros	2019-12-05 21:11:17 -06:00
GriffinR	be17c1602d	Set up remaining facility script doc, use Palace macros	2019-12-05 21:11:17 -06:00
GriffinR	548af3c0f1	Document a bit of Match Call	2019-12-05 15:33:36 -05:00
DizzyEggg	6e06b08c94	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion	2019-11-29 20:55:23 +01:00
GriffinR	df1fce705c	Fix hard-coded string ptr	2019-11-29 00:10:55 -05:00
GriffinR	cb90f22c5e	Merge master into ObjEvent rename	2019-11-27 12:51:10 -05:00
GriffinR	8d870d94c9	Document Battle Arena scripts	2019-11-26 18:47:48 -06:00
GriffinR	f559fa3fe2	Merge master into ObjEvent rename	2019-11-25 20:00:04 -05:00
GriffinR	0db46e84bc	Use macros for FRONTIER_DATA_6, fix offset comment	2019-11-25 18:37:48 -06: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
huderlem	bef6150b59	Merge pull request #909 from GriffinRichards/doc-apprentice ... Document Apprentice	2019-11-23 09:27:02 -06:00
DizzyEggg	f3f9e47f96	Merge	2019-11-22 23:10:04 +01:00
GriffinR	7034f59c14	Rename EventObj to ObjEvent	2019-11-21 00:14:40 -05: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	215bb31d67	Clean up Trainer Fan Club doc	2019-11-20 09:08:24 -06:00
GriffinR	5c5c1836bb	Document Trainer Fan Club	2019-11-20 09:08:24 -06: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	6ac7efb54f	Document Scotts House and begin frontier macros	2019-11-17 08:16:28 -06:00
GriffinR	f7e17ca985	Document Ranking Hall scripts	2019-11-17 08:16:28 -06:00
GriffinR	d6e681066b	Document Battle Frontier outside scripts	2019-11-17 08:16:28 -06: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	0513e05c38	Document Frontier Reception Gate	2019-11-16 12:00:35 -06:00
GriffinR	248b85c3cb	Document Frontier Exchange Corner scripts	2019-11-16 12:00:35 -06:00
GriffinR	dadaba3075	Fix bet amount typo	2019-11-16 11:37:34 -06:00
GriffinR	57a66bb22d	Document Battle Frontier lounges	2019-11-16 11:37:34 -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	0f53aeb19b	Document SS Tidal scripts	2019-11-14 18:07:56 -06:00
GriffinR	00f22b6400	Document remaining routes (104, 119-123)	2019-11-14 17:51:02 -06:00
GriffinR	525ec2025d	Document Routes 111-118	2019-11-14 17:41:01 -06:00
GriffinR	0ba591d26f	Document ocean routes	2019-11-14 17:29:46 -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	c0ae1cbc1c	Document Lilycove scripts	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	6c863f6724	Document Sootopolis scripts	2019-11-10 16:37:14 -06: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	5ac8b126e9	Document Mt Pyre scripts	2019-11-09 12:32:13 -06:00
GriffinR	e4d65addf4	Document Mossdeep scripts	2019-11-09 10:42:52 -06:00
huderlem	ed76620d28	Merge pull request #880 from GriffinRichards/doc-trickhouse ... Document Trick House scripts	2019-11-09 08:48:49 -06:00
GriffinR	06bb4ba402	Document Secret Power TM script	2019-11-09 08:41:43 -06:00
GriffinR	8702972067	Document Sky Pillar outside	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	030784dece	Merge pull request #882 from GriffinRichards/doc-mauville ... Document Mauville and New Mauville scripts	2019-11-07 20:22:56 -06: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	4334e31a7e	Fix sailing typo	2019-11-07 16:46:56 -05:00
GriffinR	5e4dd022a6	Document Dewford scripts	2019-11-07 16:36:48 -05:00
GriffinR	5d35662c4c	Document Pacifidlog scripts	2019-11-07 15:41:42 -05:00
GriffinR	de933000e3	Document Lavaridge scripts	2019-11-07 15:21:32 -05:00
GriffinR	979ece7d56	Document Fortree scripts	2019-11-07 14:49:52 -05:00
GriffinR	bae4a586d8	Document Hall of Fame scripts	2019-11-07 13:26:53 -05:00
GriffinR	35ed8de51b	Fix Battle Colosseum names	2019-11-07 12:37:11 -05:00
GriffinR	09afa7992d	Document Shoal Cave	2019-11-07 12:17:28 -05:00
GriffinR	d5685db19a	Fold nops into hidemoneybox	2019-11-07 10:37:15 -05:00
GriffinR	0b5c2c2721	Document New Mauville scripts	2019-11-07 10:32:21 -05:00
GriffinR	c132989679	Document Mauville scripts	2019-11-07 10:18:56 -05:00
GriffinR	43b7fd741a	Document Game Corner scripts	2019-11-07 09:41:59 -05:00
GriffinR	3a00b66407	Document cave scripts	2019-11-07 07:57:51 -05:00
GriffinR	2b944fd721	Merge branch 'master' into doc-trickhouse	2019-11-06 19:49:14 -05:00
GriffinR	25d026aded	Document Trick House scripts	2019-11-06 19:41:19 -05:00
GriffinR	1475c4d8da	Document other cable car station	2019-11-06 17:01:23 -06:00
GriffinR	fbc3eee1f2	Document Fossil Maniac and Berry Master route houses	2019-11-06 17:01:23 -06:00
GriffinR	7d5d12877e	Document cycling, cable car, and tunneler route houses	2019-11-06 17:01:23 -06:00
GriffinR	d0198088d9	Document Lanettes, Winstrates, Old Ladys, and Wingull houses	2019-11-06 17:01:23 -06:00
GriffinR	903b8060a7	Document Glass Workshop	2019-11-06 17:01:23 -06:00
GriffinR	dba94e3971	Update fldeff sparkle macro	2019-11-06 16:41:56 -06:00
GriffinR	6730df2321	Document Abandoned Ship scripts	2019-11-06 16:41:56 -06:00
GriffinR	481c09fcad	Clean up Rustboro script doc	2019-11-05 16:43:57 -06:00
GriffinR	d9da932dad	Document Rustboro scripts	2019-11-05 16:43:57 -06:00
GriffinR	1d421f2f71	Document Devon Corp scripts	2019-11-05 16:43:57 -06:00
GriffinR	5ef300c10b	Document dept store	2019-11-04 16:49:06 -06:00
GriffinR	5c627518b3	Rename Grunts to use location-specific names	2019-11-04 16:45:00 -06:00
GriffinR	290df23130	Document remaining poke marts	2019-11-04 16:42:28 -06:00
GriffinR	878eb523d7	Document remainder of poke centers	2019-11-04 16:42:28 -06:00
GriffinR	033c6cea3b	Use YES/NO constants for MSGBOX_YESNO	2019-11-02 16:36:43 -05:00
GriffinR	a90b828bb8	Use YES/NO constants	2019-11-02 16:32:58 -05:00
GriffinR	e4fe21786e	Document misc special houses	2019-11-02 16:32:58 -05:00