diff options
| author | ultima-soul <akshayjhanji@hotmail.com> | 2020-03-13 00:32:04 -0700 |
|---|---|---|
| committer | ultima-soul <akshayjhanji@hotmail.com> | 2020-03-13 00:32:04 -0700 |
| commit | 99e4de062ae43aa978ad4f1a8cd70bc739c64c9d (patch) | |
| tree | 1164d31577e6ebddc1cb313d40bb69ce0d426170 /asm/macros/map.inc | |
| parent | 339c2914affc3c62ac9a5725aa1a0c7ccc3161ca (diff) | |
| parent | 6af8c04d8fa6aaeaeb6c8b919e7770a65b9a883d (diff) | |
Merge branch 'master' into event_object_movement
Diffstat (limited to 'asm/macros/map.inc')
| -rw-r--r-- | asm/macros/map.inc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/asm/macros/map.inc b/asm/macros/map.inc index d903899fe..881ffdbb4 100644 --- a/asm/macros/map.inc +++ b/asm/macros/map.inc @@ -14,9 +14,10 @@ .4byte \address .endm - .macro object_event index:req, gfx:req, x:req, y:req, elevation:req, movement_type:req, x_radius:req, y_radius:req, trainer_type:req, sight_radius_tree_etc:req, script:req, event_flag:req + .macro object_event index:req, gfx:req, in_connection:req x:req, y:req, elevation:req, movement_type:req, x_radius:req, y_radius:req, trainer_type:req, sight_radius_tree_etc:req, script:req, event_flag:req .byte \index - .2byte \gfx + .byte \gfx + .byte \in_connection .byte 0 .2byte \x, \y .byte \elevation, \movement_type, ((\y_radius << 4) | \x_radius), 0 @@ -88,3 +89,8 @@ map \map .space 2 .endm + + .macro map_header_flags allow_cycling:req, allow_escaping:req, allow_running:req, show_map_name:req + .byte \allow_cycling + .byte ((\show_map_name & 1) << 2) | ((\allow_running & 1) << 1) | ((\allow_escaping & 1) << 0) + .endm |