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

Align object_event coordinates

Browse source 
Fixes #336
This commit is contained in:
Rangi 2021-09-26 23:20:57 -04:00
parent 30acb46b98
commit d48a318dbf
204 changed files with 685 additions and 685 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -10,6 +10,6 @@ AgathasRoom_Object:
def_bg_events
def_object_events
object_event 5, 2, SPRITE_AGATHA, STAY, DOWN, 1, OPP_AGATHA, 1
object_event 5, 2, SPRITE_AGATHA, STAY, DOWN, 1, OPP_AGATHA, 1
def_warps_to AGATHAS_ROOM

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

@ -8,8 +8,8 @@ BikeShop_Object:
def_bg_events
def_object_events
object_event 6, 2, SPRITE_BIKE_SHOP_CLERK, STAY, NONE, 1 ; person
object_event 5, 6, SPRITE_MIDDLE_AGED_WOMAN, WALK, UP_DOWN, 2 ; person
object_event 1, 3, SPRITE_YOUNGSTER, STAY, UP, 3 ; person
object_event 6, 2, SPRITE_BIKE_SHOP_CLERK, STAY, NONE, 1 ; person
object_event 5, 6, SPRITE_MIDDLE_AGED_WOMAN, WALK, UP_DOWN, 2 ; person
object_event 1, 3, SPRITE_YOUNGSTER, STAY, UP, 3 ; person
def_warps_to BIKE_SHOP

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

@ -8,8 +8,8 @@ BillsHouse_Object:
def_bg_events
def_object_events
object_event 6, 5, SPRITE_MONSTER, STAY, NONE, 1 ; person
object_event 4, 4, SPRITE_SUPER_NERD, STAY, NONE, 2 ; person
object_event 6, 5, SPRITE_SUPER_NERD, STAY, NONE, 3 ; person
object_event 6, 5, SPRITE_MONSTER, STAY, NONE, 1 ; person
object_event 4, 4, SPRITE_SUPER_NERD, STAY, NONE, 2 ; person
object_event 6, 5, SPRITE_SUPER_NERD, STAY, NONE, 3 ; person
def_warps_to BILLS_HOUSE

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

@ -8,8 +8,8 @@ BluesHouse_Object:
def_bg_events
def_object_events
object_event 2, 3, SPRITE_DAISY, STAY, RIGHT, 1 ; Daisy, sitting by map
object_event 6, 4, SPRITE_DAISY, WALK, UP_DOWN, 2, 0 ; Daisy, walking around
object_event 3, 3, SPRITE_POKEDEX, STAY, NONE, 3, 0 ; map on table
object_event 2, 3, SPRITE_DAISY, STAY, RIGHT, 1 ; Daisy, sitting by map
object_event 6, 4, SPRITE_DAISY, WALK, UP_DOWN, 2, 0 ; Daisy, walking around
object_event 3, 3, SPRITE_POKEDEX, STAY, NONE, 3, 0 ; map on table
def_warps_to BLUES_HOUSE

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

@ -10,6 +10,6 @@ BrunosRoom_Object:
def_bg_events
def_object_events
object_event 5, 2, SPRITE_BRUNO, STAY, DOWN, 1, OPP_BRUNO, 1
object_event 5, 2, SPRITE_BRUNO, STAY, DOWN, 1, OPP_BRUNO, 1
def_warps_to BRUNOS_ROOM

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

@ -8,8 +8,8 @@ CeladonChiefHouse_Object:
def_bg_events
def_object_events
object_event 4, 2, SPRITE_GRAMPS, STAY, DOWN, 1 ; person
object_event 1, 4, SPRITE_ROCKET, WALK, ANY_DIR, 2 ; person
object_event 5, 6, SPRITE_SAILOR, STAY, LEFT, 3 ; person
object_event 4, 2, SPRITE_GRAMPS, STAY, DOWN, 1 ; person
object_event 1, 4, SPRITE_ROCKET, WALK, ANY_DIR, 2 ; person
object_event 5, 6, SPRITE_SAILOR, STAY, LEFT, 3 ; person
def_warps_to CELADON_CHIEF_HOUSE

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

@ -28,7 +28,7 @@ CeladonCity_Object:
bg_event 27, 21, 18 ; CeladonCityText18
def_object_events
object_event 8, 17, SPRITE_LITTLE_GIRL, WALK, ANY_DIR, 1 ; person
object_event 8, 17, SPRITE_LITTLE_GIRL, WALK, ANY_DIR, 1 ; person
object_event 11, 28, SPRITE_GRAMPS, STAY, UP, 2 ; person
object_event 14, 19, SPRITE_GIRL, WALK, UP_DOWN, 3 ; person
object_event 25, 22, SPRITE_GRAMPS, STAY, DOWN, 4 ; person

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

@ -8,10 +8,10 @@ CeladonDiner_Object:
def_bg_events
def_object_events
object_event 8, 5, SPRITE_COOK, WALK, LEFT_RIGHT, 1 ; person
object_event 7, 2, SPRITE_MIDDLE_AGED_WOMAN, STAY, NONE, 2 ; person
object_event 1, 4, SPRITE_MIDDLE_AGED_MAN, STAY, DOWN, 3 ; person
object_event 5, 3, SPRITE_FISHER, STAY, RIGHT, 4 ; person
object_event 0, 1, SPRITE_GYM_GUIDE, STAY, DOWN, 5 ; person
object_event 8, 5, SPRITE_COOK, WALK, LEFT_RIGHT, 1 ; person
object_event 7, 2, SPRITE_MIDDLE_AGED_WOMAN, STAY, NONE, 2 ; person
object_event 1, 4, SPRITE_MIDDLE_AGED_MAN, STAY, DOWN, 3 ; person
object_event 5, 3, SPRITE_FISHER, STAY, RIGHT, 4 ; person
object_event 0, 1, SPRITE_GYM_GUIDE, STAY, DOWN, 5 ; person
def_warps_to CELADON_DINER

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

@ -8,13 +8,13 @@ CeladonGym_Object:
def_bg_events
def_object_events
object_event 4, 3, SPRITE_ERIKA, STAY, DOWN, 1, OPP_ERIKA, 1
object_event 2, 11, SPRITE_COOLTRAINER_F, STAY, RIGHT, 2, OPP_LASS, 17
object_event 7, 10, SPRITE_BEAUTY, STAY, LEFT, 3, OPP_BEAUTY, 1
object_event 9, 5, SPRITE_COOLTRAINER_F, STAY, DOWN, 4, OPP_JR_TRAINER_F, 11
object_event 1, 5, SPRITE_BEAUTY, STAY, DOWN, 5, OPP_BEAUTY, 2
object_event 6, 3, SPRITE_COOLTRAINER_F, STAY, DOWN, 6, OPP_LASS, 18
object_event 3, 3, SPRITE_BEAUTY, STAY, DOWN, 7, OPP_BEAUTY, 3
object_event 5, 3, SPRITE_COOLTRAINER_F, STAY, DOWN, 8, OPP_COOLTRAINER_F, 1
object_event 4, 3, SPRITE_ERIKA, STAY, DOWN, 1, OPP_ERIKA, 1
object_event 2, 11, SPRITE_COOLTRAINER_F, STAY, RIGHT, 2, OPP_LASS, 17
object_event 7, 10, SPRITE_BEAUTY, STAY, LEFT, 3, OPP_BEAUTY, 1
object_event 9, 5, SPRITE_COOLTRAINER_F, STAY, DOWN, 4, OPP_JR_TRAINER_F, 11
object_event 1, 5, SPRITE_BEAUTY, STAY, DOWN, 5, OPP_BEAUTY, 2
object_event 6, 3, SPRITE_COOLTRAINER_F, STAY, DOWN, 6, OPP_LASS, 18
object_event 3, 3, SPRITE_BEAUTY, STAY, DOWN, 7, OPP_BEAUTY, 3
object_event 5, 3, SPRITE_COOLTRAINER_F, STAY, DOWN, 8, OPP_COOLTRAINER_F, 1
def_warps_to CELADON_GYM

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

@ -8,8 +8,8 @@ CeladonHotel_Object:
def_bg_events
def_object_events
object_event 3, 1, SPRITE_GRANNY, STAY, DOWN, 1 ; person
object_event 2, 4, SPRITE_BEAUTY, STAY, NONE, 2 ; person
object_event 8, 4, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 3 ; person
object_event 3, 1, SPRITE_GRANNY, STAY, DOWN, 1 ; person
object_event 2, 4, SPRITE_BEAUTY, STAY, NONE, 2 ; person
object_event 8, 4, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 3 ; person
def_warps_to CELADON_HOTEL

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

@ -12,9 +12,9 @@ CeladonMansion1F_Object:
bg_event 4, 9, 5 ; CeladonMansion1Text5
def_object_events
object_event 0, 5, SPRITE_MONSTER, STAY, RIGHT, 1 ; person
object_event 1, 5, SPRITE_GRANNY, STAY, DOWN, 2 ; person
object_event 1, 8, SPRITE_FAIRY, WALK, LEFT_RIGHT, 3 ; person
object_event 4, 4, SPRITE_MONSTER, WALK, UP_DOWN, 4 ; person
object_event 0, 5, SPRITE_MONSTER, STAY, RIGHT, 1 ; person
object_event 1, 5, SPRITE_GRANNY, STAY, DOWN, 2 ; person
object_event 1, 8, SPRITE_FAIRY, WALK, LEFT_RIGHT, 3 ; person
object_event 4, 4, SPRITE_MONSTER, WALK, UP_DOWN, 4 ; person
def_warps_to CELADON_MANSION_1F

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

@ -14,9 +14,9 @@ CeladonMansion3F_Object:
bg_event 4, 9, 8 ; CeladonMansion3Text8
def_object_events
object_event 0, 4, SPRITE_BIKE_SHOP_CLERK, STAY, UP, 1 ; person
object_event 3, 4, SPRITE_CLERK, STAY, UP, 2 ; person
object_event 0, 7, SPRITE_SUPER_NERD, STAY, UP, 3 ; person
object_event 2, 3, SPRITE_SILPH_WORKER, STAY, NONE, 4 ; person
object_event 0, 4, SPRITE_BIKE_SHOP_CLERK, STAY, UP, 1 ; person
object_event 3, 4, SPRITE_CLERK, STAY, UP, 2 ; person
object_event 0, 7, SPRITE_SUPER_NERD, STAY, UP, 3 ; person
object_event 2, 3, SPRITE_SILPH_WORKER, STAY, NONE, 4 ; person
def_warps_to CELADON_MANSION_3F

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

@ -8,7 +8,7 @@ CeladonMansionRoofHouse_Object:
def_bg_events
def_object_events
object_event 2, 2, SPRITE_HIKER, STAY, DOWN, 1 ; person
object_event 4, 3, SPRITE_POKE_BALL, STAY, NONE, 2 ; person
object_event 2, 2, SPRITE_HIKER, STAY, DOWN, 1 ; person
object_event 4, 3, SPRITE_POKE_BALL, STAY, NONE, 2 ; person
def_warps_to CELADON_MANSION_ROOF_HOUSE

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

