summaryrefslogtreecommitdiff
path: root/macros.asm
diff options
context:
space:
mode:
authorIIMarckus <iimarckus@gmail.com>2014-04-06 08:52:55 -0600
committerIIMarckus <iimarckus@gmail.com>2014-04-06 08:52:55 -0600
commit7f8974dab5c6c307a8e15e139dfab9264fcc639f (patch)
tree0e23869f299671f7c9bb2f4ab2d486071e4e44c3 /macros.asm
parent46164d4d4740f0fefc726bf691626a13855090ab (diff)
parent0c8b9e52222f409aefb3517be91b56d68b20561c (diff)
Merge https://github.com/yenatch/pokered
Conflicts: main.asm
Diffstat (limited to 'macros.asm')
-rw-r--r--macros.asm14
1 files changed, 10 insertions, 4 deletions
diff --git a/macros.asm b/macros.asm
index 90fafdbe..b5d0ff7c 100644
--- a/macros.asm
+++ b/macros.asm
@@ -54,11 +54,17 @@ IMAP: MACRO ; imap mapid_less_than,x-coordinate,y-coordinate,textpointer
ENDM
; tilesets' headers macro
-TSETHEAD: MACRO
- db BANK(\2)
- dw \1,\2,\3
- db \4,\5,\6,\7,\8
+tileset: MACRO
+ db BANK(\2) ; BANK(GFX)
+ dw \1, \2, \3 ; Block, GFX, Coll
+ db \4, \5, \6 ; counter tiles
+ db \7 ; grass tile
+ db \8 ; permission (indoor, cave, outdoor)
ENDM
+
+INDOOR EQU 0
+CAVE EQU 1
+OUTDOOR EQU 2
; macro for two nibbles
dn: MACRO