thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-12-17 08:11:29 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Align warp and sign coordinates

Browse source
This commit is contained in:
Rangi 2020-08-21 11:57:53 -04:00
parent 7e9ccbb5b2
commit 48da6c53be
213 changed files with 781 additions and 781 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,10 +2,10 @@ AgathasRoom_Object:
db $0 ; border block
def_warps
warp 4, 11, 2, BRUNOS_ROOM
warp 5, 11, 3, BRUNOS_ROOM
warp 4, 0, 0, LANCES_ROOM
warp 5, 0, 0, LANCES_ROOM
warp 4, 11, 2, BRUNOS_ROOM
warp 5, 11, 3, BRUNOS_ROOM
warp 4, 0, 0, LANCES_ROOM
warp 5, 0, 0, LANCES_ROOM
def_signs

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

@ -2,8 +2,8 @@ BikeShop_Object:
db $e ; border block
def_warps
warp 2, 7, 4, LAST_MAP
warp 3, 7, 4, LAST_MAP
warp 2, 7, 4, LAST_MAP
warp 3, 7, 4, LAST_MAP
def_signs

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

@ -2,8 +2,8 @@ BillsHouse_Object:
db $d ; border block
def_warps
warp 2, 7, 0, LAST_MAP
warp 3, 7, 0, LAST_MAP
warp 2, 7, 0, LAST_MAP
warp 3, 7, 0, LAST_MAP
def_signs

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

@ -2,8 +2,8 @@ BluesHouse_Object:
db $a ; border block
def_warps
warp 2, 7, 1, LAST_MAP
warp 3, 7, 1, LAST_MAP
warp 2, 7, 1, LAST_MAP
warp 3, 7, 1, LAST_MAP
def_signs

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

@ -2,10 +2,10 @@ BrunosRoom_Object:
db $3 ; border block
def_warps
warp 4, 11, 2, LORELEIS_ROOM
warp 5, 11, 3, LORELEIS_ROOM
warp 4, 0, 0, AGATHAS_ROOM
warp 5, 0, 1, AGATHAS_ROOM
warp 4, 11, 2, LORELEIS_ROOM
warp 5, 11, 3, LORELEIS_ROOM
warp 4, 0, 0, AGATHAS_ROOM
warp 5, 0, 1, AGATHAS_ROOM
def_signs

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

@ -2,8 +2,8 @@ CeladonChiefHouse_Object:
db $f ; border block
def_warps
warp 2, 7, 11, LAST_MAP
warp 3, 7, 11, LAST_MAP
warp 2, 7, 11, LAST_MAP
warp 3, 7, 11, LAST_MAP
def_signs

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

@ -2,12 +2,12 @@ CeladonCity_Object:
db $f ; border block
def_warps
warp 8, 13, 0, CELADON_MART_1F
warp 8, 13, 0, CELADON_MART_1F
warp 10, 13, 2, CELADON_MART_1F
warp 24, 9, 0, CELADON_MANSION_1F
warp 24, 3, 2, CELADON_MANSION_1F
warp 25, 3, 2, CELADON_MANSION_1F
warp 41, 9, 0, CELADON_POKECENTER
warp 24, 9, 0, CELADON_MANSION_1F
warp 24, 3, 2, CELADON_MANSION_1F
warp 25, 3, 2, CELADON_MANSION_1F
warp 41, 9, 0, CELADON_POKECENTER
warp 12, 27, 0, CELADON_GYM
warp 28, 19, 0, GAME_CORNER
warp 39, 19, 0, CELADON_MART_5F ; beta warp! no longer used
@ -19,9 +19,9 @@ CeladonCity_Object:
def_signs
sign 27, 15, 10 ; CeladonCityText10
sign 19, 15, 11 ; CeladonCityText11
sign 42, 9, 12 ; PokeCenterSignText
sign 42, 9, 12 ; PokeCenterSignText
sign 13, 29, 13 ; CeladonCityText13
sign 21, 9, 14 ; CeladonCityText14
sign 21, 9, 14 ; CeladonCityText14
sign 12, 13, 15 ; CeladonCityText15
sign 39, 21, 16 ; CeladonCityText16
sign 33, 21, 17 ; CeladonCityText17

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

@ -2,8 +2,8 @@ CeladonDiner_Object:
db $f ; border block
def_warps
warp 3, 7, 10, LAST_MAP
warp 4, 7, 10, LAST_MAP
warp 3, 7, 10, LAST_MAP
warp 4, 7, 10, LAST_MAP
def_signs

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

@ -2,8 +2,8 @@ CeladonGym_Object:
db $3 ; border block
def_warps
warp 4, 17, 6, LAST_MAP
warp 5, 17, 6, LAST_MAP
warp 4, 17, 6, LAST_MAP
warp 5, 17, 6, LAST_MAP
def_signs

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

@ -2,8 +2,8 @@ CeladonHotel_Object:
db $0 ; border block
def_warps
warp 3, 7, 12, LAST_MAP
warp 4, 7, 12, LAST_MAP
warp 3, 7, 12, LAST_MAP
warp 4, 7, 12, LAST_MAP
def_signs

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

@ -2,14 +2,14 @@ CeladonMansion1F_Object:
db $f ; border block
def_warps
warp 4, 11, 2, LAST_MAP
warp 5, 11, 2, LAST_MAP
warp 4, 0, 4, LAST_MAP
warp 7, 1, 1, CELADON_MANSION_2F
warp 2, 1, 2, CELADON_MANSION_2F
warp 4, 11, 2, LAST_MAP
warp 5, 11, 2, LAST_MAP
warp 4, 0, 4, LAST_MAP
warp 7, 1, 1, CELADON_MANSION_2F
warp 2, 1, 2, CELADON_MANSION_2F
def_signs
sign 4, 9, 5 ; CeladonMansion1Text5
sign 4, 9, 5 ; CeladonMansion1Text5
def_objects
object SPRITE_MONSTER, 0, 5, STAY, RIGHT, 1 ; person

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

@ -2,13 +2,13 @@ CeladonMansion2F_Object:
db $f ; border block
def_warps
warp 6, 1, 0, CELADON_MANSION_3F
warp 7, 1, 3, CELADON_MANSION_1F
warp 2, 1, 4, CELADON_MANSION_1F
warp 4, 1, 3, CELADON_MANSION_3F
warp 6, 1, 0, CELADON_MANSION_3F
warp 7, 1, 3, CELADON_MANSION_1F
warp 2, 1, 4, CELADON_MANSION_1F
warp 4, 1, 3, CELADON_MANSION_3F
def_signs
sign 4, 9, 1 ; CeladonMansion2Text1
sign 4, 9, 1 ; CeladonMansion2Text1
def_objects

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

