thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-12-05 19:10:07 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix object constant names

Browse source 
swap LEFT and RIGHT
FACE is better named STAY because sprites that have no range do not
necessarily face any direction
STAY has been renamed to NONE because sprites that use this will
spin randomly, except for the item/voltorb/electrode sprite

I never should have listened to https://github.com/iimarckus/pokered/issues/89
This commit is contained in:
dannye 2015-07-18 22:36:22 -05:00
parent 0e48333fb8
commit 4452acb021
204 changed files with 830 additions and 830 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/mapObjects/agatha.asm
View file

@ -10,7 +10,7 @@ AgathaObject: ; 0x76534 (size=44)
db $0 ; signs
db $1 ; objects
object SPRITE_AGATHA, $5, $2, FACE, DOWN, $1, AGATHA + $C8, $1
object SPRITE_AGATHA, $5, $2, STAY, DOWN, $1, AGATHA + $C8, $1
; warp-to
EVENT_DISP AGATHAS_ROOM_WIDTH, $b, $4 ; BRUNOS_ROOM

2
data/mapObjects/beach_house.asm
View file

@ -12,7 +12,7 @@ BeachHouseObjects: ; 0xf23a4
db 1,$d,6
db 2 ; objects
object SPRITE_FISHER, 2, 3, FACE, DOWN, 1 ; surfin' dude
object SPRITE_FISHER, 2, 3, STAY, DOWN, 1 ; surfin' dude
object $3d, 5, 3, WALK, $01, 2 ; pikachu
; warp-to

4
data/mapObjects/bikeshop.asm
View file

@ -8,9 +8,9 @@ BikeShopObject: ; 0x1d866 (size=38)
db $0 ; signs
db $3 ; objects
object SPRITE_BIKE_SHOP_GUY, $6, $2, FACE, STAY, $1 ; person
object SPRITE_BIKE_SHOP_GUY, $6, $2, STAY, NONE, $1 ; person
object SPRITE_MOM_GEISHA, $5, $6, WALK, $1, $2 ; person
object SPRITE_BUG_CATCHER, $1, $3, FACE, UP, $3 ; person
object SPRITE_BUG_CATCHER, $1, $3, STAY, UP, $3 ; person
; warp-to
EVENT_DISP BIKE_SHOP_WIDTH, $7, $2

6
data/mapObjects/billshouse.asm
View file

@ -8,9 +8,9 @@ BillsHouseObject: ; 0x1e8df (size=38)
db $0 ; signs
db $3 ; objects
object SPRITE_SLOWBRO, $6, $5, FACE, STAY, $1 ; person
object SPRITE_BLACK_HAIR_BOY_2, $4, $4, FACE, STAY, $2 ; person
object SPRITE_BLACK_HAIR_BOY_2, $6, $5, FACE, STAY, $3 ; person
object SPRITE_SLOWBRO, $6, $5, STAY, NONE, $1 ; person
object SPRITE_BLACK_HAIR_BOY_2, $4, $4, STAY, NONE, $2 ; person
object SPRITE_BLACK_HAIR_BOY_2, $6, $5, STAY, NONE, $3 ; person
; warp-to
EVENT_DISP BILLS_HOUSE_WIDTH, $7, $2

4
data/mapObjects/blueshouse.asm
View file

@ -8,9 +8,9 @@ BluesHouseObject: ; 19bce (6:5bce)
db $0 ; signs
db $3 ; objects
object SPRITE_DAISY, $2, $3, FACE, LEFT, $1 ; Daisy, sitting by map
object SPRITE_DAISY, $2, $3, STAY, RIGHT, $1 ; Daisy, sitting by map
object SPRITE_DAISY, $6, $4, WALK, $1, $2, $0 ; Daisy, walking around
object SPRITE_BOOK_MAP_DEX, $3, $3, FACE, STAY, $3, $0 ; map on table
object SPRITE_BOOK_MAP_DEX, $3, $3, STAY, NONE, $3, $0 ; map on table
; warp-to
EVENT_DISP BLUES_HOUSE_WIDTH, $7, $2

2
data/mapObjects/bruno.asm
View file

@ -10,7 +10,7 @@ BrunoObject: ; 0x763d7 (size=44)
db $0 ; signs
db $1 ; objects
object SPRITE_BRUNO, $5, $2, FACE, DOWN, $1, BRUNO + $C8, $1
object SPRITE_BRUNO, $5, $2, STAY, DOWN, $1, BRUNO + $C8, $1
; warp-to
EVENT_DISP BRUNOS_ROOM_WIDTH, $b, $4 ; LORELEIS_ROOM

10
data/mapObjects/celadoncity.asm
View file

@ -29,12 +29,12 @@ CeladonCityObject: ; 0x18022 (size=189)
db $9 ; objects
object SPRITE_LITTLE_GIRL, $8, $11, WALK, $0, $1 ; person
object SPRITE_OLD_PERSON, $b, $1c, FACE, UP, $2 ; person
object SPRITE_OLD_PERSON, $b, $1c, STAY, UP, $2 ; person
object SPRITE_GIRL, $e, $13, WALK, $1, $3 ; person
object SPRITE_OLD_PERSON, $19, $16, FACE, DOWN, $4 ; person
object SPRITE_OLD_PERSON, $16, $10, FACE, DOWN, $5 ; person
object SPRITE_FISHER2, $20, $c, FACE, RIGHT, $6 ; person
object SPRITE_SLOWBRO, $1e, $c, FACE, LEFT, $7 ; person
object SPRITE_OLD_PERSON, $19, $16, STAY, DOWN, $4 ; person
object SPRITE_OLD_PERSON, $16, $10, STAY, DOWN, $5 ; person
object SPRITE_FISHER2, $20, $c, STAY, LEFT, $6 ; person
object SPRITE_SLOWBRO, $1e, $c, STAY, RIGHT, $7 ; person
object SPRITE_ROCKET, $20, $1d, WALK, $2, $8 ; person
object SPRITE_ROCKET, $2a, $e, WALK, $2, $9 ; person

8
data/mapObjects/celadondiner.asm
View file

@ -9,10 +9,10 @@ CeladonDinerObject: ; 0x491bc (size=50)
db $5 ; objects
object SPRITE_COOK, $8, $5, WALK, $2, $1 ; person
object SPRITE_MOM_GEISHA, $7, $2, FACE, STAY, $2 ; person
object SPRITE_FAT_BALD_GUY, $1, $4, FACE, DOWN, $3 ; person
object SPRITE_FISHER2, $5, $3, FACE, LEFT, $4 ; person
object SPRITE_GYM_HELPER, $0, $1, FACE, DOWN, $5 ; person
object SPRITE_MOM_GEISHA, $7, $2, STAY, NONE, $2 ; person
object SPRITE_FAT_BALD_GUY, $1, $4, STAY, DOWN, $3 ; person
object SPRITE_FISHER2, $5, $3, STAY, RIGHT, $4 ; person
object SPRITE_GYM_HELPER, $0, $1, STAY, DOWN, $5 ; person
; warp-to
EVENT_DISP CELADON_DINER_WIDTH, $7, $3

22
data/mapObjects/celadongamecorner.asm
View file

@ -10,17 +10,17 @@ CeladonGameCornerObject: ; 0x48fa0 (size=99)
db $4, $9, $c ; CeladonGameCornerText12
db $b ; objects
object SPRITE_FOULARD_WOMAN, $2, $6, FACE, DOWN, $1 ; person
object SPRITE_MART_GUY, $5, $6, FACE, DOWN, $2 ; person
object SPRITE_FAT_BALD_GUY, $2, $a, FACE, RIGHT, $3 ; person
object SPRITE_FOULARD_WOMAN, $2, $d, FACE, RIGHT, $4 ; person
object SPRITE_FISHER, $5, $b, FACE, LEFT, $5 ; person
object SPRITE_MOM_GEISHA, $8, $b, FACE, RIGHT, $6 ; person
object SPRITE_GYM_HELPER, $8, $e, FACE, RIGHT, $7 ; person
object SPRITE_GAMBLER, $b, $f, FACE, LEFT, $8 ; person
object SPRITE_MART_GUY, $e, $b, FACE, RIGHT, $9 ; person
object SPRITE_GENTLEMAN, $11, $d, FACE, LEFT, $a ; person
object SPRITE_ROCKET, $9, $5, FACE, UP, $b, ROCKET + $C8, $7
object SPRITE_FOULARD_WOMAN, $2, $6, STAY, DOWN, $1 ; person
object SPRITE_MART_GUY, $5, $6, STAY, DOWN, $2 ; person
object SPRITE_FAT_BALD_GUY, $2, $a, STAY, LEFT, $3 ; person
object SPRITE_FOULARD_WOMAN, $2, $d, STAY, LEFT, $4 ; person
object SPRITE_FISHER, $5, $b, STAY, RIGHT, $5 ; person
object SPRITE_MOM_GEISHA, $8, $b, STAY, LEFT, $6 ; person
object SPRITE_GYM_HELPER, $8, $e, STAY, LEFT, $7 ; person
object SPRITE_GAMBLER, $b, $f, STAY, RIGHT, $8 ; person
object SPRITE_MART_GUY, $e, $b, STAY, LEFT, $9 ; person
object SPRITE_GENTLEMAN, $11, $d, STAY, RIGHT, $a ; person
object SPRITE_ROCKET, $9, $5, STAY, UP, $b, ROCKET + $C8, $7
; warp-to
EVENT_DISP GAME_CORNER_WIDTH, $11, $f

16
data/mapObjects/celadongym.asm
View file

@ -8,14 +8,14 @@ CeladonGymObject: ; 0x48b30 (size=84)
db $0 ; signs
db $8 ; objects
object SPRITE_ERIKA, $4, $3, FACE, DOWN, $1, ERIKA + $C8, $1
object SPRITE_LASS, $2, $b, FACE, LEFT, $2, LASS + $C8, $11
object SPRITE_FOULARD_WOMAN, $7, $a, FACE, RIGHT, $3, BEAUTY + $C8, $1
object SPRITE_LASS, $9, $5, FACE, DOWN, $4, JR__TRAINER_F + $C8, $b
object SPRITE_FOULARD_WOMAN, $1, $5, FACE, DOWN, $5, BEAUTY + $C8, $2
object SPRITE_LASS, $6, $3, FACE, DOWN, $6, LASS + $C8, $12
object SPRITE_FOULARD_WOMAN, $3, $3, FACE, DOWN, $7, BEAUTY + $C8, $3
object SPRITE_LASS, $5, $3, FACE, DOWN, $8, COOLTRAINER_F + $C8, $1
object SPRITE_ERIKA, $4, $3, STAY, DOWN, $1, ERIKA + $C8, $1
object SPRITE_LASS, $2, $b, STAY, RIGHT, $2, LASS + $C8, $11
object SPRITE_FOULARD_WOMAN, $7, $a, STAY, LEFT, $3, BEAUTY + $C8, $1
object SPRITE_LASS, $9, $5, STAY, DOWN, $4, JR__TRAINER_F + $C8, $b
object SPRITE_FOULARD_WOMAN, $1, $5, STAY, DOWN, $5, BEAUTY + $C8, $2
object SPRITE_LASS, $6, $3, STAY, DOWN, $6, LASS + $C8, $12
object SPRITE_FOULARD_WOMAN, $3, $3, STAY, DOWN, $7, BEAUTY + $C8, $3
object SPRITE_LASS, $5, $3, STAY, DOWN, $8, COOLTRAINER_F + $C8, $1
; warp-to
EVENT_DISP CELADON_GYM_WIDTH, $11, $4

4
data/mapObjects/celadonhotel.asm
View file

@ -8,8 +8,8 @@ CeladonHotelObject: ; 0x49281 (size=38)
db $0 ; signs
db $3 ; objects
object SPRITE_OLD_MEDIUM_WOMAN, $3, $1, FACE, DOWN, $1 ; person
object SPRITE_FOULARD_WOMAN, $2, $4, FACE, STAY, $2 ; person
object SPRITE_OLD_MEDIUM_WOMAN, $3, $1, STAY, DOWN, $1 ; person
object SPRITE_FOULARD_WOMAN, $2, $4, STAY, NONE, $2 ; person
object SPRITE_BLACK_HAIR_BOY_2, $8, $4, WALK, $2, $3 ; person
; warp-to

4
data/mapObjects/celadonhouse.asm
View file

@ -8,9 +8,9 @@ CeladonHouseObject: ; 0x49227 (size=38)
db $0 ; signs
db $3 ; objects
object SPRITE_OLD_PERSON, $4, $2, FACE, DOWN, $1 ; person
object SPRITE_OLD_PERSON, $4, $2, STAY, DOWN, $1 ; person
object SPRITE_ROCKET, $1, $4, WALK, $0, $2 ; person
object SPRITE_SAILOR, $5, $6, FACE, RIGHT, $3 ; person
object SPRITE_SAILOR, $5, $6, STAY, LEFT, $3 ; person
; warp-to
EVENT_DISP CELADON_HOUSE_WIDTH, $7, $2

4
data/mapObjects/celadonmansion1.asm
View file

@ -12,8 +12,8 @@ CeladonMansion1Object: ; 0x486cf (size=71)
db $9, $4, $5 ; CeladonMansion1Text5
db $4 ; objects
object SPRITE_SLOWBRO, $0, $5, FACE, LEFT, $1 ; person
object SPRITE_OLD_MEDIUM_WOMAN, $1, $5, FACE, DOWN, $2 ; person
object SPRITE_SLOWBRO, $0, $5, STAY, RIGHT, $1 ; person
object SPRITE_OLD_MEDIUM_WOMAN, $1, $5, STAY, DOWN, $2 ; person
object SPRITE_CLEFAIRY, $1, $8, WALK, $2, $3 ; person
object SPRITE_SLOWBRO, $4, $4, WALK, $1, $4 ; person

