39 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	36551dff2f	Treat warp ids as strings to allow constants	2022-09-03 15:43:43 -04:00
ultima-soul	4f2e3bf214	Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync	2021-12-17 21:23:54 -08:00
GriffinR	e66ea0cb99	Reformat compare + goto_if/call_if to single statements	2021-11-18 23:06:51 -05:00
ultima-soul	988320b89a	Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync	2021-08-17 11:25:13 -07:00
GriffinR	44cd9eed6b	Add align directives to all marts	2021-08-04 11:50:33 -04:00
GriffinR	06351bf63c	Remove address comments	2021-07-20 15:18:31 -04:00
DizzyEggg	271219f962	Merge with master	2020-09-08 12:00:51 +02:00
GriffinR	3014241179	Give songs meaningful english names	2020-08-20 19:06:14 -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	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
DizzyEggg	13c0c64d70	Merge with master	2020-02-23 12:41:36 +01: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
DizzyEggg	791ed999d9	Merge	2019-11-10 12:40:11 +01:00
GriffinR	290df23130	Document remaining poke marts	2019-11-04 16:42:28 -06:00
DizzyEggg	cb6bafcb7f	Merge with master	2019-10-06 14:40:12 +02:00
GriffinR	ecf2097abb	initial event_scripts documentation	2019-08-14 23:38:42 -04:00
DizzyEggg	896602db5b	Begin item expansion	2019-04-13 13:14:45 +02:00
Phlosioneer	e77e7844ea	Name several vars, document some related events	2019-02-27 20:25:09 -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
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
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
Marcus Huderle	a1ea3b5e39	Use map_header_flags macro (#483)	2018-12-26 12:20:15 -06: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
Melody	c557ac61ae	adds constants, cleans up callstd and msgbox code ... * adds some constants for standard script names and messagebox types * replaces some callstd calls with msgbox calls where equivalent * replaces msgbox and callstd calls using raw digits with versions that use the constants	2018-12-02 03:37:46 -05:00
Marcus Huderle	94650495c6	Use map battle scene constants in map headers	2018-07-12 22:45:41 -05:00
Marcus Huderle	546819bc72	Use map type constants in map headers	2018-07-12 22:39:38 -05:00
Marcus Huderle	d53e8137cd	Use weather constants in map headers	2018-07-12 22:15:35 -05:00
Marcus Huderle	d5eb94330a	Use region map section constants in map headers	2018-07-12 21:47:04 -05:00
Marcus Huderle	8ffd7a70fc	Use movement type constants in object_event macros	2018-07-10 18:04:51 -05:00
Marcus Huderle	135a11e50e	Move events and scripts into map dirs	2018-06-20 19:54:21 -05:00
Marcus Huderle	89d35e82a2	Move 'map attributes' into 'layouts'	2018-06-20 19:54:21 -05:00
sceptillion	96511dc214	use internal song names	2017-12-22 00:10:20 -08:00
Diegoisawesome	f61810a8f9	Dump maps	2017-11-09 19:21:31 -06:00