Merge branch 'master' of https://github.com/pret/pokered

7 files changed, 39 insertions, 2 deletions

diff --git a/data/maps/hide_show_data.asm b/data/maps/hide_show_data.asm
index 39e8cab4..810da263 100644
--- a/data/maps/hide_show_data.asm
+++ b/data/maps/hide_show_data.asm
@@ -2,6 +2,7 @@
 
 MapHSPointers:
 ; entries correspond to map ids
+	table_width 2, MapHSPointers
 	dw PalletTownHS
 	dw ViridianCityHS
 	dw PewterCityHS
@@ -251,6 +252,7 @@ MapHSPointers:
 	dw NoHS
 	dw NoHS
 	dw NoHS ; beach house
+	assert_table_length NUM_MAPS
 	dw -1 ; end
 
 NoHS:
@@ -258,6 +260,7 @@ NoHS:
 
 MissableObjects:
 ; entries correspond to HS_* constants (see constants/hide_show_constants)
+	table_width 3, MissableObjects
 ; format: map id, object id, HIDE/SHOW
 
 PalletTownHS:
@@ -576,3 +579,4 @@ BluesHouseHSCopy: ; unreferenced
 	db BLUES_HOUSE, $02, HIDE
 	db BLUES_HOUSE, $03, SHOW
 	db $FF, $01, SHOW ; end
+	assert_table_length NUM_HS_OBJECTS + 1
diff --git a/data/maps/map_header_banks.asm b/data/maps/map_header_banks.asm
index f9a107e3..454e3260 100644
--- a/data/maps/map_header_banks.asm
+++ b/data/maps/map_header_banks.asm
@@ -1,5 +1,6 @@
 ; see also MapHeaderPointers
 MapHeaderBanks::
+	table_width 1, MapHeaderBanks
 	db BANK(PalletTown_h)
 	db BANK(ViridianCity_h)
 	db BANK(PewterCity_h)
@@ -249,3 +250,4 @@ MapHeaderBanks::
 	db BANK(BrunosRoom_h)
 	db BANK(AgathasRoom_h)
 	db BANK(SummerBeachHouse_h)
+	assert_table_length NUM_MAPS
diff --git a/data/maps/map_header_pointers.asm b/data/maps/map_header_pointers.asm
index cf02e5cc..0f37b129 100644
--- a/data/maps/map_header_pointers.asm
+++ b/data/maps/map_header_pointers.asm
@@ -1,5 +1,6 @@
 ; see also MapHeaderBanks
 MapHeaderPointers::
+	table_width 2, MapHeaderPointers
 	dw PalletTown_h
 	dw ViridianCity_h
 	dw PewterCity_h
@@ -247,5 +248,6 @@ MapHeaderPointers::
 	dw SilphCo2F_h ; UNUSED_MAP_F4
 	dw LoreleisRoom_h
 	dw BrunosRoom_h
-	dw AgathasRoom_h ;247
+	dw AgathasRoom_h
 	dw SummerBeachHouse_h
+	assert_table_length NUM_MAPS
diff --git a/data/maps/names.asm b/data/maps/names.asm
index 6bdb66d5..805c57c9 100644
--- a/data/maps/names.asm
+++ b/data/maps/names.asm
@@ -1,4 +1,3 @@
-MapNames:
 PalletTownName:      db "PALLET TOWN@"
 ViridianCityName:    db "VIRIDIAN CITY@"
 PewterCityName:      db "PEWTER CITY@"
diff --git a/data/maps/songs.asm b/data/maps/songs.asm
index 4305fc2f..7378804e 100644
--- a/data/maps/songs.asm
+++ b/data/maps/songs.asm
@@ -1,4 +1,5 @@
 MapSongBanks::
+	table_width 2, MapSongBanks
 	db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; PALLET_TOWN
 	db MUSIC_CITIES1, BANK(Music_Cities1) ; VIRIDIAN_CITY
 	db MUSIC_CITIES1, BANK(Music_Cities1) ; PEWTER_CITY
@@ -248,3 +249,4 @@ MapSongBanks::
 	db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; BRUNOS_ROOM
 	db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; AGATHAS_ROOM
 	db MUSIC_ROUTES3, BANK(Music_Routes3) ; SUMMER_BEACH_HOUSE
+	assert_table_length NUM_MAPS
diff --git a/data/maps/sprite_sets.asm b/data/maps/sprite_sets.asm
index cce86d1a..b42e9245 100644
--- a/data/maps/sprite_sets.asm
+++ b/data/maps/sprite_sets.asm
@@ -1,4 +1,5 @@
 MapSpriteSets:
+	table_width 1, MapSpriteSets
 	db $01 ; PALLET_TOWN
 	db $01 ; VIRIDIAN_CITY
 	db $02 ; PEWTER_CITY
@@ -36,6 +37,7 @@ MapSpriteSets:
 	db $06 ; ROUTE_23
 	db $02 ; ROUTE_24
 	db $02 ; ROUTE_25
+	assert_table_length FIRST_INDOOR_MAP
 
 EAST_WEST   EQU 1
 NORTH_SOUTH EQU 2
@@ -60,7 +62,12 @@ SplitMapSpriteSets:
 	db EAST_WEST,    3, $07, $03 ; $fc
 
 SpriteSets:
