73 Commits

Author	SHA1	Message	Date
Eduardo Quezada	e4a439aa46	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030 ... # Conflicts: # src/data/bard_music/moves.h # src/data/bard_music/pokemon.h	2022-10-30 12:30:38 -03:00
GriffinR	cc182bf05e	Use Porymap's new order for connection fields	2022-10-24 10:05:59 -04:00
GriffinR	36551dff2f	Treat warp ids as strings to allow constants	2022-09-03 15:43:43 -04:00
ultima-soul	d408b56549	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2021-12-01 20:18:57 -08:00
ultima-soul	a8f9a54787	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2021-11-21 10:41:32 -08:00
GriffinR	e66ea0cb99	Reformat compare + goto_if/call_if to single statements	2021-11-18 23:06:51 -05:00
cbt6	32aaf6912f	Rename movement scripts to use Faster over Fastest	2021-11-05 02:22:28 +08:00
ultima-soul	5cb73a012c	Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_id_revamp	2021-08-30 11:57:27 -07:00
GriffinR	06351bf63c	Remove address comments	2021-07-20 15:18:31 -04:00
ultima-soul	ad8cfda831	Add and rearrange Key Items.	2021-07-06 17:03:46 -07:00
ExpoSeed	6a977bdbfc	Document second parameter of playbgm	2021-05-21 15:08:00 -05:00
GriffinR	0851c34bac	Add berry tree id constants	2021-02-05 15:25:12 -05:00
GriffinR	3014241179	Give songs meaningful english names	2020-08-20 19:06:14 -04:00
GriffinR	3ba8cabd80	Fix Brenday typo	2020-08-18 15:56:44 -04:00
GriffinR	fac6288156	Add local object event ids for referenced objects	2020-06-22 17:18:58 -04:00
GriffinR	e5757a3def	Use trainer type constants	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
GriffinR	e92cc7752b	Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj	2020-01-13 20:41:57 -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
Fontbane	31b4656324	Labels better	2019-12-25 22:39:06 -05:00
GriffinR	82cb741d8b	Standardize EVENT_OBJECT to OBJECT_EVENT	2019-11-20 23:12:51 -05:00
GriffinR	525ec2025d	Document Routes 111-118	2019-11-14 17:41:01 -06:00
GriffinR	dd01942c4f	Document aqua/magma hideout scripts	2019-11-01 17:22:45 -05:00
Marcus Huderle	aad430c049	Document route 110 scripts	2019-10-26 12:55:53 -05:00
GriffinR	d914c1d659	Document common movements	2019-10-06 13:55:30 -04:00
GriffinR	1d703e786b	move some data out of event_scripts, use game stat constants	2019-09-05 14:56:34 -04:00
GriffinR	0f5d96e5f5	name used and unnamed vars	2019-08-03 14:12:48 -04:00
Fontbane	901a83d249	Fix some labels and include decorations.h ... Include decorations.h in shop.c Include decorations.h in event_scripts.s	2019-04-22 17:23:59 -05:00
Fontbane	2c076f1f3e	Doc most OnTransitions	2019-04-22 17:23:59 -05:00
Fontbane	90e32f4ec5	Document landmark setting and item balls	2019-04-04 19:34:35 -05:00
huderlem	84573f1774	Merge pull request #574 from Phlosioneer/event-vars ... Event vars	2019-02-25 08:02:28 -06:00
Phlosioneer	8816aa527d	Update map script files	2019-02-25 08:01:22 -06:00
Phlosioneer	4e5fae0086	Merge branch 'master' into event-vars	2019-02-25 02:24:20 -05:00
Phlosioneer	0de831fd29	Name some common single-entry movements	2019-02-24 10:10:18 -06:00
Phlosioneer	4582fd1545	Name a ton of commonly used event scripts	2019-02-24 10:10:18 -06:00
Phlosioneer	e12a7790cf	Start porting pokeruby vars to pokeemerald	2019-02-22 04:01:38 -05:00
Marcus Huderle	19b76bffda	Use strings for map json trainer_type and trainer_sight_or_berry_tree_id fields	2019-02-16 16:56:41 -06:00
garak	0b1bb9e4e9	use strings for map json coord_event var_value	2019-02-16 16:14:43 -06:00
Marcus Huderle	29d6221935	Convert map data to JSON	2019-01-31 15:51:20 -06:00
Marcus Huderle	5c1667b41a	Define layout constants	2019-01-29 16:55:25 -06:00
Marcus Huderle	36a1825bbe	Document trainer approach funcs, and use movement type constants in scripts	2019-01-29 14:36:02 -06:00
Tetrable	a3ebca4d81	Fix merge conflicts	2019-01-02 21:25:14 +00:00
Tetrable	1e3da62d24	Finish off labelling flags	2019-01-02 21:12:43 +00:00
Melody	dc6c0ed17e	add event object var references	2018-12-29 11:56:53 -06:00
Melody	6d556f8cf7	improve checkplayergender calls ... clean up constant definitions make tweaks from review	2018-12-28 08:22:21 -06:00
Marcus Huderle	a1ea3b5e39	Use map_header_flags macro (#483)	2018-12-26 12:20:15 -06:00
Melody	55005f1588	improve call_if macros	2018-12-21 21:32:45 -05:00
Melody	ac2e4adf2d	improve goto_if macros	2018-12-21 20:28:24 -05:00
Melody	2615ece23b	Use normal apostrophes like adults	2018-12-07 10:41:08 -05:00