e92cc7752b
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
f2e7b1507e
Port some macro/script fixes from pokefirered
2020-01-11 14:12:31 -05:00
635267ce32
Merge branch 'master' into fix-eventobj
2020-01-08 05:51:49 -05:00
31b4656324
Labels better
2019-12-25 22:39:06 -05:00
82cb741d8b
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
00f22b6400
Document remaining routes (104, 119-123)
2019-11-14 17:51:02 -06:00
d9da932dad
Document Rustboro scripts
2019-11-05 16:43:57 -06:00
033c6cea3b
Use YES/NO constants for MSGBOX_YESNO
2019-11-02 16:36:43 -05:00
dd01942c4f
Document aqua/magma hideout scripts
2019-11-01 17:22:45 -05:00
13f9760187
Document route 109 scripts
2019-10-26 12:55:53 -05:00
83d0a87d0c
Document several route scripts
2019-10-24 20:14:11 -05:00
4fd848e689
Document early route scripts
2019-10-22 16:47:19 -05:00
d914c1d659
Document common movements
2019-10-06 13:55:30 -04:00
9aed405851
Document a few field specials
2019-09-30 01:42:52 -04:00
1d703e786b
move some data out of event_scripts, use game stat constants
2019-09-05 14:56:34 -04:00
6b04ea0727
Merge branch 'master' into document-eventscripts
2019-09-03 22:22:14 -04:00
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
ecf2097abb
initial event_scripts documentation
2019-08-14 23:38:42 -04:00
c2bf668fdd
rename town/city vars
2019-08-05 11:23:45 -04:00
0f5d96e5f5
name used and unnamed vars
2019-08-03 14:12:48 -04:00
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
2c076f1f3e
Doc most OnTransitions
2019-04-22 17:23:59 -05:00
4a09a5da33
Doc field move scripts completely, use fldeff constants for dofieldeffect
...
Fix labels
Fix labels again
Delete extra boulder scripts
Now it should build fine
2019-04-06 12:48:50 -05:00
90e32f4ec5
Document landmark setting and item balls
2019-04-04 19:34:35 -05:00
84573f1774
Merge pull request #574 from Phlosioneer/event-vars
...
Event vars
2019-02-25 08:02:28 -06:00
8816aa527d
Update map script files
2019-02-25 08:01:22 -06:00
4e5fae0086
Merge branch 'master' into event-vars
2019-02-25 02:24:20 -05:00
0de831fd29
Name some common single-entry movements
2019-02-24 10:10:18 -06:00
4582fd1545
Name a ton of commonly used event scripts
2019-02-24 10:10:18 -06:00
e12a7790cf
Start porting pokeruby vars to pokeemerald
2019-02-22 04:01:38 -05:00
19b76bffda
Use strings for map json trainer_type and trainer_sight_or_berry_tree_id fields
2019-02-16 16:56:41 -06:00
0b1bb9e4e9
use strings for map json coord_event var_value
2019-02-16 16:14:43 -06:00
29d6221935
Convert map data to JSON
2019-01-31 15:51:20 -06:00
5c1667b41a
Define layout constants
2019-01-29 16:55:25 -06:00
a3ebca4d81
Fix merge conflicts
2019-01-02 21:25:14 +00:00
1e3da62d24
Finish off labelling flags
2019-01-02 21:12:43 +00:00
dc6c0ed17e
add event object var references
2018-12-29 11:56:53 -06:00
6d556f8cf7
improve checkplayergender calls
...
clean up constant definitions
make tweaks from review
2018-12-28 08:22:21 -06:00
a1ea3b5e39
Use map_header_flags macro ( #483 )
2018-12-26 12:20:15 -06:00
38293d4293
use player constant in obj script commands
2018-12-24 16:31:24 -05:00
55005f1588
improve call_if macros
2018-12-21 21:32:45 -05:00
ac2e4adf2d
improve goto_if macros
2018-12-21 20:28:24 -05:00
5e6ceeb631
update applymovement to remove magic numbers
2018-12-19 14:08:01 -05:00
2615ece23b
Use normal apostrophes like adults
2018-12-07 10:41:08 -05:00
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
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
862265b73a
defines register_matchcall macro
2018-12-02 06:04:59 -05:00
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
113a8d1efd
clean flags and remove temp macro
2018-10-19 14:59:18 -04:00
1441ee6bc3
finish event object flags
2018-10-19 13:04:47 -04:00
GriffinR