8
data/mapObjects/celadonmansion3.asm
View file

@ -14,10 +14,10 @@ CeladonMansion3Object: ; 0x487ff (size=72)
db $9, $4, $8 ; CeladonMansion3Text8
db $4 ; objects
object SPRITE_BIKE_SHOP_GUY, $0, $4, FACE, UP, $1 ; person
object SPRITE_MART_GUY, $3, $4, FACE, UP, $2 ; person
object SPRITE_BLACK_HAIR_BOY_2, $0, $7, FACE, UP, $3 ; person
object SPRITE_LAPRAS_GIVER, $2, $3, FACE, STAY, $4 ; person
object SPRITE_BIKE_SHOP_GUY, $0, $4, STAY, UP, $1 ; person
object SPRITE_MART_GUY, $3, $4, STAY, UP, $2 ; person
object SPRITE_BLACK_HAIR_BOY_2, $0, $7, STAY, UP, $3 ; person
object SPRITE_LAPRAS_GIVER, $2, $3, STAY, NONE, $4 ; person
; warp-to
EVENT_DISP CELADON_MANSION_3_WIDTH, $1, $6 ; CELADON_MANSION_2

4
data/mapObjects/celadonmansion5.asm
View file

@ -8,8 +8,8 @@ CeladonMansion5Object: ; 0x1dd5c (size=32)
db $0 ; signs
db $2 ; objects
object SPRITE_HIKER, $2, $2, FACE, DOWN, $1 ; person
object SPRITE_BALL, $4, $3, FACE, STAY, $2 ; person
object SPRITE_HIKER, $2, $2, STAY, DOWN, $1 ; person
object SPRITE_BALL, $4, $3, STAY, NONE, $2 ; person
; warp-to
EVENT_DISP CELADON_MANSION_5_WIDTH, $7, $2 ; CELADON_MANSION_4

2
data/mapObjects/celadonmart1.asm
View file

@ -14,7 +14,7 @@ CeladonMart1Object: ; 0x60f9e (size=64)
db $1, $e, $3 ; CeladonMart1Text3
db $1 ; objects
object SPRITE_CABLE_CLUB_WOMAN, $8, $3, FACE, DOWN, $1 ; person
object SPRITE_CABLE_CLUB_WOMAN, $8, $3, STAY, DOWN, $1 ; person
; warp-to
EVENT_DISP CELADON_MART_1_WIDTH, $7, $2

6
data/mapObjects/celadonmart2.asm
View file

@ -10,9 +10,9 @@ CeladonMart2Object: ; 0x56111 (size=55)
db $1, $e, $5 ; CeladonMart2Text5
db $4 ; objects
object SPRITE_MART_GUY, $5, $3, FACE, DOWN, $1 ; person
object SPRITE_MART_GUY, $6, $3, FACE, DOWN, $2 ; person
object SPRITE_FAT_BALD_GUY, $13, $5, FACE, STAY, $3 ; person
object SPRITE_MART_GUY, $5, $3, STAY, DOWN, $1 ; person
object SPRITE_MART_GUY, $6, $3, STAY, DOWN, $2 ; person
object SPRITE_FAT_BALD_GUY, $13, $5, STAY, NONE, $3 ; person
object SPRITE_GIRL, $e, $4, WALK, $1, $4 ; person
; warp-to

10
data/mapObjects/celadonmart3.asm
View file

@ -21,11 +21,11 @@ CeladonMart3Object: ; 0x482c4 (size=94)
db $1, $a, $11 ; CeladonMart3Text17
db $5 ; objects
object SPRITE_MART_GUY, $10, $5, FACE, STAY, $1 ; person
object SPRITE_GAMEBOY_KID_COPY, $b, $6, FACE, LEFT, $2 ; person
object SPRITE_GAMEBOY_KID_COPY, $7, $2, FACE, DOWN, $3 ; person
object SPRITE_GAMEBOY_KID_COPY, $8, $2, FACE, DOWN, $4 ; person
object SPRITE_YOUNG_BOY, $2, $5, FACE, UP, $5 ; person
object SPRITE_MART_GUY, $10, $5, STAY, NONE, $1 ; person
object SPRITE_GAMEBOY_KID_COPY, $b, $6, STAY, RIGHT, $2 ; person
object SPRITE_GAMEBOY_KID_COPY, $7, $2, STAY, DOWN, $3 ; person
object SPRITE_GAMEBOY_KID_COPY, $8, $2, STAY, DOWN, $4 ; person
object SPRITE_YOUNG_BOY, $2, $5, STAY, UP, $5 ; person
; warp-to
EVENT_DISP CELADON_MART_3_WIDTH, $1, $c ; CELADON_MART_4

2
data/mapObjects/celadonmart4.asm
View file

@ -10,7 +10,7 @@ CeladonMart4Object: ; 0x48370 (size=49)
db $1, $e, $4 ; CeladonMart4Text4
db $3 ; objects
object SPRITE_MART_GUY, $5, $7, FACE, STAY, $1 ; person
object SPRITE_MART_GUY, $5, $7, STAY, NONE, $1 ; person
object SPRITE_BLACK_HAIR_BOY_2, $f, $5, WALK, $2, $2 ; person
object SPRITE_BUG_CATCHER, $5, $2, WALK, $2, $3 ; person

6
data/mapObjects/celadonmart5.asm
View file

@ -11,9 +11,9 @@ CeladonMart5Object: ; 0x49085 (size=55)
db $4 ; objects
object SPRITE_GENTLEMAN, $e, $5, WALK, $1, $1 ; person
object SPRITE_SAILOR, $2, $6, FACE, STAY, $2 ; person
object SPRITE_MART_GUY, $5, $3, FACE, DOWN, $3 ; person
object SPRITE_MART_GUY, $6, $3, FACE, DOWN, $4 ; person
object SPRITE_SAILOR, $2, $6, STAY, NONE, $2 ; person
object SPRITE_MART_GUY, $5, $3, STAY, DOWN, $3 ; person
object SPRITE_MART_GUY, $6, $3, STAY, DOWN, $4 ; person
; warp-to
EVENT_DISP CELADON_MART_5_WIDTH, $1, $c ; CELADON_MART_ROOF

2
data/mapObjects/celadonmartroof.asm
View file

@ -11,7 +11,7 @@ CeladonMartRoofObject: ; 0x485a8 (size=36)
db $2, $d, $6 ; CeladonMartRoofText6
db $2 ; objects
object SPRITE_BLACK_HAIR_BOY_2, $a, $4, FACE, RIGHT, $1 ; person
object SPRITE_BLACK_HAIR_BOY_2, $a, $4, STAY, LEFT, $1 ; person
object SPRITE_LITTLE_GIRL, $5, $5, WALK, $0, $2 ; person
; warp-to

4
data/mapObjects/celadonpokecenter.asm
View file

@ -8,10 +8,10 @@ CeladonPokecenterObject: ; 0x488d2 (size=44)
db $0 ; signs
db $4 ; objects
object SPRITE_NURSE, $3, $1, FACE, DOWN, $1 ; person
object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person
object SPRITE_GENTLEMAN, $7, $3, WALK, $2, $2 ; person
object SPRITE_FOULARD_WOMAN, $a, $5, WALK, $0, $3 ; person
object SPRITE_CABLE_CLUB_WOMAN, $b, $2, FACE, DOWN, $4 ; person
object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person
; warp-to
EVENT_DISP CELADON_POKECENTER_WIDTH, $7, $3

2
data/mapObjects/celadonprizeroom.asm
View file

@ -11,7 +11,7 @@ CeladonPrizeRoomObject: ; 0x49108 (size=41)
db $2, $6, $5 ; CeladonPrizeRoomText5
db $2 ; objects
object SPRITE_BALDING_GUY, $1, $4, FACE, STAY, $1 ; person
object SPRITE_BALDING_GUY, $1, $4, STAY, NONE, $1 ; person
object SPRITE_GAMBLER, $7, $3, WALK, $2, $2 ; person
; warp-to

16
data/mapObjects/ceruleancity.asm
View file

@ -22,17 +22,17 @@ CeruleanCityObject: ; 0x18786 (size=170)
db $15, $1b, $11 ; CeruleanCityText17
db $b ; objects
object SPRITE_BLUE, $14, $2, FACE, DOWN, $1 ; person
object SPRITE_ROCKET, $1e, $8, FACE, STAY, $2, ROCKET + $C8, $5
object SPRITE_BLACK_HAIR_BOY_1, $1f, $14, FACE, DOWN, $3 ; person
object SPRITE_BLUE, $14, $2, STAY, DOWN, $1 ; person
object SPRITE_ROCKET, $1e, $8, STAY, NONE, $2, ROCKET + $C8, $5
object SPRITE_BLACK_HAIR_BOY_1, $1f, $14, STAY, DOWN, $3 ; person
object SPRITE_BLACK_HAIR_BOY_2, $f, $12, WALK, $1, $4 ; person
object SPRITE_BLACK_HAIR_BOY_2, $9, $15, WALK, $2, $5 ; person
object SPRITE_GUARD, $1c, $c, FACE, DOWN, $6 ; person
object SPRITE_LASS, $1d, $1a, FACE, RIGHT, $7 ; person
object SPRITE_SLOWBRO, $1c, $1a, FACE, DOWN, $8 ; person
object SPRITE_GUARD, $1c, $c, STAY, DOWN, $6 ; person
object SPRITE_LASS, $1d, $1a, STAY, LEFT, $7 ; person
object SPRITE_SLOWBRO, $1c, $1a, STAY, DOWN, $8 ; person
object SPRITE_LASS, $9, $1b, WALK, $2, $9 ; person
object SPRITE_BLACK_HAIR_BOY_2, $4, $c, FACE, DOWN, $a ; person
object SPRITE_GUARD, $1b, $c, FACE, DOWN, $b ; person
object SPRITE_BLACK_HAIR_BOY_2, $4, $c, STAY, DOWN, $a ; person
object SPRITE_GUARD, $1b, $c, STAY, DOWN, $b ; person
; warp-to
EVENT_DISP CERULEAN_CITY_WIDTH, $b, $1b ; TRASHED_HOUSE

8
data/mapObjects/ceruleangym.asm
View file

@ -8,10 +8,10 @@ CeruleanGymObject: ; 0x5c834 (size=50)
db $0 ; signs
db $4 ; objects
object SPRITE_BRUNETTE_GIRL, $4, $2, FACE, DOWN, $1, MISTY + $C8, $1
object SPRITE_LASS, $2, $3, FACE, LEFT, $2, JR__TRAINER_F + $C8, $1
object SPRITE_SWIMMER, $8, $7, FACE, RIGHT, $3, SWIMMER + $C8, $1
object SPRITE_GYM_HELPER, $7, $a, FACE, DOWN, $4 ; person
object SPRITE_BRUNETTE_GIRL, $4, $2, STAY, DOWN, $1, MISTY + $C8, $1
object SPRITE_LASS, $2, $3, STAY, RIGHT, $2, JR__TRAINER_F + $C8, $1
object SPRITE_SWIMMER, $8, $7, STAY, LEFT, $3, SWIMMER + $C8, $1
object SPRITE_GYM_HELPER, $7, $a, STAY, DOWN, $4 ; person
; warp-to
EVENT_DISP CERULEAN_GYM_WIDTH, $d, $4

4
data/mapObjects/ceruleanhouse1.asm
View file

@ -8,8 +8,8 @@ CeruleanHouse1Object: ; 0x1d710 (size=32)
db $0 ; signs
db $2 ; objects
object SPRITE_OLD_MEDIUM_WOMAN, $5, $4, FACE, RIGHT, $1 ; person
object SPRITE_GAMBLER, $1, $2, FACE, STAY, $2 ; person
object SPRITE_OLD_MEDIUM_WOMAN, $5, $4, STAY, LEFT, $1 ; person
object SPRITE_GAMBLER, $1, $2, STAY, NONE, $2 ; person
; warp-to
EVENT_DISP CERULEAN_HOUSE_1_WIDTH, $7, $2

2
data/mapObjects/ceruleanhouse2.asm
View file

@ -9,7 +9,7 @@ CeruleanHouse2Object: ; 0x74ebe (size=34)
db $0 ; signs
db $1 ; objects
object SPRITE_FAT_BALD_GUY, $5, $3, FACE, LEFT, $1 ; person
object SPRITE_FAT_BALD_GUY, $5, $3, STAY, RIGHT, $1 ; person
; warp-to
EVENT_DISP CERULEAN_HOUSE_2_WIDTH, $0, $2

2
data/mapObjects/ceruleanhousetrashed.asm
View file

@ -10,7 +10,7 @@ CeruleanHouseTrashedObject: ; 0x1d6bf (size=43)
db $0, $3, $3 ; CeruleanHouseTrashedText3
db $2 ; objects
object SPRITE_FISHER, $2, $1, FACE, DOWN, $1 ; person
object SPRITE_FISHER, $2, $1, STAY, DOWN, $1 ; person
object SPRITE_GIRL, $5, $6, WALK, $2, $2 ; person
; warp-to

2
data/mapObjects/ceruleanmart.asm
View file

@ -8,7 +8,7 @@ CeruleanMartObject: ; 0x5c8a8 (size=38)
db $0 ; signs
db $3 ; objects
object SPRITE_MART_GUY, $0, $5, FACE, LEFT, $1 ; person
object SPRITE_MART_GUY, $0, $5, STAY, RIGHT, $1 ; person
object SPRITE_BLACK_HAIR_BOY_1, $3, $4, WALK, $1, $2 ; person
object SPRITE_LASS, $6, $2, WALK, $2, $3 ; person

