Game-Decompilation/pokeyellow
1
0
Fork 0
mirror of https://github.com/pret/pokeyellow.git synced 2025-02-22 11:00:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #287 from Rangi42/master

Browse Source 
Simplify map event definitions
This commit is contained in:
Rangi 2020-08-20 19:07:42 -04:00 committed by GitHub
commit 7e9ccbb5b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
224 changed files with 958 additions and 1693 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
data/maps/objects/AgathasRoom.asm
View File

@ -1,19 +1,15 @@
AgathasRoom_Object:
db $0 ; border block
db 4 ; warps
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
db 0 ; signs
def_signs
db 1 ; objects
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

10
data/maps/objects/BikeShop.asm
View File

@ -1,17 +1,15 @@
BikeShop_Object:
db $e ; border block
db 2 ; warps
def_warps
warp 2, 7, 4, LAST_MAP
warp 3, 7, 4, LAST_MAP
db 0 ; signs
def_signs
db 3 ; objects
def_objects
object SPRITE_BIKE_SHOP_CLERK, 6, 2, STAY, NONE, 1 ; person
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

10
data/maps/objects/BillsHouse.asm
View File

@ -1,17 +1,15 @@
BillsHouse_Object:
db $d ; border block
db 2 ; warps
def_warps
warp 2, 7, 0, LAST_MAP
warp 3, 7, 0, LAST_MAP
db 0 ; signs
def_signs
db 3 ; objects
def_objects
object SPRITE_MONSTER, 6, 5, STAY, NONE, 1 ; person
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

10
data/maps/objects/BluesHouse.asm
View File

@ -1,17 +1,15 @@
BluesHouse_Object:
db $a ; border block
db 2 ; warps
def_warps
warp 2, 7, 1, LAST_MAP
warp 3, 7, 1, LAST_MAP
db 0 ; signs
def_signs
db 3 ; objects
def_objects
object SPRITE_DAISY, 2, 3, STAY, RIGHT, 1 ; Daisy, sitting by map
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

12
data/maps/objects/BrunosRoom.asm
View File

@ -1,19 +1,15 @@
BrunosRoom_Object:
db $3 ; border block
db 4 ; warps
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
db 0 ; signs
def_signs
db 1 ; objects
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

10
data/maps/objects/CeladonChiefHouse.asm
View File

@ -1,17 +1,15 @@
CeladonChiefHouse_Object:
db $f ; border block
db 2 ; warps
def_warps
warp 2, 7, 11, LAST_MAP
warp 3, 7, 11, LAST_MAP
db 0 ; signs
def_signs
db 3 ; objects
def_objects
object SPRITE_GRAMPS, 4, 2, STAY, DOWN, 1 ; person
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

21
data/maps/objects/CeladonCity.asm
View File

@ -1,7 +1,7 @@
CeladonCity_Object:
db $f ; border block
db 13 ; warps
def_warps
warp 8, 13, 0, CELADON_MART_1F
warp 10, 13, 2, CELADON_MART_1F
warp 24, 9, 0, CELADON_MANSION_1F
@ -16,7 +16,7 @@ CeladonCity_Object:
warp 35, 27, 0, CELADON_CHIEF_HOUSE
warp 43, 27, 0, CELADON_HOTEL
db 9 ; signs
def_signs
sign 27, 15, 10 ; CeladonCityText10
sign 19, 15, 11 ; CeladonCityText11
sign 42, 9, 12 ; PokeCenterSignText
@ -27,7 +27,7 @@ CeladonCity_Object:
sign 33, 21, 17 ; CeladonCityText17
sign 27, 21, 18 ; CeladonCityText18
db 9 ; objects
def_objects
object SPRITE_LITTLE_GIRL, 8, 17, WALK, ANY_DIR, 1 ; person
object SPRITE_GRAMPS, 11, 28, STAY, UP, 2 ; person
object SPRITE_GIRL, 14, 19, WALK, UP_DOWN, 3 ; person
@ -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

10
data/maps/objects/CeladonDiner.asm
View File

@ -1,19 +1,17 @@
CeladonDiner_Object:
db $f ; border block
db 2 ; warps
def_warps
warp 3, 7, 10, LAST_MAP
warp 4, 7, 10, LAST_MAP
db 0 ; signs
def_signs
db 5 ; objects
def_objects
object SPRITE_COOK, 8, 5, WALK, LEFT_RIGHT, 1 ; person
object SPRITE_MIDDLE_AGED_WOMAN, 7, 2, STAY, NONE, 2 ; person
object SPRITE_MIDDLE_AGED_MAN, 1, 4, STAY, DOWN, 3 ; person
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

10
data/maps/objects/CeladonGym.asm
View File

@ -1,13 +1,13 @@
CeladonGym_Object:
db $3 ; border block
db 2 ; warps
def_warps
warp 4, 17, 6, LAST_MAP
warp 5, 17, 6, LAST_MAP
db 0 ; signs
def_signs
db 8 ; objects
def_objects
object SPRITE_ERIKA, 4, 3, STAY, DOWN, 1, OPP_ERIKA, 1
object SPRITE_COOLTRAINER_F, 2, 11, STAY, RIGHT, 2, OPP_LASS, 17
object SPRITE_BEAUTY, 7, 10, STAY, LEFT, 3, OPP_BEAUTY, 1
@ -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

10
data/maps/objects/CeladonHotel.asm
View File

@ -1,17 +1,15 @@
CeladonHotel_Object:
db $0 ; border block
db 2 ; warps
def_warps
warp 3, 7, 12, LAST_MAP
warp 4, 7, 12, LAST_MAP
db 0 ; signs
def_signs
db 3 ; objects
def_objects
object SPRITE_GRANNY, 3, 1, STAY, DOWN, 1 ; person
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

13
data/maps/objects/CeladonMansion1F.asm
View File

@ -1,25 +1,20 @@
CeladonMansion1F_Object:
db $f ; border block
db 5 ; warps
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
db 1 ; signs
def_signs
sign 4, 9, 5 ; CeladonMansion1Text5
db 4 ; objects
def_objects
object SPRITE_MONSTER, 0, 5, STAY, RIGHT, 1 ; person
object SPRITE_GRANNY, 1, 5, STAY, DOWN, 2 ; person
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

12
data/maps/objects/CeladonMansion2F.asm
View File

@ -1,19 +1,15 @@
CeladonMansion2F_Object:
db $f ; border block
db 4 ; warps
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
db 1 ; signs
def_signs
sign 4, 9, 1 ; CeladonMansion2Text1
db 0 ; objects
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

12
data/maps/objects/CeladonMansion3F.asm
View File

@ -1,26 +1,22 @@
CeladonMansion3F_Object:
db $f ; border block
db 4 ; warps
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
db 4 ; signs
def_signs
sign 1, 3, 5 ; CeladonMansion3Text5
sign 4, 3, 6 ; CeladonMansion3Text6
sign 1, 6, 7 ; CeladonMansion3Text7
sign 4, 9, 8 ; CeladonMansion3Text8
db 4 ; objects
def_objects
object SPRITE_BIKE_SHOP_CLERK, 0, 4, STAY, UP, 1 ; person
object SPRITE_CLERK, 3, 4, STAY, UP, 2 ; person
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