@ -2,16 +2,16 @@ CeladonMansion3F_Object:
db $f ; border block
def_warps
warp 6, 1, 0, CELADON_MANSION_2F
warp 7, 1, 0, CELADON_MANSION_ROOF
warp 2, 1, 1, CELADON_MANSION_ROOF
warp 4, 1, 3, CELADON_MANSION_2F
warp 6, 1, 0, CELADON_MANSION_2F
warp 7, 1, 0, CELADON_MANSION_ROOF
warp 2, 1, 1, CELADON_MANSION_ROOF
warp 4, 1, 3, CELADON_MANSION_2F
def_signs
sign 1, 3, 5 ; CeladonMansion3Text5
sign 4, 3, 6 ; CeladonMansion3Text6
sign 1, 6, 7 ; CeladonMansion3Text7
sign 4, 9, 8 ; CeladonMansion3Text8
sign 1, 3, 5 ; CeladonMansion3Text5
sign 4, 3, 6 ; CeladonMansion3Text6
sign 1, 6, 7 ; CeladonMansion3Text7
sign 4, 9, 8 ; CeladonMansion3Text8
def_objects
object SPRITE_BIKE_SHOP_CLERK, 0, 4, STAY, UP, 1 ; person

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

@ -2,12 +2,12 @@ CeladonMansionRoof_Object:
db $9 ; border block
def_warps
warp 6, 1, 1, CELADON_MANSION_3F
warp 2, 1, 2, CELADON_MANSION_3F
warp 2, 7, 0, CELADON_MANSION_ROOF_HOUSE
warp 6, 1, 1, CELADON_MANSION_3F
warp 2, 1, 2, CELADON_MANSION_3F
warp 2, 7, 0, CELADON_MANSION_ROOF_HOUSE
def_signs
sign 3, 7, 1 ; CeladonMansion4Text1
sign 3, 7, 1 ; CeladonMansion4Text1
def_objects

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

@ -2,8 +2,8 @@ CeladonMansionRoofHouse_Object:
db $a ; border block
def_warps
warp 2, 7, 2, CELADON_MANSION_ROOF
warp 3, 7, 2, CELADON_MANSION_ROOF
warp 2, 7, 2, CELADON_MANSION_ROOF
warp 3, 7, 2, CELADON_MANSION_ROOF
def_signs

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

@ -2,16 +2,16 @@ CeladonMart1F_Object:
db $f ; border block
def_warps
warp 2, 7, 0, LAST_MAP
warp 3, 7, 0, LAST_MAP
warp 16, 7, 1, LAST_MAP
warp 17, 7, 1, LAST_MAP
warp 12, 1, 0, CELADON_MART_2F
warp 1, 1, 0, CELADON_MART_ELEVATOR
warp 2, 7, 0, LAST_MAP
warp 3, 7, 0, LAST_MAP
warp 16, 7, 1, LAST_MAP
warp 17, 7, 1, LAST_MAP
warp 12, 1, 0, CELADON_MART_2F
warp 1, 1, 0, CELADON_MART_ELEVATOR
def_signs
sign 11, 4, 2 ; CeladonMart1Text2
sign 14, 1, 3 ; CeladonMart1Text3
sign 11, 4, 2 ; CeladonMart1Text2
sign 14, 1, 3 ; CeladonMart1Text3
def_objects
object SPRITE_LINK_RECEPTIONIST, 8, 3, STAY, DOWN, 1 ; person

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

@ -2,12 +2,12 @@ CeladonMart2F_Object:
db $f ; border block
def_warps
warp 12, 1, 4, CELADON_MART_1F
warp 16, 1, 1, CELADON_MART_3F
warp 1, 1, 0, CELADON_MART_ELEVATOR
warp 12, 1, 4, CELADON_MART_1F
warp 16, 1, 1, CELADON_MART_3F
warp 1, 1, 0, CELADON_MART_ELEVATOR
def_signs
sign 14, 1, 5 ; CeladonMart2Text5
sign 14, 1, 5 ; CeladonMart2Text5
def_objects
object SPRITE_CLERK, 5, 3, STAY, DOWN, 1 ; person

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

@ -2,23 +2,23 @@ CeladonMart3F_Object:
db $f ; border block
def_warps
warp 12, 1, 0, CELADON_MART_4F
warp 16, 1, 1, CELADON_MART_2F
warp 1, 1, 0, CELADON_MART_ELEVATOR
warp 12, 1, 0, CELADON_MART_4F
warp 16, 1, 1, CELADON_MART_2F
warp 1, 1, 0, CELADON_MART_ELEVATOR
def_signs
sign 2, 4, 6 ; CeladonMart3Text6
sign 3, 4, 7 ; CeladonMart3Text7
sign 5, 4, 8 ; CeladonMart3Text8
sign 6, 4, 9 ; CeladonMart3Text9
sign 2, 6, 10 ; CeladonMart3Text10
sign 3, 6, 11 ; CeladonMart3Text11
sign 5, 6, 12 ; CeladonMart3Text12
sign 6, 6, 13 ; CeladonMart3Text13
sign 14, 1, 14 ; CeladonMart3Text14
sign 4, 1, 15 ; CeladonMart3Text15
sign 6, 1, 16 ; CeladonMart3Text16
sign 10, 1, 17 ; CeladonMart3Text17
sign 2, 4, 6 ; CeladonMart3Text6
sign 3, 4, 7 ; CeladonMart3Text7
sign 5, 4, 8 ; CeladonMart3Text8
sign 6, 4, 9 ; CeladonMart3Text9
sign 2, 6, 10 ; CeladonMart3Text10
sign 3, 6, 11 ; CeladonMart3Text11
sign 5, 6, 12 ; CeladonMart3Text12
sign 6, 6, 13 ; CeladonMart3Text13
sign 14, 1, 14 ; CeladonMart3Text14
sign 4, 1, 15 ; CeladonMart3Text15
sign 6, 1, 16 ; CeladonMart3Text16
sign 10, 1, 17 ; CeladonMart3Text17
def_objects
object SPRITE_CLERK, 16, 5, STAY, NONE, 1 ; person

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

@ -2,12 +2,12 @@ CeladonMart4F_Object:
db $f ; border block
def_warps
warp 12, 1, 0, CELADON_MART_3F
warp 16, 1, 1, CELADON_MART_5F
warp 1, 1, 0, CELADON_MART_ELEVATOR
warp 12, 1, 0, CELADON_MART_3F
warp 16, 1, 1, CELADON_MART_5F
warp 1, 1, 0, CELADON_MART_ELEVATOR
def_signs
sign 14, 1, 4 ; CeladonMart4Text4
sign 14, 1, 4 ; CeladonMart4Text4
def_objects
object SPRITE_CLERK, 5, 7, STAY, NONE, 1 ; person

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

@ -2,12 +2,12 @@ CeladonMart5F_Object:
db $f ; border block
def_warps
warp 12, 1, 0, CELADON_MART_ROOF
warp 16, 1, 1, CELADON_MART_4F
warp 1, 1, 0, CELADON_MART_ELEVATOR
warp 12, 1, 0, CELADON_MART_ROOF
warp 16, 1, 1, CELADON_MART_4F
warp 1, 1, 0, CELADON_MART_ELEVATOR
def_signs
sign 14, 1, 5 ; CeladonMart5Text5
sign 14, 1, 5 ; CeladonMart5Text5
def_objects
object SPRITE_GENTLEMAN, 14, 5, WALK, UP_DOWN, 1 ; person

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