6
data/mapObjects/ceruleanpokecenter.asm
View file

@ -8,10 +8,10 @@ CeruleanPokecenterObject: ; 0x5c65f (size=44)
db $0 ; signs
db $4 ; objects
object SPRITE_NURSE, $3, $1, FACE, DOWN, $1 ; person
object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person
object SPRITE_BLACK_HAIR_BOY_2, $a, $5, WALK, $0, $2 ; person
object SPRITE_GENTLEMAN, $4, $3, FACE, DOWN, $3 ; person
object SPRITE_CABLE_CLUB_WOMAN, $b, $2, FACE, DOWN, $4 ; person
object SPRITE_GENTLEMAN, $4, $3, STAY, DOWN, $3 ; person
object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person
; warp-to
EVENT_DISP CERULEAN_POKECENTER_WIDTH, $7, $3

18
data/mapObjects/cinnabargym.asm
View file

@ -8,15 +8,15 @@ CinnabarGymObject: ; 0x75acc (size=90)
db $0 ; signs
db $9 ; objects
object SPRITE_FAT_BALD_GUY, $3, $3, FACE, DOWN, $1, BLAINE + $C8, $1
object SPRITE_BLACK_HAIR_BOY_2, $11, $2, FACE, DOWN, $2, SUPER_NERD + $C8, $9
object SPRITE_BLACK_HAIR_BOY_2, $11, $8, FACE, DOWN, $3, BURGLAR + $C8, $4
object SPRITE_BLACK_HAIR_BOY_2, $b, $4, FACE, DOWN, $4, SUPER_NERD + $C8, $a
object SPRITE_BLACK_HAIR_BOY_2, $b, $8, FACE, DOWN, $5, BURGLAR + $C8, $5
object SPRITE_BLACK_HAIR_BOY_2, $b, $e, FACE, DOWN, $6, SUPER_NERD + $C8, $b
object SPRITE_BLACK_HAIR_BOY_2, $3, $e, FACE, DOWN, $7, BURGLAR + $C8, $6
object SPRITE_BLACK_HAIR_BOY_2, $3, $8, FACE, DOWN, $8, SUPER_NERD + $C8, $c
object SPRITE_GYM_HELPER, $10, $d, FACE, DOWN, $9 ; person
object SPRITE_FAT_BALD_GUY, $3, $3, STAY, DOWN, $1, BLAINE + $C8, $1
object SPRITE_BLACK_HAIR_BOY_2, $11, $2, STAY, DOWN, $2, SUPER_NERD + $C8, $9
object SPRITE_BLACK_HAIR_BOY_2, $11, $8, STAY, DOWN, $3, BURGLAR + $C8, $4
object SPRITE_BLACK_HAIR_BOY_2, $b, $4, STAY, DOWN, $4, SUPER_NERD + $C8, $a
object SPRITE_BLACK_HAIR_BOY_2, $b, $8, STAY, DOWN, $5, BURGLAR + $C8, $5
object SPRITE_BLACK_HAIR_BOY_2, $b, $e, STAY, DOWN, $6, SUPER_NERD + $C8, $b
object SPRITE_BLACK_HAIR_BOY_2, $3, $e, STAY, DOWN, $7, BURGLAR + $C8, $6
object SPRITE_BLACK_HAIR_BOY_2, $3, $8, STAY, DOWN, $8, SUPER_NERD + $C8, $c
object SPRITE_GYM_HELPER, $10, $d, STAY, DOWN, $9 ; person
; warp-to
EVENT_DISP CINNABAR_GYM_WIDTH, $11, $10

2
data/mapObjects/cinnabarisland.asm
View file

@ -17,7 +17,7 @@ CinnabarIslandObject: ; 0x1c022 (size=71)
db $2 ; objects
object SPRITE_GIRL, $c, $5, WALK, $2, $1 ; person
object SPRITE_GAMBLER, $e, $6, FACE, STAY, $2 ; person
object SPRITE_GAMBLER, $e, $6, STAY, NONE, $2 ; person
; warp-to
EVENT_DISP CINNABAR_ISLAND_WIDTH, $3, $6 ; MANSION_1

6
data/mapObjects/cinnabarmart.asm
View file

@ -8,9 +8,9 @@ CinnabarMartObject: ; 0x75e91 (size=38)
db $0 ; signs
db $3 ; objects
object SPRITE_MART_GUY, $0, $5, FACE, LEFT, $1 ; person
object SPRITE_ERIKA, $6, $2, FACE, STAY, $2 ; person
object SPRITE_OAK_AIDE, $3, $4, FACE, STAY, $3 ; person
object SPRITE_MART_GUY, $0, $5, STAY, RIGHT, $1 ; person
object SPRITE_ERIKA, $6, $2, STAY, NONE, $2 ; person
object SPRITE_OAK_AIDE, $3, $4, STAY, NONE, $3 ; person
; warp-to
EVENT_DISP CINNABAR_MART_WIDTH, $7, $3

6
data/mapObjects/cinnabarpokecenter.asm
View file

@ -8,10 +8,10 @@ CinnabarPokecenterObject: ; 0x75e46 (size=44)
db $0 ; signs
db $4 ; objects
object SPRITE_NURSE, $3, $1, FACE, DOWN, $1 ; person
object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person
object SPRITE_LASS, $9, $4, WALK, $0, $2 ; person
object SPRITE_GENTLEMAN, $2, $6, FACE, STAY, $3 ; person
object SPRITE_CABLE_CLUB_WOMAN, $b, $2, FACE, DOWN, $4 ; person
object SPRITE_GENTLEMAN, $2, $6, STAY, NONE, $3 ; person
object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person
; warp-to
EVENT_DISP CINNABAR_POKECENTER_WIDTH, $7, $3

4
data/mapObjects/copycatshouse1f.asm
View file

@ -9,8 +9,8 @@ CopycatsHouse1FObject: ; 0x75ee3 (size=46)
db $0 ; signs
db $3 ; objects
object SPRITE_MOM_GEISHA, $2, $2, FACE, DOWN, $1 ; person
object SPRITE_FAT_BALD_GUY, $5, $4, FACE, RIGHT, $2 ; person
object SPRITE_MOM_GEISHA, $2, $2, STAY, DOWN, $1 ; person
object SPRITE_FAT_BALD_GUY, $5, $4, STAY, LEFT, $2 ; person
object SPRITE_CLEFAIRY, $1, $4, WALK, $1, $3 ; person
; warp-to

6
data/mapObjects/copycatshouse2f.asm
View file

@ -11,9 +11,9 @@ CopycatsHouse2FObject: ; 0x5cd21 (size=48)
db $5 ; objects
object SPRITE_BRUNETTE_GIRL, $4, $3, WALK, $0, $1 ; person
object SPRITE_BIRD, $4, $6, WALK, $2, $2 ; person
object SPRITE_SLOWBRO, $5, $1, FACE, DOWN, $3 ; person
object SPRITE_BIRD, $2, $0, FACE, DOWN, $4 ; person
object SPRITE_CLEFAIRY, $1, $6, FACE, LEFT, $5 ; person
object SPRITE_SLOWBRO, $5, $1, STAY, DOWN, $3 ; person
object SPRITE_BIRD, $2, $0, STAY, DOWN, $4 ; person
object SPRITE_CLEFAIRY, $1, $6, STAY, RIGHT, $5 ; person
; warp-to
EVENT_DISP COPYCATS_HOUSE_2F_WIDTH, $1, $7 ; COPYCATS_HOUSE_1F

2
data/mapObjects/daycarem.asm
View file

@ -8,7 +8,7 @@ DayCareMObject: ; 0x56459 (size=26)
db $0 ; signs
db $1 ; objects
object SPRITE_GENTLEMAN, $2, $3, FACE, LEFT, $1 ; person
object SPRITE_GENTLEMAN, $2, $3, STAY, RIGHT, $1 ; person
; warp-to
EVENT_DISP DAYCAREM_WIDTH, $7, $2

2
data/mapObjects/diglettscaveroute11.asm
View file

@ -9,7 +9,7 @@ DiglettsCaveEntranceRoute11Object: ; 0x1e5ca (size=34)
db $0 ; signs
db $1 ; objects
object SPRITE_GAMBLER, $2, $3, FACE, STAY, $1 ; person
object SPRITE_GAMBLER, $2, $3, STAY, NONE, $1 ; person
; warp-to
EVENT_DISP DIGLETTS_CAVE_ENTRANCE_WIDTH, $7, $2

2
data/mapObjects/diglettscaveroute2.asm
View file

@ -9,7 +9,7 @@ DiglettsCaveRoute2Object: ; 0x1debf (size=34)
db $0 ; signs
db $1 ; objects
object SPRITE_FISHER, $3, $3, FACE, STAY, $1 ; person
object SPRITE_FISHER, $3, $3, STAY, NONE, $1 ; person
; warp-to
EVENT_DISP DIGLETTS_CAVE_EXIT_WIDTH, $7, $2

12
data/mapObjects/fanclub.asm
View file

@ -10,12 +10,12 @@ FanClubObject: ; 0x59c97 (size=62)
db $0, $6, $8 ; FanClubText8
db $6 ; objects
object SPRITE_FISHER2, $6, $3, FACE, RIGHT, $1 ; person
object SPRITE_GIRL, $1, $3, FACE, LEFT, $2 ; person
object SPRITE_CLEFAIRY, $6, $4, FACE, RIGHT, $3 ; person
object SPRITE_SEEL, $1, $4, FACE, LEFT, $4 ; person
object SPRITE_GENTLEMAN, $3, $1, FACE, DOWN, $5 ; person
object SPRITE_CABLE_CLUB_WOMAN, $5, $1, FACE, DOWN, $6 ; person
object SPRITE_FISHER2, $6, $3, STAY, LEFT, $1 ; person
object SPRITE_GIRL, $1, $3, STAY, RIGHT, $2 ; person
object SPRITE_CLEFAIRY, $6, $4, STAY, LEFT, $3 ; person
object SPRITE_SEEL, $1, $4, STAY, RIGHT, $4 ; person
object SPRITE_GENTLEMAN, $3, $1, STAY, DOWN, $5 ; person
object SPRITE_CABLE_CLUB_WOMAN, $5, $1, STAY, DOWN, $6 ; person
; warp-to
EVENT_DISP POKEMON_FAN_CLUB_WIDTH, $7, $2

14
data/mapObjects/fightingdojo.asm
View file

@ -8,13 +8,13 @@ FightingDojoObject: ; 0x5cf9b (size=72)
db $0 ; signs
db $7 ; objects
object SPRITE_HIKER, $5, $3, FACE, DOWN, $1, BLACKBELT + $C8, $1
object SPRITE_HIKER, $3, $4, FACE, LEFT, $2, BLACKBELT + $C8, $2
object SPRITE_HIKER, $3, $6, FACE, LEFT, $3, BLACKBELT + $C8, $3
object SPRITE_HIKER, $5, $5, FACE, RIGHT, $4, BLACKBELT + $C8, $4
object SPRITE_HIKER, $5, $7, FACE, RIGHT, $5, BLACKBELT + $C8, $5
object SPRITE_BALL, $4, $1, FACE, STAY, $6 ; person
object SPRITE_BALL, $5, $1, FACE, STAY, $7 ; person
object SPRITE_HIKER, $5, $3, STAY, DOWN, $1, BLACKBELT + $C8, $1
object SPRITE_HIKER, $3, $4, STAY, RIGHT, $2, BLACKBELT + $C8, $2
object SPRITE_HIKER, $3, $6, STAY, RIGHT, $3, BLACKBELT + $C8, $3
object SPRITE_HIKER, $5, $5, STAY, LEFT, $4, BLACKBELT + $C8, $4
object SPRITE_HIKER, $5, $7, STAY, LEFT, $5, BLACKBELT + $C8, $5
object SPRITE_BALL, $4, $1, STAY, NONE, $6 ; person
object SPRITE_BALL, $5, $1, STAY, NONE, $7 ; person
; warp-to
EVENT_DISP FIGHTING_DOJO_WIDTH, $b, $4

8
data/mapObjects/fuchsiacity.asm
View file

@ -31,14 +31,14 @@ FuchsiaCityObject: ; 0x18bd4 (size=178)
db $a ; objects
object SPRITE_BUG_CATCHER, $a, $c, WALK, $2, $1 ; person
object SPRITE_GAMBLER, $1c, $11, WALK, $2, $2 ; person
object SPRITE_FISHER2, $1e, $e, FACE, DOWN, $3 ; person
object SPRITE_BUG_CATCHER, $18, $8, FACE, UP, $4 ; person
object SPRITE_FISHER2, $1e, $e, STAY, DOWN, $3 ; person
object SPRITE_BUG_CATCHER, $18, $8, STAY, UP, $4 ; person
object SPRITE_CLEFAIRY, $1f, $5, WALK, $0, $5 ; person
object SPRITE_BALL, $19, $6, FACE, STAY, $6 ; person
object SPRITE_BALL, $19, $6, STAY, NONE, $6 ; person
object SPRITE_SLOWBRO, $c, $6, WALK, $2, $7 ; person
object SPRITE_SLOWBRO, $1e, $c, WALK, $2, $8 ; person
object SPRITE_SEEL, $8, $11, WALK, $0, $9 ; person
object SPRITE_OMANYTE, $6, $5, FACE, STAY, $a ; person
object SPRITE_OMANYTE, $6, $5, STAY, NONE, $a ; person
; warp-to
EVENT_DISP FUCHSIA_CITY_WIDTH, $d, $5 ; FUCHSIA_MART