11
data/maps/objects/CeladonMansionRoof.asm
View File

@ -1,17 +1,14 @@
CeladonMansionRoof_Object:
db $9 ; border block
db 3 ; warps
def_warps
warp 6, 1, 1, CELADON_MANSION_3F
warp 2, 1, 2, CELADON_MANSION_3F
warp 2, 7, 0, CELADON_MANSION_ROOF_HOUSE
db 1 ; signs
def_signs
sign 3, 7, 1 ; CeladonMansion4Text1
db 0 ; objects
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

10
data/maps/objects/CeladonMansionRoofHouse.asm
View File

@ -1,16 +1,14 @@
CeladonMansionRoofHouse_Object:
db $a ; border block
db 2 ; warps
def_warps
warp 2, 7, 2, CELADON_MANSION_ROOF
warp 3, 7, 2, CELADON_MANSION_ROOF
db 0 ; signs
def_signs
db 2 ; objects
def_objects
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

14
data/maps/objects/CeladonMart1F.asm
View File

@ -1,7 +1,7 @@
CeladonMart1F_Object:
db $f ; border block
db 6 ; warps
def_warps
warp 2, 7, 0, LAST_MAP
warp 3, 7, 0, LAST_MAP
warp 16, 7, 1, LAST_MAP
@ -9,17 +9,11 @@ CeladonMart1F_Object:
warp 12, 1, 0, CELADON_MART_2F
warp 1, 1, 0, CELADON_MART_ELEVATOR
db 2 ; signs
def_signs
sign 11, 4, 2 ; CeladonMart1Text2
sign 14, 1, 3 ; CeladonMart1Text3
db 1 ; objects
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

11
data/maps/objects/CeladonMart2F.asm
View File

@ -1,21 +1,18 @@
CeladonMart2F_Object:
db $f ; border block
db 3 ; warps
def_warps
warp 12, 1, 4, CELADON_MART_1F
warp 16, 1, 1, CELADON_MART_3F
warp 1, 1, 0, CELADON_MART_ELEVATOR
db 1 ; signs
def_signs
sign 14, 1, 5 ; CeladonMart2Text5
db 4 ; objects
def_objects
object SPRITE_CLERK, 5, 3, STAY, DOWN, 1 ; person
object SPRITE_CLERK, 6, 3, STAY, DOWN, 2 ; person
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

11
data/maps/objects/CeladonMart3F.asm
View File

@ -1,12 +1,12 @@
CeladonMart3F_Object:
db $f ; border block
db 3 ; warps
def_warps
warp 12, 1, 0, CELADON_MART_4F
warp 16, 1, 1, CELADON_MART_2F
warp 1, 1, 0, CELADON_MART_ELEVATOR
db 12 ; signs
def_signs
sign 2, 4, 6 ; CeladonMart3Text6
sign 3, 4, 7 ; CeladonMart3Text7
sign 5, 4, 8 ; CeladonMart3Text8
@ -20,14 +20,11 @@ CeladonMart3F_Object:
sign 6, 1, 16 ; CeladonMart3Text16
sign 10, 1, 17 ; CeladonMart3Text17
db 5 ; objects
def_objects
object SPRITE_CLERK, 16, 5, STAY, NONE, 1 ; person
object SPRITE_GAMEBOY_KID, 11, 6, STAY, RIGHT, 2 ; person
object SPRITE_GAMEBOY_KID, 7, 2, STAY, DOWN, 3 ; person
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

11
data/maps/objects/CeladonMart4F.asm
View File

@ -1,20 +1,17 @@
CeladonMart4F_Object:
db $f ; border block
db 3 ; warps
def_warps
warp 12, 1, 0, CELADON_MART_3F
warp 16, 1, 1, CELADON_MART_5F
warp 1, 1, 0, CELADON_MART_ELEVATOR
db 1 ; signs
def_signs
sign 14, 1, 4 ; CeladonMart4Text4
db 3 ; objects
def_objects
object SPRITE_CLERK, 5, 7, STAY, NONE, 1 ; person
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

11
data/maps/objects/CeladonMart5F.asm
View File

@ -1,21 +1,18 @@
CeladonMart5F_Object:
db $f ; border block
db 3 ; warps
def_warps
warp 12, 1, 0, CELADON_MART_ROOF
warp 16, 1, 1, CELADON_MART_4F
warp 1, 1, 0, CELADON_MART_ELEVATOR
db 1 ; signs
def_signs
sign 14, 1, 5 ; CeladonMart5Text5
db 4 ; objects
def_objects
object SPRITE_GENTLEMAN, 14, 5, WALK, UP_DOWN, 1 ; person
object SPRITE_SAILOR, 2, 6, STAY, NONE, 2 ; person
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

10
data/maps/objects/CeladonMartElevator.asm
View File

@ -1,15 +1,13 @@
CeladonMartElevator_Object:
db $f ; border block
db 2 ; warps
def_warps
warp 1, 3, 5, CELADON_MART_1F
warp 2, 3, 5, CELADON_MART_1F
db 1 ; signs
def_signs
sign 3, 0, 1 ; CeladonMartElevatorText1
db 0 ; objects
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

9
data/maps/objects/CeladonMartRoof.asm
View File

@ -1,18 +1,17 @@
CeladonMartRoof_Object:
db $42 ; border block
db 1 ; warps
def_warps
warp 15, 2, 0, CELADON_MART_5F
db 4 ; signs
def_signs
sign 10, 1, 3 ; CeladonMartRoofText3
sign 11, 1, 4 ; CeladonMartRoofText4
sign 12, 2, 5 ; CeladonMartRoofText5
sign 13, 2, 6 ; CeladonMartRoofText6
db 2 ; objects
def_objects
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

10
data/maps/objects/CeladonPokecenter.asm
View File

@ -1,18 +1,16 @@
CeladonPokecenter_Object:
db $0 ; border block
db 2 ; warps
def_warps
warp 3, 7, 5, LAST_MAP
warp 4, 7, 5, LAST_MAP
db 0 ; signs
def_signs
db 4 ; objects
def_objects
object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
object SPRITE_GENTLEMAN, 7, 3, WALK, LEFT_RIGHT, 2 ; person
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

11
data/maps/objects/CeruleanBadgeHouse.asm
View File

@ -1,17 +1,14 @@
CeruleanBadgeHouse_Object:
db $c ; border block
db 3 ; warps
def_warps
warp 2, 0, 9, LAST_MAP
warp 2, 7, 8, LAST_MAP
warp 3, 7, 8, LAST_MAP
db 0 ; signs
def_signs
db 1 ; objects
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

17
data/maps/objects/CeruleanCave1F.asm
View File

