diff options
Diffstat (limited to 'data/tilesets/collision_tile_ids.asm')
| -rw-r--r-- | data/tilesets/collision_tile_ids.asm | 67 |
1 files changed, 28 insertions, 39 deletions
diff --git a/data/tilesets/collision_tile_ids.asm b/data/tilesets/collision_tile_ids.asm index c18a7e72..d348d5d5 100644 --- a/data/tilesets/collision_tile_ids.asm +++ b/data/tilesets/collision_tile_ids.asm @@ -1,82 +1,71 @@ -Underground_Coll:: - db $0b, $0c, $13, $15, $18 +coll_tiles: MACRO +REPT _NARG + db \1 + shift +ENDR db -1 ; end +ENDM + +Underground_Coll:: + coll_tiles $0b, $0c, $13, $15, $18 Overworld_Coll:: - db $00, $10, $1b, $20, $21, $23, $2c, $2d, $2e, $30, $31, $33, $39, $3c, $3e, $52, $54, $58, $5b - db -1 ; end + coll_tiles $00, $10, $1b, $20, $21, $23, $2c, $2d, $2e, $30, $31, $33, $39, $3c, $3e, $52, $54, $58, $5b RedsHouse1_Coll:: RedsHouse2_Coll:: - db $01, $02, $03, $11, $12, $13, $14, $1c, $1a - db -1 ; end + coll_tiles $01, $02, $03, $11, $12, $13, $14, $1c, $1a Mart_Coll:: Pokecenter_Coll:: - db $11, $1a, $1c, $3c, $5e - db -1 ; end + coll_tiles $11, $1a, $1c, $3c, $5e Dojo_Coll:: Gym_Coll:: - db $11, $16, $19, $2b, $3c, $3d, $3f, $4a, $4c, $4d, $03 - db -1 ; end + coll_tiles $11, $16, $19, $2b, $3c, $3d, $3f, $4a, $4c, $4d, $03 Forest_Coll:: - db $1e, $20, $2e, $30, $34, $37, $39, $3a, $40, $51, $52, $5a, $5c, $5e, $5f - db -1 ; end + coll_tiles $1e, $20, $2e, $30, $34, $37, $39, $3a, $40, $51, $52, $5a, $5c, $5e, $5f House_Coll:: - db $01, $12, $14, $28, $32, $37, $44, $54, $5c - db -1 ; end + coll_tiles $01, $12, $14, $28, $32, $37, $44, $54, $5c ForestGate_Coll:: Museum_Coll:: Gate_Coll:: - db $01, $12, $14, $1a, $1c, $37, $38, $3b, $3c, $5e - db -1 ; end + coll_tiles $01, $12, $14, $1a, $1c, $37, $38, $3b, $3c, $5e Ship_Coll:: - db $04, $0d, $17, $1d, $1e, $23, $34, $37, $39, $4a - db -1 ; end + coll_tiles $04, $0d, $17, $1d, $1e, $23, $34, $37, $39, $4a ShipPort_Coll:: - db $0a, $1a, $32, $3b - db -1 ; end + coll_tiles $0a, $1a, $32, $3b Cemetery_Coll:: - db $01, $10, $13, $1b, $22, $42, $52 - db -1 ; end + coll_tiles $01, $10, $13, $1b, $22, $42, $52 Interior_Coll:: - db $04, $0f, $15, $1f, $3b, $45, $47, $55, $56 - db -1 ; end + coll_tiles $04, $0f, $15, $1f, $3b, $45, $47, $55, $56 Cavern_Coll:: - db $05, $15, $18, $1a, $20, $21, $22, $2a, $2d, $30 - db -1 ; end + coll_tiles $05, $15, $18, $1a, $20, $21, $22, $2a, $2d, $30 - db -1 ; unused + coll_tiles ; unused Lobby_Coll:: - db $14, $17, $1a, $1c, $20, $38, $45 - db -1 ; end + coll_tiles $14, $17, $1a, $1c, $20, $38, $45 Mansion_Coll:: - db $01, $05, $11, $12, $14, $1a, $1c, $2c, $53 - db -1 ; end + coll_tiles $01, $05, $11, $12, $14, $1a, $1c, $2c, $53 Lab_Coll:: - db $0c, $26, $16, $1e, $34, $37 - db -1 ; end + coll_tiles $0c, $26, $16, $1e, $34, $37 Club_Coll:: - db $0f, $1a, $1f, $26, $28, $29, $2c, $2d, $2e, $2f, $41 - db -1 ; end + coll_tiles $0f, $1a, $1f, $26, $28, $29, $2c, $2d, $2e, $2f, $41 Facility_Coll:: - db $01, $10, $11, $13, $1b, $20, $21, $22, $30, $31, $32, $42, $43, $48, $52, $55, $58, $5e - db -1 ; end + coll_tiles $01, $10, $11, $13, $1b, $20, $21, $22, $30, $31, $32, $42, $43, $48, $52, $55, $58, $5e Plateau_Coll:: - db $1b, $23, $2c, $2d, $3b, $45 - db -1 ; end + coll_tiles $1b, $23, $2c, $2d, $3b, $45 |