16
data/mapObjects/fuchsiagym.asm
View file

@ -8,14 +8,14 @@ FuchsiaGymObject: ; 0x75658 (size=82)
db $0 ; signs
db $8 ; objects
object SPRITE_BLACKBELT, $4, $a, FACE, DOWN, $1, KOGA + $C8, $1
object SPRITE_ROCKER, $8, $d, FACE, DOWN, $2, JUGGLER + $C8, $7
object SPRITE_ROCKER, $7, $8, FACE, LEFT, $3, JUGGLER + $C8, $3
object SPRITE_ROCKER, $1, $c, FACE, DOWN, $4, JUGGLER + $C8, $8
object SPRITE_ROCKER, $3, $5, FACE, UP, $5, TAMER + $C8, $1
object SPRITE_ROCKER, $8, $2, FACE, DOWN, $6, TAMER + $C8, $2
object SPRITE_ROCKER, $2, $7, FACE, RIGHT, $7, JUGGLER + $C8, $4
object SPRITE_GYM_HELPER, $7, $f, FACE, DOWN, $8 ; person
object SPRITE_BLACKBELT, $4, $a, STAY, DOWN, $1, KOGA + $C8, $1
object SPRITE_ROCKER, $8, $d, STAY, DOWN, $2, JUGGLER + $C8, $7
object SPRITE_ROCKER, $7, $8, STAY, RIGHT, $3, JUGGLER + $C8, $3
object SPRITE_ROCKER, $1, $c, STAY, DOWN, $4, JUGGLER + $C8, $8
object SPRITE_ROCKER, $3, $5, STAY, UP, $5, TAMER + $C8, $1
object SPRITE_ROCKER, $8, $2, STAY, DOWN, $6, TAMER + $C8, $2
object SPRITE_ROCKER, $2, $7, STAY, LEFT, $7, JUGGLER + $C8, $4
object SPRITE_GYM_HELPER, $7, $f, STAY, DOWN, $8 ; person
; warp-to
EVENT_DISP FUCHSIA_GYM_WIDTH, $11, $4

6
data/mapObjects/fuchsiahouse1.asm
View file

@ -8,9 +8,9 @@ FuchsiaHouse1Object: ; 0x75031 (size=38)
db $0 ; signs
db $3 ; objects
object SPRITE_MOM_GEISHA, $2, $3, FACE, LEFT, $1 ; person
object SPRITE_GAMBLER, $7, $2, FACE, UP, $2 ; person
object SPRITE_BUG_CATCHER, $5, $5, FACE, STAY, $3 ; person
object SPRITE_MOM_GEISHA, $2, $3, STAY, RIGHT, $1 ; person
object SPRITE_GAMBLER, $7, $2, STAY, UP, $2 ; person
object SPRITE_BUG_CATCHER, $5, $5, STAY, NONE, $3 ; person
; warp-to
EVENT_DISP FUCHSIA_HOUSE_1_WIDTH, $7, $2

6
data/mapObjects/fuchsiahouse2.asm
View file

@ -10,9 +10,9 @@ FuchsiaHouse2Object: ; 0x75180 (size=45)
db $3, $5, $5 ; FuchsiaHouse2Text5
db $3 ; objects
object SPRITE_WARDEN, $2, $3, FACE, STAY, $1 ; person
object SPRITE_BALL, $8, $3, FACE, STAY, $2, RARE_CANDY
object SPRITE_BOULDER, $8, $4, FACE, BOULDER_MOVEMENT_BYTE_2, $3 ; person
object SPRITE_WARDEN, $2, $3, STAY, NONE, $1 ; person
object SPRITE_BALL, $8, $3, STAY, NONE, $2, RARE_CANDY
object SPRITE_BOULDER, $8, $4, STAY, BOULDER_MOVEMENT_BYTE_2, $3 ; person
; warp-to
EVENT_DISP FUCHSIA_HOUSE_2_WIDTH, $7, $4

2
data/mapObjects/fuchsiahouse3.asm
View file

@ -9,7 +9,7 @@ FuchsiaHouse3Object: ; 0x56221 (size=34)
db $0 ; signs
db $1 ; objects
object SPRITE_FISHER, $5, $3, FACE, LEFT, $1 ; person
object SPRITE_FISHER, $5, $3, STAY, RIGHT, $1 ; person
; warp-to
EVENT_DISP FUCHSIA_HOUSE_3_WIDTH, $0, $2

4
data/mapObjects/fuchsiamart.asm
View file

@ -8,8 +8,8 @@ FuchsiaMartObject: ; 0x1dd9b (size=38)
db $0 ; signs
db $3 ; objects
object SPRITE_MART_GUY, $0, $5, FACE, LEFT, $1 ; person
object SPRITE_FAT_BALD_GUY, $4, $2, FACE, STAY, $2 ; person
object SPRITE_MART_GUY, $0, $5, STAY, RIGHT, $1 ; person
object SPRITE_FAT_BALD_GUY, $4, $2, STAY, NONE, $2 ; person
object SPRITE_LASS, $6, $5, WALK, $1, $3 ; person
; warp-to

6
data/mapObjects/fuchsiameetingroom.asm
View file

@ -8,9 +8,9 @@ FuchsiaMeetingRoomObject: ; 0x756fc (size=38)
db $0 ; signs
db $3 ; objects
object SPRITE_WHITE_PLAYER, $4, $1, FACE, DOWN, $1 ; person
object SPRITE_WHITE_PLAYER, $0, $2, FACE, UP, $2 ; person
object SPRITE_WHITE_PLAYER, $a, $1, FACE, DOWN, $3 ; person
object SPRITE_WHITE_PLAYER, $4, $1, STAY, DOWN, $1 ; person
object SPRITE_WHITE_PLAYER, $0, $2, STAY, UP, $2 ; person
object SPRITE_WHITE_PLAYER, $a, $1, STAY, DOWN, $3 ; person
; warp-to
EVENT_DISP FUCHSIA_MEETING_ROOM_WIDTH, $7, $4

6
data/mapObjects/fuchsiapokecenter.asm
View file

@ -8,10 +8,10 @@ FuchsiaPokecenterObject: ; 0x7507d (size=44)
db $0 ; signs
db $4 ; objects
object SPRITE_NURSE, $3, $1, FACE, DOWN, $1 ; person
object SPRITE_ROCKER, $2, $3, FACE, STAY, $2 ; person
object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person
object SPRITE_ROCKER, $2, $3, STAY, NONE, $2 ; person
object SPRITE_LASS, $6, $5, WALK, $2, $3 ; person
object SPRITE_CABLE_CLUB_WOMAN, $b, $2, FACE, DOWN, $4 ; person
object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person
; warp-to
EVENT_DISP FUCHSIA_POKECENTER_WIDTH, $7, $3

4
data/mapObjects/gary.asm
View file

@ -10,8 +10,8 @@ GaryObject: ; 0x7612f (size=48)
db $0 ; signs
db $2 ; objects
object SPRITE_BLUE, $4, $2, FACE, DOWN, $1 ; person
object SPRITE_OAK, $3, $7, FACE, UP, $2 ; person
object SPRITE_BLUE, $4, $2, STAY, DOWN, $1 ; person
object SPRITE_OAK, $3, $7, STAY, UP, $2 ; person
; warp-to
EVENT_DISP CHAMPIONS_ROOM_WIDTH, $7, $3 ; LANCES_ROOM

2
data/mapObjects/halloffameroom.asm
View file

@ -8,7 +8,7 @@ HallofFameRoomObject: ; 0x5a571 (size=26)
db $0 ; signs
db $1 ; objects
object SPRITE_OAK, $5, $2, FACE, DOWN, $1 ; person
object SPRITE_OAK, $5, $2, STAY, DOWN, $1 ; person
; warp-to
EVENT_DISP HALL_OF_FAME_WIDTH, $7, $4 ; CHAMPIONS_ROOM

10
data/mapObjects/indigoplateaulobby.asm
View file

@ -9,11 +9,11 @@ IndigoPlateauLobbyObject: ; 0x19c95 (size=58)
db $0 ; signs
db $5 ; objects
object SPRITE_NURSE, $7, $5, FACE, DOWN, $1 ; person
object SPRITE_GYM_HELPER, $4, $9, FACE, LEFT, $2 ; person
object SPRITE_LASS, $5, $1, FACE, DOWN, $3 ; person
object SPRITE_MART_GUY, $0, $5, FACE, LEFT, $4 ; person
object SPRITE_CABLE_CLUB_WOMAN, $d, $6, FACE, DOWN, $5 ; person
object SPRITE_NURSE, $7, $5, STAY, DOWN, $1 ; person
object SPRITE_GYM_HELPER, $4, $9, STAY, RIGHT, $2 ; person
object SPRITE_LASS, $5, $1, STAY, DOWN, $3 ; person
object SPRITE_MART_GUY, $0, $5, STAY, RIGHT, $4 ; person
object SPRITE_CABLE_CLUB_WOMAN, $d, $6, STAY, DOWN, $5 ; person
; warp-to
EVENT_DISP INDIGO_PLATEAU_LOBBY_WIDTH, $b, $7

2
data/mapObjects/lab1.asm
View file

@ -15,7 +15,7 @@ Lab1Object: ; 0x75bb3 (size=62)
db $4, $11, $5 ; Lab1Text5
db $1 ; objects
object SPRITE_FISHER, $1, $3, FACE, STAY, $1 ; person
object SPRITE_FISHER, $1, $3, STAY, NONE, $1 ; person
; warp-to
EVENT_DISP CINNABAR_LAB_1_WIDTH, $7, $2

6
data/mapObjects/lab2.asm
View file

@ -8,9 +8,9 @@ Lab2Object: ; 0x75c45 (size=38)
db $0 ; signs
db $3 ; objects
object SPRITE_BLACK_HAIR_BOY_2, $3, $2, FACE, DOWN, $1 ; person
object SPRITE_OLD_PERSON, $1, $4, FACE, STAY, $2 ; person
object SPRITE_FOULARD_WOMAN, $5, $5, FACE, UP, $3 ; person
object SPRITE_BLACK_HAIR_BOY_2, $3, $2, STAY, DOWN, $1 ; person
object SPRITE_OLD_PERSON, $1, $4, STAY, NONE, $2 ; person
object SPRITE_FOULARD_WOMAN, $5, $5, STAY, UP, $3 ; person
; warp-to
EVENT_DISP CINNABAR_LAB_2_WIDTH, $7, $2 ; CINNABAR_LAB_1

2
data/mapObjects/lab3.asm
View file

@ -11,7 +11,7 @@ Lab3Object: ; 0x75cec (size=41)
db $1, $2, $5 ; Lab3Text5
db $2 ; objects
object SPRITE_OAK_AIDE, $7, $2, FACE, DOWN, $1 ; person
object SPRITE_OAK_AIDE, $7, $2, STAY, DOWN, $1 ; person
object SPRITE_OAK_AIDE, $2, $3, WALK, $2, $2 ; person
; warp-to

2
data/mapObjects/lab4.asm
View file

@ -9,7 +9,7 @@ Lab4Object: ; 0x75df0 (size=32)
db $2 ; objects
object SPRITE_OAK_AIDE, $5, $2, WALK, $2, $1 ; person
object SPRITE_OAK_AIDE, $7, $6, FACE, UP, $2 ; person
object SPRITE_OAK_AIDE, $7, $6, STAY, UP, $2 ; person
; warp-to
EVENT_DISP CINNABAR_LAB_4_WIDTH, $7, $2 ; CINNABAR_LAB_1

2
data/mapObjects/lance.asm
View file

@ -9,7 +9,7 @@ LanceObject: ; 0x5a3c5 (size=36)
db $0 ; signs
db $1 ; objects
object SPRITE_LANCE, $6, $1, FACE, DOWN, $1, LANCE + $C8, $1
object SPRITE_LANCE, $6, $1, STAY, DOWN, $1, LANCE + $C8, $1
; warp-to
EVENT_DISP LANCES_ROOM_WIDTH, $10, $18 ; AGATHAS_ROOM

12
data/mapObjects/lavenderhouse1.asm
View file

@ -8,12 +8,12 @@ LavenderHouse1Object: ; 0x1d96a (size=56)
db $0 ; signs
db $6 ; objects
object SPRITE_BLACK_HAIR_BOY_2, $3, $5, FACE, STAY, $1 ; person
object SPRITE_LITTLE_GIRL, $6, $3, FACE, DOWN, $2 ; person
object SPRITE_SLOWBRO, $6, $4, FACE, UP, $3 ; person
object SPRITE_SLOWBRO, $1, $3, FACE, STAY, $4 ; person
object SPRITE_MR_FUJI, $3, $1, FACE, STAY, $5 ; person
object SPRITE_BOOK_MAP_DEX, $3, $3, FACE, STAY, $6 ; person
object SPRITE_BLACK_HAIR_BOY_2, $3, $5, STAY, NONE, $1 ; person
object SPRITE_LITTLE_GIRL, $6, $3, STAY, DOWN, $2 ; person
object SPRITE_SLOWBRO, $6, $4, STAY, UP, $3 ; person
object SPRITE_SLOWBRO, $1, $3, STAY, NONE, $4 ; person
object SPRITE_MR_FUJI, $3, $1, STAY, NONE, $5 ; person
object SPRITE_BOOK_MAP_DEX, $3, $3, STAY, NONE, $6 ; person
; warp-to
EVENT_DISP LAVENDER_HOUSE_1_WIDTH, $7, $2