@ -2,11 +2,11 @@ CeladonMartElevator_Object:
db $f ; border block
def_warps
warp 1, 3, 5, CELADON_MART_1F
warp 2, 3, 5, CELADON_MART_1F
warp 1, 3, 5, CELADON_MART_1F
warp 2, 3, 5, CELADON_MART_1F
def_signs
sign 3, 0, 1 ; CeladonMartElevatorText1
sign 3, 0, 1 ; CeladonMartElevatorText1
def_objects

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

@ -2,13 +2,13 @@ CeladonMartRoof_Object:
db $42 ; border block
def_warps
warp 15, 2, 0, CELADON_MART_5F
warp 15, 2, 0, CELADON_MART_5F
def_signs
sign 10, 1, 3 ; CeladonMartRoofText3
sign 11, 1, 4 ; CeladonMartRoofText4
sign 12, 2, 5 ; CeladonMartRoofText5
sign 13, 2, 6 ; CeladonMartRoofText6
sign 10, 1, 3 ; CeladonMartRoofText3
sign 11, 1, 4 ; CeladonMartRoofText4
sign 12, 2, 5 ; CeladonMartRoofText5
sign 13, 2, 6 ; CeladonMartRoofText6
def_objects
object SPRITE_SUPER_NERD, 10, 4, STAY, LEFT, 1 ; person

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

@ -2,8 +2,8 @@ CeladonPokecenter_Object:
db $0 ; border block
def_warps
warp 3, 7, 5, LAST_MAP
warp 4, 7, 5, LAST_MAP
warp 3, 7, 5, LAST_MAP
warp 4, 7, 5, LAST_MAP
def_signs

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

@ -2,9 +2,9 @@ CeruleanBadgeHouse_Object:
db $c ; border block
def_warps
warp 2, 0, 9, LAST_MAP
warp 2, 7, 8, LAST_MAP
warp 3, 7, 8, LAST_MAP
warp 2, 0, 9, LAST_MAP
warp 2, 7, 8, LAST_MAP
warp 3, 7, 8, LAST_MAP
def_signs

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

@ -4,13 +4,13 @@ CeruleanCave1F_Object:
def_warps
warp 24, 17, 6, LAST_MAP
warp 25, 17, 6, LAST_MAP
warp 27, 1, 0, CERULEAN_CAVE_2F
warp 23, 7, 1, CERULEAN_CAVE_2F
warp 18, 9, 2, CERULEAN_CAVE_2F
warp 7, 1, 3, CERULEAN_CAVE_2F
warp 1, 3, 4, CERULEAN_CAVE_2F
warp 3, 11, 5, CERULEAN_CAVE_2F
warp 0, 6, 0, CERULEAN_CAVE_B1F
warp 27, 1, 0, CERULEAN_CAVE_2F
warp 23, 7, 1, CERULEAN_CAVE_2F
warp 18, 9, 2, CERULEAN_CAVE_2F
warp 7, 1, 3, CERULEAN_CAVE_2F
warp 1, 3, 4, CERULEAN_CAVE_2F
warp 3, 11, 5, CERULEAN_CAVE_2F
warp 0, 6, 0, CERULEAN_CAVE_B1F
def_signs

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

@ -2,12 +2,12 @@ CeruleanCave2F_Object:
db $7d ; border block
def_warps
warp 29, 1, 2, CERULEAN_CAVE_1F
warp 22, 6, 3, CERULEAN_CAVE_1F
warp 19, 7, 4, CERULEAN_CAVE_1F
warp 9, 1, 5, CERULEAN_CAVE_1F
warp 1, 3, 6, CERULEAN_CAVE_1F
warp 3, 11, 7, CERULEAN_CAVE_1F
warp 29, 1, 2, CERULEAN_CAVE_1F
warp 22, 6, 3, CERULEAN_CAVE_1F
warp 19, 7, 4, CERULEAN_CAVE_1F
warp 9, 1, 5, CERULEAN_CAVE_1F
warp 1, 3, 6, CERULEAN_CAVE_1F
warp 3, 11, 7, CERULEAN_CAVE_1F
def_signs

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

@ -2,7 +2,7 @@ CeruleanCaveB1F_Object:
db $7d ; border block
def_warps
warp 3, 6, 8, CERULEAN_CAVE_1F
warp 3, 6, 8, CERULEAN_CAVE_1F
def_signs

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

@ -8,10 +8,10 @@ CeruleanCity_Object:
warp 30, 19, 0, CERULEAN_GYM
warp 13, 25, 0, BIKE_SHOP
warp 25, 25, 0, CERULEAN_MART
warp 4, 11, 0, CERULEAN_CAVE_1F
warp 27, 9, 2, CERULEAN_TRASHED_HOUSE
warp 9, 11, 1, CERULEAN_BADGE_HOUSE
warp 9, 9, 0, CERULEAN_BADGE_HOUSE
warp 4, 11, 0, CERULEAN_CAVE_1F
warp 27, 9, 2, CERULEAN_TRASHED_HOUSE
warp 9, 11, 1, CERULEAN_BADGE_HOUSE
warp 9, 9, 0, CERULEAN_BADGE_HOUSE
def_signs
sign 23, 19, 12 ; CeruleanCityText12

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

@ -2,8 +2,8 @@ CeruleanGym_Object:
db $3 ; border block
def_warps
warp 4, 13, 3, LAST_MAP
warp 5, 13, 3, LAST_MAP
warp 4, 13, 3, LAST_MAP
warp 5, 13, 3, LAST_MAP
def_signs

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

@ -2,8 +2,8 @@ CeruleanMart_Object:
db $0 ; border block
def_warps
warp 3, 7, 5, LAST_MAP
warp 4, 7, 5, LAST_MAP
warp 3, 7, 5, LAST_MAP
warp 4, 7, 5, LAST_MAP
def_signs

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

@ -2,8 +2,8 @@ CeruleanPokecenter_Object:
db $0 ; border block
def_warps
warp 3, 7, 2, LAST_MAP
warp 4, 7, 2, LAST_MAP
warp 3, 7, 2, LAST_MAP
warp 4, 7, 2, LAST_MAP
def_signs

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

@ -2,8 +2,8 @@ CeruleanTradeHouse_Object:
db $a ; border block
def_warps
warp 2, 7, 1, LAST_MAP
warp 3, 7, 1, LAST_MAP
warp 2, 7, 1, LAST_MAP
warp 3, 7, 1, LAST_MAP
def_signs

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

