Merge remote-tracking branch 'remotes/pokered/master'

5 files changed, 34 insertions, 35 deletions

diff --git a/constants/item_constants.asm b/constants/item_constants.asm
index 10cc31d1..08ea1294 100644
--- a/constants/item_constants.asm
+++ b/constants/item_constants.asm
@@ -207,7 +207,7 @@ TM01 EQU const_value
 	add_tm ROCK_SLIDE   ; $F8
 	add_tm TRI_ATTACK   ; $F9
 	add_tm SUBSTITUTE   ; $FA
-assert NUM_TMS == const_value - TM01, "NUM_TMS ({d:NUM_TMS}) does not match the number of add_tm definitions"
+ASSERT NUM_TMS == const_value - TM01, "NUM_TMS ({d:NUM_TMS}) does not match the number of add_tm definitions"
 
 NUM_TM_HM EQU NUM_TMS + NUM_HMS
 
diff --git a/data/maps/headers/Route22.asm b/data/maps/headers/Route22.asm
index e235efa1..a045838e 100644
--- a/data/maps/headers/Route22.asm
+++ b/data/maps/headers/Route22.asm
@@ -1,5 +1,5 @@
 
 	map_header Route22, ROUTE_22, OVERWORLD, NORTH | EAST
-	connection north, Route23, ROUTE_23, 0
+	connection north, Route23, ROUTE_23, 0 ; unnecessary
 	connection east, ViridianCity, VIRIDIAN_CITY, -4
 	end_map_header
diff --git a/data/maps/headers/Route23.asm b/data/maps/headers/Route23.asm
index e1535c9d..66c2936f 100644
--- a/data/maps/headers/Route23.asm
+++ b/data/maps/headers/Route23.asm
@@ -1,5 +1,5 @@
 
 	map_header Route23, ROUTE_23, PLATEAU, NORTH | SOUTH
 	connection north, IndigoPlateau, INDIGO_PLATEAU, 0
-	connection south, Route22, ROUTE_22, 0
+	connection south, Route22, ROUTE_22, 0 ; unnecessary
 	end_map_header
diff --git a/data/tilesets/tileset_headers.asm b/data/tilesets/tileset_headers.asm
index e96932fd..819364b3 100644
--- a/data/tilesets/tileset_headers.asm
+++ b/data/tilesets/tileset_headers.asm
@@ -1,37 +1,36 @@
 tileset: MACRO
-	db BANK(\2)   ; BANK(GFX)
-	dw \1, \2, \3 ; Block, GFX, Coll
-	db \4, \5, \6 ; counter tiles
-	db \7         ; grass tile
-	db \8         ; animations (TILEANIM_* value)
+	db BANK(\1_GFX)
+	dw \1_Block, \1_GFX, \1_Coll
+	db \2, \3, \4 ; counter tiles
+	db \5         ; grass tile
+	db \6         ; animations (TILEANIM_* value)
 ENDM
 
 Tilesets:
 	table_width 12, Tilesets
