diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-09 20:45:02 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-09 20:45:02 -0400 |
| commit | a2f7701f3441c71b0734a28d44168576f6f28716 (patch) | |
| tree | 84fecc02816fc4fc31fdd172e8e79fc59947cedb /data/tileset_headers.asm | |
| parent | TX_SFX_KEY_ITEM and `mapconst` macro (diff) | |
| parent | Rebump extras. (diff) | |
| download | pokeyellow-a2f7701f3441c71b0734a28d44168576f6f28716.tar.gz pokeyellow-a2f7701f3441c71b0734a28d44168576f6f28716.tar.xz pokeyellow-a2f7701f3441c71b0734a28d44168576f6f28716.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/tileset_headers.asm')
| -rwxr-xr-x | data/tileset_headers.asm | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/data/tileset_headers.asm b/data/tileset_headers.asm index 3e2e68bb..84cfaffd 100755 --- a/data/tileset_headers.asm +++ b/data/tileset_headers.asm @@ -23,6 +23,3 @@ Tilesets: ; c7be (3:47be) tileset Club_Block, Club_GFX, Club_Coll, $07,$17,$FF, $FF, INDOOR tileset Facility_Block, Facility_GFX, Facility_Coll, $12,$FF,$FF, $FF, CAVE tileset Plateau_Block, Plateau_GFX, Plateau_Coll, $FF,$FF,$FF, $45, CAVE -IF DEF(_OPTION_BEACH_HOUSE) - tileset BeachHouse_Block, BeachHouse_GFX, BeachHouse_Coll, $FF,$FF,$FF, $FF, INDOOR -ENDC |