foster/pokered
0
0
Fork 0
mirror of https://github.com/pret/pokered.git synced 2024-10-22 22:55:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use def_warps_to macro for automatic warp_to entries

Browse source
This commit is contained in:
Rangi 2020-08-17 17:47:28 -04:00
parent f4514ff53c
commit 4373aafac1
224 changed files with 257 additions and 1019 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
data/maps/objects/AgathasRoom.asm
View file

@ -12,8 +12,4 @@ AgathasRoom_Object:
def_objects
object SPRITE_AGATHA, 5, 2, STAY, DOWN, 1, OPP_AGATHA, 1
; warp-to
warp_to 4, 11, AGATHAS_ROOM_WIDTH ; BRUNOS_ROOM
warp_to 5, 11, AGATHAS_ROOM_WIDTH ; BRUNOS_ROOM
warp_to 4, 0, AGATHAS_ROOM_WIDTH ; LANCES_ROOM
warp_to 5, 0, AGATHAS_ROOM_WIDTH ; LANCES_ROOM
def_warps_to AGATHAS_ROOM

4
data/maps/objects/BikeShop.asm
View file

@ -12,6 +12,4 @@ BikeShop_Object:
object SPRITE_MIDDLE_AGED_WOMAN, 5, 6, WALK, UP_DOWN, 2 ; person
object SPRITE_YOUNGSTER, 1, 3, STAY, UP, 3 ; person
; warp-to
warp_to 2, 7, BIKE_SHOP_WIDTH
warp_to 3, 7, BIKE_SHOP_WIDTH
def_warps_to BIKE_SHOP

4
data/maps/objects/BillsHouse.asm
View file

@ -12,6 +12,4 @@ BillsHouse_Object:
object SPRITE_SUPER_NERD, 4, 4, STAY, NONE, 2 ; person
object SPRITE_SUPER_NERD, 6, 5, STAY, NONE, 3 ; person
; warp-to
warp_to 2, 7, BILLS_HOUSE_WIDTH
warp_to 3, 7, BILLS_HOUSE_WIDTH
def_warps_to BILLS_HOUSE

4
data/maps/objects/BluesHouse.asm
View file

@ -12,6 +12,4 @@ BluesHouse_Object:
object SPRITE_DAISY, 6, 4, WALK, UP_DOWN, 2, 0 ; Daisy, walking around
object SPRITE_POKEDEX, 3, 3, STAY, NONE, 3, 0 ; map on table
; warp-to
warp_to 2, 7, BLUES_HOUSE_WIDTH
warp_to 3, 7, BLUES_HOUSE_WIDTH
def_warps_to BLUES_HOUSE

6
data/maps/objects/BrunosRoom.asm
View file

@ -12,8 +12,4 @@ BrunosRoom_Object:
def_objects
object SPRITE_BRUNO, 5, 2, STAY, DOWN, 1, OPP_BRUNO, 1
; warp-to
warp_to 4, 11, BRUNOS_ROOM_WIDTH ; LORELEIS_ROOM
warp_to 5, 11, BRUNOS_ROOM_WIDTH ; LORELEIS_ROOM
warp_to 4, 0, BRUNOS_ROOM_WIDTH ; AGATHAS_ROOM
warp_to 5, 0, BRUNOS_ROOM_WIDTH ; AGATHAS_ROOM
def_warps_to BRUNOS_ROOM

4
data/maps/objects/CeladonChiefHouse.asm
View file

@ -12,6 +12,4 @@ CeladonChiefHouse_Object:
object SPRITE_ROCKET, 1, 4, WALK, ANY_DIR, 2 ; person
object SPRITE_SAILOR, 5, 6, STAY, LEFT, 3 ; person
; warp-to
warp_to 2, 7, CELADON_CHIEF_HOUSE_WIDTH
warp_to 3, 7, CELADON_CHIEF_HOUSE_WIDTH
def_warps_to CELADON_CHIEF_HOUSE

15
data/maps/objects/CeladonCity.asm
View file

@ -38,17 +38,4 @@ CeladonCity_Object:
object SPRITE_ROCKET, 32, 29, WALK, LEFT_RIGHT, 8 ; person
object SPRITE_ROCKET, 42, 14, WALK, LEFT_RIGHT, 9 ; person
; warp-to
warp_to 8, 13, CELADON_CITY_WIDTH ; CELADON_MART_1F
warp_to 10, 13, CELADON_CITY_WIDTH ; CELADON_MART_1F
warp_to 24, 9, CELADON_CITY_WIDTH ; CELADON_MANSION_1F
warp_to 24, 3, CELADON_CITY_WIDTH ; CELADON_MANSION_1F
warp_to 25, 3, CELADON_CITY_WIDTH ; CELADON_MANSION_1F
warp_to 41, 9, CELADON_CITY_WIDTH ; CELADON_POKECENTER
warp_to 12, 27, CELADON_CITY_WIDTH ; CELADON_GYM
warp_to 28, 19, CELADON_CITY_WIDTH ; GAME_CORNER
warp_to 39, 19, CELADON_CITY_WIDTH ; CELADON_MART_5F
warp_to 33, 19, CELADON_CITY_WIDTH ; GAME_CORNER_PRIZE_ROOM
warp_to 31, 27, CELADON_CITY_WIDTH ; CELADON_DINER
warp_to 35, 27, CELADON_CITY_WIDTH ; CELADON_CHIEF_HOUSE
warp_to 43, 27, CELADON_CITY_WIDTH ; CELADON_HOTEL
def_warps_to CELADON_CITY

4
data/maps/objects/CeladonDiner.asm
View file

@ -14,6 +14,4 @@ CeladonDiner_Object:
object SPRITE_FISHER, 5, 3, STAY, RIGHT, 4 ; person
object SPRITE_GYM_GUIDE, 0, 1, STAY, DOWN, 5 ; person
; warp-to
warp_to 3, 7, CELADON_DINER_WIDTH
warp_to 4, 7, CELADON_DINER_WIDTH
def_warps_to CELADON_DINER

4
data/maps/objects/CeladonGym.asm
View file

@ -17,6 +17,4 @@ CeladonGym_Object:
object SPRITE_BEAUTY, 3, 3, STAY, DOWN, 7, OPP_BEAUTY, 3
object SPRITE_COOLTRAINER_F, 5, 3, STAY, DOWN, 8, OPP_COOLTRAINER_F, 1
; warp-to
warp_to 4, 17, CELADON_GYM_WIDTH
warp_to 5, 17, CELADON_GYM_WIDTH
def_warps_to CELADON_GYM

4
data/maps/objects/CeladonHotel.asm
View file

@ -12,6 +12,4 @@ CeladonHotel_Object:
object SPRITE_BEAUTY, 2, 4, STAY, NONE, 2 ; person
object SPRITE_SUPER_NERD, 8, 4, WALK, LEFT_RIGHT, 3 ; person
; warp-to
warp_to 3, 7, CELADON_HOTEL_WIDTH
warp_to 4, 7, CELADON_HOTEL_WIDTH
def_warps_to CELADON_HOTEL

7
data/maps/objects/CeladonMansion1F.asm
View file

@ -17,9 +17,4 @@ CeladonMansion1F_Object:
object SPRITE_FAIRY, 1, 8, WALK, LEFT_RIGHT, 3 ; person
object SPRITE_MONSTER, 4, 4, WALK, UP_DOWN, 4 ; person
; warp-to
warp_to 4, 11, CELADON_MANSION_1F_WIDTH
warp_to 5, 11, CELADON_MANSION_1F_WIDTH
warp_to 4, 0, CELADON_MANSION_1F_WIDTH
warp_to 7, 1, CELADON_MANSION_1F_WIDTH ; CELADON_MANSION_2F
warp_to 2, 1, CELADON_MANSION_1F_WIDTH ; CELADON_MANSION_2F
def_warps_to CELADON_MANSION_1F

6
data/maps/objects/CeladonMansion2F.asm
View file