-	; block, gfx, coll, 3 counter tiles, grass tile, animations
-	tileset Overworld_Block,   Overworld_GFX,   Overworld_Coll,   $FF,$FF,$FF, $52, TILEANIM_WATER_FLOWER
-	tileset RedsHouse1_Block,  RedsHouse1_GFX,  RedsHouse1_Coll,  $FF,$FF,$FF, $FF, TILEANIM_NONE
-	tileset Mart_Block,        Mart_GFX,        Mart_Coll,        $18,$19,$1E, $FF, TILEANIM_NONE
-	tileset Forest_Block,      Forest_GFX,      Forest_Coll,      $FF,$FF,$FF, $20, TILEANIM_WATER
-	tileset RedsHouse2_Block,  RedsHouse2_GFX,  RedsHouse2_Coll,  $FF,$FF,$FF, $FF, TILEANIM_NONE
-	tileset Dojo_Block,        Dojo_GFX,        Dojo_Coll,        $3A,$FF,$FF, $FF, TILEANIM_WATER_FLOWER
-	tileset Pokecenter_Block,  Pokecenter_GFX,  Pokecenter_Coll,  $18,$19,$1E, $FF, TILEANIM_NONE
-	tileset Gym_Block,         Gym_GFX,         Gym_Coll,         $3A,$FF,$FF, $FF, TILEANIM_WATER_FLOWER
-	tileset House_Block,       House_GFX,       House_Coll,       $FF,$FF,$FF, $FF, TILEANIM_NONE
-	tileset ForestGate_Block,  ForestGate_GFX,  ForestGate_Coll,  $17,$32,$FF, $FF, TILEANIM_NONE
-	tileset Museum_Block,      Museum_GFX,      Museum_Coll,      $17,$32,$FF, $FF, TILEANIM_NONE
-	tileset Underground_Block, Underground_GFX, Underground_Coll, $FF,$FF,$FF, $FF, TILEANIM_NONE
-	tileset Gate_Block,        Gate_GFX,        Gate_Coll,        $17,$32,$FF, $FF, TILEANIM_NONE
-	tileset Ship_Block,        Ship_GFX,        Ship_Coll,        $FF,$FF,$FF, $FF, TILEANIM_WATER
-	tileset ShipPort_Block,    ShipPort_GFX,    ShipPort_Coll,    $FF,$FF,$FF, $FF, TILEANIM_WATER
-	tileset Cemetery_Block,    Cemetery_GFX,    Cemetery_Coll,    $12,$FF,$FF, $FF, TILEANIM_NONE
-	tileset Interior_Block,    Interior_GFX,    Interior_Coll,    $FF,$FF,$FF, $FF, TILEANIM_NONE
-	tileset Cavern_Block,      Cavern_GFX,      Cavern_Coll,      $FF,$FF,$FF, $FF, TILEANIM_WATER
-	tileset Lobby_Block,       Lobby_GFX,       Lobby_Coll,       $15,$36,$FF, $FF, TILEANIM_NONE
-	tileset Mansion_Block,     Mansion_GFX,     Mansion_Coll,     $FF,$FF,$FF, $FF, TILEANIM_NONE
-	tileset Lab_Block,         Lab_GFX,         Lab_Coll,         $FF,$FF,$FF, $FF, TILEANIM_NONE
-	tileset Club_Block,        Club_GFX,        Club_Coll,        $07,$17,$FF, $FF, TILEANIM_NONE
-	tileset Facility_Block,    Facility_GFX,    Facility_Coll,    $12,$FF,$FF, $FF, TILEANIM_WATER
-	tileset Plateau_Block,     Plateau_GFX,     Plateau_Coll,     $FF,$FF,$FF, $45, TILEANIM_WATER
-	tileset BeachHouse_Block,  BeachHouse_GFX,  BeachHouse_Coll,  $FF,$FF,$FF, $FF, TILEANIM_NONE
+	tileset Overworld,    -1, -1, -1, $52, TILEANIM_WATER_FLOWER
+	tileset RedsHouse1,   -1, -1, -1,  -1, TILEANIM_NONE
+	tileset Mart,        $18,$19,$1E,  -1, TILEANIM_NONE
+	tileset Forest,       -1, -1, -1, $20, TILEANIM_WATER
+	tileset RedsHouse2,   -1, -1, -1,  -1, TILEANIM_NONE
+	tileset Dojo,        $3A, -1, -1,  -1, TILEANIM_WATER_FLOWER
+	tileset Pokecenter,  $18,$19,$1E,  -1, TILEANIM_NONE
+	tileset Gym,         $3A, -1, -1,  -1, TILEANIM_WATER_FLOWER
+	tileset House,        -1, -1, -1,  -1, TILEANIM_NONE
+	tileset ForestGate,  $17,$32, -1,  -1, TILEANIM_NONE
+	tileset Museum,      $17,$32, -1,  -1, TILEANIM_NONE
+	tileset Underground,  -1, -1, -1,  -1, TILEANIM_NONE
+	tileset Gate,        $17,$32, -1,  -1, TILEANIM_NONE
+	tileset Ship,         -1, -1, -1,  -1, TILEANIM_WATER
+	tileset ShipPort,     -1, -1, -1,  -1, TILEANIM_WATER
+	tileset Cemetery,    $12, -1, -1,  -1, TILEANIM_NONE
+	tileset Interior,     -1, -1, -1,  -1, TILEANIM_NONE
+	tileset Cavern,       -1, -1, -1,  -1, TILEANIM_WATER
+	tileset Lobby,       $15,$36, -1,  -1, TILEANIM_NONE
+	tileset Mansion,      -1, -1, -1,  -1, TILEANIM_NONE
+	tileset Lab,          -1, -1, -1,  -1, TILEANIM_NONE
+	tileset Club,        $07,$17, -1,  -1, TILEANIM_NONE
+	tileset Facility,    $12, -1, -1,  -1, TILEANIM_WATER
+	tileset Plateau,      -1, -1, -1, $45, TILEANIM_WATER
+	tileset BeachHouse,   -1, -1, -1,  -1, TILEANIM_NONE
 	assert_table_length NUM_TILESETS
diff --git a/sram.asm b/sram.asm
index 18f89d64..a4c9a38c 100644
--- a/sram.asm
+++ b/sram.asm
@@ -47,5 +47,5 @@ sBank3AllBoxesChecksum:: db
 sBank3IndividualBoxChecksums:: ds 6
 
 ; All 12 boxes fit within 2 SRAM banks
-	assert box_n == NUM_BOXES, \
+	ASSERT box_n == NUM_BOXES, \
 		"boxes: Expected {d:NUM_BOXES} total boxes, got {d:box_n}"