diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-06-14 21:58:47 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-06-15 07:49:00 -0500 |
| commit | 93659a77cdd888a100ad78ea0028053d7a3b2973 (patch) | |
| tree | ca99d2cf71c1150f5bf322324896ad31540a00d9 /include/macros/map.inc | |
| parent | 17c6698705f6ab0956be060fc4b81c0fb01988f5 (diff) | |
Split movement radius values in object_event macro
Diffstat (limited to 'include/macros/map.inc')
| -rw-r--r-- | include/macros/map.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/macros/map.inc b/include/macros/map.inc index c931d3b0e..80257fd23 100644 --- a/include/macros/map.inc +++ b/include/macros/map.inc @@ -14,11 +14,11 @@ .4byte \address .endm - .macro object_event index, gfx, replacement, x, y, elevation, movement_type, radius, trainer_type, sight_radius_tree_etc, script, event_flag + .macro object_event index, gfx, replacement, x, y, elevation, movement_type, x_radius, y_radius, trainer_type, sight_radius_tree_etc, script, event_flag .byte \index, \gfx, \replacement, 0 .2byte \x .2byte \y - .byte \elevation, \movement_type, \radius, 0 + .byte \elevation, \movement_type, ((\y_radius << 4) | \x_radius), 0 .2byte \trainer_type, \sight_radius_tree_etc .4byte \script .2byte \event_flag |