@ -12,8 +12,4 @@ CeladonMansion2F_Object:
def_objects
; warp-to
warp_to 6, 1, CELADON_MANSION_2F_WIDTH ; CELADON_MANSION_3F
warp_to 7, 1, CELADON_MANSION_2F_WIDTH ; CELADON_MANSION_1F
warp_to 2, 1, CELADON_MANSION_2F_WIDTH ; CELADON_MANSION_1F
warp_to 4, 1, CELADON_MANSION_2F_WIDTH ; CELADON_MANSION_3F
def_warps_to CELADON_MANSION_2F

6
data/maps/objects/CeladonMansion3F.asm
View file

@ -19,8 +19,4 @@ CeladonMansion3F_Object:
object SPRITE_SUPER_NERD, 0, 7, STAY, UP, 3 ; person
object SPRITE_SILPH_WORKER, 2, 3, STAY, NONE, 4 ; person
; warp-to
warp_to 6, 1, CELADON_MANSION_3F_WIDTH ; CELADON_MANSION_2F
warp_to 7, 1, CELADON_MANSION_3F_WIDTH ; CELADON_MANSION_ROOF
warp_to 2, 1, CELADON_MANSION_3F_WIDTH ; CELADON_MANSION_ROOF
warp_to 4, 1, CELADON_MANSION_3F_WIDTH ; CELADON_MANSION_2F
def_warps_to CELADON_MANSION_3F

5
data/maps/objects/CeladonMansionRoof.asm
View file

@ -11,7 +11,4 @@ CeladonMansionRoof_Object:
def_objects
; warp-to
warp_to 6, 1, CELADON_MANSION_ROOF_WIDTH ; CELADON_MANSION_3F
warp_to 2, 1, CELADON_MANSION_ROOF_WIDTH ; CELADON_MANSION_3F
warp_to 2, 7, CELADON_MANSION_ROOF_WIDTH ; CELADON_MANSION_ROOF_HOUSE
def_warps_to CELADON_MANSION_ROOF

4
data/maps/objects/CeladonMansionRoofHouse.asm
View file

@ -11,6 +11,4 @@ CeladonMansionRoofHouse_Object:
object SPRITE_HIKER, 2, 2, STAY, DOWN, 1 ; person
object SPRITE_POKE_BALL, 4, 3, STAY, NONE, 2 ; person
; warp-to
warp_to 2, 7, CELADON_MANSION_ROOF_HOUSE_WIDTH ; CELADON_MANSION_ROOF
warp_to 3, 7, CELADON_MANSION_ROOF_HOUSE_WIDTH ; CELADON_MANSION_ROOF
def_warps_to CELADON_MANSION_ROOF_HOUSE

8
data/maps/objects/CeladonMart1F.asm
View file

@ -16,10 +16,4 @@ CeladonMart1F_Object:
def_objects
object SPRITE_LINK_RECEPTIONIST, 8, 3, STAY, DOWN, 1 ; person
; warp-to
warp_to 2, 7, CELADON_MART_1F_WIDTH
warp_to 3, 7, CELADON_MART_1F_WIDTH
warp_to 16, 7, CELADON_MART_1F_WIDTH
warp_to 17, 7, CELADON_MART_1F_WIDTH
warp_to 12, 1, CELADON_MART_1F_WIDTH ; CELADON_MART_2F
warp_to 1, 1, CELADON_MART_1F_WIDTH ; CELADON_MART_ELEVATOR
def_warps_to CELADON_MART_1F

5
data/maps/objects/CeladonMart2F.asm
View file

@ -15,7 +15,4 @@ CeladonMart2F_Object:
object SPRITE_MIDDLE_AGED_MAN, 19, 5, STAY, NONE, 3 ; person
object SPRITE_GIRL, 14, 4, WALK, UP_DOWN, 4 ; person
; warp-to
warp_to 12, 1, CELADON_MART_2F_WIDTH ; CELADON_MART_1F
warp_to 16, 1, CELADON_MART_2F_WIDTH ; CELADON_MART_3F
warp_to 1, 1, CELADON_MART_2F_WIDTH ; CELADON_MART_ELEVATOR
def_warps_to CELADON_MART_2F

5
data/maps/objects/CeladonMart3F.asm
View file

@ -27,7 +27,4 @@ CeladonMart3F_Object:
object SPRITE_GAMEBOY_KID, 8, 2, STAY, DOWN, 4 ; person
object SPRITE_LITTLE_BOY, 2, 5, STAY, UP, 5 ; person
; warp-to
warp_to 12, 1, CELADON_MART_3F_WIDTH ; CELADON_MART_4F
warp_to 16, 1, CELADON_MART_3F_WIDTH ; CELADON_MART_2F
warp_to 1, 1, CELADON_MART_3F_WIDTH ; CELADON_MART_ELEVATOR
def_warps_to CELADON_MART_3F

5
data/maps/objects/CeladonMart4F.asm
View file

@ -14,7 +14,4 @@ CeladonMart4F_Object:
object SPRITE_SUPER_NERD, 15, 5, WALK, LEFT_RIGHT, 2 ; person
object SPRITE_YOUNGSTER, 5, 2, WALK, LEFT_RIGHT, 3 ; person
; warp-to
warp_to 12, 1, CELADON_MART_4F_WIDTH ; CELADON_MART_3F
warp_to 16, 1, CELADON_MART_4F_WIDTH ; CELADON_MART_5F
warp_to 1, 1, CELADON_MART_4F_WIDTH ; CELADON_MART_ELEVATOR
def_warps_to CELADON_MART_4F

5
data/maps/objects/CeladonMart5F.asm
View file

@ -15,7 +15,4 @@ CeladonMart5F_Object:
object SPRITE_CLERK, 5, 3, STAY, DOWN, 3 ; person
object SPRITE_CLERK, 6, 3, STAY, DOWN, 4 ; person
; warp-to
warp_to 12, 1, CELADON_MART_5F_WIDTH ; CELADON_MART_ROOF
warp_to 16, 1, CELADON_MART_5F_WIDTH ; CELADON_MART_4F
warp_to 1, 1, CELADON_MART_5F_WIDTH ; CELADON_MART_ELEVATOR
def_warps_to CELADON_MART_5F

4
data/maps/objects/CeladonMartElevator.asm
View file

@ -10,6 +10,4 @@ CeladonMartElevator_Object:
def_objects
; warp-to
warp_to 1, 3, CELADON_MART_ELEVATOR_WIDTH ; CELADON_MART_1F
warp_to 2, 3, CELADON_MART_ELEVATOR_WIDTH ; CELADON_MART_1F
def_warps_to CELADON_MART_ELEVATOR

3
data/maps/objects/CeladonMartRoof.asm
View file

@ -14,5 +14,4 @@ CeladonMartRoof_Object:
object SPRITE_SUPER_NERD, 10, 4, STAY, LEFT, 1 ; person
object SPRITE_LITTLE_GIRL, 5, 5, WALK, ANY_DIR, 2 ; person
; warp-to
warp_to 15, 2, CELADON_MART_ROOF_WIDTH ; CELADON_MART_5F
def_warps_to CELADON_MART_ROOF

4
data/maps/objects/CeladonPokecenter.asm
View file

@ -13,6 +13,4 @@ CeladonPokecenter_Object:
object SPRITE_BEAUTY, 10, 5, WALK, ANY_DIR, 3 ; person
object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person
; warp-to
warp_to 3, 7, CELADON_POKECENTER_WIDTH
warp_to 4, 7, CELADON_POKECENTER_WIDTH
def_warps_to CELADON_POKECENTER

5
data/maps/objects/CeruleanBadgeHouse.asm
View file

@ -11,7 +11,4 @@ CeruleanBadgeHouse_Object:
def_objects
object SPRITE_MIDDLE_AGED_MAN, 5, 3, STAY, RIGHT, 1 ; person
; warp-to
warp_to 2, 0, CERULEAN_BADGE_HOUSE_WIDTH
warp_to 2, 7, CERULEAN_BADGE_HOUSE_WIDTH
warp_to 3, 7, CERULEAN_BADGE_HOUSE_WIDTH
def_warps_to CERULEAN_BADGE_HOUSE

