shithub: pokered

Download patch

ref: 2e0183fc2745c9f450a751d82569de52e8a5e6ea
parent: dd4f0a0064921f74fd68750848fca87ae21c4545
author: Remy Oukaour <remy.oukaour@gmail.com>
date: Mon Jan 29 06:46:45 EST 2018 

Block IDs use hex; zero connections use dec


--- a/data/mapHeaders/agatha.asm
+++ b/data/mapHeaders/agatha.asm
@@ -2,5 +2,5 @@
 	db CEMETERY ; tileset
 	db AGATHAS_ROOM_HEIGHT, AGATHAS_ROOM_WIDTH ; dimensions (y, x)
 	dw AgathaBlocks, AgathaTextPointers, AgathaScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw AgathaObject ; objects
--- a/data/mapHeaders/bikeshop.asm
+++ b/data/mapHeaders/bikeshop.asm
@@ -2,5 +2,5 @@
 	db CLUB ; tileset
 	db BIKE_SHOP_HEIGHT, BIKE_SHOP_WIDTH ; dimensions (y, x)
 	dw BikeShopBlocks, BikeShopTextPointers, BikeShopScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw BikeShopObject ; objects
--- a/data/mapHeaders/billshouse.asm
+++ b/data/mapHeaders/billshouse.asm
@@ -2,5 +2,5 @@
 	db INTERIOR ; tileset
 	db BILLS_HOUSE_HEIGHT, BILLS_HOUSE_WIDTH ; dimensions (y, x)
 	dw BillsHouseBlocks, BillsHouseTextPointers, BillsHouseScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw BillsHouseObject ; objects
--- a/data/mapHeaders/bruno.asm
+++ b/data/mapHeaders/bruno.asm
@@ -2,5 +2,5 @@
 	db GYM ; tileset
 	db BRUNOS_ROOM_HEIGHT, BRUNOS_ROOM_WIDTH ; dimensions (y, x)
 	dw BrunoBlocks, BrunoTextPointers, BrunoScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw BrunoObject ; objects
--- a/data/mapHeaders/celadondiner.asm
+++ b/data/mapHeaders/celadondiner.asm
@@ -2,5 +2,5 @@
 	db LOBBY ; tileset
 	db CELADON_DINER_HEIGHT, CELADON_DINER_WIDTH ; dimensions (y, x)
 	dw CeladonDinerBlocks, CeladonDinerTextPointers, CeladonDinerScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw CeladonDinerObject ; objects
--- a/data/mapHeaders/celadongamecorner.asm
+++ b/data/mapHeaders/celadongamecorner.asm
@@ -2,5 +2,5 @@
 	db LOBBY ; tileset
 	db GAME_CORNER_HEIGHT, GAME_CORNER_WIDTH ; dimensions (y, x)
 	dw CeladonGameCornerBlocks, CeladonGameCornerTextPointers, CeladonGameCornerScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw CeladonGameCornerObject ; objects
--- a/data/mapHeaders/celadongym.asm
+++ b/data/mapHeaders/celadongym.asm
@@ -2,5 +2,5 @@
 	db GYM ; tileset
 	db CELADON_GYM_HEIGHT, CELADON_GYM_WIDTH ; dimensions (y, x)
 	dw CeladonGymBlocks, CeladonGymTextPointers, CeladonGymScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw CeladonGymObject ; objects
--- a/data/mapHeaders/celadonhotel.asm
+++ b/data/mapHeaders/celadonhotel.asm
@@ -2,5 +2,5 @@
 	db POKECENTER ; tileset
 	db CELADON_HOTEL_HEIGHT, CELADON_HOTEL_WIDTH ; dimensions (y, x)
 	dw CeladonHotelBlocks, CeladonHotelTextPointers, CeladonHotelScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw CeladonHotelObject ; objects
--- a/data/mapHeaders/celadonhouse.asm
+++ b/data/mapHeaders/celadonhouse.asm
@@ -2,5 +2,5 @@
 	db MANSION ; tileset
 	db CELADON_HOUSE_HEIGHT, CELADON_HOUSE_WIDTH ; dimensions (y, x)
 	dw CeladonHouseBlocks, CeladonHouseTextPointers, CeladonHouseScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw CeladonHouseObject ; objects
--- a/data/mapHeaders/celadonmansion1.asm
+++ b/data/mapHeaders/celadonmansion1.asm
@@ -2,5 +2,5 @@
 	db MANSION ; tileset
 	db CELADON_MANSION_1_HEIGHT, CELADON_MANSION_1_WIDTH ; dimensions (y, x)
 	dw CeladonMansion1Blocks, CeladonMansion1TextPointers, CeladonMansion1Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw CeladonMansion1Object ; objects
--- a/data/mapHeaders/celadonmansion2.asm
+++ b/data/mapHeaders/celadonmansion2.asm
@@ -2,5 +2,5 @@
 	db MANSION ; tileset
 	db CELADON_MANSION_2_HEIGHT, CELADON_MANSION_2_WIDTH ; dimensions (y, x)
 	dw CeladonMansion2Blocks, CeladonMansion2TextPointers, CeladonMansion2Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw CeladonMansion2Object ; objects
--- a/data/mapHeaders/celadonmansion3.asm
+++ b/data/mapHeaders/celadonmansion3.asm
@@ -2,5 +2,5 @@
 	db MANSION ; tileset
 	db CELADON_MANSION_3_HEIGHT, CELADON_MANSION_3_WIDTH ; dimensions (y, x)
 	dw CeladonMansion3Blocks, CeladonMansion3TextPointers, CeladonMansion3Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw CeladonMansion3Object ; objects
--- a/data/mapHeaders/celadonmansion4.asm
+++ b/data/mapHeaders/celadonmansion4.asm
@@ -2,5 +2,5 @@
 	db MANSION ; tileset
 	db CELADON_MANSION_4_HEIGHT, CELADON_MANSION_4_WIDTH ; dimensions (y, x)
 	dw CeladonMansion4Blocks, CeladonMansion4TextPointers, CeladonMansion4Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw CeladonMansion4Object ; objects
--- a/data/mapHeaders/celadonmansion5.asm
+++ b/data/mapHeaders/celadonmansion5.asm
@@ -2,5 +2,5 @@
 	db HOUSE ; tileset
 	db CELADON_MANSION_5_HEIGHT, CELADON_MANSION_5_WIDTH ; dimensions (y, x)
 	dw CeladonMansion5Blocks, CeladonMansion5TextPointers, CeladonMansion5Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw CeladonMansion5Object ; objects
--- a/data/mapHeaders/celadonmart1.asm
+++ b/data/mapHeaders/celadonmart1.asm
@@ -2,5 +2,5 @@
 	db LOBBY ; tileset
 	db CELADON_MART_1_HEIGHT, CELADON_MART_1_WIDTH ; dimensions (y, x)
 	dw CeladonMart1Blocks, CeladonMart1TextPointers, CeladonMart1Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw CeladonMart1Object ; objects
--- a/data/mapHeaders/celadonmart2.asm
+++ b/data/mapHeaders/celadonmart2.asm
@@ -2,5 +2,5 @@
 	db LOBBY ; tileset
 	db CELADON_MART_2_HEIGHT, CELADON_MART_2_WIDTH ; dimensions (y, x)
 	dw CeladonMart2Blocks, CeladonMart2TextPointers, CeladonMart2Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw CeladonMart2Object ; objects
--- a/data/mapHeaders/celadonmart3.asm
+++ b/data/mapHeaders/celadonmart3.asm
@@ -2,5 +2,5 @@
 	db LOBBY ; tileset
 	db CELADON_MART_3_HEIGHT, CELADON_MART_3_WIDTH ; dimensions (y, x)
 	dw CeladonMart3Blocks, CeladonMart3TextPointers, CeladonMart3Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw CeladonMart3Object ; objects
--- a/data/mapHeaders/celadonmart4.asm
+++ b/data/mapHeaders/celadonmart4.asm
@@ -2,5 +2,5 @@
 	db LOBBY ; tileset
 	db CELADON_MART_4_HEIGHT, CELADON_MART_4_WIDTH ; dimensions (y, x)
 	dw CeladonMart4Blocks, CeladonMart4TextPointers, CeladonMart4Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw CeladonMart4Object ; objects
--- a/data/mapHeaders/celadonmart5.asm
+++ b/data/mapHeaders/celadonmart5.asm
@@ -2,5 +2,5 @@
 	db LOBBY ; tileset
 	db CELADON_MART_5_HEIGHT, CELADON_MART_5_WIDTH ; dimensions (y, x)
 	dw CeladonMart5Blocks, CeladonMart5TextPointers, CeladonMart5Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw CeladonMart5Object ; objects
--- a/data/mapHeaders/celadonmartelevator.asm
+++ b/data/mapHeaders/celadonmartelevator.asm
@@ -2,5 +2,5 @@
 	db LOBBY ; tileset
 	db CELADON_MART_ELEVATOR_HEIGHT, CELADON_MART_ELEVATOR_WIDTH ; dimensions (y, x)
 	dw CeladonMartElevatorBlocks, CeladonMartElevatorTextPointers, CeladonMartElevatorScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw CeladonMartElevatorObject ; objects
--- a/data/mapHeaders/celadonmartroof.asm
+++ b/data/mapHeaders/celadonmartroof.asm
@@ -2,5 +2,5 @@
 	db LOBBY ; tileset
 	db CELADON_MART_ROOF_HEIGHT, CELADON_MART_ROOF_WIDTH ; dimensions (y, x)
 	dw CeladonMartRoofBlocks, CeladonMartRoofTextPointers, CeladonMartRoofScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw CeladonMartRoofObject ; objects
--- a/data/mapHeaders/celadonpokecenter.asm
+++ b/data/mapHeaders/celadonpokecenter.asm
@@ -2,5 +2,5 @@
 	db POKECENTER ; tileset
 	db CELADON_POKECENTER_HEIGHT, CELADON_POKECENTER_WIDTH ; dimensions (y, x)
 	dw CeladonPokecenterBlocks, CeladonPokecenterTextPointers, CeladonPokecenterScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw CeladonPokecenterObject ; objects
--- a/data/mapHeaders/celadonprizeroom.asm
+++ b/data/mapHeaders/celadonprizeroom.asm
@@ -2,5 +2,5 @@
 	db LOBBY ; tileset
 	db CELADON_PRIZE_ROOM_HEIGHT, CELADON_PRIZE_ROOM_WIDTH ; dimensions (y, x)
 	dw CeladonPrizeRoomBlocks, CeladonPrizeRoomTextPointers, CeladonPrizeRoomScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw CeladonPrizeRoomObject ; objects
--- a/data/mapHeaders/ceruleangym.asm
+++ b/data/mapHeaders/ceruleangym.asm
@@ -2,5 +2,5 @@
 	db GYM ; tileset
 	db CERULEAN_GYM_HEIGHT, CERULEAN_GYM_WIDTH ; dimensions (y, x)
 	dw CeruleanGymBlocks, CeruleanGymTextPointers, CeruleanGymScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw CeruleanGymObject ; objects
--- a/data/mapHeaders/ceruleanhouse1.asm
+++ b/data/mapHeaders/ceruleanhouse1.asm
@@ -2,5 +2,5 @@
 	db HOUSE ; tileset
 	db CERULEAN_HOUSE_1_HEIGHT, CERULEAN_HOUSE_1_WIDTH ; dimensions (y, x)
 	dw CeruleanHouse1Blocks, CeruleanHouse1TextPointers, CeruleanHouse1Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw CeruleanHouse1Object ; objects
--- a/data/mapHeaders/ceruleanhouse2.asm
+++ b/data/mapHeaders/ceruleanhouse2.asm
@@ -2,5 +2,5 @@
 	db SHIP ; tileset
 	db CERULEAN_HOUSE_2_HEIGHT, CERULEAN_HOUSE_2_WIDTH ; dimensions (y, x)
 	dw CeruleanHouse2Blocks, CeruleanHouse2TextPointers, CeruleanHouse2Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw CeruleanHouse2Object ; objects
--- a/data/mapHeaders/ceruleanhousetrashed.asm
+++ b/data/mapHeaders/ceruleanhousetrashed.asm
@@ -2,5 +2,5 @@
 	db HOUSE ; tileset
 	db TRASHED_HOUSE_HEIGHT, TRASHED_HOUSE_WIDTH ; dimensions (y, x)
 	dw CeruleanHouseTrashedBlocks, CeruleanHouseTrashedTextPointers, CeruleanHouseTrashedScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw CeruleanHouseTrashedObject ; objects
--- a/data/mapHeaders/ceruleanmart.asm
+++ b/data/mapHeaders/ceruleanmart.asm
@@ -2,5 +2,5 @@
 	db MART ; tileset
 	db CERULEAN_MART_HEIGHT, CERULEAN_MART_WIDTH ; dimensions (y, x)
 	dw CeruleanMartBlocks, CeruleanMartTextPointers, CeruleanMartScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw CeruleanMartObject ; objects
--- a/data/mapHeaders/ceruleanpokecenter.asm
+++ b/data/mapHeaders/ceruleanpokecenter.asm
@@ -2,5 +2,5 @@
 	db POKECENTER ; tileset
 	db CERULEAN_POKECENTER_HEIGHT, CERULEAN_POKECENTER_WIDTH ; dimensions (y, x)
 	dw CeruleanPokecenterBlocks, CeruleanPokecenterTextPointers, CeruleanPokecenterScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw CeruleanPokecenterObject ; objects
--- a/data/mapHeaders/cinnabargym.asm
+++ b/data/mapHeaders/cinnabargym.asm
@@ -2,5 +2,5 @@
 	db FACILITY ; tileset
 	db CINNABAR_GYM_HEIGHT, CINNABAR_GYM_WIDTH ; dimensions (y, x)
 	dw CinnabarGymBlocks, CinnabarGymTextPointers, CinnabarGymScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw CinnabarGymObject ; objects
--- a/data/mapHeaders/cinnabarmart.asm
+++ b/data/mapHeaders/cinnabarmart.asm
@@ -2,5 +2,5 @@
 	db MART ; tileset
 	db CINNABAR_MART_HEIGHT, CINNABAR_MART_WIDTH ; dimensions (y, x)
 	dw CinnabarMartBlocks, CinnabarMartTextPointers, CinnabarMartScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw CinnabarMartObject ; objects
--- a/data/mapHeaders/cinnabarpokecenter.asm
+++ b/data/mapHeaders/cinnabarpokecenter.asm
@@ -2,5 +2,5 @@
 	db POKECENTER ; tileset
 	db CINNABAR_POKECENTER_HEIGHT, CINNABAR_POKECENTER_WIDTH ; dimensions (y, x)
 	dw CinnabarPokecenterBlocks, CinnabarPokecenterTextPointers, CinnabarPokecenterScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw CinnabarPokecenterObject ; objects
--- a/data/mapHeaders/colosseum.asm
+++ b/data/mapHeaders/colosseum.asm
@@ -2,5 +2,5 @@
 	db CLUB ; tileset
 	db COLOSSEUM_HEIGHT, COLOSSEUM_WIDTH ; dimensions (y, x)
 	dw ColosseumBlocks, ColosseumTextPointers, ColosseumScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw ColosseumObject ; objects
--- a/data/mapHeaders/copycatshouse1f.asm
+++ b/data/mapHeaders/copycatshouse1f.asm
@@ -2,5 +2,5 @@
 	db REDS_HOUSE_1 ; tileset
 	db COPYCATS_HOUSE_1F_HEIGHT, COPYCATS_HOUSE_1F_WIDTH ; dimensions (y, x)
 	dw CopycatsHouse1FBlocks, CopycatsHouse1FTextPointers, CopycatsHouse1FScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw CopycatsHouse1FObject ; objects
--- a/data/mapHeaders/copycatshouse2f.asm
+++ b/data/mapHeaders/copycatshouse2f.asm
@@ -2,5 +2,5 @@
 	db REDS_HOUSE_2 ; tileset
 	db COPYCATS_HOUSE_2F_HEIGHT, COPYCATS_HOUSE_2F_WIDTH ; dimensions (y, x)
 	dw CopycatsHouse2FBlocks, CopycatsHouse2FTextPointers, CopycatsHouse2FScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw CopycatsHouse2FObject ; objects
--- a/data/mapHeaders/daycarem.asm
+++ b/data/mapHeaders/daycarem.asm
@@ -2,5 +2,5 @@
 	db HOUSE ; tileset
 	db DAYCAREM_HEIGHT, DAYCAREM_WIDTH ; dimensions (y, x)
 	dw DayCareMBlocks, DayCareMTextPointers, DayCareMScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw DayCareMObject ; objects
--- a/data/mapHeaders/diglettscave.asm
+++ b/data/mapHeaders/diglettscave.asm
@@ -2,5 +2,5 @@
 	db CAVERN ; tileset
 	db DIGLETTS_CAVE_HEIGHT, DIGLETTS_CAVE_WIDTH ; dimensions (y, x)
 	dw DiglettsCaveBlocks, DiglettsCaveTextPointers, DiglettsCaveScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw DiglettsCaveObject ; objects
--- a/data/mapHeaders/diglettscaveroute11.asm
+++ b/data/mapHeaders/diglettscaveroute11.asm
@@ -2,5 +2,5 @@
 	db CAVERN ; tileset
 	db DIGLETTS_CAVE_ENTRANCE_HEIGHT, DIGLETTS_CAVE_ENTRANCE_WIDTH ; dimensions (y, x)
 	dw DiglettsCaveEntranceRoute11Blocks, DiglettsCaveEntranceRoute11TextPointers, DiglettsCaveEntranceRoute11Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw DiglettsCaveEntranceRoute11Object ; objects
--- a/data/mapHeaders/diglettscaveroute2.asm
+++ b/data/mapHeaders/diglettscaveroute2.asm
@@ -2,5 +2,5 @@
 	db CAVERN ; tileset
 	db DIGLETTS_CAVE_EXIT_HEIGHT, DIGLETTS_CAVE_EXIT_WIDTH ; dimensions (y, x)
 	dw DiglettsCaveRoute2Blocks, DiglettsCaveRoute2TextPointers, DiglettsCaveRoute2Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw DiglettsCaveRoute2Object ; objects
--- a/data/mapHeaders/fanclub.asm
+++ b/data/mapHeaders/fanclub.asm
@@ -2,5 +2,5 @@
 	db INTERIOR ; tileset
 	db POKEMON_FAN_CLUB_HEIGHT, POKEMON_FAN_CLUB_WIDTH ; dimensions (y, x)
 	dw FanClubBlocks, FanClubTextPointers, FanClubScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw FanClubObject ; objects
--- a/data/mapHeaders/fightingdojo.asm
+++ b/data/mapHeaders/fightingdojo.asm
@@ -2,5 +2,5 @@
 	db DOJO ; tileset
 	db FIGHTING_DOJO_HEIGHT, FIGHTING_DOJO_WIDTH ; dimensions (y, x)
 	dw FightingDojoBlocks, FightingDojoTextPointers, FightingDojoScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw FightingDojoObject ; objects
