Commit Graph

48 Commits

Author SHA1 Message Date
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 655910a16f Merge branch 'master' into fix-eventobj 2020-01-12 22:42:43 -05:00
GriffinR f2e7b1507e Port some macro/script fixes from pokefirered 2020-01-11 14:12:31 -05:00
GriffinR ff2d8a9c4e Add frontier trainer constants 2019-12-20 21:14:05 -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 2b944fd721 Merge branch 'master' into doc-trickhouse 2019-11-06 19:49:14 -05:00
GriffinR 25d026aded Document Trick House scripts 2019-11-06 19:41:19 -05:00
GriffinR d0198088d9 Document Lanettes, Winstrates, Old Ladys, and Wingull houses 2019-11-06 17:01:23 -06:00
GriffinR d8f5e73bb7 Merge branch 'master' into doc-inc 2019-10-07 17:37:04 -04:00
GriffinR 7ba11b7a1b Use VAR_FACING constants 2019-10-07 16:36:02 -05:00
GriffinR d914c1d659 Document common movements 2019-10-06 13:55:30 -04:00
GriffinR de0084ef7a Document multichoice ids 2019-09-19 00:56:51 -04:00
GriffinR 06af24bce5 Use misc ScrCmd constants 2019-09-16 19:44:47 -05:00
garak a43dcd26bd finish labeling metatiles 2019-06-16 10:08:07 -05: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 e8add87bf3 Document Field Effects and some related text
Also VAR_TRICK_HOUSE_LEVEL
2019-03-23 09:57:37 -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 cea5696f23 Finish moving pokeruby vars 2019-02-22 04:18:43 -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 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 5e6ceeb631 update applymovement to remove magic numbers 2018-12-19 14:08:01 -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
garak 113a8d1efd clean flags and remove temp macro 2018-10-19 14:59:18 -04:00
garak 1441ee6bc3 finish event object flags 2018-10-19 13:04:47 -04:00
garak ff97873c30 label temp flags, test replace script 2018-10-17 12:25:12 -04:00
garak 624a7552b6 use event flags in event scripts 2018-10-17 09:05:22 -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 7d375972ba Sync bg_event macros with pokeruby 2018-07-11 11:12:26 -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