diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2018-12-20 22:53:08 +0100 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-12-20 22:53:08 +0100 |
commit | ecee02816d475f012dd4eec8a59b9ad3ba9ab531 (patch) | |
tree | 5eb0cdad91aeba20866a731033d76add878c3ec4 /asm/macros/map.inc | |
parent | 7dcb614cca6d61c5e51960826dddc004858ed9f1 (diff) | |
parent | 6ef96717181dfa1cda548cbe405410aba065e41c (diff) |
Merge with master
Diffstat (limited to 'asm/macros/map.inc')
-rw-r--r-- | asm/macros/map.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/macros/map.inc b/asm/macros/map.inc index 9a028b2e5..94caeb697 100644 --- a/asm/macros/map.inc +++ b/asm/macros/map.inc @@ -14,7 +14,7 @@ .4byte \address .endm - .macro object_event index, gfx, replacement, x, y, elevation, movement_type, x_radius, y_radius, trainer_type, sight_radius_tree_etc, script, event_flag + .macro object_event index:req, gfx:req, replacement: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, \gfx, \replacement, 0 .2byte \x .2byte \y |