4
data/mapObjects/lavenderhouse2.asm
View file

@ -8,8 +8,8 @@ LavenderHouse2Object: ; 0x1d9e6 (size=32)
db $0 ; signs
db $2 ; objects
object SPRITE_SLOWBRO, $3, $5, FACE, UP, $1 ; person
object SPRITE_BRUNETTE_GIRL, $2, $4, FACE, LEFT, $2 ; person
object SPRITE_SLOWBRO, $3, $5, STAY, UP, $1 ; person
object SPRITE_BRUNETTE_GIRL, $2, $4, STAY, RIGHT, $2 ; person
; warp-to
EVENT_DISP LAVENDER_HOUSE_2_WIDTH, $7, $2

6
data/mapObjects/lavendermart.asm
View file

@ -8,9 +8,9 @@ LavenderMartObject: ; 0x5c95d (size=38)
db $0 ; signs
db $3 ; objects
object SPRITE_MART_GUY, $0, $5, FACE, LEFT, $1 ; person
object SPRITE_BALDING_GUY, $3, $4, FACE, STAY, $2 ; person
object SPRITE_BLACK_HAIR_BOY_1, $7, $2, FACE, STAY, $3 ; person
object SPRITE_MART_GUY, $0, $5, STAY, RIGHT, $1 ; person
object SPRITE_BALDING_GUY, $3, $4, STAY, NONE, $2 ; person
object SPRITE_BLACK_HAIR_BOY_1, $7, $2, STAY, NONE, $3 ; person
; warp-to
EVENT_DISP LAVENDER_MART_WIDTH, $7, $3

6
data/mapObjects/lavenderpokecenter.asm
View file

@ -8,10 +8,10 @@ LavenderPokecenterObject: ; 0x5c8f4 (size=44)
db $0 ; signs
db $4 ; objects
object SPRITE_NURSE, $3, $1, FACE, DOWN, $1 ; person
object SPRITE_GENTLEMAN, $5, $3, FACE, STAY, $2 ; person
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, $1, $3 ; person
object SPRITE_CABLE_CLUB_WOMAN, $b, $2, FACE, DOWN, $4 ; person
object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person
; warp-to
EVENT_DISP LAVENDER_POKECENTER_WIDTH, $7, $3

2
data/mapObjects/lavendertown.asm
View file

@ -19,7 +19,7 @@ LavenderTownObject: ; 0x4402d (size=88)
db $3 ; objects
object SPRITE_LITTLE_GIRL, $f, $9, WALK, $0, $1 ; person
object SPRITE_BLACK_HAIR_BOY_1, $9, $a, FACE, STAY, $2 ; person
object SPRITE_BLACK_HAIR_BOY_1, $9, $a, STAY, NONE, $2 ; person
object SPRITE_BLACK_HAIR_BOY_2, $8, $7, WALK, $2, $3 ; person
; warp-to

2
data/mapObjects/lorelei.asm
View file

@ -10,7 +10,7 @@ LoreleiObject: ; 0x76280 (size=44)
db $0 ; signs
db $1 ; objects
object SPRITE_LORELEI, $5, $2, FACE, DOWN, $1, LORELEI + $C8, $1
object SPRITE_LORELEI, $5, $2, STAY, DOWN, $1, LORELEI + $C8, $1
; warp-to
EVENT_DISP LORELEIS_ROOM_WIDTH, $b, $4 ; INDIGO_PLATEAU_LOBBY

6
data/mapObjects/mansion1.asm
View file

@ -14,9 +14,9 @@ Mansion1Object: ; 0x443a4 (size=90)
db $0 ; signs
db $3 ; objects
object SPRITE_OAK_AIDE, $11, $11, FACE, RIGHT, $1, SCIENTIST + $C8, $4
object SPRITE_BALL, $e, $3, FACE, STAY, $2, ESCAPE_ROPE
object SPRITE_BALL, $12, $15, FACE, STAY, $3, CARBOS
object SPRITE_OAK_AIDE, $11, $11, STAY, LEFT, $1, SCIENTIST + $C8, $4
object SPRITE_BALL, $e, $3, STAY, NONE, $2, ESCAPE_ROPE
object SPRITE_BALL, $12, $15, STAY, NONE, $3, CARBOS
; warp-to
EVENT_DISP MANSION_1_WIDTH, $1b, $4

6
data/mapObjects/mansion2.asm
View file

@ -11,9 +11,9 @@ Mansion2Object: ; 0x520d1 (size=63)
db $4 ; objects
object SPRITE_BLACK_HAIR_BOY_2, $3, $11, WALK, $2, $1, BURGLAR + $C8, $7
object SPRITE_BALL, $1c, $7, FACE, STAY, $2, CALCIUM
object SPRITE_BOOK_MAP_DEX, $12, $2, FACE, STAY, $3 ; person
object SPRITE_BOOK_MAP_DEX, $3, $16, FACE, STAY, $4 ; person
object SPRITE_BALL, $1c, $7, STAY, NONE, $2, CALCIUM
object SPRITE_BOOK_MAP_DEX, $12, $2, STAY, NONE, $3 ; person
object SPRITE_BOOK_MAP_DEX, $3, $16, STAY, NONE, $4 ; person
; warp-to
EVENT_DISP MANSION_2_WIDTH, $a, $5 ; MANSION_1

8
data/mapObjects/mansion3.asm
View file

@ -10,10 +10,10 @@ Mansion3Object: ; 0x522e6 (size=64)
db $5 ; objects
object SPRITE_BLACK_HAIR_BOY_2, $5, $b, WALK, $2, $1, BURGLAR + $C8, $8
object SPRITE_OAK_AIDE, $14, $b, FACE, RIGHT, $2, SCIENTIST + $C8, $c
object SPRITE_BALL, $1, $10, FACE, STAY, $3, MAX_POTION
object SPRITE_BALL, $19, $5, FACE, STAY, $4, IRON
object SPRITE_BOOK_MAP_DEX, $6, $c, FACE, STAY, $5 ; person
object SPRITE_OAK_AIDE, $14, $b, STAY, LEFT, $2, SCIENTIST + $C8, $c
object SPRITE_BALL, $1, $10, STAY, NONE, $3, MAX_POTION
object SPRITE_BALL, $19, $5, STAY, NONE, $4, IRON
object SPRITE_BOOK_MAP_DEX, $6, $c, STAY, NONE, $5 ; person
; warp-to
EVENT_DISP MANSION_3_WIDTH, $a, $7 ; MANSION_2

16
data/mapObjects/mansion4.asm
View file

@ -7,14 +7,14 @@ Mansion4Object: ; 0x52498 (size=69)
db $0 ; signs
db $8 ; objects
object SPRITE_BLACK_HAIR_BOY_2, $10, $17, FACE, STAY, $1, BURGLAR + $C8, $9
object SPRITE_OAK_AIDE, $1b, $b, FACE, DOWN, $2, SCIENTIST + $C8, $d
object SPRITE_BALL, $a, $2, FACE, STAY, $3, RARE_CANDY
object SPRITE_BALL, $1, $16, FACE, STAY, $4, FULL_RESTORE
object SPRITE_BALL, $13, $19, FACE, STAY, $5, TM_14
object SPRITE_BALL, $5, $4, FACE, STAY, $6, TM_22
object SPRITE_BOOK_MAP_DEX, $10, $14, FACE, STAY, $7 ; person
object SPRITE_BALL, $5, $d, FACE, STAY, $8, SECRET_KEY
object SPRITE_BLACK_HAIR_BOY_2, $10, $17, STAY, NONE, $1, BURGLAR + $C8, $9
object SPRITE_OAK_AIDE, $1b, $b, STAY, DOWN, $2, SCIENTIST + $C8, $d
object SPRITE_BALL, $a, $2, STAY, NONE, $3, RARE_CANDY
object SPRITE_BALL, $1, $16, STAY, NONE, $4, FULL_RESTORE
object SPRITE_BALL, $13, $19, STAY, NONE, $5, TM_14
object SPRITE_BALL, $5, $4, STAY, NONE, $6, TM_22
object SPRITE_BOOK_MAP_DEX, $10, $14, STAY, NONE, $7 ; person
object SPRITE_BALL, $5, $d, STAY, NONE, $8, SECRET_KEY
; warp-to
EVENT_DISP MANSION_4_WIDTH, $16, $17 ; MANSION_1

26
data/mapObjects/mtmoon1.asm
View file

@ -12,19 +12,19 @@ MtMoon1Object: ; 0x49b06 (size=145)
db $17, $f, $e ; MtMoon1Text14
db $d ; objects
object SPRITE_HIKER, $5, $6, FACE, DOWN, $1, HIKER + $C8, $1
object SPRITE_BUG_CATCHER, $c, $10, FACE, LEFT, $2, YOUNGSTER + $C8, $3
object SPRITE_LASS, $1e, $4, FACE, DOWN, $3, LASS + $C8, $5
object SPRITE_BLACK_HAIR_BOY_2, $18, $1f, FACE, UP, $4, SUPER_NERD + $C8, $1
object SPRITE_LASS, $10, $17, FACE, DOWN, $5, LASS + $C8, $6
object SPRITE_BUG_CATCHER, $7, $16, FACE, DOWN, $6, BUG_CATCHER + $C8, $7
object SPRITE_BUG_CATCHER, $1e, $1b, FACE, LEFT, $7, BUG_CATCHER + $C8, $8
object SPRITE_BALL, $2, $14, FACE, STAY, $8, POTION
object SPRITE_BALL, $2, $2, FACE, STAY, $9, MOON_STONE
object SPRITE_BALL, $23, $1f, FACE, STAY, $a, RARE_CANDY
object SPRITE_BALL, $24, $17, FACE, STAY, $b, ESCAPE_ROPE
object SPRITE_BALL, $14, $21, FACE, STAY, $c, POTION
object SPRITE_BALL, $5, $20, FACE, STAY, $d, TM_12
object SPRITE_HIKER, $5, $6, STAY, DOWN, $1, HIKER + $C8, $1
object SPRITE_BUG_CATCHER, $c, $10, STAY, RIGHT, $2, YOUNGSTER + $C8, $3
object SPRITE_LASS, $1e, $4, STAY, DOWN, $3, LASS + $C8, $5
object SPRITE_BLACK_HAIR_BOY_2, $18, $1f, STAY, UP, $4, SUPER_NERD + $C8, $1
object SPRITE_LASS, $10, $17, STAY, DOWN, $5, LASS + $C8, $6
object SPRITE_BUG_CATCHER, $7, $16, STAY, DOWN, $6, BUG_CATCHER + $C8, $7
object SPRITE_BUG_CATCHER, $1e, $1b, STAY, RIGHT, $7, BUG_CATCHER + $C8, $8
object SPRITE_BALL, $2, $14, STAY, NONE, $8, POTION
object SPRITE_BALL, $2, $2, STAY, NONE, $9, MOON_STONE
object SPRITE_BALL, $23, $1f, STAY, NONE, $a, RARE_CANDY
object SPRITE_BALL, $24, $17, STAY, NONE, $b, ESCAPE_ROPE
object SPRITE_BALL, $14, $21, STAY, NONE, $c, POTION
object SPRITE_BALL, $5, $20, STAY, NONE, $d, TM_12
; warp-to
EVENT_DISP MT_MOON_1_WIDTH, $23, $e

18
data/mapObjects/mtmoon3.asm
View file

@ -10,15 +10,15 @@ MtMoon3Object: ; 0x49fdb (size=102)
db $0 ; signs
db $9 ; objects
object SPRITE_BLACK_HAIR_BOY_2, $c, $8, FACE, LEFT, $1, SUPER_NERD + $C8, $2
object SPRITE_ROCKET, $b, $10, FACE, DOWN, $2, ROCKET + $C8, $1
object SPRITE_ROCKET, $f, $16, FACE, DOWN, $3, ROCKET + $C8, $2
object SPRITE_ROCKET, $1d, $b, FACE, UP, $4, ROCKET + $C8, $3
object SPRITE_ROCKET, $1d, $11, FACE, RIGHT, $5, ROCKET + $C8, $4
object SPRITE_OMANYTE, $c, $6, FACE, STAY, $6 ; person
object SPRITE_OMANYTE, $d, $6, FACE, STAY, $7 ; person
object SPRITE_BALL, $19, $15, FACE, STAY, $8, HP_UP
object SPRITE_BALL, $1d, $5, FACE, STAY, $9, TM_01
object SPRITE_BLACK_HAIR_BOY_2, $c, $8, STAY, RIGHT, $1, SUPER_NERD + $C8, $2
object SPRITE_ROCKET, $b, $10, STAY, DOWN, $2, ROCKET + $C8, $1
object SPRITE_ROCKET, $f, $16, STAY, DOWN, $3, ROCKET + $C8, $2
object SPRITE_ROCKET, $1d, $b, STAY, UP, $4, ROCKET + $C8, $3
object SPRITE_ROCKET, $1d, $11, STAY, LEFT, $5, ROCKET + $C8, $4
object SPRITE_OMANYTE, $c, $6, STAY, NONE, $6 ; person
object SPRITE_OMANYTE, $d, $6, STAY, NONE, $7 ; person
object SPRITE_BALL, $19, $15, STAY, NONE, $8, HP_UP
object SPRITE_BALL, $1d, $5, STAY, NONE, $9, TM_01
; warp-to
EVENT_DISP MT_MOON_3_WIDTH, $9, $19 ; MT_MOON_2

10
data/mapObjects/mtmoonpokecenter.asm
View file

