Tiles can have different attributes in different blocks

2026-02-06 16:15:24 +13:00 · 2023-09-13 12:44:30 -04:00 · 2023-09-13 12:44:30 -04:00 · 820c2257bc
commit 820c2257bc
parent 94d9c77070
374 changed files with 554 additions and 348 deletions
--- a/data/maps/blocks.asm
+++ b/data/maps/blocks.asm
--- a/data/tilesets.asm
+++ b/data/tilesets.asm
@ -1,8 +1,6 @@
 MACRO tileset
-	dba \1GFX, \1Meta, \1Coll
+	dba \1GFX, \1Meta, \1Coll, \1Attr
 	dw \1Anim
-	dw NULL
-	dw \1PalMap
 ENDM

 ; Associated data:
--- a/data/tilesets/aerodactyl_word_room_attributes.bin
+++ b/data/tilesets/aerodactyl_word_room_attributes.bin
--- a/data/tilesets/aerodactyl_word_room_metatiles.bin
+++ b/data/tilesets/aerodactyl_word_room_metatiles.bin
--- a/data/tilesets/battle_tower_inside_attributes.bin
+++ b/data/tilesets/battle_tower_inside_attributes.bin
--- a/data/tilesets/battle_tower_inside_metatiles.bin
+++ b/data/tilesets/battle_tower_inside_metatiles.bin
--- a/data/tilesets/battle_tower_outside_attributes.bin
+++ b/data/tilesets/battle_tower_outside_attributes.bin
--- a/data/tilesets/battle_tower_outside_metatiles.bin
+++ b/data/tilesets/battle_tower_outside_metatiles.bin
--- a/data/tilesets/beta_word_room_attributes.bin
+++ b/data/tilesets/beta_word_room_attributes.bin
--- a/data/tilesets/beta_word_room_metatiles.bin
+++ b/data/tilesets/beta_word_room_metatiles.bin
--- a/data/tilesets/cave_attributes.bin
+++ b/data/tilesets/cave_attributes.bin
--- a/data/tilesets/champions_room_attributes.bin
+++ b/data/tilesets/champions_room_attributes.bin
--- a/data/tilesets/champions_room_metatiles.bin
+++ b/data/tilesets/champions_room_metatiles.bin
--- a/data/tilesets/dark_cave_attributes.bin
+++ b/data/tilesets/dark_cave_attributes.bin
--- a/data/tilesets/elite_four_room_attributes.bin
+++ b/data/tilesets/elite_four_room_attributes.bin
--- a/data/tilesets/facility_attributes.bin
+++ b/data/tilesets/facility_attributes.bin
--- a/data/tilesets/forest_attributes.bin
+++ b/data/tilesets/forest_attributes.bin
@ -0,0 +1 @@
+
--- a/data/tilesets/game_corner_attributes.bin
+++ b/data/tilesets/game_corner_attributes.bin
--- a/data/tilesets/game_corner_metatiles.bin
+++ b/data/tilesets/game_corner_metatiles.bin
--- a/data/tilesets/gate_attributes.bin
+++ b/data/tilesets/gate_attributes.bin
--- a/data/tilesets/ho_oh_word_room_attributes.bin
+++ b/data/tilesets/ho_oh_word_room_attributes.bin
--- a/data/tilesets/ho_oh_word_room_metatiles.bin
+++ b/data/tilesets/ho_oh_word_room_metatiles.bin
--- a/data/tilesets/house_attributes.bin
+++ b/data/tilesets/house_attributes.bin
--- a/data/tilesets/ice_path_attributes.bin
+++ b/data/tilesets/ice_path_attributes.bin
--- a/data/tilesets/ice_path_metatiles.bin
+++ b/data/tilesets/ice_path_metatiles.bin
--- a/data/tilesets/johto_attributes.bin
+++ b/data/tilesets/johto_attributes.bin
--- a/data/tilesets/johto_metatiles.bin
+++ b/data/tilesets/johto_metatiles.bin
--- a/data/tilesets/johto_modern_attributes.bin
+++ b/data/tilesets/johto_modern_attributes.bin
--- a/data/tilesets/johto_modern_metatiles.bin
+++ b/data/tilesets/johto_modern_metatiles.bin
--- a/data/tilesets/kabuto_word_room_attributes.bin
+++ b/data/tilesets/kabuto_word_room_attributes.bin
--- a/data/tilesets/kabuto_word_room_metatiles.bin
+++ b/data/tilesets/kabuto_word_room_metatiles.bin
--- a/data/tilesets/kanto_attributes.bin
+++ b/data/tilesets/kanto_attributes.bin
--- a/data/tilesets/lab_attributes.bin
+++ b/data/tilesets/lab_attributes.bin
--- a/data/tilesets/lab_metatiles.bin
+++ b/data/tilesets/lab_metatiles.bin
--- a/data/tilesets/lighthouse_attributes.bin
+++ b/data/tilesets/lighthouse_attributes.bin
--- a/data/tilesets/lighthouse_metatiles.bin
+++ b/data/tilesets/lighthouse_metatiles.bin
--- a/data/tilesets/mansion_attributes.bin
+++ b/data/tilesets/mansion_attributes.bin
--- a/data/tilesets/mansion_metatiles.bin
+++ b/data/tilesets/mansion_metatiles.bin
--- a/data/tilesets/mart_attributes.bin
+++ b/data/tilesets/mart_attributes.bin
--- a/data/tilesets/mart_metatiles.bin
+++ b/data/tilesets/mart_metatiles.bin
@ -1,3 +1,4 @@
 ,-<=
