From 52660012c62fa83d37817c05f5c3cae637c473dd Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 5 Oct 2021 20:46:46 -0400 Subject: Clean up some redundant or unusual event comments --- data/maps/objects/BluesHouse.asm | 6 +++--- data/maps/objects/CeladonCity.asm | 2 +- data/maps/objects/RedsHouse1F.asm | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/data/maps/objects/BluesHouse.asm b/data/maps/objects/BluesHouse.asm index 49f76276..36653b6b 100644 --- a/data/maps/objects/BluesHouse.asm +++ b/data/maps/objects/BluesHouse.asm @@ -8,8 +8,8 @@ BluesHouse_Object: def_bg_events def_object_events - object_event 2, 3, SPRITE_DAISY, STAY, RIGHT, 1 ; Daisy, sitting by map - object_event 6, 4, SPRITE_DAISY, WALK, UP_DOWN, 2, 0 ; Daisy, walking around - object_event 3, 3, SPRITE_POKEDEX, STAY, NONE, 3, 0 ; map on table + object_event 2, 3, SPRITE_DAISY, STAY, RIGHT, 1 + object_event 6, 4, SPRITE_DAISY, WALK, UP_DOWN, 2, 0 + object_event 3, 3, SPRITE_POKEDEX, STAY, NONE, 3, 0 def_warps_to BLUES_HOUSE diff --git a/data/maps/objects/CeladonCity.asm b/data/maps/objects/CeladonCity.asm index 25a2ce32..5f514653 100644 --- a/data/maps/objects/CeladonCity.asm +++ b/data/maps/objects/CeladonCity.asm @@ -10,7 +10,7 @@ CeladonCity_Object: 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 ; beta warp_event! no longer used + 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 diff --git a/data/maps/objects/RedsHouse1F.asm b/data/maps/objects/RedsHouse1F.asm index ce0f8c24..ef1f7c07 100644 --- a/data/maps/objects/RedsHouse1F.asm +++ b/data/maps/objects/RedsHouse1F.asm @@ -2,14 +2,14 @@ RedsHouse1F_Object: db $a ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 0 ; exit1 - warp_event 3, 7, LAST_MAP, 0 ; exit2 - warp_event 7, 1, REDS_HOUSE_2F, 0 ; staircase + warp_event 2, 7, LAST_MAP, 0 + warp_event 3, 7, LAST_MAP, 0 + warp_event 7, 1, REDS_HOUSE_2F, 0 def_bg_events - bg_event 3, 1, 2 ; TV + bg_event 3, 1, 2 ; RedsHouse1FTVText def_object_events - object_event 5, 4, SPRITE_MOM, STAY, LEFT, 1 ; Mom + object_event 5, 4, SPRITE_MOM, STAY, LEFT, 1 def_warps_to REDS_HOUSE_1F -- cgit v1.3.1-sl0p From fc899e1906a9a245e94dafa7c0da2ef1697b7335 Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 5 Oct 2021 21:02:42 -0400 Subject: `warp_event` warp IDs start at 1, like in pokegold/pokecrystal --- data/maps/objects/AgathasRoom.asm | 8 ++-- data/maps/objects/BikeShop.asm | 4 +- data/maps/objects/BillsHouse.asm | 4 +- data/maps/objects/BluesHouse.asm | 4 +- data/maps/objects/BrunosRoom.asm | 8 ++-- data/maps/objects/CeladonChiefHouse.asm | 4 +- data/maps/objects/CeladonCity.asm | 26 +++++----- data/maps/objects/CeladonDiner.asm | 4 +- data/maps/objects/CeladonGym.asm | 4 +- data/maps/objects/CeladonHotel.asm | 4 +- data/maps/objects/CeladonMansion1F.asm | 10 ++-- data/maps/objects/CeladonMansion2F.asm | 8 ++-- data/maps/objects/CeladonMansion3F.asm | 8 ++-- data/maps/objects/CeladonMansionRoof.asm | 6 +-- data/maps/objects/CeladonMansionRoofHouse.asm | 4 +- data/maps/objects/CeladonMart1F.asm | 12 ++--- data/maps/objects/CeladonMart2F.asm | 6 +-- data/maps/objects/CeladonMart3F.asm | 6 +-- data/maps/objects/CeladonMart4F.asm | 6 +-- data/maps/objects/CeladonMart5F.asm | 6 +-- data/maps/objects/CeladonMartElevator.asm | 4 +- data/maps/objects/CeladonMartRoof.asm | 2 +- data/maps/objects/CeladonPokecenter.asm | 4 +- data/maps/objects/CeruleanBadgeHouse.asm | 6 +-- data/maps/objects/CeruleanCave1F.asm | 18 +++---- data/maps/objects/CeruleanCave2F.asm | 12 ++--- data/maps/objects/CeruleanCaveB1F.asm | 2 +- data/maps/objects/CeruleanCity.asm | 20 ++++---- data/maps/objects/CeruleanGym.asm | 4 +- data/maps/objects/CeruleanMart.asm | 4 +- data/maps/objects/CeruleanPokecenter.asm | 4 +- data/maps/objects/CeruleanTradeHouse.asm | 4 +- data/maps/objects/CeruleanTrashedHouse.asm | 6 +-- data/maps/objects/ChampionsRoom.asm | 8 ++-- data/maps/objects/CinnabarGym.asm | 4 +- data/maps/objects/CinnabarIsland.asm | 10 ++-- data/maps/objects/CinnabarLab.asm | 10 ++-- data/maps/objects/CinnabarLabFossilRoom.asm | 4 +- data/maps/objects/CinnabarLabMetronomeRoom.asm | 4 +- data/maps/objects/CinnabarLabTradeRoom.asm | 4 +- data/maps/objects/CinnabarMart.asm | 4 +- data/maps/objects/CinnabarPokecenter.asm | 4 +- data/maps/objects/CopycatsHouse1F.asm | 6 +-- data/maps/objects/CopycatsHouse2F.asm | 2 +- data/maps/objects/Daycare.asm | 4 +- data/maps/objects/DiglettsCave.asm | 4 +- data/maps/objects/DiglettsCaveRoute11.asm | 6 +-- data/maps/objects/DiglettsCaveRoute2.asm | 6 +-- data/maps/objects/FightingDojo.asm | 4 +- data/maps/objects/FuchsiaBillsGrandpasHouse.asm | 4 +- data/maps/objects/FuchsiaCity.asm | 18 +++---- data/maps/objects/FuchsiaGoodRodHouse.asm | 6 +-- data/maps/objects/FuchsiaGym.asm | 4 +- data/maps/objects/FuchsiaMart.asm | 4 +- data/maps/objects/FuchsiaMeetingRoom.asm | 4 +- data/maps/objects/FuchsiaPokecenter.asm | 4 +- data/maps/objects/GameCorner.asm | 6 +-- data/maps/objects/GameCornerPrizeRoom.asm | 4 +- data/maps/objects/HallOfFame.asm | 4 +- data/maps/objects/IndigoPlateau.asm | 4 +- data/maps/objects/IndigoPlateauLobby.asm | 6 +-- data/maps/objects/LancesRoom.asm | 6 +-- data/maps/objects/LavenderCuboneHouse.asm | 4 +- data/maps/objects/LavenderMart.asm | 4 +- data/maps/objects/LavenderPokecenter.asm | 4 +- data/maps/objects/LavenderTown.asm | 12 ++--- data/maps/objects/LoreleisRoom.asm | 8 ++-- data/maps/objects/MrFujisHouse.asm | 4 +- data/maps/objects/MrPsychicsHouse.asm | 4 +- data/maps/objects/MtMoon1F.asm | 10 ++-- data/maps/objects/MtMoonB1F.asm | 16 +++---- data/maps/objects/MtMoonB2F.asm | 8 ++-- data/maps/objects/MtMoonPokecenter.asm | 4 +- data/maps/objects/Museum1F.asm | 10 ++-- data/maps/objects/Museum2F.asm | 2 +- data/maps/objects/NameRatersHouse.asm | 4 +- data/maps/objects/OaksLab.asm | 4 +- data/maps/objects/PalletTown.asm | 6 +-- data/maps/objects/PewterCity.asm | 14 +++--- data/maps/objects/PewterGym.asm | 4 +- data/maps/objects/PewterMart.asm | 4 +- data/maps/objects/PewterNidoranHouse.asm | 4 +- data/maps/objects/PewterPokecenter.asm | 4 +- data/maps/objects/PewterSpeechHouse.asm | 4 +- data/maps/objects/PokemonFanClub.asm | 4 +- data/maps/objects/PokemonMansion1F.asm | 16 +++---- data/maps/objects/PokemonMansion2F.asm | 8 ++-- data/maps/objects/PokemonMansion3F.asm | 6 +-- data/maps/objects/PokemonMansionB1F.asm | 2 +- data/maps/objects/PokemonTower1F.asm | 6 +-- data/maps/objects/PokemonTower2F.asm | 4 +- data/maps/objects/PokemonTower3F.asm | 4 +- data/maps/objects/PokemonTower4F.asm | 4 +- data/maps/objects/PokemonTower5F.asm | 4 +- data/maps/objects/PokemonTower6F.asm | 4 +- data/maps/objects/PokemonTower7F.asm | 2 +- data/maps/objects/PowerPlant.asm | 6 +-- data/maps/objects/RedsHouse1F.asm | 6 +-- data/maps/objects/RedsHouse2F.asm | 2 +- data/maps/objects/RockTunnel1F.asm | 16 +++---- data/maps/objects/RockTunnelB1F.asm | 8 ++-- data/maps/objects/RockTunnelPokecenter.asm | 4 +- data/maps/objects/RocketHideoutB1F.asm | 10 ++-- data/maps/objects/RocketHideoutB2F.asm | 10 ++-- data/maps/objects/RocketHideoutB3F.asm | 4 +- data/maps/objects/RocketHideoutB4F.asm | 6 +-- data/maps/objects/RocketHideoutElevator.asm | 4 +- data/maps/objects/Route10.asm | 8 ++-- data/maps/objects/Route11.asm | 10 ++-- data/maps/objects/Route11Gate1F.asm | 10 ++-- data/maps/objects/Route11Gate2F.asm | 2 +- data/maps/objects/Route12.asm | 8 ++-- data/maps/objects/Route12Gate1F.asm | 10 ++-- data/maps/objects/Route12Gate2F.asm | 2 +- data/maps/objects/Route12SuperRodHouse.asm | 4 +- data/maps/objects/Route15.asm | 8 ++-- data/maps/objects/Route15Gate1F.asm | 10 ++-- data/maps/objects/Route15Gate2F.asm | 2 +- data/maps/objects/Route16.asm | 18 +++---- data/maps/objects/Route16FlyHouse.asm | 4 +- data/maps/objects/Route16Gate1F.asm | 18 +++---- data/maps/objects/Route16Gate2F.asm | 2 +- data/maps/objects/Route18.asm | 8 ++-- data/maps/objects/Route18Gate1F.asm | 10 ++-- data/maps/objects/Route18Gate2F.asm | 2 +- data/maps/objects/Route2.asm | 12 ++--- data/maps/objects/Route20.asm | 4 +- data/maps/objects/Route22.asm | 2 +- data/maps/objects/Route22Gate.asm | 8 ++-- data/maps/objects/Route23.asm | 8 ++-- data/maps/objects/Route25.asm | 2 +- data/maps/objects/Route2Gate.asm | 8 ++-- data/maps/objects/Route2TradeHouse.asm | 4 +- data/maps/objects/Route4.asm | 6 +-- data/maps/objects/Route5.asm | 10 ++-- data/maps/objects/Route5Gate.asm | 8 ++-- data/maps/objects/Route6.asm | 8 ++-- data/maps/objects/Route6Gate.asm | 8 ++-- data/maps/objects/Route7.asm | 10 ++-- data/maps/objects/Route7Gate.asm | 8 ++-- data/maps/objects/Route8.asm | 10 ++-- data/maps/objects/Route8Gate.asm | 8 ++-- data/maps/objects/SSAnne1F.asm | 22 ++++----- data/maps/objects/SSAnne1FRooms.asm | 12 ++--- data/maps/objects/SSAnne2F.asm | 18 +++---- data/maps/objects/SSAnne2FRooms.asm | 24 +++++----- data/maps/objects/SSAnne3F.asm | 4 +- data/maps/objects/SSAnneB1F.asm | 12 ++--- data/maps/objects/SSAnneB1FRooms.asm | 20 ++++---- data/maps/objects/SSAnneBow.asm | 4 +- data/maps/objects/SSAnneCaptainsRoom.asm | 2 +- data/maps/objects/SSAnneKitchen.asm | 2 +- data/maps/objects/SafariZoneCenter.asm | 18 +++---- data/maps/objects/SafariZoneCenterRestHouse.asm | 4 +- data/maps/objects/SafariZoneEast.asm | 10 ++-- data/maps/objects/SafariZoneEastRestHouse.asm | 4 +- data/maps/objects/SafariZoneGate.asm | 8 ++-- data/maps/objects/SafariZoneNorth.asm | 18 +++---- data/maps/objects/SafariZoneNorthRestHouse.asm | 4 +- data/maps/objects/SafariZoneSecretHouse.asm | 4 +- data/maps/objects/SafariZoneWest.asm | 16 +++---- data/maps/objects/SafariZoneWestRestHouse.asm | 4 +- data/maps/objects/SaffronCity.asm | 16 +++---- data/maps/objects/SaffronGym.asm | 64 ++++++++++++------------- data/maps/objects/SaffronMart.asm | 4 +- data/maps/objects/SaffronPidgeyHouse.asm | 4 +- data/maps/objects/SaffronPokecenter.asm | 4 +- data/maps/objects/SeafoamIslands1F.asm | 14 +++--- data/maps/objects/SeafoamIslandsB1F.asm | 14 +++--- data/maps/objects/SeafoamIslandsB2F.asm | 14 +++--- data/maps/objects/SeafoamIslandsB3F.asm | 14 +++--- data/maps/objects/SeafoamIslandsB4F.asm | 8 ++-- data/maps/objects/SilphCo10F.asm | 12 ++--- data/maps/objects/SilphCo11F.asm | 8 ++-- data/maps/objects/SilphCo1F.asm | 10 ++-- data/maps/objects/SilphCo2F.asm | 14 +++--- data/maps/objects/SilphCo3F.asm | 20 ++++---- data/maps/objects/SilphCo4F.asm | 14 +++--- data/maps/objects/SilphCo5F.asm | 14 +++--- data/maps/objects/SilphCo6F.asm | 10 ++-- data/maps/objects/SilphCo7F.asm | 12 ++--- data/maps/objects/SilphCo8F.asm | 14 +++--- data/maps/objects/SilphCo9F.asm | 10 ++-- data/maps/objects/SilphCoElevator.asm | 4 +- data/maps/objects/UndergroundPathNorthSouth.asm | 4 +- data/maps/objects/UndergroundPathRoute5.asm | 6 +-- data/maps/objects/UndergroundPathRoute6.asm | 6 +-- data/maps/objects/UndergroundPathRoute7.asm | 6 +-- data/maps/objects/UndergroundPathRoute7Copy.asm | 6 +-- data/maps/objects/UndergroundPathRoute8.asm | 6 +-- data/maps/objects/UndergroundPathWestEast.asm | 4 +- data/maps/objects/VermilionCity.asm | 18 +++---- data/maps/objects/VermilionDock.asm | 4 +- data/maps/objects/VermilionGym.asm | 4 +- data/maps/objects/VermilionMart.asm | 4 +- data/maps/objects/VermilionOldRodHouse.asm | 4 +- data/maps/objects/VermilionPidgeyHouse.asm | 4 +- data/maps/objects/VermilionPokecenter.asm | 4 +- data/maps/objects/VermilionTradeHouse.asm | 4 +- data/maps/objects/VictoryRoad1F.asm | 6 +-- data/maps/objects/VictoryRoad2F.asm | 14 +++--- data/maps/objects/VictoryRoad3F.asm | 8 ++-- data/maps/objects/ViridianCity.asm | 10 ++-- data/maps/objects/ViridianForest.asm | 12 ++--- data/maps/objects/ViridianForestNorthGate.asm | 8 ++-- data/maps/objects/ViridianForestSouthGate.asm | 8 ++-- data/maps/objects/ViridianGym.asm | 4 +- data/maps/objects/ViridianMart.asm | 4 +- data/maps/objects/ViridianNicknameHouse.asm | 4 +- data/maps/objects/ViridianPokecenter.asm | 4 +- data/maps/objects/ViridianSchoolHouse.asm | 4 +- data/maps/objects/WardensHouse.asm | 4 +- macros/scripts/maps.asm | 4 +- 213 files changed, 807 insertions(+), 807 deletions(-) diff --git a/data/maps/objects/AgathasRoom.asm b/data/maps/objects/AgathasRoom.asm index 50d2e8c3..afccd1be 100644 --- a/data/maps/objects/AgathasRoom.asm +++ b/data/maps/objects/AgathasRoom.asm @@ -2,10 +2,10 @@ AgathasRoom_Object: db $0 ; border block def_warp_events - warp_event 4, 11, BRUNOS_ROOM, 2 - warp_event 5, 11, BRUNOS_ROOM, 3 - warp_event 4, 0, LANCES_ROOM, 0 - warp_event 5, 0, LANCES_ROOM, 0 + warp_event 4, 11, BRUNOS_ROOM, 3 + warp_event 5, 11, BRUNOS_ROOM, 4 + warp_event 4, 0, LANCES_ROOM, 1 + warp_event 5, 0, LANCES_ROOM, 1 def_bg_events diff --git a/data/maps/objects/BikeShop.asm b/data/maps/objects/BikeShop.asm index c0028f8c..1fa8f6e6 100644 --- a/data/maps/objects/BikeShop.asm +++ b/data/maps/objects/BikeShop.asm @@ -2,8 +2,8 @@ BikeShop_Object: db $e ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 4 - warp_event 3, 7, LAST_MAP, 4 + warp_event 2, 7, LAST_MAP, 5 + warp_event 3, 7, LAST_MAP, 5 def_bg_events diff --git a/data/maps/objects/BillsHouse.asm b/data/maps/objects/BillsHouse.asm index a6b2463d..db8f8433 100644 --- a/data/maps/objects/BillsHouse.asm +++ b/data/maps/objects/BillsHouse.asm @@ -2,8 +2,8 @@ BillsHouse_Object: db $d ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 0 - warp_event 3, 7, LAST_MAP, 0 + warp_event 2, 7, LAST_MAP, 1 + warp_event 3, 7, LAST_MAP, 1 def_bg_events diff --git a/data/maps/objects/BluesHouse.asm b/data/maps/objects/BluesHouse.asm index 36653b6b..ac200b28 100644 --- a/data/maps/objects/BluesHouse.asm +++ b/data/maps/objects/BluesHouse.asm @@ -2,8 +2,8 @@ BluesHouse_Object: db $a ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 1 - warp_event 3, 7, LAST_MAP, 1 + warp_event 2, 7, LAST_MAP, 2 + warp_event 3, 7, LAST_MAP, 2 def_bg_events diff --git a/data/maps/objects/BrunosRoom.asm b/data/maps/objects/BrunosRoom.asm index 9cf7e5e9..1e8a0a27 100644 --- a/data/maps/objects/BrunosRoom.asm +++ b/data/maps/objects/BrunosRoom.asm @@ -2,10 +2,10 @@ BrunosRoom_Object: db $3 ; border block def_warp_events - warp_event 4, 11, LORELEIS_ROOM, 2 - warp_event 5, 11, LORELEIS_ROOM, 3 - warp_event 4, 0, AGATHAS_ROOM, 0 - warp_event 5, 0, AGATHAS_ROOM, 1 + warp_event 4, 11, LORELEIS_ROOM, 3 + warp_event 5, 11, LORELEIS_ROOM, 4 + warp_event 4, 0, AGATHAS_ROOM, 1 + warp_event 5, 0, AGATHAS_ROOM, 2 def_bg_events diff --git a/data/maps/objects/CeladonChiefHouse.asm b/data/maps/objects/CeladonChiefHouse.asm index 16779c25..8bec11b0 100644 --- a/data/maps/objects/CeladonChiefHouse.asm +++ b/data/maps/objects/CeladonChiefHouse.asm @@ -2,8 +2,8 @@ CeladonChiefHouse_Object: db $f ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 11 - warp_event 3, 7, LAST_MAP, 11 + warp_event 2, 7, LAST_MAP, 12 + warp_event 3, 7, LAST_MAP, 12 def_bg_events diff --git a/data/maps/objects/CeladonCity.asm b/data/maps/objects/CeladonCity.asm index 5f514653..1644335b 100644 --- a/data/maps/objects/CeladonCity.asm +++ b/data/maps/objects/CeladonCity.asm @@ -2,19 +2,19 @@ CeladonCity_Object: db $f ; border block def_warp_events - warp_event 8, 13, CELADON_MART_1F, 0 - warp_event 10, 13, CELADON_MART_1F, 2 - warp_event 24, 9, CELADON_MANSION_1F, 0 - warp_event 24, 3, CELADON_MANSION_1F, 2 - warp_event 25, 3, CELADON_MANSION_1F, 2 - warp_event 41, 9, CELADON_POKECENTER, 0 - warp_event 12, 27, CELADON_GYM, 0 - warp_event 28, 19, GAME_CORNER, 0 - warp_event 39, 19, CELADON_MART_5F, 0 - warp_event 33, 19, GAME_CORNER_PRIZE_ROOM, 0 - warp_event 31, 27, CELADON_DINER, 0 - warp_event 35, 27, CELADON_CHIEF_HOUSE, 0 - warp_event 43, 27, CELADON_HOTEL, 0 + warp_event 8, 13, CELADON_MART_1F, 1 + warp_event 10, 13, CELADON_MART_1F, 3 + warp_event 24, 9, CELADON_MANSION_1F, 1 + warp_event 24, 3, CELADON_MANSION_1F, 3 + warp_event 25, 3, CELADON_MANSION_1F, 3 + warp_event 41, 9, CELADON_POKECENTER, 1 + warp_event 12, 27, CELADON_GYM, 1 + warp_event 28, 19, GAME_CORNER, 1 + warp_event 39, 19, CELADON_MART_5F, 1 + warp_event 33, 19, GAME_CORNER_PRIZE_ROOM, 1 + warp_event 31, 27, CELADON_DINER, 1 + warp_event 35, 27, CELADON_CHIEF_HOUSE, 1 + warp_event 43, 27, CELADON_HOTEL, 1 def_bg_events bg_event 27, 15, 10 ; CeladonCityText10 diff --git a/data/maps/objects/CeladonDiner.asm b/data/maps/objects/CeladonDiner.asm index 629a34a7..33ea922b 100644 --- a/data/maps/objects/CeladonDiner.asm +++ b/data/maps/objects/CeladonDiner.asm @@ -2,8 +2,8 @@ CeladonDiner_Object: db $f ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 10 - warp_event 4, 7, LAST_MAP, 10 + warp_event 3, 7, LAST_MAP, 11 + warp_event 4, 7, LAST_MAP, 11 def_bg_events diff --git a/data/maps/objects/CeladonGym.asm b/data/maps/objects/CeladonGym.asm index c296c68a..294e727d 100644 --- a/data/maps/objects/CeladonGym.asm +++ b/data/maps/objects/CeladonGym.asm @@ -2,8 +2,8 @@ CeladonGym_Object: db $3 ; border block def_warp_events - warp_event 4, 17, LAST_MAP, 6 - warp_event 5, 17, LAST_MAP, 6 + warp_event 4, 17, LAST_MAP, 7 + warp_event 5, 17, LAST_MAP, 7 def_bg_events diff --git a/data/maps/objects/CeladonHotel.asm b/data/maps/objects/CeladonHotel.asm index c79b658f..13aaff64 100644 --- a/data/maps/objects/CeladonHotel.asm +++ b/data/maps/objects/CeladonHotel.asm @@ -2,8 +2,8 @@ CeladonHotel_Object: db $0 ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 12 - warp_event 4, 7, LAST_MAP, 12 + warp_event 3, 7, LAST_MAP, 13 + warp_event 4, 7, LAST_MAP, 13 def_bg_events diff --git a/data/maps/objects/CeladonMansion1F.asm b/data/maps/objects/CeladonMansion1F.asm index 01a907f1..4966c903 100644 --- a/data/maps/objects/CeladonMansion1F.asm +++ b/data/maps/objects/CeladonMansion1F.asm @@ -2,11 +2,11 @@ CeladonMansion1F_Object: db $f ; border block def_warp_events - warp_event 4, 11, LAST_MAP, 2 - warp_event 5, 11, LAST_MAP, 2 - warp_event 4, 0, LAST_MAP, 4 - warp_event 7, 1, CELADON_MANSION_2F, 1 - warp_event 2, 1, CELADON_MANSION_2F, 2 + warp_event 4, 11, LAST_MAP, 3 + warp_event 5, 11, LAST_MAP, 3 + warp_event 4, 0, LAST_MAP, 5 + warp_event 7, 1, CELADON_MANSION_2F, 2 + warp_event 2, 1, CELADON_MANSION_2F, 3 def_bg_events bg_event 4, 9, 5 ; CeladonMansion1Text5 diff --git a/data/maps/objects/CeladonMansion2F.asm b/data/maps/objects/CeladonMansion2F.asm index c0d431d2..c2546d72 100644 --- a/data/maps/objects/CeladonMansion2F.asm +++ b/data/maps/objects/CeladonMansion2F.asm @@ -2,10 +2,10 @@ CeladonMansion2F_Object: db $f ; border block def_warp_events - warp_event 6, 1, CELADON_MANSION_3F, 0 - warp_event 7, 1, CELADON_MANSION_1F, 3 - warp_event 2, 1, CELADON_MANSION_1F, 4 - warp_event 4, 1, CELADON_MANSION_3F, 3 + warp_event 6, 1, CELADON_MANSION_3F, 1 + warp_event 7, 1, CELADON_MANSION_1F, 4 + warp_event 2, 1, CELADON_MANSION_1F, 5 + warp_event 4, 1, CELADON_MANSION_3F, 4 def_bg_events bg_event 4, 9, 1 ; CeladonMansion2Text1 diff --git a/data/maps/objects/CeladonMansion3F.asm b/data/maps/objects/CeladonMansion3F.asm index 4b02da20..b4f9c37b 100644 --- a/data/maps/objects/CeladonMansion3F.asm +++ b/data/maps/objects/CeladonMansion3F.asm @@ -2,10 +2,10 @@ CeladonMansion3F_Object: db $f ; border block def_warp_events - warp_event 6, 1, CELADON_MANSION_2F, 0 - warp_event 7, 1, CELADON_MANSION_ROOF, 0 - warp_event 2, 1, CELADON_MANSION_ROOF, 1 - warp_event 4, 1, CELADON_MANSION_2F, 3 + warp_event 6, 1, CELADON_MANSION_2F, 1 + warp_event 7, 1, CELADON_MANSION_ROOF, 1 + warp_event 2, 1, CELADON_MANSION_ROOF, 2 + warp_event 4, 1, CELADON_MANSION_2F, 4 def_bg_events bg_event 1, 3, 5 ; CeladonMansion3Text5 diff --git a/data/maps/objects/CeladonMansionRoof.asm b/data/maps/objects/CeladonMansionRoof.asm index 89f60ac2..e28249e2 100644 --- a/data/maps/objects/CeladonMansionRoof.asm +++ b/data/maps/objects/CeladonMansionRoof.asm @@ -2,9 +2,9 @@ CeladonMansionRoof_Object: db $9 ; border block def_warp_events - warp_event 6, 1, CELADON_MANSION_3F, 1 - warp_event 2, 1, CELADON_MANSION_3F, 2 - warp_event 2, 7, CELADON_MANSION_ROOF_HOUSE, 0 + warp_event 6, 1, CELADON_MANSION_3F, 2 + warp_event 2, 1, CELADON_MANSION_3F, 3 + warp_event 2, 7, CELADON_MANSION_ROOF_HOUSE, 1 def_bg_events bg_event 3, 7, 1 ; CeladonMansion4Text1 diff --git a/data/maps/objects/CeladonMansionRoofHouse.asm b/data/maps/objects/CeladonMansionRoofHouse.asm index b29266e9..c5111a76 100644 --- a/data/maps/objects/CeladonMansionRoofHouse.asm +++ b/data/maps/objects/CeladonMansionRoofHouse.asm @@ -2,8 +2,8 @@ CeladonMansionRoofHouse_Object: db $a ; border block def_warp_events - warp_event 2, 7, CELADON_MANSION_ROOF, 2 - warp_event 3, 7, CELADON_MANSION_ROOF, 2 + warp_event 2, 7, CELADON_MANSION_ROOF, 3 + warp_event 3, 7, CELADON_MANSION_ROOF, 3 def_bg_events diff --git a/data/maps/objects/CeladonMart1F.asm b/data/maps/objects/CeladonMart1F.asm index 89ad6b4c..d7f8924f 100644 --- a/data/maps/objects/CeladonMart1F.asm +++ b/data/maps/objects/CeladonMart1F.asm @@ -2,12 +2,12 @@ CeladonMart1F_Object: db $f ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 0 - warp_event 3, 7, LAST_MAP, 0 - warp_event 16, 7, LAST_MAP, 1 - warp_event 17, 7, LAST_MAP, 1 - warp_event 12, 1, CELADON_MART_2F, 0 - warp_event 1, 1, CELADON_MART_ELEVATOR, 0 + warp_event 2, 7, LAST_MAP, 1 + warp_event 3, 7, LAST_MAP, 1 + warp_event 16, 7, LAST_MAP, 2 + warp_event 17, 7, LAST_MAP, 2 + warp_event 12, 1, CELADON_MART_2F, 1 + warp_event 1, 1, CELADON_MART_ELEVATOR, 1 def_bg_events bg_event 11, 4, 2 ; CeladonMart1Text2 diff --git a/data/maps/objects/CeladonMart2F.asm b/data/maps/objects/CeladonMart2F.asm index e26912b3..9eaa1605 100644 --- a/data/maps/objects/CeladonMart2F.asm +++ b/data/maps/objects/CeladonMart2F.asm @@ -2,9 +2,9 @@ CeladonMart2F_Object: db $f ; border block def_warp_events - warp_event 12, 1, CELADON_MART_1F, 4 - warp_event 16, 1, CELADON_MART_3F, 1 - warp_event 1, 1, CELADON_MART_ELEVATOR, 0 + warp_event 12, 1, CELADON_MART_1F, 5 + warp_event 16, 1, CELADON_MART_3F, 2 + warp_event 1, 1, CELADON_MART_ELEVATOR, 1 def_bg_events bg_event 14, 1, 5 ; CeladonMart2Text5 diff --git a/data/maps/objects/CeladonMart3F.asm b/data/maps/objects/CeladonMart3F.asm index e0b61e52..85f0cf1c 100644 --- a/data/maps/objects/CeladonMart3F.asm +++ b/data/maps/objects/CeladonMart3F.asm @@ -2,9 +2,9 @@ CeladonMart3F_Object: db $f ; border block def_warp_events - warp_event 12, 1, CELADON_MART_4F, 0 - warp_event 16, 1, CELADON_MART_2F, 1 - warp_event 1, 1, CELADON_MART_ELEVATOR, 0 + warp_event 12, 1, CELADON_MART_4F, 1 + warp_event 16, 1, CELADON_MART_2F, 2 + warp_event 1, 1, CELADON_MART_ELEVATOR, 1 def_bg_events bg_event 2, 4, 6 ; CeladonMart3Text6 diff --git a/data/maps/objects/CeladonMart4F.asm b/data/maps/objects/CeladonMart4F.asm index f4ee3505..7f188692 100644 --- a/data/maps/objects/CeladonMart4F.asm +++ b/data/maps/objects/CeladonMart4F.asm @@ -2,9 +2,9 @@ CeladonMart4F_Object: db $f ; border block def_warp_events - warp_event 12, 1, CELADON_MART_3F, 0 - warp_event 16, 1, CELADON_MART_5F, 1 - warp_event 1, 1, CELADON_MART_ELEVATOR, 0 + warp_event 12, 1, CELADON_MART_3F, 1 + warp_event 16, 1, CELADON_MART_5F, 2 + warp_event 1, 1, CELADON_MART_ELEVATOR, 1 def_bg_events bg_event 14, 1, 4 ; CeladonMart4Text4 diff --git a/data/maps/objects/CeladonMart5F.asm b/data/maps/objects/CeladonMart5F.asm index a53c16bc..35cb45b8 100644 --- a/data/maps/objects/CeladonMart5F.asm +++ b/data/maps/objects/CeladonMart5F.asm @@ -2,9 +2,9 @@ CeladonMart5F_Object: db $f ; border block def_warp_events - warp_event 12, 1, CELADON_MART_ROOF, 0 - warp_event 16, 1, CELADON_MART_4F, 1 - warp_event 1, 1, CELADON_MART_ELEVATOR, 0 + warp_event 12, 1, CELADON_MART_ROOF, 1 + warp_event 16, 1, CELADON_MART_4F, 2 + warp_event 1, 1, CELADON_MART_ELEVATOR, 1 def_bg_events bg_event 14, 1, 5 ; CeladonMart5Text5 diff --git a/data/maps/objects/CeladonMartElevator.asm b/data/maps/objects/CeladonMartElevator.asm index 2b0382ef..c24e48df 100644 --- a/data/maps/objects/CeladonMartElevator.asm +++ b/data/maps/objects/CeladonMartElevator.asm @@ -2,8 +2,8 @@ CeladonMartElevator_Object: db $f ; border block def_warp_events - warp_event 1, 3, CELADON_MART_1F, 5 - warp_event 2, 3, CELADON_MART_1F, 5 + warp_event 1, 3, CELADON_MART_1F, 6 + warp_event 2, 3, CELADON_MART_1F, 6 def_bg_events bg_event 3, 0, 1 ; CeladonMartElevatorText1 diff --git a/data/maps/objects/CeladonMartRoof.asm b/data/maps/objects/CeladonMartRoof.asm index b495d0c2..f56a0b0d 100644 --- a/data/maps/objects/CeladonMartRoof.asm +++ b/data/maps/objects/CeladonMartRoof.asm @@ -2,7 +2,7 @@ CeladonMartRoof_Object: db $42 ; border block def_warp_events - warp_event 15, 2, CELADON_MART_5F, 0 + warp_event 15, 2, CELADON_MART_5F, 1 def_bg_events bg_event 10, 1, 3 ; CeladonMartRoofText3 diff --git a/data/maps/objects/CeladonPokecenter.asm b/data/maps/objects/CeladonPokecenter.asm index 6373bdb2..40c466a0 100644 --- a/data/maps/objects/CeladonPokecenter.asm +++ b/data/maps/objects/CeladonPokecenter.asm @@ -2,8 +2,8 @@ CeladonPokecenter_Object: db $0 ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 5 - warp_event 4, 7, LAST_MAP, 5 + warp_event 3, 7, LAST_MAP, 6 + warp_event 4, 7, LAST_MAP, 6 def_bg_events diff --git a/data/maps/objects/CeruleanBadgeHouse.asm b/data/maps/objects/CeruleanBadgeHouse.asm index bf7d0215..145dde81 100644 --- a/data/maps/objects/CeruleanBadgeHouse.asm +++ b/data/maps/objects/CeruleanBadgeHouse.asm @@ -2,9 +2,9 @@ CeruleanBadgeHouse_Object: db $c ; border block def_warp_events - warp_event 2, 0, LAST_MAP, 9 - warp_event 2, 7, LAST_MAP, 8 - warp_event 3, 7, LAST_MAP, 8 + warp_event 2, 0, LAST_MAP, 10 + warp_event 2, 7, LAST_MAP, 9 + warp_event 3, 7, LAST_MAP, 9 def_bg_events diff --git a/data/maps/objects/CeruleanCave1F.asm b/data/maps/objects/CeruleanCave1F.asm index c4a1cdfc..b858a40f 100644 --- a/data/maps/objects/CeruleanCave1F.asm +++ b/data/maps/objects/CeruleanCave1F.asm @@ -2,15 +2,15 @@ CeruleanCave1F_Object: db $7d ; border block def_warp_events - warp_event 24, 17, LAST_MAP, 6 - warp_event 25, 17, LAST_MAP, 6 - warp_event 27, 1, CERULEAN_CAVE_2F, 0 - warp_event 23, 7, CERULEAN_CAVE_2F, 1 - warp_event 18, 9, CERULEAN_CAVE_2F, 2 - warp_event 7, 1, CERULEAN_CAVE_2F, 3 - warp_event 1, 3, CERULEAN_CAVE_2F, 4 - warp_event 3, 11, CERULEAN_CAVE_2F, 5 - warp_event 0, 6, CERULEAN_CAVE_B1F, 0 + warp_event 24, 17, LAST_MAP, 7 + warp_event 25, 17, LAST_MAP, 7 + warp_event 27, 1, CERULEAN_CAVE_2F, 1 + warp_event 23, 7, CERULEAN_CAVE_2F, 2 + warp_event 18, 9, CERULEAN_CAVE_2F, 3 + warp_event 7, 1, CERULEAN_CAVE_2F, 4 + warp_event 1, 3, CERULEAN_CAVE_2F, 5 + warp_event 3, 11, CERULEAN_CAVE_2F, 6 + warp_event 0, 6, CERULEAN_CAVE_B1F, 1 def_bg_events diff --git a/data/maps/objects/CeruleanCave2F.asm b/data/maps/objects/CeruleanCave2F.asm index 5e0dd321..18765fe8 100644 --- a/data/maps/objects/CeruleanCave2F.asm +++ b/data/maps/objects/CeruleanCave2F.asm @@ -2,12 +2,12 @@ CeruleanCave2F_Object: db $7d ; border block def_warp_events - warp_event 29, 1, CERULEAN_CAVE_1F, 2 - warp_event 22, 6, CERULEAN_CAVE_1F, 3 - warp_event 19, 7, CERULEAN_CAVE_1F, 4 - warp_event 9, 1, CERULEAN_CAVE_1F, 5 - warp_event 1, 3, CERULEAN_CAVE_1F, 6 - warp_event 3, 11, CERULEAN_CAVE_1F, 7 + warp_event 29, 1, CERULEAN_CAVE_1F, 3 + warp_event 22, 6, CERULEAN_CAVE_1F, 4 + warp_event 19, 7, CERULEAN_CAVE_1F, 5 + warp_event 9, 1, CERULEAN_CAVE_1F, 6 + warp_event 1, 3, CERULEAN_CAVE_1F, 7 + warp_event 3, 11, CERULEAN_CAVE_1F, 8 def_bg_events diff --git a/data/maps/objects/CeruleanCaveB1F.asm b/data/maps/objects/CeruleanCaveB1F.asm index 6b2fd05d..5173fee6 100644 --- a/data/maps/objects/CeruleanCaveB1F.asm +++ b/data/maps/objects/CeruleanCaveB1F.asm @@ -2,7 +2,7 @@ CeruleanCaveB1F_Object: db $7d ; border block def_warp_events - warp_event 3, 6, CERULEAN_CAVE_1F, 8 + warp_event 3, 6, CERULEAN_CAVE_1F, 9 def_bg_events diff --git a/data/maps/objects/CeruleanCity.asm b/data/maps/objects/CeruleanCity.asm index c9669c44..23863aa0 100644 --- a/data/maps/objects/CeruleanCity.asm +++ b/data/maps/objects/CeruleanCity.asm @@ -2,16 +2,16 @@ CeruleanCity_Object: db $f ; border block def_warp_events - warp_event 27, 11, CERULEAN_TRASHED_HOUSE, 0 - warp_event 13, 15, CERULEAN_TRADE_HOUSE, 0 - warp_event 19, 17, CERULEAN_POKECENTER, 0 - warp_event 30, 19, CERULEAN_GYM, 0 - warp_event 13, 25, BIKE_SHOP, 0 - warp_event 25, 25, CERULEAN_MART, 0 - warp_event 4, 11, CERULEAN_CAVE_1F, 0 - warp_event 27, 9, CERULEAN_TRASHED_HOUSE, 2 - warp_event 9, 11, CERULEAN_BADGE_HOUSE, 1 - warp_event 9, 9, CERULEAN_BADGE_HOUSE, 0 + warp_event 27, 11, CERULEAN_TRASHED_HOUSE, 1 + warp_event 13, 15, CERULEAN_TRADE_HOUSE, 1 + warp_event 19, 17, CERULEAN_POKECENTER, 1 + warp_event 30, 19, CERULEAN_GYM, 1 + warp_event 13, 25, BIKE_SHOP, 1 + warp_event 25, 25, CERULEAN_MART, 1 + warp_event 4, 11, CERULEAN_CAVE_1F, 1 + warp_event 27, 9, CERULEAN_TRASHED_HOUSE, 3 + warp_event 9, 11, CERULEAN_BADGE_HOUSE, 2 + warp_event 9, 9, CERULEAN_BADGE_HOUSE, 1 def_bg_events bg_event 23, 19, 12 ; CeruleanCityText12 diff --git a/data/maps/objects/CeruleanGym.asm b/data/maps/objects/CeruleanGym.asm index 4ae7d7a4..a6be4cae 100644 --- a/data/maps/objects/CeruleanGym.asm +++ b/data/maps/objects/CeruleanGym.asm @@ -2,8 +2,8 @@ CeruleanGym_Object: db $3 ; border block def_warp_events - warp_event 4, 13, LAST_MAP, 3 - warp_event 5, 13, LAST_MAP, 3 + warp_event 4, 13, LAST_MAP, 4 + warp_event 5, 13, LAST_MAP, 4 def_bg_events diff --git a/data/maps/objects/CeruleanMart.asm b/data/maps/objects/CeruleanMart.asm index 17835e6d..0f5a8276 100644 --- a/data/maps/objects/CeruleanMart.asm +++ b/data/maps/objects/CeruleanMart.asm @@ -2,8 +2,8 @@ CeruleanMart_Object: db $0 ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 5 - warp_event 4, 7, LAST_MAP, 5 + warp_event 3, 7, LAST_MAP, 6 + warp_event 4, 7, LAST_MAP, 6 def_bg_events diff --git a/data/maps/objects/CeruleanPokecenter.asm b/data/maps/objects/CeruleanPokecenter.asm index ac1216b2..eee0a0c6 100644 --- a/data/maps/objects/CeruleanPokecenter.asm +++ b/data/maps/objects/CeruleanPokecenter.asm @@ -2,8 +2,8 @@ CeruleanPokecenter_Object: db $0 ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 2 - warp_event 4, 7, LAST_MAP, 2 + warp_event 3, 7, LAST_MAP, 3 + warp_event 4, 7, LAST_MAP, 3 def_bg_events diff --git a/data/maps/objects/CeruleanTradeHouse.asm b/data/maps/objects/CeruleanTradeHouse.asm index 1defee42..52984832 100644 --- a/data/maps/objects/CeruleanTradeHouse.asm +++ b/data/maps/objects/CeruleanTradeHouse.asm @@ -2,8 +2,8 @@ CeruleanTradeHouse_Object: db $a ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 1 - warp_event 3, 7, LAST_MAP, 1 + warp_event 2, 7, LAST_MAP, 2 + warp_event 3, 7, LAST_MAP, 2 def_bg_events diff --git a/data/maps/objects/CeruleanTrashedHouse.asm b/data/maps/objects/CeruleanTrashedHouse.asm index 8cfec104..9dc28f08 100644 --- a/data/maps/objects/CeruleanTrashedHouse.asm +++ b/data/maps/objects/CeruleanTrashedHouse.asm @@ -2,9 +2,9 @@ CeruleanTrashedHouse_Object: db $a ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 0 - warp_event 3, 7, LAST_MAP, 0 - warp_event 3, 0, LAST_MAP, 7 + warp_event 2, 7, LAST_MAP, 1 + warp_event 3, 7, LAST_MAP, 1 + warp_event 3, 0, LAST_MAP, 8 def_bg_events bg_event 3, 0, 3 ; CeruleanHouseTrashedText3 diff --git a/data/maps/objects/ChampionsRoom.asm b/data/maps/objects/ChampionsRoom.asm index 85a16298..fa5efd8f 100644 --- a/data/maps/objects/ChampionsRoom.asm +++ b/data/maps/objects/ChampionsRoom.asm @@ -2,10 +2,10 @@ ChampionsRoom_Object: db $3 ; border block def_warp_events - warp_event 3, 7, LANCES_ROOM, 1 - warp_event 4, 7, LANCES_ROOM, 2 - warp_event 3, 0, HALL_OF_FAME, 0 - warp_event 4, 0, HALL_OF_FAME, 0 + warp_event 3, 7, LANCES_ROOM, 2 + warp_event 4, 7, LANCES_ROOM, 3 + warp_event 3, 0, HALL_OF_FAME, 1 + warp_event 4, 0, HALL_OF_FAME, 1 def_bg_events diff --git a/data/maps/objects/CinnabarGym.asm b/data/maps/objects/CinnabarGym.asm index 57cb2e76..a4ed8cda 100644 --- a/data/maps/objects/CinnabarGym.asm +++ b/data/maps/objects/CinnabarGym.asm @@ -2,8 +2,8 @@ CinnabarGym_Object: db $2e ; border block def_warp_events - warp_event 16, 17, LAST_MAP, 1 - warp_event 17, 17, LAST_MAP, 1 + warp_event 16, 17, LAST_MAP, 2 + warp_event 17, 17, LAST_MAP, 2 def_bg_events diff --git a/data/maps/objects/CinnabarIsland.asm b/data/maps/objects/CinnabarIsland.asm index cdfb5ba2..f3ca64fb 100644 --- a/data/maps/objects/CinnabarIsland.asm +++ b/data/maps/objects/CinnabarIsland.asm @@ -2,11 +2,11 @@ CinnabarIsland_Object: db $43 ; border block def_warp_events - warp_event 6, 3, POKEMON_MANSION_1F, 1 - warp_event 18, 3, CINNABAR_GYM, 0 - warp_event 6, 9, CINNABAR_LAB, 0 - warp_event 11, 11, CINNABAR_POKECENTER, 0 - warp_event 15, 11, CINNABAR_MART, 0 + warp_event 6, 3, POKEMON_MANSION_1F, 2 + warp_event 18, 3, CINNABAR_GYM, 1 + warp_event 6, 9, CINNABAR_LAB, 1 + warp_event 11, 11, CINNABAR_POKECENTER, 1 + warp_event 15, 11, CINNABAR_MART, 1 def_bg_events bg_event 9, 5, 3 ; CinnabarIslandText3 diff --git a/data/maps/objects/CinnabarLab.asm b/data/maps/objects/CinnabarLab.asm index 3c8507e8..3737843c 100644 --- a/data/maps/objects/CinnabarLab.asm +++ b/data/maps/objects/CinnabarLab.asm @@ -2,11 +2,11 @@ CinnabarLab_Object: db $17 ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 2 - warp_event 3, 7, LAST_MAP, 2 - warp_event 8, 4, CINNABAR_LAB_TRADE_ROOM, 0 - warp_event 12, 4, CINNABAR_LAB_METRONOME_ROOM, 0 - warp_event 16, 4, CINNABAR_LAB_FOSSIL_ROOM, 0 + warp_event 2, 7, LAST_MAP, 3 + warp_event 3, 7, LAST_MAP, 3 + warp_event 8, 4, CINNABAR_LAB_TRADE_ROOM, 1 + warp_event 12, 4, CINNABAR_LAB_METRONOME_ROOM, 1 + warp_event 16, 4, CINNABAR_LAB_FOSSIL_ROOM, 1 def_bg_events bg_event 3, 2, 2 ; Lab1Text2 diff --git a/data/maps/objects/CinnabarLabFossilRoom.asm b/data/maps/objects/CinnabarLabFossilRoom.asm index 9e8c664c..29a805f7 100644 --- a/data/maps/objects/CinnabarLabFossilRoom.asm +++ b/data/maps/objects/CinnabarLabFossilRoom.asm @@ -2,8 +2,8 @@ CinnabarLabFossilRoom_Object: db $17 ; border block def_warp_events - warp_event 2, 7, CINNABAR_LAB, 4 - warp_event 3, 7, CINNABAR_LAB, 4 + warp_event 2, 7, CINNABAR_LAB, 5 + warp_event 3, 7, CINNABAR_LAB, 5 def_bg_events diff --git a/data/maps/objects/CinnabarLabMetronomeRoom.asm b/data/maps/objects/CinnabarLabMetronomeRoom.asm index f4a96582..ceadc217 100644 --- a/data/maps/objects/CinnabarLabMetronomeRoom.asm +++ b/data/maps/objects/CinnabarLabMetronomeRoom.asm @@ -2,8 +2,8 @@ CinnabarLabMetronomeRoom_Object: db $17 ; border block def_warp_events - warp_event 2, 7, CINNABAR_LAB, 3 - warp_event 3, 7, CINNABAR_LAB, 3 + warp_event 2, 7, CINNABAR_LAB, 4 + warp_event 3, 7, CINNABAR_LAB, 4 def_bg_events bg_event 0, 4, 3 ; Lab3Text3 diff --git a/data/maps/objects/CinnabarLabTradeRoom.asm b/data/maps/objects/CinnabarLabTradeRoom.asm index bbb66069..11702821 100644 --- a/data/maps/objects/CinnabarLabTradeRoom.asm +++ b/data/maps/objects/CinnabarLabTradeRoom.asm @@ -2,8 +2,8 @@ CinnabarLabTradeRoom_Object: db $17 ; border block def_warp_events - warp_event 2, 7, CINNABAR_LAB, 2 - warp_event 3, 7, CINNABAR_LAB, 2 + warp_event 2, 7, CINNABAR_LAB, 3 + warp_event 3, 7, CINNABAR_LAB, 3 def_bg_events diff --git a/data/maps/objects/CinnabarMart.asm b/data/maps/objects/CinnabarMart.asm index e742434e..e91d18b2 100644 --- a/data/maps/objects/CinnabarMart.asm +++ b/data/maps/objects/CinnabarMart.asm @@ -2,8 +2,8 @@ CinnabarMart_Object: db $0 ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 4 - warp_event 4, 7, LAST_MAP, 4 + warp_event 3, 7, LAST_MAP, 5 + warp_event 4, 7, LAST_MAP, 5 def_bg_events diff --git a/data/maps/objects/CinnabarPokecenter.asm b/data/maps/objects/CinnabarPokecenter.asm index 95fe1342..75d11926 100644 --- a/data/maps/objects/CinnabarPokecenter.asm +++ b/data/maps/objects/CinnabarPokecenter.asm @@ -2,8 +2,8 @@ CinnabarPokecenter_Object: db $0 ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 3 - warp_event 4, 7, LAST_MAP, 3 + warp_event 3, 7, LAST_MAP, 4 + warp_event 4, 7, LAST_MAP, 4 def_bg_events diff --git a/data/maps/objects/CopycatsHouse1F.asm b/data/maps/objects/CopycatsHouse1F.asm index 3521560b..0a3705f4 100644 --- a/data/maps/objects/CopycatsHouse1F.asm +++ b/data/maps/objects/CopycatsHouse1F.asm @@ -2,9 +2,9 @@ CopycatsHouse1F_Object: db $a ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 0 - warp_event 3, 7, LAST_MAP, 0 - warp_event 7, 1, COPYCATS_HOUSE_2F, 0 + warp_event 2, 7, LAST_MAP, 1 + warp_event 3, 7, LAST_MAP, 1 + warp_event 7, 1, COPYCATS_HOUSE_2F, 1 def_bg_events diff --git a/data/maps/objects/CopycatsHouse2F.asm b/data/maps/objects/CopycatsHouse2F.asm index 6822a5e6..86449065 100644 --- a/data/maps/objects/CopycatsHouse2F.asm +++ b/data/maps/objects/CopycatsHouse2F.asm @@ -2,7 +2,7 @@ CopycatsHouse2F_Object: db $a ; border block def_warp_events - warp_event 7, 1, COPYCATS_HOUSE_1F, 2 + warp_event 7, 1, COPYCATS_HOUSE_1F, 3 def_bg_events bg_event 3, 5, 6 ; CopycatsHouse2FText6 diff --git a/data/maps/objects/Daycare.asm b/data/maps/objects/Daycare.asm index 695ae179..f3ece1a9 100644 --- a/data/maps/objects/Daycare.asm +++ b/data/maps/objects/Daycare.asm @@ -2,8 +2,8 @@ Daycare_Object: db $a ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 4 - warp_event 3, 7, LAST_MAP, 4 + warp_event 2, 7, LAST_MAP, 5 + warp_event 3, 7, LAST_MAP, 5 def_bg_events diff --git a/data/maps/objects/DiglettsCave.asm b/data/maps/objects/DiglettsCave.asm index 1b9ae6a2..8ada664a 100644 --- a/data/maps/objects/DiglettsCave.asm +++ b/data/maps/objects/DiglettsCave.asm @@ -2,8 +2,8 @@ DiglettsCave_Object: db $19 ; border block def_warp_events - warp_event 5, 5, DIGLETTS_CAVE_ROUTE_2, 2 - warp_event 37, 31, DIGLETTS_CAVE_ROUTE_11, 2 + warp_event 5, 5, DIGLETTS_CAVE_ROUTE_2, 3 + warp_event 37, 31, DIGLETTS_CAVE_ROUTE_11, 3 def_bg_events diff --git a/data/maps/objects/DiglettsCaveRoute11.asm b/data/maps/objects/DiglettsCaveRoute11.asm index 2f5bd5a0..a0aa3ddb 100644 --- a/data/maps/objects/DiglettsCaveRoute11.asm +++ b/data/maps/objects/DiglettsCaveRoute11.asm @@ -2,9 +2,9 @@ DiglettsCaveRoute11_Object: db $7d ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 4 - warp_event 3, 7, LAST_MAP, 4 - warp_event 4, 4, DIGLETTS_CAVE, 1 + warp_event 2, 7, LAST_MAP, 5 + warp_event 3, 7, LAST_MAP, 5 + warp_event 4, 4, DIGLETTS_CAVE, 2 def_bg_events diff --git a/data/maps/objects/DiglettsCaveRoute2.asm b/data/maps/objects/DiglettsCaveRoute2.asm index 340d811d..c8dc0561 100644 --- a/data/maps/objects/DiglettsCaveRoute2.asm +++ b/data/maps/objects/DiglettsCaveRoute2.asm @@ -2,9 +2,9 @@ DiglettsCaveRoute2_Object: db $7d ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 0 - warp_event 3, 7, LAST_MAP, 0 - warp_event 4, 4, DIGLETTS_CAVE, 0 + warp_event 2, 7, LAST_MAP, 1 + warp_event 3, 7, LAST_MAP, 1 + warp_event 4, 4, DIGLETTS_CAVE, 1 def_bg_events diff --git a/data/maps/objects/FightingDojo.asm b/data/maps/objects/FightingDojo.asm index 85f34048..808abf71 100644 --- a/data/maps/objects/FightingDojo.asm +++ b/data/maps/objects/FightingDojo.asm @@ -2,8 +2,8 @@ FightingDojo_Object: db $3 ; border block def_warp_events - warp_event 4, 11, LAST_MAP, 1 - warp_event 5, 11, LAST_MAP, 1 + warp_event 4, 11, LAST_MAP, 2 + warp_event 5, 11, LAST_MAP, 2 def_bg_events diff --git a/data/maps/objects/FuchsiaBillsGrandpasHouse.asm b/data/maps/objects/FuchsiaBillsGrandpasHouse.asm index d397765d..2369e7d0 100644 --- a/data/maps/objects/FuchsiaBillsGrandpasHouse.asm +++ b/data/maps/objects/FuchsiaBillsGrandpasHouse.asm @@ -2,8 +2,8 @@ FuchsiaBillsGrandpasHouse_Object: db $a ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 1 - warp_event 3, 7, LAST_MAP, 1 + warp_event 2, 7, LAST_MAP, 2 + warp_event 3, 7, LAST_MAP, 2 def_bg_events diff --git a/data/maps/objects/FuchsiaCity.asm b/data/maps/objects/FuchsiaCity.asm index 291d30bc..c8ff36e6 100644 --- a/data/maps/objects/FuchsiaCity.asm +++ b/data/maps/objects/FuchsiaCity.asm @@ -2,15 +2,15 @@ FuchsiaCity_Object: db $f ; border block def_warp_events - warp_event 5, 13, FUCHSIA_MART, 0 - warp_event 11, 27, FUCHSIA_BILLS_GRANDPAS_HOUSE, 0 - warp_event 19, 27, FUCHSIA_POKECENTER, 0 - warp_event 27, 27, WARDENS_HOUSE, 0 - warp_event 18, 3, SAFARI_ZONE_GATE, 0 - warp_event 5, 27, FUCHSIA_GYM, 0 - warp_event 22, 13, FUCHSIA_MEETING_ROOM, 0 - warp_event 31, 27, FUCHSIA_GOOD_ROD_HOUSE, 1 - warp_event 31, 24, FUCHSIA_GOOD_ROD_HOUSE, 0 + warp_event 5, 13, FUCHSIA_MART, 1 + warp_event 11, 27, FUCHSIA_BILLS_GRANDPAS_HOUSE, 1 + warp_event 19, 27, FUCHSIA_POKECENTER, 1 + warp_event 27, 27, WARDENS_HOUSE, 1 + warp_event 18, 3, SAFARI_ZONE_GATE, 1 + warp_event 5, 27, FUCHSIA_GYM, 1 + warp_event 22, 13, FUCHSIA_MEETING_ROOM, 1 + warp_event 31, 27, FUCHSIA_GOOD_ROD_HOUSE, 2 + warp_event 31, 24, FUCHSIA_GOOD_ROD_HOUSE, 1 def_bg_events bg_event 15, 23, 11 ; FuchsiaCityText11 diff --git a/data/maps/objects/FuchsiaGoodRodHouse.asm b/data/maps/objects/FuchsiaGoodRodHouse.asm index 2d3f3c93..483734cd 100644 --- a/data/maps/objects/FuchsiaGoodRodHouse.asm +++ b/data/maps/objects/FuchsiaGoodRodHouse.asm @@ -2,9 +2,9 @@ FuchsiaGoodRodHouse_Object: db $c ; border block def_warp_events - warp_event 2, 0, LAST_MAP, 8 - warp_event 2, 7, LAST_MAP, 7 - warp_event 3, 7, LAST_MAP, 7 + warp_event 2, 0, LAST_MAP, 9 + warp_event 2, 7, LAST_MAP, 8 + warp_event 3, 7, LAST_MAP, 8 def_bg_events diff --git a/data/maps/objects/FuchsiaGym.asm b/data/maps/objects/FuchsiaGym.asm index 06dc06e2..9c39cb5e 100644 --- a/data/maps/objects/FuchsiaGym.asm +++ b/data/maps/objects/FuchsiaGym.asm @@ -2,8 +2,8 @@ FuchsiaGym_Object: db $3 ; border block def_warp_events - warp_event 4, 17, LAST_MAP, 5 - warp_event 5, 17, LAST_MAP, 5 + warp_event 4, 17, LAST_MAP, 6 + warp_event 5, 17, LAST_MAP, 6 def_bg_events diff --git a/data/maps/objects/FuchsiaMart.asm b/data/maps/objects/FuchsiaMart.asm index e6d6f445..04055fbd 100644 --- a/data/maps/objects/FuchsiaMart.asm +++ b/data/maps/objects/FuchsiaMart.asm @@ -2,8 +2,8 @@ FuchsiaMart_Object: db $0 ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 0 - warp_event 4, 7, LAST_MAP, 0 + warp_event 3, 7, LAST_MAP, 1 + warp_event 4, 7, LAST_MAP, 1 def_bg_events diff --git a/data/maps/objects/FuchsiaMeetingRoom.asm b/data/maps/objects/FuchsiaMeetingRoom.asm index 509a34b2..2e4ac72a 100644 --- a/data/maps/objects/FuchsiaMeetingRoom.asm +++ b/data/maps/objects/FuchsiaMeetingRoom.asm @@ -2,8 +2,8 @@ FuchsiaMeetingRoom_Object: db $17 ; border block def_warp_events - warp_event 4, 7, LAST_MAP, 6 - warp_event 5, 7, LAST_MAP, 6 + warp_event 4, 7, LAST_MAP, 7 + warp_event 5, 7, LAST_MAP, 7 def_bg_events diff --git a/data/maps/objects/FuchsiaPokecenter.asm b/data/maps/objects/FuchsiaPokecenter.asm index 79e99b9b..84404b09 100644 --- a/data/maps/objects/FuchsiaPokecenter.asm +++ b/data/maps/objects/FuchsiaPokecenter.asm @@ -2,8 +2,8 @@ FuchsiaPokecenter_Object: db $0 ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 2 - warp_event 4, 7, LAST_MAP, 2 + warp_event 3, 7, LAST_MAP, 3 + warp_event 4, 7, LAST_MAP, 3 def_bg_events diff --git a/data/maps/objects/GameCorner.asm b/data/maps/objects/GameCorner.asm index 7f568174..2b4c8f72 100644 --- a/data/maps/objects/GameCorner.asm +++ b/data/maps/objects/GameCorner.asm @@ -2,9 +2,9 @@ GameCorner_Object: db $f ; border block def_warp_events - warp_event 15, 17, LAST_MAP, 7 - warp_event 16, 17, LAST_MAP, 7 - warp_event 17, 4, ROCKET_HIDEOUT_B1F, 1 + warp_event 15, 17, LAST_MAP, 8 + warp_event 16, 17, LAST_MAP, 8 + warp_event 17, 4, ROCKET_HIDEOUT_B1F, 2 def_bg_events bg_event 9, 4, 12 ; CeladonGameCornerText12 diff --git a/data/maps/objects/GameCornerPrizeRoom.asm b/data/maps/objects/GameCornerPrizeRoom.asm index db149c60..b79e52ef 100644 --- a/data/maps/objects/GameCornerPrizeRoom.asm +++ b/data/maps/objects/GameCornerPrizeRoom.asm @@ -2,8 +2,8 @@ GameCornerPrizeRoom_Object: db $f ; border block def_warp_events - warp_event 4, 7, LAST_MAP, 9 - warp_event 5, 7, LAST_MAP, 9 + warp_event 4, 7, LAST_MAP, 10 + warp_event 5, 7, LAST_MAP, 10 def_bg_events bg_event 2, 2, 3 ; CeladonPrizeRoomText3 diff --git a/data/maps/objects/HallOfFame.asm b/data/maps/objects/HallOfFame.asm index 0db4f56c..31b9f8a2 100644 --- a/data/maps/objects/HallOfFame.asm +++ b/data/maps/objects/HallOfFame.asm @@ -2,8 +2,8 @@ HallOfFame_Object: db $3 ; border block def_warp_events - warp_event 4, 7, CHAMPIONS_ROOM, 2 - warp_event 5, 7, CHAMPIONS_ROOM, 3 + warp_event 4, 7, CHAMPIONS_ROOM, 3 + warp_event 5, 7, CHAMPIONS_ROOM, 4 def_bg_events diff --git a/data/maps/objects/IndigoPlateau.asm b/data/maps/objects/IndigoPlateau.asm index 63eb5381..d6b0e0db 100644 --- a/data/maps/objects/IndigoPlateau.asm +++ b/data/maps/objects/IndigoPlateau.asm @@ -2,8 +2,8 @@ IndigoPlateau_Object: db $e ; border block def_warp_events - warp_event 9, 5, INDIGO_PLATEAU_LOBBY, 0 - warp_event 10, 5, INDIGO_PLATEAU_LOBBY, 0 + warp_event 9, 5, INDIGO_PLATEAU_LOBBY, 1 + warp_event 10, 5, INDIGO_PLATEAU_LOBBY, 1 def_bg_events diff --git a/data/maps/objects/IndigoPlateauLobby.asm b/data/maps/objects/IndigoPlateauLobby.asm index d8eaf97c..fd3d07ba 100644 --- a/data/maps/objects/IndigoPlateauLobby.asm +++ b/data/maps/objects/IndigoPlateauLobby.asm @@ -2,9 +2,9 @@ IndigoPlateauLobby_Object: db $0 ; border block def_warp_events - warp_event 7, 11, LAST_MAP, 0 - warp_event 8, 11, LAST_MAP, 1 - warp_event 8, 0, LORELEIS_ROOM, 0 + warp_event 7, 11, LAST_MAP, 1 + warp_event 8, 11, LAST_MAP, 2 + warp_event 8, 0, LORELEIS_ROOM, 1 def_bg_events diff --git a/data/maps/objects/LancesRoom.asm b/data/maps/objects/LancesRoom.asm index 53848141..c9334b3a 100644 --- a/data/maps/objects/LancesRoom.asm +++ b/data/maps/objects/LancesRoom.asm @@ -2,9 +2,9 @@ LancesRoom_Object: db $3 ; border block def_warp_events - warp_event 24, 16, AGATHAS_ROOM, 2 - warp_event 5, 0, CHAMPIONS_ROOM, 0 - warp_event 6, 0, CHAMPIONS_ROOM, 0 + warp_event 24, 16, AGATHAS_ROOM, 3 + warp_event 5, 0, CHAMPIONS_ROOM, 1 + warp_event 6, 0, CHAMPIONS_ROOM, 1 def_bg_events diff --git a/data/maps/objects/LavenderCuboneHouse.asm b/data/maps/objects/LavenderCuboneHouse.asm index c6802c7a..35e6f874 100644 --- a/data/maps/objects/LavenderCuboneHouse.asm +++ b/data/maps/objects/LavenderCuboneHouse.asm @@ -2,8 +2,8 @@ LavenderCuboneHouse_Object: db $a ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 4 - warp_event 3, 7, LAST_MAP, 4 + warp_event 2, 7, LAST_MAP, 5 + warp_event 3, 7, LAST_MAP, 5 def_bg_events diff --git a/data/maps/objects/LavenderMart.asm b/data/maps/objects/LavenderMart.asm index 5deeba7c..28a9c236 100644 --- a/data/maps/objects/LavenderMart.asm +++ b/data/maps/objects/LavenderMart.asm @@ -2,8 +2,8 @@ LavenderMart_Object: db $0 ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 3 - warp_event 4, 7, LAST_MAP, 3 + warp_event 3, 7, LAST_MAP, 4 + warp_event 4, 7, LAST_MAP, 4 def_bg_events diff --git a/data/maps/objects/LavenderPokecenter.asm b/data/maps/objects/LavenderPokecenter.asm index 5e397a65..99c29528 100644 --- a/data/maps/objects/LavenderPokecenter.asm +++ b/data/maps/objects/LavenderPokecenter.asm @@ -2,8 +2,8 @@ LavenderPokecenter_Object: db $0 ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 0 - warp_event 4, 7, LAST_MAP, 0 + warp_event 3, 7, LAST_MAP, 1 + warp_event 4, 7, LAST_MAP, 1 def_bg_events diff --git a/data/maps/objects/LavenderTown.asm b/data/maps/objects/LavenderTown.asm index 973ed5eb..e2601721 100644 --- a/data/maps/objects/LavenderTown.asm +++ b/data/maps/objects/LavenderTown.asm @@ -2,12 +2,12 @@ LavenderTown_Object: db $2c ; border block def_warp_events - warp_event 3, 5, LAVENDER_POKECENTER, 0 - warp_event 14, 5, POKEMON_TOWER_1F, 0 - warp_event 7, 9, MR_FUJIS_HOUSE, 0 - warp_event 15, 13, LAVENDER_MART, 0 - warp_event 3, 13, LAVENDER_CUBONE_HOUSE, 0 - warp_event 7, 13, NAME_RATERS_HOUSE, 0 + warp_event 3, 5, LAVENDER_POKECENTER, 1 + warp_event 14, 5, POKEMON_TOWER_1F, 1 + warp_event 7, 9, MR_FUJIS_HOUSE, 1 + warp_event 15, 13, LAVENDER_MART, 1 + warp_event 3, 13, LAVENDER_CUBONE_HOUSE, 1 + warp_event 7, 13, NAME_RATERS_HOUSE, 1 def_bg_events bg_event 11, 9, 4 ; LavenderTownText4 diff --git a/data/maps/objects/LoreleisRoom.asm b/data/maps/objects/LoreleisRoom.asm index 3c4d1afa..1db058e4 100644 --- a/data/maps/objects/LoreleisRoom.asm +++ b/data/maps/objects/LoreleisRoom.asm @@ -2,10 +2,10 @@ LoreleisRoom_Object: db $3 ; border block def_warp_events - warp_event 4, 11, INDIGO_PLATEAU_LOBBY, 2 - warp_event 5, 11, INDIGO_PLATEAU_LOBBY, 2 - warp_event 4, 0, BRUNOS_ROOM, 0 - warp_event 5, 0, BRUNOS_ROOM, 1 + warp_event 4, 11, INDIGO_PLATEAU_LOBBY, 3 + warp_event 5, 11, INDIGO_PLATEAU_LOBBY, 3 + warp_event 4, 0, BRUNOS_ROOM, 1 + warp_event 5, 0, BRUNOS_ROOM, 2 def_bg_events diff --git a/data/maps/objects/MrFujisHouse.asm b/data/maps/objects/MrFujisHouse.asm index 36e8f1a0..c84b8637 100644 --- a/data/maps/objects/MrFujisHouse.asm +++ b/data/maps/objects/MrFujisHouse.asm @@ -2,8 +2,8 @@ MrFujisHouse_Object: db $a ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 2 - warp_event 3, 7, LAST_MAP, 2 + warp_event 2, 7, LAST_MAP, 3 + warp_event 3, 7, LAST_MAP, 3 def_bg_events diff --git a/data/maps/objects/MrPsychicsHouse.asm b/data/maps/objects/MrPsychicsHouse.asm index 31a9146d..c5180c6f 100644 --- a/data/maps/objects/MrPsychicsHouse.asm +++ b/data/maps/objects/MrPsychicsHouse.asm @@ -2,8 +2,8 @@ MrPsychicsHouse_Object: db $a ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 7 - warp_event 3, 7, LAST_MAP, 7 + warp_event 2, 7, LAST_MAP, 8 + warp_event 3, 7, LAST_MAP, 8 def_bg_events diff --git a/data/maps/objects/MtMoon1F.asm b/data/maps/objects/MtMoon1F.asm index a1659889..4a6c095d 100644 --- a/data/maps/objects/MtMoon1F.asm +++ b/data/maps/objects/MtMoon1F.asm @@ -2,11 +2,11 @@ MtMoon1F_Object: db $3 ; border block def_warp_events - warp_event 14, 35, LAST_MAP, 1 - warp_event 15, 35, LAST_MAP, 1 - warp_event 5, 5, MT_MOON_B1F, 0 - warp_event 17, 11, MT_MOON_B1F, 2 - warp_event 25, 15, MT_MOON_B1F, 3 + warp_event 14, 35, LAST_MAP, 2 + warp_event 15, 35, LAST_MAP, 2 + warp_event 5, 5, MT_MOON_B1F, 1 + warp_event 17, 11, MT_MOON_B1F, 3 + warp_event 25, 15, MT_MOON_B1F, 4 def_bg_events bg_event 15, 23, 14 ; MtMoon1Text14 diff --git a/data/maps/objects/MtMoonB1F.asm b/data/maps/objects/MtMoonB1F.asm index 831618e9..a989a295 100644 --- a/data/maps/objects/MtMoonB1F.asm +++ b/data/maps/objects/MtMoonB1F.asm @@ -2,14 +2,14 @@ MtMoonB1F_Object: db $3 ; border block def_warp_events - warp_event 5, 5, MT_MOON_1F, 2 - warp_event 17, 11, MT_MOON_B2F, 0 - warp_event 25, 9, MT_MOON_1F, 3 - warp_event 25, 15, MT_MOON_1F, 4 - warp_event 21, 17, MT_MOON_B2F, 1 - warp_event 13, 27, MT_MOON_B2F, 2 - warp_event 23, 3, MT_MOON_B2F, 3 - warp_event 27, 3, LAST_MAP, 2 + warp_event 5, 5, MT_MOON_1F, 3 + warp_event 17, 11, MT_MOON_B2F, 1 + warp_event 25, 9, MT_MOON_1F, 4 + warp_event 25, 15, MT_MOON_1F, 5 + warp_event 21, 17, MT_MOON_B2F, 2 + warp_event 13, 27, MT_MOON_B2F, 3 + warp_event 23, 3, MT_MOON_B2F, 4 + warp_event 27, 3, LAST_MAP, 3 def_bg_events diff --git a/data/maps/objects/MtMoonB2F.asm b/data/maps/objects/MtMoonB2F.asm index 7e49d1c5..43c7db88 100644 --- a/data/maps/objects/MtMoonB2F.asm +++ b/data/maps/objects/MtMoonB2F.asm @@ -2,10 +2,10 @@ MtMoonB2F_Object: db $3 ; border block def_warp_events - warp_event 25, 9, MT_MOON_B1F, 1 - warp_event 21, 17, MT_MOON_B1F, 4 - warp_event 15, 27, MT_MOON_B1F, 5 - warp_event 5, 7, MT_MOON_B1F, 6 + warp_event 25, 9, MT_MOON_B1F, 2 + warp_event 21, 17, MT_MOON_B1F, 5 + warp_event 15, 27, MT_MOON_B1F, 6 + warp_event 5, 7, MT_MOON_B1F, 7 def_bg_events diff --git a/data/maps/objects/MtMoonPokecenter.asm b/data/maps/objects/MtMoonPokecenter.asm index 2cf049ab..382c67dd 100644 --- a/data/maps/objects/MtMoonPokecenter.asm +++ b/data/maps/objects/MtMoonPokecenter.asm @@ -2,8 +2,8 @@ MtMoonPokecenter_Object: db $0 ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 0 - warp_event 4, 7, LAST_MAP, 0 + warp_event 3, 7, LAST_MAP, 1 + warp_event 4, 7, LAST_MAP, 1 def_bg_events diff --git a/data/maps/objects/Museum1F.asm b/data/maps/objects/Museum1F.asm index aae73366..edbe63c9 100644 --- a/data/maps/objects/Museum1F.asm +++ b/data/maps/objects/Museum1F.asm @@ -2,11 +2,11 @@ Museum1F_Object: db $a ; border block def_warp_events - warp_event 10, 7, LAST_MAP, 0 - warp_event 11, 7, LAST_MAP, 0 - warp_event 16, 7, LAST_MAP, 1 - warp_event 17, 7, LAST_MAP, 1 - warp_event 7, 7, MUSEUM_2F, 0 + warp_event 10, 7, LAST_MAP, 1 + warp_event 11, 7, LAST_MAP, 1 + warp_event 16, 7, LAST_MAP, 2 + warp_event 17, 7, LAST_MAP, 2 + warp_event 7, 7, MUSEUM_2F, 1 def_bg_events diff --git a/data/maps/objects/Museum2F.asm b/data/maps/objects/Museum2F.asm index fbf5cffe..061833ca 100644 --- a/data/maps/objects/Museum2F.asm +++ b/data/maps/objects/Museum2F.asm @@ -2,7 +2,7 @@ Museum2F_Object: db $a ; border block def_warp_events - warp_event 7, 7, MUSEUM_1F, 4 + warp_event 7, 7, MUSEUM_1F, 5 def_bg_events bg_event 11, 2, 6 ; Museum2FText6 diff --git a/data/maps/objects/NameRatersHouse.asm b/data/maps/objects/NameRatersHouse.asm index 4c2c490b..0568af76 100644 --- a/data/maps/objects/NameRatersHouse.asm +++ b/data/maps/objects/NameRatersHouse.asm @@ -2,8 +2,8 @@ NameRatersHouse_Object: db $a ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 5 - warp_event 3, 7, LAST_MAP, 5 + warp_event 2, 7, LAST_MAP, 6 + warp_event 3, 7, LAST_MAP, 6 def_bg_events diff --git a/data/maps/objects/OaksLab.asm b/data/maps/objects/OaksLab.asm index 6f654f6e..7fc869ef 100644 --- a/data/maps/objects/OaksLab.asm +++ b/data/maps/objects/OaksLab.asm @@ -2,8 +2,8 @@ OaksLab_Object: db $3 ; border block def_warp_events - warp_event 4, 11, LAST_MAP, 2 - warp_event 5, 11, LAST_MAP, 2 + warp_event 4, 11, LAST_MAP, 3 + warp_event 5, 11, LAST_MAP, 3 def_bg_events diff --git a/data/maps/objects/PalletTown.asm b/data/maps/objects/PalletTown.asm index cd760731..1343f0cd 100644 --- a/data/maps/objects/PalletTown.asm +++ b/data/maps/objects/PalletTown.asm @@ -2,9 +2,9 @@ PalletTown_Object: db $b ; border block def_warp_events - warp_event 5, 5, REDS_HOUSE_1F, 0 - warp_event 13, 5, BLUES_HOUSE, 0 - warp_event 12, 11, OAKS_LAB, 1 + warp_event 5, 5, REDS_HOUSE_1F, 1 + warp_event 13, 5, BLUES_HOUSE, 1 + warp_event 12, 11, OAKS_LAB, 2 def_bg_events bg_event 13, 13, 4 ; PalletTownText4 diff --git a/data/maps/objects/PewterCity.asm b/data/maps/objects/PewterCity.asm index fa3f794c..4a8e2323 100644 --- a/data/maps/objects/PewterCity.asm +++ b/data/maps/objects/PewterCity.asm @@ -2,13 +2,13 @@ PewterCity_Object: db $a ; border block def_warp_events - warp_event 14, 7, MUSEUM_1F, 0 - warp_event 19, 5, MUSEUM_1F, 2 - warp_event 16, 17, PEWTER_GYM, 0 - warp_event 29, 13, PEWTER_NIDORAN_HOUSE, 0 - warp_event 23, 17, PEWTER_MART, 0 - warp_event 7, 29, PEWTER_SPEECH_HOUSE, 0 - warp_event 13, 25, PEWTER_POKECENTER, 0 + warp_event 14, 7, MUSEUM_1F, 1 + warp_event 19, 5, MUSEUM_1F, 3 + warp_event 16, 17, PEWTER_GYM, 1 + warp_event 29, 13, PEWTER_NIDORAN_HOUSE, 1 + warp_event 23, 17, PEWTER_MART, 1 + warp_event 7, 29, PEWTER_SPEECH_HOUSE, 1 + warp_event 13, 25, PEWTER_POKECENTER, 1 def_bg_events bg_event 19, 29, 6 ; PewterCityText6 diff --git a/data/maps/objects/PewterGym.asm b/data/maps/objects/PewterGym.asm index 25d32486..cfaeefbf 100644 --- a/data/maps/objects/PewterGym.asm +++ b/data/maps/objects/PewterGym.asm @@ -2,8 +2,8 @@ PewterGym_Object: db $3 ; border block def_warp_events - warp_event 4, 13, LAST_MAP, 2 - warp_event 5, 13, LAST_MAP, 2 + warp_event 4, 13, LAST_MAP, 3 + warp_event 5, 13, LAST_MAP, 3 def_bg_events diff --git a/data/maps/objects/PewterMart.asm b/data/maps/objects/PewterMart.asm index e34b7686..ad804c6b 100644 --- a/data/maps/objects/PewterMart.asm +++ b/data/maps/objects/PewterMart.asm @@ -2,8 +2,8 @@ PewterMart_Object: db $0 ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 4 - warp_event 4, 7, LAST_MAP, 4 + warp_event 3, 7, LAST_MAP, 5 + warp_event 4, 7, LAST_MAP, 5 def_bg_events diff --git a/data/maps/objects/PewterNidoranHouse.asm b/data/maps/objects/PewterNidoranHouse.asm index 3b08d2df..93924d01 100644 --- a/data/maps/objects/PewterNidoranHouse.asm +++ b/data/maps/objects/PewterNidoranHouse.asm @@ -2,8 +2,8 @@ PewterNidoranHouse_Object: db $a ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 3 - warp_event 3, 7, LAST_MAP, 3 + warp_event 2, 7, LAST_MAP, 4 + warp_event 3, 7, LAST_MAP, 4 def_bg_events diff --git a/data/maps/objects/PewterPokecenter.asm b/data/maps/objects/PewterPokecenter.asm index cd422f58..9d9e8e58 100644 --- a/data/maps/objects/PewterPokecenter.asm +++ b/data/maps/objects/PewterPokecenter.asm @@ -2,8 +2,8 @@ PewterPokecenter_Object: db $0 ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 6 - warp_event 4, 7, LAST_MAP, 6 + warp_event 3, 7, LAST_MAP, 7 + warp_event 4, 7, LAST_MAP, 7 def_bg_events diff --git a/data/maps/objects/PewterSpeechHouse.asm b/data/maps/objects/PewterSpeechHouse.asm index 0cd96a67..a6896c43 100644 --- a/data/maps/objects/PewterSpeechHouse.asm +++ b/data/maps/objects/PewterSpeechHouse.asm @@ -2,8 +2,8 @@ PewterSpeechHouse_Object: db $a ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 5 - warp_event 3, 7, LAST_MAP, 5 + warp_event 2, 7, LAST_MAP, 6 + warp_event 3, 7, LAST_MAP, 6 def_bg_events diff --git a/data/maps/objects/PokemonFanClub.asm b/data/maps/objects/PokemonFanClub.asm index e089f65d..c7d815f2 100644 --- a/data/maps/objects/PokemonFanClub.asm +++ b/data/maps/objects/PokemonFanClub.asm @@ -2,8 +2,8 @@ PokemonFanClub_Object: db $d ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 1 - warp_event 3, 7, LAST_MAP, 1 + warp_event 2, 7, LAST_MAP, 2 + warp_event 3, 7, LAST_MAP, 2 def_bg_events bg_event 1, 0, 7 ; FanClubText7 diff --git a/data/maps/objects/PokemonMansion1F.asm b/data/maps/objects/PokemonMansion1F.asm index 69003a3f..5568f7fe 100644 --- a/data/maps/objects/PokemonMansion1F.asm +++ b/data/maps/objects/PokemonMansion1F.asm @@ -2,14 +2,14 @@ PokemonMansion1F_Object: db $2e ; border block def_warp_events - warp_event 4, 27, LAST_MAP, 0 - warp_event 5, 27, LAST_MAP, 0 - warp_event 6, 27, LAST_MAP, 0 - warp_event 7, 27, LAST_MAP, 0 - warp_event 5, 10, POKEMON_MANSION_2F, 0 - warp_event 21, 23, POKEMON_MANSION_B1F, 0 - warp_event 26, 27, LAST_MAP, 0 - warp_event 27, 27, LAST_MAP, 0 + warp_event 4, 27, LAST_MAP, 1 + warp_event 5, 27, LAST_MAP, 1 + warp_event 6, 27, LAST_MAP, 1 + warp_event 7, 27, LAST_MAP, 1 + warp_event 5, 10, POKEMON_MANSION_2F, 1 + warp_event 21, 23, POKEMON_MANSION_B1F, 1 + warp_event 26, 27, LAST_MAP, 1 + warp_event 27, 27, LAST_MAP, 1 def_bg_events diff --git a/data/maps/objects/PokemonMansion2F.asm b/data/maps/objects/PokemonMansion2F.asm index eebd1336..52b65885 100644 --- a/data/maps/objects/PokemonMansion2F.asm +++ b/data/maps/objects/PokemonMansion2F.asm @@ -2,10 +2,10 @@ PokemonMansion2F_Object: db $1 ; border block def_warp_events - warp_event 5, 10, POKEMON_MANSION_1F, 4 - warp_event 7, 10, POKEMON_MANSION_3F, 0 - warp_event 25, 14, POKEMON_MANSION_3F, 2 - warp_event 6, 1, POKEMON_MANSION_3F, 1 + warp_event 5, 10, POKEMON_MANSION_1F, 5 + warp_event 7, 10, POKEMON_MANSION_3F, 1 + warp_event 25, 14, POKEMON_MANSION_3F, 3 + warp_event 6, 1, POKEMON_MANSION_3F, 2 def_bg_events diff --git a/data/maps/objects/PokemonMansion3F.asm b/data/maps/objects/PokemonMansion3F.asm index bf767252..b67e13bc 100644 --- a/data/maps/objects/PokemonMansion3F.asm +++ b/data/maps/objects/PokemonMansion3F.asm @@ -2,9 +2,9 @@ PokemonMansion3F_Object: db $1 ; border block def_warp_events - warp_event 7, 10, POKEMON_MANSION_2F, 1 - warp_event 6, 1, POKEMON_MANSION_2F, 3 - warp_event 25, 14, POKEMON_MANSION_2F, 2 + warp_event 7, 10, POKEMON_MANSION_2F, 2 + warp_event 6, 1, POKEMON_MANSION_2F, 4 + warp_event 25, 14, POKEMON_MANSION_2F, 3 def_bg_events diff --git a/data/maps/objects/PokemonMansionB1F.asm b/data/maps/objects/PokemonMansionB1F.asm index 9dfdb37d..12692e81 100644 --- a/data/maps/objects/PokemonMansionB1F.asm +++ b/data/maps/objects/PokemonMansionB1F.asm @@ -2,7 +2,7 @@ PokemonMansionB1F_Object: db $1 ; border block def_warp_events - warp_event 23, 22, POKEMON_MANSION_1F, 5 + warp_event 23, 22, POKEMON_MANSION_1F, 6 def_bg_events diff --git a/data/maps/objects/PokemonTower1F.asm b/data/maps/objects/PokemonTower1F.asm index 558688f7..bacf7244 100644 --- a/data/maps/objects/PokemonTower1F.asm +++ b/data/maps/objects/PokemonTower1F.asm @@ -2,9 +2,9 @@ PokemonTower1F_Object: db $1 ; border block def_warp_events - warp_event 10, 17, LAST_MAP, 1 - warp_event 11, 17, LAST_MAP, 1 - warp_event 18, 9, POKEMON_TOWER_2F, 1 + warp_event 10, 17, LAST_MAP, 2 + warp_event 11, 17, LAST_MAP, 2 + warp_event 18, 9, POKEMON_TOWER_2F, 2 def_bg_events diff --git a/data/maps/objects/PokemonTower2F.asm b/data/maps/objects/PokemonTower2F.asm index ba0e94ca..e0635b68 100644 --- a/data/maps/objects/PokemonTower2F.asm +++ b/data/maps/objects/PokemonTower2F.asm @@ -2,8 +2,8 @@ PokemonTower2F_Object: db $1 ; border block def_warp_events - warp_event 3, 9, POKEMON_TOWER_3F, 0 - warp_event 18, 9, POKEMON_TOWER_1F, 2 + warp_event 3, 9, POKEMON_TOWER_3F, 1 + warp_event 18, 9, POKEMON_TOWER_1F, 3 def_bg_events diff --git a/data/maps/objects/PokemonTower3F.asm b/data/maps/objects/PokemonTower3F.asm index 1d983476..6b49d967 100644 --- a/data/maps/objects/PokemonTower3F.asm +++ b/data/maps/objects/PokemonTower3F.asm @@ -2,8 +2,8 @@ PokemonTower3F_Object: db $1 ; border block def_warp_events - warp_event 3, 9, POKEMON_TOWER_2F, 0 - warp_event 18, 9, POKEMON_TOWER_4F, 1 + warp_event 3, 9, POKEMON_TOWER_2F, 1 + warp_event 18, 9, POKEMON_TOWER_4F, 2 def_bg_events diff --git a/data/maps/objects/PokemonTower4F.asm b/data/maps/objects/PokemonTower4F.asm index 6b21ce68..3bc31e70 100644 --- a/data/maps/objects/PokemonTower4F.asm +++ b/data/maps/objects/PokemonTower4F.asm @@ -2,8 +2,8 @@ PokemonTower4F_Object: db $1 ; border block def_warp_events - warp_event 3, 9, POKEMON_TOWER_5F, 0 - warp_event 18, 9, POKEMON_TOWER_3F, 1 + warp_event 3, 9, POKEMON_TOWER_5F, 1 + warp_event 18, 9, POKEMON_TOWER_3F, 2 def_bg_events diff --git a/data/maps/objects/PokemonTower5F.asm b/data/maps/objects/PokemonTower5F.asm index 9b578abc..99bbe8f0 100644 --- a/data/maps/objects/PokemonTower5F.asm +++ b/data/maps/objects/PokemonTower5F.asm @@ -2,8 +2,8 @@ PokemonTower5F_Object: db $1 ; border block def_warp_events - warp_event 3, 9, POKEMON_TOWER_4F, 0 - warp_event 18, 9, POKEMON_TOWER_6F, 0 + warp_event 3, 9, POKEMON_TOWER_4F, 1 + warp_event 18, 9, POKEMON_TOWER_6F, 1 def_bg_events diff --git a/data/maps/objects/PokemonTower6F.asm b/data/maps/objects/PokemonTower6F.asm index 5b64be0e..fa828b16 100644 --- a/data/maps/objects/PokemonTower6F.asm +++ b/data/maps/objects/PokemonTower6F.asm @@ -2,8 +2,8 @@ PokemonTower6F_Object: db $1 ; border block def_warp_events - warp_event 18, 9, POKEMON_TOWER_5F, 1 - warp_event 9, 16, POKEMON_TOWER_7F, 0 + warp_event 18, 9, POKEMON_TOWER_5F, 2 + warp_event 9, 16, POKEMON_TOWER_7F, 1 def_bg_events diff --git a/data/maps/objects/PokemonTower7F.asm b/data/maps/objects/PokemonTower7F.asm index 9cc632a1..328588ed 100644 --- a/data/maps/objects/PokemonTower7F.asm +++ b/data/maps/objects/PokemonTower7F.asm @@ -2,7 +2,7 @@ PokemonTower7F_Object: db $1 ; border block def_warp_events - warp_event 9, 16, POKEMON_TOWER_6F, 1 + warp_event 9, 16, POKEMON_TOWER_6F, 2 def_bg_events diff --git a/data/maps/objects/PowerPlant.asm b/data/maps/objects/PowerPlant.asm index 287eb15a..419adc01 100644 --- a/data/maps/objects/PowerPlant.asm +++ b/data/maps/objects/PowerPlant.asm @@ -2,9 +2,9 @@ PowerPlant_Object: db $2e ; border block def_warp_events - warp_event 4, 35, LAST_MAP, 3 - warp_event 5, 35, LAST_MAP, 3 - warp_event 0, 11, LAST_MAP, 3 + warp_event 4, 35, LAST_MAP, 4 + warp_event 5, 35, LAST_MAP, 4 + warp_event 0, 11, LAST_MAP, 4 def_bg_events diff --git a/data/maps/objects/RedsHouse1F.asm b/data/maps/objects/RedsHouse1F.asm index ef1f7c07..c8a2da55 100644 --- a/data/maps/objects/RedsHouse1F.asm +++ b/data/maps/objects/RedsHouse1F.asm @@ -2,9 +2,9 @@ RedsHouse1F_Object: db $a ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 0 - warp_event 3, 7, LAST_MAP, 0 - warp_event 7, 1, REDS_HOUSE_2F, 0 + warp_event 2, 7, LAST_MAP, 1 + warp_event 3, 7, LAST_MAP, 1 + warp_event 7, 1, REDS_HOUSE_2F, 1 def_bg_events bg_event 3, 1, 2 ; RedsHouse1FTVText diff --git a/data/maps/objects/RedsHouse2F.asm b/data/maps/objects/RedsHouse2F.asm index 0ffb23f3..4a193d35 100644 --- a/data/maps/objects/RedsHouse2F.asm +++ b/data/maps/objects/RedsHouse2F.asm @@ -2,7 +2,7 @@ RedsHouse2F_Object: db $a ; border block def_warp_events - warp_event 7, 1, REDS_HOUSE_1F, 2 + warp_event 7, 1, REDS_HOUSE_1F, 3 def_bg_events diff --git a/data/maps/objects/RockTunnel1F.asm b/data/maps/objects/RockTunnel1F.asm index cfe0e463..385214a4 100644 --- a/data/maps/objects/RockTunnel1F.asm +++ b/data/maps/objects/RockTunnel1F.asm @@ -2,14 +2,14 @@ RockTunnel1F_Object: db $3 ; border block def_warp_events - warp_event 15, 3, LAST_MAP, 1 - warp_event 15, 0, LAST_MAP, 1 - warp_event 15, 33, LAST_MAP, 2 - warp_event 15, 35, LAST_MAP, 2 - warp_event 37, 3, ROCK_TUNNEL_B1F, 0 - warp_event 5, 3, ROCK_TUNNEL_B1F, 1 - warp_event 17, 11, ROCK_TUNNEL_B1F, 2 - warp_event 37, 17, ROCK_TUNNEL_B1F, 3 + warp_event 15, 3, LAST_MAP, 2 + warp_event 15, 0, LAST_MAP, 2 + warp_event 15, 33, LAST_MAP, 3 + warp_event 15, 35, LAST_MAP, 3 + warp_event 37, 3, ROCK_TUNNEL_B1F, 1 + warp_event 5, 3, ROCK_TUNNEL_B1F, 2 + warp_event 17, 11, ROCK_TUNNEL_B1F, 3 + warp_event 37, 17, ROCK_TUNNEL_B1F, 4 def_bg_events bg_event 11, 29, 8 ; RockTunnel1Text8 diff --git a/data/maps/objects/RockTunnelB1F.asm b/data/maps/objects/RockTunnelB1F.asm index 79030034..a34a1a25 100644 --- a/data/maps/objects/RockTunnelB1F.asm +++ b/data/maps/objects/RockTunnelB1F.asm @@ -2,10 +2,10 @@ RockTunnelB1F_Object: db $3 ; border block def_warp_events - warp_event 33, 25, ROCK_TUNNEL_1F, 4 - warp_event 27, 3, ROCK_TUNNEL_1F, 5 - warp_event 23, 11, ROCK_TUNNEL_1F, 6 - warp_event 3, 3, ROCK_TUNNEL_1F, 7 + warp_event 33, 25, ROCK_TUNNEL_1F, 5 + warp_event 27, 3, ROCK_TUNNEL_1F, 6 + warp_event 23, 11, ROCK_TUNNEL_1F, 7 + warp_event 3, 3, ROCK_TUNNEL_1F, 8 def_bg_events diff --git a/data/maps/objects/RockTunnelPokecenter.asm b/data/maps/objects/RockTunnelPokecenter.asm index a1b095b6..27c22252 100644 --- a/data/maps/objects/RockTunnelPokecenter.asm +++ b/data/maps/objects/RockTunnelPokecenter.asm @@ -2,8 +2,8 @@ RockTunnelPokecenter_Object: db $0 ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 0 - warp_event 4, 7, LAST_MAP, 0 + warp_event 3, 7, LAST_MAP, 1 + warp_event 4, 7, LAST_MAP, 1 def_bg_events diff --git a/data/maps/objects/RocketHideoutB1F.asm b/data/maps/objects/RocketHideoutB1F.asm index 99eb2dc0..25750eb0 100644 --- a/data/maps/objects/RocketHideoutB1F.asm +++ b/data/maps/objects/RocketHideoutB1F.asm @@ -2,11 +2,11 @@ RocketHideoutB1F_Object: db $2e ; border block def_warp_events - warp_event 23, 2, ROCKET_HIDEOUT_B2F, 0 - warp_event 21, 2, GAME_CORNER, 2 - warp_event 24, 19, ROCKET_HIDEOUT_ELEVATOR, 0 - warp_event 21, 24, ROCKET_HIDEOUT_B2F, 3 - warp_event 25, 19, ROCKET_HIDEOUT_ELEVATOR, 1 + warp_event 23, 2, ROCKET_HIDEOUT_B2F, 1 + warp_event 21, 2, GAME_CORNER, 3 + warp_event 24, 19, ROCKET_HIDEOUT_ELEVATOR, 1 + warp_event 21, 24, ROCKET_HIDEOUT_B2F, 4 + warp_event 25, 19, ROCKET_HIDEOUT_ELEVATOR, 2 def_bg_events diff --git a/data/maps/objects/RocketHideoutB2F.asm b/data/maps/objects/RocketHideoutB2F.asm index 007644ae..e118fb58 100644 --- a/data/maps/objects/RocketHideoutB2F.asm +++ b/data/maps/objects/RocketHideoutB2F.asm @@ -2,11 +2,11 @@ RocketHideoutB2F_Object: db $2e ; border block def_warp_events - warp_event 27, 8, ROCKET_HIDEOUT_B1F, 0 - warp_event 21, 8, ROCKET_HIDEOUT_B3F, 0 - warp_event 24, 19, ROCKET_HIDEOUT_ELEVATOR, 0 - warp_event 21, 22, ROCKET_HIDEOUT_B1F, 3 - warp_event 25, 19, ROCKET_HIDEOUT_ELEVATOR, 1 + warp_event 27, 8, ROCKET_HIDEOUT_B1F, 1 + warp_event 21, 8, ROCKET_HIDEOUT_B3F, 1 + warp_event 24, 19, ROCKET_HIDEOUT_ELEVATOR, 1 + warp_event 21, 22, ROCKET_HIDEOUT_B1F, 4 + warp_event 25, 19, ROCKET_HIDEOUT_ELEVATOR, 2 def_bg_events diff --git a/data/maps/objects/RocketHideoutB3F.asm b/data/maps/objects/RocketHideoutB3F.asm index 5d5f8320..b679f87c 100644 --- a/data/maps/objects/RocketHideoutB3F.asm +++ b/data/maps/objects/RocketHideoutB3F.asm @@ -2,8 +2,8 @@ RocketHideoutB3F_Object: db $2e ; border block def_warp_events - warp_event 25, 6, ROCKET_HIDEOUT_B2F, 1 - warp_event 19, 18, ROCKET_HIDEOUT_B4F, 0 + warp_event 25, 6, ROCKET_HIDEOUT_B2F, 2 + warp_event 19, 18, ROCKET_HIDEOUT_B4F, 1 def_bg_events diff --git a/data/maps/objects/RocketHideoutB4F.asm b/data/maps/objects/RocketHideoutB4F.asm index d21a7dc4..ecae529c 100644 --- a/data/maps/objects/RocketHideoutB4F.asm +++ b/data/maps/objects/RocketHideoutB4F.asm @@ -2,9 +2,9 @@ RocketHideoutB4F_Object: db $2e ; border block def_warp_events - warp_event 19, 10, ROCKET_HIDEOUT_B3F, 1 - warp_event 24, 15, ROCKET_HIDEOUT_ELEVATOR, 0 - warp_event 25, 15, ROCKET_HIDEOUT_ELEVATOR, 1 + warp_event 19, 10, ROCKET_HIDEOUT_B3F, 2 + warp_event 24, 15, ROCKET_HIDEOUT_ELEVATOR, 1 + warp_event 25, 15, ROCKET_HIDEOUT_ELEVATOR, 2 def_bg_events diff --git a/data/maps/objects/RocketHideoutElevator.asm b/data/maps/objects/RocketHideoutElevator.asm index 25c507f1..d31ec51b 100644 --- a/data/maps/objects/RocketHideoutElevator.asm +++ b/data/maps/objects/RocketHideoutElevator.asm @@ -2,8 +2,8 @@ RocketHideoutElevator_Object: db $f ; border block def_warp_events - warp_event 2, 1, ROCKET_HIDEOUT_B1F, 2 - warp_event 3, 1, ROCKET_HIDEOUT_B1F, 4 + warp_event 2, 1, ROCKET_HIDEOUT_B1F, 3 + warp_event 3, 1, ROCKET_HIDEOUT_B1F, 5 def_bg_events bg_event 1, 1, 1 ; RocketHideoutElevatorText1 diff --git a/data/maps/objects/Route10.asm b/data/maps/objects/Route10.asm index ebf9361e..01eae9cf 100644 --- a/data/maps/objects/Route10.asm +++ b/data/maps/objects/Route10.asm @@ -2,10 +2,10 @@ Route10_Object: db $2c ; border block def_warp_events - warp_event 11, 19, ROCK_TUNNEL_POKECENTER, 0 - warp_event 8, 17, ROCK_TUNNEL_1F, 0 - warp_event 8, 53, ROCK_TUNNEL_1F, 2 - warp_event 6, 39, POWER_PLANT, 0 + warp_event 11, 19, ROCK_TUNNEL_POKECENTER, 1 + warp_event 8, 17, ROCK_TUNNEL_1F, 1 + warp_event 8, 53, ROCK_TUNNEL_1F, 3 + warp_event 6, 39, POWER_PLANT, 1 def_bg_events bg_event 7, 19, 7 ; Route10Text7 diff --git a/data/maps/objects/Route11.asm b/data/maps/objects/Route11.asm index 6ee584ef..6238a067 100644 --- a/data/maps/objects/Route11.asm +++ b/data/maps/objects/Route11.asm @@ -2,11 +2,11 @@ Route11_Object: db $f ; border block def_warp_events - warp_event 49, 8, ROUTE_11_GATE_1F, 0 - warp_event 49, 9, ROUTE_11_GATE_1F, 1 - warp_event 58, 8, ROUTE_11_GATE_1F, 2 - warp_event 58, 9, ROUTE_11_GATE_1F, 3 - warp_event 4, 5, DIGLETTS_CAVE_ROUTE_11, 0 + warp_event 49, 8, ROUTE_11_GATE_1F, 1 + warp_event 49, 9, ROUTE_11_GATE_1F, 2 + warp_event 58, 8, ROUTE_11_GATE_1F, 3 + warp_event 58, 9, ROUTE_11_GATE_1F, 4 + warp_event 4, 5, DIGLETTS_CAVE_ROUTE_11, 1 def_bg_events bg_event 1, 5, 11 ; Route11Text11 diff --git a/data/maps/objects/Route11Gate1F.asm b/data/maps/objects/Route11Gate1F.asm index 9032ae11..ea40cc90 100644 --- a/data/maps/objects/Route11Gate1F.asm +++ b/data/maps/objects/Route11Gate1F.asm @@ -2,11 +2,11 @@ Route11Gate1F_Object: db $a ; border block def_warp_events - warp_event 0, 4, LAST_MAP, 0 - warp_event 0, 5, LAST_MAP, 1 - warp_event 7, 4, LAST_MAP, 2 - warp_event 7, 5, LAST_MAP, 3 - warp_event 6, 8, ROUTE_11_GATE_2F, 0 + warp_event 0, 4, LAST_MAP, 1 + warp_event 0, 5, LAST_MAP, 2 + warp_event 7, 4, LAST_MAP, 3 + warp_event 7, 5, LAST_MAP, 4 + warp_event 6, 8, ROUTE_11_GATE_2F, 1 def_bg_events diff --git a/data/maps/objects/Route11Gate2F.asm b/data/maps/objects/Route11Gate2F.asm index 0843482c..ad257fbb 100644 --- a/data/maps/objects/Route11Gate2F.asm +++ b/data/maps/objects/Route11Gate2F.asm @@ -2,7 +2,7 @@ Route11Gate2F_Object: db $a ; border block def_warp_events - warp_event 7, 7, ROUTE_11_GATE_1F, 4 + warp_event 7, 7, ROUTE_11_GATE_1F, 5 def_bg_events bg_event 1, 2, 3 ; Route11GateUpstairsText3 diff --git a/data/maps/objects/Route12.asm b/data/maps/objects/Route12.asm index 8e2995f0..e7fc92f1 100644 --- a/data/maps/objects/Route12.asm +++ b/data/maps/objects/Route12.asm @@ -2,10 +2,10 @@ Route12_Object: db $43 ; border block def_warp_events - warp_event 10, 15, ROUTE_12_GATE_1F, 0 - warp_event 11, 15, ROUTE_12_GATE_1F, 1 - warp_event 10, 21, ROUTE_12_GATE_1F, 2 - warp_event 11, 77, ROUTE_12_SUPER_ROD_HOUSE, 0 + warp_event 10, 15, ROUTE_12_GATE_1F, 1 + warp_event 11, 15, ROUTE_12_GATE_1F, 2 + warp_event 10, 21, ROUTE_12_GATE_1F, 3 + warp_event 11, 77, ROUTE_12_SUPER_ROD_HOUSE, 1 def_bg_events bg_event 13, 13, 11 ; Route12Text11 diff --git a/data/maps/objects/Route12Gate1F.asm b/data/maps/objects/Route12Gate1F.asm index b2e3c6aa..67cd4a25 100644 --- a/data/maps/objects/Route12Gate1F.asm +++ b/data/maps/objects/Route12Gate1F.asm @@ -2,11 +2,11 @@ Route12Gate1F_Object: db $a ; border block def_warp_events - warp_event 4, 0, LAST_MAP, 0 - warp_event 5, 0, LAST_MAP, 1 - warp_event 4, 7, LAST_MAP, 2 - warp_event 5, 7, LAST_MAP, 2 - warp_event 8, 6, ROUTE_12_GATE_2F, 0 + warp_event 4, 0, LAST_MAP, 1 + warp_event 5, 0, LAST_MAP, 2 + warp_event 4, 7, LAST_MAP, 3 + warp_event 5, 7, LAST_MAP, 3 + warp_event 8, 6, ROUTE_12_GATE_2F, 1 def_bg_events diff --git a/data/maps/objects/Route12Gate2F.asm b/data/maps/objects/Route12Gate2F.asm index bd52d026..13501b5c 100644 --- a/data/maps/objects/Route12Gate2F.asm +++ b/data/maps/objects/Route12Gate2F.asm @@ -2,7 +2,7 @@ Route12Gate2F_Object: db $a ; border block def_warp_events - warp_event 7, 7, ROUTE_12_GATE_1F, 4 + warp_event 7, 7, ROUTE_12_GATE_1F, 5 def_bg_events bg_event 1, 2, 2 ; Route12GateUpstairsText2 diff --git a/data/maps/objects/Route12SuperRodHouse.asm b/data/maps/objects/Route12SuperRodHouse.asm index 806bfa55..14b7747a 100644 --- a/data/maps/objects/Route12SuperRodHouse.asm +++ b/data/maps/objects/Route12SuperRodHouse.asm @@ -2,8 +2,8 @@ Route12SuperRodHouse_Object: db $a ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 3 - warp_event 3, 7, LAST_MAP, 3 + warp_event 2, 7, LAST_MAP, 4 + warp_event 3, 7, LAST_MAP, 4 def_bg_events diff --git a/data/maps/objects/Route15.asm b/data/maps/objects/Route15.asm index 895cef47..93a74966 100644 --- a/data/maps/objects/Route15.asm +++ b/data/maps/objects/Route15.asm @@ -2,10 +2,10 @@ Route15_Object: db $43 ; border block def_warp_events - warp_event 7, 8, ROUTE_15_GATE_1F, 0 - warp_event 7, 9, ROUTE_15_GATE_1F, 1 - warp_event 14, 8, ROUTE_15_GATE_1F, 2 - warp_event 14, 9, ROUTE_15_GATE_1F, 3 + warp_event 7, 8, ROUTE_15_GATE_1F, 1 + warp_event 7, 9, ROUTE_15_GATE_1F, 2 + warp_event 14, 8, ROUTE_15_GATE_1F, 3 + warp_event 14, 9, ROUTE_15_GATE_1F, 4 def_bg_events bg_event 39, 9, 12 ; Route15Text12 diff --git a/data/maps/objects/Route15Gate1F.asm b/data/maps/objects/Route15Gate1F.asm index 7c93ff33..3bc02f2f 100644 --- a/data/maps/objects/Route15Gate1F.asm +++ b/data/maps/objects/Route15Gate1F.asm @@ -2,11 +2,11 @@ Route15Gate1F_Object: db $a ; border block def_warp_events - warp_event 0, 4, LAST_MAP, 0 - warp_event 0, 5, LAST_MAP, 1 - warp_event 7, 4, LAST_MAP, 2 - warp_event 7, 5, LAST_MAP, 3 - warp_event 6, 8, ROUTE_15_GATE_2F, 0 + warp_event 0, 4, LAST_MAP, 1 + warp_event 0, 5, LAST_MAP, 2 + warp_event 7, 4, LAST_MAP, 3 + warp_event 7, 5, LAST_MAP, 4 + warp_event 6, 8, ROUTE_15_GATE_2F, 1 def_bg_events diff --git a/data/maps/objects/Route15Gate2F.asm b/data/maps/objects/Route15Gate2F.asm index 23134028..39b5c64a 100644 --- a/data/maps/objects/Route15Gate2F.asm +++ b/data/maps/objects/Route15Gate2F.asm @@ -2,7 +2,7 @@ Route15Gate2F_Object: db $a ; border block def_warp_events - warp_event 7, 7, ROUTE_15_GATE_1F, 4 + warp_event 7, 7, ROUTE_15_GATE_1F, 5 def_bg_events bg_event 6, 2, 2 ; Route15GateUpstairsText2 diff --git a/data/maps/objects/Route16.asm b/data/maps/objects/Route16.asm index a029873a..b1e62651 100644 --- a/data/maps/objects/Route16.asm +++ b/data/maps/objects/Route16.asm @@ -2,15 +2,15 @@ Route16_Object: db $f ; border block def_warp_events - warp_event 17, 10, ROUTE_16_GATE_1F, 0 - warp_event 17, 11, ROUTE_16_GATE_1F, 1 - warp_event 24, 10, ROUTE_16_GATE_1F, 2 - warp_event 24, 11, ROUTE_16_GATE_1F, 3 - warp_event 17, 4, ROUTE_16_GATE_1F, 4 - warp_event 17, 5, ROUTE_16_GATE_1F, 5 - warp_event 24, 4, ROUTE_16_GATE_1F, 6 - warp_event 24, 5, ROUTE_16_GATE_1F, 7 - warp_event 7, 5, ROUTE_16_FLY_HOUSE, 0 + warp_event 17, 10, ROUTE_16_GATE_1F, 1 + warp_event 17, 11, ROUTE_16_GATE_1F, 2 + warp_event 24, 10, ROUTE_16_GATE_1F, 3 + warp_event 24, 11, ROUTE_16_GATE_1F, 4 + warp_event 17, 4, ROUTE_16_GATE_1F, 5 + warp_event 17, 5, ROUTE_16_GATE_1F, 6 + warp_event 24, 4, ROUTE_16_GATE_1F, 7 + warp_event 24, 5, ROUTE_16_GATE_1F, 8 + warp_event 7, 5, ROUTE_16_FLY_HOUSE, 1 def_bg_events bg_event 27, 11, 8 ; Route16Text8 diff --git a/data/maps/objects/Route16FlyHouse.asm b/data/maps/objects/Route16FlyHouse.asm index 3e1f8ec9..dc767dbf 100644 --- a/data/maps/objects/Route16FlyHouse.asm +++ b/data/maps/objects/Route16FlyHouse.asm @@ -2,8 +2,8 @@ Route16FlyHouse_Object: db $a ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 8 - warp_event 3, 7, LAST_MAP, 8 + warp_event 2, 7, LAST_MAP, 9 + warp_event 3, 7, LAST_MAP, 9 def_bg_events diff --git a/data/maps/objects/Route16Gate1F.asm b/data/maps/objects/Route16Gate1F.asm index 476729e3..7aeeb619 100644 --- a/data/maps/objects/Route16Gate1F.asm +++ b/data/maps/objects/Route16Gate1F.asm @@ -2,15 +2,15 @@ Route16Gate1F_Object: db $a ; border block def_warp_events - warp_event 0, 8, LAST_MAP, 0 - warp_event 0, 9, LAST_MAP, 1 - warp_event 7, 8, LAST_MAP, 2 - warp_event 7, 9, LAST_MAP, 2 - warp_event 0, 2, LAST_MAP, 4 - warp_event 0, 3, LAST_MAP, 5 - warp_event 7, 2, LAST_MAP, 6 - warp_event 7, 3, LAST_MAP, 7 - warp_event 6, 12, ROUTE_16_GATE_2F, 0 + warp_event 0, 8, LAST_MAP, 1 + warp_event 0, 9, LAST_MAP, 2 + warp_event 7, 8, LAST_MAP, 3 + warp_event 7, 9, LAST_MAP, 3 + warp_event 0, 2, LAST_MAP, 5 + warp_event 0, 3, LAST_MAP, 6 + warp_event 7, 2, LAST_MAP, 7 + warp_event 7, 3, LAST_MAP, 8 + warp_event 6, 12, ROUTE_16_GATE_2F, 1 def_bg_events diff --git a/data/maps/objects/Route16Gate2F.asm b/data/maps/objects/Route16Gate2F.asm index 185e5a13..f687fab0 100644 --- a/data/maps/objects/Route16Gate2F.asm +++ b/data/maps/objects/Route16Gate2F.asm @@ -2,7 +2,7 @@ Route16Gate2F_Object: db $a ; border block def_warp_events - warp_event 7, 7, ROUTE_16_GATE_1F, 8 + warp_event 7, 7, ROUTE_16_GATE_1F, 9 def_bg_events bg_event 1, 2, 3 ; Route16GateUpstairsText3 diff --git a/data/maps/objects/Route18.asm b/data/maps/objects/Route18.asm index c95e3cf9..102aa4c5 100644 --- a/data/maps/objects/Route18.asm +++ b/data/maps/objects/Route18.asm @@ -2,10 +2,10 @@ Route18_Object: db $43 ; border block def_warp_events - warp_event 33, 8, ROUTE_18_GATE_1F, 0 - warp_event 33, 9, ROUTE_18_GATE_1F, 1 - warp_event 40, 8, ROUTE_18_GATE_1F, 2 - warp_event 40, 9, ROUTE_18_GATE_1F, 3 + warp_event 33, 8, ROUTE_18_GATE_1F, 1 + warp_event 33, 9, ROUTE_18_GATE_1F, 2 + warp_event 40, 8, ROUTE_18_GATE_1F, 3 + warp_event 40, 9, ROUTE_18_GATE_1F, 4 def_bg_events bg_event 43, 7, 4 ; Route18Text4 diff --git a/data/maps/objects/Route18Gate1F.asm b/data/maps/objects/Route18Gate1F.asm index 2dcec54b..cc994a36 100644 --- a/data/maps/objects/Route18Gate1F.asm +++ b/data/maps/objects/Route18Gate1F.asm @@ -2,11 +2,11 @@ Route18Gate1F_Object: db $a ; border block def_warp_events - warp_event 0, 4, LAST_MAP, 0 - warp_event 0, 5, LAST_MAP, 1 - warp_event 7, 4, LAST_MAP, 2 - warp_event 7, 5, LAST_MAP, 3 - warp_event 6, 8, ROUTE_18_GATE_2F, 0 + warp_event 0, 4, LAST_MAP, 1 + warp_event 0, 5, LAST_MAP, 2 + warp_event 7, 4, LAST_MAP, 3 + warp_event 7, 5, LAST_MAP, 4 + warp_event 6, 8, ROUTE_18_GATE_2F, 1 def_bg_events diff --git a/data/maps/objects/Route18Gate2F.asm b/data/maps/objects/Route18Gate2F.asm index afa1b383..5a05f82b 100644 --- a/data/maps/objects/Route18Gate2F.asm +++ b/data/maps/objects/Route18Gate2F.asm @@ -2,7 +2,7 @@ Route18Gate2F_Object: db $a ; border block def_warp_events - warp_event 7, 7, ROUTE_18_GATE_1F, 4 + warp_event 7, 7, ROUTE_18_GATE_1F, 5 def_bg_events bg_event 1, 2, 2 ; Route18GateUpstairsText2 diff --git a/data/maps/objects/Route2.asm b/data/maps/objects/Route2.asm index e38df5a1..6ff5c0c7 100644 --- a/data/maps/objects/Route2.asm +++ b/data/maps/objects/Route2.asm @@ -2,12 +2,12 @@ Route2_Object: db $f ; border block def_warp_events - warp_event 12, 9, DIGLETTS_CAVE_ROUTE_2, 0 - warp_event 3, 11, VIRIDIAN_FOREST_NORTH_GATE, 1 - warp_event 15, 19, ROUTE_2_TRADE_HOUSE, 0 - warp_event 16, 35, ROUTE_2_GATE, 1 - warp_event 15, 39, ROUTE_2_GATE, 2 - warp_event 3, 43, VIRIDIAN_FOREST_SOUTH_GATE, 2 + warp_event 12, 9, DIGLETTS_CAVE_ROUTE_2, 1 + warp_event 3, 11, VIRIDIAN_FOREST_NORTH_GATE, 2 + warp_event 15, 19, ROUTE_2_TRADE_HOUSE, 1 + warp_event 16, 35, ROUTE_2_GATE, 2 + warp_event 15, 39, ROUTE_2_GATE, 3 + warp_event 3, 43, VIRIDIAN_FOREST_SOUTH_GATE, 3 def_bg_events bg_event 5, 65, 3 ; Route2Text3 diff --git a/data/maps/objects/Route20.asm b/data/maps/objects/Route20.asm index c00d2284..bd9697c2 100644 --- a/data/maps/objects/Route20.asm +++ b/data/maps/objects/Route20.asm @@ -2,8 +2,8 @@ Route20_Object: db $43 ; border block def_warp_events - warp_event 48, 5, SEAFOAM_ISLANDS_1F, 0 - warp_event 58, 9, SEAFOAM_ISLANDS_1F, 2 + warp_event 48, 5, SEAFOAM_ISLANDS_1F, 1 + warp_event 58, 9, SEAFOAM_ISLANDS_1F, 3 def_bg_events bg_event 51, 7, 11 ; Route20Text11 diff --git a/data/maps/objects/Route22.asm b/data/maps/objects/Route22.asm index 5fcc989f..096d490c 100644 --- a/data/maps/objects/Route22.asm +++ b/data/maps/objects/Route22.asm @@ -2,7 +2,7 @@ Route22_Object: db $2c ; border block def_warp_events - warp_event 8, 5, ROUTE_22_GATE, 0 + warp_event 8, 5, ROUTE_22_GATE, 1 def_bg_events bg_event 7, 11, 3 ; Route22FrontGateText diff --git a/data/maps/objects/Route22Gate.asm b/data/maps/objects/Route22Gate.asm index 94aafc51..086616ca 100644 --- a/data/maps/objects/Route22Gate.asm +++ b/data/maps/objects/Route22Gate.asm @@ -2,10 +2,10 @@ Route22Gate_Object: db $a ; border block def_warp_events - warp_event 4, 7, LAST_MAP, 0 - warp_event 5, 7, LAST_MAP, 0 - warp_event 4, 0, LAST_MAP, 0 - warp_event 5, 0, LAST_MAP, 1 + warp_event 4, 7, LAST_MAP, 1 + warp_event 5, 7, LAST_MAP, 1 + warp_event 4, 0, LAST_MAP, 1 + warp_event 5, 0, LAST_MAP, 2 def_bg_events diff --git a/data/maps/objects/Route23.asm b/data/maps/objects/Route23.asm index 6cd97faa..4a9f65f6 100644 --- a/data/maps/objects/Route23.asm +++ b/data/maps/objects/Route23.asm @@ -2,10 +2,10 @@ Route23_Object: db $f ; border block def_warp_events - warp_event 7, 139, ROUTE_22_GATE, 2 - warp_event 8, 139, ROUTE_22_GATE, 3 - warp_event 4, 31, VICTORY_ROAD_1F, 0 - warp_event 14, 31, VICTORY_ROAD_2F, 1 + warp_event 7, 139, ROUTE_22_GATE, 3 + warp_event 8, 139, ROUTE_22_GATE, 4 + warp_event 4, 31, VICTORY_ROAD_1F, 1 + warp_event 14, 31, VICTORY_ROAD_2F, 2 def_bg_events bg_event 3, 33, 8 ; Route23Text8 diff --git a/data/maps/objects/Route25.asm b/data/maps/objects/Route25.asm index 096fd225..f0814b23 100644 --- a/data/maps/objects/Route25.asm +++ b/data/maps/objects/Route25.asm @@ -2,7 +2,7 @@ Route25_Object: db $2c ; border block def_warp_events - warp_event 45, 3, BILLS_HOUSE, 0 + warp_event 45, 3, BILLS_HOUSE, 1 def_bg_events bg_event 43, 3, 11 ; Route25Text11 diff --git a/data/maps/objects/Route2Gate.asm b/data/maps/objects/Route2Gate.asm index a31e92b0..02205d00 100644 --- a/data/maps/objects/Route2Gate.asm +++ b/data/maps/objects/Route2Gate.asm @@ -2,10 +2,10 @@ Route2Gate_Object: db $a ; border block def_warp_events - warp_event 4, 0, LAST_MAP, 3 - warp_event 5, 0, LAST_MAP, 3 - warp_event 4, 7, LAST_MAP, 4 - warp_event 5, 7, LAST_MAP, 4 + warp_event 4, 0, LAST_MAP, 4 + warp_event 5, 0, LAST_MAP, 4 + warp_event 4, 7, LAST_MAP, 5 + warp_event 5, 7, LAST_MAP, 5 def_bg_events diff --git a/data/maps/objects/Route2TradeHouse.asm b/data/maps/objects/Route2TradeHouse.asm index 863dee37..7b30b9e8 100644 --- a/data/maps/objects/Route2TradeHouse.asm +++ b/data/maps/objects/Route2TradeHouse.asm @@ -2,8 +2,8 @@ Route2TradeHouse_Object: db $a ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 2 - warp_event 3, 7, LAST_MAP, 2 + warp_event 2, 7, LAST_MAP, 3 + warp_event 3, 7, LAST_MAP, 3 def_bg_events diff --git a/data/maps/objects/Route4.asm b/data/maps/objects/Route4.asm index 27a72b23..2917de1f 100644 --- a/data/maps/objects/Route4.asm +++ b/data/maps/objects/Route4.asm @@ -2,9 +2,9 @@ Route4_Object: db $2c ; border block def_warp_events - warp_event 11, 5, MT_MOON_POKECENTER, 0 - warp_event 18, 5, MT_MOON_1F, 0 - warp_event 24, 5, MT_MOON_B1F, 7 + warp_event 11, 5, MT_MOON_POKECENTER, 1 + warp_event 18, 5, MT_MOON_1F, 1 + warp_event 24, 5, MT_MOON_B1F, 8 def_bg_events bg_event 12, 5, 4 ; PokeCenterSignText diff --git a/data/maps/objects/Route5.asm b/data/maps/objects/Route5.asm index d0309e6e..2e91a7c6 100644 --- a/data/maps/objects/Route5.asm +++ b/data/maps/objects/Route5.asm @@ -2,11 +2,11 @@ Route5_Object: db $a ; border block def_warp_events - warp_event 10, 29, ROUTE_5_GATE, 3 - warp_event 9, 29, ROUTE_5_GATE, 2 - warp_event 10, 33, ROUTE_5_GATE, 0 - warp_event 17, 27, UNDERGROUND_PATH_ROUTE_5, 0 - warp_event 10, 21, DAYCARE, 0 + warp_event 10, 29, ROUTE_5_GATE, 4 + warp_event 9, 29, ROUTE_5_GATE, 3 + warp_event 10, 33, ROUTE_5_GATE, 1 + warp_event 17, 27, UNDERGROUND_PATH_ROUTE_5, 1 + warp_event 10, 21, DAYCARE, 1 def_bg_events bg_event 17, 29, 1 ; Route5Text1 diff --git a/data/maps/objects/Route5Gate.asm b/data/maps/objects/Route5Gate.asm index cdcf7aa8..de4ddab2 100644 --- a/data/maps/objects/Route5Gate.asm +++ b/data/maps/objects/Route5Gate.asm @@ -2,10 +2,10 @@ Route5Gate_Object: db $a ; border block def_warp_events - warp_event 3, 5, LAST_MAP, 2 - warp_event 4, 5, LAST_MAP, 2 - warp_event 3, 0, LAST_MAP, 1 - warp_event 4, 0, LAST_MAP, 0 + warp_event 3, 5, LAST_MAP, 3 + warp_event 4, 5, LAST_MAP, 3 + warp_event 3, 0, LAST_MAP, 2 + warp_event 4, 0, LAST_MAP, 1 def_bg_events diff --git a/data/maps/objects/Route6.asm b/data/maps/objects/Route6.asm index d71c90de..33748f0f 100644 --- a/data/maps/objects/Route6.asm +++ b/data/maps/objects/Route6.asm @@ -2,10 +2,10 @@ Route6_Object: db $f ; border block def_warp_events - warp_event 9, 1, ROUTE_6_GATE, 2 - warp_event 10, 1, ROUTE_6_GATE, 2 - warp_event 10, 7, ROUTE_6_GATE, 0 - warp_event 17, 13, UNDERGROUND_PATH_ROUTE_6, 0 + warp_event 9, 1, ROUTE_6_GATE, 3 + warp_event 10, 1, ROUTE_6_GATE, 3 + warp_event 10, 7, ROUTE_6_GATE, 1 + warp_event 17, 13, UNDERGROUND_PATH_ROUTE_6, 1 def_bg_events bg_event 19, 15, 7 ; Route6Text7 diff --git a/data/maps/objects/Route6Gate.asm b/data/maps/objects/Route6Gate.asm index 95ad9e5e..d37213c9 100644 --- a/data/maps/objects/Route6Gate.asm +++ b/data/maps/objects/Route6Gate.asm @@ -2,10 +2,10 @@ Route6Gate_Object: db $a ; border block def_warp_events - warp_event 3, 5, LAST_MAP, 2 - warp_event 4, 5, LAST_MAP, 2 - warp_event 3, 0, LAST_MAP, 1 - warp_event 4, 0, LAST_MAP, 1 + warp_event 3, 5, LAST_MAP, 3 + warp_event 4, 5, LAST_MAP, 3 + warp_event 3, 0, LAST_MAP, 2 + warp_event 4, 0, LAST_MAP, 2 def_bg_events diff --git a/data/maps/objects/Route7.asm b/data/maps/objects/Route7.asm index 6dd9d92c..ec5f2e8a 100644 --- a/data/maps/objects/Route7.asm +++ b/data/maps/objects/Route7.asm @@ -2,11 +2,11 @@ Route7_Object: db $f ; border block def_warp_events - warp_event 18, 9, ROUTE_7_GATE, 2 - warp_event 18, 10, ROUTE_7_GATE, 3 - warp_event 11, 9, ROUTE_7_GATE, 0 - warp_event 11, 10, ROUTE_7_GATE, 1 - warp_event 5, 13, UNDERGROUND_PATH_ROUTE_7, 0 + warp_event 18, 9, ROUTE_7_GATE, 3 + warp_event 18, 10, ROUTE_7_GATE, 4 + warp_event 11, 9, ROUTE_7_GATE, 1 + warp_event 11, 10, ROUTE_7_GATE, 2 + warp_event 5, 13, UNDERGROUND_PATH_ROUTE_7, 1 def_bg_events bg_event 3, 13, 1 ; Route7Text1 diff --git a/data/maps/objects/Route7Gate.asm b/data/maps/objects/Route7Gate.asm index 90ddca07..8cc58d9b 100644 --- a/data/maps/objects/Route7Gate.asm +++ b/data/maps/objects/Route7Gate.asm @@ -2,10 +2,10 @@ Route7Gate_Object: db $a ; border block def_warp_events - warp_event 0, 3, LAST_MAP, 3 - warp_event 0, 4, LAST_MAP, 3 - warp_event 5, 3, LAST_MAP, 0 - warp_event 5, 4, LAST_MAP, 1 + warp_event 0, 3, LAST_MAP, 4 + warp_event 0, 4, LAST_MAP, 4 + warp_event 5, 3, LAST_MAP, 1 + warp_event 5, 4, LAST_MAP, 2 def_bg_events diff --git a/data/maps/objects/Route8.asm b/data/maps/objects/Route8.asm index 2ca33901..61faa47f 100644 --- a/data/maps/objects/Route8.asm +++ b/data/maps/objects/Route8.asm @@ -2,11 +2,11 @@ Route8_Object: db $2c ; border block def_warp_events - warp_event 1, 9, ROUTE_8_GATE, 0 - warp_event 1, 10, ROUTE_8_GATE, 1 - warp_event 8, 9, ROUTE_8_GATE, 2 - warp_event 8, 10, ROUTE_8_GATE, 3 - warp_event 13, 3, UNDERGROUND_PATH_ROUTE_8, 0 + warp_event 1, 9, ROUTE_8_GATE, 1 + warp_event 1, 10, ROUTE_8_GATE, 2 + warp_event 8, 9, ROUTE_8_GATE, 3 + warp_event 8, 10, ROUTE_8_GATE, 4 + warp_event 13, 3, UNDERGROUND_PATH_ROUTE_8, 1 def_bg_events bg_event 17, 3, 10 ; Route8Text10 diff --git a/data/maps/objects/Route8Gate.asm b/data/maps/objects/Route8Gate.asm index ee09b038..47a24967 100644 --- a/data/maps/objects/Route8Gate.asm +++ b/data/maps/objects/Route8Gate.asm @@ -2,10 +2,10 @@ Route8Gate_Object: db $a ; border block def_warp_events - warp_event 0, 3, LAST_MAP, 0 - warp_event 0, 4, LAST_MAP, 1 - warp_event 5, 3, LAST_MAP, 2 - warp_event 5, 4, LAST_MAP, 3 + warp_event 0, 3, LAST_MAP, 1 + warp_event 0, 4, LAST_MAP, 2 + warp_event 5, 3, LAST_MAP, 3 + warp_event 5, 4, LAST_MAP, 4 def_bg_events diff --git a/data/maps/objects/SSAnne1F.asm b/data/maps/objects/SSAnne1F.asm index 60db6da2..61184a1b 100644 --- a/data/maps/objects/SSAnne1F.asm +++ b/data/maps/objects/SSAnne1F.asm @@ -2,17 +2,17 @@ SSAnne1F_Object: db $c ; border block def_warp_events - warp_event 26, 0, VERMILION_DOCK, 1 - warp_event 27, 0, VERMILION_DOCK, 1 - warp_event 31, 8, SS_ANNE_1F_ROOMS, 0 - warp_event 23, 8, SS_ANNE_1F_ROOMS, 1 - warp_event 19, 8, SS_ANNE_1F_ROOMS, 2 - warp_event 15, 8, SS_ANNE_1F_ROOMS, 3 - warp_event 11, 8, SS_ANNE_1F_ROOMS, 4 - warp_event 7, 8, SS_ANNE_1F_ROOMS, 5 - warp_event 2, 6, SS_ANNE_2F, 6 - warp_event 37, 15, SS_ANNE_B1F, 5 - warp_event 3, 16, SS_ANNE_KITCHEN, 0 + warp_event 26, 0, VERMILION_DOCK, 2 + warp_event 27, 0, VERMILION_DOCK, 2 + warp_event 31, 8, SS_ANNE_1F_ROOMS, 1 + warp_event 23, 8, SS_ANNE_1F_ROOMS, 2 + warp_event 19, 8, SS_ANNE_1F_ROOMS, 3 + warp_event 15, 8, SS_ANNE_1F_ROOMS, 4 + warp_event 11, 8, SS_ANNE_1F_ROOMS, 5 + warp_event 7, 8, SS_ANNE_1F_ROOMS, 6 + warp_event 2, 6, SS_ANNE_2F, 7 + warp_event 37, 15, SS_ANNE_B1F, 6 + warp_event 3, 16, SS_ANNE_KITCHEN, 1 def_bg_events diff --git a/data/maps/objects/SSAnne1FRooms.asm b/data/maps/objects/SSAnne1FRooms.asm index c5c97671..6192c31a 100644 --- a/data/maps/objects/SSAnne1FRooms.asm +++ b/data/maps/objects/SSAnne1FRooms.asm @@ -2,12 +2,12 @@ SSAnne1FRooms_Object: db $c ; border block def_warp_events - warp_event 0, 0, SS_ANNE_1F, 2 - warp_event 10, 0, SS_ANNE_1F, 3 - warp_event 20, 0, SS_ANNE_1F, 4 - warp_event 0, 10, SS_ANNE_1F, 5 - warp_event 10, 10, SS_ANNE_1F, 6 - warp_event 20, 10, SS_ANNE_1F, 7 + warp_event 0, 0, SS_ANNE_1F, 3 + warp_event 10, 0, SS_ANNE_1F, 4 + warp_event 20, 0, SS_ANNE_1F, 5 + warp_event 0, 10, SS_ANNE_1F, 6 + warp_event 10, 10, SS_ANNE_1F, 7 + warp_event 20, 10, SS_ANNE_1F, 8 def_bg_events diff --git a/data/maps/objects/SSAnne2F.asm b/data/maps/objects/SSAnne2F.asm index fa3a851f..cfd93189 100644 --- a/data/maps/objects/SSAnne2F.asm +++ b/data/maps/objects/SSAnne2F.asm @@ -2,15 +2,15 @@ SSAnne2F_Object: db $c ; border block def_warp_events - warp_event 9, 11, SS_ANNE_2F_ROOMS, 0 - warp_event 13, 11, SS_ANNE_2F_ROOMS, 2 - warp_event 17, 11, SS_ANNE_2F_ROOMS, 4 - warp_event 21, 11, SS_ANNE_2F_ROOMS, 6 - warp_event 25, 11, SS_ANNE_2F_ROOMS, 8 - warp_event 29, 11, SS_ANNE_2F_ROOMS, 10 - warp_event 2, 4, SS_ANNE_1F, 8 - warp_event 2, 12, SS_ANNE_3F, 1 - warp_event 36, 4, SS_ANNE_CAPTAINS_ROOM, 0 + warp_event 9, 11, SS_ANNE_2F_ROOMS, 1 + warp_event 13, 11, SS_ANNE_2F_ROOMS, 3 + warp_event 17, 11, SS_ANNE_2F_ROOMS, 5 + warp_event 21, 11, SS_ANNE_2F_ROOMS, 7 + warp_event 25, 11, SS_ANNE_2F_ROOMS, 9 + warp_event 29, 11, SS_ANNE_2F_ROOMS, 11 + warp_event 2, 4, SS_ANNE_1F, 9 + warp_event 2, 12, SS_ANNE_3F, 2 + warp_event 36, 4, SS_ANNE_CAPTAINS_ROOM, 1 def_bg_events diff --git a/data/maps/objects/SSAnne2FRooms.asm b/data/maps/objects/SSAnne2FRooms.asm index 187da976..1a9a1cb1 100644 --- a/data/maps/objects/SSAnne2FRooms.asm +++ b/data/maps/objects/SSAnne2FRooms.asm @@ -2,18 +2,18 @@ SSAnne2FRooms_Object: db $c ; border block def_warp_events - warp_event 2, 5, SS_ANNE_2F, 0 - warp_event 3, 5, SS_ANNE_2F, 0 - warp_event 12, 5, SS_ANNE_2F, 1 - warp_event 13, 5, SS_ANNE_2F, 1 - warp_event 22, 5, SS_ANNE_2F, 2 - warp_event 23, 5, SS_ANNE_2F, 2 - warp_event 2, 15, SS_ANNE_2F, 3 - warp_event 3, 15, SS_ANNE_2F, 3 - warp_event 12, 15, SS_ANNE_2F, 4 - warp_event 13, 15, SS_ANNE_2F, 4 - warp_event 22, 15, SS_ANNE_2F, 5 - warp_event 23, 15, SS_ANNE_2F, 5 + warp_event 2, 5, SS_ANNE_2F, 1 + warp_event 3, 5, SS_ANNE_2F, 1 + warp_event 12, 5, SS_ANNE_2F, 2 + warp_event 13, 5, SS_ANNE_2F, 2 + warp_event 22, 5, SS_ANNE_2F, 3 + warp_event 23, 5, SS_ANNE_2F, 3 + warp_event 2, 15, SS_ANNE_2F, 4 + warp_event 3, 15, SS_ANNE_2F, 4 + warp_event 12, 15, SS_ANNE_2F, 5 + warp_event 13, 15, SS_ANNE_2F, 5 + warp_event 22, 15, SS_ANNE_2F, 6 + warp_event 23, 15, SS_ANNE_2F, 6 def_bg_events diff --git a/data/maps/objects/SSAnne3F.asm b/data/maps/objects/SSAnne3F.asm index 18df6b5e..09c4b5bd 100644 --- a/data/maps/objects/SSAnne3F.asm +++ b/data/maps/objects/SSAnne3F.asm @@ -2,8 +2,8 @@ SSAnne3F_Object: db $c ; border block def_warp_events - warp_event 0, 3, SS_ANNE_BOW, 0 - warp_event 19, 3, SS_ANNE_2F, 7 + warp_event 0, 3, SS_ANNE_BOW, 1 + warp_event 19, 3, SS_ANNE_2F, 8 def_bg_events diff --git a/data/maps/objects/SSAnneB1F.asm b/data/maps/objects/SSAnneB1F.asm index a63caeb9..c7559dd6 100644 --- a/data/maps/objects/SSAnneB1F.asm +++ b/data/maps/objects/SSAnneB1F.asm @@ -2,12 +2,12 @@ SSAnneB1F_Object: db $c ; border block def_warp_events - warp_event 23, 3, SS_ANNE_B1F_ROOMS, 8 - warp_event 19, 3, SS_ANNE_B1F_ROOMS, 6 - warp_event 15, 3, SS_ANNE_B1F_ROOMS, 4 - warp_event 11, 3, SS_ANNE_B1F_ROOMS, 2 - warp_event 7, 3, SS_ANNE_B1F_ROOMS, 0 - warp_event 27, 5, SS_ANNE_1F, 9 + warp_event 23, 3, SS_ANNE_B1F_ROOMS, 9 + warp_event 19, 3, SS_ANNE_B1F_ROOMS, 7 + warp_event 15, 3, SS_ANNE_B1F_ROOMS, 5 + warp_event 11, 3, SS_ANNE_B1F_ROOMS, 3 + warp_event 7, 3, SS_ANNE_B1F_ROOMS, 1 + warp_event 27, 5, SS_ANNE_1F, 10 def_bg_events diff --git a/data/maps/objects/SSAnneB1FRooms.asm b/data/maps/objects/SSAnneB1FRooms.asm index a7bf0825..3c7da689 100644 --- a/data/maps/objects/SSAnneB1FRooms.asm +++ b/data/maps/objects/SSAnneB1FRooms.asm @@ -2,16 +2,16 @@ SSAnneB1FRooms_Object: db $c ; border block def_warp_events - warp_event 2, 5, SS_ANNE_B1F, 4 - warp_event 3, 5, SS_ANNE_B1F, 4 - warp_event 12, 5, SS_ANNE_B1F, 3 - warp_event 13, 5, SS_ANNE_B1F, 3 - warp_event 22, 5, SS_ANNE_B1F, 2 - warp_event 23, 5, SS_ANNE_B1F, 2 - warp_event 2, 15, SS_ANNE_B1F, 1 - warp_event 3, 15, SS_ANNE_B1F, 1 - warp_event 12, 15, SS_ANNE_B1F, 0 - warp_event 13, 15, SS_ANNE_B1F, 0 + warp_event 2, 5, SS_ANNE_B1F, 5 + warp_event 3, 5, SS_ANNE_B1F, 5 + warp_event 12, 5, SS_ANNE_B1F, 4 + warp_event 13, 5, SS_ANNE_B1F, 4 + warp_event 22, 5, SS_ANNE_B1F, 3 + warp_event 23, 5, SS_ANNE_B1F, 3 + warp_event 2, 15, SS_ANNE_B1F, 2 + warp_event 3, 15, SS_ANNE_B1F, 2 + warp_event 12, 15, SS_ANNE_B1F, 1 + warp_event 13, 15, SS_ANNE_B1F, 1 def_bg_events diff --git a/data/maps/objects/SSAnneBow.asm b/data/maps/objects/SSAnneBow.asm index 9771a94f..6374f009 100644 --- a/data/maps/objects/SSAnneBow.asm +++ b/data/maps/objects/SSAnneBow.asm @@ -2,8 +2,8 @@ SSAnneBow_Object: db $23 ; border block def_warp_events - warp_event 13, 6, SS_ANNE_3F, 0 - warp_event 13, 7, SS_ANNE_3F, 0 + warp_event 13, 6, SS_ANNE_3F, 1 + warp_event 13, 7, SS_ANNE_3F, 1 def_bg_events diff --git a/data/maps/objects/SSAnneCaptainsRoom.asm b/data/maps/objects/SSAnneCaptainsRoom.asm index 7e79b662..195e4183 100644 --- a/data/maps/objects/SSAnneCaptainsRoom.asm +++ b/data/maps/objects/SSAnneCaptainsRoom.asm @@ -2,7 +2,7 @@ SSAnneCaptainsRoom_Object: db $c ; border block def_warp_events - warp_event 0, 7, SS_ANNE_2F, 8 + warp_event 0, 7, SS_ANNE_2F, 9 def_bg_events bg_event 4, 1, 2 ; SSAnne7Text2 diff --git a/data/maps/objects/SSAnneKitchen.asm b/data/maps/objects/SSAnneKitchen.asm index 3a8ab47b..c651679e 100644 --- a/data/maps/objects/SSAnneKitchen.asm +++ b/data/maps/objects/SSAnneKitchen.asm @@ -2,7 +2,7 @@ SSAnneKitchen_Object: db $c ; border block def_warp_events - warp_event 6, 0, SS_ANNE_1F, 10 + warp_event 6, 0, SS_ANNE_1F, 11 def_bg_events diff --git a/data/maps/objects/SafariZoneCenter.asm b/data/maps/objects/SafariZoneCenter.asm index ceaf6266..1c8efe95 100644 --- a/data/maps/objects/SafariZoneCenter.asm +++ b/data/maps/objects/SafariZoneCenter.asm @@ -2,15 +2,15 @@ SafariZoneCenter_Object: db $0 ; border block def_warp_events - warp_event 14, 25, SAFARI_ZONE_GATE, 2 - warp_event 15, 25, SAFARI_ZONE_GATE, 3 - warp_event 0, 10, SAFARI_ZONE_WEST, 4 - warp_event 0, 11, SAFARI_ZONE_WEST, 5 - warp_event 14, 0, SAFARI_ZONE_NORTH, 4 - warp_event 15, 0, SAFARI_ZONE_NORTH, 5 - warp_event 29, 10, SAFARI_ZONE_EAST, 2 - warp_event 29, 11, SAFARI_ZONE_EAST, 3 - warp_event 17, 19, SAFARI_ZONE_CENTER_REST_HOUSE, 0 + warp_event 14, 25, SAFARI_ZONE_GATE, 3 + warp_event 15, 25, SAFARI_ZONE_GATE, 4 + warp_event 0, 10, SAFARI_ZONE_WEST, 5 + warp_event 0, 11, SAFARI_ZONE_WEST, 6 + warp_event 14, 0, SAFARI_ZONE_NORTH, 5 + warp_event 15, 0, SAFARI_ZONE_NORTH, 6 + warp_event 29, 10, SAFARI_ZONE_EAST, 3 + warp_event 29, 11, SAFARI_ZONE_EAST, 4 + warp_event 17, 19, SAFARI_ZONE_CENTER_REST_HOUSE, 1 def_bg_events bg_event 18, 20, 2 ; SafariZoneCenterText2 diff --git a/data/maps/objects/SafariZoneCenterRestHouse.asm b/data/maps/objects/SafariZoneCenterRestHouse.asm index 2d000233..ff48d19c 100644 --- a/data/maps/objects/SafariZoneCenterRestHouse.asm +++ b/data/maps/objects/SafariZoneCenterRestHouse.asm @@ -2,8 +2,8 @@ SafariZoneCenterRestHouse_Object: db $a ; border block def_warp_events - warp_event 2, 7, SAFARI_ZONE_CENTER, 8 - warp_event 3, 7, SAFARI_ZONE_CENTER, 8 + warp_event 2, 7, SAFARI_ZONE_CENTER, 9 + warp_event 3, 7, SAFARI_ZONE_CENTER, 9 def_bg_events diff --git a/data/maps/objects/SafariZoneEast.asm b/data/maps/objects/SafariZoneEast.asm index f5759d6b..30fb4039 100644 --- a/data/maps/objects/SafariZoneEast.asm +++ b/data/maps/objects/SafariZoneEast.asm @@ -2,11 +2,11 @@ SafariZoneEast_Object: db $0 ; border block def_warp_events - warp_event 0, 4, SAFARI_ZONE_NORTH, 6 - warp_event 0, 5, SAFARI_ZONE_NORTH, 7 - warp_event 0, 22, SAFARI_ZONE_CENTER, 6 - warp_event 0, 23, SAFARI_ZONE_CENTER, 6 - warp_event 25, 9, SAFARI_ZONE_EAST_REST_HOUSE, 0 + warp_event 0, 4, SAFARI_ZONE_NORTH, 7 + warp_event 0, 5, SAFARI_ZONE_NORTH, 8 + warp_event 0, 22, SAFARI_ZONE_CENTER, 7 + warp_event 0, 23, SAFARI_ZONE_CENTER, 7 + warp_event 25, 9, SAFARI_ZONE_EAST_REST_HOUSE, 1 def_bg_events bg_event 26, 10, 5 ; SafariZoneEastText5 diff --git a/data/maps/objects/SafariZoneEastRestHouse.asm b/data/maps/objects/SafariZoneEastRestHouse.asm index 915e175b..bf506605 100644 --- a/data/maps/objects/SafariZoneEastRestHouse.asm +++ b/data/maps/objects/SafariZoneEastRestHouse.asm @@ -2,8 +2,8 @@ SafariZoneEastRestHouse_Object: db $a ; border block def_warp_events - warp_event 2, 7, SAFARI_ZONE_EAST, 4 - warp_event 3, 7, SAFARI_ZONE_EAST, 4 + warp_event 2, 7, SAFARI_ZONE_EAST, 5 + warp_event 3, 7, SAFARI_ZONE_EAST, 5 def_bg_events diff --git a/data/maps/objects/SafariZoneGate.asm b/data/maps/objects/SafariZoneGate.asm index d3c153fb..ba6f7017 100644 --- a/data/maps/objects/SafariZoneGate.asm +++ b/data/maps/objects/SafariZoneGate.asm @@ -2,10 +2,10 @@ SafariZoneGate_Object: db $a ; border block def_warp_events - warp_event 3, 5, LAST_MAP, 4 - warp_event 4, 5, LAST_MAP, 4 - warp_event 3, 0, SAFARI_ZONE_CENTER, 0 - warp_event 4, 0, SAFARI_ZONE_CENTER, 1 + warp_event 3, 5, LAST_MAP, 5 + warp_event 4, 5, LAST_MAP, 5 + warp_event 3, 0, SAFARI_ZONE_CENTER, 1 + warp_event 4, 0, SAFARI_ZONE_CENTER, 2 def_bg_events diff --git a/data/maps/objects/SafariZoneNorth.asm b/data/maps/objects/SafariZoneNorth.asm index e9c50acb..97dc0d55 100644 --- a/data/maps/objects/SafariZoneNorth.asm +++ b/data/maps/objects/SafariZoneNorth.asm @@ -2,15 +2,15 @@ SafariZoneNorth_Object: db $0 ; border block def_warp_events - warp_event 2, 35, SAFARI_ZONE_WEST, 0 - warp_event 3, 35, SAFARI_ZONE_WEST, 1 - warp_event 8, 35, SAFARI_ZONE_WEST, 2 - warp_event 9, 35, SAFARI_ZONE_WEST, 3 - warp_event 20, 35, SAFARI_ZONE_CENTER, 4 - warp_event 21, 35, SAFARI_ZONE_CENTER, 5 - warp_event 39, 30, SAFARI_ZONE_EAST, 0 - warp_event 39, 31, SAFARI_ZONE_EAST, 1 - warp_event 35, 3, SAFARI_ZONE_NORTH_REST_HOUSE, 0 + warp_event 2, 35, SAFARI_ZONE_WEST, 1 + warp_event 3, 35, SAFARI_ZONE_WEST, 2 + warp_event 8, 35, SAFARI_ZONE_WEST, 3 + warp_event 9, 35, SAFARI_ZONE_WEST, 4 + warp_event 20, 35, SAFARI_ZONE_CENTER, 5 + warp_event 21, 35, SAFARI_ZONE_CENTER, 6 + warp_event 39, 30, SAFARI_ZONE_EAST, 1 + warp_event 39, 31, SAFARI_ZONE_EAST, 2 + warp_event 35, 3, SAFARI_ZONE_NORTH_REST_HOUSE, 1 def_bg_events bg_event 36, 4, 3 ; SafariZoneNorthText3 diff --git a/data/maps/objects/SafariZoneNorthRestHouse.asm b/data/maps/objects/SafariZoneNorthRestHouse.asm index 1f5008a4..8fbacd81 100644 --- a/data/maps/objects/SafariZoneNorthRestHouse.asm +++ b/data/maps/objects/SafariZoneNorthRestHouse.asm @@ -2,8 +2,8 @@ SafariZoneNorthRestHouse_Object: db $a ; border block def_warp_events - warp_event 2, 7, SAFARI_ZONE_NORTH, 8 - warp_event 3, 7, SAFARI_ZONE_NORTH, 8 + warp_event 2, 7, SAFARI_ZONE_NORTH, 9 + warp_event 3, 7, SAFARI_ZONE_NORTH, 9 def_bg_events diff --git a/data/maps/objects/SafariZoneSecretHouse.asm b/data/maps/objects/SafariZoneSecretHouse.asm index 2459611c..5d3a28c2 100644 --- a/data/maps/objects/SafariZoneSecretHouse.asm +++ b/data/maps/objects/SafariZoneSecretHouse.asm @@ -2,8 +2,8 @@ SafariZoneSecretHouse_Object: db $17 ; border block def_warp_events - warp_event 2, 7, SAFARI_ZONE_WEST, 6 - warp_event 3, 7, SAFARI_ZONE_WEST, 6 + warp_event 2, 7, SAFARI_ZONE_WEST, 7 + warp_event 3, 7, SAFARI_ZONE_WEST, 7 def_bg_events diff --git a/data/maps/objects/SafariZoneWest.asm b/data/maps/objects/SafariZoneWest.asm index b75f824d..dca3d3a8 100644 --- a/data/maps/objects/SafariZoneWest.asm +++ b/data/maps/objects/SafariZoneWest.asm @@ -2,14 +2,14 @@ SafariZoneWest_Object: db $0 ; border block def_warp_events - warp_event 20, 0, SAFARI_ZONE_NORTH, 0 - warp_event 21, 0, SAFARI_ZONE_NORTH, 1 - warp_event 26, 0, SAFARI_ZONE_NORTH, 2 - warp_event 27, 0, SAFARI_ZONE_NORTH, 3 - warp_event 29, 22, SAFARI_ZONE_CENTER, 2 - warp_event 29, 23, SAFARI_ZONE_CENTER, 3 - warp_event 3, 3, SAFARI_ZONE_SECRET_HOUSE, 0 - warp_event 11, 11, SAFARI_ZONE_WEST_REST_HOUSE, 0 + warp_event 20, 0, SAFARI_ZONE_NORTH, 1 + warp_event 21, 0, SAFARI_ZONE_NORTH, 2 + warp_event 26, 0, SAFARI_ZONE_NORTH, 3 + warp_event 27, 0, SAFARI_ZONE_NORTH, 4 + warp_event 29, 22, SAFARI_ZONE_CENTER, 3 + warp_event 29, 23, SAFARI_ZONE_CENTER, 4 + warp_event 3, 3, SAFARI_ZONE_SECRET_HOUSE, 1 + warp_event 11, 11, SAFARI_ZONE_WEST_REST_HOUSE, 1 def_bg_events bg_event 12, 12, 5 ; SafariZoneWestText5 diff --git a/data/maps/objects/SafariZoneWestRestHouse.asm b/data/maps/objects/SafariZoneWestRestHouse.asm index f7349815..c63886b7 100644 --- a/data/maps/objects/SafariZoneWestRestHouse.asm +++ b/data/maps/objects/SafariZoneWestRestHouse.asm @@ -2,8 +2,8 @@ SafariZoneWestRestHouse_Object: db $a ; border block def_warp_events - warp_event 2, 7, SAFARI_ZONE_WEST, 7 - warp_event 3, 7, SAFARI_ZONE_WEST, 7 + warp_event 2, 7, SAFARI_ZONE_WEST, 8 + warp_event 3, 7, SAFARI_ZONE_WEST, 8 def_bg_events diff --git a/data/maps/objects/SaffronCity.asm b/data/maps/objects/SaffronCity.asm index 4c11417a..2fddfd5e 100644 --- a/data/maps/objects/SaffronCity.asm +++ b/data/maps/objects/SaffronCity.asm @@ -2,14 +2,14 @@ SaffronCity_Object: db $f ; border block def_warp_events - warp_event 7, 5, COPYCATS_HOUSE_1F, 0 - warp_event 26, 3, FIGHTING_DOJO, 0 - warp_event 34, 3, SAFFRON_GYM, 0 - warp_event 13, 11, SAFFRON_PIDGEY_HOUSE, 0 - warp_event 25, 11, SAFFRON_MART, 0 - warp_event 18, 21, SILPH_CO_1F, 0 - warp_event 9, 29, SAFFRON_POKECENTER, 0 - warp_event 29, 29, MR_PSYCHICS_HOUSE, 0 + warp_event 7, 5, COPYCATS_HOUSE_1F, 1 + warp_event 26, 3, FIGHTING_DOJO, 1 + warp_event 34, 3, SAFFRON_GYM, 1 + warp_event 13, 11, SAFFRON_PIDGEY_HOUSE, 1 + warp_event 25, 11, SAFFRON_MART, 1 + warp_event 18, 21, SILPH_CO_1F, 1 + warp_event 9, 29, SAFFRON_POKECENTER, 1 + warp_event 29, 29, MR_PSYCHICS_HOUSE, 1 def_bg_events bg_event 17, 5, 16 ; SaffronCityText16 diff --git a/data/maps/objects/SaffronGym.asm b/data/maps/objects/SaffronGym.asm index a8e3da1c..7c6e83e5 100644 --- a/data/maps/objects/SaffronGym.asm +++ b/data/maps/objects/SaffronGym.asm @@ -2,38 +2,38 @@ SaffronGym_Object: db $2e ; border block def_warp_events - warp_event 8, 17, LAST_MAP, 2 - warp_event 9, 17, LAST_MAP, 2 - warp_event 1, 3, SAFFRON_GYM, 22 - warp_event 5, 3, SAFFRON_GYM, 15 - warp_event 1, 5, SAFFRON_GYM, 18 - warp_event 5, 5, SAFFRON_GYM, 8 - warp_event 1, 9, SAFFRON_GYM, 27 - warp_event 5, 9, SAFFRON_GYM, 16 - warp_event 1, 11, SAFFRON_GYM, 5 - warp_event 5, 11, SAFFRON_GYM, 13 - warp_event 1, 15, SAFFRON_GYM, 23 - warp_event 5, 15, SAFFRON_GYM, 30 - warp_event 1, 17, SAFFRON_GYM, 17 - warp_event 5, 17, SAFFRON_GYM, 9 - warp_event 9, 3, SAFFRON_GYM, 26 - warp_event 11, 3, SAFFRON_GYM, 3 - warp_event 9, 5, SAFFRON_GYM, 7 - warp_event 11, 5, SAFFRON_GYM, 12 - warp_event 11, 11, SAFFRON_GYM, 4 - warp_event 11, 15, SAFFRON_GYM, 31 - warp_event 15, 3, SAFFRON_GYM, 24 - warp_event 19, 3, SAFFRON_GYM, 28 - warp_event 15, 5, SAFFRON_GYM, 2 - warp_event 19, 5, SAFFRON_GYM, 10 - warp_event 15, 9, SAFFRON_GYM, 20 - warp_event 19, 9, SAFFRON_GYM, 29 - warp_event 15, 11, SAFFRON_GYM, 14 - warp_event 19, 11, SAFFRON_GYM, 6 - warp_event 15, 15, SAFFRON_GYM, 21 - warp_event 19, 15, SAFFRON_GYM, 25 - warp_event 15, 17, SAFFRON_GYM, 11 - warp_event 19, 17, SAFFRON_GYM, 19 + warp_event 8, 17, LAST_MAP, 3 + warp_event 9, 17, LAST_MAP, 3 + warp_event 1, 3, SAFFRON_GYM, 23 + warp_event 5, 3, SAFFRON_GYM, 16 + warp_event 1, 5, SAFFRON_GYM, 19 + warp_event 5, 5, SAFFRON_GYM, 9 + warp_event 1, 9, SAFFRON_GYM, 28 + warp_event 5, 9, SAFFRON_GYM, 17 + warp_event 1, 11, SAFFRON_GYM, 6 + warp_event 5, 11, SAFFRON_GYM, 14 + warp_event 1, 15, SAFFRON_GYM, 24 + warp_event 5, 15, SAFFRON_GYM, 31 + warp_event 1, 17, SAFFRON_GYM, 18 + warp_event 5, 17, SAFFRON_GYM, 10 + warp_event 9, 3, SAFFRON_GYM, 27 + warp_event 11, 3, SAFFRON_GYM, 4 + warp_event 9, 5, SAFFRON_GYM, 8 + warp_event 11, 5, SAFFRON_GYM, 13 + warp_event 11, 11, SAFFRON_GYM, 5 + warp_event 11, 15, SAFFRON_GYM, 32 + warp_event 15, 3, SAFFRON_GYM, 25 + warp_event 19, 3, SAFFRON_GYM, 29 + warp_event 15, 5, SAFFRON_GYM, 3 + warp_event 19, 5, SAFFRON_GYM, 11 + warp_event 15, 9, SAFFRON_GYM, 21 + warp_event 19, 9, SAFFRON_GYM, 30 + warp_event 15, 11, SAFFRON_GYM, 15 + warp_event 19, 11, SAFFRON_GYM, 7 + warp_event 15, 15, SAFFRON_GYM, 22 + warp_event 19, 15, SAFFRON_GYM, 26 + warp_event 15, 17, SAFFRON_GYM, 12 + warp_event 19, 17, SAFFRON_GYM, 20 def_bg_events diff --git a/data/maps/objects/SaffronMart.asm b/data/maps/objects/SaffronMart.asm index 972032ac..d9dd6881 100644 --- a/data/maps/objects/SaffronMart.asm +++ b/data/maps/objects/SaffronMart.asm @@ -2,8 +2,8 @@ SaffronMart_Object: db $0 ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 4 - warp_event 4, 7, LAST_MAP, 4 + warp_event 3, 7, LAST_MAP, 5 + warp_event 4, 7, LAST_MAP, 5 def_bg_events diff --git a/data/maps/objects/SaffronPidgeyHouse.asm b/data/maps/objects/SaffronPidgeyHouse.asm index cd37ffc1..8a5249e5 100644 --- a/data/maps/objects/SaffronPidgeyHouse.asm +++ b/data/maps/objects/SaffronPidgeyHouse.asm @@ -2,8 +2,8 @@ SaffronPidgeyHouse_Object: db $a ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 3 - warp_event 3, 7, LAST_MAP, 3 + warp_event 2, 7, LAST_MAP, 4 + warp_event 3, 7, LAST_MAP, 4 def_bg_events diff --git a/data/maps/objects/SaffronPokecenter.asm b/data/maps/objects/SaffronPokecenter.asm index d3f6af7f..ca94086b 100644 --- a/data/maps/objects/SaffronPokecenter.asm +++ b/data/maps/objects/SaffronPokecenter.asm @@ -2,8 +2,8 @@ SaffronPokecenter_Object: db $0 ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 6 - warp_event 4, 7, LAST_MAP, 6 + warp_event 3, 7, LAST_MAP, 7 + warp_event 4, 7, LAST_MAP, 7 def_bg_events diff --git a/data/maps/objects/SeafoamIslands1F.asm b/data/maps/objects/SeafoamIslands1F.asm index f82c397f..f5e3347b 100644 --- a/data/maps/objects/SeafoamIslands1F.asm +++ b/data/maps/objects/SeafoamIslands1F.asm @@ -2,13 +2,13 @@ SeafoamIslands1F_Object: db $7d ; border block def_warp_events - warp_event 4, 17, LAST_MAP, 0 - warp_event 5, 17, LAST_MAP, 0 - warp_event 26, 17, LAST_MAP, 1 - warp_event 27, 17, LAST_MAP, 1 - warp_event 7, 5, SEAFOAM_ISLANDS_B1F, 1 - warp_event 25, 3, SEAFOAM_ISLANDS_B1F, 6 - warp_event 23, 15, SEAFOAM_ISLANDS_B1F, 4 + warp_event 4, 17, LAST_MAP, 1 + warp_event 5, 17, LAST_MAP, 1 + warp_event 26, 17, LAST_MAP, 2 + warp_event 27, 17, LAST_MAP, 2 + warp_event 7, 5, SEAFOAM_ISLANDS_B1F, 2 + warp_event 25, 3, SEAFOAM_ISLANDS_B1F, 7 + warp_event 23, 15, SEAFOAM_ISLANDS_B1F, 5 def_bg_events diff --git a/data/maps/objects/SeafoamIslandsB1F.asm b/data/maps/objects/SeafoamIslandsB1F.asm index 6e3ed1f7..165fc440 100644 --- a/data/maps/objects/SeafoamIslandsB1F.asm +++ b/data/maps/objects/SeafoamIslandsB1F.asm @@ -2,13 +2,13 @@ SeafoamIslandsB1F_Object: db $7d ; border block def_warp_events - warp_event 4, 2, SEAFOAM_ISLANDS_B2F, 0 - warp_event 7, 5, SEAFOAM_ISLANDS_1F, 4 - warp_event 13, 7, SEAFOAM_ISLANDS_B2F, 2 - warp_event 19, 15, SEAFOAM_ISLANDS_B2F, 3 - warp_event 23, 15, SEAFOAM_ISLANDS_1F, 6 - warp_event 25, 11, SEAFOAM_ISLANDS_B2F, 5 - warp_event 25, 3, SEAFOAM_ISLANDS_1F, 5 + warp_event 4, 2, SEAFOAM_ISLANDS_B2F, 1 + warp_event 7, 5, SEAFOAM_ISLANDS_1F, 5 + warp_event 13, 7, SEAFOAM_ISLANDS_B2F, 3 + warp_event 19, 15, SEAFOAM_ISLANDS_B2F, 4 + warp_event 23, 15, SEAFOAM_ISLANDS_1F, 7 + warp_event 25, 11, SEAFOAM_ISLANDS_B2F, 6 + warp_event 25, 3, SEAFOAM_ISLANDS_1F, 6 def_bg_events diff --git a/data/maps/objects/SeafoamIslandsB2F.asm b/data/maps/objects/SeafoamIslandsB2F.asm index e0894b20..1ab5b373 100644 --- a/data/maps/objects/SeafoamIslandsB2F.asm +++ b/data/maps/objects/SeafoamIslandsB2F.asm @@ -2,13 +2,13 @@ SeafoamIslandsB2F_Object: db $7d ; border block def_warp_events - warp_event 5, 3, SEAFOAM_ISLANDS_B1F, 0 - warp_event 5, 13, SEAFOAM_ISLANDS_B3F, 0 - warp_event 13, 7, SEAFOAM_ISLANDS_B1F, 2 - warp_event 19, 15, SEAFOAM_ISLANDS_B1F, 3 - warp_event 25, 3, SEAFOAM_ISLANDS_B3F, 3 - warp_event 25, 11, SEAFOAM_ISLANDS_B1F, 5 - warp_event 25, 14, SEAFOAM_ISLANDS_B3F, 4 + warp_event 5, 3, SEAFOAM_ISLANDS_B1F, 1 + warp_event 5, 13, SEAFOAM_ISLANDS_B3F, 1 + warp_event 13, 7, SEAFOAM_ISLANDS_B1F, 3 + warp_event 19, 15, SEAFOAM_ISLANDS_B1F, 4 + warp_event 25, 3, SEAFOAM_ISLANDS_B3F, 4 + warp_event 25, 11, SEAFOAM_ISLANDS_B1F, 6 + warp_event 25, 14, SEAFOAM_ISLANDS_B3F, 5 def_bg_events diff --git a/data/maps/objects/SeafoamIslandsB3F.asm b/data/maps/objects/SeafoamIslandsB3F.asm index 0ff64bd1..4657a80a 100644 --- a/data/maps/objects/SeafoamIslandsB3F.asm +++ b/data/maps/objects/SeafoamIslandsB3F.asm @@ -2,13 +2,13 @@ SeafoamIslandsB3F_Object: db $7d ; border block def_warp_events - warp_event 5, 12, SEAFOAM_ISLANDS_B2F, 1 - warp_event 8, 6, SEAFOAM_ISLANDS_B4F, 2 - warp_event 25, 4, SEAFOAM_ISLANDS_B4F, 3 - warp_event 25, 3, SEAFOAM_ISLANDS_B2F, 4 - warp_event 25, 14, SEAFOAM_ISLANDS_B2F, 6 - warp_event 20, 17, SEAFOAM_ISLANDS_B4F, 0 - warp_event 21, 17, SEAFOAM_ISLANDS_B4F, 1 + warp_event 5, 12, SEAFOAM_ISLANDS_B2F, 2 + warp_event 8, 6, SEAFOAM_ISLANDS_B4F, 3 + warp_event 25, 4, SEAFOAM_ISLANDS_B4F, 4 + warp_event 25, 3, SEAFOAM_ISLANDS_B2F, 5 + warp_event 25, 14, SEAFOAM_ISLANDS_B2F, 7 + warp_event 20, 17, SEAFOAM_ISLANDS_B4F, 1 + warp_event 21, 17, SEAFOAM_ISLANDS_B4F, 2 def_bg_events diff --git a/data/maps/objects/SeafoamIslandsB4F.asm b/data/maps/objects/SeafoamIslandsB4F.asm index 500f185d..c6e769e0 100644 --- a/data/maps/objects/SeafoamIslandsB4F.asm +++ b/data/maps/objects/SeafoamIslandsB4F.asm @@ -2,10 +2,10 @@ SeafoamIslandsB4F_Object: db $7d ; border block def_warp_events - warp_event 20, 17, SEAFOAM_ISLANDS_B3F, 5 - warp_event 21, 17, SEAFOAM_ISLANDS_B3F, 6 - warp_event 11, 7, SEAFOAM_ISLANDS_B3F, 1 - warp_event 25, 4, SEAFOAM_ISLANDS_B3F, 2 + warp_event 20, 17, SEAFOAM_ISLANDS_B3F, 6 + warp_event 21, 17, SEAFOAM_ISLANDS_B3F, 7 + warp_event 11, 7, SEAFOAM_ISLANDS_B3F, 2 + warp_event 25, 4, SEAFOAM_ISLANDS_B3F, 3 def_bg_events bg_event 9, 15, 4 ; SeafoamIslands5Text4 diff --git a/data/maps/objects/SilphCo10F.asm b/data/maps/objects/SilphCo10F.asm index 4747cbef..20249425 100644 --- a/data/maps/objects/SilphCo10F.asm +++ b/data/maps/objects/SilphCo10F.asm @@ -2,12 +2,12 @@ SilphCo10F_Object: db $2e ; border block def_warp_events - warp_event 8, 0, SILPH_CO_9F, 0 - warp_event 10, 0, SILPH_CO_11F, 0 - warp_event 12, 0, SILPH_CO_ELEVATOR, 0 - warp_event 9, 11, SILPH_CO_4F, 3 - warp_event 13, 15, SILPH_CO_4F, 5 - warp_event 13, 7, SILPH_CO_4F, 6 + warp_event 8, 0, SILPH_CO_9F, 1 + warp_event 10, 0, SILPH_CO_11F, 1 + warp_event 12, 0, SILPH_CO_ELEVATOR, 1 + warp_event 9, 11, SILPH_CO_4F, 4 + warp_event 13, 15, SILPH_CO_4F, 6 + warp_event 13, 7, SILPH_CO_4F, 7 def_bg_events diff --git a/data/maps/objects/SilphCo11F.asm b/data/maps/objects/SilphCo11F.asm index 83b726f5..9651c32b 100644 --- a/data/maps/objects/SilphCo11F.asm +++ b/data/maps/objects/SilphCo11F.asm @@ -2,10 +2,10 @@ SilphCo11F_Object: db $d ; border block def_warp_events - warp_event 9, 0, SILPH_CO_10F, 1 - warp_event 13, 0, SILPH_CO_ELEVATOR, 0 - warp_event 5, 5, LAST_MAP, 9 - warp_event 3, 2, SILPH_CO_7F, 3 + warp_event 9, 0, SILPH_CO_10F, 2 + warp_event 13, 0, SILPH_CO_ELEVATOR, 1 + warp_event 5, 5, LAST_MAP, 10 + warp_event 3, 2, SILPH_CO_7F, 4 def_bg_events diff --git a/data/maps/objects/SilphCo1F.asm b/data/maps/objects/SilphCo1F.asm index f3407c54..605edd9d 100644 --- a/data/maps/objects/SilphCo1F.asm +++ b/data/maps/objects/SilphCo1F.asm @@ -2,11 +2,11 @@ SilphCo1F_Object: db $2e ; border block def_warp_events - warp_event 10, 17, LAST_MAP, 5 - warp_event 11, 17, LAST_MAP, 5 - warp_event 26, 0, SILPH_CO_2F, 0 - warp_event 20, 0, SILPH_CO_ELEVATOR, 0 - warp_event 16, 10, SILPH_CO_3F, 6 + warp_event 10, 17, LAST_MAP, 6 + warp_event 11, 17, LAST_MAP, 6 + warp_event 26, 0, SILPH_CO_2F, 1 + warp_event 20, 0, SILPH_CO_ELEVATOR, 1 + warp_event 16, 10, SILPH_CO_3F, 7 def_bg_events diff --git a/data/maps/objects/SilphCo2F.asm b/data/maps/objects/SilphCo2F.asm index b777cf52..3ee8de9c 100644 --- a/data/maps/objects/SilphCo2F.asm +++ b/data/maps/objects/SilphCo2F.asm @@ -2,13 +2,13 @@ SilphCo2F_Object: db $2e ; border block def_warp_events - warp_event 24, 0, SILPH_CO_1F, 2 - warp_event 26, 0, SILPH_CO_3F, 0 - warp_event 20, 0, SILPH_CO_ELEVATOR, 0 - warp_event 3, 3, SILPH_CO_3F, 6 - warp_event 13, 3, SILPH_CO_8F, 4 - warp_event 27, 15, SILPH_CO_8F, 5 - warp_event 9, 15, SILPH_CO_6F, 4 + warp_event 24, 0, SILPH_CO_1F, 3 + warp_event 26, 0, SILPH_CO_3F, 1 + warp_event 20, 0, SILPH_CO_ELEVATOR, 1 + warp_event 3, 3, SILPH_CO_3F, 7 + warp_event 13, 3, SILPH_CO_8F, 5 + warp_event 27, 15, SILPH_CO_8F, 6 + warp_event 9, 15, SILPH_CO_6F, 5 def_bg_events diff --git a/data/maps/objects/SilphCo3F.asm b/data/maps/objects/SilphCo3F.asm index 06b4c3e9..6b050aad 100644 --- a/data/maps/objects/SilphCo3F.asm +++ b/data/maps/objects/SilphCo3F.asm @@ -2,16 +2,16 @@ SilphCo3F_Object: db $2e ; border block def_warp_events - warp_event 26, 0, SILPH_CO_2F, 1 - warp_event 24, 0, SILPH_CO_4F, 0 - warp_event 20, 0, SILPH_CO_ELEVATOR, 0 - warp_event 23, 11, SILPH_CO_3F, 9 - warp_event 3, 3, SILPH_CO_5F, 5 - warp_event 3, 15, SILPH_CO_5F, 6 - warp_event 27, 3, SILPH_CO_2F, 3 - warp_event 3, 11, SILPH_CO_9F, 3 - warp_event 11, 11, SILPH_CO_7F, 4 - warp_event 27, 15, SILPH_CO_3F, 3 + warp_event 26, 0, SILPH_CO_2F, 2 + warp_event 24, 0, SILPH_CO_4F, 1 + warp_event 20, 0, SILPH_CO_ELEVATOR, 1 + warp_event 23, 11, SILPH_CO_3F, 10 + warp_event 3, 3, SILPH_CO_5F, 6 + warp_event 3, 15, SILPH_CO_5F, 7 + warp_event 27, 3, SILPH_CO_2F, 4 + warp_event 3, 11, SILPH_CO_9F, 4 + warp_event 11, 11, SILPH_CO_7F, 5 + warp_event 27, 15, SILPH_CO_3F, 4 def_bg_events diff --git a/data/maps/objects/SilphCo4F.asm b/data/maps/objects/SilphCo4F.asm index 987451fc..7dbc12ca 100644 --- a/data/maps/objects/SilphCo4F.asm +++ b/data/maps/objects/SilphCo4F.asm @@ -2,13 +2,13 @@ SilphCo4F_Object: db $2e ; border block def_warp_events - warp_event 24, 0, SILPH_CO_3F, 1 - warp_event 26, 0, SILPH_CO_5F, 1 - warp_event 20, 0, SILPH_CO_ELEVATOR, 0 - warp_event 11, 7, SILPH_CO_10F, 3 - warp_event 17, 3, SILPH_CO_6F, 3 - warp_event 3, 15, SILPH_CO_10F, 4 - warp_event 17, 11, SILPH_CO_10F, 5 + warp_event 24, 0, SILPH_CO_3F, 2 + warp_event 26, 0, SILPH_CO_5F, 2 + warp_event 20, 0, SILPH_CO_ELEVATOR, 1 + warp_event 11, 7, SILPH_CO_10F, 4 + warp_event 17, 3, SILPH_CO_6F, 4 + warp_event 3, 15, SILPH_CO_10F, 5 + warp_event 17, 11, SILPH_CO_10F, 6 def_bg_events diff --git a/data/maps/objects/SilphCo5F.asm b/data/maps/objects/SilphCo5F.asm index ff41bc29..7910f473 100644 --- a/data/maps/objects/SilphCo5F.asm +++ b/data/maps/objects/SilphCo5F.asm @@ -2,13 +2,13 @@ SilphCo5F_Object: db $2e ; border block def_warp_events - warp_event 24, 0, SILPH_CO_6F, 1 - warp_event 26, 0, SILPH_CO_4F, 1 - warp_event 20, 0, SILPH_CO_ELEVATOR, 0 - warp_event 27, 3, SILPH_CO_7F, 5 - warp_event 9, 15, SILPH_CO_9F, 4 - warp_event 11, 5, SILPH_CO_3F, 4 - warp_event 3, 15, SILPH_CO_3F, 5 + warp_event 24, 0, SILPH_CO_6F, 2 + warp_event 26, 0, SILPH_CO_4F, 2 + warp_event 20, 0, SILPH_CO_ELEVATOR, 1 + warp_event 27, 3, SILPH_CO_7F, 6 + warp_event 9, 15, SILPH_CO_9F, 5 + warp_event 11, 5, SILPH_CO_3F, 5 + warp_event 3, 15, SILPH_CO_3F, 6 def_bg_events diff --git a/data/maps/objects/SilphCo6F.asm b/data/maps/objects/SilphCo6F.asm index e2914018..2495790d 100644 --- a/data/maps/objects/SilphCo6F.asm +++ b/data/maps/objects/SilphCo6F.asm @@ -2,11 +2,11 @@ SilphCo6F_Object: db $2e ; border block def_warp_events - warp_event 16, 0, SILPH_CO_7F, 1 - warp_event 14, 0, SILPH_CO_5F, 0 - warp_event 18, 0, SILPH_CO_ELEVATOR, 0 - warp_event 3, 3, SILPH_CO_4F, 4 - warp_event 23, 3, SILPH_CO_2F, 6 + warp_event 16, 0, SILPH_CO_7F, 2 + warp_event 14, 0, SILPH_CO_5F, 1 + warp_event 18, 0, SILPH_CO_ELEVATOR, 1 + warp_event 3, 3, SILPH_CO_4F, 5 + warp_event 23, 3, SILPH_CO_2F, 7 def_bg_events diff --git a/data/maps/objects/SilphCo7F.asm b/data/maps/objects/SilphCo7F.asm index d6dfeffe..b7854e3c 100644 --- a/data/maps/objects/SilphCo7F.asm +++ b/data/maps/objects/SilphCo7F.asm @@ -2,12 +2,12 @@ SilphCo7F_Object: db $2e ; border block def_warp_events - warp_event 16, 0, SILPH_CO_8F, 1 - warp_event 22, 0, SILPH_CO_6F, 0 - warp_event 18, 0, SILPH_CO_ELEVATOR, 0 - warp_event 5, 7, SILPH_CO_11F, 3 - warp_event 5, 3, SILPH_CO_3F, 8 - warp_event 21, 15, SILPH_CO_5F, 3 + warp_event 16, 0, SILPH_CO_8F, 2 + warp_event 22, 0, SILPH_CO_6F, 1 + warp_event 18, 0, SILPH_CO_ELEVATOR, 1 + warp_event 5, 7, SILPH_CO_11F, 4 + warp_event 5, 3, SILPH_CO_3F, 9 + warp_event 21, 15, SILPH_CO_5F, 4 def_bg_events diff --git a/data/maps/objects/SilphCo8F.asm b/data/maps/objects/SilphCo8F.asm index fcf6e28b..ded21400 100644 --- a/data/maps/objects/SilphCo8F.asm +++ b/data/maps/objects/SilphCo8F.asm @@ -2,13 +2,13 @@ SilphCo8F_Object: db $2e ; border block def_warp_events - warp_event 16, 0, SILPH_CO_9F, 1 - warp_event 14, 0, SILPH_CO_7F, 0 - warp_event 18, 0, SILPH_CO_ELEVATOR, 0 - warp_event 3, 11, SILPH_CO_8F, 6 - warp_event 3, 15, SILPH_CO_2F, 4 - warp_event 11, 5, SILPH_CO_2F, 5 - warp_event 11, 9, SILPH_CO_8F, 3 + warp_event 16, 0, SILPH_CO_9F, 2 + warp_event 14, 0, SILPH_CO_7F, 1 + warp_event 18, 0, SILPH_CO_ELEVATOR, 1 + warp_event 3, 11, SILPH_CO_8F, 7 + warp_event 3, 15, SILPH_CO_2F, 5 + warp_event 11, 5, SILPH_CO_2F, 6 + warp_event 11, 9, SILPH_CO_8F, 4 def_bg_events diff --git a/data/maps/objects/SilphCo9F.asm b/data/maps/objects/SilphCo9F.asm index 3897162e..261df23c 100644 --- a/data/maps/objects/SilphCo9F.asm +++ b/data/maps/objects/SilphCo9F.asm @@ -2,11 +2,11 @@ SilphCo9F_Object: db $2e ; border block def_warp_events - warp_event 14, 0, SILPH_CO_10F, 0 - warp_event 16, 0, SILPH_CO_8F, 0 - warp_event 18, 0, SILPH_CO_ELEVATOR, 0 - warp_event 9, 3, SILPH_CO_3F, 7 - warp_event 17, 15, SILPH_CO_5F, 4 + warp_event 14, 0, SILPH_CO_10F, 1 + warp_event 16, 0, SILPH_CO_8F, 1 + warp_event 18, 0, SILPH_CO_ELEVATOR, 1 + warp_event 9, 3, SILPH_CO_3F, 8 + warp_event 17, 15, SILPH_CO_5F, 5 def_bg_events diff --git a/data/maps/objects/SilphCoElevator.asm b/data/maps/objects/SilphCoElevator.asm index cb5b33bf..1451fccd 100644 --- a/data/maps/objects/SilphCoElevator.asm +++ b/data/maps/objects/SilphCoElevator.asm @@ -2,8 +2,8 @@ SilphCoElevator_Object: db $f ; border block def_warp_events - warp_event 1, 3, UNUSED_MAP_ED, 0 - warp_event 2, 3, UNUSED_MAP_ED, 0 + warp_event 1, 3, UNUSED_MAP_ED, 1 + warp_event 2, 3, UNUSED_MAP_ED, 1 def_bg_events bg_event 3, 0, 1 ; SilphCoElevatorText1 diff --git a/data/maps/objects/UndergroundPathNorthSouth.asm b/data/maps/objects/UndergroundPathNorthSouth.asm index fbc1b0f9..8b5dc5b7 100644 --- a/data/maps/objects/UndergroundPathNorthSouth.asm +++ b/data/maps/objects/UndergroundPathNorthSouth.asm @@ -2,8 +2,8 @@ UndergroundPathNorthSouth_Object: db $1 ; border block def_warp_events - warp_event 5, 4, UNDERGROUND_PATH_ROUTE_5, 2 - warp_event 2, 41, UNDERGROUND_PATH_ROUTE_6, 2 + warp_event 5, 4, UNDERGROUND_PATH_ROUTE_5, 3 + warp_event 2, 41, UNDERGROUND_PATH_ROUTE_6, 3 def_bg_events diff --git a/data/maps/objects/UndergroundPathRoute5.asm b/data/maps/objects/UndergroundPathRoute5.asm index 209054f7..7ffaeffc 100644 --- a/data/maps/objects/UndergroundPathRoute5.asm +++ b/data/maps/objects/UndergroundPathRoute5.asm @@ -2,9 +2,9 @@ UndergroundPathRoute5_Object: db $a ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 3 - warp_event 4, 7, LAST_MAP, 3 - warp_event 4, 4, UNDERGROUND_PATH_NORTH_SOUTH, 0 + warp_event 3, 7, LAST_MAP, 4 + warp_event 4, 7, LAST_MAP, 4 + warp_event 4, 4, UNDERGROUND_PATH_NORTH_SOUTH, 1 def_bg_events diff --git a/data/maps/objects/UndergroundPathRoute6.asm b/data/maps/objects/UndergroundPathRoute6.asm index 7961e08d..cee23de3 100644 --- a/data/maps/objects/UndergroundPathRoute6.asm +++ b/data/maps/objects/UndergroundPathRoute6.asm @@ -2,9 +2,9 @@ UndergroundPathRoute6_Object: db $a ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 3 - warp_event 4, 7, LAST_MAP, 3 - warp_event 4, 4, UNDERGROUND_PATH_NORTH_SOUTH, 1 + warp_event 3, 7, LAST_MAP, 4 + warp_event 4, 7, LAST_MAP, 4 + warp_event 4, 4, UNDERGROUND_PATH_NORTH_SOUTH, 2 def_bg_events diff --git a/data/maps/objects/UndergroundPathRoute7.asm b/data/maps/objects/UndergroundPathRoute7.asm index d377d507..47ae45f9 100644 --- a/data/maps/objects/UndergroundPathRoute7.asm +++ b/data/maps/objects/UndergroundPathRoute7.asm @@ -2,9 +2,9 @@ UndergroundPathRoute7_Object: db $a ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 4 - warp_event 4, 7, LAST_MAP, 4 - warp_event 4, 4, UNDERGROUND_PATH_WEST_EAST, 0 + warp_event 3, 7, LAST_MAP, 5 + warp_event 4, 7, LAST_MAP, 5 + warp_event 4, 4, UNDERGROUND_PATH_WEST_EAST, 1 def_bg_events diff --git a/data/maps/objects/UndergroundPathRoute7Copy.asm b/data/maps/objects/UndergroundPathRoute7Copy.asm index f0841cfa..b4e7e7fd 100644 --- a/data/maps/objects/UndergroundPathRoute7Copy.asm +++ b/data/maps/objects/UndergroundPathRoute7Copy.asm @@ -2,9 +2,9 @@ UndergroundPathRoute7Copy_Object: db $a ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 5 - warp_event 4, 7, LAST_MAP, 5 - warp_event 4, 4, UNDERGROUND_PATH_WEST_EAST, 0 + warp_event 3, 7, LAST_MAP, 6 + warp_event 4, 7, LAST_MAP, 6 + warp_event 4, 4, UNDERGROUND_PATH_WEST_EAST, 1 def_bg_events diff --git a/data/maps/objects/UndergroundPathRoute8.asm b/data/maps/objects/UndergroundPathRoute8.asm index 35094344..c36b1d42 100644 --- a/data/maps/objects/UndergroundPathRoute8.asm +++ b/data/maps/objects/UndergroundPathRoute8.asm @@ -2,9 +2,9 @@ UndergroundPathRoute8_Object: db $a ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 4 - warp_event 4, 7, LAST_MAP, 4 - warp_event 4, 4, UNDERGROUND_PATH_WEST_EAST, 1 + warp_event 3, 7, LAST_MAP, 5 + warp_event 4, 7, LAST_MAP, 5 + warp_event 4, 4, UNDERGROUND_PATH_WEST_EAST, 2 def_bg_events diff --git a/data/maps/objects/UndergroundPathWestEast.asm b/data/maps/objects/UndergroundPathWestEast.asm index b2e6fc01..fc2d9df9 100644 --- a/data/maps/objects/UndergroundPathWestEast.asm +++ b/data/maps/objects/UndergroundPathWestEast.asm @@ -2,8 +2,8 @@ UndergroundPathWestEast_Object: db $1 ; border block def_warp_events - warp_event 2, 5, UNDERGROUND_PATH_ROUTE_7, 2 - warp_event 47, 2, UNDERGROUND_PATH_ROUTE_8, 2 + warp_event 2, 5, UNDERGROUND_PATH_ROUTE_7, 3 + warp_event 47, 2, UNDERGROUND_PATH_ROUTE_8, 3 def_bg_events diff --git a/data/maps/objects/VermilionCity.asm b/data/maps/objects/VermilionCity.asm index 75b53b56..ca652afc 100644 --- a/data/maps/objects/VermilionCity.asm +++ b/data/maps/objects/VermilionCity.asm @@ -2,15 +2,15 @@ VermilionCity_Object: db $43 ; border block def_warp_events - warp_event 11, 3, VERMILION_POKECENTER, 0 - warp_event 9, 13, POKEMON_FAN_CLUB, 0 - warp_event 23, 13, VERMILION_MART, 0 - warp_event 12, 19, VERMILION_GYM, 0 - warp_event 23, 19, VERMILION_PIDGEY_HOUSE, 0 - warp_event 18, 31, VERMILION_DOCK, 0 - warp_event 19, 31, VERMILION_DOCK, 0 - warp_event 15, 13, VERMILION_TRADE_HOUSE, 0 - warp_event 7, 3, VERMILION_OLD_ROD_HOUSE, 0 + warp_event 11, 3, VERMILION_POKECENTER, 1 + warp_event 9, 13, POKEMON_FAN_CLUB, 1 + warp_event 23, 13, VERMILION_MART, 1 + warp_event 12, 19, VERMILION_GYM, 1 + warp_event 23, 19, VERMILION_PIDGEY_HOUSE, 1 + warp_event 18, 31, VERMILION_DOCK, 1 + warp_event 19, 31, VERMILION_DOCK, 1 + warp_event 15, 13, VERMILION_TRADE_HOUSE, 1 + warp_event 7, 3, VERMILION_OLD_ROD_HOUSE, 1 def_bg_events bg_event 27, 3, 7 ; VermilionCityText7 diff --git a/data/maps/objects/VermilionDock.asm b/data/maps/objects/VermilionDock.asm index 3d3ec64e..86036311 100644 --- a/data/maps/objects/VermilionDock.asm +++ b/data/maps/objects/VermilionDock.asm @@ -2,8 +2,8 @@ VermilionDock_Object: db $f ; border block def_warp_events - warp_event 14, 0, LAST_MAP, 5 - warp_event 14, 2, SS_ANNE_1F, 1 + warp_event 14, 0, LAST_MAP, 6 + warp_event 14, 2, SS_ANNE_1F, 2 def_bg_events diff --git a/data/maps/objects/VermilionGym.asm b/data/maps/objects/VermilionGym.asm index 27e773f7..a91c66ca 100644 --- a/data/maps/objects/VermilionGym.asm +++ b/data/maps/objects/VermilionGym.asm @@ -2,8 +2,8 @@ VermilionGym_Object: db $3 ; border block def_warp_events - warp_event 4, 17, LAST_MAP, 3 - warp_event 5, 17, LAST_MAP, 3 + warp_event 4, 17, LAST_MAP, 4 + warp_event 5, 17, LAST_MAP, 4 def_bg_events diff --git a/data/maps/objects/VermilionMart.asm b/data/maps/objects/VermilionMart.asm index 7d6075ce..19d65e3b 100644 --- a/data/maps/objects/VermilionMart.asm +++ b/data/maps/objects/VermilionMart.asm @@ -2,8 +2,8 @@ VermilionMart_Object: db $0 ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 2 - warp_event 4, 7, LAST_MAP, 2 + warp_event 3, 7, LAST_MAP, 3 + warp_event 4, 7, LAST_MAP, 3 def_bg_events diff --git a/data/maps/objects/VermilionOldRodHouse.asm b/data/maps/objects/VermilionOldRodHouse.asm index e960663e..a0767f20 100644 --- a/data/maps/objects/VermilionOldRodHouse.asm +++ b/data/maps/objects/VermilionOldRodHouse.asm @@ -2,8 +2,8 @@ VermilionOldRodHouse_Object: db $a ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 8 - warp_event 3, 7, LAST_MAP, 8 + warp_event 2, 7, LAST_MAP, 9 + warp_event 3, 7, LAST_MAP, 9 def_bg_events diff --git a/data/maps/objects/VermilionPidgeyHouse.asm b/data/maps/objects/VermilionPidgeyHouse.asm index 365e4afe..ce8d3f3e 100644 --- a/data/maps/objects/VermilionPidgeyHouse.asm +++ b/data/maps/objects/VermilionPidgeyHouse.asm @@ -2,8 +2,8 @@ VermilionPidgeyHouse_Object: db $a ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 4 - warp_event 3, 7, LAST_MAP, 4 + warp_event 2, 7, LAST_MAP, 5 + warp_event 3, 7, LAST_MAP, 5 def_bg_events diff --git a/data/maps/objects/VermilionPokecenter.asm b/data/maps/objects/VermilionPokecenter.asm index e0b5a72a..f88552b4 100644 --- a/data/maps/objects/VermilionPokecenter.asm +++ b/data/maps/objects/VermilionPokecenter.asm @@ -2,8 +2,8 @@ VermilionPokecenter_Object: db $0 ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 0 - warp_event 4, 7, LAST_MAP, 0 + warp_event 3, 7, LAST_MAP, 1 + warp_event 4, 7, LAST_MAP, 1 def_bg_events diff --git a/data/maps/objects/VermilionTradeHouse.asm b/data/maps/objects/VermilionTradeHouse.asm index 48d6d77f..299e5093 100644 --- a/data/maps/objects/VermilionTradeHouse.asm +++ b/data/maps/objects/VermilionTradeHouse.asm @@ -2,8 +2,8 @@ VermilionTradeHouse_Object: db $a ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 7 - warp_event 3, 7, LAST_MAP, 7 + warp_event 2, 7, LAST_MAP, 8 + warp_event 3, 7, LAST_MAP, 8 def_bg_events diff --git a/data/maps/objects/VictoryRoad1F.asm b/data/maps/objects/VictoryRoad1F.asm index 7a4f0c2a..d923948a 100644 --- a/data/maps/objects/VictoryRoad1F.asm +++ b/data/maps/objects/VictoryRoad1F.asm @@ -2,9 +2,9 @@ VictoryRoad1F_Object: db $7d ; border block def_warp_events - warp_event 8, 17, LAST_MAP, 2 - warp_event 9, 17, LAST_MAP, 2 - warp_event 1, 1, VICTORY_ROAD_2F, 0 + warp_event 8, 17, LAST_MAP, 3 + warp_event 9, 17, LAST_MAP, 3 + warp_event 1, 1, VICTORY_ROAD_2F, 1 def_bg_events diff --git a/data/maps/objects/VictoryRoad2F.asm b/data/maps/objects/VictoryRoad2F.asm index ce225067..36357e07 100644 --- a/data/maps/objects/VictoryRoad2F.asm +++ b/data/maps/objects/VictoryRoad2F.asm @@ -2,13 +2,13 @@ VictoryRoad2F_Object: db $7d ; border block def_warp_events - warp_event 0, 8, VICTORY_ROAD_1F, 2 - warp_event 29, 7, LAST_MAP, 3 - warp_event 29, 8, LAST_MAP, 3 - warp_event 23, 7, VICTORY_ROAD_3F, 0 - warp_event 25, 14, VICTORY_ROAD_3F, 2 - warp_event 27, 7, VICTORY_ROAD_3F, 1 - warp_event 1, 1, VICTORY_ROAD_3F, 3 + warp_event 0, 8, VICTORY_ROAD_1F, 3 + warp_event 29, 7, LAST_MAP, 4 + warp_event 29, 8, LAST_MAP, 4 + warp_event 23, 7, VICTORY_ROAD_3F, 1 + warp_event 25, 14, VICTORY_ROAD_3F, 3 + warp_event 27, 7, VICTORY_ROAD_3F, 2 + warp_event 1, 1, VICTORY_ROAD_3F, 4 def_bg_events diff --git a/data/maps/objects/VictoryRoad3F.asm b/data/maps/objects/VictoryRoad3F.asm index 30fde3a2..8ee97878 100644 --- a/data/maps/objects/VictoryRoad3F.asm +++ b/data/maps/objects/VictoryRoad3F.asm @@ -2,10 +2,10 @@ VictoryRoad3F_Object: db $7d ; border block def_warp_events - warp_event 23, 7, VICTORY_ROAD_2F, 3 - warp_event 26, 8, VICTORY_ROAD_2F, 5 - warp_event 27, 15, VICTORY_ROAD_2F, 4 - warp_event 2, 0, VICTORY_ROAD_2F, 6 + warp_event 23, 7, VICTORY_ROAD_2F, 4 + warp_event 26, 8, VICTORY_ROAD_2F, 6 + warp_event 27, 15, VICTORY_ROAD_2F, 5 + warp_event 2, 0, VICTORY_ROAD_2F, 7 def_bg_events diff --git a/data/maps/objects/ViridianCity.asm b/data/maps/objects/ViridianCity.asm index 46a68d19..56bf7390 100644 --- a/data/maps/objects/ViridianCity.asm +++ b/data/maps/objects/ViridianCity.asm @@ -2,11 +2,11 @@ ViridianCity_Object: db $f ; border block def_warp_events - warp_event 23, 25, VIRIDIAN_POKECENTER, 0 - warp_event 29, 19, VIRIDIAN_MART, 0 - warp_event 21, 15, VIRIDIAN_SCHOOL_HOUSE, 0 - warp_event 21, 9, VIRIDIAN_NICKNAME_HOUSE, 0 - warp_event 32, 7, VIRIDIAN_GYM, 0 + warp_event 23, 25, VIRIDIAN_POKECENTER, 1 + warp_event 29, 19, VIRIDIAN_MART, 1 + warp_event 21, 15, VIRIDIAN_SCHOOL_HOUSE, 1 + warp_event 21, 9, VIRIDIAN_NICKNAME_HOUSE, 1 + warp_event 32, 7, VIRIDIAN_GYM, 1 def_bg_events bg_event 17, 17, 8 ; ViridianCityText8 diff --git a/data/maps/objects/ViridianForest.asm b/data/maps/objects/ViridianForest.asm index 5f4cb2a6..7a0a644c 100644 --- a/data/maps/objects/ViridianForest.asm +++ b/data/maps/objects/ViridianForest.asm @@ -2,12 +2,12 @@ ViridianForest_Object: db $3 ; border block def_warp_events - warp_event 1, 0, VIRIDIAN_FOREST_NORTH_GATE, 2 - warp_event 2, 0, VIRIDIAN_FOREST_NORTH_GATE, 3 - warp_event 15, 47, VIRIDIAN_FOREST_SOUTH_GATE, 1 - warp_event 16, 47, VIRIDIAN_FOREST_SOUTH_GATE, 1 - warp_event 17, 47, VIRIDIAN_FOREST_SOUTH_GATE, 1 - warp_event 18, 47, VIRIDIAN_FOREST_SOUTH_GATE, 1 + warp_event 1, 0, VIRIDIAN_FOREST_NORTH_GATE, 3 + warp_event 2, 0, VIRIDIAN_FOREST_NORTH_GATE, 4 + warp_event 15, 47, VIRIDIAN_FOREST_SOUTH_GATE, 2 + warp_event 16, 47, VIRIDIAN_FOREST_SOUTH_GATE, 2 + warp_event 17, 47, VIRIDIAN_FOREST_SOUTH_GATE, 2 + warp_event 18, 47, VIRIDIAN_FOREST_SOUTH_GATE, 2 def_bg_events bg_event 24, 40, 9 ; ViridianForestText9 diff --git a/data/maps/objects/ViridianForestNorthGate.asm b/data/maps/objects/ViridianForestNorthGate.asm index 020f2f62..fcb0fc2b 100644 --- a/data/maps/objects/ViridianForestNorthGate.asm +++ b/data/maps/objects/ViridianForestNorthGate.asm @@ -2,10 +2,10 @@ ViridianForestNorthGate_Object: db $a ; border block def_warp_events - warp_event 4, 0, LAST_MAP, 1 - warp_event 5, 0, LAST_MAP, 1 - warp_event 4, 7, VIRIDIAN_FOREST, 0 - warp_event 5, 7, VIRIDIAN_FOREST, 0 + warp_event 4, 0, LAST_MAP, 2 + warp_event 5, 0, LAST_MAP, 2 + warp_event 4, 7, VIRIDIAN_FOREST, 1 + warp_event 5, 7, VIRIDIAN_FOREST, 1 def_bg_events diff --git a/data/maps/objects/ViridianForestSouthGate.asm b/data/maps/objects/ViridianForestSouthGate.asm index 13517e0c..e5dad809 100644 --- a/data/maps/objects/ViridianForestSouthGate.asm +++ b/data/maps/objects/ViridianForestSouthGate.asm @@ -2,10 +2,10 @@ ViridianForestSouthGate_Object: db $a ; border block def_warp_events - warp_event 4, 0, VIRIDIAN_FOREST, 3 - warp_event 5, 0, VIRIDIAN_FOREST, 4 - warp_event 4, 7, LAST_MAP, 5 - warp_event 5, 7, LAST_MAP, 5 + warp_event 4, 0, VIRIDIAN_FOREST, 4 + warp_event 5, 0, VIRIDIAN_FOREST, 5 + warp_event 4, 7, LAST_MAP, 6 + warp_event 5, 7, LAST_MAP, 6 def_bg_events diff --git a/data/maps/objects/ViridianGym.asm b/data/maps/objects/ViridianGym.asm index 4b9a159e..735cecf4 100644 --- a/data/maps/objects/ViridianGym.asm +++ b/data/maps/objects/ViridianGym.asm @@ -2,8 +2,8 @@ ViridianGym_Object: db $3 ; border block def_warp_events - warp_event 16, 17, LAST_MAP, 4 - warp_event 17, 17, LAST_MAP, 4 + warp_event 16, 17, LAST_MAP, 5 + warp_event 17, 17, LAST_MAP, 5 def_bg_events diff --git a/data/maps/objects/ViridianMart.asm b/data/maps/objects/ViridianMart.asm index 8bb5d240..291dd00f 100644 --- a/data/maps/objects/ViridianMart.asm +++ b/data/maps/objects/ViridianMart.asm @@ -2,8 +2,8 @@ ViridianMart_Object: db $0 ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 1 - warp_event 4, 7, LAST_MAP, 1 + warp_event 3, 7, LAST_MAP, 2 + warp_event 4, 7, LAST_MAP, 2 def_bg_events diff --git a/data/maps/objects/ViridianNicknameHouse.asm b/data/maps/objects/ViridianNicknameHouse.asm index 9ace1faf..2f3befb2 100644 --- a/data/maps/objects/ViridianNicknameHouse.asm +++ b/data/maps/objects/ViridianNicknameHouse.asm @@ -2,8 +2,8 @@ ViridianNicknameHouse_Object: db $a ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 3 - warp_event 3, 7, LAST_MAP, 3 + warp_event 2, 7, LAST_MAP, 4 + warp_event 3, 7, LAST_MAP, 4 def_bg_events diff --git a/data/maps/objects/ViridianPokecenter.asm b/data/maps/objects/ViridianPokecenter.asm index ef3424f2..618f5798 100644 --- a/data/maps/objects/ViridianPokecenter.asm +++ b/data/maps/objects/ViridianPokecenter.asm @@ -2,8 +2,8 @@ ViridianPokecenter_Object: db $0 ; border block def_warp_events - warp_event 3, 7, LAST_MAP, 0 - warp_event 4, 7, LAST_MAP, 0 + warp_event 3, 7, LAST_MAP, 1 + warp_event 4, 7, LAST_MAP, 1 def_bg_events diff --git a/data/maps/objects/ViridianSchoolHouse.asm b/data/maps/objects/ViridianSchoolHouse.asm index 53909d7a..745bf72b 100644 --- a/data/maps/objects/ViridianSchoolHouse.asm +++ b/data/maps/objects/ViridianSchoolHouse.asm @@ -2,8 +2,8 @@ ViridianSchoolHouse_Object: db $a ; border block def_warp_events - warp_event 2, 7, LAST_MAP, 2 - warp_event 3, 7, LAST_MAP, 2 + warp_event 2, 7, LAST_MAP, 3 + warp_event 3, 7, LAST_MAP, 3 def_bg_events diff --git a/data/maps/objects/WardensHouse.asm b/data/maps/objects/WardensHouse.asm index 46e1f35b..63e461c4 100644 --- a/data/maps/objects/WardensHouse.asm +++ b/data/maps/objects/WardensHouse.asm @@ -2,8 +2,8 @@ WardensHouse_Object: db $17 ; border block def_warp_events - warp_event 4, 7, LAST_MAP, 3 - warp_event 5, 7, LAST_MAP, 3 + warp_event 4, 7, LAST_MAP, 4 + warp_event 5, 7, LAST_MAP, 4 def_bg_events bg_event 4, 3, 4 ; FuchsiaHouse2Text4 diff --git a/macros/scripts/maps.asm b/macros/scripts/maps.asm index 6c895f9a..12bc3c77 100644 --- a/macros/scripts/maps.asm +++ b/macros/scripts/maps.asm @@ -41,9 +41,9 @@ ENDM ;\1 x position ;\2 y position ;\3 destination map (-1 = wLastMap) -;\4 destination warp id +;\4 destination warp id; starts at 1 (internally at 0) warp_event: MACRO - db \2, \1, \4, \3 + db \2, \1, \4 - 1, \3 _WARP_{d:{_NUM_WARP_EVENTS}}_X = \1 _WARP_{d:{_NUM_WARP_EVENTS}}_Y = \2 {_NUM_WARP_EVENTS} = {_NUM_WARP_EVENTS} + 1 -- cgit v1.3.1-sl0p From 0af787ea6d42d6f9c16f952b46519ab94f356abb Mon Sep 17 00:00:00 2001 From: IIMarckus Date: Fri, 8 Oct 2021 04:30:39 -0600 Subject: Kill Freenode. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3924fdd2..bfffd4e9 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ To set up the repository, see [**INSTALL.md**](INSTALL.md). ## See also - **Discord:** [pret][discord] -- **IRC:** [freenode#pret][irc] +- **IRC:** [libera#pret][irc] Other disassembly projects: @@ -36,6 +36,6 @@ Other disassembly projects: [pokefirered]: https://github.com/pret/pokefirered [pokeemerald]: https://github.com/pret/pokeemerald [discord]: https://discord.gg/d5dubZ3 -[irc]: https://kiwiirc.com/client/irc.freenode.net/?#pret +[irc]: https://web.libera.chat/?#pret [ci]: https://github.com/pret/pokered/actions [ci-badge]: https://github.com/pret/pokered/actions/workflows/main.yml/badge.svg -- cgit v1.3.1-sl0p From 58d08bff4386815b83c9260bd831719507acfcec Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 2 Nov 2021 19:57:08 -0400 Subject: Identify some percentage constant values --- engine/battle/animations.asm | 4 ++-- engine/battle/core.asm | 26 +++++++++++++------------- engine/battle/effects.asm | 14 +++++++------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 75713592..a93af9e9 100644 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -653,7 +653,7 @@ INCLUDE "data/battle_anims/special_effects.asm" DoBallTossSpecialEffects: ld a, [wcf91] - cp 3 ; is it a Master Ball or Ultra Ball? + cp ULTRA_BALL + 1 ; is it a Master Ball or Ultra Ball? jr nc, .skipFlashingEffect .flashingEffect ; do a flashing effect if it's Master Ball or Ultra Ball ldh a, [rOBP0] @@ -668,7 +668,7 @@ DoBallTossSpecialEffects: call PlaySound .skipPlayingSound ld a, [wIsInBattle] - cp 02 ; is it a trainer battle? + cp 2 ; is it a trainer battle? jr z, .isTrainerBattle ld a, [wd11e] cp $10 ; is the enemy pokemon the Ghost Marowak? diff --git a/engine/battle/core.asm b/engine/battle/core.asm index d24a43d0..57303776 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -402,12 +402,12 @@ MainInBattleLoop: cp USING_INTERNAL_CLOCK jr z, .invertOutcome call BattleRandom - cp $80 + cp 50 percent + 1 jr c, .playerMovesFirst jr .enemyMovesFirst .invertOutcome call BattleRandom - cp $80 + cp 50 percent + 1 jr c, .enemyMovesFirst jr .playerMovesFirst .enemyMovesFirst @@ -1319,7 +1319,7 @@ EnemySendOutFirstMon: ld [wWhichPokemon], a jr .next3 .next - ld b, $FF + ld b, $ff .next2 inc b ld a, [wEnemyMonPartyPos] @@ -2962,19 +2962,19 @@ SelectEnemyMove: .chooseRandomMove push hl call BattleRandom - ld b, $1 - cp $3f ; select move 1, [0,3e] (63/256 chance) + ld b, 1 ; 25% chance to select move 1 + cp 25 percent jr c, .moveChosen inc hl - inc b - cp $7f ; select move 2, [3f,7e] (64/256 chance) + inc b ; 25% chance to select move 2 + cp 50 percent jr c, .moveChosen inc hl - inc b - cp $be ; select move 3, [7f,bd] (63/256 chance) + inc b ; 25% chance to select move 3 + cp 75 percent - 1 jr c, .moveChosen inc hl - inc b ; select move 4, [be,ff] (66/256 chance) + inc b ; 25% chance to select move 4 .moveChosen ld a, b dec a @@ -3398,7 +3398,7 @@ CheckPlayerStatusConditions: ld a, CONF_ANIM - 1 call PlayMoveAnimation call BattleRandom - cp $80 ; 50% chance to hurt itself + cp 50 percent + 1 ; chance to hurt itself jr c, .TriedToUseDisabledMoveCheck ld hl, wPlayerBattleStatus1 ld a, [hl] @@ -4607,7 +4607,7 @@ CriticalHitTest: dec hl ld c, [hl] ; read move id ld a, [de] - bit GETTING_PUMPED, a ; test for focus energy + bit GETTING_PUMPED, a ; test for focus energy jr nz, .focusEnergyUsed ; bug: using focus energy causes a shift to the right instead of left, ; resulting in 1/4 the usual crit chance sla b ; (effective (base speed/2)*2) @@ -5932,7 +5932,7 @@ CheckEnemyStatusConditions: bit PAR, [hl] jr z, .checkIfUsingBide call BattleRandom - cp $3f ; 25% to be fully paralysed + cp 25 percent ; chance to be fully paralysed jr nc, .checkIfUsingBide ld hl, FullyParalyzedText call PrintText diff --git a/engine/battle/effects.asm b/engine/battle/effects.asm index 91bb9ee0..c68d6731 100644 --- a/engine/battle/effects.asm +++ b/engine/battle/effects.asm @@ -98,10 +98,10 @@ PoisonEffect: jr z, .noEffect ld a, [de] cp POISON_SIDE_EFFECT1 - ld b, $34 ; ~20% chance of poisoning + ld b, 20 percent + 1 ; chance of poisoning jr z, .sideEffectTest cp POISON_SIDE_EFFECT2 - ld b, $67 ; ~40% chance of poisoning + ld b, 40 percent + 1 ; chance of poisoning jr z, .sideEffectTest push hl push de @@ -548,7 +548,7 @@ StatModifierDownEffect: cp LINK_STATE_BATTLING jr z, .statModifierDownEffect call BattleRandom - cp $40 ; 1/4 chance to miss by in regular battle + cp 25 percent + 1 ; chance to miss by in regular battle jp c, MoveMissed .statModifierDownEffect call CheckTargetSubstitute ; can't hit through substitute @@ -557,7 +557,7 @@ StatModifierDownEffect: cp ATTACK_DOWN_SIDE_EFFECT jr c, .nonSideEffect call BattleRandom - cp $55 ; 85/256 chance for side effects + cp 33 percent + 1 ; chance for side effects jp nc, CantLowerAnymore ld a, [de] sub ATTACK_DOWN_SIDE_EFFECT ; map each stat to 0-3 @@ -979,9 +979,9 @@ FlinchSideEffect: .flinchSideEffect ld a, [de] cp FLINCH_SIDE_EFFECT1 - ld b, $1a ; ~10% chance of flinch + ld b, 10 percent + 1 ; chance of flinch (FLINCH_SIDE_EFFECT1) jr z, .gotEffectChance - ld b, $4d ; ~30% chance of flinch + ld b, 30 percent + 1 ; chance of flinch otherwise .gotEffectChance call BattleRandom cp b @@ -1111,7 +1111,7 @@ RecoilEffect: ConfusionSideEffect: call BattleRandom - cp $19 ; ~10% chance + cp 10 percent ; chance of confusion ret nc jr ConfusionSideEffectSuccess -- cgit v1.3.1-sl0p From 2ee8ce26da2d8195be9440335323d7ad9f9a168d Mon Sep 17 00:00:00 2001 From: Rangi Date: Wed, 3 Nov 2021 17:07:08 -0400 Subject: Comment on the CooltrainerFAI bug Fixes #308 --- engine/battle/trainer_ai.asm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/engine/battle/trainer_ai.asm b/engine/battle/trainer_ai.asm index 0117a057..2ef60f5b 100644 --- a/engine/battle/trainer_ai.asm +++ b/engine/battle/trainer_ai.asm @@ -342,7 +342,10 @@ CooltrainerMAI: jp AIUseXAttack CooltrainerFAI: + ; The intended 25% chance to consider switching will not apply. + ; Uncomment the line below to fix this. cp 25 percent + 1 + ; ret nc ld a, 10 call AICheckIfHPBelowFraction jp c, AIUseHyperPotion -- cgit v1.3.1-sl0p From b44a10a43a1fa4a558b4c593d0a610571ecb3a50 Mon Sep 17 00:00:00 2001 From: Yoann Fievez Date: Thu, 4 Nov 2021 20:17:17 +0100 Subject: Update 'make compare' for no pret repo and add 'make' for fork (#339) --- .github/workflows/main.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a3fd4456..0e2472a4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,6 +29,7 @@ jobs: rm -rf rgbds - name: Compare + if: ${{ github.repository_owner == 'pret' }} run: | make DEBUG=1 -j$(nproc) compare if ! git diff-index --quiet HEAD --; then @@ -37,6 +38,16 @@ jobs: return 1 fi + - name: Make + if: ${{ github.repository_owner != 'pret' }} + run: | + make -j$(nproc) + if ! git diff-index --quiet HEAD --; then + echo 'Uncommitted changes detected:' + git diff-index HEAD -- + return 1 + fi + - name: Discord webhook if: ${{ github.event_name == 'push' && github.repository_owner == 'pret' }} env: -- cgit v1.3.1-sl0p From 8349bfd8e646002105dfd6a7f997c26cf0e0624b Mon Sep 17 00:00:00 2001 From: Yoann Fievez Date: Fri, 5 Nov 2021 20:40:15 +0100 Subject: Refactorize check button pressed (#340) --- engine/battle/core.asm | 6 +++--- engine/events/cinnabar_lab.asm | 2 +- engine/events/hidden_objects/bills_house_pc.asm | 2 +- engine/events/hidden_objects/school_blackboard.asm | 8 ++++---- engine/events/prize_menu.asm | 2 +- engine/events/vending_machine.asm | 2 +- engine/link/cable_club.asm | 22 +++++++++++----------- engine/menus/main_menu.asm | 14 +++++++------- engine/menus/pc.asm | 2 +- engine/menus/pokedex.asm | 12 ++++++------ engine/menus/save.asm | 2 +- engine/menus/start_sub_menus.asm | 4 ++-- engine/menus/text_box.asm | 10 +++++----- engine/pokemon/bills_pc.asm | 6 +++--- engine/pokemon/learn_move.asm | 2 +- home/hidden_objects.asm | 2 +- home/list_menu.asm | 16 ++++++++-------- home/overworld.asm | 12 ++++++------ home/pokemon.asm | 2 +- home/print_text.asm | 4 ++-- home/start_menu.asm | 6 +++--- home/text_script.asm | 2 +- home/window.asm | 2 +- 23 files changed, 71 insertions(+), 71 deletions(-) diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 57303776..6c0585b6 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -2087,7 +2087,7 @@ DisplayBattleMenu:: ld [hli], a ; wMaxMenuItem ld [hl], D_RIGHT | A_BUTTON ; wMenuWatchedKeys call HandleMenuInput - bit 4, a ; check if right was pressed + bit BIT_D_RIGHT, a jr nz, .rightColumn jr .AButtonPressed ; the A button was pressed .rightColumn ; put cursor in right column of menu @@ -2350,7 +2350,7 @@ PartyMenuOrRockOrRun: xor a ld [hl], a ; wLastMenuItem call HandleMenuInput - bit 1, a ; was A pressed? + bit BIT_B_BUTTON, a jr nz, .partyMonDeselected ; if B was pressed, jump ; A was pressed call PlaceUnfilledArrowMenuCursor @@ -6745,7 +6745,7 @@ DetermineWildOpponent: bit 1, a jr z, .asm_3ef2f ldh a, [hJoyHeld] - bit 1, a ; B button pressed? + bit BIT_B_BUTTON, a ret nz .asm_3ef2f ld a, [wNumberOfNoRandomBattleStepsLeft] diff --git a/engine/events/cinnabar_lab.asm b/engine/events/cinnabar_lab.asm index 7cbb2cd5..547f782e 100644 --- a/engine/events/cinnabar_lab.asm +++ b/engine/events/cinnabar_lab.asm @@ -27,7 +27,7 @@ GiveFossilToCinnabarLab:: ld hl, wd730 res 6, [hl] call HandleMenuInput - bit 1, a ; pressed B? + bit BIT_B_BUTTON, a jr nz, .cancelledGivingFossil ld hl, wFilteredBagItems ld a, [wCurrentMenuItem] diff --git a/engine/events/hidden_objects/bills_house_pc.asm b/engine/events/hidden_objects/bills_house_pc.asm index a73596b4..6147387a 100644 --- a/engine/events/hidden_objects/bills_house_pc.asm +++ b/engine/events/hidden_objects/bills_house_pc.asm @@ -95,7 +95,7 @@ BillsHousePokemonList:: call PrintText call SaveScreenTilesToBuffer2 call HandleMenuInput - bit 1, a ; pressed b + bit BIT_B_BUTTON, a jr nz, .cancel ld a, [wCurrentMenuItem] add EEVEE diff --git a/engine/events/hidden_objects/school_blackboard.asm b/engine/events/hidden_objects/school_blackboard.asm index de4700d4..fd3c0b8f 100644 --- a/engine/events/hidden_objects/school_blackboard.asm +++ b/engine/events/hidden_objects/school_blackboard.asm @@ -36,7 +36,7 @@ LinkCableHelp:: ld hl, LinkCableHelpText2 call PrintText call HandleMenuInput - bit 1, a ; pressed b + bit BIT_B_BUTTON, a jr nz, .exit ld a, [wCurrentMenuItem] cp 3 ; pressed a on "STOP READING" @@ -122,9 +122,9 @@ ViridianSchoolBlackboard:: ld hl, ViridianSchoolBlackboardText2 call PrintText call HandleMenuInput ; pressing up and down is handled in here - bit 1, a ; pressed b + bit BIT_B_BUTTON, a ; pressed b jr nz, .exitBlackboard - bit 4, a ; pressed right + bit BIT_D_RIGHT, a jr z, .didNotPressRight ; move cursor to right column ld a, 2 @@ -137,7 +137,7 @@ ViridianSchoolBlackboard:: ld [wMenuItemOffset], a jr .blackboardLoop .didNotPressRight - bit 5, a ; pressed left + bit BIT_D_LEFT, a jr z, .didNotPressLeftOrRight ; move cursor to left column ld a, 2 diff --git a/engine/events/prize_menu.asm b/engine/events/prize_menu.asm index d9320fe7..bc3aab9a 100644 --- a/engine/events/prize_menu.asm +++ b/engine/events/prize_menu.asm @@ -31,7 +31,7 @@ CeladonPrizeMenu:: ld hl, WhichPrizeTextPtr call PrintText call HandleMenuInput ; menu choice handler - bit 1, a ; keypress = B (Cancel) + bit BIT_B_BUTTON, a jr nz, .noChoice ld a, [wCurrentMenuItem] cp 3 ; "NO,THANKS" choice diff --git a/engine/events/vending_machine.asm b/engine/events/vending_machine.asm index a67f1c07..980a45c5 100644 --- a/engine/events/vending_machine.asm +++ b/engine/events/vending_machine.asm @@ -31,7 +31,7 @@ VendingMachineMenu:: ld hl, wd730 res 6, [hl] call HandleMenuInput - bit 1, a ; pressed B? + bit BIT_B_BUTTON, a jr nz, .notThirsty ld a, [wCurrentMenuItem] cp 3 ; chose Cancel? diff --git a/engine/link/cable_club.asm b/engine/link/cable_club.asm index f3bf3b5d..cabc19ab 100644 --- a/engine/link/cable_club.asm +++ b/engine/link/cable_club.asm @@ -345,7 +345,7 @@ TradeCenter_SelectMon: res 1, [hl] and a jp z, .getNewInput - bit 0, a ; A button pressed? + bit BIT_A_BUTTON, a jr z, .enemyMonMenu_ANotPressed ; if A button pressed ld a, [wMaxMenuItem] @@ -364,7 +364,7 @@ TradeCenter_SelectMon: call TradeCenter_DisplayStats jp .getNewInput .enemyMonMenu_ANotPressed - bit 5, a ; Left pressed? + bit BIT_D_LEFT, a jr z, .enemyMonMenu_LeftNotPressed ; if Left pressed, switch back to the player mon menu xor a ; player mon menu @@ -384,7 +384,7 @@ TradeCenter_SelectMon: ld [wCurrentMenuItem], a jr .playerMonMenu .enemyMonMenu_LeftNotPressed - bit 7, a ; Down pressed? + bit BIT_D_DOWN, a jp z, .getNewInput jp .selectedCancelMenuItem ; jump if Down pressed .playerMonMenu @@ -412,7 +412,7 @@ TradeCenter_SelectMon: jr nz, .playerMonMenu_SomethingPressed jp .getNewInput .playerMonMenu_SomethingPressed - bit 0, a ; A button pressed? + bit BIT_A_BUTTON, a jr z, .playerMonMenu_ANotPressed jp .chosePlayerMon ; jump if A button pressed ; unreachable code @@ -422,7 +422,7 @@ TradeCenter_SelectMon: call TradeCenter_DisplayStats jp .getNewInput .playerMonMenu_ANotPressed - bit 4, a ; Right pressed? + bit BIT_D_RIGHT, a jr z, .playerMonMenu_RightNotPressed ; if Right pressed, switch to the enemy mon menu ld a, $1 ; enemy mon menu @@ -444,7 +444,7 @@ TradeCenter_SelectMon: .notPastLastEnemyMon jp .enemyMonMenu .playerMonMenu_RightNotPressed - bit 7, a ; Down pressed? + bit BIT_D_DOWN, a jr z, .getNewInput jp .selectedCancelMenuItem ; jump if Down pressed .getNewInput @@ -488,7 +488,7 @@ TradeCenter_SelectMon: call HandleMenuInput bit 4, a ; Right pressed? jr nz, .selectTradeMenuItem - bit 1, a ; B button pressed? + bit BIT_B_BUTTON, a jr z, .displayPlayerMonStats .cancelPlayerMonChoice pop af @@ -503,9 +503,9 @@ TradeCenter_SelectMon: ld a, 11 ld [wTopMenuItemX], a call HandleMenuInput - bit 5, a ; Left pressed? + bit BIT_D_LEFT, a jr nz, .selectStatsMenuItem - bit 1, a ; B button pressed? + bit BIT_B_BUTTON, a jr nz, .cancelPlayerMonChoice jr .choseTrade .displayPlayerMonStats @@ -554,9 +554,9 @@ TradeCenter_SelectMon: ldh a, [hJoy5] and a ; pressed anything? jr z, .cancelMenuItem_JoypadLoop - bit 0, a ; A button pressed? + bit BIT_A_BUTTON, a jr nz, .cancelMenuItem_APressed - bit 6, a ; Up pressed? + bit BIT_D_UP, a jr z, .cancelMenuItem_JoypadLoop ; if Up pressed ld a, " " diff --git a/engine/menus/main_menu.asm b/engine/menus/main_menu.asm index 95404cce..c3366b8e 100644 --- a/engine/menus/main_menu.asm +++ b/engine/menus/main_menu.asm @@ -66,7 +66,7 @@ MainMenu: ld a, [wSaveFileStatus] ld [wMaxMenuItem], a call HandleMenuInput - bit 1, a ; pressed B? + bit BIT_B_BUTTON, a jp nz, DisplayTitleScreen ; if so, go back to the title screen ld c, 20 call DelayFrames @@ -477,11 +477,11 @@ DisplayOptionMenu: ld b, a and A_BUTTON | B_BUTTON | START | D_RIGHT | D_LEFT | D_UP | D_DOWN ; any key besides select pressed? jr z, .getJoypadStateLoop - bit 1, b ; B button pressed? + bit BIT_B_BUTTON, b jr nz, .exitMenu - bit 3, b ; Start button pressed? + bit BIT_START, b jr nz, .exitMenu - bit 0, b ; A button pressed? + bit BIT_A_BUTTON, b jr z, .checkDirectionKeys ld a, [wTopMenuItemY] cp 16 ; is the cursor on Cancel? @@ -496,9 +496,9 @@ DisplayOptionMenu: jp .loop .checkDirectionKeys ld a, [wTopMenuItemY] - bit 7, b ; Down pressed? + bit BIT_D_DOWN, b jr nz, .downPressed - bit 6, b ; Up pressed? + bit BIT_D_UP, b jr nz, .upPressed cp 8 ; cursor in Battle Animation section? jr z, .cursorInBattleAnimation @@ -507,7 +507,7 @@ DisplayOptionMenu: cp 16 ; cursor on Cancel? jr z, .loop .cursorInTextSpeed - bit 5, b ; Left pressed? + bit BIT_D_LEFT, b jp nz, .pressedLeftInTextSpeed jp .pressedRightInTextSpeed .downPressed diff --git a/engine/menus/pc.asm b/engine/menus/pc.asm index 4c340e7b..6a15eaa5 100644 --- a/engine/menus/pc.asm +++ b/engine/menus/pc.asm @@ -14,7 +14,7 @@ PCMainMenu: ld hl, wFlags_0xcd60 set 5, [hl] call HandleMenuInput - bit 1, a ;if player pressed B + bit BIT_B_BUTTON, a jp nz, LogOff ld a, [wMaxMenuItem] cp 2 diff --git a/engine/menus/pokedex.asm b/engine/menus/pokedex.asm index 2af8d714..3411f729 100644 --- a/engine/menus/pokedex.asm +++ b/engine/menus/pokedex.asm @@ -95,7 +95,7 @@ HandlePokedexSideMenu: ld [wMenuWatchMovingOutOfBounds], a .handleMenuInput call HandleMenuInput - bit 1, a ; was the B button pressed? + bit BIT_B_BUTTON, a ld b, 2 jr nz, .buttonBPressed ld a, [wCurrentMenuItem] @@ -284,10 +284,10 @@ HandlePokedexListMenu: call Delay3 call GBPalNormal call HandleMenuInput - bit 1, a ; was the B button pressed? + bit BIT_B_BUTTON, a jp nz, .buttonBPressed .checkIfUpPressed - bit 6, a ; was Up pressed? + bit BIT_D_UP, a jr z, .checkIfDownPressed .upPressed ; scroll up one row ld a, [wListScrollOffset] @@ -297,7 +297,7 @@ HandlePokedexListMenu: ld [wListScrollOffset], a jp .loop .checkIfDownPressed - bit 7, a ; was Down pressed? + bit BIT_D_DOWN, a jr z, .checkIfRightPressed .downPressed ; scroll down one row ld a, [wDexMaxSeenMon] @@ -312,7 +312,7 @@ HandlePokedexListMenu: ld [wListScrollOffset], a jp .loop .checkIfRightPressed - bit 4, a ; was Right pressed? + bit BIT_D_RIGHT, a jr z, .checkIfLeftPressed .rightPressed ; scroll down 7 rows ld a, [wDexMaxSeenMon] @@ -330,7 +330,7 @@ HandlePokedexListMenu: ld [wListScrollOffset], a jp .loop .checkIfLeftPressed ; scroll up 7 rows - bit 5, a ; was Left pressed? + bit BIT_D_LEFT, a jr z, .buttonAPressed .leftPressed ld a, [wListScrollOffset] diff --git a/engine/menus/save.asm b/engine/menus/save.asm index 07eb5acb..83a5ca9b 100644 --- a/engine/menus/save.asm +++ b/engine/menus/save.asm @@ -356,7 +356,7 @@ ChangeBox:: call HandleMenuInput ld hl, hUILayoutFlags res 1, [hl] - bit 1, a ; pressed b + bit BIT_B_BUTTON, a ret nz call GetBoxSRAMLocation ld e, l diff --git a/engine/menus/start_sub_menus.asm b/engine/menus/start_sub_menus.asm index cd1e6da6..dbc6ab89 100644 --- a/engine/menus/start_sub_menus.asm +++ b/engine/menus/start_sub_menus.asm @@ -65,7 +65,7 @@ StartMenu_Pokemon:: push af call LoadScreenTilesFromBuffer1 ; restore saved screen pop af - bit 1, a ; was the B button pressed? + bit BIT_B_BUTTON, a jp nz, .loop ; if the B button wasn't pressed ld a, [wMaxMenuItem] @@ -360,7 +360,7 @@ StartMenu_Item:: ld [hl], a ; old menu item id call HandleMenuInput call PlaceUnfilledArrowMenuCursor - bit 1, a ; was the B button pressed? + bit BIT_B_BUTTON, a jr z, .useOrTossItem jp ItemMenuLoop .useOrTossItem ; if the player made the choice to use or toss the item diff --git a/engine/menus/text_box.asm b/engine/menus/text_box.asm index 5253ec48..cdb8841d 100644 --- a/engine/menus/text_box.asm +++ b/engine/menus/text_box.asm @@ -174,9 +174,9 @@ DoBuySellQuitMenu: ld [wd730], a call HandleMenuInput call PlaceUnfilledArrowMenuCursor - bit 0, a ; was A pressed? + bit BIT_A_BUTTON, a jr nz, .pressedA - bit 1, a ; was B pressed? (always true since only A/B are watched) + bit BIT_B_BUTTON, a ; always true since only A/B are watched jr z, .pressedA ld a, CANCELLED_MENU ld [wMenuExitMethod], a @@ -296,8 +296,8 @@ DisplayTwoOptionMenu: pop hl .noYesMenuInputLoop call HandleMenuInput - bit 1, a ; A button pressed? - jr nz, .noYesMenuInputLoop ; try again if A was not pressed + bit BIT_B_BUTTON, a + jr nz, .noYesMenuInputLoop ; try again if B was not pressed pop af pop hl ld [wFlags_0xcd60], a @@ -309,7 +309,7 @@ DisplayTwoOptionMenu: ld [wTwoOptionMenuID], a call HandleMenuInput pop hl - bit 1, a ; A button pressed? + bit BIT_B_BUTTON, a jr nz, .choseSecondMenuItem ; automatically choose the second option if B is pressed .pressedAButton ld a, [wCurrentMenuItem] diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm index 7aba8001..8684b761 100644 --- a/engine/pokemon/bills_pc.asm +++ b/engine/pokemon/bills_pc.asm @@ -171,8 +171,8 @@ BillsPCMenu: ldh [hAutoBGTransferEnabled], a call Delay3 call HandleMenuInput - bit 1, a - jp nz, ExitBillsPC ; b button + bit BIT_B_BUTTON, a + jp nz, ExitBillsPC call PlaceUnfilledArrowMenuCursor ld a, [wCurrentMenuItem] ld [wParentMenuItem], a @@ -416,7 +416,7 @@ DisplayDepositWithdrawMenu: ld [wPartyAndBillsPCSavedMenuItem], a .loop call HandleMenuInput - bit 1, a ; pressed B? + bit BIT_B_BUTTON, a jr nz, .exit ld a, [wCurrentMenuItem] and a diff --git a/engine/pokemon/learn_move.asm b/engine/pokemon/learn_move.asm index fd92ec57..0377caa4 100644 --- a/engine/pokemon/learn_move.asm +++ b/engine/pokemon/learn_move.asm @@ -155,7 +155,7 @@ TryingToLearn: call LoadScreenTilesFromBuffer1 pop af pop hl - bit 1, a ; pressed b + bit BIT_B_BUTTON, a jr nz, .cancel push hl ld a, [wCurrentMenuItem] diff --git a/home/hidden_objects.asm b/home/hidden_objects.asm index eccf1c8f..6e7d980a 100644 --- a/home/hidden_objects.asm +++ b/home/hidden_objects.asm @@ -5,7 +5,7 @@ CheckForHiddenObjectOrBookshelfOrCardKeyDoor:: ldh a, [hLoadedROMBank] push af ldh a, [hJoyHeld] - bit 0, a ; A button + bit BIT_A_BUTTON, a jr z, .nothingFound ; A button is pressed ld a, BANK(CheckForHiddenObject) diff --git a/home/list_menu.asm b/home/list_menu.asm index d6bf43b2..77e75012 100644 --- a/home/list_menu.asm +++ b/home/list_menu.asm @@ -84,7 +84,7 @@ DisplayListMenuIDLoop:: push af call PlaceMenuCursor pop af - bit 0, a ; was the A button pressed? + bit BIT_A_BUTTON, a jp z, .checkOtherKeys .buttonAPressed ld a, [wCurrentMenuItem] @@ -168,12 +168,12 @@ DisplayListMenuIDLoop:: res 6, [hl] ; turn on letter printing delay jp BankswitchBack .checkOtherKeys ; check B, SELECT, Up, and Down keys - bit 1, a ; was the B button pressed? + bit BIT_B_BUTTON, a jp nz, ExitListMenu ; if so, exit the menu - bit 2, a ; was the select button pressed? + bit BIT_SELECT, a jp nz, HandleItemListSwapping ; if so, allow the player to swap menu entries ld b, a - bit 7, b ; was Down pressed? + bit BIT_D_DOWN, b ld hl, wListScrollOffset jr z, .upPressed .downPressed @@ -220,13 +220,13 @@ DisplayChooseQuantityMenu:: .waitForKeyPressLoop call JoypadLowSensitivity ldh a, [hJoyPressed] ; newly pressed buttons - bit 0, a ; was the A button pressed? + bit BIT_A_BUTTON, a jp nz, .buttonAPressed - bit 1, a ; was the B button pressed? + bit BIT_B_BUTTON, a jp nz, .buttonBPressed - bit 6, a ; was Up pressed? + bit BIT_D_UP, a jr nz, .incrementQuantity - bit 7, a ; was Down pressed? + bit BIT_D_DOWN, a jr nz, .decrementQuantity jr .waitForKeyPressLoop .incrementQuantity diff --git a/home/overworld.asm b/home/overworld.asm index eb6f2ddb..74c97cb7 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -72,14 +72,14 @@ OverworldLoopLessDelay:: .notSimulating ldh a, [hJoyPressed] .checkIfStartIsPressed - bit 3, a ; start button + bit BIT_START, a jr z, .startButtonNotPressed ; if START is pressed xor a ; TEXT_START_MENU ldh [hSpriteIndexOrTextID], a jp .displayDialogue .startButtonNotPressed - bit 0, a ; A button + bit BIT_A_BUTTON, a jp z, .checkIfDownButtonIsPressed ; if A is pressed ld a, [wd730] @@ -146,7 +146,7 @@ OverworldLoopLessDelay:: .checkIfDownButtonIsPressed ldh a, [hJoyHeld] ; current joypad state - bit 7, a ; down button + bit BIT_D_DOWN, a jr z, .checkIfUpButtonIsPressed ld a, 1 ld [wSpritePlayerStateData1YStepVector], a @@ -154,7 +154,7 @@ OverworldLoopLessDelay:: jr .handleDirectionButtonPress .checkIfUpButtonIsPressed - bit 6, a ; up button + bit BIT_D_UP, a jr z, .checkIfLeftButtonIsPressed ld a, -1 ld [wSpritePlayerStateData1YStepVector], a @@ -162,7 +162,7 @@ OverworldLoopLessDelay:: jr .handleDirectionButtonPress .checkIfLeftButtonIsPressed - bit 5, a ; left button + bit BIT_D_LEFT, a jr z, .checkIfRightButtonIsPressed ld a, -1 ld [wSpritePlayerStateData1XStepVector], a @@ -170,7 +170,7 @@ OverworldLoopLessDelay:: jr .handleDirectionButtonPress .checkIfRightButtonIsPressed - bit 4, a ; right button + bit BIT_D_RIGHT, a jr z, .noDirectionButtonsPressed ld a, 1 ld [wSpritePlayerStateData1XStepVector], a diff --git a/home/pokemon.asm b/home/pokemon.asm index 4e6e080b..3e63de35 100644 --- a/home/pokemon.asm +++ b/home/pokemon.asm @@ -274,7 +274,7 @@ HandlePartyMenuInput:: scf ret .swappingPokemon - bit 1, b ; was the B button pressed? + bit BIT_B_BUTTON, b jr z, .handleSwap ; if not, handle swapping the pokemon .cancelSwap ; if the B button was pressed farcall ErasePartyMenuCursors diff --git a/home/print_text.asm b/home/print_text.asm index 049ddfb4..962ae519 100644 --- a/home/print_text.asm +++ b/home/print_text.asm @@ -25,11 +25,11 @@ PrintLetterDelay:: call Joypad ldh a, [hJoyHeld] .checkAButton - bit 0, a ; is the A button pressed? + bit BIT_A_BUTTON, a jr z, .checkBButton jr .endWait .checkBButton - bit 1, a ; is the B button pressed? + bit BIT_B_BUTTON, a jr z, .buttonsNotPressed .endWait call DelayFrame diff --git a/home/start_menu.asm b/home/start_menu.asm index 5b29f67a..ed3d9470 100644 --- a/home/start_menu.asm +++ b/home/start_menu.asm @@ -15,7 +15,7 @@ RedisplayStartMenu:: call HandleMenuInput ld b, a .checkIfUpPressed - bit 6, a ; was Up pressed? + bit BIT_D_UP, a jr z, .checkIfDownPressed ld a, [wCurrentMenuItem] ; menu selection and a @@ -54,7 +54,7 @@ RedisplayStartMenu:: ld a, [wCurrentMenuItem] ld [wBattleAndStartSavedMenuItem], a ; save current menu selection ld a, b - and %00001010 ; was the Start button or B button pressed? + and B_BUTTON | START ; was the Start button or B button pressed? jp nz, CloseStartMenu call SaveScreenTilesToBuffer2 ; copy background from wTileMap to wTileMapBackup2 CheckEvent EVENT_GOT_POKEDEX @@ -79,7 +79,7 @@ RedisplayStartMenu:: CloseStartMenu:: call Joypad ldh a, [hJoyPressed] - bit 0, a ; was A button newly pressed? + bit BIT_A_BUTTON, a jr nz, CloseStartMenu call LoadTextBoxTilePatterns jp CloseTextDisplay diff --git a/home/text_script.asm b/home/text_script.asm index a6881dc5..39bc3f5b 100644 --- a/home/text_script.asm +++ b/home/text_script.asm @@ -98,7 +98,7 @@ AfterDisplayingTextID:: HoldTextDisplayOpen:: call Joypad ldh a, [hJoyHeld] - bit 0, a ; is the A button being pressed? + bit BIT_A_BUTTON, a jr nz, HoldTextDisplayOpen CloseTextDisplay:: diff --git a/home/window.asm b/home/window.asm index 0182bdd3..45b207a8 100644 --- a/home/window.asm +++ b/home/window.asm @@ -50,7 +50,7 @@ HandleMenuInput_:: ld [wCheckFor180DegreeTurn], a ldh a, [hJoy5] ld b, a - bit 6, a ; pressed Up key? + bit BIT_D_UP, a jr z, .checkIfDownPressed .upPressed ld a, [wCurrentMenuItem] ; selected menu item -- cgit v1.3.1-sl0p From f68af5c6e95a11daa3bc8daaf28c4e9a779615b9 Mon Sep 17 00:00:00 2001 From: Yoann Fievez Date: Sat, 6 Nov 2021 00:45:09 +0100 Subject: Add some constants for options (#344) Co-authored-by: Rangi <35663410+Rangi42@users.noreply.github.com> --- constants/misc_constants.asm | 9 +++++++++ engine/battle/animations.asm | 2 +- engine/battle/core.asm | 2 +- engine/battle/move_effects/substitute.asm | 2 +- engine/debug/debug_menu.asm | 2 +- engine/menus/main_menu.asm | 13 ++++++------- home/start_menu.asm | 2 +- home/window.asm | 2 +- 8 files changed, 21 insertions(+), 13 deletions(-) diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 1bb32f8e..4aff58da 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -7,3 +7,12 @@ TRUE EQU 1 const FLAG_RESET ; 0 const FLAG_SET ; 1 const FLAG_TEST ; 2 + +; wOptions +TEXT_DELAY_FAST EQU %001 ; 1 +TEXT_DELAY_MEDIUM EQU %011 ; 3 +TEXT_DELAY_SLOW EQU %101 ; 5 + + const_def 6 + const BIT_BATTLE_SHIFT ; 6 + const BIT_BATTLE_ANIMATION ; 7 diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index a93af9e9..476e937f 100644 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -395,7 +395,7 @@ MoveAnimation: .moveAnimation ; check if battle animations are disabled in the options ld a, [wOptions] - bit 7, a + bit BIT_BATTLE_ANIMATION, a jr nz, .animationsDisabled call ShareMoveAnimations call PlayAnimation diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 6c0585b6..efcba34b 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -1372,7 +1372,7 @@ EnemySendOutFirstMon: cp LINK_STATE_BATTLING jr z, .next4 ld a, [wOptions] - bit 6, a + bit BIT_BATTLE_SHIFT, a jr nz, .next4 ld hl, TrainerAboutToUseText call PrintText diff --git a/engine/battle/move_effects/substitute.asm b/engine/battle/move_effects/substitute.asm index 860b76b6..b1fd8ac2 100644 --- a/engine/battle/move_effects/substitute.asm +++ b/engine/battle/move_effects/substitute.asm @@ -45,7 +45,7 @@ SubstituteEffect_: ld l, c set HAS_SUBSTITUTE_UP, [hl] ld a, [wOptions] - bit 7, a ; battle animation is enabled? + bit BIT_BATTLE_ANIMATION, a ld hl, PlayCurrentMoveAnimation ld b, BANK(PlayCurrentMoveAnimation) jr z, .animationEnabled diff --git a/engine/debug/debug_menu.asm b/engine/debug/debug_menu.asm index 02280db0..f2297129 100644 --- a/engine/debug/debug_menu.asm +++ b/engine/debug/debug_menu.asm @@ -26,7 +26,7 @@ IF DEF(_DEBUG) ld de, DebugMenuOptions call PlaceString - ld a, 3 ; medium speed + ld a, TEXT_DELAY_MEDIUM ld [wOptions], a ld a, A_BUTTON | B_BUTTON | START diff --git a/engine/menus/main_menu.asm b/engine/menus/main_menu.asm index c3366b8e..7e4cc9be 100644 --- a/engine/menus/main_menu.asm +++ b/engine/menus/main_menu.asm @@ -125,9 +125,9 @@ MainMenu: jp SpecialEnterMap InitOptions: - ld a, 1 ; no delay + ld a, TEXT_DELAY_FAST ld [wLetterPrintingDelayFlags], a - ld a, 3 ; medium speed + ld a, TEXT_DELAY_MEDIUM ld [wOptions], a ret @@ -678,11 +678,10 @@ SetCursorPositionsFromOptions: ; 00: X coordinate of menu cursor ; 01: delay after printing a letter (in frames) TextSpeedOptionData: - db 14, 5 ; Slow - db 7, 3 ; Medium - db 1, 1 ; Fast - db 7 ; default X coordinate (Medium) - db -1 ; end + db 14, TEXT_DELAY_SLOW + db 7, TEXT_DELAY_MEDIUM + db 1, TEXT_DELAY_FAST + db 7, -1 ; end (default X coordinate) CheckForPlayerNameInSRAM: ; Check if the player name data in SRAM has a string terminator character diff --git a/home/start_menu.asm b/home/start_menu.asm index ed3d9470..5a531744 100644 --- a/home/start_menu.asm +++ b/home/start_menu.asm @@ -33,7 +33,7 @@ RedisplayStartMenu:: call EraseMenuCursor jr .loop .checkIfDownPressed - bit 7, a + bit BIT_D_DOWN, a jr z, .buttonPressed ; if the player pressed tried to go past the bottom item, wrap around to the top CheckEvent EVENT_GOT_POKEDEX diff --git a/home/window.asm b/home/window.asm index 45b207a8..0abe366d 100644 --- a/home/window.asm +++ b/home/window.asm @@ -68,7 +68,7 @@ HandleMenuInput_:: ld [wCurrentMenuItem], a ; wrap to the bottom of the menu jr .checkOtherKeys .checkIfDownPressed - bit 7, a + bit BIT_D_DOWN, a jr z, .checkOtherKeys .downPressed ld a, [wCurrentMenuItem] -- cgit v1.3.1-sl0p From 157b593561382c77a6435a8f1fae64df6d7169e8 Mon Sep 17 00:00:00 2001 From: Rangi Date: Sat, 6 Nov 2021 13:24:19 -0400 Subject: Use `dn` for wave instrument samples, like pokecrystal --- audio/wave_instruments.asm | 10 +++++----- macros/data.asm | 27 ++++++++++++++++++--------- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/audio/wave_instruments.asm b/audio/wave_instruments.asm index 31e7d016..15376004 100644 --- a/audio/wave_instruments.asm +++ b/audio/wave_instruments.asm @@ -15,19 +15,19 @@ ; the graph of the wave ; the current instrument is copied to rWave_0--rWave_f .wave0 - db $02,$46,$8A,$CE,$FF,$FE,$ED,$DC,$CB,$A9,$87,$65,$44,$33,$22,$11 + dn 0, 2, 4, 6, 8, 10, 12, 14, 15, 15, 15, 14, 14, 13, 13, 12, 12, 11, 10, 9, 8, 7, 6, 5, 4, 4, 3, 3, 2, 2, 1, 1 .wave1 - db $02,$46,$8A,$CE,$EF,$FF,$FE,$EE,$DD,$CB,$A9,$87,$65,$43,$22,$11 + dn 0, 2, 4, 6, 8, 10, 12, 14, 14, 15, 15, 15, 15, 14, 14, 14, 13, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 2, 1, 1 .wave2 - db $13,$69,$BD,$EE,$EE,$FF,$FF,$ED,$DE,$FF,$FF,$EE,$EE,$DB,$96,$31 + dn 1, 3, 6, 9, 11, 13, 14, 14, 14, 14, 15, 15, 15, 15, 14, 13, 13, 14, 15, 15, 15, 15, 14, 14, 14, 14, 13, 11, 9, 6, 3, 1 .wave3 - db $02,$46,$8A,$CD,$EF,$FE,$DE,$FF,$EE,$DC,$BA,$98,$76,$54,$32,$10 + dn 0, 2, 4, 6, 8, 10, 12, 13, 14, 15, 15, 14, 13, 14, 15, 15, 14, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 .wave4 - db $01,$23,$45,$67,$8A,$CD,$EE,$F7,$7F,$EE,$DC,$A8,$76,$54,$32,$10 + dn 0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 13, 14, 14, 15, 7, 7, 15, 14, 14, 13, 12, 10, 8, 7, 6, 5, 4, 3, 2, 1, 0 ; duty 5 reads from sfx data .wave5 diff --git a/macros/data.asm b/macros/data.asm index eb5b5564..311c859f 100644 --- a/macros/data.asm +++ b/macros/data.asm @@ -39,24 +39,33 @@ ENDM ; Constant data (db, dw, dl) macros -dn: MACRO ; nybbles - db (\1 << 4 | \2) -ENDM - dbw: MACRO db \1 dw \2 ENDM -dba: MACRO - dbw BANK(\1), \1 -ENDM - dwb: MACRO dw \1 db \2 ENDM -dab: MACRO +dn: MACRO ; nybbles +REPT _NARG / 2 + db ((\1) << 4) | (\2) + SHIFT 2 +ENDR +ENDM + +dba: MACRO ; dbw bank, address +REPT _NARG + dbw BANK(\1), \1 + SHIFT +ENDR +ENDM + +dab: MACRO ; dwb address, bank +REPT _NARG dwb \1, BANK(\1) + SHIFT +ENDR ENDM -- cgit v1.3.1-sl0p From 64e2b66a610d330bfdad108a603027be9652a7e7 Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 23 Nov 2021 20:53:05 -0500 Subject: Require rgbds 0.5.2 --- .github/workflows/main.yml | 2 +- INSTALL.md | 22 +++++++++++----------- rgbdscheck.asm | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0e2472a4..c1052183 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,7 +16,7 @@ jobs: uses: actions/checkout@master with: path: rgbds - ref: v0.5.1 + ref: v0.5.2 repository: gbdev/rgbds - name: Install rgbds diff --git a/INSTALL.md b/INSTALL.md index 02ac7125..ec2f71a0 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -42,9 +42,9 @@ Run setup and leave the default settings. At the "**Select Packages**" step, cho Double click on the text that says "**Skip**" next to each package to select the most recent version to install. -Then follow the [**rgbds** install instructions](https://rgbds.gbdev.io/install/windows) for Windows with Cygwin to install **rgbds 0.5.1**. +Then follow the [**rgbds** install instructions](https://rgbds.gbdev.io/install/windows) for Windows with Cygwin to install **rgbds 0.5.2**. -**Note:** If you already have an older rgbds, you will need to update to 0.5.1. Ignore this if you have never installed rgbds before. If a version newer than 0.5.1 does not work, try downloading 0.5.1. +**Note:** If you already have an older rgbds, you will need to update to 0.5.2. Ignore this if you have never installed rgbds before. If a version newer than 0.5.2 does not work, try downloading 0.5.2. Now open the **Cygwin terminal** and enter the following commands. @@ -67,7 +67,7 @@ Install [**Homebrew**](https://brew.sh/). Follow the official instructions. Open **Terminal** and prepare to enter commands. -Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/macos) for macOS to install **rgbds 0.5.1**. +Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/macos) for macOS to install **rgbds 0.5.2**. Now you're ready to [build **pokered**](#build-pokered). @@ -84,7 +84,7 @@ To install the software required for **pokered**: sudo apt-get install make gcc git ``` -Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.5.1** from source. +Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.5.2** from source. ### OpenSUSE @@ -94,7 +94,7 @@ To install the software required for **pokered**: sudo zypper install make gcc git ``` -Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.5.1** from source. +Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.5.2** from source. ### Arch Linux @@ -104,9 +104,9 @@ To install the software required for **pokered**: sudo pacman -S make gcc git ``` -Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/arch) for Arch Linux to install **rgbds 0.5.1**. +Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/arch) for Arch Linux to install **rgbds 0.5.2**. -If you want to compile and install **rgbds** yourself instead, then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.5.1** from source. +If you want to compile and install **rgbds** yourself instead, then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.5.2** from source. ### Termux @@ -122,7 +122,7 @@ To install **rgbds**: sudo apt install rgbds ``` -If you want to compile and install **rgbds** yourself instead, then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.5.1** from source. +If you want to compile and install **rgbds** yourself instead, then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.5.2** from source. ### Other distros @@ -133,7 +133,7 @@ If your distro is not listed here, try to find the required software in its repo - `git` - `rgbds` -If `rgbds` is not available, you'll need to follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.5.1** from source. +If `rgbds` is not available, you'll need to follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.5.2** from source. Now you're ready to [build **pokered**](#build-pokered). @@ -155,8 +155,8 @@ make ### Build with a local rgbds version -If you have different projects that require different versions of `rgbds`, it might not be convenient to install rgbds 0.5.1 globally. Instead, you can put its files in a directory within pokered, such as `pokered/rgbds-0.5.1/`. Then specify it when you run `make`: +If you have different projects that require different versions of `rgbds`, it might not be convenient to install rgbds 0.5.2 globally. Instead, you can put its files in a directory within pokered, such as `pokered/rgbds-0.5.2/`. Then specify it when you run `make`: ```bash -make RGBDS=rgbds-0.5.1/ +make RGBDS=rgbds-0.5.2/ ``` diff --git a/rgbdscheck.asm b/rgbdscheck.asm index 25277131..556fbae4 100644 --- a/rgbdscheck.asm +++ b/rgbdscheck.asm @@ -1,9 +1,9 @@ MAJOR EQU 0 MINOR EQU 5 -PATCH EQU 1 +PATCH EQU 2 wrong_rgbds: MACRO - fail "pokered requires rgbds v0.5.1 or newer." + fail "pokered requires rgbds v0.5.2 or newer." ENDM IF !DEF(__RGBDS_MAJOR__) || !DEF(__RGBDS_MINOR__) || !DEF(__RGBDS_PATCH__) -- cgit v1.3.1-sl0p From 865d37e02ad6af386e7f596659ebec12266be3ce Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 23 Nov 2021 20:56:57 -0500 Subject: Use compound assignment operators --- constants/item_constants.asm | 2 +- data/trainers/move_choices.asm | 2 +- macros/asserts.asm | 8 ++++---- macros/const.asm | 10 +++++----- macros/data.asm | 2 +- macros/scripts/events.asm | 12 ++++++------ macros/scripts/maps.asm | 8 ++++---- sram.asm | 2 +- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/constants/item_constants.asm b/constants/item_constants.asm index d8a5910f..f3c71985 100644 --- a/constants/item_constants.asm +++ b/constants/item_constants.asm @@ -122,7 +122,7 @@ __tmhm_value__ = NUM_TMS + 1 add_tmnum: MACRO \1_TMNUM EQU __tmhm_value__ -__tmhm_value__ = __tmhm_value__ + 1 +__tmhm_value__ += 1 ENDM add_hm: MACRO diff --git a/data/trainers/move_choices.asm b/data/trainers/move_choices.asm index 2c3498af..66bc36e7 100644 --- a/data/trainers/move_choices.asm +++ b/data/trainers/move_choices.asm @@ -3,7 +3,7 @@ move_choices: MACRO db \# ; all args ENDC db 0 ; end -list_index = list_index + 1 +list_index += 1 ENDM ; move choice modification methods that are applied for each trainer class diff --git a/macros/asserts.asm b/macros/asserts.asm index 946add28..df2cdcd4 100644 --- a/macros/asserts.asm +++ b/macros/asserts.asm @@ -29,7 +29,7 @@ ENDM li: MACRO ASSERT !STRIN(\1, "@"), STRCAT("String terminator \"@\" in list entry: ", \1) db \1, "@" -list_index = list_index + 1 +list_index += 1 ENDM assert_list_length: MACRO @@ -52,7 +52,7 @@ ENDM nybble: MACRO ASSERT 0 <= (\1) && (\1) < $10, "nybbles must be 0-15" CURRENT_NYBBLE_ARRAY_VALUE = (\1) | (CURRENT_NYBBLE_ARRAY_VALUE << 4) -CURRENT_NYBBLE_ARRAY_LENGTH = CURRENT_NYBBLE_ARRAY_LENGTH + 1 +CURRENT_NYBBLE_ARRAY_LENGTH += 1 IF CURRENT_NYBBLE_ARRAY_LENGTH % 2 == 0 db CURRENT_NYBBLE_ARRAY_VALUE CURRENT_NYBBLE_ARRAY_VALUE = 0 @@ -86,8 +86,8 @@ ENDM dbit: MACRO ASSERT (\1) == 0 || (\1) == 1, "bits must be 0 or 1" -CURRENT_BIT_ARRAY_VALUE = CURRENT_BIT_ARRAY_VALUE | ((\1) << (CURRENT_BIT_ARRAY_LENGTH % 8)) -CURRENT_BIT_ARRAY_LENGTH = CURRENT_BIT_ARRAY_LENGTH + 1 +CURRENT_BIT_ARRAY_VALUE |= (\1) << (CURRENT_BIT_ARRAY_LENGTH % 8) +CURRENT_BIT_ARRAY_LENGTH += 1 IF CURRENT_BIT_ARRAY_LENGTH % 8 == 0 db CURRENT_BIT_ARRAY_VALUE CURRENT_BIT_ARRAY_VALUE = 0 diff --git a/macros/const.asm b/macros/const.asm index 3df9ecd8..afbde7bc 100644 --- a/macros/const.asm +++ b/macros/const.asm @@ -15,19 +15,19 @@ ENDM const: MACRO \1 EQU const_value -const_value = const_value + const_inc +const_value += const_inc ENDM shift_const: MACRO -\1 EQU (1 << const_value) -const_value = const_value + const_inc +\1 EQU 1 << const_value +const_value += const_inc ENDM const_skip: MACRO if _NARG >= 1 -const_value = const_value + const_inc * (\1) +const_value += const_inc * (\1) else -const_value = const_value + const_inc +const_value += const_inc endc ENDM diff --git a/macros/data.asm b/macros/data.asm index 311c859f..1f3c87a0 100644 --- a/macros/data.asm +++ b/macros/data.asm @@ -24,7 +24,7 @@ REPT _NARG IF DEF(\1_TMNUM) n = (\1_TMNUM - 1) / 8 i = (\1_TMNUM - 1) % 8 -_tm{d:n} = _tm{d:n} | (1 << i) +_tm{d:n} |= 1 << i ELSE FAIL "\1 is not a TM or HM move" ENDC diff --git a/macros/scripts/events.asm b/macros/scripts/events.asm index c7fdb484..a9b1c615 100644 --- a/macros/scripts/events.asm +++ b/macros/scripts/events.asm @@ -261,8 +261,8 @@ event_fill_start = event_start_byte + 1 event_fill_count = event_end_byte - event_start_byte - 1 IF ((\1) % 8) == 0 -event_fill_start = event_fill_start - 1 -event_fill_count = event_fill_count + 1 +event_fill_start -= 1 +event_fill_count += 1 ELSE ld a, [wEventFlags + event_start_byte] or $ff - ((1 << ((\1) % 8)) - 1) @@ -270,7 +270,7 @@ event_fill_count = event_fill_count + 1 ENDC IF ((\2) % 8) == 7 -event_fill_count = event_fill_count + 1 +event_fill_count += 1 ENDC IF event_fill_count == 1 @@ -323,8 +323,8 @@ event_fill_start = event_start_byte + 1 event_fill_count = event_end_byte - event_start_byte - 1 IF ((\1) % 8) == 0 -event_fill_start = event_fill_start - 1 -event_fill_count = event_fill_count + 1 +event_fill_start -= 1 +event_fill_count += 1 ELSE ld a, [wEventFlags + event_start_byte] and ~($ff - ((1 << ((\1) % 8)) - 1)) & $ff @@ -332,7 +332,7 @@ event_fill_count = event_fill_count + 1 ENDC IF ((\2) % 8) == 7 -event_fill_count = event_fill_count + 1 +event_fill_count += 1 ENDC IF event_fill_count == 1 diff --git a/macros/scripts/maps.asm b/macros/scripts/maps.asm index 12bc3c77..bae8fd07 100644 --- a/macros/scripts/maps.asm +++ b/macros/scripts/maps.asm @@ -29,7 +29,7 @@ object_event: MACRO ELSE db \6 ENDC -{_NUM_OBJECT_EVENTS} = {_NUM_OBJECT_EVENTS} + 1 +{_NUM_OBJECT_EVENTS} += 1 ENDM def_warp_events: MACRO @@ -46,7 +46,7 @@ warp_event: MACRO 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 +{_NUM_WARP_EVENTS} += 1 ENDM def_bg_events: MACRO @@ -60,7 +60,7 @@ ENDM ;\3 sign id bg_event: MACRO db \2, \1, \3 -{_NUM_BG_EVENTS} = {_NUM_BG_EVENTS} + 1 +{_NUM_BG_EVENTS} += 1 ENDM ;\1 source map @@ -101,7 +101,7 @@ _cur_bit = CURRENT_TRAINER_BIT % 8 db \2 << 4 dw wEventFlags + (\1 - CURRENT_TRAINER_BIT) / 8 dw \3, \5, \4, \4 -CURRENT_TRAINER_BIT = CURRENT_TRAINER_BIT + 1 +CURRENT_TRAINER_BIT += 1 ENDM ;\1 x position diff --git a/sram.asm b/sram.asm index a4c9a38c..776610c5 100644 --- a/sram.asm +++ b/sram.asm @@ -27,7 +27,7 @@ sMainDataCheckSum:: db box_n = 0 boxes: MACRO REPT \1 -box_n = box_n + 1 +box_n += 1 sBox{d:box_n}:: ds wBoxDataEnd - wBoxDataStart ENDR ENDM -- cgit v1.3.1-sl0p From 09e92c554c7563b52a9484b26d96d903c7635b0d Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 23 Nov 2021 21:00:07 -0500 Subject: Use ~X instead of $ff ^ X --- Makefile | 2 +- engine/battle/core.asm | 4 ++-- engine/battle/move_effects/haze.asm | 2 +- engine/debug/debug_party.asm | 2 +- home/lcd.asm | 2 +- scripts/ViridianCity.asm | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 6d432ec9..fb1122ca 100644 --- a/Makefile +++ b/Makefile @@ -58,7 +58,7 @@ tools: $(MAKE) -C tools/ -RGBASMFLAGS = -h -L -Weverything +RGBASMFLAGS = -h -L -Weverything -Wnumeric-string=2 -Wtruncation=1 # Create a sym/map for debug purposes if `make` run with `DEBUG=1` ifeq ($(DEBUG),1) RGBASMFLAGS += -E diff --git a/engine/battle/core.asm b/engine/battle/core.asm index efcba34b..4a166f7e 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -3433,7 +3433,7 @@ CheckPlayerStatusConditions: ld hl, wPlayerBattleStatus1 ld a, [hl] ; clear bide, thrashing, charging up, and trapping moves such as warp (already cleared for confusion damage) - and $ff ^ ((1 << STORING_ENERGY) | (1 << THRASHING_ABOUT) | (1 << CHARGING_UP) | (1 << USING_TRAPPING_MOVE)) + and ~((1 << STORING_ENERGY) | (1 << THRASHING_ABOUT) | (1 << CHARGING_UP) | (1 << USING_TRAPPING_MOVE)) ld [hl], a ld a, [wPlayerMoveEffect] cp FLY_EFFECT @@ -5940,7 +5940,7 @@ CheckEnemyStatusConditions: ld hl, wEnemyBattleStatus1 ld a, [hl] ; clear bide, thrashing about, charging up, and multi-turn moves such as warp - and $ff ^ ((1 << STORING_ENERGY) | (1 << THRASHING_ABOUT) | (1 << CHARGING_UP) | (1 << USING_TRAPPING_MOVE)) + and ~((1 << STORING_ENERGY) | (1 << THRASHING_ABOUT) | (1 << CHARGING_UP) | (1 << USING_TRAPPING_MOVE)) ld [hl], a ld a, [wEnemyMoveEffect] cp FLY_EFFECT diff --git a/engine/battle/move_effects/haze.asm b/engine/battle/move_effects/haze.asm index 915eeed8..c15c848b 100644 --- a/engine/battle/move_effects/haze.asm +++ b/engine/battle/move_effects/haze.asm @@ -51,7 +51,7 @@ CureVolatileStatuses: inc hl ; BATTSTATUS2 ld a, [hl] ; clear USING_X_ACCURACY, PROTECTED_BY_MIST, GETTING_PUMPED, and SEEDED statuses - and $ff ^((1 << USING_X_ACCURACY) | (1 << PROTECTED_BY_MIST) | (1 << GETTING_PUMPED) | (1 << SEEDED)) + and ~((1 << USING_X_ACCURACY) | (1 << PROTECTED_BY_MIST) | (1 << GETTING_PUMPED) | (1 << SEEDED)) ld [hli], a ; BATTSTATUS3 ld a, [hl] and %11110000 | (1 << TRANSFORMED) ; clear Bad Poison, Reflect and Light Screen statuses diff --git a/engine/debug/debug_party.asm b/engine/debug/debug_party.asm index 17baa7ef..36eb8e6f 100644 --- a/engine/debug/debug_party.asm +++ b/engine/debug/debug_party.asm @@ -46,7 +46,7 @@ IF DEF(_DEBUG) ld [wTownVisitedFlag + 1], a ; Get all badges except Earth Badge. - ld a, $ff ^ (1 << BIT_EARTHBADGE) + ld a, ~(1 << BIT_EARTHBADGE) ld [wObtainedBadges], a call SetIshiharaTeam diff --git a/home/lcd.asm b/home/lcd.asm index 72fc70ed..5c496824 100644 --- a/home/lcd.asm +++ b/home/lcd.asm @@ -12,7 +12,7 @@ DisableLCD:: jr nz, .wait ldh a, [rLCDC] - and $ff ^ rLCDC_ENABLE_MASK + and ~rLCDC_ENABLE_MASK ldh [rLCDC], a ld a, b ldh [rIE], a diff --git a/scripts/ViridianCity.asm b/scripts/ViridianCity.asm index 96e58a19..532451c9 100644 --- a/scripts/ViridianCity.asm +++ b/scripts/ViridianCity.asm @@ -18,7 +18,7 @@ ViridianCityScript_1900b: CheckEvent EVENT_VIRIDIAN_GYM_OPEN ret nz ld a, [wObtainedBadges] - cp $ff ^ (1 << BIT_EARTHBADGE) + cp ~(1 << BIT_EARTHBADGE) jr nz, .gym_closed SetEvent EVENT_VIRIDIAN_GYM_OPEN ret @@ -148,7 +148,7 @@ ViridianCityText1: ViridianCityText2: text_asm ld a, [wObtainedBadges] - cp $ff ^ (1 << BIT_EARTHBADGE) + cp ~(1 << BIT_EARTHBADGE) ld hl, ViridianCityText_19127 jr z, .done CheckEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI -- cgit v1.3.1-sl0p