41 Commits

Author	SHA1	Message	Date
DizzyEggg	cebada80d0	Merge with master	2019-02-28 20:56:52 +01:00
Phlosioneer	8816aa527d	Update map script files	2019-02-25 08:01:22 -06:00
Phlosioneer	0de831fd29	Name some common single-entry movements	2019-02-24 10:10:18 -06:00
DizzyEggg	842e379a7b	Merge branch 'master' into battle_engine_v2	2019-02-23 22:50:46 +01: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
DizzyEggg	aa33a61e58	Merge branch 'master' into battle_engine_v2	2019-02-07 21:17:30 +01: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
DizzyEggg	736826e863	New feature - battle 2 vs 1 opponent	2019-01-27 20:54:34 +01:00
DizzyEggg	4827776a3c	Merge with master	2019-01-05 10:14:20 +01: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
DizzyEggg	27b1d74dad	Merge branch 'master' into battle_engine_v2	2018-12-29 15:11:54 +01:00
Marcus Huderle	a1ea3b5e39	Use map_header_flags macro (#483)	2018-12-26 12:20:15 -06:00
DizzyEggg	6fa5f33519	Merge branch 'master' into battle_engine_v2	2018-12-24 09:07:18 +01:00
DizzyEggg	e54dd6a02b	Merge with master	2018-12-22 13:53:07 +01: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	5e6ceeb631	update applymovement to remove magic numbers	2018-12-19 14:08:01 -05:00
DizzyEggg	470df386c9	Fix conflicts	2018-12-07 23:01:14 +01:00
Melody	2615ece23b	Use normal apostrophes like adults	2018-12-07 10:41:08 -05:00
DizzyEggg	ad67f4f26f	Merge with master and REQ arguments	2018-12-02 22:05:23 +01: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
DizzyEggg	a0699dba52	Add Aromatic Mist	2018-11-25 12:59:22 +01:00
DizzyEggg	194139a35b	Add Move Effect - Feint	2018-11-24 19:37:10 +01:00
DizzyEggg	cc635c5e6d	Custom wild multi battles functionality	2018-11-24 17:31:45 +01:00
DizzyEggg	1c8e574646	Custom Multi Battles - fix defeat msg	2018-11-24 17:06:48 +01:00
DizzyEggg	d52016bc31	Mon creation in custom multi battles	2018-11-24 13:29:10 +01:00
DizzyEggg	539b05ff73	Begin working on custom multi battles	2018-11-24 01:02:02 +01:00
Deokishisu	bf2063cc1a	Update All EVENT_OBJ_GFX References ... Didn't realize that this needed to be done as well for renaming OW sprites. The event_objects.h file has had its corresponding defines renamed and all references in all files to those defines have been relabeled.	2018-10-14 19:09:18 -04:00
garak	c3512e3b39	port larger heal location changes from poke ruby pr	2018-08-10 10:45:15 -04: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	5e00c0bfcf	Fix map constants	2018-06-20 19:54:21 -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