ref: fc899e1906a9a245e94dafa7c0da2ef1697b7335
parent: 52660012c62fa83d37817c05f5c3cae637c473dd
author: Rangi <remy.oukaour+rangi42@gmail.com>
date: Tue Oct 5 17:02:42 EDT 2021
`warp_event` warp IDs start at 1, like in pokegold/pokecrystal
--- a/data/maps/objects/AgathasRoom.asm
+++ b/data/maps/objects/AgathasRoom.asm
@@ -2,10 +2,10 @@
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
--- a/data/maps/objects/BikeShop.asm
+++ b/data/maps/objects/BikeShop.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/BillsHouse.asm
+++ b/data/maps/objects/BillsHouse.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/BluesHouse.asm
+++ b/data/maps/objects/BluesHouse.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/BrunosRoom.asm
+++ b/data/maps/objects/BrunosRoom.asm
@@ -2,10 +2,10 @@
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
--- a/data/maps/objects/CeladonChiefHouse.asm
+++ b/data/maps/objects/CeladonChiefHouse.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/CeladonCity.asm
+++ b/data/maps/objects/CeladonCity.asm
@@ -2,19 +2,19 @@
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
--- a/data/maps/objects/CeladonDiner.asm
+++ b/data/maps/objects/CeladonDiner.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/CeladonGym.asm
+++ b/data/maps/objects/CeladonGym.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/CeladonHotel.asm
+++ b/data/maps/objects/CeladonHotel.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/CeladonMansion1F.asm
+++ b/data/maps/objects/CeladonMansion1F.asm
@@ -2,11 +2,11 @@
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
--- a/data/maps/objects/CeladonMansion2F.asm
+++ b/data/maps/objects/CeladonMansion2F.asm
@@ -2,10 +2,10 @@
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
--- a/data/maps/objects/CeladonMansion3F.asm
+++ b/data/maps/objects/CeladonMansion3F.asm
@@ -2,10 +2,10 @@
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
--- a/data/maps/objects/CeladonMansionRoof.asm
+++ b/data/maps/objects/CeladonMansionRoof.asm
@@ -2,9 +2,9 @@
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
--- a/data/maps/objects/CeladonMansionRoofHouse.asm
+++ b/data/maps/objects/CeladonMansionRoofHouse.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/CeladonMart1F.asm
+++ b/data/maps/objects/CeladonMart1F.asm
@@ -2,12 +2,12 @@
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
--- a/data/maps/objects/CeladonMart2F.asm
+++ b/data/maps/objects/CeladonMart2F.asm
@@ -2,9 +2,9 @@
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
--- a/data/maps/objects/CeladonMart3F.asm
+++ b/data/maps/objects/CeladonMart3F.asm
@@ -2,9 +2,9 @@
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
--- a/data/maps/objects/CeladonMart4F.asm
+++ b/data/maps/objects/CeladonMart4F.asm
@@ -2,9 +2,9 @@
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
--- a/data/maps/objects/CeladonMart5F.asm
+++ b/data/maps/objects/CeladonMart5F.asm
@@ -2,9 +2,9 @@
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
--- a/data/maps/objects/CeladonMartElevator.asm
+++ b/data/maps/objects/CeladonMartElevator.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/CeladonMartRoof.asm
+++ b/data/maps/objects/CeladonMartRoof.asm
@@ -2,7 +2,7 @@
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
--- a/data/maps/objects/CeladonPokecenter.asm
+++ b/data/maps/objects/CeladonPokecenter.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/CeruleanBadgeHouse.asm
+++ b/data/maps/objects/CeruleanBadgeHouse.asm
@@ -2,9 +2,9 @@
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
--- a/data/maps/objects/CeruleanCave1F.asm
+++ b/data/maps/objects/CeruleanCave1F.asm
@@ -2,15 +2,15 @@
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
--- a/data/maps/objects/CeruleanCave2F.asm
+++ b/data/maps/objects/CeruleanCave2F.asm
@@ -2,12 +2,12 @@
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
--- a/data/maps/objects/CeruleanCaveB1F.asm
+++ b/data/maps/objects/CeruleanCaveB1F.asm
@@ -2,7 +2,7 @@
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
--- a/data/maps/objects/CeruleanCity.asm
+++ b/data/maps/objects/CeruleanCity.asm
@@ -2,16 +2,16 @@
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
--- a/data/maps/objects/CeruleanGym.asm
+++ b/data/maps/objects/CeruleanGym.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/CeruleanMart.asm
+++ b/data/maps/objects/CeruleanMart.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/CeruleanPokecenter.asm
+++ b/data/maps/objects/CeruleanPokecenter.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/CeruleanTradeHouse.asm
+++ b/data/maps/objects/CeruleanTradeHouse.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/CeruleanTrashedHouse.asm
+++ b/data/maps/objects/CeruleanTrashedHouse.asm
@@ -2,9 +2,9 @@
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
--- a/data/maps/objects/ChampionsRoom.asm
+++ b/data/maps/objects/ChampionsRoom.asm
@@ -2,10 +2,10 @@
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
--- a/data/maps/objects/CinnabarGym.asm
+++ b/data/maps/objects/CinnabarGym.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/CinnabarIsland.asm
+++ b/data/maps/objects/CinnabarIsland.asm
@@ -2,11 +2,11 @@
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
--- a/data/maps/objects/CinnabarLab.asm
+++ b/data/maps/objects/CinnabarLab.asm
@@ -2,11 +2,11 @@
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
--- a/data/maps/objects/CinnabarLabFossilRoom.asm
+++ b/data/maps/objects/CinnabarLabFossilRoom.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/CinnabarLabMetronomeRoom.asm
+++ b/data/maps/objects/CinnabarLabMetronomeRoom.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/CinnabarLabTradeRoom.asm
+++ b/data/maps/objects/CinnabarLabTradeRoom.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/CinnabarMart.asm
+++ b/data/maps/objects/CinnabarMart.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/CinnabarPokecenter.asm
+++ b/data/maps/objects/CinnabarPokecenter.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/CopycatsHouse1F.asm
+++ b/data/maps/objects/CopycatsHouse1F.asm
@@ -2,9 +2,9 @@
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
--- a/data/maps/objects/CopycatsHouse2F.asm
+++ b/data/maps/objects/CopycatsHouse2F.asm
@@ -2,7 +2,7 @@
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
--- a/data/maps/objects/Daycare.asm
+++ b/data/maps/objects/Daycare.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/DiglettsCave.asm
+++ b/data/maps/objects/DiglettsCave.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/DiglettsCaveRoute11.asm
+++ b/data/maps/objects/DiglettsCaveRoute11.asm
@@ -2,9 +2,9 @@
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
--- a/data/maps/objects/DiglettsCaveRoute2.asm
+++ b/data/maps/objects/DiglettsCaveRoute2.asm
@@ -2,9 +2,9 @@
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
--- a/data/maps/objects/FightingDojo.asm
+++ b/data/maps/objects/FightingDojo.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/FuchsiaBillsGrandpasHouse.asm
+++ b/data/maps/objects/FuchsiaBillsGrandpasHouse.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/FuchsiaCity.asm
+++ b/data/maps/objects/FuchsiaCity.asm
@@ -2,15 +2,15 @@
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
--- a/data/maps/objects/FuchsiaGoodRodHouse.asm
+++ b/data/maps/objects/FuchsiaGoodRodHouse.asm
@@ -2,9 +2,9 @@
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
--- a/data/maps/objects/FuchsiaGym.asm
+++ b/data/maps/objects/FuchsiaGym.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/FuchsiaMart.asm
+++ b/data/maps/objects/FuchsiaMart.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/FuchsiaMeetingRoom.asm
+++ b/data/maps/objects/FuchsiaMeetingRoom.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/FuchsiaPokecenter.asm
+++ b/data/maps/objects/FuchsiaPokecenter.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/GameCorner.asm
+++ b/data/maps/objects/GameCorner.asm
@@ -2,9 +2,9 @@
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
--- a/data/maps/objects/GameCornerPrizeRoom.asm
+++ b/data/maps/objects/GameCornerPrizeRoom.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/HallOfFame.asm
+++ b/data/maps/objects/HallOfFame.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/IndigoPlateau.asm
+++ b/data/maps/objects/IndigoPlateau.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/IndigoPlateauLobby.asm
+++ b/data/maps/objects/IndigoPlateauLobby.asm
@@ -2,9 +2,9 @@
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
--- a/data/maps/objects/LancesRoom.asm
+++ b/data/maps/objects/LancesRoom.asm
@@ -2,9 +2,9 @@
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
--- a/data/maps/objects/LavenderCuboneHouse.asm
+++ b/data/maps/objects/LavenderCuboneHouse.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/LavenderMart.asm
+++ b/data/maps/objects/LavenderMart.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/LavenderPokecenter.asm
+++ b/data/maps/objects/LavenderPokecenter.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/LavenderTown.asm
+++ b/data/maps/objects/LavenderTown.asm
@@ -2,12 +2,12 @@
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
--- a/data/maps/objects/LoreleisRoom.asm
+++ b/data/maps/objects/LoreleisRoom.asm
@@ -2,10 +2,10 @@
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
--- a/data/maps/objects/MrFujisHouse.asm
+++ b/data/maps/objects/MrFujisHouse.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/MrPsychicsHouse.asm
+++ b/data/maps/objects/MrPsychicsHouse.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/MtMoon1F.asm
+++ b/data/maps/objects/MtMoon1F.asm
@@ -2,11 +2,11 @@
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
--- a/data/maps/objects/MtMoonB1F.asm
+++ b/data/maps/objects/MtMoonB1F.asm
@@ -2,14 +2,14 @@
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
--- a/data/maps/objects/MtMoonB2F.asm
+++ b/data/maps/objects/MtMoonB2F.asm
@@ -2,10 +2,10 @@
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
--- a/data/maps/objects/MtMoonPokecenter.asm
+++ b/data/maps/objects/MtMoonPokecenter.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/Museum1F.asm
+++ b/data/maps/objects/Museum1F.asm
@@ -2,11 +2,11 @@
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
--- a/data/maps/objects/Museum2F.asm
+++ b/data/maps/objects/Museum2F.asm
@@ -2,7 +2,7 @@
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
--- a/data/maps/objects/NameRatersHouse.asm
+++ b/data/maps/objects/NameRatersHouse.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/OaksLab.asm
+++ b/data/maps/objects/OaksLab.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/PalletTown.asm
+++ b/data/maps/objects/PalletTown.asm
@@ -2,9 +2,9 @@
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
--- a/data/maps/objects/PewterCity.asm
+++ b/data/maps/objects/PewterCity.asm
@@ -2,13 +2,13 @@
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
--- a/data/maps/objects/PewterGym.asm
+++ b/data/maps/objects/PewterGym.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/PewterMart.asm
+++ b/data/maps/objects/PewterMart.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/PewterNidoranHouse.asm
+++ b/data/maps/objects/PewterNidoranHouse.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/PewterPokecenter.asm
+++ b/data/maps/objects/PewterPokecenter.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/PewterSpeechHouse.asm
+++ b/data/maps/objects/PewterSpeechHouse.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/PokemonFanClub.asm
+++ b/data/maps/objects/PokemonFanClub.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/PokemonMansion1F.asm
+++ b/data/maps/objects/PokemonMansion1F.asm
@@ -2,14 +2,14 @@
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
--- a/data/maps/objects/PokemonMansion2F.asm
+++ b/data/maps/objects/PokemonMansion2F.asm
@@ -2,10 +2,10 @@
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
--- a/data/maps/objects/PokemonMansion3F.asm
+++ b/data/maps/objects/PokemonMansion3F.asm
@@ -2,9 +2,9 @@
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
--- a/data/maps/objects/PokemonMansionB1F.asm
+++ b/data/maps/objects/PokemonMansionB1F.asm
@@ -2,7 +2,7 @@
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
--- a/data/maps/objects/PokemonTower1F.asm
+++ b/data/maps/objects/PokemonTower1F.asm
@@ -2,9 +2,9 @@
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
--- a/data/maps/objects/PokemonTower2F.asm
+++ b/data/maps/objects/PokemonTower2F.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/PokemonTower3F.asm
+++ b/data/maps/objects/PokemonTower3F.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/PokemonTower4F.asm
+++ b/data/maps/objects/PokemonTower4F.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/PokemonTower5F.asm
+++ b/data/maps/objects/PokemonTower5F.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/PokemonTower6F.asm
+++ b/data/maps/objects/PokemonTower6F.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/PokemonTower7F.asm
+++ b/data/maps/objects/PokemonTower7F.asm
@@ -2,7 +2,7 @@
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
--- a/data/maps/objects/PowerPlant.asm
+++ b/data/maps/objects/PowerPlant.asm
@@ -2,9 +2,9 @@
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
--- a/data/maps/objects/RedsHouse1F.asm
+++ b/data/maps/objects/RedsHouse1F.asm
@@ -2,9 +2,9 @@
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
--- a/data/maps/objects/RedsHouse2F.asm
+++ b/data/maps/objects/RedsHouse2F.asm
@@ -2,7 +2,7 @@
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
--- a/data/maps/objects/RockTunnel1F.asm
+++ b/data/maps/objects/RockTunnel1F.asm
@@ -2,14 +2,14 @@
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
--- a/data/maps/objects/RockTunnelB1F.asm
+++ b/data/maps/objects/RockTunnelB1F.asm
@@ -2,10 +2,10 @@
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
--- a/data/maps/objects/RockTunnelPokecenter.asm
+++ b/data/maps/objects/RockTunnelPokecenter.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/RocketHideoutB1F.asm
+++ b/data/maps/objects/RocketHideoutB1F.asm
@@ -2,11 +2,11 @@
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
--- a/data/maps/objects/RocketHideoutB2F.asm
+++ b/data/maps/objects/RocketHideoutB2F.asm
@@ -2,11 +2,11 @@
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
--- a/data/maps/objects/RocketHideoutB3F.asm
+++ b/data/maps/objects/RocketHideoutB3F.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/RocketHideoutB4F.asm
+++ b/data/maps/objects/RocketHideoutB4F.asm
@@ -2,9 +2,9 @@
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
--- a/data/maps/objects/RocketHideoutElevator.asm
+++ b/data/maps/objects/RocketHideoutElevator.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/Route10.asm
+++ b/data/maps/objects/Route10.asm
@@ -2,10 +2,10 @@
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
--- a/data/maps/objects/Route11.asm
+++ b/data/maps/objects/Route11.asm
@@ -2,11 +2,11 @@
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
--- a/data/maps/objects/Route11Gate1F.asm
+++ b/data/maps/objects/Route11Gate1F.asm
@@ -2,11 +2,11 @@
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
--- a/data/maps/objects/Route11Gate2F.asm
+++ b/data/maps/objects/Route11Gate2F.asm
@@ -2,7 +2,7 @@
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
--- a/data/maps/objects/Route12.asm
+++ b/data/maps/objects/Route12.asm
@@ -2,10 +2,10 @@
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
--- a/data/maps/objects/Route12Gate1F.asm
+++ b/data/maps/objects/Route12Gate1F.asm
@@ -2,11 +2,11 @@
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
--- a/data/maps/objects/Route12Gate2F.asm
+++ b/data/maps/objects/Route12Gate2F.asm
@@ -2,7 +2,7 @@
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
--- a/data/maps/objects/Route12SuperRodHouse.asm
+++ b/data/maps/objects/Route12SuperRodHouse.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/Route15.asm
+++ b/data/maps/objects/Route15.asm
@@ -2,10 +2,10 @@
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
--- a/data/maps/objects/Route15Gate1F.asm
+++ b/data/maps/objects/Route15Gate1F.asm
@@ -2,11 +2,11 @@
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
--- a/data/maps/objects/Route15Gate2F.asm
+++ b/data/maps/objects/Route15Gate2F.asm
@@ -2,7 +2,7 @@
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
--- a/data/maps/objects/Route16.asm
+++ b/data/maps/objects/Route16.asm
@@ -2,15 +2,15 @@
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
--- a/data/maps/objects/Route16FlyHouse.asm
+++ b/data/maps/objects/Route16FlyHouse.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/Route16Gate1F.asm
+++ b/data/maps/objects/Route16Gate1F.asm
@@ -2,15 +2,15 @@
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
--- a/data/maps/objects/Route16Gate2F.asm
+++ b/data/maps/objects/Route16Gate2F.asm
@@ -2,7 +2,7 @@
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
--- a/data/maps/objects/Route18.asm
+++ b/data/maps/objects/Route18.asm
@@ -2,10 +2,10 @@
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
--- a/data/maps/objects/Route18Gate1F.asm
+++ b/data/maps/objects/Route18Gate1F.asm
@@ -2,11 +2,11 @@
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
--- a/data/maps/objects/Route18Gate2F.asm
+++ b/data/maps/objects/Route18Gate2F.asm
@@ -2,7 +2,7 @@
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
--- a/data/maps/objects/Route2.asm
+++ b/data/maps/objects/Route2.asm
@@ -2,12 +2,12 @@
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
--- a/data/maps/objects/Route20.asm
+++ b/data/maps/objects/Route20.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/Route22.asm
+++ b/data/maps/objects/Route22.asm
@@ -2,7 +2,7 @@
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
--- a/data/maps/objects/Route22Gate.asm
+++ b/data/maps/objects/Route22Gate.asm
@@ -2,10 +2,10 @@
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
--- a/data/maps/objects/Route23.asm
+++ b/data/maps/objects/Route23.asm
@@ -2,10 +2,10 @@
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
--- a/data/maps/objects/Route25.asm
+++ b/data/maps/objects/Route25.asm
@@ -2,7 +2,7 @@
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
--- a/data/maps/objects/Route2Gate.asm
+++ b/data/maps/objects/Route2Gate.asm
@@ -2,10 +2,10 @@
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
--- a/data/maps/objects/Route2TradeHouse.asm
+++ b/data/maps/objects/Route2TradeHouse.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/Route4.asm
+++ b/data/maps/objects/Route4.asm
@@ -2,9 +2,9 @@
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
--- a/data/maps/objects/Route5.asm
+++ b/data/maps/objects/Route5.asm
@@ -2,11 +2,11 @@
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
--- a/data/maps/objects/Route5Gate.asm
+++ b/data/maps/objects/Route5Gate.asm
@@ -2,10 +2,10 @@
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
--- a/data/maps/objects/Route6.asm
+++ b/data/maps/objects/Route6.asm
@@ -2,10 +2,10 @@
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
--- a/data/maps/objects/Route6Gate.asm
+++ b/data/maps/objects/Route6Gate.asm
@@ -2,10 +2,10 @@
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
--- a/data/maps/objects/Route7.asm
+++ b/data/maps/objects/Route7.asm
@@ -2,11 +2,11 @@
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
--- a/data/maps/objects/Route7Gate.asm
+++ b/data/maps/objects/Route7Gate.asm
@@ -2,10 +2,10 @@
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
--- a/data/maps/objects/Route8.asm
+++ b/data/maps/objects/Route8.asm
@@ -2,11 +2,11 @@
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
--- a/data/maps/objects/Route8Gate.asm
+++ b/data/maps/objects/Route8Gate.asm
@@ -2,10 +2,10 @@
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
--- a/data/maps/objects/SSAnne1F.asm
+++ b/data/maps/objects/SSAnne1F.asm
@@ -2,17 +2,17 @@
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
--- a/data/maps/objects/SSAnne1FRooms.asm
+++ b/data/maps/objects/SSAnne1FRooms.asm
@@ -2,12 +2,12 @@
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
--- a/data/maps/objects/SSAnne2F.asm
+++ b/data/maps/objects/SSAnne2F.asm
@@ -2,15 +2,15 @@
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
--- a/data/maps/objects/SSAnne2FRooms.asm
+++ b/data/maps/objects/SSAnne2FRooms.asm
@@ -2,18 +2,18 @@
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
--- a/data/maps/objects/SSAnne3F.asm
+++ b/data/maps/objects/SSAnne3F.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/SSAnneB1F.asm
+++ b/data/maps/objects/SSAnneB1F.asm
@@ -2,12 +2,12 @@
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
--- a/data/maps/objects/SSAnneB1FRooms.asm
+++ b/data/maps/objects/SSAnneB1FRooms.asm
@@ -2,16 +2,16 @@
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
--- a/data/maps/objects/SSAnneBow.asm
+++ b/data/maps/objects/SSAnneBow.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/SSAnneCaptainsRoom.asm
+++ b/data/maps/objects/SSAnneCaptainsRoom.asm
@@ -2,7 +2,7 @@
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
--- a/data/maps/objects/SSAnneKitchen.asm
+++ b/data/maps/objects/SSAnneKitchen.asm
@@ -2,7 +2,7 @@
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
--- a/data/maps/objects/SafariZoneCenter.asm
+++ b/data/maps/objects/SafariZoneCenter.asm
@@ -2,15 +2,15 @@
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
--- a/data/maps/objects/SafariZoneCenterRestHouse.asm
+++ b/data/maps/objects/SafariZoneCenterRestHouse.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/SafariZoneEast.asm
+++ b/data/maps/objects/SafariZoneEast.asm
@@ -2,11 +2,11 @@
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
--- a/data/maps/objects/SafariZoneEastRestHouse.asm
+++ b/data/maps/objects/SafariZoneEastRestHouse.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/SafariZoneGate.asm
+++ b/data/maps/objects/SafariZoneGate.asm
@@ -2,10 +2,10 @@
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
--- a/data/maps/objects/SafariZoneNorth.asm
+++ b/data/maps/objects/SafariZoneNorth.asm
@@ -2,15 +2,15 @@
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
--- a/data/maps/objects/SafariZoneNorthRestHouse.asm
+++ b/data/maps/objects/SafariZoneNorthRestHouse.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/SafariZoneSecretHouse.asm
+++ b/data/maps/objects/SafariZoneSecretHouse.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/SafariZoneWest.asm
+++ b/data/maps/objects/SafariZoneWest.asm
@@ -2,14 +2,14 @@
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
--- a/data/maps/objects/SafariZoneWestRestHouse.asm
+++ b/data/maps/objects/SafariZoneWestRestHouse.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/SaffronCity.asm
+++ b/data/maps/objects/SaffronCity.asm
@@ -2,14 +2,14 @@
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
--- a/data/maps/objects/SaffronGym.asm
+++ b/data/maps/objects/SaffronGym.asm
@@ -2,38 +2,38 @@
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
--- a/data/maps/objects/SaffronMart.asm
+++ b/data/maps/objects/SaffronMart.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/SaffronPidgeyHouse.asm
+++ b/data/maps/objects/SaffronPidgeyHouse.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/SaffronPokecenter.asm
+++ b/data/maps/objects/SaffronPokecenter.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/SeafoamIslands1F.asm
+++ b/data/maps/objects/SeafoamIslands1F.asm
@@ -2,13 +2,13 @@
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
--- a/data/maps/objects/SeafoamIslandsB1F.asm
+++ b/data/maps/objects/SeafoamIslandsB1F.asm
@@ -2,13 +2,13 @@
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
--- a/data/maps/objects/SeafoamIslandsB2F.asm
+++ b/data/maps/objects/SeafoamIslandsB2F.asm
@@ -2,13 +2,13 @@
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
--- a/data/maps/objects/SeafoamIslandsB3F.asm
+++ b/data/maps/objects/SeafoamIslandsB3F.asm
@@ -2,13 +2,13 @@
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
--- a/data/maps/objects/SeafoamIslandsB4F.asm
+++ b/data/maps/objects/SeafoamIslandsB4F.asm
@@ -2,10 +2,10 @@
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
--- a/data/maps/objects/SilphCo10F.asm
+++ b/data/maps/objects/SilphCo10F.asm
@@ -2,12 +2,12 @@
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
--- a/data/maps/objects/SilphCo11F.asm
+++ b/data/maps/objects/SilphCo11F.asm
@@ -2,10 +2,10 @@
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
--- a/data/maps/objects/SilphCo1F.asm
+++ b/data/maps/objects/SilphCo1F.asm
@@ -2,11 +2,11 @@
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
--- a/data/maps/objects/SilphCo2F.asm
+++ b/data/maps/objects/SilphCo2F.asm
@@ -2,13 +2,13 @@
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
--- a/data/maps/objects/SilphCo3F.asm
+++ b/data/maps/objects/SilphCo3F.asm
@@ -2,16 +2,16 @@
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
--- a/data/maps/objects/SilphCo4F.asm
+++ b/data/maps/objects/SilphCo4F.asm
@@ -2,13 +2,13 @@
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
--- a/data/maps/objects/SilphCo5F.asm
+++ b/data/maps/objects/SilphCo5F.asm
@@ -2,13 +2,13 @@
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
--- a/data/maps/objects/SilphCo6F.asm
+++ b/data/maps/objects/SilphCo6F.asm
@@ -2,11 +2,11 @@
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
--- a/data/maps/objects/SilphCo7F.asm
+++ b/data/maps/objects/SilphCo7F.asm
@@ -2,12 +2,12 @@
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
--- a/data/maps/objects/SilphCo8F.asm
+++ b/data/maps/objects/SilphCo8F.asm
@@ -2,13 +2,13 @@
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
--- a/data/maps/objects/SilphCo9F.asm
+++ b/data/maps/objects/SilphCo9F.asm
@@ -2,11 +2,11 @@
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
--- a/data/maps/objects/SilphCoElevator.asm
+++ b/data/maps/objects/SilphCoElevator.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/UndergroundPathNorthSouth.asm
+++ b/data/maps/objects/UndergroundPathNorthSouth.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/UndergroundPathRoute5.asm
+++ b/data/maps/objects/UndergroundPathRoute5.asm
@@ -2,9 +2,9 @@
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
--- a/data/maps/objects/UndergroundPathRoute6.asm
+++ b/data/maps/objects/UndergroundPathRoute6.asm
@@ -2,9 +2,9 @@
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
--- a/data/maps/objects/UndergroundPathRoute7.asm
+++ b/data/maps/objects/UndergroundPathRoute7.asm
@@ -2,9 +2,9 @@
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
--- a/data/maps/objects/UndergroundPathRoute7Copy.asm
+++ b/data/maps/objects/UndergroundPathRoute7Copy.asm
@@ -2,9 +2,9 @@
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
--- a/data/maps/objects/UndergroundPathRoute8.asm
+++ b/data/maps/objects/UndergroundPathRoute8.asm
@@ -2,9 +2,9 @@
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
--- a/data/maps/objects/UndergroundPathWestEast.asm
+++ b/data/maps/objects/UndergroundPathWestEast.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/VermilionCity.asm
+++ b/data/maps/objects/VermilionCity.asm
@@ -2,15 +2,15 @@
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
--- a/data/maps/objects/VermilionDock.asm
+++ b/data/maps/objects/VermilionDock.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/VermilionGym.asm
+++ b/data/maps/objects/VermilionGym.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/VermilionMart.asm
+++ b/data/maps/objects/VermilionMart.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/VermilionOldRodHouse.asm
+++ b/data/maps/objects/VermilionOldRodHouse.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/VermilionPidgeyHouse.asm
+++ b/data/maps/objects/VermilionPidgeyHouse.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/VermilionPokecenter.asm
+++ b/data/maps/objects/VermilionPokecenter.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/VermilionTradeHouse.asm
+++ b/data/maps/objects/VermilionTradeHouse.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/VictoryRoad1F.asm
+++ b/data/maps/objects/VictoryRoad1F.asm
@@ -2,9 +2,9 @@
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
--- a/data/maps/objects/VictoryRoad2F.asm
+++ b/data/maps/objects/VictoryRoad2F.asm
@@ -2,13 +2,13 @@
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
--- a/data/maps/objects/VictoryRoad3F.asm
+++ b/data/maps/objects/VictoryRoad3F.asm
@@ -2,10 +2,10 @@
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
--- a/data/maps/objects/ViridianCity.asm
+++ b/data/maps/objects/ViridianCity.asm
@@ -2,11 +2,11 @@
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
--- a/data/maps/objects/ViridianForest.asm
+++ b/data/maps/objects/ViridianForest.asm
@@ -2,12 +2,12 @@
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
--- a/data/maps/objects/ViridianForestNorthGate.asm
+++ b/data/maps/objects/ViridianForestNorthGate.asm
@@ -2,10 +2,10 @@
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
--- a/data/maps/objects/ViridianForestSouthGate.asm
+++ b/data/maps/objects/ViridianForestSouthGate.asm
@@ -2,10 +2,10 @@
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
--- a/data/maps/objects/ViridianGym.asm
+++ b/data/maps/objects/ViridianGym.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/ViridianMart.asm
+++ b/data/maps/objects/ViridianMart.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/ViridianNicknameHouse.asm
+++ b/data/maps/objects/ViridianNicknameHouse.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/ViridianPokecenter.asm
+++ b/data/maps/objects/ViridianPokecenter.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/ViridianSchoolHouse.asm
+++ b/data/maps/objects/ViridianSchoolHouse.asm
@@ -2,8 +2,8 @@
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
--- a/data/maps/objects/WardensHouse.asm
+++ b/data/maps/objects/WardensHouse.asm
@@ -2,8 +2,8 @@
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
--- a/macros/scripts/maps.asm
+++ b/macros/scripts/maps.asm
@@ -41,9 +41,9 @@
;\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