467 Commits

Author	SHA1	Message	Date
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	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