+
+; each sprite set has 9 walking sprites and 2 still sprites
+SPRITE_SET_LENGTH EQU 9 + 2
+
 ; sprite set $01
+	table_width 1
 	db SPRITE_PIKACHU
 	db SPRITE_BLUE
 	db SPRITE_YOUNGSTER
@@ -72,8 +79,10 @@ SpriteSets:
 	db SPRITE_SWIMMER
 	db SPRITE_POKE_BALL
 	db SPRITE_GAMBLER_ASLEEP
+	assert_table_length SPRITE_SET_LENGTH
 
 ; sprite set $02
+	table_width 1
 	db SPRITE_PIKACHU
 	db SPRITE_YOUNGSTER
 	db SPRITE_ROCKET
@@ -85,8 +94,10 @@ SpriteSets:
 	db SPRITE_COOLTRAINER_M
 	db SPRITE_POKE_BALL
 	db SPRITE_UNUSED_GAMBLER_ASLEEP_2
+	assert_table_length SPRITE_SET_LENGTH
 
 ; sprite set $03
+	table_width 1
 	db SPRITE_PIKACHU
 	db SPRITE_LITTLE_GIRL
 	db SPRITE_GIRL
@@ -98,8 +109,10 @@ SpriteSets:
 	db SPRITE_COOLTRAINER_M
 	db SPRITE_POKE_BALL
 	db SPRITE_UNUSED_GAMBLER_ASLEEP_2
+	assert_table_length SPRITE_SET_LENGTH
 
 ; sprite set $04
+	table_width 1
 	db SPRITE_PIKACHU
 	db SPRITE_OFFICER_JENNY
 	db SPRITE_SUPER_NERD
@@ -111,8 +124,10 @@ SpriteSets:
 	db SPRITE_COOLTRAINER_M
 	db SPRITE_POKE_BALL
 	db SPRITE_UNUSED_GAMBLER_ASLEEP_2
+	assert_table_length SPRITE_SET_LENGTH
 
 ; sprite set $05
+	table_width 1
 	db SPRITE_PIKACHU
 	db SPRITE_LITTLE_GIRL
 	db SPRITE_LITTLE_BOY
@@ -124,8 +139,10 @@ SpriteSets:
 	db SPRITE_ROCKET
 	db SPRITE_POKE_BALL
 	db SPRITE_SNORLAX
+	assert_table_length SPRITE_SET_LENGTH
 
 ; sprite set $06
+	table_width 1
 	db SPRITE_PIKACHU
 	db SPRITE_GYM_GUIDE
 	db SPRITE_MONSTER
@@ -137,8 +154,10 @@ SpriteSets:
 	db SPRITE_GAMBLER
 	db SPRITE_POKE_BALL
 	db SPRITE_UNUSED_GAMBLER_ASLEEP_2
+	assert_table_length SPRITE_SET_LENGTH
 
 ; sprite set $07
+	table_width 1
 	db SPRITE_PIKACHU
 	db SPRITE_ROCKET
 	db SPRITE_SCIENTIST
@@ -150,8 +169,10 @@ SpriteSets:
 	db SPRITE_COOLTRAINER_M
 	db SPRITE_POKE_BALL
 	db SPRITE_UNUSED_GAMBLER_ASLEEP_2
+	assert_table_length SPRITE_SET_LENGTH
 
 ; sprite set $08
+	table_width 1
 	db SPRITE_PIKACHU
 	db SPRITE_BIKER
 	db SPRITE_SUPER_NERD
@@ -163,8 +184,10 @@ SpriteSets:
 	db SPRITE_ROCKER
 	db SPRITE_POKE_BALL
 	db SPRITE_SNORLAX
+	assert_table_length SPRITE_SET_LENGTH
 
 ; sprite set $09
+	table_width 1
 	db SPRITE_PIKACHU
 	db SPRITE_BIKER
 	db SPRITE_COOLTRAINER_M
@@ -176,8 +199,10 @@ SpriteSets:
 	db SPRITE_MIDDLE_AGED_MAN
 	db SPRITE_POKE_BALL
 	db SPRITE_SNORLAX
+	assert_table_length SPRITE_SET_LENGTH
 
 ; sprite set $0a
+	table_width 1
 	db SPRITE_PIKACHU
 	db SPRITE_COOLTRAINER_M
 	db SPRITE_CHANSEY
@@ -189,3 +214,4 @@ SpriteSets:
 	db SPRITE_YOUNGSTER
 	db SPRITE_POKE_BALL
 	db SPRITE_FOSSIL
+	assert_table_length SPRITE_SET_LENGTH
diff --git a/data/maps/town_map_entries.asm b/data/maps/town_map_entries.asm
index 8ad4bc28..954a3ee9 100644
--- a/data/maps/town_map_entries.asm
+++ b/data/maps/town_map_entries.asm
@@ -5,6 +5,7 @@ ENDM
 
 ; the appearance of towns and routes in the town map
 ExternalMapEntries:
+	table_width 3, ExternalMapEntries
 	; x, y, name
 	external_map  2, 11, PalletTownName
 	external_map  2,  8, ViridianCityName
@@ -43,6 +44,7 @@ ExternalMapEntries:
 	external_map  0,  6, Route23Name
 	external_map 10,  1, Route24Name
 	external_map 11,  0, Route25Name
+	assert_table_length FIRST_INDOOR_MAP
 
 
 internal_map: MACRO