@ -2,12 +2,12 @@ CeruleanTrashedHouse_Object:
db $a ; border block
def_warps
warp 2, 7, 0, LAST_MAP
warp 3, 7, 0, LAST_MAP
warp 3, 0, 7, LAST_MAP
warp 2, 7, 0, LAST_MAP
warp 3, 7, 0, LAST_MAP
warp 3, 0, 7, LAST_MAP
def_signs
sign 3, 0, 3 ; CeruleanHouseTrashedText3
sign 3, 0, 3 ; CeruleanHouseTrashedText3
def_objects
object SPRITE_FISHING_GURU, 2, 1, STAY, DOWN, 1 ; person

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

@ -2,10 +2,10 @@ ChampionsRoom_Object:
db $3 ; border block
def_warps
warp 3, 7, 1, LANCES_ROOM
warp 4, 7, 2, LANCES_ROOM
warp 3, 0, 0, HALL_OF_FAME
warp 4, 0, 0, HALL_OF_FAME
warp 3, 7, 1, LANCES_ROOM
warp 4, 7, 2, LANCES_ROOM
warp 3, 0, 0, HALL_OF_FAME
warp 4, 0, 0, HALL_OF_FAME
def_signs

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

@ -2,18 +2,18 @@ CinnabarIsland_Object:
db $43 ; border block
def_warps
warp 6, 3, 1, POKEMON_MANSION_1F
warp 18, 3, 0, CINNABAR_GYM
warp 6, 9, 0, CINNABAR_LAB
warp 6, 3, 1, POKEMON_MANSION_1F
warp 18, 3, 0, CINNABAR_GYM
warp 6, 9, 0, CINNABAR_LAB
warp 11, 11, 0, CINNABAR_POKECENTER
warp 15, 11, 0, CINNABAR_MART
def_signs
sign 9, 5, 3 ; CinnabarIslandText3
sign 9, 5, 3 ; CinnabarIslandText3
sign 16, 11, 4 ; MartSignText
sign 12, 11, 5 ; PokeCenterSignText
sign 9, 11, 6 ; CinnabarIslandText6
sign 13, 3, 7 ; CinnabarIslandText7
sign 9, 11, 6 ; CinnabarIslandText6
sign 13, 3, 7 ; CinnabarIslandText7
def_objects
object SPRITE_GIRL, 12, 5, WALK, LEFT_RIGHT, 1 ; person

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

@ -2,17 +2,17 @@ CinnabarLab_Object:
db $17 ; border block
def_warps
warp 2, 7, 2, LAST_MAP
warp 3, 7, 2, LAST_MAP
warp 8, 4, 0, CINNABAR_LAB_TRADE_ROOM
warp 12, 4, 0, CINNABAR_LAB_METRONOME_ROOM
warp 16, 4, 0, CINNABAR_LAB_FOSSIL_ROOM
warp 2, 7, 2, LAST_MAP
warp 3, 7, 2, LAST_MAP
warp 8, 4, 0, CINNABAR_LAB_TRADE_ROOM
warp 12, 4, 0, CINNABAR_LAB_METRONOME_ROOM
warp 16, 4, 0, CINNABAR_LAB_FOSSIL_ROOM
def_signs
sign 3, 2, 2 ; Lab1Text2
sign 9, 4, 3 ; Lab1Text3
sign 13, 4, 4 ; Lab1Text4
sign 17, 4, 5 ; Lab1Text5
sign 3, 2, 2 ; Lab1Text2
sign 9, 4, 3 ; Lab1Text3
sign 13, 4, 4 ; Lab1Text4
sign 17, 4, 5 ; Lab1Text5
def_objects
object SPRITE_FISHING_GURU, 1, 3, STAY, NONE, 1 ; person

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

@ -2,8 +2,8 @@ CinnabarLabFossilRoom_Object:
db $17 ; border block
def_warps
warp 2, 7, 4, CINNABAR_LAB
warp 3, 7, 4, CINNABAR_LAB
warp 2, 7, 4, CINNABAR_LAB
warp 3, 7, 4, CINNABAR_LAB
def_signs

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

@ -2,13 +2,13 @@ CinnabarLabMetronomeRoom_Object:
db $17 ; border block
def_warps
warp 2, 7, 3, CINNABAR_LAB
warp 3, 7, 3, CINNABAR_LAB
warp 2, 7, 3, CINNABAR_LAB
warp 3, 7, 3, CINNABAR_LAB
def_signs
sign 0, 4, 3 ; Lab3Text3
sign 1, 4, 4 ; Lab3Text4
sign 2, 1, 5 ; Lab3Text5
sign 0, 4, 3 ; Lab3Text3
sign 1, 4, 4 ; Lab3Text4
sign 2, 1, 5 ; Lab3Text5
def_objects
object SPRITE_SCIENTIST, 7, 2, STAY, DOWN, 1 ; person

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

@ -2,8 +2,8 @@ CinnabarLabTradeRoom_Object:
db $17 ; border block
def_warps
warp 2, 7, 2, CINNABAR_LAB
warp 3, 7, 2, CINNABAR_LAB
warp 2, 7, 2, CINNABAR_LAB
warp 3, 7, 2, CINNABAR_LAB
def_signs

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

@ -2,8 +2,8 @@ CinnabarMart_Object:
db $0 ; border block
def_warps
warp 3, 7, 4, LAST_MAP
warp 4, 7, 4, LAST_MAP
warp 3, 7, 4, LAST_MAP
warp 4, 7, 4, LAST_MAP
def_signs

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

@ -2,8 +2,8 @@ CinnabarPokecenter_Object:
db $0 ; border block
def_warps
warp 3, 7, 3, LAST_MAP
warp 4, 7, 3, LAST_MAP
warp 3, 7, 3, LAST_MAP
warp 4, 7, 3, LAST_MAP
def_signs

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

@ -2,9 +2,9 @@ CopycatsHouse1F_Object:
db $a ; border block
def_warps
warp 2, 7, 0, LAST_MAP
warp 3, 7, 0, LAST_MAP
warp 7, 1, 0, COPYCATS_HOUSE_2F
warp 2, 7, 0, LAST_MAP
warp 3, 7, 0, LAST_MAP
warp 7, 1, 0, COPYCATS_HOUSE_2F
def_signs

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

@ -2,11 +2,11 @@ CopycatsHouse2F_Object:
db $a ; border block
def_warps
warp 7, 1, 2, COPYCATS_HOUSE_1F
warp 7, 1, 2, COPYCATS_HOUSE_1F
def_signs
sign 3, 5, 6 ; CopycatsHouse2FText6
sign 0, 1, 7 ; CopycatsHouse2FText7
sign 3, 5, 6 ; CopycatsHouse2FText6
sign 0, 1, 7 ; CopycatsHouse2FText7
def_objects
object SPRITE_BRUNETTE_GIRL, 4, 3, WALK, ANY_DIR, 1 ; person

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

@ -2,8 +2,8 @@ Daycare_Object:
db $a ; border block
def_warps
warp 2, 7, 4, LAST_MAP
warp 3, 7, 4, LAST_MAP
warp 2, 7, 4, LAST_MAP
warp 3, 7, 4, LAST_MAP
def_signs

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

