diff options
Diffstat (limited to 'data/maps/objects')
60 files changed, 173 insertions, 130 deletions
diff --git a/data/maps/objects/BluesHouse.asm b/data/maps/objects/BluesHouse.asm index ac200b28..e043c160 100644 --- a/data/maps/objects/BluesHouse.asm +++ b/data/maps/objects/BluesHouse.asm @@ -8,7 +8,7 @@ BluesHouse_Object: def_bg_events def_object_events - object_event 2, 3, SPRITE_DAISY, STAY, RIGHT, 1 + object_event 2, 3, SPRITE_DAISY, STAY, RIGHT, 1, 0 object_event 6, 4, SPRITE_DAISY, WALK, UP_DOWN, 2, 0 object_event 3, 3, SPRITE_POKEDEX, STAY, NONE, 3, 0 diff --git a/data/maps/objects/CeladonPokecenter.asm b/data/maps/objects/CeladonPokecenter.asm index 40c466a0..9fd99153 100644 --- a/data/maps/objects/CeladonPokecenter.asm +++ b/data/maps/objects/CeladonPokecenter.asm @@ -9,8 +9,9 @@ CeladonPokecenter_Object: 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 7, 3, SPRITE_GENTLEMAN, STAY, DOWN, 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 4, 1, SPRITE_CHANSEY, STAY, DOWN, 5 ; person def_warps_to CELADON_POKECENTER diff --git a/data/maps/objects/CeruleanCave1F.asm b/data/maps/objects/CeruleanCave1F.asm index b858a40f..3f8ad3e1 100644 --- a/data/maps/objects/CeruleanCave1F.asm +++ b/data/maps/objects/CeruleanCave1F.asm @@ -15,8 +15,9 @@ 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 29, 16, SPRITE_POKE_BALL, STAY, NONE, 1, RARE_CANDY + object_event 7, 11, SPRITE_POKE_BALL, STAY, NONE, 2, MAX_ELIXER + object_event 29, 9, SPRITE_POKE_BALL, STAY, NONE, 3, MAX_REVIVE + object_event 18, 3, SPRITE_POKE_BALL, STAY, NONE, 4, ULTRA_BALL def_warps_to CERULEAN_CAVE_1F diff --git a/data/maps/objects/CeruleanCave2F.asm b/data/maps/objects/CeruleanCave2F.asm index 18765fe8..417c8abc 100644 --- a/data/maps/objects/CeruleanCave2F.asm +++ b/data/maps/objects/CeruleanCave2F.asm @@ -12,8 +12,9 @@ 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 0, 11, SPRITE_POKE_BALL, STAY, NONE, 1, RARE_CANDY + object_event 16, 7, SPRITE_POKE_BALL, STAY, NONE, 2, ULTRA_BALL + object_event 19, 11, SPRITE_POKE_BALL, STAY, NONE, 3, MAX_REVIVE + object_event 27, 9, SPRITE_POKE_BALL, STAY, NONE, 4, FULL_RESTORE def_warps_to CERULEAN_CAVE_2F diff --git a/data/maps/objects/CeruleanCaveB1F.asm b/data/maps/objects/CeruleanCaveB1F.asm index 5173fee6..8b10552f 100644 --- a/data/maps/objects/CeruleanCaveB1F.asm +++ b/data/maps/objects/CeruleanCaveB1F.asm @@ -8,7 +8,9 @@ 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 26, 1, SPRITE_POKE_BALL, STAY, NONE, 2, ULTRA_BALL + object_event 2, 13, SPRITE_POKE_BALL, STAY, NONE, 3, ULTRA_BALL + object_event 3, 13, SPRITE_POKE_BALL, STAY, NONE, 4, MAX_REVIVE + object_event 15, 3, SPRITE_POKE_BALL, STAY, NONE, 5, MAX_ELIXER def_warps_to CERULEAN_CAVE_B1F diff --git a/data/maps/objects/CeruleanCity.asm b/data/maps/objects/CeruleanCity.asm index 23863aa0..a709cccd 100644 --- a/data/maps/objects/CeruleanCity.asm +++ b/data/maps/objects/CeruleanCity.asm @@ -1,9 +1,9 @@ CeruleanCity_Object: - db $f ; border block + db $a ; border block def_warp_events warp_event 27, 11, CERULEAN_TRASHED_HOUSE, 1 - warp_event 13, 15, CERULEAN_TRADE_HOUSE, 1 + warp_event 13, 15, CERULEAN_MELANIES_HOUSE, 1 warp_event 19, 17, CERULEAN_POKECENTER, 1 warp_event 30, 19, CERULEAN_GYM, 1 warp_event 13, 25, BIKE_SHOP, 1 @@ -27,11 +27,11 @@ CeruleanCity_Object: 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 28, 12, SPRITE_GUARD, STAY, DOWN, 6 ; person + object_event 28, 12, SPRITE_OFFICER_JENNY, 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 28, 26, SPRITE_POKE_BALL, 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 27, 12, SPRITE_GUARD, STAY, DOWN, 11 ; person + object_event 27, 12, SPRITE_OFFICER_JENNY, STAY, DOWN, 11 ; person def_warps_to CERULEAN_CITY diff --git a/data/maps/objects/CeruleanMelaniesHouse.asm b/data/maps/objects/CeruleanMelaniesHouse.asm new file mode 100644 index 00000000..6cce0b1b --- /dev/null +++ b/data/maps/objects/CeruleanMelaniesHouse.asm @@ -0,0 +1,16 @@ +CeruleanMelaniesHouse_Object: + db $a ; border block + + def_warp_events + warp_event 2, 7, LAST_MAP, 2 + warp_event 3, 7, LAST_MAP, 2 + + def_bg_events + + def_object_events + object_event 3, 1, SPRITE_GIRL, STAY, DOWN, 1 ; person + object_event 4, 1, SPRITE_BULBASAUR, STAY, DOWN, 2 ; person + object_event 1, 4, SPRITE_ODDISH, STAY, NONE, 3 ; person + object_event 5, 3, SPRITE_SANDSHREW, STAY, LEFT, 4 ; person + + def_warps_to CERULEAN_MELANIES_HOUSE diff --git a/data/maps/objects/CeruleanPokecenter.asm b/data/maps/objects/CeruleanPokecenter.asm index eee0a0c6..491e1321 100644 --- a/data/maps/objects/CeruleanPokecenter.asm +++ b/data/maps/objects/CeruleanPokecenter.asm @@ -10,7 +10,8 @@ CeruleanPokecenter_Object: 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 4, 3, SPRITE_GENTLEMAN, STAY, UP, 3 ; person object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person + object_event 4, 1, SPRITE_CHANSEY, STAY, DOWN, 5 ; person def_warps_to CERULEAN_POKECENTER diff --git a/data/maps/objects/CeruleanTradeHouse.asm b/data/maps/objects/CeruleanTradeHouse.asm deleted file mode 100644 index 52984832..00000000 --- a/data/maps/objects/CeruleanTradeHouse.asm +++ /dev/null @@ -1,14 +0,0 @@ -CeruleanTradeHouse_Object: - db $a ; border block - - def_warp_events - warp_event 2, 7, LAST_MAP, 2 - warp_event 3, 7, LAST_MAP, 2 - - 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 - - def_warps_to CERULEAN_TRADE_HOUSE diff --git a/data/maps/objects/CinnabarGym.asm b/data/maps/objects/CinnabarGym.asm index a4ed8cda..6028b5f8 100644 --- a/data/maps/objects/CinnabarGym.asm +++ b/data/maps/objects/CinnabarGym.asm @@ -8,7 +8,7 @@ CinnabarGym_Object: def_bg_events def_object_events - object_event 3, 3, SPRITE_MIDDLE_AGED_MAN, STAY, DOWN, 1, OPP_BLAINE, 1 + object_event 3, 3, SPRITE_SILPH_PRESIDENT, 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 diff --git a/data/maps/objects/CinnabarPokecenter.asm b/data/maps/objects/CinnabarPokecenter.asm index 75d11926..638b71e3 100644 --- a/data/maps/objects/CinnabarPokecenter.asm +++ b/data/maps/objects/CinnabarPokecenter.asm @@ -12,5 +12,6 @@ CinnabarPokecenter_Object: 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 4, 1, SPRITE_CHANSEY, STAY, DOWN, 5 ; person def_warps_to CINNABAR_POKECENTER diff --git a/data/maps/objects/CopycatsHouse1F.asm b/data/maps/objects/CopycatsHouse1F.asm index 0a3705f4..3d6c3af1 100644 --- a/data/maps/objects/CopycatsHouse1F.asm +++ b/data/maps/objects/CopycatsHouse1F.asm @@ -11,6 +11,6 @@ CopycatsHouse1F_Object: 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 1, 4, SPRITE_CHANSEY, STAY, NONE, 3 ; person def_warps_to COPYCATS_HOUSE_1F diff --git a/data/maps/objects/FuchsiaCity.asm b/data/maps/objects/FuchsiaCity.asm index c8ff36e6..5f2790cd 100644 --- a/data/maps/objects/FuchsiaCity.asm +++ b/data/maps/objects/FuchsiaCity.asm @@ -33,7 +33,7 @@ FuchsiaCity_Object: 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 31, 5, SPRITE_CHANSEY, STAY, DOWN, 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 diff --git a/data/maps/objects/FuchsiaGym.asm b/data/maps/objects/FuchsiaGym.asm index 9c39cb5e..62a94376 100644 --- a/data/maps/objects/FuchsiaGym.asm +++ b/data/maps/objects/FuchsiaGym.asm @@ -8,7 +8,7 @@ FuchsiaGym_Object: def_bg_events def_object_events - object_event 4, 10, SPRITE_KOGA, STAY, DOWN, 1, OPP_KOGA, 1 + object_event 4, 10, SPRITE_SILPH_WORKER, 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 diff --git a/data/maps/objects/FuchsiaPokecenter.asm b/data/maps/objects/FuchsiaPokecenter.asm index 84404b09..87c5ba9f 100644 --- a/data/maps/objects/FuchsiaPokecenter.asm +++ b/data/maps/objects/FuchsiaPokecenter.asm @@ -9,8 +9,9 @@ FuchsiaPokecenter_Object: 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 4, 3, SPRITE_ROCKER, STAY, UP, 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 4, 1, SPRITE_CHANSEY, STAY, DOWN, 5 ; person def_warps_to FUCHSIA_POKECENTER diff --git a/data/maps/objects/GameCorner.asm b/data/maps/objects/GameCorner.asm index 2b4c8f72..8b8fb01c 100644 --- a/data/maps/objects/GameCorner.asm +++ b/data/maps/objects/GameCorner.asm @@ -18,8 +18,8 @@ GameCorner_Object: 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 14, 11, SPRITE_MIDDLE_AGED_MAN, STAY, LEFT, 9 ; person + object_event 17, 13, SPRITE_FISHING_GURU, STAY, RIGHT, 10 ; person object_event 9, 5, SPRITE_ROCKET, STAY, UP, 11, OPP_ROCKET, 7 def_warps_to GAME_CORNER diff --git a/data/maps/objects/IndigoPlateauLobby.asm b/data/maps/objects/IndigoPlateauLobby.asm index fd3d07ba..cb5ba186 100644 --- a/data/maps/objects/IndigoPlateauLobby.asm +++ b/data/maps/objects/IndigoPlateauLobby.asm @@ -14,5 +14,6 @@ IndigoPlateauLobby_Object: 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 8, 5, SPRITE_CHANSEY, STAY, DOWN, 6 ; person def_warps_to INDIGO_PLATEAU_LOBBY diff --git a/data/maps/objects/LavenderPokecenter.asm b/data/maps/objects/LavenderPokecenter.asm index 99c29528..7be79b45 100644 --- a/data/maps/objects/LavenderPokecenter.asm +++ b/data/maps/objects/LavenderPokecenter.asm @@ -10,7 +10,8 @@ LavenderPokecenter_Object: 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 10, 5, SPRITE_LITTLE_GIRL, WALK, LEFT_RIGHT, 3 ; person object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person + object_event 4, 1, SPRITE_CHANSEY, STAY, DOWN, 5 ; person def_warps_to LAVENDER_POKECENTER diff --git a/data/maps/objects/MtMoonB2F.asm b/data/maps/objects/MtMoonB2F.asm index 43c7db88..d38ee4d9 100644 --- a/data/maps/objects/MtMoonB2F.asm +++ b/data/maps/objects/MtMoonB2F.asm @@ -11,13 +11,14 @@ MtMoonB2F_Object: def_object_events 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 9, 3, SPRITE_JESSIE, STAY, LEFT, 2 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 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, 17, SPRITE_ROCKET, STAY, LEFT, 5, OPP_ROCKET, 1 + object_event 9, 4, SPRITE_JAMES, STAY, LEFT, 6 + object_event 12, 6, SPRITE_FOSSIL, STAY, NONE, 7 ; person + object_event 13, 6, SPRITE_FOSSIL, STAY, NONE, 8 ; person + object_event 25, 21, SPRITE_POKE_BALL, STAY, NONE, 9, HP_UP + object_event 29, 5, SPRITE_POKE_BALL, STAY, NONE, 10, TM_MEGA_PUNCH def_warps_to MT_MOON_B2F diff --git a/data/maps/objects/MtMoonPokecenter.asm b/data/maps/objects/MtMoonPokecenter.asm index 382c67dd..a198f566 100644 --- a/data/maps/objects/MtMoonPokecenter.asm +++ b/data/maps/objects/MtMoonPokecenter.asm @@ -14,5 +14,6 @@ MtMoonPokecenter_Object: 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 4, 1, SPRITE_CHANSEY, STAY, DOWN, 7 ; person def_warps_to MT_MOON_POKECENTER diff --git a/data/maps/objects/OaksLab.asm b/data/maps/objects/OaksLab.asm index 7fc869ef..7546e953 100644 --- a/data/maps/objects/OaksLab.asm +++ b/data/maps/objects/OaksLab.asm @@ -9,15 +9,13 @@ OaksLab_Object: 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 7, 3, SPRITE_POKE_BALL, STAY, NONE, 2 ; person + object_event 5, 2, SPRITE_OAK, STAY, DOWN, 3 ; person + object_event 2, 1, SPRITE_POKEDEX, STAY, NONE, 4 ; person + object_event 3, 1, SPRITE_POKEDEX, STAY, NONE, 5 ; person + object_event 5, 10, SPRITE_OAK, STAY, UP, 6 ; person + object_event 1, 9, SPRITE_GIRL, WALK, UP_DOWN, 7 ; person + object_event 2, 10, SPRITE_SCIENTIST, STAY, NONE, 8 ; person + object_event 8, 10, SPRITE_SCIENTIST, STAY, NONE, 9 ; person def_warps_to OAKS_LAB diff --git a/data/maps/objects/PalletTown.asm b/data/maps/objects/PalletTown.asm index 1343f0cd..a20baad0 100644 --- a/data/maps/objects/PalletTown.asm +++ b/data/maps/objects/PalletTown.asm @@ -13,7 +13,7 @@ PalletTown_Object: bg_event 11, 5, 7 ; PalletTownText7 def_object_events - object_event 8, 5, SPRITE_OAK, STAY, NONE, 1 ; person + object_event 10, 4, 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 diff --git a/data/maps/objects/PewterPokecenter.asm b/data/maps/objects/PewterPokecenter.asm index 9d9e8e58..1198daac 100644 --- a/data/maps/objects/PewterPokecenter.asm +++ b/data/maps/objects/PewterPokecenter.asm @@ -10,7 +10,9 @@ PewterPokecenter_Object: 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 1, 3, SPRITE_JIGGLYPUFF, STAY, DOWN, 3 ; person object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person + object_event 4, 3, SPRITE_COOLTRAINER_F, STAY, UP, 5 ; person + object_event 4, 1, SPRITE_CHANSEY, STAY, DOWN, 6 ; person def_warps_to PEWTER_POKECENTER diff --git a/data/maps/objects/PokemonFanClub.asm b/data/maps/objects/PokemonFanClub.asm index c7d815f2..e8e1707c 100644 --- a/data/maps/objects/PokemonFanClub.asm +++ b/data/maps/objects/PokemonFanClub.asm @@ -6,13 +6,11 @@ PokemonFanClub_Object: warp_event 3, 7, LAST_MAP, 2 def_bg_events - bg_event 1, 0, 7 ; FanClubText7 - 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 6, 4, SPRITE_CLEFAIRY, 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 diff --git a/data/maps/objects/PokemonTower7F.asm b/data/maps/objects/PokemonTower7F.asm index 328588ed..6125f870 100644 --- a/data/maps/objects/PokemonTower7F.asm +++ b/data/maps/objects/PokemonTower7F.asm @@ -7,9 +7,8 @@ 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 10, 8, SPRITE_JESSIE, STAY, DOWN, 1 + object_event 11, 8, SPRITE_JAMES, STAY, DOWN, 2 + object_event 10, 3, SPRITE_MR_FUJI, STAY, DOWN, 3 def_warps_to POKEMON_TOWER_7F diff --git a/data/maps/objects/RedsHouse2F.asm b/data/maps/objects/RedsHouse2F.asm index 4a193d35..03d98363 100644 --- a/data/maps/objects/RedsHouse2F.asm +++ b/data/maps/objects/RedsHouse2F.asm @@ -3,6 +3,12 @@ RedsHouse2F_Object: def_warp_events warp_event 7, 1, REDS_HOUSE_1F, 3 +IF DEF(_DEBUG) + warp_event 7, 2, MT_MOON_B2F, 4 + warp_event 7, 3, ROCKET_HIDEOUT_ELEVATOR, 1 + warp_event 7, 4, POKEMON_TOWER_7F, 1 + warp_event 7, 5, SILPH_CO_11F, 4 +ENDC def_bg_events diff --git a/data/maps/objects/RockTunnelPokecenter.asm b/data/maps/objects/RockTunnelPokecenter.asm index 27c22252..604bcdfb 100644 --- a/data/maps/objects/RockTunnelPokecenter.asm +++ b/data/maps/objects/RockTunnelPokecenter.asm @@ -9,8 +9,9 @@ RockTunnelPokecenter_Object: 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 7, 3, SPRITE_GENTLEMAN, STAY, DOWN, 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 4, 1, SPRITE_CHANSEY, STAY, DOWN, 5 ; person def_warps_to ROCK_TUNNEL_POKECENTER diff --git a/data/maps/objects/RocketHideoutB4F.asm b/data/maps/objects/RocketHideoutB4F.asm index ecae529c..2211d682 100644 --- a/data/maps/objects/RocketHideoutB4F.asm +++ b/data/maps/objects/RocketHideoutB4F.asm @@ -10,8 +10,8 @@ RocketHideoutB4F_Object: def_object_events 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 25, 10, SPRITE_JAMES, STAY, DOWN, 2 + object_event 24, 10, SPRITE_JESSIE, STAY, DOWN, 3 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 diff --git a/data/maps/objects/Route11.asm b/data/maps/objects/Route11.asm index 6238a067..a1635f46 100644 --- a/data/maps/objects/Route11.asm +++ b/data/maps/objects/Route11.asm @@ -3,9 +3,9 @@ Route11_Object: def_warp_events warp_event 49, 8, ROUTE_11_GATE_1F, 1 - warp_event 49, 9, ROUTE_11_GATE_1F, 2 + warp_event 49, 9, ROUTE_11_GATE_1F, 1 warp_event 58, 8, ROUTE_11_GATE_1F, 3 - warp_event 58, 9, ROUTE_11_GATE_1F, 4 + warp_event 58, 9, ROUTE_11_GATE_1F, 3 warp_event 4, 5, DIGLETTS_CAVE_ROUTE_11, 1 def_bg_events diff --git a/data/maps/objects/Route12.asm b/data/maps/objects/Route12.asm index e7fc92f1..596ddaf1 100644 --- a/data/maps/objects/Route12.asm +++ b/data/maps/objects/Route12.asm @@ -3,7 +3,7 @@ Route12_Object: def_warp_events warp_event 10, 15, ROUTE_12_GATE_1F, 1 - warp_event 11, 15, ROUTE_12_GATE_1F, 2 + warp_event 11, 15, ROUTE_12_GATE_1F, 1 warp_event 10, 21, ROUTE_12_GATE_1F, 3 warp_event 11, 77, ROUTE_12_SUPER_ROD_HOUSE, 1 diff --git a/data/maps/objects/Route15.asm b/data/maps/objects/Route15.asm index 93a74966..5513c27e 100644 --- a/data/maps/objects/Route15.asm +++ b/data/maps/objects/Route15.asm @@ -3,9 +3,9 @@ Route15_Object: def_warp_events warp_event 7, 8, ROUTE_15_GATE_1F, 1 - warp_event 7, 9, ROUTE_15_GATE_1F, 2 + warp_event 7, 9, ROUTE_15_GATE_1F, 1 warp_event 14, 8, ROUTE_15_GATE_1F, 3 - warp_event 14, 9, ROUTE_15_GATE_1F, 4 + warp_event 14, 9, ROUTE_15_GATE_1F, 3 def_bg_events bg_event 39, 9, 12 ; Route15Text12 diff --git a/data/maps/objects/Route16.asm b/data/maps/objects/Route16.asm index b1e62651..6680d1c4 100644 --- a/data/maps/objects/Route16.asm +++ b/data/maps/objects/Route16.asm @@ -3,13 +3,13 @@ Route16_Object: def_warp_events warp_event 17, 10, ROUTE_16_GATE_1F, 1 - warp_event 17, 11, ROUTE_16_GATE_1F, 2 + warp_event 17, 11, ROUTE_16_GATE_1F, 1 warp_event 24, 10, ROUTE_16_GATE_1F, 3 - warp_event 24, 11, ROUTE_16_GATE_1F, 4 + warp_event 24, 11, ROUTE_16_GATE_1F, 3 warp_event 17, 4, ROUTE_16_GATE_1F, 5 - warp_event 17, 5, ROUTE_16_GATE_1F, 6 + warp_event 17, 5, ROUTE_16_GATE_1F, 5 warp_event 24, 4, ROUTE_16_GATE_1F, 7 - warp_event 24, 5, ROUTE_16_GATE_1F, 8 + warp_event 24, 5, ROUTE_16_GATE_1F, 7 warp_event 7, 5, ROUTE_16_FLY_HOUSE, 1 def_bg_events diff --git a/data/maps/objects/Route18.asm b/data/maps/objects/Route18.asm index 102aa4c5..7555aa4f 100644 --- a/data/maps/objects/Route18.asm +++ b/data/maps/objects/Route18.asm @@ -3,9 +3,9 @@ Route18_Object: def_warp_events warp_event 33, 8, ROUTE_18_GATE_1F, 1 - warp_event 33, 9, ROUTE_18_GATE_1F, 2 + warp_event 33, 9, ROUTE_18_GATE_1F, 1 warp_event 40, 8, ROUTE_18_GATE_1F, 3 - warp_event 40, 9, ROUTE_18_GATE_1F, 4 + warp_event 40, 9, ROUTE_18_GATE_1F, 3 def_bg_events bg_event 43, 7, 4 ; Route18Text4 diff --git a/data/maps/objects/Route18Gate2F.asm b/data/maps/objects/Route18Gate2F.asm index 5a05f82b..45a0c38c 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_COOK, 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 90d253f4..fdb1fc5e 100644 --- a/data/maps/objects/Route19.asm +++ b/data/maps/objects/Route19.asm @@ -2,17 +2,18 @@ Route19_Object: db $43 ; border block def_warp_events + warp_event 5, 9, SUMMER_BEACH_HOUSE, 1 def_bg_events - bg_event 11, 9, 11 ; Route19Text11 + bg_event 11, 11, 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 9, 7, SPRITE_COOLTRAINER_M, STAY, RIGHT, 1, OPP_SWIMMER, 2 + object_event 12, 9, 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 16, 31, SPRITE_SWIMMER, STAY, UP, 5, OPP_SWIMMER, 6 - object_event 9, 11, SPRITE_SWIMMER, STAY, DOWN, 6, OPP_SWIMMER, 7 + object_event 9, 13, 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 diff --git a/data/maps/objects/Route2.asm b/data/maps/objects/Route2.asm index 6ff5c0c7..1915b2d3 100644 --- a/data/maps/objects/Route2.asm +++ b/data/maps/objects/Route2.asm @@ -8,6 +8,7 @@ Route2_Object: warp_event 16, 35, ROUTE_2_GATE, 2 warp_event 15, 39, ROUTE_2_GATE, 3 warp_event 3, 43, VIRIDIAN_FOREST_SOUTH_GATE, 3 + warp_event 17, 35, ROUTE_2_GATE, 2 def_bg_events bg_event 5, 65, 3 ; Route2Text3 diff --git a/data/maps/objects/Route22Gate.asm b/data/maps/objects/Route22Gate.asm index 086616ca..d2583a59 100644 --- a/data/maps/objects/Route22Gate.asm +++ b/data/maps/objects/Route22Gate.asm @@ -5,7 +5,7 @@ Route22Gate_Object: warp_event 4, 7, LAST_MAP, 1 warp_event 5, 7, LAST_MAP, 1 warp_event 4, 0, LAST_MAP, 1 - warp_event 5, 0, LAST_MAP, 2 + warp_event 5, 0, LAST_MAP, 1 def_bg_events diff --git a/data/maps/objects/Route24.asm b/data/maps/objects/Route24.asm index 80dca821..050b7060 100644 --- a/data/maps/objects/Route24.asm +++ b/data/maps/objects/Route24.asm @@ -14,5 +14,6 @@ Route24_Object: 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 6, 5, SPRITE_COOLTRAINER_M, STAY, DOWN, 9 def_warps_to ROUTE_24 diff --git a/data/maps/objects/Route5.asm b/data/maps/objects/Route5.asm index 2e91a7c6..f2b4b492 100644 --- a/data/maps/objects/Route5.asm +++ b/data/maps/objects/Route5.asm @@ -2,7 +2,7 @@ Route5_Object: db $a ; border block def_warp_events - warp_event 10, 29, ROUTE_5_GATE, 4 + warp_event 10, 29, ROUTE_5_GATE, 3 warp_event 9, 29, ROUTE_5_GATE, 3 warp_event 10, 33, ROUTE_5_GATE, 1 warp_event 17, 27, UNDERGROUND_PATH_ROUTE_5, 1 diff --git a/data/maps/objects/Route6.asm b/data/maps/objects/Route6.asm index 33748f0f..6501f8f6 100644 --- a/data/maps/objects/Route6.asm +++ b/data/maps/objects/Route6.asm @@ -11,8 +11,8 @@ Route6_Object: bg_event 19, 15, 7 ; Route6Text7 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 10, 21, SPRITE_COOLTRAINER_M, STAY, RIGHT, 1, OPP_JR_TRAINER_M, 10 + object_event 11, 21, SPRITE_COOLTRAINER_F, STAY, LEFT, 2, OPP_JR_TRAINER_F, 25 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 diff --git a/data/maps/objects/Route7.asm b/data/maps/objects/Route7.asm index ec5f2e8a..823400a7 100644 --- a/data/maps/objects/Route7.asm +++ b/data/maps/objects/Route7.asm @@ -3,9 +3,9 @@ Route7_Object: def_warp_events warp_event 18, 9, ROUTE_7_GATE, 3 - warp_event 18, 10, ROUTE_7_GATE, 4 + warp_event 18, 10, ROUTE_7_GATE, 3 warp_event 11, 9, ROUTE_7_GATE, 1 - warp_event 11, 10, ROUTE_7_GATE, 2 + warp_event 11, 10, ROUTE_7_GATE, 1 warp_event 5, 13, UNDERGROUND_PATH_ROUTE_7, 1 def_bg_events diff --git a/data/maps/objects/Route7Gate.asm b/data/maps/objects/Route7Gate.asm index 8cc58d9b..63c2a4af 100644 --- a/data/maps/objects/Route7Gate.asm +++ b/data/maps/objects/Route7Gate.asm @@ -4,7 +4,7 @@ Route7Gate_Object: def_warp_events warp_event 0, 3, LAST_MAP, 4 warp_event 0, 4, LAST_MAP, 4 - warp_event 5, 3, LAST_MAP, 1 + warp_event 5, 3, LAST_MAP, 2 warp_event 5, 4, LAST_MAP, 2 def_bg_events diff --git a/data/maps/objects/Route8.asm b/data/maps/objects/Route8.asm index 61faa47f..68914001 100644 --- a/data/maps/objects/Route8.asm +++ b/data/maps/objects/Route8.asm @@ -3,9 +3,9 @@ Route8_Object: def_warp_events warp_event 1, 9, ROUTE_8_GATE, 1 - warp_event 1, 10, ROUTE_8_GATE, 2 + warp_event 1, 10, ROUTE_8_GATE, 1 warp_event 8, 9, ROUTE_8_GATE, 3 - warp_event 8, 10, ROUTE_8_GATE, 4 + warp_event 8, 10, ROUTE_8_GATE, 3 warp_event 13, 3, UNDERGROUND_PATH_ROUTE_8, 1 def_bg_events diff --git a/data/maps/objects/Route8Gate.asm b/data/maps/objects/Route8Gate.asm index 47a24967..2737ca2e 100644 --- a/data/maps/objects/Route8Gate.asm +++ b/data/maps/objects/Route8Gate.asm @@ -2,9 +2,9 @@ Route8Gate_Object: db $a ; border block def_warp_events - warp_event 0, 3, LAST_MAP, 1 + warp_event 0, 3, LAST_MAP, 2 warp_event 0, 4, LAST_MAP, 2 - warp_event 5, 3, LAST_MAP, 3 + warp_event 5, 3, LAST_MAP, 4 warp_event 5, 4, LAST_MAP, 4 def_bg_events diff --git a/data/maps/objects/Route9.asm b/data/maps/objects/Route9.asm index a9be69be..b799debe 100644 --- a/data/maps/objects/Route9.asm +++ b/data/maps/objects/Route9.asm @@ -8,7 +8,7 @@ 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 24, 7, SPRITE_COOLTRAINER_M, STAY, LEFT, 2, OPP_YOUNGSTER, 14 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 diff --git a/data/maps/objects/SSAnne1FRooms.asm b/data/maps/objects/SSAnne1FRooms.asm index 6192c31a..40e80a57 100644 --- a/data/maps/objects/SSAnne1FRooms.asm +++ b/data/maps/objects/SSAnne1FRooms.asm @@ -19,7 +19,7 @@ SSAnne1FRooms_Object: 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 3, 11, SPRITE_JIGGLYPUFF, 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/SaffronCity.asm b/data/maps/objects/SaffronCity.asm index 2fddfd5e..84c76e70 100644 --- a/data/maps/objects/SaffronCity.asm +++ b/data/maps/objects/SaffronCity.asm @@ -38,6 +38,5 @@ SaffronCity_Object: object_event 31, 12, SPRITE_BIRD, STAY, DOWN, 12 ; 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 def_warps_to SAFFRON_CITY diff --git a/data/maps/objects/SaffronGym.asm b/data/maps/objects/SaffronGym.asm index 7c6e83e5..d3606fd8 100644 --- a/data/maps/objects/SaffronGym.asm +++ b/data/maps/objects/SaffronGym.asm @@ -38,7 +38,7 @@ SaffronGym_Object: def_bg_events def_object_events - object_event 9, 8, SPRITE_GIRL, STAY, DOWN, 1, OPP_SABRINA, 1 + object_event 9, 8, SPRITE_COOLTRAINER_F, 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 diff --git a/data/maps/objects/SaffronPokecenter.asm b/data/maps/objects/SaffronPokecenter.asm index ca94086b..fdbe026e 100644 --- a/data/maps/objects/SaffronPokecenter.asm +++ b/data/maps/objects/SaffronPokecenter.asm @@ -12,5 +12,6 @@ SaffronPokecenter_Object: 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 4, 1, SPRITE_CHANSEY, STAY, DOWN, 5 ; person def_warps_to SAFFRON_POKECENTER diff --git a/data/maps/objects/SeafoamIslands1F.asm b/data/maps/objects/SeafoamIslands1F.asm index f5e3347b..5de6418a 100644 --- a/data/maps/objects/SeafoamIslands1F.asm +++ b/data/maps/objects/SeafoamIslands1F.asm @@ -17,7 +17,3 @@ SeafoamIslands1F_Object: object_event 26, 7, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person def_warps_to SEAFOAM_ISLANDS_1F - - ; holes - warp_to 17, 6, SEAFOAM_ISLANDS_1F_WIDTH - warp_to 24, 6, SEAFOAM_ISLANDS_1F_WIDTH diff --git a/data/maps/objects/SilphCo11F.asm b/data/maps/objects/SilphCo11F.asm index 9651c32b..54484a05 100644 --- a/data/maps/objects/SilphCo11F.asm +++ b/data/maps/objects/SilphCo11F.asm @@ -13,7 +13,8 @@ SilphCo11F_Object: 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 2, 8, SPRITE_JAMES, STAY, UP, 4 object_event 15, 9, SPRITE_ROCKET, STAY, UP, 5, OPP_ROCKET, 40 + object_event 3, 8, SPRITE_JESSIE, STAY, UP, 6 def_warps_to SILPH_CO_11F diff --git a/data/maps/objects/SummerBeachHouse.asm b/data/maps/objects/SummerBeachHouse.asm new file mode 100644 index 00000000..1cb01869 --- /dev/null +++ b/data/maps/objects/SummerBeachHouse.asm @@ -0,0 +1,18 @@ +SummerBeachHouse_Object: + db $a ; border block + + def_warp_events + warp_event 2, 7, LAST_MAP, 1 + warp_event 3, 7, LAST_MAP, 1 + + def_bg_events + bg_event 3, 0, 3 ; SummerBeachHouseSign1Text + bg_event 7, 0, 4 ; SummerBeachHouseSign2Text + bg_event 11, 0, 5 ; SummerBeachHouseSign3Text + bg_event 13, 1, 6 ; SummerBeachHouseSign4Text + + def_object_events + object_event 2, 3, SPRITE_FISHING_GURU, STAY, DOWN, 1 ; person + object_event 5, 3, SPRITE_PIKACHU, WALK, 1, 2 ; person + + def_warps_to SUMMER_BEACH_HOUSE diff --git a/data/maps/objects/VermilionCity.asm b/data/maps/objects/VermilionCity.asm index ca652afc..37ec534e 100644 --- a/data/maps/objects/VermilionCity.asm +++ b/data/maps/objects/VermilionCity.asm @@ -13,20 +13,21 @@ VermilionCity_Object: warp_event 7, 3, VERMILION_OLD_ROD_HOUSE, 1 def_bg_events - bg_event 27, 3, 7 ; VermilionCityText7 - bg_event 37, 13, 8 ; VermilionCityText8 - bg_event 24, 13, 9 ; MartSignText - bg_event 12, 3, 10 ; PokeCenterSignText - bg_event 7, 13, 11 ; VermilionCityText11 - bg_event 7, 19, 12 ; VermilionCityText12 - bg_event 29, 15, 13 ; VermilionCityText13 + bg_event 27, 3, 8 ; VermilionCityText7 + bg_event 37, 13, 9 ; VermilionCityText8 + bg_event 24, 13, 10 ; MartSignText + bg_event 12, 3, 11 ; PokeCenterSignText + bg_event 7, 13, 12 ; VermilionCityText11 + bg_event 7, 19, 13 ; VermilionCityText12 + bg_event 29, 15, 14 ; VermilionCityText13 def_object_events - object_event 19, 7, SPRITE_BEAUTY, WALK, LEFT_RIGHT, 1 ; person + object_event 19, 7, SPRITE_COOLTRAINER_F, 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 25, 27, SPRITE_SAILOR, WALK, LEFT_RIGHT, 6 ; person + object_event 19, 15, SPRITE_OFFICER_JENNY, STAY, NONE, 7 ; person def_warps_to VERMILION_CITY diff --git a/data/maps/objects/VermilionPokecenter.asm b/data/maps/objects/VermilionPokecenter.asm index f88552b4..9ba5da69 100644 --- a/data/maps/objects/VermilionPokecenter.asm +++ b/data/maps/objects/VermilionPokecenter.asm @@ -12,5 +12,6 @@ VermilionPokecenter_Object: 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 4, 1, SPRITE_CHANSEY, STAY, DOWN, 5 ; person def_warps_to VERMILION_POKECENTER diff --git a/data/maps/objects/VermilionTradeHouse.asm b/data/maps/objects/VermilionTradeHouse.asm index 299e5093..1502818a 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_GENTLEMAN, STAY, UP, 1 ; person def_warps_to VERMILION_TRADE_HOUSE diff --git a/data/maps/objects/ViridianCity.asm b/data/maps/objects/ViridianCity.asm index 56bf7390..873460ca 100644 --- a/data/maps/objects/ViridianCity.asm +++ b/data/maps/objects/ViridianCity.asm @@ -9,12 +9,12 @@ ViridianCity_Object: warp_event 32, 7, VIRIDIAN_GYM, 1 def_bg_events - bg_event 17, 17, 8 ; ViridianCityText8 - bg_event 19, 1, 9 ; ViridianCityText9 - bg_event 21, 29, 10 ; ViridianCityText10 - bg_event 30, 19, 11 ; MartSignText - bg_event 24, 25, 12 ; PokeCenterSignText - bg_event 27, 7, 13 ; ViridianCityText13 + bg_event 17, 17, 9 ; ViridianCityText8 + bg_event 19, 1, 10 ; ViridianCityText9 + bg_event 21, 29, 11 ; ViridianCityText10 + bg_event 30, 19, 12 ; MartSignText + bg_event 24, 25, 13 ; PokeCenterSignText + bg_event 27, 7, 14 ; ViridianCityText13 def_object_events object_event 13, 20, SPRITE_YOUNGSTER, WALK, ANY_DIR, 1 ; person @@ -24,5 +24,6 @@ ViridianCity_Object: 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 18, 9, SPRITE_GAMBLER, STAY, NONE, 8 def_warps_to VIRIDIAN_CITY diff --git a/data/maps/objects/ViridianForest.asm b/data/maps/objects/ViridianForest.asm index 7a0a644c..037c4f7e 100644 --- a/data/maps/objects/ViridianForest.asm +++ b/data/maps/objects/ViridianForest.asm @@ -3,28 +3,30 @@ ViridianForest_Object: def_warp_events warp_event 1, 0, VIRIDIAN_FOREST_NORTH_GATE, 3 - warp_event 2, 0, VIRIDIAN_FOREST_NORTH_GATE, 4 + warp_event 2, 0, VIRIDIAN_FOREST_NORTH_GATE, 3 warp_event 15, 47, VIRIDIAN_FOREST_SOUTH_GATE, 2 warp_event 16, 47, VIRIDIAN_FOREST_SOUTH_GATE, 2 warp_event 17, 47, VIRIDIAN_FOREST_SOUTH_GATE, 2 warp_event 18, 47, VIRIDIAN_FOREST_SOUTH_GATE, 2 def_bg_events - bg_event 24, 40, 9 ; ViridianForestText9 - bg_event 16, 32, 10 ; ViridianForestText10 - bg_event 26, 17, 11 ; ViridianForestText11 - bg_event 4, 24, 12 ; ViridianForestText12 - bg_event 18, 45, 13 ; ViridianForestText13 - bg_event 2, 1, 14 ; ViridianForestText14 + bg_event 24, 40, 11 ; ViridianForestText9 + bg_event 16, 32, 12 ; ViridianForestText10 + bg_event 26, 17, 13 ; ViridianForestText11 + bg_event 4, 24, 14 ; ViridianForestText12 + bg_event 18, 45, 15 ; ViridianForestText13 + bg_event 2, 1, 16 ; ViridianForestText14 def_object_events 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 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 27, 40, SPRITE_YOUNGSTER, STAY, NONE, 8 ; person + object_event 2, 41, SPRITE_COOLTRAINER_F, STAY, NONE, 5, OPP_LASS, 19 + object_event 13, 17, SPRITE_YOUNGSTER, STAY, RIGHT, 6, OPP_BUG_CATCHER, 15 + object_event 25, 11, SPRITE_POKE_BALL, STAY, NONE, 7, POTION + object_event 12, 29, SPRITE_POKE_BALL, STAY, NONE, 8, POTION + object_event 1, 31, SPRITE_POKE_BALL, STAY, NONE, 9, POKE_BALL + object_event 27, 40, SPRITE_YOUNGSTER, STAY, NONE, 10 ; person def_warps_to VIRIDIAN_FOREST diff --git a/data/maps/objects/ViridianForestSouthGate.asm b/data/maps/objects/ViridianForestSouthGate.asm index e5dad809..a8be02c6 100644 --- a/data/maps/objects/ViridianForestSouthGate.asm +++ b/data/maps/objects/ViridianForestSouthGate.asm @@ -3,7 +3,7 @@ ViridianForestSouthGate_Object: def_warp_events warp_event 4, 0, VIRIDIAN_FOREST, 4 - warp_event 5, 0, VIRIDIAN_FOREST, 5 + warp_event 5, 0, VIRIDIAN_FOREST, 4 warp_event 4, 7, LAST_MAP, 6 warp_event 5, 7, LAST_MAP, 6 diff --git a/data/maps/objects/ViridianPokecenter.asm b/data/maps/objects/ViridianPokecenter.asm index 618f5798..495ad4a7 100644 --- a/data/maps/objects/ViridianPokecenter.asm +++ b/data/maps/objects/ViridianPokecenter.asm @@ -10,7 +10,8 @@ ViridianPokecenter_Object: 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 4, 3, SPRITE_COOLTRAINER_M, STAY, UP, 3 ; person object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person + object_event 4, 1, SPRITE_CHANSEY, STAY, DOWN, 5 ; person def_warps_to VIRIDIAN_POKECENTER diff --git a/data/maps/objects/ViridianSchoolHouse.asm b/data/maps/objects/ViridianSchoolHouse.asm index 745bf72b..4a938967 100644 --- a/data/maps/objects/ViridianSchoolHouse.asm +++ b/data/maps/objects/ViridianSchoolHouse.asm @@ -10,5 +10,6 @@ ViridianSchoolHouse_Object: 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 4, 5, SPRITE_LITTLE_GIRL, STAY, UP, 3 ; person def_warps_to VIRIDIAN_SCHOOL_HOUSE |