diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-02-19 08:47:50 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-02-19 08:47:50 -0500 |
| commit | 9d44bc0bda9294c4d4cb3744efe9c2d96278c3bd (patch) | |
| tree | 6ac0ef8acbace05710da0052b4decaf4146d5d3f /asm/macros | |
| parent | 9397d6d23ad460f7019d4a12da035f53a450d237 (diff) | |
| parent | 71fec599bbe144af8d4a16e98ec32454fd10a4a8 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into pokemon_jump
Diffstat (limited to 'asm/macros')
| -rw-r--r-- | asm/macros/map.inc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/asm/macros/map.inc b/asm/macros/map.inc index d903899fe..0f35bf959 100644 --- a/asm/macros/map.inc +++ b/asm/macros/map.inc @@ -88,3 +88,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 |