Merge https://github.com/yenatch/pokered

Conflicts:
	main.asm

constants.asm

@@ -27,3 +27,5 @@ INCLUDE "constants/map_dimensions.asm"
 INCLUDE "constants/connection_constants.asm"
 INCLUDE "constants/credits_constants.asm"
 INCLUDE "constants/music_constants.asm"
+INCLUDE "constants/tilesets.asm"
+

constants/tilesets.asm

@@ -0,0 +1,25 @@
+OVERWORLD    EQU 0
+REDS_HOUSE_1 EQU 1
+MART         EQU 2
+FOREST       EQU 3
+REDS_HOUSE_2 EQU 4
+DOJO         EQU 5
+POKECENTER   EQU 6
+GYM          EQU 7
+HOUSE        EQU 8
+FOREST_GATE  EQU 9
+MUSEUM       EQU 10
+UNDERGROUND  EQU 11
+GATE         EQU 12
+SHIP         EQU 13
+SHIP_PORT    EQU 14
+CEMETERY     EQU 15
+INTERIOR     EQU 16
+CAVERN       EQU 17
+LOBBY        EQU 18
+MANSION      EQU 19
+LAB          EQU 20
+CLUB         EQU 21
+FACILITY     EQU 22
+PLATEAU      EQU 23
+

macros.asm

@@ -54,11 +54,17 @@ IMAP: MACRO ; imap mapid_less_than,x-coordinate,y-coordinate,textpointer
 	ENDM
 
 ; tilesets' headers macro
-TSETHEAD: MACRO
+tileset: MACRO
-	db BANK(\2)
+	db BANK(\2)   ; BANK(GFX)
-	dw \1,\2,\3
+	dw \1, \2, \3 ; Block, GFX, Coll
-	db \4,\5,\6,\7,\8
+	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