@ -8,12 +8,12 @@ MtMoonPokecenterObject: ; 0x49376 (size=56)
db $0 ; signs
db $6 ; objects
object SPRITE_NURSE, $3, $1, FACE, DOWN, $1 ; person
object SPRITE_BUG_CATCHER, $4, $3, FACE, UP, $2 ; person
object SPRITE_GENTLEMAN, $7, $3, FACE, UP, $3 ; person
object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person
object SPRITE_BUG_CATCHER, $4, $3, STAY, UP, $2 ; person
object SPRITE_GENTLEMAN, $7, $3, STAY, UP, $3 ; person
object SPRITE_FAT_BALD_GUY, $a, $6, WALK, $2, $4 ; person
object SPRITE_CLIPBOARD, $7, $2, FACE, STAY, $5 ; person
object SPRITE_CABLE_CLUB_WOMAN, $b, $2, FACE, DOWN, $6 ; person
object SPRITE_CLIPBOARD, $7, $2, STAY, NONE, $5 ; person
object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $6 ; person
; warp-to
EVENT_DISP MT_MOON_POKECENTER_WIDTH, $7, $3

10
data/mapObjects/museum1f.asm
View file

@ -11,11 +11,11 @@ Museum1FObject: ; 0x5c2c1 (size=74)
db $0 ; signs
db $5 ; objects
object SPRITE_OAK_AIDE, $c, $4, FACE, RIGHT, $1 ; person
object SPRITE_GAMBLER, $1, $4, FACE, STAY, $2 ; person
object SPRITE_OAK_AIDE, $f, $2, FACE, DOWN, $3 ; person
object SPRITE_OAK_AIDE, $11, $4, FACE, STAY, $4 ; person
object SPRITE_OLD_AMBER, $10, $2, FACE, STAY, $5 ; person
object SPRITE_OAK_AIDE, $c, $4, STAY, LEFT, $1 ; person
object SPRITE_GAMBLER, $1, $4, STAY, NONE, $2 ; person
object SPRITE_OAK_AIDE, $f, $2, STAY, DOWN, $3 ; person
object SPRITE_OAK_AIDE, $11, $4, STAY, NONE, $4 ; person
object SPRITE_OLD_AMBER, $10, $2, STAY, NONE, $5 ; person
; warp-to
EVENT_DISP MUSEUM_1F_WIDTH, $7, $a

8
data/mapObjects/museum2f.asm
View file

@ -10,10 +10,10 @@ Museum2FObject: ; 0x5c34b (size=48)
db $5 ; objects
object SPRITE_BUG_CATCHER, $1, $7, WALK, $2, $1 ; person
object SPRITE_OLD_PERSON, $0, $5, FACE, DOWN, $2 ; person
object SPRITE_OAK_AIDE, $7, $5, FACE, DOWN, $3 ; person
object SPRITE_BRUNETTE_GIRL, $b, $5, FACE, STAY, $4 ; person
object SPRITE_HIKER, $c, $5, FACE, DOWN, $5 ; person
object SPRITE_OLD_PERSON, $0, $5, STAY, DOWN, $2 ; person
object SPRITE_OAK_AIDE, $7, $5, STAY, DOWN, $3 ; person
object SPRITE_BRUNETTE_GIRL, $b, $5, STAY, NONE, $4 ; person
object SPRITE_HIKER, $c, $5, STAY, DOWN, $5 ; person
; warp-to
EVENT_DISP MUSEUM_2F_WIDTH, $7, $7 ; MUSEUM_1F

2
data/mapObjects/namerater.asm
View file

@ -8,7 +8,7 @@ NameRaterObject: ; 0x1dad6 (size=26)
db $0 ; signs
db $1 ; objects
object SPRITE_MR_MASTERBALL, $5, $3, FACE, RIGHT, $1 ; person
object SPRITE_MR_MASTERBALL, $5, $3, STAY, LEFT, $1 ; person
; warp-to
EVENT_DISP NAME_RATERS_HOUSE_WIDTH, $7, $2

20
data/mapObjects/oakslab.asm
View file

@ -8,17 +8,17 @@ OaksLabObject: ; 0x1d40a (size=88)
db $0 ; signs
db $b ; objects
object SPRITE_BLUE, $4, $3, FACE, STAY, $1, SONY1 + $C8, $1
object SPRITE_BALL, $6, $3, FACE, STAY, $2 ; person
object SPRITE_BALL, $7, $3, FACE, STAY, $3 ; person
object SPRITE_BALL, $8, $3, FACE, STAY, $4 ; person
object SPRITE_OAK, $5, $2, FACE, DOWN, $5 ; person
object SPRITE_BOOK_MAP_DEX, $2, $1, FACE, STAY, $6 ; person
object SPRITE_BOOK_MAP_DEX, $3, $1, FACE, STAY, $7 ; person
object SPRITE_OAK, $5, $a, FACE, UP, $8 ; person
object SPRITE_BLUE, $4, $3, STAY, NONE, $1, SONY1 + $C8, $1
object SPRITE_BALL, $6, $3, STAY, NONE, $2 ; person
object SPRITE_BALL, $7, $3, STAY, NONE, $3 ; person
object SPRITE_BALL, $8, $3, STAY, NONE, $4 ; person
object SPRITE_OAK, $5, $2, STAY, DOWN, $5 ; person
object SPRITE_BOOK_MAP_DEX, $2, $1, STAY, NONE, $6 ; person
object SPRITE_BOOK_MAP_DEX, $3, $1, STAY, NONE, $7 ; person
object SPRITE_OAK, $5, $a, STAY, UP, $8 ; person
object SPRITE_GIRL, $1, $9, WALK, $1, $9 ; person
object SPRITE_OAK_AIDE, $2, $a, FACE, STAY, $a ; person
object SPRITE_OAK_AIDE, $8, $a, FACE, STAY, $b ; person
object SPRITE_OAK_AIDE, $2, $a, STAY, NONE, $a ; person
object SPRITE_OAK_AIDE, $8, $a, STAY, NONE, $b ; person
; warp-to
EVENT_DISP OAKS_LAB_WIDTH, $b, $4

2
data/mapObjects/pallettown.asm
View file

@ -13,7 +13,7 @@ PalletTownObject: ; 0x182c3 (size=58)
db $5, $b, $7 ; PalletTownText7
db $3 ; objects
object SPRITE_OAK, $8, $5, FACE, STAY, $1 ; person
object SPRITE_OAK, $8, $5, STAY, NONE, $1 ; person
object SPRITE_GIRL, $3, $8, WALK, $0, $2 ; person
object SPRITE_FISHER2, $b, $e, WALK, $0, $3 ; person

8
data/mapObjects/pewtercity.asm
View file

@ -20,11 +20,11 @@ PewterCityObject: ; 0x18577 (size=111)
db $17, $19, $c ; PewterCityText12
db $5 ; objects
object SPRITE_LASS, $8, $f, FACE, STAY, $1 ; person
object SPRITE_BLACK_HAIR_BOY_1, $11, $19, FACE, STAY, $2 ; person
object SPRITE_BLACK_HAIR_BOY_2, $1b, $11, FACE, STAY, $3 ; person
object SPRITE_LASS, $8, $f, STAY, NONE, $1 ; person
object SPRITE_BLACK_HAIR_BOY_1, $11, $19, STAY, NONE, $2 ; person
object SPRITE_BLACK_HAIR_BOY_2, $1b, $11, STAY, NONE, $3 ; person
object SPRITE_BLACK_HAIR_BOY_2, $1a, $19, WALK, $2, $4 ; person
object SPRITE_BUG_CATCHER, $23, $10, FACE, DOWN, $5 ; person
object SPRITE_BUG_CATCHER, $23, $10, STAY, DOWN, $5 ; person
; warp-to
EVENT_DISP PEWTER_CITY_WIDTH, $7, $e ; MUSEUM_1F

6
data/mapObjects/pewtergym.asm
View file

@ -8,9 +8,9 @@ PewterGymObject: ; 0x5c52e (size=42)
db $0 ; signs
db $3 ; objects
object SPRITE_BLACK_HAIR_BOY_2, $4, $1, FACE, DOWN, $1, BROCK + $C8, $1
object SPRITE_BLACK_HAIR_BOY_1, $3, $6, FACE, LEFT, $2, JR__TRAINER_M + $C8, $1
object SPRITE_GYM_HELPER, $7, $a, FACE, DOWN, $3 ; person
object SPRITE_BLACK_HAIR_BOY_2, $4, $1, STAY, DOWN, $1, BROCK + $C8, $1
object SPRITE_BLACK_HAIR_BOY_1, $3, $6, STAY, RIGHT, $2, JR__TRAINER_M + $C8, $1
object SPRITE_GYM_HELPER, $7, $a, STAY, DOWN, $3 ; person
; warp-to
EVENT_DISP PEWTER_GYM_WIDTH, $d, $4

6
data/mapObjects/pewterhouse1.asm
View file

@ -8,9 +8,9 @@ PewterHouse1Object: ; 0x1d616 (size=38)
db $0 ; signs
db $3 ; objects
object SPRITE_SLOWBRO, $4, $5, FACE, RIGHT, $1 ; person
object SPRITE_YOUNG_BOY, $3, $5, FACE, LEFT, $2 ; person
object SPRITE_FAT_BALD_GUY, $1, $2, FACE, STAY, $3 ; person
object SPRITE_SLOWBRO, $4, $5, STAY, LEFT, $1 ; person
object SPRITE_YOUNG_BOY, $3, $5, STAY, RIGHT, $2 ; person
object SPRITE_FAT_BALD_GUY, $1, $2, STAY, NONE, $3 ; person
; warp-to
EVENT_DISP PEWTER_HOUSE_1_WIDTH, $7, $2

4
data/mapObjects/pewterhouse2.asm
View file

@ -8,8 +8,8 @@ PewterHouse2Object: ; 0x1d659 (size=32)
db $0 ; signs
db $2 ; objects
object SPRITE_GAMBLER, $2, $3, FACE, LEFT, $1 ; person
object SPRITE_BUG_CATCHER, $4, $5, FACE, STAY, $2 ; person
object SPRITE_GAMBLER, $2, $3, STAY, RIGHT, $1 ; person
object SPRITE_BUG_CATCHER, $4, $5, STAY, NONE, $2 ; person
; warp-to
EVENT_DISP PEWTER_HOUSE_2_WIDTH, $7, $2

4
data/mapObjects/pewtermart.asm
View file

@ -8,9 +8,9 @@ PewterMartObject: ; 0x74cda (size=38)
db $0 ; signs
db $3 ; objects
object SPRITE_MART_GUY, $0, $5, FACE, LEFT, $1 ; person
object SPRITE_MART_GUY, $0, $5, STAY, RIGHT, $1 ; person
object SPRITE_BUG_CATCHER, $3, $3, WALK, $1, $2 ; person
object SPRITE_BLACK_HAIR_BOY_2, $5, $5, FACE, STAY, $3 ; person
object SPRITE_BLACK_HAIR_BOY_2, $5, $5, STAY, NONE, $3 ; person
; warp-to
EVENT_DISP PEWTER_MART_WIDTH, $7, $3

8
data/mapObjects/pewterpokecenter.asm
View file

@ -8,10 +8,10 @@ PewterPokecenterObject: ; 0x5c60d (size=44)
db $0 ; signs
db $4 ; objects
object SPRITE_NURSE, $3, $1, FACE, DOWN, $1 ; person
object SPRITE_GENTLEMAN, $b, $7, FACE, RIGHT, $2 ; person
object SPRITE_CLEFAIRY, $1, $3, FACE, DOWN, $3 ; person
object SPRITE_CABLE_CLUB_WOMAN, $b, $2, FACE, DOWN, $4 ; person
object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person
object SPRITE_GENTLEMAN, $b, $7, STAY, LEFT, $2 ; person
object SPRITE_CLEFAIRY, $1, $3, STAY, DOWN, $3 ; person
object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person
; warp-to
EVENT_DISP PEWTER_POKECENTER_WIDTH, $7, $3

10
data/mapObjects/pokemontower1.asm
View file

@ -9,11 +9,11 @@ PokemonTower1Object: ; 0x60452 (size=58)
db $0 ; signs
db $5 ; objects
object SPRITE_CABLE_CLUB_WOMAN, $f, $d, FACE, UP, $1 ; person
object SPRITE_MOM_GEISHA, $6, $8, FACE, STAY, $2 ; person
object SPRITE_BALDING_GUY, $8, $c, FACE, STAY, $3 ; person
object SPRITE_GIRL, $d, $7, FACE, STAY, $4 ; person
object SPRITE_MEDIUM, $11, $7, FACE, RIGHT, $5 ; person
object SPRITE_CABLE_CLUB_WOMAN, $f, $d, STAY, UP, $1 ; person
object SPRITE_MOM_GEISHA, $6, $8, STAY, NONE, $2 ; person
object SPRITE_BALDING_GUY, $8, $c, STAY, NONE, $3 ; person
object SPRITE_GIRL, $d, $7, STAY, NONE, $4 ; person
object SPRITE_MEDIUM, $11, $7, STAY, LEFT, $5 ; person
; warp-to
EVENT_DISP POKEMONTOWER_1_WIDTH, $11, $a

4
data/mapObjects/pokemontower2.asm
View file

@ -8,8 +8,8 @@ PokemonTower2Object: ; 0x60646 (size=32)
db $0 ; signs
db $2 ; objects
object SPRITE_BLUE, $e, $5, FACE, STAY, $1 ; person
object SPRITE_MEDIUM, $3, $7, FACE, LEFT, $2 ; person
object SPRITE_BLUE, $e, $5, STAY, NONE, $1 ; person
object SPRITE_MEDIUM, $3, $7, STAY, RIGHT, $2 ; person
; warp-to
EVENT_DISP POKEMONTOWER_2_WIDTH, $9, $3 ; POKEMONTOWER_3

