diff options
Diffstat (limited to 'data/mapObjects')
223 files changed, 223 insertions, 223 deletions
diff --git a/data/mapObjects/agatha.asm b/data/mapObjects/agatha.asm index b61dff29..cd8bbfe7 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 e5ff250c..98208a94 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 e152dadd..317d7c01 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 302c18ac..19338885 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 85d789cc..45d21186 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 7471563c..f3e481f4 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 63426279..b976a045 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 028a0839..a09691d6 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 0045bf73..b087153b 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 1f7916f7..09b4d99c 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 83b91723..d24354a6 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 c07ff521..423a9a2e 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 fd7e58b9..f2b96d89 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 d96c906f..e9718d9f 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 5bd2db06..98f538eb 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 f439c5eb..0fd06d13 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 f9869322..bfd66996 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 ab69c91a..215861e6 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 ba913e06..023e3b46 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 749cc401..e3ea8955 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 bf184d5f..ac2fa454 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 f7bd1ede..49745aa9 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 7a2d1a7f..0268b1ec 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 6393ee69..ab037ec0 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 dbffa9b9..bdaafe02 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 bdff2047..66d18a29 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 e4ce6250..d774c5dd 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 6c47bba9..a8c636cf 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 65f457bc..cf54c719 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 c5a88424..7b90ff73 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 5c30bf03..389e0317 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 7a862ec3..a6d7a5b5 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 b9fb420e..3fc25a02 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 0fcfed38..a66d6444 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 2c740a05..cf135039 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 19baee75..d1707ec7 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 f879d9e9..1c32de2f 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 02ca3859..e0e02a8d 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 1f36b2e5..529f3416 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 c435d7fe..7c10fe70 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 da2b8656..ef4de039 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 45cbfc49..af28bfbf 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 ef4d45ad..645cc385 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 3cfc6c00..8e0fd931 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 952da1a4..b9ff9449 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 180c051a..c89c03cd 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 7578323c..23314fb9 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 89745485..ca4638f9 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 a1c3aefe..e3702594 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 ea17c953..0bed500b 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 ab06366d..bfb93979 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 4330b59e..c6c10415 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 7db09516..12540cd3 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 c16bdec8..10d9f0ed 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 dc63d777..a815a053 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 cfabb44c..d18f25e1 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 b7149d3f..d82256a1 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 cbd8e179..b9eea581 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 81fdbc8a..3062fcae 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 fea6581e..73ba321d 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 cee79528..b9956f5f 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 572ae77c..77c0058c 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 cd925419..d9b61302 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 a70b4e66..6d900f45 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 68ae3ada..6661fee9 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 e7825178..b3eea8ec 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 16fc183f..5788c4f3 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 82f0c47f..e5f0f9f2 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 6e639865..fe543f27 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 b005aff5..cea8c8fc 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 d100598d..f6ec7aee 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 ec1c19fb..3db9d016 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 d8d5ca8b..707281aa 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 2ac19fdf..abff4094 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 d5aeadc9..13aa5a79 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 a76c8835..841d0194 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 557eaf63..3034dc74 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 a2f62660..11fad941 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 320d8b61..10487f0b 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 995dec29..d7fc8029 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 6063176f..1bd3d62b 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 5fd1d48d..4e7d24d0 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 65fcf723..fc571f26 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 1126a73a..63abe6b3 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 64d8b131..48cb243d 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 2409c11c..e79952c9 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 15374fd1..29f02eb9 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 036f0f13..f15299da 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 95b8c456..80615cd5 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 c2a23d85..0e7f5e1f 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 41e54571..9acea43e 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 0b3349d8..ac0668b2 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 13cde398..1dd66629 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 d170d21a..9609253f 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 b6e5c231..402f899f 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 ed787246..aabe6656 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 8aa0f1e5..af3c4b6b 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 264f20ab..3a51808d 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 d5ac71b5..328a4fb5 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 07ce8477..a8da69d2 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 9f69ba51..97025c71 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 9c3a8c7d..583c9f89 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 1d3d0bb2..1cfeca65 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 bc78fb55..d60863c1 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 eabddddf..c664b206 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 497d242d..26505ea6 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 f94e04cf..90abb47d 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 95e1c7f4..8d8e35d6 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 de62250f..fa627963 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 ad0d073c..e112c685 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 8bd9e94d..b72317d4 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 35cab520..bbfab54c 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 5eea516a..9351ebac 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 384a6eda..3161ebe6 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 38e475a2..b2a40c2c 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 5959041b..9694715b 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 7715068d..21fd2d97 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 4d1b8736..13c39674 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 23d56eea..ff180883 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 5acb748f..35ffea17 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 94e85a4a..4e1863ed 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 520c3e5a..41487e6e 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 8c1bab19..7a097105 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 854e7d6e..48750597 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 fc9c7d84..d7851f88 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 1eea9cfe..c73d7131 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 21604b66..6d298055 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 13c00330..935b3d4d 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 b9e921cd..b62f9fdb 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 3d18495a..5f4d5647 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 aaa87d8a..bb2409ce 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 377cf6c9..e91eb792 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 6340b702..aa9512c6 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 613ce6f4..2fd3e3d7 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 9ca277c8..0fcc1d7b 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 abc40804..3ba5fbdb 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 6d2244ec..714b8ee6 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 1a6f4b52..b27b65ef 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 827dc14d..422fa29b 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 30e3ff24..7d09c28a 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 445c7aab..62aa6431 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 0ceedb9b..8b230942 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 4bb5fbc4..e0eea85b 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 cc5ccdc2..e3b7b2b8 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 cb6f2ecb..d32e6019 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 28b4b1cf..0b726fd3 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 1dc066fb..dc7580fc 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 0d43bb80..ac286aa0 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 5ed4fe06..ab3ceefe 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 7ce03028..550f9aa4 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 e4eb6885..53553161 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 9a54ae93..5a3379c7 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 0fb2c68f..6cbe51f6 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 b90e62bf..031debec 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 80def1e3..7e589731 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 0b11f2bd..00623953 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 407b74d6..d3b81b4e 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 edba01ef..4faa90c6 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 acdffb7c..5d3c6d19 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 ed0ffae0..d9afc7ec 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 027f287a..b466d152 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 3c800d38..c6abb539 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 e74b36ff..ac1827b9 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 0a1551ea..6293b901 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 23b60a8d..b367ec89 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 1cc90d17..8f07144f 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 e4cf6bfe..a1617004 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 adb8e921..76c2ce3c 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 660e42c4..a5cb848a 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 69b3558d..0faaae28 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 e5a5e04c..9bd82887 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 9a13055d..0f98247b 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 b3f2066f..90fa2acd 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 11fb3b9f..a130f4f1 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 4d6a2fb5..4b7f34f6 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 65164c17..86b3b215 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 c91efcde..73082342 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 f8673460..5a7d59fc 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 b45700ba..c936970d 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 b23775a9..96dc64a5 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 c9f9e1ef..513e84ea 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 8abf27cf..377d7ca0 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 e451a63c..205fc046 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 0e44fa82..9d5ddd1f 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 8aac7643..93fb2cde 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 d2a1df31..3a685610 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 8de4c53d..3a45e1f9 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 83852a5b..7f0d6853 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 5e96d3b7..106557be 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 8a1b2326..a25fe9b3 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 1855967c..7657170e 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 05645d78..d26921bd 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 9c3aafb7..455e6983 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 851cb1ab..63c3e04a 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 1aa26743..3e3d52dd 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 ab45c91a..f9c6d224 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 97c730ad..80dde9a3 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 bf42e84d..20b74599 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 39337cb9..02390322 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 7a805280..00b096e8 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 a6c04541..0af2ccc3 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 68492e85..97ff99a8 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 a5b3b09e..51626589 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 95d80d12..d44ba254 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 839faa37..86cc5685 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 8ad6cc3e..289689b5 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 1c901424..843454c0 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 5b1961ca..bbb7491b 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 fdad3571..e612b06a 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 19a60f4d..a6dd42fa 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 437478fd..f5b15c7d 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 eeef9c20..da792d34 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 1c538125..62309bbd 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 361bef2d..283e74c8 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 1bd72e51..ffa2a843 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 5208f34b..b45ba9d5 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 7e399fa2..601f73e2 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 a42c7ec0..319ba272 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 2f098642..521ad818 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 c136b8a2..c6ddb1d4 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 6fd1c609..932542a6 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 184ff892..e692f810 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 c369a475..9c8ebbfe 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 |