Replace .tilecoll files with tile ID db data

2024-11-27 08:00:32 +00:00 · 2020-06-27 17:02:08 -04:00 · 2020-06-27 17:02:08 -04:00 · e770ee77ce
commit e770ee77ce
parent d5089d3c62
23 changed files with 83 additions and 45 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -10,7 +10,6 @@
 *.2bpp binary
 *.1bpp binary
 *.rle binary
-*.tilecoll binary
 *.bst binary
 *.tilemap binary
 *.wav binary
--- a/data/collision.asm
+++ b/data/collision.asm
@ -1,24 +0,0 @@
-Underground_Coll::  INCBIN  "gfx/tilesets/underground.tilecoll"
-Overworld_Coll::    INCBIN  "gfx/tilesets/overworld.tilecoll"
-RedsHouse1_Coll::
-RedsHouse2_Coll::   INCBIN  "gfx/tilesets/reds_house.tilecoll"
-Mart_Coll::
-Pokecenter_Coll::   INCBIN  "gfx/tilesets/pokecenter.tilecoll"
-Dojo_Coll::
-Gym_Coll::          INCBIN  "gfx/tilesets/gym.tilecoll"
-Forest_Coll::       INCBIN  "gfx/tilesets/forest.tilecoll"
-House_Coll::        INCBIN  "gfx/tilesets/house.tilecoll"
-ForestGate_Coll::
-Museum_Coll::
-Gate_Coll::         INCBIN  "gfx/tilesets/gate.tilecoll"
-Ship_Coll::         INCBIN  "gfx/tilesets/ship.tilecoll"
-ShipPort_Coll::     INCBIN  "gfx/tilesets/ship_port.tilecoll"
-Cemetery_Coll::     INCBIN  "gfx/tilesets/cemetery.tilecoll"
-Interior_Coll::     INCBIN  "gfx/tilesets/interior.tilecoll"
-Cavern_Coll::       INCBIN  "gfx/tilesets/cavern.tilecoll"
-Lobby_Coll::        INCBIN  "gfx/tilesets/lobby.tilecoll"
-Mansion_Coll::      INCBIN  "gfx/tilesets/mansion.tilecoll"
-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"
--- a/data/collision_tile_ids.asm
+++ b/data/collision_tile_ids.asm
@ -0,0 +1,82 @@
+Underground_Coll::
+	db $0b, $0c, $13, $15, $18
+	db -1 ; end
+
+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
+
+RedsHouse1_Coll::
+RedsHouse2_Coll::
+	db $01, $02, $03, $11, $12, $13, $14, $1c, $1a
+	db -1 ; end
+
+Mart_Coll::
+Pokecenter_Coll::
+	db $11, $1a, $1c, $3c, $5e
+	db -1 ; end
+
+Dojo_Coll::
+Gym_Coll::
+	db $11, $16, $19, $2b, $3c, $3d, $3f, $4a, $4c, $4d, $03
+	db -1 ; end
+
+Forest_Coll::
+	db $1e, $20, $2e, $30, $34, $37, $39, $3a, $40, $51, $52, $5a, $5c, $5e, $5f
+	db -1 ; end
+
+House_Coll::
+	db $01, $12, $14, $28, $32, $37, $44, $54, $5c
+	db -1 ; end
+
+ForestGate_Coll::
+Museum_Coll::
+Gate_Coll::
+	db $01, $12, $14, $1a, $1c, $37, $38, $3b, $3c, $5e
+	db -1 ; end
+
+Ship_Coll::
+	db $04, $0d, $17, $1d, $1e, $23, $34, $37, $39, $4a
+	db -1 ; end
+
+ShipPort_Coll::
+	db $0a, $1a, $32, $3b
+	db -1 ; end
+
+Cemetery_Coll::
+	db $01, $10, $13, $1b, $22, $42, $52
+	db -1 ; end
+
+Interior_Coll::
+	db $04, $0f, $15, $1f, $3b, $45, $47, $55, $56
+	db -1 ; end
+
+Cavern_Coll::
+	db $05, $15, $18, $1a, $20, $21, $22, $2a, $2d, $30
+	db -1 ; end
+
+	db -1 ; unused
+
+Lobby_Coll::
+	db $14, $17, $1a, $1c, $20, $38, $45
+	db -1 ; end
+
+Mansion_Coll::
+	db $01, $05, $11, $12, $14, $1a, $1c, $2c, $53
+	db -1 ; end
+
+Lab_Coll::
+	db $0c, $26, $16, $1e, $34, $37
+	db -1 ; end
+
+Club_Coll::
+	db $0f, $1a, $1f, $26, $28, $29, $2c, $2d, $2e, $2f, $41
+	db -1 ; end
+
+Facility_Coll::
+	db $01, $10, $11, $13, $1b, $20, $21, $22, $30, $31, $32, $42, $43, $48, $52, $55, $58, $5e
+	db -1 ; end
+
+Plateau_Coll::
+	db $1b, $23, $2c, $2d, $3b, $45
+	db -1 ; end
--- a/gfx/tilesets/cavern.tilecoll
+++ b/gfx/tilesets/cavern.tilecoll
@ -1 +0,0 @@
- !"*-0<><30>
--- a/gfx/tilesets/cemetery.tilecoll
+++ b/gfx/tilesets/cemetery.tilecoll
@ -1 +0,0 @@
-"BR<42>
--- a/gfx/tilesets/club.tilecoll
+++ b/gfx/tilesets/club.tilecoll
@ -1 +0,0 @@
-&(),-./A˙
--- a/gfx/tilesets/facility.tilecoll
+++ b/gfx/tilesets/facility.tilecoll
@ -1 +0,0 @@
- !"012BCHRUX^<5E>
--- a/gfx/tilesets/forest.tilecoll
+++ b/gfx/tilesets/forest.tilecoll
@ -1 +0,0 @@
- .0479:@QRZ\^_<>
--- a/gfx/tilesets/gate.tilecoll
+++ b/gfx/tilesets/gate.tilecoll
@ -1 +0,0 @@
-78;<^<5E>
--- a/gfx/tilesets/gym.tilecoll
+++ b/gfx/tilesets/gym.tilecoll
@ -1 +0,0 @@
-+<=?JLM<03>
--- a/gfx/tilesets/house.tilecoll
+++ b/gfx/tilesets/house.tilecoll
@ -1 +0,0 @@
-(27DT\<5C>
--- a/gfx/tilesets/interior.tilecoll
+++ b/gfx/tilesets/interior.tilecoll
@ -1 +0,0 @@
-;EGUV˙
--- a/gfx/tilesets/lab.tilecoll
+++ b/gfx/tilesets/lab.tilecoll
@ -1 +0,0 @@
-&47<34>
--- a/gfx/tilesets/lobby.tilecoll
+++ b/gfx/tilesets/lobby.tilecoll
@ -1 +0,0 @@
- 8E<38>
--- a/gfx/tilesets/mansion.tilecoll
+++ b/gfx/tilesets/mansion.tilecoll
@ -1 +0,0 @@
-,S<>
--- a/gfx/tilesets/overworld.tilecoll
+++ b/gfx/tilesets/overworld.tilecoll
--- a/gfx/tilesets/plateau.tilecoll
+++ b/gfx/tilesets/plateau.tilecoll
@ -1 +0,0 @@
-#,-;E<>
--- a/gfx/tilesets/pokecenter.tilecoll
+++ b/gfx/tilesets/pokecenter.tilecoll
@ -1 +0,0 @@
-<^<5E>
--- a/gfx/tilesets/reds_house.tilecoll
+++ b/gfx/tilesets/reds_house.tilecoll
@ -1 +0,0 @@
-<1A>
--- a/gfx/tilesets/ship.tilecoll
+++ b/gfx/tilesets/ship.tilecoll
@ -1 +0,0 @@
-
#479J<39>
--- a/gfx/tilesets/ship_port.tilecoll
+++ b/gfx/tilesets/ship_port.tilecoll
@ -1,2 +0,0 @@
-
-2;<3B>
--- a/gfx/tilesets/underground.tilecoll
+++ b/gfx/tilesets/underground.tilecoll
@ -1 +0,0 @@
-<18>
--- a/home.asm
+++ b/home.asm
@ -910,7 +910,7 @@ InterlaceMergeSpriteBuffers::
 	jp CopyVideoData


-INCLUDE "data/collision.asm"
+INCLUDE "data/collision_tile_ids.asm"
 INCLUDE "home/copy2.asm"
 INCLUDE "home/text.asm"
 INCLUDE "home/vcopy.asm"