diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-10-05 21:02:42 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-10-05 21:02:42 -0400 |
| commit | fc899e1906a9a245e94dafa7c0da2ef1697b7335 (patch) | |
| tree | 2e8694dca33f7b1c3eae1d878b8112c0ff07537f | |
| parent | 52660012c62fa83d37817c05f5c3cae637c473dd (diff) | |
`warp_event` warp IDs start at 1, like in pokegold/pokecrystal
213 files changed, 807 insertions, 807 deletions
diff --git a/data/maps/objects/AgathasRoom.asm b/data/maps/objects/AgathasRoom.asm index 50d2e8c3..afccd1be 100644 --- a/data/maps/objects/AgathasRoom.asm +++ b/data/maps/objects/AgathasRoom.asm @@ -2,10 +2,10 @@ AgathasRoom_Object: db $0 ; border block def_warp_events - warp_event 4, 11, BRUNOS_ROOM, 2 - warp_event 5, 11, BRUNOS_ROOM, 3 - warp_event 4, 0, LANCES_ROOM, 0 - warp_event 5, 0, LANCES_ROOM, 0 + warp_event 4, 11, BRUNOS_ROOM, 3 + warp_event 5, 11, BRUNOS_ROOM, 4 + warp_event 4, 0, LANCES_ROOM, 1 + warp_event 5, 0, LANCES_ROOM, 1 def_bg_events diff --git a/data/maps/objects/BikeShop.asm b/data/maps/objects/BikeShop.asm index c0028f8c..1fa8f6e6 100644 --- a/data/maps/objects/BikeShop.asm +++ b/data/maps/objects/BikeShop.asm @@ -2,8 +2,8 @@ BikeShop_Object: db $e ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 4 - warp_event 3, 7, LAST_MAP, 4 + warp_event 2, 7, LAST_MAP, 5 + warp_event 3, 7, LAST_MAP, 5 def_bg_events diff --git a/data/maps/objects/BillsHouse.asm b/data/maps/objects/BillsHouse.asm index a6b2463d..db8f8433 100644 --- a/data/maps/objects/BillsHouse.asm +++ b/data/maps/objects/BillsHouse.asm @@ -2,8 +2,8 @@ BillsHouse_Object: db $d ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 0 - warp_event 3, 7, LAST_MAP, 0 + warp_event 2, 7, LAST_MAP, 1 + warp_event 3, 7, LAST_MAP, 1 def_bg_events diff --git a/data/maps/objects/BluesHouse.asm b/data/maps/objects/BluesHouse.asm index 36653b6b..ac200b28 100644 --- a/data/maps/objects/BluesHouse.asm +++ b/data/maps/objects/BluesHouse.asm @@ -2,8 +2,8 @@ BluesHouse_Object: db $a ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 1 - warp_event 3, 7, LAST_MAP, 1 + warp_event 2, 7, LAST_MAP, 2 + warp_event 3, 7, LAST_MAP, 2 def_bg_events diff --git a/data/maps/objects/BrunosRoom.asm b/data/maps/objects/BrunosRoom.asm index 9cf7e5e9..1e8a0a27 100644 --- a/data/maps/objects/BrunosRoom.asm +++ b/data/maps/objects/BrunosRoom.asm @@ -2,10 +2,10 @@ BrunosRoom_Object: db $3 ; border block def_warp_events - warp_event 4, 11, LORELEIS_ROOM, 2 - warp_event 5, 11, LORELEIS_ROOM, 3 - warp_event 4, 0, AGATHAS_ROOM, 0 - warp_event 5, 0, AGATHAS_ROOM, 1 + warp_event 4, 11, LORELEIS_ROOM, 3 + warp_event 5, 11, LORELEIS_ROOM, 4 + warp_event 4, 0, AGATHAS_ROOM, 1 + warp_event 5, 0, AGATHAS_ROOM, 2 def_bg_events diff --git a/data/maps/objects/CeladonChiefHouse.asm b/data/maps/objects/CeladonChiefHouse.asm index 16779c25..8bec11b0 100644 --- a/data/maps/objects/CeladonChiefHouse.asm +++ b/data/maps/objects/CeladonChiefHouse.asm @@ -2,8 +2,8 @@ CeladonChiefHouse_Object: db $f ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 11 - warp_event 3, 7, LAST_MAP, 11 + warp_event 2, 7, LAST_MAP, 12 + warp_event 3, 7, LAST_MAP, 12 def_bg_events diff --git a/data/maps/objects/CeladonCity.asm b/data/maps/objects/CeladonCity.asm index 5f514653..1644335b 100644 --- a/data/maps/objects/CeladonCity.asm +++ b/data/maps/objects/CeladonCity.asm @@ -2,19 +2,19 @@ CeladonCity_Object: db $f ; border block def_warp_events - warp_event 8, 13, CELADON_MART_1F, 0 - warp_event 10, 13, CELADON_MART_1F, 2 - warp_event 24, 9, CELADON_MANSION_1F, 0 - warp_event 24, 3, CELADON_MANSION_1F, 2 - warp_event 25, 3, CELADON_MANSION_1F, 2 - warp_event 41, 9, CELADON_POKECENTER, 0 - warp_event 12, 27, CELADON_GYM, 0 - warp_event 28, 19, GAME_CORNER, 0 - warp_event 39, 19, CELADON_MART_5F, 0 - warp_event 33, 19, GAME_CORNER_PRIZE_ROOM, 0 - warp_event 31, 27, CELADON_DINER, 0 - warp_event 35, 27, CELADON_CHIEF_HOUSE, 0 - warp_event 43, 27, CELADON_HOTEL, 0 + warp_event 8, 13, CELADON_MART_1F, 1 + warp_event 10, 13, CELADON_MART_1F, 3 + warp_event 24, 9, CELADON_MANSION_1F, 1 + warp_event 24, 3, CELADON_MANSION_1F, 3 + warp_event 25, 3, CELADON_MANSION_1F, 3 + warp_event 41, 9, CELADON_POKECENTER, 1 + warp_event 12, 27, CELADON_GYM, 1 + warp_event 28, 19, GAME_CORNER, 1 + warp_event 39, 19, CELADON_MART_5F, 1 + warp_event 33, 19, GAME_CORNER_PRIZE_ROOM, 1 + warp_event 31, 27, CELADON_DINER, 1 + warp_event 35, 27, CELADON_CHIEF_HOUSE, 1 + warp_event 43, 27, CELADON_HOTEL, 1 def_bg_events bg_event 27, 15, 10 ; CeladonCityText10 diff --git a/data/maps/objects/CeladonDiner.asm b/data/maps/objects/CeladonDiner.asm index 629a34a7..33ea922b 100644 --- a/data/maps/objects/CeladonDiner.asm +++ b/data/maps/objects/CeladonDiner.asm @@ -2,8 +2,8 @@ CeladonDiner_Object: db $f ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 10 - warp_event 4, 7, LAST_MAP, 10 + warp_event 3, 7, LAST_MAP, 11 + warp_event 4, 7, LAST_MAP, 11 def_bg_events diff --git a/data/maps/objects/CeladonGym.asm b/data/maps/objects/CeladonGym.asm index c296c68a..294e727d 100644 --- a/data/maps/objects/CeladonGym.asm +++ b/data/maps/objects/CeladonGym.asm @@ -2,8 +2,8 @@ CeladonGym_Object: db $3 ; border block def_warp_events - warp_event 4, 17, LAST_MAP, 6 - warp_event 5, 17, LAST_MAP, 6 + warp_event 4, 17, LAST_MAP, 7 + warp_event 5, 17, LAST_MAP, 7 def_bg_events diff --git a/data/maps/objects/CeladonHotel.asm b/data/maps/objects/CeladonHotel.asm index c79b658f..13aaff64 100644 --- a/data/maps/objects/CeladonHotel.asm +++ b/data/maps/objects/CeladonHotel.asm @@ -2,8 +2,8 @@ CeladonHotel_Object: db $0 ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 12 - warp_event 4, 7, LAST_MAP, 12 + warp_event 3, 7, LAST_MAP, 13 + warp_event 4, 7, LAST_MAP, 13 def_bg_events diff --git a/data/maps/objects/CeladonMansion1F.asm b/data/maps/objects/CeladonMansion1F.asm index 01a907f1..4966c903 100644 --- a/data/maps/objects/CeladonMansion1F.asm +++ b/data/maps/objects/CeladonMansion1F.asm @@ -2,11 +2,11 @@ CeladonMansion1F_Object: db $f ; border block def_warp_events - warp_event 4, 11, LAST_MAP, 2 - warp_event 5, 11, LAST_MAP, 2 - warp_event 4, 0, LAST_MAP, 4 - warp_event 7, 1, CELADON_MANSION_2F, 1 - warp_event 2, 1, CELADON_MANSION_2F, 2 + warp_event 4, 11, LAST_MAP, 3 + warp_event 5, 11, LAST_MAP, 3 + warp_event 4, 0, LAST_MAP, 5 + warp_event 7, 1, CELADON_MANSION_2F, 2 + warp_event 2, 1, CELADON_MANSION_2F, 3 def_bg_events bg_event 4, 9, 5 ; CeladonMansion1Text5 diff --git a/data/maps/objects/CeladonMansion2F.asm b/data/maps/objects/CeladonMansion2F.asm index c0d431d2..c2546d72 100644 --- a/data/maps/objects/CeladonMansion2F.asm +++ b/data/maps/objects/CeladonMansion2F.asm @@ -2,10 +2,10 @@ CeladonMansion2F_Object: db $f ; border block def_warp_events - warp_event 6, 1, CELADON_MANSION_3F, 0 - warp_event 7, 1, CELADON_MANSION_1F, 3 - warp_event 2, 1, CELADON_MANSION_1F, 4 - warp_event 4, 1, CELADON_MANSION_3F, 3 + warp_event 6, 1, CELADON_MANSION_3F, 1 + warp_event 7, 1, CELADON_MANSION_1F, 4 + warp_event 2, 1, CELADON_MANSION_1F, 5 + warp_event 4, 1, CELADON_MANSION_3F, 4 def_bg_events bg_event 4, 9, 1 ; CeladonMansion2Text1 diff --git a/data/maps/objects/CeladonMansion3F.asm b/data/maps/objects/CeladonMansion3F.asm index 4b02da20..b4f9c37b 100644 --- a/data/maps/objects/CeladonMansion3F.asm +++ b/data/maps/objects/CeladonMansion3F.asm @@ -2,10 +2,10 @@ CeladonMansion3F_Object: db $f ; border block def_warp_events - warp_event 6, 1, CELADON_MANSION_2F, 0 - warp_event 7, 1, CELADON_MANSION_ROOF, 0 - warp_event 2, 1, CELADON_MANSION_ROOF, 1 - warp_event 4, 1, CELADON_MANSION_2F, 3 + warp_event 6, 1, CELADON_MANSION_2F, 1 + warp_event 7, 1, CELADON_MANSION_ROOF, 1 + warp_event 2, 1, CELADON_MANSION_ROOF, 2 + warp_event 4, 1, CELADON_MANSION_2F, 4 def_bg_events bg_event 1, 3, 5 ; CeladonMansion3Text5 diff --git a/data/maps/objects/CeladonMansionRoof.asm b/data/maps/objects/CeladonMansionRoof.asm index 89f60ac2..e28249e2 100644 --- a/data/maps/objects/CeladonMansionRoof.asm +++ b/data/maps/objects/CeladonMansionRoof.asm @@ -2,9 +2,9 @@ CeladonMansionRoof_Object: db $9 ; border block def_warp_events - warp_event 6, 1, CELADON_MANSION_3F, 1 - warp_event 2, 1, CELADON_MANSION_3F, 2 - warp_event 2, 7, CELADON_MANSION_ROOF_HOUSE, 0 + warp_event 6, 1, CELADON_MANSION_3F, 2 + warp_event 2, 1, CELADON_MANSION_3F, 3 + warp_event 2, 7, CELADON_MANSION_ROOF_HOUSE, 1 def_bg_events bg_event 3, 7, 1 ; CeladonMansion4Text1 diff --git a/data/maps/objects/CeladonMansionRoofHouse.asm b/data/maps/objects/CeladonMansionRoofHouse.asm index b29266e9..c5111a76 100644 --- a/data/maps/objects/CeladonMansionRoofHouse.asm +++ b/data/maps/objects/CeladonMansionRoofHouse.asm @@ -2,8 +2,8 @@ CeladonMansionRoofHouse_Object: db $a ; border block def_warp_events - warp_event 2, 7, CELADON_MANSION_ROOF, 2 - warp_event 3, 7, CELADON_MANSION_ROOF, 2 + warp_event 2, 7, CELADON_MANSION_ROOF, 3 + warp_event 3, 7, CELADON_MANSION_ROOF, 3 def_bg_events diff --git a/data/maps/objects/CeladonMart1F.asm b/data/maps/objects/CeladonMart1F.asm index 89ad6b4c..d7f8924f 100644 --- a/data/maps/objects/CeladonMart1F.asm +++ b/data/maps/objects/CeladonMart1F.asm @@ -2,12 +2,12 @@ CeladonMart1F_Object: db $f ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 0 - warp_event 3, 7, LAST_MAP, 0 - warp_event 16, 7, LAST_MAP, 1 - warp_event 17, 7, LAST_MAP, 1 - warp_event 12, 1, CELADON_MART_2F, 0 - warp_event 1, 1, CELADON_MART_ELEVATOR, 0 + warp_event 2, 7, LAST_MAP, 1 + warp_event 3, 7, LAST_MAP, 1 + warp_event 16, 7, LAST_MAP, 2 + warp_event 17, 7, LAST_MAP, 2 + warp_event 12, 1, CELADON_MART_2F, 1 + warp_event 1, 1, CELADON_MART_ELEVATOR, 1 def_bg_events bg_event 11, 4, 2 ; CeladonMart1Text2 diff --git a/data/maps/objects/CeladonMart2F.asm b/data/maps/objects/CeladonMart2F.asm index e26912b3..9eaa1605 100644 --- a/data/maps/objects/CeladonMart2F.asm +++ b/data/maps/objects/CeladonMart2F.asm @@ -2,9 +2,9 @@ CeladonMart2F_Object: db $f ; border block def_warp_events - warp_event 12, 1, CELADON_MART_1F, 4 - warp_event 16, 1, CELADON_MART_3F, 1 - warp_event 1, 1, CELADON_MART_ELEVATOR, 0 + warp_event 12, 1, CELADON_MART_1F, 5 + warp_event 16, 1, CELADON_MART_3F, 2 + warp_event 1, 1, CELADON_MART_ELEVATOR, 1 def_bg_events bg_event 14, 1, 5 ; CeladonMart2Text5 diff --git a/data/maps/objects/CeladonMart3F.asm b/data/maps/objects/CeladonMart3F.asm index e0b61e52..85f0cf1c 100644 --- a/data/maps/objects/CeladonMart3F.asm +++ b/data/maps/objects/CeladonMart3F.asm @@ -2,9 +2,9 @@ CeladonMart3F_Object: db $f ; border block def_warp_events - warp_event 12, 1, CELADON_MART_4F, 0 - warp_event 16, 1, CELADON_MART_2F, 1 - warp_event 1, 1, CELADON_MART_ELEVATOR, 0 + warp_event 12, 1, CELADON_MART_4F, 1 + warp_event 16, 1, CELADON_MART_2F, 2 + warp_event 1, 1, CELADON_MART_ELEVATOR, 1 def_bg_events bg_event 2, 4, 6 ; CeladonMart3Text6 diff --git a/data/maps/objects/CeladonMart4F.asm b/data/maps/objects/CeladonMart4F.asm index f4ee3505..7f188692 100644 --- a/data/maps/objects/CeladonMart4F.asm +++ b/data/maps/objects/CeladonMart4F.asm @@ -2,9 +2,9 @@ CeladonMart4F_Object: db $f ; border block def_warp_events - warp_event 12, 1, CELADON_MART_3F, 0 - warp_event 16, 1, CELADON_MART_5F, 1 - warp_event 1, 1, CELADON_MART_ELEVATOR, 0 + warp_event 12, 1, CELADON_MART_3F, 1 + warp_event 16, 1, CELADON_MART_5F, 2 + warp_event 1, 1, CELADON_MART_ELEVATOR, 1 def_bg_events bg_event 14, 1, 4 ; CeladonMart4Text4 diff --git a/data/maps/objects/CeladonMart5F.asm b/data/maps/objects/CeladonMart5F.asm index a53c16bc..35cb45b8 100644 --- a/data/maps/objects/CeladonMart5F.asm +++ b/data/maps/objects/CeladonMart5F.asm @@ -2,9 +2,9 @@ CeladonMart5F_Object: db $f ; border block def_warp_events - warp_event 12, 1, CELADON_MART_ROOF, 0 - warp_event 16, 1, CELADON_MART_4F, 1 - warp_event 1, 1, CELADON_MART_ELEVATOR, 0 + warp_event 12, 1, CELADON_MART_ROOF, 1 + warp_event 16, 1, CELADON_MART_4F, 2 + warp_event 1, 1, CELADON_MART_ELEVATOR, 1 def_bg_events bg_event 14, 1, 5 ; CeladonMart5Text5 diff --git a/data/maps/objects/CeladonMartElevator.asm b/data/maps/objects/CeladonMartElevator.asm index 2b0382ef..c24e48df 100644 --- a/data/maps/objects/CeladonMartElevator.asm +++ b/data/maps/objects/CeladonMartElevator.asm @@ -2,8 +2,8 @@ CeladonMartElevator_Object: db $f ; border block def_warp_events - warp_event 1, 3, CELADON_MART_1F, 5 - warp_event 2, 3, CELADON_MART_1F, 5 + warp_event 1, 3, CELADON_MART_1F, 6 + warp_event 2, 3, CELADON_MART_1F, 6 def_bg_events bg_event 3, 0, 1 ; CeladonMartElevatorText1 diff --git a/data/maps/objects/CeladonMartRoof.asm b/data/maps/objects/CeladonMartRoof.asm index b495d0c2..f56a0b0d 100644 --- a/data/maps/objects/CeladonMartRoof.asm +++ b/data/maps/objects/CeladonMartRoof.asm @@ -2,7 +2,7 @@ CeladonMartRoof_Object: db $42 ; border block def_warp_events - warp_event 15, 2, CELADON_MART_5F, 0 + warp_event 15, 2, CELADON_MART_5F, 1 def_bg_events bg_event 10, 1, 3 ; CeladonMartRoofText3 diff --git a/data/maps/objects/CeladonPokecenter.asm b/data/maps/objects/CeladonPokecenter.asm index 6373bdb2..40c466a0 100644 --- a/data/maps/objects/CeladonPokecenter.asm +++ b/data/maps/objects/CeladonPokecenter.asm @@ -2,8 +2,8 @@ CeladonPokecenter_Object: db $0 ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 5 - warp_event 4, 7, LAST_MAP, 5 + warp_event 3, 7, LAST_MAP, 6 + warp_event 4, 7, LAST_MAP, 6 def_bg_events diff --git a/data/maps/objects/CeruleanBadgeHouse.asm b/data/maps/objects/CeruleanBadgeHouse.asm index bf7d0215..145dde81 100644 --- a/data/maps/objects/CeruleanBadgeHouse.asm +++ b/data/maps/objects/CeruleanBadgeHouse.asm @@ -2,9 +2,9 @@ CeruleanBadgeHouse_Object: db $c ; border block def_warp_events - warp_event 2, 0, LAST_MAP, 9 - warp_event 2, 7, LAST_MAP, 8 - warp_event 3, 7, LAST_MAP, 8 + warp_event 2, 0, LAST_MAP, 10 + warp_event 2, 7, LAST_MAP, 9 + warp_event 3, 7, LAST_MAP, 9 def_bg_events diff --git a/data/maps/objects/CeruleanCave1F.asm b/data/maps/objects/CeruleanCave1F.asm index c4a1cdfc..b858a40f 100644 --- a/data/maps/objects/CeruleanCave1F.asm +++ b/data/maps/objects/CeruleanCave1F.asm @@ -2,15 +2,15 @@ CeruleanCave1F_Object: db $7d ; border block def_warp_events - warp_event 24, 17, LAST_MAP, 6 - warp_event 25, 17, LAST_MAP, 6 - warp_event 27, 1, CERULEAN_CAVE_2F, 0 - warp_event 23, 7, CERULEAN_CAVE_2F, 1 - warp_event 18, 9, CERULEAN_CAVE_2F, 2 - warp_event 7, 1, CERULEAN_CAVE_2F, 3 - warp_event 1, 3, CERULEAN_CAVE_2F, 4 - warp_event 3, 11, CERULEAN_CAVE_2F, 5 - warp_event 0, 6, CERULEAN_CAVE_B1F, 0 + warp_event 24, 17, LAST_MAP, 7 + warp_event 25, 17, LAST_MAP, 7 + warp_event 27, 1, CERULEAN_CAVE_2F, 1 + warp_event 23, 7, CERULEAN_CAVE_2F, 2 + warp_event 18, 9, CERULEAN_CAVE_2F, 3 + warp_event 7, 1, CERULEAN_CAVE_2F, 4 + warp_event 1, 3, CERULEAN_CAVE_2F, 5 + warp_event 3, 11, CERULEAN_CAVE_2F, 6 + warp_event 0, 6, CERULEAN_CAVE_B1F, 1 def_bg_events diff --git a/data/maps/objects/CeruleanCave2F.asm b/data/maps/objects/CeruleanCave2F.asm index 5e0dd321..18765fe8 100644 --- a/data/maps/objects/CeruleanCave2F.asm +++ b/data/maps/objects/CeruleanCave2F.asm @@ -2,12 +2,12 @@ CeruleanCave2F_Object: db $7d ; border block def_warp_events - warp_event 29, 1, CERULEAN_CAVE_1F, 2 - warp_event 22, 6, CERULEAN_CAVE_1F, 3 - warp_event 19, 7, CERULEAN_CAVE_1F, 4 - warp_event 9, 1, CERULEAN_CAVE_1F, 5 - warp_event 1, 3, CERULEAN_CAVE_1F, 6 - warp_event 3, 11, CERULEAN_CAVE_1F, 7 + warp_event 29, 1, CERULEAN_CAVE_1F, 3 + warp_event 22, 6, CERULEAN_CAVE_1F, 4 + warp_event 19, 7, CERULEAN_CAVE_1F, 5 + warp_event 9, 1, CERULEAN_CAVE_1F, 6 + warp_event 1, 3, CERULEAN_CAVE_1F, 7 + warp_event 3, 11, CERULEAN_CAVE_1F, 8 def_bg_events diff --git a/data/maps/objects/CeruleanCaveB1F.asm b/data/maps/objects/CeruleanCaveB1F.asm index 6b2fd05d..5173fee6 100644 --- a/data/maps/objects/CeruleanCaveB1F.asm +++ b/data/maps/objects/CeruleanCaveB1F.asm @@ -2,7 +2,7 @@ CeruleanCaveB1F_Object: db $7d ; border block def_warp_events - warp_event 3, 6, CERULEAN_CAVE_1F, 8 + warp_event 3, 6, CERULEAN_CAVE_1F, 9 def_bg_events diff --git a/data/maps/objects/CeruleanCity.asm b/data/maps/objects/CeruleanCity.asm index c9669c44..23863aa0 100644 --- a/data/maps/objects/CeruleanCity.asm +++ b/data/maps/objects/CeruleanCity.asm @@ -2,16 +2,16 @@ CeruleanCity_Object: db $f ; border block def_warp_events - warp_event 27, 11, CERULEAN_TRASHED_HOUSE, 0 - warp_event 13, 15, CERULEAN_TRADE_HOUSE, 0 - warp_event 19, 17, CERULEAN_POKECENTER, 0 - warp_event 30, 19, CERULEAN_GYM, 0 - warp_event 13, 25, BIKE_SHOP, 0 - warp_event 25, 25, CERULEAN_MART, 0 - warp_event 4, 11, CERULEAN_CAVE_1F, 0 - warp_event 27, 9, CERULEAN_TRASHED_HOUSE, 2 - warp_event 9, 11, CERULEAN_BADGE_HOUSE, 1 - warp_event 9, 9, CERULEAN_BADGE_HOUSE, 0 + warp_event 27, 11, CERULEAN_TRASHED_HOUSE, 1 + warp_event 13, 15, CERULEAN_TRADE_HOUSE, 1 + warp_event 19, 17, CERULEAN_POKECENTER, 1 + warp_event 30, 19, CERULEAN_GYM, 1 + warp_event 13, 25, BIKE_SHOP, 1 + warp_event 25, 25, CERULEAN_MART, 1 + warp_event 4, 11, CERULEAN_CAVE_1F, 1 + warp_event 27, 9, CERULEAN_TRASHED_HOUSE, 3 + warp_event 9, 11, CERULEAN_BADGE_HOUSE, 2 + warp_event 9, 9, CERULEAN_BADGE_HOUSE, 1 def_bg_events bg_event 23, 19, 12 ; CeruleanCityText12 diff --git a/data/maps/objects/CeruleanGym.asm b/data/maps/objects/CeruleanGym.asm index 4ae7d7a4..a6be4cae 100644 --- a/data/maps/objects/CeruleanGym.asm +++ b/data/maps/objects/CeruleanGym.asm @@ -2,8 +2,8 @@ CeruleanGym_Object: db $3 ; border block def_warp_events - warp_event 4, 13, LAST_MAP, 3 - warp_event 5, 13, LAST_MAP, 3 + warp_event 4, 13, LAST_MAP, 4 + warp_event 5, 13, LAST_MAP, 4 def_bg_events diff --git a/data/maps/objects/CeruleanMart.asm b/data/maps/objects/CeruleanMart.asm index 17835e6d..0f5a8276 100644 --- a/data/maps/objects/CeruleanMart.asm +++ b/data/maps/objects/CeruleanMart.asm @@ -2,8 +2,8 @@ CeruleanMart_Object: db $0 ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 5 - warp_event 4, 7, LAST_MAP, 5 + warp_event 3, 7, LAST_MAP, 6 + warp_event 4, 7, LAST_MAP, 6 def_bg_events diff --git a/data/maps/objects/CeruleanPokecenter.asm b/data/maps/objects/CeruleanPokecenter.asm index ac1216b2..eee0a0c6 100644 --- a/data/maps/objects/CeruleanPokecenter.asm +++ b/data/maps/objects/CeruleanPokecenter.asm @@ -2,8 +2,8 @@ CeruleanPokecenter_Object: db $0 ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 2 - warp_event 4, 7, LAST_MAP, 2 + warp_event 3, 7, LAST_MAP, 3 + warp_event 4, 7, LAST_MAP, 3 def_bg_events diff --git a/data/maps/objects/CeruleanTradeHouse.asm b/data/maps/objects/CeruleanTradeHouse.asm index 1defee42..52984832 100644 --- a/data/maps/objects/CeruleanTradeHouse.asm +++ b/data/maps/objects/CeruleanTradeHouse.asm @@ -2,8 +2,8 @@ CeruleanTradeHouse_Object: db $a ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 1 - warp_event 3, 7, LAST_MAP, 1 + warp_event 2, 7, LAST_MAP, 2 + warp_event 3, 7, LAST_MAP, 2 def_bg_events diff --git a/data/maps/objects/CeruleanTrashedHouse.asm b/data/maps/objects/CeruleanTrashedHouse.asm index 8cfec104..9dc28f08 100644 --- a/data/maps/objects/CeruleanTrashedHouse.asm +++ b/data/maps/objects/CeruleanTrashedHouse.asm @@ -2,9 +2,9 @@ CeruleanTrashedHouse_Object: db $a ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 0 - warp_event 3, 7, LAST_MAP, 0 - warp_event 3, 0, LAST_MAP, 7 + warp_event 2, 7, LAST_MAP, 1 + warp_event 3, 7, LAST_MAP, 1 + warp_event 3, 0, LAST_MAP, 8 def_bg_events bg_event 3, 0, 3 ; CeruleanHouseTrashedText3 diff --git a/data/maps/objects/ChampionsRoom.asm b/data/maps/objects/ChampionsRoom.asm index 85a16298..fa5efd8f 100644 --- a/data/maps/objects/ChampionsRoom.asm +++ b/data/maps/objects/ChampionsRoom.asm @@ -2,10 +2,10 @@ ChampionsRoom_Object: db $3 ; border block def_warp_events - warp_event 3, 7, LANCES_ROOM, 1 - warp_event 4, 7, LANCES_ROOM, 2 - warp_event 3, 0, HALL_OF_FAME, 0 - warp_event 4, 0, HALL_OF_FAME, 0 + warp_event 3, 7, LANCES_ROOM, 2 + warp_event 4, 7, LANCES_ROOM, 3 + warp_event 3, 0, HALL_OF_FAME, 1 + warp_event 4, 0, HALL_OF_FAME, 1 def_bg_events diff --git a/data/maps/objects/CinnabarGym.asm b/data/maps/objects/CinnabarGym.asm index 57cb2e76..a4ed8cda 100644 --- a/data/maps/objects/CinnabarGym.asm +++ b/data/maps/objects/CinnabarGym.asm @@ -2,8 +2,8 @@ CinnabarGym_Object: db $2e ; border block def_warp_events - warp_event 16, 17, LAST_MAP, 1 - warp_event 17, 17, LAST_MAP, 1 + warp_event 16, 17, LAST_MAP, 2 + warp_event 17, 17, LAST_MAP, 2 def_bg_events diff --git a/data/maps/objects/CinnabarIsland.asm b/data/maps/objects/CinnabarIsland.asm index cdfb5ba2..f3ca64fb 100644 --- a/data/maps/objects/CinnabarIsland.asm +++ b/data/maps/objects/CinnabarIsland.asm @@ -2,11 +2,11 @@ CinnabarIsland_Object: db $43 ; border block def_warp_events - warp_event 6, 3, POKEMON_MANSION_1F, 1 - warp_event 18, 3, CINNABAR_GYM, 0 - warp_event 6, 9, CINNABAR_LAB, 0 - warp_event 11, 11, CINNABAR_POKECENTER, 0 - warp_event 15, 11, CINNABAR_MART, 0 + warp_event 6, 3, POKEMON_MANSION_1F, 2 + warp_event 18, 3, CINNABAR_GYM, 1 + warp_event 6, 9, CINNABAR_LAB, 1 + warp_event 11, 11, CINNABAR_POKECENTER, 1 + warp_event 15, 11, CINNABAR_MART, 1 def_bg_events bg_event 9, 5, 3 ; CinnabarIslandText3 diff --git a/data/maps/objects/CinnabarLab.asm b/data/maps/objects/CinnabarLab.asm index 3c8507e8..3737843c 100644 --- a/data/maps/objects/CinnabarLab.asm +++ b/data/maps/objects/CinnabarLab.asm @@ -2,11 +2,11 @@ CinnabarLab_Object: db $17 ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 2 - warp_event 3, 7, LAST_MAP, 2 - warp_event 8, 4, CINNABAR_LAB_TRADE_ROOM, 0 - warp_event 12, 4, CINNABAR_LAB_METRONOME_ROOM, 0 - warp_event 16, 4, CINNABAR_LAB_FOSSIL_ROOM, 0 + warp_event 2, 7, LAST_MAP, 3 + warp_event 3, 7, LAST_MAP, 3 + warp_event 8, 4, CINNABAR_LAB_TRADE_ROOM, 1 + warp_event 12, 4, CINNABAR_LAB_METRONOME_ROOM, 1 + warp_event 16, 4, CINNABAR_LAB_FOSSIL_ROOM, 1 def_bg_events bg_event 3, 2, 2 ; Lab1Text2 diff --git a/data/maps/objects/CinnabarLabFossilRoom.asm b/data/maps/objects/CinnabarLabFossilRoom.asm index 9e8c664c..29a805f7 100644 --- a/data/maps/objects/CinnabarLabFossilRoom.asm +++ b/data/maps/objects/CinnabarLabFossilRoom.asm @@ -2,8 +2,8 @@ CinnabarLabFossilRoom_Object: db $17 ; border block def_warp_events - warp_event 2, 7, CINNABAR_LAB, 4 - warp_event 3, 7, CINNABAR_LAB, 4 + warp_event 2, 7, CINNABAR_LAB, 5 + warp_event 3, 7, CINNABAR_LAB, 5 def_bg_events diff --git a/data/maps/objects/CinnabarLabMetronomeRoom.asm b/data/maps/objects/CinnabarLabMetronomeRoom.asm index f4a96582..ceadc217 100644 --- a/data/maps/objects/CinnabarLabMetronomeRoom.asm +++ b/data/maps/objects/CinnabarLabMetronomeRoom.asm @@ -2,8 +2,8 @@ CinnabarLabMetronomeRoom_Object: db $17 ; border block def_warp_events - warp_event 2, 7, CINNABAR_LAB, 3 - warp_event 3, 7, CINNABAR_LAB, 3 + warp_event 2, 7, CINNABAR_LAB, 4 + warp_event 3, 7, CINNABAR_LAB, 4 def_bg_events bg_event 0, 4, 3 ; Lab3Text3 diff --git a/data/maps/objects/CinnabarLabTradeRoom.asm b/data/maps/objects/CinnabarLabTradeRoom.asm index bbb66069..11702821 100644 --- a/data/maps/objects/CinnabarLabTradeRoom.asm +++ b/data/maps/objects/CinnabarLabTradeRoom.asm @@ -2,8 +2,8 @@ CinnabarLabTradeRoom_Object: db $17 ; border block def_warp_events - warp_event 2, 7, CINNABAR_LAB, 2 - warp_event 3, 7, CINNABAR_LAB, 2 + warp_event 2, 7, CINNABAR_LAB, 3 + warp_event 3, 7, CINNABAR_LAB, 3 def_bg_events diff --git a/data/maps/objects/CinnabarMart.asm b/data/maps/objects/CinnabarMart.asm index e742434e..e91d18b2 100644 --- a/data/maps/objects/CinnabarMart.asm +++ b/data/maps/objects/CinnabarMart.asm @@ -2,8 +2,8 @@ CinnabarMart_Object: db $0 ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 4 - warp_event 4, 7, LAST_MAP, 4 + warp_event 3, 7, LAST_MAP, 5 + warp_event 4, 7, LAST_MAP, 5 def_bg_events diff --git a/data/maps/objects/CinnabarPokecenter.asm b/data/maps/objects/CinnabarPokecenter.asm index 95fe1342..75d11926 100644 --- a/data/maps/objects/CinnabarPokecenter.asm +++ b/data/maps/objects/CinnabarPokecenter.asm @@ -2,8 +2,8 @@ CinnabarPokecenter_Object: db $0 ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 3 - warp_event 4, 7, LAST_MAP, 3 + warp_event 3, 7, LAST_MAP, 4 + warp_event 4, 7, LAST_MAP, 4 def_bg_events diff --git a/data/maps/objects/CopycatsHouse1F.asm b/data/maps/objects/CopycatsHouse1F.asm index 3521560b..0a3705f4 100644 --- a/data/maps/objects/CopycatsHouse1F.asm +++ b/data/maps/objects/CopycatsHouse1F.asm @@ -2,9 +2,9 @@ CopycatsHouse1F_Object: db $a ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 0 - warp_event 3, 7, LAST_MAP, 0 - warp_event 7, 1, COPYCATS_HOUSE_2F, 0 + warp_event 2, 7, LAST_MAP, 1 + warp_event 3, 7, LAST_MAP, 1 + warp_event 7, 1, COPYCATS_HOUSE_2F, 1 def_bg_events diff --git a/data/maps/objects/CopycatsHouse2F.asm b/data/maps/objects/CopycatsHouse2F.asm index 6822a5e6..86449065 100644 --- a/data/maps/objects/CopycatsHouse2F.asm +++ b/data/maps/objects/CopycatsHouse2F.asm @@ -2,7 +2,7 @@ CopycatsHouse2F_Object: db $a ; border block def_warp_events - warp_event 7, 1, COPYCATS_HOUSE_1F, 2 + warp_event 7, 1, COPYCATS_HOUSE_1F, 3 def_bg_events bg_event 3, 5, 6 ; CopycatsHouse2FText6 diff --git a/data/maps/objects/Daycare.asm b/data/maps/objects/Daycare.asm index 695ae179..f3ece1a9 100644 --- a/data/maps/objects/Daycare.asm +++ b/data/maps/objects/Daycare.asm @@ -2,8 +2,8 @@ Daycare_Object: db $a ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 4 - warp_event 3, 7, LAST_MAP, 4 + warp_event 2, 7, LAST_MAP, 5 + warp_event 3, 7, LAST_MAP, 5 def_bg_events diff --git a/data/maps/objects/DiglettsCave.asm b/data/maps/objects/DiglettsCave.asm index 1b9ae6a2..8ada664a 100644 --- a/data/maps/objects/DiglettsCave.asm +++ b/data/maps/objects/DiglettsCave.asm @@ -2,8 +2,8 @@ DiglettsCave_Object: db $19 ; border block def_warp_events - warp_event 5, 5, DIGLETTS_CAVE_ROUTE_2, 2 - warp_event 37, 31, DIGLETTS_CAVE_ROUTE_11, 2 + warp_event 5, 5, DIGLETTS_CAVE_ROUTE_2, 3 + warp_event 37, 31, DIGLETTS_CAVE_ROUTE_11, 3 def_bg_events diff --git a/data/maps/objects/DiglettsCaveRoute11.asm b/data/maps/objects/DiglettsCaveRoute11.asm index 2f5bd5a0..a0aa3ddb 100644 --- a/data/maps/objects/DiglettsCaveRoute11.asm +++ b/data/maps/objects/DiglettsCaveRoute11.asm @@ -2,9 +2,9 @@ DiglettsCaveRoute11_Object: db $7d ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 4 - warp_event 3, 7, LAST_MAP, 4 - warp_event 4, 4, DIGLETTS_CAVE, 1 + warp_event 2, 7, LAST_MAP, 5 + warp_event 3, 7, LAST_MAP, 5 + warp_event 4, 4, DIGLETTS_CAVE, 2 def_bg_events diff --git a/data/maps/objects/DiglettsCaveRoute2.asm b/data/maps/objects/DiglettsCaveRoute2.asm index 340d811d..c8dc0561 100644 --- a/data/maps/objects/DiglettsCaveRoute2.asm +++ b/data/maps/objects/DiglettsCaveRoute2.asm @@ -2,9 +2,9 @@ DiglettsCaveRoute2_Object: db $7d ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 0 - warp_event 3, 7, LAST_MAP, 0 - warp_event 4, 4, DIGLETTS_CAVE, 0 + warp_event 2, 7, LAST_MAP, 1 + warp_event 3, 7, LAST_MAP, 1 + warp_event 4, 4, DIGLETTS_CAVE, 1 def_bg_events diff --git a/data/maps/objects/FightingDojo.asm b/data/maps/objects/FightingDojo.asm index 85f34048..808abf71 100644 --- a/data/maps/objects/FightingDojo.asm +++ b/data/maps/objects/FightingDojo.asm @@ -2,8 +2,8 @@ FightingDojo_Object: db $3 ; border block def_warp_events - warp_event 4, 11, LAST_MAP, 1 - warp_event 5, 11, LAST_MAP, 1 + warp_event 4, 11, LAST_MAP, 2 + warp_event 5, 11, LAST_MAP, 2 def_bg_events diff --git a/data/maps/objects/FuchsiaBillsGrandpasHouse.asm b/data/maps/objects/FuchsiaBillsGrandpasHouse.asm index d397765d..2369e7d0 100644 --- a/data/maps/objects/FuchsiaBillsGrandpasHouse.asm +++ b/data/maps/objects/FuchsiaBillsGrandpasHouse.asm @@ -2,8 +2,8 @@ FuchsiaBillsGrandpasHouse_Object: db $a ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 1 - warp_event 3, 7, LAST_MAP, 1 + warp_event 2, 7, LAST_MAP, 2 + warp_event 3, 7, LAST_MAP, 2 def_bg_events diff --git a/data/maps/objects/FuchsiaCity.asm b/data/maps/objects/FuchsiaCity.asm index 291d30bc..c8ff36e6 100644 --- a/data/maps/objects/FuchsiaCity.asm +++ b/data/maps/objects/FuchsiaCity.asm @@ -2,15 +2,15 @@ FuchsiaCity_Object: db $f ; border block def_warp_events - warp_event 5, 13, FUCHSIA_MART, 0 - warp_event 11, 27, FUCHSIA_BILLS_GRANDPAS_HOUSE, 0 - warp_event 19, 27, FUCHSIA_POKECENTER, 0 - warp_event 27, 27, WARDENS_HOUSE, 0 - warp_event 18, 3, SAFARI_ZONE_GATE, 0 - warp_event 5, 27, FUCHSIA_GYM, 0 - warp_event 22, 13, FUCHSIA_MEETING_ROOM, 0 - warp_event 31, 27, FUCHSIA_GOOD_ROD_HOUSE, 1 - warp_event 31, 24, FUCHSIA_GOOD_ROD_HOUSE, 0 + warp_event 5, 13, FUCHSIA_MART, 1 + warp_event 11, 27, FUCHSIA_BILLS_GRANDPAS_HOUSE, 1 + warp_event 19, 27, FUCHSIA_POKECENTER, 1 + warp_event 27, 27, WARDENS_HOUSE, 1 + warp_event 18, 3, SAFARI_ZONE_GATE, 1 + warp_event 5, 27, FUCHSIA_GYM, 1 + warp_event 22, 13, FUCHSIA_MEETING_ROOM, 1 + warp_event 31, 27, FUCHSIA_GOOD_ROD_HOUSE, 2 + warp_event 31, 24, FUCHSIA_GOOD_ROD_HOUSE, 1 def_bg_events bg_event 15, 23, 11 ; FuchsiaCityText11 diff --git a/data/maps/objects/FuchsiaGoodRodHouse.asm b/data/maps/objects/FuchsiaGoodRodHouse.asm index 2d3f3c93..483734cd 100644 --- a/data/maps/objects/FuchsiaGoodRodHouse.asm +++ b/data/maps/objects/FuchsiaGoodRodHouse.asm @@ -2,9 +2,9 @@ FuchsiaGoodRodHouse_Object: db $c ; border block def_warp_events - warp_event 2, 0, LAST_MAP, 8 - warp_event 2, 7, LAST_MAP, 7 - warp_event 3, 7, LAST_MAP, 7 + warp_event 2, 0, LAST_MAP, 9 + warp_event 2, 7, LAST_MAP, 8 + warp_event 3, 7, LAST_MAP, 8 def_bg_events diff --git a/data/maps/objects/FuchsiaGym.asm b/data/maps/objects/FuchsiaGym.asm index 06dc06e2..9c39cb5e 100644 --- a/data/maps/objects/FuchsiaGym.asm +++ b/data/maps/objects/FuchsiaGym.asm @@ -2,8 +2,8 @@ FuchsiaGym_Object: db $3 ; border block def_warp_events - warp_event 4, 17, LAST_MAP, 5 - warp_event 5, 17, LAST_MAP, 5 + warp_event 4, 17, LAST_MAP, 6 + warp_event 5, 17, LAST_MAP, 6 def_bg_events diff --git a/data/maps/objects/FuchsiaMart.asm b/data/maps/objects/FuchsiaMart.asm index e6d6f445..04055fbd 100644 --- a/data/maps/objects/FuchsiaMart.asm +++ b/data/maps/objects/FuchsiaMart.asm @@ -2,8 +2,8 @@ FuchsiaMart_Object: db $0 ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 0 - warp_event 4, 7, LAST_MAP, 0 + warp_event 3, 7, LAST_MAP, 1 + warp_event 4, 7, LAST_MAP, 1 def_bg_events diff --git a/data/maps/objects/FuchsiaMeetingRoom.asm b/data/maps/objects/FuchsiaMeetingRoom.asm index 509a34b2..2e4ac72a 100644 --- a/data/maps/objects/FuchsiaMeetingRoom.asm +++ b/data/maps/objects/FuchsiaMeetingRoom.asm @@ -2,8 +2,8 @@ FuchsiaMeetingRoom_Object: db $17 ; border block def_warp_events - warp_event 4, 7, LAST_MAP, 6 - warp_event 5, 7, LAST_MAP, 6 + warp_event 4, 7, LAST_MAP, 7 + warp_event 5, 7, LAST_MAP, 7 def_bg_events diff --git a/data/maps/objects/FuchsiaPokecenter.asm b/data/maps/objects/FuchsiaPokecenter.asm index 79e99b9b..84404b09 100644 --- a/data/maps/objects/FuchsiaPokecenter.asm +++ b/data/maps/objects/FuchsiaPokecenter.asm @@ -2,8 +2,8 @@ FuchsiaPokecenter_Object: db $0 ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 2 - warp_event 4, 7, LAST_MAP, 2 + warp_event 3, 7, LAST_MAP, 3 + warp_event 4, 7, LAST_MAP, 3 def_bg_events diff --git a/data/maps/objects/GameCorner.asm b/data/maps/objects/GameCorner.asm index 7f568174..2b4c8f72 100644 --- a/data/maps/objects/GameCorner.asm +++ b/data/maps/objects/GameCorner.asm @@ -2,9 +2,9 @@ GameCorner_Object: db $f ; border block def_warp_events - warp_event 15, 17, LAST_MAP, 7 - warp_event 16, 17, LAST_MAP, 7 - warp_event 17, 4, ROCKET_HIDEOUT_B1F, 1 + warp_event 15, 17, LAST_MAP, 8 + warp_event 16, 17, LAST_MAP, 8 + warp_event 17, 4, ROCKET_HIDEOUT_B1F, 2 def_bg_events bg_event 9, 4, 12 ; CeladonGameCornerText12 diff --git a/data/maps/objects/GameCornerPrizeRoom.asm b/data/maps/objects/GameCornerPrizeRoom.asm index db149c60..b79e52ef 100644 --- a/data/maps/objects/GameCornerPrizeRoom.asm +++ b/data/maps/objects/GameCornerPrizeRoom.asm @@ -2,8 +2,8 @@ GameCornerPrizeRoom_Object: db $f ; border block def_warp_events - warp_event 4, 7, LAST_MAP, 9 - warp_event 5, 7, LAST_MAP, 9 + warp_event 4, 7, LAST_MAP, 10 + warp_event 5, 7, LAST_MAP, 10 def_bg_events bg_event 2, 2, 3 ; CeladonPrizeRoomText3 diff --git a/data/maps/objects/HallOfFame.asm b/data/maps/objects/HallOfFame.asm index 0db4f56c..31b9f8a2 100644 --- a/data/maps/objects/HallOfFame.asm +++ b/data/maps/objects/HallOfFame.asm @@ -2,8 +2,8 @@ HallOfFame_Object: db $3 ; border block def_warp_events - warp_event 4, 7, CHAMPIONS_ROOM, 2 - warp_event 5, 7, CHAMPIONS_ROOM, 3 + warp_event 4, 7, CHAMPIONS_ROOM, 3 + warp_event 5, 7, CHAMPIONS_ROOM, 4 def_bg_events diff --git a/data/maps/objects/IndigoPlateau.asm b/data/maps/objects/IndigoPlateau.asm index 63eb5381..d6b0e0db 100644 --- a/data/maps/objects/IndigoPlateau.asm +++ b/data/maps/objects/IndigoPlateau.asm @@ -2,8 +2,8 @@ IndigoPlateau_Object: db $e ; border block def_warp_events - warp_event 9, 5, INDIGO_PLATEAU_LOBBY, 0 - warp_event 10, 5, INDIGO_PLATEAU_LOBBY, 0 + warp_event 9, 5, INDIGO_PLATEAU_LOBBY, 1 + warp_event 10, 5, INDIGO_PLATEAU_LOBBY, 1 def_bg_events diff --git a/data/maps/objects/IndigoPlateauLobby.asm b/data/maps/objects/IndigoPlateauLobby.asm index d8eaf97c..fd3d07ba 100644 --- a/data/maps/objects/IndigoPlateauLobby.asm +++ b/data/maps/objects/IndigoPlateauLobby.asm @@ -2,9 +2,9 @@ IndigoPlateauLobby_Object: db $0 ; border block def_warp_events - warp_event 7, 11, LAST_MAP, 0 - warp_event 8, 11, LAST_MAP, 1 - warp_event 8, 0, LORELEIS_ROOM, 0 + warp_event 7, 11, LAST_MAP, 1 + warp_event 8, 11, LAST_MAP, 2 + warp_event 8, 0, LORELEIS_ROOM, 1 def_bg_events diff --git a/data/maps/objects/LancesRoom.asm b/data/maps/objects/LancesRoom.asm index 53848141..c9334b3a 100644 --- a/data/maps/objects/LancesRoom.asm +++ b/data/maps/objects/LancesRoom.asm @@ -2,9 +2,9 @@ LancesRoom_Object: db $3 ; border block def_warp_events - warp_event 24, 16, AGATHAS_ROOM, 2 - warp_event 5, 0, CHAMPIONS_ROOM, 0 - warp_event 6, 0, CHAMPIONS_ROOM, 0 + warp_event 24, 16, AGATHAS_ROOM, 3 + warp_event 5, 0, CHAMPIONS_ROOM, 1 + warp_event 6, 0, CHAMPIONS_ROOM, 1 def_bg_events diff --git a/data/maps/objects/LavenderCuboneHouse.asm b/data/maps/objects/LavenderCuboneHouse.asm index c6802c7a..35e6f874 100644 --- a/data/maps/objects/LavenderCuboneHouse.asm +++ b/data/maps/objects/LavenderCuboneHouse.asm @@ -2,8 +2,8 @@ LavenderCuboneHouse_Object: db $a ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 4 - warp_event 3, 7, LAST_MAP, 4 + warp_event 2, 7, LAST_MAP, 5 + warp_event 3, 7, LAST_MAP, 5 def_bg_events diff --git a/data/maps/objects/LavenderMart.asm b/data/maps/objects/LavenderMart.asm index 5deeba7c..28a9c236 100644 --- a/data/maps/objects/LavenderMart.asm +++ b/data/maps/objects/LavenderMart.asm @@ -2,8 +2,8 @@ LavenderMart_Object: db $0 ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 3 - warp_event 4, 7, LAST_MAP, 3 + warp_event 3, 7, LAST_MAP, 4 + warp_event 4, 7, LAST_MAP, 4 def_bg_events diff --git a/data/maps/objects/LavenderPokecenter.asm b/data/maps/objects/LavenderPokecenter.asm index 5e397a65..99c29528 100644 --- a/data/maps/objects/LavenderPokecenter.asm +++ b/data/maps/objects/LavenderPokecenter.asm @@ -2,8 +2,8 @@ LavenderPokecenter_Object: db $0 ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 0 - warp_event 4, 7, LAST_MAP, 0 + warp_event 3, 7, LAST_MAP, 1 + warp_event 4, 7, LAST_MAP, 1 def_bg_events diff --git a/data/maps/objects/LavenderTown.asm b/data/maps/objects/LavenderTown.asm index 973ed5eb..e2601721 100644 --- a/data/maps/objects/LavenderTown.asm +++ b/data/maps/objects/LavenderTown.asm @@ -2,12 +2,12 @@ LavenderTown_Object: db $2c ; border block def_warp_events - warp_event 3, 5, LAVENDER_POKECENTER, 0 - warp_event 14, 5, POKEMON_TOWER_1F, 0 - warp_event 7, 9, MR_FUJIS_HOUSE, 0 - warp_event 15, 13, LAVENDER_MART, 0 - warp_event 3, 13, LAVENDER_CUBONE_HOUSE, 0 - warp_event 7, 13, NAME_RATERS_HOUSE, 0 + warp_event 3, 5, LAVENDER_POKECENTER, 1 + warp_event 14, 5, POKEMON_TOWER_1F, 1 + warp_event 7, 9, MR_FUJIS_HOUSE, 1 + warp_event 15, 13, LAVENDER_MART, 1 + warp_event 3, 13, LAVENDER_CUBONE_HOUSE, 1 + warp_event 7, 13, NAME_RATERS_HOUSE, 1 def_bg_events bg_event 11, 9, 4 ; LavenderTownText4 diff --git a/data/maps/objects/LoreleisRoom.asm b/data/maps/objects/LoreleisRoom.asm index 3c4d1afa..1db058e4 100644 --- a/data/maps/objects/LoreleisRoom.asm +++ b/data/maps/objects/LoreleisRoom.asm @@ -2,10 +2,10 @@ LoreleisRoom_Object: db $3 ; border block def_warp_events - warp_event 4, 11, INDIGO_PLATEAU_LOBBY, 2 - warp_event 5, 11, INDIGO_PLATEAU_LOBBY, 2 - warp_event 4, 0, BRUNOS_ROOM, 0 - warp_event 5, 0, BRUNOS_ROOM, 1 + warp_event 4, 11, INDIGO_PLATEAU_LOBBY, 3 + warp_event 5, 11, INDIGO_PLATEAU_LOBBY, 3 + warp_event 4, 0, BRUNOS_ROOM, 1 + warp_event 5, 0, BRUNOS_ROOM, 2 def_bg_events diff --git a/data/maps/objects/MrFujisHouse.asm b/data/maps/objects/MrFujisHouse.asm index 36e8f1a0..c84b8637 100644 --- a/data/maps/objects/MrFujisHouse.asm +++ b/data/maps/objects/MrFujisHouse.asm @@ -2,8 +2,8 @@ MrFujisHouse_Object: db $a ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 2 - warp_event 3, 7, LAST_MAP, 2 + warp_event 2, 7, LAST_MAP, 3 + warp_event 3, 7, LAST_MAP, 3 def_bg_events diff --git a/data/maps/objects/MrPsychicsHouse.asm b/data/maps/objects/MrPsychicsHouse.asm index 31a9146d..c5180c6f 100644 --- a/data/maps/objects/MrPsychicsHouse.asm +++ b/data/maps/objects/MrPsychicsHouse.asm @@ -2,8 +2,8 @@ MrPsychicsHouse_Object: db $a ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 7 - warp_event 3, 7, LAST_MAP, 7 + warp_event 2, 7, LAST_MAP, 8 + warp_event 3, 7, LAST_MAP, 8 def_bg_events diff --git a/data/maps/objects/MtMoon1F.asm b/data/maps/objects/MtMoon1F.asm index a1659889..4a6c095d 100644 --- a/data/maps/objects/MtMoon1F.asm +++ b/data/maps/objects/MtMoon1F.asm @@ -2,11 +2,11 @@ MtMoon1F_Object: db $3 ; border block def_warp_events - warp_event 14, 35, LAST_MAP, 1 - warp_event 15, 35, LAST_MAP, 1 - warp_event 5, 5, MT_MOON_B1F, 0 - warp_event 17, 11, MT_MOON_B1F, 2 - warp_event 25, 15, MT_MOON_B1F, 3 + warp_event 14, 35, LAST_MAP, 2 + warp_event 15, 35, LAST_MAP, 2 + warp_event 5, 5, MT_MOON_B1F, 1 + warp_event 17, 11, MT_MOON_B1F, 3 + warp_event 25, 15, MT_MOON_B1F, 4 def_bg_events bg_event 15, 23, 14 ; MtMoon1Text14 diff --git a/data/maps/objects/MtMoonB1F.asm b/data/maps/objects/MtMoonB1F.asm index 831618e9..a989a295 100644 --- a/data/maps/objects/MtMoonB1F.asm +++ b/data/maps/objects/MtMoonB1F.asm @@ -2,14 +2,14 @@ MtMoonB1F_Object: db $3 ; border block def_warp_events - warp_event 5, 5, MT_MOON_1F, 2 - warp_event 17, 11, MT_MOON_B2F, 0 - warp_event 25, 9, MT_MOON_1F, 3 - warp_event 25, 15, MT_MOON_1F, 4 - warp_event 21, 17, MT_MOON_B2F, 1 - warp_event 13, 27, MT_MOON_B2F, 2 - warp_event 23, 3, MT_MOON_B2F, 3 - warp_event 27, 3, LAST_MAP, 2 + warp_event 5, 5, MT_MOON_1F, 3 + warp_event 17, 11, MT_MOON_B2F, 1 + warp_event 25, 9, MT_MOON_1F, 4 + warp_event 25, 15, MT_MOON_1F, 5 + warp_event 21, 17, MT_MOON_B2F, 2 + warp_event 13, 27, MT_MOON_B2F, 3 + warp_event 23, 3, MT_MOON_B2F, 4 + warp_event 27, 3, LAST_MAP, 3 def_bg_events diff --git a/data/maps/objects/MtMoonB2F.asm b/data/maps/objects/MtMoonB2F.asm index 7e49d1c5..43c7db88 100644 --- a/data/maps/objects/MtMoonB2F.asm +++ b/data/maps/objects/MtMoonB2F.asm @@ -2,10 +2,10 @@ MtMoonB2F_Object: db $3 ; border block def_warp_events - warp_event 25, 9, MT_MOON_B1F, 1 - warp_event 21, 17, MT_MOON_B1F, 4 - warp_event 15, 27, MT_MOON_B1F, 5 - warp_event 5, 7, MT_MOON_B1F, 6 + warp_event 25, 9, MT_MOON_B1F, 2 + warp_event 21, 17, MT_MOON_B1F, 5 + warp_event 15, 27, MT_MOON_B1F, 6 + warp_event 5, 7, MT_MOON_B1F, 7 def_bg_events diff --git a/data/maps/objects/MtMoonPokecenter.asm b/data/maps/objects/MtMoonPokecenter.asm index 2cf049ab..382c67dd 100644 --- a/data/maps/objects/MtMoonPokecenter.asm +++ b/data/maps/objects/MtMoonPokecenter.asm @@ -2,8 +2,8 @@ MtMoonPokecenter_Object: db $0 ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 0 - warp_event 4, 7, LAST_MAP, 0 + warp_event 3, 7, LAST_MAP, 1 + warp_event 4, 7, LAST_MAP, 1 def_bg_events diff --git a/data/maps/objects/Museum1F.asm b/data/maps/objects/Museum1F.asm index aae73366..edbe63c9 100644 --- a/data/maps/objects/Museum1F.asm +++ b/data/maps/objects/Museum1F.asm @@ -2,11 +2,11 @@ Museum1F_Object: db $a ; border block def_warp_events - warp_event 10, 7, LAST_MAP, 0 - warp_event 11, 7, LAST_MAP, 0 - warp_event 16, 7, LAST_MAP, 1 - warp_event 17, 7, LAST_MAP, 1 - warp_event 7, 7, MUSEUM_2F, 0 + warp_event 10, 7, LAST_MAP, 1 + warp_event 11, 7, LAST_MAP, 1 + warp_event 16, 7, LAST_MAP, 2 + warp_event 17, 7, LAST_MAP, 2 + warp_event 7, 7, MUSEUM_2F, 1 def_bg_events diff --git a/data/maps/objects/Museum2F.asm b/data/maps/objects/Museum2F.asm index fbf5cffe..061833ca 100644 --- a/data/maps/objects/Museum2F.asm +++ b/data/maps/objects/Museum2F.asm @@ -2,7 +2,7 @@ Museum2F_Object: db $a ; border block def_warp_events - warp_event 7, 7, MUSEUM_1F, 4 + warp_event 7, 7, MUSEUM_1F, 5 def_bg_events bg_event 11, 2, 6 ; Museum2FText6 diff --git a/data/maps/objects/NameRatersHouse.asm b/data/maps/objects/NameRatersHouse.asm index 4c2c490b..0568af76 100644 --- a/data/maps/objects/NameRatersHouse.asm +++ b/data/maps/objects/NameRatersHouse.asm @@ -2,8 +2,8 @@ NameRatersHouse_Object: db $a ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 5 - warp_event 3, 7, LAST_MAP, 5 + warp_event 2, 7, LAST_MAP, 6 + warp_event 3, 7, LAST_MAP, 6 def_bg_events diff --git a/data/maps/objects/OaksLab.asm b/data/maps/objects/OaksLab.asm index 6f654f6e..7fc869ef 100644 --- a/data/maps/objects/OaksLab.asm +++ b/data/maps/objects/OaksLab.asm @@ -2,8 +2,8 @@ OaksLab_Object: db $3 ; border block def_warp_events - warp_event 4, 11, LAST_MAP, 2 - warp_event 5, 11, LAST_MAP, 2 + warp_event 4, 11, LAST_MAP, 3 + warp_event 5, 11, LAST_MAP, 3 def_bg_events diff --git a/data/maps/objects/PalletTown.asm b/data/maps/objects/PalletTown.asm index cd760731..1343f0cd 100644 --- a/data/maps/objects/PalletTown.asm +++ b/data/maps/objects/PalletTown.asm @@ -2,9 +2,9 @@ PalletTown_Object: db $b ; border block def_warp_events - warp_event 5, 5, REDS_HOUSE_1F, 0 - warp_event 13, 5, BLUES_HOUSE, 0 - warp_event 12, 11, OAKS_LAB, 1 + warp_event 5, 5, REDS_HOUSE_1F, 1 + warp_event 13, 5, BLUES_HOUSE, 1 + warp_event 12, 11, OAKS_LAB, 2 def_bg_events bg_event 13, 13, 4 ; PalletTownText4 diff --git a/data/maps/objects/PewterCity.asm b/data/maps/objects/PewterCity.asm index fa3f794c..4a8e2323 100644 --- a/data/maps/objects/PewterCity.asm +++ b/data/maps/objects/PewterCity.asm @@ -2,13 +2,13 @@ PewterCity_Object: db $a ; border block def_warp_events - warp_event 14, 7, MUSEUM_1F, 0 - warp_event 19, 5, MUSEUM_1F, 2 - warp_event 16, 17, PEWTER_GYM, 0 - warp_event 29, 13, PEWTER_NIDORAN_HOUSE, 0 - warp_event 23, 17, PEWTER_MART, 0 - warp_event 7, 29, PEWTER_SPEECH_HOUSE, 0 - warp_event 13, 25, PEWTER_POKECENTER, 0 + warp_event 14, 7, MUSEUM_1F, 1 + warp_event 19, 5, MUSEUM_1F, 3 + warp_event 16, 17, PEWTER_GYM, 1 + warp_event 29, 13, PEWTER_NIDORAN_HOUSE, 1 + warp_event 23, 17, PEWTER_MART, 1 + warp_event 7, 29, PEWTER_SPEECH_HOUSE, 1 + warp_event 13, 25, PEWTER_POKECENTER, 1 def_bg_events bg_event 19, 29, 6 ; PewterCityText6 diff --git a/data/maps/objects/PewterGym.asm b/data/maps/objects/PewterGym.asm index 25d32486..cfaeefbf 100644 --- a/data/maps/objects/PewterGym.asm +++ b/data/maps/objects/PewterGym.asm @@ -2,8 +2,8 @@ PewterGym_Object: db $3 ; border block def_warp_events - warp_event 4, 13, LAST_MAP, 2 - warp_event 5, 13, LAST_MAP, 2 + warp_event 4, 13, LAST_MAP, 3 + warp_event 5, 13, LAST_MAP, 3 def_bg_events diff --git a/data/maps/objects/PewterMart.asm b/data/maps/objects/PewterMart.asm index e34b7686..ad804c6b 100644 --- a/data/maps/objects/PewterMart.asm +++ b/data/maps/objects/PewterMart.asm @@ -2,8 +2,8 @@ PewterMart_Object: db $0 ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 4 - warp_event 4, 7, LAST_MAP, 4 + warp_event 3, 7, LAST_MAP, 5 + warp_event 4, 7, LAST_MAP, 5 def_bg_events diff --git a/data/maps/objects/PewterNidoranHouse.asm b/data/maps/objects/PewterNidoranHouse.asm index 3b08d2df..93924d01 100644 --- a/data/maps/objects/PewterNidoranHouse.asm +++ b/data/maps/objects/PewterNidoranHouse.asm @@ -2,8 +2,8 @@ PewterNidoranHouse_Object: db $a ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 3 - warp_event 3, 7, LAST_MAP, 3 + warp_event 2, 7, LAST_MAP, 4 + warp_event 3, 7, LAST_MAP, 4 def_bg_events diff --git a/data/maps/objects/PewterPokecenter.asm b/data/maps/objects/PewterPokecenter.asm index cd422f58..9d9e8e58 100644 --- a/data/maps/objects/PewterPokecenter.asm +++ b/data/maps/objects/PewterPokecenter.asm @@ -2,8 +2,8 @@ PewterPokecenter_Object: db $0 ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 6 - warp_event 4, 7, LAST_MAP, 6 + warp_event 3, 7, LAST_MAP, 7 + warp_event 4, 7, LAST_MAP, 7 def_bg_events diff --git a/data/maps/objects/PewterSpeechHouse.asm b/data/maps/objects/PewterSpeechHouse.asm index 0cd96a67..a6896c43 100644 --- a/data/maps/objects/PewterSpeechHouse.asm +++ b/data/maps/objects/PewterSpeechHouse.asm @@ -2,8 +2,8 @@ PewterSpeechHouse_Object: db $a ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 5 - warp_event 3, 7, LAST_MAP, 5 + warp_event 2, 7, LAST_MAP, 6 + warp_event 3, 7, LAST_MAP, 6 def_bg_events diff --git a/data/maps/objects/PokemonFanClub.asm b/data/maps/objects/PokemonFanClub.asm index e089f65d..c7d815f2 100644 --- a/data/maps/objects/PokemonFanClub.asm +++ b/data/maps/objects/PokemonFanClub.asm @@ -2,8 +2,8 @@ PokemonFanClub_Object: db $d ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 1 - warp_event 3, 7, LAST_MAP, 1 + warp_event 2, 7, LAST_MAP, 2 + warp_event 3, 7, LAST_MAP, 2 def_bg_events bg_event 1, 0, 7 ; FanClubText7 diff --git a/data/maps/objects/PokemonMansion1F.asm b/data/maps/objects/PokemonMansion1F.asm index 69003a3f..5568f7fe 100644 --- a/data/maps/objects/PokemonMansion1F.asm +++ b/data/maps/objects/PokemonMansion1F.asm @@ -2,14 +2,14 @@ PokemonMansion1F_Object: db $2e ; border block def_warp_events - warp_event 4, 27, LAST_MAP, 0 - warp_event 5, 27, LAST_MAP, 0 - warp_event 6, 27, LAST_MAP, 0 - warp_event 7, 27, LAST_MAP, 0 - warp_event 5, 10, POKEMON_MANSION_2F, 0 - warp_event 21, 23, POKEMON_MANSION_B1F, 0 - warp_event 26, 27, LAST_MAP, 0 - warp_event 27, 27, LAST_MAP, 0 + warp_event 4, 27, LAST_MAP, 1 + warp_event 5, 27, LAST_MAP, 1 + warp_event 6, 27, LAST_MAP, 1 + warp_event 7, 27, LAST_MAP, 1 + warp_event 5, 10, POKEMON_MANSION_2F, 1 + warp_event 21, 23, POKEMON_MANSION_B1F, 1 + warp_event 26, 27, LAST_MAP, 1 + warp_event 27, 27, LAST_MAP, 1 def_bg_events diff --git a/data/maps/objects/PokemonMansion2F.asm b/data/maps/objects/PokemonMansion2F.asm index eebd1336..52b65885 100644 --- a/data/maps/objects/PokemonMansion2F.asm +++ b/data/maps/objects/PokemonMansion2F.asm @@ -2,10 +2,10 @@ PokemonMansion2F_Object: db $1 ; border block def_warp_events - warp_event 5, 10, POKEMON_MANSION_1F, 4 - warp_event 7, 10, POKEMON_MANSION_3F, 0 - warp_event 25, 14, POKEMON_MANSION_3F, 2 - warp_event 6, 1, POKEMON_MANSION_3F, 1 + warp_event 5, 10, POKEMON_MANSION_1F, 5 + warp_event 7, 10, POKEMON_MANSION_3F, 1 + warp_event 25, 14, POKEMON_MANSION_3F, 3 + warp_event 6, 1, POKEMON_MANSION_3F, 2 def_bg_events diff --git a/data/maps/objects/PokemonMansion3F.asm b/data/maps/objects/PokemonMansion3F.asm index bf767252..b67e13bc 100644 --- a/data/maps/objects/PokemonMansion3F.asm +++ b/data/maps/objects/PokemonMansion3F.asm @@ -2,9 +2,9 @@ PokemonMansion3F_Object: db $1 ; border block def_warp_events - warp_event 7, 10, POKEMON_MANSION_2F, 1 - warp_event 6, 1, POKEMON_MANSION_2F, 3 - warp_event 25, 14, POKEMON_MANSION_2F, 2 + warp_event 7, 10, POKEMON_MANSION_2F, 2 + warp_event 6, 1, POKEMON_MANSION_2F, 4 + warp_event 25, 14, POKEMON_MANSION_2F, 3 def_bg_events diff --git a/data/maps/objects/PokemonMansionB1F.asm b/data/maps/objects/PokemonMansionB1F.asm index 9dfdb37d..12692e81 100644 --- a/data/maps/objects/PokemonMansionB1F.asm +++ b/data/maps/objects/PokemonMansionB1F.asm @@ -2,7 +2,7 @@ PokemonMansionB1F_Object: db $1 ; border block def_warp_events - warp_event 23, 22, POKEMON_MANSION_1F, 5 + warp_event 23, 22, POKEMON_MANSION_1F, 6 def_bg_events diff --git a/data/maps/objects/PokemonTower1F.asm b/data/maps/objects/PokemonTower1F.asm index 558688f7..bacf7244 100644 --- a/data/maps/objects/PokemonTower1F.asm +++ b/data/maps/objects/PokemonTower1F.asm @@ -2,9 +2,9 @@ PokemonTower1F_Object: db $1 ; border block def_warp_events - warp_event 10, 17, LAST_MAP, 1 - warp_event 11, 17, LAST_MAP, 1 - warp_event 18, 9, POKEMON_TOWER_2F, 1 + warp_event 10, 17, LAST_MAP, 2 + warp_event 11, 17, LAST_MAP, 2 + warp_event 18, 9, POKEMON_TOWER_2F, 2 def_bg_events diff --git a/data/maps/objects/PokemonTower2F.asm b/data/maps/objects/PokemonTower2F.asm index ba0e94ca..e0635b68 100644 --- a/data/maps/objects/PokemonTower2F.asm +++ b/data/maps/objects/PokemonTower2F.asm @@ -2,8 +2,8 @@ PokemonTower2F_Object: db $1 ; border block def_warp_events - warp_event 3, 9, POKEMON_TOWER_3F, 0 - warp_event 18, 9, POKEMON_TOWER_1F, 2 + warp_event 3, 9, POKEMON_TOWER_3F, 1 + warp_event 18, 9, POKEMON_TOWER_1F, 3 def_bg_events diff --git a/data/maps/objects/PokemonTower3F.asm b/data/maps/objects/PokemonTower3F.asm index 1d983476..6b49d967 100644 --- a/data/maps/objects/PokemonTower3F.asm +++ b/data/maps/objects/PokemonTower3F.asm @@ -2,8 +2,8 @@ PokemonTower3F_Object: db $1 ; border block def_warp_events - warp_event 3, 9, POKEMON_TOWER_2F, 0 - warp_event 18, 9, POKEMON_TOWER_4F, 1 + warp_event 3, 9, POKEMON_TOWER_2F, 1 + warp_event 18, 9, POKEMON_TOWER_4F, 2 def_bg_events diff --git a/data/maps/objects/PokemonTower4F.asm b/data/maps/objects/PokemonTower4F.asm index 6b21ce68..3bc31e70 100644 --- a/data/maps/objects/PokemonTower4F.asm +++ b/data/maps/objects/PokemonTower4F.asm @@ -2,8 +2,8 @@ PokemonTower4F_Object: db $1 ; border block def_warp_events - warp_event 3, 9, POKEMON_TOWER_5F, 0 - warp_event 18, 9, POKEMON_TOWER_3F, 1 + warp_event 3, 9, POKEMON_TOWER_5F, 1 + warp_event 18, 9, POKEMON_TOWER_3F, 2 def_bg_events diff --git a/data/maps/objects/PokemonTower5F.asm b/data/maps/objects/PokemonTower5F.asm index 9b578abc..99bbe8f0 100644 --- a/data/maps/objects/PokemonTower5F.asm +++ b/data/maps/objects/PokemonTower5F.asm @@ -2,8 +2,8 @@ PokemonTower5F_Object: db $1 ; border block def_warp_events - warp_event 3, 9, POKEMON_TOWER_4F, 0 - warp_event 18, 9, POKEMON_TOWER_6F, 0 + warp_event 3, 9, POKEMON_TOWER_4F, 1 + warp_event 18, 9, POKEMON_TOWER_6F, 1 def_bg_events diff --git a/data/maps/objects/PokemonTower6F.asm b/data/maps/objects/PokemonTower6F.asm index 5b64be0e..fa828b16 100644 --- a/data/maps/objects/PokemonTower6F.asm +++ b/data/maps/objects/PokemonTower6F.asm @@ -2,8 +2,8 @@ PokemonTower6F_Object: db $1 ; border block def_warp_events - warp_event 18, 9, POKEMON_TOWER_5F, 1 - warp_event 9, 16, POKEMON_TOWER_7F, 0 + warp_event 18, 9, POKEMON_TOWER_5F, 2 + warp_event 9, 16, POKEMON_TOWER_7F, 1 def_bg_events diff --git a/data/maps/objects/PokemonTower7F.asm b/data/maps/objects/PokemonTower7F.asm index 9cc632a1..328588ed 100644 --- a/data/maps/objects/PokemonTower7F.asm +++ b/data/maps/objects/PokemonTower7F.asm @@ -2,7 +2,7 @@ PokemonTower7F_Object: db $1 ; border block def_warp_events - warp_event 9, 16, POKEMON_TOWER_6F, 1 + warp_event 9, 16, POKEMON_TOWER_6F, 2 def_bg_events diff --git a/data/maps/objects/PowerPlant.asm b/data/maps/objects/PowerPlant.asm index 287eb15a..419adc01 100644 --- a/data/maps/objects/PowerPlant.asm +++ b/data/maps/objects/PowerPlant.asm @@ -2,9 +2,9 @@ PowerPlant_Object: db $2e ; border block def_warp_events - warp_event 4, 35, LAST_MAP, 3 - warp_event 5, 35, LAST_MAP, 3 - warp_event 0, 11, LAST_MAP, 3 + warp_event 4, 35, LAST_MAP, 4 + warp_event 5, 35, LAST_MAP, 4 + warp_event 0, 11, LAST_MAP, 4 def_bg_events diff --git a/data/maps/objects/RedsHouse1F.asm b/data/maps/objects/RedsHouse1F.asm index ef1f7c07..c8a2da55 100644 --- a/data/maps/objects/RedsHouse1F.asm +++ b/data/maps/objects/RedsHouse1F.asm @@ -2,9 +2,9 @@ RedsHouse1F_Object: db $a ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 0 - warp_event 3, 7, LAST_MAP, 0 - warp_event 7, 1, REDS_HOUSE_2F, 0 + warp_event 2, 7, LAST_MAP, 1 + warp_event 3, 7, LAST_MAP, 1 + warp_event 7, 1, REDS_HOUSE_2F, 1 def_bg_events bg_event 3, 1, 2 ; RedsHouse1FTVText diff --git a/data/maps/objects/RedsHouse2F.asm b/data/maps/objects/RedsHouse2F.asm index 0ffb23f3..4a193d35 100644 --- a/data/maps/objects/RedsHouse2F.asm +++ b/data/maps/objects/RedsHouse2F.asm @@ -2,7 +2,7 @@ RedsHouse2F_Object: db $a ; border block def_warp_events - warp_event 7, 1, REDS_HOUSE_1F, 2 + warp_event 7, 1, REDS_HOUSE_1F, 3 def_bg_events diff --git a/data/maps/objects/RockTunnel1F.asm b/data/maps/objects/RockTunnel1F.asm index cfe0e463..385214a4 100644 --- a/data/maps/objects/RockTunnel1F.asm +++ b/data/maps/objects/RockTunnel1F.asm @@ -2,14 +2,14 @@ RockTunnel1F_Object: db $3 ; border block def_warp_events - warp_event 15, 3, LAST_MAP, 1 - warp_event 15, 0, LAST_MAP, 1 - warp_event 15, 33, LAST_MAP, 2 - warp_event 15, 35, LAST_MAP, 2 - warp_event 37, 3, ROCK_TUNNEL_B1F, 0 - warp_event 5, 3, ROCK_TUNNEL_B1F, 1 - warp_event 17, 11, ROCK_TUNNEL_B1F, 2 - warp_event 37, 17, ROCK_TUNNEL_B1F, 3 + warp_event 15, 3, LAST_MAP, 2 + warp_event 15, 0, LAST_MAP, 2 + warp_event 15, 33, LAST_MAP, 3 + warp_event 15, 35, LAST_MAP, 3 + warp_event 37, 3, ROCK_TUNNEL_B1F, 1 + warp_event 5, 3, ROCK_TUNNEL_B1F, 2 + warp_event 17, 11, ROCK_TUNNEL_B1F, 3 + warp_event 37, 17, ROCK_TUNNEL_B1F, 4 def_bg_events bg_event 11, 29, 8 ; RockTunnel1Text8 diff --git a/data/maps/objects/RockTunnelB1F.asm b/data/maps/objects/RockTunnelB1F.asm index 79030034..a34a1a25 100644 --- a/data/maps/objects/RockTunnelB1F.asm +++ b/data/maps/objects/RockTunnelB1F.asm @@ -2,10 +2,10 @@ RockTunnelB1F_Object: db $3 ; border block def_warp_events - warp_event 33, 25, ROCK_TUNNEL_1F, 4 - warp_event 27, 3, ROCK_TUNNEL_1F, 5 - warp_event 23, 11, ROCK_TUNNEL_1F, 6 - warp_event 3, 3, ROCK_TUNNEL_1F, 7 + warp_event 33, 25, ROCK_TUNNEL_1F, 5 + warp_event 27, 3, ROCK_TUNNEL_1F, 6 + warp_event 23, 11, ROCK_TUNNEL_1F, 7 + warp_event 3, 3, ROCK_TUNNEL_1F, 8 def_bg_events diff --git a/data/maps/objects/RockTunnelPokecenter.asm b/data/maps/objects/RockTunnelPokecenter.asm index a1b095b6..27c22252 100644 --- a/data/maps/objects/RockTunnelPokecenter.asm +++ b/data/maps/objects/RockTunnelPokecenter.asm @@ -2,8 +2,8 @@ RockTunnelPokecenter_Object: db $0 ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 0 - warp_event 4, 7, LAST_MAP, 0 + warp_event 3, 7, LAST_MAP, 1 + warp_event 4, 7, LAST_MAP, 1 def_bg_events diff --git a/data/maps/objects/RocketHideoutB1F.asm b/data/maps/objects/RocketHideoutB1F.asm index 99eb2dc0..25750eb0 100644 --- a/data/maps/objects/RocketHideoutB1F.asm +++ b/data/maps/objects/RocketHideoutB1F.asm @@ -2,11 +2,11 @@ RocketHideoutB1F_Object: db $2e ; border block def_warp_events - warp_event 23, 2, ROCKET_HIDEOUT_B2F, 0 - warp_event 21, 2, GAME_CORNER, 2 - warp_event 24, 19, ROCKET_HIDEOUT_ELEVATOR, 0 - warp_event 21, 24, ROCKET_HIDEOUT_B2F, 3 - warp_event 25, 19, ROCKET_HIDEOUT_ELEVATOR, 1 + warp_event 23, 2, ROCKET_HIDEOUT_B2F, 1 + warp_event 21, 2, GAME_CORNER, 3 + warp_event 24, 19, ROCKET_HIDEOUT_ELEVATOR, 1 + warp_event 21, 24, ROCKET_HIDEOUT_B2F, 4 + warp_event 25, 19, ROCKET_HIDEOUT_ELEVATOR, 2 def_bg_events diff --git a/data/maps/objects/RocketHideoutB2F.asm b/data/maps/objects/RocketHideoutB2F.asm index 007644ae..e118fb58 100644 --- a/data/maps/objects/RocketHideoutB2F.asm +++ b/data/maps/objects/RocketHideoutB2F.asm @@ -2,11 +2,11 @@ RocketHideoutB2F_Object: db $2e ; border block def_warp_events - warp_event 27, 8, ROCKET_HIDEOUT_B1F, 0 - warp_event 21, 8, ROCKET_HIDEOUT_B3F, 0 - warp_event 24, 19, ROCKET_HIDEOUT_ELEVATOR, 0 - warp_event 21, 22, ROCKET_HIDEOUT_B1F, 3 - warp_event 25, 19, ROCKET_HIDEOUT_ELEVATOR, 1 + warp_event 27, 8, ROCKET_HIDEOUT_B1F, 1 + warp_event 21, 8, ROCKET_HIDEOUT_B3F, 1 + warp_event 24, 19, ROCKET_HIDEOUT_ELEVATOR, 1 + warp_event 21, 22, ROCKET_HIDEOUT_B1F, 4 + warp_event 25, 19, ROCKET_HIDEOUT_ELEVATOR, 2 def_bg_events diff --git a/data/maps/objects/RocketHideoutB3F.asm b/data/maps/objects/RocketHideoutB3F.asm index 5d5f8320..b679f87c 100644 --- a/data/maps/objects/RocketHideoutB3F.asm +++ b/data/maps/objects/RocketHideoutB3F.asm @@ -2,8 +2,8 @@ RocketHideoutB3F_Object: db $2e ; border block def_warp_events - warp_event 25, 6, ROCKET_HIDEOUT_B2F, 1 - warp_event 19, 18, ROCKET_HIDEOUT_B4F, 0 + warp_event 25, 6, ROCKET_HIDEOUT_B2F, 2 + warp_event 19, 18, ROCKET_HIDEOUT_B4F, 1 def_bg_events diff --git a/data/maps/objects/RocketHideoutB4F.asm b/data/maps/objects/RocketHideoutB4F.asm index d21a7dc4..ecae529c 100644 --- a/data/maps/objects/RocketHideoutB4F.asm +++ b/data/maps/objects/RocketHideoutB4F.asm @@ -2,9 +2,9 @@ RocketHideoutB4F_Object: db $2e ; border block def_warp_events - warp_event 19, 10, ROCKET_HIDEOUT_B3F, 1 - warp_event 24, 15, ROCKET_HIDEOUT_ELEVATOR, 0 - warp_event 25, 15, ROCKET_HIDEOUT_ELEVATOR, 1 + warp_event 19, 10, ROCKET_HIDEOUT_B3F, 2 + warp_event 24, 15, ROCKET_HIDEOUT_ELEVATOR, 1 + warp_event 25, 15, ROCKET_HIDEOUT_ELEVATOR, 2 def_bg_events diff --git a/data/maps/objects/RocketHideoutElevator.asm b/data/maps/objects/RocketHideoutElevator.asm index 25c507f1..d31ec51b 100644 --- a/data/maps/objects/RocketHideoutElevator.asm +++ b/data/maps/objects/RocketHideoutElevator.asm @@ -2,8 +2,8 @@ RocketHideoutElevator_Object: db $f ; border block def_warp_events - warp_event 2, 1, ROCKET_HIDEOUT_B1F, 2 - warp_event 3, 1, ROCKET_HIDEOUT_B1F, 4 + warp_event 2, 1, ROCKET_HIDEOUT_B1F, 3 + warp_event 3, 1, ROCKET_HIDEOUT_B1F, 5 def_bg_events bg_event 1, 1, 1 ; RocketHideoutElevatorText1 diff --git a/data/maps/objects/Route10.asm b/data/maps/objects/Route10.asm index ebf9361e..01eae9cf 100644 --- a/data/maps/objects/Route10.asm +++ b/data/maps/objects/Route10.asm @@ -2,10 +2,10 @@ Route10_Object: db $2c ; border block def_warp_events - warp_event 11, 19, ROCK_TUNNEL_POKECENTER, 0 - warp_event 8, 17, ROCK_TUNNEL_1F, 0 - warp_event 8, 53, ROCK_TUNNEL_1F, 2 - warp_event 6, 39, POWER_PLANT, 0 + warp_event 11, 19, ROCK_TUNNEL_POKECENTER, 1 + warp_event 8, 17, ROCK_TUNNEL_1F, 1 + warp_event 8, 53, ROCK_TUNNEL_1F, 3 + warp_event 6, 39, POWER_PLANT, 1 def_bg_events bg_event 7, 19, 7 ; Route10Text7 diff --git a/data/maps/objects/Route11.asm b/data/maps/objects/Route11.asm index 6ee584ef..6238a067 100644 --- a/data/maps/objects/Route11.asm +++ b/data/maps/objects/Route11.asm @@ -2,11 +2,11 @@ Route11_Object: db $f ; border block def_warp_events - warp_event 49, 8, ROUTE_11_GATE_1F, 0 - warp_event 49, 9, ROUTE_11_GATE_1F, 1 - warp_event 58, 8, ROUTE_11_GATE_1F, 2 - warp_event 58, 9, ROUTE_11_GATE_1F, 3 - warp_event 4, 5, DIGLETTS_CAVE_ROUTE_11, 0 + warp_event 49, 8, ROUTE_11_GATE_1F, 1 + warp_event 49, 9, ROUTE_11_GATE_1F, 2 + warp_event 58, 8, ROUTE_11_GATE_1F, 3 + warp_event 58, 9, ROUTE_11_GATE_1F, 4 + warp_event 4, 5, DIGLETTS_CAVE_ROUTE_11, 1 def_bg_events bg_event 1, 5, 11 ; Route11Text11 diff --git a/data/maps/objects/Route11Gate1F.asm b/data/maps/objects/Route11Gate1F.asm index 9032ae11..ea40cc90 100644 --- a/data/maps/objects/Route11Gate1F.asm +++ b/data/maps/objects/Route11Gate1F.asm @@ -2,11 +2,11 @@ Route11Gate1F_Object: db $a ; border block def_warp_events - warp_event 0, 4, LAST_MAP, 0 - warp_event 0, 5, LAST_MAP, 1 - warp_event 7, 4, LAST_MAP, 2 - warp_event 7, 5, LAST_MAP, 3 - warp_event 6, 8, ROUTE_11_GATE_2F, 0 + warp_event 0, 4, LAST_MAP, 1 + warp_event 0, 5, LAST_MAP, 2 + warp_event 7, 4, LAST_MAP, 3 + warp_event 7, 5, LAST_MAP, 4 + warp_event 6, 8, ROUTE_11_GATE_2F, 1 def_bg_events diff --git a/data/maps/objects/Route11Gate2F.asm b/data/maps/objects/Route11Gate2F.asm index 0843482c..ad257fbb 100644 --- a/data/maps/objects/Route11Gate2F.asm +++ b/data/maps/objects/Route11Gate2F.asm @@ -2,7 +2,7 @@ Route11Gate2F_Object: db $a ; border block def_warp_events - warp_event 7, 7, ROUTE_11_GATE_1F, 4 + warp_event 7, 7, ROUTE_11_GATE_1F, 5 def_bg_events bg_event 1, 2, 3 ; Route11GateUpstairsText3 diff --git a/data/maps/objects/Route12.asm b/data/maps/objects/Route12.asm index 8e2995f0..e7fc92f1 100644 --- a/data/maps/objects/Route12.asm +++ b/data/maps/objects/Route12.asm @@ -2,10 +2,10 @@ Route12_Object: db $43 ; border block def_warp_events - warp_event 10, 15, ROUTE_12_GATE_1F, 0 - warp_event 11, 15, ROUTE_12_GATE_1F, 1 - warp_event 10, 21, ROUTE_12_GATE_1F, 2 - warp_event 11, 77, ROUTE_12_SUPER_ROD_HOUSE, 0 + warp_event 10, 15, ROUTE_12_GATE_1F, 1 + warp_event 11, 15, ROUTE_12_GATE_1F, 2 + warp_event 10, 21, ROUTE_12_GATE_1F, 3 + warp_event 11, 77, ROUTE_12_SUPER_ROD_HOUSE, 1 def_bg_events bg_event 13, 13, 11 ; Route12Text11 diff --git a/data/maps/objects/Route12Gate1F.asm b/data/maps/objects/Route12Gate1F.asm index b2e3c6aa..67cd4a25 100644 --- a/data/maps/objects/Route12Gate1F.asm +++ b/data/maps/objects/Route12Gate1F.asm @@ -2,11 +2,11 @@ Route12Gate1F_Object: db $a ; border block def_warp_events - warp_event 4, 0, LAST_MAP, 0 - warp_event 5, 0, LAST_MAP, 1 - warp_event 4, 7, LAST_MAP, 2 - warp_event 5, 7, LAST_MAP, 2 - warp_event 8, 6, ROUTE_12_GATE_2F, 0 + warp_event 4, 0, LAST_MAP, 1 + warp_event 5, 0, LAST_MAP, 2 + warp_event 4, 7, LAST_MAP, 3 + warp_event 5, 7, LAST_MAP, 3 + warp_event 8, 6, ROUTE_12_GATE_2F, 1 def_bg_events diff --git a/data/maps/objects/Route12Gate2F.asm b/data/maps/objects/Route12Gate2F.asm index bd52d026..13501b5c 100644 --- a/data/maps/objects/Route12Gate2F.asm +++ b/data/maps/objects/Route12Gate2F.asm @@ -2,7 +2,7 @@ Route12Gate2F_Object: db $a ; border block def_warp_events - warp_event 7, 7, ROUTE_12_GATE_1F, 4 + warp_event 7, 7, ROUTE_12_GATE_1F, 5 def_bg_events bg_event 1, 2, 2 ; Route12GateUpstairsText2 diff --git a/data/maps/objects/Route12SuperRodHouse.asm b/data/maps/objects/Route12SuperRodHouse.asm index 806bfa55..14b7747a 100644 --- a/data/maps/objects/Route12SuperRodHouse.asm +++ b/data/maps/objects/Route12SuperRodHouse.asm @@ -2,8 +2,8 @@ Route12SuperRodHouse_Object: db $a ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 3 - warp_event 3, 7, LAST_MAP, 3 + warp_event 2, 7, LAST_MAP, 4 + warp_event 3, 7, LAST_MAP, 4 def_bg_events diff --git a/data/maps/objects/Route15.asm b/data/maps/objects/Route15.asm index 895cef47..93a74966 100644 --- a/data/maps/objects/Route15.asm +++ b/data/maps/objects/Route15.asm @@ -2,10 +2,10 @@ Route15_Object: db $43 ; border block def_warp_events - warp_event 7, 8, ROUTE_15_GATE_1F, 0 - warp_event 7, 9, ROUTE_15_GATE_1F, 1 - warp_event 14, 8, ROUTE_15_GATE_1F, 2 - warp_event 14, 9, ROUTE_15_GATE_1F, 3 + warp_event 7, 8, ROUTE_15_GATE_1F, 1 + warp_event 7, 9, ROUTE_15_GATE_1F, 2 + warp_event 14, 8, ROUTE_15_GATE_1F, 3 + warp_event 14, 9, ROUTE_15_GATE_1F, 4 def_bg_events bg_event 39, 9, 12 ; Route15Text12 diff --git a/data/maps/objects/Route15Gate1F.asm b/data/maps/objects/Route15Gate1F.asm index 7c93ff33..3bc02f2f 100644 --- a/data/maps/objects/Route15Gate1F.asm +++ b/data/maps/objects/Route15Gate1F.asm @@ -2,11 +2,11 @@ Route15Gate1F_Object: db $a ; border block def_warp_events - warp_event 0, 4, LAST_MAP, 0 - warp_event 0, 5, LAST_MAP, 1 - warp_event 7, 4, LAST_MAP, 2 - warp_event 7, 5, LAST_MAP, 3 - warp_event 6, 8, ROUTE_15_GATE_2F, 0 + warp_event 0, 4, LAST_MAP, 1 + warp_event 0, 5, LAST_MAP, 2 + warp_event 7, 4, LAST_MAP, 3 + warp_event 7, 5, LAST_MAP, 4 + warp_event 6, 8, ROUTE_15_GATE_2F, 1 def_bg_events diff --git a/data/maps/objects/Route15Gate2F.asm b/data/maps/objects/Route15Gate2F.asm index 23134028..39b5c64a 100644 --- a/data/maps/objects/Route15Gate2F.asm +++ b/data/maps/objects/Route15Gate2F.asm @@ -2,7 +2,7 @@ Route15Gate2F_Object: db $a ; border block def_warp_events - warp_event 7, 7, ROUTE_15_GATE_1F, 4 + warp_event 7, 7, ROUTE_15_GATE_1F, 5 def_bg_events bg_event 6, 2, 2 ; Route15GateUpstairsText2 diff --git a/data/maps/objects/Route16.asm b/data/maps/objects/Route16.asm index a029873a..b1e62651 100644 --- a/data/maps/objects/Route16.asm +++ b/data/maps/objects/Route16.asm @@ -2,15 +2,15 @@ Route16_Object: db $f ; border block def_warp_events - warp_event 17, 10, ROUTE_16_GATE_1F, 0 - warp_event 17, 11, ROUTE_16_GATE_1F, 1 - warp_event 24, 10, ROUTE_16_GATE_1F, 2 - warp_event 24, 11, ROUTE_16_GATE_1F, 3 - warp_event 17, 4, ROUTE_16_GATE_1F, 4 - warp_event 17, 5, ROUTE_16_GATE_1F, 5 - warp_event 24, 4, ROUTE_16_GATE_1F, 6 - warp_event 24, 5, ROUTE_16_GATE_1F, 7 - warp_event 7, 5, ROUTE_16_FLY_HOUSE, 0 + warp_event 17, 10, ROUTE_16_GATE_1F, 1 + warp_event 17, 11, ROUTE_16_GATE_1F, 2 + warp_event 24, 10, ROUTE_16_GATE_1F, 3 + warp_event 24, 11, ROUTE_16_GATE_1F, 4 + warp_event 17, 4, ROUTE_16_GATE_1F, 5 + warp_event 17, 5, ROUTE_16_GATE_1F, 6 + warp_event 24, 4, ROUTE_16_GATE_1F, 7 + warp_event 24, 5, ROUTE_16_GATE_1F, 8 + warp_event 7, 5, ROUTE_16_FLY_HOUSE, 1 def_bg_events bg_event 27, 11, 8 ; Route16Text8 diff --git a/data/maps/objects/Route16FlyHouse.asm b/data/maps/objects/Route16FlyHouse.asm index 3e1f8ec9..dc767dbf 100644 --- a/data/maps/objects/Route16FlyHouse.asm +++ b/data/maps/objects/Route16FlyHouse.asm @@ -2,8 +2,8 @@ Route16FlyHouse_Object: db $a ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 8 - warp_event 3, 7, LAST_MAP, 8 + warp_event 2, 7, LAST_MAP, 9 + warp_event 3, 7, LAST_MAP, 9 def_bg_events diff --git a/data/maps/objects/Route16Gate1F.asm b/data/maps/objects/Route16Gate1F.asm index 476729e3..7aeeb619 100644 --- a/data/maps/objects/Route16Gate1F.asm +++ b/data/maps/objects/Route16Gate1F.asm @@ -2,15 +2,15 @@ Route16Gate1F_Object: db $a ; border block def_warp_events - warp_event 0, 8, LAST_MAP, 0 - warp_event 0, 9, LAST_MAP, 1 - warp_event 7, 8, LAST_MAP, 2 - warp_event 7, 9, LAST_MAP, 2 - warp_event 0, 2, LAST_MAP, 4 - warp_event 0, 3, LAST_MAP, 5 - warp_event 7, 2, LAST_MAP, 6 - warp_event 7, 3, LAST_MAP, 7 - warp_event 6, 12, ROUTE_16_GATE_2F, 0 + warp_event 0, 8, LAST_MAP, 1 + warp_event 0, 9, LAST_MAP, 2 + warp_event 7, 8, LAST_MAP, 3 + warp_event 7, 9, LAST_MAP, 3 + warp_event 0, 2, LAST_MAP, 5 + warp_event 0, 3, LAST_MAP, 6 + warp_event 7, 2, LAST_MAP, 7 + warp_event 7, 3, LAST_MAP, 8 + warp_event 6, 12, ROUTE_16_GATE_2F, 1 def_bg_events diff --git a/data/maps/objects/Route16Gate2F.asm b/data/maps/objects/Route16Gate2F.asm index 185e5a13..f687fab0 100644 --- a/data/maps/objects/Route16Gate2F.asm +++ b/data/maps/objects/Route16Gate2F.asm @@ -2,7 +2,7 @@ Route16Gate2F_Object: db $a ; border block def_warp_events - warp_event 7, 7, ROUTE_16_GATE_1F, 8 + warp_event 7, 7, ROUTE_16_GATE_1F, 9 def_bg_events bg_event 1, 2, 3 ; Route16GateUpstairsText3 diff --git a/data/maps/objects/Route18.asm b/data/maps/objects/Route18.asm index c95e3cf9..102aa4c5 100644 --- a/data/maps/objects/Route18.asm +++ b/data/maps/objects/Route18.asm @@ -2,10 +2,10 @@ Route18_Object: db $43 ; border block def_warp_events - warp_event 33, 8, ROUTE_18_GATE_1F, 0 - warp_event 33, 9, ROUTE_18_GATE_1F, 1 - warp_event 40, 8, ROUTE_18_GATE_1F, 2 - warp_event 40, 9, ROUTE_18_GATE_1F, 3 + warp_event 33, 8, ROUTE_18_GATE_1F, 1 + warp_event 33, 9, ROUTE_18_GATE_1F, 2 + warp_event 40, 8, ROUTE_18_GATE_1F, 3 + warp_event 40, 9, ROUTE_18_GATE_1F, 4 def_bg_events bg_event 43, 7, 4 ; Route18Text4 diff --git a/data/maps/objects/Route18Gate1F.asm b/data/maps/objects/Route18Gate1F.asm index 2dcec54b..cc994a36 100644 --- a/data/maps/objects/Route18Gate1F.asm +++ b/data/maps/objects/Route18Gate1F.asm @@ -2,11 +2,11 @@ Route18Gate1F_Object: db $a ; border block def_warp_events - warp_event 0, 4, LAST_MAP, 0 - warp_event 0, 5, LAST_MAP, 1 - warp_event 7, 4, LAST_MAP, 2 - warp_event 7, 5, LAST_MAP, 3 - warp_event 6, 8, ROUTE_18_GATE_2F, 0 + warp_event 0, 4, LAST_MAP, 1 + warp_event 0, 5, LAST_MAP, 2 + warp_event 7, 4, LAST_MAP, 3 + warp_event 7, 5, LAST_MAP, 4 + warp_event 6, 8, ROUTE_18_GATE_2F, 1 def_bg_events diff --git a/data/maps/objects/Route18Gate2F.asm b/data/maps/objects/Route18Gate2F.asm index afa1b383..5a05f82b 100644 --- a/data/maps/objects/Route18Gate2F.asm +++ b/data/maps/objects/Route18Gate2F.asm @@ -2,7 +2,7 @@ Route18Gate2F_Object: db $a ; border block def_warp_events - warp_event 7, 7, ROUTE_18_GATE_1F, 4 + warp_event 7, 7, ROUTE_18_GATE_1F, 5 def_bg_events bg_event 1, 2, 2 ; Route18GateUpstairsText2 diff --git a/data/maps/objects/Route2.asm b/data/maps/objects/Route2.asm index e38df5a1..6ff5c0c7 100644 --- a/data/maps/objects/Route2.asm +++ b/data/maps/objects/Route2.asm @@ -2,12 +2,12 @@ Route2_Object: db $f ; border block def_warp_events - warp_event 12, 9, DIGLETTS_CAVE_ROUTE_2, 0 - warp_event 3, 11, VIRIDIAN_FOREST_NORTH_GATE, 1 - warp_event 15, 19, ROUTE_2_TRADE_HOUSE, 0 - warp_event 16, 35, ROUTE_2_GATE, 1 - warp_event 15, 39, ROUTE_2_GATE, 2 - warp_event 3, 43, VIRIDIAN_FOREST_SOUTH_GATE, 2 + warp_event 12, 9, DIGLETTS_CAVE_ROUTE_2, 1 + warp_event 3, 11, VIRIDIAN_FOREST_NORTH_GATE, 2 + warp_event 15, 19, ROUTE_2_TRADE_HOUSE, 1 + warp_event 16, 35, ROUTE_2_GATE, 2 + warp_event 15, 39, ROUTE_2_GATE, 3 + warp_event 3, 43, VIRIDIAN_FOREST_SOUTH_GATE, 3 def_bg_events bg_event 5, 65, 3 ; Route2Text3 diff --git a/data/maps/objects/Route20.asm b/data/maps/objects/Route20.asm index c00d2284..bd9697c2 100644 --- a/data/maps/objects/Route20.asm +++ b/data/maps/objects/Route20.asm @@ -2,8 +2,8 @@ Route20_Object: db $43 ; border block def_warp_events - warp_event 48, 5, SEAFOAM_ISLANDS_1F, 0 - warp_event 58, 9, SEAFOAM_ISLANDS_1F, 2 + warp_event 48, 5, SEAFOAM_ISLANDS_1F, 1 + warp_event 58, 9, SEAFOAM_ISLANDS_1F, 3 def_bg_events bg_event 51, 7, 11 ; Route20Text11 diff --git a/data/maps/objects/Route22.asm b/data/maps/objects/Route22.asm index 5fcc989f..096d490c 100644 --- a/data/maps/objects/Route22.asm +++ b/data/maps/objects/Route22.asm @@ -2,7 +2,7 @@ Route22_Object: db $2c ; border block def_warp_events - warp_event 8, 5, ROUTE_22_GATE, 0 + warp_event 8, 5, ROUTE_22_GATE, 1 def_bg_events bg_event 7, 11, 3 ; Route22FrontGateText diff --git a/data/maps/objects/Route22Gate.asm b/data/maps/objects/Route22Gate.asm index 94aafc51..086616ca 100644 --- a/data/maps/objects/Route22Gate.asm +++ b/data/maps/objects/Route22Gate.asm @@ -2,10 +2,10 @@ Route22Gate_Object: db $a ; border block def_warp_events - warp_event 4, 7, LAST_MAP, 0 - warp_event 5, 7, LAST_MAP, 0 - warp_event 4, 0, LAST_MAP, 0 - warp_event 5, 0, LAST_MAP, 1 + warp_event 4, 7, LAST_MAP, 1 + warp_event 5, 7, LAST_MAP, 1 + warp_event 4, 0, LAST_MAP, 1 + warp_event 5, 0, LAST_MAP, 2 def_bg_events diff --git a/data/maps/objects/Route23.asm b/data/maps/objects/Route23.asm index 6cd97faa..4a9f65f6 100644 --- a/data/maps/objects/Route23.asm +++ b/data/maps/objects/Route23.asm @@ -2,10 +2,10 @@ Route23_Object: db $f ; border block def_warp_events - warp_event 7, 139, ROUTE_22_GATE, 2 - warp_event 8, 139, ROUTE_22_GATE, 3 - warp_event 4, 31, VICTORY_ROAD_1F, 0 - warp_event 14, 31, VICTORY_ROAD_2F, 1 + warp_event 7, 139, ROUTE_22_GATE, 3 + warp_event 8, 139, ROUTE_22_GATE, 4 + warp_event 4, 31, VICTORY_ROAD_1F, 1 + warp_event 14, 31, VICTORY_ROAD_2F, 2 def_bg_events bg_event 3, 33, 8 ; Route23Text8 diff --git a/data/maps/objects/Route25.asm b/data/maps/objects/Route25.asm index 096fd225..f0814b23 100644 --- a/data/maps/objects/Route25.asm +++ b/data/maps/objects/Route25.asm @@ -2,7 +2,7 @@ Route25_Object: db $2c ; border block def_warp_events - warp_event 45, 3, BILLS_HOUSE, 0 + warp_event 45, 3, BILLS_HOUSE, 1 def_bg_events bg_event 43, 3, 11 ; Route25Text11 diff --git a/data/maps/objects/Route2Gate.asm b/data/maps/objects/Route2Gate.asm index a31e92b0..02205d00 100644 --- a/data/maps/objects/Route2Gate.asm +++ b/data/maps/objects/Route2Gate.asm @@ -2,10 +2,10 @@ Route2Gate_Object: db $a ; border block def_warp_events - warp_event 4, 0, LAST_MAP, 3 - warp_event 5, 0, LAST_MAP, 3 - warp_event 4, 7, LAST_MAP, 4 - warp_event 5, 7, LAST_MAP, 4 + warp_event 4, 0, LAST_MAP, 4 + warp_event 5, 0, LAST_MAP, 4 + warp_event 4, 7, LAST_MAP, 5 + warp_event 5, 7, LAST_MAP, 5 def_bg_events diff --git a/data/maps/objects/Route2TradeHouse.asm b/data/maps/objects/Route2TradeHouse.asm index 863dee37..7b30b9e8 100644 --- a/data/maps/objects/Route2TradeHouse.asm +++ b/data/maps/objects/Route2TradeHouse.asm @@ -2,8 +2,8 @@ Route2TradeHouse_Object: db $a ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 2 - warp_event 3, 7, LAST_MAP, 2 + warp_event 2, 7, LAST_MAP, 3 + warp_event 3, 7, LAST_MAP, 3 def_bg_events diff --git a/data/maps/objects/Route4.asm b/data/maps/objects/Route4.asm index 27a72b23..2917de1f 100644 --- a/data/maps/objects/Route4.asm +++ b/data/maps/objects/Route4.asm @@ -2,9 +2,9 @@ Route4_Object: db $2c ; border block def_warp_events - warp_event 11, 5, MT_MOON_POKECENTER, 0 - warp_event 18, 5, MT_MOON_1F, 0 - warp_event 24, 5, MT_MOON_B1F, 7 + warp_event 11, 5, MT_MOON_POKECENTER, 1 + warp_event 18, 5, MT_MOON_1F, 1 + warp_event 24, 5, MT_MOON_B1F, 8 def_bg_events bg_event 12, 5, 4 ; PokeCenterSignText diff --git a/data/maps/objects/Route5.asm b/data/maps/objects/Route5.asm index d0309e6e..2e91a7c6 100644 --- a/data/maps/objects/Route5.asm +++ b/data/maps/objects/Route5.asm @@ -2,11 +2,11 @@ Route5_Object: db $a ; border block def_warp_events - warp_event 10, 29, ROUTE_5_GATE, 3 - warp_event 9, 29, ROUTE_5_GATE, 2 - warp_event 10, 33, ROUTE_5_GATE, 0 - warp_event 17, 27, UNDERGROUND_PATH_ROUTE_5, 0 - warp_event 10, 21, DAYCARE, 0 + warp_event 10, 29, ROUTE_5_GATE, 4 + warp_event 9, 29, ROUTE_5_GATE, 3 + warp_event 10, 33, ROUTE_5_GATE, 1 + warp_event 17, 27, UNDERGROUND_PATH_ROUTE_5, 1 + warp_event 10, 21, DAYCARE, 1 def_bg_events bg_event 17, 29, 1 ; Route5Text1 diff --git a/data/maps/objects/Route5Gate.asm b/data/maps/objects/Route5Gate.asm index cdcf7aa8..de4ddab2 100644 --- a/data/maps/objects/Route5Gate.asm +++ b/data/maps/objects/Route5Gate.asm @@ -2,10 +2,10 @@ Route5Gate_Object: db $a ; border block def_warp_events - warp_event 3, 5, LAST_MAP, 2 - warp_event 4, 5, LAST_MAP, 2 - warp_event 3, 0, LAST_MAP, 1 - warp_event 4, 0, LAST_MAP, 0 + warp_event 3, 5, LAST_MAP, 3 + warp_event 4, 5, LAST_MAP, 3 + warp_event 3, 0, LAST_MAP, 2 + warp_event 4, 0, LAST_MAP, 1 def_bg_events diff --git a/data/maps/objects/Route6.asm b/data/maps/objects/Route6.asm index d71c90de..33748f0f 100644 --- a/data/maps/objects/Route6.asm +++ b/data/maps/objects/Route6.asm @@ -2,10 +2,10 @@ Route6_Object: db $f ; border block def_warp_events - warp_event 9, 1, ROUTE_6_GATE, 2 - warp_event 10, 1, ROUTE_6_GATE, 2 - warp_event 10, 7, ROUTE_6_GATE, 0 - warp_event 17, 13, UNDERGROUND_PATH_ROUTE_6, 0 + warp_event 9, 1, ROUTE_6_GATE, 3 + warp_event 10, 1, ROUTE_6_GATE, 3 + warp_event 10, 7, ROUTE_6_GATE, 1 + warp_event 17, 13, UNDERGROUND_PATH_ROUTE_6, 1 def_bg_events bg_event 19, 15, 7 ; Route6Text7 diff --git a/data/maps/objects/Route6Gate.asm b/data/maps/objects/Route6Gate.asm index 95ad9e5e..d37213c9 100644 --- a/data/maps/objects/Route6Gate.asm +++ b/data/maps/objects/Route6Gate.asm @@ -2,10 +2,10 @@ Route6Gate_Object: db $a ; border block def_warp_events - warp_event 3, 5, LAST_MAP, 2 - warp_event 4, 5, LAST_MAP, 2 - warp_event 3, 0, LAST_MAP, 1 - warp_event 4, 0, LAST_MAP, 1 + warp_event 3, 5, LAST_MAP, 3 + warp_event 4, 5, LAST_MAP, 3 + warp_event 3, 0, LAST_MAP, 2 + warp_event 4, 0, LAST_MAP, 2 def_bg_events diff --git a/data/maps/objects/Route7.asm b/data/maps/objects/Route7.asm index 6dd9d92c..ec5f2e8a 100644 --- a/data/maps/objects/Route7.asm +++ b/data/maps/objects/Route7.asm @@ -2,11 +2,11 @@ Route7_Object: db $f ; border block def_warp_events - warp_event 18, 9, ROUTE_7_GATE, 2 - warp_event 18, 10, ROUTE_7_GATE, 3 - warp_event 11, 9, ROUTE_7_GATE, 0 - warp_event 11, 10, ROUTE_7_GATE, 1 - warp_event 5, 13, UNDERGROUND_PATH_ROUTE_7, 0 + warp_event 18, 9, ROUTE_7_GATE, 3 + warp_event 18, 10, ROUTE_7_GATE, 4 + warp_event 11, 9, ROUTE_7_GATE, 1 + warp_event 11, 10, ROUTE_7_GATE, 2 + warp_event 5, 13, UNDERGROUND_PATH_ROUTE_7, 1 def_bg_events bg_event 3, 13, 1 ; Route7Text1 diff --git a/data/maps/objects/Route7Gate.asm b/data/maps/objects/Route7Gate.asm index 90ddca07..8cc58d9b 100644 --- a/data/maps/objects/Route7Gate.asm +++ b/data/maps/objects/Route7Gate.asm @@ -2,10 +2,10 @@ Route7Gate_Object: db $a ; border block def_warp_events - warp_event 0, 3, LAST_MAP, 3 - warp_event 0, 4, LAST_MAP, 3 - warp_event 5, 3, LAST_MAP, 0 - warp_event 5, 4, LAST_MAP, 1 + warp_event 0, 3, LAST_MAP, 4 + warp_event 0, 4, LAST_MAP, 4 + warp_event 5, 3, LAST_MAP, 1 + warp_event 5, 4, LAST_MAP, 2 def_bg_events diff --git a/data/maps/objects/Route8.asm b/data/maps/objects/Route8.asm index 2ca33901..61faa47f 100644 --- a/data/maps/objects/Route8.asm +++ b/data/maps/objects/Route8.asm @@ -2,11 +2,11 @@ Route8_Object: db $2c ; border block def_warp_events - warp_event 1, 9, ROUTE_8_GATE, 0 - warp_event 1, 10, ROUTE_8_GATE, 1 - warp_event 8, 9, ROUTE_8_GATE, 2 - warp_event 8, 10, ROUTE_8_GATE, 3 - warp_event 13, 3, UNDERGROUND_PATH_ROUTE_8, 0 + warp_event 1, 9, ROUTE_8_GATE, 1 + warp_event 1, 10, ROUTE_8_GATE, 2 + warp_event 8, 9, ROUTE_8_GATE, 3 + warp_event 8, 10, ROUTE_8_GATE, 4 + warp_event 13, 3, UNDERGROUND_PATH_ROUTE_8, 1 def_bg_events bg_event 17, 3, 10 ; Route8Text10 diff --git a/data/maps/objects/Route8Gate.asm b/data/maps/objects/Route8Gate.asm index ee09b038..47a24967 100644 --- a/data/maps/objects/Route8Gate.asm +++ b/data/maps/objects/Route8Gate.asm @@ -2,10 +2,10 @@ Route8Gate_Object: db $a ; border block def_warp_events - warp_event 0, 3, LAST_MAP, 0 - warp_event 0, 4, LAST_MAP, 1 - warp_event 5, 3, LAST_MAP, 2 - warp_event 5, 4, LAST_MAP, 3 + warp_event 0, 3, LAST_MAP, 1 + warp_event 0, 4, LAST_MAP, 2 + warp_event 5, 3, LAST_MAP, 3 + warp_event 5, 4, LAST_MAP, 4 def_bg_events diff --git a/data/maps/objects/SSAnne1F.asm b/data/maps/objects/SSAnne1F.asm index 60db6da2..61184a1b 100644 --- a/data/maps/objects/SSAnne1F.asm +++ b/data/maps/objects/SSAnne1F.asm @@ -2,17 +2,17 @@ SSAnne1F_Object: db $c ; border block def_warp_events - warp_event 26, 0, VERMILION_DOCK, 1 - warp_event 27, 0, VERMILION_DOCK, 1 - warp_event 31, 8, SS_ANNE_1F_ROOMS, 0 - warp_event 23, 8, SS_ANNE_1F_ROOMS, 1 - warp_event 19, 8, SS_ANNE_1F_ROOMS, 2 - warp_event 15, 8, SS_ANNE_1F_ROOMS, 3 - warp_event 11, 8, SS_ANNE_1F_ROOMS, 4 - warp_event 7, 8, SS_ANNE_1F_ROOMS, 5 - warp_event 2, 6, SS_ANNE_2F, 6 - warp_event 37, 15, SS_ANNE_B1F, 5 - warp_event 3, 16, SS_ANNE_KITCHEN, 0 + warp_event 26, 0, VERMILION_DOCK, 2 + warp_event 27, 0, VERMILION_DOCK, 2 + warp_event 31, 8, SS_ANNE_1F_ROOMS, 1 + warp_event 23, 8, SS_ANNE_1F_ROOMS, 2 + warp_event 19, 8, SS_ANNE_1F_ROOMS, 3 + warp_event 15, 8, SS_ANNE_1F_ROOMS, 4 + warp_event 11, 8, SS_ANNE_1F_ROOMS, 5 + warp_event 7, 8, SS_ANNE_1F_ROOMS, 6 + warp_event 2, 6, SS_ANNE_2F, 7 + warp_event 37, 15, SS_ANNE_B1F, 6 + warp_event 3, 16, SS_ANNE_KITCHEN, 1 def_bg_events diff --git a/data/maps/objects/SSAnne1FRooms.asm b/data/maps/objects/SSAnne1FRooms.asm index c5c97671..6192c31a 100644 --- a/data/maps/objects/SSAnne1FRooms.asm +++ b/data/maps/objects/SSAnne1FRooms.asm @@ -2,12 +2,12 @@ SSAnne1FRooms_Object: db $c ; border block def_warp_events - warp_event 0, 0, SS_ANNE_1F, 2 - warp_event 10, 0, SS_ANNE_1F, 3 - warp_event 20, 0, SS_ANNE_1F, 4 - warp_event 0, 10, SS_ANNE_1F, 5 - warp_event 10, 10, SS_ANNE_1F, 6 - warp_event 20, 10, SS_ANNE_1F, 7 + warp_event 0, 0, SS_ANNE_1F, 3 + warp_event 10, 0, SS_ANNE_1F, 4 + warp_event 20, 0, SS_ANNE_1F, 5 + warp_event 0, 10, SS_ANNE_1F, 6 + warp_event 10, 10, SS_ANNE_1F, 7 + warp_event 20, 10, SS_ANNE_1F, 8 def_bg_events diff --git a/data/maps/objects/SSAnne2F.asm b/data/maps/objects/SSAnne2F.asm index fa3a851f..cfd93189 100644 --- a/data/maps/objects/SSAnne2F.asm +++ b/data/maps/objects/SSAnne2F.asm @@ -2,15 +2,15 @@ SSAnne2F_Object: db $c ; border block def_warp_events - warp_event 9, 11, SS_ANNE_2F_ROOMS, 0 - warp_event 13, 11, SS_ANNE_2F_ROOMS, 2 - warp_event 17, 11, SS_ANNE_2F_ROOMS, 4 - warp_event 21, 11, SS_ANNE_2F_ROOMS, 6 - warp_event 25, 11, SS_ANNE_2F_ROOMS, 8 - warp_event 29, 11, SS_ANNE_2F_ROOMS, 10 - warp_event 2, 4, SS_ANNE_1F, 8 - warp_event 2, 12, SS_ANNE_3F, 1 - warp_event 36, 4, SS_ANNE_CAPTAINS_ROOM, 0 + warp_event 9, 11, SS_ANNE_2F_ROOMS, 1 + warp_event 13, 11, SS_ANNE_2F_ROOMS, 3 + warp_event 17, 11, SS_ANNE_2F_ROOMS, 5 + warp_event 21, 11, SS_ANNE_2F_ROOMS, 7 + warp_event 25, 11, SS_ANNE_2F_ROOMS, 9 + warp_event 29, 11, SS_ANNE_2F_ROOMS, 11 + warp_event 2, 4, SS_ANNE_1F, 9 + warp_event 2, 12, SS_ANNE_3F, 2 + warp_event 36, 4, SS_ANNE_CAPTAINS_ROOM, 1 def_bg_events diff --git a/data/maps/objects/SSAnne2FRooms.asm b/data/maps/objects/SSAnne2FRooms.asm index 187da976..1a9a1cb1 100644 --- a/data/maps/objects/SSAnne2FRooms.asm +++ b/data/maps/objects/SSAnne2FRooms.asm @@ -2,18 +2,18 @@ SSAnne2FRooms_Object: db $c ; border block def_warp_events - warp_event 2, 5, SS_ANNE_2F, 0 - warp_event 3, 5, SS_ANNE_2F, 0 - warp_event 12, 5, SS_ANNE_2F, 1 - warp_event 13, 5, SS_ANNE_2F, 1 - warp_event 22, 5, SS_ANNE_2F, 2 - warp_event 23, 5, SS_ANNE_2F, 2 - warp_event 2, 15, SS_ANNE_2F, 3 - warp_event 3, 15, SS_ANNE_2F, 3 - warp_event 12, 15, SS_ANNE_2F, 4 - warp_event 13, 15, SS_ANNE_2F, 4 - warp_event 22, 15, SS_ANNE_2F, 5 - warp_event 23, 15, SS_ANNE_2F, 5 + warp_event 2, 5, SS_ANNE_2F, 1 + warp_event 3, 5, SS_ANNE_2F, 1 + warp_event 12, 5, SS_ANNE_2F, 2 + warp_event 13, 5, SS_ANNE_2F, 2 + warp_event 22, 5, SS_ANNE_2F, 3 + warp_event 23, 5, SS_ANNE_2F, 3 + warp_event 2, 15, SS_ANNE_2F, 4 + warp_event 3, 15, SS_ANNE_2F, 4 + warp_event 12, 15, SS_ANNE_2F, 5 + warp_event 13, 15, SS_ANNE_2F, 5 + warp_event 22, 15, SS_ANNE_2F, 6 + warp_event 23, 15, SS_ANNE_2F, 6 def_bg_events diff --git a/data/maps/objects/SSAnne3F.asm b/data/maps/objects/SSAnne3F.asm index 18df6b5e..09c4b5bd 100644 --- a/data/maps/objects/SSAnne3F.asm +++ b/data/maps/objects/SSAnne3F.asm @@ -2,8 +2,8 @@ SSAnne3F_Object: db $c ; border block def_warp_events - warp_event 0, 3, SS_ANNE_BOW, 0 - warp_event 19, 3, SS_ANNE_2F, 7 + warp_event 0, 3, SS_ANNE_BOW, 1 + warp_event 19, 3, SS_ANNE_2F, 8 def_bg_events diff --git a/data/maps/objects/SSAnneB1F.asm b/data/maps/objects/SSAnneB1F.asm index a63caeb9..c7559dd6 100644 --- a/data/maps/objects/SSAnneB1F.asm +++ b/data/maps/objects/SSAnneB1F.asm @@ -2,12 +2,12 @@ SSAnneB1F_Object: db $c ; border block def_warp_events - warp_event 23, 3, SS_ANNE_B1F_ROOMS, 8 - warp_event 19, 3, SS_ANNE_B1F_ROOMS, 6 - warp_event 15, 3, SS_ANNE_B1F_ROOMS, 4 - warp_event 11, 3, SS_ANNE_B1F_ROOMS, 2 - warp_event 7, 3, SS_ANNE_B1F_ROOMS, 0 - warp_event 27, 5, SS_ANNE_1F, 9 + warp_event 23, 3, SS_ANNE_B1F_ROOMS, 9 + warp_event 19, 3, SS_ANNE_B1F_ROOMS, 7 + warp_event 15, 3, SS_ANNE_B1F_ROOMS, 5 + warp_event 11, 3, SS_ANNE_B1F_ROOMS, 3 + warp_event 7, 3, SS_ANNE_B1F_ROOMS, 1 + warp_event 27, 5, SS_ANNE_1F, 10 def_bg_events diff --git a/data/maps/objects/SSAnneB1FRooms.asm b/data/maps/objects/SSAnneB1FRooms.asm index a7bf0825..3c7da689 100644 --- a/data/maps/objects/SSAnneB1FRooms.asm +++ b/data/maps/objects/SSAnneB1FRooms.asm @@ -2,16 +2,16 @@ SSAnneB1FRooms_Object: db $c ; border block def_warp_events - warp_event 2, 5, SS_ANNE_B1F, 4 - warp_event 3, 5, SS_ANNE_B1F, 4 - warp_event 12, 5, SS_ANNE_B1F, 3 - warp_event 13, 5, SS_ANNE_B1F, 3 - warp_event 22, 5, SS_ANNE_B1F, 2 - warp_event 23, 5, SS_ANNE_B1F, 2 - warp_event 2, 15, SS_ANNE_B1F, 1 - warp_event 3, 15, SS_ANNE_B1F, 1 - warp_event 12, 15, SS_ANNE_B1F, 0 - warp_event 13, 15, SS_ANNE_B1F, 0 + warp_event 2, 5, SS_ANNE_B1F, 5 + warp_event 3, 5, SS_ANNE_B1F, 5 + warp_event 12, 5, SS_ANNE_B1F, 4 + warp_event 13, 5, SS_ANNE_B1F, 4 + warp_event 22, 5, SS_ANNE_B1F, 3 + warp_event 23, 5, SS_ANNE_B1F, 3 + warp_event 2, 15, SS_ANNE_B1F, 2 + warp_event 3, 15, SS_ANNE_B1F, 2 + warp_event 12, 15, SS_ANNE_B1F, 1 + warp_event 13, 15, SS_ANNE_B1F, 1 def_bg_events diff --git a/data/maps/objects/SSAnneBow.asm b/data/maps/objects/SSAnneBow.asm index 9771a94f..6374f009 100644 --- a/data/maps/objects/SSAnneBow.asm +++ b/data/maps/objects/SSAnneBow.asm @@ -2,8 +2,8 @@ SSAnneBow_Object: db $23 ; border block def_warp_events - warp_event 13, 6, SS_ANNE_3F, 0 - warp_event 13, 7, SS_ANNE_3F, 0 + warp_event 13, 6, SS_ANNE_3F, 1 + warp_event 13, 7, SS_ANNE_3F, 1 def_bg_events diff --git a/data/maps/objects/SSAnneCaptainsRoom.asm b/data/maps/objects/SSAnneCaptainsRoom.asm index 7e79b662..195e4183 100644 --- a/data/maps/objects/SSAnneCaptainsRoom.asm +++ b/data/maps/objects/SSAnneCaptainsRoom.asm @@ -2,7 +2,7 @@ SSAnneCaptainsRoom_Object: db $c ; border block def_warp_events - warp_event 0, 7, SS_ANNE_2F, 8 + warp_event 0, 7, SS_ANNE_2F, 9 def_bg_events bg_event 4, 1, 2 ; SSAnne7Text2 diff --git a/data/maps/objects/SSAnneKitchen.asm b/data/maps/objects/SSAnneKitchen.asm index 3a8ab47b..c651679e 100644 --- a/data/maps/objects/SSAnneKitchen.asm +++ b/data/maps/objects/SSAnneKitchen.asm @@ -2,7 +2,7 @@ SSAnneKitchen_Object: db $c ; border block def_warp_events - warp_event 6, 0, SS_ANNE_1F, 10 + warp_event 6, 0, SS_ANNE_1F, 11 def_bg_events diff --git a/data/maps/objects/SafariZoneCenter.asm b/data/maps/objects/SafariZoneCenter.asm index ceaf6266..1c8efe95 100644 --- a/data/maps/objects/SafariZoneCenter.asm +++ b/data/maps/objects/SafariZoneCenter.asm @@ -2,15 +2,15 @@ SafariZoneCenter_Object: db $0 ; border block def_warp_events - warp_event 14, 25, SAFARI_ZONE_GATE, 2 - warp_event 15, 25, SAFARI_ZONE_GATE, 3 - warp_event 0, 10, SAFARI_ZONE_WEST, 4 - warp_event 0, 11, SAFARI_ZONE_WEST, 5 - warp_event 14, 0, SAFARI_ZONE_NORTH, 4 - warp_event 15, 0, SAFARI_ZONE_NORTH, 5 - warp_event 29, 10, SAFARI_ZONE_EAST, 2 - warp_event 29, 11, SAFARI_ZONE_EAST, 3 - warp_event 17, 19, SAFARI_ZONE_CENTER_REST_HOUSE, 0 + warp_event 14, 25, SAFARI_ZONE_GATE, 3 + warp_event 15, 25, SAFARI_ZONE_GATE, 4 + warp_event 0, 10, SAFARI_ZONE_WEST, 5 + warp_event 0, 11, SAFARI_ZONE_WEST, 6 + warp_event 14, 0, SAFARI_ZONE_NORTH, 5 + warp_event 15, 0, SAFARI_ZONE_NORTH, 6 + warp_event 29, 10, SAFARI_ZONE_EAST, 3 + warp_event 29, 11, SAFARI_ZONE_EAST, 4 + warp_event 17, 19, SAFARI_ZONE_CENTER_REST_HOUSE, 1 def_bg_events bg_event 18, 20, 2 ; SafariZoneCenterText2 diff --git a/data/maps/objects/SafariZoneCenterRestHouse.asm b/data/maps/objects/SafariZoneCenterRestHouse.asm index 2d000233..ff48d19c 100644 --- a/data/maps/objects/SafariZoneCenterRestHouse.asm +++ b/data/maps/objects/SafariZoneCenterRestHouse.asm @@ -2,8 +2,8 @@ SafariZoneCenterRestHouse_Object: db $a ; border block def_warp_events - warp_event 2, 7, SAFARI_ZONE_CENTER, 8 - warp_event 3, 7, SAFARI_ZONE_CENTER, 8 + warp_event 2, 7, SAFARI_ZONE_CENTER, 9 + warp_event 3, 7, SAFARI_ZONE_CENTER, 9 def_bg_events diff --git a/data/maps/objects/SafariZoneEast.asm b/data/maps/objects/SafariZoneEast.asm index f5759d6b..30fb4039 100644 --- a/data/maps/objects/SafariZoneEast.asm +++ b/data/maps/objects/SafariZoneEast.asm @@ -2,11 +2,11 @@ SafariZoneEast_Object: db $0 ; border block def_warp_events - warp_event 0, 4, SAFARI_ZONE_NORTH, 6 - warp_event 0, 5, SAFARI_ZONE_NORTH, 7 - warp_event 0, 22, SAFARI_ZONE_CENTER, 6 - warp_event 0, 23, SAFARI_ZONE_CENTER, 6 - warp_event 25, 9, SAFARI_ZONE_EAST_REST_HOUSE, 0 + warp_event 0, 4, SAFARI_ZONE_NORTH, 7 + warp_event 0, 5, SAFARI_ZONE_NORTH, 8 + warp_event 0, 22, SAFARI_ZONE_CENTER, 7 + warp_event 0, 23, SAFARI_ZONE_CENTER, 7 + warp_event 25, 9, SAFARI_ZONE_EAST_REST_HOUSE, 1 def_bg_events bg_event 26, 10, 5 ; SafariZoneEastText5 diff --git a/data/maps/objects/SafariZoneEastRestHouse.asm b/data/maps/objects/SafariZoneEastRestHouse.asm index 915e175b..bf506605 100644 --- a/data/maps/objects/SafariZoneEastRestHouse.asm +++ b/data/maps/objects/SafariZoneEastRestHouse.asm @@ -2,8 +2,8 @@ SafariZoneEastRestHouse_Object: db $a ; border block def_warp_events - warp_event 2, 7, SAFARI_ZONE_EAST, 4 - warp_event 3, 7, SAFARI_ZONE_EAST, 4 + warp_event 2, 7, SAFARI_ZONE_EAST, 5 + warp_event 3, 7, SAFARI_ZONE_EAST, 5 def_bg_events diff --git a/data/maps/objects/SafariZoneGate.asm b/data/maps/objects/SafariZoneGate.asm index d3c153fb..ba6f7017 100644 --- a/data/maps/objects/SafariZoneGate.asm +++ b/data/maps/objects/SafariZoneGate.asm @@ -2,10 +2,10 @@ SafariZoneGate_Object: db $a ; border block def_warp_events - warp_event 3, 5, LAST_MAP, 4 - warp_event 4, 5, LAST_MAP, 4 - warp_event 3, 0, SAFARI_ZONE_CENTER, 0 - warp_event 4, 0, SAFARI_ZONE_CENTER, 1 + warp_event 3, 5, LAST_MAP, 5 + warp_event 4, 5, LAST_MAP, 5 + warp_event 3, 0, SAFARI_ZONE_CENTER, 1 + warp_event 4, 0, SAFARI_ZONE_CENTER, 2 def_bg_events diff --git a/data/maps/objects/SafariZoneNorth.asm b/data/maps/objects/SafariZoneNorth.asm index e9c50acb..97dc0d55 100644 --- a/data/maps/objects/SafariZoneNorth.asm +++ b/data/maps/objects/SafariZoneNorth.asm @@ -2,15 +2,15 @@ SafariZoneNorth_Object: db $0 ; border block def_warp_events - warp_event 2, 35, SAFARI_ZONE_WEST, 0 - warp_event 3, 35, SAFARI_ZONE_WEST, 1 - warp_event 8, 35, SAFARI_ZONE_WEST, 2 - warp_event 9, 35, SAFARI_ZONE_WEST, 3 - warp_event 20, 35, SAFARI_ZONE_CENTER, 4 - warp_event 21, 35, SAFARI_ZONE_CENTER, 5 - warp_event 39, 30, SAFARI_ZONE_EAST, 0 - warp_event 39, 31, SAFARI_ZONE_EAST, 1 - warp_event 35, 3, SAFARI_ZONE_NORTH_REST_HOUSE, 0 + warp_event 2, 35, SAFARI_ZONE_WEST, 1 + warp_event 3, 35, SAFARI_ZONE_WEST, 2 + warp_event 8, 35, SAFARI_ZONE_WEST, 3 + warp_event 9, 35, SAFARI_ZONE_WEST, 4 + warp_event 20, 35, SAFARI_ZONE_CENTER, 5 + warp_event 21, 35, SAFARI_ZONE_CENTER, 6 + warp_event 39, 30, SAFARI_ZONE_EAST, 1 + warp_event 39, 31, SAFARI_ZONE_EAST, 2 + warp_event 35, 3, SAFARI_ZONE_NORTH_REST_HOUSE, 1 def_bg_events bg_event 36, 4, 3 ; SafariZoneNorthText3 diff --git a/data/maps/objects/SafariZoneNorthRestHouse.asm b/data/maps/objects/SafariZoneNorthRestHouse.asm index 1f5008a4..8fbacd81 100644 --- a/data/maps/objects/SafariZoneNorthRestHouse.asm +++ b/data/maps/objects/SafariZoneNorthRestHouse.asm @@ -2,8 +2,8 @@ SafariZoneNorthRestHouse_Object: db $a ; border block def_warp_events - warp_event 2, 7, SAFARI_ZONE_NORTH, 8 - warp_event 3, 7, SAFARI_ZONE_NORTH, 8 + warp_event 2, 7, SAFARI_ZONE_NORTH, 9 + warp_event 3, 7, SAFARI_ZONE_NORTH, 9 def_bg_events diff --git a/data/maps/objects/SafariZoneSecretHouse.asm b/data/maps/objects/SafariZoneSecretHouse.asm index 2459611c..5d3a28c2 100644 --- a/data/maps/objects/SafariZoneSecretHouse.asm +++ b/data/maps/objects/SafariZoneSecretHouse.asm @@ -2,8 +2,8 @@ SafariZoneSecretHouse_Object: db $17 ; border block def_warp_events - warp_event 2, 7, SAFARI_ZONE_WEST, 6 - warp_event 3, 7, SAFARI_ZONE_WEST, 6 + warp_event 2, 7, SAFARI_ZONE_WEST, 7 + warp_event 3, 7, SAFARI_ZONE_WEST, 7 def_bg_events diff --git a/data/maps/objects/SafariZoneWest.asm b/data/maps/objects/SafariZoneWest.asm index b75f824d..dca3d3a8 100644 --- a/data/maps/objects/SafariZoneWest.asm +++ b/data/maps/objects/SafariZoneWest.asm @@ -2,14 +2,14 @@ SafariZoneWest_Object: db $0 ; border block def_warp_events - warp_event 20, 0, SAFARI_ZONE_NORTH, 0 - warp_event 21, 0, SAFARI_ZONE_NORTH, 1 - warp_event 26, 0, SAFARI_ZONE_NORTH, 2 - warp_event 27, 0, SAFARI_ZONE_NORTH, 3 - warp_event 29, 22, SAFARI_ZONE_CENTER, 2 - warp_event 29, 23, SAFARI_ZONE_CENTER, 3 - warp_event 3, 3, SAFARI_ZONE_SECRET_HOUSE, 0 - warp_event 11, 11, SAFARI_ZONE_WEST_REST_HOUSE, 0 + warp_event 20, 0, SAFARI_ZONE_NORTH, 1 + warp_event 21, 0, SAFARI_ZONE_NORTH, 2 + warp_event 26, 0, SAFARI_ZONE_NORTH, 3 + warp_event 27, 0, SAFARI_ZONE_NORTH, 4 + warp_event 29, 22, SAFARI_ZONE_CENTER, 3 + warp_event 29, 23, SAFARI_ZONE_CENTER, 4 + warp_event 3, 3, SAFARI_ZONE_SECRET_HOUSE, 1 + warp_event 11, 11, SAFARI_ZONE_WEST_REST_HOUSE, 1 def_bg_events bg_event 12, 12, 5 ; SafariZoneWestText5 diff --git a/data/maps/objects/SafariZoneWestRestHouse.asm b/data/maps/objects/SafariZoneWestRestHouse.asm index f7349815..c63886b7 100644 --- a/data/maps/objects/SafariZoneWestRestHouse.asm +++ b/data/maps/objects/SafariZoneWestRestHouse.asm @@ -2,8 +2,8 @@ SafariZoneWestRestHouse_Object: db $a ; border block def_warp_events - warp_event 2, 7, SAFARI_ZONE_WEST, 7 - warp_event 3, 7, SAFARI_ZONE_WEST, 7 + warp_event 2, 7, SAFARI_ZONE_WEST, 8 + warp_event 3, 7, SAFARI_ZONE_WEST, 8 def_bg_events diff --git a/data/maps/objects/SaffronCity.asm b/data/maps/objects/SaffronCity.asm index 4c11417a..2fddfd5e 100644 --- a/data/maps/objects/SaffronCity.asm +++ b/data/maps/objects/SaffronCity.asm @@ -2,14 +2,14 @@ SaffronCity_Object: db $f ; border block def_warp_events - warp_event 7, 5, COPYCATS_HOUSE_1F, 0 - warp_event 26, 3, FIGHTING_DOJO, 0 - warp_event 34, 3, SAFFRON_GYM, 0 - warp_event 13, 11, SAFFRON_PIDGEY_HOUSE, 0 - warp_event 25, 11, SAFFRON_MART, 0 - warp_event 18, 21, SILPH_CO_1F, 0 - warp_event 9, 29, SAFFRON_POKECENTER, 0 - warp_event 29, 29, MR_PSYCHICS_HOUSE, 0 + warp_event 7, 5, COPYCATS_HOUSE_1F, 1 + warp_event 26, 3, FIGHTING_DOJO, 1 + warp_event 34, 3, SAFFRON_GYM, 1 + warp_event 13, 11, SAFFRON_PIDGEY_HOUSE, 1 + warp_event 25, 11, SAFFRON_MART, 1 + warp_event 18, 21, SILPH_CO_1F, 1 + warp_event 9, 29, SAFFRON_POKECENTER, 1 + warp_event 29, 29, MR_PSYCHICS_HOUSE, 1 def_bg_events bg_event 17, 5, 16 ; SaffronCityText16 diff --git a/data/maps/objects/SaffronGym.asm b/data/maps/objects/SaffronGym.asm index a8e3da1c..7c6e83e5 100644 --- a/data/maps/objects/SaffronGym.asm +++ b/data/maps/objects/SaffronGym.asm @@ -2,38 +2,38 @@ SaffronGym_Object: db $2e ; border block def_warp_events - warp_event 8, 17, LAST_MAP, 2 - warp_event 9, 17, LAST_MAP, 2 - warp_event 1, 3, SAFFRON_GYM, 22 - warp_event 5, 3, SAFFRON_GYM, 15 - warp_event 1, 5, SAFFRON_GYM, 18 - warp_event 5, 5, SAFFRON_GYM, 8 - warp_event 1, 9, SAFFRON_GYM, 27 - warp_event 5, 9, SAFFRON_GYM, 16 - warp_event 1, 11, SAFFRON_GYM, 5 - warp_event 5, 11, SAFFRON_GYM, 13 - warp_event 1, 15, SAFFRON_GYM, 23 - warp_event 5, 15, SAFFRON_GYM, 30 - warp_event 1, 17, SAFFRON_GYM, 17 - warp_event 5, 17, SAFFRON_GYM, 9 - warp_event 9, 3, SAFFRON_GYM, 26 - warp_event 11, 3, SAFFRON_GYM, 3 - warp_event 9, 5, SAFFRON_GYM, 7 - warp_event 11, 5, SAFFRON_GYM, 12 - warp_event 11, 11, SAFFRON_GYM, 4 - warp_event 11, 15, SAFFRON_GYM, 31 - warp_event 15, 3, SAFFRON_GYM, 24 - warp_event 19, 3, SAFFRON_GYM, 28 - warp_event 15, 5, SAFFRON_GYM, 2 - warp_event 19, 5, SAFFRON_GYM, 10 - warp_event 15, 9, SAFFRON_GYM, 20 - warp_event 19, 9, SAFFRON_GYM, 29 - warp_event 15, 11, SAFFRON_GYM, 14 - warp_event 19, 11, SAFFRON_GYM, 6 - warp_event 15, 15, SAFFRON_GYM, 21 - warp_event 19, 15, SAFFRON_GYM, 25 - warp_event 15, 17, SAFFRON_GYM, 11 - warp_event 19, 17, SAFFRON_GYM, 19 + warp_event 8, 17, LAST_MAP, 3 + warp_event 9, 17, LAST_MAP, 3 + warp_event 1, 3, SAFFRON_GYM, 23 + warp_event 5, 3, SAFFRON_GYM, 16 + warp_event 1, 5, SAFFRON_GYM, 19 + warp_event 5, 5, SAFFRON_GYM, 9 + warp_event 1, 9, SAFFRON_GYM, 28 + warp_event 5, 9, SAFFRON_GYM, 17 + warp_event 1, 11, SAFFRON_GYM, 6 + warp_event 5, 11, SAFFRON_GYM, 14 + warp_event 1, 15, SAFFRON_GYM, 24 + warp_event 5, 15, SAFFRON_GYM, 31 + warp_event 1, 17, SAFFRON_GYM, 18 + warp_event 5, 17, SAFFRON_GYM, 10 + warp_event 9, 3, SAFFRON_GYM, 27 + warp_event 11, 3, SAFFRON_GYM, 4 + warp_event 9, 5, SAFFRON_GYM, 8 + warp_event 11, 5, SAFFRON_GYM, 13 + warp_event 11, 11, SAFFRON_GYM, 5 + warp_event 11, 15, SAFFRON_GYM, 32 + warp_event 15, 3, SAFFRON_GYM, 25 + warp_event 19, 3, SAFFRON_GYM, 29 + warp_event 15, 5, SAFFRON_GYM, 3 + warp_event 19, 5, SAFFRON_GYM, 11 + warp_event 15, 9, SAFFRON_GYM, 21 + warp_event 19, 9, SAFFRON_GYM, 30 + warp_event 15, 11, SAFFRON_GYM, 15 + warp_event 19, 11, SAFFRON_GYM, 7 + warp_event 15, 15, SAFFRON_GYM, 22 + warp_event 19, 15, SAFFRON_GYM, 26 + warp_event 15, 17, SAFFRON_GYM, 12 + warp_event 19, 17, SAFFRON_GYM, 20 def_bg_events diff --git a/data/maps/objects/SaffronMart.asm b/data/maps/objects/SaffronMart.asm index 972032ac..d9dd6881 100644 --- a/data/maps/objects/SaffronMart.asm +++ b/data/maps/objects/SaffronMart.asm @@ -2,8 +2,8 @@ SaffronMart_Object: db $0 ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 4 - warp_event 4, 7, LAST_MAP, 4 + warp_event 3, 7, LAST_MAP, 5 + warp_event 4, 7, LAST_MAP, 5 def_bg_events diff --git a/data/maps/objects/SaffronPidgeyHouse.asm b/data/maps/objects/SaffronPidgeyHouse.asm index cd37ffc1..8a5249e5 100644 --- a/data/maps/objects/SaffronPidgeyHouse.asm +++ b/data/maps/objects/SaffronPidgeyHouse.asm @@ -2,8 +2,8 @@ SaffronPidgeyHouse_Object: db $a ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 3 - warp_event 3, 7, LAST_MAP, 3 + warp_event 2, 7, LAST_MAP, 4 + warp_event 3, 7, LAST_MAP, 4 def_bg_events diff --git a/data/maps/objects/SaffronPokecenter.asm b/data/maps/objects/SaffronPokecenter.asm index d3f6af7f..ca94086b 100644 --- a/data/maps/objects/SaffronPokecenter.asm +++ b/data/maps/objects/SaffronPokecenter.asm @@ -2,8 +2,8 @@ SaffronPokecenter_Object: db $0 ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 6 - warp_event 4, 7, LAST_MAP, 6 + warp_event 3, 7, LAST_MAP, 7 + warp_event 4, 7, LAST_MAP, 7 def_bg_events diff --git a/data/maps/objects/SeafoamIslands1F.asm b/data/maps/objects/SeafoamIslands1F.asm index f82c397f..f5e3347b 100644 --- a/data/maps/objects/SeafoamIslands1F.asm +++ b/data/maps/objects/SeafoamIslands1F.asm @@ -2,13 +2,13 @@ SeafoamIslands1F_Object: db $7d ; border block def_warp_events - warp_event 4, 17, LAST_MAP, 0 - warp_event 5, 17, LAST_MAP, 0 - warp_event 26, 17, LAST_MAP, 1 - warp_event 27, 17, LAST_MAP, 1 - warp_event 7, 5, SEAFOAM_ISLANDS_B1F, 1 - warp_event 25, 3, SEAFOAM_ISLANDS_B1F, 6 - warp_event 23, 15, SEAFOAM_ISLANDS_B1F, 4 + warp_event 4, 17, LAST_MAP, 1 + warp_event 5, 17, LAST_MAP, 1 + warp_event 26, 17, LAST_MAP, 2 + warp_event 27, 17, LAST_MAP, 2 + warp_event 7, 5, SEAFOAM_ISLANDS_B1F, 2 + warp_event 25, 3, SEAFOAM_ISLANDS_B1F, 7 + warp_event 23, 15, SEAFOAM_ISLANDS_B1F, 5 def_bg_events diff --git a/data/maps/objects/SeafoamIslandsB1F.asm b/data/maps/objects/SeafoamIslandsB1F.asm index 6e3ed1f7..165fc440 100644 --- a/data/maps/objects/SeafoamIslandsB1F.asm +++ b/data/maps/objects/SeafoamIslandsB1F.asm @@ -2,13 +2,13 @@ SeafoamIslandsB1F_Object: db $7d ; border block def_warp_events - warp_event 4, 2, SEAFOAM_ISLANDS_B2F, 0 - warp_event 7, 5, SEAFOAM_ISLANDS_1F, 4 - warp_event 13, 7, SEAFOAM_ISLANDS_B2F, 2 - warp_event 19, 15, SEAFOAM_ISLANDS_B2F, 3 - warp_event 23, 15, SEAFOAM_ISLANDS_1F, 6 - warp_event 25, 11, SEAFOAM_ISLANDS_B2F, 5 - warp_event 25, 3, SEAFOAM_ISLANDS_1F, 5 + warp_event 4, 2, SEAFOAM_ISLANDS_B2F, 1 + warp_event 7, 5, SEAFOAM_ISLANDS_1F, 5 + warp_event 13, 7, SEAFOAM_ISLANDS_B2F, 3 + warp_event 19, 15, SEAFOAM_ISLANDS_B2F, 4 + warp_event 23, 15, SEAFOAM_ISLANDS_1F, 7 + warp_event 25, 11, SEAFOAM_ISLANDS_B2F, 6 + warp_event 25, 3, SEAFOAM_ISLANDS_1F, 6 def_bg_events diff --git a/data/maps/objects/SeafoamIslandsB2F.asm b/data/maps/objects/SeafoamIslandsB2F.asm index e0894b20..1ab5b373 100644 --- a/data/maps/objects/SeafoamIslandsB2F.asm +++ b/data/maps/objects/SeafoamIslandsB2F.asm @@ -2,13 +2,13 @@ SeafoamIslandsB2F_Object: db $7d ; border block def_warp_events - warp_event 5, 3, SEAFOAM_ISLANDS_B1F, 0 - warp_event 5, 13, SEAFOAM_ISLANDS_B3F, 0 - warp_event 13, 7, SEAFOAM_ISLANDS_B1F, 2 - warp_event 19, 15, SEAFOAM_ISLANDS_B1F, 3 - warp_event 25, 3, SEAFOAM_ISLANDS_B3F, 3 - warp_event 25, 11, SEAFOAM_ISLANDS_B1F, 5 - warp_event 25, 14, SEAFOAM_ISLANDS_B3F, 4 + warp_event 5, 3, SEAFOAM_ISLANDS_B1F, 1 + warp_event 5, 13, SEAFOAM_ISLANDS_B3F, 1 + warp_event 13, 7, SEAFOAM_ISLANDS_B1F, 3 + warp_event 19, 15, SEAFOAM_ISLANDS_B1F, 4 + warp_event 25, 3, SEAFOAM_ISLANDS_B3F, 4 + warp_event 25, 11, SEAFOAM_ISLANDS_B1F, 6 + warp_event 25, 14, SEAFOAM_ISLANDS_B3F, 5 def_bg_events diff --git a/data/maps/objects/SeafoamIslandsB3F.asm b/data/maps/objects/SeafoamIslandsB3F.asm index 0ff64bd1..4657a80a 100644 --- a/data/maps/objects/SeafoamIslandsB3F.asm +++ b/data/maps/objects/SeafoamIslandsB3F.asm @@ -2,13 +2,13 @@ SeafoamIslandsB3F_Object: db $7d ; border block def_warp_events - warp_event 5, 12, SEAFOAM_ISLANDS_B2F, 1 - warp_event 8, 6, SEAFOAM_ISLANDS_B4F, 2 - warp_event 25, 4, SEAFOAM_ISLANDS_B4F, 3 - warp_event 25, 3, SEAFOAM_ISLANDS_B2F, 4 - warp_event 25, 14, SEAFOAM_ISLANDS_B2F, 6 - warp_event 20, 17, SEAFOAM_ISLANDS_B4F, 0 - warp_event 21, 17, SEAFOAM_ISLANDS_B4F, 1 + warp_event 5, 12, SEAFOAM_ISLANDS_B2F, 2 + warp_event 8, 6, SEAFOAM_ISLANDS_B4F, 3 + warp_event 25, 4, SEAFOAM_ISLANDS_B4F, 4 + warp_event 25, 3, SEAFOAM_ISLANDS_B2F, 5 + warp_event 25, 14, SEAFOAM_ISLANDS_B2F, 7 + warp_event 20, 17, SEAFOAM_ISLANDS_B4F, 1 + warp_event 21, 17, SEAFOAM_ISLANDS_B4F, 2 def_bg_events diff --git a/data/maps/objects/SeafoamIslandsB4F.asm b/data/maps/objects/SeafoamIslandsB4F.asm index 500f185d..c6e769e0 100644 --- a/data/maps/objects/SeafoamIslandsB4F.asm +++ b/data/maps/objects/SeafoamIslandsB4F.asm @@ -2,10 +2,10 @@ SeafoamIslandsB4F_Object: db $7d ; border block def_warp_events - warp_event 20, 17, SEAFOAM_ISLANDS_B3F, 5 - warp_event 21, 17, SEAFOAM_ISLANDS_B3F, 6 - warp_event 11, 7, SEAFOAM_ISLANDS_B3F, 1 - warp_event 25, 4, SEAFOAM_ISLANDS_B3F, 2 + warp_event 20, 17, SEAFOAM_ISLANDS_B3F, 6 + warp_event 21, 17, SEAFOAM_ISLANDS_B3F, 7 + warp_event 11, 7, SEAFOAM_ISLANDS_B3F, 2 + warp_event 25, 4, SEAFOAM_ISLANDS_B3F, 3 def_bg_events bg_event 9, 15, 4 ; SeafoamIslands5Text4 diff --git a/data/maps/objects/SilphCo10F.asm b/data/maps/objects/SilphCo10F.asm index 4747cbef..20249425 100644 --- a/data/maps/objects/SilphCo10F.asm +++ b/data/maps/objects/SilphCo10F.asm @@ -2,12 +2,12 @@ SilphCo10F_Object: db $2e ; border block def_warp_events - warp_event 8, 0, SILPH_CO_9F, 0 - warp_event 10, 0, SILPH_CO_11F, 0 - warp_event 12, 0, SILPH_CO_ELEVATOR, 0 - warp_event 9, 11, SILPH_CO_4F, 3 - warp_event 13, 15, SILPH_CO_4F, 5 - warp_event 13, 7, SILPH_CO_4F, 6 + warp_event 8, 0, SILPH_CO_9F, 1 + warp_event 10, 0, SILPH_CO_11F, 1 + warp_event 12, 0, SILPH_CO_ELEVATOR, 1 + warp_event 9, 11, SILPH_CO_4F, 4 + warp_event 13, 15, SILPH_CO_4F, 6 + warp_event 13, 7, SILPH_CO_4F, 7 def_bg_events diff --git a/data/maps/objects/SilphCo11F.asm b/data/maps/objects/SilphCo11F.asm index 83b726f5..9651c32b 100644 --- a/data/maps/objects/SilphCo11F.asm +++ b/data/maps/objects/SilphCo11F.asm @@ -2,10 +2,10 @@ SilphCo11F_Object: db $d ; border block def_warp_events - warp_event 9, 0, SILPH_CO_10F, 1 - warp_event 13, 0, SILPH_CO_ELEVATOR, 0 - warp_event 5, 5, LAST_MAP, 9 - warp_event 3, 2, SILPH_CO_7F, 3 + warp_event 9, 0, SILPH_CO_10F, 2 + warp_event 13, 0, SILPH_CO_ELEVATOR, 1 + warp_event 5, 5, LAST_MAP, 10 + warp_event 3, 2, SILPH_CO_7F, 4 def_bg_events diff --git a/data/maps/objects/SilphCo1F.asm b/data/maps/objects/SilphCo1F.asm index f3407c54..605edd9d 100644 --- a/data/maps/objects/SilphCo1F.asm +++ b/data/maps/objects/SilphCo1F.asm @@ -2,11 +2,11 @@ SilphCo1F_Object: db $2e ; border block def_warp_events - warp_event 10, 17, LAST_MAP, 5 - warp_event 11, 17, LAST_MAP, 5 - warp_event 26, 0, SILPH_CO_2F, 0 - warp_event 20, 0, SILPH_CO_ELEVATOR, 0 - warp_event 16, 10, SILPH_CO_3F, 6 + warp_event 10, 17, LAST_MAP, 6 + warp_event 11, 17, LAST_MAP, 6 + warp_event 26, 0, SILPH_CO_2F, 1 + warp_event 20, 0, SILPH_CO_ELEVATOR, 1 + warp_event 16, 10, SILPH_CO_3F, 7 def_bg_events diff --git a/data/maps/objects/SilphCo2F.asm b/data/maps/objects/SilphCo2F.asm index b777cf52..3ee8de9c 100644 --- a/data/maps/objects/SilphCo2F.asm +++ b/data/maps/objects/SilphCo2F.asm @@ -2,13 +2,13 @@ SilphCo2F_Object: db $2e ; border block def_warp_events - warp_event 24, 0, SILPH_CO_1F, 2 - warp_event 26, 0, SILPH_CO_3F, 0 - warp_event 20, 0, SILPH_CO_ELEVATOR, 0 - warp_event 3, 3, SILPH_CO_3F, 6 - warp_event 13, 3, SILPH_CO_8F, 4 - warp_event 27, 15, SILPH_CO_8F, 5 - warp_event 9, 15, SILPH_CO_6F, 4 + warp_event 24, 0, SILPH_CO_1F, 3 + warp_event 26, 0, SILPH_CO_3F, 1 + warp_event 20, 0, SILPH_CO_ELEVATOR, 1 + warp_event 3, 3, SILPH_CO_3F, 7 + warp_event 13, 3, SILPH_CO_8F, 5 + warp_event 27, 15, SILPH_CO_8F, 6 + warp_event 9, 15, SILPH_CO_6F, 5 def_bg_events diff --git a/data/maps/objects/SilphCo3F.asm b/data/maps/objects/SilphCo3F.asm index 06b4c3e9..6b050aad 100644 --- a/data/maps/objects/SilphCo3F.asm +++ b/data/maps/objects/SilphCo3F.asm @@ -2,16 +2,16 @@ SilphCo3F_Object: db $2e ; border block def_warp_events - warp_event 26, 0, SILPH_CO_2F, 1 - warp_event 24, 0, SILPH_CO_4F, 0 - warp_event 20, 0, SILPH_CO_ELEVATOR, 0 - warp_event 23, 11, SILPH_CO_3F, 9 - warp_event 3, 3, SILPH_CO_5F, 5 - warp_event 3, 15, SILPH_CO_5F, 6 - warp_event 27, 3, SILPH_CO_2F, 3 - warp_event 3, 11, SILPH_CO_9F, 3 - warp_event 11, 11, SILPH_CO_7F, 4 - warp_event 27, 15, SILPH_CO_3F, 3 + warp_event 26, 0, SILPH_CO_2F, 2 + warp_event 24, 0, SILPH_CO_4F, 1 + warp_event 20, 0, SILPH_CO_ELEVATOR, 1 + warp_event 23, 11, SILPH_CO_3F, 10 + warp_event 3, 3, SILPH_CO_5F, 6 + warp_event 3, 15, SILPH_CO_5F, 7 + warp_event 27, 3, SILPH_CO_2F, 4 + warp_event 3, 11, SILPH_CO_9F, 4 + warp_event 11, 11, SILPH_CO_7F, 5 + warp_event 27, 15, SILPH_CO_3F, 4 def_bg_events diff --git a/data/maps/objects/SilphCo4F.asm b/data/maps/objects/SilphCo4F.asm index 987451fc..7dbc12ca 100644 --- a/data/maps/objects/SilphCo4F.asm +++ b/data/maps/objects/SilphCo4F.asm @@ -2,13 +2,13 @@ SilphCo4F_Object: db $2e ; border block def_warp_events - warp_event 24, 0, SILPH_CO_3F, 1 - warp_event 26, 0, SILPH_CO_5F, 1 - warp_event 20, 0, SILPH_CO_ELEVATOR, 0 - warp_event 11, 7, SILPH_CO_10F, 3 - warp_event 17, 3, SILPH_CO_6F, 3 - warp_event 3, 15, SILPH_CO_10F, 4 - warp_event 17, 11, SILPH_CO_10F, 5 + warp_event 24, 0, SILPH_CO_3F, 2 + warp_event 26, 0, SILPH_CO_5F, 2 + warp_event 20, 0, SILPH_CO_ELEVATOR, 1 + warp_event 11, 7, SILPH_CO_10F, 4 + warp_event 17, 3, SILPH_CO_6F, 4 + warp_event 3, 15, SILPH_CO_10F, 5 + warp_event 17, 11, SILPH_CO_10F, 6 def_bg_events diff --git a/data/maps/objects/SilphCo5F.asm b/data/maps/objects/SilphCo5F.asm index ff41bc29..7910f473 100644 --- a/data/maps/objects/SilphCo5F.asm +++ b/data/maps/objects/SilphCo5F.asm @@ -2,13 +2,13 @@ SilphCo5F_Object: db $2e ; border block def_warp_events - warp_event 24, 0, SILPH_CO_6F, 1 - warp_event 26, 0, SILPH_CO_4F, 1 - warp_event 20, 0, SILPH_CO_ELEVATOR, 0 - warp_event 27, 3, SILPH_CO_7F, 5 - warp_event 9, 15, SILPH_CO_9F, 4 - warp_event 11, 5, SILPH_CO_3F, 4 - warp_event 3, 15, SILPH_CO_3F, 5 + warp_event 24, 0, SILPH_CO_6F, 2 + warp_event 26, 0, SILPH_CO_4F, 2 + warp_event 20, 0, SILPH_CO_ELEVATOR, 1 + warp_event 27, 3, SILPH_CO_7F, 6 + warp_event 9, 15, SILPH_CO_9F, 5 + warp_event 11, 5, SILPH_CO_3F, 5 + warp_event 3, 15, SILPH_CO_3F, 6 def_bg_events diff --git a/data/maps/objects/SilphCo6F.asm b/data/maps/objects/SilphCo6F.asm index e2914018..2495790d 100644 --- a/data/maps/objects/SilphCo6F.asm +++ b/data/maps/objects/SilphCo6F.asm @@ -2,11 +2,11 @@ SilphCo6F_Object: db $2e ; border block def_warp_events - warp_event 16, 0, SILPH_CO_7F, 1 - warp_event 14, 0, SILPH_CO_5F, 0 - warp_event 18, 0, SILPH_CO_ELEVATOR, 0 - warp_event 3, 3, SILPH_CO_4F, 4 - warp_event 23, 3, SILPH_CO_2F, 6 + warp_event 16, 0, SILPH_CO_7F, 2 + warp_event 14, 0, SILPH_CO_5F, 1 + warp_event 18, 0, SILPH_CO_ELEVATOR, 1 + warp_event 3, 3, SILPH_CO_4F, 5 + warp_event 23, 3, SILPH_CO_2F, 7 def_bg_events diff --git a/data/maps/objects/SilphCo7F.asm b/data/maps/objects/SilphCo7F.asm index d6dfeffe..b7854e3c 100644 --- a/data/maps/objects/SilphCo7F.asm +++ b/data/maps/objects/SilphCo7F.asm @@ -2,12 +2,12 @@ SilphCo7F_Object: db $2e ; border block def_warp_events - warp_event 16, 0, SILPH_CO_8F, 1 - warp_event 22, 0, SILPH_CO_6F, 0 - warp_event 18, 0, SILPH_CO_ELEVATOR, 0 - warp_event 5, 7, SILPH_CO_11F, 3 - warp_event 5, 3, SILPH_CO_3F, 8 - warp_event 21, 15, SILPH_CO_5F, 3 + warp_event 16, 0, SILPH_CO_8F, 2 + warp_event 22, 0, SILPH_CO_6F, 1 + warp_event 18, 0, SILPH_CO_ELEVATOR, 1 + warp_event 5, 7, SILPH_CO_11F, 4 + warp_event 5, 3, SILPH_CO_3F, 9 + warp_event 21, 15, SILPH_CO_5F, 4 def_bg_events diff --git a/data/maps/objects/SilphCo8F.asm b/data/maps/objects/SilphCo8F.asm index fcf6e28b..ded21400 100644 --- a/data/maps/objects/SilphCo8F.asm +++ b/data/maps/objects/SilphCo8F.asm @@ -2,13 +2,13 @@ SilphCo8F_Object: db $2e ; border block def_warp_events - warp_event 16, 0, SILPH_CO_9F, 1 - warp_event 14, 0, SILPH_CO_7F, 0 - warp_event 18, 0, SILPH_CO_ELEVATOR, 0 - warp_event 3, 11, SILPH_CO_8F, 6 - warp_event 3, 15, SILPH_CO_2F, 4 - warp_event 11, 5, SILPH_CO_2F, 5 - warp_event 11, 9, SILPH_CO_8F, 3 + warp_event 16, 0, SILPH_CO_9F, 2 + warp_event 14, 0, SILPH_CO_7F, 1 + warp_event 18, 0, SILPH_CO_ELEVATOR, 1 + warp_event 3, 11, SILPH_CO_8F, 7 + warp_event 3, 15, SILPH_CO_2F, 5 + warp_event 11, 5, SILPH_CO_2F, 6 + warp_event 11, 9, SILPH_CO_8F, 4 def_bg_events diff --git a/data/maps/objects/SilphCo9F.asm b/data/maps/objects/SilphCo9F.asm index 3897162e..261df23c 100644 --- a/data/maps/objects/SilphCo9F.asm +++ b/data/maps/objects/SilphCo9F.asm @@ -2,11 +2,11 @@ SilphCo9F_Object: db $2e ; border block def_warp_events - warp_event 14, 0, SILPH_CO_10F, 0 - warp_event 16, 0, SILPH_CO_8F, 0 - warp_event 18, 0, SILPH_CO_ELEVATOR, 0 - warp_event 9, 3, SILPH_CO_3F, 7 - warp_event 17, 15, SILPH_CO_5F, 4 + warp_event 14, 0, SILPH_CO_10F, 1 + warp_event 16, 0, SILPH_CO_8F, 1 + warp_event 18, 0, SILPH_CO_ELEVATOR, 1 + warp_event 9, 3, SILPH_CO_3F, 8 + warp_event 17, 15, SILPH_CO_5F, 5 def_bg_events diff --git a/data/maps/objects/SilphCoElevator.asm b/data/maps/objects/SilphCoElevator.asm index cb5b33bf..1451fccd 100644 --- a/data/maps/objects/SilphCoElevator.asm +++ b/data/maps/objects/SilphCoElevator.asm @@ -2,8 +2,8 @@ SilphCoElevator_Object: db $f ; border block def_warp_events - warp_event 1, 3, UNUSED_MAP_ED, 0 - warp_event 2, 3, UNUSED_MAP_ED, 0 + warp_event 1, 3, UNUSED_MAP_ED, 1 + warp_event 2, 3, UNUSED_MAP_ED, 1 def_bg_events bg_event 3, 0, 1 ; SilphCoElevatorText1 diff --git a/data/maps/objects/UndergroundPathNorthSouth.asm b/data/maps/objects/UndergroundPathNorthSouth.asm index fbc1b0f9..8b5dc5b7 100644 --- a/data/maps/objects/UndergroundPathNorthSouth.asm +++ b/data/maps/objects/UndergroundPathNorthSouth.asm @@ -2,8 +2,8 @@ UndergroundPathNorthSouth_Object: db $1 ; border block def_warp_events - warp_event 5, 4, UNDERGROUND_PATH_ROUTE_5, 2 - warp_event 2, 41, UNDERGROUND_PATH_ROUTE_6, 2 + warp_event 5, 4, UNDERGROUND_PATH_ROUTE_5, 3 + warp_event 2, 41, UNDERGROUND_PATH_ROUTE_6, 3 def_bg_events diff --git a/data/maps/objects/UndergroundPathRoute5.asm b/data/maps/objects/UndergroundPathRoute5.asm index 209054f7..7ffaeffc 100644 --- a/data/maps/objects/UndergroundPathRoute5.asm +++ b/data/maps/objects/UndergroundPathRoute5.asm @@ -2,9 +2,9 @@ UndergroundPathRoute5_Object: db $a ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 3 - warp_event 4, 7, LAST_MAP, 3 - warp_event 4, 4, UNDERGROUND_PATH_NORTH_SOUTH, 0 + warp_event 3, 7, LAST_MAP, 4 + warp_event 4, 7, LAST_MAP, 4 + warp_event 4, 4, UNDERGROUND_PATH_NORTH_SOUTH, 1 def_bg_events diff --git a/data/maps/objects/UndergroundPathRoute6.asm b/data/maps/objects/UndergroundPathRoute6.asm index 7961e08d..cee23de3 100644 --- a/data/maps/objects/UndergroundPathRoute6.asm +++ b/data/maps/objects/UndergroundPathRoute6.asm @@ -2,9 +2,9 @@ UndergroundPathRoute6_Object: db $a ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 3 - warp_event 4, 7, LAST_MAP, 3 - warp_event 4, 4, UNDERGROUND_PATH_NORTH_SOUTH, 1 + warp_event 3, 7, LAST_MAP, 4 + warp_event 4, 7, LAST_MAP, 4 + warp_event 4, 4, UNDERGROUND_PATH_NORTH_SOUTH, 2 def_bg_events diff --git a/data/maps/objects/UndergroundPathRoute7.asm b/data/maps/objects/UndergroundPathRoute7.asm index d377d507..47ae45f9 100644 --- a/data/maps/objects/UndergroundPathRoute7.asm +++ b/data/maps/objects/UndergroundPathRoute7.asm @@ -2,9 +2,9 @@ UndergroundPathRoute7_Object: db $a ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 4 - warp_event 4, 7, LAST_MAP, 4 - warp_event 4, 4, UNDERGROUND_PATH_WEST_EAST, 0 + warp_event 3, 7, LAST_MAP, 5 + warp_event 4, 7, LAST_MAP, 5 + warp_event 4, 4, UNDERGROUND_PATH_WEST_EAST, 1 def_bg_events diff --git a/data/maps/objects/UndergroundPathRoute7Copy.asm b/data/maps/objects/UndergroundPathRoute7Copy.asm index f0841cfa..b4e7e7fd 100644 --- a/data/maps/objects/UndergroundPathRoute7Copy.asm +++ b/data/maps/objects/UndergroundPathRoute7Copy.asm @@ -2,9 +2,9 @@ UndergroundPathRoute7Copy_Object: db $a ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 5 - warp_event 4, 7, LAST_MAP, 5 - warp_event 4, 4, UNDERGROUND_PATH_WEST_EAST, 0 + warp_event 3, 7, LAST_MAP, 6 + warp_event 4, 7, LAST_MAP, 6 + warp_event 4, 4, UNDERGROUND_PATH_WEST_EAST, 1 def_bg_events diff --git a/data/maps/objects/UndergroundPathRoute8.asm b/data/maps/objects/UndergroundPathRoute8.asm index 35094344..c36b1d42 100644 --- a/data/maps/objects/UndergroundPathRoute8.asm +++ b/data/maps/objects/UndergroundPathRoute8.asm @@ -2,9 +2,9 @@ UndergroundPathRoute8_Object: db $a ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 4 - warp_event 4, 7, LAST_MAP, 4 - warp_event 4, 4, UNDERGROUND_PATH_WEST_EAST, 1 + warp_event 3, 7, LAST_MAP, 5 + warp_event 4, 7, LAST_MAP, 5 + warp_event 4, 4, UNDERGROUND_PATH_WEST_EAST, 2 def_bg_events diff --git a/data/maps/objects/UndergroundPathWestEast.asm b/data/maps/objects/UndergroundPathWestEast.asm index b2e6fc01..fc2d9df9 100644 --- a/data/maps/objects/UndergroundPathWestEast.asm +++ b/data/maps/objects/UndergroundPathWestEast.asm @@ -2,8 +2,8 @@ UndergroundPathWestEast_Object: db $1 ; border block def_warp_events - warp_event 2, 5, UNDERGROUND_PATH_ROUTE_7, 2 - warp_event 47, 2, UNDERGROUND_PATH_ROUTE_8, 2 + warp_event 2, 5, UNDERGROUND_PATH_ROUTE_7, 3 + warp_event 47, 2, UNDERGROUND_PATH_ROUTE_8, 3 def_bg_events diff --git a/data/maps/objects/VermilionCity.asm b/data/maps/objects/VermilionCity.asm index 75b53b56..ca652afc 100644 --- a/data/maps/objects/VermilionCity.asm +++ b/data/maps/objects/VermilionCity.asm @@ -2,15 +2,15 @@ VermilionCity_Object: db $43 ; border block def_warp_events - warp_event 11, 3, VERMILION_POKECENTER, 0 - warp_event 9, 13, POKEMON_FAN_CLUB, 0 - warp_event 23, 13, VERMILION_MART, 0 - warp_event 12, 19, VERMILION_GYM, 0 - warp_event 23, 19, VERMILION_PIDGEY_HOUSE, 0 - warp_event 18, 31, VERMILION_DOCK, 0 - warp_event 19, 31, VERMILION_DOCK, 0 - warp_event 15, 13, VERMILION_TRADE_HOUSE, 0 - warp_event 7, 3, VERMILION_OLD_ROD_HOUSE, 0 + warp_event 11, 3, VERMILION_POKECENTER, 1 + warp_event 9, 13, POKEMON_FAN_CLUB, 1 + warp_event 23, 13, VERMILION_MART, 1 + warp_event 12, 19, VERMILION_GYM, 1 + warp_event 23, 19, VERMILION_PIDGEY_HOUSE, 1 + warp_event 18, 31, VERMILION_DOCK, 1 + warp_event 19, 31, VERMILION_DOCK, 1 + warp_event 15, 13, VERMILION_TRADE_HOUSE, 1 + warp_event 7, 3, VERMILION_OLD_ROD_HOUSE, 1 def_bg_events bg_event 27, 3, 7 ; VermilionCityText7 diff --git a/data/maps/objects/VermilionDock.asm b/data/maps/objects/VermilionDock.asm index 3d3ec64e..86036311 100644 --- a/data/maps/objects/VermilionDock.asm +++ b/data/maps/objects/VermilionDock.asm @@ -2,8 +2,8 @@ VermilionDock_Object: db $f ; border block def_warp_events - warp_event 14, 0, LAST_MAP, 5 - warp_event 14, 2, SS_ANNE_1F, 1 + warp_event 14, 0, LAST_MAP, 6 + warp_event 14, 2, SS_ANNE_1F, 2 def_bg_events diff --git a/data/maps/objects/VermilionGym.asm b/data/maps/objects/VermilionGym.asm index 27e773f7..a91c66ca 100644 --- a/data/maps/objects/VermilionGym.asm +++ b/data/maps/objects/VermilionGym.asm @@ -2,8 +2,8 @@ VermilionGym_Object: db $3 ; border block def_warp_events - warp_event 4, 17, LAST_MAP, 3 - warp_event 5, 17, LAST_MAP, 3 + warp_event 4, 17, LAST_MAP, 4 + warp_event 5, 17, LAST_MAP, 4 def_bg_events diff --git a/data/maps/objects/VermilionMart.asm b/data/maps/objects/VermilionMart.asm index 7d6075ce..19d65e3b 100644 --- a/data/maps/objects/VermilionMart.asm +++ b/data/maps/objects/VermilionMart.asm @@ -2,8 +2,8 @@ VermilionMart_Object: db $0 ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 2 - warp_event 4, 7, LAST_MAP, 2 + warp_event 3, 7, LAST_MAP, 3 + warp_event 4, 7, LAST_MAP, 3 def_bg_events diff --git a/data/maps/objects/VermilionOldRodHouse.asm b/data/maps/objects/VermilionOldRodHouse.asm index e960663e..a0767f20 100644 --- a/data/maps/objects/VermilionOldRodHouse.asm +++ b/data/maps/objects/VermilionOldRodHouse.asm @@ -2,8 +2,8 @@ VermilionOldRodHouse_Object: db $a ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 8 - warp_event 3, 7, LAST_MAP, 8 + warp_event 2, 7, LAST_MAP, 9 + warp_event 3, 7, LAST_MAP, 9 def_bg_events diff --git a/data/maps/objects/VermilionPidgeyHouse.asm b/data/maps/objects/VermilionPidgeyHouse.asm index 365e4afe..ce8d3f3e 100644 --- a/data/maps/objects/VermilionPidgeyHouse.asm +++ b/data/maps/objects/VermilionPidgeyHouse.asm @@ -2,8 +2,8 @@ VermilionPidgeyHouse_Object: db $a ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 4 - warp_event 3, 7, LAST_MAP, 4 + warp_event 2, 7, LAST_MAP, 5 + warp_event 3, 7, LAST_MAP, 5 def_bg_events diff --git a/data/maps/objects/VermilionPokecenter.asm b/data/maps/objects/VermilionPokecenter.asm index e0b5a72a..f88552b4 100644 --- a/data/maps/objects/VermilionPokecenter.asm +++ b/data/maps/objects/VermilionPokecenter.asm @@ -2,8 +2,8 @@ VermilionPokecenter_Object: db $0 ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 0 - warp_event 4, 7, LAST_MAP, 0 + warp_event 3, 7, LAST_MAP, 1 + warp_event 4, 7, LAST_MAP, 1 def_bg_events diff --git a/data/maps/objects/VermilionTradeHouse.asm b/data/maps/objects/VermilionTradeHouse.asm index 48d6d77f..299e5093 100644 --- a/data/maps/objects/VermilionTradeHouse.asm +++ b/data/maps/objects/VermilionTradeHouse.asm @@ -2,8 +2,8 @@ VermilionTradeHouse_Object: db $a ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 7 - warp_event 3, 7, LAST_MAP, 7 + warp_event 2, 7, LAST_MAP, 8 + warp_event 3, 7, LAST_MAP, 8 def_bg_events diff --git a/data/maps/objects/VictoryRoad1F.asm b/data/maps/objects/VictoryRoad1F.asm index 7a4f0c2a..d923948a 100644 --- a/data/maps/objects/VictoryRoad1F.asm +++ b/data/maps/objects/VictoryRoad1F.asm @@ -2,9 +2,9 @@ VictoryRoad1F_Object: db $7d ; border block def_warp_events - warp_event 8, 17, LAST_MAP, 2 - warp_event 9, 17, LAST_MAP, 2 - warp_event 1, 1, VICTORY_ROAD_2F, 0 + warp_event 8, 17, LAST_MAP, 3 + warp_event 9, 17, LAST_MAP, 3 + warp_event 1, 1, VICTORY_ROAD_2F, 1 def_bg_events diff --git a/data/maps/objects/VictoryRoad2F.asm b/data/maps/objects/VictoryRoad2F.asm index ce225067..36357e07 100644 --- a/data/maps/objects/VictoryRoad2F.asm +++ b/data/maps/objects/VictoryRoad2F.asm @@ -2,13 +2,13 @@ VictoryRoad2F_Object: db $7d ; border block def_warp_events - warp_event 0, 8, VICTORY_ROAD_1F, 2 - warp_event 29, 7, LAST_MAP, 3 - warp_event 29, 8, LAST_MAP, 3 - warp_event 23, 7, VICTORY_ROAD_3F, 0 - warp_event 25, 14, VICTORY_ROAD_3F, 2 - warp_event 27, 7, VICTORY_ROAD_3F, 1 - warp_event 1, 1, VICTORY_ROAD_3F, 3 + warp_event 0, 8, VICTORY_ROAD_1F, 3 + warp_event 29, 7, LAST_MAP, 4 + warp_event 29, 8, LAST_MAP, 4 + warp_event 23, 7, VICTORY_ROAD_3F, 1 + warp_event 25, 14, VICTORY_ROAD_3F, 3 + warp_event 27, 7, VICTORY_ROAD_3F, 2 + warp_event 1, 1, VICTORY_ROAD_3F, 4 def_bg_events diff --git a/data/maps/objects/VictoryRoad3F.asm b/data/maps/objects/VictoryRoad3F.asm index 30fde3a2..8ee97878 100644 --- a/data/maps/objects/VictoryRoad3F.asm +++ b/data/maps/objects/VictoryRoad3F.asm @@ -2,10 +2,10 @@ VictoryRoad3F_Object: db $7d ; border block def_warp_events - warp_event 23, 7, VICTORY_ROAD_2F, 3 - warp_event 26, 8, VICTORY_ROAD_2F, 5 - warp_event 27, 15, VICTORY_ROAD_2F, 4 - warp_event 2, 0, VICTORY_ROAD_2F, 6 + warp_event 23, 7, VICTORY_ROAD_2F, 4 + warp_event 26, 8, VICTORY_ROAD_2F, 6 + warp_event 27, 15, VICTORY_ROAD_2F, 5 + warp_event 2, 0, VICTORY_ROAD_2F, 7 def_bg_events diff --git a/data/maps/objects/ViridianCity.asm b/data/maps/objects/ViridianCity.asm index 46a68d19..56bf7390 100644 --- a/data/maps/objects/ViridianCity.asm +++ b/data/maps/objects/ViridianCity.asm @@ -2,11 +2,11 @@ ViridianCity_Object: db $f ; border block def_warp_events - warp_event 23, 25, VIRIDIAN_POKECENTER, 0 - warp_event 29, 19, VIRIDIAN_MART, 0 - warp_event 21, 15, VIRIDIAN_SCHOOL_HOUSE, 0 - warp_event 21, 9, VIRIDIAN_NICKNAME_HOUSE, 0 - warp_event 32, 7, VIRIDIAN_GYM, 0 + warp_event 23, 25, VIRIDIAN_POKECENTER, 1 + warp_event 29, 19, VIRIDIAN_MART, 1 + warp_event 21, 15, VIRIDIAN_SCHOOL_HOUSE, 1 + warp_event 21, 9, VIRIDIAN_NICKNAME_HOUSE, 1 + warp_event 32, 7, VIRIDIAN_GYM, 1 def_bg_events bg_event 17, 17, 8 ; ViridianCityText8 diff --git a/data/maps/objects/ViridianForest.asm b/data/maps/objects/ViridianForest.asm index 5f4cb2a6..7a0a644c 100644 --- a/data/maps/objects/ViridianForest.asm +++ b/data/maps/objects/ViridianForest.asm @@ -2,12 +2,12 @@ ViridianForest_Object: db $3 ; border block def_warp_events - warp_event 1, 0, VIRIDIAN_FOREST_NORTH_GATE, 2 - warp_event 2, 0, VIRIDIAN_FOREST_NORTH_GATE, 3 - warp_event 15, 47, VIRIDIAN_FOREST_SOUTH_GATE, 1 - warp_event 16, 47, VIRIDIAN_FOREST_SOUTH_GATE, 1 - warp_event 17, 47, VIRIDIAN_FOREST_SOUTH_GATE, 1 - warp_event 18, 47, VIRIDIAN_FOREST_SOUTH_GATE, 1 + warp_event 1, 0, VIRIDIAN_FOREST_NORTH_GATE, 3 + warp_event 2, 0, VIRIDIAN_FOREST_NORTH_GATE, 4 + warp_event 15, 47, VIRIDIAN_FOREST_SOUTH_GATE, 2 + warp_event 16, 47, VIRIDIAN_FOREST_SOUTH_GATE, 2 + warp_event 17, 47, VIRIDIAN_FOREST_SOUTH_GATE, 2 + warp_event 18, 47, VIRIDIAN_FOREST_SOUTH_GATE, 2 def_bg_events bg_event 24, 40, 9 ; ViridianForestText9 diff --git a/data/maps/objects/ViridianForestNorthGate.asm b/data/maps/objects/ViridianForestNorthGate.asm index 020f2f62..fcb0fc2b 100644 --- a/data/maps/objects/ViridianForestNorthGate.asm +++ b/data/maps/objects/ViridianForestNorthGate.asm @@ -2,10 +2,10 @@ ViridianForestNorthGate_Object: db $a ; border block def_warp_events - warp_event 4, 0, LAST_MAP, 1 - warp_event 5, 0, LAST_MAP, 1 - warp_event 4, 7, VIRIDIAN_FOREST, 0 - warp_event 5, 7, VIRIDIAN_FOREST, 0 + warp_event 4, 0, LAST_MAP, 2 + warp_event 5, 0, LAST_MAP, 2 + warp_event 4, 7, VIRIDIAN_FOREST, 1 + warp_event 5, 7, VIRIDIAN_FOREST, 1 def_bg_events diff --git a/data/maps/objects/ViridianForestSouthGate.asm b/data/maps/objects/ViridianForestSouthGate.asm index 13517e0c..e5dad809 100644 --- a/data/maps/objects/ViridianForestSouthGate.asm +++ b/data/maps/objects/ViridianForestSouthGate.asm @@ -2,10 +2,10 @@ ViridianForestSouthGate_Object: db $a ; border block def_warp_events - warp_event 4, 0, VIRIDIAN_FOREST, 3 - warp_event 5, 0, VIRIDIAN_FOREST, 4 - warp_event 4, 7, LAST_MAP, 5 - warp_event 5, 7, LAST_MAP, 5 + warp_event 4, 0, VIRIDIAN_FOREST, 4 + warp_event 5, 0, VIRIDIAN_FOREST, 5 + warp_event 4, 7, LAST_MAP, 6 + warp_event 5, 7, LAST_MAP, 6 def_bg_events diff --git a/data/maps/objects/ViridianGym.asm b/data/maps/objects/ViridianGym.asm index 4b9a159e..735cecf4 100644 --- a/data/maps/objects/ViridianGym.asm +++ b/data/maps/objects/ViridianGym.asm @@ -2,8 +2,8 @@ ViridianGym_Object: db $3 ; border block def_warp_events - warp_event 16, 17, LAST_MAP, 4 - warp_event 17, 17, LAST_MAP, 4 + warp_event 16, 17, LAST_MAP, 5 + warp_event 17, 17, LAST_MAP, 5 def_bg_events diff --git a/data/maps/objects/ViridianMart.asm b/data/maps/objects/ViridianMart.asm index 8bb5d240..291dd00f 100644 --- a/data/maps/objects/ViridianMart.asm +++ b/data/maps/objects/ViridianMart.asm @@ -2,8 +2,8 @@ ViridianMart_Object: db $0 ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 1 - warp_event 4, 7, LAST_MAP, 1 + warp_event 3, 7, LAST_MAP, 2 + warp_event 4, 7, LAST_MAP, 2 def_bg_events diff --git a/data/maps/objects/ViridianNicknameHouse.asm b/data/maps/objects/ViridianNicknameHouse.asm index 9ace1faf..2f3befb2 100644 --- a/data/maps/objects/ViridianNicknameHouse.asm +++ b/data/maps/objects/ViridianNicknameHouse.asm @@ -2,8 +2,8 @@ ViridianNicknameHouse_Object: db $a ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 3 - warp_event 3, 7, LAST_MAP, 3 + warp_event 2, 7, LAST_MAP, 4 + warp_event 3, 7, LAST_MAP, 4 def_bg_events diff --git a/data/maps/objects/ViridianPokecenter.asm b/data/maps/objects/ViridianPokecenter.asm index ef3424f2..618f5798 100644 --- a/data/maps/objects/ViridianPokecenter.asm +++ b/data/maps/objects/ViridianPokecenter.asm @@ -2,8 +2,8 @@ ViridianPokecenter_Object: db $0 ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 0 - warp_event 4, 7, LAST_MAP, 0 + warp_event 3, 7, LAST_MAP, 1 + warp_event 4, 7, LAST_MAP, 1 def_bg_events diff --git a/data/maps/objects/ViridianSchoolHouse.asm b/data/maps/objects/ViridianSchoolHouse.asm index 53909d7a..745bf72b 100644 --- a/data/maps/objects/ViridianSchoolHouse.asm +++ b/data/maps/objects/ViridianSchoolHouse.asm @@ -2,8 +2,8 @@ ViridianSchoolHouse_Object: db $a ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 2 - warp_event 3, 7, LAST_MAP, 2 + warp_event 2, 7, LAST_MAP, 3 + warp_event 3, 7, LAST_MAP, 3 def_bg_events diff --git a/data/maps/objects/WardensHouse.asm b/data/maps/objects/WardensHouse.asm index 46e1f35b..63e461c4 100644 --- a/data/maps/objects/WardensHouse.asm +++ b/data/maps/objects/WardensHouse.asm @@ -2,8 +2,8 @@ WardensHouse_Object: db $17 ; border block def_warp_events - warp_event 4, 7, LAST_MAP, 3 - warp_event 5, 7, LAST_MAP, 3 + warp_event 4, 7, LAST_MAP, 4 + warp_event 5, 7, LAST_MAP, 4 def_bg_events bg_event 4, 3, 4 ; FuchsiaHouse2Text4 diff --git a/macros/scripts/maps.asm b/macros/scripts/maps.asm index 6c895f9a..12bc3c77 100644 --- a/macros/scripts/maps.asm +++ b/macros/scripts/maps.asm @@ -41,9 +41,9 @@ ENDM ;\1 x position ;\2 y position ;\3 destination map (-1 = wLastMap) -;\4 destination warp id +;\4 destination warp id; starts at 1 (internally at 0) warp_event: MACRO - db \2, \1, \4, \3 + db \2, \1, \4 - 1, \3 _WARP_{d:{_NUM_WARP_EVENTS}}_X = \1 _WARP_{d:{_NUM_WARP_EVENTS}}_Y = \2 {_NUM_WARP_EVENTS} = {_NUM_WARP_EVENTS} + 1 |