diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-02-19 14:49:14 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-19 14:49:14 -0500 |
| commit | 4280723f0ef24ff218cb81fd4ce8eb7abf063d34 (patch) | |
| tree | 490c6f22a1311ea234d09949704c7ec1215731c7 /asm/macros/map.inc | |
| parent | 57cf3a4bfb521e8a5ea4c85744b4789ea7d38215 (diff) | |
| parent | 3e806419156cd1b57f8c6c1b215f836b467c723a (diff) | |
Merge pull request #260 from GriffinRichards/doc-connection
Split connection field from graphics id in object events
Diffstat (limited to 'asm/macros/map.inc')
| -rw-r--r-- | asm/macros/map.inc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/asm/macros/map.inc b/asm/macros/map.inc index 0f35bf959..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 |