@ -1,7 +1,7 @@
CeruleanCave1F_Object:
db $7d ; border block
db 9 ; warps
def_warps
warp 24, 17, 6, LAST_MAP
warp 25, 17, 6, LAST_MAP
warp 27, 1, 0, CERULEAN_CAVE_2F
@ -12,20 +12,11 @@ CeruleanCave1F_Object:
warp 3, 11, 5, CERULEAN_CAVE_2F
warp 0, 6, 0, CERULEAN_CAVE_B1F
db 0 ; signs
def_signs
db 3 ; objects
def_objects
object SPRITE_POKE_BALL, 7, 13, STAY, NONE, 1, FULL_RESTORE
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

14
data/maps/objects/CeruleanCave2F.asm
View File

@ -1,7 +1,7 @@
CeruleanCave2F_Object:
db $7d ; border block
db 6 ; warps
def_warps
warp 29, 1, 2, CERULEAN_CAVE_1F
warp 22, 6, 3, CERULEAN_CAVE_1F
warp 19, 7, 4, CERULEAN_CAVE_1F
@ -9,17 +9,11 @@ CeruleanCave2F_Object:
warp 1, 3, 6, CERULEAN_CAVE_1F
warp 3, 11, 7, CERULEAN_CAVE_1F
db 0 ; signs
def_signs
db 3 ; objects
def_objects
object SPRITE_POKE_BALL, 29, 9, STAY, NONE, 1, PP_UP
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

9
data/maps/objects/CeruleanCaveB1F.asm
View File

@ -1,15 +1,14 @@
CeruleanCaveB1F_Object:
db $7d ; border block
db 1 ; warps
def_warps
warp 3, 6, 8, CERULEAN_CAVE_1F
db 0 ; signs
def_signs
db 3 ; objects
def_objects
object SPRITE_MONSTER, 27, 13, STAY, DOWN, 1, MEWTWO, 70
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

18
data/maps/objects/CeruleanCity.asm
View File

@ -1,7 +1,7 @@
CeruleanCity_Object:
db $f ; border block
db 10 ; warps
def_warps
warp 27, 11, 0, CERULEAN_TRASHED_HOUSE
warp 13, 15, 0, CERULEAN_TRADE_HOUSE
warp 19, 17, 0, CERULEAN_POKECENTER
@ -13,7 +13,7 @@ CeruleanCity_Object:
warp 9, 11, 1, CERULEAN_BADGE_HOUSE
warp 9, 9, 0, CERULEAN_BADGE_HOUSE
db 6 ; signs
def_signs
sign 23, 19, 12 ; CeruleanCityText12
sign 17, 29, 13 ; CeruleanCityText13
sign 26, 25, 14 ; MartSignText
@ -21,7 +21,7 @@ CeruleanCity_Object:
sign 11, 25, 16 ; CeruleanCityText16
sign 27, 21, 17 ; CeruleanCityText17
db 11 ; objects
def_objects
object SPRITE_BLUE, 20, 2, STAY, DOWN, 1 ; person
object SPRITE_ROCKET, 30, 8, STAY, NONE, 2, OPP_ROCKET, 5
object SPRITE_COOLTRAINER_M, 31, 20, STAY, DOWN, 3 ; person
@ -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

10
data/maps/objects/CeruleanGym.asm
View File

@ -1,18 +1,16 @@
CeruleanGym_Object:
db $3 ; border block
db 2 ; warps
def_warps
warp 4, 13, 3, LAST_MAP
warp 5, 13, 3, LAST_MAP
db 0 ; signs
def_signs
db 4 ; objects
def_objects
object SPRITE_BRUNETTE_GIRL, 4, 2, STAY, DOWN, 1, OPP_MISTY, 1
object SPRITE_COOLTRAINER_F, 2, 3, STAY, RIGHT, 2, OPP_JR_TRAINER_F, 1
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

10
data/maps/objects/CeruleanMart.asm
View File

@ -1,17 +1,15 @@
CeruleanMart_Object:
db $0 ; border block
db 2 ; warps
def_warps
warp 3, 7, 5, LAST_MAP
warp 4, 7, 5, LAST_MAP
db 0 ; signs
def_signs
db 3 ; objects
def_objects
object SPRITE_CLERK, 0, 5, STAY, RIGHT, 1 ; person
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

10
data/maps/objects/CeruleanPokecenter.asm
View File

@ -1,18 +1,16 @@
CeruleanPokecenter_Object:
db $0 ; border block
db 2 ; warps
def_warps
warp 3, 7, 2, LAST_MAP
warp 4, 7, 2, LAST_MAP
db 0 ; signs
def_signs
db 4 ; objects
def_objects
object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
object SPRITE_SUPER_NERD, 10, 5, WALK, ANY_DIR, 2 ; person
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

10
data/maps/objects/CeruleanTradeHouse.asm
View File

@ -1,16 +1,14 @@
CeruleanTradeHouse_Object:
db $a ; border block
db 2 ; warps
def_warps
warp 2, 7, 1, LAST_MAP
warp 3, 7, 1, LAST_MAP
db 0 ; signs
def_signs
db 2 ; objects
def_objects
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

11
data/maps/objects/CeruleanTrashedHouse.asm
View File

@ -1,19 +1,16 @@
CeruleanTrashedHouse_Object:
db $a ; border block
db 3 ; warps
def_warps
warp 2, 7, 0, LAST_MAP
warp 3, 7, 0, LAST_MAP
warp 3, 0, 7, LAST_MAP
db 1 ; signs
def_signs
sign 3, 0, 3 ; CeruleanHouseTrashedText3
db 2 ; objects
def_objects
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

12
data/maps/objects/ChampionsRoom.asm
View File

@ -1,20 +1,16 @@
ChampionsRoom_Object:
db $3 ; border block
db 4 ; warps
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
db 0 ; signs
def_signs
db 2 ; objects
def_objects
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

10
data/maps/objects/CinnabarGym.asm
View File

@ -1,13 +1,13 @@
CinnabarGym_Object:
db $2e ; border block
db 2 ; warps
def_warps
warp 16, 17, 1, LAST_MAP
warp 17, 17, 1, LAST_MAP
db 0 ; signs
def_signs
db 9 ; objects
def_objects
object SPRITE_MIDDLE_AGED_MAN, 3, 3, STAY, DOWN, 1, OPP_BLAINE, 1
object SPRITE_SUPER_NERD, 17, 2, STAY, DOWN, 2, OPP_SUPER_NERD, 9
object SPRITE_SUPER_NERD, 17, 8, STAY, DOWN, 3, OPP_BURGLAR, 4
@ -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

13
data/maps/objects/CinnabarIsland.asm
View File

@ -1,27 +1,22 @@
CinnabarIsland_Object:
db $43 ; border block
db 5 ; warps
def_warps
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
db 5 ; signs
def_signs
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
db 2 ; objects
def_objects
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

13
data/maps/objects/CinnabarLab.asm
View File

@ -1,25 +1,20 @@
CinnabarLab_Object:
db $17 ; border block
db 5 ; warps
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
db 4 ; signs
def_signs
sign 3, 2, 2 ; Lab1Text2
sign 9, 4, 3 ; Lab1Text3
sign 13, 4, 4 ; Lab1Text4
sign 17, 4, 5 ; Lab1Text5
db 1 ; objects
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