--- a/data/mapHeaders/fuchsiagym.asm
+++ b/data/mapHeaders/fuchsiagym.asm
@@ -2,5 +2,5 @@
 	db GYM ; tileset
 	db FUCHSIA_GYM_HEIGHT, FUCHSIA_GYM_WIDTH ; dimensions (y, x)
 	dw FuchsiaGymBlocks, FuchsiaGymTextPointers, FuchsiaGymScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw FuchsiaGymObject ; objects
--- a/data/mapHeaders/fuchsiahouse1.asm
+++ b/data/mapHeaders/fuchsiahouse1.asm
@@ -2,5 +2,5 @@
 	db HOUSE ; tileset
 	db FUCHSIA_HOUSE_1_HEIGHT, FUCHSIA_HOUSE_1_WIDTH ; dimensions (y, x)
 	dw FuchsiaHouse1Blocks, FuchsiaHouse1TextPointers, FuchsiaHouse1Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw FuchsiaHouse1Object ; objects
--- a/data/mapHeaders/fuchsiahouse2.asm
+++ b/data/mapHeaders/fuchsiahouse2.asm
@@ -2,5 +2,5 @@
 	db LAB ; tileset
 	db FUCHSIA_HOUSE_2_HEIGHT, FUCHSIA_HOUSE_2_WIDTH ; dimensions (y, x)
 	dw FuchsiaHouse2Blocks, FuchsiaHouse2TextPointers, FuchsiaHouse2Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw FuchsiaHouse2Object ; objects
--- a/data/mapHeaders/fuchsiahouse3.asm
+++ b/data/mapHeaders/fuchsiahouse3.asm
@@ -2,5 +2,5 @@
 	db SHIP ; tileset
 	db FUCHSIA_HOUSE_3_HEIGHT, FUCHSIA_HOUSE_3_WIDTH ; dimensions (y, x)
 	dw FuchsiaHouse3Blocks, FuchsiaHouse3TextPointers, FuchsiaHouse3Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw FuchsiaHouse3Object ; objects
--- a/data/mapHeaders/fuchsiamart.asm
+++ b/data/mapHeaders/fuchsiamart.asm
@@ -2,5 +2,5 @@
 	db MART ; tileset
 	db FUCHSIA_MART_HEIGHT, FUCHSIA_MART_WIDTH ; dimensions (y, x)
 	dw FuchsiaMartBlocks, FuchsiaMartTextPointers, FuchsiaMartScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw FuchsiaMartObject ; objects
--- a/data/mapHeaders/fuchsiameetingroom.asm
+++ b/data/mapHeaders/fuchsiameetingroom.asm
@@ -2,5 +2,5 @@
 	db LAB ; tileset
 	db FUCHSIA_MEETING_ROOM_HEIGHT, FUCHSIA_MEETING_ROOM_WIDTH ; dimensions (y, x)
 	dw FuchsiaMeetingRoomBlocks, FuchsiaMeetingRoomTextPointers, FuchsiaMeetingRoomScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw FuchsiaMeetingRoomObject ; objects
--- a/data/mapHeaders/fuchsiapokecenter.asm
+++ b/data/mapHeaders/fuchsiapokecenter.asm
@@ -2,5 +2,5 @@
 	db POKECENTER ; tileset
 	db FUCHSIA_POKECENTER_HEIGHT, FUCHSIA_POKECENTER_WIDTH ; dimensions (y, x)
 	dw FuchsiaPokecenterBlocks, FuchsiaPokecenterTextPointers, FuchsiaPokecenterScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw FuchsiaPokecenterObject ; objects
--- a/data/mapHeaders/halloffameroom.asm
+++ b/data/mapHeaders/halloffameroom.asm
@@ -2,5 +2,5 @@
 	db GYM ; tileset
 	db HALL_OF_FAME_HEIGHT, HALL_OF_FAME_WIDTH ; dimensions (y, x)
 	dw HallofFameRoomBlocks, HallofFameRoomTextPointers, HallofFameRoomScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw HallofFameRoomObject ; objects
--- a/data/mapHeaders/indigoplateaulobby.asm
+++ b/data/mapHeaders/indigoplateaulobby.asm
@@ -2,5 +2,5 @@
 	db MART ; tileset
 	db INDIGO_PLATEAU_LOBBY_HEIGHT, INDIGO_PLATEAU_LOBBY_WIDTH ; dimensions (y, x)
 	dw IndigoPlateauLobbyBlocks, IndigoPlateauLobbyTextPointers, IndigoPlateauLobbyScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw IndigoPlateauLobbyObject ; objects
--- a/data/mapHeaders/lab1.asm
+++ b/data/mapHeaders/lab1.asm
@@ -2,5 +2,5 @@
 	db LAB ; tileset
 	db CINNABAR_LAB_1_HEIGHT, CINNABAR_LAB_1_WIDTH ; dimensions (y, x)
 	dw Lab1Blocks, Lab1TextPointers, Lab1Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw Lab1Object ; objects
--- a/data/mapHeaders/lab2.asm
+++ b/data/mapHeaders/lab2.asm
@@ -2,5 +2,5 @@
 	db LAB ; tileset
 	db CINNABAR_LAB_2_HEIGHT, CINNABAR_LAB_2_WIDTH ; dimensions (y, x)
 	dw Lab2Blocks, Lab2TextPointers, Lab2Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw Lab2Object ; objects
--- a/data/mapHeaders/lab3.asm
+++ b/data/mapHeaders/lab3.asm
@@ -2,5 +2,5 @@
 	db LAB ; tileset
 	db CINNABAR_LAB_3_HEIGHT, CINNABAR_LAB_3_WIDTH ; dimensions (y, x)
 	dw Lab3Blocks, Lab3TextPointers, Lab3Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw Lab3Object ; objects
--- a/data/mapHeaders/lab4.asm
+++ b/data/mapHeaders/lab4.asm
@@ -2,5 +2,5 @@
 	db LAB ; tileset
 	db CINNABAR_LAB_4_HEIGHT, CINNABAR_LAB_4_WIDTH ; dimensions (y, x)
 	dw Lab4Blocks, Lab4TextPointers, Lab4Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw Lab4Object ; objects
--- a/data/mapHeaders/lance.asm
+++ b/data/mapHeaders/lance.asm
@@ -2,5 +2,5 @@
 	db DOJO ; tileset
 	db LANCES_ROOM_HEIGHT, LANCES_ROOM_WIDTH ; dimensions (y, x)
 	dw LanceBlocks, LanceTextPointers, LanceScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw LanceObject ; objects
--- a/data/mapHeaders/lavenderhouse1.asm
+++ b/data/mapHeaders/lavenderhouse1.asm
@@ -2,5 +2,5 @@
 	db HOUSE ; tileset
 	db LAVENDER_HOUSE_1_HEIGHT, LAVENDER_HOUSE_1_WIDTH ; dimensions (y, x)
 	dw LavenderHouse1Blocks, LavenderHouse1TextPointers, LavenderHouse1Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw LavenderHouse1Object ; objects
--- a/data/mapHeaders/lavenderhouse2.asm
+++ b/data/mapHeaders/lavenderhouse2.asm
@@ -2,5 +2,5 @@
 	db HOUSE ; tileset
 	db LAVENDER_HOUSE_2_HEIGHT, LAVENDER_HOUSE_2_WIDTH ; dimensions (y, x)
 	dw LavenderHouse2Blocks, LavenderHouse2TextPointers, LavenderHouse2Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw LavenderHouse2Object ; objects
--- a/data/mapHeaders/lavendermart.asm
+++ b/data/mapHeaders/lavendermart.asm
@@ -2,5 +2,5 @@
 	db MART ; tileset
 	db LAVENDER_MART_HEIGHT, LAVENDER_MART_WIDTH ; dimensions (y, x)
 	dw LavenderMartBlocks, LavenderMartTextPointers, LavenderMartScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw LavenderMartObject ; objects
--- a/data/mapHeaders/lavenderpokecenter.asm
+++ b/data/mapHeaders/lavenderpokecenter.asm
@@ -2,5 +2,5 @@
 	db POKECENTER ; tileset
 	db LAVENDER_POKECENTER_HEIGHT, LAVENDER_POKECENTER_WIDTH ; dimensions (y, x)
 	dw LavenderPokecenterBlocks, LavenderPokecenterTextPointers, LavenderPokecenterScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw LavenderPokecenterObject ; objects
--- a/data/mapHeaders/lorelei.asm
+++ b/data/mapHeaders/lorelei.asm
@@ -2,5 +2,5 @@
 	db GYM ; tileset
 	db LORELEIS_ROOM_HEIGHT, LORELEIS_ROOM_WIDTH ; dimensions (y, x)
 	dw LoreleiBlocks, LoreleiTextPointers, LoreleiScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw LoreleiObject ; objects
--- a/data/mapHeaders/mansion1.asm
+++ b/data/mapHeaders/mansion1.asm
@@ -2,5 +2,5 @@
 	db FACILITY ; tileset
 	db MANSION_1_HEIGHT, MANSION_1_WIDTH ; dimensions (y, x)
 	dw Mansion1Blocks, Mansion1TextPointers, Mansion1Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw Mansion1Object ; objects
--- a/data/mapHeaders/mansion2.asm
+++ b/data/mapHeaders/mansion2.asm
@@ -2,5 +2,5 @@
 	db FACILITY ; tileset
 	db MANSION_2_HEIGHT, MANSION_2_WIDTH ; dimensions (y, x)
 	dw Mansion2Blocks, Mansion2TextPointers, Mansion2Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw Mansion2Object ; objects
--- a/data/mapHeaders/mansion3.asm
+++ b/data/mapHeaders/mansion3.asm
@@ -2,5 +2,5 @@
 	db FACILITY ; tileset
 	db MANSION_3_HEIGHT, MANSION_3_WIDTH ; dimensions (y, x)
 	dw Mansion3Blocks, Mansion3TextPointers, Mansion3Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw Mansion3Object ; objects
--- a/data/mapHeaders/mansion4.asm
+++ b/data/mapHeaders/mansion4.asm
@@ -2,5 +2,5 @@
 	db FACILITY ; tileset
 	db MANSION_4_HEIGHT, MANSION_4_WIDTH ; dimensions (y, x)
 	dw Mansion4Blocks, Mansion4TextPointers, Mansion4Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw Mansion4Object ; objects
--- a/data/mapHeaders/mtmoon1.asm
+++ b/data/mapHeaders/mtmoon1.asm
@@ -2,5 +2,5 @@
 	db CAVERN ; tileset
 	db MT_MOON_1_HEIGHT, MT_MOON_1_WIDTH ; dimensions (y, x)
 	dw MtMoon1Blocks, MtMoon1TextPointers, MtMoon1Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw MtMoon1Object ; objects
--- a/data/mapHeaders/mtmoon2.asm
+++ b/data/mapHeaders/mtmoon2.asm
@@ -2,5 +2,5 @@
 	db CAVERN ; tileset
 	db MT_MOON_2_HEIGHT, MT_MOON_2_WIDTH ; dimensions (y, x)
 	dw MtMoon2Blocks, MtMoon2TextPointers, MtMoon2Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw MtMoon2Object ; objects
--- a/data/mapHeaders/mtmoon3.asm
+++ b/data/mapHeaders/mtmoon3.asm
@@ -2,5 +2,5 @@
 	db CAVERN ; tileset
 	db MT_MOON_3_HEIGHT, MT_MOON_3_WIDTH ; dimensions (y, x)
 	dw MtMoon3Blocks, MtMoon3TextPointers, MtMoon3Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw MtMoon3Object ; objects
--- a/data/mapHeaders/mtmoonpokecenter.asm
+++ b/data/mapHeaders/mtmoonpokecenter.asm
@@ -2,5 +2,5 @@
 	db POKECENTER ; tileset
 	db MT_MOON_POKECENTER_HEIGHT, MT_MOON_POKECENTER_WIDTH ; dimensions (y, x)
 	dw MtMoonPokecenterBlocks, MtMoonPokecenterTextPointers, MtMoonPokecenterScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw MtMoonPokecenterObject ; objects
--- a/data/mapHeaders/museum1f.asm
+++ b/data/mapHeaders/museum1f.asm
@@ -2,5 +2,5 @@
 	db MUSEUM ; tileset
 	db MUSEUM_1F_HEIGHT, MUSEUM_1F_WIDTH ; dimensions (y, x)
 	dw Museum1FBlocks, Museum1FTextPointers, Museum1FScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw Museum1FObject ; objects
--- a/data/mapHeaders/museum2f.asm
+++ b/data/mapHeaders/museum2f.asm
@@ -2,5 +2,5 @@
 	db MUSEUM ; tileset
 	db MUSEUM_2F_HEIGHT, MUSEUM_2F_WIDTH ; dimensions (y, x)
 	dw Museum2FBlocks, Museum2FTextPointers, Museum2FScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw Museum2FObject ; objects
--- a/data/mapHeaders/namerater.asm
+++ b/data/mapHeaders/namerater.asm
@@ -2,5 +2,5 @@
 	db HOUSE ; tileset
 	db NAME_RATERS_HOUSE_HEIGHT, NAME_RATERS_HOUSE_WIDTH ; dimensions (y, x)
 	dw NameRaterBlocks, NameRaterTextPointers, NameRaterScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw NameRaterObject ; objects
--- a/data/mapHeaders/oakslab.asm
+++ b/data/mapHeaders/oakslab.asm
@@ -2,5 +2,5 @@
 	db DOJO ; tileset
 	db OAKS_LAB_HEIGHT, OAKS_LAB_WIDTH ; dimensions (y, x)
 	dw OaksLabBlocks, OaksLabTextPointers, OaksLabScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw OaksLabObject ; objects
--- a/data/mapHeaders/pewtergym.asm
+++ b/data/mapHeaders/pewtergym.asm
@@ -2,5 +2,5 @@
 	db GYM ; tileset
 	db PEWTER_GYM_HEIGHT, PEWTER_GYM_WIDTH ; dimensions (y, x)
 	dw PewterGymBlocks, PewterGymTextPointers, PewterGymScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw PewterGymObject ; objects
--- a/data/mapHeaders/pewterhouse1.asm
+++ b/data/mapHeaders/pewterhouse1.asm
@@ -2,5 +2,5 @@
 	db HOUSE ; tileset
 	db PEWTER_HOUSE_1_HEIGHT, PEWTER_HOUSE_1_WIDTH ; dimensions (y, x)
 	dw PewterHouse1Blocks, PewterHouse1TextPointers, PewterHouse1Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw PewterHouse1Object ; objects
--- a/data/mapHeaders/pewterhouse2.asm
+++ b/data/mapHeaders/pewterhouse2.asm
@@ -2,5 +2,5 @@
 	db HOUSE ; tileset
 	db PEWTER_HOUSE_2_HEIGHT, PEWTER_HOUSE_2_WIDTH ; dimensions (y, x)
 	dw PewterHouse2Blocks, PewterHouse2TextPointers, PewterHouse2Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw PewterHouse2Object ; objects
--- a/data/mapHeaders/pewtermart.asm
+++ b/data/mapHeaders/pewtermart.asm
@@ -2,5 +2,5 @@
 	db MART ; tileset
 	db PEWTER_MART_HEIGHT, PEWTER_MART_WIDTH ; dimensions (y, x)
 	dw PewterMartBlocks, PewterMartTextPointers, PewterMartScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw PewterMartObject ; objects
--- a/data/mapHeaders/pewterpokecenter.asm
+++ b/data/mapHeaders/pewterpokecenter.asm
@@ -2,5 +2,5 @@
 	db POKECENTER ; tileset
 	db PEWTER_POKECENTER_HEIGHT, PEWTER_POKECENTER_WIDTH ; dimensions (y, x)
 	dw PewterPokecenterBlocks, PewterPokecenterTextPointers, PewterPokecenterScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw PewterPokecenterObject ; objects
--- a/data/mapHeaders/pokemontower1.asm
+++ b/data/mapHeaders/pokemontower1.asm
@@ -2,5 +2,5 @@
 	db CEMETERY ; tileset
 	db POKEMONTOWER_1_HEIGHT, POKEMONTOWER_1_WIDTH ; dimensions (y, x)
 	dw PokemonTower1Blocks, PokemonTower1TextPointers, PokemonTower1Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw PokemonTower1Object ; objects
--- a/data/mapHeaders/pokemontower2.asm
+++ b/data/mapHeaders/pokemontower2.asm
@@ -2,5 +2,5 @@
 	db CEMETERY ; tileset
 	db POKEMONTOWER_2_HEIGHT, POKEMONTOWER_2_WIDTH ; dimensions (y, x)
 	dw PokemonTower2Blocks, PokemonTower2TextPointers, PokemonTower2Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw PokemonTower2Object ; objects
--- a/data/mapHeaders/pokemontower3.asm
+++ b/data/mapHeaders/pokemontower3.asm
@@ -2,5 +2,5 @@
 	db CEMETERY ; tileset
 	db POKEMONTOWER_3_HEIGHT, POKEMONTOWER_3_WIDTH ; dimensions (y, x)
 	dw PokemonTower3Blocks, PokemonTower3TextPointers, PokemonTower3Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw PokemonTower3Object ; objects
--- a/data/mapHeaders/pokemontower4.asm
+++ b/data/mapHeaders/pokemontower4.asm
@@ -2,5 +2,5 @@
 	db CEMETERY ; tileset
 	db POKEMONTOWER_4_HEIGHT, POKEMONTOWER_4_WIDTH ; dimensions (y, x)
 	dw PokemonTower4Blocks, PokemonTower4TextPointers, PokemonTower4Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw PokemonTower4Object ; objects
--- a/data/mapHeaders/pokemontower5.asm
+++ b/data/mapHeaders/pokemontower5.asm
@@ -2,5 +2,5 @@
 	db CEMETERY ; tileset
 	db POKEMONTOWER_5_HEIGHT, POKEMONTOWER_5_WIDTH ; dimensions (y, x)
 	dw PokemonTower5Blocks, PokemonTower5TextPointers, PokemonTower5Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw PokemonTower5Object ; objects
--- a/data/mapHeaders/pokemontower6.asm
+++ b/data/mapHeaders/pokemontower6.asm
@@ -2,5 +2,5 @@
 	db CEMETERY ; tileset
 	db POKEMONTOWER_6_HEIGHT, POKEMONTOWER_6_WIDTH ; dimensions (y, x)
 	dw PokemonTower6Blocks, PokemonTower6TextPointers, PokemonTower6Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw PokemonTower6Object ; objects
--- a/data/mapHeaders/pokemontower7.asm
+++ b/data/mapHeaders/pokemontower7.asm
@@ -2,5 +2,5 @@
 	db CEMETERY ; tileset
 	db POKEMONTOWER_7_HEIGHT, POKEMONTOWER_7_WIDTH ; dimensions (y, x)
 	dw PokemonTower7Blocks, PokemonTower7TextPointers, PokemonTower7Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw PokemonTower7Object ; objects
--- a/data/mapHeaders/powerplant.asm
+++ b/data/mapHeaders/powerplant.asm
@@ -2,5 +2,5 @@
 	db FACILITY ; tileset
 	db POWER_PLANT_HEIGHT, POWER_PLANT_WIDTH ; dimensions (y, x)
 	dw PowerPlantBlocks, PowerPlantTextPointers, PowerPlantScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw PowerPlantObject ; objects