8
data/mapObjects/pokemontower3.asm
View file

@ -8,10 +8,10 @@ PokemonTower3Object: ; 0x6075d (size=51)
db $0 ; signs
db $4 ; objects
object SPRITE_MEDIUM, $c, $3, FACE, RIGHT, $1, CHANNELER + $C8, $5
object SPRITE_MEDIUM, $9, $8, FACE, DOWN, $2, CHANNELER + $C8, $6
object SPRITE_MEDIUM, $a, $d, FACE, DOWN, $3, CHANNELER + $C8, $8
object SPRITE_BALL, $c, $1, FACE, STAY, $4, ESCAPE_ROPE
object SPRITE_MEDIUM, $c, $3, STAY, LEFT, $1, CHANNELER + $C8, $5
object SPRITE_MEDIUM, $9, $8, STAY, DOWN, $2, CHANNELER + $C8, $6
object SPRITE_MEDIUM, $a, $d, STAY, DOWN, $3, CHANNELER + $C8, $8
object SPRITE_BALL, $c, $1, STAY, NONE, $4, ESCAPE_ROPE
; warp-to
EVENT_DISP POKEMONTOWER_3_WIDTH, $9, $3 ; POKEMONTOWER_2

12
data/mapObjects/pokemontower4.asm
View file

@ -8,12 +8,12 @@ PokemonTower4Object: ; 0x6088b (size=65)
db $0 ; signs
db $6 ; objects
object SPRITE_MEDIUM, $5, $a, FACE, LEFT, $1, CHANNELER + $C8, $9
object SPRITE_MEDIUM, $f, $7, FACE, DOWN, $2, CHANNELER + $C8, $a
object SPRITE_MEDIUM, $e, $c, FACE, RIGHT, $3, CHANNELER + $C8, $c
object SPRITE_BALL, $c, $a, FACE, STAY, $4, ELIXER
object SPRITE_BALL, $9, $a, FACE, STAY, $5, AWAKENING
object SPRITE_BALL, $c, $10, FACE, STAY, $6, HP_UP
object SPRITE_MEDIUM, $5, $a, STAY, RIGHT, $1, CHANNELER + $C8, $9
object SPRITE_MEDIUM, $f, $7, STAY, DOWN, $2, CHANNELER + $C8, $a
object SPRITE_MEDIUM, $e, $c, STAY, LEFT, $3, CHANNELER + $C8, $c
object SPRITE_BALL, $c, $a, STAY, NONE, $4, ELIXER
object SPRITE_BALL, $9, $a, STAY, NONE, $5, AWAKENING
object SPRITE_BALL, $c, $10, STAY, NONE, $6, HP_UP
; warp-to
EVENT_DISP POKEMONTOWER_4_WIDTH, $9, $3 ; POKEMONTOWER_5

12
data/mapObjects/pokemontower5.asm
View file

@ -8,12 +8,12 @@ PokemonTower5Object: ; 0x60a48 (size=65)
db $0 ; signs
db $6 ; objects
object SPRITE_MEDIUM, $c, $8, FACE, STAY, $1 ; person
object SPRITE_MEDIUM, $11, $7, FACE, RIGHT, $2, CHANNELER + $C8, $e
object SPRITE_MEDIUM, $e, $3, FACE, RIGHT, $3, CHANNELER + $C8, $10
object SPRITE_MEDIUM, $6, $a, FACE, LEFT, $4, CHANNELER + $C8, $11
object SPRITE_MEDIUM, $9, $10, FACE, LEFT, $5, CHANNELER + $C8, $12
object SPRITE_BALL, $6, $e, FACE, STAY, $6, NUGGET
object SPRITE_MEDIUM, $c, $8, STAY, NONE, $1 ; person
object SPRITE_MEDIUM, $11, $7, STAY, LEFT, $2, CHANNELER + $C8, $e
object SPRITE_MEDIUM, $e, $3, STAY, LEFT, $3, CHANNELER + $C8, $10
object SPRITE_MEDIUM, $6, $a, STAY, RIGHT, $4, CHANNELER + $C8, $11
object SPRITE_MEDIUM, $9, $10, STAY, RIGHT, $5, CHANNELER + $C8, $12
object SPRITE_BALL, $6, $e, STAY, NONE, $6, NUGGET
; warp-to
EVENT_DISP POKEMONTOWER_5_WIDTH, $9, $3 ; POKEMONTOWER_4

10
data/mapObjects/pokemontower6.asm
View file

@ -8,11 +8,11 @@ PokemonTower6Object: ; 0x60c5b (size=58)
db $0 ; signs
db $5 ; objects
object SPRITE_MEDIUM, $c, $a, FACE, LEFT, $1, CHANNELER + $C8, $13
object SPRITE_MEDIUM, $9, $5, FACE, DOWN, $2, CHANNELER + $C8, $14
object SPRITE_MEDIUM, $10, $5, FACE, RIGHT, $3, CHANNELER + $C8, $15
object SPRITE_BALL, $6, $8, FACE, STAY, $4, RARE_CANDY
object SPRITE_BALL, $e, $e, FACE, STAY, $5, X_ACCURACY
object SPRITE_MEDIUM, $c, $a, STAY, RIGHT, $1, CHANNELER + $C8, $13
object SPRITE_MEDIUM, $9, $5, STAY, DOWN, $2, CHANNELER + $C8, $14
object SPRITE_MEDIUM, $10, $5, STAY, LEFT, $3, CHANNELER + $C8, $15
object SPRITE_BALL, $6, $8, STAY, NONE, $4, RARE_CANDY
object SPRITE_BALL, $e, $e, STAY, NONE, $5, X_ACCURACY
; warp-to
EVENT_DISP POKEMONTOWER_6_WIDTH, $9, $12 ; POKEMONTOWER_5

14
data/mapObjects/pokemontower7.asm
View file

@ -8,15 +8,15 @@ PokemonTower7Object: ; 0x60ef6 (size=42)
IF DEF(_YELLOW)
db 3 ; objects
object SPRITE_JESSIE, $a 8, 8, FACE, DOWN, 1
object SPRITE_JAMES, $b, 8, FACE, DOWN, 2
object SPRITE_MR_FUJI, $a, 3, FACE, DOWN, 3
object SPRITE_JESSIE, $a 8, 8, STAY, DOWN, 1
object SPRITE_JAMES, $b, 8, STAY, DOWN, 2
object SPRITE_MR_FUJI, $a, 3, STAY, DOWN, 3
ELSE
db $4 ; objects
object SPRITE_ROCKET, $9, $b, FACE, LEFT, $1, ROCKET + $C8, $13
object SPRITE_ROCKET, $c, $9, FACE, RIGHT, $2, ROCKET + $C8, $14
object SPRITE_ROCKET, $9, $7, FACE, LEFT, $3, ROCKET + $C8, $15
object SPRITE_MR_FUJI, $a, $3, FACE, DOWN, $4 ; person
object SPRITE_ROCKET, $9, $b, STAY, RIGHT, $1, ROCKET + $C8, $13
object SPRITE_ROCKET, $c, $9, STAY, LEFT, $2, ROCKET + $C8, $14
object SPRITE_ROCKET, $9, $7, STAY, RIGHT, $3, ROCKET + $C8, $15
object SPRITE_MR_FUJI, $a, $3, STAY, DOWN, $4 ; person
ENDC
; warp-to

28
data/mapObjects/powerplant.asm
View file

@ -9,20 +9,20 @@ PowerPlantObject: ; 0x1e3bf (size=135)
db $0 ; signs
db $e ; objects
object SPRITE_BALL, $9, $14, FACE, STAY, $1, VOLTORB, 40
object SPRITE_BALL, $20, $12, FACE, STAY, $2, VOLTORB, 40
object SPRITE_BALL, $15, $19, FACE, STAY, $3, VOLTORB, 40
object SPRITE_BALL, $19, $12, FACE, STAY, $4, ELECTRODE, 43
object SPRITE_BALL, $17, $22, FACE, STAY, $5, VOLTORB, 40
object SPRITE_BALL, $1a, $1c, FACE, STAY, $6, VOLTORB, 40
object SPRITE_BALL, $15, $e, FACE, STAY, $7, ELECTRODE, 43
object SPRITE_BALL, $25, $20, FACE, STAY, $8, VOLTORB, 40
object SPRITE_BIRD, $4, $9, FACE, UP, $9, ZAPDOS, 50
object SPRITE_BALL, $7, $19, FACE, STAY, $a, CARBOS
object SPRITE_BALL, $1c, $3, FACE, STAY, $b, HP_UP
object SPRITE_BALL, $22, $3, FACE, STAY, $c, RARE_CANDY
object SPRITE_BALL, $1a, $20, FACE, STAY, $d, TM_25
object SPRITE_BALL, $14, $20, FACE, STAY, $e, TM_33
object SPRITE_BALL, $9, $14, STAY, NONE, $1, VOLTORB, 40
object SPRITE_BALL, $20, $12, STAY, NONE, $2, VOLTORB, 40
object SPRITE_BALL, $15, $19, STAY, NONE, $3, VOLTORB, 40
object SPRITE_BALL, $19, $12, STAY, NONE, $4, ELECTRODE, 43
object SPRITE_BALL, $17, $22, STAY, NONE, $5, VOLTORB, 40
object SPRITE_BALL, $1a, $1c, STAY, NONE, $6, VOLTORB, 40
object SPRITE_BALL, $15, $e, STAY, NONE, $7, ELECTRODE, 43
object SPRITE_BALL, $25, $20, STAY, NONE, $8, VOLTORB, 40
object SPRITE_BIRD, $4, $9, STAY, UP, $9, ZAPDOS, 50
object SPRITE_BALL, $7, $19, STAY, NONE, $a, CARBOS
object SPRITE_BALL, $1c, $3, STAY, NONE, $b, HP_UP
object SPRITE_BALL, $22, $3, STAY, NONE, $c, RARE_CANDY
object SPRITE_BALL, $1a, $20, STAY, NONE, $d, TM_25
object SPRITE_BALL, $14, $20, STAY, NONE, $e, TM_33
; warp-to
EVENT_DISP POWER_PLANT_WIDTH, $23, $4

2
data/mapObjects/redshouse1f.asm
View file

@ -10,7 +10,7 @@ RedsHouse1FObject: ; 481e4 (12:41e4)
db $1, $3, $2 ; TV
db $1 ; objects
object SPRITE_MOM, $5, $4, FACE, RIGHT, $1 ; Mom
object SPRITE_MOM, $5, $4, STAY, LEFT, $1 ; Mom
; warp-to
EVENT_DISP REDS_HOUSE_1F_WIDTH, $7, $2

14
data/mapObjects/rockethideout1.asm
View file

@ -11,13 +11,13 @@ RocketHideout1Object: ; 0x44ce7 (size=98)
db $0 ; signs
db $7 ; objects
object SPRITE_ROCKET, $1a, $8, FACE, RIGHT, $1, ROCKET + $C8, $8
object SPRITE_ROCKET, $c, $6, FACE, LEFT, $2, ROCKET + $C8, $9
object SPRITE_ROCKET, $12, $11, FACE, DOWN, $3, ROCKET + $C8, $a
object SPRITE_ROCKET, $f, $19, FACE, LEFT, $4, ROCKET + $C8, $b
object SPRITE_ROCKET, $1c, $12, FACE, RIGHT, $5, ROCKET + $C8, $c
object SPRITE_BALL, $b, $e, FACE, STAY, $6, ESCAPE_ROPE
object SPRITE_BALL, $9, $11, FACE, STAY, $7, HYPER_POTION
object SPRITE_ROCKET, $1a, $8, STAY, LEFT, $1, ROCKET + $C8, $8
object SPRITE_ROCKET, $c, $6, STAY, RIGHT, $2, ROCKET + $C8, $9
object SPRITE_ROCKET, $12, $11, STAY, DOWN, $3, ROCKET + $C8, $a
object SPRITE_ROCKET, $f, $19, STAY, RIGHT, $4, ROCKET + $C8, $b
object SPRITE_ROCKET, $1c, $12, STAY, LEFT, $5, ROCKET + $C8, $c
object SPRITE_BALL, $b, $e, STAY, NONE, $6, ESCAPE_ROPE
object SPRITE_BALL, $9, $11, STAY, NONE, $7, HYPER_POTION
; warp-to
EVENT_DISP ROCKET_HIDEOUT_1_WIDTH, $2, $17 ; ROCKET_HIDEOUT_2

10
data/mapObjects/rockethideout2.asm
View file

@ -11,11 +11,11 @@ RocketHideout2Object: ; 0x450f7 (size=80)
db $0 ; signs
db $5 ; objects
object SPRITE_ROCKET, $14, $c, FACE, DOWN, $1, ROCKET + $C8, $d
object SPRITE_BALL, $1, $b, FACE, STAY, $2, MOON_STONE
object SPRITE_BALL, $10, $8, FACE, STAY, $3, NUGGET
object SPRITE_BALL, $6, $c, FACE, STAY, $4, TM_07
object SPRITE_BALL, $3, $15, FACE, STAY, $5, SUPER_POTION
object SPRITE_ROCKET, $14, $c, STAY, DOWN, $1, ROCKET + $C8, $d
object SPRITE_BALL, $1, $b, STAY, NONE, $2, MOON_STONE
object SPRITE_BALL, $10, $8, STAY, NONE, $3, NUGGET
object SPRITE_BALL, $6, $c, STAY, NONE, $4, TM_07
object SPRITE_BALL, $3, $15, STAY, NONE, $5, SUPER_POTION
; warp-to
EVENT_DISP ROCKET_HIDEOUT_2_WIDTH, $8, $1b ; ROCKET_HIDEOUT_1

