Commit Graph

57 Commits

Author SHA1 Message Date
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 635267ce32 Merge branch 'master' into fix-eventobj 2020-01-08 05:51:49 -05:00
Fontbane 31b4656324 Labels better 2019-12-25 22:39:06 -05:00
GriffinR 949509aade Merge branch 'master' into fix-eventobj 2019-12-18 13:16:38 -05:00
GriffinR 96ec5e1b84 Use fadescreen constants 2019-12-15 11:42:50 -05:00
GriffinR b93101bbeb Merge master into ObjEvent rename 2019-12-06 21:37:33 -05:00
GriffinR a4191040c9 Sync weather names 2019-12-06 19:05:28 -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 5c627518b3 Rename Grunts to use location-specific names 2019-11-04 16:45:00 -06:00
GriffinR 033c6cea3b Use YES/NO constants for MSGBOX_YESNO 2019-11-02 16:36:43 -05:00
GriffinR 5f1fcdd023 Document aqua/magma area scripts 2019-11-01 17:22:45 -05:00
GriffinR ca2c6fa9b1 Document pc_transfer.inc 2019-10-22 17:57:28 -05:00
GriffinR 945d3d3a27 Merge branch 'master' into document-eventscripts 2019-09-17 00:10:23 -04:00
GriffinR 06af24bce5 Use misc ScrCmd constants 2019-09-16 19:44:47 -05:00
GriffinR 6b04ea0727 Merge branch 'master' into document-eventscripts 2019-09-03 22:22:14 -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 ecf2097abb initial event_scripts documentation 2019-08-14 23:38:42 -04:00
Fontbane d9115ada86 Use species constants for VAR_TEMP_1 before givemon 2019-05-13 10:16:28 -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 7d54c2b960 EventScript and Text Documentation
In event_script.s. Also renamed a couple events for consistency/detail.
2019-03-23 09:57:37 -05:00
Phlosioneer c1348d22f3 Name most event scripts related to unusual weather 2019-02-27 04:27:54 -05:00
Phlosioneer fe55580fe1 Reverse engineer unusual weather events 2019-02-27 03:42:04 -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
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 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 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 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
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