--- a/data/mapHeaders/rockethideout1.asm
+++ b/data/mapHeaders/rockethideout1.asm
@@ -2,5 +2,5 @@
 	db FACILITY ; tileset
 	db ROCKET_HIDEOUT_1_HEIGHT, ROCKET_HIDEOUT_1_WIDTH ; dimensions (y, x)
 	dw RocketHideout1Blocks, RocketHideout1TextPointers, RocketHideout1Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw RocketHideout1Object ; objects
--- a/data/mapHeaders/rockethideout2.asm
+++ b/data/mapHeaders/rockethideout2.asm
@@ -2,5 +2,5 @@
 	db FACILITY ; tileset
 	db ROCKET_HIDEOUT_2_HEIGHT, ROCKET_HIDEOUT_2_WIDTH ; dimensions (y, x)
 	dw RocketHideout2Blocks, RocketHideout2TextPointers, RocketHideout2Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw RocketHideout2Object ; objects
--- a/data/mapHeaders/rockethideout3.asm
+++ b/data/mapHeaders/rockethideout3.asm
@@ -2,5 +2,5 @@
 	db FACILITY ; tileset
 	db ROCKET_HIDEOUT_3_HEIGHT, ROCKET_HIDEOUT_3_WIDTH ; dimensions (y, x)
 	dw RocketHideout3Blocks, RocketHideout3TextPointers, RocketHideout3Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw RocketHideout3Object ; objects
--- a/data/mapHeaders/rockethideout4.asm
+++ b/data/mapHeaders/rockethideout4.asm
@@ -2,5 +2,5 @@
 	db FACILITY ; tileset
 	db ROCKET_HIDEOUT_4_HEIGHT, ROCKET_HIDEOUT_4_WIDTH ; dimensions (y, x)
 	dw RocketHideout4Blocks, RocketHideout4TextPointers, RocketHideout4Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw RocketHideout4Object ; objects
--- a/data/mapHeaders/rockethideoutelevator.asm
+++ b/data/mapHeaders/rockethideoutelevator.asm
@@ -2,5 +2,5 @@
 	db LOBBY ; tileset
 	db ROCKET_HIDEOUT_ELEVATOR_HEIGHT, ROCKET_HIDEOUT_ELEVATOR_WIDTH ; dimensions (y, x)
 	dw RocketHideoutElevatorBlocks, RocketHideoutElevatorTextPointers, RocketHideoutElevatorScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw RocketHideoutElevatorObject ; objects
--- a/data/mapHeaders/rocktunnel1.asm
+++ b/data/mapHeaders/rocktunnel1.asm
@@ -2,5 +2,5 @@
 	db CAVERN ; tileset
 	db ROCK_TUNNEL_1_HEIGHT, ROCK_TUNNEL_1_WIDTH ; dimensions (y, x)
 	dw RockTunnel1Blocks, RockTunnel1TextPointers, RockTunnel1Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw RockTunnel1Object ; objects
--- a/data/mapHeaders/rocktunnel2.asm
+++ b/data/mapHeaders/rocktunnel2.asm
@@ -2,5 +2,5 @@
 	db CAVERN ; tileset
 	db ROCK_TUNNEL_2_HEIGHT, ROCK_TUNNEL_2_WIDTH ; dimensions (y, x)
 	dw RockTunnel2Blocks, RockTunnel2TextPointers, RockTunnel2Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw RockTunnel2Object ; objects
--- a/data/mapHeaders/rocktunnelpokecenter.asm
+++ b/data/mapHeaders/rocktunnelpokecenter.asm
@@ -2,5 +2,5 @@
 	db POKECENTER ; tileset
 	db ROCK_TUNNEL_POKECENTER_HEIGHT, ROCK_TUNNEL_POKECENTER_WIDTH ; dimensions (y, x)
 	dw RockTunnelPokecenterBlocks, RockTunnelPokecenterTextPointers, RockTunnelPokecenterScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw RockTunnelPokecenterObject ; objects
--- a/data/mapHeaders/route11gate.asm
+++ b/data/mapHeaders/route11gate.asm
@@ -2,5 +2,5 @@
 	db GATE ; tileset
 	db ROUTE_11_GATE_1F_HEIGHT, ROUTE_11_GATE_1F_WIDTH ; dimensions (y, x)
 	dw Route11GateBlocks, Route11GateTextPointers, Route11GateScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw Route11GateObject ; objects
--- a/data/mapHeaders/route11gateupstairs.asm
+++ b/data/mapHeaders/route11gateupstairs.asm
@@ -2,5 +2,5 @@
 	db GATE ; tileset
 	db ROUTE_11_GATE_2F_HEIGHT, ROUTE_11_GATE_2F_WIDTH ; dimensions (y, x)
 	dw Route11GateUpstairsBlocks, Route11GateUpstairsTextPointers, Route11GateUpstairsScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw Route11GateUpstairsObject ; objects
--- a/data/mapHeaders/route12gate.asm
+++ b/data/mapHeaders/route12gate.asm
@@ -2,5 +2,5 @@
 	db GATE ; tileset
 	db ROUTE_12_GATE_1F_HEIGHT, ROUTE_12_GATE_1F_WIDTH ; dimensions (y, x)
 	dw Route12GateBlocks, Route12GateTextPointers, Route12GateScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw Route12GateObject ; objects
--- a/data/mapHeaders/route12gateupstairs.asm
+++ b/data/mapHeaders/route12gateupstairs.asm
@@ -2,5 +2,5 @@
 	db GATE ; tileset
 	db ROUTE_12_GATE_2F_HEIGHT, ROUTE_12_GATE_2F_WIDTH ; dimensions (y, x)
 	dw Route12GateUpstairsBlocks, Route12GateUpstairsTextPointers, Route12GateUpstairsScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw Route12GateUpstairsObject ; objects
--- a/data/mapHeaders/route12house.asm
+++ b/data/mapHeaders/route12house.asm
@@ -2,5 +2,5 @@
 	db HOUSE ; tileset
 	db ROUTE_12_HOUSE_HEIGHT, ROUTE_12_HOUSE_WIDTH ; dimensions (y, x)
 	dw Route12HouseBlocks, Route12HouseTextPointers, Route12HouseScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw Route12HouseObject ; objects
--- a/data/mapHeaders/route15gate.asm
+++ b/data/mapHeaders/route15gate.asm
@@ -2,5 +2,5 @@
 	db GATE ; tileset
 	db ROUTE_15_GATE_1F_HEIGHT, ROUTE_15_GATE_1F_WIDTH ; dimensions (y, x)
 	dw Route15GateBlocks, Route15GateTextPointers, Route15GateScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw Route15GateObject ; objects
--- a/data/mapHeaders/route15gateupstairs.asm
+++ b/data/mapHeaders/route15gateupstairs.asm
@@ -2,5 +2,5 @@
 	db GATE ; tileset
 	db ROUTE_15_GATE_2F_HEIGHT, ROUTE_15_GATE_2F_WIDTH ; dimensions (y, x)
 	dw Route15GateUpstairsBlocks, Route15GateUpstairsTextPointers, Route15GateUpstairsScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw Route15GateUpstairsObject ; objects
--- a/data/mapHeaders/route16gate.asm
+++ b/data/mapHeaders/route16gate.asm
@@ -2,5 +2,5 @@
 	db GATE ; tileset
 	db ROUTE_16_GATE_1F_HEIGHT, ROUTE_16_GATE_1F_WIDTH ; dimensions (y, x)
 	dw Route16GateBlocks, Route16GateTextPointers, Route16GateScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw Route16GateObject ; objects
--- a/data/mapHeaders/route16gateupstairs.asm
+++ b/data/mapHeaders/route16gateupstairs.asm
@@ -2,5 +2,5 @@
 	db GATE ; tileset
 	db ROUTE_16_GATE_2F_HEIGHT, ROUTE_16_GATE_2F_WIDTH ; dimensions (y, x)
 	dw Route16GateUpstairsBlocks, Route16GateUpstairsTextPointers, Route16GateUpstairsScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw Route16GateUpstairsObject ; objects
--- a/data/mapHeaders/route16house.asm
+++ b/data/mapHeaders/route16house.asm
@@ -2,5 +2,5 @@
 	db HOUSE ; tileset
 	db ROUTE_16_HOUSE_HEIGHT, ROUTE_16_HOUSE_WIDTH ; dimensions (y, x)
 	dw Route16HouseBlocks, Route16HouseTextPointers, Route16HouseScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw Route16HouseObject ; objects
--- a/data/mapHeaders/route18gate.asm
+++ b/data/mapHeaders/route18gate.asm
@@ -2,5 +2,5 @@
 	db GATE ; tileset
 	db ROUTE_18_GATE_1F_HEIGHT, ROUTE_18_GATE_1F_WIDTH ; dimensions (y, x)
 	dw Route18GateBlocks, Route18GateTextPointers, Route18GateScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw Route18GateObject ; objects
--- a/data/mapHeaders/route18gateupstairs.asm
+++ b/data/mapHeaders/route18gateupstairs.asm
@@ -2,5 +2,5 @@
 	db GATE ; tileset
 	db ROUTE_18_GATE_2F_HEIGHT, ROUTE_18_GATE_2F_WIDTH ; dimensions (y, x)
 	dw Route18GateUpstairsBlocks, Route18GateUpstairsTextPointers, Route18GateUpstairsScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw Route18GateUpstairsObject ; objects
--- a/data/mapHeaders/route22gate.asm
+++ b/data/mapHeaders/route22gate.asm
@@ -2,5 +2,5 @@
 	db GATE ; tileset
 	db ROUTE_22_GATE_HEIGHT, ROUTE_22_GATE_WIDTH ; dimensions (y, x)
 	dw Route22GateBlocks, Route22GateTextPointers, Route22GateScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw Route22GateObject ; objects
--- a/data/mapHeaders/route2gate.asm
+++ b/data/mapHeaders/route2gate.asm
@@ -2,5 +2,5 @@
 	db GATE ; tileset
 	db ROUTE_2_GATE_HEIGHT, ROUTE_2_GATE_WIDTH ; dimensions (y, x)
 	dw Route2GateBlocks, Route2GateTextPointers, Route2GateScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw Route2GateObject ; objects
--- a/data/mapHeaders/route2house.asm
+++ b/data/mapHeaders/route2house.asm
@@ -2,5 +2,5 @@
 	db HOUSE ; tileset
 	db ROUTE_2_HOUSE_HEIGHT, ROUTE_2_HOUSE_WIDTH ; dimensions (y, x)
 	dw Route2HouseBlocks, Route2HouseTextPointers, Route2HouseScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw Route2HouseObject ; objects
--- a/data/mapHeaders/route5gate.asm
+++ b/data/mapHeaders/route5gate.asm
@@ -2,5 +2,5 @@
 	db GATE ; tileset
 	db ROUTE_5_GATE_HEIGHT, ROUTE_5_GATE_WIDTH ; dimensions (y, x)
 	dw Route5GateBlocks, Route5GateTextPointers, Route5GateScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw Route5GateObject ; objects
--- a/data/mapHeaders/route6gate.asm
+++ b/data/mapHeaders/route6gate.asm
@@ -2,5 +2,5 @@
 	db GATE ; tileset
 	db ROUTE_6_GATE_HEIGHT, ROUTE_6_GATE_WIDTH ; dimensions (y, x)
 	dw Route6GateBlocks, Route6GateTextPointers, Route6GateScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw Route6GateObject ; objects
--- a/data/mapHeaders/route7gate.asm
+++ b/data/mapHeaders/route7gate.asm
@@ -2,5 +2,5 @@
 	db GATE ; tileset
 	db ROUTE_7_GATE_HEIGHT, ROUTE_7_GATE_WIDTH ; dimensions (y, x)
 	dw Route7GateBlocks, Route7GateTextPointers, Route7GateScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw Route7GateObject ; objects
--- a/data/mapHeaders/route8gate.asm
+++ b/data/mapHeaders/route8gate.asm
@@ -2,5 +2,5 @@
 	db GATE ; tileset
 	db ROUTE_8_GATE_HEIGHT, ROUTE_8_GATE_WIDTH ; dimensions (y, x)
 	dw Route8GateBlocks, Route8GateTextPointers, Route8GateScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw Route8GateObject ; objects
--- a/data/mapHeaders/safarizonecenter.asm
+++ b/data/mapHeaders/safarizonecenter.asm
@@ -2,5 +2,5 @@
 	db FOREST ; tileset
 	db SAFARI_ZONE_CENTER_HEIGHT, SAFARI_ZONE_CENTER_WIDTH ; dimensions (y, x)
 	dw SafariZoneCenterBlocks, SafariZoneCenterTextPointers, SafariZoneCenterScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw SafariZoneCenterObject ; objects
--- a/data/mapHeaders/safarizoneeast.asm
+++ b/data/mapHeaders/safarizoneeast.asm
@@ -2,5 +2,5 @@
 	db FOREST ; tileset
 	db SAFARI_ZONE_EAST_HEIGHT, SAFARI_ZONE_EAST_WIDTH ; dimensions (y, x)
 	dw SafariZoneEastBlocks, SafariZoneEastTextPointers, SafariZoneEastScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw SafariZoneEastObject ; objects
--- a/data/mapHeaders/safarizoneentrance.asm
+++ b/data/mapHeaders/safarizoneentrance.asm
@@ -2,5 +2,5 @@
 	db GATE ; tileset
 	db SAFARI_ZONE_ENTRANCE_HEIGHT, SAFARI_ZONE_ENTRANCE_WIDTH ; dimensions (y, x)
 	dw SafariZoneEntranceBlocks, SafariZoneEntranceTextPointers, SafariZoneEntranceScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw SafariZoneEntranceObject ; objects
--- a/data/mapHeaders/safarizonenorth.asm
+++ b/data/mapHeaders/safarizonenorth.asm
@@ -2,5 +2,5 @@
 	db FOREST ; tileset
 	db SAFARI_ZONE_NORTH_HEIGHT, SAFARI_ZONE_NORTH_WIDTH ; dimensions (y, x)
 	dw SafariZoneNorthBlocks, SafariZoneNorthTextPointers, SafariZoneNorthScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw SafariZoneNorthObject ; objects
--- a/data/mapHeaders/safarizoneresthouse1.asm
+++ b/data/mapHeaders/safarizoneresthouse1.asm
@@ -2,5 +2,5 @@
 	db GATE ; tileset
 	db SAFARI_ZONE_REST_HOUSE_1_HEIGHT, SAFARI_ZONE_REST_HOUSE_1_WIDTH ; dimensions (y, x)
 	dw SafariZoneRestHouse1Blocks, SafariZoneRestHouse1TextPointers, SafariZoneRestHouse1Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw SafariZoneRestHouse1Object ; objects
--- a/data/mapHeaders/safarizoneresthouse2.asm
+++ b/data/mapHeaders/safarizoneresthouse2.asm
@@ -2,5 +2,5 @@
 	db GATE ; tileset
 	db SAFARI_ZONE_REST_HOUSE_2_HEIGHT, SAFARI_ZONE_REST_HOUSE_2_WIDTH ; dimensions (y, x)
 	dw SafariZoneRestHouse2Blocks, SafariZoneRestHouse2TextPointers, SafariZoneRestHouse2Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw SafariZoneRestHouse2Object ; objects
--- a/data/mapHeaders/safarizoneresthouse3.asm
+++ b/data/mapHeaders/safarizoneresthouse3.asm
@@ -2,5 +2,5 @@
 	db GATE ; tileset
 	db SAFARI_ZONE_REST_HOUSE_3_HEIGHT, SAFARI_ZONE_REST_HOUSE_3_WIDTH ; dimensions (y, x)
 	dw SafariZoneRestHouse3Blocks, SafariZoneRestHouse3TextPointers, SafariZoneRestHouse3Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw SafariZoneRestHouse3Object ; objects
--- a/data/mapHeaders/safarizoneresthouse4.asm
+++ b/data/mapHeaders/safarizoneresthouse4.asm
@@ -2,5 +2,5 @@
 	db GATE ; tileset
 	db SAFARI_ZONE_REST_HOUSE_4_HEIGHT, SAFARI_ZONE_REST_HOUSE_4_WIDTH ; dimensions (y, x)
 	dw SafariZoneRestHouse4Blocks, SafariZoneRestHouse4TextPointers, SafariZoneRestHouse4Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw SafariZoneRestHouse4Object ; objects
--- a/data/mapHeaders/safarizonesecrethouse.asm
+++ b/data/mapHeaders/safarizonesecrethouse.asm
@@ -2,5 +2,5 @@
 	db LAB ; tileset
 	db SAFARI_ZONE_SECRET_HOUSE_HEIGHT, SAFARI_ZONE_SECRET_HOUSE_WIDTH ; dimensions (y, x)
 	dw SafariZoneSecretHouseBlocks, SafariZoneSecretHouseTextPointers, SafariZoneSecretHouseScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw SafariZoneSecretHouseObject ; objects
--- a/data/mapHeaders/safarizonewest.asm
+++ b/data/mapHeaders/safarizonewest.asm
@@ -2,5 +2,5 @@
 	db FOREST ; tileset
 	db SAFARI_ZONE_WEST_HEIGHT, SAFARI_ZONE_WEST_WIDTH ; dimensions (y, x)
 	dw SafariZoneWestBlocks, SafariZoneWestTextPointers, SafariZoneWestScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw SafariZoneWestObject ; objects
--- a/data/mapHeaders/saffrongym.asm
+++ b/data/mapHeaders/saffrongym.asm
@@ -2,5 +2,5 @@
 	db FACILITY ; tileset
 	db SAFFRON_GYM_HEIGHT, SAFFRON_GYM_WIDTH ; dimensions (y, x)
 	dw SaffronGymBlocks, SaffronGymTextPointers, SaffronGymScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw SaffronGymObject ; objects
--- a/data/mapHeaders/saffronhouse1.asm
+++ b/data/mapHeaders/saffronhouse1.asm
@@ -2,5 +2,5 @@
 	db HOUSE ; tileset
 	db SAFFRON_HOUSE_1_HEIGHT, SAFFRON_HOUSE_1_WIDTH ; dimensions (y, x)
 	dw SaffronHouse1Blocks, SaffronHouse1TextPointers, SaffronHouse1Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw SaffronHouse1Object ; objects
--- a/data/mapHeaders/saffronhouse2.asm
+++ b/data/mapHeaders/saffronhouse2.asm
@@ -2,5 +2,5 @@
 	db HOUSE ; tileset
 	db SAFFRON_HOUSE_2_HEIGHT, SAFFRON_HOUSE_2_WIDTH ; dimensions (y, x)
 	dw SaffronHouse2Blocks, SaffronHouse2TextPointers, SaffronHouse2Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw SaffronHouse2Object ; objects
--- a/data/mapHeaders/saffronmart.asm
+++ b/data/mapHeaders/saffronmart.asm
@@ -2,5 +2,5 @@
 	db MART ; tileset
 	db SAFFRON_MART_HEIGHT, SAFFRON_MART_WIDTH ; dimensions (y, x)
 	dw SaffronMartBlocks, SaffronMartTextPointers, SaffronMartScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw SaffronMartObject ; objects