8
data/mapObjects/rockethideout3.asm
View file

@ -8,10 +8,10 @@ RocketHideout3Object: ; 0x4534d (size=50)
db $0 ; signs
db $4 ; objects
object SPRITE_ROCKET, $a, $16, FACE, LEFT, $1, ROCKET + $C8, $e
object SPRITE_ROCKET, $1a, $c, FACE, UP, $2, ROCKET + $C8, $f
object SPRITE_BALL, $1a, $11, FACE, STAY, $3, TM_10
object SPRITE_BALL, $14, $e, FACE, STAY, $4, RARE_CANDY
object SPRITE_ROCKET, $a, $16, STAY, RIGHT, $1, ROCKET + $C8, $e
object SPRITE_ROCKET, $1a, $c, STAY, UP, $2, ROCKET + $C8, $f
object SPRITE_BALL, $1a, $11, STAY, NONE, $3, TM_10
object SPRITE_BALL, $14, $e, STAY, NONE, $4, RARE_CANDY
; warp-to
EVENT_DISP ROCKET_HIDEOUT_3_WIDTH, $6, $19 ; ROCKET_HIDEOUT_2

18
data/mapObjects/rockethideout4.asm
View file

@ -9,15 +9,15 @@ RocketHideout4Object: ; 0x455f1 (size=95)
db $0 ; signs
db $9 ; objects
object SPRITE_GIOVANNI, $19, $3, FACE, DOWN, $1, GIOVANNI + $C8, $1
object SPRITE_ROCKET, $17, $c, FACE, DOWN, $2, ROCKET + $C8, $10
object SPRITE_ROCKET, $1a, $c, FACE, DOWN, $3, ROCKET + $C8, $11
object SPRITE_ROCKET, $b, $2, FACE, DOWN, $4, ROCKET + $C8, $12
object SPRITE_BALL, $a, $c, FACE, STAY, $5, HP_UP
object SPRITE_BALL, $9, $4, FACE, STAY, $6, TM_02
object SPRITE_BALL, $c, $14, FACE, STAY, $7, IRON
object SPRITE_BALL, $19, $2, FACE, STAY, $8, SILPH_SCOPE
object SPRITE_BALL, $a, $2, FACE, STAY, $9, LIFT_KEY
object SPRITE_GIOVANNI, $19, $3, STAY, DOWN, $1, GIOVANNI + $C8, $1
object SPRITE_ROCKET, $17, $c, STAY, DOWN, $2, ROCKET + $C8, $10
object SPRITE_ROCKET, $1a, $c, STAY, DOWN, $3, ROCKET + $C8, $11
object SPRITE_ROCKET, $b, $2, STAY, DOWN, $4, ROCKET + $C8, $12
object SPRITE_BALL, $a, $c, STAY, NONE, $5, HP_UP
object SPRITE_BALL, $9, $4, STAY, NONE, $6, TM_02
object SPRITE_BALL, $c, $14, STAY, NONE, $7, IRON
object SPRITE_BALL, $19, $2, STAY, NONE, $8, SILPH_SCOPE
object SPRITE_BALL, $a, $2, STAY, NONE, $9, LIFT_KEY
; warp-to
EVENT_DISP ROCKET_HIDEOUT_4_WIDTH, $a, $13 ; ROCKET_HIDEOUT_3

14
data/mapObjects/rocktunnel1.asm
View file

@ -15,13 +15,13 @@ RockTunnel1Object: ; 0x445f6 (size=127)
db $1d, $b, $8 ; RockTunnel1Text8
db $7 ; objects
object SPRITE_HIKER, $7, $5, FACE, DOWN, $1, HIKER + $C8, $c
object SPRITE_HIKER, $5, $10, FACE, DOWN, $2, HIKER + $C8, $d
object SPRITE_HIKER, $11, $f, FACE, RIGHT, $3, HIKER + $C8, $e
object SPRITE_BLACK_HAIR_BOY_2, $17, $8, FACE, RIGHT, $4, POKEMANIAC + $C8, $7
object SPRITE_LASS, $25, $15, FACE, RIGHT, $5, JR__TRAINER_F + $C8, $11
object SPRITE_LASS, $16, $18, FACE, DOWN, $6, JR__TRAINER_F + $C8, $12
object SPRITE_LASS, $20, $18, FACE, LEFT, $7, JR__TRAINER_F + $C8, $13
object SPRITE_HIKER, $7, $5, STAY, DOWN, $1, HIKER + $C8, $c
object SPRITE_HIKER, $5, $10, STAY, DOWN, $2, HIKER + $C8, $d
object SPRITE_HIKER, $11, $f, STAY, LEFT, $3, HIKER + $C8, $e
object SPRITE_BLACK_HAIR_BOY_2, $17, $8, STAY, LEFT, $4, POKEMANIAC + $C8, $7
object SPRITE_LASS, $25, $15, STAY, LEFT, $5, JR__TRAINER_F + $C8, $11
object SPRITE_LASS, $16, $18, STAY, DOWN, $6, JR__TRAINER_F + $C8, $12
object SPRITE_LASS, $20, $18, STAY, RIGHT, $7, JR__TRAINER_F + $C8, $13
; warp-to
EVENT_DISP ROCK_TUNNEL_1_WIDTH, $3, $f

16
data/mapObjects/rocktunnel2.asm
View file

@ -10,14 +10,14 @@ RockTunnel2Object: ; 0x4613d (size=100)
db $0 ; signs
db $8 ; objects
object SPRITE_LASS, $b, $d, FACE, DOWN, $1, JR__TRAINER_F + $C8, $9
object SPRITE_HIKER, $6, $a, FACE, DOWN, $2, HIKER + $C8, $9
object SPRITE_BLACK_HAIR_BOY_2, $3, $5, FACE, DOWN, $3, POKEMANIAC + $C8, $3
object SPRITE_BLACK_HAIR_BOY_2, $14, $15, FACE, LEFT, $4, POKEMANIAC + $C8, $4
object SPRITE_HIKER, $1e, $a, FACE, DOWN, $5, HIKER + $C8, $a
object SPRITE_LASS, $e, $1c, FACE, LEFT, $6, JR__TRAINER_F + $C8, $a
object SPRITE_HIKER, $21, $5, FACE, LEFT, $7, HIKER + $C8, $b
object SPRITE_BLACK_HAIR_BOY_2, $1a, $1e, FACE, DOWN, $8, POKEMANIAC + $C8, $5
object SPRITE_LASS, $b, $d, STAY, DOWN, $1, JR__TRAINER_F + $C8, $9
object SPRITE_HIKER, $6, $a, STAY, DOWN, $2, HIKER + $C8, $9
object SPRITE_BLACK_HAIR_BOY_2, $3, $5, STAY, DOWN, $3, POKEMANIAC + $C8, $3
object SPRITE_BLACK_HAIR_BOY_2, $14, $15, STAY, RIGHT, $4, POKEMANIAC + $C8, $4
object SPRITE_HIKER, $1e, $a, STAY, DOWN, $5, HIKER + $C8, $a
object SPRITE_LASS, $e, $1c, STAY, RIGHT, $6, JR__TRAINER_F + $C8, $a
object SPRITE_HIKER, $21, $5, STAY, RIGHT, $7, HIKER + $C8, $b
object SPRITE_BLACK_HAIR_BOY_2, $1a, $1e, STAY, DOWN, $8, POKEMANIAC + $C8, $5
; warp-to
EVENT_DISP ROCK_TUNNEL_2_WIDTH, $19, $21 ; ROCK_TUNNEL_1

6
data/mapObjects/rocktunnelpokecenter.asm
View file

@ -8,10 +8,10 @@ RockTunnelPokecenterObject: ; 0x493d4 (size=44)
db $0 ; signs
db $4 ; objects
object SPRITE_NURSE, $3, $1, FACE, DOWN, $1 ; person
object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person
object SPRITE_GENTLEMAN, $7, $3, WALK, $2, $2 ; person
object SPRITE_FISHER2, $2, $5, FACE, STAY, $3 ; person
object SPRITE_CABLE_CLUB_WOMAN, $b, $2, FACE, DOWN, $4 ; person
object SPRITE_FISHER2, $2, $5, STAY, NONE, $3 ; person
object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person
; warp-to
EVENT_DISP ROCK_TUNNEL_POKECENTER_WIDTH, $7, $3

12
data/mapObjects/route10.asm
View file

@ -14,12 +14,12 @@ Route10Object: ; 0x582f6 (size=96)
db $29, $5, $a ; Route10Text10
db $6 ; objects
object SPRITE_BLACK_HAIR_BOY_2, $a, $2c, FACE, RIGHT, $1, POKEMANIAC + $C8, $1
object SPRITE_HIKER, $3, $39, FACE, UP, $2, HIKER + $C8, $7
object SPRITE_BLACK_HAIR_BOY_2, $e, $40, FACE, RIGHT, $3, POKEMANIAC + $C8, $2
object SPRITE_LASS, $7, $19, FACE, RIGHT, $4, JR__TRAINER_F + $C8, $7
object SPRITE_HIKER, $3, $3d, FACE, DOWN, $5, HIKER + $C8, $8
object SPRITE_LASS, $7, $36, FACE, DOWN, $6, JR__TRAINER_F + $C8, $8
object SPRITE_BLACK_HAIR_BOY_2, $a, $2c, STAY, LEFT, $1, POKEMANIAC + $C8, $1
object SPRITE_HIKER, $3, $39, STAY, UP, $2, HIKER + $C8, $7
object SPRITE_BLACK_HAIR_BOY_2, $e, $40, STAY, LEFT, $3, POKEMANIAC + $C8, $2
object SPRITE_LASS, $7, $19, STAY, LEFT, $4, JR__TRAINER_F + $C8, $7
object SPRITE_HIKER, $3, $3d, STAY, DOWN, $5, HIKER + $C8, $8
object SPRITE_LASS, $7, $36, STAY, DOWN, $6, JR__TRAINER_F + $C8, $8
; warp-to
EVENT_DISP ROUTE_10_WIDTH, $13, $b ; ROCK_TUNNEL_POKECENTER

20
data/mapObjects/route11.asm
View file

@ -12,16 +12,16 @@ Route11Object: ; 0x584e0 (size=127)
db $5, $1, $b ; Route11Text11
db $a ; objects
object SPRITE_GAMBLER, $a, $e, FACE, DOWN, $1, GAMBLER + $C8, $1
object SPRITE_GAMBLER, $1a, $9, FACE, DOWN, $2, GAMBLER + $C8, $2
object SPRITE_BUG_CATCHER, $d, $5, FACE, RIGHT, $3, YOUNGSTER + $C8, $9
object SPRITE_BLACK_HAIR_BOY_2, $24, $b, FACE, DOWN, $4, ENGINEER + $C8, $2
object SPRITE_BUG_CATCHER, $16, $4, FACE, UP, $5, YOUNGSTER + $C8, $a
object SPRITE_GAMBLER, $2d, $7, FACE, DOWN, $6, GAMBLER + $C8, $3
object SPRITE_GAMBLER, $21, $3, FACE, UP, $7, GAMBLER + $C8, $4
object SPRITE_BUG_CATCHER, $2b, $5, FACE, LEFT, $8, YOUNGSTER + $C8, $b
object SPRITE_BLACK_HAIR_BOY_2, $2d, $10, FACE, RIGHT, $9, ENGINEER + $C8, $3
object SPRITE_BUG_CATCHER, $16, $c, FACE, UP, $a, YOUNGSTER + $C8, $c
object SPRITE_GAMBLER, $a, $e, STAY, DOWN, $1, GAMBLER + $C8, $1
object SPRITE_GAMBLER, $1a, $9, STAY, DOWN, $2, GAMBLER + $C8, $2
object SPRITE_BUG_CATCHER, $d, $5, STAY, LEFT, $3, YOUNGSTER + $C8, $9
object SPRITE_BLACK_HAIR_BOY_2, $24, $b, STAY, DOWN, $4, ENGINEER + $C8, $2
object SPRITE_BUG_CATCHER, $16, $4, STAY, UP, $5, YOUNGSTER + $C8, $a
object SPRITE_GAMBLER, $2d, $7, STAY, DOWN, $6, GAMBLER + $C8, $3
object SPRITE_GAMBLER, $21, $3, STAY, UP, $7, GAMBLER + $C8, $4
object SPRITE_BUG_CATCHER, $2b, $5, STAY, RIGHT, $8, YOUNGSTER + $C8, $b
object SPRITE_BLACK_HAIR_BOY_2, $2d, $10, STAY, LEFT, $9, ENGINEER + $C8, $3
object SPRITE_BUG_CATCHER, $16, $c, STAY, UP, $a, YOUNGSTER + $C8, $c
; warp-to
EVENT_DISP ROUTE_11_WIDTH, $8, $31 ; ROUTE_11_GATE_1F

2
data/mapObjects/route11gate.asm
View file

@ -11,7 +11,7 @@ Route11GateObject: ; 0x49416 (size=50)
db $0 ; signs
db $1 ; objects
object SPRITE_GUARD, $4, $1, FACE, STAY, $1 ; person
object SPRITE_GUARD, $4, $1, STAY, NONE, $1 ; person
; warp-to
EVENT_DISP ROUTE_11_GATE_1F_WIDTH, $4, $0

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