diff options
Diffstat (limited to 'data/mapObjects')
219 files changed, 219 insertions, 219 deletions
diff --git a/data/mapObjects/agatha.asm b/data/mapObjects/agatha.asm index e33172ae..22000dde 100755 --- a/data/mapObjects/agatha.asm +++ b/data/mapObjects/agatha.asm @@ -1,4 +1,4 @@ -AgathaObject: ; 0x76534 (size=44) +AgathaObject: db $0 ; border block db $4 ; warps diff --git a/data/mapObjects/bikeshop.asm b/data/mapObjects/bikeshop.asm index ab763bc3..5a7e832c 100755 --- a/data/mapObjects/bikeshop.asm +++ b/data/mapObjects/bikeshop.asm @@ -1,4 +1,4 @@ -BikeShopObject: ; 0x1d866 (size=38) +BikeShopObject: db $e ; border block db $2 ; warps diff --git a/data/mapObjects/billshouse.asm b/data/mapObjects/billshouse.asm index 9da1efd1..ef52e1dd 100755 --- a/data/mapObjects/billshouse.asm +++ b/data/mapObjects/billshouse.asm @@ -1,4 +1,4 @@ -BillsHouseObject: ; 0x1e8df (size=38) +BillsHouseObject: db $d ; border block db $2 ; warps diff --git a/data/mapObjects/bruno.asm b/data/mapObjects/bruno.asm index 8d55461f..a734b07b 100755 --- a/data/mapObjects/bruno.asm +++ b/data/mapObjects/bruno.asm @@ -1,4 +1,4 @@ -BrunoObject: ; 0x763d7 (size=44) +BrunoObject: db $3 ; border block db $4 ; warps diff --git a/data/mapObjects/celadoncity.asm b/data/mapObjects/celadoncity.asm index 0e420221..c2a7fd78 100755 --- a/data/mapObjects/celadoncity.asm +++ b/data/mapObjects/celadoncity.asm @@ -1,4 +1,4 @@ -CeladonCityObject: ; 0x18022 (size=189) +CeladonCityObject: db $f ; border block db $d ; warps diff --git a/data/mapObjects/celadondiner.asm b/data/mapObjects/celadondiner.asm index 74141df9..fd202a96 100755 --- a/data/mapObjects/celadondiner.asm +++ b/data/mapObjects/celadondiner.asm @@ -1,4 +1,4 @@ -CeladonDinerObject: ; 0x491bc (size=50) +CeladonDinerObject: db $f ; border block db $2 ; warps diff --git a/data/mapObjects/celadongamecorner.asm b/data/mapObjects/celadongamecorner.asm index a44cf0a6..af59d2b1 100755 --- a/data/mapObjects/celadongamecorner.asm +++ b/data/mapObjects/celadongamecorner.asm @@ -1,4 +1,4 @@ -CeladonGameCornerObject: ; 0x48fa0 (size=99) +CeladonGameCornerObject: db $f ; border block db $3 ; warps diff --git a/data/mapObjects/celadongym.asm b/data/mapObjects/celadongym.asm index a38dd535..212c389e 100755 --- a/data/mapObjects/celadongym.asm +++ b/data/mapObjects/celadongym.asm @@ -1,4 +1,4 @@ -CeladonGymObject: ; 0x48b30 (size=84) +CeladonGymObject: db $3 ; border block db $2 ; warps diff --git a/data/mapObjects/celadonhotel.asm b/data/mapObjects/celadonhotel.asm index 33c442c2..8d7dcb03 100755 --- a/data/mapObjects/celadonhotel.asm +++ b/data/mapObjects/celadonhotel.asm @@ -1,4 +1,4 @@ -CeladonHotelObject: ; 0x49281 (size=38) +CeladonHotelObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/celadonhouse.asm b/data/mapObjects/celadonhouse.asm index 0fcb08f5..6bd847a4 100755 --- a/data/mapObjects/celadonhouse.asm +++ b/data/mapObjects/celadonhouse.asm @@ -1,4 +1,4 @@ -CeladonHouseObject: ; 0x49227 (size=38) +CeladonHouseObject: db $f ; border block db $2 ; warps diff --git a/data/mapObjects/celadonmansion1.asm b/data/mapObjects/celadonmansion1.asm index a308e8bc..47fbb0e5 100755 --- a/data/mapObjects/celadonmansion1.asm +++ b/data/mapObjects/celadonmansion1.asm @@ -1,4 +1,4 @@ -CeladonMansion1Object: ; 0x486cf (size=71) +CeladonMansion1Object: db $f ; border block db $5 ; warps diff --git a/data/mapObjects/celadonmansion2.asm b/data/mapObjects/celadonmansion2.asm index 9271c22d..883cae36 100755 --- a/data/mapObjects/celadonmansion2.asm +++ b/data/mapObjects/celadonmansion2.asm @@ -1,4 +1,4 @@ -CeladonMansion2Object: ; 0x48745 (size=39) +CeladonMansion2Object: db $f ; border block db $4 ; warps diff --git a/data/mapObjects/celadonmansion3.asm b/data/mapObjects/celadonmansion3.asm index 36bf36d5..0564b1cb 100755 --- a/data/mapObjects/celadonmansion3.asm +++ b/data/mapObjects/celadonmansion3.asm @@ -1,4 +1,4 @@ -CeladonMansion3Object: ; 0x487ff (size=72) +CeladonMansion3Object: db $f ; border block db $4 ; warps diff --git a/data/mapObjects/celadonmansion4.asm b/data/mapObjects/celadonmansion4.asm index 0241725d..c4f667fa 100755 --- a/data/mapObjects/celadonmansion4.asm +++ b/data/mapObjects/celadonmansion4.asm @@ -1,4 +1,4 @@ -CeladonMansion4Object: ; 0x48875 (size=31) +CeladonMansion4Object: db $9 ; border block db $3 ; warps diff --git a/data/mapObjects/celadonmansion5.asm b/data/mapObjects/celadonmansion5.asm index 2f20323d..243e345b 100755 --- a/data/mapObjects/celadonmansion5.asm +++ b/data/mapObjects/celadonmansion5.asm @@ -1,4 +1,4 @@ -CeladonMansion5Object: ; 0x1dd5c (size=32) +CeladonMansion5Object: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/celadonmart1.asm b/data/mapObjects/celadonmart1.asm index dbbc0a36..af647cf2 100755 --- a/data/mapObjects/celadonmart1.asm +++ b/data/mapObjects/celadonmart1.asm @@ -1,4 +1,4 @@ -CeladonMart1Object: ; 0x60f9e (size=64) +CeladonMart1Object: db $f ; border block db $6 ; warps diff --git a/data/mapObjects/celadonmart2.asm b/data/mapObjects/celadonmart2.asm index 061ac6e0..a6c9af59 100755 --- a/data/mapObjects/celadonmart2.asm +++ b/data/mapObjects/celadonmart2.asm @@ -1,4 +1,4 @@ -CeladonMart2Object: ; 0x56111 (size=55) +CeladonMart2Object: db $f ; border block db $3 ; warps diff --git a/data/mapObjects/celadonmart3.asm b/data/mapObjects/celadonmart3.asm index 36760d25..45f12b2c 100755 --- a/data/mapObjects/celadonmart3.asm +++ b/data/mapObjects/celadonmart3.asm @@ -1,4 +1,4 @@ -CeladonMart3Object: ; 0x482c4 (size=94) +CeladonMart3Object: db $f ; border block db $3 ; warps diff --git a/data/mapObjects/celadonmart4.asm b/data/mapObjects/celadonmart4.asm index 7dce43dc..386dba8c 100755 --- a/data/mapObjects/celadonmart4.asm +++ b/data/mapObjects/celadonmart4.asm @@ -1,4 +1,4 @@ -CeladonMart4Object: ; 0x48370 (size=49) +CeladonMart4Object: db $f ; border block db $3 ; warps diff --git a/data/mapObjects/celadonmart5.asm b/data/mapObjects/celadonmart5.asm index 23b7cf4f..df47a70d 100755 --- a/data/mapObjects/celadonmart5.asm +++ b/data/mapObjects/celadonmart5.asm @@ -1,4 +1,4 @@ -CeladonMart5Object: ; 0x49085 (size=55) +CeladonMart5Object: db $f ; border block db $3 ; warps diff --git a/data/mapObjects/celadonmartelevator.asm b/data/mapObjects/celadonmartelevator.asm index 6b778043..2db8635a 100755 --- a/data/mapObjects/celadonmartelevator.asm +++ b/data/mapObjects/celadonmartelevator.asm @@ -1,4 +1,4 @@ -CeladonMartElevatorObject: ; 0x4866d (size=23) +CeladonMartElevatorObject: db $f ; border block db $2 ; warps diff --git a/data/mapObjects/celadonmartroof.asm b/data/mapObjects/celadonmartroof.asm index 82830cf2..63a1b4d7 100755 --- a/data/mapObjects/celadonmartroof.asm +++ b/data/mapObjects/celadonmartroof.asm @@ -1,4 +1,4 @@ -CeladonMartRoofObject: ; 0x485a8 (size=36) +CeladonMartRoofObject: db $42 ; border block db $1 ; warps diff --git a/data/mapObjects/celadonpokecenter.asm b/data/mapObjects/celadonpokecenter.asm index 7429c190..6691eaaa 100755 --- a/data/mapObjects/celadonpokecenter.asm +++ b/data/mapObjects/celadonpokecenter.asm @@ -1,4 +1,4 @@ -CeladonPokecenterObject: ; 0x488d2 (size=44) +CeladonPokecenterObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/celadonprizeroom.asm b/data/mapObjects/celadonprizeroom.asm index 73ca7598..c440bad5 100755 --- a/data/mapObjects/celadonprizeroom.asm +++ b/data/mapObjects/celadonprizeroom.asm @@ -1,4 +1,4 @@ -CeladonPrizeRoomObject: ; 0x49108 (size=41) +CeladonPrizeRoomObject: db $f ; border block db $2 ; warps diff --git a/data/mapObjects/ceruleancity.asm b/data/mapObjects/ceruleancity.asm index ff0f2c66..318f03b9 100755 --- a/data/mapObjects/ceruleancity.asm +++ b/data/mapObjects/ceruleancity.asm @@ -1,4 +1,4 @@ -CeruleanCityObject: ; 0x18786 (size=170) +CeruleanCityObject: db $a ; border block db $a ; warps diff --git a/data/mapObjects/ceruleangym.asm b/data/mapObjects/ceruleangym.asm index 68d74547..66d22260 100755 --- a/data/mapObjects/ceruleangym.asm +++ b/data/mapObjects/ceruleangym.asm @@ -1,4 +1,4 @@ -CeruleanGymObject: ; 0x5c834 (size=50) +CeruleanGymObject: db $3 ; border block db $2 ; warps diff --git a/data/mapObjects/ceruleanhouse1.asm b/data/mapObjects/ceruleanhouse1.asm index aa9f66a4..97e5b52d 100755 --- a/data/mapObjects/ceruleanhouse1.asm +++ b/data/mapObjects/ceruleanhouse1.asm @@ -1,4 +1,4 @@ -CeruleanHouse1Object: ; 0x1d710 (size=32) +CeruleanHouse1Object: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/ceruleanhouse2.asm b/data/mapObjects/ceruleanhouse2.asm index 24fe3a5e..669cd098 100755 --- a/data/mapObjects/ceruleanhouse2.asm +++ b/data/mapObjects/ceruleanhouse2.asm @@ -1,4 +1,4 @@ -CeruleanHouse2Object: ; 0x74ebe (size=34) +CeruleanHouse2Object: db $c ; border block db $3 ; warps diff --git a/data/mapObjects/ceruleanhousetrashed.asm b/data/mapObjects/ceruleanhousetrashed.asm index 0c896120..4f154191 100755 --- a/data/mapObjects/ceruleanhousetrashed.asm +++ b/data/mapObjects/ceruleanhousetrashed.asm @@ -1,4 +1,4 @@ -CeruleanHouseTrashedObject: ; 0x1d6bf (size=43) +CeruleanHouseTrashedObject: db $a ; border block db $3 ; warps diff --git a/data/mapObjects/ceruleanmart.asm b/data/mapObjects/ceruleanmart.asm index fc400e73..301d11a2 100755 --- a/data/mapObjects/ceruleanmart.asm +++ b/data/mapObjects/ceruleanmart.asm @@ -1,4 +1,4 @@ -CeruleanMartObject: ; 0x5c8a8 (size=38) +CeruleanMartObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/ceruleanpokecenter.asm b/data/mapObjects/ceruleanpokecenter.asm index 4b92f0d8..a8ad26d4 100755 --- a/data/mapObjects/ceruleanpokecenter.asm +++ b/data/mapObjects/ceruleanpokecenter.asm @@ -1,4 +1,4 @@ -CeruleanPokecenterObject: ; 0x5c65f (size=44) +CeruleanPokecenterObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/cinnabargym.asm b/data/mapObjects/cinnabargym.asm index 2b9f34cb..28960150 100755 --- a/data/mapObjects/cinnabargym.asm +++ b/data/mapObjects/cinnabargym.asm @@ -1,4 +1,4 @@ -CinnabarGymObject: ; 0x75acc (size=90) +CinnabarGymObject: db $2e ; border block db $2 ; warps diff --git a/data/mapObjects/cinnabarisland.asm b/data/mapObjects/cinnabarisland.asm index 7c8e80fb..05f4c06c 100755 --- a/data/mapObjects/cinnabarisland.asm +++ b/data/mapObjects/cinnabarisland.asm @@ -1,4 +1,4 @@ -CinnabarIslandObject: ; 0x1c022 (size=71) +CinnabarIslandObject: db $43 ; border block db $5 ; warps diff --git a/data/mapObjects/cinnabarmart.asm b/data/mapObjects/cinnabarmart.asm index 057ce048..79494686 100755 --- a/data/mapObjects/cinnabarmart.asm +++ b/data/mapObjects/cinnabarmart.asm @@ -1,4 +1,4 @@ -CinnabarMartObject: ; 0x75e91 (size=38) +CinnabarMartObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/cinnabarpokecenter.asm b/data/mapObjects/cinnabarpokecenter.asm index b855464e..b9779eb5 100755 --- a/data/mapObjects/cinnabarpokecenter.asm +++ b/data/mapObjects/cinnabarpokecenter.asm @@ -1,4 +1,4 @@ -CinnabarPokecenterObject: ; 0x75e46 (size=44) +CinnabarPokecenterObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/colosseum.asm b/data/mapObjects/colosseum.asm index 5be02b44..91fea6b9 100644 --- a/data/mapObjects/colosseum.asm +++ b/data/mapObjects/colosseum.asm @@ -1,4 +1,4 @@ -ColosseumObject: ; 0x4fd87 (size=10) +ColosseumObject: db $e ; border block db $0 ; warps diff --git a/data/mapObjects/copycatshouse1f.asm b/data/mapObjects/copycatshouse1f.asm index 983baa99..c6702cfa 100755 --- a/data/mapObjects/copycatshouse1f.asm +++ b/data/mapObjects/copycatshouse1f.asm @@ -1,4 +1,4 @@ -CopycatsHouse1FObject: ; 0x75ee3 (size=46) +CopycatsHouse1FObject: db $a ; border block db $3 ; warps diff --git a/data/mapObjects/copycatshouse2f.asm b/data/mapObjects/copycatshouse2f.asm index 204c429f..0d53965a 100755 --- a/data/mapObjects/copycatshouse2f.asm +++ b/data/mapObjects/copycatshouse2f.asm @@ -1,4 +1,4 @@ -CopycatsHouse2FObject: ; 0x5cd21 (size=48) +CopycatsHouse2FObject: db $a ; border block db $1 ; warps diff --git a/data/mapObjects/daycarem.asm b/data/mapObjects/daycarem.asm index 7fbbf13b..98d4c184 100755 --- a/data/mapObjects/daycarem.asm +++ b/data/mapObjects/daycarem.asm @@ -1,4 +1,4 @@ -DayCareMObject: ; 0x56459 (size=26) +DayCareMObject: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/diglettscave.asm b/data/mapObjects/diglettscave.asm index 74bbf775..cdcffce0 100755 --- a/data/mapObjects/diglettscave.asm +++ b/data/mapObjects/diglettscave.asm @@ -1,4 +1,4 @@ -DiglettsCaveObject: ; 0x61f72 (size=20) +DiglettsCaveObject: db $19 ; border block db $2 ; warps diff --git a/data/mapObjects/diglettscaveroute11.asm b/data/mapObjects/diglettscaveroute11.asm index d77e649d..e5d6b69f 100755 --- a/data/mapObjects/diglettscaveroute11.asm +++ b/data/mapObjects/diglettscaveroute11.asm @@ -1,4 +1,4 @@ -DiglettsCaveEntranceRoute11Object: ; 0x1e5ca (size=34) +DiglettsCaveEntranceRoute11Object: db $7d ; border block db $3 ; warps diff --git a/data/mapObjects/diglettscaveroute2.asm b/data/mapObjects/diglettscaveroute2.asm index a905305b..f1310cce 100755 --- a/data/mapObjects/diglettscaveroute2.asm +++ b/data/mapObjects/diglettscaveroute2.asm @@ -1,4 +1,4 @@ -DiglettsCaveRoute2Object: ; 0x1debf (size=34) +DiglettsCaveRoute2Object: db $7d ; border block db $3 ; warps diff --git a/data/mapObjects/fanclub.asm b/data/mapObjects/fanclub.asm index cbe0cb31..1dbb2dca 100755 --- a/data/mapObjects/fanclub.asm +++ b/data/mapObjects/fanclub.asm @@ -1,4 +1,4 @@ -FanClubObject: ; 0x59c97 (size=62) +FanClubObject: db $d ; border block db $2 ; warps diff --git a/data/mapObjects/fightingdojo.asm b/data/mapObjects/fightingdojo.asm index aa9c0bd7..44fed88f 100755 --- a/data/mapObjects/fightingdojo.asm +++ b/data/mapObjects/fightingdojo.asm @@ -1,4 +1,4 @@ -FightingDojoObject: ; 0x5cf9b (size=72) +FightingDojoObject: db $3 ; border block db $2 ; warps diff --git a/data/mapObjects/fuchsiacity.asm b/data/mapObjects/fuchsiacity.asm index c64760c0..f4bb842b 100755 --- a/data/mapObjects/fuchsiacity.asm +++ b/data/mapObjects/fuchsiacity.asm @@ -1,4 +1,4 @@ -FuchsiaCityObject: ; 0x18bd4 (size=178) +FuchsiaCityObject: db $f ; border block db $9 ; warps diff --git a/data/mapObjects/fuchsiagym.asm b/data/mapObjects/fuchsiagym.asm index c7fc3799..86f62d21 100755 --- a/data/mapObjects/fuchsiagym.asm +++ b/data/mapObjects/fuchsiagym.asm @@ -1,4 +1,4 @@ -FuchsiaGymObject: ; 0x75658 (size=82) +FuchsiaGymObject: db $3 ; border block db $2 ; warps diff --git a/data/mapObjects/fuchsiahouse1.asm b/data/mapObjects/fuchsiahouse1.asm index 0789ea2c..4d3c3b6e 100755 --- a/data/mapObjects/fuchsiahouse1.asm +++ b/data/mapObjects/fuchsiahouse1.asm @@ -1,4 +1,4 @@ -FuchsiaHouse1Object: ; 0x75031 (size=38) +FuchsiaHouse1Object: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/fuchsiahouse2.asm b/data/mapObjects/fuchsiahouse2.asm index f3aa5e7c..3a3d07c3 100755 --- a/data/mapObjects/fuchsiahouse2.asm +++ b/data/mapObjects/fuchsiahouse2.asm @@ -1,4 +1,4 @@ -FuchsiaHouse2Object: ; 0x75180 (size=45) +FuchsiaHouse2Object: db $17 ; border block db $2 ; warps diff --git a/data/mapObjects/fuchsiahouse3.asm b/data/mapObjects/fuchsiahouse3.asm index 3fd056e9..aaf05bd6 100755 --- a/data/mapObjects/fuchsiahouse3.asm +++ b/data/mapObjects/fuchsiahouse3.asm @@ -1,4 +1,4 @@ -FuchsiaHouse3Object: ; 0x56221 (size=34) +FuchsiaHouse3Object: db $c ; border block db $3 ; warps diff --git a/data/mapObjects/fuchsiamart.asm b/data/mapObjects/fuchsiamart.asm index eb85d110..431e7c2f 100755 --- a/data/mapObjects/fuchsiamart.asm +++ b/data/mapObjects/fuchsiamart.asm @@ -1,4 +1,4 @@ -FuchsiaMartObject: ; 0x1dd9b (size=38) +FuchsiaMartObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/fuchsiameetingroom.asm b/data/mapObjects/fuchsiameetingroom.asm index 36afcfd8..8106b9ec 100755 --- a/data/mapObjects/fuchsiameetingroom.asm +++ b/data/mapObjects/fuchsiameetingroom.asm @@ -1,4 +1,4 @@ -FuchsiaMeetingRoomObject: ; 0x756fc (size=38) +FuchsiaMeetingRoomObject: db $17 ; border block db $2 ; warps diff --git a/data/mapObjects/fuchsiapokecenter.asm b/data/mapObjects/fuchsiapokecenter.asm index 8a1c392b..bf9abe99 100755 --- a/data/mapObjects/fuchsiapokecenter.asm +++ b/data/mapObjects/fuchsiapokecenter.asm @@ -1,4 +1,4 @@ -FuchsiaPokecenterObject: ; 0x7507d (size=44) +FuchsiaPokecenterObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/gary.asm b/data/mapObjects/gary.asm index c14efcf0..e0f37b91 100755 --- a/data/mapObjects/gary.asm +++ b/data/mapObjects/gary.asm @@ -1,4 +1,4 @@ -GaryObject: ; 0x7612f (size=48) +GaryObject: db $3 ; border block db $4 ; warps diff --git a/data/mapObjects/halloffameroom.asm b/data/mapObjects/halloffameroom.asm index b21b1f4e..8e245c2c 100755 --- a/data/mapObjects/halloffameroom.asm +++ b/data/mapObjects/halloffameroom.asm @@ -1,4 +1,4 @@ -HallofFameRoomObject: ; 0x5a571 (size=26) +HallofFameRoomObject: db $3 ; border block db $2 ; warps diff --git a/data/mapObjects/indigoplateau.asm b/data/mapObjects/indigoplateau.asm index a30cfbfe..145f2f39 100755 --- a/data/mapObjects/indigoplateau.asm +++ b/data/mapObjects/indigoplateau.asm @@ -1,4 +1,4 @@ -IndigoPlateauObject: ; 0x50936 (size=20) +IndigoPlateauObject: db $e ; border block db $2 ; warps diff --git a/data/mapObjects/indigoplateaulobby.asm b/data/mapObjects/indigoplateaulobby.asm index c41e2cfc..dbeaa85b 100755 --- a/data/mapObjects/indigoplateaulobby.asm +++ b/data/mapObjects/indigoplateaulobby.asm @@ -1,4 +1,4 @@ -IndigoPlateauLobbyObject: ; 0x19c95 (size=58) +IndigoPlateauLobbyObject: db $0 ; border block db $3 ; warps diff --git a/data/mapObjects/lab1.asm b/data/mapObjects/lab1.asm index a2e05e14..e0adaedc 100755 --- a/data/mapObjects/lab1.asm +++ b/data/mapObjects/lab1.asm @@ -1,4 +1,4 @@ -Lab1Object: ; 0x75bb3 (size=62) +Lab1Object: db $17 ; border block db $5 ; warps diff --git a/data/mapObjects/lab2.asm b/data/mapObjects/lab2.asm index 89ed5f2c..ed541ada 100755 --- a/data/mapObjects/lab2.asm +++ b/data/mapObjects/lab2.asm @@ -1,4 +1,4 @@ -Lab2Object: ; 0x75c45 (size=38) +Lab2Object: db $17 ; border block db $2 ; warps diff --git a/data/mapObjects/lab3.asm b/data/mapObjects/lab3.asm index 8aca194b..c5ee01c3 100755 --- a/data/mapObjects/lab3.asm +++ b/data/mapObjects/lab3.asm @@ -1,4 +1,4 @@ -Lab3Object: ; 0x75cec (size=41) +Lab3Object: db $17 ; border block db $2 ; warps diff --git a/data/mapObjects/lab4.asm b/data/mapObjects/lab4.asm index 47f301c9..361f9533 100755 --- a/data/mapObjects/lab4.asm +++ b/data/mapObjects/lab4.asm @@ -1,4 +1,4 @@ -Lab4Object: ; 0x75df0 (size=32) +Lab4Object: db $17 ; border block db $2 ; warps diff --git a/data/mapObjects/lance.asm b/data/mapObjects/lance.asm index cdfbc7a6..e7bf0ad6 100755 --- a/data/mapObjects/lance.asm +++ b/data/mapObjects/lance.asm @@ -1,4 +1,4 @@ -LanceObject: ; 0x5a3c5 (size=36) +LanceObject: db $3 ; border block db $3 ; warps diff --git a/data/mapObjects/lavenderhouse1.asm b/data/mapObjects/lavenderhouse1.asm index 45707121..54f57270 100755 --- a/data/mapObjects/lavenderhouse1.asm +++ b/data/mapObjects/lavenderhouse1.asm @@ -1,4 +1,4 @@ -LavenderHouse1Object: ; 0x1d96a (size=56) +LavenderHouse1Object: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/lavenderhouse2.asm b/data/mapObjects/lavenderhouse2.asm index a8641204..7638ff66 100755 --- a/data/mapObjects/lavenderhouse2.asm +++ b/data/mapObjects/lavenderhouse2.asm @@ -1,4 +1,4 @@ -LavenderHouse2Object: ; 0x1d9e6 (size=32) +LavenderHouse2Object: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/lavendermart.asm b/data/mapObjects/lavendermart.asm index d23f21ae..2d8e7636 100755 --- a/data/mapObjects/lavendermart.asm +++ b/data/mapObjects/lavendermart.asm @@ -1,4 +1,4 @@ -LavenderMartObject: ; 0x5c95d (size=38) +LavenderMartObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/lavenderpokecenter.asm b/data/mapObjects/lavenderpokecenter.asm index 702e67b7..f98cede4 100755 --- a/data/mapObjects/lavenderpokecenter.asm +++ b/data/mapObjects/lavenderpokecenter.asm @@ -1,4 +1,4 @@ -LavenderPokecenterObject: ; 0x5c8f4 (size=44) +LavenderPokecenterObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/lavendertown.asm b/data/mapObjects/lavendertown.asm index fb78f139..49347aba 100755 --- a/data/mapObjects/lavendertown.asm +++ b/data/mapObjects/lavendertown.asm @@ -1,4 +1,4 @@ -LavenderTownObject: ; 0x4402d (size=88) +LavenderTownObject: db $2c ; border block db $6 ; warps diff --git a/data/mapObjects/lorelei.asm b/data/mapObjects/lorelei.asm index 4ce080f7..5b985369 100755 --- a/data/mapObjects/lorelei.asm +++ b/data/mapObjects/lorelei.asm @@ -1,4 +1,4 @@ -LoreleiObject: ; 0x76280 (size=44) +LoreleiObject: db $3 ; border block db $4 ; warps diff --git a/data/mapObjects/mansion1.asm b/data/mapObjects/mansion1.asm index 0bb168bb..ed6529f2 100755 --- a/data/mapObjects/mansion1.asm +++ b/data/mapObjects/mansion1.asm @@ -1,4 +1,4 @@ -Mansion1Object: ; 0x443a4 (size=90) +Mansion1Object: db $2e ; border block db $8 ; warps diff --git a/data/mapObjects/mansion2.asm b/data/mapObjects/mansion2.asm index 2cb45879..bda2ad27 100755 --- a/data/mapObjects/mansion2.asm +++ b/data/mapObjects/mansion2.asm @@ -1,4 +1,4 @@ -Mansion2Object: ; 0x520d1 (size=63) +Mansion2Object: db $1 ; border block db $4 ; warps diff --git a/data/mapObjects/mansion3.asm b/data/mapObjects/mansion3.asm index 288b4753..72431402 100755 --- a/data/mapObjects/mansion3.asm +++ b/data/mapObjects/mansion3.asm @@ -1,4 +1,4 @@ -Mansion3Object: ; 0x522e6 (size=64) +Mansion3Object: db $1 ; border block db $3 ; warps diff --git a/data/mapObjects/mansion4.asm b/data/mapObjects/mansion4.asm index eddbda8e..94a6f612 100755 --- a/data/mapObjects/mansion4.asm +++ b/data/mapObjects/mansion4.asm @@ -1,4 +1,4 @@ -Mansion4Object: ; 0x52498 (size=69) +Mansion4Object: db $1 ; border block db $1 ; warps diff --git a/data/mapObjects/mtmoon1.asm b/data/mapObjects/mtmoon1.asm index a59f2a20..42c45016 100755 --- a/data/mapObjects/mtmoon1.asm +++ b/data/mapObjects/mtmoon1.asm @@ -1,4 +1,4 @@ -MtMoon1Object: ; 0x49b06 (size=145) +MtMoon1Object: db $3 ; border block db $5 ; warps diff --git a/data/mapObjects/mtmoon2.asm b/data/mapObjects/mtmoon2.asm index 2cf6be6b..f39cd4a5 100755 --- a/data/mapObjects/mtmoon2.asm +++ b/data/mapObjects/mtmoon2.asm @@ -1,4 +1,4 @@ -MtMoon2Object: ; 0x51a4d (size=68) +MtMoon2Object: db $3 ; border block db $8 ; warps diff --git a/data/mapObjects/mtmoon3.asm b/data/mapObjects/mtmoon3.asm index 4a9b1946..43891ec3 100755 --- a/data/mapObjects/mtmoon3.asm +++ b/data/mapObjects/mtmoon3.asm @@ -1,4 +1,4 @@ -MtMoon3Object: ; 0x49fdb (size=102) +MtMoon3Object: db $3 ; border block db $4 ; warps diff --git a/data/mapObjects/mtmoonpokecenter.asm b/data/mapObjects/mtmoonpokecenter.asm index 935c4a40..d1ac34fb 100755 --- a/data/mapObjects/mtmoonpokecenter.asm +++ b/data/mapObjects/mtmoonpokecenter.asm @@ -1,4 +1,4 @@ -MtMoonPokecenterObject: ; 0x49376 (size=56) +MtMoonPokecenterObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/museum1f.asm b/data/mapObjects/museum1f.asm index 208a19c8..56932af8 100755 --- a/data/mapObjects/museum1f.asm +++ b/data/mapObjects/museum1f.asm @@ -1,4 +1,4 @@ -Museum1FObject: ; 0x5c2c1 (size=74) +Museum1FObject: db $a ; border block db $5 ; warps diff --git a/data/mapObjects/museum2f.asm b/data/mapObjects/museum2f.asm index 77ea061b..689391d9 100755 --- a/data/mapObjects/museum2f.asm +++ b/data/mapObjects/museum2f.asm @@ -1,4 +1,4 @@ -Museum2FObject: ; 0x5c34b (size=48) +Museum2FObject: db $a ; border block db $1 ; warps diff --git a/data/mapObjects/namerater.asm b/data/mapObjects/namerater.asm index 28dcf48f..0118b2f7 100755 --- a/data/mapObjects/namerater.asm +++ b/data/mapObjects/namerater.asm @@ -1,4 +1,4 @@ -NameRaterObject: ; 0x1dad6 (size=26) +NameRaterObject: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/oakslab.asm b/data/mapObjects/oakslab.asm index 5b9a01d5..1efb1e72 100755 --- a/data/mapObjects/oakslab.asm +++ b/data/mapObjects/oakslab.asm @@ -1,4 +1,4 @@ -OaksLabObject: ; 0x1d40a (size=88) +OaksLabObject: db $3 ; border block db $2 ; warps diff --git a/data/mapObjects/pallettown.asm b/data/mapObjects/pallettown.asm index 0d45fea3..e22f79a6 100755 --- a/data/mapObjects/pallettown.asm +++ b/data/mapObjects/pallettown.asm @@ -1,4 +1,4 @@ -PalletTownObject: ; 0x182c3 (size=58) +PalletTownObject: db $b ; border block db $3 ; warps diff --git a/data/mapObjects/pewtercity.asm b/data/mapObjects/pewtercity.asm index 27a559fc..7b389bd2 100755 --- a/data/mapObjects/pewtercity.asm +++ b/data/mapObjects/pewtercity.asm @@ -1,4 +1,4 @@ -PewterCityObject: ; 0x18577 (size=111) +PewterCityObject: db $a ; border block db $7 ; warps diff --git a/data/mapObjects/pewtergym.asm b/data/mapObjects/pewtergym.asm index b0224a11..280f1a7e 100755 --- a/data/mapObjects/pewtergym.asm +++ b/data/mapObjects/pewtergym.asm @@ -1,4 +1,4 @@ -PewterGymObject: ; 0x5c52e (size=42) +PewterGymObject: db $3 ; border block db $2 ; warps diff --git a/data/mapObjects/pewterhouse1.asm b/data/mapObjects/pewterhouse1.asm index 8dcac05c..d973e53b 100755 --- a/data/mapObjects/pewterhouse1.asm +++ b/data/mapObjects/pewterhouse1.asm @@ -1,4 +1,4 @@ -PewterHouse1Object: ; 0x1d616 (size=38) +PewterHouse1Object: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/pewterhouse2.asm b/data/mapObjects/pewterhouse2.asm index b4b8f2e7..6c111acb 100755 --- a/data/mapObjects/pewterhouse2.asm +++ b/data/mapObjects/pewterhouse2.asm @@ -1,4 +1,4 @@ -PewterHouse2Object: ; 0x1d659 (size=32) +PewterHouse2Object: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/pewtermart.asm b/data/mapObjects/pewtermart.asm index 2ef08e29..50ccd288 100755 --- a/data/mapObjects/pewtermart.asm +++ b/data/mapObjects/pewtermart.asm @@ -1,4 +1,4 @@ -PewterMartObject: ; 0x74cda (size=38) +PewterMartObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/pewterpokecenter.asm b/data/mapObjects/pewterpokecenter.asm index d3f87326..4c7444bb 100755 --- a/data/mapObjects/pewterpokecenter.asm +++ b/data/mapObjects/pewterpokecenter.asm @@ -1,4 +1,4 @@ -PewterPokecenterObject: ; 0x5c60d (size=44) +PewterPokecenterObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/pokemontower1.asm b/data/mapObjects/pokemontower1.asm index eb71be9e..54af9efc 100755 --- a/data/mapObjects/pokemontower1.asm +++ b/data/mapObjects/pokemontower1.asm @@ -1,4 +1,4 @@ -PokemonTower1Object: ; 0x60452 (size=58) +PokemonTower1Object: db $1 ; border block db $3 ; warps diff --git a/data/mapObjects/pokemontower2.asm b/data/mapObjects/pokemontower2.asm index 57ba7363..33bc048d 100755 --- a/data/mapObjects/pokemontower2.asm +++ b/data/mapObjects/pokemontower2.asm @@ -1,4 +1,4 @@ -PokemonTower2Object: ; 0x60646 (size=32) +PokemonTower2Object: db $1 ; border block db $2 ; warps diff --git a/data/mapObjects/pokemontower3.asm b/data/mapObjects/pokemontower3.asm index 4591cbe3..9899276a 100755 --- a/data/mapObjects/pokemontower3.asm +++ b/data/mapObjects/pokemontower3.asm @@ -1,4 +1,4 @@ -PokemonTower3Object: ; 0x6075d (size=51) +PokemonTower3Object: db $1 ; border block db $2 ; warps diff --git a/data/mapObjects/pokemontower4.asm b/data/mapObjects/pokemontower4.asm index 722f6e08..19f4f4e3 100755 --- a/data/mapObjects/pokemontower4.asm +++ b/data/mapObjects/pokemontower4.asm @@ -1,4 +1,4 @@ -PokemonTower4Object: ; 0x6088b (size=65) +PokemonTower4Object: db $1 ; border block db $2 ; warps diff --git a/data/mapObjects/pokemontower5.asm b/data/mapObjects/pokemontower5.asm index 1d23abbf..5a73825c 100755 --- a/data/mapObjects/pokemontower5.asm +++ b/data/mapObjects/pokemontower5.asm @@ -1,4 +1,4 @@ -PokemonTower5Object: ; 0x60a48 (size=65) +PokemonTower5Object: db $1 ; border block db $2 ; warps diff --git a/data/mapObjects/pokemontower6.asm b/data/mapObjects/pokemontower6.asm index cd7453d8..d0035faa 100755 --- a/data/mapObjects/pokemontower6.asm +++ b/data/mapObjects/pokemontower6.asm @@ -1,4 +1,4 @@ -PokemonTower6Object: ; 0x60c5b (size=58) +PokemonTower6Object: db $1 ; border block db $2 ; warps diff --git a/data/mapObjects/pokemontower7.asm b/data/mapObjects/pokemontower7.asm index 4d1e26c2..76435c04 100755 --- a/data/mapObjects/pokemontower7.asm +++ b/data/mapObjects/pokemontower7.asm @@ -1,4 +1,4 @@ -PokemonTower7Object: ; 0x60ef6 (size=42) +PokemonTower7Object: db $1 ; border block db $1 ; warps diff --git a/data/mapObjects/powerplant.asm b/data/mapObjects/powerplant.asm index a4c5d8ea..a04cb657 100755 --- a/data/mapObjects/powerplant.asm +++ b/data/mapObjects/powerplant.asm @@ -1,4 +1,4 @@ -PowerPlantObject: ; 0x1e3bf (size=135) +PowerPlantObject: db $2e ; border block db $3 ; warps diff --git a/data/mapObjects/redshouse2f.asm b/data/mapObjects/redshouse2f.asm index d668d441..ebd57e59 100755 --- a/data/mapObjects/redshouse2f.asm +++ b/data/mapObjects/redshouse2f.asm @@ -1,4 +1,4 @@ -RedsHouse2FObject: ; 0x5c0d0 +RedsHouse2FObject: db $0A ; border block db $1 ; warps diff --git a/data/mapObjects/rockethideout1.asm b/data/mapObjects/rockethideout1.asm index 55c0c101..0b2bf374 100755 --- a/data/mapObjects/rockethideout1.asm +++ b/data/mapObjects/rockethideout1.asm @@ -1,4 +1,4 @@ -RocketHideout1Object: ; 0x44ce7 (size=98) +RocketHideout1Object: db $2e ; border block db $5 ; warps diff --git a/data/mapObjects/rockethideout2.asm b/data/mapObjects/rockethideout2.asm index b14dc0e6..6689110c 100755 --- a/data/mapObjects/rockethideout2.asm +++ b/data/mapObjects/rockethideout2.asm @@ -1,4 +1,4 @@ -RocketHideout2Object: ; 0x450f7 (size=80) +RocketHideout2Object: db $2e ; border block db $5 ; warps diff --git a/data/mapObjects/rockethideout3.asm b/data/mapObjects/rockethideout3.asm index d7933ddf..90bfbb57 100755 --- a/data/mapObjects/rockethideout3.asm +++ b/data/mapObjects/rockethideout3.asm @@ -1,4 +1,4 @@ -RocketHideout3Object: ; 0x4534d (size=50) +RocketHideout3Object: db $2e ; border block db $2 ; warps diff --git a/data/mapObjects/rockethideout4.asm b/data/mapObjects/rockethideout4.asm index 616f5a75..42e58b23 100755 --- a/data/mapObjects/rockethideout4.asm +++ b/data/mapObjects/rockethideout4.asm @@ -1,4 +1,4 @@ -RocketHideout4Object: ; 0x455f1 (size=95) +RocketHideout4Object: db $2e ; border block db $3 ; warps diff --git a/data/mapObjects/rockethideoutelevator.asm b/data/mapObjects/rockethideoutelevator.asm index 477e62c9..c1dfe961 100755 --- a/data/mapObjects/rockethideoutelevator.asm +++ b/data/mapObjects/rockethideoutelevator.asm @@ -1,4 +1,4 @@ -RocketHideoutElevatorObject: ; 0x45791 (size=23) +RocketHideoutElevatorObject: db $f ; border block db $2 ; warps diff --git a/data/mapObjects/rocktunnel1.asm b/data/mapObjects/rocktunnel1.asm index 70ffa438..932efb87 100755 --- a/data/mapObjects/rocktunnel1.asm +++ b/data/mapObjects/rocktunnel1.asm @@ -1,4 +1,4 @@ -RockTunnel1Object: ; 0x445f6 (size=127) +RockTunnel1Object: db $3 ; border block db $8 ; warps diff --git a/data/mapObjects/rocktunnel2.asm b/data/mapObjects/rocktunnel2.asm index e343fc0b..3589ec60 100755 --- a/data/mapObjects/rocktunnel2.asm +++ b/data/mapObjects/rocktunnel2.asm @@ -1,4 +1,4 @@ -RockTunnel2Object: ; 0x4613d (size=100) +RockTunnel2Object: db $3 ; border block db $4 ; warps diff --git a/data/mapObjects/rocktunnelpokecenter.asm b/data/mapObjects/rocktunnelpokecenter.asm index 3cd937cf..06a2e39d 100755 --- a/data/mapObjects/rocktunnelpokecenter.asm +++ b/data/mapObjects/rocktunnelpokecenter.asm @@ -1,4 +1,4 @@ -RockTunnelPokecenterObject: ; 0x493d4 (size=44) +RockTunnelPokecenterObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/route1.asm b/data/mapObjects/route1.asm index d2abf51f..0e6237e7 100755 --- a/data/mapObjects/route1.asm +++ b/data/mapObjects/route1.asm @@ -1,4 +1,4 @@ -Route1Object: ; 0x1c0e5 (size=19) +Route1Object: db $b ; border block db $0 ; warps diff --git a/data/mapObjects/route10.asm b/data/mapObjects/route10.asm index 3623b79f..a1590ded 100755 --- a/data/mapObjects/route10.asm +++ b/data/mapObjects/route10.asm @@ -1,4 +1,4 @@ -Route10Object: ; 0x582f6 (size=96) +Route10Object: db $2c ; border block db $4 ; warps diff --git a/data/mapObjects/route11.asm b/data/mapObjects/route11.asm index d0c9af20..8b6b5d3f 100755 --- a/data/mapObjects/route11.asm +++ b/data/mapObjects/route11.asm @@ -1,4 +1,4 @@ -Route11Object: ; 0x584e0 (size=127) +Route11Object: db $f ; border block db $5 ; warps diff --git a/data/mapObjects/route11gate.asm b/data/mapObjects/route11gate.asm index 351b922c..d8e6bff1 100755 --- a/data/mapObjects/route11gate.asm +++ b/data/mapObjects/route11gate.asm @@ -1,4 +1,4 @@ -Route11GateObject: ; 0x49416 (size=50) +Route11GateObject: db $a ; border block db $5 ; warps diff --git a/data/mapObjects/route11gateupstairs.asm b/data/mapObjects/route11gateupstairs.asm index 421de945..6228851d 100755 --- a/data/mapObjects/route11gateupstairs.asm +++ b/data/mapObjects/route11gateupstairs.asm @@ -1,4 +1,4 @@ -Route11GateUpstairsObject: ; 0x494da (size=30) +Route11GateUpstairsObject: db $a ; border block db $1 ; warps diff --git a/data/mapObjects/route12.asm b/data/mapObjects/route12.asm index 783fd49b..2dc7f9e7 100755 --- a/data/mapObjects/route12.asm +++ b/data/mapObjects/route12.asm @@ -1,4 +1,4 @@ -Route12Object: ; 0x5869a (size=118) +Route12Object: db $43 ; border block db $4 ; warps diff --git a/data/mapObjects/route12gate.asm b/data/mapObjects/route12gate.asm index 1e2fe3f9..27e8532a 100755 --- a/data/mapObjects/route12gate.asm +++ b/data/mapObjects/route12gate.asm @@ -1,4 +1,4 @@ -Route12GateObject: ; 0x4950e (size=50) +Route12GateObject: db $a ; border block db $5 ; warps diff --git a/data/mapObjects/route12gateupstairs.asm b/data/mapObjects/route12gateupstairs.asm index 9a8e4d4a..f1221c44 100755 --- a/data/mapObjects/route12gateupstairs.asm +++ b/data/mapObjects/route12gateupstairs.asm @@ -1,4 +1,4 @@ -Route12GateUpstairsObject: ; 0x495de (size=24) +Route12GateUpstairsObject: db $a ; border block db $1 ; warps diff --git a/data/mapObjects/route12house.asm b/data/mapObjects/route12house.asm index fad89578..104b01f7 100755 --- a/data/mapObjects/route12house.asm +++ b/data/mapObjects/route12house.asm @@ -1,4 +1,4 @@ -Route12HouseObject: ; 0x564de (size=26) +Route12HouseObject: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/route13.asm b/data/mapObjects/route13.asm index e6fdf8e6..a01e25a3 100755 --- a/data/mapObjects/route13.asm +++ b/data/mapObjects/route13.asm @@ -1,4 +1,4 @@ -Route13Object: ; 0x5482e (size=93) +Route13Object: db $43 ; border block db $0 ; warps diff --git a/data/mapObjects/route14.asm b/data/mapObjects/route14.asm index ce6d52b0..48edd284 100755 --- a/data/mapObjects/route14.asm +++ b/data/mapObjects/route14.asm @@ -1,4 +1,4 @@ -Route14Object: ; 0x549bb (size=87) +Route14Object: db $43 ; border block db $0 ; warps diff --git a/data/mapObjects/route15.asm b/data/mapObjects/route15.asm index bd6283b0..30fc39c4 100755 --- a/data/mapObjects/route15.asm +++ b/data/mapObjects/route15.asm @@ -1,4 +1,4 @@ -Route15Object: ; 0x5894e (size=126) +Route15Object: db $43 ; border block db $4 ; warps diff --git a/data/mapObjects/route15gate.asm b/data/mapObjects/route15gate.asm index f571ee03..06a6790a 100755 --- a/data/mapObjects/route15gate.asm +++ b/data/mapObjects/route15gate.asm @@ -1,4 +1,4 @@ -Route15GateObject: ; 0x4960c (size=50) +Route15GateObject: db $a ; border block db $5 ; warps diff --git a/data/mapObjects/route16.asm b/data/mapObjects/route16.asm index 529b59bf..b7da1dbb 100755 --- a/data/mapObjects/route16.asm +++ b/data/mapObjects/route16.asm @@ -1,4 +1,4 @@ -Route16Object: ; 0x58afc (size=136) +Route16Object: db $f ; border block db $9 ; warps diff --git a/data/mapObjects/route16gate.asm b/data/mapObjects/route16gate.asm index e1da990d..fce6c292 100755 --- a/data/mapObjects/route16gate.asm +++ b/data/mapObjects/route16gate.asm @@ -1,4 +1,4 @@ -Route16GateObject: ; 0x4978b (size=88) +Route16GateObject: db $a ; border block db $9 ; warps diff --git a/data/mapObjects/route16gateupstairs.asm b/data/mapObjects/route16gateupstairs.asm index d8c2db12..9119bf5e 100755 --- a/data/mapObjects/route16gateupstairs.asm +++ b/data/mapObjects/route16gateupstairs.asm @@ -1,4 +1,4 @@ -Route16GateUpstairsObject: ; 0x4984c (size=30) +Route16GateUpstairsObject: db $a ; border block db $1 ; warps diff --git a/data/mapObjects/route16house.asm b/data/mapObjects/route16house.asm index 12a846c6..e1e4244d 100755 --- a/data/mapObjects/route16house.asm +++ b/data/mapObjects/route16house.asm @@ -1,4 +1,4 @@ -Route16HouseObject: ; 0x1e657 (size=32) +Route16HouseObject: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/route17.asm b/data/mapObjects/route17.asm index c496373e..3c8e3bce 100755 --- a/data/mapObjects/route17.asm +++ b/data/mapObjects/route17.asm @@ -1,4 +1,4 @@ -Route17Object: ; 0x54b42 (size=102) +Route17Object: db $43 ; border block db $0 ; warps diff --git a/data/mapObjects/route18.asm b/data/mapObjects/route18.asm index 40b50b08..41b971b0 100755 --- a/data/mapObjects/route18.asm +++ b/data/mapObjects/route18.asm @@ -1,4 +1,4 @@ -Route18Object: ; 0x58c5a (size=66) +Route18Object: db $43 ; border block db $4 ; warps diff --git a/data/mapObjects/route18gate.asm b/data/mapObjects/route18gate.asm index d42026da..08b10050 100755 --- a/data/mapObjects/route18gate.asm +++ b/data/mapObjects/route18gate.asm @@ -1,4 +1,4 @@ -Route18GateObject: ; 0x49937 (size=50) +Route18GateObject: db $a ; border block db $5 ; warps diff --git a/data/mapObjects/route18gateupstairs.asm b/data/mapObjects/route18gateupstairs.asm index 93438044..1ad911e8 100755 --- a/data/mapObjects/route18gateupstairs.asm +++ b/data/mapObjects/route18gateupstairs.asm @@ -1,4 +1,4 @@ -Route18GateUpstairsObject: ; 0x499a4 (size=24) +Route18GateUpstairsObject: db $a ; border block db $1 ; warps diff --git a/data/mapObjects/route19.asm b/data/mapObjects/route19.asm index 151cc4a8..0f963cfd 100755 --- a/data/mapObjects/route19.asm +++ b/data/mapObjects/route19.asm @@ -1,4 +1,4 @@ -Route19Object: ; 0x54e9a (size=87) +Route19Object: db $43 ; border block db $1 ; warps diff --git a/data/mapObjects/route2.asm b/data/mapObjects/route2.asm index 9731f450..a8b0a7a5 100755 --- a/data/mapObjects/route2.asm +++ b/data/mapObjects/route2.asm @@ -1,4 +1,4 @@ -Route2Object: ; 0x54022 (size=72) +Route2Object: db $f ; border block db $7 ; warps diff --git a/data/mapObjects/route20.asm b/data/mapObjects/route20.asm index 6939ffad..a3527525 100755 --- a/data/mapObjects/route20.asm +++ b/data/mapObjects/route20.asm @@ -1,4 +1,4 @@ -Route20Object: ; 0x50113 (size=106) +Route20Object: db $43 ; border block db $2 ; warps diff --git a/data/mapObjects/route21.asm b/data/mapObjects/route21.asm index e98c8425..1ed7b1cb 100755 --- a/data/mapObjects/route21.asm +++ b/data/mapObjects/route21.asm @@ -1,4 +1,4 @@ -Route21Object: ; 0x55021 (size=76) +Route21Object: db $43 ; border block db $0 ; warps diff --git a/data/mapObjects/route22.asm b/data/mapObjects/route22.asm index 999b9d8a..ef568ae8 100755 --- a/data/mapObjects/route22.asm +++ b/data/mapObjects/route22.asm @@ -1,4 +1,4 @@ -Route22Object: ; 0x50022 (size=27) +Route22Object: db $2c ; border block db $1 ; warps diff --git a/data/mapObjects/route22gate.asm b/data/mapObjects/route22gate.asm index 02f11d58..e75c4d50 100755 --- a/data/mapObjects/route22gate.asm +++ b/data/mapObjects/route22gate.asm @@ -1,4 +1,4 @@ -Route22GateObject: ; 0x1e720 (size=42) +Route22GateObject: db $a ; border block db $4 ; warps diff --git a/data/mapObjects/route23.asm b/data/mapObjects/route23.asm index af8c8dab..3995e510 100755 --- a/data/mapObjects/route23.asm +++ b/data/mapObjects/route23.asm @@ -1,4 +1,4 @@ -Route23Object: ; 0x50361 (size=81) +Route23Object: db $f ; border block db $4 ; warps diff --git a/data/mapObjects/route24.asm b/data/mapObjects/route24.asm index 115f08d3..78a4d573 100755 --- a/data/mapObjects/route24.asm +++ b/data/mapObjects/route24.asm @@ -1,4 +1,4 @@ -Route24Object: ; 0x506a4 (size=67) +Route24Object: db $2c ; border block db $0 ; warps diff --git a/data/mapObjects/route25.asm b/data/mapObjects/route25.asm index 5c6811f3..b26f62ef 100755 --- a/data/mapObjects/route25.asm +++ b/data/mapObjects/route25.asm @@ -1,4 +1,4 @@ -Route25Object: ; 0x507b2 (size=94) +Route25Object: db $2c ; border block db $1 ; warps diff --git a/data/mapObjects/route2gate.asm b/data/mapObjects/route2gate.asm index 9a0b79e0..53590f69 100755 --- a/data/mapObjects/route2gate.asm +++ b/data/mapObjects/route2gate.asm @@ -1,4 +1,4 @@ -Route2GateObject: ; 0x5d620 (size=48) +Route2GateObject: db $a ; border block db $4 ; warps diff --git a/data/mapObjects/route2house.asm b/data/mapObjects/route2house.asm index 463d9a1a..7d1d224d 100755 --- a/data/mapObjects/route2house.asm +++ b/data/mapObjects/route2house.asm @@ -1,4 +1,4 @@ -Route2HouseObject: ; 0x1df07 (size=32) +Route2HouseObject: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/route3.asm b/data/mapObjects/route3.asm index a2df6925..ba446dca 100755 --- a/data/mapObjects/route3.asm +++ b/data/mapObjects/route3.asm @@ -1,4 +1,4 @@ -Route3Object: ; 0x54208 (size=77) +Route3Object: db $2c ; border block db $0 ; warps diff --git a/data/mapObjects/route4.asm b/data/mapObjects/route4.asm index 14e59684..e52f4909 100755 --- a/data/mapObjects/route4.asm +++ b/data/mapObjects/route4.asm @@ -1,4 +1,4 @@ -Route4Object: ; 0x543b2 (size=58) +Route4Object: db $2c ; border block db $3 ; warps diff --git a/data/mapObjects/route5.asm b/data/mapObjects/route5.asm index 7ace428a..eefcaa92 100755 --- a/data/mapObjects/route5.asm +++ b/data/mapObjects/route5.asm @@ -1,4 +1,4 @@ -Route5Object: ; 0x545ab (size=47) +Route5Object: db $a ; border block db $5 ; warps diff --git a/data/mapObjects/route5gate.asm b/data/mapObjects/route5gate.asm index db2f4564..9588f511 100755 --- a/data/mapObjects/route5gate.asm +++ b/data/mapObjects/route5gate.asm @@ -1,4 +1,4 @@ -Route5GateObject: ; 0x1dffb (size=42) +Route5GateObject: db $a ; border block db $4 ; warps diff --git a/data/mapObjects/route6.asm b/data/mapObjects/route6.asm index c854c91f..6ab90621 100755 --- a/data/mapObjects/route6.asm +++ b/data/mapObjects/route6.asm @@ -1,4 +1,4 @@ -Route6Object: ; 0x58022 (size=87) +Route6Object: db $f ; border block db $4 ; warps diff --git a/data/mapObjects/route6gate.asm b/data/mapObjects/route6gate.asm index 59d08e57..79f17007 100755 --- a/data/mapObjects/route6gate.asm +++ b/data/mapObjects/route6gate.asm @@ -1,4 +1,4 @@ -Route6GateObject: ; 0x1e0be (size=42) +Route6GateObject: db $a ; border block db $4 ; warps diff --git a/data/mapObjects/route7.asm b/data/mapObjects/route7.asm index b84fa190..3f753830 100755 --- a/data/mapObjects/route7.asm +++ b/data/mapObjects/route7.asm @@ -1,4 +1,4 @@ -Route7Object: ; 0x48022 (size=47) +Route7Object: db $f ; border block db $5 ; warps diff --git a/data/mapObjects/route7gate.asm b/data/mapObjects/route7gate.asm index 9e80ca39..8f65891b 100755 --- a/data/mapObjects/route7gate.asm +++ b/data/mapObjects/route7gate.asm @@ -1,4 +1,4 @@ -Route7GateObject: ; 0x1e185 (size=42) +Route7GateObject: db $a ; border block db $4 ; warps diff --git a/data/mapObjects/route8.asm b/data/mapObjects/route8.asm index 38bcca5e..8f336e03 100755 --- a/data/mapObjects/route8.asm +++ b/data/mapObjects/route8.asm @@ -1,4 +1,4 @@ -Route8Object: ; 0x5814f (size=119) +Route8Object: db $2c ; border block db $5 ; warps diff --git a/data/mapObjects/route8gate.asm b/data/mapObjects/route8gate.asm index 61d70dfc..a3e21618 100755 --- a/data/mapObjects/route8gate.asm +++ b/data/mapObjects/route8gate.asm @@ -1,4 +1,4 @@ -Route8GateObject: ; 0x1e247 (size=42) +Route8GateObject: db $a ; border block db $4 ; warps diff --git a/data/mapObjects/route9.asm b/data/mapObjects/route9.asm index 6a759608..cdfd801c 100755 --- a/data/mapObjects/route9.asm +++ b/data/mapObjects/route9.asm @@ -1,4 +1,4 @@ -Route9Object: ; 0x546a8 (size=86) +Route9Object: db $2c ; border block db $0 ; warps diff --git a/data/mapObjects/safarizonecenter.asm b/data/mapObjects/safarizonecenter.asm index 41886e9f..b5fa0107 100755 --- a/data/mapObjects/safarizonecenter.asm +++ b/data/mapObjects/safarizonecenter.asm @@ -1,4 +1,4 @@ -SafariZoneCenterObject: ; 0x45bc5 (size=89) +SafariZoneCenterObject: db $0 ; border block db $9 ; warps diff --git a/data/mapObjects/safarizoneeast.asm b/data/mapObjects/safarizoneeast.asm index 4cb1e0ae..6c2f8138 100755 --- a/data/mapObjects/safarizoneeast.asm +++ b/data/mapObjects/safarizoneeast.asm @@ -1,4 +1,4 @@ -SafariZoneEastObject: ; 0x4588b (size=81) +SafariZoneEastObject: db $0 ; border block db $5 ; warps diff --git a/data/mapObjects/safarizoneentrance.asm b/data/mapObjects/safarizoneentrance.asm index 543cf7dc..9d26aa17 100755 --- a/data/mapObjects/safarizoneentrance.asm +++ b/data/mapObjects/safarizoneentrance.asm @@ -1,4 +1,4 @@ -SafariZoneEntranceObject: ; 0x753f5 (size=48) +SafariZoneEntranceObject: db $a ; border block db $4 ; warps diff --git a/data/mapObjects/safarizonenorth.asm b/data/mapObjects/safarizonenorth.asm index e3c4cddb..d0305507 100755 --- a/data/mapObjects/safarizonenorth.asm +++ b/data/mapObjects/safarizonenorth.asm @@ -1,4 +1,4 @@ -SafariZoneNorthObject: ; 0x459d5 (size=105) +SafariZoneNorthObject: db $0 ; border block db $9 ; warps diff --git a/data/mapObjects/safarizoneresthouse1.asm b/data/mapObjects/safarizoneresthouse1.asm index d27a967f..79156825 100755 --- a/data/mapObjects/safarizoneresthouse1.asm +++ b/data/mapObjects/safarizoneresthouse1.asm @@ -1,4 +1,4 @@ -SafariZoneRestHouse1Object: ; 0x45cfe (size=32) +SafariZoneRestHouse1Object: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/safarizoneresthouse2.asm b/data/mapObjects/safarizoneresthouse2.asm index eb6c7a25..82f04f9d 100755 --- a/data/mapObjects/safarizoneresthouse2.asm +++ b/data/mapObjects/safarizoneresthouse2.asm @@ -1,4 +1,4 @@ -SafariZoneRestHouse2Object: ; 0x45d43 (size=38) +SafariZoneRestHouse2Object: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/safarizoneresthouse3.asm b/data/mapObjects/safarizoneresthouse3.asm index 4d698782..ae973fa8 100755 --- a/data/mapObjects/safarizoneresthouse3.asm +++ b/data/mapObjects/safarizoneresthouse3.asm @@ -1,4 +1,4 @@ -SafariZoneRestHouse3Object: ; 0x45d8e (size=38) +SafariZoneRestHouse3Object: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/safarizoneresthouse4.asm b/data/mapObjects/safarizoneresthouse4.asm index 1d928420..7502732c 100755 --- a/data/mapObjects/safarizoneresthouse4.asm +++ b/data/mapObjects/safarizoneresthouse4.asm @@ -1,4 +1,4 @@ -SafariZoneRestHouse4Object: ; 0x45dd9 (size=38) +SafariZoneRestHouse4Object: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/safarizonesecrethouse.asm b/data/mapObjects/safarizonesecrethouse.asm index 471ec40b..a96115b8 100755 --- a/data/mapObjects/safarizonesecrethouse.asm +++ b/data/mapObjects/safarizonesecrethouse.asm @@ -1,4 +1,4 @@ -SafariZoneSecretHouseObject: ; 0x4a365 (size=26) +SafariZoneSecretHouseObject: db $17 ; border block db $2 ; warps diff --git a/data/mapObjects/safarizonewest.asm b/data/mapObjects/safarizonewest.asm index 724476ae..64ed0876 100755 --- a/data/mapObjects/safarizonewest.asm +++ b/data/mapObjects/safarizonewest.asm @@ -1,4 +1,4 @@ -SafariZoneWestObject: ; 0x4a1dc (size=108) +SafariZoneWestObject: db $0 ; border block db $8 ; warps diff --git a/data/mapObjects/saffroncity.asm b/data/mapObjects/saffroncity.asm index 5980659b..730d8be5 100755 --- a/data/mapObjects/saffroncity.asm +++ b/data/mapObjects/saffroncity.asm @@ -1,4 +1,4 @@ -SaffronCityObject: ; 0x509e2 (size=188) +SaffronCityObject: db $f ; border block db $8 ; warps diff --git a/data/mapObjects/saffrongym.asm b/data/mapObjects/saffrongym.asm index 20d91991..629ab760 100755 --- a/data/mapObjects/saffrongym.asm +++ b/data/mapObjects/saffrongym.asm @@ -1,4 +1,4 @@ -SaffronGymObject: ; 0x5d259 (size=330) +SaffronGymObject: db $2e ; border block db $20 ; warps diff --git a/data/mapObjects/saffronhouse1.asm b/data/mapObjects/saffronhouse1.asm index 0480cbd9..9f6d7750 100755 --- a/data/mapObjects/saffronhouse1.asm +++ b/data/mapObjects/saffronhouse1.asm @@ -1,4 +1,4 @@ -SaffronHouse1Object: ; 0x1de04 (size=44) +SaffronHouse1Object: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/saffronhouse2.asm b/data/mapObjects/saffronhouse2.asm index ffcbd64d..e57bdbb7 100755 --- a/data/mapObjects/saffronhouse2.asm +++ b/data/mapObjects/saffronhouse2.asm @@ -1,4 +1,4 @@ -SaffronHouse2Object: ; 0x1de8a (size=26) +SaffronHouse2Object: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/saffronmart.asm b/data/mapObjects/saffronmart.asm index be3803af..113a1ea9 100755 --- a/data/mapObjects/saffronmart.asm +++ b/data/mapObjects/saffronmart.asm @@ -1,4 +1,4 @@ -SaffronMartObject: ; 0x5d41c (size=38) +SaffronMartObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/saffronpokecenter.asm b/data/mapObjects/saffronpokecenter.asm index bda46343..b82be083 100755 --- a/data/mapObjects/saffronpokecenter.asm +++ b/data/mapObjects/saffronpokecenter.asm @@ -1,4 +1,4 @@ -SaffronPokecenterObject: ; 0x5d54f (size=44) +SaffronPokecenterObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/school.asm b/data/mapObjects/school.asm index 4c802e64..3fe629da 100755 --- a/data/mapObjects/school.asm +++ b/data/mapObjects/school.asm @@ -1,4 +1,4 @@ -SchoolObject: ; 0x1d55d (size=32) +SchoolObject: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/seafoamislands1.asm b/data/mapObjects/seafoamislands1.asm index 3b3d4f7a..eaa9036e 100755 --- a/data/mapObjects/seafoamislands1.asm +++ b/data/mapObjects/seafoamislands1.asm @@ -1,4 +1,4 @@ -SeafoamIslands1Object: ; 0x4484f (size=72) +SeafoamIslands1Object: db $7d ; border block db $7 ; warps diff --git a/data/mapObjects/seafoamislands2.asm b/data/mapObjects/seafoamislands2.asm index 29cdfa59..d25e5375 100755 --- a/data/mapObjects/seafoamislands2.asm +++ b/data/mapObjects/seafoamislands2.asm @@ -1,4 +1,4 @@ -SeafoamIslands2Object: ; 0x46376 (size=72) +SeafoamIslands2Object: db $7d ; border block db $7 ; warps diff --git a/data/mapObjects/seafoamislands3.asm b/data/mapObjects/seafoamislands3.asm index 28a5e67b..a660f2ed 100755 --- a/data/mapObjects/seafoamislands3.asm +++ b/data/mapObjects/seafoamislands3.asm @@ -1,4 +1,4 @@ -SeafoamIslands3Object: ; 0x464b2 (size=72) +SeafoamIslands3Object: db $7d ; border block db $7 ; warps diff --git a/data/mapObjects/seafoamislands4.asm b/data/mapObjects/seafoamislands4.asm index e90b3865..c7043a93 100755 --- a/data/mapObjects/seafoamislands4.asm +++ b/data/mapObjects/seafoamislands4.asm @@ -1,4 +1,4 @@ -SeafoamIslands4Object: ; 0x466a6 (size=96) +SeafoamIslands4Object: db $7d ; border block db $7 ; warps diff --git a/data/mapObjects/seafoamislands5.asm b/data/mapObjects/seafoamislands5.asm index e5fbaecd..a05c00cc 100755 --- a/data/mapObjects/seafoamislands5.asm +++ b/data/mapObjects/seafoamislands5.asm @@ -1,4 +1,4 @@ -SeafoamIslands5Object: ; 0x468bc (size=62) +SeafoamIslands5Object: db $7d ; border block db $4 ; warps diff --git a/data/mapObjects/silphco1.asm b/data/mapObjects/silphco1.asm index a953f376..fe779393 100755 --- a/data/mapObjects/silphco1.asm +++ b/data/mapObjects/silphco1.asm @@ -1,4 +1,4 @@ -SilphCo1Object: ; 0x5d470 (size=50) +SilphCo1Object: db $2e ; border block db $5 ; warps diff --git a/data/mapObjects/silphco10.asm b/data/mapObjects/silphco10.asm index cc608e64..185a23c9 100755 --- a/data/mapObjects/silphco10.asm +++ b/data/mapObjects/silphco10.asm @@ -1,4 +1,4 @@ -SilphCo10Object: ; 0x5a1fb (size=95) +SilphCo10Object: db $2e ; border block db $6 ; warps diff --git a/data/mapObjects/silphco11.asm b/data/mapObjects/silphco11.asm index bae7eda5..a1bb5d81 100755 --- a/data/mapObjects/silphco11.asm +++ b/data/mapObjects/silphco11.asm @@ -1,4 +1,4 @@ -SilphCo11Object: ; 0x62380 (size=72) +SilphCo11Object: db $d ; border block db $4 ; warps diff --git a/data/mapObjects/silphco2.asm b/data/mapObjects/silphco2.asm index 44271d70..ae3aca74 100755 --- a/data/mapObjects/silphco2.asm +++ b/data/mapObjects/silphco2.asm @@ -1,4 +1,4 @@ -SilphCo2Object: ; 0x59e66 (size=98) +SilphCo2Object: db $2e ; border block db $7 ; warps diff --git a/data/mapObjects/silphco3.asm b/data/mapObjects/silphco3.asm index 48bb8c1a..ddea9062 100755 --- a/data/mapObjects/silphco3.asm +++ b/data/mapObjects/silphco3.asm @@ -1,4 +1,4 @@ -SilphCo3Object: ; 0x5a035 (size=113) +SilphCo3Object: db $2e ; border block db $a ; warps diff --git a/data/mapObjects/silphco4.asm b/data/mapObjects/silphco4.asm index 762ca7f8..a2320112 100755 --- a/data/mapObjects/silphco4.asm +++ b/data/mapObjects/silphco4.asm @@ -1,4 +1,4 @@ -SilphCo4Object: ; 0x19e35 (size=111) +SilphCo4Object: db $2e ; border block db $7 ; warps diff --git a/data/mapObjects/silphco5.asm b/data/mapObjects/silphco5.asm index 0c956cd3..62e30fac 100755 --- a/data/mapObjects/silphco5.asm +++ b/data/mapObjects/silphco5.asm @@ -1,4 +1,4 @@ -SilphCo5Object: ; 0x1a08d (size=137) +SilphCo5Object: db $2e ; border block db $7 ; warps diff --git a/data/mapObjects/silphco6.asm b/data/mapObjects/silphco6.asm index 66372f57..19d66e50 100755 --- a/data/mapObjects/silphco6.asm +++ b/data/mapObjects/silphco6.asm @@ -1,4 +1,4 @@ -SilphCo6Object: ; 0x1a2fb (size=112) +SilphCo6Object: db $2e ; border block db $5 ; warps diff --git a/data/mapObjects/silphco7.asm b/data/mapObjects/silphco7.asm index ef665ac0..47e881fe 100755 --- a/data/mapObjects/silphco7.asm +++ b/data/mapObjects/silphco7.asm @@ -1,4 +1,4 @@ -SilphCo7Object: ; 0x51ed7 (size=128) +SilphCo7Object: db $2e ; border block db $6 ; warps diff --git a/data/mapObjects/silphco8.asm b/data/mapObjects/silphco8.asm index a4b97a91..188b27b6 100755 --- a/data/mapObjects/silphco8.asm +++ b/data/mapObjects/silphco8.asm @@ -1,4 +1,4 @@ -SilphCo8Object: ; 0x56613 (size=90) +SilphCo8Object: db $2e ; border block db $7 ; warps diff --git a/data/mapObjects/silphco9.asm b/data/mapObjects/silphco9.asm index 204f0d1d..76d82895 100755 --- a/data/mapObjects/silphco9.asm +++ b/data/mapObjects/silphco9.asm @@ -1,4 +1,4 @@ -SilphCo9Object: ; 0x5d93f (size=74) +SilphCo9Object: db $2e ; border block db $5 ; warps diff --git a/data/mapObjects/silphcoelevator.asm b/data/mapObjects/silphcoelevator.asm index 0e0f03c6..2de795ae 100755 --- a/data/mapObjects/silphcoelevator.asm +++ b/data/mapObjects/silphcoelevator.asm @@ -1,4 +1,4 @@ -SilphCoElevatorObject: ; 0x45844 (size=23) +SilphCoElevatorObject: db $f ; border block db $2 ; warps diff --git a/data/mapObjects/ssanne1.asm b/data/mapObjects/ssanne1.asm index c631074c..7f6a826c 100755 --- a/data/mapObjects/ssanne1.asm +++ b/data/mapObjects/ssanne1.asm @@ -1,4 +1,4 @@ -SSAnne1Object: ; 0x61277 (size=104) +SSAnne1Object: db $c ; border block db $b ; warps diff --git a/data/mapObjects/ssanne10.asm b/data/mapObjects/ssanne10.asm index c57925f1..a8f49cf7 100755 --- a/data/mapObjects/ssanne10.asm +++ b/data/mapObjects/ssanne10.asm @@ -1,4 +1,4 @@ -SSAnne10Object: ; 0x61e75 (size=165) +SSAnne10Object: db $c ; border block db $a ; warps diff --git a/data/mapObjects/ssanne2.asm b/data/mapObjects/ssanne2.asm index 9f3691cf..eb761685 100755 --- a/data/mapObjects/ssanne2.asm +++ b/data/mapObjects/ssanne2.asm @@ -1,4 +1,4 @@ -SSAnne2Object: ; 0x61514 (size=90) +SSAnne2Object: db $c ; border block db $9 ; warps diff --git a/data/mapObjects/ssanne3.asm b/data/mapObjects/ssanne3.asm index 1037d118..567f0363 100755 --- a/data/mapObjects/ssanne3.asm +++ b/data/mapObjects/ssanne3.asm @@ -1,4 +1,4 @@ -SSAnne3Object: ; 0x4493c (size=26) +SSAnne3Object: db $c ; border block db $2 ; warps diff --git a/data/mapObjects/ssanne4.asm b/data/mapObjects/ssanne4.asm index 9d752480..fbd1df5b 100755 --- a/data/mapObjects/ssanne4.asm +++ b/data/mapObjects/ssanne4.asm @@ -1,4 +1,4 @@ -SSAnne4Object: ; 0x61632 (size=52) +SSAnne4Object: db $c ; border block db $6 ; warps diff --git a/data/mapObjects/ssanne5.asm b/data/mapObjects/ssanne5.asm index e18f1074..6031327e 100755 --- a/data/mapObjects/ssanne5.asm +++ b/data/mapObjects/ssanne5.asm @@ -1,4 +1,4 @@ -SSAnne5Object: ; 0x6172b (size=54) +SSAnne5Object: db $23 ; border block db $2 ; warps diff --git a/data/mapObjects/ssanne6.asm b/data/mapObjects/ssanne6.asm index 159a3ed2..8c2444f8 100755 --- a/data/mapObjects/ssanne6.asm +++ b/data/mapObjects/ssanne6.asm @@ -1,4 +1,4 @@ -SSAnne6Object: ; 0x6181b (size=54) +SSAnne6Object: db $c ; border block db $1 ; warps diff --git a/data/mapObjects/ssanne7.asm b/data/mapObjects/ssanne7.asm index 6179a28e..6002e85b 100755 --- a/data/mapObjects/ssanne7.asm +++ b/data/mapObjects/ssanne7.asm @@ -1,4 +1,4 @@ -SSAnne7Object: ; 0x61946 (size=24) +SSAnne7Object: db $c ; border block db $1 ; warps diff --git a/data/mapObjects/ssanne8.asm b/data/mapObjects/ssanne8.asm index f089b35d..0d1ea2f3 100755 --- a/data/mapObjects/ssanne8.asm +++ b/data/mapObjects/ssanne8.asm @@ -1,4 +1,4 @@ -SSAnne8Object: ; 0x61a60 (size=127) +SSAnne8Object: db $c ; border block db $6 ; warps diff --git a/data/mapObjects/ssanne9.asm b/data/mapObjects/ssanne9.asm index 7fddc058..6b5e4b7d 100755 --- a/data/mapObjects/ssanne9.asm +++ b/data/mapObjects/ssanne9.asm @@ -1,4 +1,4 @@ -SSAnne9Object: ; 0x61c8d (size=188) +SSAnne9Object: db $c ; border block db $c ; warps diff --git a/data/mapObjects/tradecenter.asm b/data/mapObjects/tradecenter.asm index 57a3eee5..f482fc4f 100644 --- a/data/mapObjects/tradecenter.asm +++ b/data/mapObjects/tradecenter.asm @@ -1,4 +1,4 @@ -TradeCenterObject: ; 0x4fd53 (size=10) +TradeCenterObject: db $e ; border block db $0 ; warps diff --git a/data/mapObjects/undergroundpathentranceroute5.asm b/data/mapObjects/undergroundpathentranceroute5.asm index a2f18179..14d7232e 100755 --- a/data/mapObjects/undergroundpathentranceroute5.asm +++ b/data/mapObjects/undergroundpathentranceroute5.asm @@ -1,4 +1,4 @@ -UndergroundPathEntranceRoute5Object: ; 0x5d6c1 (size=34) +UndergroundPathEntranceRoute5Object: db $a ; border block db $3 ; warps diff --git a/data/mapObjects/undergroundpathentranceroute6.asm b/data/mapObjects/undergroundpathentranceroute6.asm index 834263b5..7bce8774 100755 --- a/data/mapObjects/undergroundpathentranceroute6.asm +++ b/data/mapObjects/undergroundpathentranceroute6.asm @@ -1,4 +1,4 @@ -UndergroundPathEntranceRoute6Object: ; 0x5d6fe (size=34) +UndergroundPathEntranceRoute6Object: db $a ; border block db $3 ; warps diff --git a/data/mapObjects/undergroundpathentranceroute7.asm b/data/mapObjects/undergroundpathentranceroute7.asm index 909ff4a0..51b4bcda 100755 --- a/data/mapObjects/undergroundpathentranceroute7.asm +++ b/data/mapObjects/undergroundpathentranceroute7.asm @@ -1,4 +1,4 @@ -UndergroundPathEntranceRoute7Object: ; 0x5d73b (size=34) +UndergroundPathEntranceRoute7Object: db $a ; border block db $3 ; warps diff --git a/data/mapObjects/undergroundpathentranceroute8.asm b/data/mapObjects/undergroundpathentranceroute8.asm index 9a1d9d37..9e98c987 100755 --- a/data/mapObjects/undergroundpathentranceroute8.asm +++ b/data/mapObjects/undergroundpathentranceroute8.asm @@ -1,4 +1,4 @@ -UndergroundPathEntranceRoute8Object: ; 0x1e298 (size=34) +UndergroundPathEntranceRoute8Object: db $a ; border block db $3 ; warps diff --git a/data/mapObjects/undergroundpathns.asm b/data/mapObjects/undergroundpathns.asm index d9ae7499..d0188a76 100755 --- a/data/mapObjects/undergroundpathns.asm +++ b/data/mapObjects/undergroundpathns.asm @@ -1,4 +1,4 @@ -UndergroundPathNSObject: ; 0x61f2a (size=20) +UndergroundPathNSObject: db $1 ; border block db $2 ; warps diff --git a/data/mapObjects/undergroundpathwe.asm b/data/mapObjects/undergroundpathwe.asm index 303f60b9..42bbb9bf 100755 --- a/data/mapObjects/undergroundpathwe.asm +++ b/data/mapObjects/undergroundpathwe.asm @@ -1,4 +1,4 @@ -UndergroundPathWEObject: ; 0x61f4e (size=20) +UndergroundPathWEObject: db $1 ; border block db $2 ; warps diff --git a/data/mapObjects/unknowndungeon1.asm b/data/mapObjects/unknowndungeon1.asm index 0635e9a7..5348dab8 100755 --- a/data/mapObjects/unknowndungeon1.asm +++ b/data/mapObjects/unknowndungeon1.asm @@ -1,4 +1,4 @@ -UnknownDungeon1Object: ; 0x74d15 (size=97) +UnknownDungeon1Object: db $7d ; border block db $9 ; warps diff --git a/data/mapObjects/unknowndungeon2.asm b/data/mapObjects/unknowndungeon2.asm index 88cc6ba0..8e696462 100755 --- a/data/mapObjects/unknowndungeon2.asm +++ b/data/mapObjects/unknowndungeon2.asm @@ -1,4 +1,4 @@ -UnknownDungeon2Object: ; 0x45e14 (size=73) +UnknownDungeon2Object: db $7d ; border block db $6 ; warps diff --git a/data/mapObjects/unknowndungeon3.asm b/data/mapObjects/unknowndungeon3.asm index cb2d8f83..18439368 100755 --- a/data/mapObjects/unknowndungeon3.asm +++ b/data/mapObjects/unknowndungeon3.asm @@ -1,4 +1,4 @@ -UnknownDungeon3Object: ; 0x45f36 (size=34) +UnknownDungeon3Object: db $7d ; border block db $1 ; warps diff --git a/data/mapObjects/vermilioncity.asm b/data/mapObjects/vermilioncity.asm index 3bfbc947..8342a2a6 100755 --- a/data/mapObjects/vermilioncity.asm +++ b/data/mapObjects/vermilioncity.asm @@ -1,4 +1,4 @@ -VermilionCityObject: ; 0x189ba (size=133) +VermilionCityObject: db $43 ; border block db $9 ; warps diff --git a/data/mapObjects/vermiliondock.asm b/data/mapObjects/vermiliondock.asm index b8aa659d..54d6790a 100755 --- a/data/mapObjects/vermiliondock.asm +++ b/data/mapObjects/vermiliondock.asm @@ -1,4 +1,4 @@ -VermilionDockObject: ; 0x1dcc6 (size=20) +VermilionDockObject: db $f ; border block db $2 ; warps diff --git a/data/mapObjects/vermiliongym.asm b/data/mapObjects/vermiliongym.asm index 892403a3..9058ec4c 100755 --- a/data/mapObjects/vermiliongym.asm +++ b/data/mapObjects/vermiliongym.asm @@ -1,4 +1,4 @@ -VermilionGymObject: ; 0x5cbfe (size=58) +VermilionGymObject: db $3 ; border block db $2 ; warps diff --git a/data/mapObjects/vermilionhouse1.asm b/data/mapObjects/vermilionhouse1.asm index 952661cc..199489ba 100755 --- a/data/mapObjects/vermilionhouse1.asm +++ b/data/mapObjects/vermilionhouse1.asm @@ -1,4 +1,4 @@ -VermilionHouse1Object: ; 0x1db20 (size=38) +VermilionHouse1Object: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/vermilionhouse2.asm b/data/mapObjects/vermilionhouse2.asm index 03c3c1a2..0108233b 100755 --- a/data/mapObjects/vermilionhouse2.asm +++ b/data/mapObjects/vermilionhouse2.asm @@ -1,4 +1,4 @@ -VermilionHouse2Object: ; 0x560cf (size=26) +VermilionHouse2Object: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/vermilionhouse3.asm b/data/mapObjects/vermilionhouse3.asm index 161ad090..3d269364 100755 --- a/data/mapObjects/vermilionhouse3.asm +++ b/data/mapObjects/vermilionhouse3.asm @@ -1,4 +1,4 @@ -VermilionHouse3Object: ; 0x19c25 (size=26) +VermilionHouse3Object: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/vermilionmart.asm b/data/mapObjects/vermilionmart.asm index 56c52944..01df824e 100755 --- a/data/mapObjects/vermilionmart.asm +++ b/data/mapObjects/vermilionmart.asm @@ -1,4 +1,4 @@ -VermilionMartObject: ; 0x5c9f4 (size=38) +VermilionMartObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/vermilionpokecenter.asm b/data/mapObjects/vermilionpokecenter.asm index cd11d653..1440531f 100755 --- a/data/mapObjects/vermilionpokecenter.asm +++ b/data/mapObjects/vermilionpokecenter.asm @@ -1,4 +1,4 @@ -VermilionPokecenterObject: ; 0x5c9a9 (size=44) +VermilionPokecenterObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/victoryroad1.asm b/data/mapObjects/victoryroad1.asm index 9e66e95b..05680b9f 100755 --- a/data/mapObjects/victoryroad1.asm +++ b/data/mapObjects/victoryroad1.asm @@ -1,4 +1,4 @@ -VictoryRoad1Object: ; 0x5dab8 (size=76) +VictoryRoad1Object: db $7d ; border block db $3 ; warps diff --git a/data/mapObjects/victoryroad2.asm b/data/mapObjects/victoryroad2.asm index 348cae03..1bada62a 100755 --- a/data/mapObjects/victoryroad2.asm +++ b/data/mapObjects/victoryroad2.asm @@ -1,4 +1,4 @@ -VictoryRoad2Object: ; 0x51915 (size=154) +VictoryRoad2Object: db $7d ; border block db $7 ; warps diff --git a/data/mapObjects/victoryroad3.asm b/data/mapObjects/victoryroad3.asm index 19a06c65..20e43583 100755 --- a/data/mapObjects/victoryroad3.asm +++ b/data/mapObjects/victoryroad3.asm @@ -1,4 +1,4 @@ -VictoryRoad3Object: ; 0x44acd (size=106) +VictoryRoad3Object: db $7d ; border block db $4 ; warps diff --git a/data/mapObjects/viridiancity.asm b/data/mapObjects/viridiancity.asm index 79b177f4..465d53bc 100755 --- a/data/mapObjects/viridiancity.asm +++ b/data/mapObjects/viridiancity.asm @@ -1,4 +1,4 @@ -ViridianCityObject: ; 0x18384 (size=104) +ViridianCityObject: db $f ; border block db $5 ; warps diff --git a/data/mapObjects/viridianforest.asm b/data/mapObjects/viridianforest.asm index 8f5d6b0b..0bb67f82 100755 --- a/data/mapObjects/viridianforest.asm +++ b/data/mapObjects/viridianforest.asm @@ -1,4 +1,4 @@ -ViridianForestObject: ; 0x611da (size=127) +ViridianForestObject: db $3 ; border block db $6 ; warps diff --git a/data/mapObjects/viridianforestentrance.asm b/data/mapObjects/viridianforestentrance.asm index 891c0636..8fe934ae 100755 --- a/data/mapObjects/viridianforestentrance.asm +++ b/data/mapObjects/viridianforestentrance.asm @@ -1,4 +1,4 @@ -ViridianForestEntranceObject: ; 0x5d66d (size=48) +ViridianForestEntranceObject: db $a ; border block db $4 ; warps diff --git a/data/mapObjects/viridianforestexit.asm b/data/mapObjects/viridianforestexit.asm index be8b65ea..0f48fd1c 100755 --- a/data/mapObjects/viridianforestexit.asm +++ b/data/mapObjects/viridianforestexit.asm @@ -1,4 +1,4 @@ -ViridianForestExitObject: ; 0x5d598 (size=48) +ViridianForestExitObject: db $a ; border block db $4 ; warps diff --git a/data/mapObjects/viridiangym.asm b/data/mapObjects/viridiangym.asm index 468b9022..8efa5e22 100755 --- a/data/mapObjects/viridiangym.asm +++ b/data/mapObjects/viridiangym.asm @@ -1,4 +1,4 @@ -ViridianGymObject: ; 0x74bde (size=105) +ViridianGymObject: db $3 ; border block db $2 ; warps diff --git a/data/mapObjects/viridianhouse.asm b/data/mapObjects/viridianhouse.asm index ba45adac..c06bb9c8 100755 --- a/data/mapObjects/viridianhouse.asm +++ b/data/mapObjects/viridianhouse.asm @@ -1,4 +1,4 @@ -ViridianHouseObject: ; 0x1d5bb (size=44) +ViridianHouseObject: db $a ; border block db $2 ; warps diff --git a/data/mapObjects/viridianmart.asm b/data/mapObjects/viridianmart.asm index ed2642f9..4b90bee3 100755 --- a/data/mapObjects/viridianmart.asm +++ b/data/mapObjects/viridianmart.asm @@ -1,4 +1,4 @@ -ViridianMartObject: ; 0x1d50a (size=38) +ViridianMartObject: db $0 ; border block db $2 ; warps diff --git a/data/mapObjects/viridianpokecenter.asm b/data/mapObjects/viridianpokecenter.asm index 74c27d46..39432c17 100755 --- a/data/mapObjects/viridianpokecenter.asm +++ b/data/mapObjects/viridianpokecenter.asm @@ -1,4 +1,4 @@ -ViridianPokecenterObject: ; 0x44277 (size=44) +ViridianPokecenterObject: db $0 ; border block db $2 ; warps |