--- a/data/mapHeaders/saffronpokecenter.asm
+++ b/data/mapHeaders/saffronpokecenter.asm
@@ -2,5 +2,5 @@
 	db POKECENTER ; tileset
 	db SAFFRON_POKECENTER_HEIGHT, SAFFRON_POKECENTER_WIDTH ; dimensions (y, x)
 	dw SaffronPokecenterBlocks, SaffronPokecenterTextPointers, SaffronPokecenterScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw SaffronPokecenterObject ; objects
--- a/data/mapHeaders/school.asm
+++ b/data/mapHeaders/school.asm
@@ -2,5 +2,5 @@
 	db HOUSE ; tileset
 	db VIRIDIAN_SCHOOL_HEIGHT, VIRIDIAN_SCHOOL_WIDTH ; dimensions (y, x)
 	dw SchoolBlocks, SchoolTextPointers, SchoolScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw SchoolObject ; objects
--- a/data/mapHeaders/seafoamislands1.asm
+++ b/data/mapHeaders/seafoamislands1.asm
@@ -2,5 +2,5 @@
 	db CAVERN ; tileset
 	db SEAFOAM_ISLANDS_1_HEIGHT, SEAFOAM_ISLANDS_1_WIDTH ; dimensions (y, x)
 	dw SeafoamIslands1Blocks, SeafoamIslands1TextPointers, SeafoamIslands1Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw SeafoamIslands1Object ; objects
--- a/data/mapHeaders/seafoamislands2.asm
+++ b/data/mapHeaders/seafoamislands2.asm
@@ -2,5 +2,5 @@
 	db CAVERN ; tileset
 	db SEAFOAM_ISLANDS_2_HEIGHT, SEAFOAM_ISLANDS_2_WIDTH ; dimensions (y, x)
 	dw SeafoamIslands2Blocks, SeafoamIslands2TextPointers, SeafoamIslands2Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw SeafoamIslands2Object ; objects
--- a/data/mapHeaders/seafoamislands3.asm
+++ b/data/mapHeaders/seafoamislands3.asm
@@ -2,5 +2,5 @@
 	db CAVERN ; tileset
 	db SEAFOAM_ISLANDS_3_HEIGHT, SEAFOAM_ISLANDS_3_WIDTH ; dimensions (y, x)
 	dw SeafoamIslands3Blocks, SeafoamIslands3TextPointers, SeafoamIslands3Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw SeafoamIslands3Object ; objects
--- a/data/mapHeaders/seafoamislands4.asm
+++ b/data/mapHeaders/seafoamislands4.asm
@@ -2,5 +2,5 @@
 	db CAVERN ; tileset
 	db SEAFOAM_ISLANDS_4_HEIGHT, SEAFOAM_ISLANDS_4_WIDTH ; dimensions (y, x)
 	dw SeafoamIslands4Blocks, SeafoamIslands4TextPointers, SeafoamIslands4Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw SeafoamIslands4Object ; objects
--- a/data/mapHeaders/seafoamislands5.asm
+++ b/data/mapHeaders/seafoamislands5.asm
@@ -2,5 +2,5 @@
 	db CAVERN ; tileset
 	db SEAFOAM_ISLANDS_5_HEIGHT, SEAFOAM_ISLANDS_5_WIDTH ; dimensions (y, x)
 	dw SeafoamIslands5Blocks, SeafoamIslands5TextPointers, SeafoamIslands5Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw SeafoamIslands5Object ; objects
--- a/data/mapHeaders/silphco1.asm
+++ b/data/mapHeaders/silphco1.asm
@@ -2,5 +2,5 @@
 	db FACILITY ; tileset
 	db SILPH_CO_1F_HEIGHT, SILPH_CO_1F_WIDTH ; dimensions (y, x)
 	dw SilphCo1Blocks, SilphCo1TextPointers, SilphCo1Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw SilphCo1Object ; objects
--- a/data/mapHeaders/silphco10.asm
+++ b/data/mapHeaders/silphco10.asm
@@ -2,5 +2,5 @@
 	db FACILITY ; tileset
 	db SILPH_CO_10F_HEIGHT, SILPH_CO_10F_WIDTH ; dimensions (y, x)
 	dw SilphCo10Blocks, SilphCo10TextPointers, SilphCo10Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw SilphCo10Object ; objects
--- a/data/mapHeaders/silphco11.asm
+++ b/data/mapHeaders/silphco11.asm
@@ -2,5 +2,5 @@
 	db INTERIOR ; tileset
 	db SILPH_CO_11F_HEIGHT, SILPH_CO_11F_WIDTH ; dimensions (y, x)
 	dw SilphCo11Blocks, SilphCo11TextPointers, SilphCo11Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw SilphCo11Object ; objects
--- a/data/mapHeaders/silphco2.asm
+++ b/data/mapHeaders/silphco2.asm
@@ -2,5 +2,5 @@
 	db FACILITY ; tileset
 	db SILPH_CO_2F_HEIGHT, SILPH_CO_2F_WIDTH ; dimensions (y, x)
 	dw SilphCo2Blocks, SilphCo2TextPointers, SilphCo2Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw SilphCo2Object ; objects
--- a/data/mapHeaders/silphco3.asm
+++ b/data/mapHeaders/silphco3.asm
@@ -2,5 +2,5 @@
 	db FACILITY ; tileset
 	db SILPH_CO_3F_HEIGHT, SILPH_CO_3F_WIDTH ; dimensions (y, x)
 	dw SilphCo3Blocks, SilphCo3TextPointers, SilphCo3Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw SilphCo3Object ; objects
--- a/data/mapHeaders/silphco4.asm
+++ b/data/mapHeaders/silphco4.asm
@@ -2,5 +2,5 @@
 	db FACILITY ; tileset
 	db SILPH_CO_4F_HEIGHT, SILPH_CO_4F_WIDTH ; dimensions (y, x)
 	dw SilphCo4Blocks, SilphCo4TextPointers, SilphCo4Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw SilphCo4Object ; objects
--- a/data/mapHeaders/silphco5.asm
+++ b/data/mapHeaders/silphco5.asm
@@ -2,5 +2,5 @@
 	db FACILITY ; tileset
 	db SILPH_CO_5F_HEIGHT, SILPH_CO_5F_WIDTH ; dimensions (y, x)
 	dw SilphCo5Blocks, SilphCo5TextPointers, SilphCo5Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw SilphCo5Object ; objects
--- a/data/mapHeaders/silphco6.asm
+++ b/data/mapHeaders/silphco6.asm
@@ -2,5 +2,5 @@
 	db FACILITY ; tileset
 	db SILPH_CO_6F_HEIGHT, SILPH_CO_6F_WIDTH ; dimensions (y, x)
 	dw SilphCo6Blocks, SilphCo6TextPointers, SilphCo6Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw SilphCo6Object ; objects
--- a/data/mapHeaders/silphco7.asm
+++ b/data/mapHeaders/silphco7.asm
@@ -2,5 +2,5 @@
 	db FACILITY ; tileset
 	db SILPH_CO_7F_HEIGHT, SILPH_CO_7F_WIDTH ; dimensions (y, x)
 	dw SilphCo7Blocks, SilphCo7TextPointers, SilphCo7Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw SilphCo7Object ; objects
--- a/data/mapHeaders/silphco8.asm
+++ b/data/mapHeaders/silphco8.asm
@@ -2,5 +2,5 @@
 	db FACILITY ; tileset
 	db SILPH_CO_8F_HEIGHT, SILPH_CO_8F_WIDTH ; dimensions (y, x)
 	dw SilphCo8Blocks, SilphCo8TextPointers, SilphCo8Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw SilphCo8Object ; objects
--- a/data/mapHeaders/silphco9.asm
+++ b/data/mapHeaders/silphco9.asm
@@ -2,5 +2,5 @@
 	db FACILITY ; tileset
 	db SILPH_CO_9F_HEIGHT, SILPH_CO_9F_WIDTH ; dimensions (y, x)
 	dw SilphCo9Blocks, SilphCo9TextPointers, SilphCo9Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw SilphCo9Object ; objects
--- a/data/mapHeaders/silphcoelevator.asm
+++ b/data/mapHeaders/silphcoelevator.asm
@@ -2,5 +2,5 @@
 	db LOBBY ; tileset
 	db SILPH_CO_ELEVATOR_HEIGHT, SILPH_CO_ELEVATOR_WIDTH ; dimensions (y, x)
 	dw SilphCoElevatorBlocks, SilphCoElevatorTextPointers, SilphCoElevatorScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw SilphCoElevatorObject ; objects
--- a/data/mapHeaders/ssanne1.asm
+++ b/data/mapHeaders/ssanne1.asm
@@ -2,5 +2,5 @@
 	db SHIP ; tileset
 	db SS_ANNE_1_HEIGHT, SS_ANNE_1_WIDTH ; dimensions (y, x)
 	dw SSAnne1Blocks, SSAnne1TextPointers, SSAnne1Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw SSAnne1Object ; objects
--- a/data/mapHeaders/ssanne10.asm
+++ b/data/mapHeaders/ssanne10.asm
@@ -2,5 +2,5 @@
 	db SHIP ; tileset
 	db SS_ANNE_10_HEIGHT, SS_ANNE_10_WIDTH ; dimensions (y, x)
 	dw SSAnne10Blocks, SSAnne10TextPointers, SSAnne10Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw SSAnne10Object ; objects
--- a/data/mapHeaders/ssanne2.asm
+++ b/data/mapHeaders/ssanne2.asm
@@ -2,5 +2,5 @@
 	db SHIP ; tileset
 	db SS_ANNE_2_HEIGHT, SS_ANNE_2_WIDTH ; dimensions (y, x)
 	dw SSAnne2Blocks, SSAnne2TextPointers, SSAnne2Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw SSAnne2Object ; objects
--- a/data/mapHeaders/ssanne3.asm
+++ b/data/mapHeaders/ssanne3.asm
@@ -2,5 +2,5 @@
 	db SHIP ; tileset
 	db SS_ANNE_3_HEIGHT, SS_ANNE_3_WIDTH ; dimensions (y, x)
 	dw SSAnne3Blocks, SSAnne3TextPointers, SSAnne3Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw SSAnne3Object ; objects
--- a/data/mapHeaders/ssanne4.asm
+++ b/data/mapHeaders/ssanne4.asm
@@ -2,5 +2,5 @@
 	db SHIP ; tileset
 	db SS_ANNE_4_HEIGHT, SS_ANNE_4_WIDTH ; dimensions (y, x)
 	dw SSAnne4Blocks, SSAnne4TextPointers, SSAnne4Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw SSAnne4Object ; objects
--- a/data/mapHeaders/ssanne5.asm
+++ b/data/mapHeaders/ssanne5.asm
@@ -2,5 +2,5 @@
 	db SHIP ; tileset
 	db SS_ANNE_5_HEIGHT, SS_ANNE_5_WIDTH ; dimensions (y, x)
 	dw SSAnne5Blocks, SSAnne5TextPointers, SSAnne5Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw SSAnne5Object ; objects
--- a/data/mapHeaders/ssanne6.asm
+++ b/data/mapHeaders/ssanne6.asm
@@ -2,5 +2,5 @@
 	db SHIP ; tileset
 	db SS_ANNE_6_HEIGHT, SS_ANNE_6_WIDTH ; dimensions (y, x)
 	dw SSAnne6Blocks, SSAnne6TextPointers, SSAnne6Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw SSAnne6Object ; objects
--- a/data/mapHeaders/ssanne7.asm
+++ b/data/mapHeaders/ssanne7.asm
@@ -2,5 +2,5 @@
 	db SHIP ; tileset
 	db SS_ANNE_7_HEIGHT, SS_ANNE_7_WIDTH ; dimensions (y, x)
 	dw SSAnne7Blocks, SSAnne7TextPointers, SSAnne7Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw SSAnne7Object ; objects
--- a/data/mapHeaders/ssanne8.asm
+++ b/data/mapHeaders/ssanne8.asm
@@ -2,5 +2,5 @@
 	db SHIP ; tileset
 	db SS_ANNE_8_HEIGHT, SS_ANNE_8_WIDTH ; dimensions (y, x)
 	dw SSAnne8Blocks, SSAnne8TextPointers, SSAnne8Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw SSAnne8Object ; objects
--- a/data/mapHeaders/ssanne9.asm
+++ b/data/mapHeaders/ssanne9.asm
@@ -2,5 +2,5 @@
 	db SHIP ; tileset
 	db SS_ANNE_9_HEIGHT, SS_ANNE_9_WIDTH ; dimensions (y, x)
 	dw SSAnne9Blocks, SSAnne9TextPointers, SSAnne9Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw SSAnne9Object ; objects
--- a/data/mapHeaders/tradecenter.asm
+++ b/data/mapHeaders/tradecenter.asm
@@ -2,5 +2,5 @@
 	db CLUB ; tileset
 	db TRADE_CENTER_HEIGHT, TRADE_CENTER_WIDTH ; dimensions (y, x)
 	dw TradeCenterBlocks, TradeCenterTextPointers, TradeCenterScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw TradeCenterObject ; objects
--- a/data/mapHeaders/undergroundpathentranceroute5.asm
+++ b/data/mapHeaders/undergroundpathentranceroute5.asm
@@ -2,5 +2,5 @@
 	db GATE ; tileset
 	db PATH_ENTRANCE_ROUTE_5_HEIGHT, PATH_ENTRANCE_ROUTE_5_WIDTH ; dimensions (y, x)
 	dw UndergroundPathEntranceRoute5Blocks, UndergroundPathEntranceRoute5TextPointers, UndergroundPathEntranceRoute5Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw UndergroundPathEntranceRoute5Object ; objects
--- a/data/mapHeaders/undergroundpathentranceroute6.asm
+++ b/data/mapHeaders/undergroundpathentranceroute6.asm
@@ -2,5 +2,5 @@
 	db GATE ; tileset
 	db PATH_ENTRANCE_ROUTE_6_HEIGHT, PATH_ENTRANCE_ROUTE_6_WIDTH ; dimensions (y, x)
 	dw UndergroundPathEntranceRoute6Blocks, UndergroundPathEntranceRoute6TextPointers, UndergroundPathEntranceRoute6Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw UndergroundPathEntranceRoute6Object ; objects
--- a/data/mapHeaders/undergroundpathentranceroute7.asm
+++ b/data/mapHeaders/undergroundpathentranceroute7.asm
@@ -2,5 +2,5 @@
 	db GATE ; tileset
 	db PATH_ENTRANCE_ROUTE_7_HEIGHT, PATH_ENTRANCE_ROUTE_7_WIDTH ; dimensions (y, x)
 	dw UndergroundPathEntranceRoute7Blocks, UndergroundPathEntranceRoute7TextPointers, UndergroundPathEntranceRoute7Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw UndergroundPathEntranceRoute7Object ; objects
--- a/data/mapHeaders/undergroundpathentranceroute7copy.asm
+++ b/data/mapHeaders/undergroundpathentranceroute7copy.asm
@@ -2,5 +2,5 @@
 	db GATE ; tileset
 	db PATH_ENTRANCE_ROUTE_7_HEIGHT, PATH_ENTRANCE_ROUTE_7_WIDTH ; dimensions (y, x)
 	dw UndergroundPathEntranceRoute7CopyBlocks, UndergroundPathEntranceRoute7CopyTextPointers, UndergroundPathEntranceRoute7CopyScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw UndergroundPathEntranceRoute7CopyObject ; objects
--- a/data/mapHeaders/undergroundpathentranceroute8.asm
+++ b/data/mapHeaders/undergroundpathentranceroute8.asm
@@ -2,5 +2,5 @@
 	db GATE ; tileset
 	db PATH_ENTRANCE_ROUTE_8_HEIGHT, PATH_ENTRANCE_ROUTE_8_WIDTH ; dimensions (y, x)
 	dw UndergroundPathEntranceRoute8Blocks, UndergroundPathEntranceRoute8TextPointers, UndergroundPathEntranceRoute8Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw UndergroundPathEntranceRoute8Object ; objects
--- a/data/mapHeaders/undergroundpathns.asm
+++ b/data/mapHeaders/undergroundpathns.asm
@@ -2,5 +2,5 @@
 	db UNDERGROUND ; tileset
 	db UNDERGROUND_PATH_NS_HEIGHT, UNDERGROUND_PATH_NS_WIDTH ; dimensions (y, x)
 	dw UndergroundPathNSBlocks, UndergroundPathNSTextPointers, UndergroundPathNSScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw UndergroundPathNSObject ; objects
--- a/data/mapHeaders/undergroundpathwe.asm
+++ b/data/mapHeaders/undergroundpathwe.asm
@@ -2,5 +2,5 @@
 	db UNDERGROUND ; tileset
 	db UNDERGROUND_PATH_WE_HEIGHT, UNDERGROUND_PATH_WE_WIDTH ; dimensions (y, x)
 	dw UndergroundPathWEBlocks, UndergroundPathWETextPointers, UndergroundPathWEScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw UndergroundPathWEObject ; objects
--- a/data/mapHeaders/unknowndungeon1.asm
+++ b/data/mapHeaders/unknowndungeon1.asm
@@ -2,5 +2,5 @@
 	db CAVERN ; tileset
 	db UNKNOWN_DUNGEON_1_HEIGHT, UNKNOWN_DUNGEON_1_WIDTH ; dimensions (y, x)
 	dw UnknownDungeon1Blocks, UnknownDungeon1TextPointers, UnknownDungeon1Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw UnknownDungeon1Object ; objects
--- a/data/mapHeaders/unknowndungeon2.asm
+++ b/data/mapHeaders/unknowndungeon2.asm
@@ -2,5 +2,5 @@
 	db CAVERN ; tileset
 	db UNKNOWN_DUNGEON_2_HEIGHT, UNKNOWN_DUNGEON_2_WIDTH ; dimensions (y, x)
 	dw UnknownDungeon2Blocks, UnknownDungeon2TextPointers, UnknownDungeon2Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw UnknownDungeon2Object ; objects
--- a/data/mapHeaders/unknowndungeon3.asm
+++ b/data/mapHeaders/unknowndungeon3.asm
@@ -2,5 +2,5 @@
 	db CAVERN ; tileset
 	db UNKNOWN_DUNGEON_3_HEIGHT, UNKNOWN_DUNGEON_3_WIDTH ; dimensions (y, x)
 	dw UnknownDungeon3Blocks, UnknownDungeon3TextPointers, UnknownDungeon3Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw UnknownDungeon3Object ; objects
--- a/data/mapHeaders/vermiliondock.asm
+++ b/data/mapHeaders/vermiliondock.asm
@@ -2,5 +2,5 @@
 	db SHIP_PORT ; tileset
 	db VERMILION_DOCK_HEIGHT, VERMILION_DOCK_WIDTH ; dimensions (y, x)
 	dw VermilionDockBlocks, VermilionDockTextPointers, VermilionDockScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw VermilionDockObject ; objects
--- a/data/mapHeaders/vermiliongym.asm
+++ b/data/mapHeaders/vermiliongym.asm
@@ -2,5 +2,5 @@
 	db GYM ; tileset
 	db VERMILION_GYM_HEIGHT, VERMILION_GYM_WIDTH ; dimensions (y, x)
 	dw VermilionGymBlocks, VermilionGymTextPointers, VermilionGymScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw VermilionGymObject ; objects