11
data/maps/objects/CeruleanCave1F.asm
View file

@ -19,13 +19,4 @@ CeruleanCave1F_Object:
object SPRITE_POKE_BALL, 19, 3, STAY, NONE, 2, MAX_ELIXER
object SPRITE_POKE_BALL, 5, 0, STAY, NONE, 3, NUGGET
; warp-to
warp_to 24, 17, CERULEAN_CAVE_1F_WIDTH
warp_to 25, 17, CERULEAN_CAVE_1F_WIDTH
warp_to 27, 1, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F
warp_to 23, 7, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F
warp_to 18, 9, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F
warp_to 7, 1, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F
warp_to 1, 3, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F
warp_to 3, 11, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F
warp_to 0, 6, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_B1F
def_warps_to CERULEAN_CAVE_1F

8
data/maps/objects/CeruleanCave2F.asm
View file

@ -16,10 +16,4 @@ CeruleanCave2F_Object:
object SPRITE_POKE_BALL, 4, 15, STAY, NONE, 2, ULTRA_BALL
object SPRITE_POKE_BALL, 13, 6, STAY, NONE, 3, FULL_RESTORE
; warp-to
warp_to 29, 1, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F
warp_to 22, 6, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F
warp_to 19, 7, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F
warp_to 9, 1, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F
warp_to 1, 3, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F
warp_to 3, 11, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F
def_warps_to CERULEAN_CAVE_2F

3
data/maps/objects/CeruleanCaveB1F.asm
View file

@ -11,5 +11,4 @@ CeruleanCaveB1F_Object:
object SPRITE_POKE_BALL, 16, 9, STAY, NONE, 2, ULTRA_BALL
object SPRITE_POKE_BALL, 18, 1, STAY, NONE, 3, MAX_REVIVE
; warp-to
warp_to 3, 6, CERULEAN_CAVE_B1F_WIDTH ; CERULEAN_CAVE_1F
def_warps_to CERULEAN_CAVE_B1F

12
data/maps/objects/CeruleanCity.asm
View file

@ -34,14 +34,4 @@ CeruleanCity_Object:
object SPRITE_SUPER_NERD, 4, 12, STAY, DOWN, 10 ; person
object SPRITE_GUARD, 27, 12, STAY, DOWN, 11 ; person
; warp-to
warp_to 27, 11, CERULEAN_CITY_WIDTH ; CERULEAN_TRASHED_HOUSE
warp_to 13, 15, CERULEAN_CITY_WIDTH ; CERULEAN_TRADE_HOUSE
warp_to 19, 17, CERULEAN_CITY_WIDTH ; CERULEAN_POKECENTER
warp_to 30, 19, CERULEAN_CITY_WIDTH ; CERULEAN_GYM
warp_to 13, 25, CERULEAN_CITY_WIDTH ; BIKE_SHOP
warp_to 25, 25, CERULEAN_CITY_WIDTH ; CERULEAN_MART
warp_to 4, 11, CERULEAN_CITY_WIDTH ; CERULEAN_CAVE_1F
warp_to 27, 9, CERULEAN_CITY_WIDTH ; CERULEAN_TRASHED_HOUSE
warp_to 9, 11, CERULEAN_CITY_WIDTH ; CERULEAN_BADGE_HOUSE
warp_to 9, 9, CERULEAN_CITY_WIDTH ; CERULEAN_BADGE_HOUSE
def_warps_to CERULEAN_CITY

4
data/maps/objects/CeruleanGym.asm
View file

@ -13,6 +13,4 @@ CeruleanGym_Object:
object SPRITE_SWIMMER, 8, 7, STAY, LEFT, 3, OPP_SWIMMER, 1
object SPRITE_GYM_GUIDE, 7, 10, STAY, DOWN, 4 ; person
; warp-to
warp_to 4, 13, CERULEAN_GYM_WIDTH
warp_to 5, 13, CERULEAN_GYM_WIDTH
def_warps_to CERULEAN_GYM

4
data/maps/objects/CeruleanMart.asm
View file

@ -12,6 +12,4 @@ CeruleanMart_Object:
object SPRITE_COOLTRAINER_M, 3, 4, WALK, UP_DOWN, 2 ; person
object SPRITE_COOLTRAINER_F, 6, 2, WALK, LEFT_RIGHT, 3 ; person
; warp-to
warp_to 3, 7, CERULEAN_MART_WIDTH
warp_to 4, 7, CERULEAN_MART_WIDTH
def_warps_to CERULEAN_MART

4
data/maps/objects/CeruleanPokecenter.asm
View file

@ -13,6 +13,4 @@ CeruleanPokecenter_Object:
object SPRITE_GENTLEMAN, 4, 3, STAY, DOWN, 3 ; person
object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person
; warp-to
warp_to 3, 7, CERULEAN_POKECENTER_WIDTH
warp_to 4, 7, CERULEAN_POKECENTER_WIDTH
def_warps_to CERULEAN_POKECENTER

4
data/maps/objects/CeruleanTradeHouse.asm
View file

@ -11,6 +11,4 @@ CeruleanTradeHouse_Object:
object SPRITE_GRANNY, 5, 4, STAY, LEFT, 1 ; person
object SPRITE_GAMBLER, 1, 2, STAY, NONE, 2 ; person
; warp-to
warp_to 2, 7, CERULEAN_TRADE_HOUSE_WIDTH
warp_to 3, 7, CERULEAN_TRADE_HOUSE_WIDTH
def_warps_to CERULEAN_TRADE_HOUSE

5
data/maps/objects/CeruleanTrashedHouse.asm
View file

@ -13,7 +13,4 @@ CeruleanTrashedHouse_Object:
object SPRITE_FISHING_GURU, 2, 1, STAY, DOWN, 1 ; person
object SPRITE_GIRL, 5, 6, WALK, LEFT_RIGHT, 2 ; person
; warp-to
warp_to 2, 7, CERULEAN_TRASHED_HOUSE_WIDTH
warp_to 3, 7, CERULEAN_TRASHED_HOUSE_WIDTH
warp_to 3, 0, CERULEAN_TRASHED_HOUSE_WIDTH
def_warps_to CERULEAN_TRASHED_HOUSE

6
data/maps/objects/ChampionsRoom.asm
View file

@ -13,8 +13,4 @@ ChampionsRoom_Object:
object SPRITE_BLUE, 4, 2, STAY, DOWN, 1 ; person
object SPRITE_OAK, 3, 7, STAY, UP, 2 ; person
; warp-to
warp_to 3, 7, CHAMPIONS_ROOM_WIDTH ; LANCES_ROOM
warp_to 4, 7, CHAMPIONS_ROOM_WIDTH ; LANCES_ROOM
warp_to 3, 0, CHAMPIONS_ROOM_WIDTH ; HALL_OF_FAME
warp_to 4, 0, CHAMPIONS_ROOM_WIDTH ; HALL_OF_FAME
def_warps_to CHAMPIONS_ROOM

4
data/maps/objects/CinnabarGym.asm
View file

@ -18,6 +18,4 @@ CinnabarGym_Object:
object SPRITE_SUPER_NERD, 3, 8, STAY, DOWN, 8, OPP_SUPER_NERD, 12
object SPRITE_GYM_GUIDE, 16, 13, STAY, DOWN, 9 ; person
; warp-to
warp_to 16, 17, CINNABAR_GYM_WIDTH
warp_to 17, 17, CINNABAR_GYM_WIDTH
def_warps_to CINNABAR_GYM

7
data/maps/objects/CinnabarIsland.asm
View file