@ -2,7 +2,7 @@ DiglettsCave_Object:
db $19 ; border block
def_warps
warp 5, 5, 2, DIGLETTS_CAVE_ROUTE_2
warp 5, 5, 2, DIGLETTS_CAVE_ROUTE_2
warp 37, 31, 2, DIGLETTS_CAVE_ROUTE_11
def_signs

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

@ -2,9 +2,9 @@ DiglettsCaveRoute11_Object:
db $7d ; border block
def_warps
warp 2, 7, 4, LAST_MAP
warp 3, 7, 4, LAST_MAP
warp 4, 4, 1, DIGLETTS_CAVE
warp 2, 7, 4, LAST_MAP
warp 3, 7, 4, LAST_MAP
warp 4, 4, 1, DIGLETTS_CAVE
def_signs

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

@ -2,9 +2,9 @@ DiglettsCaveRoute2_Object:
db $7d ; border block
def_warps
warp 2, 7, 0, LAST_MAP
warp 3, 7, 0, LAST_MAP
warp 4, 4, 0, DIGLETTS_CAVE
warp 2, 7, 0, LAST_MAP
warp 3, 7, 0, LAST_MAP
warp 4, 4, 0, DIGLETTS_CAVE
def_signs

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

@ -2,8 +2,8 @@ FightingDojo_Object:
db $3 ; border block
def_warps
warp 4, 11, 1, LAST_MAP
warp 5, 11, 1, LAST_MAP
warp 4, 11, 1, LAST_MAP
warp 5, 11, 1, LAST_MAP
def_signs

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

@ -2,8 +2,8 @@ FuchsiaBillsGrandpasHouse_Object:
db $a ; border block
def_warps
warp 2, 7, 1, LAST_MAP
warp 3, 7, 1, LAST_MAP
warp 2, 7, 1, LAST_MAP
warp 3, 7, 1, LAST_MAP
def_signs

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

@ -2,12 +2,12 @@ FuchsiaCity_Object:
db $f ; border block
def_warps
warp 5, 13, 0, FUCHSIA_MART
warp 5, 13, 0, FUCHSIA_MART
warp 11, 27, 0, FUCHSIA_BILLS_GRANDPAS_HOUSE
warp 19, 27, 0, FUCHSIA_POKECENTER
warp 27, 27, 0, WARDENS_HOUSE
warp 18, 3, 0, SAFARI_ZONE_GATE
warp 5, 27, 0, FUCHSIA_GYM
warp 18, 3, 0, SAFARI_ZONE_GATE
warp 5, 27, 0, FUCHSIA_GYM
warp 22, 13, 0, FUCHSIA_MEETING_ROOM
warp 31, 27, 1, FUCHSIA_GOOD_ROD_HOUSE
warp 31, 24, 0, FUCHSIA_GOOD_ROD_HOUSE
@ -15,18 +15,18 @@ FuchsiaCity_Object:
def_signs
sign 15, 23, 11 ; FuchsiaCityText11
sign 25, 15, 12 ; FuchsiaCityText12
sign 17, 5, 13 ; FuchsiaCityText13
sign 6, 13, 14 ; MartSignText
sign 17, 5, 13 ; FuchsiaCityText13
sign 6, 13, 14 ; MartSignText
sign 20, 27, 15 ; PokeCenterSignText
sign 27, 29, 16 ; FuchsiaCityText16
sign 21, 15, 17 ; FuchsiaCityText17
sign 5, 29, 18 ; FuchsiaCityText18
sign 33, 7, 19 ; FuchsiaCityText19
sign 27, 7, 20 ; FuchsiaCityText20
sign 13, 7, 21 ; FuchsiaCityText21
sign 5, 29, 18 ; FuchsiaCityText18
sign 33, 7, 19 ; FuchsiaCityText19
sign 27, 7, 20 ; FuchsiaCityText20
sign 13, 7, 21 ; FuchsiaCityText21
sign 31, 13, 22 ; FuchsiaCityText22
sign 13, 15, 23 ; FuchsiaCityText23
sign 7, 7, 24 ; FuchsiaCityText24
sign 7, 7, 24 ; FuchsiaCityText24
def_objects
object SPRITE_YOUNGSTER, 10, 12, WALK, LEFT_RIGHT, 1 ; person

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

@ -2,9 +2,9 @@ FuchsiaGoodRodHouse_Object:
db $c ; border block
def_warps
warp 2, 0, 8, LAST_MAP
warp 2, 7, 7, LAST_MAP
warp 3, 7, 7, LAST_MAP
warp 2, 0, 8, LAST_MAP
warp 2, 7, 7, LAST_MAP
warp 3, 7, 7, LAST_MAP
def_signs

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

@ -2,8 +2,8 @@ FuchsiaGym_Object:
db $3 ; border block
def_warps
warp 4, 17, 5, LAST_MAP
warp 5, 17, 5, LAST_MAP
warp 4, 17, 5, LAST_MAP
warp 5, 17, 5, LAST_MAP
def_signs

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

@ -2,8 +2,8 @@ FuchsiaMart_Object:
db $0 ; border block
def_warps
warp 3, 7, 0, LAST_MAP
warp 4, 7, 0, LAST_MAP
warp 3, 7, 0, LAST_MAP
warp 4, 7, 0, LAST_MAP
def_signs

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

@ -2,8 +2,8 @@ FuchsiaMeetingRoom_Object:
db $17 ; border block
def_warps
warp 4, 7, 6, LAST_MAP
warp 5, 7, 6, LAST_MAP
warp 4, 7, 6, LAST_MAP
warp 5, 7, 6, LAST_MAP
def_signs

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

@ -2,8 +2,8 @@ FuchsiaPokecenter_Object:
db $0 ; border block
def_warps
warp 3, 7, 2, LAST_MAP
warp 4, 7, 2, LAST_MAP
warp 3, 7, 2, LAST_MAP
warp 4, 7, 2, LAST_MAP
def_signs

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

@ -4,10 +4,10 @@ GameCorner_Object:
def_warps
warp 15, 17, 7, LAST_MAP
warp 16, 17, 7, LAST_MAP
warp 17, 4, 1, ROCKET_HIDEOUT_B1F
warp 17, 4, 1, ROCKET_HIDEOUT_B1F
def_signs
sign 9, 4, 12 ; CeladonGameCornerText12
sign 9, 4, 12 ; CeladonGameCornerText12
def_objects
object SPRITE_BEAUTY, 2, 6, STAY, DOWN, 1 ; person

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

@ -2,13 +2,13 @@ GameCornerPrizeRoom_Object:
db $f ; border block
def_warps
warp 4, 7, 9, LAST_MAP
warp 5, 7, 9, LAST_MAP
warp 4, 7, 9, LAST_MAP
warp 5, 7, 9, LAST_MAP
def_signs
sign 2, 2, 3 ; CeladonPrizeRoomText3
sign 4, 2, 4 ; CeladonPrizeRoomText4
sign 6, 2, 5 ; CeladonPrizeRoomText5
sign 2, 2, 3 ; CeladonPrizeRoomText3
sign 4, 2, 4 ; CeladonPrizeRoomText4
sign 6, 2, 5 ; CeladonPrizeRoomText5
def_objects
object SPRITE_BALDING_GUY, 1, 4, STAY, NONE, 1 ; person

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