@ -14,6 +14,6 @@ CeladonMart1F_Object:
bg_event 14, 1, 3 ; CeladonMart1Text3
def_object_events
object_event 8, 3, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 1 ; person
object_event 8, 3, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 1 ; person
def_warps_to CELADON_MART_1F

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

@ -10,9 +10,9 @@ CeladonMart2F_Object:
bg_event 14, 1, 5 ; CeladonMart2Text5
def_object_events
object_event 5, 3, SPRITE_CLERK, STAY, DOWN, 1 ; person
object_event 6, 3, SPRITE_CLERK, STAY, DOWN, 2 ; person
object_event 19, 5, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, 3 ; person
object_event 14, 4, SPRITE_GIRL, WALK, UP_DOWN, 4 ; person
object_event 5, 3, SPRITE_CLERK, STAY, DOWN, 1 ; person
object_event 6, 3, SPRITE_CLERK, STAY, DOWN, 2 ; person
object_event 19, 5, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, 3 ; person
object_event 14, 4, SPRITE_GIRL, WALK, UP_DOWN, 4 ; person
def_warps_to CELADON_MART_2F

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

@ -21,10 +21,10 @@ CeladonMart3F_Object:
bg_event 10, 1, 17 ; CeladonMart3Text17
def_object_events
object_event 16, 5, SPRITE_CLERK, STAY, NONE, 1 ; person
object_event 11, 6, SPRITE_GAMEBOY_KID, STAY, RIGHT, 2 ; person
object_event 7, 2, SPRITE_GAMEBOY_KID, STAY, DOWN, 3 ; person
object_event 8, 2, SPRITE_GAMEBOY_KID, STAY, DOWN, 4 ; person
object_event 2, 5, SPRITE_LITTLE_BOY, STAY, UP, 5 ; person
object_event 16, 5, SPRITE_CLERK, STAY, NONE, 1 ; person
object_event 11, 6, SPRITE_GAMEBOY_KID, STAY, RIGHT, 2 ; person
object_event 7, 2, SPRITE_GAMEBOY_KID, STAY, DOWN, 3 ; person
object_event 8, 2, SPRITE_GAMEBOY_KID, STAY, DOWN, 4 ; person
object_event 2, 5, SPRITE_LITTLE_BOY, STAY, UP, 5 ; person
def_warps_to CELADON_MART_3F

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

@ -10,8 +10,8 @@ CeladonMart4F_Object:
bg_event 14, 1, 4 ; CeladonMart4Text4
def_object_events
object_event 5, 7, SPRITE_CLERK, STAY, NONE, 1 ; person
object_event 15, 5, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 2 ; person
object_event 5, 2, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 3 ; person
object_event 5, 7, SPRITE_CLERK, STAY, NONE, 1 ; person
object_event 15, 5, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 2 ; person
object_event 5, 2, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 3 ; person
def_warps_to CELADON_MART_4F

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

@ -10,9 +10,9 @@ CeladonMart5F_Object:
bg_event 14, 1, 5 ; CeladonMart5Text5
def_object_events
object_event 14, 5, SPRITE_GENTLEMAN, WALK, UP_DOWN, 1 ; person
object_event 2, 6, SPRITE_SAILOR, STAY, NONE, 2 ; person
object_event 5, 3, SPRITE_CLERK, STAY, DOWN, 3 ; person
object_event 6, 3, SPRITE_CLERK, STAY, DOWN, 4 ; person
object_event 14, 5, SPRITE_GENTLEMAN, WALK, UP_DOWN, 1 ; person
object_event 2, 6, SPRITE_SAILOR, STAY, NONE, 2 ; person
object_event 5, 3, SPRITE_CLERK, STAY, DOWN, 3 ; person
object_event 6, 3, SPRITE_CLERK, STAY, DOWN, 4 ; person
def_warps_to CELADON_MART_5F

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

@ -11,7 +11,7 @@ CeladonMartRoof_Object:
bg_event 13, 2, 6 ; CeladonMartRoofText6
def_object_events
object_event 10, 4, SPRITE_SUPER_NERD, STAY, LEFT, 1 ; person
object_event 5, 5, SPRITE_LITTLE_GIRL, WALK, ANY_DIR, 2 ; person
object_event 10, 4, SPRITE_SUPER_NERD, STAY, LEFT, 1 ; person
object_event 5, 5, SPRITE_LITTLE_GIRL, WALK, ANY_DIR, 2 ; person
def_warps_to CELADON_MART_ROOF

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

@ -8,9 +8,9 @@ CeladonPokecenter_Object:
def_bg_events
def_object_events
object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person
object_event 7, 3, SPRITE_GENTLEMAN, WALK, LEFT_RIGHT, 2 ; person
object_event 10, 5, SPRITE_BEAUTY, WALK, ANY_DIR, 3 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person
object_event 7, 3, SPRITE_GENTLEMAN, WALK, LEFT_RIGHT, 2 ; person
object_event 10, 5, SPRITE_BEAUTY, WALK, ANY_DIR, 3 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
def_warps_to CELADON_POKECENTER

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

@ -9,6 +9,6 @@ CeruleanBadgeHouse_Object:
def_bg_events
def_object_events
object_event 5, 3, SPRITE_MIDDLE_AGED_MAN, STAY, RIGHT, 1 ; person
object_event 5, 3, SPRITE_MIDDLE_AGED_MAN, STAY, RIGHT, 1 ; person
def_warps_to CERULEAN_BADGE_HOUSE

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

@ -15,8 +15,8 @@ CeruleanCave1F_Object:
def_bg_events
def_object_events
object_event 7, 13, SPRITE_POKE_BALL, STAY, NONE, 1, FULL_RESTORE
object_event 19, 3, SPRITE_POKE_BALL, STAY, NONE, 2, MAX_ELIXER
object_event 5, 0, SPRITE_POKE_BALL, STAY, NONE, 3, NUGGET
object_event 7, 13, SPRITE_POKE_BALL, STAY, NONE, 1, FULL_RESTORE
object_event 19, 3, SPRITE_POKE_BALL, STAY, NONE, 2, MAX_ELIXER
object_event 5, 0, SPRITE_POKE_BALL, STAY, NONE, 3, NUGGET
def_warps_to CERULEAN_CAVE_1F

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

@ -12,8 +12,8 @@ CeruleanCave2F_Object:
def_bg_events
def_object_events
object_event 29, 9, SPRITE_POKE_BALL, STAY, NONE, 1, PP_UP
object_event 4, 15, SPRITE_POKE_BALL, STAY, NONE, 2, ULTRA_BALL
object_event 13, 6, SPRITE_POKE_BALL, STAY, NONE, 3, FULL_RESTORE
object_event 29, 9, SPRITE_POKE_BALL, STAY, NONE, 1, PP_UP
object_event 4, 15, SPRITE_POKE_BALL, STAY, NONE, 2, ULTRA_BALL
object_event 13, 6, SPRITE_POKE_BALL, STAY, NONE, 3, FULL_RESTORE
def_warps_to CERULEAN_CAVE_2F

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

@ -8,7 +8,7 @@ CeruleanCaveB1F_Object:
def_object_events
object_event 27, 13, SPRITE_MONSTER, STAY, DOWN, 1, MEWTWO, 70
object_event 16, 9, SPRITE_POKE_BALL, STAY, NONE, 2, ULTRA_BALL
object_event 18, 1, SPRITE_POKE_BALL, STAY, NONE, 3, MAX_REVIVE
object_event 16, 9, SPRITE_POKE_BALL, STAY, NONE, 2, ULTRA_BALL
object_event 18, 1, SPRITE_POKE_BALL, STAY, NONE, 3, MAX_REVIVE
def_warps_to CERULEAN_CAVE_B1F

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

@ -22,16 +22,16 @@ CeruleanCity_Object:
bg_event 27, 21, 17 ; CeruleanCityText17
def_object_events
object_event 20, 2, SPRITE_BLUE, STAY, DOWN, 1 ; person
object_event 30, 8, SPRITE_ROCKET, STAY, NONE, 2, OPP_ROCKET, 5
object_event 20, 2, SPRITE_BLUE, STAY, DOWN, 1 ; person
object_event 30, 8, SPRITE_ROCKET, STAY, NONE, 2, OPP_ROCKET, 5
object_event 31, 20, SPRITE_COOLTRAINER_M, STAY, DOWN, 3 ; person
object_event 15, 18, SPRITE_SUPER_NERD, WALK, UP_DOWN, 4 ; person
object_event 9, 21, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 5 ; person
object_event 9, 21, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 5 ; person
object_event 28, 12, SPRITE_GUARD, STAY, DOWN, 6 ; person
object_event 29, 26, SPRITE_COOLTRAINER_F, STAY, LEFT, 7 ; person
object_event 28, 26, SPRITE_MONSTER, STAY, DOWN, 8 ; person
object_event 9, 27, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, 9 ; person
object_event 4, 12, SPRITE_SUPER_NERD, STAY, DOWN, 10 ; person
object_event 9, 27, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, 9 ; person
object_event 4, 12, SPRITE_SUPER_NERD, STAY, DOWN, 10 ; person
object_event 27, 12, SPRITE_GUARD, STAY, DOWN, 11 ; person
def_warps_to CERULEAN_CITY

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

@ -8,9 +8,9 @@ CeruleanGym_Object:
def_bg_events
def_object_events
object_event 4, 2, SPRITE_BRUNETTE_GIRL, STAY, DOWN, 1, OPP_MISTY, 1
object_event 2, 3, SPRITE_COOLTRAINER_F, STAY, RIGHT, 2, OPP_JR_TRAINER_F, 1
object_event 8, 7, SPRITE_SWIMMER, STAY, LEFT, 3, OPP_SWIMMER, 1
object_event 7, 10, SPRITE_GYM_GUIDE, STAY, DOWN, 4 ; person
object_event 4, 2, SPRITE_BRUNETTE_GIRL, STAY, DOWN, 1, OPP_MISTY, 1
object_event 2, 3, SPRITE_COOLTRAINER_F, STAY, RIGHT, 2, OPP_JR_TRAINER_F, 1
object_event 8, 7, SPRITE_SWIMMER, STAY, LEFT, 3, OPP_SWIMMER, 1
object_event 7, 10, SPRITE_GYM_GUIDE, STAY, DOWN, 4 ; person
def_warps_to CERULEAN_GYM

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

@ -8,8 +8,8 @@ CeruleanMart_Object:
def_bg_events
def_object_events
object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, 1 ; person
object_event 3, 4, SPRITE_COOLTRAINER_M, WALK, UP_DOWN, 2 ; person
object_event 6, 2, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, 3 ; person
object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, 1 ; person
object_event 3, 4, SPRITE_COOLTRAINER_M, WALK, UP_DOWN, 2 ; person
object_event 6, 2, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, 3 ; person
def_warps_to CERULEAN_MART

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