@ -19,9 +19,4 @@ CinnabarIsland_Object:
object SPRITE_GIRL, 12, 5, WALK, LEFT_RIGHT, 1 ; person
object SPRITE_GAMBLER, 14, 6, STAY, NONE, 2 ; person
; warp-to
warp_to 6, 3, CINNABAR_ISLAND_WIDTH ; POKEMON_MANSION_1F
warp_to 18, 3, CINNABAR_ISLAND_WIDTH ; CINNABAR_GYM
warp_to 6, 9, CINNABAR_ISLAND_WIDTH ; CINNABAR_LAB
warp_to 11, 11, CINNABAR_ISLAND_WIDTH ; CINNABAR_POKECENTER
warp_to 15, 11, CINNABAR_ISLAND_WIDTH ; CINNABAR_MART
def_warps_to CINNABAR_ISLAND

7
data/maps/objects/CinnabarLab.asm
View file

@ -17,9 +17,4 @@ CinnabarLab_Object:
def_objects
object SPRITE_FISHING_GURU, 1, 3, STAY, NONE, 1 ; person
; warp-to
warp_to 2, 7, CINNABAR_LAB_WIDTH
warp_to 3, 7, CINNABAR_LAB_WIDTH
warp_to 8, 4, CINNABAR_LAB_WIDTH ; CINNABAR_LAB_TRADE_ROOM
warp_to 12, 4, CINNABAR_LAB_WIDTH ; CINNABAR_LAB_METRONOME_ROOM
warp_to 16, 4, CINNABAR_LAB_WIDTH ; CINNABAR_LAB_FOSSIL_ROOM
def_warps_to CINNABAR_LAB

4
data/maps/objects/CinnabarLabFossilRoom.asm
View file

@ -11,6 +11,4 @@ CinnabarLabFossilRoom_Object:
object SPRITE_SCIENTIST, 5, 2, WALK, LEFT_RIGHT, 1 ; person
object SPRITE_SCIENTIST, 7, 6, STAY, UP, 2 ; person
; warp-to
warp_to 2, 7, CINNABAR_LAB_FOSSIL_ROOM_WIDTH ; CINNABAR_LAB
warp_to 3, 7, CINNABAR_LAB_FOSSIL_ROOM_WIDTH ; CINNABAR_LAB
def_warps_to CINNABAR_LAB_FOSSIL_ROOM

4
data/maps/objects/CinnabarLabMetronomeRoom.asm
View file

@ -14,6 +14,4 @@ CinnabarLabMetronomeRoom_Object:
object SPRITE_SCIENTIST, 7, 2, STAY, DOWN, 1 ; person
object SPRITE_SCIENTIST, 2, 3, WALK, LEFT_RIGHT, 2 ; person
; warp-to
warp_to 2, 7, CINNABAR_LAB_METRONOME_ROOM_WIDTH ; CINNABAR_LAB
warp_to 3, 7, CINNABAR_LAB_METRONOME_ROOM_WIDTH ; CINNABAR_LAB
def_warps_to CINNABAR_LAB_METRONOME_ROOM

4
data/maps/objects/CinnabarLabTradeRoom.asm
View file

@ -12,6 +12,4 @@ CinnabarLabTradeRoom_Object:
object SPRITE_GRAMPS, 1, 4, STAY, NONE, 2 ; person
object SPRITE_BEAUTY, 5, 5, STAY, UP, 3 ; person
; warp-to
warp_to 2, 7, CINNABAR_LAB_TRADE_ROOM_WIDTH ; CINNABAR_LAB
warp_to 3, 7, CINNABAR_LAB_TRADE_ROOM_WIDTH ; CINNABAR_LAB
def_warps_to CINNABAR_LAB_TRADE_ROOM

4
data/maps/objects/CinnabarMart.asm
View file

@ -12,6 +12,4 @@ CinnabarMart_Object:
object SPRITE_ERIKA, 6, 2, STAY, NONE, 2 ; person
object SPRITE_SCIENTIST, 3, 4, STAY, NONE, 3 ; person
; warp-to
warp_to 3, 7, CINNABAR_MART_WIDTH
warp_to 4, 7, CINNABAR_MART_WIDTH
def_warps_to CINNABAR_MART

4
data/maps/objects/CinnabarPokecenter.asm
View file

@ -13,6 +13,4 @@ CinnabarPokecenter_Object:
object SPRITE_GENTLEMAN, 2, 6, STAY, NONE, 3 ; person
object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person
; warp-to
warp_to 3, 7, CINNABAR_POKECENTER_WIDTH
warp_to 4, 7, CINNABAR_POKECENTER_WIDTH
def_warps_to CINNABAR_POKECENTER

2
data/maps/objects/Colosseum.asm
View file

@ -7,3 +7,5 @@ Colosseum_Object:
def_objects
object SPRITE_RED, 2, 2, STAY, 0, 1 ; person
def_warps_to COLOSSEUM

5
data/maps/objects/CopycatsHouse1F.asm
View file

@ -13,7 +13,4 @@ CopycatsHouse1F_Object:
object SPRITE_MIDDLE_AGED_MAN, 5, 4, STAY, LEFT, 2 ; person
object SPRITE_FAIRY, 1, 4, WALK, UP_DOWN, 3 ; person
; warp-to
warp_to 2, 7, COPYCATS_HOUSE_1F_WIDTH
warp_to 3, 7, COPYCATS_HOUSE_1F_WIDTH
warp_to 7, 1, COPYCATS_HOUSE_1F_WIDTH ; COPYCATS_HOUSE_2F
def_warps_to COPYCATS_HOUSE_1F

3
data/maps/objects/CopycatsHouse2F.asm
View file

@ -15,5 +15,4 @@ CopycatsHouse2F_Object:
object SPRITE_BIRD, 2, 0, STAY, DOWN, 4 ; person
object SPRITE_FAIRY, 1, 6, STAY, RIGHT, 5 ; person
; warp-to
warp_to 7, 1, COPYCATS_HOUSE_2F_WIDTH ; COPYCATS_HOUSE_1F
def_warps_to COPYCATS_HOUSE_2F

4
data/maps/objects/Daycare.asm
View file

@ -10,6 +10,4 @@ Daycare_Object:
def_objects
object SPRITE_GENTLEMAN, 2, 3, STAY, RIGHT, 1 ; person
; warp-to
warp_to 2, 7, DAYCARE_WIDTH
warp_to 3, 7, DAYCARE_WIDTH
def_warps_to DAYCARE

4
data/maps/objects/DiglettsCave.asm
View file

@ -9,6 +9,4 @@ DiglettsCave_Object:
def_objects
; warp-to
warp_to 5, 5, DIGLETTS_CAVE_WIDTH ; DIGLETTS_CAVE_ROUTE_2
warp_to 37, 31, DIGLETTS_CAVE_WIDTH ; DIGLETTS_CAVE_ROUTE_11
def_warps_to DIGLETTS_CAVE

5
data/maps/objects/DiglettsCaveRoute11.asm
View file

@ -11,7 +11,4 @@ DiglettsCaveRoute11_Object:
def_objects
object SPRITE_GAMBLER, 2, 3, STAY, NONE, 1 ; person
; warp-to
warp_to 2, 7, DIGLETTS_CAVE_ROUTE_11_WIDTH
warp_to 3, 7, DIGLETTS_CAVE_ROUTE_11_WIDTH
warp_to 4, 4, DIGLETTS_CAVE_ROUTE_11_WIDTH ; DIGLETTS_CAVE
def_warps_to DIGLETTS_CAVE_ROUTE_11

5
data/maps/objects/DiglettsCaveRoute2.asm
View file

@ -11,7 +11,4 @@ DiglettsCaveRoute2_Object:
def_objects
object SPRITE_FISHING_GURU, 3, 3, STAY, NONE, 1 ; person
; warp-to
warp_to 2, 7, DIGLETTS_CAVE_ROUTE_2_WIDTH
warp_to 3, 7, DIGLETTS_CAVE_ROUTE_2_WIDTH
warp_to 4, 4, DIGLETTS_CAVE_ROUTE_2_WIDTH ; DIGLETTS_CAVE
def_warps_to DIGLETTS_CAVE_ROUTE_2