10
data/maps/objects/CinnabarLabFossilRoom.asm
View File

@ -1,16 +1,14 @@
CinnabarLabFossilRoom_Object:
db $17 ; border block
db 2 ; warps
def_warps
warp 2, 7, 4, CINNABAR_LAB
warp 3, 7, 4, CINNABAR_LAB
db 0 ; signs
def_signs
db 2 ; objects
def_objects
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

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

@ -1,19 +1,17 @@
CinnabarLabMetronomeRoom_Object:
db $17 ; border block
db 2 ; warps
def_warps
warp 2, 7, 3, CINNABAR_LAB
warp 3, 7, 3, CINNABAR_LAB
db 3 ; signs
def_signs
sign 0, 4, 3 ; Lab3Text3
sign 1, 4, 4 ; Lab3Text4
sign 2, 1, 5 ; Lab3Text5
db 2 ; objects
def_objects
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

10
data/maps/objects/CinnabarLabTradeRoom.asm
View File

@ -1,17 +1,15 @@
CinnabarLabTradeRoom_Object:
db $17 ; border block
db 2 ; warps
def_warps
warp 2, 7, 2, CINNABAR_LAB
warp 3, 7, 2, CINNABAR_LAB
db 0 ; signs
def_signs
db 3 ; objects
def_objects
object SPRITE_SUPER_NERD, 3, 2, STAY, DOWN, 1 ; person
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

10
data/maps/objects/CinnabarMart.asm
View File

@ -1,17 +1,15 @@
CinnabarMart_Object:
db $0 ; border block
db 2 ; warps
def_warps
warp 3, 7, 4, LAST_MAP
warp 4, 7, 4, LAST_MAP
db 0 ; signs
def_signs
db 3 ; objects
def_objects
object SPRITE_CLERK, 0, 5, STAY, RIGHT, 1 ; person
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

10
data/maps/objects/CinnabarPokecenter.asm
View File

@ -1,18 +1,16 @@
CinnabarPokecenter_Object:
db $0 ; border block
db 2 ; warps
def_warps
warp 3, 7, 3, LAST_MAP
warp 4, 7, 3, LAST_MAP
db 0 ; signs
def_signs
db 4 ; objects
def_objects
object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
object SPRITE_COOLTRAINER_F, 9, 4, WALK, ANY_DIR, 2 ; person
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

8
data/maps/objects/Colosseum.asm
View File

@ -1,9 +1,11 @@
Colosseum_Object:
db $e ; border block
db 0 ; warps
def_warps
db 0 ; signs
def_signs
db 1 ; objects
def_objects
object SPRITE_RED, 2, 2, STAY, 0, 1 ; person
def_warps_to COLOSSEUM

11
data/maps/objects/CopycatsHouse1F.asm
View File

@ -1,19 +1,16 @@
CopycatsHouse1F_Object:
db $a ; border block
db 3 ; warps
def_warps
warp 2, 7, 0, LAST_MAP
warp 3, 7, 0, LAST_MAP
warp 7, 1, 0, COPYCATS_HOUSE_2F
db 0 ; signs
def_signs
db 3 ; objects
def_objects
object SPRITE_MIDDLE_AGED_WOMAN, 2, 2, STAY, DOWN, 1 ; person
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

9
data/maps/objects/CopycatsHouse2F.asm
View File

@ -1,19 +1,18 @@
CopycatsHouse2F_Object:
db $a ; border block
db 1 ; warps
def_warps
warp 7, 1, 2, COPYCATS_HOUSE_1F
db 2 ; signs
def_signs
sign 3, 5, 6 ; CopycatsHouse2FText6
sign 0, 1, 7 ; CopycatsHouse2FText7
db 5 ; objects
def_objects
object SPRITE_BRUNETTE_GIRL, 4, 3, WALK, ANY_DIR, 1 ; person
object SPRITE_BIRD, 4, 6, WALK, LEFT_RIGHT, 2 ; person
object SPRITE_MONSTER, 5, 1, STAY, DOWN, 3 ; person
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

10
data/maps/objects/Daycare.asm
View File

@ -1,15 +1,13 @@
Daycare_Object:
db $a ; border block
db 2 ; warps
def_warps
warp 2, 7, 4, LAST_MAP
warp 3, 7, 4, LAST_MAP
db 0 ; signs
def_signs
db 1 ; objects
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

10
data/maps/objects/DiglettsCave.asm
View File

@ -1,14 +1,12 @@
DiglettsCave_Object:
db $19 ; border block
db 2 ; warps
def_warps
warp 5, 5, 2, DIGLETTS_CAVE_ROUTE_2
warp 37, 31, 2, DIGLETTS_CAVE_ROUTE_11
db 0 ; signs
def_signs
db 0 ; objects
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

11
data/maps/objects/DiglettsCaveRoute11.asm
View File

@ -1,17 +1,14 @@
DiglettsCaveRoute11_Object:
db $7d ; border block
db 3 ; warps
def_warps
warp 2, 7, 4, LAST_MAP
warp 3, 7, 4, LAST_MAP
warp 4, 4, 1, DIGLETTS_CAVE
db 0 ; signs
def_signs
db 1 ; objects
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

11
data/maps/objects/DiglettsCaveRoute2.asm
View File

@ -1,17 +1,14 @@
DiglettsCaveRoute2_Object:
db $7d ; border block
db 3 ; warps
def_warps
warp 2, 7, 0, LAST_MAP
warp 3, 7, 0, LAST_MAP
warp 4, 4, 0, DIGLETTS_CAVE
db 0 ; signs
def_signs
db 1 ; objects
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

10
data/maps/objects/FightingDojo.asm
View File

@ -1,13 +1,13 @@
FightingDojo_Object:
db $3 ; border block
db 2 ; warps
def_warps
warp 4, 11, 1, LAST_MAP
warp 5, 11, 1, LAST_MAP
db 0 ; signs
def_signs
db 7 ; objects
def_objects
object SPRITE_HIKER, 5, 3, STAY, DOWN, 1, OPP_BLACKBELT, 1
object SPRITE_HIKER, 3, 4, STAY, RIGHT, 2, OPP_BLACKBELT, 2
object SPRITE_HIKER, 3, 6, STAY, RIGHT, 3, OPP_BLACKBELT, 3
@ -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

10
data/maps/objects/FuchsiaBillsGrandpasHouse.asm
View File

@ -1,17 +1,15 @@
FuchsiaBillsGrandpasHouse_Object:
db $a ; border block
db 2 ; warps
def_warps
warp 2, 7, 1, LAST_MAP
warp 3, 7, 1, LAST_MAP
db 0 ; signs
def_signs
db 3 ; objects
def_objects
object SPRITE_MIDDLE_AGED_WOMAN, 2, 3, STAY, RIGHT, 1 ; person
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

17
data/maps/objects/FuchsiaCity.asm
View File