@ -8,9 +8,9 @@ CeruleanPokecenter_Object:
def_bg_events
def_object_events
object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person
object_event 10, 5, SPRITE_SUPER_NERD, WALK, ANY_DIR, 2 ; person
object_event 4, 3, SPRITE_GENTLEMAN, STAY, DOWN, 3 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person
object_event 10, 5, SPRITE_SUPER_NERD, WALK, ANY_DIR, 2 ; person
object_event 4, 3, SPRITE_GENTLEMAN, STAY, DOWN, 3 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
def_warps_to CERULEAN_POKECENTER

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

@ -8,7 +8,7 @@ CeruleanTradeHouse_Object:
def_bg_events
def_object_events
object_event 5, 4, SPRITE_GRANNY, STAY, LEFT, 1 ; person
object_event 1, 2, SPRITE_GAMBLER, STAY, NONE, 2 ; person
object_event 5, 4, SPRITE_GRANNY, STAY, LEFT, 1 ; person
object_event 1, 2, SPRITE_GAMBLER, STAY, NONE, 2 ; person
def_warps_to CERULEAN_TRADE_HOUSE

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

@ -10,7 +10,7 @@ CeruleanTrashedHouse_Object:
bg_event 3, 0, 3 ; CeruleanHouseTrashedText3
def_object_events
object_event 2, 1, SPRITE_FISHING_GURU, STAY, DOWN, 1 ; person
object_event 5, 6, SPRITE_GIRL, WALK, LEFT_RIGHT, 2 ; person
object_event 2, 1, SPRITE_FISHING_GURU, STAY, DOWN, 1 ; person
object_event 5, 6, SPRITE_GIRL, WALK, LEFT_RIGHT, 2 ; person
def_warps_to CERULEAN_TRASHED_HOUSE

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

@ -10,7 +10,7 @@ ChampionsRoom_Object:
def_bg_events
def_object_events
object_event 4, 2, SPRITE_BLUE, STAY, DOWN, 1 ; person
object_event 3, 7, SPRITE_OAK, STAY, UP, 2 ; person
object_event 4, 2, SPRITE_BLUE, STAY, DOWN, 1 ; person
object_event 3, 7, SPRITE_OAK, STAY, UP, 2 ; person
def_warps_to CHAMPIONS_ROOM

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

@ -8,14 +8,14 @@ CinnabarGym_Object:
def_bg_events
def_object_events
object_event 3, 3, SPRITE_MIDDLE_AGED_MAN, STAY, DOWN, 1, OPP_BLAINE, 1
object_event 17, 2, SPRITE_SUPER_NERD, STAY, DOWN, 2, OPP_SUPER_NERD, 9
object_event 17, 8, SPRITE_SUPER_NERD, STAY, DOWN, 3, OPP_BURGLAR, 4
object_event 11, 4, SPRITE_SUPER_NERD, STAY, DOWN, 4, OPP_SUPER_NERD, 10
object_event 11, 8, SPRITE_SUPER_NERD, STAY, DOWN, 5, OPP_BURGLAR, 5
object_event 3, 3, SPRITE_MIDDLE_AGED_MAN, STAY, DOWN, 1, OPP_BLAINE, 1
object_event 17, 2, SPRITE_SUPER_NERD, STAY, DOWN, 2, OPP_SUPER_NERD, 9
object_event 17, 8, SPRITE_SUPER_NERD, STAY, DOWN, 3, OPP_BURGLAR, 4
object_event 11, 4, SPRITE_SUPER_NERD, STAY, DOWN, 4, OPP_SUPER_NERD, 10
object_event 11, 8, SPRITE_SUPER_NERD, STAY, DOWN, 5, OPP_BURGLAR, 5
object_event 11, 14, SPRITE_SUPER_NERD, STAY, DOWN, 6, OPP_SUPER_NERD, 11
object_event 3, 14, SPRITE_SUPER_NERD, STAY, DOWN, 7, OPP_BURGLAR, 6
object_event 3, 8, SPRITE_SUPER_NERD, STAY, DOWN, 8, OPP_SUPER_NERD, 12
object_event 3, 14, SPRITE_SUPER_NERD, STAY, DOWN, 7, OPP_BURGLAR, 6
object_event 3, 8, SPRITE_SUPER_NERD, STAY, DOWN, 8, OPP_SUPER_NERD, 12
object_event 16, 13, SPRITE_GYM_GUIDE, STAY, DOWN, 9 ; person
def_warps_to CINNABAR_GYM

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

@ -16,7 +16,7 @@ CinnabarIsland_Object:
bg_event 13, 3, 7 ; CinnabarIslandText7
def_object_events
object_event 12, 5, SPRITE_GIRL, WALK, LEFT_RIGHT, 1 ; person
object_event 14, 6, SPRITE_GAMBLER, STAY, NONE, 2 ; person
object_event 12, 5, SPRITE_GIRL, WALK, LEFT_RIGHT, 1 ; person
object_event 14, 6, SPRITE_GAMBLER, STAY, NONE, 2 ; person
def_warps_to CINNABAR_ISLAND

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

@ -15,6 +15,6 @@ CinnabarLab_Object:
bg_event 17, 4, 5 ; Lab1Text5
def_object_events
object_event 1, 3, SPRITE_FISHING_GURU, STAY, NONE, 1 ; person
object_event 1, 3, SPRITE_FISHING_GURU, STAY, NONE, 1 ; person
def_warps_to CINNABAR_LAB

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

@ -8,7 +8,7 @@ CinnabarLabFossilRoom_Object:
def_bg_events
def_object_events
object_event 5, 2, SPRITE_SCIENTIST, WALK, LEFT_RIGHT, 1 ; person
object_event 7, 6, SPRITE_SCIENTIST, STAY, UP, 2 ; person
object_event 5, 2, SPRITE_SCIENTIST, WALK, LEFT_RIGHT, 1 ; person
object_event 7, 6, SPRITE_SCIENTIST, STAY, UP, 2 ; person
def_warps_to CINNABAR_LAB_FOSSIL_ROOM

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

@ -11,7 +11,7 @@ CinnabarLabMetronomeRoom_Object:
bg_event 2, 1, 5 ; Lab3Text5
def_object_events
object_event 7, 2, SPRITE_SCIENTIST, STAY, DOWN, 1 ; person
object_event 2, 3, SPRITE_SCIENTIST, WALK, LEFT_RIGHT, 2 ; person
object_event 7, 2, SPRITE_SCIENTIST, STAY, DOWN, 1 ; person
object_event 2, 3, SPRITE_SCIENTIST, WALK, LEFT_RIGHT, 2 ; person
def_warps_to CINNABAR_LAB_METRONOME_ROOM

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

@ -8,8 +8,8 @@ CinnabarLabTradeRoom_Object:
def_bg_events
def_object_events
object_event 3, 2, SPRITE_SUPER_NERD, STAY, DOWN, 1 ; person
object_event 1, 4, SPRITE_GRAMPS, STAY, NONE, 2 ; person
object_event 5, 5, SPRITE_BEAUTY, STAY, UP, 3 ; person
object_event 3, 2, SPRITE_SUPER_NERD, STAY, DOWN, 1 ; person
object_event 1, 4, SPRITE_GRAMPS, STAY, NONE, 2 ; person
object_event 5, 5, SPRITE_BEAUTY, STAY, UP, 3 ; person
def_warps_to CINNABAR_LAB_TRADE_ROOM

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

@ -8,8 +8,8 @@ CinnabarMart_Object:
def_bg_events
def_object_events
object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, 1 ; person
object_event 6, 2, SPRITE_ERIKA, STAY, NONE, 2 ; person
object_event 3, 4, SPRITE_SCIENTIST, STAY, NONE, 3 ; person
object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, 1 ; person
object_event 6, 2, SPRITE_ERIKA, STAY, NONE, 2 ; person
object_event 3, 4, SPRITE_SCIENTIST, STAY, NONE, 3 ; person
def_warps_to CINNABAR_MART

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

@ -8,9 +8,9 @@ CinnabarPokecenter_Object:
def_bg_events
def_object_events
object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person
object_event 9, 4, SPRITE_COOLTRAINER_F, WALK, ANY_DIR, 2 ; person
object_event 2, 6, SPRITE_GENTLEMAN, STAY, NONE, 3 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person
object_event 9, 4, SPRITE_COOLTRAINER_F, WALK, ANY_DIR, 2 ; person
object_event 2, 6, SPRITE_GENTLEMAN, STAY, NONE, 3 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
def_warps_to CINNABAR_POKECENTER

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

@ -6,6 +6,6 @@ Colosseum_Object:
def_bg_events
def_object_events
object_event 2, 2, SPRITE_RED, STAY, 0, 1 ; person
object_event 2, 2, SPRITE_RED, STAY, 0, 1 ; person
def_warps_to COLOSSEUM

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

@ -9,8 +9,8 @@ CopycatsHouse1F_Object:
def_bg_events
def_object_events
object_event 2, 2, SPRITE_MIDDLE_AGED_WOMAN, STAY, DOWN, 1 ; person
object_event 5, 4, SPRITE_MIDDLE_AGED_MAN, STAY, LEFT, 2 ; person
object_event 1, 4, SPRITE_FAIRY, WALK, UP_DOWN, 3 ; person
object_event 2, 2, SPRITE_MIDDLE_AGED_WOMAN, STAY, DOWN, 1 ; person
object_event 5, 4, SPRITE_MIDDLE_AGED_MAN, STAY, LEFT, 2 ; person
object_event 1, 4, SPRITE_FAIRY, WALK, UP_DOWN, 3 ; person
def_warps_to COPYCATS_HOUSE_1F

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

@ -9,10 +9,10 @@ CopycatsHouse2F_Object:
bg_event 0, 1, 7 ; CopycatsHouse2FText7
def_object_events
object_event 4, 3, SPRITE_BRUNETTE_GIRL, WALK, ANY_DIR, 1 ; person
object_event 4, 6, SPRITE_BIRD, WALK, LEFT_RIGHT, 2 ; person
object_event 5, 1, SPRITE_MONSTER, STAY, DOWN, 3 ; person
object_event 2, 0, SPRITE_BIRD, STAY, DOWN, 4 ; person
object_event 1, 6, SPRITE_FAIRY, STAY, RIGHT, 5 ; person
object_event 4, 3, SPRITE_BRUNETTE_GIRL, WALK, ANY_DIR, 1 ; person
object_event 4, 6, SPRITE_BIRD, WALK, LEFT_RIGHT, 2 ; person
object_event 5, 1, SPRITE_MONSTER, STAY, DOWN, 3 ; person
object_event 2, 0, SPRITE_BIRD, STAY, DOWN, 4 ; person
object_event 1, 6, SPRITE_FAIRY, STAY, RIGHT, 5 ; person
def_warps_to COPYCATS_HOUSE_2F

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