4
data/maps/objects/FightingDojo.asm
View file

@ -16,6 +16,4 @@ FightingDojo_Object:
object SPRITE_POKE_BALL, 4, 1, STAY, NONE, 6 ; person
object SPRITE_POKE_BALL, 5, 1, STAY, NONE, 7 ; person
; warp-to
warp_to 4, 11, FIGHTING_DOJO_WIDTH
warp_to 5, 11, FIGHTING_DOJO_WIDTH
def_warps_to FIGHTING_DOJO

4
data/maps/objects/FuchsiaBillsGrandpasHouse.asm
View file

@ -12,6 +12,4 @@ FuchsiaBillsGrandpasHouse_Object:
object SPRITE_GAMBLER, 7, 2, STAY, UP, 2 ; person
object SPRITE_YOUNGSTER, 5, 5, STAY, NONE, 3 ; person
; warp-to
warp_to 2, 7, FUCHSIA_BILLS_GRANDPAS_HOUSE_WIDTH
warp_to 3, 7, FUCHSIA_BILLS_GRANDPAS_HOUSE_WIDTH
def_warps_to FUCHSIA_BILLS_GRANDPAS_HOUSE

11
data/maps/objects/FuchsiaCity.asm
View file

@ -40,13 +40,4 @@ FuchsiaCity_Object:
object SPRITE_SEEL, 8, 17, WALK, ANY_DIR, 9 ; person
object SPRITE_FOSSIL, 6, 5, STAY, NONE, 10 ; person
; warp-to
warp_to 5, 13, FUCHSIA_CITY_WIDTH ; FUCHSIA_MART
warp_to 11, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_BILLS_GRANDPAS_HOUSE
warp_to 19, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_POKECENTER
warp_to 27, 27, FUCHSIA_CITY_WIDTH ; WARDENS_HOUSE
warp_to 18, 3, FUCHSIA_CITY_WIDTH ; SAFARI_ZONE_GATE
warp_to 5, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_GYM
warp_to 22, 13, FUCHSIA_CITY_WIDTH ; FUCHSIA_MEETING_ROOM
warp_to 31, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_GOOD_ROD_HOUSE
warp_to 31, 24, FUCHSIA_CITY_WIDTH ; FUCHSIA_GOOD_ROD_HOUSE
def_warps_to FUCHSIA_CITY

5
data/maps/objects/FuchsiaGoodRodHouse.asm
View file

@ -11,7 +11,4 @@ FuchsiaGoodRodHouse_Object:
def_objects
object SPRITE_FISHING_GURU, 5, 3, STAY, RIGHT, 1 ; person
; warp-to
warp_to 2, 0, FUCHSIA_GOOD_ROD_HOUSE_WIDTH
warp_to 2, 7, FUCHSIA_GOOD_ROD_HOUSE_WIDTH
warp_to 3, 7, FUCHSIA_GOOD_ROD_HOUSE_WIDTH
def_warps_to FUCHSIA_GOOD_ROD_HOUSE

4
data/maps/objects/FuchsiaGym.asm
View file

@ -17,6 +17,4 @@ FuchsiaGym_Object:
object SPRITE_ROCKER, 2, 7, STAY, LEFT, 7, OPP_JUGGLER, 4
object SPRITE_GYM_GUIDE, 7, 15, STAY, DOWN, 8 ; person
; warp-to
warp_to 4, 17, FUCHSIA_GYM_WIDTH
warp_to 5, 17, FUCHSIA_GYM_WIDTH
def_warps_to FUCHSIA_GYM

4
data/maps/objects/FuchsiaMart.asm
View file

@ -12,6 +12,4 @@ FuchsiaMart_Object:
object SPRITE_MIDDLE_AGED_MAN, 4, 2, STAY, NONE, 2 ; person
object SPRITE_COOLTRAINER_F, 6, 5, WALK, UP_DOWN, 3 ; person
; warp-to
warp_to 3, 7, FUCHSIA_MART_WIDTH
warp_to 4, 7, FUCHSIA_MART_WIDTH
def_warps_to FUCHSIA_MART

4
data/maps/objects/FuchsiaMeetingRoom.asm
View file

@ -12,6 +12,4 @@ FuchsiaMeetingRoom_Object:
object SPRITE_SAFARI_ZONE_WORKER, 0, 2, STAY, UP, 2 ; person
object SPRITE_SAFARI_ZONE_WORKER, 10, 1, STAY, DOWN, 3 ; person
; warp-to
warp_to 4, 7, FUCHSIA_MEETING_ROOM_WIDTH
warp_to 5, 7, FUCHSIA_MEETING_ROOM_WIDTH
def_warps_to FUCHSIA_MEETING_ROOM

4
data/maps/objects/FuchsiaPokecenter.asm
View file

@ -13,6 +13,4 @@ FuchsiaPokecenter_Object:
object SPRITE_COOLTRAINER_F, 6, 5, WALK, LEFT_RIGHT, 3 ; person
object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person
; warp-to
warp_to 3, 7, FUCHSIA_POKECENTER_WIDTH
warp_to 4, 7, FUCHSIA_POKECENTER_WIDTH
def_warps_to FUCHSIA_POKECENTER

5
data/maps/objects/GameCorner.asm
View file

@ -22,7 +22,4 @@ GameCorner_Object:
object SPRITE_GENTLEMAN, 17, 13, STAY, RIGHT, 10 ; person
object SPRITE_ROCKET, 9, 5, STAY, UP, 11, OPP_ROCKET, 7
; warp-to
warp_to 15, 17, GAME_CORNER_WIDTH
warp_to 16, 17, GAME_CORNER_WIDTH
warp_to 17, 4, GAME_CORNER_WIDTH ; ROCKET_HIDEOUT_B1F
def_warps_to GAME_CORNER

4
data/maps/objects/GameCornerPrizeRoom.asm
View file

@ -14,6 +14,4 @@ GameCornerPrizeRoom_Object:
object SPRITE_BALDING_GUY, 1, 4, STAY, NONE, 1 ; person
object SPRITE_GAMBLER, 7, 3, WALK, LEFT_RIGHT, 2 ; person
; warp-to
warp_to 4, 7, GAME_CORNER_PRIZE_ROOM_WIDTH
warp_to 5, 7, GAME_CORNER_PRIZE_ROOM_WIDTH
def_warps_to GAME_CORNER_PRIZE_ROOM

4
data/maps/objects/HallOfFame.asm
View file

@ -10,6 +10,4 @@ HallOfFame_Object:
def_objects
object SPRITE_OAK, 5, 2, STAY, DOWN, 1 ; person
; warp-to
warp_to 4, 7, HALL_OF_FAME_WIDTH ; CHAMPIONS_ROOM
warp_to 5, 7, HALL_OF_FAME_WIDTH ; CHAMPIONS_ROOM
def_warps_to HALL_OF_FAME

4
data/maps/objects/IndigoPlateau.asm
View file

@ -9,6 +9,4 @@ IndigoPlateau_Object:
def_objects
; warp-to
warp_to 9, 5, INDIGO_PLATEAU_WIDTH ; INDIGO_PLATEAU_LOBBY
warp_to 10, 5, INDIGO_PLATEAU_WIDTH ; INDIGO_PLATEAU_LOBBY
def_warps_to INDIGO_PLATEAU

5
data/maps/objects/IndigoPlateauLobby.asm
View file

@ -15,7 +15,4 @@ IndigoPlateauLobby_Object:
object SPRITE_CLERK, 0, 5, STAY, RIGHT, 4 ; person
object SPRITE_LINK_RECEPTIONIST, 13, 6, STAY, DOWN, 5 ; person
; warp-to
warp_to 7, 11, INDIGO_PLATEAU_LOBBY_WIDTH
warp_to 8, 11, INDIGO_PLATEAU_LOBBY_WIDTH
warp_to 8, 0, INDIGO_PLATEAU_LOBBY_WIDTH ; LORELEIS_ROOM
def_warps_to INDIGO_PLATEAU_LOBBY

