2581 Commits

Author	SHA1	Message	Date
jiangzhengwenjz	aa631825fc	resolve data sections	2020-01-16 08:14:27 -06:00
jiangzhengwenjz	46b00b11d4	match all the functions	2020-01-16 08:14:27 -06:00
jiangzhengwenjz	c2be2e8c69	sync documentation from firered	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
Marcus Huderle	5a2d676e71	Merge remote-tracking branch 'upstream' into tustin2121-patch-5	2020-01-13 20:26:20 -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
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	6a470ddfda	Some script clean up, document secret base secrets show	2020-01-12 19:39:30 -06:00
GriffinR	58e64b9524	Clean up some of save.c	2020-01-12 18:42:41 -06: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	017fa294b5	Add battle tent mon/trainer constants	2020-01-08 01:07:53 -05:00
GriffinR	fb5bea98ce	More battle_dome.c doc	2020-01-07 22:30:37 -05:00
GriffinR	bb692a03eb	Add frontier mon constants	2020-01-03 23:20:11 -05:00
DizzyEggg	b69292248c	Add constants for special multi battles	2020-01-01 00:22:42 +01:00
DizzyEggg	39e3b0b740	Form changes layout and Stance Change Aegi	2019-12-31 19:11:53 +01:00
DizzyEggg	4c9ea32d19	Merge with master	2019-12-30 18:52:23 +01:00
Marcus Huderle	ef751c8d1b	Fix formatting and remove unnecessary comments	2019-12-28 12:07:02 -06: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	8d64bc9df8	Merge pull request #944 from GriffinRichards/doc-itemuse ... Document item_use.c	2019-12-25 11:59:07 -06:00
huderlem	ee61726136	Merge pull request #936 from GriffinRichards/doc-tower ... Document Battle Tower scripts	2019-12-25 11:39:20 -06:00
DizzyEggg	eb029d557b	Merge pull request #215 from LOuroboros/aftermath ... Implemented Aftermath's effect	2019-12-25 12:04:09 +01:00
DizzyEggg	e4a9a228c5	Merge pull request #210 from ultima-soul/battle_engine ... Implement Leaf Guard.	2019-12-23 17:15:51 +01:00
DizzyEggg	15d34c3513	Fix strings coz they had the same name for some unknown to me reason	2019-12-23 17:09:13 +01:00
DizzyEggg	9e3d5672e6	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2	2019-12-23 16:40:21 +01:00
GriffinR	749965d56b	Document item_use.c	2019-12-21 21:39:30 -05:00
GriffinR	68cdd7b1cb	Merge master into ObjEvent rename	2019-12-21 05:19:27 -05:00
LOuroboros	c690d577a5	Implemented Aftermath's effect	2019-12-21 05:01:42 -03: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	d137a1a0c1	Use constants in compare macro	2019-12-18 19:12:09 -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
huderlem	f8cef9a6a8	Merge pull request #932 from jiangzhengwenjz/berry_crush ... berry crush	2019-12-17 19:35:00 -06:00
GriffinR	4879c1eab2	Merge branch 'master' into constants-fade	2019-12-17 19:11:51 -05:00
jiangzhengwenjz	5bec27aa34	nonmatch sub_8024604	2019-12-18 03:36:51 +08:00
GriffinR	d1cf9006fb	Document some warp/field screen effect	2019-12-17 05:23:07 -05:00
ultima-soul	029ab67ff4	Implement Leaf Guard.	2019-12-16 00:29:20 -08: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	a04347816f	Split PokenavMatchCallEntries from PokenavMonList	2019-12-15 10:25:47 -05:00
GriffinR	82f55f2381	Merge master into ObjEvent rename	2019-12-15 02:00:00 -05:00
GriffinR	75b0c9d7a9	Document Battle Pyramid scripts	2019-12-14 08:38:26 -06:00
GriffinR	ea9a2c848a	Define start and ends for temp vars and daily/temp/special flags	2019-12-14 08:27:49 -06:00
GriffinR	09840efc64	Name last event_data funcs	2019-12-14 08:27:49 -06:00
GriffinR	1a672dac8d	Use constant for daily flag offset	2019-12-14 08:27:49 -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	b7ab9cbf4c	Update JP translation and fix typo	2019-12-10 19:29:23 -06:00
GriffinR	ed1ff0ad77	Document misc strings and text colors	2019-12-10 19:29:23 -06:00
GriffinR	8da7a94423	Merge branch 'master' into fix-eventobj	2019-12-10 17:41:08 -05:00
Diegoisawesome	49b56d0136	Merge pull request #929 from jiangzhengwenjz/nonmatching ... fake match InitEventObjectStateFromTemplate	2019-12-10 14:32:57 -08:00
jiangzhengwenjz	f34b8f564a	InitEventObjectStateFromTemplate	2019-12-11 05:35:40 +08:00
DizzyEggg	740ab29c7c	Merge pull request #204 from cfmnephrite/beta ... Dancer	2019-12-09 08:36:22 +01:00
DizzyEggg	ac499bc896	Merge with master	2019-12-09 08:16:18 +01:00
GriffinR	51179df017	Clean up match call doc	2019-12-08 15:49:36 -05:00
GriffinR	0086cd1efa	More pokenav match call documentation	2019-12-08 15:25:21 -05:00
Nephrite	0343f63eda	Dancer ... Implemented Dancer and all relevant code for interacting with abilities, certain moves, etc	2019-12-07 10:19:01 +00:00
GriffinR	b93101bbeb	Merge master into ObjEvent rename	2019-12-06 21:37:33 -05:00
GriffinR	22fd579fd9	Add comment for ABNORMAL_WEATHER	2019-12-06 19:05:28 -06:00
GriffinR	7f22fc9879	Update old weather names in field_weather_effect	2019-12-06 19:05:28 -06:00
GriffinR	955bfe3f5c	Add comment for original weather name	2019-12-06 19:05:28 -06: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	1b30f0c973	Rename event_obj_lock to event_object_lock	2019-12-06 02:55:30 -05:00
GriffinR	cc9b923dc2	More pokenav match call documentation	2019-12-06 02:35:08 -05:00
GriffinR	c51e0f3bae	Merge branch 'master' into fix-eventobj	2019-12-06 02:34:54 -05: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	dcb5d16cb3	Merge with master	2019-11-29 21:47:31 +01: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
Sewef	07b79c3fc3	battle_anim_effects_3 (5)	2019-11-24 18:00:51 +01: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
Sewef	4f590e8f61	battle_anim_effects_3 (4)	2019-11-23 11:57:39 +01:00
DizzyEggg	88244463e9	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2	2019-11-22 22:50:03 +01:00
DizzyEggg	8cc0439182	merge master	2019-11-22 22:47:19 +01:00
GriffinR	4c52cf9ed1	Fix event constant file names	2019-11-21 14:03:35 -05:00
GriffinR	86c08330c4	Fix Event Object include guards	2019-11-21 14:03:11 -05:00
GriffinR	5822dfca8d	Rename FIELD_OBJ_EVENT to OBJECT_EVENT_MOVEMENT	2019-11-21 10:47:24 -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	b2eb49888d	Clean up Apprentice doc	2019-11-20 19:00:08 -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
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	5393b42f7c	Remove SpriteCB_Null name	2019-11-17 08:16:28 -06:00
GriffinR	f6ab6934ae	Align battle tower func spacing	2019-11-17 08:16:28 -06: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	b96fad074b	Rename neverRead fields	2019-11-16 13:02:35 -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	2c3726a328	Document contest strings	2019-11-16 12:50:01 -06:00
GriffinR	248b85c3cb	Document Frontier Exchange Corner scripts	2019-11-16 12:00:35 -06:00
GriffinR	57a66bb22d	Document Battle Frontier lounges	2019-11-16 11:37:34 -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	ba65719090	Typo fix	2019-11-14 17:51:02 -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	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
DizzyEggg	e82fc06e08	Match ConvertImageProcessingToGBA	2019-11-12 17:25:02 +01:00
Marcus Huderle	8e65f0188f	Rename contest_painting_effects to image_processing_effects	2019-11-10 16:37:26 -06:00
Marcus Huderle	1ed3af66eb	Document contest painting image processing effects	2019-11-10 16:37:26 -06:00
GriffinR	a3ee92a4e7	Document some frontier util funcs	2019-11-10 16:37:14 -06:00
DizzyEggg	b4ac979600	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2	2019-11-10 12:09:43 +01:00
DizzyEggg	ea6736cd8d	merge	2019-11-10 12:09:14 +01:00
huderlem	ed76620d28	Merge pull request #880 from GriffinRichards/doc-trickhouse ... Document Trick House scripts	2019-11-09 08:48:49 -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
huderlem	662a9915cf	Merge pull request #881 from GriffinRichards/doc-caves ... Document cave scripts	2019-11-07 18:29:48 -06:00
Marcus Huderle	01e6fb6dd0	Document some battle_bg-related things	2019-11-07 18:24:04 -06:00
GriffinR	de933000e3	Document Lavaridge scripts	2019-11-07 15:21:32 -05:00
GriffinR	bae4a586d8	Document Hall of Fame scripts	2019-11-07 13:26:53 -05:00