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/collision.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/collision.asm')
| -rw-r--r-- | data/collision.asm | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/data/collision.asm b/data/collision.asm index 46d5ddc6..78579242 100644 --- a/data/collision.asm +++ b/data/collision.asm @@ -22,6 +22,3 @@ Lab_Coll:: INCBIN "gfx/tilesets/lab.tilecoll" Club_Coll:: INCBIN "gfx/tilesets/club.tilecoll" Facility_Coll:: INCBIN "gfx/tilesets/facility.tilecoll" Plateau_Coll:: INCBIN "gfx/tilesets/plateau.tilecoll" -IF DEF(_OPTION_BEACH_HOUSE) -BeachHouse_Coll:: INCBIN "gfx/tilesets/beachhouse.tilecoll" -ENDC |