@ -8,6 +8,6 @@ Daycare_Object:
def_bg_events
def_object_events
object_event 2, 3, SPRITE_GENTLEMAN, STAY, RIGHT, 1 ; person
object_event 2, 3, SPRITE_GENTLEMAN, STAY, RIGHT, 1 ; person
def_warps_to DAYCARE

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

@ -9,6 +9,6 @@ DiglettsCaveRoute11_Object:
def_bg_events
def_object_events
object_event 2, 3, SPRITE_GAMBLER, STAY, NONE, 1 ; person
object_event 2, 3, SPRITE_GAMBLER, STAY, NONE, 1 ; person
def_warps_to DIGLETTS_CAVE_ROUTE_11

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

@ -9,6 +9,6 @@ DiglettsCaveRoute2_Object:
def_bg_events
def_object_events
object_event 3, 3, SPRITE_FISHING_GURU, STAY, NONE, 1 ; person
object_event 3, 3, SPRITE_FISHING_GURU, STAY, NONE, 1 ; person
def_warps_to DIGLETTS_CAVE_ROUTE_2

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

@ -8,12 +8,12 @@ FightingDojo_Object:
def_bg_events
def_object_events
object_event 5, 3, SPRITE_HIKER, STAY, DOWN, 1, OPP_BLACKBELT, 1
object_event 3, 4, SPRITE_HIKER, STAY, RIGHT, 2, OPP_BLACKBELT, 2
object_event 3, 6, SPRITE_HIKER, STAY, RIGHT, 3, OPP_BLACKBELT, 3
object_event 5, 5, SPRITE_HIKER, STAY, LEFT, 4, OPP_BLACKBELT, 4
object_event 5, 7, SPRITE_HIKER, STAY, LEFT, 5, OPP_BLACKBELT, 5
object_event 4, 1, SPRITE_POKE_BALL, STAY, NONE, 6 ; person
object_event 5, 1, SPRITE_POKE_BALL, STAY, NONE, 7 ; person
object_event 5, 3, SPRITE_HIKER, STAY, DOWN, 1, OPP_BLACKBELT, 1
object_event 3, 4, SPRITE_HIKER, STAY, RIGHT, 2, OPP_BLACKBELT, 2
object_event 3, 6, SPRITE_HIKER, STAY, RIGHT, 3, OPP_BLACKBELT, 3
object_event 5, 5, SPRITE_HIKER, STAY, LEFT, 4, OPP_BLACKBELT, 4
object_event 5, 7, SPRITE_HIKER, STAY, LEFT, 5, OPP_BLACKBELT, 5
object_event 4, 1, SPRITE_POKE_BALL, STAY, NONE, 6 ; person
object_event 5, 1, SPRITE_POKE_BALL, STAY, NONE, 7 ; person
def_warps_to FIGHTING_DOJO

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

@ -8,8 +8,8 @@ FuchsiaBillsGrandpasHouse_Object:
def_bg_events
def_object_events
object_event 2, 3, SPRITE_MIDDLE_AGED_WOMAN, STAY, RIGHT, 1 ; person
object_event 7, 2, SPRITE_GAMBLER, STAY, UP, 2 ; person
object_event 5, 5, SPRITE_YOUNGSTER, STAY, NONE, 3 ; person
object_event 2, 3, SPRITE_MIDDLE_AGED_WOMAN, STAY, RIGHT, 1 ; person
object_event 7, 2, SPRITE_GAMBLER, STAY, UP, 2 ; person
object_event 5, 5, SPRITE_YOUNGSTER, STAY, NONE, 3 ; person
def_warps_to FUCHSIA_BILLS_GRANDPAS_HOUSE

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

@ -32,12 +32,12 @@ FuchsiaCity_Object:
object_event 10, 12, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 1 ; person
object_event 28, 17, SPRITE_GAMBLER, WALK, LEFT_RIGHT, 2 ; person
object_event 30, 14, SPRITE_FISHER, STAY, DOWN, 3 ; person
object_event 24, 8, SPRITE_YOUNGSTER, STAY, UP, 4 ; person
object_event 31, 5, SPRITE_FAIRY, WALK, ANY_DIR, 5 ; person
object_event 25, 6, SPRITE_POKE_BALL, STAY, NONE, 6 ; person
object_event 12, 6, SPRITE_MONSTER, WALK, LEFT_RIGHT, 7 ; person
object_event 24, 8, SPRITE_YOUNGSTER, STAY, UP, 4 ; person
object_event 31, 5, SPRITE_FAIRY, WALK, ANY_DIR, 5 ; person
object_event 25, 6, SPRITE_POKE_BALL, STAY, NONE, 6 ; person
object_event 12, 6, SPRITE_MONSTER, WALK, LEFT_RIGHT, 7 ; person
object_event 30, 12, SPRITE_MONSTER, WALK, LEFT_RIGHT, 8 ; person
object_event 8, 17, SPRITE_SEEL, WALK, ANY_DIR, 9 ; person
object_event 6, 5, SPRITE_FOSSIL, STAY, NONE, 10 ; person
object_event 8, 17, SPRITE_SEEL, WALK, ANY_DIR, 9 ; person
object_event 6, 5, SPRITE_FOSSIL, STAY, NONE, 10 ; person
def_warps_to FUCHSIA_CITY

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

@ -9,6 +9,6 @@ FuchsiaGoodRodHouse_Object:
def_bg_events
def_object_events
object_event 5, 3, SPRITE_FISHING_GURU, STAY, RIGHT, 1 ; person
object_event 5, 3, SPRITE_FISHING_GURU, STAY, RIGHT, 1 ; person
def_warps_to FUCHSIA_GOOD_ROD_HOUSE

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

@ -8,13 +8,13 @@ FuchsiaGym_Object:
def_bg_events
def_object_events
object_event 4, 10, SPRITE_KOGA, STAY, DOWN, 1, OPP_KOGA, 1
object_event 8, 13, SPRITE_ROCKER, STAY, DOWN, 2, OPP_JUGGLER, 7
object_event 7, 8, SPRITE_ROCKER, STAY, RIGHT, 3, OPP_JUGGLER, 3
object_event 1, 12, SPRITE_ROCKER, STAY, DOWN, 4, OPP_JUGGLER, 8
object_event 3, 5, SPRITE_ROCKER, STAY, UP, 5, OPP_TAMER, 1
object_event 8, 2, SPRITE_ROCKER, STAY, DOWN, 6, OPP_TAMER, 2
object_event 2, 7, SPRITE_ROCKER, STAY, LEFT, 7, OPP_JUGGLER, 4
object_event 7, 15, SPRITE_GYM_GUIDE, STAY, DOWN, 8 ; person
object_event 4, 10, SPRITE_KOGA, STAY, DOWN, 1, OPP_KOGA, 1
object_event 8, 13, SPRITE_ROCKER, STAY, DOWN, 2, OPP_JUGGLER, 7
object_event 7, 8, SPRITE_ROCKER, STAY, RIGHT, 3, OPP_JUGGLER, 3
object_event 1, 12, SPRITE_ROCKER, STAY, DOWN, 4, OPP_JUGGLER, 8
object_event 3, 5, SPRITE_ROCKER, STAY, UP, 5, OPP_TAMER, 1
object_event 8, 2, SPRITE_ROCKER, STAY, DOWN, 6, OPP_TAMER, 2
object_event 2, 7, SPRITE_ROCKER, STAY, LEFT, 7, OPP_JUGGLER, 4
object_event 7, 15, SPRITE_GYM_GUIDE, STAY, DOWN, 8 ; person
def_warps_to FUCHSIA_GYM

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

@ -8,8 +8,8 @@ FuchsiaMart_Object:
def_bg_events
def_object_events
object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, 1 ; person
object_event 4, 2, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, 2 ; person
object_event 6, 5, SPRITE_COOLTRAINER_F, WALK, UP_DOWN, 3 ; person
object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, 1 ; person
object_event 4, 2, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, 2 ; person
object_event 6, 5, SPRITE_COOLTRAINER_F, WALK, UP_DOWN, 3 ; person
def_warps_to FUCHSIA_MART

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

@ -8,8 +8,8 @@ FuchsiaMeetingRoom_Object:
def_bg_events
def_object_events
object_event 4, 1, SPRITE_SAFARI_ZONE_WORKER, STAY, DOWN, 1 ; person
object_event 0, 2, SPRITE_SAFARI_ZONE_WORKER, STAY, UP, 2 ; person
object_event 10, 1, SPRITE_SAFARI_ZONE_WORKER, STAY, DOWN, 3 ; person
object_event 4, 1, SPRITE_SAFARI_ZONE_WORKER, STAY, DOWN, 1 ; person
object_event 0, 2, SPRITE_SAFARI_ZONE_WORKER, STAY, UP, 2 ; person
object_event 10, 1, SPRITE_SAFARI_ZONE_WORKER, STAY, DOWN, 3 ; person
def_warps_to FUCHSIA_MEETING_ROOM

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

@ -8,9 +8,9 @@ FuchsiaPokecenter_Object:
def_bg_events
def_object_events
object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person
object_event 2, 3, SPRITE_ROCKER, STAY, NONE, 2 ; person
object_event 6, 5, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, 3 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person
object_event 2, 3, SPRITE_ROCKER, STAY, NONE, 2 ; person
object_event 6, 5, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, 3 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
def_warps_to FUCHSIA_POKECENTER

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

@ -10,16 +10,16 @@ GameCorner_Object:
bg_event 9, 4, 12 ; CeladonGameCornerText12
def_object_events
object_event 2, 6, SPRITE_BEAUTY, STAY, DOWN, 1 ; person
object_event 5, 6, SPRITE_CLERK, STAY, DOWN, 2 ; person
object_event 2, 10, SPRITE_MIDDLE_AGED_MAN, STAY, LEFT, 3 ; person
object_event 2, 13, SPRITE_BEAUTY, STAY, LEFT, 4 ; person
object_event 5, 11, SPRITE_FISHING_GURU, STAY, RIGHT, 5 ; person
object_event 8, 11, SPRITE_MIDDLE_AGED_WOMAN, STAY, LEFT, 6 ; person
object_event 8, 14, SPRITE_GYM_GUIDE, STAY, LEFT, 7 ; person
object_event 2, 6, SPRITE_BEAUTY, STAY, DOWN, 1 ; person
object_event 5, 6, SPRITE_CLERK, STAY, DOWN, 2 ; person
object_event 2, 10, SPRITE_MIDDLE_AGED_MAN, STAY, LEFT, 3 ; person
object_event 2, 13, SPRITE_BEAUTY, STAY, LEFT, 4 ; person
object_event 5, 11, SPRITE_FISHING_GURU, STAY, RIGHT, 5 ; person
object_event 8, 11, SPRITE_MIDDLE_AGED_WOMAN, STAY, LEFT, 6 ; person
object_event 8, 14, SPRITE_GYM_GUIDE, STAY, LEFT, 7 ; person
object_event 11, 15, SPRITE_GAMBLER, STAY, RIGHT, 8 ; person
object_event 14, 11, SPRITE_CLERK, STAY, LEFT, 9 ; person
object_event 17, 13, SPRITE_GENTLEMAN, STAY, RIGHT, 10 ; person
object_event 9, 5, SPRITE_ROCKET, STAY, UP, 11, OPP_ROCKET, 7
object_event 9, 5, SPRITE_ROCKET, STAY, UP, 11, OPP_ROCKET, 7
def_warps_to GAME_CORNER

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