5
data/maps/objects/LancesRoom.asm
View file

@ -11,7 +11,4 @@ LancesRoom_Object:
def_objects
object SPRITE_LANCE, 6, 1, STAY, DOWN, 1, OPP_LANCE, 1
; warp-to
warp_to 24, 16, LANCES_ROOM_WIDTH ; AGATHAS_ROOM
warp_to 5, 0, LANCES_ROOM_WIDTH ; CHAMPIONS_ROOM
warp_to 6, 0, LANCES_ROOM_WIDTH ; CHAMPIONS_ROOM
def_warps_to LANCES_ROOM

4
data/maps/objects/LavenderCuboneHouse.asm
View file

@ -11,6 +11,4 @@ LavenderCuboneHouse_Object:
object SPRITE_MONSTER, 3, 5, STAY, UP, 1 ; person
object SPRITE_BRUNETTE_GIRL, 2, 4, STAY, RIGHT, 2 ; person
; warp-to
warp_to 2, 7, LAVENDER_CUBONE_HOUSE_WIDTH
warp_to 3, 7, LAVENDER_CUBONE_HOUSE_WIDTH
def_warps_to LAVENDER_CUBONE_HOUSE

4
data/maps/objects/LavenderMart.asm
View file

@ -12,6 +12,4 @@ LavenderMart_Object:
object SPRITE_BALDING_GUY, 3, 4, STAY, NONE, 2 ; person
object SPRITE_COOLTRAINER_M, 7, 2, STAY, NONE, 3 ; person
; warp-to
warp_to 3, 7, LAVENDER_MART_WIDTH
warp_to 4, 7, LAVENDER_MART_WIDTH
def_warps_to LAVENDER_MART

4
data/maps/objects/LavenderPokecenter.asm
View file

@ -13,6 +13,4 @@ LavenderPokecenter_Object:
object SPRITE_LITTLE_GIRL, 2, 6, WALK, UP_DOWN, 3 ; person
object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person
; warp-to
warp_to 3, 7, LAVENDER_POKECENTER_WIDTH
warp_to 4, 7, LAVENDER_POKECENTER_WIDTH
def_warps_to LAVENDER_POKECENTER

8
data/maps/objects/LavenderTown.asm
View file

@ -22,10 +22,4 @@ LavenderTown_Object:
object SPRITE_COOLTRAINER_M, 9, 10, STAY, NONE, 2 ; person
object SPRITE_SUPER_NERD, 8, 7, WALK, LEFT_RIGHT, 3 ; person
; warp-to
warp_to 3, 5, LAVENDER_TOWN_WIDTH ; LAVENDER_POKECENTER
warp_to 14, 5, LAVENDER_TOWN_WIDTH ; POKEMON_TOWER_1F
warp_to 7, 9, LAVENDER_TOWN_WIDTH ; MR_FUJIS_HOUSE
warp_to 15, 13, LAVENDER_TOWN_WIDTH ; LAVENDER_MART
warp_to 3, 13, LAVENDER_TOWN_WIDTH ; LAVENDER_CUBONE_HOUSE
warp_to 7, 13, LAVENDER_TOWN_WIDTH ; NAME_RATERS_HOUSE
def_warps_to LAVENDER_TOWN

6
data/maps/objects/LoreleisRoom.asm
View file

@ -12,8 +12,4 @@ LoreleisRoom_Object:
def_objects
object SPRITE_LORELEI, 5, 2, STAY, DOWN, 1, OPP_LORELEI, 1
; warp-to
warp_to 4, 11, LORELEIS_ROOM_WIDTH ; INDIGO_PLATEAU_LOBBY
warp_to 5, 11, LORELEIS_ROOM_WIDTH ; INDIGO_PLATEAU_LOBBY
warp_to 4, 0, LORELEIS_ROOM_WIDTH ; BRUNOS_ROOM
warp_to 5, 0, LORELEIS_ROOM_WIDTH ; BRUNOS_ROOM
def_warps_to LORELEIS_ROOM

4
data/maps/objects/MrFujisHouse.asm
View file

@ -15,6 +15,4 @@ MrFujisHouse_Object:
object SPRITE_MR_FUJI, 3, 1, STAY, NONE, 5 ; person
object SPRITE_POKEDEX, 3, 3, STAY, NONE, 6 ; person
; warp-to
warp_to 2, 7, MR_FUJIS_HOUSE_WIDTH
warp_to 3, 7, MR_FUJIS_HOUSE_WIDTH
def_warps_to MR_FUJIS_HOUSE

4
data/maps/objects/MrPsychicsHouse.asm
View file

@ -10,6 +10,4 @@ MrPsychicsHouse_Object:
def_objects
object SPRITE_FISHING_GURU, 5, 3, STAY, LEFT, 1 ; person
; warp-to
warp_to 2, 7, MR_PSYCHICS_HOUSE_WIDTH
warp_to 3, 7, MR_PSYCHICS_HOUSE_WIDTH
def_warps_to MR_PSYCHICS_HOUSE

7
data/maps/objects/MtMoon1F.asm
View file

@ -26,9 +26,4 @@ MtMoon1F_Object:
object SPRITE_POKE_BALL, 20, 33, STAY, NONE, 12, POTION
object SPRITE_POKE_BALL, 5, 32, STAY, NONE, 13, TM_WATER_GUN
; warp-to
warp_to 14, 35, MT_MOON_1F_WIDTH
warp_to 15, 35, MT_MOON_1F_WIDTH
warp_to 5, 5, MT_MOON_1F_WIDTH ; MT_MOON_B1F
warp_to 17, 11, MT_MOON_1F_WIDTH ; MT_MOON_B1F
warp_to 25, 15, MT_MOON_1F_WIDTH ; MT_MOON_B1F
def_warps_to MT_MOON_1F

10
data/maps/objects/MtMoonB1F.asm
View file

@ -15,12 +15,4 @@ MtMoonB1F_Object:
def_objects
; warp-to
warp_to 5, 5, MT_MOON_B1F_WIDTH ; MT_MOON_1F
warp_to 17, 11, MT_MOON_B1F_WIDTH ; MT_MOON_B2F
warp_to 25, 9, MT_MOON_B1F_WIDTH ; MT_MOON_1F
warp_to 25, 15, MT_MOON_B1F_WIDTH ; MT_MOON_1F
warp_to 21, 17, MT_MOON_B1F_WIDTH ; MT_MOON_B2F
warp_to 13, 27, MT_MOON_B1F_WIDTH ; MT_MOON_B2F
warp_to 23, 3, MT_MOON_B1F_WIDTH ; MT_MOON_B2F
warp_to 27, 3, MT_MOON_B1F_WIDTH
def_warps_to MT_MOON_B1F

6
data/maps/objects/MtMoonB2F.asm
View file

@ -20,8 +20,4 @@ MtMoonB2F_Object:
object SPRITE_POKE_BALL, 25, 21, STAY, NONE, 8, HP_UP
object SPRITE_POKE_BALL, 29, 5, STAY, NONE, 9, TM_MEGA_PUNCH
; warp-to
warp_to 25, 9, MT_MOON_B2F_WIDTH ; MT_MOON_B1F
warp_to 21, 17, MT_MOON_B2F_WIDTH ; MT_MOON_B1F
warp_to 15, 27, MT_MOON_B2F_WIDTH ; MT_MOON_B1F
warp_to 5, 7, MT_MOON_B2F_WIDTH ; MT_MOON_B1F
def_warps_to MT_MOON_B2F

4
data/maps/objects/MtMoonPokecenter.asm
View file

@ -15,6 +15,4 @@ MtMoonPokecenter_Object:
object SPRITE_CLIPBOARD, 7, 2, STAY, NONE, 5 ; person
object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 6 ; person
; warp-to
warp_to 3, 7, MT_MOON_POKECENTER_WIDTH
warp_to 4, 7, MT_MOON_POKECENTER_WIDTH
def_warps_to MT_MOON_POKECENTER