@ -1,7 +1,7 @@
FuchsiaCity_Object:
db $f ; border block
db 9 ; warps
def_warps
warp 5, 13, 0, FUCHSIA_MART
warp 11, 27, 0, FUCHSIA_BILLS_GRANDPAS_HOUSE
warp 19, 27, 0, FUCHSIA_POKECENTER
@ -12,7 +12,7 @@ FuchsiaCity_Object:
warp 31, 27, 1, FUCHSIA_GOOD_ROD_HOUSE
warp 31, 24, 0, FUCHSIA_GOOD_ROD_HOUSE
db 14 ; signs
def_signs
sign 15, 23, 11 ; FuchsiaCityText11
sign 25, 15, 12 ; FuchsiaCityText12
sign 17, 5, 13 ; FuchsiaCityText13
@ -28,7 +28,7 @@ FuchsiaCity_Object:
sign 13, 15, 23 ; FuchsiaCityText23
sign 7, 7, 24 ; FuchsiaCityText24
db 10 ; objects
def_objects
object SPRITE_YOUNGSTER, 10, 12, WALK, LEFT_RIGHT, 1 ; person
object SPRITE_GAMBLER, 28, 17, WALK, LEFT_RIGHT, 2 ; person
object SPRITE_FISHER, 30, 14, STAY, DOWN, 3 ; person
@ -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

11
data/maps/objects/FuchsiaGoodRodHouse.asm
View File

@ -1,17 +1,14 @@
FuchsiaGoodRodHouse_Object:
db $c ; border block
db 3 ; warps
def_warps
warp 2, 0, 8, LAST_MAP
warp 2, 7, 7, LAST_MAP
warp 3, 7, 7, LAST_MAP
db 0 ; signs
def_signs
db 1 ; objects
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

10
data/maps/objects/FuchsiaGym.asm
View File

@ -1,13 +1,13 @@
FuchsiaGym_Object:
db $3 ; border block
db 2 ; warps
def_warps
warp 4, 17, 5, LAST_MAP
warp 5, 17, 5, LAST_MAP
db 0 ; signs
def_signs
db 8 ; objects
def_objects
object SPRITE_KOGA, 4, 10, STAY, DOWN, 1, OPP_KOGA, 1
object SPRITE_ROCKER, 8, 13, STAY, DOWN, 2, OPP_JUGGLER, 7
object SPRITE_ROCKER, 7, 8, STAY, RIGHT, 3, OPP_JUGGLER, 3
@ -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

10
data/maps/objects/FuchsiaMart.asm
View File

@ -1,17 +1,15 @@
FuchsiaMart_Object:
db $0 ; border block
db 2 ; warps
def_warps
warp 3, 7, 0, LAST_MAP
warp 4, 7, 0, LAST_MAP
db 0 ; signs
def_signs
db 3 ; objects
def_objects
object SPRITE_CLERK, 0, 5, STAY, RIGHT, 1 ; person
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

10
data/maps/objects/FuchsiaMeetingRoom.asm
View File

@ -1,17 +1,15 @@
FuchsiaMeetingRoom_Object:
db $17 ; border block
db 2 ; warps
def_warps
warp 4, 7, 6, LAST_MAP
warp 5, 7, 6, LAST_MAP
db 0 ; signs
def_signs
db 3 ; objects
def_objects
object SPRITE_SAFARI_ZONE_WORKER, 4, 1, STAY, DOWN, 1 ; person
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

10
data/maps/objects/FuchsiaPokecenter.asm
View File

@ -1,18 +1,16 @@
FuchsiaPokecenter_Object:
db $0 ; border block
db 2 ; warps
def_warps
warp 3, 7, 2, LAST_MAP
warp 4, 7, 2, LAST_MAP
db 0 ; signs
def_signs
db 4 ; objects
def_objects
object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
object SPRITE_ROCKER, 2, 3, STAY, NONE, 2 ; person
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

11
data/maps/objects/GameCorner.asm
View File

@ -1,15 +1,15 @@
GameCorner_Object:
db $f ; border block
db 3 ; warps
def_warps
warp 15, 17, 7, LAST_MAP
warp 16, 17, 7, LAST_MAP
warp 17, 4, 1, ROCKET_HIDEOUT_B1F
db 1 ; signs
def_signs
sign 9, 4, 12 ; CeladonGameCornerText12
db 11 ; objects
def_objects
object SPRITE_BEAUTY, 2, 6, STAY, DOWN, 1 ; person
object SPRITE_CLERK, 5, 6, STAY, DOWN, 2 ; person
object SPRITE_MIDDLE_AGED_MAN, 2, 10, STAY, LEFT, 3 ; person
@ -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

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

@ -1,19 +1,17 @@
GameCornerPrizeRoom_Object:
db $f ; border block
db 2 ; warps
def_warps
warp 4, 7, 9, LAST_MAP
warp 5, 7, 9, LAST_MAP
db 3 ; signs
def_signs
sign 2, 2, 3 ; CeladonPrizeRoomText3
sign 4, 2, 4 ; CeladonPrizeRoomText4
sign 6, 2, 5 ; CeladonPrizeRoomText5
db 2 ; objects
def_objects
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

10
data/maps/objects/HallOfFame.asm
View File

@ -1,15 +1,13 @@
HallOfFame_Object:
db $3 ; border block
db 2 ; warps
def_warps
warp 4, 7, 2, CHAMPIONS_ROOM
warp 5, 7, 3, CHAMPIONS_ROOM
db 0 ; signs
def_signs
db 1 ; objects
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

10
data/maps/objects/IndigoPlateau.asm
View File

@ -1,14 +1,12 @@
IndigoPlateau_Object:
db $e ; border block
db 2 ; warps
def_warps
warp 9, 5, 0, INDIGO_PLATEAU_LOBBY
warp 10, 5, 0, INDIGO_PLATEAU_LOBBY
db 0 ; signs
def_signs
db 0 ; objects
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

11
data/maps/objects/IndigoPlateauLobby.asm
View File

@ -1,21 +1,18 @@
IndigoPlateauLobby_Object:
db $0 ; border block
db 3 ; warps
def_warps
warp 7, 11, 0, LAST_MAP
warp 8, 11, 1, LAST_MAP
warp 8, 0, 0, LORELEIS_ROOM
db 0 ; signs
def_signs
db 5 ; objects
def_objects
object SPRITE_NURSE, 7, 5, STAY, DOWN, 1 ; person
object SPRITE_GYM_GUIDE, 4, 9, STAY, RIGHT, 2 ; person
object SPRITE_COOLTRAINER_F, 5, 1, STAY, DOWN, 3 ; person
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

11
data/maps/objects/LancesRoom.asm
View File

@ -1,17 +1,14 @@
LancesRoom_Object:
db $3 ; border block
db 3 ; warps
def_warps
warp 24, 16, 2, AGATHAS_ROOM
warp 5, 0, 0, CHAMPIONS_ROOM
warp 6, 0, 0, CHAMPIONS_ROOM
db 0 ; signs
def_signs
db 1 ; objects
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