@ -11,7 +11,7 @@ GameCornerPrizeRoom_Object:
bg_event 6, 2, 5 ; CeladonPrizeRoomText5
def_object_events
object_event 1, 4, SPRITE_BALDING_GUY, STAY, NONE, 1 ; person
object_event 7, 3, SPRITE_GAMBLER, WALK, LEFT_RIGHT, 2 ; person
object_event 1, 4, SPRITE_BALDING_GUY, STAY, NONE, 1 ; person
object_event 7, 3, SPRITE_GAMBLER, WALK, LEFT_RIGHT, 2 ; person
def_warps_to GAME_CORNER_PRIZE_ROOM

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

@ -8,6 +8,6 @@ HallOfFame_Object:
def_bg_events
def_object_events
object_event 5, 2, SPRITE_OAK, STAY, DOWN, 1 ; person
object_event 5, 2, SPRITE_OAK, STAY, DOWN, 1 ; person
def_warps_to HALL_OF_FAME

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

@ -9,10 +9,10 @@ IndigoPlateauLobby_Object:
def_bg_events
def_object_events
object_event 7, 5, SPRITE_NURSE, STAY, DOWN, 1 ; person
object_event 4, 9, SPRITE_GYM_GUIDE, STAY, RIGHT, 2 ; person
object_event 5, 1, SPRITE_COOLTRAINER_F, STAY, DOWN, 3 ; person
object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, 4 ; person
object_event 13, 6, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 5 ; person
object_event 7, 5, SPRITE_NURSE, STAY, DOWN, 1 ; person
object_event 4, 9, SPRITE_GYM_GUIDE, STAY, RIGHT, 2 ; person
object_event 5, 1, SPRITE_COOLTRAINER_F, STAY, DOWN, 3 ; person
object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, 4 ; person
object_event 13, 6, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 5 ; person
def_warps_to INDIGO_PLATEAU_LOBBY

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

@ -9,6 +9,6 @@ LancesRoom_Object:
def_bg_events
def_object_events
object_event 6, 1, SPRITE_LANCE, STAY, DOWN, 1, OPP_LANCE, 1
object_event 6, 1, SPRITE_LANCE, STAY, DOWN, 1, OPP_LANCE, 1
def_warps_to LANCES_ROOM

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

@ -8,7 +8,7 @@ LavenderCuboneHouse_Object:
def_bg_events
def_object_events
object_event 3, 5, SPRITE_MONSTER, STAY, UP, 1 ; person
object_event 2, 4, SPRITE_BRUNETTE_GIRL, STAY, RIGHT, 2 ; person
object_event 3, 5, SPRITE_MONSTER, STAY, UP, 1 ; person
object_event 2, 4, SPRITE_BRUNETTE_GIRL, STAY, RIGHT, 2 ; person
def_warps_to LAVENDER_CUBONE_HOUSE

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

@ -8,8 +8,8 @@ LavenderMart_Object:
def_bg_events
def_object_events
object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, 1 ; person
object_event 3, 4, SPRITE_BALDING_GUY, STAY, NONE, 2 ; person
object_event 7, 2, SPRITE_COOLTRAINER_M, STAY, NONE, 3 ; person
object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, 1 ; person
object_event 3, 4, SPRITE_BALDING_GUY, STAY, NONE, 2 ; person
object_event 7, 2, SPRITE_COOLTRAINER_M, STAY, NONE, 3 ; person
def_warps_to LAVENDER_MART

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

@ -8,9 +8,9 @@ LavenderPokecenter_Object:
def_bg_events
def_object_events
object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person
object_event 5, 3, SPRITE_GENTLEMAN, STAY, NONE, 2 ; person
object_event 2, 6, SPRITE_LITTLE_GIRL, WALK, UP_DOWN, 3 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person
object_event 5, 3, SPRITE_GENTLEMAN, STAY, NONE, 2 ; person
object_event 2, 6, SPRITE_LITTLE_GIRL, WALK, UP_DOWN, 3 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
def_warps_to LAVENDER_POKECENTER

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

@ -18,8 +18,8 @@ LavenderTown_Object:
bg_event 17, 7, 9 ; LavenderTownText9
def_object_events
object_event 15, 9, SPRITE_LITTLE_GIRL, WALK, ANY_DIR, 1 ; person
object_event 9, 10, SPRITE_COOLTRAINER_M, STAY, NONE, 2 ; person
object_event 8, 7, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 3 ; person
object_event 15, 9, SPRITE_LITTLE_GIRL, WALK, ANY_DIR, 1 ; person
object_event 9, 10, SPRITE_COOLTRAINER_M, STAY, NONE, 2 ; person
object_event 8, 7, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 3 ; person
def_warps_to LAVENDER_TOWN

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

@ -10,6 +10,6 @@ LoreleisRoom_Object:
def_bg_events
def_object_events
object_event 5, 2, SPRITE_LORELEI, STAY, DOWN, 1, OPP_LORELEI, 1
object_event 5, 2, SPRITE_LORELEI, STAY, DOWN, 1, OPP_LORELEI, 1
def_warps_to LORELEIS_ROOM

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

@ -8,11 +8,11 @@ MrFujisHouse_Object:
def_bg_events
def_object_events
object_event 3, 5, SPRITE_SUPER_NERD, STAY, NONE, 1 ; person
object_event 6, 3, SPRITE_LITTLE_GIRL, STAY, DOWN, 2 ; person
object_event 6, 4, SPRITE_MONSTER, STAY, UP, 3 ; person
object_event 1, 3, SPRITE_MONSTER, STAY, NONE, 4 ; person
object_event 3, 1, SPRITE_MR_FUJI, STAY, NONE, 5 ; person
object_event 3, 3, SPRITE_POKEDEX, STAY, NONE, 6 ; person
object_event 3, 5, SPRITE_SUPER_NERD, STAY, NONE, 1 ; person
object_event 6, 3, SPRITE_LITTLE_GIRL, STAY, DOWN, 2 ; person
object_event 6, 4, SPRITE_MONSTER, STAY, UP, 3 ; person
object_event 1, 3, SPRITE_MONSTER, STAY, NONE, 4 ; person
object_event 3, 1, SPRITE_MR_FUJI, STAY, NONE, 5 ; person
object_event 3, 3, SPRITE_POKEDEX, STAY, NONE, 6 ; person
def_warps_to MR_FUJIS_HOUSE

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

@ -8,6 +8,6 @@ MrPsychicsHouse_Object:
def_bg_events
def_object_events
object_event 5, 3, SPRITE_FISHING_GURU, STAY, LEFT, 1 ; person
object_event 5, 3, SPRITE_FISHING_GURU, STAY, LEFT, 1 ; person
def_warps_to MR_PSYCHICS_HOUSE

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

@ -12,18 +12,18 @@ MtMoon1F_Object:
bg_event 15, 23, 14 ; MtMoon1Text14
def_object_events
object_event 5, 6, SPRITE_HIKER, STAY, DOWN, 1, OPP_HIKER, 1
object_event 5, 6, SPRITE_HIKER, STAY, DOWN, 1, OPP_HIKER, 1
object_event 12, 16, SPRITE_YOUNGSTER, STAY, RIGHT, 2, OPP_YOUNGSTER, 3
object_event 30, 4, SPRITE_COOLTRAINER_F, STAY, DOWN, 3, OPP_LASS, 5
object_event 30, 4, SPRITE_COOLTRAINER_F, STAY, DOWN, 3, OPP_LASS, 5
object_event 24, 31, SPRITE_SUPER_NERD, STAY, UP, 4, OPP_SUPER_NERD, 1
object_event 16, 23, SPRITE_COOLTRAINER_F, STAY, DOWN, 5, OPP_LASS, 6
object_event 7, 22, SPRITE_YOUNGSTER, STAY, DOWN, 6, OPP_BUG_CATCHER, 7
object_event 7, 22, SPRITE_YOUNGSTER, STAY, DOWN, 6, OPP_BUG_CATCHER, 7
object_event 30, 27, SPRITE_YOUNGSTER, STAY, RIGHT, 7, OPP_BUG_CATCHER, 8
object_event 2, 20, SPRITE_POKE_BALL, STAY, NONE, 8, POTION
object_event 2, 2, SPRITE_POKE_BALL, STAY, NONE, 9, MOON_STONE
object_event 2, 20, SPRITE_POKE_BALL, STAY, NONE, 8, POTION
object_event 2, 2, SPRITE_POKE_BALL, STAY, NONE, 9, MOON_STONE
object_event 35, 31, SPRITE_POKE_BALL, STAY, NONE, 10, RARE_CANDY
object_event 36, 23, SPRITE_POKE_BALL, STAY, NONE, 11, ESCAPE_ROPE
object_event 20, 33, SPRITE_POKE_BALL, STAY, NONE, 12, POTION
object_event 5, 32, SPRITE_POKE_BALL, STAY, NONE, 13, TM_WATER_GUN
object_event 5, 32, SPRITE_POKE_BALL, STAY, NONE, 13, TM_WATER_GUN
def_warps_to MT_MOON_1F

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

@ -10,14 +10,14 @@ MtMoonB2F_Object:
def_bg_events
def_object_events
object_event 12, 8, SPRITE_SUPER_NERD, STAY, RIGHT, 1, OPP_SUPER_NERD, 2
object_event 12, 8, SPRITE_SUPER_NERD, STAY, RIGHT, 1, OPP_SUPER_NERD, 2
object_event 11, 16, SPRITE_ROCKET, STAY, DOWN, 2, OPP_ROCKET, 1
object_event 15, 22, SPRITE_ROCKET, STAY, DOWN, 3, OPP_ROCKET, 2
object_event 29, 11, SPRITE_ROCKET, STAY, UP, 4, OPP_ROCKET, 3
object_event 29, 17, SPRITE_ROCKET, STAY, LEFT, 5, OPP_ROCKET, 4
object_event 12, 6, SPRITE_FOSSIL, STAY, NONE, 6 ; person
object_event 13, 6, SPRITE_FOSSIL, STAY, NONE, 7 ; person
object_event 12, 6, SPRITE_FOSSIL, STAY, NONE, 6 ; person
object_event 13, 6, SPRITE_FOSSIL, STAY, NONE, 7 ; person
object_event 25, 21, SPRITE_POKE_BALL, STAY, NONE, 8, HP_UP
object_event 29, 5, SPRITE_POKE_BALL, STAY, NONE, 9, TM_MEGA_PUNCH
object_event 29, 5, SPRITE_POKE_BALL, STAY, NONE, 9, TM_MEGA_PUNCH
def_warps_to MT_MOON_B2F

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