7
data/maps/objects/Museum1F.asm
View file

@ -17,9 +17,4 @@ Museum1F_Object:
object SPRITE_SCIENTIST, 17, 4, STAY, NONE, 4 ; person
object SPRITE_OLD_AMBER, 16, 2, STAY, NONE, 5 ; person
; warp-to
warp_to 10, 7, MUSEUM_1F_WIDTH
warp_to 11, 7, MUSEUM_1F_WIDTH
warp_to 16, 7, MUSEUM_1F_WIDTH
warp_to 17, 7, MUSEUM_1F_WIDTH
warp_to 7, 7, MUSEUM_1F_WIDTH ; MUSEUM_2F
def_warps_to MUSEUM_1F

3
data/maps/objects/Museum2F.asm
View file

@ -15,5 +15,4 @@ Museum2F_Object:
object SPRITE_BRUNETTE_GIRL, 11, 5, STAY, NONE, 4 ; person
object SPRITE_HIKER, 12, 5, STAY, DOWN, 5 ; person
; warp-to
warp_to 7, 7, MUSEUM_2F_WIDTH ; MUSEUM_1F
def_warps_to MUSEUM_2F

4
data/maps/objects/NameRatersHouse.asm
View file

@ -10,6 +10,4 @@ NameRatersHouse_Object:
def_objects
object SPRITE_SILPH_PRESIDENT, 5, 3, STAY, LEFT, 1 ; person
; warp-to
warp_to 2, 7, NAME_RATERS_HOUSE_WIDTH
warp_to 3, 7, NAME_RATERS_HOUSE_WIDTH
def_warps_to NAME_RATERS_HOUSE

4
data/maps/objects/OaksLab.asm
View file

@ -20,6 +20,4 @@ OaksLab_Object:
object SPRITE_SCIENTIST, 2, 10, STAY, NONE, 10 ; person
object SPRITE_SCIENTIST, 8, 10, STAY, NONE, 11 ; person
; warp-to
warp_to 4, 11, OAKS_LAB_WIDTH
warp_to 5, 11, OAKS_LAB_WIDTH
def_warps_to OAKS_LAB

5
data/maps/objects/PalletTown.asm
View file

@ -17,7 +17,4 @@ PalletTown_Object:
object SPRITE_GIRL, 3, 8, WALK, ANY_DIR, 2 ; person
object SPRITE_FISHER, 11, 14, WALK, ANY_DIR, 3 ; person
; warp-to
warp_to 5, 5, PALLET_TOWN_WIDTH ; REDS_HOUSE_1F
warp_to 13, 5, PALLET_TOWN_WIDTH ; BLUES_HOUSE
warp_to 12, 11, PALLET_TOWN_WIDTH ; OAKS_LAB
def_warps_to PALLET_TOWN

9
data/maps/objects/PewterCity.asm
View file

@ -26,11 +26,4 @@ PewterCity_Object:
object SPRITE_SUPER_NERD, 26, 25, WALK, LEFT_RIGHT, 4 ; person
object SPRITE_YOUNGSTER, 35, 16, STAY, DOWN, 5 ; person
; warp-to
warp_to 14, 7, PEWTER_CITY_WIDTH ; MUSEUM_1F
warp_to 19, 5, PEWTER_CITY_WIDTH ; MUSEUM_1F
warp_to 16, 17, PEWTER_CITY_WIDTH ; PEWTER_GYM
warp_to 29, 13, PEWTER_CITY_WIDTH ; PEWTER_NIDORAN_HOUSE
warp_to 23, 17, PEWTER_CITY_WIDTH ; PEWTER_MART
warp_to 7, 29, PEWTER_CITY_WIDTH ; PEWTER_SPEECH_HOUSE
warp_to 13, 25, PEWTER_CITY_WIDTH ; PEWTER_POKECENTER
def_warps_to PEWTER_CITY

4
data/maps/objects/PewterGym.asm
View file

@ -12,6 +12,4 @@ PewterGym_Object:
object SPRITE_COOLTRAINER_M, 3, 6, STAY, RIGHT, 2, OPP_JR_TRAINER_M, 1
object SPRITE_GYM_GUIDE, 7, 10, STAY, DOWN, 3 ; person
; warp-to
warp_to 4, 13, PEWTER_GYM_WIDTH
warp_to 5, 13, PEWTER_GYM_WIDTH
def_warps_to PEWTER_GYM

4
data/maps/objects/PewterMart.asm
View file

@ -12,6 +12,4 @@ PewterMart_Object:
object SPRITE_YOUNGSTER, 3, 3, WALK, UP_DOWN, 2 ; person
object SPRITE_SUPER_NERD, 5, 5, STAY, NONE, 3 ; person
; warp-to
warp_to 3, 7, PEWTER_MART_WIDTH
warp_to 4, 7, PEWTER_MART_WIDTH
def_warps_to PEWTER_MART

4
data/maps/objects/PewterNidoranHouse.asm
View file

@ -12,6 +12,4 @@ PewterNidoranHouse_Object:
object SPRITE_LITTLE_BOY, 3, 5, STAY, RIGHT, 2 ; person
object SPRITE_MIDDLE_AGED_MAN, 1, 2, STAY, NONE, 3 ; person
; warp-to
warp_to 2, 7, PEWTER_NIDORAN_HOUSE_WIDTH
warp_to 3, 7, PEWTER_NIDORAN_HOUSE_WIDTH
def_warps_to PEWTER_NIDORAN_HOUSE

4
data/maps/objects/PewterPokecenter.asm
View file

@ -13,6 +13,4 @@ PewterPokecenter_Object:
object SPRITE_FAIRY, 1, 3, STAY, DOWN, 3 ; person
object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person
; warp-to
warp_to 3, 7, PEWTER_POKECENTER_WIDTH
warp_to 4, 7, PEWTER_POKECENTER_WIDTH
def_warps_to PEWTER_POKECENTER

4
data/maps/objects/PewterSpeechHouse.asm
View file

@ -11,6 +11,4 @@ PewterSpeechHouse_Object:
object SPRITE_GAMBLER, 2, 3, STAY, RIGHT, 1 ; person
object SPRITE_YOUNGSTER, 4, 5, STAY, NONE, 2 ; person
; warp-to
warp_to 2, 7, PEWTER_SPEECH_HOUSE_WIDTH
warp_to 3, 7, PEWTER_SPEECH_HOUSE_WIDTH
def_warps_to PEWTER_SPEECH_HOUSE

4
data/maps/objects/PokemonFanClub.asm
View file

@ -17,6 +17,4 @@ PokemonFanClub_Object:
object SPRITE_GENTLEMAN, 3, 1, STAY, DOWN, 5 ; person
object SPRITE_LINK_RECEPTIONIST, 5, 1, STAY, DOWN, 6 ; person
; warp-to
warp_to 2, 7, POKEMON_FAN_CLUB_WIDTH
warp_to 3, 7, POKEMON_FAN_CLUB_WIDTH
def_warps_to POKEMON_FAN_CLUB

10
data/maps/objects/PokemonMansion1F.asm
View file

@ -18,12 +18,4 @@ PokemonMansion1F_Object:
object SPRITE_POKE_BALL, 14, 3, STAY, NONE, 2, ESCAPE_ROPE
object SPRITE_POKE_BALL, 18, 21, STAY, NONE, 3, CARBOS
; warp-to
warp_to 4, 27, POKEMON_MANSION_1F_WIDTH
warp_to 5, 27, POKEMON_MANSION_1F_WIDTH
warp_to 6, 27, POKEMON_MANSION_1F_WIDTH
warp_to 7, 27, POKEMON_MANSION_1F_WIDTH
warp_to 5, 10, POKEMON_MANSION_1F_WIDTH ; POKEMON_MANSION_2F
warp_to 21, 23, POKEMON_MANSION_1F_WIDTH ; POKEMON_MANSION_B1F
warp_to 26, 27, POKEMON_MANSION_1F_WIDTH
warp_to 27, 27, POKEMON_MANSION_1F_WIDTH
def_warps_to POKEMON_MANSION_1F

