Commit Graph

50 Commits

Author SHA1 Message Date
GriffinR 81d95b9325 Use BUGFIX for some inline fixes 2020-12-12 23:30:51 -05:00
GriffinR 3014241179 Give songs meaningful english names 2020-08-20 19:06:14 -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 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 5c627518b3 Rename Grunts to use location-specific names 2019-11-04 16:45:00 -06:00
GriffinR 5f1fcdd023 Document aqua/magma area scripts 2019-11-01 17:22:45 -05:00
GriffinR dd01942c4f Document aqua/magma hideout scripts 2019-11-01 17:22:45 -05: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
Tustin2121 6508469259 Rename movobjectoffscreen to copyobjectxytoperm
Renaming the command to something that makes more sense as to what the command actually does. The command copies the current xy of the instantiated object back to its template, so that the object remains in the same place if the player walks away and despawns the object, and then comes back. "moveobjectoffscreen" implies that it might be taking the object and moving it physically to an off-screen location somehow.
2019-08-17 13:18:56 -04:00
GriffinR c2bf668fdd rename town/city vars 2019-08-05 11:23:45 -04:00
garak 713f61de7c continue labeling metatiles for scripts 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
Phlosioneer 648fc3d4f3 Name more unknown vars 2019-02-27 15:18:56 -05: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
Phlosioneer 4582fd1545 Name a ton of commonly used event scripts 2019-02-24 10:10:18 -06: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
Diegoisawesome 449fb25f23 Clear up misnamed time-based flags and functions 2019-02-12 00:40:34 -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
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
Melody 10725def8e trainerbattle_normal → trainerbattle_single
* trainerbattle_normal → trainerbattle_single
* TRAINER_BATTLE_NORMAL → TRAINER_BATTLE_SINGLE
* improves the macro documentation a little
2018-12-02 15:08:19 -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
garak c27043bd3c more event flags 2018-10-18 15:28:59 -04:00
garak 624a7552b6 use event flags in event scripts 2018-10-17 09:05:22 -04: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
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