@ -8,11 +8,11 @@ MtMoonPokecenter_Object:
def_bg_events
def_object_events
object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person
object_event 4, 3, SPRITE_YOUNGSTER, STAY, UP, 2 ; person
object_event 7, 3, SPRITE_GENTLEMAN, STAY, UP, 3 ; person
object_event 10, 6, SPRITE_MIDDLE_AGED_MAN, WALK, LEFT_RIGHT, 4 ; person
object_event 7, 2, SPRITE_CLIPBOARD, STAY, NONE, 5 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 6 ; person
object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person
object_event 4, 3, SPRITE_YOUNGSTER, STAY, UP, 2 ; person
object_event 7, 3, SPRITE_GENTLEMAN, STAY, UP, 3 ; person
object_event 10, 6, SPRITE_MIDDLE_AGED_MAN, WALK, LEFT_RIGHT, 4 ; person
object_event 7, 2, SPRITE_CLIPBOARD, STAY, NONE, 5 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 6 ; person
def_warps_to MT_MOON_POKECENTER

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

@ -11,10 +11,10 @@ Museum1F_Object:
def_bg_events
def_object_events
object_event 12, 4, SPRITE_SCIENTIST, STAY, LEFT, 1 ; person
object_event 1, 4, SPRITE_GAMBLER, STAY, NONE, 2 ; person
object_event 15, 2, SPRITE_SCIENTIST, STAY, DOWN, 3 ; person
object_event 17, 4, SPRITE_SCIENTIST, STAY, NONE, 4 ; person
object_event 16, 2, SPRITE_OLD_AMBER, STAY, NONE, 5 ; person
object_event 12, 4, SPRITE_SCIENTIST, STAY, LEFT, 1 ; person
object_event 1, 4, SPRITE_GAMBLER, STAY, NONE, 2 ; person
object_event 15, 2, SPRITE_SCIENTIST, STAY, DOWN, 3 ; person
object_event 17, 4, SPRITE_SCIENTIST, STAY, NONE, 4 ; person
object_event 16, 2, SPRITE_OLD_AMBER, STAY, NONE, 5 ; person
def_warps_to MUSEUM_1F

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

@ -9,10 +9,10 @@ Museum2F_Object:
bg_event 2, 5, 7 ; Museum2FText7
def_object_events
object_event 1, 7, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 1 ; person
object_event 0, 5, SPRITE_GRAMPS, STAY, DOWN, 2 ; person
object_event 7, 5, SPRITE_SCIENTIST, STAY, DOWN, 3 ; person
object_event 11, 5, SPRITE_BRUNETTE_GIRL, STAY, NONE, 4 ; person
object_event 12, 5, SPRITE_HIKER, STAY, DOWN, 5 ; person
object_event 1, 7, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 1 ; person
object_event 0, 5, SPRITE_GRAMPS, STAY, DOWN, 2 ; person
object_event 7, 5, SPRITE_SCIENTIST, STAY, DOWN, 3 ; person
object_event 11, 5, SPRITE_BRUNETTE_GIRL, STAY, NONE, 4 ; person
object_event 12, 5, SPRITE_HIKER, STAY, DOWN, 5 ; person
def_warps_to MUSEUM_2F

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

@ -8,6 +8,6 @@ NameRatersHouse_Object:
def_bg_events
def_object_events
object_event 5, 3, SPRITE_SILPH_PRESIDENT, STAY, LEFT, 1 ; person
object_event 5, 3, SPRITE_SILPH_PRESIDENT, STAY, LEFT, 1 ; person
def_warps_to NAME_RATERS_HOUSE

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

@ -8,16 +8,16 @@ OaksLab_Object:
def_bg_events
def_object_events
object_event 4, 3, SPRITE_BLUE, STAY, NONE, 1, OPP_RIVAL1, 1
object_event 6, 3, SPRITE_POKE_BALL, STAY, NONE, 2 ; person
object_event 7, 3, SPRITE_POKE_BALL, STAY, NONE, 3 ; person
object_event 8, 3, SPRITE_POKE_BALL, STAY, NONE, 4 ; person
object_event 5, 2, SPRITE_OAK, STAY, DOWN, 5 ; person
object_event 2, 1, SPRITE_POKEDEX, STAY, NONE, 6 ; person
object_event 3, 1, SPRITE_POKEDEX, STAY, NONE, 7 ; person
object_event 5, 10, SPRITE_OAK, STAY, UP, 8 ; person
object_event 1, 9, SPRITE_GIRL, WALK, UP_DOWN, 9 ; person
object_event 2, 10, SPRITE_SCIENTIST, STAY, NONE, 10 ; person
object_event 8, 10, SPRITE_SCIENTIST, STAY, NONE, 11 ; person
object_event 4, 3, SPRITE_BLUE, STAY, NONE, 1, OPP_RIVAL1, 1
object_event 6, 3, SPRITE_POKE_BALL, STAY, NONE, 2 ; person
object_event 7, 3, SPRITE_POKE_BALL, STAY, NONE, 3 ; person
object_event 8, 3, SPRITE_POKE_BALL, STAY, NONE, 4 ; person
object_event 5, 2, SPRITE_OAK, STAY, DOWN, 5 ; person
object_event 2, 1, SPRITE_POKEDEX, STAY, NONE, 6 ; person
object_event 3, 1, SPRITE_POKEDEX, STAY, NONE, 7 ; person
object_event 5, 10, SPRITE_OAK, STAY, UP, 8 ; person
object_event 1, 9, SPRITE_GIRL, WALK, UP_DOWN, 9 ; person
object_event 2, 10, SPRITE_SCIENTIST, STAY, NONE, 10 ; person
object_event 8, 10, SPRITE_SCIENTIST, STAY, NONE, 11 ; person
def_warps_to OAKS_LAB

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

@ -13,8 +13,8 @@ PalletTown_Object:
bg_event 11, 5, 7 ; PalletTownText7
def_object_events
object_event 8, 5, SPRITE_OAK, STAY, NONE, 1 ; person
object_event 3, 8, SPRITE_GIRL, WALK, ANY_DIR, 2 ; person
object_event 8, 5, SPRITE_OAK, STAY, NONE, 1 ; person
object_event 3, 8, SPRITE_GIRL, WALK, ANY_DIR, 2 ; person
object_event 11, 14, SPRITE_FISHER, WALK, ANY_DIR, 3 ; person
def_warps_to PALLET_TOWN

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

@ -20,7 +20,7 @@ PewterCity_Object:
bg_event 25, 23, 12 ; PewterCityText12
def_object_events
object_event 8, 15, SPRITE_COOLTRAINER_F, STAY, NONE, 1 ; person
object_event 8, 15, SPRITE_COOLTRAINER_F, STAY, NONE, 1 ; person
object_event 17, 25, SPRITE_COOLTRAINER_M, STAY, NONE, 2 ; person
object_event 27, 17, SPRITE_SUPER_NERD, STAY, NONE, 3 ; person
object_event 26, 25, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 4 ; person

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

@ -8,8 +8,8 @@ PewterGym_Object:
def_bg_events
def_object_events
object_event 4, 1, SPRITE_SUPER_NERD, STAY, DOWN, 1, OPP_BROCK, 1
object_event 3, 6, SPRITE_COOLTRAINER_M, STAY, RIGHT, 2, OPP_JR_TRAINER_M, 1
object_event 7, 10, SPRITE_GYM_GUIDE, STAY, DOWN, 3 ; person
object_event 4, 1, SPRITE_SUPER_NERD, STAY, DOWN, 1, OPP_BROCK, 1
object_event 3, 6, SPRITE_COOLTRAINER_M, STAY, RIGHT, 2, OPP_JR_TRAINER_M, 1
object_event 7, 10, SPRITE_GYM_GUIDE, STAY, DOWN, 3 ; person
def_warps_to PEWTER_GYM

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

@ -8,8 +8,8 @@ PewterMart_Object:
def_bg_events
def_object_events
object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, 1 ; person
object_event 3, 3, SPRITE_YOUNGSTER, WALK, UP_DOWN, 2 ; person
object_event 5, 5, SPRITE_SUPER_NERD, STAY, NONE, 3 ; person
object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, 1 ; person
object_event 3, 3, SPRITE_YOUNGSTER, WALK, UP_DOWN, 2 ; person
object_event 5, 5, SPRITE_SUPER_NERD, STAY, NONE, 3 ; person
def_warps_to PEWTER_MART

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

@ -8,8 +8,8 @@ PewterNidoranHouse_Object:
def_bg_events
def_object_events
object_event 4, 5, SPRITE_MONSTER, STAY, LEFT, 1 ; person
object_event 3, 5, SPRITE_LITTLE_BOY, STAY, RIGHT, 2 ; person
object_event 1, 2, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, 3 ; person
object_event 4, 5, SPRITE_MONSTER, STAY, LEFT, 1 ; person
object_event 3, 5, SPRITE_LITTLE_BOY, STAY, RIGHT, 2 ; person
object_event 1, 2, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, 3 ; person
def_warps_to PEWTER_NIDORAN_HOUSE

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

@ -8,9 +8,9 @@ PewterPokecenter_Object:
def_bg_events
def_object_events
object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person
object_event 11, 7, SPRITE_GENTLEMAN, STAY, LEFT, 2 ; person
object_event 1, 3, SPRITE_FAIRY, STAY, DOWN, 3 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person
object_event 11, 7, SPRITE_GENTLEMAN, STAY, LEFT, 2 ; person
object_event 1, 3, SPRITE_FAIRY, STAY, DOWN, 3 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
def_warps_to PEWTER_POKECENTER

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

@ -8,7 +8,7 @@ PewterSpeechHouse_Object:
def_bg_events
def_object_events
object_event 2, 3, SPRITE_GAMBLER, STAY, RIGHT, 1 ; person
object_event 4, 5, SPRITE_YOUNGSTER, STAY, NONE, 2 ; person
object_event 2, 3, SPRITE_GAMBLER, STAY, RIGHT, 1 ; person
object_event 4, 5, SPRITE_YOUNGSTER, STAY, NONE, 2 ; person
def_warps_to PEWTER_SPEECH_HOUSE

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

@ -10,11 +10,11 @@ PokemonFanClub_Object:
bg_event 6, 0, 8 ; FanClubText8
def_object_events
object_event 6, 3, SPRITE_FISHER, STAY, LEFT, 1 ; person
object_event 1, 3, SPRITE_GIRL, STAY, RIGHT, 2 ; person
object_event 6, 4, SPRITE_FAIRY, STAY, LEFT, 3 ; person
object_event 1, 4, SPRITE_SEEL, STAY, RIGHT, 4 ; person
object_event 3, 1, SPRITE_GENTLEMAN, STAY, DOWN, 5 ; person
object_event 5, 1, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 6 ; person
object_event 6, 3, SPRITE_FISHER, STAY, LEFT, 1 ; person
object_event 1, 3, SPRITE_GIRL, STAY, RIGHT, 2 ; person
object_event 6, 4, SPRITE_FAIRY, STAY, LEFT, 3 ; person
object_event 1, 4, SPRITE_SEEL, STAY, RIGHT, 4 ; person
object_event 3, 1, SPRITE_GENTLEMAN, STAY, DOWN, 5 ; person
object_event 5, 1, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 6 ; person
def_warps_to POKEMON_FAN_CLUB

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