--- a/data/mapHeaders/vermilionhouse1.asm
+++ b/data/mapHeaders/vermilionhouse1.asm
@@ -2,5 +2,5 @@
 	db HOUSE ; tileset
 	db VERMILION_HOUSE_1_HEIGHT, VERMILION_HOUSE_1_WIDTH ; dimensions (y, x)
 	dw VermilionHouse1Blocks, VermilionHouse1TextPointers, VermilionHouse1Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw VermilionHouse1Object ; objects
--- a/data/mapHeaders/vermilionhouse2.asm
+++ b/data/mapHeaders/vermilionhouse2.asm
@@ -2,5 +2,5 @@
 	db HOUSE ; tileset
 	db VERMILION_HOUSE_2_HEIGHT, VERMILION_HOUSE_2_WIDTH ; dimensions (y, x)
 	dw VermilionHouse2Blocks, VermilionHouse2TextPointers, VermilionHouse2Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw VermilionHouse2Object ; objects
--- a/data/mapHeaders/vermilionhouse3.asm
+++ b/data/mapHeaders/vermilionhouse3.asm
@@ -2,5 +2,5 @@
 	db HOUSE ; tileset
 	db VERMILION_HOUSE_3_HEIGHT, VERMILION_HOUSE_3_WIDTH ; dimensions (y, x)
 	dw VermilionHouse3Blocks, VermilionHouse3TextPointers, VermilionHouse3Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw VermilionHouse3Object ; objects
--- a/data/mapHeaders/vermilionmart.asm
+++ b/data/mapHeaders/vermilionmart.asm
@@ -2,5 +2,5 @@
 	db MART ; tileset
 	db VERMILION_MART_HEIGHT, VERMILION_MART_WIDTH ; dimensions (y, x)
 	dw VermilionMartBlocks, VermilionMartTextPointers, VermilionMartScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw VermilionMartObject ; objects
--- a/data/mapHeaders/vermilionpokecenter.asm
+++ b/data/mapHeaders/vermilionpokecenter.asm
@@ -2,5 +2,5 @@
 	db POKECENTER ; tileset
 	db VERMILION_POKECENTER_HEIGHT, VERMILION_POKECENTER_WIDTH ; dimensions (y, x)
 	dw VermilionPokecenterBlocks, VermilionPokecenterTextPointers, VermilionPokecenterScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw VermilionPokecenterObject ; objects
--- a/data/mapHeaders/victoryroad1.asm
+++ b/data/mapHeaders/victoryroad1.asm
@@ -2,5 +2,5 @@
 	db CAVERN ; tileset
 	db VICTORY_ROAD_1_HEIGHT, VICTORY_ROAD_1_WIDTH ; dimensions (y, x)
 	dw VictoryRoad1Blocks, VictoryRoad1TextPointers, VictoryRoad1Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw VictoryRoad1Object ; objects
--- a/data/mapHeaders/victoryroad2.asm
+++ b/data/mapHeaders/victoryroad2.asm
@@ -2,5 +2,5 @@
 	db CAVERN ; tileset
 	db VICTORY_ROAD_2_HEIGHT, VICTORY_ROAD_2_WIDTH ; dimensions (y, x)
 	dw VictoryRoad2Blocks, VictoryRoad2TextPointers, VictoryRoad2Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw VictoryRoad2Object ; objects
--- a/data/mapHeaders/victoryroad3.asm
+++ b/data/mapHeaders/victoryroad3.asm
@@ -2,5 +2,5 @@
 	db CAVERN ; tileset
 	db VICTORY_ROAD_3_HEIGHT, VICTORY_ROAD_3_WIDTH ; dimensions (y, x)
 	dw VictoryRoad3Blocks, VictoryRoad3TextPointers, VictoryRoad3Script ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw VictoryRoad3Object ; objects
--- a/data/mapHeaders/viridianforest.asm
+++ b/data/mapHeaders/viridianforest.asm
@@ -2,5 +2,5 @@
 	db FOREST ; tileset
 	db VIRIDIAN_FOREST_HEIGHT, VIRIDIAN_FOREST_WIDTH ; dimensions (y, x)
 	dw ViridianForestBlocks, ViridianForestTextPointers, ViridianForestScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw ViridianForestObject ; objects
--- a/data/mapHeaders/viridianforestentrance.asm
+++ b/data/mapHeaders/viridianforestentrance.asm
@@ -2,5 +2,5 @@
 	db FOREST_GATE ; tileset
 	db VIRIDIAN_FOREST_ENTRANCE_HEIGHT, VIRIDIAN_FOREST_ENTRANCE_WIDTH ; dimensions (y, x)
 	dw ViridianForestEntranceBlocks, ViridianForestEntranceTextPointers, ViridianForestEntranceScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw ViridianForestEntranceObject ; objects
--- a/data/mapHeaders/viridianforestexit.asm
+++ b/data/mapHeaders/viridianforestexit.asm
@@ -2,5 +2,5 @@
 	db FOREST_GATE ; tileset
 	db VIRIDIAN_FOREST_EXIT_HEIGHT, VIRIDIAN_FOREST_EXIT_WIDTH ; dimensions (y, x)
 	dw ViridianForestExitBlocks, ViridianForestExitTextPointers, ViridianForestExitScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw ViridianForestExitObject ; objects
--- a/data/mapHeaders/viridiangym.asm
+++ b/data/mapHeaders/viridiangym.asm
@@ -2,5 +2,5 @@
 	db GYM ; tileset
 	db VIRIDIAN_GYM_HEIGHT, VIRIDIAN_GYM_WIDTH ; dimensions (y, x)
 	dw ViridianGymBlocks, ViridianGymTextPointers, ViridianGymScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw ViridianGymObject ; objects
--- a/data/mapHeaders/viridianhouse.asm
+++ b/data/mapHeaders/viridianhouse.asm
@@ -2,7 +2,7 @@
 	db HOUSE ; tileset
 	db VIRIDIAN_HOUSE_HEIGHT, VIRIDIAN_HOUSE_WIDTH ; dimensions (y, x)
 	dw ViridianHouseBlocks, ViridianHouseTextPointers, ViridianHouseScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw ViridianHouseObject ; objects
 
 	db $0
--- a/data/mapHeaders/viridianmart.asm
+++ b/data/mapHeaders/viridianmart.asm
@@ -2,5 +2,5 @@
 	db MART ; tileset
 	db VIRIDIAN_MART_HEIGHT, VIRIDIAN_MART_WIDTH ; dimensions (y, x)
 	dw ViridianMartBlocks, ViridianMartTextPointers, ViridianMartScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw ViridianMartObject ; objects
--- a/data/mapHeaders/viridianpokecenter.asm
+++ b/data/mapHeaders/viridianpokecenter.asm
@@ -2,5 +2,5 @@
 	db POKECENTER ; tileset
 	db VIRIDIAN_POKECENTER_HEIGHT, VIRIDIAN_POKECENTER_WIDTH ; dimensions (y, x)
 	dw ViridianPokecenterBlocks, ViridianPokecenterTextPointers, ViridianPokeCenterScript ; blocks, texts, scripts
-	db $00 ; connections
+	db 0 ; connections
 	dw ViridianPokecenterObject ; objects
--- a/data/mapObjects/agatha.asm
+++ b/data/mapObjects/agatha.asm
@@ -1,5 +1,5 @@
 AgathaObject:
-	db 0 ; border block
+	db $0 ; border block
 
 	db 4 ; warps
 	warp 4, 11, 2, BRUNOS_ROOM
--- a/data/mapObjects/bikeshop.asm
+++ b/data/mapObjects/bikeshop.asm
@@ -1,5 +1,5 @@
 BikeShopObject:
-	db 14 ; border block
+	db $e ; border block
 
 	db 2 ; warps
 	warp 2, 7, 4, -1
--- a/data/mapObjects/billshouse.asm
+++ b/data/mapObjects/billshouse.asm
@@ -1,5 +1,5 @@
 BillsHouseObject:
-	db 13 ; border block
+	db $d ; border block
 
 	db 2 ; warps
 	warp 2, 7, 0, -1
--- a/data/mapObjects/blueshouse.asm
+++ b/data/mapObjects/blueshouse.asm
@@ -1,5 +1,5 @@
 BluesHouseObject:
-	db 10 ; border block
+	db $a ; border block
 
 	db 2 ; warps
 	warp 2, 7, 1, -1
--- a/data/mapObjects/bruno.asm
+++ b/data/mapObjects/bruno.asm
@@ -1,5 +1,5 @@
 BrunoObject:
-	db 3 ; border block
+	db $3 ; border block
 
 	db 4 ; warps
 	warp 4, 11, 2, LORELEIS_ROOM
--- a/data/mapObjects/celadoncity.asm
+++ b/data/mapObjects/celadoncity.asm
@@ -1,5 +1,5 @@
 CeladonCityObject:
-	db 15 ; border block
+	db $f ; border block
 
 	db 13 ; warps
 	warp 8, 13, 0, CELADON_MART_1
--- a/data/mapObjects/celadondiner.asm
+++ b/data/mapObjects/celadondiner.asm
@@ -1,5 +1,5 @@
 CeladonDinerObject:
-	db 15 ; border block
+	db $f ; border block
 
 	db 2 ; warps
 	warp 3, 7, 10, -1
--- a/data/mapObjects/celadongamecorner.asm
+++ b/data/mapObjects/celadongamecorner.asm
@@ -1,5 +1,5 @@
 CeladonGameCornerObject:
-	db 15 ; border block
+	db $f ; border block
 
 	db 3 ; warps
 	warp 15, 17, 7, -1
--- a/data/mapObjects/celadongym.asm
+++ b/data/mapObjects/celadongym.asm
@@ -1,5 +1,5 @@
 CeladonGymObject:
-	db 3 ; border block
+	db $3 ; border block
 
 	db 2 ; warps
 	warp 4, 17, 6, -1
--- a/data/mapObjects/celadonhotel.asm
+++ b/data/mapObjects/celadonhotel.asm
@@ -1,5 +1,5 @@
 CeladonHotelObject:
-	db 0 ; border block
+	db $0 ; border block
 
 	db 2 ; warps
 	warp 3, 7, 12, -1
--- a/data/mapObjects/celadonhouse.asm
+++ b/data/mapObjects/celadonhouse.asm
@@ -1,5 +1,5 @@
 CeladonHouseObject:
-	db 15 ; border block
+	db $f ; border block
 
 	db 2 ; warps
 	warp 2, 7, 11, -1
--- a/data/mapObjects/celadonmansion1.asm
+++ b/data/mapObjects/celadonmansion1.asm
@@ -1,5 +1,5 @@
 CeladonMansion1Object:
-	db 15 ; border block
+	db $f ; border block
 
 	db 5 ; warps
 	warp 4, 11, 2, -1
--- a/data/mapObjects/celadonmansion2.asm
+++ b/data/mapObjects/celadonmansion2.asm
@@ -1,5 +1,5 @@
 CeladonMansion2Object:
-	db 15 ; border block
+	db $f ; border block
 
 	db 4 ; warps
 	warp 6, 1, 0, CELADON_MANSION_3
--- a/data/mapObjects/celadonmansion3.asm
+++ b/data/mapObjects/celadonmansion3.asm
@@ -1,5 +1,5 @@
 CeladonMansion3Object:
-	db 15 ; border block
+	db $f ; border block
 
 	db 4 ; warps
 	warp 6, 1, 0, CELADON_MANSION_2
--- a/data/mapObjects/celadonmansion4.asm
+++ b/data/mapObjects/celadonmansion4.asm
@@ -1,5 +1,5 @@
 CeladonMansion4Object:
-	db 9 ; border block
+	db $9 ; border block
 
 	db 3 ; warps
 	warp 6, 1, 1, CELADON_MANSION_3
--- a/data/mapObjects/celadonmansion5.asm
+++ b/data/mapObjects/celadonmansion5.asm
@@ -1,5 +1,5 @@
 CeladonMansion5Object:
-	db 10 ; border block
+	db $a ; border block
 
 	db 2 ; warps
 	warp 2, 7, 2, CELADON_MANSION_4
--- a/data/mapObjects/celadonmart1.asm
+++ b/data/mapObjects/celadonmart1.asm
@@ -1,5 +1,5 @@
 CeladonMart1Object:
-	db 15 ; border block
+	db $f ; border block
 
 	db 6 ; warps
 	warp 2, 7, 0, -1
--- a/data/mapObjects/celadonmart2.asm
+++ b/data/mapObjects/celadonmart2.asm
@@ -1,5 +1,5 @@
 CeladonMart2Object:
-	db 15 ; border block
+	db $f ; border block
 
 	db 3 ; warps
 	warp 12, 1, 4, CELADON_MART_1
--- a/data/mapObjects/celadonmart3.asm
+++ b/data/mapObjects/celadonmart3.asm
@@ -1,5 +1,5 @@
 CeladonMart3Object:
-	db 15 ; border block
+	db $f ; border block
 
 	db 3 ; warps
 	warp 12, 1, 0, CELADON_MART_4
--- a/data/mapObjects/celadonmart4.asm
+++ b/data/mapObjects/celadonmart4.asm
@@ -1,5 +1,5 @@
 CeladonMart4Object:
-	db 15 ; border block
+	db $f ; border block
 
 	db 3 ; warps
 	warp 12, 1, 0, CELADON_MART_3
--- a/data/mapObjects/celadonmart5.asm
+++ b/data/mapObjects/celadonmart5.asm
@@ -1,5 +1,5 @@
 CeladonMart5Object:
-	db 15 ; border block
+	db $f ; border block
 
 	db 3 ; warps
 	warp 12, 1, 0, CELADON_MART_ROOF
--- a/data/mapObjects/celadonmartelevator.asm
+++ b/data/mapObjects/celadonmartelevator.asm
@@ -1,5 +1,5 @@
 CeladonMartElevatorObject:
-	db 15 ; border block
+	db $f ; border block
 
 	db 2 ; warps
 	warp 1, 3, 5, CELADON_MART_1
--- a/data/mapObjects/celadonmartroof.asm
+++ b/data/mapObjects/celadonmartroof.asm
@@ -1,5 +1,5 @@
 CeladonMartRoofObject:
-	db 66 ; border block
+	db $42 ; border block
 
 	db 1 ; warps
 	warp 15, 2, 0, CELADON_MART_5
--- a/data/mapObjects/celadonpokecenter.asm
+++ b/data/mapObjects/celadonpokecenter.asm
@@ -1,5 +1,5 @@
 CeladonPokecenterObject:
-	db 0 ; border block
+	db $0 ; border block
 
 	db 2 ; warps
 	warp 3, 7, 5, -1
--- a/data/mapObjects/celadonprizeroom.asm
+++ b/data/mapObjects/celadonprizeroom.asm
@@ -1,5 +1,5 @@
 CeladonPrizeRoomObject:
-	db 15 ; border block
+	db $f ; border block
 
 	db 2 ; warps
 	warp 4, 7, 9, -1
--- a/data/mapObjects/ceruleancity.asm
+++ b/data/mapObjects/ceruleancity.asm
@@ -1,5 +1,5 @@
 CeruleanCityObject:
-	db 15 ; border block
+	db $f ; border block
 
 	db 10 ; warps
 	warp 27, 11, 0, TRASHED_HOUSE
--- a/data/mapObjects/ceruleangym.asm
+++ b/data/mapObjects/ceruleangym.asm
@@ -1,5 +1,5 @@
 CeruleanGymObject:
-	db 3 ; border block
+	db $3 ; border block
 
 	db 2 ; warps
 	warp 4, 13, 3, -1
--- a/data/mapObjects/ceruleanhouse1.asm
+++ b/data/mapObjects/ceruleanhouse1.asm
@@ -1,5 +1,5 @@
 CeruleanHouse1Object:
-	db 10 ; border block
+	db $a ; border block
 
 	db 2 ; warps
 	warp 2, 7, 1, -1
--- a/data/mapObjects/ceruleanhouse2.asm
+++ b/data/mapObjects/ceruleanhouse2.asm
@@ -1,5 +1,5 @@
 CeruleanHouse2Object:
-	db 12 ; border block
+	db $c ; border block
 
 	db 3 ; warps
 	warp 2, 0, 9, -1
--- a/data/mapObjects/ceruleanhousetrashed.asm
+++ b/data/mapObjects/ceruleanhousetrashed.asm
@@ -1,5 +1,5 @@
 CeruleanHouseTrashedObject:
-	db 10 ; border block
+	db $a ; border block
 
 	db 3 ; warps
 	warp 2, 7, 0, -1
--- a/data/mapObjects/ceruleanmart.asm
+++ b/data/mapObjects/ceruleanmart.asm
@@ -1,5 +1,5 @@
 CeruleanMartObject:
-	db 0 ; border block
+	db $0 ; border block
 
 	db 2 ; warps
 	warp 3, 7, 5, -1
--- a/data/mapObjects/ceruleanpokecenter.asm
+++ b/data/mapObjects/ceruleanpokecenter.asm
@@ -1,5 +1,5 @@
 CeruleanPokecenterObject:
-	db 0 ; border block
+	db $0 ; border block
 
 	db 2 ; warps
 	warp 3, 7, 2, -1
--- a/data/mapObjects/cinnabargym.asm
+++ b/data/mapObjects/cinnabargym.asm
@@ -1,5 +1,5 @@
 CinnabarGymObject:
-	db 46 ; border block
+	db $2e ; border block
 
 	db 2 ; warps
 	warp 16, 17, 1, -1
--- a/data/mapObjects/cinnabarisland.asm
+++ b/data/mapObjects/cinnabarisland.asm
@@ -1,5 +1,5 @@
 CinnabarIslandObject:
-	db 67 ; border block
+	db $43 ; border block
 
 	db 5 ; warps
 	warp 6, 3, 1, MANSION_1
--- a/data/mapObjects/cinnabarmart.asm
+++ b/data/mapObjects/cinnabarmart.asm
@@ -1,5 +1,5 @@
 CinnabarMartObject:
-	db 0 ; border block
+	db $0 ; border block
 
 	db 2 ; warps
 	warp 3, 7, 4, -1
--- a/data/mapObjects/cinnabarpokecenter.asm
+++ b/data/mapObjects/cinnabarpokecenter.asm
@@ -1,5 +1,5 @@
 CinnabarPokecenterObject:
-	db 0 ; border block
+	db $0 ; border block
 
 	db 2 ; warps
 	warp 3, 7, 3, -1
--- a/data/mapObjects/colosseum.asm
+++ b/data/mapObjects/colosseum.asm
@@ -1,5 +1,5 @@
 ColosseumObject:
-	db 14 ; border block
+	db $e ; border block
 
 	db 0 ; warps
 
--- a/data/mapObjects/copycatshouse1f.asm
+++ b/data/mapObjects/copycatshouse1f.asm
@@ -1,5 +1,5 @@
 CopycatsHouse1FObject:
-	db 10 ; border block
+	db $a ; border block
 
 	db 3 ; warps
 	warp 2, 7, 0, -1
--- a/data/mapObjects/copycatshouse2f.asm
+++ b/data/mapObjects/copycatshouse2f.asm
@@ -1,5 +1,5 @@
 CopycatsHouse2FObject:
-	db 10 ; border block
+	db $a ; border block
 
 	db 1 ; warps
 	warp 7, 1, 2, COPYCATS_HOUSE_1F
--- a/data/mapObjects/daycarem.asm
+++ b/data/mapObjects/daycarem.asm
@@ -1,5 +1,5 @@
 DayCareMObject:
-	db 10 ; border block
+	db $a ; border block
 
 	db 2 ; warps
 	warp 2, 7, 4, -1
--- a/data/mapObjects/diglettscave.asm
+++ b/data/mapObjects/diglettscave.asm
@@ -1,5 +1,5 @@
 DiglettsCaveObject:
-	db 25 ; border block
+	db $19 ; border block
 
 	db 2 ; warps
 	warp 5, 5, 2, DIGLETTS_CAVE_EXIT
--- a/data/mapObjects/diglettscaveroute11.asm
+++ b/data/mapObjects/diglettscaveroute11.asm
@@ -1,5 +1,5 @@
 DiglettsCaveEntranceRoute11Object:
-	db 125 ; border block
+	db $7d ; border block
 
 	db 3 ; warps
 	warp 2, 7, 4, -1
--- a/data/mapObjects/diglettscaveroute2.asm
+++ b/data/mapObjects/diglettscaveroute2.asm
@@ -1,5 +1,5 @@
 DiglettsCaveRoute2Object:
-	db 125 ; border block
+	db $7d ; border block
 
 	db 3 ; warps
 	warp 2, 7, 0, -1
--- a/data/mapObjects/fanclub.asm
+++ b/data/mapObjects/fanclub.asm
@@ -1,5 +1,5 @@
 FanClubObject:
-	db 13 ; border block
+	db $d ; border block
 
 	db 2 ; warps
 	warp 2, 7, 1, -1
--- a/data/mapObjects/fightingdojo.asm
+++ b/data/mapObjects/fightingdojo.asm
@@ -1,5 +1,5 @@
 FightingDojoObject:
-	db 3 ; border block
+	db $3 ; border block
 
 	db 2 ; warps
 	warp 4, 11, 1, -1
--- a/data/mapObjects/fuchsiacity.asm
+++ b/data/mapObjects/fuchsiacity.asm
@@ -1,5 +1,5 @@
 FuchsiaCityObject:
-	db 15 ; border block
+	db $f ; border block
 
 	db 9 ; warps
 	warp 5, 13, 0, FUCHSIA_MART
--- a/data/mapObjects/fuchsiagym.asm
+++ b/data/mapObjects/fuchsiagym.asm
@@ -1,5 +1,5 @@
 FuchsiaGymObject:
-	db 3 ; border block
+	db $3 ; border block
 
 	db 2 ; warps
 	warp 4, 17, 5, -1
--- a/data/mapObjects/fuchsiahouse1.asm
+++ b/data/mapObjects/fuchsiahouse1.asm
@@ -1,5 +1,5 @@
 FuchsiaHouse1Object:
-	db 10 ; border block
+	db $a ; border block
 
 	db 2 ; warps
 	warp 2, 7, 1, -1
--- a/data/mapObjects/fuchsiahouse2.asm
+++ b/data/mapObjects/fuchsiahouse2.asm
@@ -1,5 +1,5 @@
 FuchsiaHouse2Object:
-	db 23 ; border block
+	db $17 ; border block
 
 	db 2 ; warps
 	warp 4, 7, 3, -1
--- a/data/mapObjects/fuchsiahouse3.asm
+++ b/data/mapObjects/fuchsiahouse3.asm
@@ -1,5 +1,5 @@
 FuchsiaHouse3Object:
-	db 12 ; border block
+	db $c ; border block
 
 	db 3 ; warps
 	warp 2, 0, 8, -1
--- a/data/mapObjects/fuchsiamart.asm
+++ b/data/mapObjects/fuchsiamart.asm
@@ -1,5 +1,5 @@
 FuchsiaMartObject:
-	db 0 ; border block
+	db $0 ; border block
 
 	db 2 ; warps
 	warp 3, 7, 0, -1
--- a/data/mapObjects/fuchsiameetingroom.asm
+++ b/data/mapObjects/fuchsiameetingroom.asm
@@ -1,5 +1,5 @@
 FuchsiaMeetingRoomObject:
-	db 23 ; border block
+	db $17 ; border block
 
 	db 2 ; warps
 	warp 4, 7, 6, -1
--- a/data/mapObjects/fuchsiapokecenter.asm
+++ b/data/mapObjects/fuchsiapokecenter.asm
@@ -1,5 +1,5 @@
 FuchsiaPokecenterObject:
-	db 0 ; border block
+	db $0 ; border block
 
 	db 2 ; warps
 	warp 3, 7, 2, -1
--- a/data/mapObjects/gary.asm
+++ b/data/mapObjects/gary.asm
@@ -1,5 +1,5 @@
 GaryObject:
-	db 3 ; border block
+	db $3 ; border block
 
 	db 4 ; warps
 	warp 3, 7, 1, LANCES_ROOM
--- a/data/mapObjects/halloffameroom.asm
+++ b/data/mapObjects/halloffameroom.asm
@@ -1,5 +1,5 @@
 HallofFameRoomObject:
-	db 3 ; border block
+	db $3 ; border block
 
 	db 2 ; warps
 	warp 4, 7, 2, CHAMPIONS_ROOM
--- a/data/mapObjects/indigoplateau.asm
+++ b/data/mapObjects/indigoplateau.asm
@@ -1,5 +1,5 @@
 IndigoPlateauObject:
-	db 14 ; border block
+	db $e ; border block
 
 	db 2 ; warps
 	warp 9, 5, 0, INDIGO_PLATEAU_LOBBY
--- a/data/mapObjects/indigoplateaulobby.asm
+++ b/data/mapObjects/indigoplateaulobby.asm
@@ -1,5 +1,5 @@
 IndigoPlateauLobbyObject:
-	db 0 ; border block
+	db $0 ; border block
 
 	db 3 ; warps
 	warp 7, 11, 0, -1
--- a/data/mapObjects/lab1.asm
+++ b/data/mapObjects/lab1.asm
@@ -1,5 +1,5 @@
 Lab1Object:
-	db 23 ; border block
+	db $17 ; border block
 
 	db 5 ; warps
 	warp 2, 7, 2, -1
--- a/data/mapObjects/lab2.asm
+++ b/data/mapObjects/lab2.asm
@@ -1,5 +1,5 @@
 Lab2Object:
-	db 23 ; border block
+	db $17 ; border block
 
 	db 2 ; warps
 	warp 2, 7, 2, CINNABAR_LAB_1
--- a/data/mapObjects/lab3.asm
+++ b/data/mapObjects/lab3.asm
@@ -1,5 +1,5 @@
 Lab3Object:
-	db 23 ; border block
+	db $17 ; border block
 
 	db 2 ; warps
 	warp 2, 7, 3, CINNABAR_LAB_1
--- a/data/mapObjects/lab4.asm
+++ b/data/mapObjects/lab4.asm
@@ -1,5 +1,5 @@
 Lab4Object:
-	db 23 ; border block
+	db $17 ; border block
 
 	db 2 ; warps
 	warp 2, 7, 4, CINNABAR_LAB_1
--- a/data/mapObjects/lance.asm
+++ b/data/mapObjects/lance.asm
@@ -1,5 +1,5 @@
 LanceObject:
-	db 3 ; border block
+	db $3 ; border block
 
 	db 3 ; warps
 	warp 24, 16, 2, AGATHAS_ROOM
--- a/data/mapObjects/lavenderhouse1.asm
+++ b/data/mapObjects/lavenderhouse1.asm
@@ -1,5 +1,5 @@
 LavenderHouse1Object:
-	db 10 ; border block
+	db $a ; border block
 
 	db 2 ; warps
 	warp 2, 7, 2, -1
--- a/data/mapObjects/lavenderhouse2.asm
+++ b/data/mapObjects/lavenderhouse2.asm
@@ -1,5 +1,5 @@
 LavenderHouse2Object:
-	db 10 ; border block
+	db $a ; border block
 
 	db 2 ; warps
 	warp 2, 7, 4, -1
--- a/data/mapObjects/lavendermart.asm
+++ b/data/mapObjects/lavendermart.asm
@@ -1,5 +1,5 @@
 LavenderMartObject:
-	db 0 ; border block
+	db $0 ; border block
 
 	db 2 ; warps
 	warp 3, 7, 3, -1
--- a/data/mapObjects/lavenderpokecenter.asm
+++ b/data/mapObjects/lavenderpokecenter.asm
@@ -1,5 +1,5 @@
 LavenderPokecenterObject:
-	db 0 ; border block
+	db $0 ; border block
 
 	db 2 ; warps
 	warp 3, 7, 0, -1
--- a/data/mapObjects/lavendertown.asm
+++ b/data/mapObjects/lavendertown.asm
@@ -1,5 +1,5 @@
 LavenderTownObject:
-	db 44 ; border block
+	db $2c ; border block
 
 	db 6 ; warps
 	warp 3, 5, 0, LAVENDER_POKECENTER
--- a/data/mapObjects/lorelei.asm
+++ b/data/mapObjects/lorelei.asm
@@ -1,5 +1,5 @@
 LoreleiObject:
-	db 3 ; border block
+	db $3 ; border block
 
 	db 4 ; warps
 	warp 4, 11, 2, INDIGO_PLATEAU_LOBBY
--- a/data/mapObjects/mansion1.asm
+++ b/data/mapObjects/mansion1.asm
@@ -1,5 +1,5 @@
 Mansion1Object:
-	db 46 ; border block
+	db $2e ; border block
 
 	db 8 ; warps
 	warp 4, 27, 0, -1
--- a/data/mapObjects/mansion2.asm
+++ b/data/mapObjects/mansion2.asm
@@ -1,5 +1,5 @@
 Mansion2Object:
-	db 1 ; border block
+	db $1 ; border block
 
 	db 4 ; warps
 	warp 5, 10, 4, MANSION_1
--- a/data/mapObjects/mansion3.asm
+++ b/data/mapObjects/mansion3.asm
@@ -1,5 +1,5 @@
 Mansion3Object:
-	db 1 ; border block
+	db $1 ; border block
 
 	db 3 ; warps
 	warp 7, 10, 1, MANSION_2
--- a/data/mapObjects/mansion4.asm
+++ b/data/mapObjects/mansion4.asm
@@ -1,5 +1,5 @@
 Mansion4Object:
-	db 1 ; border block
+	db $1 ; border block
 
 	db 1 ; warps
 	warp 23, 22, 5, MANSION_1
--- a/data/mapObjects/mtmoon1.asm
+++ b/data/mapObjects/mtmoon1.asm
@@ -1,5 +1,5 @@
 MtMoon1Object:
-	db 3 ; border block
+	db $3 ; border block
 
 	db 5 ; warps
 	warp 14, 35, 1, -1
--- a/data/mapObjects/mtmoon2.asm
+++ b/data/mapObjects/mtmoon2.asm
@@ -1,5 +1,5 @@
 MtMoon2Object:
-	db 3 ; border block
+	db $3 ; border block
 
 	db 8 ; warps
 	warp 5, 5, 2, MT_MOON_1
--- a/data/mapObjects/mtmoon3.asm
+++ b/data/mapObjects/mtmoon3.asm
@@ -1,5 +1,5 @@
 MtMoon3Object:
-	db 3 ; border block
+	db $3 ; border block
 
 	db 4 ; warps
 	warp 25, 9, 1, MT_MOON_2
--- a/data/mapObjects/mtmoonpokecenter.asm
+++ b/data/mapObjects/mtmoonpokecenter.asm
@@ -1,5 +1,5 @@
 MtMoonPokecenterObject:
-	db 0 ; border block
+	db $0 ; border block
 
 	db 2 ; warps
 	warp 3, 7, 0, -1
--- a/data/mapObjects/museum1f.asm
+++ b/data/mapObjects/museum1f.asm
@@ -1,5 +1,5 @@
 Museum1FObject:
-	db 10 ; border block
+	db $a ; border block
 
 	db 5 ; warps
 	warp 10, 7, 0, -1
--- a/data/mapObjects/museum2f.asm
+++ b/data/mapObjects/museum2f.asm
@@ -1,5 +1,5 @@
 Museum2FObject:
-	db 10 ; border block
+	db $a ; border block
 
 	db 1 ; warps
 	warp 7, 7, 4, MUSEUM_1F
--- a/data/mapObjects/namerater.asm
+++ b/data/mapObjects/namerater.asm
@@ -1,5 +1,5 @@
 NameRaterObject:
-	db 10 ; border block
+	db $a ; border block
 
 	db 2 ; warps
 	warp 2, 7, 5, -1
--- a/data/mapObjects/oakslab.asm
+++ b/data/mapObjects/oakslab.asm
@@ -1,5 +1,5 @@
 OaksLabObject:
-	db 3 ; border block
+	db $3 ; border block
 
 	db 2 ; warps
 	warp 4, 11, 2, -1
--- a/data/mapObjects/pallettown.asm
+++ b/data/mapObjects/pallettown.asm
@@ -1,5 +1,5 @@
 PalletTownObject:
-	db 11 ; border block
+	db $b ; border block
 
 	db 3 ; warps
 	warp 5, 5, 0, REDS_HOUSE_1F
--- a/data/mapObjects/pewtercity.asm
+++ b/data/mapObjects/pewtercity.asm
@@ -1,5 +1,5 @@
 PewterCityObject:
-	db 10 ; border block
+	db $a ; border block
 
 	db 7 ; warps
 	warp 14, 7, 0, MUSEUM_1F
--- a/data/mapObjects/pewtergym.asm
+++ b/data/mapObjects/pewtergym.asm
@@ -1,5 +1,5 @@
 PewterGymObject:
-	db 3 ; border block
+	db $3 ; border block
 
 	db 2 ; warps
 	warp 4, 13, 2, -1
--- a/data/mapObjects/pewterhouse1.asm
+++ b/data/mapObjects/pewterhouse1.asm
@@ -1,5 +1,5 @@
 PewterHouse1Object:
-	db 10 ; border block
+	db $a ; border block
 
 	db 2 ; warps
 	warp 2, 7, 3, -1
--- a/data/mapObjects/pewterhouse2.asm
+++ b/data/mapObjects/pewterhouse2.asm
@@ -1,5 +1,5 @@
 PewterHouse2Object:
-	db 10 ; border block
+	db $a ; border block
 
 	db 2 ; warps
 	warp 2, 7, 5, -1
--- a/data/mapObjects/pewtermart.asm
+++ b/data/mapObjects/pewtermart.asm
@@ -1,5 +1,5 @@
 PewterMartObject:
-	db 0 ; border block
+	db $0 ; border block
 
 	db 2 ; warps
 	warp 3, 7, 4, -1
--- a/data/mapObjects/pewterpokecenter.asm
+++ b/data/mapObjects/pewterpokecenter.asm
@@ -1,5 +1,5 @@
 PewterPokecenterObject:
-	db 0 ; border block
+	db $0 ; border block
 
 	db 2 ; warps
 	warp 3, 7, 6, -1
--- a/data/mapObjects/pokemontower1.asm
+++ b/data/mapObjects/pokemontower1.asm
@@ -1,5 +1,5 @@
 PokemonTower1Object:
-	db 1 ; border block
+	db $1 ; border block
 
 	db 3 ; warps
 	warp 10, 17, 1, -1
--- a/data/mapObjects/pokemontower2.asm
+++ b/data/mapObjects/pokemontower2.asm
@@ -1,5 +1,5 @@
 PokemonTower2Object:
-	db 1 ; border block
+	db $1 ; border block
 
 	db 2 ; warps
 	warp 3, 9, 0, POKEMONTOWER_3
--- a/data/mapObjects/pokemontower3.asm
+++ b/data/mapObjects/pokemontower3.asm
@@ -1,5 +1,5 @@
 PokemonTower3Object:
-	db 1 ; border block
+	db $1 ; border block
 
 	db 2 ; warps
 	warp 3, 9, 0, POKEMONTOWER_2
--- a/data/mapObjects/pokemontower4.asm
+++ b/data/mapObjects/pokemontower4.asm
@@ -1,5 +1,5 @@
 PokemonTower4Object:
-	db 1 ; border block
+	db $1 ; border block
 
 	db 2 ; warps
 	warp 3, 9, 0, POKEMONTOWER_5
--- a/data/mapObjects/pokemontower5.asm
+++ b/data/mapObjects/pokemontower5.asm
@@ -1,5 +1,5 @@
 PokemonTower5Object:
-	db 1 ; border block
+	db $1 ; border block
 
 	db 2 ; warps
 	warp 3, 9, 0, POKEMONTOWER_4
--- a/data/mapObjects/pokemontower6.asm
+++ b/data/mapObjects/pokemontower6.asm
@@ -1,5 +1,5 @@
 PokemonTower6Object:
-	db 1 ; border block
+	db $1 ; border block
 
 	db 2 ; warps
 	warp 18, 9, 1, POKEMONTOWER_5
--- a/data/mapObjects/pokemontower7.asm
+++ b/data/mapObjects/pokemontower7.asm
@@ -1,5 +1,5 @@
 PokemonTower7Object:
-	db 1 ; border block
+	db $1 ; border block
 
 	db 1 ; warps
 	warp 9, 16, 1, POKEMONTOWER_6
--- a/data/mapObjects/powerplant.asm
+++ b/data/mapObjects/powerplant.asm
@@ -1,5 +1,5 @@
 PowerPlantObject:
-	db 46 ; border block
+	db $2e ; border block
 
 	db 3 ; warps
 	warp 4, 35, 3, -1
--- a/data/mapObjects/redshouse1f.asm
+++ b/data/mapObjects/redshouse1f.asm
@@ -1,5 +1,5 @@
 RedsHouse1FObject:
-	db 10 ; border block
+	db $a ; border block
 
 	db 3 ; warps
 	warp 2, 7, 0, -1 ; exit1
--- a/data/mapObjects/redshouse2f.asm
+++ b/data/mapObjects/redshouse2f.asm
@@ -1,5 +1,5 @@
 RedsHouse2FObject:
-	db 10 ; border block
+	db $a ; border block
 
 	db 1 ; warps
 	warp 7, 1, 2, REDS_HOUSE_1F
--- a/data/mapObjects/rockethideout1.asm
+++ b/data/mapObjects/rockethideout1.asm
@@ -1,5 +1,5 @@
 RocketHideout1Object:
-	db 46 ; border block
+	db $2e ; border block
 
 	db 5 ; warps
 	warp 23, 2, 0, ROCKET_HIDEOUT_2
--- a/data/mapObjects/rockethideout2.asm
+++ b/data/mapObjects/rockethideout2.asm
@@ -1,5 +1,5 @@
 RocketHideout2Object:
-	db 46 ; border block
+	db $2e ; border block
 
 	db 5 ; warps
 	warp 27, 8, 0, ROCKET_HIDEOUT_1
--- a/data/mapObjects/rockethideout3.asm
+++ b/data/mapObjects/rockethideout3.asm
@@ -1,5 +1,5 @@
 RocketHideout3Object:
-	db 46 ; border block
+	db $2e ; border block
 
 	db 2 ; warps
 	warp 25, 6, 1, ROCKET_HIDEOUT_2
--- a/data/mapObjects/rockethideout4.asm
+++ b/data/mapObjects/rockethideout4.asm
@@ -1,5 +1,5 @@
 RocketHideout4Object:
-	db 46 ; border block
+	db $2e ; border block
 
 	db 3 ; warps
 	warp 19, 10, 1, ROCKET_HIDEOUT_3
--- a/data/mapObjects/rockethideoutelevator.asm
+++ b/data/mapObjects/rockethideoutelevator.asm
@@ -1,5 +1,5 @@
 RocketHideoutElevatorObject:
-	db 15 ; border block
+	db $f ; border block
 
 	db 2 ; warps
 	warp 2, 1, 2, ROCKET_HIDEOUT_1
--- a/data/mapObjects/rocktunnel1.asm
+++ b/data/mapObjects/rocktunnel1.asm
@@ -1,5 +1,5 @@
 RockTunnel1Object:
-	db 3 ; border block
+	db $3 ; border block
 
 	db 8 ; warps
 	warp 15, 3, 1, -1
--- a/data/mapObjects/rocktunnel2.asm
+++ b/data/mapObjects/rocktunnel2.asm
@@ -1,5 +1,5 @@
 RockTunnel2Object:
-	db 3 ; border block
+	db $3 ; border block
 
 	db 4 ; warps
 	warp 33, 25, 4, ROCK_TUNNEL_1
--- a/data/mapObjects/rocktunnelpokecenter.asm
+++ b/data/mapObjects/rocktunnelpokecenter.asm
@@ -1,5 +1,5 @@
 RockTunnelPokecenterObject:
-	db 0 ; border block
+	db $0 ; border block
 
 	db 2 ; warps
 	warp 3, 7, 0, -1
--- a/data/mapObjects/route1.asm
+++ b/data/mapObjects/route1.asm
@@ -1,5 +1,5 @@
 Route1Object:
-	db 11 ; border block
+	db $b ; border block
 
 	db 0 ; warps
 
--- a/data/mapObjects/route10.asm
+++ b/data/mapObjects/route10.asm
@@ -1,5 +1,5 @@
 Route10Object:
-	db 44 ; border block
+	db $2c ; border block
 
 	db 4 ; warps
 	warp 11, 19, 0, ROCK_TUNNEL_POKECENTER
--- a/data/mapObjects/route11.asm
+++ b/data/mapObjects/route11.asm
@@ -1,5 +1,5 @@
 Route11Object:
-	db 15 ; border block
+	db $f ; border block
 
 	db 5 ; warps
 	warp 49, 8, 0, ROUTE_11_GATE_1F
--- a/data/mapObjects/route11gate.asm
+++ b/data/mapObjects/route11gate.asm
@@ -1,5 +1,5 @@
 Route11GateObject:
-	db 10 ; border block
+	db $a ; border block
 
 	db 5 ; warps
 	warp 0, 4, 0, -1
--- a/data/mapObjects/route11gateupstairs.asm
+++ b/data/mapObjects/route11gateupstairs.asm
@@ -1,5 +1,5 @@
 Route11GateUpstairsObject:
-	db 10 ; border block
+	db $a ; border block
 
 	db 1 ; warps
 	warp 7, 7, 4, ROUTE_11_GATE_1F
--- a/data/mapObjects/route12.asm
+++ b/data/mapObjects/route12.asm
@@ -1,5 +1,5 @@
 Route12Object:
-	db 67 ; border block
+	db $43 ; border block
 
 	db 4 ; warps
 	warp 10, 15, 0, ROUTE_12_GATE_1F
--- a/data/mapObjects/route12gate.asm
+++ b/data/mapObjects/route12gate.asm
@@ -1,5 +1,5 @@
 Route12GateObject:
-	db 10 ; border block
+	db $a ; border block
 
 	db 5 ; warps
 	warp 4, 0, 0, -1
--- a/data/mapObjects/route12gateupstairs.asm
+++ b/data/mapObjects/route12gateupstairs.asm
@@ -1,5 +1,5 @@
 Route12GateUpstairsObject:
-	db 10 ; border block
+	db $a ; border block
 
 	db 1 ; warps
 	warp 7, 7, 4, ROUTE_12_GATE_1F
--- a/data/mapObjects/route12house.asm
+++ b/data/mapObjects/route12house.asm
@@ -1,5 +1,5 @@
 Route12HouseObject:
-	db 10 ; border block
+	db $a ; border block
 
 	db 2 ; warps
 	warp 2, 7, 3, -1
--- a/data/mapObjects/route13.asm
+++ b/data/mapObjects/route13.asm
@@ -1,5 +1,5 @@
 Route13Object:
-	db 67 ; border block
+	db $43 ; border block
 
 	db 0 ; warps
 
--- a/data/mapObjects/route14.asm
+++ b/data/mapObjects/route14.asm
@@ -1,5 +1,5 @@
 Route14Object:
-	db 67 ; border block
+	db $43 ; border block
 
 	db 0 ; warps
 
--- a/data/mapObjects/route15.asm
+++ b/data/mapObjects/route15.asm
@@ -1,5 +1,5 @@
 Route15Object:
-	db 67 ; border block
+	db $43 ; border block
 
 	db 4 ; warps
 	warp 7, 8, 0, ROUTE_15_GATE_1F
--- a/data/mapObjects/route15gate.asm
+++ b/data/mapObjects/route15gate.asm
@@ -1,5 +1,5 @@
 Route15GateObject:
-	db 10 ; border block
+	db $a ; border block
 
 	db 5 ; warps
 	warp 0, 4, 0, -1
--- a/data/mapObjects/route15gateupstairs.asm
+++ b/data/mapObjects/route15gateupstairs.asm
@@ -1,5 +1,5 @@
 Route15GateUpstairsObject:
-	db 10 ; border block
+	db $a ; border block
 
 	db 1 ; warps
 	warp 7, 7, 4, ROUTE_15_GATE_1F
--- a/data/mapObjects/route16.asm
+++ b/data/mapObjects/route16.asm
@@ -1,5 +1,5 @@
 Route16Object:
-	db 15 ; border block
+	db $f ; border block
 
 	db 9 ; warps
 	warp 17, 10, 0, ROUTE_16_GATE_1F
--- a/data/mapObjects/route16gate.asm
+++ b/data/mapObjects/route16gate.asm
@@ -1,5 +1,5 @@
 Route16GateObject:
-	db 10 ; border block
+	db $a ; border block
 
 	db 9 ; warps
 	warp 0, 8, 0, -1
--- a/data/mapObjects/route16gateupstairs.asm
+++ b/data/mapObjects/route16gateupstairs.asm
@@ -1,5 +1,5 @@
 Route16GateUpstairsObject:
-	db 10 ; border block
+	db $a ; border block
 
 	db 1 ; warps
 	warp 7, 7, 8, ROUTE_16_GATE_1F
--- a/data/mapObjects/route16house.asm
+++ b/data/mapObjects/route16house.asm
@@ -1,5 +1,5 @@
 Route16HouseObject:
-	db 10 ; border block
+	db $a ; border block
 
 	db 2 ; warps
 	warp 2, 7, 8, -1
--- a/data/mapObjects/route17.asm
+++ b/data/mapObjects/route17.asm
@@ -1,5 +1,5 @@
 Route17Object:
-	db 67 ; border block
+	db $43 ; border block
 
 	db 0 ; warps
 
--- a/data/mapObjects/route18.asm
+++ b/data/mapObjects/route18.asm
@@ -1,5 +1,5 @@
 Route18Object:
-	db 67 ; border block
+	db $43 ; border block
 
 	db 4 ; warps
 	warp 33, 8, 0, ROUTE_18_GATE_1F
--- a/data/mapObjects/route18gate.asm
+++ b/data/mapObjects/route18gate.asm
@@ -1,5 +1,5 @@
 Route18GateObject:
-	db 10 ; border block
+	db $a ; border block
 
 	db 5 ; warps
 	warp 0, 4, 0, -1
--- a/data/mapObjects/route18gateupstairs.asm
+++ b/data/mapObjects/route18gateupstairs.asm
@@ -1,5 +1,5 @@
 Route18GateUpstairsObject:
-	db 10 ; border block
+	db $a ; border block
 
 	db 1 ; warps
 	warp 7, 7, 4, ROUTE_18_GATE_1F
--- a/data/mapObjects/route19.asm
+++ b/data/mapObjects/route19.asm
@@ -1,5 +1,5 @@
 Route19Object:
-	db 67 ; border block
+	db $43 ; border block
 
 	db 0 ; warps
 
--- a/data/mapObjects/route2.asm
+++ b/data/mapObjects/route2.asm
@@ -1,5 +1,5 @@
 Route2Object:
-	db 15 ; border block
+	db $f ; border block
 
 	db 6 ; warps
 	warp 12, 9, 0, DIGLETTS_CAVE_EXIT
--- a/data/mapObjects/route20.asm
+++ b/data/mapObjects/route20.asm
@@ -1,5 +1,5 @@
 Route20Object:
-	db 67 ; border block
+	db $43 ; border block
 
 	db 2 ; warps
 	warp 48, 5, 0, SEAFOAM_ISLANDS_1
--- a/data/mapObjects/route21.asm
+++ b/data/mapObjects/route21.asm
@@ -1,5 +1,5 @@
 Route21Object:
-	db 67 ; border block
+	db $43 ; border block
 
 	db 0 ; warps
 
--- a/data/mapObjects/route22.asm
+++ b/data/mapObjects/route22.asm
@@ -1,5 +1,5 @@
 Route22Object:
-	db 44 ; border block
+	db $2c ; border block
 
 	db 1 ; warps
 	warp 8, 5, 0, ROUTE_22_GATE
--- a/data/mapObjects/route22gate.asm
+++ b/data/mapObjects/route22gate.asm
@@ -1,5 +1,5 @@
 Route22GateObject:
-	db 10 ; border block
+	db $a ; border block
 
 	db 4 ; warps
 	warp 4, 7, 0, -1
--- a/data/mapObjects/route23.asm
+++ b/data/mapObjects/route23.asm
@@ -1,5 +1,5 @@
 Route23Object:
-	db 15 ; border block
+	db $f ; border block
 
 	db 4 ; warps
 	warp 7, 139, 2, ROUTE_22_GATE
--- a/data/mapObjects/route24.asm
+++ b/data/mapObjects/route24.asm
@@ -1,5 +1,5 @@
 Route24Object:
-	db 44 ; border block
+	db $2c ; border block
 
 	db 0 ; warps
 
--- a/data/mapObjects/route25.asm
+++ b/data/mapObjects/route25.asm
@@ -1,5 +1,5 @@
 Route25Object:
-	db 44 ; border block
+	db $2c ; border block
 
 	db 1 ; warps
 	warp 45, 3, 0, BILLS_HOUSE
--- a/data/mapObjects/route2gate.asm
+++ b/data/mapObjects/route2gate.asm
@@ -1,5 +1,5 @@
 Route2GateObject:
-	db 10 ; border block
+	db $a ; border block
 
 	db 4 ; warps
 	warp 4, 0, 3, -1
--- a/data/mapObjects/route2house.asm
+++ b/data/mapObjects/route2house.asm
@@ -1,5 +1,5 @@
 Route2HouseObject:
-	db 10 ; border block
+	db $a ; border block
 
 	db 2 ; warps
 	warp 2, 7, 2, -1
--- a/data/mapObjects/route3.asm
+++ b/data/mapObjects/route3.asm
@@ -1,5 +1,5 @@
 Route3Object:
-	db 44 ; border block
+	db $2c ; border block
 
 	db 0 ; warps
 
--- a/data/mapObjects/route4.asm
+++ b/data/mapObjects/route4.asm
@@ -1,5 +1,5 @@
 Route4Object:
-	db 44 ; border block
+	db $2c ; border block
 
 	db 3 ; warps
 	warp 11, 5, 0, MT_MOON_POKECENTER
--- a/data/mapObjects/route5.asm
+++ b/data/mapObjects/route5.asm
@@ -1,5 +1,5 @@
 Route5Object:
-	db 10 ; border block
+	db $a ; border block
 
 	db 5 ; warps
 	warp 10, 29, 3, ROUTE_5_GATE
--- a/data/mapObjects/route5gate.asm
+++ b/data/mapObjects/route5gate.asm
@@ -1,5 +1,5 @@
 Route5GateObject:
-	db 10 ; border block
+	db $a ; border block
 
 	db 4 ; warps
 	warp 3, 5, 2, -1
--- a/data/mapObjects/route6.asm
+++ b/data/mapObjects/route6.asm
@@ -1,5 +1,5 @@
 Route6Object:
-	db 15 ; border block
+	db $f ; border block
 
 	db 4 ; warps
 	warp 9, 1, 2, ROUTE_6_GATE
--- a/data/mapObjects/route6gate.asm
+++ b/data/mapObjects/route6gate.asm
@@ -1,5 +1,5 @@
 Route6GateObject:
-	db 10 ; border block
+	db $a ; border block
 
 	db 4 ; warps
 	warp 3, 5, 2, -1
--- a/data/mapObjects/route7.asm
+++ b/data/mapObjects/route7.asm
@@ -1,5 +1,5 @@
 Route7Object:
-	db 15 ; border block
+	db $f ; border block
 
 	db 5 ; warps
 	warp 18, 9, 2, ROUTE_7_GATE
--- a/data/mapObjects/route7gate.asm
+++ b/data/mapObjects/route7gate.asm
@@ -1,5 +1,5 @@
 Route7GateObject:
-	db 10 ; border block
+	db $a ; border block
 
 	db 4 ; warps
 	warp 0, 3, 3, -1
--- a/data/mapObjects/route8.asm
+++ b/data/mapObjects/route8.asm
@@ -1,5 +1,5 @@
 Route8Object:
-	db 44 ; border block
+	db $2c ; border block
 
 	db 5 ; warps
 	warp 1, 9, 0, ROUTE_8_GATE
--- a/data/mapObjects/route8gate.asm
+++ b/data/mapObjects/route8gate.asm
@@ -1,5 +1,5 @@
 Route8GateObject:
-	db 10 ; border block
+	db $a ; border block
 
 	db 4 ; warps
 	warp 0, 3, 0, -1
--- a/data/mapObjects/route9.asm
+++ b/data/mapObjects/route9.asm
@@ -1,5 +1,5 @@
 Route9Object:
-	db 44 ; border block
+	db $2c ; border block
 
 	db 0 ; warps
 
--- a/data/mapObjects/safarizonecenter.asm
+++ b/data/mapObjects/safarizonecenter.asm
@@ -1,5 +1,5 @@
 SafariZoneCenterObject:
-	db 0 ; border block
+	db $0 ; border block
 
 	db 9 ; warps
 	warp 14, 25, 2, SAFARI_ZONE_ENTRANCE
--- a/data/mapObjects/safarizoneeast.asm
+++ b/data/mapObjects/safarizoneeast.asm
@@ -1,5 +1,5 @@
 SafariZoneEastObject:
-	db 0 ; border block
+	db $0 ; border block
 
 	db 5 ; warps
 	warp 0, 4, 6, SAFARI_ZONE_NORTH
--- a/data/mapObjects/safarizoneentrance.asm
+++ b/data/mapObjects/safarizoneentrance.asm
@@ -1,5 +1,5 @@
 SafariZoneEntranceObject:
-	db 10 ; border block
+	db $a ; border block
 
 	db 4 ; warps
 	warp 3, 5, 4, -1
--- a/data/mapObjects/safarizonenorth.asm
+++ b/data/mapObjects/safarizonenorth.asm
@@ -1,5 +1,5 @@
 SafariZoneNorthObject:
-	db 0 ; border block
+	db $0 ; border block
 
 	db 9 ; warps
 	warp 2, 35, 0, SAFARI_ZONE_WEST
--- a/data/mapObjects/safarizoneresthouse1.asm
+++ b/data/mapObjects/safarizoneresthouse1.asm
@@ -1,5 +1,5 @@
 SafariZoneRestHouse1Object:
-	db 10 ; border block
+	db $a ; border block
 
 	db 2 ; warps
 	warp 2, 7, 8, SAFARI_ZONE_CENTER
--- a/data/mapObjects/safarizoneresthouse2.asm
+++ b/data/mapObjects/safarizoneresthouse2.asm
@@ -1,5 +1,5 @@
 SafariZoneRestHouse2Object:
-	db 10 ; border block
+	db $a ; border block
 
 	db 2 ; warps
 	warp 2, 7, 7, SAFARI_ZONE_WEST
--- a/data/mapObjects/safarizoneresthouse3.asm
+++ b/data/mapObjects/safarizoneresthouse3.asm
@@ -1,5 +1,5 @@
 SafariZoneRestHouse3Object:
-	db 10 ; border block
+	db $a ; border block
 
 	db 2 ; warps
 	warp 2, 7, 4, SAFARI_ZONE_EAST
--- a/data/mapObjects/safarizoneresthouse4.asm
+++ b/data/mapObjects/safarizoneresthouse4.asm
@@ -1,5 +1,5 @@
 SafariZoneRestHouse4Object:
-	db 10 ; border block
+	db $a ; border block
 
 	db 2 ; warps
 	warp 2, 7, 8, SAFARI_ZONE_NORTH
--- a/data/mapObjects/safarizonesecrethouse.asm
+++ b/data/mapObjects/safarizonesecrethouse.asm
@@ -1,5 +1,5 @@
 SafariZoneSecretHouseObject:
-	db 23 ; border block
+	db $17 ; border block
 
 	db 2 ; warps
 	warp 2, 7, 6, SAFARI_ZONE_WEST
--- a/data/mapObjects/safarizonewest.asm
+++ b/data/mapObjects/safarizonewest.asm
@@ -1,5 +1,5 @@
 SafariZoneWestObject:
-	db 0 ; border block
+	db $0 ; border block
 
 	db 8 ; warps
 	warp 20, 0, 0, SAFARI_ZONE_NORTH
--- a/data/mapObjects/saffroncity.asm
+++ b/data/mapObjects/saffroncity.asm
@@ -1,5 +1,5 @@
 SaffronCityObject:
-	db 15 ; border block
+	db $f ; border block
 
 	db 8 ; warps
 	warp 7, 5, 0, COPYCATS_HOUSE_1F
--- a/data/mapObjects/saffrongym.asm
+++ b/data/mapObjects/saffrongym.asm
@@ -1,5 +1,5 @@
 SaffronGymObject:
-	db 46 ; border block
+	db $2e ; border block
 
 	db 32 ; warps
 	warp 8, 17, 2, -1
--- a/data/mapObjects/saffronhouse1.asm
+++ b/data/mapObjects/saffronhouse1.asm
@@ -1,5 +1,5 @@
 SaffronHouse1Object:
-	db 10 ; border block
+	db $a ; border block
 
 	db 2 ; warps
 	warp 2, 7, 3, -1
--- a/data/mapObjects/saffronhouse2.asm
+++ b/data/mapObjects/saffronhouse2.asm
@@ -1,5 +1,5 @@
 SaffronHouse2Object:
-	db 10 ; border block
+	db $a ; border block
 
 	db 2 ; warps
 	warp 2, 7, 7, -1
