diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-09-26 23:20:57 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-09-26 23:20:57 -0400 |
| commit | d48a318dbf4b9e07da57980adb5894f5eadb11f7 (patch) | |
| tree | 9fd47f6aeb205591c421b178a4f870d2502ceef9 | |
| parent | 30acb46b988d4bb54af761696123778acd8517e3 (diff) | |
Align `object_event` coordinates
Fixes #336
204 files changed, 685 insertions, 685 deletions
diff --git a/data/maps/objects/AgathasRoom.asm b/data/maps/objects/AgathasRoom.asm index e8b29f00..50d2e8c3 100644 --- a/data/maps/objects/AgathasRoom.asm +++ b/data/maps/objects/AgathasRoom.asm @@ -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 diff --git a/data/maps/objects/BikeShop.asm b/data/maps/objects/BikeShop.asm index 873d4fc1..c0028f8c 100644 --- a/data/maps/objects/BikeShop.asm +++ b/data/maps/objects/BikeShop.asm @@ -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 diff --git a/data/maps/objects/BillsHouse.asm b/data/maps/objects/BillsHouse.asm index 7590be91..a6b2463d 100644 --- a/data/maps/objects/BillsHouse.asm +++ b/data/maps/objects/BillsHouse.asm @@ -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 diff --git a/data/maps/objects/BluesHouse.asm b/data/maps/objects/BluesHouse.asm index 36d96058..49f76276 100644 --- a/data/maps/objects/BluesHouse.asm +++ b/data/maps/objects/BluesHouse.asm @@ -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 diff --git a/data/maps/objects/BrunosRoom.asm b/data/maps/objects/BrunosRoom.asm index b0125dc4..9cf7e5e9 100644 --- a/data/maps/objects/BrunosRoom.asm +++ b/data/maps/objects/BrunosRoom.asm @@ -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 diff --git a/data/maps/objects/CeladonChiefHouse.asm b/data/maps/objects/CeladonChiefHouse.asm index f8f28da8..16779c25 100644 --- a/data/maps/objects/CeladonChiefHouse.asm +++ b/data/maps/objects/CeladonChiefHouse.asm @@ -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 diff --git a/data/maps/objects/CeladonCity.asm b/data/maps/objects/CeladonCity.asm index 0f3976d4..25a2ce32 100644 --- a/data/maps/objects/CeladonCity.asm +++ b/data/maps/objects/CeladonCity.asm @@ -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 diff --git a/data/maps/objects/CeladonDiner.asm b/data/maps/objects/CeladonDiner.asm index d2815299..629a34a7 100644 --- a/data/maps/objects/CeladonDiner.asm +++ b/data/maps/objects/CeladonDiner.asm @@ -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 diff --git a/data/maps/objects/CeladonGym.asm b/data/maps/objects/CeladonGym.asm index f7fb04fd..c296c68a 100644 --- a/data/maps/objects/CeladonGym.asm +++ b/data/maps/objects/CeladonGym.asm @@ -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 diff --git a/data/maps/objects/CeladonHotel.asm b/data/maps/objects/CeladonHotel.asm index 951b6c75..c79b658f 100644 --- a/data/maps/objects/CeladonHotel.asm +++ b/data/maps/objects/CeladonHotel.asm @@ -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 diff --git a/data/maps/objects/CeladonMansion1F.asm b/data/maps/objects/CeladonMansion1F.asm index 274fca30..01a907f1 100644 --- a/data/maps/objects/CeladonMansion1F.asm +++ b/data/maps/objects/CeladonMansion1F.asm @@ -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 diff --git a/data/maps/objects/CeladonMansion3F.asm b/data/maps/objects/CeladonMansion3F.asm index 033ba346..4b02da20 100644 --- a/data/maps/objects/CeladonMansion3F.asm +++ b/data/maps/objects/CeladonMansion3F.asm @@ -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 diff --git a/data/maps/objects/CeladonMansionRoofHouse.asm b/data/maps/objects/CeladonMansionRoofHouse.asm index 6e51e120..b29266e9 100644 --- a/data/maps/objects/CeladonMansionRoofHouse.asm +++ b/data/maps/objects/CeladonMansionRoofHouse.asm @@ -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 diff --git a/data/maps/objects/CeladonMart1F.asm b/data/maps/objects/CeladonMart1F.asm index 4b40b1c5..89ad6b4c 100644 --- a/data/maps/objects/CeladonMart1F.asm +++ b/data/maps/objects/CeladonMart1F.asm @@ -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 diff --git a/data/maps/objects/CeladonMart2F.asm b/data/maps/objects/CeladonMart2F.asm index 34313385..e26912b3 100644 --- a/data/maps/objects/CeladonMart2F.asm +++ b/data/maps/objects/CeladonMart2F.asm @@ -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 diff --git a/data/maps/objects/CeladonMart3F.asm b/data/maps/objects/CeladonMart3F.asm index c9f65f9a..e0b61e52 100644 --- a/data/maps/objects/CeladonMart3F.asm +++ b/data/maps/objects/CeladonMart3F.asm @@ -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 diff --git a/data/maps/objects/CeladonMart4F.asm b/data/maps/objects/CeladonMart4F.asm index 0dcb3e21..f4ee3505 100644 --- a/data/maps/objects/CeladonMart4F.asm +++ b/data/maps/objects/CeladonMart4F.asm @@ -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 diff --git a/data/maps/objects/CeladonMart5F.asm b/data/maps/objects/CeladonMart5F.asm index 3fe6232c..a53c16bc 100644 --- a/data/maps/objects/CeladonMart5F.asm +++ b/data/maps/objects/CeladonMart5F.asm @@ -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 diff --git a/data/maps/objects/CeladonMartRoof.asm b/data/maps/objects/CeladonMartRoof.asm index 2ceb9cca..b495d0c2 100644 --- a/data/maps/objects/CeladonMartRoof.asm +++ b/data/maps/objects/CeladonMartRoof.asm @@ -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 diff --git a/data/maps/objects/CeladonPokecenter.asm b/data/maps/objects/CeladonPokecenter.asm index bdb57852..6373bdb2 100644 --- a/data/maps/objects/CeladonPokecenter.asm +++ b/data/maps/objects/CeladonPokecenter.asm @@ -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 diff --git a/data/maps/objects/CeruleanBadgeHouse.asm b/data/maps/objects/CeruleanBadgeHouse.asm index db81d009..bf7d0215 100644 --- a/data/maps/objects/CeruleanBadgeHouse.asm +++ b/data/maps/objects/CeruleanBadgeHouse.asm @@ -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 diff --git a/data/maps/objects/CeruleanCave1F.asm b/data/maps/objects/CeruleanCave1F.asm index 255f200f..c4a1cdfc 100644 --- a/data/maps/objects/CeruleanCave1F.asm +++ b/data/maps/objects/CeruleanCave1F.asm @@ -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 diff --git a/data/maps/objects/CeruleanCave2F.asm b/data/maps/objects/CeruleanCave2F.asm index 5d7a3d7d..5e0dd321 100644 --- a/data/maps/objects/CeruleanCave2F.asm +++ b/data/maps/objects/CeruleanCave2F.asm @@ -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 diff --git a/data/maps/objects/CeruleanCaveB1F.asm b/data/maps/objects/CeruleanCaveB1F.asm index 6e9c650b..6b2fd05d 100644 --- a/data/maps/objects/CeruleanCaveB1F.asm +++ b/data/maps/objects/CeruleanCaveB1F.asm @@ -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 diff --git a/data/maps/objects/CeruleanCity.asm b/data/maps/objects/CeruleanCity.asm index 05ae934b..c9669c44 100644 --- a/data/maps/objects/CeruleanCity.asm +++ b/data/maps/objects/CeruleanCity.asm @@ -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 diff --git a/data/maps/objects/CeruleanGym.asm b/data/maps/objects/CeruleanGym.asm index b4589efa..4ae7d7a4 100644 --- a/data/maps/objects/CeruleanGym.asm +++ b/data/maps/objects/CeruleanGym.asm @@ -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 diff --git a/data/maps/objects/CeruleanMart.asm b/data/maps/objects/CeruleanMart.asm index fbe1e58b..17835e6d 100644 --- a/data/maps/objects/CeruleanMart.asm +++ b/data/maps/objects/CeruleanMart.asm @@ -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 diff --git a/data/maps/objects/CeruleanPokecenter.asm b/data/maps/objects/CeruleanPokecenter.asm index 4c3d3758..ac1216b2 100644 --- a/data/maps/objects/CeruleanPokecenter.asm +++ b/data/maps/objects/CeruleanPokecenter.asm @@ -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 diff --git a/data/maps/objects/CeruleanTradeHouse.asm b/data/maps/objects/CeruleanTradeHouse.asm index 912b786c..1defee42 100644 --- a/data/maps/objects/CeruleanTradeHouse.asm +++ b/data/maps/objects/CeruleanTradeHouse.asm @@ -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 diff --git a/data/maps/objects/CeruleanTrashedHouse.asm b/data/maps/objects/CeruleanTrashedHouse.asm index 7432707e..8cfec104 100644 --- a/data/maps/objects/CeruleanTrashedHouse.asm +++ b/data/maps/objects/CeruleanTrashedHouse.asm @@ -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 diff --git a/data/maps/objects/ChampionsRoom.asm b/data/maps/objects/ChampionsRoom.asm index acf85135..85a16298 100644 --- a/data/maps/objects/ChampionsRoom.asm +++ b/data/maps/objects/ChampionsRoom.asm @@ -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 diff --git a/data/maps/objects/CinnabarGym.asm b/data/maps/objects/CinnabarGym.asm index 309230b4..57cb2e76 100644 --- a/data/maps/objects/CinnabarGym.asm +++ b/data/maps/objects/CinnabarGym.asm @@ -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 diff --git a/data/maps/objects/CinnabarIsland.asm b/data/maps/objects/CinnabarIsland.asm index c2decff6..cdfb5ba2 100644 --- a/data/maps/objects/CinnabarIsland.asm +++ b/data/maps/objects/CinnabarIsland.asm @@ -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 diff --git a/data/maps/objects/CinnabarLab.asm b/data/maps/objects/CinnabarLab.asm index aa1aa1c7..3c8507e8 100644 --- a/data/maps/objects/CinnabarLab.asm +++ b/data/maps/objects/CinnabarLab.asm @@ -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 diff --git a/data/maps/objects/CinnabarLabFossilRoom.asm b/data/maps/objects/CinnabarLabFossilRoom.asm index 0c61cf88..9e8c664c 100644 --- a/data/maps/objects/CinnabarLabFossilRoom.asm +++ b/data/maps/objects/CinnabarLabFossilRoom.asm @@ -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 diff --git a/data/maps/objects/CinnabarLabMetronomeRoom.asm b/data/maps/objects/CinnabarLabMetronomeRoom.asm index dbfe0578..f4a96582 100644 --- a/data/maps/objects/CinnabarLabMetronomeRoom.asm +++ b/data/maps/objects/CinnabarLabMetronomeRoom.asm @@ -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 diff --git a/data/maps/objects/CinnabarLabTradeRoom.asm b/data/maps/objects/CinnabarLabTradeRoom.asm index d117af51..bbb66069 100644 --- a/data/maps/objects/CinnabarLabTradeRoom.asm +++ b/data/maps/objects/CinnabarLabTradeRoom.asm @@ -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 diff --git a/data/maps/objects/CinnabarMart.asm b/data/maps/objects/CinnabarMart.asm index 9aa0e265..e742434e 100644 --- a/data/maps/objects/CinnabarMart.asm +++ b/data/maps/objects/CinnabarMart.asm @@ -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 diff --git a/data/maps/objects/CinnabarPokecenter.asm b/data/maps/objects/CinnabarPokecenter.asm index 3e5a1d30..95fe1342 100644 --- a/data/maps/objects/CinnabarPokecenter.asm +++ b/data/maps/objects/CinnabarPokecenter.asm @@ -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 diff --git a/data/maps/objects/Colosseum.asm b/data/maps/objects/Colosseum.asm index f7837731..32327058 100644 --- a/data/maps/objects/Colosseum.asm +++ b/data/maps/objects/Colosseum.asm @@ -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 diff --git a/data/maps/objects/CopycatsHouse1F.asm b/data/maps/objects/CopycatsHouse1F.asm index 980cdcbc..3521560b 100644 --- a/data/maps/objects/CopycatsHouse1F.asm +++ b/data/maps/objects/CopycatsHouse1F.asm @@ -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 diff --git a/data/maps/objects/CopycatsHouse2F.asm b/data/maps/objects/CopycatsHouse2F.asm index 5e5df0a5..6822a5e6 100644 --- a/data/maps/objects/CopycatsHouse2F.asm +++ b/data/maps/objects/CopycatsHouse2F.asm @@ -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 diff --git a/data/maps/objects/Daycare.asm b/data/maps/objects/Daycare.asm index 7b3a52c6..695ae179 100644 --- a/data/maps/objects/Daycare.asm +++ b/data/maps/objects/Daycare.asm @@ -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 diff --git a/data/maps/objects/DiglettsCaveRoute11.asm b/data/maps/objects/DiglettsCaveRoute11.asm index e3d7b7ad..2f5bd5a0 100644 --- a/data/maps/objects/DiglettsCaveRoute11.asm +++ b/data/maps/objects/DiglettsCaveRoute11.asm @@ -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 diff --git a/data/maps/objects/DiglettsCaveRoute2.asm b/data/maps/objects/DiglettsCaveRoute2.asm index 1853d3a3..340d811d 100644 --- a/data/maps/objects/DiglettsCaveRoute2.asm +++ b/data/maps/objects/DiglettsCaveRoute2.asm @@ -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 diff --git a/data/maps/objects/FightingDojo.asm b/data/maps/objects/FightingDojo.asm index 61be63a4..85f34048 100644 --- a/data/maps/objects/FightingDojo.asm +++ b/data/maps/objects/FightingDojo.asm @@ -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 diff --git a/data/maps/objects/FuchsiaBillsGrandpasHouse.asm b/data/maps/objects/FuchsiaBillsGrandpasHouse.asm index 84d8896e..d397765d 100644 --- a/data/maps/objects/FuchsiaBillsGrandpasHouse.asm +++ b/data/maps/objects/FuchsiaBillsGrandpasHouse.asm @@ -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 diff --git a/data/maps/objects/FuchsiaCity.asm b/data/maps/objects/FuchsiaCity.asm index c6f41754..291d30bc 100644 --- a/data/maps/objects/FuchsiaCity.asm +++ b/data/maps/objects/FuchsiaCity.asm @@ -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 diff --git a/data/maps/objects/FuchsiaGoodRodHouse.asm b/data/maps/objects/FuchsiaGoodRodHouse.asm index 0a8dd12f..2d3f3c93 100644 --- a/data/maps/objects/FuchsiaGoodRodHouse.asm +++ b/data/maps/objects/FuchsiaGoodRodHouse.asm @@ -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 diff --git a/data/maps/objects/FuchsiaGym.asm b/data/maps/objects/FuchsiaGym.asm index 9b884a68..06dc06e2 100644 --- a/data/maps/objects/FuchsiaGym.asm +++ b/data/maps/objects/FuchsiaGym.asm @@ -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 diff --git a/data/maps/objects/FuchsiaMart.asm b/data/maps/objects/FuchsiaMart.asm index 80eb426b..e6d6f445 100644 --- a/data/maps/objects/FuchsiaMart.asm +++ b/data/maps/objects/FuchsiaMart.asm @@ -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 diff --git a/data/maps/objects/FuchsiaMeetingRoom.asm b/data/maps/objects/FuchsiaMeetingRoom.asm index 228d5f79..509a34b2 100644 --- a/data/maps/objects/FuchsiaMeetingRoom.asm +++ b/data/maps/objects/FuchsiaMeetingRoom.asm @@ -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 diff --git a/data/maps/objects/FuchsiaPokecenter.asm b/data/maps/objects/FuchsiaPokecenter.asm index 1d0e76fa..79e99b9b 100644 --- a/data/maps/objects/FuchsiaPokecenter.asm +++ b/data/maps/objects/FuchsiaPokecenter.asm @@ -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 diff --git a/data/maps/objects/GameCorner.asm b/data/maps/objects/GameCorner.asm index a195f2c2..7f568174 100644 --- a/data/maps/objects/GameCorner.asm +++ b/data/maps/objects/GameCorner.asm @@ -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 diff --git a/data/maps/objects/GameCornerPrizeRoom.asm b/data/maps/objects/GameCornerPrizeRoom.asm index fab25b4f..db149c60 100644 --- a/data/maps/objects/GameCornerPrizeRoom.asm +++ b/data/maps/objects/GameCornerPrizeRoom.asm @@ -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 diff --git a/data/maps/objects/HallOfFame.asm b/data/maps/objects/HallOfFame.asm index b3273ec6..0db4f56c 100644 --- a/data/maps/objects/HallOfFame.asm +++ b/data/maps/objects/HallOfFame.asm @@ -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 diff --git a/data/maps/objects/IndigoPlateauLobby.asm b/data/maps/objects/IndigoPlateauLobby.asm index 8af27657..d8eaf97c 100644 --- a/data/maps/objects/IndigoPlateauLobby.asm +++ b/data/maps/objects/IndigoPlateauLobby.asm @@ -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 diff --git a/data/maps/objects/LancesRoom.asm b/data/maps/objects/LancesRoom.asm index 3e055fde..53848141 100644 --- a/data/maps/objects/LancesRoom.asm +++ b/data/maps/objects/LancesRoom.asm @@ -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 diff --git a/data/maps/objects/LavenderCuboneHouse.asm b/data/maps/objects/LavenderCuboneHouse.asm index e39d911b..c6802c7a 100644 --- a/data/maps/objects/LavenderCuboneHouse.asm +++ b/data/maps/objects/LavenderCuboneHouse.asm @@ -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 diff --git a/data/maps/objects/LavenderMart.asm b/data/maps/objects/LavenderMart.asm index 430df64a..5deeba7c 100644 --- a/data/maps/objects/LavenderMart.asm +++ b/data/maps/objects/LavenderMart.asm @@ -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 diff --git a/data/maps/objects/LavenderPokecenter.asm b/data/maps/objects/LavenderPokecenter.asm index b14e93b3..5e397a65 100644 --- a/data/maps/objects/LavenderPokecenter.asm +++ b/data/maps/objects/LavenderPokecenter.asm @@ -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 diff --git a/data/maps/objects/LavenderTown.asm b/data/maps/objects/LavenderTown.asm index 6e855efb..973ed5eb 100644 --- a/data/maps/objects/LavenderTown.asm +++ b/data/maps/objects/LavenderTown.asm @@ -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 diff --git a/data/maps/objects/LoreleisRoom.asm b/data/maps/objects/LoreleisRoom.asm index 84f5f6c8..3c4d1afa 100644 --- a/data/maps/objects/LoreleisRoom.asm +++ b/data/maps/objects/LoreleisRoom.asm @@ -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 diff --git a/data/maps/objects/MrFujisHouse.asm b/data/maps/objects/MrFujisHouse.asm index 054ac845..36e8f1a0 100644 --- a/data/maps/objects/MrFujisHouse.asm +++ b/data/maps/objects/MrFujisHouse.asm @@ -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 diff --git a/data/maps/objects/MrPsychicsHouse.asm b/data/maps/objects/MrPsychicsHouse.asm index fcb8b95e..31a9146d 100644 --- a/data/maps/objects/MrPsychicsHouse.asm +++ b/data/maps/objects/MrPsychicsHouse.asm @@ -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 diff --git a/data/maps/objects/MtMoon1F.asm b/data/maps/objects/MtMoon1F.asm index 4f72fcda..a1659889 100644 --- a/data/maps/objects/MtMoon1F.asm +++ b/data/maps/objects/MtMoon1F.asm @@ -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 diff --git a/data/maps/objects/MtMoonB2F.asm b/data/maps/objects/MtMoonB2F.asm index 8fb91617..7e49d1c5 100644 --- a/data/maps/objects/MtMoonB2F.asm +++ b/data/maps/objects/MtMoonB2F.asm @@ -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 diff --git a/data/maps/objects/MtMoonPokecenter.asm b/data/maps/objects/MtMoonPokecenter.asm index 189b1025..2cf049ab 100644 --- a/data/maps/objects/MtMoonPokecenter.asm +++ b/data/maps/objects/MtMoonPokecenter.asm @@ -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 diff --git a/data/maps/objects/Museum1F.asm b/data/maps/objects/Museum1F.asm index 4c6e7ebe..aae73366 100644 --- a/data/maps/objects/Museum1F.asm +++ b/data/maps/objects/Museum1F.asm @@ -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 diff --git a/data/maps/objects/Museum2F.asm b/data/maps/objects/Museum2F.asm index 8dcc229f..fbf5cffe 100644 --- a/data/maps/objects/Museum2F.asm +++ b/data/maps/objects/Museum2F.asm @@ -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 diff --git a/data/maps/objects/NameRatersHouse.asm b/data/maps/objects/NameRatersHouse.asm index b712a1d9..4c2c490b 100644 --- a/data/maps/objects/NameRatersHouse.asm +++ b/data/maps/objects/NameRatersHouse.asm @@ -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 diff --git a/data/maps/objects/OaksLab.asm b/data/maps/objects/OaksLab.asm index e24eb3c8..6f654f6e 100644 --- a/data/maps/objects/OaksLab.asm +++ b/data/maps/objects/OaksLab.asm @@ -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 diff --git a/data/maps/objects/PalletTown.asm b/data/maps/objects/PalletTown.asm index 7c3641cd..cd760731 100644 --- a/data/maps/objects/PalletTown.asm +++ b/data/maps/objects/PalletTown.asm @@ -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 diff --git a/data/maps/objects/PewterCity.asm b/data/maps/objects/PewterCity.asm index 0ae84c0f..fa3f794c 100644 --- a/data/maps/objects/PewterCity.asm +++ b/data/maps/objects/PewterCity.asm @@ -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 diff --git a/data/maps/objects/PewterGym.asm b/data/maps/objects/PewterGym.asm index 2e3fb6ed..25d32486 100644 --- a/data/maps/objects/PewterGym.asm +++ b/data/maps/objects/PewterGym.asm @@ -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 diff --git a/data/maps/objects/PewterMart.asm b/data/maps/objects/PewterMart.asm index d76e846c..e34b7686 100644 --- a/data/maps/objects/PewterMart.asm +++ b/data/maps/objects/PewterMart.asm @@ -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 diff --git a/data/maps/objects/PewterNidoranHouse.asm b/data/maps/objects/PewterNidoranHouse.asm index 79cec7a8..3b08d2df 100644 --- a/data/maps/objects/PewterNidoranHouse.asm +++ b/data/maps/objects/PewterNidoranHouse.asm @@ -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 diff --git a/data/maps/objects/PewterPokecenter.asm b/data/maps/objects/PewterPokecenter.asm index 0da86e9b..cd422f58 100644 --- a/data/maps/objects/PewterPokecenter.asm +++ b/data/maps/objects/PewterPokecenter.asm @@ -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 diff --git a/data/maps/objects/PewterSpeechHouse.asm b/data/maps/objects/PewterSpeechHouse.asm index 16e73cd8..0cd96a67 100644 --- a/data/maps/objects/PewterSpeechHouse.asm +++ b/data/maps/objects/PewterSpeechHouse.asm @@ -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 diff --git a/data/maps/objects/PokemonFanClub.asm b/data/maps/objects/PokemonFanClub.asm index e845a083..e089f65d 100644 --- a/data/maps/objects/PokemonFanClub.asm +++ b/data/maps/objects/PokemonFanClub.asm @@ -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 diff --git a/data/maps/objects/PokemonMansion1F.asm b/data/maps/objects/PokemonMansion1F.asm index a6ef0ecb..69003a3f 100644 --- a/data/maps/objects/PokemonMansion1F.asm +++ b/data/maps/objects/PokemonMansion1F.asm @@ -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 diff --git a/data/maps/objects/PokemonMansion2F.asm b/data/maps/objects/PokemonMansion2F.asm index 4b59a896..eebd1336 100644 --- a/data/maps/objects/PokemonMansion2F.asm +++ b/data/maps/objects/PokemonMansion2F.asm @@ -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 diff --git a/data/maps/objects/PokemonMansion3F.asm b/data/maps/objects/PokemonMansion3F.asm index 7cb94a3e..bf767252 100644 --- a/data/maps/objects/PokemonMansion3F.asm +++ b/data/maps/objects/PokemonMansion3F.asm @@ -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 diff --git a/data/maps/objects/PokemonMansionB1F.asm b/data/maps/objects/PokemonMansionB1F.asm index cd5d6763..9dfdb37d 100644 --- a/data/maps/objects/PokemonMansionB1F.asm +++ b/data/maps/objects/PokemonMansionB1F.asm @@ -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 diff --git a/data/maps/objects/PokemonTower1F.asm b/data/maps/objects/PokemonTower1F.asm index 109ffd50..558688f7 100644 --- a/data/maps/objects/PokemonTower1F.asm +++ b/data/maps/objects/PokemonTower1F.asm @@ -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 diff --git a/data/maps/objects/PokemonTower2F.asm b/data/maps/objects/PokemonTower2F.asm index c569e4d7..ba0e94ca 100644 --- a/data/maps/objects/PokemonTower2F.asm +++ b/data/maps/objects/PokemonTower2F.asm @@ -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 diff --git a/data/maps/objects/PokemonTower3F.asm b/data/maps/objects/PokemonTower3F.asm index 09c8719e..1d983476 100644 --- a/data/maps/objects/PokemonTower3F.asm +++ b/data/maps/objects/PokemonTower3F.asm @@ -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 diff --git a/data/maps/objects/PokemonTower4F.asm b/data/maps/objects/PokemonTower4F.asm index 7c762912..6b21ce68 100644 --- a/data/maps/objects/PokemonTower4F.asm +++ b/data/maps/objects/PokemonTower4F.asm @@ -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 diff --git a/data/maps/objects/PokemonTower5F.asm b/data/maps/objects/PokemonTower5F.asm index 355ab587..9b578abc 100644 --- a/data/maps/objects/PokemonTower5F.asm +++ b/data/maps/objects/PokemonTower5F.asm @@ -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 diff --git a/data/maps/objects/PokemonTower6F.asm b/data/maps/objects/PokemonTower6F.asm index c9c362c8..5b64be0e 100644 --- a/data/maps/objects/PokemonTower6F.asm +++ b/data/maps/objects/PokemonTower6F.asm @@ -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 diff --git a/data/maps/objects/PokemonTower7F.asm b/data/maps/objects/PokemonTower7F.asm index a148936b..9cc632a1 100644 --- a/data/maps/objects/PokemonTower7F.asm +++ b/data/maps/objects/PokemonTower7F.asm @@ -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 diff --git a/data/maps/objects/PowerPlant.asm b/data/maps/objects/PowerPlant.asm index 083b801e..287eb15a 100644 --- a/data/maps/objects/PowerPlant.asm +++ b/data/maps/objects/PowerPlant.asm @@ -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 diff --git a/data/maps/objects/RedsHouse1F.asm b/data/maps/objects/RedsHouse1F.asm index 6099eb5d..ce0f8c24 100644 --- a/data/maps/objects/RedsHouse1F.asm +++ b/data/maps/objects/RedsHouse1F.asm @@ -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 diff --git a/data/maps/objects/RockTunnel1F.asm b/data/maps/objects/RockTunnel1F.asm index 2d3b0522..cfe0e463 100644 --- a/data/maps/objects/RockTunnel1F.asm +++ b/data/maps/objects/RockTunnel1F.asm @@ -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 diff --git a/data/maps/objects/RockTunnelB1F.asm b/data/maps/objects/RockTunnelB1F.asm index 82f6ae83..79030034 100644 --- a/data/maps/objects/RockTunnelB1F.asm +++ b/data/maps/objects/RockTunnelB1F.asm @@ -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 diff --git a/data/maps/objects/RockTunnelPokecenter.asm b/data/maps/objects/RockTunnelPokecenter.asm index 738a791c..a1b095b6 100644 --- a/data/maps/objects/RockTunnelPokecenter.asm +++ b/data/maps/objects/RockTunnelPokecenter.asm @@ -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 diff --git a/data/maps/objects/RocketHideoutB1F.asm b/data/maps/objects/RocketHideoutB1F.asm index f3d9fb79..99eb2dc0 100644 --- a/data/maps/objects/RocketHideoutB1F.asm +++ b/data/maps/objects/RocketHideoutB1F.asm @@ -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 diff --git a/data/maps/objects/RocketHideoutB2F.asm b/data/maps/objects/RocketHideoutB2F.asm index 19a77d20..007644ae 100644 --- a/data/maps/objects/RocketHideoutB2F.asm +++ b/data/maps/objects/RocketHideoutB2F.asm @@ -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 diff --git a/data/maps/objects/RocketHideoutB4F.asm b/data/maps/objects/RocketHideoutB4F.asm index e882e364..d21a7dc4 100644 --- a/data/maps/objects/RocketHideoutB4F.asm +++ b/data/maps/objects/RocketHideoutB4F.asm @@ -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 diff --git a/data/maps/objects/Route1.asm b/data/maps/objects/Route1.asm index d7e2c751..b4ae442c 100644 --- a/data/maps/objects/Route1.asm +++ b/data/maps/objects/Route1.asm @@ -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 diff --git a/data/maps/objects/Route10.asm b/data/maps/objects/Route10.asm index 80b27066..ebf9361e 100644 --- a/data/maps/objects/Route10.asm +++ b/data/maps/objects/Route10.asm @@ -15,10 +15,10 @@ Route10_Object: def_object_events object_event 10, 44, SPRITE_SUPER_NERD, STAY, LEFT, 1, OPP_POKEMANIAC, 1 - object_event 3, 57, SPRITE_HIKER, STAY, UP, 2, OPP_HIKER, 7 + object_event 3, 57, SPRITE_HIKER, STAY, UP, 2, OPP_HIKER, 7 object_event 14, 64, SPRITE_SUPER_NERD, STAY, LEFT, 3, OPP_POKEMANIAC, 2 - object_event 7, 25, SPRITE_COOLTRAINER_F, STAY, LEFT, 4, OPP_JR_TRAINER_F, 7 - object_event 3, 61, SPRITE_HIKER, STAY, DOWN, 5, OPP_HIKER, 8 - object_event 7, 54, SPRITE_COOLTRAINER_F, STAY, DOWN, 6, OPP_JR_TRAINER_F, 8 + object_event 7, 25, SPRITE_COOLTRAINER_F, STAY, LEFT, 4, OPP_JR_TRAINER_F, 7 + object_event 3, 61, SPRITE_HIKER, STAY, DOWN, 5, OPP_HIKER, 8 + object_event 7, 54, SPRITE_COOLTRAINER_F, STAY, DOWN, 6, OPP_JR_TRAINER_F, 8 def_warps_to ROUTE_10 diff --git a/data/maps/objects/Route11.asm b/data/maps/objects/Route11.asm index 18bf6977..6ee584ef 100644 --- a/data/maps/objects/Route11.asm +++ b/data/maps/objects/Route11.asm @@ -13,13 +13,13 @@ Route11_Object: def_object_events object_event 10, 14, SPRITE_GAMBLER, STAY, DOWN, 1, OPP_GAMBLER, 1 - object_event 26, 9, SPRITE_GAMBLER, STAY, DOWN, 2, OPP_GAMBLER, 2 - object_event 13, 5, SPRITE_YOUNGSTER, STAY, LEFT, 3, OPP_YOUNGSTER, 9 + object_event 26, 9, SPRITE_GAMBLER, STAY, DOWN, 2, OPP_GAMBLER, 2 + object_event 13, 5, SPRITE_YOUNGSTER, STAY, LEFT, 3, OPP_YOUNGSTER, 9 object_event 36, 11, SPRITE_SUPER_NERD, STAY, DOWN, 4, OPP_ENGINEER, 2 - object_event 22, 4, SPRITE_YOUNGSTER, STAY, UP, 5, OPP_YOUNGSTER, 10 - object_event 45, 7, SPRITE_GAMBLER, STAY, DOWN, 6, OPP_GAMBLER, 3 - object_event 33, 3, SPRITE_GAMBLER, STAY, UP, 7, OPP_GAMBLER, 4 - object_event 43, 5, SPRITE_YOUNGSTER, STAY, RIGHT, 8, OPP_YOUNGSTER, 11 + object_event 22, 4, SPRITE_YOUNGSTER, STAY, UP, 5, OPP_YOUNGSTER, 10 + object_event 45, 7, SPRITE_GAMBLER, STAY, DOWN, 6, OPP_GAMBLER, 3 + object_event 33, 3, SPRITE_GAMBLER, STAY, UP, 7, OPP_GAMBLER, 4 + object_event 43, 5, SPRITE_YOUNGSTER, STAY, RIGHT, 8, OPP_YOUNGSTER, 11 object_event 45, 16, SPRITE_SUPER_NERD, STAY, LEFT, 9, OPP_ENGINEER, 3 object_event 22, 12, SPRITE_YOUNGSTER, STAY, UP, 10, OPP_YOUNGSTER, 12 diff --git a/data/maps/objects/Route11Gate1F.asm b/data/maps/objects/Route11Gate1F.asm index bfd9823d..9032ae11 100644 --- a/data/maps/objects/Route11Gate1F.asm +++ b/data/maps/objects/Route11Gate1F.asm @@ -11,6 +11,6 @@ Route11Gate1F_Object: def_bg_events def_object_events - object_event 4, 1, SPRITE_GUARD, STAY, NONE, 1 ; person + object_event 4, 1, SPRITE_GUARD, STAY, NONE, 1 ; person def_warps_to ROUTE_11_GATE_1F diff --git a/data/maps/objects/Route11Gate2F.asm b/data/maps/objects/Route11Gate2F.asm index 7dc52e2f..0843482c 100644 --- a/data/maps/objects/Route11Gate2F.asm +++ b/data/maps/objects/Route11Gate2F.asm @@ -9,7 +9,7 @@ Route11Gate2F_Object: bg_event 6, 2, 4 ; Route11GateUpstairsText4 def_object_events - object_event 4, 2, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 1 ; person - object_event 2, 6, SPRITE_SCIENTIST, STAY, NONE, 2 ; person + object_event 4, 2, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 1 ; person + object_event 2, 6, SPRITE_SCIENTIST, STAY, NONE, 2 ; person def_warps_to ROUTE_11_GATE_2F diff --git a/data/maps/objects/Route12.asm b/data/maps/objects/Route12.asm index b4f76556..8e2995f0 100644 --- a/data/maps/objects/Route12.asm +++ b/data/maps/objects/Route12.asm @@ -14,13 +14,13 @@ Route12_Object: def_object_events object_event 10, 62, SPRITE_SNORLAX, STAY, DOWN, 1 ; person object_event 14, 31, SPRITE_FISHER, STAY, LEFT, 2, OPP_FISHER, 3 - object_event 5, 39, SPRITE_FISHER, STAY, UP, 3, OPP_FISHER, 4 + object_event 5, 39, SPRITE_FISHER, STAY, UP, 3, OPP_FISHER, 4 object_event 11, 92, SPRITE_COOLTRAINER_M, STAY, LEFT, 4, OPP_JR_TRAINER_M, 9 object_event 14, 76, SPRITE_SUPER_NERD, STAY, UP, 5, OPP_ROCKER, 2 object_event 12, 40, SPRITE_FISHER, STAY, LEFT, 6, OPP_FISHER, 5 - object_event 9, 52, SPRITE_FISHER, STAY, RIGHT, 7, OPP_FISHER, 6 - object_event 6, 87, SPRITE_FISHER, STAY, DOWN, 8, OPP_FISHER, 11 + object_event 9, 52, SPRITE_FISHER, STAY, RIGHT, 7, OPP_FISHER, 6 + object_event 6, 87, SPRITE_FISHER, STAY, DOWN, 8, OPP_FISHER, 11 object_event 14, 35, SPRITE_POKE_BALL, STAY, NONE, 9, TM_PAY_DAY - object_event 5, 89, SPRITE_POKE_BALL, STAY, NONE, 10, IRON + object_event 5, 89, SPRITE_POKE_BALL, STAY, NONE, 10, IRON def_warps_to ROUTE_12 diff --git a/data/maps/objects/Route12Gate1F.asm b/data/maps/objects/Route12Gate1F.asm index 3f1692e8..b2e3c6aa 100644 --- a/data/maps/objects/Route12Gate1F.asm +++ b/data/maps/objects/Route12Gate1F.asm @@ -11,6 +11,6 @@ Route12Gate1F_Object: def_bg_events def_object_events - object_event 1, 3, SPRITE_GUARD, STAY, NONE, 1 ; person + object_event 1, 3, SPRITE_GUARD, STAY, NONE, 1 ; person def_warps_to ROUTE_12_GATE_1F diff --git a/data/maps/objects/Route12Gate2F.asm b/data/maps/objects/Route12Gate2F.asm index c1590119..bd52d026 100644 --- a/data/maps/objects/Route12Gate2F.asm +++ b/data/maps/objects/Route12Gate2F.asm @@ -9,6 +9,6 @@ Route12Gate2F_Object: bg_event 6, 2, 3 ; Route12GateUpstairsText3 def_object_events - object_event 3, 4, SPRITE_BRUNETTE_GIRL, WALK, UP_DOWN, 1 ; person + object_event 3, 4, SPRITE_BRUNETTE_GIRL, WALK, UP_DOWN, 1 ; person def_warps_to ROUTE_12_GATE_2F diff --git a/data/maps/objects/Route12SuperRodHouse.asm b/data/maps/objects/Route12SuperRodHouse.asm index 9bba09a4..806bfa55 100644 --- a/data/maps/objects/Route12SuperRodHouse.asm +++ b/data/maps/objects/Route12SuperRodHouse.asm @@ -8,6 +8,6 @@ Route12SuperRodHouse_Object: def_bg_events def_object_events - object_event 2, 4, SPRITE_FISHING_GURU, STAY, RIGHT, 1 ; person + object_event 2, 4, SPRITE_FISHING_GURU, STAY, RIGHT, 1 ; person def_warps_to ROUTE_12_SUPER_ROD_HOUSE diff --git a/data/maps/objects/Route13.asm b/data/maps/objects/Route13.asm index 234d6df2..a3397573 100644 --- a/data/maps/objects/Route13.asm +++ b/data/maps/objects/Route13.asm @@ -11,13 +11,13 @@ Route13_Object: def_object_events object_event 49, 10, SPRITE_COOLTRAINER_M, STAY, RIGHT, 1, OPP_BIRD_KEEPER, 1 object_event 48, 10, SPRITE_COOLTRAINER_F, STAY, DOWN, 2, OPP_JR_TRAINER_F, 12 - object_event 27, 9, SPRITE_COOLTRAINER_F, STAY, DOWN, 3, OPP_JR_TRAINER_F, 13 + object_event 27, 9, SPRITE_COOLTRAINER_F, STAY, DOWN, 3, OPP_JR_TRAINER_F, 13 object_event 23, 10, SPRITE_COOLTRAINER_F, STAY, LEFT, 4, OPP_JR_TRAINER_F, 14 - object_event 50, 5, SPRITE_COOLTRAINER_F, STAY, DOWN, 5, OPP_JR_TRAINER_F, 15 - object_event 12, 4, SPRITE_COOLTRAINER_M, STAY, RIGHT, 6, OPP_BIRD_KEEPER, 2 - object_event 33, 6, SPRITE_BEAUTY, STAY, DOWN, 7, OPP_BEAUTY, 4 - object_event 32, 6, SPRITE_BEAUTY, STAY, DOWN, 8, OPP_BEAUTY, 5 - object_event 10, 7, SPRITE_BIKER, STAY, UP, 9, OPP_BIKER, 1 - object_event 7, 13, SPRITE_COOLTRAINER_M, STAY, UP, 10, OPP_BIRD_KEEPER, 3 + object_event 50, 5, SPRITE_COOLTRAINER_F, STAY, DOWN, 5, OPP_JR_TRAINER_F, 15 + object_event 12, 4, SPRITE_COOLTRAINER_M, STAY, RIGHT, 6, OPP_BIRD_KEEPER, 2 + object_event 33, 6, SPRITE_BEAUTY, STAY, DOWN, 7, OPP_BEAUTY, 4 + object_event 32, 6, SPRITE_BEAUTY, STAY, DOWN, 8, OPP_BEAUTY, 5 + object_event 10, 7, SPRITE_BIKER, STAY, UP, 9, OPP_BIKER, 1 + object_event 7, 13, SPRITE_COOLTRAINER_M, STAY, UP, 10, OPP_BIRD_KEEPER, 3 def_warps_to ROUTE_13 diff --git a/data/maps/objects/Route14.asm b/data/maps/objects/Route14.asm index 8808f501..b9244646 100644 --- a/data/maps/objects/Route14.asm +++ b/data/maps/objects/Route14.asm @@ -7,15 +7,15 @@ Route14_Object: bg_event 17, 13, 11 ; Route14Text11 def_object_events - object_event 4, 4, SPRITE_COOLTRAINER_M, STAY, DOWN, 1, OPP_BIRD_KEEPER, 14 - object_event 15, 6, SPRITE_COOLTRAINER_M, STAY, DOWN, 2, OPP_BIRD_KEEPER, 15 + object_event 4, 4, SPRITE_COOLTRAINER_M, STAY, DOWN, 1, OPP_BIRD_KEEPER, 14 + object_event 15, 6, SPRITE_COOLTRAINER_M, STAY, DOWN, 2, OPP_BIRD_KEEPER, 15 object_event 12, 11, SPRITE_COOLTRAINER_M, STAY, DOWN, 3, OPP_BIRD_KEEPER, 16 object_event 14, 15, SPRITE_COOLTRAINER_M, STAY, UP, 4, OPP_BIRD_KEEPER, 17 object_event 15, 31, SPRITE_COOLTRAINER_M, STAY, LEFT, 5, OPP_BIRD_KEEPER, 4 - object_event 6, 49, SPRITE_COOLTRAINER_M, STAY, UP, 6, OPP_BIRD_KEEPER, 5 - object_event 5, 39, SPRITE_BIKER, STAY, DOWN, 7, OPP_BIKER, 13 - object_event 4, 30, SPRITE_BIKER, STAY, RIGHT, 8, OPP_BIKER, 14 + object_event 6, 49, SPRITE_COOLTRAINER_M, STAY, UP, 6, OPP_BIRD_KEEPER, 5 + object_event 5, 39, SPRITE_BIKER, STAY, DOWN, 7, OPP_BIKER, 13 + object_event 4, 30, SPRITE_BIKER, STAY, RIGHT, 8, OPP_BIKER, 14 object_event 15, 30, SPRITE_BIKER, STAY, LEFT, 9, OPP_BIKER, 15 - object_event 4, 31, SPRITE_BIKER, STAY, RIGHT, 10, OPP_BIKER, 2 + object_event 4, 31, SPRITE_BIKER, STAY, RIGHT, 10, OPP_BIKER, 2 def_warps_to ROUTE_14 diff --git a/data/maps/objects/Route15.asm b/data/maps/objects/Route15.asm index bb4266b7..895cef47 100644 --- a/data/maps/objects/Route15.asm +++ b/data/maps/objects/Route15.asm @@ -19,8 +19,8 @@ Route15_Object: object_event 41, 10, SPRITE_BEAUTY, STAY, RIGHT, 6, OPP_BEAUTY, 10 object_event 48, 10, SPRITE_BIKER, STAY, DOWN, 7, OPP_BIKER, 3 object_event 46, 10, SPRITE_BIKER, STAY, DOWN, 8, OPP_BIKER, 4 - object_event 37, 5, SPRITE_COOLTRAINER_F, STAY, RIGHT, 9, OPP_JR_TRAINER_F, 22 + object_event 37, 5, SPRITE_COOLTRAINER_F, STAY, RIGHT, 9, OPP_JR_TRAINER_F, 22 object_event 18, 13, SPRITE_COOLTRAINER_F, STAY, UP, 10, OPP_JR_TRAINER_F, 23 - object_event 18, 5, SPRITE_POKE_BALL, STAY, NONE, 11, TM_RAGE + object_event 18, 5, SPRITE_POKE_BALL, STAY, NONE, 11, TM_RAGE def_warps_to ROUTE_15 diff --git a/data/maps/objects/Route15Gate1F.asm b/data/maps/objects/Route15Gate1F.asm index 24311f87..7c93ff33 100644 --- a/data/maps/objects/Route15Gate1F.asm +++ b/data/maps/objects/Route15Gate1F.asm @@ -11,6 +11,6 @@ Route15Gate1F_Object: def_bg_events def_object_events - object_event 4, 1, SPRITE_GUARD, STAY, NONE, 1 ; person + object_event 4, 1, SPRITE_GUARD, STAY, NONE, 1 ; person def_warps_to ROUTE_15_GATE_1F diff --git a/data/maps/objects/Route15Gate2F.asm b/data/maps/objects/Route15Gate2F.asm index d57bddab..23134028 100644 --- a/data/maps/objects/Route15Gate2F.asm +++ b/data/maps/objects/Route15Gate2F.asm @@ -8,6 +8,6 @@ Route15Gate2F_Object: bg_event 6, 2, 2 ; Route15GateUpstairsText2 def_object_events - object_event 4, 2, SPRITE_SCIENTIST, STAY, DOWN, 1 + object_event 4, 2, SPRITE_SCIENTIST, STAY, DOWN, 1 def_warps_to ROUTE_15_GATE_2F diff --git a/data/maps/objects/Route16.asm b/data/maps/objects/Route16.asm index 88da2f5f..a029873a 100644 --- a/data/maps/objects/Route16.asm +++ b/data/maps/objects/Route16.asm @@ -20,9 +20,9 @@ Route16_Object: object_event 17, 12, SPRITE_BIKER, STAY, LEFT, 1, OPP_BIKER, 5 object_event 14, 13, SPRITE_BIKER, STAY, RIGHT, 2, OPP_CUE_BALL, 1 object_event 11, 12, SPRITE_BIKER, STAY, UP, 3, OPP_CUE_BALL, 2 - object_event 9, 11, SPRITE_BIKER, STAY, LEFT, 4, OPP_BIKER, 6 - object_event 6, 10, SPRITE_BIKER, STAY, RIGHT, 5, OPP_CUE_BALL, 3 - object_event 3, 12, SPRITE_BIKER, STAY, RIGHT, 6, OPP_BIKER, 7 + object_event 9, 11, SPRITE_BIKER, STAY, LEFT, 4, OPP_BIKER, 6 + object_event 6, 10, SPRITE_BIKER, STAY, RIGHT, 5, OPP_CUE_BALL, 3 + object_event 3, 12, SPRITE_BIKER, STAY, RIGHT, 6, OPP_BIKER, 7 object_event 26, 10, SPRITE_SNORLAX, STAY, DOWN, 7 ; person def_warps_to ROUTE_16 diff --git a/data/maps/objects/Route16FlyHouse.asm b/data/maps/objects/Route16FlyHouse.asm index 1e4d2643..3e1f8ec9 100644 --- a/data/maps/objects/Route16FlyHouse.asm +++ b/data/maps/objects/Route16FlyHouse.asm @@ -8,7 +8,7 @@ Route16FlyHouse_Object: def_bg_events def_object_events - object_event 2, 3, SPRITE_BRUNETTE_GIRL, STAY, RIGHT, 1 ; person - object_event 6, 4, SPRITE_BIRD, WALK, ANY_DIR, 2 ; person + object_event 2, 3, SPRITE_BRUNETTE_GIRL, STAY, RIGHT, 1 ; person + object_event 6, 4, SPRITE_BIRD, WALK, ANY_DIR, 2 ; person def_warps_to ROUTE_16_FLY_HOUSE diff --git a/data/maps/objects/Route16Gate1F.asm b/data/maps/objects/Route16Gate1F.asm index 229ee0a0..476729e3 100644 --- a/data/maps/objects/Route16Gate1F.asm +++ b/data/maps/objects/Route16Gate1F.asm @@ -15,7 +15,7 @@ Route16Gate1F_Object: def_bg_events def_object_events - object_event 4, 5, SPRITE_GUARD, STAY, DOWN, 1 ; person - object_event 4, 3, SPRITE_GAMBLER, STAY, NONE, 2 ; person + object_event 4, 5, SPRITE_GUARD, STAY, DOWN, 1 ; person + object_event 4, 3, SPRITE_GAMBLER, STAY, NONE, 2 ; person def_warps_to ROUTE_16_GATE_1F diff --git a/data/maps/objects/Route16Gate2F.asm b/data/maps/objects/Route16Gate2F.asm index 047e2d70..185e5a13 100644 --- a/data/maps/objects/Route16Gate2F.asm +++ b/data/maps/objects/Route16Gate2F.asm @@ -9,7 +9,7 @@ Route16Gate2F_Object: bg_event 6, 2, 4 ; Route16GateUpstairsText4 def_object_events - object_event 4, 2, SPRITE_LITTLE_BOY, STAY, NONE, 1 ; person - object_event 2, 5, SPRITE_LITTLE_GIRL, WALK, LEFT_RIGHT, 2 ; person + object_event 4, 2, SPRITE_LITTLE_BOY, STAY, NONE, 1 ; person + object_event 2, 5, SPRITE_LITTLE_GIRL, WALK, LEFT_RIGHT, 2 ; person def_warps_to ROUTE_16_GATE_2F diff --git a/data/maps/objects/Route17.asm b/data/maps/objects/Route17.asm index a2923c29..48d88926 100644 --- a/data/maps/objects/Route17.asm +++ b/data/maps/objects/Route17.asm @@ -14,13 +14,13 @@ Route17_Object: def_object_events object_event 12, 19, SPRITE_BIKER, STAY, LEFT, 1, OPP_CUE_BALL, 4 object_event 11, 16, SPRITE_BIKER, STAY, RIGHT, 2, OPP_CUE_BALL, 5 - object_event 4, 18, SPRITE_BIKER, STAY, UP, 3, OPP_BIKER, 8 - object_event 7, 32, SPRITE_BIKER, STAY, LEFT, 4, OPP_BIKER, 9 + object_event 4, 18, SPRITE_BIKER, STAY, UP, 3, OPP_BIKER, 8 + object_event 7, 32, SPRITE_BIKER, STAY, LEFT, 4, OPP_BIKER, 9 object_event 14, 34, SPRITE_BIKER, STAY, RIGHT, 5, OPP_BIKER, 10 object_event 17, 58, SPRITE_BIKER, STAY, LEFT, 6, OPP_CUE_BALL, 6 - object_event 2, 68, SPRITE_BIKER, STAY, RIGHT, 7, OPP_CUE_BALL, 7 + object_event 2, 68, SPRITE_BIKER, STAY, RIGHT, 7, OPP_CUE_BALL, 7 object_event 14, 98, SPRITE_BIKER, STAY, RIGHT, 8, OPP_CUE_BALL, 8 - object_event 5, 98, SPRITE_BIKER, STAY, LEFT, 9, OPP_BIKER, 11 + object_event 5, 98, SPRITE_BIKER, STAY, LEFT, 9, OPP_BIKER, 11 object_event 10, 118, SPRITE_BIKER, STAY, DOWN, 10, OPP_BIKER, 12 def_warps_to ROUTE_17 diff --git a/data/maps/objects/Route18Gate1F.asm b/data/maps/objects/Route18Gate1F.asm index b01f8a21..2dcec54b 100644 --- a/data/maps/objects/Route18Gate1F.asm +++ b/data/maps/objects/Route18Gate1F.asm @@ -11,6 +11,6 @@ Route18Gate1F_Object: def_bg_events def_object_events - object_event 4, 1, SPRITE_GUARD, STAY, DOWN, 1 ; person + object_event 4, 1, SPRITE_GUARD, STAY, DOWN, 1 ; person def_warps_to ROUTE_18_GATE_1F diff --git a/data/maps/objects/Route18Gate2F.asm b/data/maps/objects/Route18Gate2F.asm index bf384bd2..afa1b383 100644 --- a/data/maps/objects/Route18Gate2F.asm +++ b/data/maps/objects/Route18Gate2F.asm @@ -9,6 +9,6 @@ Route18Gate2F_Object: bg_event 6, 2, 3 ; Route18GateUpstairsText3 def_object_events - object_event 4, 2, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 1 ; person + object_event 4, 2, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 1 ; person def_warps_to ROUTE_18_GATE_2F diff --git a/data/maps/objects/Route19.asm b/data/maps/objects/Route19.asm index 34ddfafa..90d253f4 100644 --- a/data/maps/objects/Route19.asm +++ b/data/maps/objects/Route19.asm @@ -7,15 +7,15 @@ Route19_Object: bg_event 11, 9, 11 ; Route19Text11 def_object_events - object_event 8, 7, SPRITE_COOLTRAINER_M, STAY, LEFT, 1, OPP_SWIMMER, 2 - object_event 13, 7, SPRITE_COOLTRAINER_M,STAY, LEFT, 2, OPP_SWIMMER, 3 + object_event 8, 7, SPRITE_COOLTRAINER_M, STAY, LEFT, 1, OPP_SWIMMER, 2 + object_event 13, 7, SPRITE_COOLTRAINER_M,STAY, LEFT, 2, OPP_SWIMMER, 3 object_event 13, 25, SPRITE_SWIMMER, STAY, LEFT, 3, OPP_SWIMMER, 4 - object_event 4, 27, SPRITE_SWIMMER, STAY, RIGHT, 4, OPP_SWIMMER, 5 + object_event 4, 27, SPRITE_SWIMMER, STAY, RIGHT, 4, OPP_SWIMMER, 5 object_event 16, 31, SPRITE_SWIMMER, STAY, UP, 5, OPP_SWIMMER, 6 - object_event 9, 11, SPRITE_SWIMMER, STAY, DOWN, 6, OPP_SWIMMER, 7 - object_event 8, 43, SPRITE_SWIMMER, STAY, LEFT, 7, OPP_BEAUTY, 12 + object_event 9, 11, SPRITE_SWIMMER, STAY, DOWN, 6, OPP_SWIMMER, 7 + object_event 8, 43, SPRITE_SWIMMER, STAY, LEFT, 7, OPP_BEAUTY, 12 object_event 11, 43, SPRITE_SWIMMER, STAY, RIGHT, 8, OPP_BEAUTY, 13 - object_event 9, 42, SPRITE_SWIMMER, STAY, UP, 9, OPP_SWIMMER, 8 + object_event 9, 42, SPRITE_SWIMMER, STAY, UP, 9, OPP_SWIMMER, 8 object_event 10, 44, SPRITE_SWIMMER, STAY, DOWN, 10, OPP_BEAUTY, 14 def_warps_to ROUTE_19 diff --git a/data/maps/objects/Route20.asm b/data/maps/objects/Route20.asm index 6b55e6e0..c00d2284 100644 --- a/data/maps/objects/Route20.asm +++ b/data/maps/objects/Route20.asm @@ -10,15 +10,15 @@ Route20_Object: bg_event 57, 11, 12 ; Route20Text12 def_object_events - object_event 87, 8, SPRITE_SWIMMER, STAY, UP, 1, OPP_SWIMMER, 9 + object_event 87, 8, SPRITE_SWIMMER, STAY, UP, 1, OPP_SWIMMER, 9 object_event 68, 11, SPRITE_SWIMMER, STAY, UP, 2, OPP_BEAUTY, 15 object_event 45, 10, SPRITE_SWIMMER, STAY, DOWN, 3, OPP_BEAUTY, 6 object_event 55, 14, SPRITE_SWIMMER, STAY, RIGHT, 4, OPP_JR_TRAINER_F, 24 object_event 38, 13, SPRITE_SWIMMER, STAY, DOWN, 5, OPP_SWIMMER, 10 object_event 87, 13, SPRITE_SWIMMER, STAY, UP, 6, OPP_SWIMMER, 11 - object_event 34, 9, SPRITE_COOLTRAINER_M, STAY, UP, 7, OPP_BIRD_KEEPER, 11 - object_event 25, 7, SPRITE_SWIMMER, STAY, UP, 8, OPP_BEAUTY, 7 + object_event 34, 9, SPRITE_COOLTRAINER_M, STAY, UP, 7, OPP_BIRD_KEEPER, 11 + object_event 25, 7, SPRITE_SWIMMER, STAY, UP, 8, OPP_BEAUTY, 7 object_event 24, 12, SPRITE_SWIMMER, STAY, DOWN, 9, OPP_JR_TRAINER_F, 16 - object_event 15, 8, SPRITE_SWIMMER, STAY, UP, 10, OPP_BEAUTY, 8 + object_event 15, 8, SPRITE_SWIMMER, STAY, UP, 10, OPP_BEAUTY, 8 def_warps_to ROUTE_20 diff --git a/data/maps/objects/Route21.asm b/data/maps/objects/Route21.asm index 57ad4d43..52012684 100644 --- a/data/maps/objects/Route21.asm +++ b/data/maps/objects/Route21.asm @@ -6,12 +6,12 @@ Route21_Object: def_bg_events def_object_events - object_event 4, 24, SPRITE_FISHER, STAY, LEFT, 1, OPP_FISHER, 7 - object_event 6, 25, SPRITE_FISHER, STAY, DOWN, 2, OPP_FISHER, 9 + object_event 4, 24, SPRITE_FISHER, STAY, LEFT, 1, OPP_FISHER, 7 + object_event 6, 25, SPRITE_FISHER, STAY, DOWN, 2, OPP_FISHER, 9 object_event 10, 31, SPRITE_SWIMMER, STAY, UP, 3, OPP_SWIMMER, 12 object_event 12, 30, SPRITE_SWIMMER, STAY, RIGHT, 4, OPP_CUE_BALL, 9 object_event 16, 63, SPRITE_SWIMMER, STAY, DOWN, 5, OPP_SWIMMER, 13 - object_event 5, 71, SPRITE_SWIMMER, STAY, RIGHT, 6, OPP_SWIMMER, 14 + object_event 5, 71, SPRITE_SWIMMER, STAY, RIGHT, 6, OPP_SWIMMER, 14 object_event 15, 71, SPRITE_SWIMMER, STAY, LEFT, 7, OPP_SWIMMER, 15 object_event 14, 56, SPRITE_FISHER, STAY, LEFT, 8, OPP_FISHER, 8 object_event 17, 57, SPRITE_FISHER, STAY, RIGHT, 9, OPP_FISHER, 10 diff --git a/data/maps/objects/Route22.asm b/data/maps/objects/Route22.asm index 4be0dda2..5fcc989f 100644 --- a/data/maps/objects/Route22.asm +++ b/data/maps/objects/Route22.asm @@ -8,7 +8,7 @@ Route22_Object: bg_event 7, 11, 3 ; Route22FrontGateText def_object_events - object_event 25, 5, SPRITE_BLUE, STAY, NONE, 1 ; person - object_event 25, 5, SPRITE_BLUE, STAY, NONE, 2 ; person + object_event 25, 5, SPRITE_BLUE, STAY, NONE, 1 ; person + object_event 25, 5, SPRITE_BLUE, STAY, NONE, 2 ; person def_warps_to ROUTE_22 diff --git a/data/maps/objects/Route22Gate.asm b/data/maps/objects/Route22Gate.asm index 04e628e0..94aafc51 100644 --- a/data/maps/objects/Route22Gate.asm +++ b/data/maps/objects/Route22Gate.asm @@ -10,6 +10,6 @@ Route22Gate_Object: def_bg_events def_object_events - object_event 6, 2, SPRITE_GUARD, STAY, LEFT, 1 ; person + object_event 6, 2, SPRITE_GUARD, STAY, LEFT, 1 ; person def_warps_to ROUTE_22_GATE diff --git a/data/maps/objects/Route23.asm b/data/maps/objects/Route23.asm index fe5aadab..6cd97faa 100644 --- a/data/maps/objects/Route23.asm +++ b/data/maps/objects/Route23.asm @@ -11,12 +11,12 @@ Route23_Object: bg_event 3, 33, 8 ; Route23Text8 def_object_events - object_event 4, 35, SPRITE_GUARD, STAY, DOWN, 1 ; person + object_event 4, 35, SPRITE_GUARD, STAY, DOWN, 1 ; person object_event 10, 56, SPRITE_GUARD, STAY, DOWN, 2 ; person - object_event 8, 85, SPRITE_SWIMMER, STAY, DOWN, 3 ; person + object_event 8, 85, SPRITE_SWIMMER, STAY, DOWN, 3 ; person object_event 11, 96, SPRITE_SWIMMER, STAY, DOWN, 4 ; person object_event 12, 105, SPRITE_GUARD, STAY, DOWN, 5 ; person - object_event 8, 119, SPRITE_GUARD, STAY, DOWN, 6 ; person - object_event 8, 136, SPRITE_GUARD, STAY, DOWN, 7 ; person + object_event 8, 119, SPRITE_GUARD, STAY, DOWN, 6 ; person + object_event 8, 136, SPRITE_GUARD, STAY, DOWN, 7 ; person def_warps_to ROUTE_23 diff --git a/data/maps/objects/Route24.asm b/data/maps/objects/Route24.asm index d9d0a9d1..80dca821 100644 --- a/data/maps/objects/Route24.asm +++ b/data/maps/objects/Route24.asm @@ -7,12 +7,12 @@ Route24_Object: def_object_events object_event 11, 15, SPRITE_COOLTRAINER_M, STAY, LEFT, 1, OPP_ROCKET, 6 - object_event 5, 20, SPRITE_COOLTRAINER_M, STAY, UP, 2, OPP_JR_TRAINER_M, 2 + object_event 5, 20, SPRITE_COOLTRAINER_M, STAY, UP, 2, OPP_JR_TRAINER_M, 2 object_event 11, 19, SPRITE_COOLTRAINER_M, STAY, LEFT, 3, OPP_JR_TRAINER_M, 3 object_event 10, 22, SPRITE_COOLTRAINER_F, STAY, RIGHT, 4, OPP_LASS, 7 object_event 11, 25, SPRITE_YOUNGSTER, STAY, LEFT, 5, OPP_YOUNGSTER, 4 object_event 10, 28, SPRITE_COOLTRAINER_F, STAY, RIGHT, 6, OPP_LASS, 8 object_event 11, 31, SPRITE_YOUNGSTER, STAY, LEFT, 7, OPP_BUG_CATCHER, 9 - object_event 10, 5, SPRITE_POKE_BALL, STAY, NONE, 8, TM_THUNDER_WAVE + object_event 10, 5, SPRITE_POKE_BALL, STAY, NONE, 8, TM_THUNDER_WAVE def_warps_to ROUTE_24 diff --git a/data/maps/objects/Route25.asm b/data/maps/objects/Route25.asm index 96af21ab..096fd225 100644 --- a/data/maps/objects/Route25.asm +++ b/data/maps/objects/Route25.asm @@ -8,15 +8,15 @@ Route25_Object: bg_event 43, 3, 11 ; Route25Text11 def_object_events - object_event 14, 2, SPRITE_YOUNGSTER, STAY, DOWN, 1, OPP_YOUNGSTER, 5 - object_event 18, 5, SPRITE_YOUNGSTER, STAY, UP, 2, OPP_YOUNGSTER, 6 - object_event 24, 4, SPRITE_COOLTRAINER_M, STAY, DOWN, 3, OPP_JR_TRAINER_M, 2 - object_event 18, 8, SPRITE_COOLTRAINER_F, STAY, RIGHT, 4, OPP_LASS, 9 - object_event 32, 3, SPRITE_YOUNGSTER, STAY, LEFT, 5, OPP_YOUNGSTER, 7 - object_event 37, 4, SPRITE_COOLTRAINER_F, STAY, DOWN, 6, OPP_LASS, 10 - object_event 8, 4, SPRITE_HIKER, STAY, RIGHT, 7, OPP_HIKER, 2 - object_event 23, 9, SPRITE_HIKER, STAY, UP, 8, OPP_HIKER, 3 - object_event 13, 7, SPRITE_HIKER, STAY, RIGHT, 9, OPP_HIKER, 4 - object_event 22, 2, SPRITE_POKE_BALL, STAY, NONE, 10, TM_SEISMIC_TOSS + object_event 14, 2, SPRITE_YOUNGSTER, STAY, DOWN, 1, OPP_YOUNGSTER, 5 + object_event 18, 5, SPRITE_YOUNGSTER, STAY, UP, 2, OPP_YOUNGSTER, 6 + object_event 24, 4, SPRITE_COOLTRAINER_M, STAY, DOWN, 3, OPP_JR_TRAINER_M, 2 + object_event 18, 8, SPRITE_COOLTRAINER_F, STAY, RIGHT, 4, OPP_LASS, 9 + object_event 32, 3, SPRITE_YOUNGSTER, STAY, LEFT, 5, OPP_YOUNGSTER, 7 + object_event 37, 4, SPRITE_COOLTRAINER_F, STAY, DOWN, 6, OPP_LASS, 10 + object_event 8, 4, SPRITE_HIKER, STAY, RIGHT, 7, OPP_HIKER, 2 + object_event 23, 9, SPRITE_HIKER, STAY, UP, 8, OPP_HIKER, 3 + object_event 13, 7, SPRITE_HIKER, STAY, RIGHT, 9, OPP_HIKER, 4 + object_event 22, 2, SPRITE_POKE_BALL, STAY, NONE, 10, TM_SEISMIC_TOSS def_warps_to ROUTE_25 diff --git a/data/maps/objects/Route2Gate.asm b/data/maps/objects/Route2Gate.asm index 8d8b5db2..a31e92b0 100644 --- a/data/maps/objects/Route2Gate.asm +++ b/data/maps/objects/Route2Gate.asm @@ -10,7 +10,7 @@ Route2Gate_Object: def_bg_events def_object_events - object_event 1, 4, SPRITE_SCIENTIST, STAY, LEFT, 1 ; person - object_event 5, 4, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 2 ; person + object_event 1, 4, SPRITE_SCIENTIST, STAY, LEFT, 1 ; person + object_event 5, 4, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 2 ; person def_warps_to ROUTE_2_GATE diff --git a/data/maps/objects/Route2TradeHouse.asm b/data/maps/objects/Route2TradeHouse.asm index 3a7f1d72..863dee37 100644 --- a/data/maps/objects/Route2TradeHouse.asm +++ b/data/maps/objects/Route2TradeHouse.asm @@ -8,7 +8,7 @@ Route2TradeHouse_Object: def_bg_events def_object_events - object_event 2, 4, SPRITE_SCIENTIST, STAY, RIGHT, 1 ; person - object_event 4, 1, SPRITE_GAMEBOY_KID, STAY, DOWN, 2 ; person + object_event 2, 4, SPRITE_SCIENTIST, STAY, RIGHT, 1 ; person + object_event 4, 1, SPRITE_GAMEBOY_KID, STAY, DOWN, 2 ; person def_warps_to ROUTE_2_TRADE_HOUSE diff --git a/data/maps/objects/Route3.asm b/data/maps/objects/Route3.asm index c60f78a9..dc27fe24 100644 --- a/data/maps/objects/Route3.asm +++ b/data/maps/objects/Route3.asm @@ -8,13 +8,13 @@ Route3_Object: def_object_events object_event 57, 11, SPRITE_SUPER_NERD, STAY, NONE, 1 ; person - object_event 10, 6, SPRITE_YOUNGSTER, STAY, RIGHT, 2, OPP_BUG_CATCHER, 4 - object_event 14, 4, SPRITE_YOUNGSTER, STAY, DOWN, 3, OPP_YOUNGSTER, 1 - object_event 16, 9, SPRITE_COOLTRAINER_F, STAY, LEFT, 4, OPP_LASS, 1 - object_event 19, 5, SPRITE_YOUNGSTER, STAY, DOWN, 5, OPP_BUG_CATCHER, 5 - object_event 23, 4, SPRITE_COOLTRAINER_F, STAY, LEFT, 6, OPP_LASS, 2 - object_event 22, 9, SPRITE_YOUNGSTER, STAY, LEFT, 7, OPP_YOUNGSTER, 2 - object_event 24, 6, SPRITE_YOUNGSTER, STAY, RIGHT, 8, OPP_BUG_CATCHER, 6 + object_event 10, 6, SPRITE_YOUNGSTER, STAY, RIGHT, 2, OPP_BUG_CATCHER, 4 + object_event 14, 4, SPRITE_YOUNGSTER, STAY, DOWN, 3, OPP_YOUNGSTER, 1 + object_event 16, 9, SPRITE_COOLTRAINER_F, STAY, LEFT, 4, OPP_LASS, 1 + object_event 19, 5, SPRITE_YOUNGSTER, STAY, DOWN, 5, OPP_BUG_CATCHER, 5 + object_event 23, 4, SPRITE_COOLTRAINER_F, STAY, LEFT, 6, OPP_LASS, 2 + object_event 22, 9, SPRITE_YOUNGSTER, STAY, LEFT, 7, OPP_YOUNGSTER, 2 + object_event 24, 6, SPRITE_YOUNGSTER, STAY, RIGHT, 8, OPP_BUG_CATCHER, 6 object_event 33, 10, SPRITE_COOLTRAINER_F, STAY, UP, 9, OPP_LASS, 3 def_warps_to ROUTE_3 diff --git a/data/maps/objects/Route4.asm b/data/maps/objects/Route4.asm index 13f25a80..27a72b23 100644 --- a/data/maps/objects/Route4.asm +++ b/data/maps/objects/Route4.asm @@ -12,8 +12,8 @@ Route4_Object: bg_event 27, 7, 6 ; Route4Text6 def_object_events - object_event 9, 8, SPRITE_COOLTRAINER_F, WALK, ANY_DIR, 1 ; person - object_event 63, 3, SPRITE_COOLTRAINER_F, STAY, RIGHT, 2, OPP_LASS, 4 - object_event 57, 3, SPRITE_POKE_BALL, STAY, NONE, 3, TM_WHIRLWIND + object_event 9, 8, SPRITE_COOLTRAINER_F, WALK, ANY_DIR, 1 ; person + object_event 63, 3, SPRITE_COOLTRAINER_F, STAY, RIGHT, 2, OPP_LASS, 4 + object_event 57, 3, SPRITE_POKE_BALL, STAY, NONE, 3, TM_WHIRLWIND def_warps_to ROUTE_4 diff --git a/data/maps/objects/Route5Gate.asm b/data/maps/objects/Route5Gate.asm index 29a54892..cdcf7aa8 100644 --- a/data/maps/objects/Route5Gate.asm +++ b/data/maps/objects/Route5Gate.asm @@ -10,6 +10,6 @@ Route5Gate_Object: def_bg_events def_object_events - object_event 1, 3, SPRITE_GUARD, STAY, RIGHT, 1 ; person + object_event 1, 3, SPRITE_GUARD, STAY, RIGHT, 1 ; person def_warps_to ROUTE_5_GATE diff --git a/data/maps/objects/Route6.asm b/data/maps/objects/Route6.asm index 1bd91d98..d71c90de 100644 --- a/data/maps/objects/Route6.asm +++ b/data/maps/objects/Route6.asm @@ -13,7 +13,7 @@ Route6_Object: def_object_events object_event 10, 21, SPRITE_COOLTRAINER_M, STAY, RIGHT, 1, OPP_JR_TRAINER_M, 4 object_event 11, 21, SPRITE_COOLTRAINER_F, STAY, LEFT, 2, OPP_JR_TRAINER_F, 2 - object_event 0, 15, SPRITE_YOUNGSTER, STAY, RIGHT, 3, OPP_BUG_CATCHER, 10 + object_event 0, 15, SPRITE_YOUNGSTER, STAY, RIGHT, 3, OPP_BUG_CATCHER, 10 object_event 11, 31, SPRITE_COOLTRAINER_M, STAY, LEFT, 4, OPP_JR_TRAINER_M, 5 object_event 11, 30, SPRITE_COOLTRAINER_F, STAY, LEFT, 5, OPP_JR_TRAINER_F, 3 object_event 19, 26, SPRITE_YOUNGSTER, STAY, LEFT, 6, OPP_BUG_CATCHER, 11 diff --git a/data/maps/objects/Route6Gate.asm b/data/maps/objects/Route6Gate.asm index e4503913..95ad9e5e 100644 --- a/data/maps/objects/Route6Gate.asm +++ b/data/maps/objects/Route6Gate.asm @@ -10,6 +10,6 @@ Route6Gate_Object: def_bg_events def_object_events - object_event 6, 2, SPRITE_GUARD, STAY, LEFT, 1 ; person + object_event 6, 2, SPRITE_GUARD, STAY, LEFT, 1 ; person def_warps_to ROUTE_6_GATE diff --git a/data/maps/objects/Route7Gate.asm b/data/maps/objects/Route7Gate.asm index 9aeb81ee..90ddca07 100644 --- a/data/maps/objects/Route7Gate.asm +++ b/data/maps/objects/Route7Gate.asm @@ -10,6 +10,6 @@ Route7Gate_Object: def_bg_events def_object_events - object_event 3, 1, SPRITE_GUARD, STAY, DOWN, 1 ; person + object_event 3, 1, SPRITE_GUARD, STAY, DOWN, 1 ; person def_warps_to ROUTE_7_GATE diff --git a/data/maps/objects/Route8.asm b/data/maps/objects/Route8.asm index 71a1df45..2ca33901 100644 --- a/data/maps/objects/Route8.asm +++ b/data/maps/objects/Route8.asm @@ -12,13 +12,13 @@ Route8_Object: bg_event 17, 3, 10 ; Route8Text10 def_object_events - object_event 8, 5, SPRITE_SUPER_NERD, STAY, RIGHT, 1, OPP_SUPER_NERD, 3 - object_event 13, 9, SPRITE_GAMBLER, STAY, UP, 2, OPP_GAMBLER, 5 - object_event 42, 6, SPRITE_SUPER_NERD, STAY, UP, 3, OPP_SUPER_NERD, 4 - object_event 26, 3, SPRITE_COOLTRAINER_F, STAY, LEFT, 4, OPP_LASS, 13 - object_event 26, 4, SPRITE_SUPER_NERD, STAY, RIGHT, 5, OPP_SUPER_NERD, 5 - object_event 26, 5, SPRITE_COOLTRAINER_F, STAY, LEFT, 6, OPP_LASS, 14 - object_event 26, 6, SPRITE_COOLTRAINER_F, STAY, RIGHT, 7, OPP_LASS, 15 + object_event 8, 5, SPRITE_SUPER_NERD, STAY, RIGHT, 1, OPP_SUPER_NERD, 3 + object_event 13, 9, SPRITE_GAMBLER, STAY, UP, 2, OPP_GAMBLER, 5 + object_event 42, 6, SPRITE_SUPER_NERD, STAY, UP, 3, OPP_SUPER_NERD, 4 + object_event 26, 3, SPRITE_COOLTRAINER_F, STAY, LEFT, 4, OPP_LASS, 13 + object_event 26, 4, SPRITE_SUPER_NERD, STAY, RIGHT, 5, OPP_SUPER_NERD, 5 + object_event 26, 5, SPRITE_COOLTRAINER_F, STAY, LEFT, 6, OPP_LASS, 14 + object_event 26, 6, SPRITE_COOLTRAINER_F, STAY, RIGHT, 7, OPP_LASS, 15 object_event 46, 13, SPRITE_GAMBLER, STAY, DOWN, 8, OPP_GAMBLER, 7 object_event 51, 12, SPRITE_COOLTRAINER_F, STAY, LEFT, 9, OPP_LASS, 16 diff --git a/data/maps/objects/Route8Gate.asm b/data/maps/objects/Route8Gate.asm index 89a79d87..ee09b038 100644 --- a/data/maps/objects/Route8Gate.asm +++ b/data/maps/objects/Route8Gate.asm @@ -10,6 +10,6 @@ Route8Gate_Object: def_bg_events def_object_events - object_event 2, 1, SPRITE_GUARD, STAY, DOWN, 1 ; person + object_event 2, 1, SPRITE_GUARD, STAY, DOWN, 1 ; person def_warps_to ROUTE_8_GATE diff --git a/data/maps/objects/Route9.asm b/data/maps/objects/Route9.asm index 7960af20..a9be69be 100644 --- a/data/maps/objects/Route9.asm +++ b/data/maps/objects/Route9.asm @@ -8,14 +8,14 @@ Route9_Object: def_object_events object_event 13, 10, SPRITE_COOLTRAINER_F, STAY, LEFT, 1, OPP_JR_TRAINER_F, 5 - object_event 24, 7, SPRITE_COOLTRAINER_M, STAY, LEFT, 2, OPP_JR_TRAINER_M, 7 - object_event 31, 7, SPRITE_COOLTRAINER_M, STAY, RIGHT, 3, OPP_JR_TRAINER_M, 8 - object_event 48, 8, SPRITE_COOLTRAINER_F, STAY, RIGHT, 4, OPP_JR_TRAINER_F, 6 + object_event 24, 7, SPRITE_COOLTRAINER_M, STAY, LEFT, 2, OPP_JR_TRAINER_M, 7 + object_event 31, 7, SPRITE_COOLTRAINER_M, STAY, RIGHT, 3, OPP_JR_TRAINER_M, 8 + object_event 48, 8, SPRITE_COOLTRAINER_F, STAY, RIGHT, 4, OPP_JR_TRAINER_F, 6 object_event 16, 15, SPRITE_HIKER, STAY, LEFT, 5, OPP_HIKER, 11 - object_event 43, 3, SPRITE_HIKER, STAY, LEFT, 6, OPP_HIKER, 6 - object_event 22, 2, SPRITE_YOUNGSTER, STAY, DOWN, 7, OPP_BUG_CATCHER, 13 + object_event 43, 3, SPRITE_HIKER, STAY, LEFT, 6, OPP_HIKER, 6 + object_event 22, 2, SPRITE_YOUNGSTER, STAY, DOWN, 7, OPP_BUG_CATCHER, 13 object_event 45, 15, SPRITE_HIKER, STAY, RIGHT, 8, OPP_HIKER, 5 - object_event 40, 8, SPRITE_YOUNGSTER, STAY, RIGHT, 9, OPP_BUG_CATCHER, 14 + object_event 40, 8, SPRITE_YOUNGSTER, STAY, RIGHT, 9, OPP_BUG_CATCHER, 14 object_event 10, 15, SPRITE_POKE_BALL, STAY, NONE, 10, TM_TELEPORT def_warps_to ROUTE_9 diff --git a/data/maps/objects/SSAnne1F.asm b/data/maps/objects/SSAnne1F.asm index dcdd73f9..60db6da2 100644 --- a/data/maps/objects/SSAnne1F.asm +++ b/data/maps/objects/SSAnne1F.asm @@ -17,7 +17,7 @@ SSAnne1F_Object: def_bg_events def_object_events - object_event 12, 6, SPRITE_WAITER, WALK, LEFT_RIGHT, 1 ; person - object_event 27, 5, SPRITE_SAILOR, STAY, NONE, 2 ; person + object_event 12, 6, SPRITE_WAITER, WALK, LEFT_RIGHT, 1 ; person + object_event 27, 5, SPRITE_SAILOR, STAY, NONE, 2 ; person def_warps_to SS_ANNE_1F diff --git a/data/maps/objects/SSAnne1FRooms.asm b/data/maps/objects/SSAnne1FRooms.asm index b4967492..c5c97671 100644 --- a/data/maps/objects/SSAnne1FRooms.asm +++ b/data/maps/objects/SSAnne1FRooms.asm @@ -12,14 +12,14 @@ SSAnne1FRooms_Object: def_bg_events def_object_events - object_event 2, 3, SPRITE_GENTLEMAN, STAY, LEFT, 1, OPP_GENTLEMAN, 1 - object_event 11, 4, SPRITE_GENTLEMAN, STAY, UP, 2, OPP_GENTLEMAN, 2 + object_event 2, 3, SPRITE_GENTLEMAN, STAY, LEFT, 1, OPP_GENTLEMAN, 1 + object_event 11, 4, SPRITE_GENTLEMAN, STAY, UP, 2, OPP_GENTLEMAN, 2 object_event 11, 14, SPRITE_YOUNGSTER, STAY, UP, 3, OPP_YOUNGSTER, 8 object_event 13, 11, SPRITE_COOLTRAINER_F, STAY, LEFT, 4, OPP_LASS, 11 - object_event 22, 3, SPRITE_GIRL, WALK, UP_DOWN, 5 ; person - object_event 0, 14, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, 6 ; person - object_event 2, 11, SPRITE_LITTLE_GIRL, STAY, DOWN, 7 ; person - object_event 3, 11, SPRITE_FAIRY, STAY, DOWN, 8 ; person + object_event 22, 3, SPRITE_GIRL, WALK, UP_DOWN, 5 ; person + object_event 0, 14, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, 6 ; person + object_event 2, 11, SPRITE_LITTLE_GIRL, STAY, DOWN, 7 ; person + object_event 3, 11, SPRITE_FAIRY, STAY, DOWN, 8 ; person object_event 10, 13, SPRITE_GIRL, STAY, RIGHT, 9 ; person object_event 12, 15, SPRITE_POKE_BALL, STAY, NONE, 10, TM_BODY_SLAM object_event 21, 13, SPRITE_GENTLEMAN, WALK, LEFT_RIGHT, 11 ; person diff --git a/data/maps/objects/SSAnne2F.asm b/data/maps/objects/SSAnne2F.asm index e582252e..fa3a851f 100644 --- a/data/maps/objects/SSAnne2F.asm +++ b/data/maps/objects/SSAnne2F.asm @@ -15,7 +15,7 @@ SSAnne2F_Object: def_bg_events def_object_events - object_event 3, 7, SPRITE_WAITER, WALK, UP_DOWN, 1 ; person - object_event 36, 4, SPRITE_BLUE, STAY, DOWN, 2, OPP_RIVAL1, 1 + object_event 3, 7, SPRITE_WAITER, WALK, UP_DOWN, 1 ; person + object_event 36, 4, SPRITE_BLUE, STAY, DOWN, 2, OPP_RIVAL1, 1 def_warps_to SS_ANNE_2F diff --git a/data/maps/objects/SSAnne2FRooms.asm b/data/maps/objects/SSAnne2FRooms.asm index 21948e65..187da976 100644 --- a/data/maps/objects/SSAnne2FRooms.asm +++ b/data/maps/objects/SSAnne2FRooms.asm @@ -18,15 +18,15 @@ SSAnne2FRooms_Object: def_bg_events def_object_events - object_event 10, 2, SPRITE_GENTLEMAN, STAY, RIGHT, 1, OPP_GENTLEMAN, 3 - object_event 13, 4, SPRITE_FISHER, STAY, LEFT, 2, OPP_FISHER, 1 - object_event 0, 14, SPRITE_GENTLEMAN, STAY, RIGHT, 3, OPP_GENTLEMAN, 5 - object_event 2, 11, SPRITE_COOLTRAINER_F, STAY, DOWN, 4, OPP_LASS, 12 - object_event 1, 2, SPRITE_GENTLEMAN, STAY, DOWN, 5 ; person - object_event 12, 1, SPRITE_POKE_BALL, STAY, NONE, 6, MAX_ETHER - object_event 21, 2, SPRITE_GENTLEMAN, STAY, DOWN, 7 ; person - object_event 22, 1, SPRITE_GRAMPS, STAY, DOWN, 8 ; person - object_event 0, 12, SPRITE_POKE_BALL, STAY, NONE, 9, RARE_CANDY + object_event 10, 2, SPRITE_GENTLEMAN, STAY, RIGHT, 1, OPP_GENTLEMAN, 3 + object_event 13, 4, SPRITE_FISHER, STAY, LEFT, 2, OPP_FISHER, 1 + object_event 0, 14, SPRITE_GENTLEMAN, STAY, RIGHT, 3, OPP_GENTLEMAN, 5 + object_event 2, 11, SPRITE_COOLTRAINER_F, STAY, DOWN, 4, OPP_LASS, 12 + object_event 1, 2, SPRITE_GENTLEMAN, STAY, DOWN, 5 ; person + object_event 12, 1, SPRITE_POKE_BALL, STAY, NONE, 6, MAX_ETHER + object_event 21, 2, SPRITE_GENTLEMAN, STAY, DOWN, 7 ; person + object_event 22, 1, SPRITE_GRAMPS, STAY, DOWN, 8 ; person + object_event 0, 12, SPRITE_POKE_BALL, STAY, NONE, 9, RARE_CANDY object_event 12, 12, SPRITE_GENTLEMAN, STAY, DOWN, 10 ; person object_event 11, 14, SPRITE_LITTLE_BOY, STAY, NONE, 11 ; person object_event 22, 12, SPRITE_BRUNETTE_GIRL, STAY, LEFT, 12 ; person diff --git a/data/maps/objects/SSAnne3F.asm b/data/maps/objects/SSAnne3F.asm index a91c3646..18df6b5e 100644 --- a/data/maps/objects/SSAnne3F.asm +++ b/data/maps/objects/SSAnne3F.asm @@ -8,6 +8,6 @@ SSAnne3F_Object: def_bg_events def_object_events - object_event 9, 3, SPRITE_SAILOR, WALK, LEFT_RIGHT, 1 ; person + object_event 9, 3, SPRITE_SAILOR, WALK, LEFT_RIGHT, 1 ; person def_warps_to SS_ANNE_3F diff --git a/data/maps/objects/SSAnneB1FRooms.asm b/data/maps/objects/SSAnneB1FRooms.asm index 23f7a2f2..a7bf0825 100644 --- a/data/maps/objects/SSAnneB1FRooms.asm +++ b/data/maps/objects/SSAnneB1FRooms.asm @@ -16,16 +16,16 @@ SSAnneB1FRooms_Object: def_bg_events def_object_events - object_event 0, 13, SPRITE_SAILOR, STAY, DOWN, 1, OPP_SAILOR, 3 - object_event 2, 11, SPRITE_SAILOR, STAY, DOWN, 2, OPP_SAILOR, 4 - object_event 12, 3, SPRITE_SAILOR, STAY, LEFT, 3, OPP_SAILOR, 5 - object_event 22, 2, SPRITE_SAILOR, STAY, DOWN, 4, OPP_SAILOR, 6 - object_event 0, 2, SPRITE_SAILOR, STAY, RIGHT, 5, OPP_SAILOR, 7 - object_event 0, 4, SPRITE_FISHER, STAY, RIGHT, 6, OPP_FISHER, 2 + object_event 0, 13, SPRITE_SAILOR, STAY, DOWN, 1, OPP_SAILOR, 3 + object_event 2, 11, SPRITE_SAILOR, STAY, DOWN, 2, OPP_SAILOR, 4 + object_event 12, 3, SPRITE_SAILOR, STAY, LEFT, 3, OPP_SAILOR, 5 + object_event 22, 2, SPRITE_SAILOR, STAY, DOWN, 4, OPP_SAILOR, 6 + object_event 0, 2, SPRITE_SAILOR, STAY, RIGHT, 5, OPP_SAILOR, 7 + object_event 0, 4, SPRITE_FISHER, STAY, RIGHT, 6, OPP_FISHER, 2 object_event 10, 13, SPRITE_SUPER_NERD, STAY, RIGHT, 7 ; person object_event 11, 12, SPRITE_MONSTER, STAY, NONE, 8 ; person - object_event 20, 2, SPRITE_POKE_BALL, STAY, NONE, 9, ETHER - object_event 10, 2, SPRITE_POKE_BALL, STAY, NONE, 10, TM_REST + object_event 20, 2, SPRITE_POKE_BALL, STAY, NONE, 9, ETHER + object_event 10, 2, SPRITE_POKE_BALL, STAY, NONE, 10, TM_REST object_event 12, 11, SPRITE_POKE_BALL, STAY, NONE, 11, MAX_POTION def_warps_to SS_ANNE_B1F_ROOMS diff --git a/data/maps/objects/SSAnneBow.asm b/data/maps/objects/SSAnneBow.asm index ec0389df..9771a94f 100644 --- a/data/maps/objects/SSAnneBow.asm +++ b/data/maps/objects/SSAnneBow.asm @@ -8,10 +8,10 @@ SSAnneBow_Object: def_bg_events def_object_events - object_event 5, 2, SPRITE_SUPER_NERD, STAY, UP, 1 ; person - object_event 4, 9, SPRITE_SAILOR, STAY, NONE, 2 ; person - object_event 7, 11, SPRITE_COOLTRAINER_M, STAY, NONE, 3 ; person - object_event 4, 4, SPRITE_SAILOR, STAY, DOWN, 4, OPP_SAILOR, 1 - object_event 10, 8, SPRITE_SAILOR, STAY, UP, 5, OPP_SAILOR, 2 + object_event 5, 2, SPRITE_SUPER_NERD, STAY, UP, 1 ; person + object_event 4, 9, SPRITE_SAILOR, STAY, NONE, 2 ; person + object_event 7, 11, SPRITE_COOLTRAINER_M, STAY, NONE, 3 ; person + object_event 4, 4, SPRITE_SAILOR, STAY, DOWN, 4, OPP_SAILOR, 1 + object_event 10, 8, SPRITE_SAILOR, STAY, UP, 5, OPP_SAILOR, 2 def_warps_to SS_ANNE_BOW diff --git a/data/maps/objects/SSAnneCaptainsRoom.asm b/data/maps/objects/SSAnneCaptainsRoom.asm index f91b301a..7e79b662 100644 --- a/data/maps/objects/SSAnneCaptainsRoom.asm +++ b/data/maps/objects/SSAnneCaptainsRoom.asm @@ -9,6 +9,6 @@ SSAnneCaptainsRoom_Object: bg_event 1, 2, 3 ; SSAnne7Text3 def_object_events - object_event 4, 2, SPRITE_CAPTAIN, STAY, UP, 1 ; person + object_event 4, 2, SPRITE_CAPTAIN, STAY, UP, 1 ; person def_warps_to SS_ANNE_CAPTAINS_ROOM diff --git a/data/maps/objects/SSAnneKitchen.asm b/data/maps/objects/SSAnneKitchen.asm index bf6434e3..3a8ab47b 100644 --- a/data/maps/objects/SSAnneKitchen.asm +++ b/data/maps/objects/SSAnneKitchen.asm @@ -7,11 +7,11 @@ SSAnneKitchen_Object: def_bg_events def_object_events - object_event 1, 8, SPRITE_COOK, WALK, UP_DOWN, 1 ; person - object_event 5, 8, SPRITE_COOK, WALK, UP_DOWN, 2 ; person - object_event 9, 7, SPRITE_COOK, WALK, UP_DOWN, 3 ; person - object_event 13, 6, SPRITE_COOK, STAY, NONE, 4 ; person - object_event 13, 8, SPRITE_COOK, STAY, NONE, 5 ; person + object_event 1, 8, SPRITE_COOK, WALK, UP_DOWN, 1 ; person + object_event 5, 8, SPRITE_COOK, WALK, UP_DOWN, 2 ; person + object_event 9, 7, SPRITE_COOK, WALK, UP_DOWN, 3 ; person + object_event 13, 6, SPRITE_COOK, STAY, NONE, 4 ; person + object_event 13, 8, SPRITE_COOK, STAY, NONE, 5 ; person object_event 13, 10, SPRITE_COOK, STAY, NONE, 6 ; person object_event 11, 13, SPRITE_COOK, STAY, UP, 7 ; person diff --git a/data/maps/objects/SafariZoneCenterRestHouse.asm b/data/maps/objects/SafariZoneCenterRestHouse.asm index 34acd75f..2d000233 100644 --- a/data/maps/objects/SafariZoneCenterRestHouse.asm +++ b/data/maps/objects/SafariZoneCenterRestHouse.asm @@ -8,7 +8,7 @@ SafariZoneCenterRestHouse_Object: def_bg_events def_object_events - object_event 3, 2, SPRITE_GIRL, STAY, DOWN, 1 ; person - object_event 1, 4, SPRITE_SCIENTIST, WALK, UP_DOWN, 2 ; person + object_event 3, 2, SPRITE_GIRL, STAY, DOWN, 1 ; person + object_event 1, 4, SPRITE_SCIENTIST, WALK, UP_DOWN, 2 ; person def_warps_to SAFARI_ZONE_CENTER_REST_HOUSE diff --git a/data/maps/objects/SafariZoneEast.asm b/data/maps/objects/SafariZoneEast.asm index 84074349..f5759d6b 100644 --- a/data/maps/objects/SafariZoneEast.asm +++ b/data/maps/objects/SafariZoneEast.asm @@ -15,7 +15,7 @@ SafariZoneEast_Object: def_object_events object_event 21, 10, SPRITE_POKE_BALL, STAY, NONE, 1, FULL_RESTORE - object_event 3, 7, SPRITE_POKE_BALL, STAY, NONE, 2, MAX_POTION + object_event 3, 7, SPRITE_POKE_BALL, STAY, NONE, 2, MAX_POTION object_event 20, 13, SPRITE_POKE_BALL, STAY, NONE, 3, CARBOS object_event 15, 12, SPRITE_POKE_BALL, STAY, NONE, 4, TM_EGG_BOMB diff --git a/data/maps/objects/SafariZoneEastRestHouse.asm b/data/maps/objects/SafariZoneEastRestHouse.asm index 8f83a10a..915e175b 100644 --- a/data/maps/objects/SafariZoneEastRestHouse.asm +++ b/data/maps/objects/SafariZoneEastRestHouse.asm @@ -8,8 +8,8 @@ SafariZoneEastRestHouse_Object: def_bg_events def_object_events - object_event 1, 3, SPRITE_SCIENTIST, WALK, UP_DOWN, 1 ; person - object_event 4, 2, SPRITE_ROCKER, STAY, NONE, 2 ; person - object_event 5, 2, SPRITE_SILPH_WORKER, STAY, NONE, 3 ; person + object_event 1, 3, SPRITE_SCIENTIST, WALK, UP_DOWN, 1 ; person + object_event 4, 2, SPRITE_ROCKER, STAY, NONE, 2 ; person + object_event 5, 2, SPRITE_SILPH_WORKER, STAY, NONE, 3 ; person def_warps_to SAFARI_ZONE_EAST_REST_HOUSE diff --git a/data/maps/objects/SafariZoneGate.asm b/data/maps/objects/SafariZoneGate.asm index c12cd4ee..d3c153fb 100644 --- a/data/maps/objects/SafariZoneGate.asm +++ b/data/maps/objects/SafariZoneGate.asm @@ -10,7 +10,7 @@ SafariZoneGate_Object: def_bg_events def_object_events - object_event 6, 2, SPRITE_SAFARI_ZONE_WORKER, STAY, LEFT, 1 ; person - object_event 1, 4, SPRITE_SAFARI_ZONE_WORKER, STAY, RIGHT, 2 ; person + object_event 6, 2, SPRITE_SAFARI_ZONE_WORKER, STAY, LEFT, 1 ; person + object_event 1, 4, SPRITE_SAFARI_ZONE_WORKER, STAY, RIGHT, 2 ; person def_warps_to SAFARI_ZONE_GATE diff --git a/data/maps/objects/SafariZoneNorth.asm b/data/maps/objects/SafariZoneNorth.asm index b783a926..e9c50acb 100644 --- a/data/maps/objects/SafariZoneNorth.asm +++ b/data/maps/objects/SafariZoneNorth.asm @@ -20,7 +20,7 @@ SafariZoneNorth_Object: bg_event 26, 28, 7 ; SafariZoneNorthText7 def_object_events - object_event 25, 1, SPRITE_POKE_BALL, STAY, NONE, 1, PROTEIN - object_event 19, 7, SPRITE_POKE_BALL, STAY, NONE, 2, TM_SKULL_BASH + object_event 25, 1, SPRITE_POKE_BALL, STAY, NONE, 1, PROTEIN + object_event 19, 7, SPRITE_POKE_BALL, STAY, NONE, 2, TM_SKULL_BASH def_warps_to SAFARI_ZONE_NORTH diff --git a/data/maps/objects/SafariZoneNorthRestHouse.asm b/data/maps/objects/SafariZoneNorthRestHouse.asm index 4e178e99..1f5008a4 100644 --- a/data/maps/objects/SafariZoneNorthRestHouse.asm +++ b/data/maps/objects/SafariZoneNorthRestHouse.asm @@ -8,8 +8,8 @@ SafariZoneNorthRestHouse_Object: def_bg_events def_object_events - object_event 6, 3, SPRITE_SCIENTIST, WALK, LEFT_RIGHT, 1 ; person - object_event 3, 4, SPRITE_SAFARI_ZONE_WORKER, STAY, NONE, 2 ; person - object_event 1, 5, SPRITE_GENTLEMAN, WALK, UP_DOWN, 3 ; person + object_event 6, 3, SPRITE_SCIENTIST, WALK, LEFT_RIGHT, 1 ; person + object_event 3, 4, SPRITE_SAFARI_ZONE_WORKER, STAY, NONE, 2 ; person + object_event 1, 5, SPRITE_GENTLEMAN, WALK, UP_DOWN, 3 ; person def_warps_to SAFARI_ZONE_NORTH_REST_HOUSE diff --git a/data/maps/objects/SafariZoneSecretHouse.asm b/data/maps/objects/SafariZoneSecretHouse.asm index 439f4a95..2459611c 100644 --- a/data/maps/objects/SafariZoneSecretHouse.asm +++ b/data/maps/objects/SafariZoneSecretHouse.asm @@ -8,6 +8,6 @@ SafariZoneSecretHouse_Object: def_bg_events def_object_events - object_event 3, 3, SPRITE_FISHING_GURU, STAY, DOWN, 1 ; person + object_event 3, 3, SPRITE_FISHING_GURU, STAY, DOWN, 1 ; person def_warps_to SAFARI_ZONE_SECRET_HOUSE diff --git a/data/maps/objects/SafariZoneWest.asm b/data/maps/objects/SafariZoneWest.asm index 0ceb8fe9..b75f824d 100644 --- a/data/maps/objects/SafariZoneWest.asm +++ b/data/maps/objects/SafariZoneWest.asm @@ -18,9 +18,9 @@ SafariZoneWest_Object: bg_event 24, 22, 8 ; SafariZoneWestText8 def_object_events - object_event 8, 20, SPRITE_POKE_BALL, STAY, NONE, 1, MAX_POTION - object_event 9, 7, SPRITE_POKE_BALL, STAY, NONE, 2, TM_DOUBLE_TEAM + object_event 8, 20, SPRITE_POKE_BALL, STAY, NONE, 1, MAX_POTION + object_event 9, 7, SPRITE_POKE_BALL, STAY, NONE, 2, TM_DOUBLE_TEAM object_event 18, 18, SPRITE_POKE_BALL, STAY, NONE, 3, MAX_REVIVE - object_event 19, 7, SPRITE_POKE_BALL, STAY, NONE, 4, GOLD_TEETH + object_event 19, 7, SPRITE_POKE_BALL, STAY, NONE, 4, GOLD_TEETH def_warps_to SAFARI_ZONE_WEST diff --git a/data/maps/objects/SafariZoneWestRestHouse.asm b/data/maps/objects/SafariZoneWestRestHouse.asm index 654c8913..f7349815 100644 --- a/data/maps/objects/SafariZoneWestRestHouse.asm +++ b/data/maps/objects/SafariZoneWestRestHouse.asm @@ -8,8 +8,8 @@ SafariZoneWestRestHouse_Object: def_bg_events def_object_events - object_event 4, 4, SPRITE_SCIENTIST, WALK, ANY_DIR, 1 ; person - object_event 0, 2, SPRITE_COOLTRAINER_M, STAY, RIGHT, 2 ; person - object_event 6, 2, SPRITE_ERIKA, STAY, DOWN, 3 ; person + object_event 4, 4, SPRITE_SCIENTIST, WALK, ANY_DIR, 1 ; person + object_event 0, 2, SPRITE_COOLTRAINER_M, STAY, RIGHT, 2 ; person + object_event 6, 2, SPRITE_ERIKA, STAY, DOWN, 3 ; person def_warps_to SAFARI_ZONE_WEST_REST_HOUSE diff --git a/data/maps/objects/SaffronCity.asm b/data/maps/objects/SaffronCity.asm index c09a44de..4c11417a 100644 --- a/data/maps/objects/SaffronCity.asm +++ b/data/maps/objects/SaffronCity.asm @@ -24,19 +24,19 @@ SaffronCity_Object: bg_event 1, 19, 25 ; SaffronCityText25 def_object_events - object_event 7, 6, SPRITE_ROCKET, STAY, NONE, 1 ; person - object_event 20, 8, SPRITE_ROCKET, WALK, LEFT_RIGHT, 2 ; person - object_event 34, 4, SPRITE_ROCKET, STAY, NONE, 3 ; person + object_event 7, 6, SPRITE_ROCKET, STAY, NONE, 1 ; person + object_event 20, 8, SPRITE_ROCKET, WALK, LEFT_RIGHT, 2 ; person + object_event 34, 4, SPRITE_ROCKET, STAY, NONE, 3 ; person object_event 13, 12, SPRITE_ROCKET, STAY, NONE, 4 ; person object_event 11, 25, SPRITE_ROCKET, WALK, LEFT_RIGHT, 5 ; person object_event 32, 13, SPRITE_ROCKET, WALK, LEFT_RIGHT, 6 ; person object_event 18, 30, SPRITE_ROCKET, WALK, LEFT_RIGHT, 7 ; person - object_event 8, 14, SPRITE_SCIENTIST, WALK, ANY_DIR, 8 ; person + object_event 8, 14, SPRITE_SCIENTIST, WALK, ANY_DIR, 8 ; person object_event 23, 23, SPRITE_SILPH_WORKER, STAY, NONE, 9 ; person object_event 17, 30, SPRITE_ERIKA, WALK, LEFT_RIGHT, 10 ; person object_event 30, 12, SPRITE_GENTLEMAN, STAY, DOWN, 11 ; person object_event 31, 12, SPRITE_BIRD, STAY, DOWN, 12 ; person - object_event 18, 8, SPRITE_ROCKER, STAY, UP, 13 ; person + object_event 18, 8, SPRITE_ROCKER, STAY, UP, 13 ; person object_event 18, 22, SPRITE_ROCKET, STAY, DOWN, 14 ; person object_event 19, 22, SPRITE_ROCKET, STAY, DOWN, 15 ; person diff --git a/data/maps/objects/SaffronGym.asm b/data/maps/objects/SaffronGym.asm index c5d2f8dd..a8e3da1c 100644 --- a/data/maps/objects/SaffronGym.asm +++ b/data/maps/objects/SaffronGym.asm @@ -38,14 +38,14 @@ SaffronGym_Object: def_bg_events def_object_events - object_event 9, 8, SPRITE_GIRL, STAY, DOWN, 1, OPP_SABRINA, 1 - object_event 10, 1, SPRITE_CHANNELER, STAY, DOWN, 2, OPP_CHANNELER, 22 - object_event 17, 1, SPRITE_YOUNGSTER, STAY, DOWN, 3, OPP_PSYCHIC_TR, 1 - object_event 3, 7, SPRITE_CHANNELER, STAY, DOWN, 4, OPP_CHANNELER, 23 - object_event 17, 7, SPRITE_YOUNGSTER, STAY, DOWN, 5, OPP_PSYCHIC_TR, 2 - object_event 3, 13, SPRITE_CHANNELER, STAY, DOWN, 6, OPP_CHANNELER, 24 + object_event 9, 8, SPRITE_GIRL, STAY, DOWN, 1, OPP_SABRINA, 1 + object_event 10, 1, SPRITE_CHANNELER, STAY, DOWN, 2, OPP_CHANNELER, 22 + object_event 17, 1, SPRITE_YOUNGSTER, STAY, DOWN, 3, OPP_PSYCHIC_TR, 1 + object_event 3, 7, SPRITE_CHANNELER, STAY, DOWN, 4, OPP_CHANNELER, 23 + object_event 17, 7, SPRITE_YOUNGSTER, STAY, DOWN, 5, OPP_PSYCHIC_TR, 2 + object_event 3, 13, SPRITE_CHANNELER, STAY, DOWN, 6, OPP_CHANNELER, 24 object_event 17, 13, SPRITE_YOUNGSTER, STAY, DOWN, 7, OPP_PSYCHIC_TR, 3 - object_event 3, 1, SPRITE_YOUNGSTER, STAY, DOWN, 8, OPP_PSYCHIC_TR, 4 + object_event 3, 1, SPRITE_YOUNGSTER, STAY, DOWN, 8, OPP_PSYCHIC_TR, 4 object_event 10, 15, SPRITE_GYM_GUIDE, STAY, DOWN, 9 ; person def_warps_to SAFFRON_GYM diff --git a/data/maps/objects/SaffronMart.asm b/data/maps/objects/SaffronMart.asm index 9e7e345a..972032ac 100644 --- a/data/maps/objects/SaffronMart.asm +++ b/data/maps/objects/SaffronMart.asm @@ -8,8 +8,8 @@ SaffronMart_Object: def_bg_events def_object_events - object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, 1 ; person - object_event 4, 2, SPRITE_SUPER_NERD, STAY, NONE, 2 ; person - object_event 6, 5, SPRITE_COOLTRAINER_F, WALK, ANY_DIR, 3 ; person + object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, 1 ; person + object_event 4, 2, SPRITE_SUPER_NERD, STAY, NONE, 2 ; person + object_event 6, 5, SPRITE_COOLTRAINER_F, WALK, ANY_DIR, 3 ; person def_warps_to SAFFRON_MART diff --git a/data/maps/objects/SaffronPidgeyHouse.asm b/data/maps/objects/SaffronPidgeyHouse.asm index e2b0fa72..cd37ffc1 100644 --- a/data/maps/objects/SaffronPidgeyHouse.asm +++ b/data/maps/objects/SaffronPidgeyHouse.asm @@ -8,9 +8,9 @@ SaffronPidgeyHouse_Object: def_bg_events def_object_events - object_event 2, 3, SPRITE_BRUNETTE_GIRL, STAY, RIGHT, 1 ; person - object_event 0, 4, SPRITE_BIRD, WALK, UP_DOWN, 2 ; person - object_event 4, 1, SPRITE_YOUNGSTER, STAY, DOWN, 3 ; person - object_event 3, 3, SPRITE_PAPER, STAY, NONE, 4 ; person + object_event 2, 3, SPRITE_BRUNETTE_GIRL, STAY, RIGHT, 1 ; person + object_event 0, 4, SPRITE_BIRD, WALK, UP_DOWN, 2 ; person + object_event 4, 1, SPRITE_YOUNGSTER, STAY, DOWN, 3 ; person + object_event 3, 3, SPRITE_PAPER, STAY, NONE, 4 ; person def_warps_to SAFFRON_PIDGEY_HOUSE diff --git a/data/maps/objects/SaffronPokecenter.asm b/data/maps/objects/SaffronPokecenter.asm index eb03932c..d3f6af7f 100644 --- a/data/maps/objects/SaffronPokecenter.asm +++ b/data/maps/objects/SaffronPokecenter.asm @@ -8,9 +8,9 @@ SaffronPokecenter_Object: def_bg_events def_object_events - object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person - object_event 5, 5, SPRITE_BEAUTY, STAY, NONE, 2 ; person - object_event 8, 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 5, 5, SPRITE_BEAUTY, STAY, NONE, 2 ; person + object_event 8, 3, SPRITE_GENTLEMAN, STAY, DOWN, 3 ; person + object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person def_warps_to SAFFRON_POKECENTER diff --git a/data/maps/objects/SeafoamIslands1F.asm b/data/maps/objects/SeafoamIslands1F.asm index db6b5056..f82c397f 100644 --- a/data/maps/objects/SeafoamIslands1F.asm +++ b/data/maps/objects/SeafoamIslands1F.asm @@ -14,7 +14,7 @@ SeafoamIslands1F_Object: def_object_events object_event 18, 10, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person - object_event 26, 7, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person + object_event 26, 7, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person def_warps_to SEAFOAM_ISLANDS_1F diff --git a/data/maps/objects/SeafoamIslandsB1F.asm b/data/maps/objects/SeafoamIslandsB1F.asm index 7a631653..6e3ed1f7 100644 --- a/data/maps/objects/SeafoamIslandsB1F.asm +++ b/data/maps/objects/SeafoamIslandsB1F.asm @@ -13,7 +13,7 @@ SeafoamIslandsB1F_Object: def_bg_events def_object_events - object_event 17, 6, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person - object_event 22, 6, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person + object_event 17, 6, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person + object_event 22, 6, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person def_warps_to SEAFOAM_ISLANDS_B1F diff --git a/data/maps/objects/SeafoamIslandsB2F.asm b/data/maps/objects/SeafoamIslandsB2F.asm index f152eb97..e0894b20 100644 --- a/data/maps/objects/SeafoamIslandsB2F.asm +++ b/data/maps/objects/SeafoamIslandsB2F.asm @@ -13,7 +13,7 @@ SeafoamIslandsB2F_Object: def_bg_events def_object_events - object_event 18, 6, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person - object_event 23, 6, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person + object_event 18, 6, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person + object_event 23, 6, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person def_warps_to SEAFOAM_ISLANDS_B2F diff --git a/data/maps/objects/SeafoamIslandsB3F.asm b/data/maps/objects/SeafoamIslandsB3F.asm index 530b7b7e..0ff64bd1 100644 --- a/data/maps/objects/SeafoamIslandsB3F.asm +++ b/data/maps/objects/SeafoamIslandsB3F.asm @@ -13,11 +13,11 @@ SeafoamIslandsB3F_Object: def_bg_events def_object_events - object_event 5, 14, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person - object_event 3, 15, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person - object_event 8, 14, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person - object_event 9, 14, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 4 ; person - object_event 18, 6, SPRITE_BOULDER, STAY, NONE, 5 ; person - object_event 19, 6, SPRITE_BOULDER, STAY, NONE, 6 ; person + object_event 5, 14, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person + object_event 3, 15, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person + object_event 8, 14, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person + object_event 9, 14, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 4 ; person + object_event 18, 6, SPRITE_BOULDER, STAY, NONE, 5 ; person + object_event 19, 6, SPRITE_BOULDER, STAY, NONE, 6 ; person def_warps_to SEAFOAM_ISLANDS_B3F diff --git a/data/maps/objects/SeafoamIslandsB4F.asm b/data/maps/objects/SeafoamIslandsB4F.asm index 602fcda3..500f185d 100644 --- a/data/maps/objects/SeafoamIslandsB4F.asm +++ b/data/maps/objects/SeafoamIslandsB4F.asm @@ -12,8 +12,8 @@ SeafoamIslandsB4F_Object: bg_event 23, 1, 5 ; SeafoamIslands5Text5 def_object_events - object_event 4, 15, SPRITE_BOULDER, STAY, NONE, 1 ; person - object_event 5, 15, SPRITE_BOULDER, STAY, NONE, 2 ; person - object_event 6, 1, SPRITE_BIRD, STAY, DOWN, 3, ARTICUNO, 50 + object_event 4, 15, SPRITE_BOULDER, STAY, NONE, 1 ; person + object_event 5, 15, SPRITE_BOULDER, STAY, NONE, 2 ; person + object_event 6, 1, SPRITE_BIRD, STAY, DOWN, 3, ARTICUNO, 50 def_warps_to SEAFOAM_ISLANDS_B4F diff --git a/data/maps/objects/SilphCo10F.asm b/data/maps/objects/SilphCo10F.asm index 031713e9..4747cbef 100644 --- a/data/maps/objects/SilphCo10F.asm +++ b/data/maps/objects/SilphCo10F.asm @@ -12,11 +12,11 @@ SilphCo10F_Object: def_bg_events def_object_events - object_event 1, 9, SPRITE_ROCKET, STAY, RIGHT, 1, OPP_ROCKET, 39 - object_event 10, 2, SPRITE_SCIENTIST, STAY, LEFT, 2, OPP_SCIENTIST, 11 - object_event 9, 15, SPRITE_ERIKA, WALK, ANY_DIR, 3 ; person - object_event 2, 12, SPRITE_POKE_BALL, STAY, NONE, 4, TM_EARTHQUAKE - object_event 4, 14, SPRITE_POKE_BALL, STAY, NONE, 5, RARE_CANDY - object_event 5, 11, SPRITE_POKE_BALL, STAY, NONE, 6, CARBOS + object_event 1, 9, SPRITE_ROCKET, STAY, RIGHT, 1, OPP_ROCKET, 39 + object_event 10, 2, SPRITE_SCIENTIST, STAY, LEFT, 2, OPP_SCIENTIST, 11 + object_event 9, 15, SPRITE_ERIKA, WALK, ANY_DIR, 3 ; person + object_event 2, 12, SPRITE_POKE_BALL, STAY, NONE, 4, TM_EARTHQUAKE + object_event 4, 14, SPRITE_POKE_BALL, STAY, NONE, 5, RARE_CANDY + object_event 5, 11, SPRITE_POKE_BALL, STAY, NONE, 6, CARBOS def_warps_to SILPH_CO_10F diff --git a/data/maps/objects/SilphCo11F.asm b/data/maps/objects/SilphCo11F.asm index dc7cd526..83b726f5 100644 --- a/data/maps/objects/SilphCo11F.asm +++ b/data/maps/objects/SilphCo11F.asm @@ -10,10 +10,10 @@ SilphCo11F_Object: def_bg_events def_object_events - object_event 7, 5, SPRITE_SILPH_PRESIDENT, STAY, DOWN, 1 ; person - object_event 10, 5, SPRITE_BEAUTY, STAY, DOWN, 2 ; person - object_event 6, 9, SPRITE_GIOVANNI, STAY, DOWN, 3, OPP_GIOVANNI, 2 - object_event 3, 16, SPRITE_ROCKET, STAY, UP, 4, OPP_ROCKET, 41 - object_event 15, 9, SPRITE_ROCKET, STAY, UP, 5, OPP_ROCKET, 40 + object_event 7, 5, SPRITE_SILPH_PRESIDENT, STAY, DOWN, 1 ; person + object_event 10, 5, SPRITE_BEAUTY, STAY, DOWN, 2 ; person + object_event 6, 9, SPRITE_GIOVANNI, STAY, DOWN, 3, OPP_GIOVANNI, 2 + object_event 3, 16, SPRITE_ROCKET, STAY, UP, 4, OPP_ROCKET, 41 + object_event 15, 9, SPRITE_ROCKET, STAY, UP, 5, OPP_ROCKET, 40 def_warps_to SILPH_CO_11F diff --git a/data/maps/objects/SilphCo1F.asm b/data/maps/objects/SilphCo1F.asm index 23323e27..f3407c54 100644 --- a/data/maps/objects/SilphCo1F.asm +++ b/data/maps/objects/SilphCo1F.asm @@ -11,6 +11,6 @@ SilphCo1F_Object: def_bg_events def_object_events - object_event 4, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 1 ; person + object_event 4, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 1 ; person def_warps_to SILPH_CO_1F diff --git a/data/maps/objects/SilphCo2F.asm b/data/maps/objects/SilphCo2F.asm index b7a68c4e..b777cf52 100644 --- a/data/maps/objects/SilphCo2F.asm +++ b/data/maps/objects/SilphCo2F.asm @@ -13,10 +13,10 @@ SilphCo2F_Object: def_bg_events def_object_events - object_event 10, 1, SPRITE_ERIKA, STAY, UP, 1 ; person - object_event 5, 12, SPRITE_SCIENTIST, STAY, DOWN, 2, OPP_SCIENTIST, 2 + object_event 10, 1, SPRITE_ERIKA, STAY, UP, 1 ; person + object_event 5, 12, SPRITE_SCIENTIST, STAY, DOWN, 2, OPP_SCIENTIST, 2 object_event 24, 13, SPRITE_SCIENTIST, STAY, LEFT, 3, OPP_SCIENTIST, 3 object_event 16, 11, SPRITE_ROCKET, STAY, UP, 4, OPP_ROCKET, 23 - object_event 24, 7, SPRITE_ROCKET, STAY, UP, 5, OPP_ROCKET, 24 + object_event 24, 7, SPRITE_ROCKET, STAY, UP, 5, OPP_ROCKET, 24 def_warps_to SILPH_CO_2F diff --git a/data/maps/objects/SilphCo3F.asm b/data/maps/objects/SilphCo3F.asm index 5f37ed91..06b4c3e9 100644 --- a/data/maps/objects/SilphCo3F.asm +++ b/data/maps/objects/SilphCo3F.asm @@ -16,9 +16,9 @@ SilphCo3F_Object: def_bg_events def_object_events - object_event 24, 8, SPRITE_SILPH_WORKER, STAY, NONE, 1 ; person - object_event 20, 7, SPRITE_ROCKET, STAY, LEFT, 2, OPP_ROCKET, 25 - object_event 7, 9, SPRITE_SCIENTIST, STAY, DOWN, 3, OPP_SCIENTIST, 4 - object_event 8, 5, SPRITE_POKE_BALL, STAY, NONE, 4, HYPER_POTION + object_event 24, 8, SPRITE_SILPH_WORKER, STAY, NONE, 1 ; person + object_event 20, 7, SPRITE_ROCKET, STAY, LEFT, 2, OPP_ROCKET, 25 + object_event 7, 9, SPRITE_SCIENTIST, STAY, DOWN, 3, OPP_SCIENTIST, 4 + object_event 8, 5, SPRITE_POKE_BALL, STAY, NONE, 4, HYPER_POTION def_warps_to SILPH_CO_3F diff --git a/data/maps/objects/SilphCo4F.asm b/data/maps/objects/SilphCo4F.asm index 0b6ae7d4..987451fc 100644 --- a/data/maps/objects/SilphCo4F.asm +++ b/data/maps/objects/SilphCo4F.asm @@ -13,12 +13,12 @@ SilphCo4F_Object: def_bg_events def_object_events - object_event 6, 2, SPRITE_SILPH_WORKER, STAY, NONE, 1 ; person - object_event 9, 14, SPRITE_ROCKET, STAY, RIGHT, 2, OPP_ROCKET, 26 - object_event 14, 6, SPRITE_SCIENTIST, STAY, LEFT, 3, OPP_SCIENTIST, 5 + object_event 6, 2, SPRITE_SILPH_WORKER, STAY, NONE, 1 ; person + object_event 9, 14, SPRITE_ROCKET, STAY, RIGHT, 2, OPP_ROCKET, 26 + object_event 14, 6, SPRITE_SCIENTIST, STAY, LEFT, 3, OPP_SCIENTIST, 5 object_event 26, 10, SPRITE_ROCKET, STAY, UP, 4, OPP_ROCKET, 27 - object_event 3, 9, SPRITE_POKE_BALL, STAY, NONE, 5, FULL_HEAL - object_event 4, 7, SPRITE_POKE_BALL, STAY, NONE, 6, MAX_REVIVE - object_event 5, 8, SPRITE_POKE_BALL, STAY, NONE, 7, ESCAPE_ROPE + object_event 3, 9, SPRITE_POKE_BALL, STAY, NONE, 5, FULL_HEAL + object_event 4, 7, SPRITE_POKE_BALL, STAY, NONE, 6, MAX_REVIVE + object_event 5, 8, SPRITE_POKE_BALL, STAY, NONE, 7, ESCAPE_ROPE def_warps_to SILPH_CO_4F diff --git a/data/maps/objects/SilphCo5F.asm b/data/maps/objects/SilphCo5F.asm index 1f8bffd6..ff41bc29 100644 --- a/data/maps/objects/SilphCo5F.asm +++ b/data/maps/objects/SilphCo5F.asm @@ -13,16 +13,16 @@ SilphCo5F_Object: def_bg_events def_object_events - object_event 13, 9, SPRITE_SILPH_WORKER, STAY, NONE, 1 ; person - object_event 8, 16, SPRITE_ROCKET, STAY, RIGHT, 2, OPP_ROCKET, 28 - object_event 8, 3, SPRITE_SCIENTIST, STAY, RIGHT, 3, OPP_SCIENTIST, 6 + object_event 13, 9, SPRITE_SILPH_WORKER, STAY, NONE, 1 ; person + object_event 8, 16, SPRITE_ROCKET, STAY, RIGHT, 2, OPP_ROCKET, 28 + object_event 8, 3, SPRITE_SCIENTIST, STAY, RIGHT, 3, OPP_SCIENTIST, 6 object_event 18, 10, SPRITE_ROCKER, STAY, UP, 4, OPP_JUGGLER, 1 - object_event 28, 4, SPRITE_ROCKET, STAY, UP, 5, OPP_ROCKET, 29 - object_event 2, 13, SPRITE_POKE_BALL, STAY, NONE, 6, TM_TAKE_DOWN - object_event 4, 6, SPRITE_POKE_BALL, STAY, NONE, 7, PROTEIN + object_event 28, 4, SPRITE_ROCKET, STAY, UP, 5, OPP_ROCKET, 29 + object_event 2, 13, SPRITE_POKE_BALL, STAY, NONE, 6, TM_TAKE_DOWN + object_event 4, 6, SPRITE_POKE_BALL, STAY, NONE, 7, PROTEIN object_event 21, 16, SPRITE_POKE_BALL, STAY, NONE, 8, CARD_KEY object_event 22, 12, SPRITE_CLIPBOARD, STAY, NONE, 9 ; person object_event 25, 10, SPRITE_CLIPBOARD, STAY, NONE, 10 ; person - object_event 24, 6, SPRITE_CLIPBOARD, STAY, NONE, 11 ; person + object_event 24, 6, SPRITE_CLIPBOARD, STAY, NONE, 11 ; person def_warps_to SILPH_CO_5F diff --git a/data/maps/objects/SilphCo6F.asm b/data/maps/objects/SilphCo6F.asm index a0f2339b..e2914018 100644 --- a/data/maps/objects/SilphCo6F.asm +++ b/data/maps/objects/SilphCo6F.asm @@ -11,15 +11,15 @@ SilphCo6F_Object: def_bg_events def_object_events - object_event 10, 6, SPRITE_SILPH_WORKER, STAY, NONE, 1 ; person - object_event 20, 6, SPRITE_SILPH_WORKER, STAY, NONE, 2 ; person - object_event 21, 6, SPRITE_ERIKA, STAY, DOWN, 3 ; person + object_event 10, 6, SPRITE_SILPH_WORKER, STAY, NONE, 1 ; person + object_event 20, 6, SPRITE_SILPH_WORKER, STAY, NONE, 2 ; person + object_event 21, 6, SPRITE_ERIKA, STAY, DOWN, 3 ; person object_event 11, 10, SPRITE_ERIKA, STAY, RIGHT, 4 ; person object_event 18, 13, SPRITE_SILPH_WORKER, STAY, UP, 5 ; person - object_event 17, 3, SPRITE_ROCKET, STAY, RIGHT, 6, OPP_ROCKET, 30 - object_event 7, 8, SPRITE_SCIENTIST, STAY, DOWN, 7, OPP_SCIENTIST, 7 + object_event 17, 3, SPRITE_ROCKET, STAY, RIGHT, 6, OPP_ROCKET, 30 + object_event 7, 8, SPRITE_SCIENTIST, STAY, DOWN, 7, OPP_SCIENTIST, 7 object_event 14, 15, SPRITE_ROCKET, STAY, LEFT, 8, OPP_ROCKET, 31 - object_event 3, 12, SPRITE_POKE_BALL, STAY, NONE, 9, HP_UP - object_event 2, 15, SPRITE_POKE_BALL, STAY, NONE, 10, X_ACCURACY + object_event 3, 12, SPRITE_POKE_BALL, STAY, NONE, 9, HP_UP + object_event 2, 15, SPRITE_POKE_BALL, STAY, NONE, 10, X_ACCURACY def_warps_to SILPH_CO_6F diff --git a/data/maps/objects/SilphCo7F.asm b/data/maps/objects/SilphCo7F.asm index 7855516c..d6dfeffe 100644 --- a/data/maps/objects/SilphCo7F.asm +++ b/data/maps/objects/SilphCo7F.asm @@ -12,16 +12,16 @@ SilphCo7F_Object: def_bg_events def_object_events - object_event 1, 5, SPRITE_SILPH_WORKER, STAY, NONE, 1 ; person + object_event 1, 5, SPRITE_SILPH_WORKER, STAY, NONE, 1 ; person object_event 13, 13, SPRITE_SILPH_WORKER, STAY, UP, 2 ; person - object_event 7, 10, SPRITE_SILPH_WORKER, STAY, NONE, 3 ; person - object_event 10, 8, SPRITE_ERIKA, STAY, NONE, 4 ; person - object_event 13, 1, SPRITE_ROCKET, STAY, DOWN, 5, OPP_ROCKET, 32 - object_event 2, 13, SPRITE_SCIENTIST, STAY, DOWN, 6, OPP_SCIENTIST, 8 - object_event 20, 2, SPRITE_ROCKET, STAY, LEFT, 7, OPP_ROCKET, 33 + object_event 7, 10, SPRITE_SILPH_WORKER, STAY, NONE, 3 ; person + object_event 10, 8, SPRITE_ERIKA, STAY, NONE, 4 ; person + object_event 13, 1, SPRITE_ROCKET, STAY, DOWN, 5, OPP_ROCKET, 32 + object_event 2, 13, SPRITE_SCIENTIST, STAY, DOWN, 6, OPP_SCIENTIST, 8 + object_event 20, 2, SPRITE_ROCKET, STAY, LEFT, 7, OPP_ROCKET, 33 object_event 19, 14, SPRITE_ROCKET, STAY, RIGHT, 8, OPP_ROCKET, 34 - object_event 3, 7, SPRITE_BLUE, STAY, UP, 9 ; person - object_event 1, 9, SPRITE_POKE_BALL, STAY, NONE, 10, CALCIUM + object_event 3, 7, SPRITE_BLUE, STAY, UP, 9 ; person + object_event 1, 9, SPRITE_POKE_BALL, STAY, NONE, 10, CALCIUM object_event 24, 11, SPRITE_POKE_BALL, STAY, NONE, 11, TM_SWORDS_DANCE def_warps_to SILPH_CO_7F diff --git a/data/maps/objects/SilphCo8F.asm b/data/maps/objects/SilphCo8F.asm index f6ea58ae..fcf6e28b 100644 --- a/data/maps/objects/SilphCo8F.asm +++ b/data/maps/objects/SilphCo8F.asm @@ -13,9 +13,9 @@ SilphCo8F_Object: def_bg_events def_object_events - object_event 4, 2, SPRITE_SILPH_WORKER, STAY, NONE, 1 ; person - object_event 19, 2, SPRITE_ROCKET, STAY, LEFT, 2, OPP_ROCKET, 35 - object_event 10, 2, SPRITE_SCIENTIST, STAY, DOWN, 3, OPP_SCIENTIST, 9 + object_event 4, 2, SPRITE_SILPH_WORKER, STAY, NONE, 1 ; person + object_event 19, 2, SPRITE_ROCKET, STAY, LEFT, 2, OPP_ROCKET, 35 + object_event 10, 2, SPRITE_SCIENTIST, STAY, DOWN, 3, OPP_SCIENTIST, 9 object_event 12, 15, SPRITE_ROCKET, STAY, RIGHT, 4, OPP_ROCKET, 36 def_warps_to SILPH_CO_8F diff --git a/data/maps/objects/SilphCo9F.asm b/data/maps/objects/SilphCo9F.asm index cf55b5aa..3897162e 100644 --- a/data/maps/objects/SilphCo9F.asm +++ b/data/maps/objects/SilphCo9F.asm @@ -11,8 +11,8 @@ SilphCo9F_Object: def_bg_events def_object_events - object_event 3, 14, SPRITE_NURSE, STAY, DOWN, 1 ; person - object_event 2, 4, SPRITE_ROCKET, STAY, UP, 2, OPP_ROCKET, 37 + object_event 3, 14, SPRITE_NURSE, STAY, DOWN, 1 ; person + object_event 2, 4, SPRITE_ROCKET, STAY, UP, 2, OPP_ROCKET, 37 object_event 21, 13, SPRITE_SCIENTIST, STAY, DOWN, 3, OPP_SCIENTIST, 10 object_event 13, 16, SPRITE_ROCKET, STAY, UP, 4, OPP_ROCKET, 38 diff --git a/data/maps/objects/TradeCenter.asm b/data/maps/objects/TradeCenter.asm index b8dd3ff5..9bc1f72d 100644 --- a/data/maps/objects/TradeCenter.asm +++ b/data/maps/objects/TradeCenter.asm @@ -6,6 +6,6 @@ TradeCenter_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 TRADE_CENTER diff --git a/data/maps/objects/UndergroundPathRoute5.asm b/data/maps/objects/UndergroundPathRoute5.asm index a5c6286f..209054f7 100644 --- a/data/maps/objects/UndergroundPathRoute5.asm +++ b/data/maps/objects/UndergroundPathRoute5.asm @@ -9,6 +9,6 @@ UndergroundPathRoute5_Object: def_bg_events def_object_events - object_event 2, 3, SPRITE_LITTLE_GIRL, STAY, NONE, 1 ; person + object_event 2, 3, SPRITE_LITTLE_GIRL, STAY, NONE, 1 ; person def_warps_to UNDERGROUND_PATH_ROUTE_5 diff --git a/data/maps/objects/UndergroundPathRoute6.asm b/data/maps/objects/UndergroundPathRoute6.asm index 67fac094..7961e08d 100644 --- a/data/maps/objects/UndergroundPathRoute6.asm +++ b/data/maps/objects/UndergroundPathRoute6.asm @@ -9,6 +9,6 @@ UndergroundPathRoute6_Object: def_bg_events def_object_events - object_event 2, 3, SPRITE_GIRL, STAY, NONE, 1 ; person + object_event 2, 3, SPRITE_GIRL, STAY, NONE, 1 ; person def_warps_to UNDERGROUND_PATH_ROUTE_6 diff --git a/data/maps/objects/UndergroundPathRoute7.asm b/data/maps/objects/UndergroundPathRoute7.asm index 75d0c8b4..d377d507 100644 --- a/data/maps/objects/UndergroundPathRoute7.asm +++ b/data/maps/objects/UndergroundPathRoute7.asm @@ -9,6 +9,6 @@ UndergroundPathRoute7_Object: def_bg_events def_object_events - object_event 2, 4, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, 1 ; person + object_event 2, 4, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, 1 ; person def_warps_to UNDERGROUND_PATH_ROUTE_7 diff --git a/data/maps/objects/UndergroundPathRoute7Copy.asm b/data/maps/objects/UndergroundPathRoute7Copy.asm index 20d9c0ee..f0841cfa 100644 --- a/data/maps/objects/UndergroundPathRoute7Copy.asm +++ b/data/maps/objects/UndergroundPathRoute7Copy.asm @@ -9,7 +9,7 @@ UndergroundPathRoute7Copy_Object: def_bg_events def_object_events - object_event 3, 2, SPRITE_GIRL, STAY, NONE, 1 ; person - object_event 2, 4, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, 2 ; person + object_event 3, 2, SPRITE_GIRL, STAY, NONE, 1 ; person + object_event 2, 4, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, 2 ; person def_warps_to UNDERGROUND_PATH_ROUTE_7_COPY diff --git a/data/maps/objects/UndergroundPathRoute8.asm b/data/maps/objects/UndergroundPathRoute8.asm index aadef04c..35094344 100644 --- a/data/maps/objects/UndergroundPathRoute8.asm +++ b/data/maps/objects/UndergroundPathRoute8.asm @@ -9,6 +9,6 @@ UndergroundPathRoute8_Object: def_bg_events def_object_events - object_event 3, 4, SPRITE_GIRL, STAY, NONE, 1 ; person + object_event 3, 4, SPRITE_GIRL, STAY, NONE, 1 ; person def_warps_to UNDERGROUND_PATH_ROUTE_8 diff --git a/data/maps/objects/VermilionCity.asm b/data/maps/objects/VermilionCity.asm index c30d43ba..75b53b56 100644 --- a/data/maps/objects/VermilionCity.asm +++ b/data/maps/objects/VermilionCity.asm @@ -22,11 +22,11 @@ VermilionCity_Object: bg_event 29, 15, 13 ; VermilionCityText13 def_object_events - object_event 19, 7, SPRITE_BEAUTY, WALK, LEFT_RIGHT, 1 ; person - object_event 14, 6, SPRITE_GAMBLER, STAY, NONE, 2 ; person + object_event 19, 7, SPRITE_BEAUTY, WALK, LEFT_RIGHT, 1 ; person + object_event 14, 6, SPRITE_GAMBLER, STAY, NONE, 2 ; person object_event 19, 30, SPRITE_SAILOR, STAY, UP, 3 ; person - object_event 30, 7, SPRITE_GAMBLER, STAY, NONE, 4 ; person - object_event 29, 9, SPRITE_MONSTER, WALK, UP_DOWN, 5 ; person + object_event 30, 7, SPRITE_GAMBLER, STAY, NONE, 4 ; person + object_event 29, 9, SPRITE_MONSTER, WALK, UP_DOWN, 5 ; person object_event 25, 27, SPRITE_SAILOR, WALK, LEFT_RIGHT, 6 ; person def_warps_to VERMILION_CITY diff --git a/data/maps/objects/VermilionGym.asm b/data/maps/objects/VermilionGym.asm index 234b78c7..27e773f7 100644 --- a/data/maps/objects/VermilionGym.asm +++ b/data/maps/objects/VermilionGym.asm @@ -8,10 +8,10 @@ VermilionGym_Object: def_bg_events def_object_events - object_event 5, 1, SPRITE_ROCKER, STAY, DOWN, 1, OPP_LT_SURGE, 1 - object_event 9, 6, SPRITE_GENTLEMAN, STAY, LEFT, 2, OPP_GENTLEMAN, 3 - object_event 3, 8, SPRITE_SUPER_NERD, STAY, LEFT, 3, OPP_ROCKER, 1 - object_event 0, 10, SPRITE_SAILOR, STAY, RIGHT, 4, OPP_SAILOR, 8 - object_event 4, 14, SPRITE_GYM_GUIDE, STAY, DOWN, 5 ; person + object_event 5, 1, SPRITE_ROCKER, STAY, DOWN, 1, OPP_LT_SURGE, 1 + object_event 9, 6, SPRITE_GENTLEMAN, STAY, LEFT, 2, OPP_GENTLEMAN, 3 + object_event 3, 8, SPRITE_SUPER_NERD, STAY, LEFT, 3, OPP_ROCKER, 1 + object_event 0, 10, SPRITE_SAILOR, STAY, RIGHT, 4, OPP_SAILOR, 8 + object_event 4, 14, SPRITE_GYM_GUIDE, STAY, DOWN, 5 ; person def_warps_to VERMILION_GYM diff --git a/data/maps/objects/VermilionMart.asm b/data/maps/objects/VermilionMart.asm index 7f6b4404..7d6075ce 100644 --- a/data/maps/objects/VermilionMart.asm +++ b/data/maps/objects/VermilionMart.asm @@ -8,8 +8,8 @@ VermilionMart_Object: def_bg_events def_object_events - object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, 1 ; person - object_event 5, 6, SPRITE_COOLTRAINER_M, STAY, NONE, 2 ; person - object_event 3, 3, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, 3 ; person + object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, 1 ; person + object_event 5, 6, SPRITE_COOLTRAINER_M, STAY, NONE, 2 ; person + object_event 3, 3, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, 3 ; person def_warps_to VERMILION_MART diff --git a/data/maps/objects/VermilionOldRodHouse.asm b/data/maps/objects/VermilionOldRodHouse.asm index 8ab9d7c9..e960663e 100644 --- a/data/maps/objects/VermilionOldRodHouse.asm +++ b/data/maps/objects/VermilionOldRodHouse.asm @@ -8,6 +8,6 @@ VermilionOldRodHouse_Object: def_bg_events def_object_events - object_event 2, 4, SPRITE_FISHING_GURU, STAY, RIGHT, 1 ; person + object_event 2, 4, SPRITE_FISHING_GURU, STAY, RIGHT, 1 ; person def_warps_to VERMILION_OLD_ROD_HOUSE diff --git a/data/maps/objects/VermilionPidgeyHouse.asm b/data/maps/objects/VermilionPidgeyHouse.asm index 7274f7fd..365e4afe 100644 --- a/data/maps/objects/VermilionPidgeyHouse.asm +++ b/data/maps/objects/VermilionPidgeyHouse.asm @@ -8,8 +8,8 @@ VermilionPidgeyHouse_Object: def_bg_events def_object_events - object_event 5, 3, SPRITE_YOUNGSTER, STAY, LEFT, 1 ; person - object_event 3, 5, SPRITE_BIRD, WALK, LEFT_RIGHT, 2 ; person - object_event 4, 3, SPRITE_PAPER, STAY, NONE, 3 ; person + object_event 5, 3, SPRITE_YOUNGSTER, STAY, LEFT, 1 ; person + object_event 3, 5, SPRITE_BIRD, WALK, LEFT_RIGHT, 2 ; person + object_event 4, 3, SPRITE_PAPER, STAY, NONE, 3 ; person def_warps_to VERMILION_PIDGEY_HOUSE diff --git a/data/maps/objects/VermilionPokecenter.asm b/data/maps/objects/VermilionPokecenter.asm index e9c22500..e0b5a72a 100644 --- a/data/maps/objects/VermilionPokecenter.asm +++ b/data/maps/objects/VermilionPokecenter.asm @@ -8,9 +8,9 @@ VermilionPokecenter_Object: def_bg_events def_object_events - object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person - object_event 10, 5, SPRITE_FISHING_GURU, STAY, NONE, 2 ; person - object_event 5, 4, SPRITE_SAILOR, 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 10, 5, SPRITE_FISHING_GURU, STAY, NONE, 2 ; person + object_event 5, 4, SPRITE_SAILOR, STAY, NONE, 3 ; person + object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person def_warps_to VERMILION_POKECENTER diff --git a/data/maps/objects/VermilionTradeHouse.asm b/data/maps/objects/VermilionTradeHouse.asm index 2f4b2b00..48d6d77f 100644 --- a/data/maps/objects/VermilionTradeHouse.asm +++ b/data/maps/objects/VermilionTradeHouse.asm @@ -8,6 +8,6 @@ VermilionTradeHouse_Object: def_bg_events def_object_events - object_event 3, 5, SPRITE_LITTLE_GIRL, STAY, UP, 1 ; person + object_event 3, 5, SPRITE_LITTLE_GIRL, STAY, UP, 1 ; person def_warps_to VERMILION_TRADE_HOUSE diff --git a/data/maps/objects/VictoryRoad1F.asm b/data/maps/objects/VictoryRoad1F.asm index c1f92163..7a4f0c2a 100644 --- a/data/maps/objects/VictoryRoad1F.asm +++ b/data/maps/objects/VictoryRoad1F.asm @@ -9,12 +9,12 @@ VictoryRoad1F_Object: def_bg_events def_object_events - object_event 7, 5, SPRITE_COOLTRAINER_F, STAY, RIGHT, 1, OPP_COOLTRAINER_F, 5 - object_event 3, 2, SPRITE_COOLTRAINER_M, STAY, DOWN, 2, OPP_COOLTRAINER_M, 5 - object_event 11, 0, SPRITE_POKE_BALL, STAY, NONE, 3, TM_SKY_ATTACK - object_event 9, 2, SPRITE_POKE_BALL, STAY, NONE, 4, RARE_CANDY - object_event 5, 15, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 5 ; person - object_event 14, 2, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 6 ; person - object_event 2, 10, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person + object_event 7, 5, SPRITE_COOLTRAINER_F, STAY, RIGHT, 1, OPP_COOLTRAINER_F, 5 + object_event 3, 2, SPRITE_COOLTRAINER_M, STAY, DOWN, 2, OPP_COOLTRAINER_M, 5 + object_event 11, 0, SPRITE_POKE_BALL, STAY, NONE, 3, TM_SKY_ATTACK + object_event 9, 2, SPRITE_POKE_BALL, STAY, NONE, 4, RARE_CANDY + object_event 5, 15, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 5 ; person + object_event 14, 2, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 6 ; person + object_event 2, 10, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person def_warps_to VICTORY_ROAD_1F diff --git a/data/maps/objects/VictoryRoad2F.asm b/data/maps/objects/VictoryRoad2F.asm index bb8c137b..ce225067 100644 --- a/data/maps/objects/VictoryRoad2F.asm +++ b/data/maps/objects/VictoryRoad2F.asm @@ -13,18 +13,18 @@ VictoryRoad2F_Object: def_bg_events def_object_events - object_event 12, 9, SPRITE_HIKER, STAY, LEFT, 1, OPP_BLACKBELT, 9 + object_event 12, 9, SPRITE_HIKER, STAY, LEFT, 1, OPP_BLACKBELT, 9 object_event 21, 13, SPRITE_SUPER_NERD, STAY, LEFT, 2, OPP_JUGGLER, 2 - object_event 19, 8, SPRITE_COOLTRAINER_M, STAY, DOWN, 3, OPP_TAMER, 5 - object_event 4, 2, SPRITE_SUPER_NERD, STAY, DOWN, 4, OPP_POKEMANIAC, 6 - object_event 26, 3, SPRITE_SUPER_NERD, STAY, LEFT, 5, OPP_JUGGLER, 5 - object_event 11, 5, SPRITE_BIRD, STAY, UP, 6, MOLTRES, 50 - object_event 27, 5, SPRITE_POKE_BALL, STAY, NONE, 7, TM_SUBMISSION - object_event 18, 9, SPRITE_POKE_BALL, STAY, NONE, 8, FULL_HEAL - object_event 9, 11, SPRITE_POKE_BALL, STAY, NONE, 9, TM_MEGA_KICK - object_event 11, 0, SPRITE_POKE_BALL, STAY, NONE, 10, GUARD_SPEC - object_event 4, 14, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 11 ; person - object_event 5, 5, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 12 ; person + object_event 19, 8, SPRITE_COOLTRAINER_M, STAY, DOWN, 3, OPP_TAMER, 5 + object_event 4, 2, SPRITE_SUPER_NERD, STAY, DOWN, 4, OPP_POKEMANIAC, 6 + object_event 26, 3, SPRITE_SUPER_NERD, STAY, LEFT, 5, OPP_JUGGLER, 5 + object_event 11, 5, SPRITE_BIRD, STAY, UP, 6, MOLTRES, 50 + object_event 27, 5, SPRITE_POKE_BALL, STAY, NONE, 7, TM_SUBMISSION + object_event 18, 9, SPRITE_POKE_BALL, STAY, NONE, 8, FULL_HEAL + object_event 9, 11, SPRITE_POKE_BALL, STAY, NONE, 9, TM_MEGA_KICK + object_event 11, 0, SPRITE_POKE_BALL, STAY, NONE, 10, GUARD_SPEC + object_event 4, 14, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 11 ; person + object_event 5, 5, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 12 ; person object_event 23, 16, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 13 ; person def_warps_to VICTORY_ROAD_2F diff --git a/data/maps/objects/VictoryRoad3F.asm b/data/maps/objects/VictoryRoad3F.asm index 2479ab5b..30fde3a2 100644 --- a/data/maps/objects/VictoryRoad3F.asm +++ b/data/maps/objects/VictoryRoad3F.asm @@ -10,13 +10,13 @@ VictoryRoad3F_Object: def_bg_events def_object_events - object_event 28, 5, SPRITE_COOLTRAINER_M, STAY, LEFT, 1, OPP_COOLTRAINER_M, 2 - object_event 7, 13, SPRITE_COOLTRAINER_F, STAY, RIGHT, 2, OPP_COOLTRAINER_F, 2 - object_event 6, 14, SPRITE_COOLTRAINER_M, STAY, LEFT, 3, OPP_COOLTRAINER_M, 3 - object_event 13, 3, SPRITE_COOLTRAINER_F, STAY, RIGHT, 4, OPP_COOLTRAINER_F, 3 - object_event 26, 5, SPRITE_POKE_BALL, STAY, NONE, 5, MAX_REVIVE - object_event 7, 7, SPRITE_POKE_BALL, STAY, NONE, 6, TM_EXPLOSION - object_event 22, 3, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person + object_event 28, 5, SPRITE_COOLTRAINER_M, STAY, LEFT, 1, OPP_COOLTRAINER_M, 2 + object_event 7, 13, SPRITE_COOLTRAINER_F, STAY, RIGHT, 2, OPP_COOLTRAINER_F, 2 + object_event 6, 14, SPRITE_COOLTRAINER_M, STAY, LEFT, 3, OPP_COOLTRAINER_M, 3 + object_event 13, 3, SPRITE_COOLTRAINER_F, STAY, RIGHT, 4, OPP_COOLTRAINER_F, 3 + object_event 26, 5, SPRITE_POKE_BALL, STAY, NONE, 5, MAX_REVIVE + object_event 7, 7, SPRITE_POKE_BALL, STAY, NONE, 6, TM_EXPLOSION + object_event 22, 3, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person object_event 13, 12, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 8 ; person object_event 24, 10, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 9 ; person object_event 22, 15, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 10 ; person diff --git a/data/maps/objects/ViridianCity.asm b/data/maps/objects/ViridianCity.asm index 981765dd..46a68d19 100644 --- a/data/maps/objects/ViridianCity.asm +++ b/data/maps/objects/ViridianCity.asm @@ -18,11 +18,11 @@ ViridianCity_Object: def_object_events object_event 13, 20, SPRITE_YOUNGSTER, WALK, ANY_DIR, 1 ; person - object_event 30, 8, SPRITE_GAMBLER, STAY, NONE, 2 ; person + object_event 30, 8, SPRITE_GAMBLER, STAY, NONE, 2 ; person object_event 30, 25, SPRITE_YOUNGSTER, WALK, ANY_DIR, 3 ; person - object_event 17, 9, SPRITE_GIRL, STAY, RIGHT, 4 ; person - object_event 18, 9, SPRITE_GAMBLER_ASLEEP, STAY, NONE, 5 ; person - object_event 6, 23, SPRITE_FISHER, STAY, DOWN, 6 ; person - object_event 17, 5, SPRITE_GAMBLER, WALK, LEFT_RIGHT, 7 ; person + object_event 17, 9, SPRITE_GIRL, STAY, RIGHT, 4 ; person + object_event 18, 9, SPRITE_GAMBLER_ASLEEP, STAY, NONE, 5 ; person + object_event 6, 23, SPRITE_FISHER, STAY, DOWN, 6 ; person + object_event 17, 5, SPRITE_GAMBLER, WALK, LEFT_RIGHT, 7 ; person def_warps_to VIRIDIAN_CITY diff --git a/data/maps/objects/ViridianForest.asm b/data/maps/objects/ViridianForest.asm index 87a93800..5f4cb2a6 100644 --- a/data/maps/objects/ViridianForest.asm +++ b/data/maps/objects/ViridianForest.asm @@ -21,10 +21,10 @@ ViridianForest_Object: object_event 16, 43, SPRITE_YOUNGSTER, STAY, NONE, 1 ; person object_event 30, 33, SPRITE_YOUNGSTER, STAY, LEFT, 2, OPP_BUG_CATCHER, 1 object_event 30, 19, SPRITE_YOUNGSTER, STAY, LEFT, 3, OPP_BUG_CATCHER, 2 - object_event 2, 18, SPRITE_YOUNGSTER, STAY, LEFT, 4, OPP_BUG_CATCHER, 3 + object_event 2, 18, SPRITE_YOUNGSTER, STAY, LEFT, 4, OPP_BUG_CATCHER, 3 object_event 25, 11, SPRITE_POKE_BALL, STAY, NONE, 5, ANTIDOTE object_event 12, 29, SPRITE_POKE_BALL, STAY, NONE, 6, POTION - object_event 1, 31, SPRITE_POKE_BALL, STAY, NONE, 7, POKE_BALL + object_event 1, 31, SPRITE_POKE_BALL, STAY, NONE, 7, POKE_BALL object_event 27, 40, SPRITE_YOUNGSTER, STAY, NONE, 8 ; person def_warps_to VIRIDIAN_FOREST diff --git a/data/maps/objects/ViridianForestNorthGate.asm b/data/maps/objects/ViridianForestNorthGate.asm index 28d91ebe..020f2f62 100644 --- a/data/maps/objects/ViridianForestNorthGate.asm +++ b/data/maps/objects/ViridianForestNorthGate.asm @@ -10,7 +10,7 @@ ViridianForestNorthGate_Object: def_bg_events def_object_events - object_event 3, 2, SPRITE_SUPER_NERD, STAY, NONE, 1 ; person - object_event 2, 5, SPRITE_GRAMPS, STAY, NONE, 2 ; person + object_event 3, 2, SPRITE_SUPER_NERD, STAY, NONE, 1 ; person + object_event 2, 5, SPRITE_GRAMPS, STAY, NONE, 2 ; person def_warps_to VIRIDIAN_FOREST_NORTH_GATE diff --git a/data/maps/objects/ViridianForestSouthGate.asm b/data/maps/objects/ViridianForestSouthGate.asm index 1ed22076..13517e0c 100644 --- a/data/maps/objects/ViridianForestSouthGate.asm +++ b/data/maps/objects/ViridianForestSouthGate.asm @@ -10,7 +10,7 @@ ViridianForestSouthGate_Object: def_bg_events def_object_events - object_event 8, 4, SPRITE_GIRL, STAY, LEFT, 1 ; person - object_event 2, 4, SPRITE_LITTLE_GIRL, WALK, UP_DOWN, 2 ; person + object_event 8, 4, SPRITE_GIRL, STAY, LEFT, 1 ; person + object_event 2, 4, SPRITE_LITTLE_GIRL, WALK, UP_DOWN, 2 ; person def_warps_to VIRIDIAN_FOREST_SOUTH_GATE diff --git a/data/maps/objects/ViridianGym.asm b/data/maps/objects/ViridianGym.asm index ead8b290..4b9a159e 100644 --- a/data/maps/objects/ViridianGym.asm +++ b/data/maps/objects/ViridianGym.asm @@ -8,16 +8,16 @@ ViridianGym_Object: def_bg_events def_object_events - object_event 2, 1, SPRITE_GIOVANNI, STAY, DOWN, 1, OPP_GIOVANNI, 3 - object_event 12, 7, SPRITE_COOLTRAINER_M, STAY, DOWN, 2, OPP_COOLTRAINER_M, 9 + object_event 2, 1, SPRITE_GIOVANNI, STAY, DOWN, 1, OPP_GIOVANNI, 3 + object_event 12, 7, SPRITE_COOLTRAINER_M, STAY, DOWN, 2, OPP_COOLTRAINER_M, 9 object_event 11, 11, SPRITE_HIKER, STAY, UP, 3, OPP_BLACKBELT, 6 - object_event 10, 7, SPRITE_ROCKER, STAY, DOWN, 4, OPP_TAMER, 3 - object_event 3, 7, SPRITE_HIKER, STAY, LEFT, 5, OPP_BLACKBELT, 7 - object_event 13, 5, SPRITE_COOLTRAINER_M, STAY, RIGHT, 6, OPP_COOLTRAINER_M, 10 - object_event 10, 1, SPRITE_HIKER, STAY, DOWN, 7, OPP_BLACKBELT, 8 - object_event 2, 16, SPRITE_ROCKER, STAY, RIGHT, 8, OPP_TAMER, 4 - object_event 6, 5, SPRITE_COOLTRAINER_M, STAY, DOWN, 9, OPP_COOLTRAINER_M, 1 + object_event 10, 7, SPRITE_ROCKER, STAY, DOWN, 4, OPP_TAMER, 3 + object_event 3, 7, SPRITE_HIKER, STAY, LEFT, 5, OPP_BLACKBELT, 7 + object_event 13, 5, SPRITE_COOLTRAINER_M, STAY, RIGHT, 6, OPP_COOLTRAINER_M, 10 + object_event 10, 1, SPRITE_HIKER, STAY, DOWN, 7, OPP_BLACKBELT, 8 + object_event 2, 16, SPRITE_ROCKER, STAY, RIGHT, 8, OPP_TAMER, 4 + object_event 6, 5, SPRITE_COOLTRAINER_M, STAY, DOWN, 9, OPP_COOLTRAINER_M, 1 object_event 16, 15, SPRITE_GYM_GUIDE, STAY, DOWN, 10 ; person - object_event 16, 9, SPRITE_POKE_BALL, STAY, NONE, 11, REVIVE + object_event 16, 9, SPRITE_POKE_BALL, STAY, NONE, 11, REVIVE def_warps_to VIRIDIAN_GYM diff --git a/data/maps/objects/ViridianMart.asm b/data/maps/objects/ViridianMart.asm index 80a6656c..8bb5d240 100644 --- a/data/maps/objects/ViridianMart.asm +++ b/data/maps/objects/ViridianMart.asm @@ -8,8 +8,8 @@ ViridianMart_Object: def_bg_events def_object_events - object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, 1 ; person - object_event 5, 5, SPRITE_YOUNGSTER, WALK, UP_DOWN, 2 ; person - object_event 3, 3, SPRITE_COOLTRAINER_M, STAY, NONE, 3 ; person + object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, 1 ; person + object_event 5, 5, SPRITE_YOUNGSTER, WALK, UP_DOWN, 2 ; person + object_event 3, 3, SPRITE_COOLTRAINER_M, STAY, NONE, 3 ; person def_warps_to VIRIDIAN_MART diff --git a/data/maps/objects/ViridianNicknameHouse.asm b/data/maps/objects/ViridianNicknameHouse.asm index 452f8cb5..9ace1faf 100644 --- a/data/maps/objects/ViridianNicknameHouse.asm +++ b/data/maps/objects/ViridianNicknameHouse.asm @@ -8,9 +8,9 @@ ViridianNicknameHouse_Object: def_bg_events def_object_events - object_event 5, 3, SPRITE_BALDING_GUY, STAY, NONE, 1 ; person - object_event 1, 4, SPRITE_LITTLE_GIRL, WALK, UP_DOWN, 2 ; person - object_event 5, 5, SPRITE_BIRD, WALK, LEFT_RIGHT, 3 ; person - object_event 4, 0, SPRITE_CLIPBOARD, STAY, NONE, 4 ; person + object_event 5, 3, SPRITE_BALDING_GUY, STAY, NONE, 1 ; person + object_event 1, 4, SPRITE_LITTLE_GIRL, WALK, UP_DOWN, 2 ; person + object_event 5, 5, SPRITE_BIRD, WALK, LEFT_RIGHT, 3 ; person + object_event 4, 0, SPRITE_CLIPBOARD, STAY, NONE, 4 ; person def_warps_to VIRIDIAN_NICKNAME_HOUSE diff --git a/data/maps/objects/ViridianPokecenter.asm b/data/maps/objects/ViridianPokecenter.asm index 90f5e144..ef3424f2 100644 --- a/data/maps/objects/ViridianPokecenter.asm +++ b/data/maps/objects/ViridianPokecenter.asm @@ -8,9 +8,9 @@ ViridianPokecenter_Object: def_bg_events def_object_events - object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person - object_event 10, 5, SPRITE_GENTLEMAN, WALK, UP_DOWN, 2 ; person - object_event 4, 3, SPRITE_COOLTRAINER_M, 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 10, 5, SPRITE_GENTLEMAN, WALK, UP_DOWN, 2 ; person + object_event 4, 3, SPRITE_COOLTRAINER_M, STAY, NONE, 3 ; person + object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person def_warps_to VIRIDIAN_POKECENTER diff --git a/data/maps/objects/ViridianSchoolHouse.asm b/data/maps/objects/ViridianSchoolHouse.asm index 43bbd27f..53909d7a 100644 --- a/data/maps/objects/ViridianSchoolHouse.asm +++ b/data/maps/objects/ViridianSchoolHouse.asm @@ -8,7 +8,7 @@ ViridianSchoolHouse_Object: def_bg_events def_object_events - object_event 3, 5, SPRITE_BRUNETTE_GIRL, STAY, UP, 1 ; person - object_event 4, 1, SPRITE_COOLTRAINER_F, STAY, DOWN, 2 ; person + object_event 3, 5, SPRITE_BRUNETTE_GIRL, STAY, UP, 1 ; person + object_event 4, 1, SPRITE_COOLTRAINER_F, STAY, DOWN, 2 ; person def_warps_to VIRIDIAN_SCHOOL_HOUSE diff --git a/data/maps/objects/WardensHouse.asm b/data/maps/objects/WardensHouse.asm index 9b66c464..46e1f35b 100644 --- a/data/maps/objects/WardensHouse.asm +++ b/data/maps/objects/WardensHouse.asm @@ -10,8 +10,8 @@ WardensHouse_Object: bg_event 5, 3, 5 ; FuchsiaHouse2Text5 def_object_events - object_event 2, 3, SPRITE_WARDEN, STAY, NONE, 1 ; person - object_event 8, 3, SPRITE_POKE_BALL, STAY, NONE, 2, RARE_CANDY - object_event 8, 4, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person + object_event 2, 3, SPRITE_WARDEN, STAY, NONE, 1 ; person + object_event 8, 3, SPRITE_POKE_BALL, STAY, NONE, 2, RARE_CANDY + object_event 8, 4, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person def_warps_to WARDENS_HOUSE |