diff --git a/data/mapHeaders/agatha.asm b/data/mapHeaders/agatha.asm index f3389579f..155f07db5 100755 --- a/data/mapHeaders/agatha.asm +++ b/data/mapHeaders/agatha.asm @@ -2,5 +2,5 @@ Agatha_h: 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 diff --git a/data/mapHeaders/bikeshop.asm b/data/mapHeaders/bikeshop.asm index b63b03dfd..1524f59b2 100755 --- a/data/mapHeaders/bikeshop.asm +++ b/data/mapHeaders/bikeshop.asm @@ -2,5 +2,5 @@ BikeShop_h: 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 diff --git a/data/mapHeaders/billshouse.asm b/data/mapHeaders/billshouse.asm index 735f8d62d..832affe91 100755 --- a/data/mapHeaders/billshouse.asm +++ b/data/mapHeaders/billshouse.asm @@ -2,5 +2,5 @@ BillsHouse_h: 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 diff --git a/data/mapHeaders/bruno.asm b/data/mapHeaders/bruno.asm index 1267ebe2d..921fa80cf 100755 --- a/data/mapHeaders/bruno.asm +++ b/data/mapHeaders/bruno.asm @@ -2,5 +2,5 @@ Bruno_h: 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 diff --git a/data/mapHeaders/celadondiner.asm b/data/mapHeaders/celadondiner.asm index 9520d76e9..f608af16c 100755 --- a/data/mapHeaders/celadondiner.asm +++ b/data/mapHeaders/celadondiner.asm @@ -2,5 +2,5 @@ CeladonDiner_h: 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 diff --git a/data/mapHeaders/celadongamecorner.asm b/data/mapHeaders/celadongamecorner.asm index 3c5674a74..76403d926 100755 --- a/data/mapHeaders/celadongamecorner.asm +++ b/data/mapHeaders/celadongamecorner.asm @@ -2,5 +2,5 @@ CeladonGameCorner_h: 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 diff --git a/data/mapHeaders/celadongym.asm b/data/mapHeaders/celadongym.asm index c0dcf1627..78e486f33 100755 --- a/data/mapHeaders/celadongym.asm +++ b/data/mapHeaders/celadongym.asm @@ -2,5 +2,5 @@ CeladonGym_h: 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 diff --git a/data/mapHeaders/celadonhotel.asm b/data/mapHeaders/celadonhotel.asm index 019c3cc3a..ddc27cd6b 100755 --- a/data/mapHeaders/celadonhotel.asm +++ b/data/mapHeaders/celadonhotel.asm @@ -2,5 +2,5 @@ CeladonHotel_h: 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 diff --git a/data/mapHeaders/celadonhouse.asm b/data/mapHeaders/celadonhouse.asm index ba510282d..d6d27a644 100755 --- a/data/mapHeaders/celadonhouse.asm +++ b/data/mapHeaders/celadonhouse.asm @@ -2,5 +2,5 @@ CeladonHouse_h: 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 diff --git a/data/mapHeaders/celadonmansion1.asm b/data/mapHeaders/celadonmansion1.asm index 8c94cc63d..da7739433 100755 --- a/data/mapHeaders/celadonmansion1.asm +++ b/data/mapHeaders/celadonmansion1.asm @@ -2,5 +2,5 @@ CeladonMansion1_h: 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 diff --git a/data/mapHeaders/celadonmansion2.asm b/data/mapHeaders/celadonmansion2.asm index 462dfdf37..92970148d 100755 --- a/data/mapHeaders/celadonmansion2.asm +++ b/data/mapHeaders/celadonmansion2.asm @@ -2,5 +2,5 @@ CeladonMansion2_h: 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 diff --git a/data/mapHeaders/celadonmansion3.asm b/data/mapHeaders/celadonmansion3.asm index 81b3f2e29..95c93bd73 100755 --- a/data/mapHeaders/celadonmansion3.asm +++ b/data/mapHeaders/celadonmansion3.asm @@ -2,5 +2,5 @@ CeladonMansion3_h: 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 diff --git a/data/mapHeaders/celadonmansion4.asm b/data/mapHeaders/celadonmansion4.asm index c5cf2da93..6b4e833a5 100755 --- a/data/mapHeaders/celadonmansion4.asm +++ b/data/mapHeaders/celadonmansion4.asm @@ -2,5 +2,5 @@ CeladonMansion4_h: 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 diff --git a/data/mapHeaders/celadonmansion5.asm b/data/mapHeaders/celadonmansion5.asm index d26faccf3..7cc16d248 100755 --- a/data/mapHeaders/celadonmansion5.asm +++ b/data/mapHeaders/celadonmansion5.asm @@ -2,5 +2,5 @@ CeladonMansion5_h: 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 diff --git a/data/mapHeaders/celadonmart1.asm b/data/mapHeaders/celadonmart1.asm index 50d171bc8..12b013a4f 100755 --- a/data/mapHeaders/celadonmart1.asm +++ b/data/mapHeaders/celadonmart1.asm @@ -2,5 +2,5 @@ CeladonMart1_h: 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 diff --git a/data/mapHeaders/celadonmart2.asm b/data/mapHeaders/celadonmart2.asm index ecd609cba..210f85af9 100755 --- a/data/mapHeaders/celadonmart2.asm +++ b/data/mapHeaders/celadonmart2.asm @@ -2,5 +2,5 @@ CeladonMart2_h: 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 diff --git a/data/mapHeaders/celadonmart3.asm b/data/mapHeaders/celadonmart3.asm index af1095280..511b14053 100755 --- a/data/mapHeaders/celadonmart3.asm +++ b/data/mapHeaders/celadonmart3.asm @@ -2,5 +2,5 @@ CeladonMart3_h: 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 diff --git a/data/mapHeaders/celadonmart4.asm b/data/mapHeaders/celadonmart4.asm index 4ae820d9a..fd34406d5 100755 --- a/data/mapHeaders/celadonmart4.asm +++ b/data/mapHeaders/celadonmart4.asm @@ -2,5 +2,5 @@ CeladonMart4_h: 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 diff --git a/data/mapHeaders/celadonmart5.asm b/data/mapHeaders/celadonmart5.asm index 0d28464f8..66e70f28d 100755 --- a/data/mapHeaders/celadonmart5.asm +++ b/data/mapHeaders/celadonmart5.asm @@ -2,5 +2,5 @@ CeladonMart5_h: 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 diff --git a/data/mapHeaders/celadonmartelevator.asm b/data/mapHeaders/celadonmartelevator.asm index 498587c6d..149e5b0f7 100755 --- a/data/mapHeaders/celadonmartelevator.asm +++ b/data/mapHeaders/celadonmartelevator.asm @@ -2,5 +2,5 @@ CeladonMartElevator_h: 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 diff --git a/data/mapHeaders/celadonmartroof.asm b/data/mapHeaders/celadonmartroof.asm index 8814092be..2073afd23 100755 --- a/data/mapHeaders/celadonmartroof.asm +++ b/data/mapHeaders/celadonmartroof.asm @@ -2,5 +2,5 @@ CeladonMartRoof_h: 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 diff --git a/data/mapHeaders/celadonpokecenter.asm b/data/mapHeaders/celadonpokecenter.asm index b9464c68b..bfeb76b7c 100755 --- a/data/mapHeaders/celadonpokecenter.asm +++ b/data/mapHeaders/celadonpokecenter.asm @@ -2,5 +2,5 @@ CeladonPokecenter_h: 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 diff --git a/data/mapHeaders/celadonprizeroom.asm b/data/mapHeaders/celadonprizeroom.asm index f7a5dc125..83161b306 100755 --- a/data/mapHeaders/celadonprizeroom.asm +++ b/data/mapHeaders/celadonprizeroom.asm @@ -2,5 +2,5 @@ CeladonPrizeRoom_h: 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 diff --git a/data/mapHeaders/ceruleangym.asm b/data/mapHeaders/ceruleangym.asm index f95e1a797..3c4f80526 100755 --- a/data/mapHeaders/ceruleangym.asm +++ b/data/mapHeaders/ceruleangym.asm @@ -2,5 +2,5 @@ CeruleanGym_h: 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 diff --git a/data/mapHeaders/ceruleanhouse1.asm b/data/mapHeaders/ceruleanhouse1.asm index 2a8c91977..fa12c61c6 100755 --- a/data/mapHeaders/ceruleanhouse1.asm +++ b/data/mapHeaders/ceruleanhouse1.asm @@ -2,5 +2,5 @@ CeruleanHouse1_h: 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 diff --git a/data/mapHeaders/ceruleanhouse2.asm b/data/mapHeaders/ceruleanhouse2.asm index 1e040ffda..78f6d821a 100755 --- a/data/mapHeaders/ceruleanhouse2.asm +++ b/data/mapHeaders/ceruleanhouse2.asm @@ -2,5 +2,5 @@ CeruleanHouse2_h: 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 diff --git a/data/mapHeaders/ceruleanhousetrashed.asm b/data/mapHeaders/ceruleanhousetrashed.asm index 90119dc57..53eaa5819 100755 --- a/data/mapHeaders/ceruleanhousetrashed.asm +++ b/data/mapHeaders/ceruleanhousetrashed.asm @@ -2,5 +2,5 @@ CeruleanHouseTrashed_h: 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 diff --git a/data/mapHeaders/ceruleanmart.asm b/data/mapHeaders/ceruleanmart.asm index 3f3231e83..12bafa98a 100755 --- a/data/mapHeaders/ceruleanmart.asm +++ b/data/mapHeaders/ceruleanmart.asm @@ -2,5 +2,5 @@ CeruleanMart_h: 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 diff --git a/data/mapHeaders/ceruleanpokecenter.asm b/data/mapHeaders/ceruleanpokecenter.asm index 636a89ae6..41fcdd903 100755 --- a/data/mapHeaders/ceruleanpokecenter.asm +++ b/data/mapHeaders/ceruleanpokecenter.asm @@ -2,5 +2,5 @@ CeruleanPokecenter_h: 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 diff --git a/data/mapHeaders/cinnabargym.asm b/data/mapHeaders/cinnabargym.asm index 3f05790c2..2cb7dc746 100755 --- a/data/mapHeaders/cinnabargym.asm +++ b/data/mapHeaders/cinnabargym.asm @@ -2,5 +2,5 @@ CinnabarGym_h: 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 diff --git a/data/mapHeaders/cinnabarmart.asm b/data/mapHeaders/cinnabarmart.asm index b686713fd..e2c8437d7 100755 --- a/data/mapHeaders/cinnabarmart.asm +++ b/data/mapHeaders/cinnabarmart.asm @@ -2,5 +2,5 @@ CinnabarMart_h: 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 diff --git a/data/mapHeaders/cinnabarpokecenter.asm b/data/mapHeaders/cinnabarpokecenter.asm index b1f002bd1..a11a02f32 100755 --- a/data/mapHeaders/cinnabarpokecenter.asm +++ b/data/mapHeaders/cinnabarpokecenter.asm @@ -2,5 +2,5 @@ CinnabarPokecenter_h: 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 diff --git a/data/mapHeaders/colosseum.asm b/data/mapHeaders/colosseum.asm index 67e1188b3..13d9f0c4e 100755 --- a/data/mapHeaders/colosseum.asm +++ b/data/mapHeaders/colosseum.asm @@ -2,5 +2,5 @@ Colosseum_h: 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 diff --git a/data/mapHeaders/copycatshouse1f.asm b/data/mapHeaders/copycatshouse1f.asm index bdca2189b..7489eed7d 100755 --- a/data/mapHeaders/copycatshouse1f.asm +++ b/data/mapHeaders/copycatshouse1f.asm @@ -2,5 +2,5 @@ CopycatsHouse1F_h: 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 diff --git a/data/mapHeaders/copycatshouse2f.asm b/data/mapHeaders/copycatshouse2f.asm index 3eecf7186..7566143f2 100755 --- a/data/mapHeaders/copycatshouse2f.asm +++ b/data/mapHeaders/copycatshouse2f.asm @@ -2,5 +2,5 @@ CopycatsHouse2F_h: 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 diff --git a/data/mapHeaders/daycarem.asm b/data/mapHeaders/daycarem.asm index 1b8d4c1c6..b61a00f20 100755 --- a/data/mapHeaders/daycarem.asm +++ b/data/mapHeaders/daycarem.asm @@ -2,5 +2,5 @@ DayCareM_h: 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 diff --git a/data/mapHeaders/diglettscave.asm b/data/mapHeaders/diglettscave.asm index 0e68a55c2..29c1db3e0 100755 --- a/data/mapHeaders/diglettscave.asm +++ b/data/mapHeaders/diglettscave.asm @@ -2,5 +2,5 @@ DiglettsCave_h: 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 diff --git a/data/mapHeaders/diglettscaveroute11.asm b/data/mapHeaders/diglettscaveroute11.asm index 7670c83f9..bb3817ea3 100755 --- a/data/mapHeaders/diglettscaveroute11.asm +++ b/data/mapHeaders/diglettscaveroute11.asm @@ -2,5 +2,5 @@ DiglettsCaveEntranceRoute11_h: 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 diff --git a/data/mapHeaders/diglettscaveroute2.asm b/data/mapHeaders/diglettscaveroute2.asm index 0499b4c30..505fbbfff 100755 --- a/data/mapHeaders/diglettscaveroute2.asm +++ b/data/mapHeaders/diglettscaveroute2.asm @@ -2,5 +2,5 @@ DiglettsCaveRoute2_h: 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 diff --git a/data/mapHeaders/fanclub.asm b/data/mapHeaders/fanclub.asm index 8e8205b45..6b70e935f 100755 --- a/data/mapHeaders/fanclub.asm +++ b/data/mapHeaders/fanclub.asm @@ -2,5 +2,5 @@ FanClub_h: 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 diff --git a/data/mapHeaders/fightingdojo.asm b/data/mapHeaders/fightingdojo.asm index cb0a2fdbb..37f9437ca 100755 --- a/data/mapHeaders/fightingdojo.asm +++ b/data/mapHeaders/fightingdojo.asm @@ -2,5 +2,5 @@ FightingDojo_h: 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 diff --git a/data/mapHeaders/fuchsiagym.asm b/data/mapHeaders/fuchsiagym.asm index 9d16f1786..9bad3a7ff 100755 --- a/data/mapHeaders/fuchsiagym.asm +++ b/data/mapHeaders/fuchsiagym.asm @@ -2,5 +2,5 @@ FuchsiaGym_h: 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 diff --git a/data/mapHeaders/fuchsiahouse1.asm b/data/mapHeaders/fuchsiahouse1.asm index c4ab2c953..7de94ad51 100755 --- a/data/mapHeaders/fuchsiahouse1.asm +++ b/data/mapHeaders/fuchsiahouse1.asm @@ -2,5 +2,5 @@ FuchsiaHouse1_h: 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 diff --git a/data/mapHeaders/fuchsiahouse2.asm b/data/mapHeaders/fuchsiahouse2.asm index 530f44b65..7032f5496 100755 --- a/data/mapHeaders/fuchsiahouse2.asm +++ b/data/mapHeaders/fuchsiahouse2.asm @@ -2,5 +2,5 @@ FuchsiaHouse2_h: 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 diff --git a/data/mapHeaders/fuchsiahouse3.asm b/data/mapHeaders/fuchsiahouse3.asm index e52b6b8a8..019171458 100755 --- a/data/mapHeaders/fuchsiahouse3.asm +++ b/data/mapHeaders/fuchsiahouse3.asm @@ -2,5 +2,5 @@ FuchsiaHouse3_h: 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 diff --git a/data/mapHeaders/fuchsiamart.asm b/data/mapHeaders/fuchsiamart.asm index dcdfe8c7e..c1445bc8b 100755 --- a/data/mapHeaders/fuchsiamart.asm +++ b/data/mapHeaders/fuchsiamart.asm @@ -2,5 +2,5 @@ FuchsiaMart_h: 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 diff --git a/data/mapHeaders/fuchsiameetingroom.asm b/data/mapHeaders/fuchsiameetingroom.asm index b44acf290..e7f31770b 100755 --- a/data/mapHeaders/fuchsiameetingroom.asm +++ b/data/mapHeaders/fuchsiameetingroom.asm @@ -2,5 +2,5 @@ FuchsiaMeetingRoom_h: 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 diff --git a/data/mapHeaders/fuchsiapokecenter.asm b/data/mapHeaders/fuchsiapokecenter.asm index dc6f1e6b5..4625c9808 100755 --- a/data/mapHeaders/fuchsiapokecenter.asm +++ b/data/mapHeaders/fuchsiapokecenter.asm @@ -2,5 +2,5 @@ FuchsiaPokecenter_h: 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 diff --git a/data/mapHeaders/halloffameroom.asm b/data/mapHeaders/halloffameroom.asm index a90464a87..9c06c434b 100755 --- a/data/mapHeaders/halloffameroom.asm +++ b/data/mapHeaders/halloffameroom.asm @@ -2,5 +2,5 @@ HallofFameRoom_h: 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 diff --git a/data/mapHeaders/indigoplateaulobby.asm b/data/mapHeaders/indigoplateaulobby.asm index 4cf92d82a..67153dbcd 100755 --- a/data/mapHeaders/indigoplateaulobby.asm +++ b/data/mapHeaders/indigoplateaulobby.asm @@ -2,5 +2,5 @@ IndigoPlateauLobby_h: 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 diff --git a/data/mapHeaders/lab1.asm b/data/mapHeaders/lab1.asm index d0e976e70..d4d04e3de 100755 --- a/data/mapHeaders/lab1.asm +++ b/data/mapHeaders/lab1.asm @@ -2,5 +2,5 @@ Lab1_h: 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 diff --git a/data/mapHeaders/lab2.asm b/data/mapHeaders/lab2.asm index 75cbcf1fe..3d2647419 100755 --- a/data/mapHeaders/lab2.asm +++ b/data/mapHeaders/lab2.asm @@ -2,5 +2,5 @@ Lab2_h: 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 diff --git a/data/mapHeaders/lab3.asm b/data/mapHeaders/lab3.asm index 9af39022c..0f401f65b 100755 --- a/data/mapHeaders/lab3.asm +++ b/data/mapHeaders/lab3.asm @@ -2,5 +2,5 @@ Lab3_h: 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 diff --git a/data/mapHeaders/lab4.asm b/data/mapHeaders/lab4.asm index e0b23c7db..10ded3768 100755 --- a/data/mapHeaders/lab4.asm +++ b/data/mapHeaders/lab4.asm @@ -2,5 +2,5 @@ Lab4_h: 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 diff --git a/data/mapHeaders/lance.asm b/data/mapHeaders/lance.asm index 13b2a3432..d9a1ae755 100755 --- a/data/mapHeaders/lance.asm +++ b/data/mapHeaders/lance.asm @@ -2,5 +2,5 @@ Lance_h: 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 diff --git a/data/mapHeaders/lavenderhouse1.asm b/data/mapHeaders/lavenderhouse1.asm index f1750dc05..362e43597 100755 --- a/data/mapHeaders/lavenderhouse1.asm +++ b/data/mapHeaders/lavenderhouse1.asm @@ -2,5 +2,5 @@ LavenderHouse1_h: 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 diff --git a/data/mapHeaders/lavenderhouse2.asm b/data/mapHeaders/lavenderhouse2.asm index 449ccf079..971e1e8da 100755 --- a/data/mapHeaders/lavenderhouse2.asm +++ b/data/mapHeaders/lavenderhouse2.asm @@ -2,5 +2,5 @@ LavenderHouse2_h: 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 diff --git a/data/mapHeaders/lavendermart.asm b/data/mapHeaders/lavendermart.asm index e2bd0c9c1..13cb06c5e 100755 --- a/data/mapHeaders/lavendermart.asm +++ b/data/mapHeaders/lavendermart.asm @@ -2,5 +2,5 @@ LavenderMart_h: 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 diff --git a/data/mapHeaders/lavenderpokecenter.asm b/data/mapHeaders/lavenderpokecenter.asm index c0d41294d..ce9650f11 100755 --- a/data/mapHeaders/lavenderpokecenter.asm +++ b/data/mapHeaders/lavenderpokecenter.asm @@ -2,5 +2,5 @@ LavenderPokecenter_h: 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 diff --git a/data/mapHeaders/lorelei.asm b/data/mapHeaders/lorelei.asm index 634435d32..82efe164c 100755 --- a/data/mapHeaders/lorelei.asm +++ b/data/mapHeaders/lorelei.asm @@ -2,5 +2,5 @@ Lorelei_h: 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 diff --git a/data/mapHeaders/mansion1.asm b/data/mapHeaders/mansion1.asm index 46b0a83e7..8b3269417 100755 --- a/data/mapHeaders/mansion1.asm +++ b/data/mapHeaders/mansion1.asm @@ -2,5 +2,5 @@ Mansion1_h: 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 diff --git a/data/mapHeaders/mansion2.asm b/data/mapHeaders/mansion2.asm index ee4b570c3..fba95ed8b 100755 --- a/data/mapHeaders/mansion2.asm +++ b/data/mapHeaders/mansion2.asm @@ -2,5 +2,5 @@ Mansion2_h: 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 diff --git a/data/mapHeaders/mansion3.asm b/data/mapHeaders/mansion3.asm index 97074347d..933d4c6f6 100755 --- a/data/mapHeaders/mansion3.asm +++ b/data/mapHeaders/mansion3.asm @@ -2,5 +2,5 @@ Mansion3_h: 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 diff --git a/data/mapHeaders/mansion4.asm b/data/mapHeaders/mansion4.asm index 45b1636a2..806b66b63 100755 --- a/data/mapHeaders/mansion4.asm +++ b/data/mapHeaders/mansion4.asm @@ -2,5 +2,5 @@ Mansion4_h: 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 diff --git a/data/mapHeaders/mtmoon1.asm b/data/mapHeaders/mtmoon1.asm index da64b6676..4fbd8de0b 100755 --- a/data/mapHeaders/mtmoon1.asm +++ b/data/mapHeaders/mtmoon1.asm @@ -2,5 +2,5 @@ MtMoon1_h: 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 diff --git a/data/mapHeaders/mtmoon2.asm b/data/mapHeaders/mtmoon2.asm index 7121c33e7..81b0b3656 100755 --- a/data/mapHeaders/mtmoon2.asm +++ b/data/mapHeaders/mtmoon2.asm @@ -2,5 +2,5 @@ MtMoon2_h: 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 diff --git a/data/mapHeaders/mtmoon3.asm b/data/mapHeaders/mtmoon3.asm index 643eb95d5..f89d77cba 100755 --- a/data/mapHeaders/mtmoon3.asm +++ b/data/mapHeaders/mtmoon3.asm @@ -2,5 +2,5 @@ MtMoon3_h: 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 diff --git a/data/mapHeaders/mtmoonpokecenter.asm b/data/mapHeaders/mtmoonpokecenter.asm index ba82c4787..0cb1791b1 100755 --- a/data/mapHeaders/mtmoonpokecenter.asm +++ b/data/mapHeaders/mtmoonpokecenter.asm @@ -2,5 +2,5 @@ MtMoonPokecenter_h: 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 diff --git a/data/mapHeaders/museum1f.asm b/data/mapHeaders/museum1f.asm index 106115139..eca97706a 100755 --- a/data/mapHeaders/museum1f.asm +++ b/data/mapHeaders/museum1f.asm @@ -2,5 +2,5 @@ Museum1F_h: 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 diff --git a/data/mapHeaders/museum2f.asm b/data/mapHeaders/museum2f.asm index 62f9f7ca8..973f5045e 100755 --- a/data/mapHeaders/museum2f.asm +++ b/data/mapHeaders/museum2f.asm @@ -2,5 +2,5 @@ Museum2F_h: 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 diff --git a/data/mapHeaders/namerater.asm b/data/mapHeaders/namerater.asm index 3fdef0d7a..01a488a70 100755 --- a/data/mapHeaders/namerater.asm +++ b/data/mapHeaders/namerater.asm @@ -2,5 +2,5 @@ NameRater_h: 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 diff --git a/data/mapHeaders/oakslab.asm b/data/mapHeaders/oakslab.asm index ba2c9d22a..94608ef22 100755 --- a/data/mapHeaders/oakslab.asm +++ b/data/mapHeaders/oakslab.asm @@ -2,5 +2,5 @@ OaksLab_h: 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 diff --git a/data/mapHeaders/pewtergym.asm b/data/mapHeaders/pewtergym.asm index 8eee73b34..a335ab503 100755 --- a/data/mapHeaders/pewtergym.asm +++ b/data/mapHeaders/pewtergym.asm @@ -2,5 +2,5 @@ PewterGym_h: 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 diff --git a/data/mapHeaders/pewterhouse1.asm b/data/mapHeaders/pewterhouse1.asm index 402099262..90b69d001 100755 --- a/data/mapHeaders/pewterhouse1.asm +++ b/data/mapHeaders/pewterhouse1.asm @@ -2,5 +2,5 @@ PewterHouse1_h: 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 diff --git a/data/mapHeaders/pewterhouse2.asm b/data/mapHeaders/pewterhouse2.asm index 25fc3e9d1..9baa3d415 100755 --- a/data/mapHeaders/pewterhouse2.asm +++ b/data/mapHeaders/pewterhouse2.asm @@ -2,5 +2,5 @@ PewterHouse2_h: 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 diff --git a/data/mapHeaders/pewtermart.asm b/data/mapHeaders/pewtermart.asm index 02481bfcc..00b912473 100755 --- a/data/mapHeaders/pewtermart.asm +++ b/data/mapHeaders/pewtermart.asm @@ -2,5 +2,5 @@ PewterMart_h: 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 diff --git a/data/mapHeaders/pewterpokecenter.asm b/data/mapHeaders/pewterpokecenter.asm index f3abc838f..29851a961 100755 --- a/data/mapHeaders/pewterpokecenter.asm +++ b/data/mapHeaders/pewterpokecenter.asm @@ -2,5 +2,5 @@ PewterPokecenter_h: 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 diff --git a/data/mapHeaders/pokemontower1.asm b/data/mapHeaders/pokemontower1.asm index 9a799d739..5ea76d217 100755 --- a/data/mapHeaders/pokemontower1.asm +++ b/data/mapHeaders/pokemontower1.asm @@ -2,5 +2,5 @@ PokemonTower1_h: 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 diff --git a/data/mapHeaders/pokemontower2.asm b/data/mapHeaders/pokemontower2.asm index a2c395c99..3da497e46 100755 --- a/data/mapHeaders/pokemontower2.asm +++ b/data/mapHeaders/pokemontower2.asm @@ -2,5 +2,5 @@ PokemonTower2_h: 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 diff --git a/data/mapHeaders/pokemontower3.asm b/data/mapHeaders/pokemontower3.asm index af81c9e61..bec351226 100755 --- a/data/mapHeaders/pokemontower3.asm +++ b/data/mapHeaders/pokemontower3.asm @@ -2,5 +2,5 @@ PokemonTower3_h: 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 diff --git a/data/mapHeaders/pokemontower4.asm b/data/mapHeaders/pokemontower4.asm index 073c34c0f..4d96c709b 100755 --- a/data/mapHeaders/pokemontower4.asm +++ b/data/mapHeaders/pokemontower4.asm @@ -2,5 +2,5 @@ PokemonTower4_h: 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 diff --git a/data/mapHeaders/pokemontower5.asm b/data/mapHeaders/pokemontower5.asm index a76365344..f91911b0c 100755 --- a/data/mapHeaders/pokemontower5.asm +++ b/data/mapHeaders/pokemontower5.asm @@ -2,5 +2,5 @@ PokemonTower5_h: 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 diff --git a/data/mapHeaders/pokemontower6.asm b/data/mapHeaders/pokemontower6.asm index a83ae0ba0..10a54cd58 100755 --- a/data/mapHeaders/pokemontower6.asm +++ b/data/mapHeaders/pokemontower6.asm @@ -2,5 +2,5 @@ PokemonTower6_h: 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 diff --git a/data/mapHeaders/pokemontower7.asm b/data/mapHeaders/pokemontower7.asm index 4e13bceec..b69fd01ed 100755 --- a/data/mapHeaders/pokemontower7.asm +++ b/data/mapHeaders/pokemontower7.asm @@ -2,5 +2,5 @@ PokemonTower7_h: 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 diff --git a/data/mapHeaders/powerplant.asm b/data/mapHeaders/powerplant.asm index 9c78311d2..3b13491d6 100755 --- a/data/mapHeaders/powerplant.asm +++ b/data/mapHeaders/powerplant.asm @@ -2,5 +2,5 @@ PowerPlant_h: 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 diff --git a/data/mapHeaders/rockethideout1.asm b/data/mapHeaders/rockethideout1.asm index a9dcf4248..bbe721ab1 100755 --- a/data/mapHeaders/rockethideout1.asm +++ b/data/mapHeaders/rockethideout1.asm @@ -2,5 +2,5 @@ RocketHideout1_h: 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 diff --git a/data/mapHeaders/rockethideout2.asm b/data/mapHeaders/rockethideout2.asm index 8f034360a..cc2ed948c 100755 --- a/data/mapHeaders/rockethideout2.asm +++ b/data/mapHeaders/rockethideout2.asm @@ -2,5 +2,5 @@ RocketHideout2_h: 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 diff --git a/data/mapHeaders/rockethideout3.asm b/data/mapHeaders/rockethideout3.asm index 5fc9fb951..12e9aa1e8 100755 --- a/data/mapHeaders/rockethideout3.asm +++ b/data/mapHeaders/rockethideout3.asm @@ -2,5 +2,5 @@ RocketHideout3_h: 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 diff --git a/data/mapHeaders/rockethideout4.asm b/data/mapHeaders/rockethideout4.asm index 0cde5beed..0b858dc92 100755 --- a/data/mapHeaders/rockethideout4.asm +++ b/data/mapHeaders/rockethideout4.asm @@ -2,5 +2,5 @@ RocketHideout4_h: 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 diff --git a/data/mapHeaders/rockethideoutelevator.asm b/data/mapHeaders/rockethideoutelevator.asm index d4917812c..b42694440 100755 --- a/data/mapHeaders/rockethideoutelevator.asm +++ b/data/mapHeaders/rockethideoutelevator.asm @@ -2,5 +2,5 @@ RocketHideoutElevator_h: 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 diff --git a/data/mapHeaders/rocktunnel1.asm b/data/mapHeaders/rocktunnel1.asm index db67517d2..14fc41b15 100755 --- a/data/mapHeaders/rocktunnel1.asm +++ b/data/mapHeaders/rocktunnel1.asm @@ -2,5 +2,5 @@ RockTunnel1_h: 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 diff --git a/data/mapHeaders/rocktunnel2.asm b/data/mapHeaders/rocktunnel2.asm index 5b85701b9..c4184b8d4 100755 --- a/data/mapHeaders/rocktunnel2.asm +++ b/data/mapHeaders/rocktunnel2.asm @@ -2,5 +2,5 @@ RockTunnel2_h: 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 diff --git a/data/mapHeaders/rocktunnelpokecenter.asm b/data/mapHeaders/rocktunnelpokecenter.asm index e1bad3bd6..977dd1cf7 100755 --- a/data/mapHeaders/rocktunnelpokecenter.asm +++ b/data/mapHeaders/rocktunnelpokecenter.asm @@ -2,5 +2,5 @@ RockTunnelPokecenter_h: 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 diff --git a/data/mapHeaders/route11gate.asm b/data/mapHeaders/route11gate.asm index 26539a197..22f90adb3 100755 --- a/data/mapHeaders/route11gate.asm +++ b/data/mapHeaders/route11gate.asm @@ -2,5 +2,5 @@ Route11Gate_h: 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 diff --git a/data/mapHeaders/route11gateupstairs.asm b/data/mapHeaders/route11gateupstairs.asm index ac5568045..d3f4a3e16 100755 --- a/data/mapHeaders/route11gateupstairs.asm +++ b/data/mapHeaders/route11gateupstairs.asm @@ -2,5 +2,5 @@ Route11GateUpstairs_h: 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 diff --git a/data/mapHeaders/route12gate.asm b/data/mapHeaders/route12gate.asm index bcd36d73f..a870a1917 100755 --- a/data/mapHeaders/route12gate.asm +++ b/data/mapHeaders/route12gate.asm @@ -2,5 +2,5 @@ Route12Gate_h: 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 diff --git a/data/mapHeaders/route12gateupstairs.asm b/data/mapHeaders/route12gateupstairs.asm index 96109a387..767cb7644 100755 --- a/data/mapHeaders/route12gateupstairs.asm +++ b/data/mapHeaders/route12gateupstairs.asm @@ -2,5 +2,5 @@ Route12GateUpstairs_h: 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 diff --git a/data/mapHeaders/route12house.asm b/data/mapHeaders/route12house.asm index 11f45d24d..48428b100 100755 --- a/data/mapHeaders/route12house.asm +++ b/data/mapHeaders/route12house.asm @@ -2,5 +2,5 @@ Route12House_h: 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 diff --git a/data/mapHeaders/route15gate.asm b/data/mapHeaders/route15gate.asm index 072d8f726..ae71bc35d 100755 --- a/data/mapHeaders/route15gate.asm +++ b/data/mapHeaders/route15gate.asm @@ -2,5 +2,5 @@ Route15Gate_h: 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 diff --git a/data/mapHeaders/route15gateupstairs.asm b/data/mapHeaders/route15gateupstairs.asm index 96e7e2cab..02996057b 100755 --- a/data/mapHeaders/route15gateupstairs.asm +++ b/data/mapHeaders/route15gateupstairs.asm @@ -2,5 +2,5 @@ Route15GateUpstairs_h: 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 diff --git a/data/mapHeaders/route16gate.asm b/data/mapHeaders/route16gate.asm index b33812580..32d0729b6 100755 --- a/data/mapHeaders/route16gate.asm +++ b/data/mapHeaders/route16gate.asm @@ -2,5 +2,5 @@ Route16Gate_h: 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 diff --git a/data/mapHeaders/route16gateupstairs.asm b/data/mapHeaders/route16gateupstairs.asm index e8dd7d456..32c324335 100755 --- a/data/mapHeaders/route16gateupstairs.asm +++ b/data/mapHeaders/route16gateupstairs.asm @@ -2,5 +2,5 @@ Route16GateUpstairs_h: 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 diff --git a/data/mapHeaders/route16house.asm b/data/mapHeaders/route16house.asm index 5945e11b2..2b633873c 100755 --- a/data/mapHeaders/route16house.asm +++ b/data/mapHeaders/route16house.asm @@ -2,5 +2,5 @@ Route16House_h: 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 diff --git a/data/mapHeaders/route18gate.asm b/data/mapHeaders/route18gate.asm index 090d43df2..1b5195277 100755 --- a/data/mapHeaders/route18gate.asm +++ b/data/mapHeaders/route18gate.asm @@ -2,5 +2,5 @@ Route18Gate_h: 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 diff --git a/data/mapHeaders/route18gateupstairs.asm b/data/mapHeaders/route18gateupstairs.asm index ac9e3d0a0..3f78af1bb 100755 --- a/data/mapHeaders/route18gateupstairs.asm +++ b/data/mapHeaders/route18gateupstairs.asm @@ -2,5 +2,5 @@ Route18GateUpstairs_h: 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 diff --git a/data/mapHeaders/route22gate.asm b/data/mapHeaders/route22gate.asm index 7b8963bac..a8c20e97e 100755 --- a/data/mapHeaders/route22gate.asm +++ b/data/mapHeaders/route22gate.asm @@ -2,5 +2,5 @@ Route22Gate_h: 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 diff --git a/data/mapHeaders/route2gate.asm b/data/mapHeaders/route2gate.asm index 5cb7bcbcc..7ef9f1a81 100755 --- a/data/mapHeaders/route2gate.asm +++ b/data/mapHeaders/route2gate.asm @@ -2,5 +2,5 @@ Route2Gate_h: 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 diff --git a/data/mapHeaders/route2house.asm b/data/mapHeaders/route2house.asm index c7c140f6b..2fc12748c 100755 --- a/data/mapHeaders/route2house.asm +++ b/data/mapHeaders/route2house.asm @@ -2,5 +2,5 @@ Route2House_h: 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 diff --git a/data/mapHeaders/route5gate.asm b/data/mapHeaders/route5gate.asm index 68810da12..be3fd45c0 100755 --- a/data/mapHeaders/route5gate.asm +++ b/data/mapHeaders/route5gate.asm @@ -2,5 +2,5 @@ Route5Gate_h: 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 diff --git a/data/mapHeaders/route6gate.asm b/data/mapHeaders/route6gate.asm index f689240c2..37c5032f8 100755 --- a/data/mapHeaders/route6gate.asm +++ b/data/mapHeaders/route6gate.asm @@ -2,5 +2,5 @@ Route6Gate_h: 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 diff --git a/data/mapHeaders/route7gate.asm b/data/mapHeaders/route7gate.asm index 9e01914f8..9b5802b3a 100755 --- a/data/mapHeaders/route7gate.asm +++ b/data/mapHeaders/route7gate.asm @@ -2,5 +2,5 @@ Route7Gate_h: 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 diff --git a/data/mapHeaders/route8gate.asm b/data/mapHeaders/route8gate.asm index d206e9786..665930583 100755 --- a/data/mapHeaders/route8gate.asm +++ b/data/mapHeaders/route8gate.asm @@ -2,5 +2,5 @@ Route8Gate_h: 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 diff --git a/data/mapHeaders/safarizonecenter.asm b/data/mapHeaders/safarizonecenter.asm index 6da27c12f..39f20b5d9 100755 --- a/data/mapHeaders/safarizonecenter.asm +++ b/data/mapHeaders/safarizonecenter.asm @@ -2,5 +2,5 @@ SafariZoneCenter_h: 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 diff --git a/data/mapHeaders/safarizoneeast.asm b/data/mapHeaders/safarizoneeast.asm index 089620dc8..f94a92bf1 100755 --- a/data/mapHeaders/safarizoneeast.asm +++ b/data/mapHeaders/safarizoneeast.asm @@ -2,5 +2,5 @@ SafariZoneEast_h: 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 diff --git a/data/mapHeaders/safarizoneentrance.asm b/data/mapHeaders/safarizoneentrance.asm index 1122d5a39..e2eabdcd4 100755 --- a/data/mapHeaders/safarizoneentrance.asm +++ b/data/mapHeaders/safarizoneentrance.asm @@ -2,5 +2,5 @@ SafariZoneEntrance_h: 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 diff --git a/data/mapHeaders/safarizonenorth.asm b/data/mapHeaders/safarizonenorth.asm index a3a46769b..5b01138da 100755 --- a/data/mapHeaders/safarizonenorth.asm +++ b/data/mapHeaders/safarizonenorth.asm @@ -2,5 +2,5 @@ SafariZoneNorth_h: 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 diff --git a/data/mapHeaders/safarizoneresthouse1.asm b/data/mapHeaders/safarizoneresthouse1.asm index b2988b477..0169c61fb 100755 --- a/data/mapHeaders/safarizoneresthouse1.asm +++ b/data/mapHeaders/safarizoneresthouse1.asm @@ -2,5 +2,5 @@ SafariZoneRestHouse1_h: 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 diff --git a/data/mapHeaders/safarizoneresthouse2.asm b/data/mapHeaders/safarizoneresthouse2.asm index 589d98503..804d619c3 100755 --- a/data/mapHeaders/safarizoneresthouse2.asm +++ b/data/mapHeaders/safarizoneresthouse2.asm @@ -2,5 +2,5 @@ SafariZoneRestHouse2_h: 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 diff --git a/data/mapHeaders/safarizoneresthouse3.asm b/data/mapHeaders/safarizoneresthouse3.asm index 21ffd3b6c..becd3e7c5 100755 --- a/data/mapHeaders/safarizoneresthouse3.asm +++ b/data/mapHeaders/safarizoneresthouse3.asm @@ -2,5 +2,5 @@ SafariZoneRestHouse3_h: 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 diff --git a/data/mapHeaders/safarizoneresthouse4.asm b/data/mapHeaders/safarizoneresthouse4.asm index fa7de7adc..7cc8fd25c 100755 --- a/data/mapHeaders/safarizoneresthouse4.asm +++ b/data/mapHeaders/safarizoneresthouse4.asm @@ -2,5 +2,5 @@ SafariZoneRestHouse4_h: 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 diff --git a/data/mapHeaders/safarizonesecrethouse.asm b/data/mapHeaders/safarizonesecrethouse.asm index 6b081b1a3..35575a103 100755 --- a/data/mapHeaders/safarizonesecrethouse.asm +++ b/data/mapHeaders/safarizonesecrethouse.asm @@ -2,5 +2,5 @@ SafariZoneSecretHouse_h: 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 diff --git a/data/mapHeaders/safarizonewest.asm b/data/mapHeaders/safarizonewest.asm index c1c54d135..24ac76867 100755 --- a/data/mapHeaders/safarizonewest.asm +++ b/data/mapHeaders/safarizonewest.asm @@ -2,5 +2,5 @@ SafariZoneWest_h: 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 diff --git a/data/mapHeaders/saffrongym.asm b/data/mapHeaders/saffrongym.asm index da3b4c045..4e9fe3835 100755 --- a/data/mapHeaders/saffrongym.asm +++ b/data/mapHeaders/saffrongym.asm @@ -2,5 +2,5 @@ SaffronGym_h: 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 diff --git a/data/mapHeaders/saffronhouse1.asm b/data/mapHeaders/saffronhouse1.asm index 9e22b03ba..747b46b41 100755 --- a/data/mapHeaders/saffronhouse1.asm +++ b/data/mapHeaders/saffronhouse1.asm @@ -2,5 +2,5 @@ SaffronHouse1_h: 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 diff --git a/data/mapHeaders/saffronhouse2.asm b/data/mapHeaders/saffronhouse2.asm index c38d02314..6a642a73f 100755 --- a/data/mapHeaders/saffronhouse2.asm +++ b/data/mapHeaders/saffronhouse2.asm @@ -2,5 +2,5 @@ SaffronHouse2_h: 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 diff --git a/data/mapHeaders/saffronmart.asm b/data/mapHeaders/saffronmart.asm index 747e4da97..72aadb567 100755 --- a/data/mapHeaders/saffronmart.asm +++ b/data/mapHeaders/saffronmart.asm @@ -2,5 +2,5 @@ SaffronMart_h: 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 diff --git a/data/mapHeaders/saffronpokecenter.asm b/data/mapHeaders/saffronpokecenter.asm index aa972289c..85e3b5e38 100755 --- a/data/mapHeaders/saffronpokecenter.asm +++ b/data/mapHeaders/saffronpokecenter.asm @@ -2,5 +2,5 @@ SaffronPokecenter_h: 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 diff --git a/data/mapHeaders/school.asm b/data/mapHeaders/school.asm index 8ace4fba2..4c122f2a5 100755 --- a/data/mapHeaders/school.asm +++ b/data/mapHeaders/school.asm @@ -2,5 +2,5 @@ School_h: 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 diff --git a/data/mapHeaders/seafoamislands1.asm b/data/mapHeaders/seafoamislands1.asm index f52a65a8b..32754b238 100755 --- a/data/mapHeaders/seafoamislands1.asm +++ b/data/mapHeaders/seafoamislands1.asm @@ -2,5 +2,5 @@ SeafoamIslands1_h: 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 diff --git a/data/mapHeaders/seafoamislands2.asm b/data/mapHeaders/seafoamislands2.asm index 08ec4bfa0..f59d72018 100755 --- a/data/mapHeaders/seafoamislands2.asm +++ b/data/mapHeaders/seafoamislands2.asm @@ -2,5 +2,5 @@ SeafoamIslands2_h: 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 diff --git a/data/mapHeaders/seafoamislands3.asm b/data/mapHeaders/seafoamislands3.asm index 4050cd713..e75325ea1 100755 --- a/data/mapHeaders/seafoamislands3.asm +++ b/data/mapHeaders/seafoamislands3.asm @@ -2,5 +2,5 @@ SeafoamIslands3_h: 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 diff --git a/data/mapHeaders/seafoamislands4.asm b/data/mapHeaders/seafoamislands4.asm index d3912ce0b..297ecbbb5 100755 --- a/data/mapHeaders/seafoamislands4.asm +++ b/data/mapHeaders/seafoamislands4.asm @@ -2,5 +2,5 @@ SeafoamIslands4_h: 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 diff --git a/data/mapHeaders/seafoamislands5.asm b/data/mapHeaders/seafoamislands5.asm index 2ae6d4b7f..1e8af6f74 100755 --- a/data/mapHeaders/seafoamislands5.asm +++ b/data/mapHeaders/seafoamislands5.asm @@ -2,5 +2,5 @@ SeafoamIslands5_h: 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 diff --git a/data/mapHeaders/silphco1.asm b/data/mapHeaders/silphco1.asm index 203f08b78..4a2b176fe 100755 --- a/data/mapHeaders/silphco1.asm +++ b/data/mapHeaders/silphco1.asm @@ -2,5 +2,5 @@ SilphCo1_h: 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 diff --git a/data/mapHeaders/silphco10.asm b/data/mapHeaders/silphco10.asm index a16a63233..716fa0253 100755 --- a/data/mapHeaders/silphco10.asm +++ b/data/mapHeaders/silphco10.asm @@ -2,5 +2,5 @@ SilphCo10_h: 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 diff --git a/data/mapHeaders/silphco11.asm b/data/mapHeaders/silphco11.asm index a5d2f1b0a..4ed282a91 100755 --- a/data/mapHeaders/silphco11.asm +++ b/data/mapHeaders/silphco11.asm @@ -2,5 +2,5 @@ SilphCo11_h: 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 diff --git a/data/mapHeaders/silphco2.asm b/data/mapHeaders/silphco2.asm index f0783e983..fae02d5b6 100755 --- a/data/mapHeaders/silphco2.asm +++ b/data/mapHeaders/silphco2.asm @@ -2,5 +2,5 @@ SilphCo2_h: 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 diff --git a/data/mapHeaders/silphco3.asm b/data/mapHeaders/silphco3.asm index b89a38021..98a130c02 100755 --- a/data/mapHeaders/silphco3.asm +++ b/data/mapHeaders/silphco3.asm @@ -2,5 +2,5 @@ SilphCo3_h: 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 diff --git a/data/mapHeaders/silphco4.asm b/data/mapHeaders/silphco4.asm index 3c03a771f..bc91f24bd 100755 --- a/data/mapHeaders/silphco4.asm +++ b/data/mapHeaders/silphco4.asm @@ -2,5 +2,5 @@ SilphCo4_h: 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 diff --git a/data/mapHeaders/silphco5.asm b/data/mapHeaders/silphco5.asm index 42704025b..c9a4c1d2e 100755 --- a/data/mapHeaders/silphco5.asm +++ b/data/mapHeaders/silphco5.asm @@ -2,5 +2,5 @@ SilphCo5_h: 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 diff --git a/data/mapHeaders/silphco6.asm b/data/mapHeaders/silphco6.asm index c204360ae..675709c25 100755 --- a/data/mapHeaders/silphco6.asm +++ b/data/mapHeaders/silphco6.asm @@ -2,5 +2,5 @@ SilphCo6_h: 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 diff --git a/data/mapHeaders/silphco7.asm b/data/mapHeaders/silphco7.asm index bc31b335b..ee46c3fb1 100755 --- a/data/mapHeaders/silphco7.asm +++ b/data/mapHeaders/silphco7.asm @@ -2,5 +2,5 @@ SilphCo7_h: 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 diff --git a/data/mapHeaders/silphco8.asm b/data/mapHeaders/silphco8.asm index aa3e03178..90c0ba0f8 100755 --- a/data/mapHeaders/silphco8.asm +++ b/data/mapHeaders/silphco8.asm @@ -2,5 +2,5 @@ SilphCo8_h: 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 diff --git a/data/mapHeaders/silphco9.asm b/data/mapHeaders/silphco9.asm index 97427fa31..182ec5b2b 100755 --- a/data/mapHeaders/silphco9.asm +++ b/data/mapHeaders/silphco9.asm @@ -2,5 +2,5 @@ SilphCo9_h: 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 diff --git a/data/mapHeaders/silphcoelevator.asm b/data/mapHeaders/silphcoelevator.asm index 8a6ae1ca1..3663cacde 100755 --- a/data/mapHeaders/silphcoelevator.asm +++ b/data/mapHeaders/silphcoelevator.asm @@ -2,5 +2,5 @@ SilphCoElevator_h: 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 diff --git a/data/mapHeaders/ssanne1.asm b/data/mapHeaders/ssanne1.asm index e6b485640..c69481d6e 100755 --- a/data/mapHeaders/ssanne1.asm +++ b/data/mapHeaders/ssanne1.asm @@ -2,5 +2,5 @@ SSAnne1_h: 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 diff --git a/data/mapHeaders/ssanne10.asm b/data/mapHeaders/ssanne10.asm index ef07424b5..79464bebe 100755 --- a/data/mapHeaders/ssanne10.asm +++ b/data/mapHeaders/ssanne10.asm @@ -2,5 +2,5 @@ SSAnne10_h: 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 diff --git a/data/mapHeaders/ssanne2.asm b/data/mapHeaders/ssanne2.asm index cd5f3aa47..7a6294e5d 100755 --- a/data/mapHeaders/ssanne2.asm +++ b/data/mapHeaders/ssanne2.asm @@ -2,5 +2,5 @@ SSAnne2_h: 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 diff --git a/data/mapHeaders/ssanne3.asm b/data/mapHeaders/ssanne3.asm index ffa57ddd9..78f9660b4 100755 --- a/data/mapHeaders/ssanne3.asm +++ b/data/mapHeaders/ssanne3.asm @@ -2,5 +2,5 @@ SSAnne3_h: 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 diff --git a/data/mapHeaders/ssanne4.asm b/data/mapHeaders/ssanne4.asm index 492b4b8dc..9ad2c66c1 100755 --- a/data/mapHeaders/ssanne4.asm +++ b/data/mapHeaders/ssanne4.asm @@ -2,5 +2,5 @@ SSAnne4_h: 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 diff --git a/data/mapHeaders/ssanne5.asm b/data/mapHeaders/ssanne5.asm index 29ffb6b9b..a2c2b9439 100755 --- a/data/mapHeaders/ssanne5.asm +++ b/data/mapHeaders/ssanne5.asm @@ -2,5 +2,5 @@ SSAnne5_h: 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 diff --git a/data/mapHeaders/ssanne6.asm b/data/mapHeaders/ssanne6.asm index e347528ad..5a939b8f7 100755 --- a/data/mapHeaders/ssanne6.asm +++ b/data/mapHeaders/ssanne6.asm @@ -2,5 +2,5 @@ SSAnne6_h: 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 diff --git a/data/mapHeaders/ssanne7.asm b/data/mapHeaders/ssanne7.asm index 9b4376882..976665301 100755 --- a/data/mapHeaders/ssanne7.asm +++ b/data/mapHeaders/ssanne7.asm @@ -2,5 +2,5 @@ SSAnne7_h: 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 diff --git a/data/mapHeaders/ssanne8.asm b/data/mapHeaders/ssanne8.asm index 64b5c565e..2771ad40f 100755 --- a/data/mapHeaders/ssanne8.asm +++ b/data/mapHeaders/ssanne8.asm @@ -2,5 +2,5 @@ SSAnne8_h: 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 diff --git a/data/mapHeaders/ssanne9.asm b/data/mapHeaders/ssanne9.asm index c8e6e16f5..8f944cf9c 100755 --- a/data/mapHeaders/ssanne9.asm +++ b/data/mapHeaders/ssanne9.asm @@ -2,5 +2,5 @@ SSAnne9_h: 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 diff --git a/data/mapHeaders/tradecenter.asm b/data/mapHeaders/tradecenter.asm index 09217ff09..5d6c7d951 100755 --- a/data/mapHeaders/tradecenter.asm +++ b/data/mapHeaders/tradecenter.asm @@ -2,5 +2,5 @@ TradeCenter_h: 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 diff --git a/data/mapHeaders/undergroundpathentranceroute5.asm b/data/mapHeaders/undergroundpathentranceroute5.asm index 6e2c5727a..9f5a21257 100755 --- a/data/mapHeaders/undergroundpathentranceroute5.asm +++ b/data/mapHeaders/undergroundpathentranceroute5.asm @@ -2,5 +2,5 @@ UndergroundPathEntranceRoute5_h: 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 diff --git a/data/mapHeaders/undergroundpathentranceroute6.asm b/data/mapHeaders/undergroundpathentranceroute6.asm index bb22e93e8..4a5670af1 100755 --- a/data/mapHeaders/undergroundpathentranceroute6.asm +++ b/data/mapHeaders/undergroundpathentranceroute6.asm @@ -2,5 +2,5 @@ UndergroundPathEntranceRoute6_h: 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 diff --git a/data/mapHeaders/undergroundpathentranceroute7.asm b/data/mapHeaders/undergroundpathentranceroute7.asm index 49b034153..e3fe68f00 100755 --- a/data/mapHeaders/undergroundpathentranceroute7.asm +++ b/data/mapHeaders/undergroundpathentranceroute7.asm @@ -2,5 +2,5 @@ UndergroundPathEntranceRoute7_h: 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 diff --git a/data/mapHeaders/undergroundpathentranceroute7copy.asm b/data/mapHeaders/undergroundpathentranceroute7copy.asm index e12ee454e..a15f2f4db 100755 --- a/data/mapHeaders/undergroundpathentranceroute7copy.asm +++ b/data/mapHeaders/undergroundpathentranceroute7copy.asm @@ -2,5 +2,5 @@ UndergroundPathEntranceRoute7Copy_h: 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 diff --git a/data/mapHeaders/undergroundpathentranceroute8.asm b/data/mapHeaders/undergroundpathentranceroute8.asm index c70cb6978..0698da9a2 100755 --- a/data/mapHeaders/undergroundpathentranceroute8.asm +++ b/data/mapHeaders/undergroundpathentranceroute8.asm @@ -2,5 +2,5 @@ UndergroundPathEntranceRoute8_h: 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 diff --git a/data/mapHeaders/undergroundpathns.asm b/data/mapHeaders/undergroundpathns.asm index 4dc866477..ba021bea6 100755 --- a/data/mapHeaders/undergroundpathns.asm +++ b/data/mapHeaders/undergroundpathns.asm @@ -2,5 +2,5 @@ UndergroundPathNS_h: 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 diff --git a/data/mapHeaders/undergroundpathwe.asm b/data/mapHeaders/undergroundpathwe.asm index df2f98e18..7061a8d17 100755 --- a/data/mapHeaders/undergroundpathwe.asm +++ b/data/mapHeaders/undergroundpathwe.asm @@ -2,5 +2,5 @@ UndergroundPathWE_h: 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 diff --git a/data/mapHeaders/unknowndungeon1.asm b/data/mapHeaders/unknowndungeon1.asm index e784ffac0..0c6adbbd3 100755 --- a/data/mapHeaders/unknowndungeon1.asm +++ b/data/mapHeaders/unknowndungeon1.asm @@ -2,5 +2,5 @@ UnknownDungeon1_h: 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 diff --git a/data/mapHeaders/unknowndungeon2.asm b/data/mapHeaders/unknowndungeon2.asm index 3c4c8d4e2..b5147da2c 100755 --- a/data/mapHeaders/unknowndungeon2.asm +++ b/data/mapHeaders/unknowndungeon2.asm @@ -2,5 +2,5 @@ UnknownDungeon2_h: 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 diff --git a/data/mapHeaders/unknowndungeon3.asm b/data/mapHeaders/unknowndungeon3.asm index 2e01c0792..4b5372d27 100755 --- a/data/mapHeaders/unknowndungeon3.asm +++ b/data/mapHeaders/unknowndungeon3.asm @@ -2,5 +2,5 @@ UnknownDungeon3_h: 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 diff --git a/data/mapHeaders/vermiliondock.asm b/data/mapHeaders/vermiliondock.asm index 16b1c7d81..5d93f2846 100755 --- a/data/mapHeaders/vermiliondock.asm +++ b/data/mapHeaders/vermiliondock.asm @@ -2,5 +2,5 @@ VermilionDock_h: 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 diff --git a/data/mapHeaders/vermiliongym.asm b/data/mapHeaders/vermiliongym.asm index 7624ed752..e960a70f4 100755 --- a/data/mapHeaders/vermiliongym.asm +++ b/data/mapHeaders/vermiliongym.asm @@ -2,5 +2,5 @@ VermilionGym_h: 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 diff --git a/data/mapHeaders/vermilionhouse1.asm b/data/mapHeaders/vermilionhouse1.asm index 94aac1d0d..47375c914 100755 --- a/data/mapHeaders/vermilionhouse1.asm +++ b/data/mapHeaders/vermilionhouse1.asm @@ -2,5 +2,5 @@ VermilionHouse1_h: 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 diff --git a/data/mapHeaders/vermilionhouse2.asm b/data/mapHeaders/vermilionhouse2.asm index b41240887..3a870db3c 100755 --- a/data/mapHeaders/vermilionhouse2.asm +++ b/data/mapHeaders/vermilionhouse2.asm @@ -2,5 +2,5 @@ VermilionHouse2_h: 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 diff --git a/data/mapHeaders/vermilionhouse3.asm b/data/mapHeaders/vermilionhouse3.asm index 016835328..139f69f6f 100755 --- a/data/mapHeaders/vermilionhouse3.asm +++ b/data/mapHeaders/vermilionhouse3.asm @@ -2,5 +2,5 @@ VermilionHouse3_h: 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 diff --git a/data/mapHeaders/vermilionmart.asm b/data/mapHeaders/vermilionmart.asm index 97fccc4d8..e9dcd9133 100755 --- a/data/mapHeaders/vermilionmart.asm +++ b/data/mapHeaders/vermilionmart.asm @@ -2,5 +2,5 @@ VermilionMart_h: 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 diff --git a/data/mapHeaders/vermilionpokecenter.asm b/data/mapHeaders/vermilionpokecenter.asm index e1a63f9ee..6a84204d8 100755 --- a/data/mapHeaders/vermilionpokecenter.asm +++ b/data/mapHeaders/vermilionpokecenter.asm @@ -2,5 +2,5 @@ VermilionPokecenter_h: 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 diff --git a/data/mapHeaders/victoryroad1.asm b/data/mapHeaders/victoryroad1.asm index 6d2f4338f..cb902e37b 100755 --- a/data/mapHeaders/victoryroad1.asm +++ b/data/mapHeaders/victoryroad1.asm @@ -2,5 +2,5 @@ VictoryRoad1_h: 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 diff --git a/data/mapHeaders/victoryroad2.asm b/data/mapHeaders/victoryroad2.asm index fa9803b2d..223652e56 100755 --- a/data/mapHeaders/victoryroad2.asm +++ b/data/mapHeaders/victoryroad2.asm @@ -2,5 +2,5 @@ VictoryRoad2_h: 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 diff --git a/data/mapHeaders/victoryroad3.asm b/data/mapHeaders/victoryroad3.asm index 4202bfb66..5401fe101 100755 --- a/data/mapHeaders/victoryroad3.asm +++ b/data/mapHeaders/victoryroad3.asm @@ -2,5 +2,5 @@ VictoryRoad3_h: 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 diff --git a/data/mapHeaders/viridianforest.asm b/data/mapHeaders/viridianforest.asm index ef7905b02..250f3de82 100755 --- a/data/mapHeaders/viridianforest.asm +++ b/data/mapHeaders/viridianforest.asm @@ -2,5 +2,5 @@ ViridianForest_h: 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 diff --git a/data/mapHeaders/viridianforestentrance.asm b/data/mapHeaders/viridianforestentrance.asm index 6e861c580..81534daa7 100755 --- a/data/mapHeaders/viridianforestentrance.asm +++ b/data/mapHeaders/viridianforestentrance.asm @@ -2,5 +2,5 @@ ViridianForestEntrance_h: 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 diff --git a/data/mapHeaders/viridianforestexit.asm b/data/mapHeaders/viridianforestexit.asm index 8e1dd25e2..9c4924872 100755 --- a/data/mapHeaders/viridianforestexit.asm +++ b/data/mapHeaders/viridianforestexit.asm @@ -2,5 +2,5 @@ ViridianForestExit_h: 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 diff --git a/data/mapHeaders/viridiangym.asm b/data/mapHeaders/viridiangym.asm index 40b0d69f3..19833cf03 100755 --- a/data/mapHeaders/viridiangym.asm +++ b/data/mapHeaders/viridiangym.asm @@ -2,5 +2,5 @@ ViridianGym_h: 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 diff --git a/data/mapHeaders/viridianhouse.asm b/data/mapHeaders/viridianhouse.asm index c8724b4e7..a80953f96 100755 --- a/data/mapHeaders/viridianhouse.asm +++ b/data/mapHeaders/viridianhouse.asm @@ -2,7 +2,7 @@ ViridianHouse_h: 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 diff --git a/data/mapHeaders/viridianmart.asm b/data/mapHeaders/viridianmart.asm index 3d799a5b9..39281567c 100755 --- a/data/mapHeaders/viridianmart.asm +++ b/data/mapHeaders/viridianmart.asm @@ -2,5 +2,5 @@ ViridianMart_h: 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 diff --git a/data/mapHeaders/viridianpokecenter.asm b/data/mapHeaders/viridianpokecenter.asm index 3218e89d9..fbef51930 100755 --- a/data/mapHeaders/viridianpokecenter.asm +++ b/data/mapHeaders/viridianpokecenter.asm @@ -2,5 +2,5 @@ ViridianPokecenter_h: 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 diff --git a/data/mapObjects/agatha.asm b/data/mapObjects/agatha.asm index b61dff298..cd8bbfe77 100755 --- 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 diff --git a/data/mapObjects/bikeshop.asm b/data/mapObjects/bikeshop.asm index e5ff250cf..98208a949 100755 --- 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 diff --git a/data/mapObjects/billshouse.asm b/data/mapObjects/billshouse.asm index e152dadd9..317d7c01a 100755 --- 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 diff --git a/data/mapObjects/blueshouse.asm b/data/mapObjects/blueshouse.asm index 302c18acf..19338885b 100755 --- 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 diff --git a/data/mapObjects/bruno.asm b/data/mapObjects/bruno.asm index 85d789cc9..45d211866 100755 --- 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 diff --git a/data/mapObjects/celadoncity.asm b/data/mapObjects/celadoncity.asm index 7471563c7..f3e481f45 100755 --- 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 diff --git a/data/mapObjects/celadondiner.asm b/data/mapObjects/celadondiner.asm index 63426279c..b976a0455 100755 --- 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 diff --git a/data/mapObjects/celadongamecorner.asm b/data/mapObjects/celadongamecorner.asm index 028a08395..a09691d69 100755 --- 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 diff --git a/data/mapObjects/celadongym.asm b/data/mapObjects/celadongym.asm index 0045bf730..b087153bd 100755 --- 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 diff --git a/data/mapObjects/celadonhotel.asm b/data/mapObjects/celadonhotel.asm index 1f7916f7b..09b4d99ca 100755 --- 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 diff --git a/data/mapObjects/celadonhouse.asm b/data/mapObjects/celadonhouse.asm index 83b91723e..d24354a64 100755 --- 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 diff --git a/data/mapObjects/celadonmansion1.asm b/data/mapObjects/celadonmansion1.asm index c07ff5214..423a9a2ed 100755 --- 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 diff --git a/data/mapObjects/celadonmansion2.asm b/data/mapObjects/celadonmansion2.asm index fd7e58b90..f2b96d89f 100755 --- 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 diff --git a/data/mapObjects/celadonmansion3.asm b/data/mapObjects/celadonmansion3.asm index d96c906f9..e9718d9fd 100755 --- 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 diff --git a/data/mapObjects/celadonmansion4.asm b/data/mapObjects/celadonmansion4.asm index 5bd2db069..98f538ebb 100755 --- 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 diff --git a/data/mapObjects/celadonmansion5.asm b/data/mapObjects/celadonmansion5.asm index f439c5eb8..0fd06d13e 100755 --- 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 diff --git a/data/mapObjects/celadonmart1.asm b/data/mapObjects/celadonmart1.asm index f9869322d..bfd669963 100755 --- 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 diff --git a/data/mapObjects/celadonmart2.asm b/data/mapObjects/celadonmart2.asm index ab69c91a2..215861e62 100755 --- 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 diff --git a/data/mapObjects/celadonmart3.asm b/data/mapObjects/celadonmart3.asm index ba913e062..023e3b465 100755 --- 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 diff --git a/data/mapObjects/celadonmart4.asm b/data/mapObjects/celadonmart4.asm index 749cc4013..e3ea8955f 100755 --- 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 diff --git a/data/mapObjects/celadonmart5.asm b/data/mapObjects/celadonmart5.asm index bf184d5fb..ac2fa4544 100755 --- 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 diff --git a/data/mapObjects/celadonmartelevator.asm b/data/mapObjects/celadonmartelevator.asm index f7bd1ede7..49745aa97 100755 --- 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 diff --git a/data/mapObjects/celadonmartroof.asm b/data/mapObjects/celadonmartroof.asm index 7a2d1a7ff..0268b1ec0 100755 --- 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 diff --git a/data/mapObjects/celadonpokecenter.asm b/data/mapObjects/celadonpokecenter.asm index 6393ee695..ab037ec0b 100755 --- 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 diff --git a/data/mapObjects/celadonprizeroom.asm b/data/mapObjects/celadonprizeroom.asm index dbffa9b91..bdaafe02b 100755 --- 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 diff --git a/data/mapObjects/ceruleancity.asm b/data/mapObjects/ceruleancity.asm index bdff20475..66d18a29c 100755 --- 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 diff --git a/data/mapObjects/ceruleangym.asm b/data/mapObjects/ceruleangym.asm index e4ce62506..d774c5dd1 100755 --- 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 diff --git a/data/mapObjects/ceruleanhouse1.asm b/data/mapObjects/ceruleanhouse1.asm index 6c47bba96..a8c636cf6 100755 --- 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 diff --git a/data/mapObjects/ceruleanhouse2.asm b/data/mapObjects/ceruleanhouse2.asm index 65f457bc2..cf54c719d 100755 --- 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 diff --git a/data/mapObjects/ceruleanhousetrashed.asm b/data/mapObjects/ceruleanhousetrashed.asm index c5a88424a..7b90ff735 100755 --- 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 diff --git a/data/mapObjects/ceruleanmart.asm b/data/mapObjects/ceruleanmart.asm index 5c30bf033..389e0317e 100755 --- 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 diff --git a/data/mapObjects/ceruleanpokecenter.asm b/data/mapObjects/ceruleanpokecenter.asm index 7a862ec32..a6d7a5b50 100755 --- 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 diff --git a/data/mapObjects/cinnabargym.asm b/data/mapObjects/cinnabargym.asm index b9fb420e2..3fc25a02d 100755 --- 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 diff --git a/data/mapObjects/cinnabarisland.asm b/data/mapObjects/cinnabarisland.asm index 0fcfed382..a66d64441 100755 --- 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 diff --git a/data/mapObjects/cinnabarmart.asm b/data/mapObjects/cinnabarmart.asm index 2c740a059..cf135039c 100755 --- 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 diff --git a/data/mapObjects/cinnabarpokecenter.asm b/data/mapObjects/cinnabarpokecenter.asm index 19baee756..d1707ec7c 100755 --- 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 diff --git a/data/mapObjects/colosseum.asm b/data/mapObjects/colosseum.asm index f879d9e9f..1c32de2fc 100755 --- 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 diff --git a/data/mapObjects/copycatshouse1f.asm b/data/mapObjects/copycatshouse1f.asm index 02ca3859e..e0e02a8d5 100755 --- 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 diff --git a/data/mapObjects/copycatshouse2f.asm b/data/mapObjects/copycatshouse2f.asm index 1f36b2e53..529f34161 100755 --- 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 diff --git a/data/mapObjects/daycarem.asm b/data/mapObjects/daycarem.asm index c435d7fe5..7c10fe700 100755 --- 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 diff --git a/data/mapObjects/diglettscave.asm b/data/mapObjects/diglettscave.asm index da2b86563..ef4de039c 100755 --- 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 diff --git a/data/mapObjects/diglettscaveroute11.asm b/data/mapObjects/diglettscaveroute11.asm index 45cbfc49f..af28bfbf9 100755 --- 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 diff --git a/data/mapObjects/diglettscaveroute2.asm b/data/mapObjects/diglettscaveroute2.asm index ef4d45add..645cc3852 100755 --- 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 diff --git a/data/mapObjects/fanclub.asm b/data/mapObjects/fanclub.asm index 3cfc6c000..8e0fd931c 100755 --- 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 diff --git a/data/mapObjects/fightingdojo.asm b/data/mapObjects/fightingdojo.asm index 952da1a40..b9ff94491 100755 --- 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 diff --git a/data/mapObjects/fuchsiacity.asm b/data/mapObjects/fuchsiacity.asm index 180c051af..c89c03cd7 100755 --- 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 diff --git a/data/mapObjects/fuchsiagym.asm b/data/mapObjects/fuchsiagym.asm index 7578323ca..23314fb9f 100755 --- 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 diff --git a/data/mapObjects/fuchsiahouse1.asm b/data/mapObjects/fuchsiahouse1.asm index 897454851..ca4638f97 100755 --- 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 diff --git a/data/mapObjects/fuchsiahouse2.asm b/data/mapObjects/fuchsiahouse2.asm index a1c3aefef..e37025947 100755 --- 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 diff --git a/data/mapObjects/fuchsiahouse3.asm b/data/mapObjects/fuchsiahouse3.asm index ea17c953e..0bed500b9 100755 --- 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 diff --git a/data/mapObjects/fuchsiamart.asm b/data/mapObjects/fuchsiamart.asm index ab06366d5..bfb939793 100755 --- 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 diff --git a/data/mapObjects/fuchsiameetingroom.asm b/data/mapObjects/fuchsiameetingroom.asm index 4330b59e8..c6c104156 100755 --- 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 diff --git a/data/mapObjects/fuchsiapokecenter.asm b/data/mapObjects/fuchsiapokecenter.asm index 7db09516d..12540cd3f 100755 --- 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 diff --git a/data/mapObjects/gary.asm b/data/mapObjects/gary.asm index c16bdec85..10d9f0ed5 100755 --- 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 diff --git a/data/mapObjects/halloffameroom.asm b/data/mapObjects/halloffameroom.asm index dc63d777f..a815a053b 100755 --- 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 diff --git a/data/mapObjects/indigoplateau.asm b/data/mapObjects/indigoplateau.asm index cfabb44cb..d18f25e1c 100755 --- 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 diff --git a/data/mapObjects/indigoplateaulobby.asm b/data/mapObjects/indigoplateaulobby.asm index b7149d3f9..d82256a1f 100755 --- 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 diff --git a/data/mapObjects/lab1.asm b/data/mapObjects/lab1.asm index cbd8e179a..b9eea5818 100755 --- 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 diff --git a/data/mapObjects/lab2.asm b/data/mapObjects/lab2.asm index 81fdbc8a6..3062fcae5 100755 --- 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 diff --git a/data/mapObjects/lab3.asm b/data/mapObjects/lab3.asm index fea6581e0..73ba321d6 100755 --- 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 diff --git a/data/mapObjects/lab4.asm b/data/mapObjects/lab4.asm index cee795289..b9956f5f2 100755 --- 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 diff --git a/data/mapObjects/lance.asm b/data/mapObjects/lance.asm index 572ae77c9..77c0058c6 100755 --- 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 diff --git a/data/mapObjects/lavenderhouse1.asm b/data/mapObjects/lavenderhouse1.asm index cd925419d..d9b61302a 100755 --- 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 diff --git a/data/mapObjects/lavenderhouse2.asm b/data/mapObjects/lavenderhouse2.asm index a70b4e66e..6d900f45d 100755 --- 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 diff --git a/data/mapObjects/lavendermart.asm b/data/mapObjects/lavendermart.asm index 68ae3ada6..6661fee9e 100755 --- 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 diff --git a/data/mapObjects/lavenderpokecenter.asm b/data/mapObjects/lavenderpokecenter.asm index e7825178a..b3eea8ec2 100755 --- 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 diff --git a/data/mapObjects/lavendertown.asm b/data/mapObjects/lavendertown.asm index 16fc183f8..5788c4f3a 100755 --- 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 diff --git a/data/mapObjects/lorelei.asm b/data/mapObjects/lorelei.asm index 82f0c47f0..e5f0f9f28 100755 --- 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 diff --git a/data/mapObjects/mansion1.asm b/data/mapObjects/mansion1.asm index 6e639865a..fe543f27e 100755 --- 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 diff --git a/data/mapObjects/mansion2.asm b/data/mapObjects/mansion2.asm index b005aff5c..cea8c8fc5 100755 --- 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 diff --git a/data/mapObjects/mansion3.asm b/data/mapObjects/mansion3.asm index d100598d5..f6ec7aeeb 100755 --- 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 diff --git a/data/mapObjects/mansion4.asm b/data/mapObjects/mansion4.asm index ec1c19fbe..3db9d0161 100755 --- 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 diff --git a/data/mapObjects/mtmoon1.asm b/data/mapObjects/mtmoon1.asm index d8d5ca8b6..707281aa4 100755 --- 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 diff --git a/data/mapObjects/mtmoon2.asm b/data/mapObjects/mtmoon2.asm index 2ac19fdf9..abff40943 100755 --- 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 diff --git a/data/mapObjects/mtmoon3.asm b/data/mapObjects/mtmoon3.asm index d5aeadc94..13aa5a799 100755 --- 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 diff --git a/data/mapObjects/mtmoonpokecenter.asm b/data/mapObjects/mtmoonpokecenter.asm index a76c8835b..841d0194b 100755 --- 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 diff --git a/data/mapObjects/museum1f.asm b/data/mapObjects/museum1f.asm index 557eaf632..3034dc741 100755 --- 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 diff --git a/data/mapObjects/museum2f.asm b/data/mapObjects/museum2f.asm index a2f626604..11fad941c 100755 --- 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 diff --git a/data/mapObjects/namerater.asm b/data/mapObjects/namerater.asm index 320d8b619..10487f0b0 100755 --- 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 diff --git a/data/mapObjects/oakslab.asm b/data/mapObjects/oakslab.asm index 995dec292..d7fc8029d 100755 --- 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 diff --git a/data/mapObjects/pallettown.asm b/data/mapObjects/pallettown.asm index 6063176fd..1bd3d62bf 100755 --- 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 diff --git a/data/mapObjects/pewtercity.asm b/data/mapObjects/pewtercity.asm index 5fd1d48d5..4e7d24d08 100755 --- 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 diff --git a/data/mapObjects/pewtergym.asm b/data/mapObjects/pewtergym.asm index 65fcf7237..fc571f266 100755 --- 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 diff --git a/data/mapObjects/pewterhouse1.asm b/data/mapObjects/pewterhouse1.asm index 1126a73ac..63abe6b3e 100755 --- 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 diff --git a/data/mapObjects/pewterhouse2.asm b/data/mapObjects/pewterhouse2.asm index 64d8b131a..48cb243da 100755 --- 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 diff --git a/data/mapObjects/pewtermart.asm b/data/mapObjects/pewtermart.asm index 2409c11c0..e79952c97 100755 --- 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 diff --git a/data/mapObjects/pewterpokecenter.asm b/data/mapObjects/pewterpokecenter.asm index 15374fd17..29f02eb95 100755 --- 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 diff --git a/data/mapObjects/pokemontower1.asm b/data/mapObjects/pokemontower1.asm index 036f0f135..f15299dab 100755 --- 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 diff --git a/data/mapObjects/pokemontower2.asm b/data/mapObjects/pokemontower2.asm index 95b8c4569..80615cd57 100755 --- 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 diff --git a/data/mapObjects/pokemontower3.asm b/data/mapObjects/pokemontower3.asm index c2a23d852..0e7f5e1f7 100755 --- 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 diff --git a/data/mapObjects/pokemontower4.asm b/data/mapObjects/pokemontower4.asm index 41e54571d..9acea43e4 100755 --- 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 diff --git a/data/mapObjects/pokemontower5.asm b/data/mapObjects/pokemontower5.asm index 0b3349d83..ac0668b2c 100755 --- 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 diff --git a/data/mapObjects/pokemontower6.asm b/data/mapObjects/pokemontower6.asm index 13cde3989..1dd666298 100755 --- 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 diff --git a/data/mapObjects/pokemontower7.asm b/data/mapObjects/pokemontower7.asm index d170d21a4..9609253fb 100755 --- 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 diff --git a/data/mapObjects/powerplant.asm b/data/mapObjects/powerplant.asm index b6e5c2317..402f899f3 100755 --- 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 diff --git a/data/mapObjects/redshouse1f.asm b/data/mapObjects/redshouse1f.asm index ed7872460..aabe6656b 100755 --- 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 diff --git a/data/mapObjects/redshouse2f.asm b/data/mapObjects/redshouse2f.asm index 8aa0f1e57..af3c4b6b6 100755 --- 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 diff --git a/data/mapObjects/rockethideout1.asm b/data/mapObjects/rockethideout1.asm index 264f20ab4..3a51808db 100755 --- 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 diff --git a/data/mapObjects/rockethideout2.asm b/data/mapObjects/rockethideout2.asm index d5ac71b5c..328a4fb5f 100755 --- 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 diff --git a/data/mapObjects/rockethideout3.asm b/data/mapObjects/rockethideout3.asm index 07ce84776..a8da69d28 100755 --- 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 diff --git a/data/mapObjects/rockethideout4.asm b/data/mapObjects/rockethideout4.asm index 9f69ba516..97025c714 100755 --- 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 diff --git a/data/mapObjects/rockethideoutelevator.asm b/data/mapObjects/rockethideoutelevator.asm index 9c3a8c7d9..583c9f898 100755 --- 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 diff --git a/data/mapObjects/rocktunnel1.asm b/data/mapObjects/rocktunnel1.asm index 1d3d0bb20..1cfeca652 100755 --- 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 diff --git a/data/mapObjects/rocktunnel2.asm b/data/mapObjects/rocktunnel2.asm index bc78fb550..d60863c1b 100755 --- 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 diff --git a/data/mapObjects/rocktunnelpokecenter.asm b/data/mapObjects/rocktunnelpokecenter.asm index eabddddfa..c664b2060 100755 --- 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 diff --git a/data/mapObjects/route1.asm b/data/mapObjects/route1.asm index 497d242d4..26505ea62 100755 --- 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 diff --git a/data/mapObjects/route10.asm b/data/mapObjects/route10.asm index f94e04cf2..90abb47d1 100755 --- 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 diff --git a/data/mapObjects/route11.asm b/data/mapObjects/route11.asm index 95e1c7f44..8d8e35d61 100755 --- 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 diff --git a/data/mapObjects/route11gate.asm b/data/mapObjects/route11gate.asm index de62250f7..fa6279636 100755 --- 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 diff --git a/data/mapObjects/route11gateupstairs.asm b/data/mapObjects/route11gateupstairs.asm index ad0d073cb..e112c685b 100755 --- 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 diff --git a/data/mapObjects/route12.asm b/data/mapObjects/route12.asm index 8bd9e94d2..b72317d47 100755 --- 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 diff --git a/data/mapObjects/route12gate.asm b/data/mapObjects/route12gate.asm index 35cab5207..bbfab54cf 100755 --- 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 diff --git a/data/mapObjects/route12gateupstairs.asm b/data/mapObjects/route12gateupstairs.asm index 5eea516a6..9351ebac2 100755 --- 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 diff --git a/data/mapObjects/route12house.asm b/data/mapObjects/route12house.asm index 384a6eda2..3161ebe6e 100755 --- 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 diff --git a/data/mapObjects/route13.asm b/data/mapObjects/route13.asm index 38e475a29..b2a40c2c1 100755 --- 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 diff --git a/data/mapObjects/route14.asm b/data/mapObjects/route14.asm index 5959041bd..9694715b5 100755 --- 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 diff --git a/data/mapObjects/route15.asm b/data/mapObjects/route15.asm index 7715068df..21fd2d97f 100755 --- 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 diff --git a/data/mapObjects/route15gate.asm b/data/mapObjects/route15gate.asm index 4d1b87363..13c39674b 100755 --- 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 diff --git a/data/mapObjects/route15gateupstairs.asm b/data/mapObjects/route15gateupstairs.asm index 23d56eeac..ff180883c 100755 --- 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 diff --git a/data/mapObjects/route16.asm b/data/mapObjects/route16.asm index 5acb748f4..35ffea17b 100755 --- 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 diff --git a/data/mapObjects/route16gate.asm b/data/mapObjects/route16gate.asm index 94e85a4a7..4e1863ed8 100755 --- 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 diff --git a/data/mapObjects/route16gateupstairs.asm b/data/mapObjects/route16gateupstairs.asm index 520c3e5a0..41487e6e5 100755 --- 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 diff --git a/data/mapObjects/route16house.asm b/data/mapObjects/route16house.asm index 8c1bab196..7a097105c 100755 --- 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 diff --git a/data/mapObjects/route17.asm b/data/mapObjects/route17.asm index 854e7d6ed..48750597e 100755 --- 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 diff --git a/data/mapObjects/route18.asm b/data/mapObjects/route18.asm index fc9c7d841..d7851f884 100755 --- 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 diff --git a/data/mapObjects/route18gate.asm b/data/mapObjects/route18gate.asm index 1eea9cfe8..c73d71312 100755 --- 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 diff --git a/data/mapObjects/route18gateupstairs.asm b/data/mapObjects/route18gateupstairs.asm index 21604b66b..6d2980556 100755 --- 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 diff --git a/data/mapObjects/route19.asm b/data/mapObjects/route19.asm index 13c003305..935b3d4d3 100755 --- 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 diff --git a/data/mapObjects/route2.asm b/data/mapObjects/route2.asm index b9e921cd7..b62f9fdbf 100755 --- 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 diff --git a/data/mapObjects/route20.asm b/data/mapObjects/route20.asm index 3d18495a3..5f4d56476 100755 --- 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 diff --git a/data/mapObjects/route21.asm b/data/mapObjects/route21.asm index aaa87d8a3..bb2409ceb 100755 --- 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 diff --git a/data/mapObjects/route22.asm b/data/mapObjects/route22.asm index 377cf6c9b..e91eb7929 100755 --- 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 diff --git a/data/mapObjects/route22gate.asm b/data/mapObjects/route22gate.asm index 6340b7025..aa9512c6a 100755 --- 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 diff --git a/data/mapObjects/route23.asm b/data/mapObjects/route23.asm index 613ce6f41..2fd3e3d7a 100755 --- 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 diff --git a/data/mapObjects/route24.asm b/data/mapObjects/route24.asm index 9ca277c8e..0fcc1d7b4 100755 --- 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 diff --git a/data/mapObjects/route25.asm b/data/mapObjects/route25.asm index abc40804b..3ba5fbdbe 100755 --- 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 diff --git a/data/mapObjects/route2gate.asm b/data/mapObjects/route2gate.asm index 6d2244ecb..714b8ee60 100755 --- 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 diff --git a/data/mapObjects/route2house.asm b/data/mapObjects/route2house.asm index 1a6f4b524..b27b65ef6 100755 --- 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 diff --git a/data/mapObjects/route3.asm b/data/mapObjects/route3.asm index 827dc14d9..422fa29be 100755 --- 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 diff --git a/data/mapObjects/route4.asm b/data/mapObjects/route4.asm index 30e3ff24e..7d09c28ac 100755 --- 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 diff --git a/data/mapObjects/route5.asm b/data/mapObjects/route5.asm index 445c7aab9..62aa64318 100755 --- 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 diff --git a/data/mapObjects/route5gate.asm b/data/mapObjects/route5gate.asm index 0ceedb9bb..8b2309420 100755 --- 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 diff --git a/data/mapObjects/route6.asm b/data/mapObjects/route6.asm index 4bb5fbc42..e0eea85b4 100755 --- 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 diff --git a/data/mapObjects/route6gate.asm b/data/mapObjects/route6gate.asm index cc5ccdc21..e3b7b2b86 100755 --- 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 diff --git a/data/mapObjects/route7.asm b/data/mapObjects/route7.asm index cb6f2ecb4..d32e6019d 100755 --- 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 diff --git a/data/mapObjects/route7gate.asm b/data/mapObjects/route7gate.asm index 28b4b1cfe..0b726fd33 100755 --- 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 diff --git a/data/mapObjects/route8.asm b/data/mapObjects/route8.asm index 1dc066fb8..dc7580fcb 100755 --- 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 diff --git a/data/mapObjects/route8gate.asm b/data/mapObjects/route8gate.asm index 0d43bb807..ac286aa0c 100755 --- 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 diff --git a/data/mapObjects/route9.asm b/data/mapObjects/route9.asm index 5ed4fe06d..ab3ceefec 100755 --- 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 diff --git a/data/mapObjects/safarizonecenter.asm b/data/mapObjects/safarizonecenter.asm index 7ce03028d..550f9aa4f 100755 --- 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 diff --git a/data/mapObjects/safarizoneeast.asm b/data/mapObjects/safarizoneeast.asm index e4eb6885d..53553161b 100755 --- 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 diff --git a/data/mapObjects/safarizoneentrance.asm b/data/mapObjects/safarizoneentrance.asm index 9a54ae937..5a3379c72 100755 --- 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 diff --git a/data/mapObjects/safarizonenorth.asm b/data/mapObjects/safarizonenorth.asm index 0fb2c68f2..6cbe51f69 100755 --- 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 diff --git a/data/mapObjects/safarizoneresthouse1.asm b/data/mapObjects/safarizoneresthouse1.asm index b90e62bf8..031debecd 100755 --- 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 diff --git a/data/mapObjects/safarizoneresthouse2.asm b/data/mapObjects/safarizoneresthouse2.asm index 80def1e3e..7e589731b 100755 --- 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 diff --git a/data/mapObjects/safarizoneresthouse3.asm b/data/mapObjects/safarizoneresthouse3.asm index 0b11f2bda..006239533 100755 --- 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 diff --git a/data/mapObjects/safarizoneresthouse4.asm b/data/mapObjects/safarizoneresthouse4.asm index 407b74d68..d3b81b4ee 100755 --- 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 diff --git a/data/mapObjects/safarizonesecrethouse.asm b/data/mapObjects/safarizonesecrethouse.asm index edba01eff..4faa90c66 100755 --- 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 diff --git a/data/mapObjects/safarizonewest.asm b/data/mapObjects/safarizonewest.asm index acdffb7cf..5d3c6d190 100755 --- 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 diff --git a/data/mapObjects/saffroncity.asm b/data/mapObjects/saffroncity.asm index ed0ffae00..d9afc7ec5 100755 --- 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 diff --git a/data/mapObjects/saffrongym.asm b/data/mapObjects/saffrongym.asm index 027f287ad..b466d1524 100755 --- 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 diff --git a/data/mapObjects/saffronhouse1.asm b/data/mapObjects/saffronhouse1.asm index 3c800d38d..c6abb539a 100755 --- 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 diff --git a/data/mapObjects/saffronhouse2.asm b/data/mapObjects/saffronhouse2.asm index e74b36ff4..ac1827b90 100755 --- 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 diff --git a/data/mapObjects/saffronmart.asm b/data/mapObjects/saffronmart.asm index 0a1551ea0..6293b9012 100755 --- 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 diff --git a/data/mapObjects/saffronpokecenter.asm b/data/mapObjects/saffronpokecenter.asm index 23b60a8df..b367ec89a 100755 --- 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 diff --git a/data/mapObjects/school.asm b/data/mapObjects/school.asm index 1cc90d171..8f07144f4 100755 --- 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 diff --git a/data/mapObjects/seafoamislands1.asm b/data/mapObjects/seafoamislands1.asm index e4cf6bfe4..a16170043 100755 --- 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 diff --git a/data/mapObjects/seafoamislands2.asm b/data/mapObjects/seafoamislands2.asm index adb8e9216..76c2ce3cf 100755 --- 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 diff --git a/data/mapObjects/seafoamislands3.asm b/data/mapObjects/seafoamislands3.asm index 660e42c45..a5cb848ad 100755 --- 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 diff --git a/data/mapObjects/seafoamislands4.asm b/data/mapObjects/seafoamislands4.asm index 69b3558df..0faaae28e 100755 --- 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 diff --git a/data/mapObjects/seafoamislands5.asm b/data/mapObjects/seafoamislands5.asm index e5a5e04c2..9bd828873 100755 --- 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 diff --git a/data/mapObjects/silphco1.asm b/data/mapObjects/silphco1.asm index 9a13055de..0f98247be 100755 --- 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 diff --git a/data/mapObjects/silphco10.asm b/data/mapObjects/silphco10.asm index b3f2066ff..90fa2acd5 100755 --- 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 diff --git a/data/mapObjects/silphco11.asm b/data/mapObjects/silphco11.asm index 11fb3b9fd..a130f4f19 100755 --- 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 diff --git a/data/mapObjects/silphco2.asm b/data/mapObjects/silphco2.asm index 4d6a2fb54..4b7f34f6e 100755 --- 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 diff --git a/data/mapObjects/silphco3.asm b/data/mapObjects/silphco3.asm index 65164c171..86b3b2153 100755 --- 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 diff --git a/data/mapObjects/silphco4.asm b/data/mapObjects/silphco4.asm index c91efcdef..730823421 100755 --- 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 diff --git a/data/mapObjects/silphco5.asm b/data/mapObjects/silphco5.asm index f8673460d..5a7d59fca 100755 --- 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 diff --git a/data/mapObjects/silphco6.asm b/data/mapObjects/silphco6.asm index b45700ba9..c936970d0 100755 --- 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 diff --git a/data/mapObjects/silphco7.asm b/data/mapObjects/silphco7.asm index b23775a94..96dc64a53 100755 --- 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 diff --git a/data/mapObjects/silphco8.asm b/data/mapObjects/silphco8.asm index c9f9e1efb..513e84eaa 100755 --- 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 diff --git a/data/mapObjects/silphco9.asm b/data/mapObjects/silphco9.asm index 8abf27cf5..377d7ca04 100755 --- 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 diff --git a/data/mapObjects/silphcoelevator.asm b/data/mapObjects/silphcoelevator.asm index e451a63ce..205fc046d 100755 --- 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 diff --git a/data/mapObjects/ssanne1.asm b/data/mapObjects/ssanne1.asm index 0e44fa829..9d5ddd1f6 100755 --- 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 diff --git a/data/mapObjects/ssanne10.asm b/data/mapObjects/ssanne10.asm index 8aac76438..93fb2cde1 100755 --- 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 diff --git a/data/mapObjects/ssanne2.asm b/data/mapObjects/ssanne2.asm index d2a1df31f..3a6856104 100755 --- 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 diff --git a/data/mapObjects/ssanne3.asm b/data/mapObjects/ssanne3.asm index 8de4c53df..3a45e1f9d 100755 --- 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 diff --git a/data/mapObjects/ssanne4.asm b/data/mapObjects/ssanne4.asm index 83852a5b7..7f0d68537 100755 --- 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 diff --git a/data/mapObjects/ssanne5.asm b/data/mapObjects/ssanne5.asm index 5e96d3b71..106557be6 100755 --- 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 diff --git a/data/mapObjects/ssanne6.asm b/data/mapObjects/ssanne6.asm index 8a1b23268..a25fe9b39 100755 --- 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 diff --git a/data/mapObjects/ssanne7.asm b/data/mapObjects/ssanne7.asm index 1855967c7..7657170e9 100755 --- 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 diff --git a/data/mapObjects/ssanne8.asm b/data/mapObjects/ssanne8.asm index 05645d783..d26921bd4 100755 --- 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 diff --git a/data/mapObjects/ssanne9.asm b/data/mapObjects/ssanne9.asm index 9c3aafb73..455e69839 100755 --- 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 diff --git a/data/mapObjects/tradecenter.asm b/data/mapObjects/tradecenter.asm index 851cb1ab6..63c3e04a0 100755 --- 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 diff --git a/data/mapObjects/undergroundpathentranceroute5.asm b/data/mapObjects/undergroundpathentranceroute5.asm index 1aa26743e..3e3d52ddb 100755 --- 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 diff --git a/data/mapObjects/undergroundpathentranceroute6.asm b/data/mapObjects/undergroundpathentranceroute6.asm index ab45c91ac..f9c6d224f 100755 --- 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 diff --git a/data/mapObjects/undergroundpathentranceroute7.asm b/data/mapObjects/undergroundpathentranceroute7.asm index 97c730ad2..80dde9a3c 100755 --- 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 diff --git a/data/mapObjects/undergroundpathentranceroute7copy.asm b/data/mapObjects/undergroundpathentranceroute7copy.asm index bf42e84d0..20b74599e 100755 --- 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 diff --git a/data/mapObjects/undergroundpathentranceroute8.asm b/data/mapObjects/undergroundpathentranceroute8.asm index 39337cb92..023903229 100755 --- 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 diff --git a/data/mapObjects/undergroundpathns.asm b/data/mapObjects/undergroundpathns.asm index 7a805280a..00b096e87 100755 --- 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 diff --git a/data/mapObjects/undergroundpathwe.asm b/data/mapObjects/undergroundpathwe.asm index a6c045415..0af2ccc36 100755 --- 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 diff --git a/data/mapObjects/unknowndungeon1.asm b/data/mapObjects/unknowndungeon1.asm index 68492e85b..97ff99a89 100755 --- 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 diff --git a/data/mapObjects/unknowndungeon2.asm b/data/mapObjects/unknowndungeon2.asm index a5b3b09e5..516265894 100755 --- 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 diff --git a/data/mapObjects/unknowndungeon3.asm b/data/mapObjects/unknowndungeon3.asm index 95d80d127..d44ba2548 100755 --- 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 diff --git a/data/mapObjects/vermilioncity.asm b/data/mapObjects/vermilioncity.asm index 839faa37c..86cc5685e 100755 --- 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 diff --git a/data/mapObjects/vermiliondock.asm b/data/mapObjects/vermiliondock.asm index 8ad6cc3e7..289689b52 100755 --- 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 diff --git a/data/mapObjects/vermiliongym.asm b/data/mapObjects/vermiliongym.asm index 1c9014246..843454c04 100755 --- 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 diff --git a/data/mapObjects/vermilionhouse1.asm b/data/mapObjects/vermilionhouse1.asm index 5b1961caa..bbb7491ba 100755 --- 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 diff --git a/data/mapObjects/vermilionhouse2.asm b/data/mapObjects/vermilionhouse2.asm index fdad3571f..e612b06ad 100755 --- 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 diff --git a/data/mapObjects/vermilionhouse3.asm b/data/mapObjects/vermilionhouse3.asm index 19a60f4da..a6dd42fab 100755 --- 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 diff --git a/data/mapObjects/vermilionmart.asm b/data/mapObjects/vermilionmart.asm index 437478fdb..f5b15c7d7 100755 --- 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 diff --git a/data/mapObjects/vermilionpokecenter.asm b/data/mapObjects/vermilionpokecenter.asm index eeef9c207..da792d344 100755 --- 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 diff --git a/data/mapObjects/victoryroad1.asm b/data/mapObjects/victoryroad1.asm index 1c538125e..62309bbd4 100755 --- 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 diff --git a/data/mapObjects/victoryroad2.asm b/data/mapObjects/victoryroad2.asm index 361bef2d5..283e74c8e 100755 --- 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 diff --git a/data/mapObjects/victoryroad3.asm b/data/mapObjects/victoryroad3.asm index 1bd72e511..ffa2a843a 100755 --- 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 diff --git a/data/mapObjects/viridiancity.asm b/data/mapObjects/viridiancity.asm index 5208f34b2..b45ba9d52 100755 --- 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 diff --git a/data/mapObjects/viridianforest.asm b/data/mapObjects/viridianforest.asm index 7e399fa25..601f73e24 100755 --- 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 diff --git a/data/mapObjects/viridianforestentrance.asm b/data/mapObjects/viridianforestentrance.asm index a42c7ec0c..319ba2723 100755 --- 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 diff --git a/data/mapObjects/viridianforestexit.asm b/data/mapObjects/viridianforestexit.asm index 2f098642a..521ad8187 100755 --- 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 diff --git a/data/mapObjects/viridiangym.asm b/data/mapObjects/viridiangym.asm index c136b8a2f..c6ddb1d4e 100755 --- 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 diff --git a/data/mapObjects/viridianhouse.asm b/data/mapObjects/viridianhouse.asm index 6fd1c609e..932542a6f 100755 --- 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 diff --git a/data/mapObjects/viridianmart.asm b/data/mapObjects/viridianmart.asm index 184ff8921..e692f810b 100755 --- 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 diff --git a/data/mapObjects/viridianpokecenter.asm b/data/mapObjects/viridianpokecenter.asm index c369a4754..9c8ebbfef 100755 --- 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