--- a/data/mapObjects/saffronmart.asm
+++ b/data/mapObjects/saffronmart.asm
@@ -1,5 +1,5 @@
 SaffronMartObject:
-	db 0 ; border block
+	db $0 ; border block
 
 	db 2 ; warps
 	warp 3, 7, 4, -1
--- a/data/mapObjects/saffronpokecenter.asm
+++ b/data/mapObjects/saffronpokecenter.asm
@@ -1,5 +1,5 @@
 SaffronPokecenterObject:
-	db 0 ; border block
+	db $0 ; border block
 
 	db 2 ; warps
 	warp 3, 7, 6, -1
--- a/data/mapObjects/school.asm
+++ b/data/mapObjects/school.asm
@@ -1,5 +1,5 @@
 SchoolObject:
-	db 10 ; border block
+	db $a ; border block
 
 	db 2 ; warps
 	warp 2, 7, 2, -1
--- a/data/mapObjects/seafoamislands1.asm
+++ b/data/mapObjects/seafoamislands1.asm
@@ -1,5 +1,5 @@
 SeafoamIslands1Object:
-	db 125 ; border block
+	db $7d ; border block
 
 	db 7 ; warps
 	warp 4, 17, 0, -1
--- a/data/mapObjects/seafoamislands2.asm
+++ b/data/mapObjects/seafoamislands2.asm
@@ -1,5 +1,5 @@
 SeafoamIslands2Object:
-	db 125 ; border block
+	db $7d ; border block
 
 	db 7 ; warps
 	warp 4, 2, 0, SEAFOAM_ISLANDS_3
--- a/data/mapObjects/seafoamislands3.asm
+++ b/data/mapObjects/seafoamislands3.asm
@@ -1,5 +1,5 @@
 SeafoamIslands3Object:
-	db 125 ; border block
+	db $7d ; border block
 
 	db 7 ; warps
 	warp 5, 3, 0, SEAFOAM_ISLANDS_2
--- a/data/mapObjects/seafoamislands4.asm
+++ b/data/mapObjects/seafoamislands4.asm
@@ -1,5 +1,5 @@
 SeafoamIslands4Object:
-	db 125 ; border block
+	db $7d ; border block
 
 	db 7 ; warps
 	warp 5, 12, 1, SEAFOAM_ISLANDS_3
--- a/data/mapObjects/seafoamislands5.asm
+++ b/data/mapObjects/seafoamislands5.asm
@@ -1,5 +1,5 @@
 SeafoamIslands5Object:
-	db 125 ; border block
+	db $7d ; border block
 
 	db 4 ; warps
 	warp 20, 17, 5, SEAFOAM_ISLANDS_4
--- a/data/mapObjects/silphco1.asm
+++ b/data/mapObjects/silphco1.asm
@@ -1,5 +1,5 @@
 SilphCo1Object:
-	db 46 ; border block
+	db $2e ; border block
 
 	db 5 ; warps
 	warp 10, 17, 5, -1
--- a/data/mapObjects/silphco10.asm
+++ b/data/mapObjects/silphco10.asm
@@ -1,5 +1,5 @@
 SilphCo10Object:
-	db 46 ; border block
+	db $2e ; border block
 
 	db 6 ; warps
 	warp 8, 0, 0, SILPH_CO_9F
--- a/data/mapObjects/silphco11.asm
+++ b/data/mapObjects/silphco11.asm
@@ -1,5 +1,5 @@
 SilphCo11Object:
-	db 13 ; border block
+	db $d ; border block
 
 	db 4 ; warps
 	warp 9, 0, 1, SILPH_CO_10F
--- a/data/mapObjects/silphco2.asm
+++ b/data/mapObjects/silphco2.asm
@@ -1,5 +1,5 @@
 SilphCo2Object:
-	db 46 ; border block
+	db $2e ; border block
 
 	db 7 ; warps
 	warp 24, 0, 2, SILPH_CO_1F
--- a/data/mapObjects/silphco3.asm
+++ b/data/mapObjects/silphco3.asm
@@ -1,5 +1,5 @@
 SilphCo3Object:
-	db 46 ; border block
+	db $2e ; border block
 
 	db 10 ; warps
 	warp 26, 0, 1, SILPH_CO_2F
--- a/data/mapObjects/silphco4.asm
+++ b/data/mapObjects/silphco4.asm
@@ -1,5 +1,5 @@
 SilphCo4Object:
-	db 46 ; border block
+	db $2e ; border block
 
 	db 7 ; warps
 	warp 24, 0, 1, SILPH_CO_3F
--- a/data/mapObjects/silphco5.asm
+++ b/data/mapObjects/silphco5.asm
@@ -1,5 +1,5 @@
 SilphCo5Object:
-	db 46 ; border block
+	db $2e ; border block
 
 	db 7 ; warps
 	warp 24, 0, 1, SILPH_CO_6F
--- a/data/mapObjects/silphco6.asm
+++ b/data/mapObjects/silphco6.asm
@@ -1,5 +1,5 @@
 SilphCo6Object:
-	db 46 ; border block
+	db $2e ; border block
 
 	db 5 ; warps
 	warp 16, 0, 1, SILPH_CO_7F
--- a/data/mapObjects/silphco7.asm
+++ b/data/mapObjects/silphco7.asm
@@ -1,5 +1,5 @@
 SilphCo7Object:
-	db 46 ; border block
+	db $2e ; border block
 
 	db 6 ; warps
 	warp 16, 0, 1, SILPH_CO_8F
--- a/data/mapObjects/silphco8.asm
+++ b/data/mapObjects/silphco8.asm
@@ -1,5 +1,5 @@
 SilphCo8Object:
-	db 46 ; border block
+	db $2e ; border block
 
 	db 7 ; warps
 	warp 16, 0, 1, SILPH_CO_9F
--- a/data/mapObjects/silphco9.asm
+++ b/data/mapObjects/silphco9.asm
@@ -1,5 +1,5 @@
 SilphCo9Object:
-	db 46 ; border block
+	db $2e ; border block
 
 	db 5 ; warps
 	warp 14, 0, 0, SILPH_CO_10F
--- a/data/mapObjects/silphcoelevator.asm
+++ b/data/mapObjects/silphcoelevator.asm
@@ -1,5 +1,5 @@
 SilphCoElevatorObject:
-	db 15 ; border block
+	db $f ; border block
 
 	db 2 ; warps
 	warp 1, 3, 0, 237
--- a/data/mapObjects/ssanne1.asm
+++ b/data/mapObjects/ssanne1.asm
@@ -1,5 +1,5 @@
 SSAnne1Object:
-	db 12 ; border block
+	db $c ; border block
 
 	db 11 ; warps
 	warp 26, 0, 1, VERMILION_DOCK
--- a/data/mapObjects/ssanne10.asm
+++ b/data/mapObjects/ssanne10.asm
@@ -1,5 +1,5 @@
 SSAnne10Object:
-	db 12 ; border block
+	db $c ; border block
 
 	db 10 ; warps
 	warp 2, 5, 4, SS_ANNE_4
--- a/data/mapObjects/ssanne2.asm
+++ b/data/mapObjects/ssanne2.asm
@@ -1,5 +1,5 @@
 SSAnne2Object:
-	db 12 ; border block
+	db $c ; border block
 
 	db 9 ; warps
 	warp 9, 11, 0, SS_ANNE_9
--- a/data/mapObjects/ssanne3.asm
+++ b/data/mapObjects/ssanne3.asm
@@ -1,5 +1,5 @@
 SSAnne3Object:
-	db 12 ; border block
+	db $c ; border block
 
 	db 2 ; warps
 	warp 0, 3, 0, SS_ANNE_5
--- a/data/mapObjects/ssanne4.asm
+++ b/data/mapObjects/ssanne4.asm
@@ -1,5 +1,5 @@
 SSAnne4Object:
-	db 12 ; border block
+	db $c ; border block
 
 	db 6 ; warps
 	warp 23, 3, 8, SS_ANNE_10
--- a/data/mapObjects/ssanne5.asm
+++ b/data/mapObjects/ssanne5.asm
@@ -1,5 +1,5 @@
 SSAnne5Object:
-	db 35 ; border block
+	db $23 ; border block
 
 	db 2 ; warps
 	warp 13, 6, 0, SS_ANNE_3
--- a/data/mapObjects/ssanne6.asm
+++ b/data/mapObjects/ssanne6.asm
@@ -1,5 +1,5 @@
 SSAnne6Object:
-	db 12 ; border block
+	db $c ; border block
 
 	db 1 ; warps
 	warp 6, 0, 10, SS_ANNE_1
--- a/data/mapObjects/ssanne7.asm
+++ b/data/mapObjects/ssanne7.asm
@@ -1,5 +1,5 @@
 SSAnne7Object:
-	db 12 ; border block
+	db $c ; border block
 
 	db 1 ; warps
 	warp 0, 7, 8, SS_ANNE_2
--- a/data/mapObjects/ssanne8.asm
+++ b/data/mapObjects/ssanne8.asm
@@ -1,5 +1,5 @@
 SSAnne8Object:
-	db 12 ; border block
+	db $c ; border block
 
 	db 6 ; warps
 	warp 0, 0, 2, SS_ANNE_1
--- a/data/mapObjects/ssanne9.asm
+++ b/data/mapObjects/ssanne9.asm
@@ -1,5 +1,5 @@
 SSAnne9Object:
-	db 12 ; border block
+	db $c ; border block
 
 	db 12 ; warps
 	warp 2, 5, 0, SS_ANNE_2
--- a/data/mapObjects/tradecenter.asm
+++ b/data/mapObjects/tradecenter.asm
@@ -1,5 +1,5 @@
 TradeCenterObject:
-	db 14 ; border block
+	db $e ; border block
 
 	db 0 ; warps
 
--- a/data/mapObjects/undergroundpathentranceroute5.asm
+++ b/data/mapObjects/undergroundpathentranceroute5.asm
@@ -1,5 +1,5 @@
 UndergroundPathEntranceRoute5Object:
-	db 10 ; border block
+	db $a ; border block
 
 	db 3 ; warps
 	warp 3, 7, 3, -1
--- a/data/mapObjects/undergroundpathentranceroute6.asm
+++ b/data/mapObjects/undergroundpathentranceroute6.asm
@@ -1,5 +1,5 @@
 UndergroundPathEntranceRoute6Object:
-	db 10 ; border block
+	db $a ; border block
 
 	db 3 ; warps
 	warp 3, 7, 3, -1
--- a/data/mapObjects/undergroundpathentranceroute7.asm
+++ b/data/mapObjects/undergroundpathentranceroute7.asm
@@ -1,5 +1,5 @@
 UndergroundPathEntranceRoute7Object:
-	db 10 ; border block
+	db $a ; border block
 
 	db 3 ; warps
 	warp 3, 7, 4, -1
--- a/data/mapObjects/undergroundpathentranceroute7copy.asm
+++ b/data/mapObjects/undergroundpathentranceroute7copy.asm
@@ -1,5 +1,5 @@
 UndergroundPathEntranceRoute7CopyObject:
-	db 10 ; border block
+	db $a ; border block
 
 	db 3 ; warps
 	warp 3, 7, 5, -1
--- a/data/mapObjects/undergroundpathentranceroute8.asm
+++ b/data/mapObjects/undergroundpathentranceroute8.asm
@@ -1,5 +1,5 @@
 UndergroundPathEntranceRoute8Object:
-	db 10 ; border block
+	db $a ; border block
 
 	db 3 ; warps
 	warp 3, 7, 4, -1
--- a/data/mapObjects/undergroundpathns.asm
+++ b/data/mapObjects/undergroundpathns.asm
@@ -1,5 +1,5 @@
 UndergroundPathNSObject:
-	db 1 ; border block
+	db $1 ; border block
 
 	db 2 ; warps
 	warp 5, 4, 2, PATH_ENTRANCE_ROUTE_5
--- a/data/mapObjects/undergroundpathwe.asm
+++ b/data/mapObjects/undergroundpathwe.asm
@@ -1,5 +1,5 @@
 UndergroundPathWEObject:
-	db 1 ; border block
+	db $1 ; border block
 
 	db 2 ; warps
 	warp 2, 5, 2, PATH_ENTRANCE_ROUTE_7
--- a/data/mapObjects/unknowndungeon1.asm
+++ b/data/mapObjects/unknowndungeon1.asm
@@ -1,5 +1,5 @@
 UnknownDungeon1Object:
-	db 125 ; border block
+	db $7d ; border block
 
 	db 9 ; warps
 	warp 24, 17, 6, -1
--- a/data/mapObjects/unknowndungeon2.asm
+++ b/data/mapObjects/unknowndungeon2.asm
@@ -1,5 +1,5 @@
 UnknownDungeon2Object:
-	db 125 ; border block
+	db $7d ; border block
 
 	db 6 ; warps
 	warp 29, 1, 2, UNKNOWN_DUNGEON_1
--- a/data/mapObjects/unknowndungeon3.asm
+++ b/data/mapObjects/unknowndungeon3.asm
@@ -1,5 +1,5 @@
 UnknownDungeon3Object:
-	db 125 ; border block
+	db $7d ; border block
 
 	db 1 ; warps
 	warp 3, 6, 8, UNKNOWN_DUNGEON_1
--- a/data/mapObjects/vermilioncity.asm
+++ b/data/mapObjects/vermilioncity.asm
@@ -1,5 +1,5 @@
 VermilionCityObject:
-	db 67 ; border block
+	db $43 ; border block
 
 	db 9 ; warps
 	warp 11, 3, 0, VERMILION_POKECENTER
--- a/data/mapObjects/vermiliondock.asm
+++ b/data/mapObjects/vermiliondock.asm
@@ -1,5 +1,5 @@
 VermilionDockObject:
-	db 15 ; border block
+	db $f ; border block
 
 	db 2 ; warps
 	warp 14, 0, 5, -1
--- a/data/mapObjects/vermiliongym.asm
+++ b/data/mapObjects/vermiliongym.asm
@@ -1,5 +1,5 @@
 VermilionGymObject:
-	db 3 ; border block
+	db $3 ; border block
 
 	db 2 ; warps
 	warp 4, 17, 3, -1
--- a/data/mapObjects/vermilionhouse1.asm
+++ b/data/mapObjects/vermilionhouse1.asm
@@ -1,5 +1,5 @@
 VermilionHouse1Object:
-	db 10 ; border block
+	db $a ; border block
 
 	db 2 ; warps
 	warp 2, 7, 4, -1
--- a/data/mapObjects/vermilionhouse2.asm
+++ b/data/mapObjects/vermilionhouse2.asm
@@ -1,5 +1,5 @@
 VermilionHouse2Object:
-	db 10 ; border block
+	db $a ; border block
 
 	db 2 ; warps
 	warp 2, 7, 8, -1
--- a/data/mapObjects/vermilionhouse3.asm
+++ b/data/mapObjects/vermilionhouse3.asm
@@ -1,5 +1,5 @@
 VermilionHouse3Object:
-	db 10 ; border block
+	db $a ; border block
 
 	db 2 ; warps
 	warp 2, 7, 7, -1
--- a/data/mapObjects/vermilionmart.asm
+++ b/data/mapObjects/vermilionmart.asm
@@ -1,5 +1,5 @@
 VermilionMartObject:
-	db 0 ; border block
+	db $0 ; border block
 
 	db 2 ; warps
 	warp 3, 7, 2, -1
--- a/data/mapObjects/vermilionpokecenter.asm
+++ b/data/mapObjects/vermilionpokecenter.asm
@@ -1,5 +1,5 @@
 VermilionPokecenterObject:
-	db 0 ; border block
+	db $0 ; border block
 
 	db 2 ; warps
 	warp 3, 7, 0, -1
--- a/data/mapObjects/victoryroad1.asm
+++ b/data/mapObjects/victoryroad1.asm
@@ -1,5 +1,5 @@
 VictoryRoad1Object:
-	db 125 ; border block
+	db $7d ; border block
 
 	db 3 ; warps
 	warp 8, 17, 2, -1
--- a/data/mapObjects/victoryroad2.asm
+++ b/data/mapObjects/victoryroad2.asm
@@ -1,5 +1,5 @@
 VictoryRoad2Object:
-	db 125 ; border block
+	db $7d ; border block
 
 	db 7 ; warps
 	warp 0, 8, 2, VICTORY_ROAD_1
--- a/data/mapObjects/victoryroad3.asm
+++ b/data/mapObjects/victoryroad3.asm
@@ -1,5 +1,5 @@
 VictoryRoad3Object:
-	db 125 ; border block
+	db $7d ; border block
 
 	db 4 ; warps
 	warp 23, 7, 3, VICTORY_ROAD_2
--- a/data/mapObjects/viridiancity.asm
+++ b/data/mapObjects/viridiancity.asm
@@ -1,5 +1,5 @@
 ViridianCityObject:
-	db 15 ; border block
+	db $f ; border block
 
 	db 5 ; warps
 	warp 23, 25, 0, VIRIDIAN_POKECENTER
--- a/data/mapObjects/viridianforest.asm
+++ b/data/mapObjects/viridianforest.asm
@@ -1,5 +1,5 @@
 ViridianForestObject:
-	db 3 ; border block
+	db $3 ; border block
 
 	db 6 ; warps
 	warp 1, 0, 2, VIRIDIAN_FOREST_EXIT
--- a/data/mapObjects/viridianforestentrance.asm
+++ b/data/mapObjects/viridianforestentrance.asm
@@ -1,5 +1,5 @@
 ViridianForestEntranceObject:
-	db 10 ; border block
+	db $a ; border block
 
 	db 4 ; warps
 	warp 4, 0, 3, VIRIDIAN_FOREST
--- a/data/mapObjects/viridianforestexit.asm
+++ b/data/mapObjects/viridianforestexit.asm
@@ -1,5 +1,5 @@
 ViridianForestExitObject:
-	db 10 ; border block
+	db $a ; border block
 
 	db 4 ; warps
 	warp 4, 0, 1, -1
--- a/data/mapObjects/viridiangym.asm
+++ b/data/mapObjects/viridiangym.asm
@@ -1,5 +1,5 @@
 ViridianGymObject:
-	db 3 ; border block
+	db $3 ; border block
 
 	db 2 ; warps
 	warp 16, 17, 4, -1
--- a/data/mapObjects/viridianhouse.asm
+++ b/data/mapObjects/viridianhouse.asm
@@ -1,5 +1,5 @@
 ViridianHouseObject:
-	db 10 ; border block
+	db $a ; border block
 
 	db 2 ; warps
 	warp 2, 7, 3, -1
--- a/data/mapObjects/viridianmart.asm
+++ b/data/mapObjects/viridianmart.asm
@@ -1,5 +1,5 @@
 ViridianMartObject:
-	db 0 ; border block
+	db $0 ; border block
 
 	db 2 ; warps
 	warp 3, 7, 1, -1
--- a/data/mapObjects/viridianpokecenter.asm
+++ b/data/mapObjects/viridianpokecenter.asm
@@ -1,5 +1,5 @@
 ViridianPokecenterObject:
-	db 0 ; border block
+	db $0 ; border block
 
 	db 2 ; warps
 	warp 3, 7, 0, -1