-II"#23$%45*+>?>?*+ !01JK	墛Ж./悜憫悜憫惏辈惗犯*;;;>?>?>?;;;;&'67()89@AB+PQRECD\]STU

VWVWXYXYZ[Z[

PQPQPQPQ^_^_呐魄哉肿壬仕貞憫*+>?>?,-<=*;;;>?>?::>?::;;;+>?::>?::>?>?::

::>?

F:F:F::G:G:G"#23$%45

LMLMLMLMNONO !HH01HH>?HH>?HHHH&'HH67HH()HH89枛枛枛枛枛枛枛枛
-II
*+PQ>?PQ>?^_HH&'HH67HH()HH89/HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH;;;;&'67()89>?>?.懒旅醒矣悜仝悜圮亖亖憫憫憫憫憫憫悜"#悜23悜$%悜媽悜憫悜憫牎　枛枛憫憫憫憫　　枛枛憫櫄憫┆　、枛枛憫憭憫憭憫櫄憫┆亖亗憫憭憫憭憫憭<E686AB><E686AD>憫憫憫憫憫憫亖亖憫憫憫噲憫棙憫憫憫憫憫憫憫憫儎厗摂敃　　枛枛亖仠帋幀灋灛瑳亖伀崕帿灋灚<E7818B><01><>憫憫憫憫憫憫惏辈惞撼惢嫉惤靖
+II"#23$%45*+>?>?*+ !01JK		
+'(./012678*;;;>?>?>?;;;;&'67()89@AB+PQRECD\]STU

VWVWXYXYZ[Z[

PQPQPQPQ^_^_DEFGTUVWHIJKX*+>?>?,-<=*;;;>?>?::>?::;;;+>?::>?::>?>?::

::>?

F:F:F::G:G:G"#23$%45

LMLMLMLMNONO !HH01HH>?HH>?HHHH&'HH67HH()HH89
+II
*+PQ>?PQ>?^_HH&'HH67HH()HH89/HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH;;;;&'67()89>?>?.@ABCPQRSYZ[\"#23$% !!!!!!!)*!!!")*.///!!!!,,,+
++///-0129:3;<5=>8
--- a/data/tilesets/omanyte_word_room_attributes.bin
+++ b/data/tilesets/omanyte_word_room_attributes.bin
--- a/data/tilesets/omanyte_word_room_metatiles.bin
+++ b/data/tilesets/omanyte_word_room_metatiles.bin
--- a/data/tilesets/park_attributes.bin
+++ b/data/tilesets/park_attributes.bin
--- a/data/tilesets/park_metatiles.bin
+++ b/data/tilesets/park_metatiles.bin
--- a/data/tilesets/players_house_attributes.bin
+++ b/data/tilesets/players_house_attributes.bin
--- a/data/tilesets/players_house_metatiles.bin
+++ b/data/tilesets/players_house_metatiles.bin
--- a/data/tilesets/players_room_attributes.bin
+++ b/data/tilesets/players_room_attributes.bin
--- a/data/tilesets/pokecenter_attributes.bin
+++ b/data/tilesets/pokecenter_attributes.bin
--- a/data/tilesets/pokecom_center_attributes.bin
+++ b/data/tilesets/pokecom_center_attributes.bin
--- a/data/tilesets/pokecom_center_metatiles.bin
+++ b/data/tilesets/pokecom_center_metatiles.bin
--- a/data/tilesets/port_attributes.bin
+++ b/data/tilesets/port_attributes.bin
--- a/data/tilesets/port_metatiles.bin
+++ b/data/tilesets/port_metatiles.bin
@ -1,4 +1,4 @@
-""""!!!!1111111111111111    ""       !!!!+,--9::3#$%./02;<=>&'()345?@AB*678CDE+,-39:PQXYZFGHIRRSSZ[\\IJKLT,-U]^^^MNOVW_˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙""""""""
+""""!!!!1111111111111111    ""       !!!!+,--9::3#$%./02;<=>&'()345?@AB*678CDE+,-39:PQXYZFGHIRRSSZ[\\IJKLT,-U]^^^MNOVW_""""""""



@ -62,4 +62,4 @@



-˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙
+
--- a/data/tilesets/radio_tower_attributes.bin
+++ b/data/tilesets/radio_tower_attributes.bin
--- a/data/tilesets/radio_tower_metatiles.bin
+++ b/data/tilesets/radio_tower_metatiles.bin
--- a/data/tilesets/ruins_of_alph_attributes.bin
+++ b/data/tilesets/ruins_of_alph_attributes.bin
--- a/data/tilesets/tower_attributes.bin
+++ b/data/tilesets/tower_attributes.bin
--- a/data/tilesets/tower_metatiles.bin
+++ b/data/tilesets/tower_metatiles.bin
@ -1,2 +1,2 @@
 
@ !!A1A1!!!!!!@ A1A1
-A1A1A1A1A1A1A1A1A1A1!!!!!!!!A1A1!!!!-.=><>MN./>?,NO()89*+:;()89*+:;MN]^NO^_A1A1@ !!A1A1!!@ !!!!^^^^"#23&'67"#23&'67PQPQPQPQPQPQPQPQ$$$$	
"#23!!67"#!!2367%545%545%545%545	^^		˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙˙FVGWPQPQRSRSBCHZ[!XL\67IBCY!Z[L\67JKZ[L\67JKZ[L\67DETU!!!!PPPPPPPPFVGW
+A1A1A1A1A1A1A1A1A1A1!!!!!!!!A1A1!!!!-.=><>MN./>?,NO()89*+:;()89*+:;MN]^NO^_A1A1@ !!A1A1!!@ !!!!^^^^"#23&'67"#23&'67PQPQPQPQPQPQPQPQ$$$$	
"#23!!67"#!!2367%545%545%545%545	^^		FVGWPQPQRSRSBCHZ[!XL\67IBCY!Z[L\67JKZ[L\67JKZ[L\67DETU!!!!PPPPPPPPFVGW
--- a/data/tilesets/traditional_house_attributes.bin
+++ b/data/tilesets/traditional_house_attributes.bin
--- a/data/tilesets/train_station_attributes.bin
+++ b/data/tilesets/train_station_attributes.bin
--- a/data/tilesets/train_station_metatiles.bin
+++ b/data/tilesets/train_station_metatiles.bin
--- a/data/tilesets/underground_attributes.bin
+++ b/data/tilesets/underground_attributes.bin