1980 Commits

Author	SHA1	Message	Date
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
PikalaxALT	135ed6a162	Merge pull request #1163 from GriffinRichards/doc-animthrow ... Minor battle_anim_throw cleanup	2020-09-04 19:44:33 -04: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	5773bb8643	Merge pull request #1152 from GriffinRichards/doc-blender ... Document berry blender	2020-08-30 15:33:17 -04:00
GriffinR	afb3472282	Minor battle_anim_throw cleanup	2020-08-30 15:11:44 -04:00
hondew	e46b35455d	Merge branch 'master' into pokeball-doc	2020-08-30 14:14:38 -04:00
hondew	328aecc96e	Document throwing pokeball ... continue Document more Doc more funcs Remove workspace Document shiny stars Document PokeBlock Clean up Clean more	2020-08-30 14:08:06 -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	c830731734	Merge branch 'master' into doc-blender	2020-08-28 16:16:00 -04:00
GriffinR	09cfed64b5	Merge pull request #1146 from GriffinRichards/rename-songs ... Give songs meaningful english names	2020-08-28 16:14:21 -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	0ff767a9b5	Start documenting berry blender	2020-08-22 19:39:39 -04:00
GriffinR	fbb70b3727	Document contest AI scripts	2020-08-21 14:57:17 -04:00
GriffinR	469ec5f248	Document contest AI commands	2020-08-21 02:36:48 -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	2749948eeb	Clean up contest doc	2020-08-16 05:52:17 -04:00
GriffinR	e98e4652fd	Document contest live updates	2020-08-16 05:18:09 -04:00
GriffinR	3779422489	Split contest funcs from script_pokemon_util	2020-08-13 17:42:12 -04:00
GriffinR	8b95e1964b	Merge pull request #1121 from GriffinRichards/doc-roulette ... Document roulette	2020-08-10 17:18:09 -04:00
GriffinR	078c341b2b	Merge pull request #1122 from GriffinRichards/clean-battlemsg ... Add stat stage constants, clean up misc battle msg data	2020-08-10 14:29:27 -04:00
GriffinR	5e8ffff62f	Add stat stage constants	2020-08-04 20:38:57 -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	aca50c87be	Continue new contest documentation	2020-07-24 00:14:53 -04:00
GriffinR	52a4428ba6	Begin new contest documentation	2020-07-23 17:55:40 -04: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
PikalaxALT	5348674bc4	Merge pull request #1102 from GriffinRichards/doc-faraway ... Document faraway island	2020-07-23 09:12:19 -04:00
GriffinR	60ca1aa3fd	Restore tabs in field_effect_scripts.s	2020-07-23 05:07:20 -04:00
GriffinR	a4e47f1201	Clean some battle_message.c data	2020-07-23 05:01:42 -04:00
GriffinR	813f0c724f	Sync flags with pokeruby	2020-07-22 18:00:41 -04:00
GriffinR	33523d1b06	Comment gBattleAI_ScriptsTable with constants	2020-07-20 14:20:25 -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	1a27af8855	Merge pull request #1100 from GriffinRichards/clean-battlescrdata ... Misc battle and battle palace documentation	2020-07-18 20:22:44 -04:00
GriffinR	aba42513d3	Clean up some battle scr cmd data	2020-07-18 18:10:15 -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	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	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
GriffinR	fd77eb1eb9	Document wireless_communication_status_screen.c	2020-06-03 14:07:40 -04:00
GriffinR	f9e6f7540f	Use fixed point macros for math util	2020-05-24 08:28:02 -05: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	d478156ad9	Split stormy_water png for kyogre/groudon	2020-04-12 13:04:05 -04:00
GriffinR	097ddb0677	Re-export tileset anim pngs to use palettes	2020-04-02 11:18:47 -04:00
GriffinR	8e4b987699	Revert more porymap-breaking changes	2020-03-18 03:22:07 -04: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	fd34afac1e	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion	2020-03-13 22:44:35 +01:00
garakmon	b1dd945cbf	move fonts from data/graphics/ to graphics/	2020-03-12 13:40:00 -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
GriffinR	53724e2b43	Delete asm siirtc data	2020-03-01 00:35:42 -05:00
DizzyEggg	f2760e3083	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion	2020-02-29 09:47:14 +01:00
GriffinR	51cd0ac081	Rename battle anim type files, remove unneeded ARG_RET_IDs	2020-02-25 12:54:08 -06:00
GriffinR	dc3c2b72f2	Clean up move anim doc	2020-02-25 12:54:08 -06:00
GriffinR	68dc68907b	Label move anim data	2020-02-25 12:54:08 -06:00
GriffinR	efd53d080c	Clean up battle anim C for doc	2020-02-25 12:54:08 -06:00
GriffinR	afa1ae2209	Finish documenting move anim scripts	2020-02-25 12:54:08 -06:00
GriffinR	e633b57593	Document remaining status/general/special anims	2020-02-25 12:54:08 -06:00
GriffinR	208057d7ae	Document move anims S-Z	2020-02-25 12:54:08 -06:00
GriffinR	0d651c7c9e	Some battle anim review changes	2020-02-25 12:54:08 -06:00
GriffinR	1ba12dc050	Document move anims I-S	2020-02-25 12:54:08 -06:00
GriffinR	501d0d3c18	Document move anims C-H	2020-02-25 12:54:08 -06:00
GriffinR	6eb44dc507	Document move anims A-C	2020-02-25 12:54:08 -06:00
DizzyEggg	13c0c64d70	Merge with master	2020-02-23 12:41:36 +01:00
GriffinR	3456578c0f	Move berry crush data to src	2020-02-17 13:10:23 -06:00
GriffinR	ac1738e11d	Move smokescreen data to src	2020-02-13 14:48:19 -06:00
GriffinR	d11cd5d217	Move text input strings to src	2020-02-13 14:48:19 -06: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	689acd3613	Move slot machine data to src	2020-02-09 14:11:50 -06:00
GriffinR	43ec11b92a	Move berry powder data to src	2020-02-08 14:22:53 -06:00
GriffinR	d1035f027e	Move contest_link_80F57C4 data to src	2020-02-08 14:22:53 -06:00
GriffinR	85dc8a528c	Move rotating tile puzzle data to src	2020-02-08 14:22:53 -06:00
GriffinR	86354f1d50	Document some pokenav and region map	2020-02-05 21:04:43 -05:00
DizzyEggg	bf6aa6a176	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion	2020-01-31 22:02:10 +01:00
GriffinR	9c934c9664	Merge master into fix-eventobj, add explicit size to gObjectEventGraphicsInfoPointers	2020-01-26 12:23:08 -05:00
GriffinR	6f392632c2	Note AI weather bug	2020-01-22 18:05:42 -05:00
GriffinR	4c12ad00d2	Merge branch 'master' into fix-eventobj	2020-01-19 21:57:29 -05:00
DizzyEggg	044f070020	Merge with master	2020-01-18 15:04:56 +01:00
jiangzhengwenjz	aa631825fc	resolve data sections	2020-01-16 08:14:27 -06:00
jiangzhengwenjz	8a5f292618	document symbols	2020-01-16 08:14:27 -06: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	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	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
GriffinR	3efc8199d4	More battle_dome.c documentation	2019-12-25 22:27:33 -08: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	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	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	ed1ff0ad77	Document misc strings and text colors	2019-12-10 19:29:23 -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	9a81661075	Merge pull request #851 from Sewef/patch-3 ... battle_anim_effects_3	2019-11-24 12:02:54 -06:00
huderlem	bef6150b59	Merge pull request #909 from GriffinRichards/doc-apprentice ... Document Apprentice	2019-11-23 09:27:02 -06:00
Sewef	1dfe34dee3	TriForce → TriAttack	2019-11-23 15:51:08 +01:00
GriffinR	2bf1e0600e	Consolidate apprentice_buff macros	2019-11-23 08:09:25 -05:00
Sewef	4f590e8f61	battle_anim_effects_3 (4)	2019-11-23 11:57:39 +01:00
DizzyEggg	f3f9e47f96	Merge	2019-11-22 23:10:04 +01:00
GriffinR	4c52cf9ed1	Fix event constant file names	2019-11-21 14:03:35 -05: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	a05006421b	Document Apprentice	2019-11-20 17:36:52 -05:00
GriffinR	215bb31d67	Clean up Trainer Fan Club doc	2019-11-20 09:08:24 -06:00