6
data/maps/objects/PokemonMansion2F.asm
View file

@ -15,8 +15,4 @@ PokemonMansion2F_Object:
object SPRITE_POKEDEX, 18, 2, STAY, NONE, 3 ; person
object SPRITE_POKEDEX, 3, 22, STAY, NONE, 4 ; person
; warp-to
warp_to 5, 10, POKEMON_MANSION_2F_WIDTH ; POKEMON_MANSION_1F
warp_to 7, 10, POKEMON_MANSION_2F_WIDTH ; POKEMON_MANSION_3F
warp_to 25, 14, POKEMON_MANSION_2F_WIDTH ; POKEMON_MANSION_3F
warp_to 6, 1, POKEMON_MANSION_2F_WIDTH ; POKEMON_MANSION_3F
def_warps_to POKEMON_MANSION_2F

5
data/maps/objects/PokemonMansion3F.asm
View file

@ -15,7 +15,4 @@ PokemonMansion3F_Object:
object SPRITE_POKE_BALL, 25, 5, STAY, NONE, 4, IRON
object SPRITE_POKEDEX, 6, 12, STAY, NONE, 5 ; person
; warp-to
warp_to 7, 10, POKEMON_MANSION_3F_WIDTH ; POKEMON_MANSION_2F
warp_to 6, 1, POKEMON_MANSION_3F_WIDTH ; POKEMON_MANSION_2F
warp_to 25, 14, POKEMON_MANSION_3F_WIDTH ; POKEMON_MANSION_2F
def_warps_to POKEMON_MANSION_3F

3
data/maps/objects/PokemonMansionB1F.asm
View file

@ -16,5 +16,4 @@ PokemonMansionB1F_Object:
object SPRITE_POKEDEX, 16, 20, STAY, NONE, 7 ; person
object SPRITE_POKE_BALL, 5, 13, STAY, NONE, 8, SECRET_KEY
; warp-to
warp_to 23, 22, POKEMON_MANSION_B1F_WIDTH ; POKEMON_MANSION_1F
def_warps_to POKEMON_MANSION_B1F

5
data/maps/objects/PokemonTower1F.asm
View file

@ -15,7 +15,4 @@ PokemonTower1F_Object:
object SPRITE_GIRL, 13, 7, STAY, NONE, 4 ; person
object SPRITE_CHANNELER, 17, 7, STAY, LEFT, 5 ; person
; warp-to
warp_to 10, 17, POKEMON_TOWER_1F_WIDTH
warp_to 11, 17, POKEMON_TOWER_1F_WIDTH
warp_to 18, 9, POKEMON_TOWER_1F_WIDTH ; POKEMON_TOWER_2F
def_warps_to POKEMON_TOWER_1F

4
data/maps/objects/PokemonTower2F.asm
View file

@ -11,6 +11,4 @@ PokemonTower2F_Object:
object SPRITE_BLUE, 14, 5, STAY, NONE, 1 ; person
object SPRITE_CHANNELER, 3, 7, STAY, RIGHT, 2 ; person
; warp-to
warp_to 3, 9, POKEMON_TOWER_2F_WIDTH ; POKEMON_TOWER_3F
warp_to 18, 9, POKEMON_TOWER_2F_WIDTH ; POKEMON_TOWER_1F
def_warps_to POKEMON_TOWER_2F

4
data/maps/objects/PokemonTower3F.asm
View file

@ -13,6 +13,4 @@ PokemonTower3F_Object:
object SPRITE_CHANNELER, 10, 13, STAY, DOWN, 3, OPP_CHANNELER, 8
object SPRITE_POKE_BALL, 12, 1, STAY, NONE, 4, ESCAPE_ROPE
; warp-to
warp_to 3, 9, POKEMON_TOWER_3F_WIDTH ; POKEMON_TOWER_2F
warp_to 18, 9, POKEMON_TOWER_3F_WIDTH ; POKEMON_TOWER_4F
def_warps_to POKEMON_TOWER_3F

4
data/maps/objects/PokemonTower4F.asm
View file

@ -15,6 +15,4 @@ PokemonTower4F_Object:
object SPRITE_POKE_BALL, 9, 10, STAY, NONE, 5, AWAKENING
object SPRITE_POKE_BALL, 12, 16, STAY, NONE, 6, HP_UP
; warp-to
warp_to 3, 9, POKEMON_TOWER_4F_WIDTH ; POKEMON_TOWER_5F
warp_to 18, 9, POKEMON_TOWER_4F_WIDTH ; POKEMON_TOWER_3F
def_warps_to POKEMON_TOWER_4F

4
data/maps/objects/PokemonTower5F.asm
View file

@ -15,6 +15,4 @@ PokemonTower5F_Object:
object SPRITE_CHANNELER, 9, 16, STAY, RIGHT, 5, OPP_CHANNELER, 18
object SPRITE_POKE_BALL, 6, 14, STAY, NONE, 6, NUGGET
; warp-to
warp_to 3, 9, POKEMON_TOWER_5F_WIDTH ; POKEMON_TOWER_4F
warp_to 18, 9, POKEMON_TOWER_5F_WIDTH ; POKEMON_TOWER_6F
def_warps_to POKEMON_TOWER_5F

4
data/maps/objects/PokemonTower6F.asm
View file

@ -14,6 +14,4 @@ PokemonTower6F_Object:
object SPRITE_POKE_BALL, 6, 8, STAY, NONE, 4, RARE_CANDY
object SPRITE_POKE_BALL, 14, 14, STAY, NONE, 5, X_ACCURACY
; warp-to
warp_to 18, 9, POKEMON_TOWER_6F_WIDTH ; POKEMON_TOWER_5F
warp_to 9, 16, POKEMON_TOWER_6F_WIDTH ; POKEMON_TOWER_7F
def_warps_to POKEMON_TOWER_6F

3
data/maps/objects/PokemonTower7F.asm
View file

@ -12,5 +12,4 @@ PokemonTower7F_Object:
object SPRITE_ROCKET, 9, 7, STAY, RIGHT, 3, OPP_ROCKET, 21
object SPRITE_MR_FUJI, 10, 3, STAY, DOWN, 4 ; person
; warp-to
warp_to 9, 16, POKEMON_TOWER_7F_WIDTH ; POKEMON_TOWER_6F
def_warps_to POKEMON_TOWER_7F

5
data/maps/objects/PowerPlant.asm
View file

@ -24,7 +24,4 @@ PowerPlant_Object:
object SPRITE_POKE_BALL, 26, 32, STAY, NONE, 13, TM_THUNDER
object SPRITE_POKE_BALL, 20, 32, STAY, NONE, 14, TM_REFLECT
; warp-to
warp_to 4, 35, POWER_PLANT_WIDTH
warp_to 5, 35, POWER_PLANT_WIDTH
warp_to 0, 11, POWER_PLANT_WIDTH
def_warps_to POWER_PLANT

5
data/maps/objects/RedsHouse1F.asm
View file

@ -12,7 +12,4 @@ RedsHouse1F_Object:
def_objects
object SPRITE_MOM, 5, 4, STAY, LEFT, 1 ; Mom
; warp-to
warp_to 2, 7, REDS_HOUSE_1F_WIDTH
warp_to 3, 7, REDS_HOUSE_1F_WIDTH
warp_to 7, 1, REDS_HOUSE_1F_WIDTH
def_warps_to REDS_HOUSE_1F

3
data/maps/objects/RedsHouse2F.asm
View file

@ -8,5 +8,4 @@ RedsHouse2F_Object:
def_objects
; warp-to
warp_to 7, 1, REDS_HOUSE_2F_WIDTH
def_warps_to REDS_HOUSE_2F

Some files were not shown because too many files have changed in this diff Show more