@ -2,8 +2,8 @@ HallOfFame_Object:
db $3 ; border block
def_warps
warp 4, 7, 2, CHAMPIONS_ROOM
warp 5, 7, 3, CHAMPIONS_ROOM
warp 4, 7, 2, CHAMPIONS_ROOM
warp 5, 7, 3, CHAMPIONS_ROOM
def_signs

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

@ -2,8 +2,8 @@ IndigoPlateau_Object:
db $e ; border block
def_warps
warp 9, 5, 0, INDIGO_PLATEAU_LOBBY
warp 10, 5, 0, INDIGO_PLATEAU_LOBBY
warp 9, 5, 0, INDIGO_PLATEAU_LOBBY
warp 10, 5, 0, INDIGO_PLATEAU_LOBBY
def_signs

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

@ -2,9 +2,9 @@ IndigoPlateauLobby_Object:
db $0 ; border block
def_warps
warp 7, 11, 0, LAST_MAP
warp 8, 11, 1, LAST_MAP
warp 8, 0, 0, LORELEIS_ROOM
warp 7, 11, 0, LAST_MAP
warp 8, 11, 1, LAST_MAP
warp 8, 0, 0, LORELEIS_ROOM
def_signs

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

@ -3,8 +3,8 @@ LancesRoom_Object:
def_warps
warp 24, 16, 2, AGATHAS_ROOM
warp 5, 0, 0, CHAMPIONS_ROOM
warp 6, 0, 0, CHAMPIONS_ROOM
warp 5, 0, 0, CHAMPIONS_ROOM
warp 6, 0, 0, CHAMPIONS_ROOM
def_signs

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

@ -2,8 +2,8 @@ LavenderCuboneHouse_Object:
db $a ; border block
def_warps
warp 2, 7, 4, LAST_MAP
warp 3, 7, 4, LAST_MAP
warp 2, 7, 4, LAST_MAP
warp 3, 7, 4, LAST_MAP
def_signs

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

@ -2,8 +2,8 @@ LavenderMart_Object:
db $0 ; border block
def_warps
warp 3, 7, 3, LAST_MAP
warp 4, 7, 3, LAST_MAP
warp 3, 7, 3, LAST_MAP
warp 4, 7, 3, LAST_MAP
def_signs

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

@ -2,8 +2,8 @@ LavenderPokecenter_Object:
db $0 ; border block
def_warps
warp 3, 7, 0, LAST_MAP
warp 4, 7, 0, LAST_MAP
warp 3, 7, 0, LAST_MAP
warp 4, 7, 0, LAST_MAP
def_signs

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

@ -2,20 +2,20 @@ LavenderTown_Object:
db $2c ; border block
def_warps
warp 3, 5, 0, LAVENDER_POKECENTER
warp 14, 5, 0, POKEMON_TOWER_1F
warp 7, 9, 0, MR_FUJIS_HOUSE
warp 3, 5, 0, LAVENDER_POKECENTER
warp 14, 5, 0, POKEMON_TOWER_1F
warp 7, 9, 0, MR_FUJIS_HOUSE
warp 15, 13, 0, LAVENDER_MART
warp 3, 13, 0, LAVENDER_CUBONE_HOUSE
warp 7, 13, 0, NAME_RATERS_HOUSE
warp 3, 13, 0, LAVENDER_CUBONE_HOUSE
warp 7, 13, 0, NAME_RATERS_HOUSE
def_signs
sign 11, 9, 4 ; LavenderTownText4
sign 9, 3, 5 ; LavenderTownText5
sign 11, 9, 4 ; LavenderTownText4
sign 9, 3, 5 ; LavenderTownText5
sign 16, 13, 6 ; MartSignText
sign 4, 5, 7 ; PokeCenterSignText
sign 5, 9, 8 ; LavenderTownText8
sign 17, 7, 9 ; LavenderTownText9
sign 4, 5, 7 ; PokeCenterSignText
sign 5, 9, 8 ; LavenderTownText8
sign 17, 7, 9 ; LavenderTownText9
def_objects
object SPRITE_LITTLE_GIRL, 15, 9, WALK, ANY_DIR, 1 ; person

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

@ -2,10 +2,10 @@ LoreleisRoom_Object:
db $3 ; border block
def_warps
warp 4, 11, 2, INDIGO_PLATEAU_LOBBY
warp 5, 11, 2, INDIGO_PLATEAU_LOBBY
warp 4, 0, 0, BRUNOS_ROOM
warp 5, 0, 1, BRUNOS_ROOM
warp 4, 11, 2, INDIGO_PLATEAU_LOBBY
warp 5, 11, 2, INDIGO_PLATEAU_LOBBY
warp 4, 0, 0, BRUNOS_ROOM
warp 5, 0, 1, BRUNOS_ROOM
def_signs

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

@ -2,8 +2,8 @@ MrFujisHouse_Object:
db $a ; border block
def_warps
warp 2, 7, 2, LAST_MAP
warp 3, 7, 2, LAST_MAP
warp 2, 7, 2, LAST_MAP
warp 3, 7, 2, LAST_MAP
def_signs

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

@ -2,8 +2,8 @@ MrPsychicsHouse_Object:
db $a ; border block
def_warps
warp 2, 7, 7, LAST_MAP
warp 3, 7, 7, LAST_MAP
warp 2, 7, 7, LAST_MAP
warp 3, 7, 7, LAST_MAP
def_signs

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

@ -4,7 +4,7 @@ MtMoon1F_Object:
def_warps
warp 14, 35, 1, LAST_MAP
warp 15, 35, 1, LAST_MAP
warp 5, 5, 0, MT_MOON_B1F
warp 5, 5, 0, MT_MOON_B1F
warp 17, 11, 2, MT_MOON_B1F
warp 25, 15, 3, MT_MOON_B1F

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

@ -2,14 +2,14 @@ MtMoonB1F_Object:
db $3 ; border block
def_warps
warp 5, 5, 2, MT_MOON_1F
warp 5, 5, 2, MT_MOON_1F
warp 17, 11, 0, MT_MOON_B2F
warp 25, 9, 3, MT_MOON_1F
warp 25, 9, 3, MT_MOON_1F
warp 25, 15, 4, MT_MOON_1F
warp 21, 17, 1, MT_MOON_B2F
warp 13, 27, 2, MT_MOON_B2F
warp 23, 3, 3, MT_MOON_B2F
warp 27, 3, 2, LAST_MAP
warp 23, 3, 3, MT_MOON_B2F
warp 27, 3, 2, LAST_MAP
def_signs

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