10
data/maps/objects/LavenderCuboneHouse.asm
View File

@ -1,16 +1,14 @@
LavenderCuboneHouse_Object:
db $a ; border block
db 2 ; warps
def_warps
warp 2, 7, 4, LAST_MAP
warp 3, 7, 4, LAST_MAP
db 0 ; signs
def_signs
db 2 ; objects
def_objects
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

10
data/maps/objects/LavenderMart.asm
View File

@ -1,17 +1,15 @@
LavenderMart_Object:
db $0 ; border block
db 2 ; warps
def_warps
warp 3, 7, 3, LAST_MAP
warp 4, 7, 3, LAST_MAP
db 0 ; signs
def_signs
db 3 ; objects
def_objects
object SPRITE_CLERK, 0, 5, STAY, RIGHT, 1 ; person
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

10
data/maps/objects/LavenderPokecenter.asm
View File

@ -1,18 +1,16 @@
LavenderPokecenter_Object:
db $0 ; border block
db 2 ; warps
def_warps
warp 3, 7, 0, LAST_MAP
warp 4, 7, 0, LAST_MAP
db 0 ; signs
def_signs
db 4 ; objects
def_objects
object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
object SPRITE_GENTLEMAN, 5, 3, STAY, NONE, 2 ; person
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

14
data/maps/objects/LavenderTown.asm
View File

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

12
data/maps/objects/LoreleisRoom.asm
View File

@ -1,19 +1,15 @@
LoreleisRoom_Object:
db $3 ; border block
db 4 ; warps
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
db 0 ; signs
def_signs
db 1 ; objects
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

10
data/maps/objects/MrFujisHouse.asm
View File

@ -1,13 +1,13 @@
MrFujisHouse_Object:
db $a ; border block
db 2 ; warps
def_warps
warp 2, 7, 2, LAST_MAP
warp 3, 7, 2, LAST_MAP
db 0 ; signs
def_signs
db 6 ; objects
def_objects
object SPRITE_SUPER_NERD, 3, 5, STAY, NONE, 1 ; person
object SPRITE_LITTLE_GIRL, 6, 3, STAY, DOWN, 2 ; person
object SPRITE_MONSTER, 6, 4, STAY, UP, 3 ; person
@ -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

10
data/maps/objects/MrPsychicsHouse.asm
View File

@ -1,15 +1,13 @@
MrPsychicsHouse_Object:
db $a ; border block
db 2 ; warps
def_warps
warp 2, 7, 7, LAST_MAP
warp 3, 7, 7, LAST_MAP
db 0 ; signs
def_signs
db 1 ; objects
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

13
data/maps/objects/MtMoon1F.asm
View File

@ -1,17 +1,17 @@
MtMoon1F_Object:
db $3 ; border block
db 5 ; warps
def_warps
warp 14, 35, 1, LAST_MAP
warp 15, 35, 1, LAST_MAP
warp 5, 5, 0, MT_MOON_B1F
warp 17, 11, 2, MT_MOON_B1F
warp 25, 15, 3, MT_MOON_B1F
db 1 ; signs
def_signs
sign 15, 23, 14 ; MtMoon1Text14
db 13 ; objects
def_objects
object SPRITE_HIKER, 5, 6, STAY, DOWN, 1, OPP_HIKER, 1
object SPRITE_YOUNGSTER, 12, 16, STAY, RIGHT, 2, OPP_YOUNGSTER, 3
object SPRITE_COOLTRAINER_F, 30, 4, STAY, DOWN, 3, OPP_LASS, 5
@ -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

16
data/maps/objects/MtMoonB1F.asm
View File

@ -1,7 +1,7 @@
MtMoonB1F_Object:
db $3 ; border block
db 8 ; warps
def_warps
warp 5, 5, 2, MT_MOON_1F
warp 17, 11, 0, MT_MOON_B2F
warp 25, 9, 3, MT_MOON_1F
@ -11,16 +11,8 @@ MtMoonB1F_Object:
warp 23, 3, 3, MT_MOON_B2F
warp 27, 3, 2, LAST_MAP
db 0 ; signs
def_signs
db 0 ; objects
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

12
data/maps/objects/MtMoonB2F.asm
View File

@ -1,15 +1,15 @@
MtMoonB2F_Object:
db $3 ; border block
db 4 ; warps
def_warps
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
db 0 ; signs
def_signs
db 9 ; objects
def_objects
object SPRITE_SUPER_NERD, 12, 8, STAY, RIGHT, 1, OPP_SUPER_NERD, 2
object SPRITE_ROCKET, 11, 16, STAY, DOWN, 2, OPP_ROCKET, 1
object SPRITE_ROCKET, 15, 22, STAY, DOWN, 3, OPP_ROCKET, 2
@ -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

10
data/maps/objects/MtMoonPokecenter.asm
View File

@ -1,13 +1,13 @@
MtMoonPokecenter_Object:
db $0 ; border block
db 2 ; warps
def_warps
warp 3, 7, 0, LAST_MAP
warp 4, 7, 0, LAST_MAP
db 0 ; signs
def_signs
db 6 ; objects
def_objects
object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
object SPRITE_YOUNGSTER, 4, 3, STAY, UP, 2 ; person
object SPRITE_GENTLEMAN, 7, 3, STAY, UP, 3 ; person
@ -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

13
data/maps/objects/Museum1F.asm
View File

@ -1,25 +1,20 @@
Museum1F_Object:
db $a ; border block
db 5 ; warps
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
db 0 ; signs
def_signs
db 5 ; objects
def_objects
object SPRITE_SCIENTIST, 12, 4, STAY, LEFT, 1 ; person
object SPRITE_GAMBLER, 1, 4, STAY, NONE, 2 ; person
object SPRITE_SCIENTIST, 15, 2, STAY, DOWN, 3 ; person
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

9
data/maps/objects/Museum2F.asm
View File

@ -1,19 +1,18 @@
Museum2F_Object:
db $a ; border block
db 1 ; warps
def_warps
warp 7, 7, 4, MUSEUM_1F
db 2 ; signs
def_signs
sign 11, 2, 6 ; Museum2FText6
sign 2, 5, 7 ; Museum2FText7
db 5 ; objects
def_objects
object SPRITE_YOUNGSTER, 1, 7, WALK, LEFT_RIGHT, 1 ; person
object SPRITE_GRAMPS, 0, 5, STAY, DOWN, 2 ; person
object SPRITE_SCIENTIST, 7, 5, STAY, DOWN, 3 ; person
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

10
data/maps/objects/NameRatersHouse.asm
View File

@ -1,15 +1,13 @@
NameRatersHouse_Object:
db $a ; border block
db 2 ; warps
def_warps
warp 2, 7, 5, LAST_MAP
warp 3, 7, 5, LAST_MAP
db 0 ; signs
def_signs
db 1 ; objects
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

10
data/maps/objects/OaksLab.asm
View File

