Some miscellaneous changes, syncing more with pokered

7 files changed, 8 insertions, 6 deletions

diff --git a/data/maps/hide_show_data.asm b/data/maps/hide_show_data.asm
index 810da263..6d5d4aa6 100644
--- a/data/maps/hide_show_data.asm
+++ b/data/maps/hide_show_data.asm
@@ -251,7 +251,7 @@ MapHSPointers:
 	dw NoHS
 	dw NoHS
 	dw NoHS
-	dw NoHS ; beach house
+	dw NoHS
 	assert_table_length NUM_MAPS
 	dw -1 ; end
 
diff --git a/data/sgb/sgb_packets.asm b/data/sgb/sgb_packets.asm
index 161ad9fe..38257fa1 100644
--- a/data/sgb/sgb_packets.asm
+++ b/data/sgb/sgb_packets.asm
@@ -159,6 +159,7 @@ PctTrnPacket:  PCT_TRN
 MaskEnFreezePacket: MASK_EN 1
 MaskEnCancelPacket: MASK_EN 0
 
+
 ; These are DATA_SND packets containing SNES code.
 ; This set of packets is found in several Japanese SGB-compatible titles.
 ; It appears to be part of NCL's SGB devkit.
diff --git a/data/sgb/sgb_palettes.asm b/data/sgb/sgb_palettes.asm
index aa8c0b7e..ba753f6a 100644
--- a/data/sgb/sgb_palettes.asm
+++ b/data/sgb/sgb_palettes.asm
@@ -1,6 +1,6 @@
 SuperPalettes:
-	table_width 2 * 4, SuperPalettes
 ; entries correspond to PAL_* constants
+	table_width 2 * 4, SuperPalettes
 	RGB 31,31,30, 23,26,19, 23,27,31, 06,06,06 ; PAL_ROUTE
 	RGB 31,31,30, 28,27,31, 23,27,31, 06,06,06 ; PAL_PALLET
 	RGB 31,31,30, 26,31,21, 23,27,31, 06,06,06 ; PAL_VIRIDIAN
@@ -44,6 +44,7 @@ SuperPalettes:
 	assert_table_length NUM_SGB_PALS
 
 GBCBasePalettes:
+; entries correspond to PAL_* constants
 	table_width 2 * 4, GBCBasePalettes
 	RGB 31,31,31, 16,31,04, 11,23,31, 03,03,03 ; PAL_ROUTE
 	RGB 31,31,31, 23,17,31, 11,23,31, 03,03,03 ; PAL_PALLET
diff --git a/data/tilesets/tileset_headers.asm b/data/tilesets/tileset_headers.asm
index 819364b3..3355de6d 100644
--- a/data/tilesets/tileset_headers.asm
+++ b/data/tilesets/tileset_headers.asm
@@ -8,6 +8,7 @@ ENDM
 
 Tilesets:
 	table_width 12, Tilesets
+	; name, 3 counter tiles, grass tile, animations
 	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
diff --git a/data/tilesets/warp_tile_ids.asm b/data/tilesets/warp_tile_ids.asm
index b30a731d..61b93a36 100644
--- a/data/tilesets/warp_tile_ids.asm
+++ b/data/tilesets/warp_tile_ids.asm
@@ -92,7 +92,7 @@ ENDM
 	; fallthrough
 .ShipPortWarpTileIDs:
 .ClubWarpTileIDs:
-	warp_tiles
+	warp_tiles ; end
 
 .BeachHouseWarpTileIDs:
 	warp_tiles ; end
diff --git a/engine/items/town_map.asm b/engine/items/town_map.asm
index 3e71fc29..700be30c 100644
--- a/engine/items/town_map.asm
+++ b/engine/items/town_map.asm
@@ -105,7 +105,7 @@ DisplayTownMap:
 	ld [wWhichTownMapLocation], a
 	jp .townMapLoop
 
-.asm_70f87
+Func_70f87: ; unreferenced
 	ldh a, [hJoy5]
 	and D_DOWN | D_UP
 	ret z
diff --git a/maps.asm b/maps.asm
index b3b71b40..4efa99d7 100644
--- a/maps.asm
+++ b/maps.asm
@@ -1250,8 +1250,7 @@ INCLUDE "scripts/MtMoonPokecenter2.asm"
 
 INCLUDE "data/maps/headers/SummerBeachHouse.asm"
 INCLUDE "scripts/SummerBeachHouse.asm"
-SummerBeachHouse_Blocks:
-INCBIN "maps/SummerBeachHouse.blk"
+SummerBeachHouse_Blocks: INCBIN "maps/SummerBeachHouse.blk"
 INCLUDE "data/maps/objects/SummerBeachHouse.asm"
 INCLUDE "scripts/SummerBeachHouse2.asm"