@ -2,10 +2,10 @@ MtMoonB2F_Object:
db $3 ; border block
def_warps
warp 25, 9, 1, MT_MOON_B1F
warp 25, 9, 1, MT_MOON_B1F
warp 21, 17, 4, MT_MOON_B1F
warp 15, 27, 5, MT_MOON_B1F
warp 5, 7, 6, MT_MOON_B1F
warp 5, 7, 6, MT_MOON_B1F
def_signs

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

@ -2,8 +2,8 @@ MtMoonPokecenter_Object:
db $0 ; border block
def_warps
warp 3, 7, 0, LAST_MAP
warp 4, 7, 0, LAST_MAP
warp 3, 7, 0, LAST_MAP
warp 4, 7, 0, LAST_MAP
def_signs

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

@ -2,11 +2,11 @@ Museum1F_Object:
db $a ; border block
def_warps
warp 10, 7, 0, LAST_MAP
warp 11, 7, 0, LAST_MAP
warp 16, 7, 1, LAST_MAP
warp 17, 7, 1, LAST_MAP
warp 7, 7, 0, MUSEUM_2F
warp 10, 7, 0, LAST_MAP
warp 11, 7, 0, LAST_MAP
warp 16, 7, 1, LAST_MAP
warp 17, 7, 1, LAST_MAP
warp 7, 7, 0, MUSEUM_2F
def_signs

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

@ -2,11 +2,11 @@ Museum2F_Object:
db $a ; border block
def_warps
warp 7, 7, 4, MUSEUM_1F
warp 7, 7, 4, MUSEUM_1F
def_signs
sign 11, 2, 6 ; Museum2FText6
sign 2, 5, 7 ; Museum2FText7
sign 11, 2, 6 ; Museum2FText6
sign 2, 5, 7 ; Museum2FText7
def_objects
object SPRITE_YOUNGSTER, 1, 7, WALK, LEFT_RIGHT, 1 ; person

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

@ -2,8 +2,8 @@ NameRatersHouse_Object:
db $a ; border block
def_warps
warp 2, 7, 5, LAST_MAP
warp 3, 7, 5, LAST_MAP
warp 2, 7, 5, LAST_MAP
warp 3, 7, 5, LAST_MAP
def_signs

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

@ -2,8 +2,8 @@ OaksLab_Object:
db $3 ; border block
def_warps
warp 4, 11, 2, LAST_MAP
warp 5, 11, 2, LAST_MAP
warp 4, 11, 2, LAST_MAP
warp 5, 11, 2, LAST_MAP
def_signs

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

@ -2,15 +2,15 @@ PalletTown_Object:
db $b ; border block
def_warps
warp 5, 5, 0, REDS_HOUSE_1F
warp 13, 5, 0, BLUES_HOUSE
warp 5, 5, 0, REDS_HOUSE_1F
warp 13, 5, 0, BLUES_HOUSE
warp 12, 11, 1, OAKS_LAB
def_signs
sign 13, 13, 4 ; PalletTownText4
sign 7, 9, 5 ; PalletTownText5
sign 3, 5, 6 ; PalletTownText6
sign 11, 5, 7 ; PalletTownText7
sign 7, 9, 5 ; PalletTownText5
sign 3, 5, 6 ; PalletTownText6
sign 11, 5, 7 ; PalletTownText7
def_objects
object SPRITE_OAK, 8, 5, STAY, NONE, 1 ; person

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

@ -2,20 +2,20 @@ PewterCity_Object:
db $a ; border block
def_warps
warp 14, 7, 0, MUSEUM_1F
warp 19, 5, 2, MUSEUM_1F
warp 14, 7, 0, MUSEUM_1F
warp 19, 5, 2, MUSEUM_1F
warp 16, 17, 0, PEWTER_GYM
warp 29, 13, 0, PEWTER_NIDORAN_HOUSE
warp 23, 17, 0, PEWTER_MART
warp 7, 29, 0, PEWTER_SPEECH_HOUSE
warp 7, 29, 0, PEWTER_SPEECH_HOUSE
warp 13, 25, 0, PEWTER_POKECENTER
def_signs
sign 19, 29, 6 ; PewterCityText6
sign 33, 19, 7 ; PewterCityText7
sign 24, 17, 8 ; MartSignText
sign 14, 25, 9 ; PokeCenterSignText
sign 15, 9, 10 ; PewterCityText10
sign 19, 29, 6 ; PewterCityText6
sign 33, 19, 7 ; PewterCityText7
sign 24, 17, 8 ; MartSignText
sign 14, 25, 9 ; PokeCenterSignText
sign 15, 9, 10 ; PewterCityText10
sign 11, 17, 11 ; PewterCityText11
sign 25, 23, 12 ; PewterCityText12

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

@ -2,8 +2,8 @@ PewterGym_Object:
db $3 ; border block
def_warps
warp 4, 13, 2, LAST_MAP
warp 5, 13, 2, LAST_MAP
warp 4, 13, 2, LAST_MAP
warp 5, 13, 2, LAST_MAP
def_signs

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

@ -2,8 +2,8 @@ PewterMart_Object:
db $0 ; border block
def_warps
warp 3, 7, 4, LAST_MAP
warp 4, 7, 4, LAST_MAP
warp 3, 7, 4, LAST_MAP
warp 4, 7, 4, LAST_MAP
def_signs

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

@ -2,8 +2,8 @@ PewterNidoranHouse_Object:
db $a ; border block
def_warps
warp 2, 7, 3, LAST_MAP
warp 3, 7, 3, LAST_MAP
warp 2, 7, 3, LAST_MAP
warp 3, 7, 3, LAST_MAP
def_signs

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

@ -2,8 +2,8 @@ PewterPokecenter_Object:
db $0 ; border block
def_warps
warp 3, 7, 6, LAST_MAP
warp 4, 7, 6, LAST_MAP
warp 3, 7, 6, LAST_MAP
warp 4, 7, 6, LAST_MAP
def_signs

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

@ -2,8 +2,8 @@ PewterSpeechHouse_Object:
db $a ; border block
def_warps
warp 2, 7, 5, LAST_MAP
warp 3, 7, 5, LAST_MAP
warp 2, 7, 5, LAST_MAP
warp 3, 7, 5, LAST_MAP
def_signs

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

@ -2,12 +2,12 @@ PokemonFanClub_Object:
db $d ; border block
def_warps
warp 2, 7, 1, LAST_MAP
warp 3, 7, 1, LAST_MAP
warp 2, 7, 1, LAST_MAP
warp 3, 7, 1, LAST_MAP
def_signs
sign 1, 0, 7 ; FanClubText7
sign 6, 0, 8 ; FanClubText8
sign 1, 0, 7 ; FanClubText7
sign 6, 0, 8 ; FanClubText8
def_objects
object SPRITE_FISHER, 6, 3, STAY, LEFT, 1 ; person

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