@ -15,7 +15,7 @@ PokemonMansion1F_Object:
def_object_events
object_event 17, 17, SPRITE_SCIENTIST, STAY, LEFT, 1, OPP_SCIENTIST, 4
object_event 14, 3, SPRITE_POKE_BALL, STAY, NONE, 2, ESCAPE_ROPE
object_event 14, 3, SPRITE_POKE_BALL, STAY, NONE, 2, ESCAPE_ROPE
object_event 18, 21, SPRITE_POKE_BALL, STAY, NONE, 3, CARBOS
def_warps_to POKEMON_MANSION_1F

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

@ -10,9 +10,9 @@ PokemonMansion2F_Object:
def_bg_events
def_object_events
object_event 3, 17, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 1, OPP_BURGLAR, 7
object_event 28, 7, SPRITE_POKE_BALL, STAY, NONE, 2, CALCIUM
object_event 18, 2, SPRITE_POKEDEX, STAY, NONE, 3 ; person
object_event 3, 22, SPRITE_POKEDEX, STAY, NONE, 4 ; person
object_event 3, 17, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 1, OPP_BURGLAR, 7
object_event 28, 7, SPRITE_POKE_BALL, STAY, NONE, 2, CALCIUM
object_event 18, 2, SPRITE_POKEDEX, STAY, NONE, 3 ; person
object_event 3, 22, SPRITE_POKEDEX, STAY, NONE, 4 ; person
def_warps_to POKEMON_MANSION_2F

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

@ -9,10 +9,10 @@ PokemonMansion3F_Object:
def_bg_events
def_object_events
object_event 5, 11, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 1, OPP_BURGLAR, 8
object_event 5, 11, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 1, OPP_BURGLAR, 8
object_event 20, 11, SPRITE_SCIENTIST, STAY, LEFT, 2, OPP_SCIENTIST, 12
object_event 1, 16, SPRITE_POKE_BALL, STAY, NONE, 3, MAX_POTION
object_event 25, 5, SPRITE_POKE_BALL, STAY, NONE, 4, IRON
object_event 6, 12, SPRITE_POKEDEX, STAY, NONE, 5 ; person
object_event 1, 16, SPRITE_POKE_BALL, STAY, NONE, 3, MAX_POTION
object_event 25, 5, SPRITE_POKE_BALL, STAY, NONE, 4, IRON
object_event 6, 12, SPRITE_POKEDEX, STAY, NONE, 5 ; person
def_warps_to POKEMON_MANSION_3F

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

@ -9,11 +9,11 @@ PokemonMansionB1F_Object:
def_object_events
object_event 16, 23, SPRITE_SUPER_NERD, STAY, NONE, 1, OPP_BURGLAR, 9
object_event 27, 11, SPRITE_SCIENTIST, STAY, DOWN, 2, OPP_SCIENTIST, 13
object_event 10, 2, SPRITE_POKE_BALL, STAY, NONE, 3, RARE_CANDY
object_event 1, 22, SPRITE_POKE_BALL, STAY, NONE, 4, FULL_RESTORE
object_event 10, 2, SPRITE_POKE_BALL, STAY, NONE, 3, RARE_CANDY
object_event 1, 22, SPRITE_POKE_BALL, STAY, NONE, 4, FULL_RESTORE
object_event 19, 25, SPRITE_POKE_BALL, STAY, NONE, 5, TM_BLIZZARD
object_event 5, 4, SPRITE_POKE_BALL, STAY, NONE, 6, TM_SOLARBEAM
object_event 5, 4, SPRITE_POKE_BALL, STAY, NONE, 6, TM_SOLARBEAM
object_event 16, 20, SPRITE_POKEDEX, STAY, NONE, 7 ; person
object_event 5, 13, SPRITE_POKE_BALL, STAY, NONE, 8, SECRET_KEY
object_event 5, 13, SPRITE_POKE_BALL, STAY, NONE, 8, SECRET_KEY
def_warps_to POKEMON_MANSION_B1F

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

@ -10,9 +10,9 @@ PokemonTower1F_Object:
def_object_events
object_event 15, 13, SPRITE_LINK_RECEPTIONIST, STAY, UP, 1 ; person
object_event 6, 8, SPRITE_MIDDLE_AGED_WOMAN, STAY, NONE, 2 ; person
object_event 8, 12, SPRITE_BALDING_GUY, STAY, NONE, 3 ; person
object_event 13, 7, SPRITE_GIRL, STAY, NONE, 4 ; person
object_event 17, 7, SPRITE_CHANNELER, STAY, LEFT, 5 ; person
object_event 6, 8, SPRITE_MIDDLE_AGED_WOMAN, STAY, NONE, 2 ; person
object_event 8, 12, SPRITE_BALDING_GUY, STAY, NONE, 3 ; person
object_event 13, 7, SPRITE_GIRL, STAY, NONE, 4 ; person
object_event 17, 7, SPRITE_CHANNELER, STAY, LEFT, 5 ; person
def_warps_to POKEMON_TOWER_1F

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

@ -8,7 +8,7 @@ PokemonTower2F_Object:
def_bg_events
def_object_events
object_event 14, 5, SPRITE_BLUE, STAY, NONE, 1 ; person
object_event 3, 7, SPRITE_CHANNELER, STAY, RIGHT, 2 ; person
object_event 14, 5, SPRITE_BLUE, STAY, NONE, 1 ; person
object_event 3, 7, SPRITE_CHANNELER, STAY, RIGHT, 2 ; person
def_warps_to POKEMON_TOWER_2F

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

@ -8,9 +8,9 @@ PokemonTower3F_Object:
def_bg_events
def_object_events
object_event 12, 3, SPRITE_CHANNELER, STAY, LEFT, 1, OPP_CHANNELER, 5
object_event 9, 8, SPRITE_CHANNELER, STAY, DOWN, 2, OPP_CHANNELER, 6
object_event 12, 3, SPRITE_CHANNELER, STAY, LEFT, 1, OPP_CHANNELER, 5
object_event 9, 8, SPRITE_CHANNELER, STAY, DOWN, 2, OPP_CHANNELER, 6
object_event 10, 13, SPRITE_CHANNELER, STAY, DOWN, 3, OPP_CHANNELER, 8
object_event 12, 1, SPRITE_POKE_BALL, STAY, NONE, 4, ESCAPE_ROPE
object_event 12, 1, SPRITE_POKE_BALL, STAY, NONE, 4, ESCAPE_ROPE
def_warps_to POKEMON_TOWER_3F

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

@ -8,11 +8,11 @@ PokemonTower4F_Object:
def_bg_events
def_object_events
object_event 5, 10, SPRITE_CHANNELER, STAY, RIGHT, 1, OPP_CHANNELER, 9
object_event 15, 7, SPRITE_CHANNELER, STAY, DOWN, 2, OPP_CHANNELER, 10
object_event 5, 10, SPRITE_CHANNELER, STAY, RIGHT, 1, OPP_CHANNELER, 9
object_event 15, 7, SPRITE_CHANNELER, STAY, DOWN, 2, OPP_CHANNELER, 10
object_event 14, 12, SPRITE_CHANNELER, STAY, LEFT, 3, OPP_CHANNELER, 12
object_event 12, 10, SPRITE_POKE_BALL, STAY, NONE, 4, ELIXER
object_event 9, 10, SPRITE_POKE_BALL, STAY, NONE, 5, AWAKENING
object_event 9, 10, SPRITE_POKE_BALL, STAY, NONE, 5, AWAKENING
object_event 12, 16, SPRITE_POKE_BALL, STAY, NONE, 6, HP_UP
def_warps_to POKEMON_TOWER_4F

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

@ -8,11 +8,11 @@ PokemonTower5F_Object:
def_bg_events
def_object_events
object_event 12, 8, SPRITE_CHANNELER, STAY, NONE, 1 ; person
object_event 17, 7, SPRITE_CHANNELER, STAY, LEFT, 2, OPP_CHANNELER, 14
object_event 14, 3, SPRITE_CHANNELER, STAY, LEFT, 3, OPP_CHANNELER, 16
object_event 6, 10, SPRITE_CHANNELER, STAY, RIGHT, 4, OPP_CHANNELER, 17
object_event 9, 16, SPRITE_CHANNELER, STAY, RIGHT, 5, OPP_CHANNELER, 18
object_event 6, 14, SPRITE_POKE_BALL, STAY, NONE, 6, NUGGET
object_event 12, 8, SPRITE_CHANNELER, STAY, NONE, 1 ; person
object_event 17, 7, SPRITE_CHANNELER, STAY, LEFT, 2, OPP_CHANNELER, 14
object_event 14, 3, SPRITE_CHANNELER, STAY, LEFT, 3, OPP_CHANNELER, 16
object_event 6, 10, SPRITE_CHANNELER, STAY, RIGHT, 4, OPP_CHANNELER, 17
object_event 9, 16, SPRITE_CHANNELER, STAY, RIGHT, 5, OPP_CHANNELER, 18
object_event 6, 14, SPRITE_POKE_BALL, STAY, NONE, 6, NUGGET
def_warps_to POKEMON_TOWER_5F

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

@ -9,9 +9,9 @@ PokemonTower6F_Object:
def_object_events
object_event 12, 10, SPRITE_CHANNELER, STAY, RIGHT, 1, OPP_CHANNELER, 19
object_event 9, 5, SPRITE_CHANNELER, STAY, DOWN, 2, OPP_CHANNELER, 20
object_event 16, 5, SPRITE_CHANNELER, STAY, LEFT, 3, OPP_CHANNELER, 21
object_event 6, 8, SPRITE_POKE_BALL, STAY, NONE, 4, RARE_CANDY
object_event 9, 5, SPRITE_CHANNELER, STAY, DOWN, 2, OPP_CHANNELER, 20
object_event 16, 5, SPRITE_CHANNELER, STAY, LEFT, 3, OPP_CHANNELER, 21
object_event 6, 8, SPRITE_POKE_BALL, STAY, NONE, 4, RARE_CANDY
object_event 14, 14, SPRITE_POKE_BALL, STAY, NONE, 5, X_ACCURACY
def_warps_to POKEMON_TOWER_6F

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