@ -1,13 +1,13 @@
OaksLab_Object:
db $3 ; border block
db 2 ; warps
def_warps
warp 4, 11, 2, LAST_MAP
warp 5, 11, 2, LAST_MAP
db 0 ; signs
def_signs
db 11 ; objects
def_objects
object SPRITE_BLUE, 4, 3, STAY, NONE, 1, OPP_RIVAL1, 1
object SPRITE_POKE_BALL, 6, 3, STAY, NONE, 2 ; person
object SPRITE_POKE_BALL, 7, 3, STAY, NONE, 3 ; person
@ -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

11
data/maps/objects/PalletTown.asm
View File

@ -1,23 +1,20 @@
PalletTown_Object:
db $b ; border block
db 3 ; warps
def_warps
warp 5, 5, 0, REDS_HOUSE_1F
warp 13, 5, 0, BLUES_HOUSE
warp 12, 11, 1, OAKS_LAB
db 4 ; signs
def_signs
sign 13, 13, 4 ; PalletTownText4
sign 7, 9, 5 ; PalletTownText5
sign 3, 5, 6 ; PalletTownText6
sign 11, 5, 7 ; PalletTownText7
db 3 ; objects
def_objects
object SPRITE_OAK, 8, 5, STAY, NONE, 1 ; person
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

15
data/maps/objects/PewterCity.asm
View File

@ -1,7 +1,7 @@
PewterCity_Object:
db $a ; border block
db 7 ; warps
def_warps
warp 14, 7, 0, MUSEUM_1F
warp 19, 5, 2, MUSEUM_1F
warp 16, 17, 0, PEWTER_GYM
@ -10,7 +10,7 @@ PewterCity_Object:
warp 7, 29, 0, PEWTER_SPEECH_HOUSE
warp 13, 25, 0, PEWTER_POKECENTER
db 7 ; signs
def_signs
sign 19, 29, 6 ; PewterCityText6
sign 33, 19, 7 ; PewterCityText7
sign 24, 17, 8 ; MartSignText
@ -19,18 +19,11 @@ PewterCity_Object:
sign 11, 17, 11 ; PewterCityText11
sign 25, 23, 12 ; PewterCityText12
db 5 ; objects
def_objects
object SPRITE_COOLTRAINER_F, 8, 15, STAY, NONE, 1 ; person
object SPRITE_COOLTRAINER_M, 17, 25, STAY, NONE, 2 ; person
object SPRITE_SUPER_NERD, 27, 17, STAY, NONE, 3 ; person
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

10
data/maps/objects/PewterGym.asm
View File

@ -1,17 +1,15 @@
PewterGym_Object:
db $3 ; border block
db 2 ; warps
def_warps
warp 4, 13, 2, LAST_MAP
warp 5, 13, 2, LAST_MAP
db 0 ; signs
def_signs
db 3 ; objects
def_objects
object SPRITE_SUPER_NERD, 4, 1, STAY, DOWN, 1, OPP_BROCK, 1
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

10
data/maps/objects/PewterMart.asm
View File

@ -1,17 +1,15 @@
PewterMart_Object:
db $0 ; border block
db 2 ; warps
def_warps
warp 3, 7, 4, LAST_MAP
warp 4, 7, 4, LAST_MAP
db 0 ; signs
def_signs
db 3 ; objects
def_objects
object SPRITE_CLERK, 0, 5, STAY, RIGHT, 1 ; person
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

10
data/maps/objects/PewterNidoranHouse.asm
View File

@ -1,17 +1,15 @@
PewterNidoranHouse_Object:
db $a ; border block
db 2 ; warps
def_warps
warp 2, 7, 3, LAST_MAP
warp 3, 7, 3, LAST_MAP
db 0 ; signs
def_signs
db 3 ; objects
def_objects
object SPRITE_MONSTER, 4, 5, STAY, LEFT, 1 ; person
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

10
data/maps/objects/PewterPokecenter.asm
View File

@ -1,18 +1,16 @@
PewterPokecenter_Object:
db $0 ; border block
db 2 ; warps
def_warps
warp 3, 7, 6, LAST_MAP
warp 4, 7, 6, LAST_MAP
db 0 ; signs
def_signs
db 4 ; objects
def_objects
object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
object SPRITE_GENTLEMAN, 11, 7, STAY, LEFT, 2 ; person
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

10
data/maps/objects/PewterSpeechHouse.asm
View File

@ -1,16 +1,14 @@
PewterSpeechHouse_Object:
db $a ; border block
db 2 ; warps
def_warps
warp 2, 7, 5, LAST_MAP
warp 3, 7, 5, LAST_MAP
db 0 ; signs
def_signs
db 2 ; objects
def_objects
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

10
data/maps/objects/PokemonFanClub.asm
View File

@ -1,15 +1,15 @@
PokemonFanClub_Object:
db $d ; border block
db 2 ; warps
def_warps
warp 2, 7, 1, LAST_MAP
warp 3, 7, 1, LAST_MAP
db 2 ; signs
def_signs
sign 1, 0, 7 ; FanClubText7
sign 6, 0, 8 ; FanClubText8
db 6 ; objects
def_objects
object SPRITE_FISHER, 6, 3, STAY, LEFT, 1 ; person
object SPRITE_GIRL, 1, 3, STAY, RIGHT, 2 ; person
object SPRITE_FAIRY, 6, 4, STAY, LEFT, 3 ; person
@ -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

16
data/maps/objects/PokemonMansion1F.asm
View File

@ -1,7 +1,7 @@
PokemonMansion1F_Object:
db $2e ; border block
db 8 ; warps
def_warps
warp 4, 27, 0, LAST_MAP
warp 5, 27, 0, LAST_MAP
warp 6, 27, 0, LAST_MAP
@ -11,19 +11,11 @@ PokemonMansion1F_Object:
warp 26, 27, 0, LAST_MAP
warp 27, 27, 0, LAST_MAP
db 0 ; signs
def_signs
db 3 ; objects
def_objects
object SPRITE_SCIENTIST, 17, 17, STAY, LEFT, 1, OPP_SCIENTIST, 4
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

12
data/maps/objects/PokemonMansion2F.asm
View File

@ -1,22 +1,18 @@
PokemonMansion2F_Object:
db $1 ; border block
db 4 ; warps
def_warps
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
db 0 ; signs
def_signs
db 4 ; objects
def_objects
object SPRITE_SUPER_NERD, 3, 17, WALK, LEFT_RIGHT, 1, OPP_BURGLAR, 7
object SPRITE_POKE_BALL, 28, 7, STAY, NONE, 2, CALCIUM
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

11
data/maps/objects/PokemonMansion3F.asm
View File

@ -1,21 +1,18 @@
PokemonMansion3F_Object:
db $1 ; border block
db 3 ; warps
def_warps
warp 7, 10, 1, POKEMON_MANSION_2F
warp 6, 1, 3, POKEMON_MANSION_2F
warp 25, 14, 2, POKEMON_MANSION_2F
db 0 ; signs
def_signs
db 5 ; objects
def_objects
object SPRITE_SUPER_NERD, 5, 11, WALK, LEFT_RIGHT, 1, OPP_BURGLAR, 8
object SPRITE_SCIENTIST, 20, 11, STAY, LEFT, 2, OPP_SCIENTIST, 12
object SPRITE_POKE_BALL, 1, 16, STAY, NONE, 3, MAX_POTION
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