@ -2,11 +2,11 @@ PokemonMansion1F_Object:
db $2e ; border block
def_warps
warp 4, 27, 0, LAST_MAP
warp 5, 27, 0, LAST_MAP
warp 6, 27, 0, LAST_MAP
warp 7, 27, 0, LAST_MAP
warp 5, 10, 0, POKEMON_MANSION_2F
warp 4, 27, 0, LAST_MAP
warp 5, 27, 0, LAST_MAP
warp 6, 27, 0, LAST_MAP
warp 7, 27, 0, LAST_MAP
warp 5, 10, 0, POKEMON_MANSION_2F
warp 21, 23, 0, POKEMON_MANSION_B1F
warp 26, 27, 0, LAST_MAP
warp 27, 27, 0, LAST_MAP

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

@ -2,10 +2,10 @@ PokemonMansion2F_Object:
db $1 ; border block
def_warps
warp 5, 10, 4, POKEMON_MANSION_1F
warp 7, 10, 0, POKEMON_MANSION_3F
warp 5, 10, 4, POKEMON_MANSION_1F
warp 7, 10, 0, POKEMON_MANSION_3F
warp 25, 14, 2, POKEMON_MANSION_3F
warp 6, 1, 1, POKEMON_MANSION_3F
warp 6, 1, 1, POKEMON_MANSION_3F
def_signs

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

@ -2,8 +2,8 @@ PokemonMansion3F_Object:
db $1 ; border block
def_warps
warp 7, 10, 1, POKEMON_MANSION_2F
warp 6, 1, 3, POKEMON_MANSION_2F
warp 7, 10, 1, POKEMON_MANSION_2F
warp 6, 1, 3, POKEMON_MANSION_2F
warp 25, 14, 2, POKEMON_MANSION_2F
def_signs

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

@ -4,7 +4,7 @@ PokemonTower1F_Object:
def_warps
warp 10, 17, 1, LAST_MAP
warp 11, 17, 1, LAST_MAP
warp 18, 9, 1, POKEMON_TOWER_2F
warp 18, 9, 1, POKEMON_TOWER_2F
def_signs

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

@ -2,8 +2,8 @@ PokemonTower2F_Object:
db $1 ; border block
def_warps
warp 3, 9, 0, POKEMON_TOWER_3F
warp 18, 9, 2, POKEMON_TOWER_1F
warp 3, 9, 0, POKEMON_TOWER_3F
warp 18, 9, 2, POKEMON_TOWER_1F
def_signs

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

@ -2,8 +2,8 @@ PokemonTower3F_Object:
db $1 ; border block
def_warps
warp 3, 9, 0, POKEMON_TOWER_2F
warp 18, 9, 1, POKEMON_TOWER_4F
warp 3, 9, 0, POKEMON_TOWER_2F
warp 18, 9, 1, POKEMON_TOWER_4F
def_signs

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

@ -2,8 +2,8 @@ PokemonTower4F_Object:
db $1 ; border block
def_warps
warp 3, 9, 0, POKEMON_TOWER_5F
warp 18, 9, 1, POKEMON_TOWER_3F
warp 3, 9, 0, POKEMON_TOWER_5F
warp 18, 9, 1, POKEMON_TOWER_3F
def_signs

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

@ -2,8 +2,8 @@ PokemonTower5F_Object:
db $1 ; border block
def_warps
warp 3, 9, 0, POKEMON_TOWER_4F
warp 18, 9, 0, POKEMON_TOWER_6F
warp 3, 9, 0, POKEMON_TOWER_4F
warp 18, 9, 0, POKEMON_TOWER_6F
def_signs

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

@ -2,8 +2,8 @@ PokemonTower6F_Object:
db $1 ; border block
def_warps
warp 18, 9, 1, POKEMON_TOWER_5F
warp 9, 16, 0, POKEMON_TOWER_7F
warp 18, 9, 1, POKEMON_TOWER_5F
warp 9, 16, 0, POKEMON_TOWER_7F
def_signs

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

@ -2,7 +2,7 @@ PokemonTower7F_Object:
db $1 ; border block
def_warps
warp 9, 16, 1, POKEMON_TOWER_6F
warp 9, 16, 1, POKEMON_TOWER_6F
def_signs

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

@ -2,9 +2,9 @@ PowerPlant_Object:
db $2e ; border block
def_warps
warp 4, 35, 3, LAST_MAP
warp 5, 35, 3, LAST_MAP
warp 0, 11, 3, LAST_MAP
warp 4, 35, 3, LAST_MAP
warp 5, 35, 3, LAST_MAP
warp 0, 11, 3, LAST_MAP
def_signs

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

@ -2,12 +2,12 @@ RedsHouse1F_Object:
db $a ; border block
def_warps
warp 2, 7, 0, LAST_MAP ; exit1
warp 3, 7, 0, LAST_MAP ; exit2
warp 7, 1, 0, REDS_HOUSE_2F ; staircase
warp 2, 7, 0, LAST_MAP ; exit1
warp 3, 7, 0, LAST_MAP ; exit2
warp 7, 1, 0, REDS_HOUSE_2F ; staircase
def_signs
sign 3, 1, 2 ; TV
sign 3, 1, 2 ; TV
def_objects
object SPRITE_MOM, 5, 4, STAY, LEFT, 1 ; Mom

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

@ -2,7 +2,7 @@ RedsHouse2F_Object:
db $a ; border block
def_warps
warp 7, 1, 2, REDS_HOUSE_1F
warp 7, 1, 2, REDS_HOUSE_1F
def_signs

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

@ -2,12 +2,12 @@ RockTunnel1F_Object:
db $3 ; border block
def_warps
warp 15, 3, 1, LAST_MAP
warp 15, 0, 1, LAST_MAP
warp 15, 3, 1, LAST_MAP
warp 15, 0, 1, LAST_MAP
warp 15, 33, 2, LAST_MAP
warp 15, 35, 2, LAST_MAP
warp 37, 3, 0, ROCK_TUNNEL_B1F
warp 5, 3, 1, ROCK_TUNNEL_B1F
warp 37, 3, 0, ROCK_TUNNEL_B1F
warp 5, 3, 1, ROCK_TUNNEL_B1F
warp 17, 11, 2, ROCK_TUNNEL_B1F
warp 37, 17, 3, ROCK_TUNNEL_B1F

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

@ -3,9 +3,9 @@ RockTunnelB1F_Object:
def_warps
warp 33, 25, 4, ROCK_TUNNEL_1F
warp 27, 3, 5, ROCK_TUNNEL_1F
warp 27, 3, 5, ROCK_TUNNEL_1F
warp 23, 11, 6, ROCK_TUNNEL_1F
warp 3, 3, 7, ROCK_TUNNEL_1F
warp 3, 3, 7, ROCK_TUNNEL_1F
def_signs

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

@ -2,8 +2,8 @@ RockTunnelPokecenter_Object:
db $0 ; border block
def_warps
warp 3, 7, 0, LAST_MAP
warp 4, 7, 0, LAST_MAP
warp 3, 7, 0, LAST_MAP
warp 4, 7, 0, LAST_MAP
def_signs

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