Commit Graph

35 Commits

Author SHA1 Message Date
GriffinR
3014241179 Give songs meaningful english names 2020-08-20 19:06:14 -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
655910a16f
Merge branch 'master' into fix-eventobj 2020-01-12 22:42:43 -05:00
GriffinR
c27a4778ee Standardize prebattle -> intro 2020-01-12 19:39:30 -06: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
60a9dc6a0e Fix map script names 2019-10-13 15:40:15 -04:00
GriffinR
70d1d8956e Document elite_four.inc and the E4 map scripts 2019-10-08 02:25:31 -04:00
GriffinR
06af24bce5 Use misc ScrCmd constants 2019-09-16 19:44:47 -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
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
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
38293d4293 use player constant in obj script commands 2018-12-24 16:31:24 -05: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
Melody
bad5323642 cleans up trainer battle scripts
* adds battle type macros
* adds `trainerbattle_normal` macro
* adds `trainerbattle_double` macro
* adds rematch macros
* adds no intro macro
2018-12-02 15:08:19 -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
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