9
data/maps/objects/PokemonMansionB1F.asm
View File

@ -1,12 +1,12 @@
PokemonMansionB1F_Object:
db $1 ; border block
db 1 ; warps
def_warps
warp 23, 22, 5, POKEMON_MANSION_1F
db 0 ; signs
def_signs
db 8 ; objects
def_objects
object SPRITE_SUPER_NERD, 16, 23, STAY, NONE, 1, OPP_BURGLAR, 9
object SPRITE_SCIENTIST, 27, 11, STAY, DOWN, 2, OPP_SCIENTIST, 13
object SPRITE_POKE_BALL, 10, 2, STAY, NONE, 3, RARE_CANDY
@ -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

11
data/maps/objects/PokemonTower1F.asm
View File

@ -1,21 +1,18 @@
PokemonTower1F_Object:
db $1 ; border block
db 3 ; warps
def_warps
warp 10, 17, 1, LAST_MAP
warp 11, 17, 1, LAST_MAP
warp 18, 9, 1, POKEMON_TOWER_2F
db 0 ; signs
def_signs
db 5 ; objects
def_objects
object SPRITE_LINK_RECEPTIONIST, 15, 13, STAY, UP, 1 ; person
object SPRITE_MIDDLE_AGED_WOMAN, 6, 8, STAY, NONE, 2 ; person
object SPRITE_BALDING_GUY, 8, 12, STAY, NONE, 3 ; person
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

10
data/maps/objects/PokemonTower2F.asm
View File

@ -1,16 +1,14 @@
PokemonTower2F_Object:
db $1 ; border block
db 2 ; warps
def_warps
warp 3, 9, 0, POKEMON_TOWER_3F
warp 18, 9, 2, POKEMON_TOWER_1F
db 0 ; signs
def_signs
db 2 ; objects
def_objects
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

10
data/maps/objects/PokemonTower3F.asm
View File

@ -1,18 +1,16 @@
PokemonTower3F_Object:
db $1 ; border block
db 2 ; warps
def_warps
warp 3, 9, 0, POKEMON_TOWER_2F
warp 18, 9, 1, POKEMON_TOWER_4F
db 0 ; signs
def_signs
db 4 ; objects
def_objects
object SPRITE_CHANNELER, 12, 3, STAY, LEFT, 1, OPP_CHANNELER, 5
object SPRITE_CHANNELER, 9, 8, STAY, DOWN, 2, OPP_CHANNELER, 6
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

10
data/maps/objects/PokemonTower4F.asm
View File

@ -1,13 +1,13 @@
PokemonTower4F_Object:
db $1 ; border block
db 2 ; warps
def_warps
warp 3, 9, 0, POKEMON_TOWER_5F
warp 18, 9, 1, POKEMON_TOWER_3F
db 0 ; signs
def_signs
db 6 ; objects
def_objects
object SPRITE_CHANNELER, 5, 10, STAY, RIGHT, 1, OPP_CHANNELER, 9
object SPRITE_CHANNELER, 15, 7, STAY, DOWN, 2, OPP_CHANNELER, 10
object SPRITE_CHANNELER, 14, 12, STAY, LEFT, 3, OPP_CHANNELER, 12
@ -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

10
data/maps/objects/PokemonTower5F.asm
View File

@ -1,13 +1,13 @@
PokemonTower5F_Object:
db $1 ; border block
db 2 ; warps
def_warps
warp 3, 9, 0, POKEMON_TOWER_4F
warp 18, 9, 0, POKEMON_TOWER_6F
db 0 ; signs
def_signs
db 6 ; objects
def_objects
object SPRITE_CHANNELER, 12, 8, STAY, NONE, 1 ; person
object SPRITE_CHANNELER, 17, 7, STAY, LEFT, 2, OPP_CHANNELER, 14
object SPRITE_CHANNELER, 14, 3, STAY, LEFT, 3, OPP_CHANNELER, 16
@ -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

10
data/maps/objects/PokemonTower6F.asm
View File

@ -1,19 +1,17 @@
PokemonTower6F_Object:
db $1 ; border block
db 2 ; warps
def_warps
warp 18, 9, 1, POKEMON_TOWER_5F
warp 9, 16, 0, POKEMON_TOWER_7F
db 0 ; signs
def_signs
db 5 ; objects
def_objects
object SPRITE_CHANNELER, 12, 10, STAY, RIGHT, 1, OPP_CHANNELER, 19
object SPRITE_CHANNELER, 9, 5, STAY, DOWN, 2, OPP_CHANNELER, 20
object SPRITE_CHANNELER, 16, 5, STAY, LEFT, 3, OPP_CHANNELER, 21
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

9
data/maps/objects/PokemonTower7F.asm
View File

@ -1,16 +1,15 @@
PokemonTower7F_Object:
db $1 ; border block
db 1 ; warps
def_warps
warp 9, 16, 1, POKEMON_TOWER_6F
db 0 ; signs
def_signs
db 4 ; objects
def_objects
object SPRITE_ROCKET, 9, 11, STAY, RIGHT, 1, OPP_ROCKET, 19
object SPRITE_ROCKET, 12, 9, STAY, LEFT, 2, OPP_ROCKET, 20
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

11
data/maps/objects/PowerPlant.asm
View File

@ -1,14 +1,14 @@
PowerPlant_Object:
db $2e ; border block
db 3 ; warps
def_warps
warp 4, 35, 3, LAST_MAP
warp 5, 35, 3, LAST_MAP
warp 0, 11, 3, LAST_MAP
db 0 ; signs
def_signs
db 14 ; objects
def_objects
object SPRITE_POKE_BALL, 9, 20, STAY, NONE, 1, VOLTORB, 40
object SPRITE_POKE_BALL, 32, 18, STAY, NONE, 2, VOLTORB, 40
object SPRITE_POKE_BALL, 21, 25, STAY, NONE, 3, VOLTORB, 40
@ -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

11
data/maps/objects/RedsHouse1F.asm
View File

@ -1,18 +1,15 @@
RedsHouse1F_Object:
db $a ; border block
db 3 ; warps
def_warps
warp 2, 7, 0, LAST_MAP ; exit1
warp 3, 7, 0, LAST_MAP ; exit2
warp 7, 1, 0, REDS_HOUSE_2F ; staircase
db 1 ; signs
def_signs
sign 3, 1, 2 ; TV
db 1 ; objects
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

9
data/maps/objects/RedsHouse2F.asm
View File

@ -1,12 +1,11 @@
RedsHouse2F_Object:
db $a ; border block
db 1 ; warps
def_warps
warp 7, 1, 2, REDS_HOUSE_1F
db 0 ; signs
def_signs
db 0 ; objects
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