@ -7,9 +7,9 @@ PokemonTower7F_Object:
def_bg_events
def_object_events
object_event 9, 11, SPRITE_ROCKET, STAY, RIGHT, 1, OPP_ROCKET, 19
object_event 12, 9, SPRITE_ROCKET, STAY, LEFT, 2, OPP_ROCKET, 20
object_event 9, 7, SPRITE_ROCKET, STAY, RIGHT, 3, OPP_ROCKET, 21
object_event 10, 3, SPRITE_MR_FUJI, STAY, DOWN, 4 ; person
object_event 9, 11, SPRITE_ROCKET, STAY, RIGHT, 1, OPP_ROCKET, 19
object_event 12, 9, SPRITE_ROCKET, STAY, LEFT, 2, OPP_ROCKET, 20
object_event 9, 7, SPRITE_ROCKET, STAY, RIGHT, 3, OPP_ROCKET, 21
object_event 10, 3, SPRITE_MR_FUJI, STAY, DOWN, 4 ; person
def_warps_to POKEMON_TOWER_7F

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

@ -9,7 +9,7 @@ PowerPlant_Object:
def_bg_events
def_object_events
object_event 9, 20, SPRITE_POKE_BALL, STAY, NONE, 1, VOLTORB, 40
object_event 9, 20, SPRITE_POKE_BALL, STAY, NONE, 1, VOLTORB, 40
object_event 32, 18, SPRITE_POKE_BALL, STAY, NONE, 2, VOLTORB, 40
object_event 21, 25, SPRITE_POKE_BALL, STAY, NONE, 3, VOLTORB, 40
object_event 25, 18, SPRITE_POKE_BALL, STAY, NONE, 4, ELECTRODE, 43
@ -17,10 +17,10 @@ PowerPlant_Object:
object_event 26, 28, SPRITE_POKE_BALL, STAY, NONE, 6, VOLTORB, 40
object_event 21, 14, SPRITE_POKE_BALL, STAY, NONE, 7, ELECTRODE, 43
object_event 37, 32, SPRITE_POKE_BALL, STAY, NONE, 8, VOLTORB, 40
object_event 4, 9, SPRITE_BIRD, STAY, UP, 9, ZAPDOS, 50
object_event 7, 25, SPRITE_POKE_BALL, STAY, NONE, 10, CARBOS
object_event 28, 3, SPRITE_POKE_BALL, STAY, NONE, 11, HP_UP
object_event 34, 3, SPRITE_POKE_BALL, STAY, NONE, 12, RARE_CANDY
object_event 4, 9, SPRITE_BIRD, STAY, UP, 9, ZAPDOS, 50
object_event 7, 25, SPRITE_POKE_BALL, STAY, NONE, 10, CARBOS
object_event 28, 3, SPRITE_POKE_BALL, STAY, NONE, 11, HP_UP
object_event 34, 3, SPRITE_POKE_BALL, STAY, NONE, 12, RARE_CANDY
object_event 26, 32, SPRITE_POKE_BALL, STAY, NONE, 13, TM_THUNDER
object_event 20, 32, SPRITE_POKE_BALL, STAY, NONE, 14, TM_REFLECT

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

@ -10,6 +10,6 @@ RedsHouse1F_Object:
bg_event 3, 1, 2 ; TV
def_object_events
object_event 5, 4, SPRITE_MOM, STAY, LEFT, 1 ; Mom
object_event 5, 4, SPRITE_MOM, STAY, LEFT, 1 ; Mom
def_warps_to REDS_HOUSE_1F

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

@ -15,10 +15,10 @@ RockTunnel1F_Object:
bg_event 11, 29, 8 ; RockTunnel1Text8
def_object_events
object_event 7, 5, SPRITE_HIKER, STAY, DOWN, 1, OPP_HIKER, 12
object_event 5, 16, SPRITE_HIKER, STAY, DOWN, 2, OPP_HIKER, 13
object_event 7, 5, SPRITE_HIKER, STAY, DOWN, 1, OPP_HIKER, 12
object_event 5, 16, SPRITE_HIKER, STAY, DOWN, 2, OPP_HIKER, 13
object_event 17, 15, SPRITE_HIKER, STAY, LEFT, 3, OPP_HIKER, 14
object_event 23, 8, SPRITE_SUPER_NERD, STAY, LEFT, 4, OPP_POKEMANIAC, 7
object_event 23, 8, SPRITE_SUPER_NERD, STAY, LEFT, 4, OPP_POKEMANIAC, 7
object_event 37, 21, SPRITE_COOLTRAINER_F, STAY, LEFT, 5, OPP_JR_TRAINER_F, 17
object_event 22, 24, SPRITE_COOLTRAINER_F, STAY, DOWN, 6, OPP_JR_TRAINER_F, 18
object_event 32, 24, SPRITE_COOLTRAINER_F, STAY, RIGHT, 7, OPP_JR_TRAINER_F, 19

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

@ -11,12 +11,12 @@ RockTunnelB1F_Object:
def_object_events
object_event 11, 13, SPRITE_COOLTRAINER_F, STAY, DOWN, 1, OPP_JR_TRAINER_F, 9
object_event 6, 10, SPRITE_HIKER, STAY, DOWN, 2, OPP_HIKER, 9
object_event 3, 5, SPRITE_SUPER_NERD, STAY, DOWN, 3, OPP_POKEMANIAC, 3
object_event 6, 10, SPRITE_HIKER, STAY, DOWN, 2, OPP_HIKER, 9
object_event 3, 5, SPRITE_SUPER_NERD, STAY, DOWN, 3, OPP_POKEMANIAC, 3
object_event 20, 21, SPRITE_SUPER_NERD, STAY, RIGHT, 4, OPP_POKEMANIAC, 4
object_event 30, 10, SPRITE_HIKER, STAY, DOWN, 5, OPP_HIKER, 10
object_event 14, 28, SPRITE_COOLTRAINER_F, STAY, RIGHT, 6, OPP_JR_TRAINER_F, 10
object_event 33, 5, SPRITE_HIKER, STAY, RIGHT, 7, OPP_HIKER, 11
object_event 33, 5, SPRITE_HIKER, STAY, RIGHT, 7, OPP_HIKER, 11
object_event 26, 30, SPRITE_SUPER_NERD, STAY, DOWN, 8, OPP_POKEMANIAC, 5
def_warps_to ROCK_TUNNEL_B1F

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

@ -8,9 +8,9 @@ RockTunnelPokecenter_Object:
def_bg_events
def_object_events
object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person
object_event 7, 3, SPRITE_GENTLEMAN, WALK, LEFT_RIGHT, 2 ; person
object_event 2, 5, SPRITE_FISHER, STAY, NONE, 3 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person
object_event 7, 3, SPRITE_GENTLEMAN, WALK, LEFT_RIGHT, 2 ; person
object_event 2, 5, SPRITE_FISHER, STAY, NONE, 3 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
def_warps_to ROCK_TUNNEL_POKECENTER

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

@ -11,12 +11,12 @@ RocketHideoutB1F_Object:
def_bg_events
def_object_events
object_event 26, 8, SPRITE_ROCKET, STAY, LEFT, 1, OPP_ROCKET, 8
object_event 12, 6, SPRITE_ROCKET, STAY, RIGHT, 2, OPP_ROCKET, 9
object_event 26, 8, SPRITE_ROCKET, STAY, LEFT, 1, OPP_ROCKET, 8
object_event 12, 6, SPRITE_ROCKET, STAY, RIGHT, 2, OPP_ROCKET, 9
object_event 18, 17, SPRITE_ROCKET, STAY, DOWN, 3, OPP_ROCKET, 10
object_event 15, 25, SPRITE_ROCKET, STAY, RIGHT, 4, OPP_ROCKET, 11
object_event 28, 18, SPRITE_ROCKET, STAY, LEFT, 5, OPP_ROCKET, 12
object_event 11, 14, SPRITE_POKE_BALL, STAY, NONE, 6, ESCAPE_ROPE
object_event 9, 17, SPRITE_POKE_BALL, STAY, NONE, 7, HYPER_POTION
object_event 9, 17, SPRITE_POKE_BALL, STAY, NONE, 7, HYPER_POTION
def_warps_to ROCKET_HIDEOUT_B1F

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

@ -12,9 +12,9 @@ RocketHideoutB2F_Object:
def_object_events
object_event 20, 12, SPRITE_ROCKET, STAY, DOWN, 1, OPP_ROCKET, 13
object_event 1, 11, SPRITE_POKE_BALL, STAY, NONE, 2, MOON_STONE
object_event 16, 8, SPRITE_POKE_BALL, STAY, NONE, 3, NUGGET
object_event 6, 12, SPRITE_POKE_BALL, STAY, NONE, 4, TM_HORN_DRILL
object_event 3, 21, SPRITE_POKE_BALL, STAY, NONE, 5, SUPER_POTION
object_event 1, 11, SPRITE_POKE_BALL, STAY, NONE, 2, MOON_STONE
object_event 16, 8, SPRITE_POKE_BALL, STAY, NONE, 3, NUGGET
object_event 6, 12, SPRITE_POKE_BALL, STAY, NONE, 4, TM_HORN_DRILL
object_event 3, 21, SPRITE_POKE_BALL, STAY, NONE, 5, SUPER_POTION
def_warps_to ROCKET_HIDEOUT_B2F

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

@ -9,14 +9,14 @@ RocketHideoutB4F_Object:
def_bg_events
def_object_events
object_event 25, 3, SPRITE_GIOVANNI, STAY, DOWN, 1, OPP_GIOVANNI, 1
object_event 25, 3, SPRITE_GIOVANNI, STAY, DOWN, 1, OPP_GIOVANNI, 1
object_event 23, 12, SPRITE_ROCKET, STAY, DOWN, 2, OPP_ROCKET, 16
object_event 26, 12, SPRITE_ROCKET, STAY, DOWN, 3, OPP_ROCKET, 17
object_event 11, 2, SPRITE_ROCKET, STAY, DOWN, 4, OPP_ROCKET, 18
object_event 11, 2, SPRITE_ROCKET, STAY, DOWN, 4, OPP_ROCKET, 18
object_event 10, 12, SPRITE_POKE_BALL, STAY, NONE, 5, HP_UP
object_event 9, 4, SPRITE_POKE_BALL, STAY, NONE, 6, TM_RAZOR_WIND
object_event 9, 4, SPRITE_POKE_BALL, STAY, NONE, 6, TM_RAZOR_WIND
object_event 12, 20, SPRITE_POKE_BALL, STAY, NONE, 7, IRON
object_event 25, 2, SPRITE_POKE_BALL, STAY, NONE, 8, SILPH_SCOPE
object_event 10, 2, SPRITE_POKE_BALL, STAY, NONE, 9, LIFT_KEY
object_event 25, 2, SPRITE_POKE_BALL, STAY, NONE, 8, SILPH_SCOPE
object_event 10, 2, SPRITE_POKE_BALL, STAY, NONE, 9, LIFT_KEY
def_warps_to ROCKET_HIDEOUT_B4F

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

@ -7,7 +7,7 @@ Route1_Object:
bg_event 9, 27, 3 ; Route1Text3
def_object_events
object_event 5, 24, SPRITE_YOUNGSTER, WALK, UP_DOWN, 1 ; person
object_event 5, 24, SPRITE_YOUNGSTER, WALK, UP_DOWN, 1 ; person
object_event 15, 13, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 2 ; person
def_warps_to ROUTE_1

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