Commit Graph

55 Commits

Author SHA1 Message Date
GriffinR 96ec5e1b84 Use fadescreen constants 2019-12-15 11:42:50 -05:00
GriffinR a4191040c9 Sync weather names 2019-12-06 19:05:28 -06:00
GriffinR d5685db19a Fold nops into hidemoneybox 2019-11-07 10:37:15 -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 dd01942c4f Document aqua/magma hideout scripts 2019-11-01 17:22:45 -05:00
GriffinR b1ea2592c3 Merge branch 'master' into doc-partymenu 2019-10-31 14:22:51 -04:00
GriffinR 6db014cc32 Document party_menu first pass 2019-10-25 15:41:06 -04:00
GriffinR b4a9298205 Merge branch 'master' into document-gyms2 2019-10-16 04:22:34 -04:00
GriffinR 1b41b8b7ca Document Petalburg, Fortree, Sootopolis, and some of Mossdeep Gyms 2019-10-15 05:05:57 -04: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 06af24bce5 Use misc ScrCmd constants 2019-09-16 19:44:47 -05:00
Tustin2121 18dee14170 Review fixes 2019-08-17 23:26:46 -04:00
Tustin2121 f4d4424618 Folded nops into hidemoneybox and updatemoneybox
The nops are essential to the hidemoneybox and updatemoneybox commands when using vanilla versions of those commands. Even though they're not actually used parameters in the command implementation, they are still consumed, which means if someone were to get rid of the nops (as I did in TriHard) it causes the commands to consume bytecode that are not theirs, resulting in undefined behavior usually leading to softlocks. Folding the extra bytes into the macros means there's no chance of the extra bytes getting losts in scripts.
2019-08-17 13:25:36 -04: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
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
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 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 862265b73a defines register_matchcall macro 2018-12-02 06:04:59 -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 d1b7f32b0a begin event flag names, add temporary hidden item macro 2018-10-17 22:07:23 -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
Diegoisawesome e92e2cb0aa Merge branch 'master' of github.com:pret/pokeemerald 2018-07-24 21:18:36 -07:00
Diegoisawesome 156fb472e1 Clean up files and add entries to charmap 2018-07-24 21:18:23 -07: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