Merge branch 'master' of github.com:pret/pokefirered into pokemon_jump

2020-02-19 08:47:50 -05:00
parent 9397d6d23a 71fec599bb
commit 9d44bc0bda
480 changed files with 4598 additions and 3764 deletions
@@ -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