diff options
| author | vulcandth <vulcandth@gmail.com> | 2023-07-13 20:27:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-13 21:27:56 -0400 |
| commit | d001ced41b53271373753de835a9c3b3413dc318 (patch) | |
| tree | ff2db7f403bddfcdeb12e50def8411cafedcdd5e /data/maps | |
| parent | Make wCurrentBoxNum a byte instead of word (#414) (diff) | |
| download | pokeyellow-d001ced41b53271373753de835a9c3b3413dc318.tar.gz pokeyellow-d001ced41b53271373753de835a9c3b3413dc318.tar.xz pokeyellow-d001ced41b53271373753de835a9c3b3413dc318.zip | |
Add macros, constants, and labels for map scripts and text (#367)
This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
Diffstat (limited to 'data/maps')
216 files changed, 2456 insertions, 1119 deletions
diff --git a/data/maps/objects/AgathasRoom.asm b/data/maps/objects/AgathasRoom.asm index afccd1be..6cd6f21d 100644 --- a/data/maps/objects/AgathasRoom.asm +++ b/data/maps/objects/AgathasRoom.asm @@ -1,3 +1,6 @@ + object_const_def + const AGATHASROOM_AGATHA + AgathasRoom_Object: db $0 ; border block @@ -10,6 +13,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, TEXT_AGATHASROOM_AGATHA, OPP_AGATHA, 1 def_warps_to AGATHAS_ROOM diff --git a/data/maps/objects/BikeShop.asm b/data/maps/objects/BikeShop.asm index 1fa8f6e6..450d7a3a 100644 --- a/data/maps/objects/BikeShop.asm +++ b/data/maps/objects/BikeShop.asm @@ -1,3 +1,8 @@ + object_const_def + const BIKESHOP_CLERK + const BIKESHOP_MIDDLE_AGED_WOMAN + const BIKESHOP_YOUNGSTER + BikeShop_Object: db $e ; border block @@ -8,8 +13,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, TEXT_BIKESHOP_CLERK + object_event 5, 6, SPRITE_MIDDLE_AGED_WOMAN, WALK, UP_DOWN, TEXT_BIKESHOP_MIDDLE_AGED_WOMAN + object_event 1, 3, SPRITE_YOUNGSTER, STAY, UP, TEXT_BIKESHOP_YOUNGSTER def_warps_to BIKE_SHOP diff --git a/data/maps/objects/BillsHouse.asm b/data/maps/objects/BillsHouse.asm index db8f8433..198e6d9e 100644 --- a/data/maps/objects/BillsHouse.asm +++ b/data/maps/objects/BillsHouse.asm @@ -1,3 +1,8 @@ + object_const_def + const BILLSHOUSE_BILL_POKEMON + const BILLSHOUSE_BILL1 + const BILLSHOUSE_BILL2 + BillsHouse_Object: db $d ; border block @@ -8,8 +13,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, TEXT_BILLSHOUSE_BILL_POKEMON + object_event 4, 4, SPRITE_SUPER_NERD, STAY, NONE, TEXT_BILLSHOUSE_BILL_SS_TICKET + object_event 6, 5, SPRITE_SUPER_NERD, STAY, NONE, TEXT_BILLSHOUSE_BILL_CHECK_OUT_MY_RARE_POKEMON def_warps_to BILLS_HOUSE diff --git a/data/maps/objects/BluesHouse.asm b/data/maps/objects/BluesHouse.asm index ac200b28..9633c1d0 100644 --- a/data/maps/objects/BluesHouse.asm +++ b/data/maps/objects/BluesHouse.asm @@ -1,3 +1,8 @@ + object_const_def + const BLUESHOUSE_DAISY1 + const BLUESHOUSE_DAISY2 + const BLUESHOUSE_TOWN_MAP + BluesHouse_Object: db $a ; border block @@ -8,8 +13,8 @@ BluesHouse_Object: def_bg_events def_object_events - object_event 2, 3, SPRITE_DAISY, STAY, RIGHT, 1 - object_event 6, 4, SPRITE_DAISY, WALK, UP_DOWN, 2, 0 - object_event 3, 3, SPRITE_POKEDEX, STAY, NONE, 3, 0 + object_event 2, 3, SPRITE_DAISY, STAY, RIGHT, TEXT_BLUESHOUSE_DAISY_SITTING + object_event 6, 4, SPRITE_DAISY, WALK, UP_DOWN, TEXT_BLUESHOUSE_DAISY_WALKING, 0 + object_event 3, 3, SPRITE_POKEDEX, STAY, NONE, TEXT_BLUESHOUSE_TOWN_MAP, 0 def_warps_to BLUES_HOUSE diff --git a/data/maps/objects/BrunosRoom.asm b/data/maps/objects/BrunosRoom.asm index 1e8a0a27..e4cd5692 100644 --- a/data/maps/objects/BrunosRoom.asm +++ b/data/maps/objects/BrunosRoom.asm @@ -1,3 +1,6 @@ + object_const_def + const BRUNOSROOM_BRUNO + BrunosRoom_Object: db $3 ; border block @@ -10,6 +13,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, TEXT_BRUNOSROOM_BRUNO, OPP_BRUNO, 1 def_warps_to BRUNOS_ROOM diff --git a/data/maps/objects/CeladonChiefHouse.asm b/data/maps/objects/CeladonChiefHouse.asm index 8bec11b0..8fe27f68 100644 --- a/data/maps/objects/CeladonChiefHouse.asm +++ b/data/maps/objects/CeladonChiefHouse.asm @@ -1,3 +1,8 @@ + object_const_def + const CELADONCHIEFHOUSE_CHIEF + const CELADONCHIEFHOUSE_ROCKET + const CELADONCHIEFHOUSE_SAILOR + CeladonChiefHouse_Object: db $f ; border block @@ -8,8 +13,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, TEXT_CELADONCHIEFHOUSE_CHIEF + object_event 1, 4, SPRITE_ROCKET, WALK, ANY_DIR, TEXT_CELADONCHIEFHOUSE_ROCKET + object_event 5, 6, SPRITE_SAILOR, STAY, LEFT, TEXT_CELADONCHIEFHOUSE_SAILOR def_warps_to CELADON_CHIEF_HOUSE diff --git a/data/maps/objects/CeladonCity.asm b/data/maps/objects/CeladonCity.asm index 1644335b..6975bf6b 100644 --- a/data/maps/objects/CeladonCity.asm +++ b/data/maps/objects/CeladonCity.asm @@ -1,3 +1,14 @@ + object_const_def + const CELADONCITY_LITTLE_GIRL + const CELADONCITY_GRAMPS1 + const CELADONCITY_GIRL + const CELADONCITY_GRAMPS2 + const CELADONCITY_GRAMPS3 + const CELADONCITY_FISHER + const CELADONCITY_POLIWRATH + const CELADONCITY_ROCKET1 + const CELADONCITY_ROCKET2 + CeladonCity_Object: db $f ; border block @@ -17,25 +28,25 @@ CeladonCity_Object: warp_event 43, 27, CELADON_HOTEL, 1 def_bg_events - bg_event 27, 15, 10 ; CeladonCityText10 - bg_event 19, 15, 11 ; CeladonCityText11 - bg_event 42, 9, 12 ; PokeCenterSignText - bg_event 13, 29, 13 ; CeladonCityText13 - bg_event 21, 9, 14 ; CeladonCityText14 - bg_event 12, 13, 15 ; CeladonCityText15 - bg_event 39, 21, 16 ; CeladonCityText16 - bg_event 33, 21, 17 ; CeladonCityText17 - bg_event 27, 21, 18 ; CeladonCityText18 + bg_event 27, 15, TEXT_CELADONCITY_TRAINER_TIPS1 + bg_event 19, 15, TEXT_CELADONCITY_SIGN + bg_event 42, 9, TEXT_CELADONCITY_POKECENTER_SIGN + bg_event 13, 29, TEXT_CELADONCITY_GYM_SIGN + bg_event 21, 9, TEXT_CELADONCITY_MANSION_SIGN + bg_event 12, 13, TEXT_CELADONCITY_DEPTSTORE_SIGN + bg_event 39, 21, TEXT_CELADONCITY_TRAINER_TIPS2 + bg_event 33, 21, TEXT_CELADONCITY_PRIZEEXCHANGE_SIGN + bg_event 27, 21, TEXT_CELADONCITY_GAMECORNER_SIGN def_object_events - 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 - object_event 22, 16, SPRITE_GRAMPS, STAY, DOWN, 5 ; person - object_event 32, 12, SPRITE_FISHER, STAY, LEFT, 6 ; person - object_event 30, 12, SPRITE_MONSTER, STAY, RIGHT, 7 ; person - object_event 32, 29, SPRITE_ROCKET, WALK, LEFT_RIGHT, 8 ; person - object_event 42, 14, SPRITE_ROCKET, WALK, LEFT_RIGHT, 9 ; person + object_event 8, 17, SPRITE_LITTLE_GIRL, WALK, ANY_DIR, TEXT_CELADONCITY_LITTLE_GIRL + object_event 11, 28, SPRITE_GRAMPS, STAY, UP, TEXT_CELADONCITY_GRAMPS1 + object_event 14, 19, SPRITE_GIRL, WALK, UP_DOWN, TEXT_CELADONCITY_GIRL + object_event 25, 22, SPRITE_GRAMPS, STAY, DOWN, TEXT_CELADONCITY_GRAMPS2 + object_event 22, 16, SPRITE_GRAMPS, STAY, DOWN, TEXT_CELADONCITY_GRAMPS3 + object_event 32, 12, SPRITE_FISHER, STAY, LEFT, TEXT_CELADONCITY_FISHER + object_event 30, 12, SPRITE_MONSTER, STAY, RIGHT, TEXT_CELADONCITY_POLIWRATH + object_event 32, 29, SPRITE_ROCKET, WALK, LEFT_RIGHT, TEXT_CELADONCITY_ROCKET1 + object_event 42, 14, SPRITE_ROCKET, WALK, LEFT_RIGHT, TEXT_CELADONCITY_ROCKET2 def_warps_to CELADON_CITY diff --git a/data/maps/objects/CeladonDiner.asm b/data/maps/objects/CeladonDiner.asm index 33ea922b..98363688 100644 --- a/data/maps/objects/CeladonDiner.asm +++ b/data/maps/objects/CeladonDiner.asm @@ -1,3 +1,10 @@ + object_const_def + const CELADONDINER_COOK + const CELADONDINER_MIDDLE_AGED_WOMAN + const CELADONDINER_MIDDLE_AGED_MAN + const CELADONDINER_FISHER + const CELADONDINER_GYM_GUIDE + CeladonDiner_Object: db $f ; border block @@ -8,10 +15,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, TEXT_CELADONDINER_COOK + object_event 7, 2, SPRITE_MIDDLE_AGED_WOMAN, STAY, NONE, TEXT_CELADONDINER_MIDDLE_AGED_WOMAN + object_event 1, 4, SPRITE_MIDDLE_AGED_MAN, STAY, DOWN, TEXT_CELADONDINER_MIDDLE_AGED_MAN + object_event 5, 3, SPRITE_FISHER, STAY, RIGHT, TEXT_CELADONDINER_FISHER + object_event 0, 1, SPRITE_GYM_GUIDE, STAY, DOWN, TEXT_CELADONDINER_GYM_GUIDE def_warps_to CELADON_DINER diff --git a/data/maps/objects/CeladonGym.asm b/data/maps/objects/CeladonGym.asm index 294e727d..bb4ad61c 100644 --- a/data/maps/objects/CeladonGym.asm +++ b/data/maps/objects/CeladonGym.asm @@ -1,3 +1,13 @@ + object_const_def + const CELADONGYM_ERIKA + const CELADONGYM_COOLTRAINER_F1 + const CELADONGYM_BEAUTY1 + const CELADONGYM_COOLTRAINER_F2 + const CELADONGYM_BEAUTY2 + const CELADONGYM_COOLTRAINER_F3 + const CELADONGYM_BEAUTY3 + const CELADONGYM_COOLTRAINER_F4 + CeladonGym_Object: db $3 ; border block @@ -8,13 +18,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_SILPH_WORKER_F, STAY, DOWN, TEXT_CELADONGYM_ERIKA, OPP_ERIKA, 1 + object_event 2, 11, SPRITE_COOLTRAINER_F, STAY, RIGHT, TEXT_CELADONGYM_COOLTRAINER_F1, OPP_LASS, 17 + object_event 7, 10, SPRITE_BEAUTY, STAY, LEFT, TEXT_CELADONGYM_BEAUTY1, OPP_BEAUTY, 1 + object_event 9, 5, SPRITE_COOLTRAINER_F, STAY, DOWN, TEXT_CELADONGYM_COOLTRAINER_F2, OPP_JR_TRAINER_F, 11 + object_event 1, 5, SPRITE_BEAUTY, STAY, DOWN, TEXT_CELADONGYM_BEAUTY2, OPP_BEAUTY, 2 + object_event 6, 3, SPRITE_COOLTRAINER_F, STAY, DOWN, TEXT_CELADONGYM_COOLTRAINER_F3, OPP_LASS, 18 + object_event 3, 3, SPRITE_BEAUTY, STAY, DOWN, TEXT_CELADONGYM_BEAUTY3, OPP_BEAUTY, 3 + object_event 5, 3, SPRITE_COOLTRAINER_F, STAY, DOWN, TEXT_CELADONGYM_COOLTRAINER_F4, OPP_COOLTRAINER_F, 1 def_warps_to CELADON_GYM diff --git a/data/maps/objects/CeladonHotel.asm b/data/maps/objects/CeladonHotel.asm index 13aaff64..700361ce 100644 --- a/data/maps/objects/CeladonHotel.asm +++ b/data/maps/objects/CeladonHotel.asm @@ -1,3 +1,8 @@ + object_const_def + const CELADONHOTEL_GRANNY + const CELADONHOTEL_BEAUTY + const CELADONHOTEL_SUPER_NERD + CeladonHotel_Object: db $0 ; border block @@ -8,8 +13,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, TEXT_CELADONHOTEL_GRANNY + object_event 2, 4, SPRITE_BEAUTY, STAY, NONE, TEXT_CELADONHOTEL_BEAUTY + object_event 8, 4, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, TEXT_CELADONHOTEL_SUPER_NERD def_warps_to CELADON_HOTEL diff --git a/data/maps/objects/CeladonMansion1F.asm b/data/maps/objects/CeladonMansion1F.asm index 4966c903..6161cf0a 100644 --- a/data/maps/objects/CeladonMansion1F.asm +++ b/data/maps/objects/CeladonMansion1F.asm @@ -1,3 +1,9 @@ + object_const_def + const CELADONMANSION1F_MEOWTH + const CELADONMANSION1F_GRANNY + const CELADONMANSION1F_CLEFAIRY + const CELADONMANSION1F_NIDORANF + CeladonMansion1F_Object: db $f ; border block @@ -9,12 +15,12 @@ CeladonMansion1F_Object: warp_event 2, 1, CELADON_MANSION_2F, 3 def_bg_events - bg_event 4, 9, 5 ; CeladonMansion1Text5 + bg_event 4, 9, TEXT_CELADONMANSION1F_MANAGERS_SUITE_SIGN 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, TEXT_CELADONMANSION1F_MEOWTH + object_event 1, 5, SPRITE_GRANNY, STAY, DOWN, TEXT_CELADONMANSION1F_GRANNY + object_event 1, 8, SPRITE_FAIRY, WALK, LEFT_RIGHT, TEXT_CELADONMANSION1F_CLEFAIRY + object_event 4, 4, SPRITE_MONSTER, WALK, UP_DOWN, TEXT_CELADONMANSION1F_NIDORANF def_warps_to CELADON_MANSION_1F diff --git a/data/maps/objects/CeladonMansion2F.asm b/data/maps/objects/CeladonMansion2F.asm index c2546d72..07ba173d 100644 --- a/data/maps/objects/CeladonMansion2F.asm +++ b/data/maps/objects/CeladonMansion2F.asm @@ -8,7 +8,7 @@ CeladonMansion2F_Object: warp_event 4, 1, CELADON_MANSION_3F, 4 def_bg_events - bg_event 4, 9, 1 ; CeladonMansion2Text1 + bg_event 4, 9, TEXT_CELADONMANSION2F_MEETING_ROOM_SIGN def_object_events diff --git a/data/maps/objects/CeladonMansion3F.asm b/data/maps/objects/CeladonMansion3F.asm index b4f9c37b..5d2c1e99 100644 --- a/data/maps/objects/CeladonMansion3F.asm +++ b/data/maps/objects/CeladonMansion3F.asm @@ -1,3 +1,9 @@ + object_const_def + const CELADONMANSION3F_PROGRAMMER + const CELADONMANSION3F_GRAPHIC_ARTIST + const CELADONMANSION3F_WRITER + const CELADONMANSION3F_GAME_DESIGNER + CeladonMansion3F_Object: db $f ; border block @@ -8,15 +14,15 @@ CeladonMansion3F_Object: warp_event 4, 1, CELADON_MANSION_2F, 4 def_bg_events - bg_event 1, 3, 5 ; CeladonMansion3Text5 - bg_event 4, 3, 6 ; CeladonMansion3Text6 - bg_event 1, 6, 7 ; CeladonMansion3Text7 - bg_event 4, 9, 8 ; CeladonMansion3Text8 + bg_event 1, 3, TEXT_CELADONMANSION3F_GAME_PROGRAM_PC + bg_event 4, 3, TEXT_CELADONMANSION3F_PLAYING_GAME_PC + bg_event 1, 6, TEXT_CELADONMANSION3F_GAME_SCRIPT_PC + bg_event 4, 9, TEXT_CELADONMANSION3F_DEV_ROOM_SIGN 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, TEXT_CELADONMANSION3F_PROGRAMMER + object_event 3, 4, SPRITE_CLERK, STAY, UP, TEXT_CELADONMANSION3F_GRAPHIC_ARTIST + object_event 0, 7, SPRITE_SUPER_NERD, STAY, UP, TEXT_CELADONMANSION3F_WRITER + object_event 2, 3, SPRITE_SILPH_WORKER_M, STAY, NONE, TEXT_CELADONMANSION3F_GAME_DESIGNER def_warps_to CELADON_MANSION_3F diff --git a/data/maps/objects/CeladonMansionRoof.asm b/data/maps/objects/CeladonMansionRoof.asm index e28249e2..e347849b 100644 --- a/data/maps/objects/CeladonMansionRoof.asm +++ b/data/maps/objects/CeladonMansionRoof.asm @@ -7,7 +7,7 @@ CeladonMansionRoof_Object: warp_event 2, 7, CELADON_MANSION_ROOF_HOUSE, 1 def_bg_events - bg_event 3, 7, 1 ; CeladonMansion4Text1 + bg_event 3, 7, TEXT_CELADONMANSIONROOF_HOUSE_SIGN def_object_events diff --git a/data/maps/objects/CeladonMansionRoofHouse.asm b/data/maps/objects/CeladonMansionRoofHouse.asm index c5111a76..4ee9494b 100644 --- a/data/maps/objects/CeladonMansionRoofHouse.asm +++ b/data/maps/objects/CeladonMansionRoofHouse.asm @@ -1,3 +1,7 @@ + object_const_def + const CELADONMANSION_ROOF_HOUSE_HIKER + const CELADONMANSION_ROOF_HOUSE_EEVEE_POKEBALL + CeladonMansionRoofHouse_Object: db $a ; border block @@ -8,7 +12,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, TEXT_CELADONMANSION_ROOF_HOUSE_HIKER + object_event 4, 3, SPRITE_POKE_BALL, STAY, NONE, TEXT_CELADONMANSION_ROOF_HOUSE_EEVEE_POKEBALL def_warps_to CELADON_MANSION_ROOF_HOUSE diff --git a/data/maps/objects/CeladonMart1F.asm b/data/maps/objects/CeladonMart1F.asm index d7f8924f..6ec1e35d 100644 --- a/data/maps/objects/CeladonMart1F.asm +++ b/data/maps/objects/CeladonMart1F.asm @@ -1,3 +1,6 @@ + object_const_def + const CELADONMART1F_RECEPTIONIST + CeladonMart1F_Object: db $f ; border block @@ -10,10 +13,10 @@ CeladonMart1F_Object: warp_event 1, 1, CELADON_MART_ELEVATOR, 1 def_bg_events - bg_event 11, 4, 2 ; CeladonMart1Text2 - bg_event 14, 1, 3 ; CeladonMart1Text3 + bg_event 11, 4, TEXT_CELADONMART1F_DIRECTORY_SIGN + bg_event 14, 1, TEXT_CELADONMART1F_CURRENT_FLOOR_SIGN def_object_events - object_event 8, 3, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 1 ; person + object_event 8, 3, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, TEXT_CELADONMART1F_RECEPTIONIST def_warps_to CELADON_MART_1F diff --git a/data/maps/objects/CeladonMart2F.asm b/data/maps/objects/CeladonMart2F.asm index 9eaa1605..52052383 100644 --- a/data/maps/objects/CeladonMart2F.asm +++ b/data/maps/objects/CeladonMart2F.asm @@ -1,3 +1,9 @@ + object_const_def + const CELADONMART2F_CLERK1 + const CELADONMART2F_CLERK2 + const CELADONMART2F_MIDDLE_AGED_MAN + const CELADONMART2F_GIRL + CeladonMart2F_Object: db $f ; border block @@ -7,12 +13,12 @@ CeladonMart2F_Object: warp_event 1, 1, CELADON_MART_ELEVATOR, 1 def_bg_events - bg_event 14, 1, 5 ; CeladonMart2Text5 + bg_event 14, 1, TEXT_CELADONMART2F_CURRENT_FLOOR_SIGN 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, TEXT_CELADONMART2F_CLERK1 + object_event 6, 3, SPRITE_CLERK, STAY, DOWN, TEXT_CELADONMART2F_CLERK2 + object_event 19, 5, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, TEXT_CELADONMART2F_MIDDLE_AGED_MAN + object_event 14, 4, SPRITE_GIRL, WALK, UP_DOWN, TEXT_CELADONMART2F_GIRL def_warps_to CELADON_MART_2F diff --git a/data/maps/objects/CeladonMart3F.asm b/data/maps/objects/CeladonMart3F.asm index 85f0cf1c..e0e3f7be 100644 --- a/data/maps/objects/CeladonMart3F.asm +++ b/data/maps/objects/CeladonMart3F.asm @@ -1,3 +1,10 @@ + object_const_def + const CELADONMART3F_CLERK + const CELADONMART3F_GAMEBOY_KID1 + const CELADONMART3F_GAMEBOY_KID2 + const CELADONMART3F_GAMEBOY_KID3 + const CELADONMART3F_LITTLE_BOY + CeladonMart3F_Object: db $f ; border block @@ -7,24 +14,24 @@ CeladonMart3F_Object: warp_event 1, 1, CELADON_MART_ELEVATOR, 1 def_bg_events - bg_event 2, 4, 6 ; CeladonMart3Text6 - bg_event 3, 4, 7 ; CeladonMart3Text7 - bg_event 5, 4, 8 ; CeladonMart3Text8 - bg_event 6, 4, 9 ; CeladonMart3Text9 - bg_event 2, 6, 10 ; CeladonMart3Text10 - bg_event 3, 6, 11 ; CeladonMart3Text11 - bg_event 5, 6, 12 ; CeladonMart3Text12 - bg_event 6, 6, 13 ; CeladonMart3Text13 - bg_event 14, 1, 14 ; CeladonMart3Text14 - bg_event 4, 1, 15 ; CeladonMart3Text15 - bg_event 6, 1, 16 ; CeladonMart3Text16 - bg_event 10, 1, 17 ; CeladonMart3Text17 + bg_event 2, 4, TEXT_CELADONMART3F_SNES1 + bg_event 3, 4, TEXT_CELADONMART3F_RPG + bg_event 5, 4, TEXT_CELADONMART3F_SNES2 + bg_event 6, 4, TEXT_CELADONMART3F_SPORTS_GAME + bg_event 2, 6, TEXT_CELADONMART3F_SNES3 + bg_event 3, 6, TEXT_CELADONMART3F_PUZZLE_GAME + bg_event 5, 6, TEXT_CELADONMART3F_SNES4 + bg_event 6, 6, TEXT_CELADONMART3F_FIGHTING_GAME + bg_event 14, 1, TEXT_CELADONMART3F_CURRENT_FLOOR_SIGN + bg_event 4, 1, TEXT_CELADONMART3F_POKEMON_POSTER1 + bg_event 6, 1, TEXT_CELADONMART3F_POKEMON_POSTER2 + bg_event 10, 1, TEXT_CELADONMART3F_POKEMON_POSTER3 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, TEXT_CELADONMART3F_CLERK + object_event 11, 6, SPRITE_GAMEBOY_KID, STAY, RIGHT, TEXT_CELADONMART3F_GAMEBOY_KID1 + object_event 7, 2, SPRITE_GAMEBOY_KID, STAY, DOWN, TEXT_CELADONMART3F_GAMEBOY_KID2 + object_event 8, 2, SPRITE_GAMEBOY_KID, STAY, DOWN, TEXT_CELADONMART3F_GAMEBOY_KID3 + object_event 2, 5, SPRITE_LITTLE_BOY, STAY, UP, TEXT_CELADONMART3F_LITTLE_BOY def_warps_to CELADON_MART_3F diff --git a/data/maps/objects/CeladonMart4F.asm b/data/maps/objects/CeladonMart4F.asm index 7f188692..6ee17f19 100644 --- a/data/maps/objects/CeladonMart4F.asm +++ b/data/maps/objects/CeladonMart4F.asm @@ -1,3 +1,8 @@ + object_const_def + const CELADONMART4F_CLERK + const CELADONMART4F_SUPER_NERD + const CELADONMART4F_YOUNGSTER + CeladonMart4F_Object: db $f ; border block @@ -7,11 +12,11 @@ CeladonMart4F_Object: warp_event 1, 1, CELADON_MART_ELEVATOR, 1 def_bg_events - bg_event 14, 1, 4 ; CeladonMart4Text4 + bg_event 14, 1, TEXT_CELADONMART4F_CURRENT_FLOOR_SIGN 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, TEXT_CELADONMART4F_CLERK + object_event 15, 5, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, TEXT_CELADONMART4F_SUPER_NERD + object_event 5, 2, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, TEXT_CELADONMART4F_YOUNGSTER def_warps_to CELADON_MART_4F diff --git a/data/maps/objects/CeladonMart5F.asm b/data/maps/objects/CeladonMart5F.asm index 35cb45b8..916d2756 100644 --- a/data/maps/objects/CeladonMart5F.asm +++ b/data/maps/objects/CeladonMart5F.asm @@ -1,3 +1,9 @@ + object_const_def + const CELADONMART5F_GENTLEMAN + const CELADONMART5F_SAILOR + const CELADONMART5F_CLERK1 + const CELADONMART5F_CLERK2 + CeladonMart5F_Object: db $f ; border block @@ -7,12 +13,12 @@ CeladonMart5F_Object: warp_event 1, 1, CELADON_MART_ELEVATOR, 1 def_bg_events - bg_event 14, 1, 5 ; CeladonMart5Text5 + bg_event 14, 1, TEXT_CELADONMART5F_CURRENT_FLOOR_SIGN 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, TEXT_CELADONMART5F_GENTLEMAN + object_event 2, 6, SPRITE_SAILOR, STAY, NONE, TEXT_CELADONMART5F_SAILOR + object_event 5, 3, SPRITE_CLERK, STAY, DOWN, TEXT_CELADONMART5F_CLERK1 + object_event 6, 3, SPRITE_CLERK, STAY, DOWN, TEXT_CELADONMART5F_CLERK2 def_warps_to CELADON_MART_5F diff --git a/data/maps/objects/CeladonMartElevator.asm b/data/maps/objects/CeladonMartElevator.asm index c24e48df..0ced06ce 100644 --- a/data/maps/objects/CeladonMartElevator.asm +++ b/data/maps/objects/CeladonMartElevator.asm @@ -6,7 +6,7 @@ CeladonMartElevator_Object: warp_event 2, 3, CELADON_MART_1F, 6 def_bg_events - bg_event 3, 0, 1 ; CeladonMartElevatorText1 + bg_event 3, 0, TEXT_CELADONMARTELEVATOR def_object_events diff --git a/data/maps/objects/CeladonMartRoof.asm b/data/maps/objects/CeladonMartRoof.asm index f56a0b0d..e686567c 100644 --- a/data/maps/objects/CeladonMartRoof.asm +++ b/data/maps/objects/CeladonMartRoof.asm @@ -1,3 +1,7 @@ + object_const_def + const CELADONMARTROOF_SUPER_NERD + const CELADONMARTROOF_LITTLE_GIRL + CeladonMartRoof_Object: db $42 ; border block @@ -5,13 +9,13 @@ CeladonMartRoof_Object: warp_event 15, 2, CELADON_MART_5F, 1 def_bg_events - bg_event 10, 1, 3 ; CeladonMartRoofText3 - bg_event 11, 1, 4 ; CeladonMartRoofText4 - bg_event 12, 2, 5 ; CeladonMartRoofText5 - bg_event 13, 2, 6 ; CeladonMartRoofText6 + bg_event 10, 1, TEXT_CELADONMARTROOF_VENDING_MACHINE1 + bg_event 11, 1, TEXT_CELADONMARTROOF_VENDING_MACHINE2 + bg_event 12, 2, TEXT_CELADONMARTROOF_VENDING_MACHINE3 + bg_event 13, 2, TEXT_CELADONMARTROOF_CURRENT_FLOOR_SIGN 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, TEXT_CELADONMARTROOF_SUPER_NERD + object_event 5, 5, SPRITE_LITTLE_GIRL, WALK, ANY_DIR, TEXT_CELADONMARTROOF_LITTLE_GIRL def_warps_to CELADON_MART_ROOF diff --git a/data/maps/objects/CeladonPokecenter.asm b/data/maps/objects/CeladonPokecenter.asm index 40c466a0..4709203b 100644 --- a/data/maps/objects/CeladonPokecenter.asm +++ b/data/maps/objects/CeladonPokecenter.asm @@ -1,3 +1,9 @@ + object_const_def + const CELADONPOKECENTER_NURSE + const CELADONPOKECENTER_GENTLEMAN + const CELADONPOKECENTER_BEAUTY + const CELADONPOKECENTER_LINK_RECEPTIONIST + CeladonPokecenter_Object: db $0 ; border block @@ -8,9 +14,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, TEXT_CELADONPOKECENTER_NURSE + object_event 7, 3, SPRITE_GENTLEMAN, WALK, LEFT_RIGHT, TEXT_CELADONPOKECENTER_GENTLEMAN + object_event 10, 5, SPRITE_BEAUTY, WALK, ANY_DIR, TEXT_CELADONPOKECENTER_BEAUTY + object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, TEXT_CELADONPOKECENTER_LINK_RECEPTIONIST def_warps_to CELADON_POKECENTER diff --git a/data/maps/objects/CeruleanBadgeHouse.asm b/data/maps/objects/CeruleanBadgeHouse.asm index 145dde81..1fec6ac8 100644 --- a/data/maps/objects/CeruleanBadgeHouse.asm +++ b/data/maps/objects/CeruleanBadgeHouse.asm @@ -1,3 +1,6 @@ + object_const_def + const CERULEANBADGEHOUSE_MIDDLE_AGED_MAN + CeruleanBadgeHouse_Object: db $c ; border block @@ -9,6 +12,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, TEXT_CERULEANBADGEHOUSE_MIDDLE_AGED_MAN def_warps_to CERULEAN_BADGE_HOUSE diff --git a/data/maps/objects/CeruleanCave1F.asm b/data/maps/objects/CeruleanCave1F.asm index b858a40f..777805d4 100644 --- a/data/maps/objects/CeruleanCave1F.asm +++ b/data/maps/objects/CeruleanCave1F.asm @@ -1,3 +1,8 @@ + object_const_def + const CERULEANCAVE1F_FULL_RESTORE + const CERULEANCAVE1F_MAX_ELIXER + const CERULEANCAVE1F_NUGGET + CeruleanCave1F_Object: db $7d ; border block @@ -15,8 +20,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, TEXT_CERULEANCAVE1F_FULL_RESTORE, FULL_RESTORE + object_event 19, 3, SPRITE_POKE_BALL, STAY, NONE, TEXT_CERULEANCAVE1F_MAX_ELIXER, MAX_ELIXER + object_event 5, 0, SPRITE_POKE_BALL, STAY, NONE, TEXT_CERULEANCAVE1F_NUGGET, NUGGET def_warps_to CERULEAN_CAVE_1F diff --git a/data/maps/objects/CeruleanCave2F.asm b/data/maps/objects/CeruleanCave2F.asm index 18765fe8..6eea42a0 100644 --- a/data/maps/objects/CeruleanCave2F.asm +++ b/data/maps/objects/CeruleanCave2F.asm @@ -1,3 +1,8 @@ + object_const_def + const CERULEANCAVE2F_PP_UP + const CERULEANCAVE2F_ULTRA_BALL + const CERULEANCAVE2F_FULL_RESTORE + CeruleanCave2F_Object: db $7d ; border block @@ -12,8 +17,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, TEXT_CERULEANCAVE2F_PP_UP, PP_UP + object_event 4, 15, SPRITE_POKE_BALL, STAY, NONE, TEXT_CERULEANCAVE2F_ULTRA_BALL, ULTRA_BALL + object_event 13, 6, SPRITE_POKE_BALL, STAY, NONE, TEXT_CERULEANCAVE2F_FULL_RESTORE, FULL_RESTORE def_warps_to CERULEAN_CAVE_2F diff --git a/data/maps/objects/CeruleanCaveB1F.asm b/data/maps/objects/CeruleanCaveB1F.asm index 5173fee6..81e2b880 100644 --- a/data/maps/objects/CeruleanCaveB1F.asm +++ b/data/maps/objects/CeruleanCaveB1F.asm @@ -1,3 +1,8 @@ + object_const_def + const CERULEANCAVE_B1F_MEWTWO + const CERULEANCAVE_B1F_ULTRA_BALL + const CERULEANCAVE_B1F_MAX_REVIVE + CeruleanCaveB1F_Object: db $7d ; border block @@ -7,8 +12,8 @@ CeruleanCaveB1F_Object: def_bg_events 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 27, 13, SPRITE_MONSTER, STAY, DOWN, TEXT_CERULEANCAVEB1F_MEWTWO, MEWTWO, 70 + object_event 16, 9, SPRITE_POKE_BALL, STAY, NONE, TEXT_CERULEANCAVEB1F_ULTRA_BALL, ULTRA_BALL + object_event 18, 1, SPRITE_POKE_BALL, STAY, NONE, TEXT_CERULEANCAVEB1F_MAX_REVIVE, MAX_REVIVE def_warps_to CERULEAN_CAVE_B1F diff --git a/data/maps/objects/CeruleanCity.asm b/data/maps/objects/CeruleanCity.asm index 23863aa0..605aa417 100644 --- a/data/maps/objects/CeruleanCity.asm +++ b/data/maps/objects/CeruleanCity.asm @@ -1,3 +1,16 @@ + object_const_def + const CERULEANCITY_RIVAL + const CERULEANCITY_ROCKET + const CERULEANCITY_COOLTRAINER_M + const CERULEANCITY_SUPER_NERD1 + const CERULEANCITY_SUPER_NERD2 + const CERULEANCITY_GUARD1 + const CERULEANCITY_COOLTRAINER_F1 + const CERULEANCITY_SLOWBRO + const CERULEANCITY_COOLTRAINER_F2 + const CERULEANCITY_SUPER_NERD3 + const CERULEANCITY_GUARD2 + CeruleanCity_Object: db $f ; border block @@ -14,24 +27,24 @@ CeruleanCity_Object: warp_event 9, 9, CERULEAN_BADGE_HOUSE, 1 def_bg_events - bg_event 23, 19, 12 ; CeruleanCityText12 - bg_event 17, 29, 13 ; CeruleanCityText13 - bg_event 26, 25, 14 ; MartSignText - bg_event 20, 17, 15 ; PokeCenterSignText - bg_event 11, 25, 16 ; CeruleanCityText16 - bg_event 27, 21, 17 ; CeruleanCityText17 + bg_event 23, 19, TEXT_CERULEANCITY_SIGN + bg_event 17, 29, TEXT_CERULEANCITY_TRAINER_TIPS + bg_event 26, 25, TEXT_CERULEANCITY_MART_SIGN + bg_event 20, 17, TEXT_CERULEANCITY_POKECENTER_SIGN + bg_event 11, 25, TEXT_CERULEANCITY_BIKESHOP_SIGN + bg_event 27, 21, TEXT_CERULEANCITY_GYM_SIGN 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 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 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 27, 12, SPRITE_GUARD, STAY, DOWN, 11 ; person + object_event 20, 2, SPRITE_BLUE, STAY, DOWN, TEXT_CERULEANCITY_RIVAL + object_event 30, 8, SPRITE_ROCKET, STAY, NONE, TEXT_CERULEANCITY_ROCKET, OPP_ROCKET, 5 + object_event 31, 20, SPRITE_COOLTRAINER_M, STAY, DOWN, TEXT_CERULEANCITY_COOLTRAINER_M + object_event 15, 18, SPRITE_SUPER_NERD, WALK, UP_DOWN, TEXT_CERULEANCITY_SUPER_NERD1 + object_event 9, 21, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, TEXT_CERULEANCITY_SUPER_NERD2 + object_event 28, 12, SPRITE_GUARD, STAY, DOWN, TEXT_CERULEANCITY_GUARD1 + object_event 29, 26, SPRITE_COOLTRAINER_F, STAY, LEFT, TEXT_CERULEANCITY_COOLTRAINER_F1 + object_event 28, 26, SPRITE_MONSTER, STAY, DOWN, TEXT_CERULEANCITY_SLOWBRO + object_event 9, 27, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, TEXT_CERULEANCITY_COOLTRAINER_F2 + object_event 4, 12, SPRITE_SUPER_NERD, STAY, DOWN, TEXT_CERULEANCITY_SUPER_NERD3 + object_event 27, 12, SPRITE_GUARD, STAY, DOWN, TEXT_CERULEANCITY_GUARD2 def_warps_to CERULEAN_CITY diff --git a/data/maps/objects/CeruleanGym.asm b/data/maps/objects/CeruleanGym.asm index a6be4cae..19a06870 100644 --- a/data/maps/objects/CeruleanGym.asm +++ b/data/maps/objects/CeruleanGym.asm @@ -1,3 +1,9 @@ + object_const_def + const CERULEANGYM_MISTY + const CERULEANGYM_COOLTRAINER_F + const CERULEANGYM_SWIMMER + const CERULEANGYM_GYM_GUIDE + CeruleanGym_Object: db $3 ; border block @@ -8,9 +14,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, TEXT_CERULEANGYM_MISTY, OPP_MISTY, 1 + object_event 2, 3, SPRITE_COOLTRAINER_F, STAY, RIGHT, TEXT_CERULEANGYM_COOLTRAINER_F, OPP_JR_TRAINER_F, 1 + object_event 8, 7, SPRITE_SWIMMER, STAY, LEFT, TEXT_CERULEANGYM_SWIMMER, OPP_SWIMMER, 1 + object_event 7, 10, SPRITE_GYM_GUIDE, STAY, DOWN, TEXT_CERULEANGYM_GYM_GUIDE def_warps_to CERULEAN_GYM diff --git a/data/maps/objects/CeruleanMart.asm b/data/maps/objects/CeruleanMart.asm index 0f5a8276..a1ab6717 100644 --- a/data/maps/objects/CeruleanMart.asm +++ b/data/maps/objects/CeruleanMart.asm @@ -1,3 +1,8 @@ + object_const_def + const CERULEANMART_CLERK + const CERULEANMART_COOLTRAINER_M + const CERULEANMART_COOLTRAINER_F + CeruleanMart_Object: db $0 ; border block @@ -8,8 +13,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, TEXT_CERULEANMART_CLERK + object_event 3, 4, SPRITE_COOLTRAINER_M, WALK, UP_DOWN, TEXT_CERULEANMART_COOLTRAINER_M + object_event 6, 2, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, TEXT_CERULEANMART_COOLTRAINER_F def_warps_to CERULEAN_MART diff --git a/data/maps/objects/CeruleanPokecenter.asm b/data/maps/objects/CeruleanPokecenter.asm index eee0a0c6..5e1a4015 100644 --- a/data/maps/objects/CeruleanPokecenter.asm +++ b/data/maps/objects/CeruleanPokecenter.asm @@ -1,3 +1,9 @@ + object_const_def + const CERULEANPOKECENTER_NURSE + const CERULEANPOKECENTER_SUPER_NERD + const CERULEANPOKECENTER_GENTLEMAN + const CERULEANPOKECENTER_LINK_RECEPTIONIST + CeruleanPokecenter_Object: db $0 ; border block @@ -8,9 +14,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, TEXT_CERULEANPOKECENTER_NURSE + object_event 10, 5, SPRITE_SUPER_NERD, WALK, ANY_DIR, TEXT_CERULEANPOKECENTER_SUPER_NERD + object_event 4, 3, SPRITE_GENTLEMAN, STAY, DOWN, TEXT_CERULEANPOKECENTER_GENTLEMAN + object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, TEXT_CERULEANPOKECENTER_LINK_RECEPTIONIST def_warps_to CERULEAN_POKECENTER diff --git a/data/maps/objects/CeruleanTradeHouse.asm b/data/maps/objects/CeruleanTradeHouse.asm index 52984832..c55ed6ef 100644 --- a/data/maps/objects/CeruleanTradeHouse.asm +++ b/data/maps/objects/CeruleanTradeHouse.asm @@ -1,3 +1,7 @@ + object_const_def + const CERULEANTRADEHOUSE_GRANNY + const CERULEANTRADEHOUSE_GAMBLER + CeruleanTradeHouse_Object: db $a ; border block @@ -8,7 +12,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, TEXT_CERULEANTRADEHOUSE_GRANNY + object_event 1, 2, SPRITE_GAMBLER, STAY, NONE, TEXT_CERULEANTRADEHOUSE_GAMBLER def_warps_to CERULEAN_TRADE_HOUSE diff --git a/data/maps/objects/CeruleanTrashedHouse.asm b/data/maps/objects/CeruleanTrashedHouse.asm index 9dc28f08..993e66c2 100644 --- a/data/maps/objects/CeruleanTrashedHouse.asm +++ b/data/maps/objects/CeruleanTrashedHouse.asm @@ -1,3 +1,7 @@ + object_const_def + const CERULEANTRASHEDHOUSE_FISHING_GURU + const CERULEANTRASHEDHOUSE_GIRL + CeruleanTrashedHouse_Object: db $a ; border block @@ -7,10 +11,10 @@ CeruleanTrashedHouse_Object: warp_event 3, 0, LAST_MAP, 8 def_bg_events - bg_event 3, 0, 3 ; CeruleanHouseTrashedText3 + bg_event 3, 0, TEXT_CERULEANTRASHEDHOUSE_WALL_HOLE 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, TEXT_CERULEANTRASHEDHOUSE_FISHING_GURU + object_event 5, 6, SPRITE_GIRL, WALK, LEFT_RIGHT, TEXT_CERULEANTRASHEDHOUSE_GIRL def_warps_to CERULEAN_TRASHED_HOUSE diff --git a/data/maps/objects/ChampionsRoom.asm b/data/maps/objects/ChampionsRoom.asm index fa5efd8f..50bdee60 100644 --- a/data/maps/objects/ChampionsRoom.asm +++ b/data/maps/objects/ChampionsRoom.asm @@ -1,3 +1,7 @@ + object_const_def + const CHAMPIONSROOM_RIVAL + const CHAMPIONSROOM_OAK + ChampionsRoom_Object: db $3 ; border block @@ -10,7 +14,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, TEXT_CHAMPIONSROOM_RIVAL + object_event 3, 7, SPRITE_OAK, STAY, UP, TEXT_CHAMPIONSROOM_OAK def_warps_to CHAMPIONS_ROOM diff --git a/data/maps/objects/CinnabarGym.asm b/data/maps/objects/CinnabarGym.asm index a4ed8cda..9453d0b7 100644 --- a/data/maps/objects/CinnabarGym.asm +++ b/data/maps/objects/CinnabarGym.asm @@ -1,3 +1,14 @@ + object_const_def + const CINNABARGYM_BLAINE + const CINNABARGYM_SUPER_NERD1 + const CINNABARGYM_SUPER_NERD2 + const CINNABARGYM_SUPER_NERD3 + const CINNABARGYM_SUPER_NERD4 + const CINNABARGYM_SUPER_NERD5 + const CINNABARGYM_SUPER_NERD6 + const CINNABARGYM_SUPER_NERD7 + const CINNABARGYM_GYM_GUIDE + CinnabarGym_Object: db $2e ; border block @@ -8,14 +19,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 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 16, 13, SPRITE_GYM_GUIDE, STAY, DOWN, 9 ; person + object_event 3, 3, SPRITE_MIDDLE_AGED_MAN, STAY, DOWN, TEXT_CINNABARGYM_BLAINE, OPP_BLAINE, 1 + object_event 17, 2, SPRITE_SUPER_NERD, STAY, DOWN, TEXT_CINNABARGYM_SUPER_NERD1, OPP_SUPER_NERD, 9 + object_event 17, 8, SPRITE_SUPER_NERD, STAY, DOWN, TEXT_CINNABARGYM_SUPER_NERD2, OPP_BURGLAR, 4 + object_event 11, 4, SPRITE_SUPER_NERD, STAY, DOWN, TEXT_CINNABARGYM_SUPER_NERD3, OPP_SUPER_NERD, 10 + object_event 11, 8, SPRITE_SUPER_NERD, STAY, DOWN, TEXT_CINNABARGYM_SUPER_NERD4, OPP_BURGLAR, 5 + object_event 11, 14, SPRITE_SUPER_NERD, STAY, DOWN, TEXT_CINNABARGYM_SUPER_NERD5, OPP_SUPER_NERD, 11 + object_event 3, 14, SPRITE_SUPER_NERD, STAY, DOWN, TEXT_CINNABARGYM_SUPER_NERD6, OPP_BURGLAR, 6 + object_event 3, 8, SPRITE_SUPER_NERD, STAY, DOWN, TEXT_CINNABARGYM_SUPER_NERD7, OPP_SUPER_NERD, 12 + object_event 16, 13, SPRITE_GYM_GUIDE, STAY, DOWN, TEXT_CINNABARGYM_GYM_GUIDE def_warps_to CINNABAR_GYM diff --git a/data/maps/objects/CinnabarIsland.asm b/data/maps/objects/CinnabarIsland.asm index f3ca64fb..dd3593b3 100644 --- a/data/maps/objects/CinnabarIsland.asm +++ b/data/maps/objects/CinnabarIsland.asm @@ -1,3 +1,7 @@ + object_const_def + const CINNABARISLAND_GIRL + const CINNABARISLAND_GAMBLER + CinnabarIsland_Object: db $43 ; border block @@ -9,14 +13,14 @@ CinnabarIsland_Object: warp_event 15, 11, CINNABAR_MART, 1 def_bg_events - bg_event 9, 5, 3 ; CinnabarIslandText3 - bg_event 16, 11, 4 ; MartSignText - bg_event 12, 11, 5 ; PokeCenterSignText - bg_event 9, 11, 6 ; CinnabarIslandText6 - bg_event 13, 3, 7 ; CinnabarIslandText7 + bg_event 9, 5, TEXT_CINNABARISLAND_SIGN + bg_event 16, 11, TEXT_CINNABARISLAND_MART_SIGN + bg_event 12, 11, TEXT_CINNABARISLAND_POKECENTER_SIGN + bg_event 9, 11, TEXT_CINNABARISLAND_POKEMONLAB_SIGN + bg_event 13, 3, TEXT_CINNABARISLAND_GYM_SIGN 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, TEXT_CINNABARISLAND_GIRL + object_event 14, 6, SPRITE_GAMBLER, STAY, NONE, TEXT_CINNABARISLAND_GAMBLER def_warps_to CINNABAR_ISLAND diff --git a/data/maps/objects/CinnabarLab.asm b/data/maps/objects/CinnabarLab.asm index 3737843c..bced7c56 100644 --- a/data/maps/objects/CinnabarLab.asm +++ b/data/maps/objects/CinnabarLab.asm @@ -1,3 +1,6 @@ + object_const_def + const CINNABARLAB_FISHING_GURU + CinnabarLab_Object: db $17 ; border block @@ -9,12 +12,12 @@ CinnabarLab_Object: warp_event 16, 4, CINNABAR_LAB_FOSSIL_ROOM, 1 def_bg_events - bg_event 3, 2, 2 ; Lab1Text2 - bg_event 9, 4, 3 ; Lab1Text3 - bg_event 13, 4, 4 ; Lab1Text4 - bg_event 17, 4, 5 ; Lab1Text5 + bg_event 3, 2, TEXT_CINNABARLAB_PHOTO + bg_event 9, 4, TEXT_CINNABARLAB_MEETING_ROOM_SIGN + bg_event 13, 4, TEXT_CINNABARLAB_R_AND_D_SIGN + bg_event 17, 4, TEXT_CINNABARLAB_TESTING_ROOM_SIGN def_object_events - object_event 1, 3, SPRITE_FISHING_GURU, STAY, NONE, 1 ; person + object_event 1, 3, SPRITE_FISHING_GURU, STAY, NONE, TEXT_CINNABARLAB_FISHING_GURU def_warps_to CINNABAR_LAB diff --git a/data/maps/objects/CinnabarLabFossilRoom.asm b/data/maps/objects/CinnabarLabFossilRoom.asm index 29a805f7..6ffe4912 100644 --- a/data/maps/objects/CinnabarLabFossilRoom.asm +++ b/data/maps/objects/CinnabarLabFossilRoom.asm @@ -1,3 +1,7 @@ + object_const_def + const CINNABARLABFOSSILROOM_SCIENTIST1 + const CINNABARLABFOSSILROOM_SCIENTIST2 + CinnabarLabFossilRoom_Object: db $17 ; border block @@ -8,7 +12,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, TEXT_CINNABARLABFOSSILROOM_SCIENTIST1 + object_event 7, 6, SPRITE_SCIENTIST, STAY, UP, TEXT_CINNABARLABFOSSILROOM_SCIENTIST2 def_warps_to CINNABAR_LAB_FOSSIL_ROOM diff --git a/data/maps/objects/CinnabarLabMetronomeRoom.asm b/data/maps/objects/CinnabarLabMetronomeRoom.asm index ceadc217..926e9024 100644 --- a/data/maps/objects/CinnabarLabMetronomeRoom.asm +++ b/data/maps/objects/CinnabarLabMetronomeRoom.asm @@ -1,3 +1,7 @@ + object_const_def + const CINNABARLABMETRONOMEROOM_SCIENTIST1 + const CINNABARLABMETRONOMEROOM_SCIENTIST2 + CinnabarLabMetronomeRoom_Object: db $17 ; border block @@ -6,12 +10,12 @@ CinnabarLabMetronomeRoom_Object: warp_event 3, 7, CINNABAR_LAB, 4 def_bg_events - bg_event 0, 4, 3 ; Lab3Text3 - bg_event 1, 4, 4 ; Lab3Text4 - bg_event 2, 1, 5 ; Lab3Text5 + bg_event 0, 4, TEXT_CINNABARLABMETRONOMEROOM_PC_KEYBOARD + bg_event 1, 4, TEXT_CINNABARLABMETRONOMEROOM_PC_MONITOR + bg_event 2, 1, TEXT_CINNABARLABMETRONOMEROOM_AMBER_PIPE 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, TEXT_CINNABARLABMETRONOMEROOM_SCIENTIST1 + object_event 2, 3, SPRITE_SCIENTIST, WALK, LEFT_RIGHT, TEXT_CINNABARLABMETRONOMEROOM_SCIENTIST2 def_warps_to CINNABAR_LAB_METRONOME_ROOM diff --git a/data/maps/objects/CinnabarLabTradeRoom.asm b/data/maps/objects/CinnabarLabTradeRoom.asm index 11702821..69a94483 100644 --- a/data/maps/objects/CinnabarLabTradeRoom.asm +++ b/data/maps/objects/CinnabarLabTradeRoom.asm @@ -1,3 +1,8 @@ + object_const_def + const CINNABARLABTRADEROOM_SUPER_NERD + const CINNABARLABTRADEROOM_GRAMPS + const CINNABARLABTRADEROOM_BEAUTY + CinnabarLabTradeRoom_Object: db $17 ; border block @@ -8,8 +13,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, TEXT_CINNABARLABTRADEROOM_SUPER_NERD + object_event 1, 4, SPRITE_GRAMPS, STAY, NONE, TEXT_CINNABARLABTRADEROOM_GRAMPS + object_event 5, 5, SPRITE_BEAUTY, STAY, UP, TEXT_CINNABARLABTRADEROOM_BEAUTY def_warps_to CINNABAR_LAB_TRADE_ROOM diff --git a/data/maps/objects/CinnabarMart.asm b/data/maps/objects/CinnabarMart.asm index e91d18b2..d6651e97 100644 --- a/data/maps/objects/CinnabarMart.asm +++ b/data/maps/objects/CinnabarMart.asm @@ -1,3 +1,8 @@ + object_const_def + const CINNABARMART_CLERK + const CINNABARMART_SILPH_WORKER_F + const CINNABARMART_SCIENTIST + CinnabarMart_Object: db $0 ; border block @@ -8,8 +13,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, TEXT_CINNABARMART_CLERK + object_event 6, 2, SPRITE_SILPH_WORKER_F, STAY, NONE, TEXT_CINNABARMART_SILPH_WORKER_F + object_event 3, 4, SPRITE_SCIENTIST, STAY, NONE, TEXT_CINNABARMART_SCIENTIST def_warps_to CINNABAR_MART diff --git a/data/maps/objects/CinnabarPokecenter.asm b/data/maps/objects/CinnabarPokecenter.asm index 75d11926..1d3b39f0 100644 --- a/data/maps/objects/CinnabarPokecenter.asm +++ b/data/maps/objects/CinnabarPokecenter.asm @@ -1,3 +1,9 @@ + object_const_def + const CINNABARPOKECENTER_NURSE + const CINNABARPOKECENTER_COOLTRAINER_F + const CINNABARPOKECENTER_GENTLEMAN + const CINNABARPOKECENTER_LINK_RECEPTIONIST + CinnabarPokecenter_Object: db $0 ; border block @@ -8,9 +14,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, TEXT_CINNABARPOKECENTER_NURSE + object_event 9, 4, SPRITE_COOLTRAINER_F, WALK, ANY_DIR, TEXT_CINNABARPOKECENTER_COOLTRAINER_F + object_event 2, 6, SPRITE_GENTLEMAN, STAY, NONE, TEXT_CINNABARPOKECENTER_GENTLEMAN + object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, TEXT_CINNABARPOKECENTER_LINK_RECEPTIONIST def_warps_to CINNABAR_POKECENTER diff --git a/data/maps/objects/Colosseum.asm b/data/maps/objects/Colosseum.asm index 32327058..9d6b0441 100644 --- a/data/maps/objects/Colosseum.asm +++ b/data/maps/objects/Colosseum.asm @@ -1,3 +1,6 @@ + object_const_def + const COLOSSEUM_OPPONENT + Colosseum_Object: db $e ; border block @@ -6,6 +9,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, ANY_DIR, TEXT_COLOSSEUM_OPPONENT def_warps_to COLOSSEUM diff --git a/data/maps/objects/CopycatsHouse1F.asm b/data/maps/objects/CopycatsHouse1F.asm index 0a3705f4..e82bd780 100644 --- a/data/maps/objects/CopycatsHouse1F.asm +++ b/data/maps/objects/CopycatsHouse1F.asm @@ -1,3 +1,8 @@ + object_const_def + const COPYCATSHOUSE1F_MIDDLE_AGED_WOMAN + const COPYCATSHOUSE1F_MIDDLE_AGED_MAN + const COPYCATSHOUSE1F_CHANSEY + CopycatsHouse1F_Object: db $a ; border block @@ -9,8 +14,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, TEXT_COPYCATSHOUSE1F_MIDDLE_AGED_WOMAN + object_event 5, 4, SPRITE_MIDDLE_AGED_MAN, STAY, LEFT, TEXT_COPYCATSHOUSE1F_MIDDLE_AGED_MAN + object_event 1, 4, SPRITE_FAIRY, WALK, UP_DOWN, TEXT_COPYCATSHOUSE1F_CHANSEY def_warps_to COPYCATS_HOUSE_1F diff --git a/data/maps/objects/CopycatsHouse2F.asm b/data/maps/objects/CopycatsHouse2F.asm index 86449065..dbc9918d 100644 --- a/data/maps/objects/CopycatsHouse2F.asm +++ b/data/maps/objects/CopycatsHouse2F.asm @@ -1,3 +1,10 @@ + object_const_def + const COPYCATSHOUSE2F_COPYCAT + const COPYCATSHOUSE2F_DODUO + const COPYCATSHOUSE2F_MONSTER + const COPYCATSHOUSE2F_BIRD + const COPYCATSHOUSE2F_FAIRY + CopycatsHouse2F_Object: db $a ; border block @@ -5,14 +12,14 @@ CopycatsHouse2F_Object: warp_event 7, 1, COPYCATS_HOUSE_1F, 3 def_bg_events - bg_event 3, 5, 6 ; CopycatsHouse2FText6 - bg_event 0, 1, 7 ; CopycatsHouse2FText7 + bg_event 3, 5, TEXT_COPYCATSHOUSE2F_SNES + bg_event 0, 1, TEXT_COPYCATSHOUSE2F_PC 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, TEXT_COPYCATSHOUSE2F_COPYCAT + object_event 4, 6, SPRITE_BIRD, WALK, LEFT_RIGHT, TEXT_COPYCATSHOUSE2F_DODUO + object_event 5, 1, SPRITE_MONSTER, STAY, DOWN, TEXT_COPYCATSHOUSE2F_MONSTER + object_event 2, 0, SPRITE_BIRD, STAY, DOWN, TEXT_COPYCATSHOUSE2F_BIRD + object_event 1, 6, SPRITE_FAIRY, STAY, RIGHT, TEXT_COPYCATSHOUSE2F_FAIRY def_warps_to COPYCATS_HOUSE_2F diff --git a/data/maps/objects/Daycare.asm b/data/maps/objects/Daycare.asm index f3ece1a9..78060a94 100644 --- a/data/maps/objects/Daycare.asm +++ b/data/maps/objects/Daycare.asm @@ -1,3 +1,6 @@ + object_const_def + const DAYCARE_GENTLEMAN + Daycare_Object: db $a ; border block @@ -8,6 +11,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, TEXT_DAYCARE_GENTLEMAN def_warps_to DAYCARE diff --git a/data/maps/objects/DiglettsCaveRoute11.asm b/data/maps/objects/DiglettsCaveRoute11.asm index a0aa3ddb..50956693 100644 --- a/data/maps/objects/DiglettsCaveRoute11.asm +++ b/data/maps/objects/DiglettsCaveRoute11.asm @@ -1,3 +1,6 @@ + object_const_def + const DIGLETTSCAVEROUTE11_GAMBLER + DiglettsCaveRoute11_Object: db $7d ; border block @@ -9,6 +12,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, TEXT_DIGLETTSCAVEROUTE11_GAMBLER def_warps_to DIGLETTS_CAVE_ROUTE_11 diff --git a/data/maps/objects/DiglettsCaveRoute2.asm b/data/maps/objects/DiglettsCaveRoute2.asm index c8dc0561..97b975c0 100644 --- a/data/maps/objects/DiglettsCaveRoute2.asm +++ b/data/maps/objects/DiglettsCaveRoute2.asm @@ -1,3 +1,6 @@ + object_const_def + const DIGLETTSCAVEROUTE2_FISHING_GURU + DiglettsCaveRoute2_Object: db $7d ; border block @@ -9,6 +12,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, TEXT_DIGLETTSCAVEROUTE2_FISHING_GURU def_warps_to DIGLETTS_CAVE_ROUTE_2 diff --git a/data/maps/objects/FightingDojo.asm b/data/maps/objects/FightingDojo.asm index 808abf71..15ce598f 100644 --- a/data/maps/objects/FightingDojo.asm +++ b/data/maps/objects/FightingDojo.asm @@ -1,3 +1,12 @@ + object_const_def + const FIGHTINGDOJO_KARATE_MASTER + const FIGHTINGDOJO_BLACKBELT1 + const FIGHTINGDOJO_BLACKBELT2 + const FIGHTINGDOJO_BLACKBELT3 + const FIGHTINGDOJO_BLACKBELT4 + const FIGHTINGDOJO_HITMONLEE_POKE_BALL + const FIGHTINGDOJO_HITMONCHAN_POKE_BALL + FightingDojo_Object: db $3 ; border block @@ -8,12 +17,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, TEXT_FIGHTINGDOJO_KARATE_MASTER + object_event 3, 4, SPRITE_HIKER, STAY, RIGHT, 2, OPP_BLACKBELT, TEXT_FIGHTINGDOJO_BLACKBELT1 + object_event 3, 6, SPRITE_HIKER, STAY, RIGHT, 3, OPP_BLACKBELT, TEXT_FIGHTINGDOJO_BLACKBELT2 + object_event 5, 5, SPRITE_HIKER, STAY, LEFT, 4, OPP_BLACKBELT, TEXT_FIGHTINGDOJO_BLACKBELT3 + object_event 5, 7, SPRITE_HIKER, STAY, LEFT, 5, OPP_BLACKBELT, TEXT_FIGHTINGDOJO_BLACKBELT4 + object_event 4, 1, SPRITE_POKE_BALL, STAY, NONE, TEXT_FIGHTINGDOJO_HITMONLEE_POKE_BALL + object_event 5, 1, SPRITE_POKE_BALL, STAY, NONE, TEXT_FIGHTINGDOJO_HITMONCHAN_POKE_BALL def_warps_to FIGHTING_DOJO diff --git a/data/maps/objects/FuchsiaBillsGrandpasHouse.asm b/data/maps/objects/FuchsiaBillsGrandpasHouse.asm index 2369e7d0..3d9bc143 100644 --- a/data/maps/objects/FuchsiaBillsGrandpasHouse.asm +++ b/data/maps/objects/FuchsiaBillsGrandpasHouse.asm @@ -1,3 +1,8 @@ + object_const_def + const FUCHSIABILLSGRANDPASHOUSE_MIDDLE_AGED_WOMAN + const FUCHSIABILLSGRANDPASHOUSE_BILLS_GRANDPA + const FUCHSIABILLSGRANDPASHOUSE_YOUNGSTER + FuchsiaBillsGrandpasHouse_Object: db $a ; border block @@ -8,8 +13,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, TEXT_FUCHSIABILLSGRANDPASHOUSE_MIDDLE_AGED_WOMAN + object_event 7, 2, SPRITE_GAMBLER, STAY, UP, TEXT_FUCHSIABILLSGRANDPASHOUSE_BILLS_GRANDPA + object_event 5, 5, SPRITE_YOUNGSTER, STAY, NONE, TEXT_FUCHSIABILLSGRANDPASHOUSE_YOUNGSTER def_warps_to FUCHSIA_BILLS_GRANDPAS_HOUSE diff --git a/data/maps/objects/FuchsiaCity.asm b/data/maps/objects/FuchsiaCity.asm index c8ff36e6..7e4201ff 100644 --- a/data/maps/objects/FuchsiaCity.asm +++ b/data/maps/objects/FuchsiaCity.asm @@ -1,3 +1,15 @@ + object_const_def + const FUCHSIACITY_YOUNGSTER1 + const FUCHSIACITY_GAMBLER + const FUCHSIACITY_ERIK + const FUCHSIACITY_YOUNGSTER2 + const FUCHSIACITY_CHANSEY + const FUCHSIACITY_VOLTORB + const FUCHSIACITY_KANGASKHAN + const FUCHSIACITY_SLOWPOKE + const FUCHSIACITY_LAPRAS + const FUCHSIACITY_FOSSIL + FuchsiaCity_Object: db $f ; border block @@ -13,31 +25,31 @@ FuchsiaCity_Object: warp_event 31, 24, FUCHSIA_GOOD_ROD_HOUSE, 1 def_bg_events - bg_event 15, 23, 11 ; FuchsiaCityText11 - bg_event 25, 15, 12 ; FuchsiaCityText12 - bg_event 17, 5, 13 ; FuchsiaCityText13 - bg_event 6, 13, 14 ; MartSignText - bg_event 20, 27, 15 ; PokeCenterSignText - bg_event 27, 29, 16 ; FuchsiaCityText16 - bg_event 21, 15, 17 ; FuchsiaCityText17 - bg_event 5, 29, 18 ; FuchsiaCityText18 - bg_event 33, 7, 19 ; FuchsiaCityText19 - bg_event 27, 7, 20 ; FuchsiaCityText20 - bg_event 13, 7, 21 ; FuchsiaCityText21 - bg_event 31, 13, 22 ; FuchsiaCityText22 - bg_event 13, 15, 23 ; FuchsiaCityText23 - bg_event 7, 7, 24 ; FuchsiaCityText24 + bg_event 15, 23, TEXT_FUCHSIACITY_SIGN1 + bg_event 25, 15, TEXT_FUCHSIACITY_SIGN2 + bg_event 17, 5, TEXT_FUCHSIACITY_SAFARI_GAME_SIGN + bg_event 6, 13, TEXT_FUCHSIACITY_MART_SIGN + bg_event 20, 27, TEXT_FUCHSIACITY_POKECENTER_SIGN + bg_event 27, 29, TEXT_FUCHSIACITY_WARDENS_HOME_SIGN + bg_event 21, 15, TEXT_FUCHSIACITY_SAFARI_ZONE_SIGN + bg_event 5, 29, TEXT_FUCHSIACITY_GYM_SIGN + bg_event 33, 7, TEXT_FUCHSIACITY_CHANSEY_SIGN + bg_event 27, 7, TEXT_FUCHSIACITY_VOLTORB_SIGN + bg_event 13, 7, TEXT_FUCHSIACITY_KANGASKHAN_SIGN + bg_event 31, 13, TEXT_FUCHSIACITY_SLOWPOKE_SIGN + bg_event 13, 15, TEXT_FUCHSIACITY_LAPRAS_SIGN + bg_event 7, 7, TEXT_FUCHSIACITY_FOSSIL_SIGN def_object_events - 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 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 10, 12, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, TEXT_FUCHSIACITY_YOUNGSTER1 + object_event 28, 17, SPRITE_GAMBLER, WALK, LEFT_RIGHT, TEXT_FUCHSIACITY_GAMBLER + object_event 30, 14, SPRITE_FISHER, STAY, DOWN, TEXT_FUCHSIACITY_ERIK + object_event 24, 8, SPRITE_YOUNGSTER, STAY, UP, TEXT_FUCHSIACITY_YOUNGSTER2 + object_event 31, 5, SPRITE_FAIRY, WALK, ANY_DIR, TEXT_FUCHSIACITY_CHANSEY + object_event 25, 6, SPRITE_POKE_BALL, STAY, NONE, TEXT_FUCHSIACITY_VOLTORB + object_event 12, 6, SPRITE_MONSTER, WALK, LEFT_RIGHT, TEXT_FUCHSIACITY_KANGASKHAN + object_event 30, 12, SPRITE_MONSTER, WALK, LEFT_RIGHT, TEXT_FUCHSIACITY_SLOWPOKE + object_event 8, 17, SPRITE_SEEL, WALK, ANY_DIR, TEXT_FUCHSIACITY_LAPRAS + object_event 6, 5, SPRITE_FOSSIL, STAY, NONE, TEXT_FUCHSIACITY_FOSSIL def_warps_to FUCHSIA_CITY diff --git a/data/maps/objects/FuchsiaGoodRodHouse.asm b/data/maps/objects/FuchsiaGoodRodHouse.asm index 483734cd..eea49399 100644 --- a/data/maps/objects/FuchsiaGoodRodHouse.asm +++ b/data/maps/objects/FuchsiaGoodRodHouse.asm @@ -1,3 +1,6 @@ + object_const_def + const FUCHSIAGOODRODHOUSE_FISHING_GURU + FuchsiaGoodRodHouse_Object: db $c ; border block @@ -9,6 +12,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, TEXT_FUCHSIAGOODRODHOUSE_FISHING_GURU def_warps_to FUCHSIA_GOOD_ROD_HOUSE diff --git a/data/maps/objects/FuchsiaGym.asm b/data/maps/objects/FuchsiaGym.asm index 9c39cb5e..e3d0680a 100644 --- a/data/maps/objects/FuchsiaGym.asm +++ b/data/maps/objects/FuchsiaGym.asm @@ -1,3 +1,13 @@ + object_const_def + const FUCHSIAGYM_KOGA + const FUCHSIAGYM_ROCKER1 + const FUCHSIAGYM_ROCKER2 + const FUCHSIAGYM_ROCKER3 + const FUCHSIAGYM_ROCKER4 + const FUCHSIAGYM_ROCKER5 + const FUCHSIAGYM_ROCKER6 + const FUCHSIAGYM_GYM_GUIDE + FuchsiaGym_Object: db $3 ; border block @@ -8,13 +18,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, TEXT_FUCHSIAGYM_KOGA, OPP_KOGA, 1 + object_event 8, 13, SPRITE_ROCKER, STAY, DOWN, TEXT_FUCHSIAGYM_ROCKER1, OPP_JUGGLER, 7 + object_event 7, 8, SPRITE_ROCKER, STAY, RIGHT, TEXT_FUCHSIAGYM_ROCKER2, OPP_JUGGLER, 3 + object_event 1, 12, SPRITE_ROCKER, STAY, DOWN, TEXT_FUCHSIAGYM_ROCKER3, OPP_JUGGLER, 8 + object_event 3, 5, SPRITE_ROCKER, STAY, UP, TEXT_FUCHSIAGYM_ROCKER4, OPP_TAMER, 1 + object_event 8, 2, SPRITE_ROCKER, STAY, DOWN, TEXT_FUCHSIAGYM_ROCKER5, OPP_TAMER, 2 + object_event 2, 7, SPRITE_ROCKER, STAY, LEFT, TEXT_FUCHSIAGYM_ROCKER6, OPP_JUGGLER, 4 + object_event 7, 15, SPRITE_GYM_GUIDE, STAY, DOWN, TEXT_FUCHSIAGYM_GYM_GUIDE def_warps_to FUCHSIA_GYM diff --git a/data/maps/objects/FuchsiaMart.asm b/data/maps/objects/FuchsiaMart.asm index 04055fbd..b41ba0f6 100644 --- a/data/maps/objects/FuchsiaMart.asm +++ b/data/maps/objects/FuchsiaMart.asm @@ -1,3 +1,8 @@ + object_const_def + const FUCHSIAMART_CLERK + const FUCHSIAMART_MIDDLE_AGED_MAN + const FUCHSIAMART_COOLTRAINER_F + FuchsiaMart_Object: db $0 ; border block @@ -8,8 +13,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, TEXT_FUCHSIAMART_CLERK + object_event 4, 2, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, TEXT_FUCHSIAMART_MIDDLE_AGED_MAN + object_event 6, 5, SPRITE_COOLTRAINER_F, WALK, UP_DOWN, TEXT_FUCHSIAMART_COOLTRAINER_F def_warps_to FUCHSIA_MART diff --git a/data/maps/objects/FuchsiaMeetingRoom.asm b/data/maps/objects/FuchsiaMeetingRoom.asm index 2e4ac72a..c4670a09 100644 --- a/data/maps/objects/FuchsiaMeetingRoom.asm +++ b/data/maps/objects/FuchsiaMeetingRoom.asm @@ -1,3 +1,8 @@ + object_const_def + const FUCHSIAMEETINGROOM_SAFARI_ZONE_WORKER1 + const FUCHSIAMEETINGROOM_SAFARI_ZONE_WORKER2 + const FUCHSIAMEETINGROOM_SAFARI_ZONE_WORKER3 + FuchsiaMeetingRoom_Object: db $17 ; border block @@ -8,8 +13,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, TEXT_FUCHSIAMEETINGROOM_SAFARI_ZONE_WORKER1 + object_event 0, 2, SPRITE_SAFARI_ZONE_WORKER, STAY, UP, TEXT_FUCHSIAMEETINGROOM_SAFARI_ZONE_WORKER2 + object_event 10, 1, SPRITE_SAFARI_ZONE_WORKER, STAY, DOWN, TEXT_FUCHSIAMEETINGROOM_SAFARI_ZONE_WORKER3 def_warps_to FUCHSIA_MEETING_ROOM diff --git a/data/maps/objects/FuchsiaPokecenter.asm b/data/maps/objects/FuchsiaPokecenter.asm index 84404b09..efa75643 100644 --- a/data/maps/objects/FuchsiaPokecenter.asm +++ b/data/maps/objects/FuchsiaPokecenter.asm @@ -1,3 +1,9 @@ + object_const_def + const FUCHSIAPOKECENTER_NURSE + const FUCHSIAPOKECENTER_ROCKER + const FUCHSIAPOKECENTER_COOLTRAINER_F + const FUCHSIAPOKECENTER_LINK_RECEPTIONIST + FuchsiaPokecenter_Object: db $0 ; border block @@ -8,9 +14,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, TEXT_FUCHSIAPOKECENTER_NURSE + object_event 2, 3, SPRITE_ROCKER, STAY, NONE, TEXT_FUCHSIAPOKECENTER_ROCKER + object_event 6, 5, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, TEXT_FUCHSIAPOKECENTER_COOLTRAINER_F + object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, TEXT_FUCHSIAPOKECENTER_LINK_RECEPTIONIST def_warps_to FUCHSIA_POKECENTER diff --git a/data/maps/objects/GameCorner.asm b/data/maps/objects/GameCorner.asm index 2b4c8f72..06277a33 100644 --- a/data/maps/objects/GameCorner.asm +++ b/data/maps/objects/GameCorner.asm @@ -1,3 +1,16 @@ + object_const_def + const GAMECORNER_BEAUTY1 + const GAMECORNER_CLERK1 + const GAMECORNER_MIDDLE_AGED_MAN1 + const GAMECORNER_BEAUTY2 + const GAMECORNER_FISHING_GURU + const GAMECORNER_MIDDLE_AGED_WOMAN + const GAMECORNER_GYM_GUIDE + const GAMECORNER_GAMBLER + const GAMECORNER_CLERK2 + const GAMECORNER_GENTLEMAN + const GAMECORNER_ROCKET + GameCorner_Object: db $f ; border block @@ -7,19 +20,19 @@ GameCorner_Object: warp_event 17, 4, ROCKET_HIDEOUT_B1F, 2 def_bg_events - bg_event 9, 4, 12 ; CeladonGameCornerText12 + bg_event 9, 4, TEXT_GAMECORNER_POSTER 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 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 2, 6, SPRITE_BEAUTY, STAY, DOWN, TEXT_GAMECORNER_BEAUTY1 + object_event 5, 6, SPRITE_CLERK, STAY, DOWN, TEXT_GAMECORNER_CLERK1 + object_event 2, 10, SPRITE_MIDDLE_AGED_MAN, STAY, LEFT, TEXT_GAMECORNER_MIDDLE_AGED_MAN1 + object_event 2, 13, SPRITE_BEAUTY, STAY, LEFT, TEXT_GAMECORNER_BEAUTY2 + object_event 5, 11, SPRITE_FISHING_GURU, STAY, RIGHT, TEXT_GAMECORNER_FISHING_GURU + object_event 8, 11, SPRITE_MIDDLE_AGED_WOMAN, STAY, LEFT, TEXT_GAMECORNER_MIDDLE_AGED_WOMAN + object_event 8, 14, SPRITE_GYM_GUIDE, STAY, LEFT, TEXT_GAMECORNER_GYM_GUIDE + object_event 11, 15, SPRITE_GAMBLER, STAY, RIGHT, TEXT_GAMECORNER_GAMBLER + object_event 14, 11, SPRITE_CLERK, STAY, LEFT, TEXT_GAMECORNER_CLERK2 + object_event 17, 13, SPRITE_GENTLEMAN, STAY, RIGHT, TEXT_GAMECORNER_GENTLEMAN + object_event 9, 5, SPRITE_ROCKET, STAY, UP, TEXT_GAMECORNER_ROCKET, OPP_ROCKET, 7 def_warps_to GAME_CORNER diff --git a/data/maps/objects/GameCornerPrizeRoom.asm b/data/maps/objects/GameCornerPrizeRoom.asm index b79e52ef..14523813 100644 --- a/data/maps/objects/GameCornerPrizeRoom.asm +++ b/data/maps/objects/GameCornerPrizeRoom.asm @@ -1,3 +1,7 @@ + object_const_def + const GAMECORNERPRIZEROOM_BALDING_GUY + const GAMECORNERPRIZEROOM_GAMBLER + GameCornerPrizeRoom_Object: db $f ; border block @@ -6,12 +10,12 @@ GameCornerPrizeRoom_Object: warp_event 5, 7, LAST_MAP, 10 def_bg_events - bg_event 2, 2, 3 ; CeladonPrizeRoomText3 - bg_event 4, 2, 4 ; CeladonPrizeRoomText4 - bg_event 6, 2, 5 ; CeladonPrizeRoomText5 + bg_event 2, 2, TEXT_GAMECORNERPRIZEROOM_PRIZE_VENDOR_1 + bg_event 4, 2, TEXT_GAMECORNERPRIZEROOM_PRIZE_VENDOR_2 + bg_event 6, 2, TEXT_GAMECORNERPRIZEROOM_PRIZE_VENDOR_3 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, TEXT_GAMECORNERPRIZEROOM_BALDING_GUY + object_event 7, 3, SPRITE_GAMBLER, WALK, LEFT_RIGHT, TEXT_GAMECORNERPRIZEROOM_GAMBLER def_warps_to GAME_CORNER_PRIZE_ROOM diff --git a/data/maps/objects/HallOfFame.asm b/data/maps/objects/HallOfFame.asm index 31b9f8a2..5c711dbe 100644 --- a/data/maps/objects/HallOfFame.asm +++ b/data/maps/objects/HallOfFame.asm @@ -1,3 +1,6 @@ + object_const_def + const HALLOFFAME_OAK + HallOfFame_Object: db $3 ; border block @@ -8,6 +11,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, TEXT_HALLOFFAME_OAK def_warps_to HALL_OF_FAME diff --git a/data/maps/objects/IndigoPlateauLobby.asm b/data/maps/objects/IndigoPlateauLobby.asm index fd3d07ba..97ced88b 100644 --- a/data/maps/objects/IndigoPlateauLobby.asm +++ b/data/maps/objects/IndigoPlateauLobby.asm @@ -1,3 +1,10 @@ + object_const_def + const INDIGOPLATEAULOBBY_NURSE + const INDIGOPLATEAULOBBY_GYM_GUIDE + const INDIGOPLATEAULOBBY_COOLTRAINER_F + const INDIGOPLATEAULOBBY_CLERK + const INDIGOPLATEAULOBBY_LINK_RECEPTIONIST + IndigoPlateauLobby_Object: db $0 ; border block @@ -9,10 +16,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, TEXT_INDIGOPLATEAULOBBY_NURSE + object_event 4, 9, SPRITE_GYM_GUIDE, STAY, RIGHT, TEXT_INDIGOPLATEAULOBBY_GYM_GUIDE + object_event 5, 1, SPRITE_COOLTRAINER_F, STAY, DOWN, TEXT_INDIGOPLATEAULOBBY_COOLTRAINER_F + object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, TEXT_INDIGOPLATEAULOBBY_CLERK + object_event 13, 6, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, TEXT_INDIGOPLATEAULOBBY_LINK_RECEPTIONIST def_warps_to INDIGO_PLATEAU_LOBBY diff --git a/data/maps/objects/LancesRoom.asm b/data/maps/objects/LancesRoom.asm index c9334b3a..9cd2aaf3 100644 --- a/data/maps/objects/LancesRoom.asm +++ b/data/maps/objects/LancesRoom.asm @@ -1,3 +1,6 @@ + object_const_def + const LANCESROOM_LANCE + LancesRoom_Object: db $3 ; border block @@ -9,6 +12,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, TEXT_LANCESROOM_LANCE, OPP_LANCE, 1 def_warps_to LANCES_ROOM diff --git a/data/maps/objects/LavenderCuboneHouse.asm b/data/maps/objects/LavenderCuboneHouse.asm index 35e6f874..6ed53923 100644 --- a/data/maps/objects/LavenderCuboneHouse.asm +++ b/data/maps/objects/LavenderCuboneHouse.asm @@ -1,3 +1,7 @@ + object_const_def + const LAVENDERCUBONEHOUSE_CUBONE + const LAVENDERCUBONEHOUSE_BRUNETTE_GIRL + LavenderCuboneHouse_Object: db $a ; border block @@ -8,7 +12,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, TEXT_LAVENDERCUBONEHOUSE_CUBONE + object_event 2, 4, SPRITE_BRUNETTE_GIRL, STAY, RIGHT, TEXT_LAVENDERCUBONEHOUSE_BRUNETTE_GIRL def_warps_to LAVENDER_CUBONE_HOUSE diff --git a/data/maps/objects/LavenderMart.asm b/data/maps/objects/LavenderMart.asm index 28a9c236..7302981f 100644 --- a/data/maps/objects/LavenderMart.asm +++ b/data/maps/objects/LavenderMart.asm @@ -1,3 +1,8 @@ + object_const_def + const LAVENDERMART_CLERK + const LAVENDERMART_BALDING_GUY + const LAVENDERMART_COOLTRAINER_M + LavenderMart_Object: db $0 ; border block @@ -8,8 +13,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, TEXT_LAVENDERMART_CLERK + object_event 3, 4, SPRITE_BALDING_GUY, STAY, NONE, TEXT_LAVENDERMART_BALDING_GUY + object_event 7, 2, SPRITE_COOLTRAINER_M, STAY, NONE, TEXT_LAVENDERMART_COOLTRAINER_M def_warps_to LAVENDER_MART diff --git a/data/maps/objects/LavenderPokecenter.asm b/data/maps/objects/LavenderPokecenter.asm index 99c29528..2fb98ec0 100644 --- a/data/maps/objects/LavenderPokecenter.asm +++ b/data/maps/objects/LavenderPokecenter.asm @@ -1,3 +1,9 @@ + object_const_def + const LAVENDERPOKECENTER_NURSE + const LAVENDERPOKECENTER_GENTLEMAN + const LAVENDERPOKECENTER_LITTLE_GIRL + const LAVENDERPOKECENTER_LINK_RECEPTIONIST + LavenderPokecenter_Object: db $0 ; border block @@ -8,9 +14,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, TEXT_LAVENDERPOKECENTER_NURSE + object_event 5, 3, SPRITE_GENTLEMAN, STAY, NONE, TEXT_LAVENDERPOKECENTER_GENTLEMAN + object_event 2, 6, SPRITE_LITTLE_GIRL, WALK, UP_DOWN, TEXT_LAVENDERPOKECENTER_LITTLE_GIRL + object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, TEXT_LAVENDERPOKECENTER_LINK_RECEPTIONIST def_warps_to LAVENDER_POKECENTER diff --git a/data/maps/objects/LavenderTown.asm b/data/maps/objects/LavenderTown.asm index e2601721..76df4c60 100644 --- a/data/maps/objects/LavenderTown.asm +++ b/data/maps/objects/LavenderTown.asm @@ -1,3 +1,8 @@ + object_const_def + const LAVENDERTOWN_LITTLE_GIRL + const LAVENDERTOWN_COOLTRAINER_M + const LAVENDERTOWN_SUPER_NERD + LavenderTown_Object: db $2c ; border block @@ -10,16 +15,16 @@ LavenderTown_Object: warp_event 7, 13, NAME_RATERS_HOUSE, 1 def_bg_events - bg_event 11, 9, 4 ; LavenderTownText4 - bg_event 9, 3, 5 ; LavenderTownText5 - bg_event 16, 13, 6 ; MartSignText - bg_event 4, 5, 7 ; PokeCenterSignText - bg_event 5, 9, 8 ; LavenderTownText8 - bg_event 17, 7, 9 ; LavenderTownText9 + bg_event 11, 9, TEXT_LAVENDERTOWN_SIGN + bg_event 9, 3, TEXT_LAVENDERTOWN_SILPH_SCOPE_SIGN + bg_event 16, 13, TEXT_LAVENDERTOWN_MART_SIGN + bg_event 4, 5, TEXT_LAVENDERTOWN_POKECENTER_SIGN + bg_event 5, 9, TEXT_LAVENDERTOWN_POKEMON_HOUSE_SIGN + bg_event 17, 7, TEXT_LAVENDERTOWN_POKEMON_TOWER_SIGN 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, TEXT_LAVENDERTOWN_LITTLE_GIRL + object_event 9, 10, SPRITE_COOLTRAINER_M, STAY, NONE, TEXT_LAVENDERTOWN_COOLTRAINER_M + object_event 8, 7, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, TEXT_LAVENDERTOWN_SUPER_NERD def_warps_to LAVENDER_TOWN diff --git a/data/maps/objects/LoreleisRoom.asm b/data/maps/objects/LoreleisRoom.asm index 1db058e4..3a24b23c 100644 --- a/data/maps/objects/LoreleisRoom.asm +++ b/data/maps/objects/LoreleisRoom.asm @@ -1,3 +1,6 @@ + object_const_def + const LORELEISROOM_LORELEI + LoreleisRoom_Object: db $3 ; border block @@ -10,6 +13,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, TEXT_LORELEISROOM_LORELEI, OPP_LORELEI, 1 def_warps_to LORELEIS_ROOM diff --git a/data/maps/objects/MrFujisHouse.asm b/data/maps/objects/MrFujisHouse.asm index c84b8637..0a816d1e 100644 --- a/data/maps/objects/MrFujisHouse.asm +++ b/data/maps/objects/MrFujisHouse.asm @@ -1,3 +1,11 @@ + object_const_def + const MRFUJISHOUSE_SUPER_NERD + const MRFUJISHOUSE_LITTLE_GIRL + const MRFUJISHOUSE_PSYDUCK + const MRFUJISHOUSE_NIDORINO + const MRFUJISHOUSE_MR_FUJI + const MRFUJISHOUSE_POKEDEX + MrFujisHouse_Object: db $a ; border block @@ -8,11 +16,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, TEXT_MRFUJISHOUSE_SUPER_NERD + object_event 6, 3, SPRITE_LITTLE_GIRL, STAY, DOWN, TEXT_MRFUJISHOUSE_LITTLE_GIRL + object_event 6, 4, SPRITE_MONSTER, STAY, UP, TEXT_MRFUJISHOUSE_PSYDUCK + object_event 1, 3, SPRITE_MONSTER, STAY, NONE, TEXT_MRFUJISHOUSE_NIDORINO + object_event 3, 1, SPRITE_MR_FUJI, STAY, NONE, TEXT_MRFUJISHOUSE_MR_FUJI + object_event 3, 3, SPRITE_POKEDEX, STAY, NONE, TEXT_MRFUJISHOUSE_POKEDEX def_warps_to MR_FUJIS_HOUSE diff --git a/data/maps/objects/MrPsychicsHouse.asm b/data/maps/objects/MrPsychicsHouse.asm index c5180c6f..f7c009e6 100644 --- a/data/maps/objects/MrPsychicsHouse.asm +++ b/data/maps/objects/MrPsychicsHouse.asm @@ -1,3 +1,6 @@ + object_const_def + const MRPSYCHICSHOUSE_MR_PSYCHIC + MrPsychicsHouse_Object: db $a ; border block @@ -8,6 +11,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, TEXT_MRPSYCHICSHOUSE_MR_PSYCHIC def_warps_to MR_PSYCHICS_HOUSE diff --git a/data/maps/objects/MtMoon1F.asm b/data/maps/objects/MtMoon1F.asm index 4a6c095d..bc697395 100644 --- a/data/maps/objects/MtMoon1F.asm +++ b/data/maps/objects/MtMoon1F.asm @@ -1,3 +1,19 @@ + object_const_def + const MTMOON1F_HIKER + const MTMOON1F_YOUNGSTER1 + const MTMOON1F_COOLTRAINER_F1 + const MTMOON1F_SUPER_NERD + const MTMOON1F_COOLTRAINER_F2 + const MTMOON1F_YOUNGSTER2 + const MTMOON1F_YOUNGSTER3 + const MTMOON1F_POTION1 + const MTMOON1F_MOON_STONE + const MTMOON1F_RARE_CANDY + const MTMOON1F_ESCAPE_ROPE + const MTMOON1F_POTION2 + const MTMOON1F_TM_WATER_GUN + const MTMOON1F_BEWARE_ZUBAT_SIGN + MtMoon1F_Object: db $3 ; border block @@ -9,21 +25,21 @@ MtMoon1F_Object: warp_event 25, 15, MT_MOON_B1F, 4 def_bg_events - bg_event 15, 23, 14 ; MtMoon1Text14 + bg_event 15, 23, TEXT_MTMOON1F_BEWARE_ZUBAT_SIGN def_object_events - 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 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 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 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, 6, SPRITE_HIKER, STAY, DOWN, TEXT_MTMOON1F_HIKER, OPP_HIKER, 1 + object_event 12, 16, SPRITE_YOUNGSTER, STAY, RIGHT, TEXT_MTMOON1F_YOUNGSTER1, OPP_YOUNGSTER, 3 + object_event 30, 4, SPRITE_COOLTRAINER_F, STAY, DOWN, TEXT_MTMOON1F_COOLTRAINER_F1, OPP_LASS, 5 + object_event 24, 31, SPRITE_SUPER_NERD, STAY, UP, TEXT_MTMOON1F_SUPER_NERD, OPP_SUPER_NERD, 1 + object_event 16, 23, SPRITE_COOLTRAINER_F, STAY, DOWN, TEXT_MTMOON1F_COOLTRAINER_F2, OPP_LASS, 6 + object_event 7, 22, SPRITE_YOUNGSTER, STAY, DOWN, TEXT_MTMOON1F_YOUNGSTER2, OPP_BUG_CATCHER, 7 + object_event 30, 27, SPRITE_YOUNGSTER, STAY, RIGHT, TEXT_MTMOON1F_YOUNGSTER3, OPP_BUG_CATCHER, 8 + object_event 2, 20, SPRITE_POKE_BALL, STAY, NONE, TEXT_MTMOON1F_POTION1, POTION + object_event 2, 2, SPRITE_POKE_BALL, STAY, NONE, TEXT_MTMOON1F_MOON_STONE, MOON_STONE + object_event 35, 31, SPRITE_POKE_BALL, STAY, NONE, TEXT_MTMOON1F_RARE_CANDY, RARE_CANDY + object_event 36, 23, SPRITE_POKE_BALL, STAY, NONE, TEXT_MTMOON1F_ESCAPE_ROPE, ESCAPE_ROPE + object_event 20, 33, SPRITE_POKE_BALL, STAY, NONE, TEXT_MTMOON1F_POTION2, POTION + object_event 5, 32, SPRITE_POKE_BALL, STAY, NONE, TEXT_MTMOON1F_TM_WATER_GUN, TM_WATER_GUN def_warps_to MT_MOON_1F diff --git a/data/maps/objects/MtMoonB2F.asm b/data/maps/objects/MtMoonB2F.asm index 43c7db88..5f3bbf76 100644 --- a/data/maps/objects/MtMoonB2F.asm +++ b/data/maps/objects/MtMoonB2F.asm @@ -1,3 +1,14 @@ + object_const_def + const MTMOONB2F_SUPER_NERD + const MTMOONB2F_ROCKET1 + const MTMOONB2F_ROCKET2 + const MTMOONB2F_ROCKET3 + const MTMOONB2F_ROCKET4 + const MTMOONB2F_DOME_FOSSIL + const MTMOONB2F_HELIX_FOSSIL + const MTMOONB2F_HP_UP + const MTMOONB2F_TM_MEGA_PUNCH + MtMoonB2F_Object: db $3 ; border block @@ -10,14 +21,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 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 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 12, 8, SPRITE_SUPER_NERD, STAY, RIGHT, TEXT_MTMOONB2F_SUPER_NERD, OPP_SUPER_NERD, 2 + object_event 11, 16, SPRITE_ROCKET, STAY, DOWN, TEXT_MTMOONB2F_ROCKET1, OPP_ROCKET, 1 + object_event 15, 22, SPRITE_ROCKET, STAY, DOWN, TEXT_MTMOONB2F_ROCKET2, OPP_ROCKET, 2 + object_event 29, 11, SPRITE_ROCKET, STAY, UP, TEXT_MTMOONB2F_ROCKET3, OPP_ROCKET, 3 + object_event 29, 17, SPRITE_ROCKET, STAY, LEFT, TEXT_MTMOONB2F_ROCKET4, OPP_ROCKET, 4 + object_event 12, 6, SPRITE_FOSSIL, STAY, NONE, TEXT_MTMOONB2F_DOME_FOSSIL + object_event 13, 6, SPRITE_FOSSIL, STAY, NONE, TEXT_MTMOONB2F_HELIX_FOSSIL + object_event 25, 21, SPRITE_POKE_BALL, STAY, NONE, TEXT_MTMOONB2F_HP_UP, HP_UP + object_event 29, 5, SPRITE_POKE_BALL, STAY, NONE, TEXT_MTMOONB2F_TM_MEGA_PUNCH, 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..28049fef 100644 --- a/data/maps/objects/MtMoonPokecenter.asm +++ b/data/maps/objects/MtMoonPokecenter.asm @@ -1,3 +1,11 @@ + object_const_def + const MTMOONPOKECENTER_NURSE + const MTMOONPOKECENTER_YOUNGSTER + const MTMOONPOKECENTER_GENTLEMAN + const MTMOONPOKECENTER_MAGIKARP_SALESMAN + const MTMOONPOKECENTER_CLIPBOARD + const MTMOONPOKECENTER_LINK_RECEPTIONIST + MtMoonPokecenter_Object: db $0 ; border block @@ -8,11 +16,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, TEXT_MTMOONPOKECENTER_NURSE + object_event 4, 3, SPRITE_YOUNGSTER, STAY, UP, TEXT_MTMOONPOKECENTER_YOUNGSTER + object_event 7, 3, SPRITE_GENTLEMAN, STAY, UP, TEXT_MTMOONPOKECENTER_GENTLEMAN + object_event 10, 6, SPRITE_MIDDLE_AGED_MAN, WALK, LEFT_RIGHT, TEXT_MTMOONPOKECENTER_MAGIKARP_SALESMAN + object_event 7, 2, SPRITE_CLIPBOARD, STAY, NONE, TEXT_MTMOONPOKECENTER_CLIPBOARD + object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, TEXT_MTMOONPOKECENTER_LINK_RECEPTIONIST def_warps_to MT_MOON_POKECENTER diff --git a/data/maps/objects/Museum1F.asm b/data/maps/objects/Museum1F.asm index edbe63c9..d33151a6 100644 --- a/data/maps/objects/Museum1F.asm +++ b/data/maps/objects/Museum1F.asm @@ -1,3 +1,10 @@ + object_const_def + const MUSEUM1F_SCIENTIST1 + const MUSEUM1F_GAMBLER + const MUSEUM1F_SCIENTIST2 + const MUSEUM1F_SCIENTIST3 + const MUSEUM1F_OLD_AMBER + Museum1F_Object: db $a ; border block @@ -11,10 +18,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, TEXT_MUSEUM1F_SCIENTIST1 + object_event 1, 4, SPRITE_GAMBLER, STAY, NONE, TEXT_MUSEUM1F_GAMBLER + object_event 15, 2, SPRITE_SCIENTIST, STAY, DOWN, TEXT_MUSEUM1F_SCIENTIST2 + object_event 17, 4, SPRITE_SCIENTIST, STAY, NONE, TEXT_MUSEUM1F_SCIENTIST3 + object_event 16, 2, SPRITE_OLD_AMBER, STAY, NONE, TEXT_MUSEUM1F_OLD_AMBER def_warps_to MUSEUM_1F diff --git a/data/maps/objects/Museum2F.asm b/data/maps/objects/Museum2F.asm index 061833ca..e3c27117 100644 --- a/data/maps/objects/Museum2F.asm +++ b/data/maps/objects/Museum2F.asm @@ -1,3 +1,10 @@ + object_const_def + const MUSEUM2F_YOUNGSTER + const MUSEUM2F_GRAMPS + const MUSEUM2F_SCIENTIST + const MUSEUM2F_BRUNETTE_GIRL + const MUSEUM2F_HIKER + Museum2F_Object: db $a ; border block @@ -5,14 +12,14 @@ Museum2F_Object: warp_event 7, 7, MUSEUM_1F, 5 def_bg_events - bg_event 11, 2, 6 ; Museum2FText6 - bg_event 2, 5, 7 ; Museum2FText7 + bg_event 11, 2, TEXT_MUSEUM2F_SPACE_SHUTTLE_SIGN + bg_event 2, 5, TEXT_MUSEUM2F_MOON_STONE_SIGN 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, TEXT_MUSEUM2F_YOUNGSTER + object_event 0, 5, SPRITE_GRAMPS, STAY, DOWN, TEXT_MUSEUM2F_GRAMPS + object_event 7, 5, SPRITE_SCIENTIST, STAY, DOWN, TEXT_MUSEUM2F_SCIENTIST + object_event 11, 5, SPRITE_BRUNETTE_GIRL, STAY, NONE, TEXT_MUSEUM2F_BRUNETTE_GIRL + object_event 12, 5, SPRITE_HIKER, STAY, DOWN, TEXT_MUSEUM2F_HIKER def_warps_to MUSEUM_2F diff --git a/data/maps/objects/NameRatersHouse.asm b/data/maps/objects/NameRatersHouse.asm index 0568af76..0b6375e9 100644 --- a/data/maps/objects/NameRatersHouse.asm +++ b/data/maps/objects/NameRatersHouse.asm @@ -1,3 +1,6 @@ + object_const_def + const NAMERATERSHOUSE_NAME_RATER + NameRatersHouse_Object: db $a ; border block @@ -8,6 +11,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, TEXT_NAMERATERSHOUSE_NAME_RATER def_warps_to NAME_RATERS_HOUSE diff --git a/data/maps/objects/OaksLab.asm b/data/maps/objects/OaksLab.asm index 7fc869ef..f800e880 100644 --- a/data/maps/objects/OaksLab.asm +++ b/data/maps/objects/OaksLab.asm @@ -1,3 +1,16 @@ + object_const_def + const OAKSLAB_RIVAL + const OAKSLAB_CHARMANDER_POKE_BALL + const OAKSLAB_SQUIRTLE_POKE_BALL + const OAKSLAB_BULBASAUR_POKE_BALL + const OAKSLAB_OAK1 + const OAKSLAB_POKEDEX1 + const OAKSLAB_POKEDEX2 + const OAKSLAB_OAK2 + const OAKSLAB_GIRL + const OAKSLAB_SCIENTIST1 + const OAKSLAB_SCIENTIST2 + OaksLab_Object: db $3 ; border block @@ -8,16 +21,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, TEXT_OAKSLAB_RIVAL, OPP_RIVAL1, 1 + object_event 6, 3, SPRITE_POKE_BALL, STAY, NONE, TEXT_OAKSLAB_CHARMANDER_POKE_BALL + object_event 7, 3, SPRITE_POKE_BALL, STAY, NONE, TEXT_OAKSLAB_SQUIRTLE_POKE_BALL + object_event 8, 3, SPRITE_POKE_BALL, STAY, NONE, TEXT_OAKSLAB_BULBASAUR_POKE_BALL + object_event 5, 2, SPRITE_OAK, STAY, DOWN, TEXT_OAKSLAB_OAK1 + object_event 2, 1, SPRITE_POKEDEX, STAY, NONE, TEXT_OAKSLAB_POKEDEX1 + object_event 3, 1, SPRITE_POKEDEX, STAY, NONE, TEXT_OAKSLAB_POKEDEX2 + object_event 5, 10, SPRITE_OAK, STAY, UP, TEXT_OAKSLAB_OAK2 + object_event 1, 9, SPRITE_GIRL, WALK, UP_DOWN, TEXT_OAKSLAB_GIRL + object_event 2, 10, SPRITE_SCIENTIST, STAY, NONE, TEXT_OAKSLAB_SCIENTIST1 + object_event 8, 10, SPRITE_SCIENTIST, STAY, NONE, TEXT_OAKSLAB_SCIENTIST2 def_warps_to OAKS_LAB diff --git a/data/maps/objects/PalletTown.asm b/data/maps/objects/PalletTown.asm index 1343f0cd..793ec164 100644 --- a/data/maps/objects/PalletTown.asm +++ b/data/maps/objects/PalletTown.asm @@ -1,3 +1,8 @@ + object_const_def + const PALLETTOWN_OAK + const PALLETTOWN_GIRL + const PALLETTOWN_FISHER + PalletTown_Object: db $b ; border block @@ -7,14 +12,14 @@ PalletTown_Object: warp_event 12, 11, OAKS_LAB, 2 def_bg_events - bg_event 13, 13, 4 ; PalletTownText4 - bg_event 7, 9, 5 ; PalletTownText5 - bg_event 3, 5, 6 ; PalletTownText6 - bg_event 11, 5, 7 ; PalletTownText7 + bg_event 13, 13, TEXT_PALLETTOWN_OAKSLAB_SIGN + bg_event 7, 9, TEXT_PALLETTOWN_SIGN + bg_event 3, 5, TEXT_PALLETTOWN_PLAYERSHOUSE_SIGN + bg_event 11, 5, TEXT_PALLETTOWN_RIVALSHOUSE_SIGN 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 11, 14, SPRITE_FISHER, WALK, ANY_DIR, 3 ; person + object_event 8, 5, SPRITE_OAK, STAY, NONE, TEXT_PALLETTOWN_OAK + object_event 3, 8, SPRITE_GIRL, WALK, ANY_DIR, TEXT_PALLETTOWN_GIRL + object_event 11, 14, SPRITE_FISHER, WALK, ANY_DIR, TEXT_PALLETTOWN_FISHER def_warps_to PALLET_TOWN diff --git a/data/maps/objects/PewterCity.asm b/data/maps/objects/PewterCity.asm index 4a8e2323..b734ee40 100644 --- a/data/maps/objects/PewterCity.asm +++ b/data/maps/objects/PewterCity.asm @@ -1,3 +1,10 @@ + object_const_def + const PEWTERCITY_COOLTRAINER_F + const PEWTERCITY_COOLTRAINER_M + const PEWTERCITY_SUPER_NERD1 + const PEWTERCITY_SUPER_NERD2 + const PEWTERCITY_YOUNGSTER + PewterCity_Object: db $a ; border block @@ -11,19 +18,19 @@ PewterCity_Object: warp_event 13, 25, PEWTER_POKECENTER, 1 def_bg_events - bg_event 19, 29, 6 ; PewterCityText6 - bg_event 33, 19, 7 ; PewterCityText7 - bg_event 24, 17, 8 ; MartSignText - bg_event 14, 25, 9 ; PokeCenterSignText - bg_event 15, 9, 10 ; PewterCityText10 - bg_event 11, 17, 11 ; PewterCityText11 - bg_event 25, 23, 12 ; PewterCityText12 + bg_event 19, 29, TEXT_PEWTERCITY_TRAINER_TIPS + bg_event 33, 19, TEXT_PEWTERCITY_POLICE_NOTICE_SIGN + bg_event 24, 17, TEXT_PEWTERCITY_MART_SIGN + bg_event 14, 25, TEXT_PEWTERCITY_POKECENTER_SIGN + bg_event 15, 9, TEXT_PEWTERCITY_MUSEUM_SIGN + bg_event 11, 17, TEXT_PEWTERCITY_GYM_SIGN + bg_event 25, 23, TEXT_PEWTERCITY_SIGN def_object_events - 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 - object_event 35, 16, SPRITE_YOUNGSTER, STAY, DOWN, 5 ; person + object_event 8, 15, SPRITE_COOLTRAINER_F, STAY, NONE, TEXT_PEWTERCITY_COOLTRAINER_F + object_event 17, 25, SPRITE_COOLTRAINER_M, STAY, NONE, TEXT_PEWTERCITY_COOLTRAINER_M + object_event 27, 17, SPRITE_SUPER_NERD, STAY, NONE, TEXT_PEWTERCITY_SUPER_NERD1 + object_event 26, 25, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, TEXT_PEWTERCITY_SUPER_NERD2 + object_event 35, 16, SPRITE_YOUNGSTER, STAY, DOWN, TEXT_PEWTERCITY_YOUNGSTER def_warps_to PEWTER_CITY diff --git a/data/maps/objects/PewterGym.asm b/data/maps/objects/PewterGym.asm index cfaeefbf..ee82ed21 100644 --- a/data/maps/objects/PewterGym.asm +++ b/data/maps/objects/PewterGym.asm @@ -1,3 +1,8 @@ + object_const_def + const PEWTERGYM_BROCK + const PEWTERGYM_COOLTRAINER_M + const PEWTERGYM_GYM_GUIDE + PewterGym_Object: db $3 ; border block @@ -8,8 +13,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, TEXT_PEWTERGYM_BROCK, OPP_BROCK, 1 + object_event 3, 6, SPRITE_COOLTRAINER_M, STAY, RIGHT, TEXT_PEWTERGYM_COOLTRAINER_M, OPP_JR_TRAINER_M, 1 + object_event 7, 10, SPRITE_GYM_GUIDE, STAY, DOWN, TEXT_PEWTERGYM_GYM_GUIDE def_warps_to PEWTER_GYM diff --git a/data/maps/objects/PewterMart.asm b/data/maps/objects/PewterMart.asm index ad804c6b..e5fc199b 100644 --- a/data/maps/objects/PewterMart.asm +++ b/data/maps/objects/PewterMart.asm @@ -1,3 +1,8 @@ + object_const_def + const PEWTERMART_CLERK + const PEWTERMART_YOUNGSTER + const PEWTERMART_SUPER_NERD + PewterMart_Object: db $0 ; border block @@ -8,8 +13,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, TEXT_PEWTERMART_CLERK + object_event 3, 3, SPRITE_YOUNGSTER, WALK, UP_DOWN, TEXT_PEWTERMART_YOUNGSTER + object_event 5, 5, SPRITE_SUPER_NERD, STAY, NONE, TEXT_PEWTERMART_SUPER_NERD def_warps_to PEWTER_MART diff --git a/data/maps/objects/PewterNidoranHouse.asm b/data/maps/objects/PewterNidoranHouse.asm index 93924d01..d14ee345 100644 --- a/data/maps/objects/PewterNidoranHouse.asm +++ b/data/maps/objects/PewterNidoranHouse.asm @@ -1,3 +1,8 @@ + object_const_def + const PEWTERNIDORANHOUSE_NIDORAN + const PEWTERNIDORANHOUSE_LITTLE_BOY + const PEWTERNIDORANHOUSE_MIDDLE_AGED_MAN + PewterNidoranHouse_Object: db $a ; border block @@ -8,8 +13,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, PEWTERNIDORANHOUSE_NIDORAN + object_event 3, 5, SPRITE_LITTLE_BOY, STAY, RIGHT, PEWTERNIDORANHOUSE_LITTLE_BOY + object_event 1, 2, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, PEWTERNIDORANHOUSE_MIDDLE_AGED_MAN def_warps_to PEWTER_NIDORAN_HOUSE diff --git a/data/maps/objects/PewterPokecenter.asm b/data/maps/objects/PewterPokecenter.asm index 9d9e8e58..3b3e9cd9 100644 --- a/data/maps/objects/PewterPokecenter.asm +++ b/data/maps/objects/PewterPokecenter.asm @@ -1,3 +1,9 @@ + object_const_def + const PEWTERPOKECENTER_NURSE + const PEWTERPOKECENTER_GENTLEMAN + const PEWTERPOKECENTER_JIGGLYPUFF + const PEWTERPOKECENTER_LINK_RECEPTIONIST + PewterPokecenter_Object: db $0 ; border block @@ -8,9 +14,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, TEXT_PEWTERPOKECENTER_NURSE + object_event 11, 7, SPRITE_GENTLEMAN, STAY, LEFT, TEXT_PEWTERPOKECENTER_GENTLEMAN + object_event 1, 3, SPRITE_FAIRY, STAY, DOWN, TEXT_PEWTERPOKECENTER_JIGGLYPUFF + object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, TEXT_PEWTERPOKECENTER_LINK_RECEPTIONIST def_warps_to PEWTER_POKECENTER diff --git a/data/maps/objects/PewterSpeechHouse.asm b/data/maps/objects/PewterSpeechHouse.asm index a6896c43..0e892b60 100644 --- a/data/maps/objects/PewterSpeechHouse.asm +++ b/data/maps/objects/PewterSpeechHouse.asm @@ -1,3 +1,7 @@ + object_const_def + const PEWTERSPEECHHOUSE_GAMBLER + const PEWTERSPEECHHOUSE_YOUNGSTER + PewterSpeechHouse_Object: db $a ; border block @@ -8,7 +12,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, TEXT_PEWTERSPEECHHOUSE_GAMBLER + object_event 4, 5, SPRITE_YOUNGSTER, STAY, NONE, TEXT_PEWTERSPEECHHOUSE_YOUNGSTER def_warps_to PEWTER_SPEECH_HOUSE diff --git a/data/maps/objects/PokemonFanClub.asm b/data/maps/objects/PokemonFanClub.asm index c7d815f2..5ee899d3 100644 --- a/data/maps/objects/PokemonFanClub.asm +++ b/data/maps/objects/PokemonFanClub.asm @@ -1,3 +1,13 @@ + object_const_def + const POKEMONFANCLUB_PIKACHU_FAN + const POKEMONFANCLUB_SEEL_FAN + const POKEMONFANCLUB_PIKACHU + const POKEMONFANCLUB_SEEL + const POKEMONFANCLUB_CHAIRMAN + const POKEMONFANCLUB_RECEPTIONIST + const POKEMONFANCLUB_SIGN_1 + const POKEMONFANCLUB_SIGN_2 + PokemonFanClub_Object: db $d ; border block @@ -6,15 +16,15 @@ PokemonFanClub_Object: warp_event 3, 7, LAST_MAP, 2 def_bg_events - bg_event 1, 0, 7 ; FanClubText7 - bg_event 6, 0, 8 ; FanClubText8 + bg_event 1, 0, TEXT_POKEMONFANCLUB_SIGN_1 + bg_event 6, 0, TEXT_POKEMONFANCLUB_SIGN_2 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, TEXT_POKEMONFANCLUB_PIKACHU_FAN + object_event 1, 3, SPRITE_GIRL, STAY, RIGHT, TEXT_POKEMONFANCLUB_SEEL_FAN + object_event 6, 4, SPRITE_FAIRY, STAY, LEFT, TEXT_POKEMONFANCLUB_PIKACHU + object_event 1, 4, SPRITE_SEEL, STAY, RIGHT, TEXT_POKEMONFANCLUB_SEEL + object_event 3, 1, SPRITE_GENTLEMAN, STAY, DOWN, TEXT_POKEMONFANCLUB_CHAIRMAN + object_event 5, 1, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, TEXT_POKEMONFANCLUB_RECEPTIONIST def_warps_to POKEMON_FAN_CLUB diff --git a/data/maps/objects/PokemonMansion1F.asm b/data/maps/objects/PokemonMansion1F.asm index 5568f7fe..3fb8780e 100644 --- a/data/maps/objects/PokemonMansion1F.asm +++ b/data/maps/objects/PokemonMansion1F.asm @@ -1,3 +1,8 @@ + object_const_def + const POKEMONMANSION1F_SCIENTIST + const POKEMONMANSION1F_ESCAPE_ROPE + const POKEMONMANSION1F_CARBOS + PokemonMansion1F_Object: db $2e ; border block @@ -14,8 +19,8 @@ PokemonMansion1F_Object: def_bg_events 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 18, 21, SPRITE_POKE_BALL, STAY, NONE, 3, CARBOS + object_event 17, 17, SPRITE_SCIENTIST, STAY, LEFT, TEXT_POKEMONMANSION1F_SCIENTIST, OPP_SCIENTIST, 4 + object_event 14, 3, SPRITE_POKE_BALL, STAY, NONE, TEXT_POKEMONMANSION1F_ESCAPE_ROPE, ESCAPE_ROPE + object_event 18, 21, SPRITE_POKE_BALL, STAY, NONE, TEXT_POKEMONMANSION1F_CARBOS, CARBOS def_warps_to POKEMON_MANSION_1F diff --git a/data/maps/objects/PokemonMansion2F.asm b/data/maps/objects/PokemonMansion2F.asm index 52b65885..a4b71d2c 100644 --- a/data/maps/objects/PokemonMansion2F.asm +++ b/data/maps/objects/PokemonMansion2F.asm @@ -1,3 +1,9 @@ + object_const_def + const POKEMONMANSION2F_SUPER_NERD + const POKEMONMANSION2F_CALCIUM + const POKEMONMANSION2F_DIARY1 + const POKEMONMANSION2F_DIARY2 + PokemonMansion2F_Object: db $1 ; border block @@ -10,9 +16,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, TEXT_POKEMONMANSION2F_SUPER_NERD, OPP_BURGLAR, 7 + object_event 28, 7, SPRITE_POKE_BALL, STAY, NONE, TEXT_POKEMONMANSION2F_CALCIUM, CALCIUM + object_event 18, 2, SPRITE_POKEDEX, STAY, NONE, TEXT_POKEMONMANSION2F_DIARY1 + object_event 3, 22, SPRITE_POKEDEX, STAY, NONE, TEXT_POKEMONMANSION2F_DIARY2 def_warps_to POKEMON_MANSION_2F diff --git a/data/maps/objects/PokemonMansion3F.asm b/data/maps/objects/PokemonMansion3F.asm index b67e13bc..a9ebedc9 100644 --- a/data/maps/objects/PokemonMansion3F.asm +++ b/data/maps/objects/PokemonMansion3F.asm @@ -1,3 +1,10 @@ + object_const_def + const POKEMONMANSION3F_SUPER_NERD + const POKEMONMANSION3F_SCIENTIST + const POKEMONMANSION3F_MAX_POTION + const POKEMONMANSION3F_IRON + const POKEMONMANSION3F_DIARY + PokemonMansion3F_Object: db $1 ; border block @@ -9,10 +16,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 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 5, 11, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, TEXT_POKEMONMANSION3F_SUPER_NERD, OPP_BURGLAR, 8 + object_event 20, 11, SPRITE_SCIENTIST, STAY, LEFT, TEXT_POKEMONMANSION3F_SCIENTIST, OPP_SCIENTIST, 12 + object_event 1, 16, SPRITE_POKE_BALL, STAY, NONE, TEXT_POKEMONMANSION3F_MAX_POTION, MAX_POTION + object_event 25, 5, SPRITE_POKE_BALL, STAY, NONE, TEXT_POKEMONMANSION3F_IRON, IRON + object_event 6, 12, SPRITE_POKEDEX, STAY, NONE, TEXT_POKEMONMANSION3F_DIARY def_warps_to POKEMON_MANSION_3F diff --git a/data/maps/objects/PokemonMansionB1F.asm b/data/maps/objects/PokemonMansionB1F.asm index 12692e81..5d70db70 100644 --- a/data/maps/objects/PokemonMansionB1F.asm +++ b/data/maps/objects/PokemonMansionB1F.asm @@ -1,3 +1,13 @@ + object_const_def + const POKEMONMANSIONB1F_BURGLAR + const POKEMONMANSIONB1F_SCIENTIST + const POKEMONMANSIONB1F_RARE_CANDY + const POKEMONMANSIONB1F_FULL_RESTORE + const POKEMONMANSIONB1F_TM_BLIZZARD + const POKEMONMANSIONB1F_TM_SOLARBEAM + const POKEMONMANSIONB1F_DIARY + const POKEMONMANSIONB1F_SECRET_KEY + PokemonMansionB1F_Object: db $1 ; border block @@ -7,13 +17,13 @@ PokemonMansionB1F_Object: def_bg_events 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 19, 25, SPRITE_POKE_BALL, STAY, NONE, 5, TM_BLIZZARD - 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 16, 23, SPRITE_SUPER_NERD, STAY, NONE, TEXT_POKEMONMANSIONB1F_BURGLAR, OPP_BURGLAR, 9 + object_event 27, 11, SPRITE_SCIENTIST, STAY, DOWN, TEXT_POKEMONMANSIONB1F_SCIENTIST, OPP_SCIENTIST, 13 + object_event 10, 2, SPRITE_POKE_BALL, STAY, NONE, TEXT_POKEMONMANSIONB1F_RARE_CANDY, RARE_CANDY + object_event 1, 22, SPRITE_POKE_BALL, STAY, NONE, TEXT_POKEMONMANSIONB1F_FULL_RESTORE, FULL_RESTORE + object_event 19, 25, SPRITE_POKE_BALL, STAY, NONE, TEXT_POKEMONMANSIONB1F_TM_BLIZZARD, TM_BLIZZARD + object_event 5, 4, SPRITE_POKE_BALL, STAY, NONE, TEXT_POKEMONMANSIONB1F_TM_SOLARBEAM, TM_SOLARBEAM + object_event 16, 20, SPRITE_POKEDEX, STAY, NONE, TEXT_POKEMONMANSIONB1F_DIARY + object_event 5, 13, SPRITE_POKE_BALL, STAY, NONE, TEXT_POKEMONMANSIONB1F_SECRET_KEY, SECRET_KEY def_warps_to POKEMON_MANSION_B1F diff --git a/data/maps/objects/PokemonTower1F.asm b/data/maps/objects/PokemonTower1F.asm index bacf7244..0f8c64c3 100644 --- a/data/maps/objects/PokemonTower1F.asm +++ b/data/maps/objects/PokemonTower1F.asm @@ -1,3 +1,10 @@ + object_const_def + const POKEMONTOWER1F_RECEPTIONIST + const POKEMONTOWER1F_MIDDLE_AGED_WOMAN + const POKEMONTOWER1F_BALDING_GUY + const POKEMONTOWER1F_GIRL + const POKEMONTOWER1F_CHANNELER + PokemonTower1F_Object: db $1 ; border block @@ -9,10 +16,10 @@ PokemonTower1F_Object: def_bg_events 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 15, 13, SPRITE_LINK_RECEPTIONIST, STAY, UP, TEXT_POKEMONTOWER1F_RECEPTIONIST + object_event 6, 8, SPRITE_MIDDLE_AGED_WOMAN, STAY, NONE, TEXT_POKEMONTOWER1F_MIDDLE_AGED_WOMAN + object_event 8, 12, SPRITE_BALDING_GUY, STAY, NONE, TEXT_POKEMONTOWER1F_BALDING_GUY + object_event 13, 7, SPRITE_GIRL, STAY, NONE, TEXT_POKEMONTOWER1F_GIRL + object_event 17, 7, SPRITE_CHANNELER, STAY, LEFT, TEXT_POKEMONTOWER1F_CHANNELER def_warps_to POKEMON_TOWER_1F diff --git a/data/maps/objects/PokemonTower2F.asm b/data/maps/objects/PokemonTower2F.asm index e0635b68..ecdbc20a 100644 --- a/data/maps/objects/PokemonTower2F.asm +++ b/data/maps/objects/PokemonTower2F.asm @@ -1,3 +1,7 @@ + object_const_def + const POKEMONTOWER2F_RIVAL + const POKEMONTOWER2F_CHANNELER + PokemonTower2F_Object: db $1 ; border block @@ -8,7 +12,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, TEXT_POKEMONTOWER2F_RIVAL + object_event 3, 7, SPRITE_CHANNELER, STAY, RIGHT, TEXT_POKEMONTOWER2F_CHANNELER def_warps_to POKEMON_TOWER_2F diff --git a/data/maps/objects/PokemonTower3F.asm b/data/maps/objects/PokemonTower3F.asm index 6b49d967..2a5c9b8d 100644 --- a/data/maps/objects/PokemonTower3F.asm +++ b/data/maps/objects/PokemonTower3F.asm @@ -1,3 +1,9 @@ + object_const_def + const POKEMONTOWER3F_CHANNELER1 + const POKEMONTOWER3F_CHANNELER2 + const POKEMONTOWER3F_CHANNELER3 + const POKEMONTOWER3F_ESCAPE_ROPE + PokemonTower3F_Object: db $1 ; border block @@ -8,9 +14,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 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, 3, SPRITE_CHANNELER, STAY, LEFT, TEXT_POKEMONTOWER3F_CHANNELER1, OPP_CHANNELER, 5 + object_event 9, 8, SPRITE_CHANNELER, STAY, DOWN, TEXT_POKEMONTOWER3F_CHANNELER2, OPP_CHANNELER, 6 + object_event 10, 13, SPRITE_CHANNELER, STAY, DOWN, TEXT_POKEMONTOWER3F_CHANNELER3, OPP_CHANNELER, 8 + object_event 12, 1, SPRITE_POKE_BALL, STAY, NONE, TEXT_POKEMONTOWER3F_ESCAPE_ROPE, ESCAPE_ROPE def_warps_to POKEMON_TOWER_3F diff --git a/data/maps/objects/PokemonTower4F.asm b/data/maps/objects/PokemonTower4F.asm index 3bc31e70..ad8175eb 100644 --- a/data/maps/objects/PokemonTower4F.asm +++ b/data/maps/objects/PokemonTower4F.asm @@ -1,3 +1,11 @@ + object_const_def + const POKEMONTOWER4F_CHANNELER1 + const POKEMONTOWER4F_CHANNELER2 + const POKEMONTOWER4F_CHANNELER3 + const POKEMONTOWER4F_ELIXER + const POKEMONTOWER4F_AWAKENING + const POKEMONTOWER4F_HP_UP + PokemonTower4F_Object: db $1 ; border block @@ -8,11 +16,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 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 12, 16, SPRITE_POKE_BALL, STAY, NONE, 6, HP_UP + object_event 5, 10, SPRITE_CHANNELER, STAY, RIGHT, TEXT_POKEMONTOWER4F_CHANNELER1, OPP_CHANNELER, 9 + object_event 15, 7, SPRITE_CHANNELER, STAY, DOWN, TEXT_POKEMONTOWER4F_CHANNELER2, OPP_CHANNELER, 10 + object_event 14, 12, SPRITE_CHANNELER, STAY, LEFT, TEXT_POKEMONTOWER4F_CHANNELER3, OPP_CHANNELER, 12 + object_event 12, 10, SPRITE_POKE_BALL, STAY, NONE, TEXT_POKEMONTOWER4F_ELIXER, ELIXER + object_event 9, 10, SPRITE_POKE_BALL, STAY, NONE, TEXT_POKEMONTOWER4F_AWAKENING, AWAKENING + object_event 12, 16, SPRITE_POKE_BALL, STAY, NONE, TEXT_POKEMONTOWER4F_HP_UP, HP_UP def_warps_to POKEMON_TOWER_4F diff --git a/data/maps/objects/PokemonTower5F.asm b/data/maps/objects/PokemonTower5F.asm index 99bbe8f0..be27f3c1 100644 --- a/data/maps/objects/PokemonTower5F.asm +++ b/data/maps/objects/PokemonTower5F.asm @@ -1,3 +1,11 @@ + object_const_def + const POKEMONTOWER5F_CHANNELER1 + const POKEMONTOWER5F_CHANNELER2 + const POKEMONTOWER5F_CHANNELER3 + const POKEMONTOWER5F_CHANNELER4 + const POKEMONTOWER5F_CHANNELER5 + const POKEMONTOWER5F_NUGGET + PokemonTower5F_Object: db $1 ; border block @@ -8,11 +16,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, TEXT_POKEMONTOWER5F_CHANNELER1 + object_event 17, 7, SPRITE_CHANNELER, STAY, LEFT, TEXT_POKEMONTOWER5F_CHANNELER2, OPP_CHANNELER, 14 + object_event 14, 3, SPRITE_CHANNELER, STAY, LEFT, TEXT_POKEMONTOWER5F_CHANNELER3, OPP_CHANNELER, 16 + object_event 6, 10, SPRITE_CHANNELER, STAY, RIGHT, TEXT_POKEMONTOWER5F_CHANNELER4, OPP_CHANNELER, 17 + object_event 9, 16, SPRITE_CHANNELER, STAY, RIGHT, TEXT_POKEMONTOWER5F_CHANNELER5, OPP_CHANNELER, 18 + object_event 6, 14, SPRITE_POKE_BALL, STAY, NONE, TEXT_POKEMONTOWER5F_NUGGET, NUGGET def_warps_to POKEMON_TOWER_5F diff --git a/data/maps/objects/PokemonTower6F.asm b/data/maps/objects/PokemonTower6F.asm index fa828b16..96e0b5b5 100644 --- a/data/maps/objects/PokemonTower6F.asm +++ b/data/maps/objects/PokemonTower6F.asm @@ -1,3 +1,10 @@ + object_const_def + const POKEMONTOWER6F_CHANNELER1 + const POKEMONTOWER6F_CHANNELER2 + const POKEMONTOWER6F_CHANNELER3 + const POKEMONTOWER6F_RARE_CANDY + const POKEMONTOWER6F_X_ACCURACY + PokemonTower6F_Object: db $1 ; border block @@ -8,10 +15,10 @@ PokemonTower6F_Object: def_bg_events 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 14, 14, SPRITE_POKE_BALL, STAY, NONE, 5, X_ACCURACY + object_event 12, 10, SPRITE_CHANNELER, STAY, RIGHT, TEXT_POKEMONTOWER6F_CHANNELER1, OPP_CHANNELER, 19 + object_event 9, 5, SPRITE_CHANNELER, STAY, DOWN, TEXT_POKEMONTOWER6F_CHANNELER2, OPP_CHANNELER, 20 + object_event 16, 5, SPRITE_CHANNELER, STAY, LEFT, TEXT_POKEMONTOWER6F_CHANNELER3, OPP_CHANNELER, 21 + object_event 6, 8, SPRITE_POKE_BALL, STAY, NONE, TEXT_POKEMONTOWER6F_RARE_CANDY, RARE_CANDY + object_event 14, 14, SPRITE_POKE_BALL, STAY, NONE, TEXT_POKEMONTOWER6F_X_ACCURACY, X_ACCURACY def_warps_to POKEMON_TOWER_6F diff --git a/data/maps/objects/PokemonTower7F.asm b/data/maps/objects/PokemonTower7F.asm index 328588ed..9f72f3ed 100644 --- a/data/maps/objects/PokemonTower7F.asm +++ b/data/maps/objects/PokemonTower7F.asm @@ -1,3 +1,9 @@ + object_const_def + const POKEMONTOWER7F_ROCKET1 + const POKEMONTOWER7F_ROCKET2 + const POKEMONTOWER7F_ROCKET3 + const POKEMONTOWER7F_MR_FUJI + PokemonTower7F_Object: db $1 ; border block @@ -7,9 +13,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, TEXT_POKEMONTOWER7F_ROCKET1, OPP_ROCKET, 19 + object_event 12, 9, SPRITE_ROCKET, STAY, LEFT, TEXT_POKEMONTOWER7F_ROCKET2, OPP_ROCKET, 20 + object_event 9, 7, SPRITE_ROCKET, STAY, RIGHT, TEXT_POKEMONTOWER7F_ROCKET3, OPP_ROCKET, 21 + object_event 10, 3, SPRITE_MR_FUJI, STAY, DOWN, TEXT_POKEMONTOWER7F_MR_FUJI def_warps_to POKEMON_TOWER_7F diff --git a/data/maps/objects/PowerPlant.asm b/data/maps/objects/PowerPlant.asm index 419adc01..df3bca01 100644 --- a/data/maps/objects/PowerPlant.asm +++ b/data/maps/objects/PowerPlant.asm @@ -1,3 +1,19 @@ + object_const_def + const POWERPLANT_VOLTORB1 + const POWERPLANT_VOLTORB2 + const POWERPLANT_VOLTORB3 + const POWERPLANT_ELECTRODE1 + const POWERPLANT_VOLTORB4 + const POWERPLANT_VOLTORB5 + const POWERPLANT_ELECTRODE2 + const POWERPLANT_VOLTORB6 + const POWERPLANT_ZAPDOS + const POWERPLANT_CARBOS + const POWERPLANT_HP_UP + const POWERPLANT_RARE_CANDY + const POWERPLANT_TM_THUNDER + const POWERPLANT_TM_REFLECT + PowerPlant_Object: db $2e ; border block @@ -9,19 +25,19 @@ PowerPlant_Object: def_bg_events def_object_events - 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 - object_event 23, 34, SPRITE_POKE_BALL, STAY, NONE, 5, VOLTORB, 40 - 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 26, 32, SPRITE_POKE_BALL, STAY, NONE, 13, TM_THUNDER - object_event 20, 32, SPRITE_POKE_BALL, STAY, NONE, 14, TM_REFLECT + object_event 9, 20, SPRITE_POKE_BALL, STAY, NONE, TEXT_POWERPLANT_VOLTORB1, VOLTORB, 40 + object_event 32, 18, SPRITE_POKE_BALL, STAY, NONE, TEXT_POWERPLANT_VOLTORB2, VOLTORB, 40 + object_event 21, 25, SPRITE_POKE_BALL, STAY, NONE, TEXT_POWERPLANT_VOLTORB3, VOLTORB, 40 + object_event 25, 18, SPRITE_POKE_BALL, STAY, NONE, TEXT_POWERPLANT_ELECTRODE1, ELECTRODE, 43 + object_event 23, 34, SPRITE_POKE_BALL, STAY, NONE, TEXT_POWERPLANT_VOLTORB4, VOLTORB, 40 + object_event 26, 28, SPRITE_POKE_BALL, STAY, NONE, TEXT_POWERPLANT_VOLTORB5, VOLTORB, 40 + object_event 21, 14, SPRITE_POKE_BALL, STAY, NONE, TEXT_POWERPLANT_ELECTRODE2, ELECTRODE, 43 + object_event 37, 32, SPRITE_POKE_BALL, STAY, NONE, TEXT_POWERPLANT_VOLTORB6, VOLTORB, 40 + object_event 4, 9, SPRITE_BIRD, STAY, UP, TEXT_POWERPLANT_ZAPDOS, ZAPDOS, 50 + object_event 7, 25, SPRITE_POKE_BALL, STAY, NONE, TEXT_POWERPLANT_CARBOS, CARBOS + object_event 28, 3, SPRITE_POKE_BALL, STAY, NONE, TEXT_POWERPLANT_HP_UP, HP_UP + object_event 34, 3, SPRITE_POKE_BALL, STAY, NONE, TEXT_POWERPLANT_RARE_CANDY, RARE_CANDY + object_event 26, 32, SPRITE_POKE_BALL, STAY, NONE, TEXT_POWERPLANT_TM_THUNDER, TM_THUNDER + object_event 20, 32, SPRITE_POKE_BALL, STAY, NONE, TEXT_POWERPLANT_TM_REFLECT, TM_REFLECT def_warps_to POWER_PLANT diff --git a/data/maps/objects/RedsHouse1F.asm b/data/maps/objects/RedsHouse1F.asm index c8a2da55..9b259a99 100644 --- a/data/maps/objects/RedsHouse1F.asm +++ b/data/maps/objects/RedsHouse1F.asm @@ -1,3 +1,6 @@ + object_const_def + const REDSHOUSE1F_MOM + RedsHouse1F_Object: db $a ; border block @@ -7,9 +10,9 @@ RedsHouse1F_Object: warp_event 7, 1, REDS_HOUSE_2F, 1 def_bg_events - bg_event 3, 1, 2 ; RedsHouse1FTVText + bg_event 3, 1, TEXT_REDSHOUSE1F_TV def_object_events - object_event 5, 4, SPRITE_MOM, STAY, LEFT, 1 + object_event 5, 4, SPRITE_MOM, STAY, LEFT, TEXT_REDSHOUSE1F_MOM def_warps_to REDS_HOUSE_1F diff --git a/data/maps/objects/RockTunnel1F.asm b/data/maps/objects/RockTunnel1F.asm index 385214a4..57726be8 100644 --- a/data/maps/objects/RockTunnel1F.asm +++ b/data/maps/objects/RockTunnel1F.asm @@ -1,3 +1,12 @@ + object_const_def + const ROCKTUNNEL1F_HIKER1 + const ROCKTUNNEL1F_HIKER2 + const ROCKTUNNEL1F_HIKER3 + const ROCKTUNNEL1F_SUPER_NERD + const ROCKTUNNEL1F_COOLTRAINER_F1 + const ROCKTUNNEL1F_COOLTRAINER_F2 + const ROCKTUNNEL1F_COOLTRAINER_F3 + RockTunnel1F_Object: db $3 ; border block @@ -12,15 +21,15 @@ RockTunnel1F_Object: warp_event 37, 17, ROCK_TUNNEL_B1F, 4 def_bg_events - bg_event 11, 29, 8 ; RockTunnel1Text8 + bg_event 11, 29, TEXT_ROCKTUNNEL1F_SIGN 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 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 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 + object_event 7, 5, SPRITE_HIKER, STAY, DOWN, TEXT_ROCKTUNNEL1F_HIKER1, OPP_HIKER, 12 + object_event 5, 16, SPRITE_HIKER, STAY, DOWN, TEXT_ROCKTUNNEL1F_HIKER2, OPP_HIKER, 13 + object_event 17, 15, SPRITE_HIKER, STAY, LEFT, TEXT_ROCKTUNNEL1F_HIKER3, OPP_HIKER, 14 + object_event 23, 8, SPRITE_SUPER_NERD, STAY, LEFT, TEXT_ROCKTUNNEL1F_SUPER_NERD, OPP_POKEMANIAC, 7 + object_event 37, 21, SPRITE_COOLTRAINER_F, STAY, LEFT, TEXT_ROCKTUNNEL1F_COOLTRAINER_F1, OPP_JR_TRAINER_F, 17 + object_event 22, 24, SPRITE_COOLTRAINER_F, STAY, DOWN, TEXT_ROCKTUNNEL1F_COOLTRAINER_F2, OPP_JR_TRAINER_F, 18 + object_event 32, 24, SPRITE_COOLTRAINER_F, STAY, RIGHT, TEXT_ROCKTUNNEL1F_COOLTRAINER_F3, OPP_JR_TRAINER_F, 19 def_warps_to ROCK_TUNNEL_1F diff --git a/data/maps/objects/RockTunnelB1F.asm b/data/maps/objects/RockTunnelB1F.asm index a34a1a25..c0905cbc 100644 --- a/data/maps/objects/RockTunnelB1F.asm +++ b/data/maps/objects/RockTunnelB1F.asm @@ -1,3 +1,13 @@ + object_const_def + const ROCKTUNNELB1F_COOLTRAINER_F1 + const ROCKTUNNELB1F_HIKER1 + const ROCKTUNNELB1F_SUPER_NERD1 + const ROCKTUNNELB1F_SUPER_NERD2 + const ROCKTUNNELB1F_HIKER2 + const ROCKTUNNELB1F_COOLTRAINER_F2 + const ROCKTUNNELB1F_HIKER3 + const ROCKTUNNELB1F_SUPER_NERD3 + RockTunnelB1F_Object: db $3 ; border block @@ -10,13 +20,13 @@ RockTunnelB1F_Object: def_bg_events 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 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 26, 30, SPRITE_SUPER_NERD, STAY, DOWN, 8, OPP_POKEMANIAC, 5 + object_event 11, 13, SPRITE_COOLTRAINER_F, STAY, DOWN, TEXT_ROCKTUNNELB1F_COOLTRAINER_F1, OPP_JR_TRAINER_F, 9 + object_event 6, 10, SPRITE_HIKER, STAY, DOWN, TEXT_ROCKTUNNELB1F_HIKER1, OPP_HIKER, 9 + object_event 3, 5, SPRITE_SUPER_NERD, STAY, DOWN, TEXT_ROCKTUNNELB1F_SUPER_NERD1, OPP_POKEMANIAC, 3 + object_event 20, 21, SPRITE_SUPER_NERD, STAY, RIGHT, TEXT_ROCKTUNNELB1F_SUPER_NERD2, OPP_POKEMANIAC, 4 + object_event 30, 10, SPRITE_HIKER, STAY, DOWN, TEXT_ROCKTUNNELB1F_HIKER2, OPP_HIKER, 10 + object_event 14, 28, SPRITE_COOLTRAINER_F, STAY, RIGHT, TEXT_ROCKTUNNELB1F_COOLTRAINER_F2, OPP_JR_TRAINER_F, 10 + object_event 33, 5, SPRITE_HIKER, STAY, RIGHT, TEXT_ROCKTUNNELB1F_HIKER3, OPP_HIKER, 11 + object_event 26, 30, SPRITE_SUPER_NERD, STAY, DOWN, TEXT_ROCKTUNNELB1F_SUPER_NERD3, OPP_POKEMANIAC, 5 def_warps_to ROCK_TUNNEL_B1F diff --git a/data/maps/objects/RockTunnelPokecenter.asm b/data/maps/objects/RockTunnelPokecenter.asm index 27c22252..810fea0b 100644 --- a/data/maps/objects/RockTunnelPokecenter.asm +++ b/data/maps/objects/RockTunnelPokecenter.asm @@ -1,3 +1,9 @@ + object_const_def + const ROCKTUNNELPOKECENTER_NURSE + const ROCKTUNNELPOKECENTER_GENTLEMAN + const ROCKTUNNELPOKECENTER_FISHER + const ROCKTUNNELPOKECENTER_LINK_RECEPTIONIST + RockTunnelPokecenter_Object: db $0 ; border block @@ -8,9 +14,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, TEXT_ROCKTUNNELPOKECENTER_NURSE + object_event 7, 3, SPRITE_GENTLEMAN, WALK, LEFT_RIGHT, TEXT_ROCKTUNNELPOKECENTER_GENTLEMAN + object_event 2, 5, SPRITE_FISHER, STAY, NONE, TEXT_ROCKTUNNELPOKECENTER_FISHER + object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, TEXT_ROCKTUNNELPOKECENTER_LINK_RECEPTIONIST def_warps_to ROCK_TUNNEL_POKECENTER diff --git a/data/maps/objects/RocketHideoutB1F.asm b/data/maps/objects/RocketHideoutB1F.asm index 25750eb0..7d720960 100644 --- a/data/maps/objects/RocketHideoutB1F.asm +++ b/data/maps/objects/RocketHideoutB1F.asm @@ -1,3 +1,12 @@ + object_const_def + const ROCKETHIDEOUTB1F_ROCKET1 + const ROCKETHIDEOUTB1F_ROCKET2 + const ROCKETHIDEOUTB1F_ROCKET3 + const ROCKETHIDEOUTB1F_ROCKET4 + const ROCKETHIDEOUTB1F_ROCKET5 + const ROCKETHIDEOUTB1F_ESCAPE_ROPE + const ROCKETHIDEOUTB1F_HYPER_POTION + RocketHideoutB1F_Object: db $2e ; border block @@ -11,12 +20,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 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 26, 8, SPRITE_ROCKET, STAY, LEFT, TEXT_ROCKETHIDEOUTB1F_ROCKET1, OPP_ROCKET, 8 + object_event 12, 6, SPRITE_ROCKET, STAY, RIGHT, TEXT_ROCKETHIDEOUTB1F_ROCKET2, OPP_ROCKET, 9 + object_event 18, 17, SPRITE_ROCKET, STAY, DOWN, TEXT_ROCKETHIDEOUTB1F_ROCKET3, OPP_ROCKET, 10 + object_event 15, 25, SPRITE_ROCKET, STAY, RIGHT, TEXT_ROCKETHIDEOUTB1F_ROCKET4, OPP_ROCKET, 11 + object_event 28, 18, SPRITE_ROCKET, STAY, LEFT, TEXT_ROCKETHIDEOUTB1F_ROCKET5, OPP_ROCKET, 12 + object_event 11, 14, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROCKETHIDEOUTB1F_ESCAPE_ROPE, ESCAPE_ROPE + object_event 9, 17, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROCKETHIDEOUTB1F_HYPER_POTION, HYPER_POTION def_warps_to ROCKET_HIDEOUT_B1F diff --git a/data/maps/objects/RocketHideoutB2F.asm b/data/maps/objects/RocketHideoutB2F.asm index e118fb58..9808f58b 100644 --- a/data/maps/objects/RocketHideoutB2F.asm +++ b/data/maps/objects/RocketHideoutB2F.asm @@ -1,3 +1,10 @@ + object_const_def + const ROCKETHIDEOUTB2F_ROCKET + const ROCKETHIDEOUTB2F_MOON_STONE + const ROCKETHIDEOUTB2F_NUGGET + const ROCKETHIDEOUTB2F_TM_HORN_DRILL + const ROCKETHIDEOUTB2F_SUPER_POTION + RocketHideoutB2F_Object: db $2e ; border block @@ -11,10 +18,10 @@ RocketHideoutB2F_Object: def_bg_events 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 20, 12, SPRITE_ROCKET, STAY, DOWN, TEXT_ROCKETHIDEOUTB2F_ROCKET, OPP_ROCKET, 13 + object_event 1, 11, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROCKETHIDEOUTB2F_MOON_STONE, MOON_STONE + object_event 16, 8, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROCKETHIDEOUTB2F_NUGGET, NUGGET + object_event 6, 12, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROCKETHIDEOUTB2F_TM_HORN_DRILL, TM_HORN_DRILL + object_event 3, 21, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROCKETHIDEOUTB2F_SUPER_POTION, SUPER_POTION def_warps_to ROCKET_HIDEOUT_B2F diff --git a/data/maps/objects/RocketHideoutB3F.asm b/data/maps/objects/RocketHideoutB3F.asm index b679f87c..ee02d809 100644 --- a/data/maps/objects/RocketHideoutB3F.asm +++ b/data/maps/objects/RocketHideoutB3F.asm @@ -1,3 +1,9 @@ + object_const_def + const ROCKETHIDEOUTB3F_ROCKET1 + const ROCKETHIDEOUTB3F_ROCKET2 + const ROCKETHIDEOUTB3F_TM_DOUBLE_EDGE + const ROCKETHIDEOUTB3F_RARE_CANDY + RocketHideoutB3F_Object: db $2e ; border block @@ -8,9 +14,9 @@ RocketHideoutB3F_Object: def_bg_events def_object_events - object_event 10, 22, SPRITE_ROCKET, STAY, RIGHT, 1, OPP_ROCKET, 14 - object_event 26, 12, SPRITE_ROCKET, STAY, UP, 2, OPP_ROCKET, 15 - object_event 26, 17, SPRITE_POKE_BALL, STAY, NONE, 3, TM_DOUBLE_EDGE - object_event 20, 14, SPRITE_POKE_BALL, STAY, NONE, 4, RARE_CANDY + object_event 10, 22, SPRITE_ROCKET, STAY, RIGHT, TEXT_ROCKETHIDEOUTB3F_ROCKET1, OPP_ROCKET, 14 + object_event 26, 12, SPRITE_ROCKET, STAY, UP, TEXT_ROCKETHIDEOUTB3F_ROCKET2, OPP_ROCKET, 15 + object_event 26, 17, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROCKETHIDEOUTB3F_TM_DOUBLE_EDGE, TM_DOUBLE_EDGE + object_event 20, 14, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROCKETHIDEOUTB3F_RARE_CANDY, RARE_CANDY def_warps_to ROCKET_HIDEOUT_B3F diff --git a/data/maps/objects/RocketHideoutB4F.asm b/data/maps/objects/RocketHideoutB4F.asm index ecae529c..939b5c93 100644 --- a/data/maps/objects/RocketHideoutB4F.asm +++ b/data/maps/objects/RocketHideoutB4F.asm @@ -1,3 +1,14 @@ + object_const_def + const ROCKETHIDEOUTB4F_GIOVANNI + const ROCKETHIDEOUTB4F_ROCKET1 + const ROCKETHIDEOUTB4F_ROCKET2 + const ROCKETHIDEOUTB4F_ROCKET3 + const ROCKETHIDEOUTB4F_HP_UP + const ROCKETHIDEOUTB4F_TM_RAZOR_WIND + const ROCKETHIDEOUTB4F_IRON + const ROCKETHIDEOUTB4F_SLIPH_SCOPE + const ROCKETHIDEOUTB4F_LIFT_KEY + RocketHideoutB4F_Object: db $2e ; border block @@ -9,14 +20,14 @@ RocketHideoutB4F_Object: def_bg_events 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 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 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, 3, SPRITE_GIOVANNI, STAY, DOWN, TEXT_ROCKETHIDEOUTB4F_GIOVANNI, OPP_GIOVANNI, 1 + object_event 23, 12, SPRITE_ROCKET, STAY, DOWN, TEXT_ROCKETHIDEOUTB4F_ROCKET1, OPP_ROCKET, 16 + object_event 26, 12, SPRITE_ROCKET, STAY, DOWN, TEXT_ROCKETHIDEOUTB4F_ROCKET2, OPP_ROCKET, 17 + object_event 11, 2, SPRITE_ROCKET, STAY, DOWN, TEXT_ROCKETHIDEOUTB4F_ROCKET3, OPP_ROCKET, 18 + object_event 10, 12, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROCKETHIDEOUTB4F_HP_UP, HP_UP + object_event 9, 4, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROCKETHIDEOUTB4F_TM_RAZOR_WIND, TM_RAZOR_WIND + object_event 12, 20, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROCKETHIDEOUTB4F_IRON, IRON + object_event 25, 2, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROCKETHIDEOUTB4F_SILPH_SCOPE, SILPH_SCOPE + object_event 10, 2, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROCKETHIDEOUTB4F_LIFT_KEY, LIFT_KEY def_warps_to ROCKET_HIDEOUT_B4F diff --git a/data/maps/objects/RocketHideoutElevator.asm b/data/maps/objects/RocketHideoutElevator.asm index d31ec51b..92255d88 100644 --- a/data/maps/objects/RocketHideoutElevator.asm +++ b/data/maps/objects/RocketHideoutElevator.asm @@ -6,7 +6,7 @@ RocketHideoutElevator_Object: warp_event 3, 1, ROCKET_HIDEOUT_B1F, 5 def_bg_events - bg_event 1, 1, 1 ; RocketHideoutElevatorText1 + bg_event 1, 1, TEXT_ROCKETHIDEOUTELEVATOR def_object_events diff --git a/data/maps/objects/Route1.asm b/data/maps/objects/Route1.asm index b4ae442c..bb6bcf63 100644 --- a/data/maps/objects/Route1.asm +++ b/data/maps/objects/Route1.asm @@ -1,14 +1,18 @@ + object_const_def + const ROUTE1_YOUNGSTER1 + const ROUTE1_YOUNGSTER2 + Route1_Object: db $b ; border block def_warp_events def_bg_events - bg_event 9, 27, 3 ; Route1Text3 + bg_event 9, 27, TEXT_ROUTE1_SIGN def_object_events - object_event 5, 24, SPRITE_YOUNGSTER, WALK, UP_DOWN, 1 ; person - object_event 15, 13, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 2 ; person + object_event 5, 24, SPRITE_YOUNGSTER, WALK, UP_DOWN, TEXT_ROUTE1_YOUNGSTER1 + object_event 15, 13, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, TEXT_ROUTE1_YOUNGSTER2 def_warps_to ROUTE_1 diff --git a/data/maps/objects/Route10.asm b/data/maps/objects/Route10.asm index 01eae9cf..031ae521 100644 --- a/data/maps/objects/Route10.asm +++ b/data/maps/objects/Route10.asm @@ -1,3 +1,11 @@ + object_const_def + const ROUTE10_SUPER_NERD1 + const ROUTE10_HIKER1 + const ROUTE10_SUPER_NERD2 + const ROUTE10_COOLTRAINER_F1 + const ROUTE10_HIKER2 + const ROUTE10_COOLTRAINER_F2 + Route10_Object: db $2c ; border block @@ -8,17 +16,17 @@ Route10_Object: warp_event 6, 39, POWER_PLANT, 1 def_bg_events - bg_event 7, 19, 7 ; Route10Text7 - bg_event 12, 19, 8 ; PokeCenterSignText - bg_event 9, 55, 9 ; Route10Text9 - bg_event 5, 41, 10 ; Route10Text10 + bg_event 7, 19, TEXT_ROUTE10_ROCKTUNNEL_NORTH_SIGN + bg_event 12, 19, TEXT_ROUTE10_POKECENTER_SIGN + bg_event 9, 55, TEXT_ROUTE10_ROCKTUNNEL_SOUTH_SIGN + bg_event 5, 41, TEXT_ROUTE10_POWERPLANT_SIGN 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 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 10, 44, SPRITE_SUPER_NERD, STAY, LEFT, TEXT_ROUTE10_SUPER_NERD1, OPP_POKEMANIAC, 1 + object_event 3, 57, SPRITE_HIKER, STAY, UP, TEXT_ROUTE10_HIKER1, OPP_HIKER, 7 + object_event 14, 64, SPRITE_SUPER_NERD, STAY, LEFT, TEXT_ROUTE10_SUPER_NERD2, OPP_POKEMANIAC, 2 + object_event 7, 25, SPRITE_COOLTRAINER_F, STAY, LEFT, TEXT_ROUTE10_COOLTRAINER_F1, OPP_JR_TRAINER_F, 7 + object_event 3, 61, SPRITE_HIKER, STAY, DOWN, TEXT_ROUTE10_HIKER2, OPP_HIKER, 8 + object_event 7, 54, SPRITE_COOLTRAINER_F, STAY, DOWN, TEXT_ROUTE10_COOLTRAINER_F2, 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 6238a067..26487216 100644 --- a/data/maps/objects/Route11.asm +++ b/data/maps/objects/Route11.asm @@ -1,3 +1,15 @@ + object_const_def + const ROUTE11_GAMBLER1 + const ROUTE11_GAMBLER2 + const ROUTE11_YOUNGSTER1 + const ROUTE11_SUPER_NERD1 + const ROUTE11_YOUNGSTER2 + const ROUTE11_GAMBLER3 + const ROUTE11_GAMBLER4 + const ROUTE11_YOUNGSTER3 + const ROUTE11_SUPER_NERD2 + const ROUTE11_YOUNGSTER4 + Route11_Object: db $f ; border block @@ -9,18 +21,18 @@ Route11_Object: warp_event 4, 5, DIGLETTS_CAVE_ROUTE_11, 1 def_bg_events - bg_event 1, 5, 11 ; Route11Text11 + bg_event 1, 5, TEXT_ROUTE11_DIGLETTSCAVE_SIGN 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 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 45, 16, SPRITE_SUPER_NERD, STAY, LEFT, 9, OPP_ENGINEER, 3 - object_event 22, 12, SPRITE_YOUNGSTER, STAY, UP, 10, OPP_YOUNGSTER, 12 + object_event 10, 14, SPRITE_GAMBLER, STAY, DOWN, TEXT_ROUTE11_GAMBLER1, OPP_GAMBLER, 1 + object_event 26, 9, SPRITE_GAMBLER, STAY, DOWN, TEXT_ROUTE11_GAMBLER2, OPP_GAMBLER, 2 + object_event 13, 5, SPRITE_YOUNGSTER, STAY, LEFT, TEXT_ROUTE11_YOUNGSTER1, OPP_YOUNGSTER, 9 + object_event 36, 11, SPRITE_SUPER_NERD, STAY, DOWN, TEXT_ROUTE11_SUPER_NERD1, OPP_ENGINEER, 2 + object_event 22, 4, SPRITE_YOUNGSTER, STAY, UP, TEXT_ROUTE11_YOUNGSTER2, OPP_YOUNGSTER, 10 + object_event 45, 7, SPRITE_GAMBLER, STAY, DOWN, TEXT_ROUTE11_GAMBLER3, OPP_GAMBLER, 3 + object_event 33, 3, SPRITE_GAMBLER, STAY, UP, TEXT_ROUTE11_GAMBLER4, OPP_GAMBLER, 4 + object_event 43, 5, SPRITE_YOUNGSTER, STAY, RIGHT, TEXT_ROUTE11_YOUNGSTER3, OPP_YOUNGSTER, 11 + object_event 45, 16, SPRITE_SUPER_NERD, STAY, LEFT, TEXT_ROUTE11_SUPER_NERD2, OPP_ENGINEER, 3 + object_event 22, 12, SPRITE_YOUNGSTER, STAY, UP, TEXT_ROUTE11_YOUNGSTER4, OPP_YOUNGSTER, 12 def_warps_to ROUTE_11 diff --git a/data/maps/objects/Route11Gate1F.asm b/data/maps/objects/Route11Gate1F.asm index ea40cc90..56d2e7f7 100644 --- a/data/maps/objects/Route11Gate1F.asm +++ b/data/maps/objects/Route11Gate1F.asm @@ -1,3 +1,6 @@ + object_const_def + const ROUTE11GATE1F_GUARD + Route11Gate1F_Object: db $a ; border block @@ -11,6 +14,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, TEXT_ROUTE11GATE1F_GUARD def_warps_to ROUTE_11_GATE_1F diff --git a/data/maps/objects/Route11Gate2F.asm b/data/maps/objects/Route11Gate2F.asm index ad257fbb..7e76288a 100644 --- a/data/maps/objects/Route11Gate2F.asm +++ b/data/maps/objects/Route11Gate2F.asm @@ -1,3 +1,7 @@ + object_const_def + const ROUTE11GATE2F_YOUNGSTER + const ROUTE11GATE2F_OAKS_AIDE + Route11Gate2F_Object: db $a ; border block @@ -5,11 +9,11 @@ Route11Gate2F_Object: warp_event 7, 7, ROUTE_11_GATE_1F, 5 def_bg_events - bg_event 1, 2, 3 ; Route11GateUpstairsText3 - bg_event 6, 2, 4 ; Route11GateUpstairsText4 + bg_event 1, 2, TEXT_ROUTE11GATE2F_LEFT_BINOCULARS + bg_event 6, 2, TEXT_ROUTE11GATE2F_RIGHT_BINOCULARS 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, TEXT_ROUTE11GATE2F_YOUNGSTER + object_event 2, 6, SPRITE_SCIENTIST, STAY, NONE, TEXT_ROUTE11GATE2F_OAKS_AIDE def_warps_to ROUTE_11_GATE_2F diff --git a/data/maps/objects/Route12.asm b/data/maps/objects/Route12.asm index e7fc92f1..4884a6f9 100644 --- a/data/maps/objects/Route12.asm +++ b/data/maps/objects/Route12.asm @@ -1,3 +1,15 @@ + object_const_def + const ROUTE12_SNORLAX + const ROUTE12_FISHER1 + const ROUTE12_FISHER2 + const ROUTE12_COOLTRAINER_M + const ROUTE12_SUPER_NERD + const ROUTE12_FISHER3 + const ROUTE12_FISHER4 + const ROUTE12_FISHER5 + const ROUTE12_TM_PAY_DAY + const ROUTE12_IRON + Route12_Object: db $43 ; border block @@ -8,19 +20,19 @@ Route12_Object: warp_event 11, 77, ROUTE_12_SUPER_ROD_HOUSE, 1 def_bg_events - bg_event 13, 13, 11 ; Route12Text11 - bg_event 11, 63, 12 ; Route12Text12 + bg_event 13, 13, TEXT_ROUTE12_SIGN + bg_event 11, 63, TEXT_ROUTE12_SPORT_FISHING_SIGN 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 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 14, 35, SPRITE_POKE_BALL, STAY, NONE, 9, TM_PAY_DAY - object_event 5, 89, SPRITE_POKE_BALL, STAY, NONE, 10, IRON + object_event 10, 62, SPRITE_SNORLAX, STAY, DOWN, TEXT_ROUTE12_SNORLAX + object_event 14, 31, SPRITE_FISHER, STAY, LEFT, TEXT_ROUTE12_FISHER1, OPP_FISHER, 3 + object_event 5, 39, SPRITE_FISHER, STAY, UP, TEXT_ROUTE12_FISHER2, OPP_FISHER, 4 + object_event 11, 92, SPRITE_COOLTRAINER_M, STAY, LEFT, TEXT_ROUTE12_COOLTRAINER_M, OPP_JR_TRAINER_M, 9 + object_event 14, 76, SPRITE_SUPER_NERD, STAY, UP, TEXT_ROUTE12_SUPER_NERD, OPP_ROCKER, 2 + object_event 12, 40, SPRITE_FISHER, STAY, LEFT, TEXT_ROUTE12_FISHER3, OPP_FISHER, 5 + object_event 9, 52, SPRITE_FISHER, STAY, RIGHT, TEXT_ROUTE12_FISHER4, OPP_FISHER, 6 + object_event 6, 87, SPRITE_FISHER, STAY, DOWN, TEXT_ROUTE12_FISHER5, OPP_FISHER, 11 + object_event 14, 35, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROUTE12_TM_PAY_DAY, TM_PAY_DAY + object_event 5, 89, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROUTE12_IRON, IRON def_warps_to ROUTE_12 diff --git a/data/maps/objects/Route12Gate1F.asm b/data/maps/objects/Route12Gate1F.asm index 67cd4a25..eef1a37d 100644 --- a/data/maps/objects/Route12Gate1F.asm +++ b/data/maps/objects/Route12Gate1F.asm @@ -1,3 +1,6 @@ + object_const_def + const ROUTE12GATE1F_GUARD + Route12Gate1F_Object: db $a ; border block @@ -11,6 +14,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, TEXT_ROUTE12GATE1F_GUARD def_warps_to ROUTE_12_GATE_1F diff --git a/data/maps/objects/Route12Gate2F.asm b/data/maps/objects/Route12Gate2F.asm index 13501b5c..a3fc5c80 100644 --- a/data/maps/objects/Route12Gate2F.asm +++ b/data/maps/objects/Route12Gate2F.asm @@ -1,3 +1,6 @@ + object_const_def + const ROUTE12GATE2F_BRUNETTE_GIRL + Route12Gate2F_Object: db $a ; border block @@ -5,10 +8,10 @@ Route12Gate2F_Object: warp_event 7, 7, ROUTE_12_GATE_1F, 5 def_bg_events - bg_event 1, 2, 2 ; Route12GateUpstairsText2 - bg_event 6, 2, 3 ; Route12GateUpstairsText3 + bg_event 1, 2, TEXT_ROUTE12GATE2F_LEFT_BINOCULARS + bg_event 6, 2, TEXT_ROUTE12GATE2F_RIGHT_BINOCULARS 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, TEXT_ROUTE12GATE2F_BRUNETTE_GIRL def_warps_to ROUTE_12_GATE_2F diff --git a/data/maps/objects/Route12SuperRodHouse.asm b/data/maps/objects/Route12SuperRodHouse.asm index 14b7747a..b9899c67 100644 --- a/data/maps/objects/Route12SuperRodHouse.asm +++ b/data/maps/objects/Route12SuperRodHouse.asm @@ -1,3 +1,6 @@ + object_const_def + const ROUTE12SUPERRODHOUSE_FISHING_GURU + Route12SuperRodHouse_Object: db $a ; border block @@ -8,6 +11,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, TEXT_ROUTE12SUPERRODHOUSE_FISHING_GURU def_warps_to ROUTE_12_SUPER_ROD_HOUSE diff --git a/data/maps/objects/Route13.asm b/data/maps/objects/Route13.asm index a3397573..ef9d1276 100644 --- a/data/maps/objects/Route13.asm +++ b/data/maps/objects/Route13.asm @@ -1,23 +1,35 @@ + object_const_def + const ROUTE13_COOLTRAINER_M1 + const ROUTE13_COOLTRAINER_F1 + const ROUTE13_COOLTRAINER_F2 + const ROUTE13_COOLTRAINER_F3 + const ROUTE13_COOLTRAINER_F4 + const ROUTE13_COOLTRAINER_M2 + const ROUTE13_BEAUTY1 + const ROUTE13_BEAUTY2 + const ROUTE13_BIKER + const ROUTE13_COOLTRAINER_M3 + Route13_Object: db $43 ; border block def_warp_events def_bg_events - bg_event 15, 13, 11 ; Route13Text11 - bg_event 33, 5, 12 ; Route13Text12 - bg_event 31, 11, 13 ; Route13Text13 + bg_event 15, 13, TEXT_ROUTE13_TRAINER_TIPS1 + bg_event 33, 5, TEXT_ROUTE13_TRAINER_TIPS2 + bg_event 31, 11, TEXT_ROUTE13_SIGN 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 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 49, 10, SPRITE_COOLTRAINER_M, STAY, RIGHT, TEXT_ROUTE13_COOLTRAINER_M1, OPP_BIRD_KEEPER, 1 + object_event 48, 10, SPRITE_COOLTRAINER_F, STAY, DOWN, TEXT_ROUTE13_COOLTRAINER_F1, OPP_JR_TRAINER_F, 12 + object_event 27, 9, SPRITE_COOLTRAINER_F, STAY, DOWN, TEXT_ROUTE13_COOLTRAINER_F2, OPP_JR_TRAINER_F, 13 + object_event 23, 10, SPRITE_COOLTRAINER_F, STAY, LEFT, TEXT_ROUTE13_COOLTRAINER_F3, OPP_JR_TRAINER_F, 14 + object_event 50, 5, SPRITE_COOLTRAINER_F, STAY, DOWN, TEXT_ROUTE13_COOLTRAINER_F4, OPP_JR_TRAINER_F, 15 + object_event 12, 4, SPRITE_COOLTRAINER_M, STAY, RIGHT, TEXT_ROUTE13_COOLTRAINER_M2, OPP_BIRD_KEEPER, 2 + object_event 33, 6, SPRITE_BEAUTY, STAY, DOWN, TEXT_ROUTE13_BEAUTY1, OPP_BEAUTY, 4 + object_event 32, 6, SPRITE_BEAUTY, STAY, DOWN, TEXT_ROUTE13_BEAUTY2, OPP_BEAUTY, 5 + object_event 10, 7, SPRITE_BIKER, STAY, UP, TEXT_ROUTE13_BIKER, OPP_BIKER, 1 + object_event 7, 13, SPRITE_COOLTRAINER_M, STAY, UP, TEXT_ROUTE13_COOLTRAINER_M3, OPP_BIRD_KEEPER, 3 def_warps_to ROUTE_13 diff --git a/data/maps/objects/Route14.asm b/data/maps/objects/Route14.asm index b9244646..0ca3a40a 100644 --- a/data/maps/objects/Route14.asm +++ b/data/maps/objects/Route14.asm @@ -1,21 +1,33 @@ + object_const_def + const ROUTE14_COOLTRAINER_M1 + const ROUTE14_COOLTRAINER_M2 + const ROUTE14_COOLTRAINER_M3 + const ROUTE14_COOLTRAINER_M4 + const ROUTE14_COOLTRAINER_M5 + const ROUTE14_COOLTRAINER_M6 + const ROUTE14_BIKER1 + const ROUTE14_BIKER2 + const ROUTE14_BIKER3 + const ROUTE14_BIKER4 + Route14_Object: db $43 ; border block def_warp_events def_bg_events - bg_event 17, 13, 11 ; Route14Text11 + bg_event 17, 13, TEXT_ROUTE14_SIGN 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 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 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, 4, SPRITE_COOLTRAINER_M, STAY, DOWN, TEXT_ROUTE14_COOLTRAINER_M1, OPP_BIRD_KEEPER, 14 + object_event 15, 6, SPRITE_COOLTRAINER_M, STAY, DOWN, TEXT_ROUTE14_COOLTRAINER_M2, OPP_BIRD_KEEPER, 15 + object_event 12, 11, SPRITE_COOLTRAINER_M, STAY, DOWN, TEXT_ROUTE14_COOLTRAINER_M3, OPP_BIRD_KEEPER, 16 + object_event 14, 15, SPRITE_COOLTRAINER_M, STAY, UP, TEXT_ROUTE14_COOLTRAINER_M4, OPP_BIRD_KEEPER, 17 + object_event 15, 31, SPRITE_COOLTRAINER_M, STAY, LEFT, TEXT_ROUTE14_COOLTRAINER_M5, OPP_BIRD_KEEPER, 4 + object_event 6, 49, SPRITE_COOLTRAINER_M, STAY, UP, TEXT_ROUTE14_COOLTRAINER_M6, OPP_BIRD_KEEPER, 5 + object_event 5, 39, SPRITE_BIKER, STAY, DOWN, TEXT_ROUTE14_BIKER1, OPP_BIKER, 13 + object_event 4, 30, SPRITE_BIKER, STAY, RIGHT, TEXT_ROUTE14_BIKER2, OPP_BIKER, 14 + object_event 15, 30, SPRITE_BIKER, STAY, LEFT, TEXT_ROUTE14_BIKER3, OPP_BIKER, 15 + object_event 4, 31, SPRITE_BIKER, STAY, RIGHT, TEXT_ROUTE14_BIKER4, OPP_BIKER, 2 def_warps_to ROUTE_14 diff --git a/data/maps/objects/Route15.asm b/data/maps/objects/Route15.asm index 93a74966..d04c305c 100644 --- a/data/maps/objects/Route15.asm +++ b/data/maps/objects/Route15.asm @@ -1,3 +1,16 @@ + object_const_def + const ROUTE15_COOLTRAINER_F1 + const ROUTE15_COOLTRAINER_F2 + const ROUTE15_COOLTRAINER_M1 + const ROUTE15_COOLTRAINER_M2 + const ROUTE15_BEAUTY1 + const ROUTE15_BEAUTY2 + const ROUTE15_BIKER1 + const ROUTE15_BIKER2 + const ROUTE15_COOLTRAINER_F3 + const ROUTE15_COOLTRAINER_F4 + const ROUTE15_TM_RAGE + Route15_Object: db $43 ; border block @@ -8,19 +21,19 @@ Route15_Object: warp_event 14, 9, ROUTE_15_GATE_1F, 4 def_bg_events - bg_event 39, 9, 12 ; Route15Text12 + bg_event 39, 9, TEXT_ROUTE15_SIGN def_object_events - object_event 41, 11, SPRITE_COOLTRAINER_F, STAY, DOWN, 1, OPP_JR_TRAINER_F, 20 - object_event 53, 10, SPRITE_COOLTRAINER_F, STAY, LEFT, 2, OPP_JR_TRAINER_F, 21 - object_event 31, 13, SPRITE_COOLTRAINER_M, STAY, UP, 3, OPP_BIRD_KEEPER, 6 - object_event 35, 13, SPRITE_COOLTRAINER_M, STAY, UP, 4, OPP_BIRD_KEEPER, 7 - object_event 53, 11, SPRITE_BEAUTY, STAY, DOWN, 5, OPP_BEAUTY, 9 - 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 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 41, 11, SPRITE_COOLTRAINER_F, STAY, DOWN, TEXT_ROUTE15_COOLTRAINER_F1, OPP_JR_TRAINER_F, 20 + object_event 53, 10, SPRITE_COOLTRAINER_F, STAY, LEFT, TEXT_ROUTE15_COOLTRAINER_F2, OPP_JR_TRAINER_F, 21 + object_event 31, 13, SPRITE_COOLTRAINER_M, STAY, UP, TEXT_ROUTE15_COOLTRAINER_M1, OPP_BIRD_KEEPER, 6 + object_event 35, 13, SPRITE_COOLTRAINER_M, STAY, UP, TEXT_ROUTE15_COOLTRAINER_M2, OPP_BIRD_KEEPER, 7 + object_event 53, 11, SPRITE_BEAUTY, STAY, DOWN, TEXT_ROUTE15_BEAUTY1, OPP_BEAUTY, 9 + object_event 41, 10, SPRITE_BEAUTY, STAY, RIGHT, TEXT_ROUTE15_BEAUTY2, OPP_BEAUTY, 10 + object_event 48, 10, SPRITE_BIKER, STAY, DOWN, TEXT_ROUTE15_BIKER1, OPP_BIKER, 3 + object_event 46, 10, SPRITE_BIKER, STAY, DOWN, TEXT_ROUTE15_BIKER2, OPP_BIKER, 4 + object_event 37, 5, SPRITE_COOLTRAINER_F, STAY, RIGHT, TEXT_ROUTE15_COOLTRAINER_F3, OPP_JR_TRAINER_F, 22 + object_event 18, 13, SPRITE_COOLTRAINER_F, STAY, UP, TEXT_ROUTE15_COOLTRAINER_F4, OPP_JR_TRAINER_F, 23 + object_event 18, 5, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROUTE15_TM_RAGE, TM_RAGE def_warps_to ROUTE_15 diff --git a/data/maps/objects/Route15Gate1F.asm b/data/maps/objects/Route15Gate1F.asm index 3bc02f2f..7285c23e 100644 --- a/data/maps/objects/Route15Gate1F.asm +++ b/data/maps/objects/Route15Gate1F.asm @@ -1,3 +1,6 @@ + object_const_def + const ROUTE15GATE1F_GUARD + Route15Gate1F_Object: db $a ; border block @@ -11,6 +14,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, TEXT_ROUTE15GATE1F_GUARD def_warps_to ROUTE_15_GATE_1F diff --git a/data/maps/objects/Route15Gate2F.asm b/data/maps/objects/Route15Gate2F.asm index 39b5c64a..b2b17285 100644 --- a/data/maps/objects/Route15Gate2F.asm +++ b/data/maps/objects/Route15Gate2F.asm @@ -1,3 +1,6 @@ + object_const_def + const ROUTE15GATE2F_OAKS_AIDE + Route15Gate2F_Object: db $a ; border block @@ -5,9 +8,9 @@ Route15Gate2F_Object: warp_event 7, 7, ROUTE_15_GATE_1F, 5 def_bg_events - bg_event 6, 2, 2 ; Route15GateUpstairsText2 + bg_event 6, 2, TEXT_ROUTE15GATE2F_BINOCULARS def_object_events - object_event 4, 2, SPRITE_SCIENTIST, STAY, DOWN, 1 + object_event 4, 2, SPRITE_SCIENTIST, STAY, DOWN, TEXT_ROUTE15GATE2F_OAKS_AIDE def_warps_to ROUTE_15_GATE_2F diff --git a/data/maps/objects/Route16.asm b/data/maps/objects/Route16.asm index b1e62651..0eff9b2e 100644 --- a/data/maps/objects/Route16.asm +++ b/data/maps/objects/Route16.asm @@ -1,3 +1,12 @@ + object_const_def + const ROUTE16_BIKER1 + const ROUTE16_BIKER2 + const ROUTE16_BIKER3 + const ROUTE16_BIKER4 + const ROUTE16_BIKER5 + const ROUTE16_BIKER6 + const ROUTE16_SNORLAX + Route16_Object: db $f ; border block @@ -13,16 +22,16 @@ Route16_Object: warp_event 7, 5, ROUTE_16_FLY_HOUSE, 1 def_bg_events - bg_event 27, 11, 8 ; Route16Text8 - bg_event 5, 17, 9 ; Route16Text9 + bg_event 27, 11, TEXT_ROUTE16_CYCLING_ROAD_SIGN + bg_event 5, 17, TEXT_ROUTE16_SIGN def_object_events - 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 26, 10, SPRITE_SNORLAX, STAY, DOWN, 7 ; person + object_event 17, 12, SPRITE_BIKER, STAY, LEFT, TEXT_ROUTE16_BIKER1, OPP_BIKER, 5 + object_event 14, 13, SPRITE_BIKER, STAY, RIGHT, TEXT_ROUTE16_BIKER2, OPP_CUE_BALL, 1 + object_event 11, 12, SPRITE_BIKER, STAY, UP, TEXT_ROUTE16_BIKER3, OPP_CUE_BALL, 2 + object_event 9, 11, SPRITE_BIKER, STAY, LEFT, TEXT_ROUTE16_BIKER4, OPP_BIKER, 6 + object_event 6, 10, SPRITE_BIKER, STAY, RIGHT, TEXT_ROUTE16_BIKER5, OPP_CUE_BALL, 3 + object_event 3, 12, SPRITE_BIKER, STAY, RIGHT, TEXT_ROUTE16_BIKER6, OPP_BIKER, 7 + object_event 26, 10, SPRITE_SNORLAX, STAY, DOWN, TEXT_ROUTE16_SNORLAX def_warps_to ROUTE_16 diff --git a/data/maps/objects/Route16FlyHouse.asm b/data/maps/objects/Route16FlyHouse.asm index dc767dbf..be2f19d4 100644 --- a/data/maps/objects/Route16FlyHouse.asm +++ b/data/maps/objects/Route16FlyHouse.asm @@ -1,3 +1,7 @@ + object_const_def + const ROUTE16FLYHOUSE_BRUNETTE_GIRL + const ROUTE16FLYHOUSE_FEAROW + Route16FlyHouse_Object: db $a ; border block @@ -8,7 +12,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, TEXT_ROUTE16FLYHOUSE_BRUNETTE_GIRL + object_event 6, 4, SPRITE_BIRD, WALK, ANY_DIR, TEXT_ROUTE16FLYHOUSE_FEAROW def_warps_to ROUTE_16_FLY_HOUSE diff --git a/data/maps/objects/Route16Gate1F.asm b/data/maps/objects/Route16Gate1F.asm index 7aeeb619..d703a6e0 100644 --- a/data/maps/objects/Route16Gate1F.asm +++ b/data/maps/objects/Route16Gate1F.asm @@ -1,3 +1,7 @@ + object_const_def + const ROUTE16GATE1F_GUARD + const ROUTE16GATE1F_GAMBLER + Route16Gate1F_Object: db $a ; border block @@ -15,7 +19,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, TEXT_ROUTE16GATE1F_GUARD + object_event 4, 3, SPRITE_GAMBLER, STAY, NONE, TEXT_ROUTE16GATE1F_GAMBLER def_warps_to ROUTE_16_GATE_1F diff --git a/data/maps/objects/Route16Gate2F.asm b/data/maps/objects/Route16Gate2F.asm index f687fab0..421b5caa 100644 --- a/data/maps/objects/Route16Gate2F.asm +++ b/data/maps/objects/Route16Gate2F.asm @@ -1,3 +1,7 @@ + object_const_def + const ROUTE16GATE2F_LITTLE_BOY + const ROUTE16GATE2F_LITTLE_GIRL + Route16Gate2F_Object: db $a ; border block @@ -5,11 +9,11 @@ Route16Gate2F_Object: warp_event 7, 7, ROUTE_16_GATE_1F, 9 def_bg_events - bg_event 1, 2, 3 ; Route16GateUpstairsText3 - bg_event 6, 2, 4 ; Route16GateUpstairsText4 + bg_event 1, 2, TEXT_ROUTE16GATE2F_LEFT_BINOCULARS + bg_event 6, 2, TEXT_ROUTE16GATE2F_RIGHT_BINOCULARS 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, TEXT_ROUTE16GATE2F_LITTLE_BOY + object_event 2, 5, SPRITE_LITTLE_GIRL, WALK, LEFT_RIGHT, TEXT_ROUTE16GATE2F_LITTLE_GIRL def_warps_to ROUTE_16_GATE_2F diff --git a/data/maps/objects/Route17.asm b/data/maps/objects/Route17.asm index 48d88926..2f1dbeb1 100644 --- a/data/maps/objects/Route17.asm +++ b/data/maps/objects/Route17.asm @@ -1,26 +1,38 @@ + object_const_def + const ROUTE17_BIKER1 + const ROUTE17_BIKER2 + const ROUTE17_BIKER3 + const ROUTE17_BIKER4 + const ROUTE17_BIKER5 + const ROUTE17_BIKER6 + const ROUTE17_BIKER7 + const ROUTE17_BIKER8 + const ROUTE17_BIKER9 + const ROUTE17_BIKER10 + Route17_Object: db $43 ; border block def_warp_events def_bg_events - bg_event 9, 51, 11 ; Route17Text11 - bg_event 9, 63, 12 ; Route17Text12 - bg_event 9, 75, 13 ; Route17Text13 - bg_event 9, 87, 14 ; Route17Text14 - bg_event 9, 111, 15 ; Route17Text15 - bg_event 9, 141, 16 ; Route17Text16 + bg_event 9, 51, TEXT_ROUTE17_NOTICE_SIGN1 + bg_event 9, 63, TEXT_ROUTE17_TRAINER_TIPS1 + bg_event 9, 75, TEXT_ROUTE17_TRAINER_TIPS2 + bg_event 9, 87, TEXT_ROUTE17_SIGN + bg_event 9, 111, TEXT_ROUTE17_NOTICE_SIGN2 + bg_event 9, 141, TEXT_ROUTE17_CYCLING_ROAD_ENDS_SIGN 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 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 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 10, 118, SPRITE_BIKER, STAY, DOWN, 10, OPP_BIKER, 12 + object_event 12, 19, SPRITE_BIKER, STAY, LEFT, TEXT_ROUTE17_BIKER1, OPP_CUE_BALL, 4 + object_event 11, 16, SPRITE_BIKER, STAY, RIGHT, TEXT_ROUTE17_BIKER2, OPP_CUE_BALL, 5 + object_event 4, 18, SPRITE_BIKER, STAY, UP, TEXT_ROUTE17_BIKER3, OPP_BIKER, 8 + object_event 7, 32, SPRITE_BIKER, STAY, LEFT, TEXT_ROUTE17_BIKER4, OPP_BIKER, 9 + object_event 14, 34, SPRITE_BIKER, STAY, RIGHT, TEXT_ROUTE17_BIKER5, OPP_BIKER, 10 + object_event 17, 58, SPRITE_BIKER, STAY, LEFT, TEXT_ROUTE17_BIKER6, OPP_CUE_BALL, 6 + object_event 2, 68, SPRITE_BIKER, STAY, RIGHT, TEXT_ROUTE17_BIKER7, OPP_CUE_BALL, 7 + object_event 14, 98, SPRITE_BIKER, STAY, RIGHT, TEXT_ROUTE17_BIKER8, OPP_CUE_BALL, 8 + object_event 5, 98, SPRITE_BIKER, STAY, LEFT, TEXT_ROUTE17_BIKER9, OPP_BIKER, 11 + object_event 10, 118, SPRITE_BIKER, STAY, DOWN, TEXT_ROUTE17_BIKER10, OPP_BIKER, 12 def_warps_to ROUTE_17 diff --git a/data/maps/objects/Route18.asm b/data/maps/objects/Route18.asm index 102aa4c5..41286afc 100644 --- a/data/maps/objects/Route18.asm +++ b/data/maps/objects/Route18.asm @@ -1,3 +1,8 @@ + object_const_def + const ROUTE18_COOLTRAINER_M1 + const ROUTE18_COOLTRAINER_M2 + const ROUTE18_COOLTRAINER_M3 + Route18_Object: db $43 ; border block @@ -8,12 +13,12 @@ Route18_Object: warp_event 40, 9, ROUTE_18_GATE_1F, 4 def_bg_events - bg_event 43, 7, 4 ; Route18Text4 - bg_event 33, 5, 5 ; Route18Text5 + bg_event 43, 7, SCRIPT_ROUTE18_SIGN + bg_event 33, 5, SCRIPT_ROUTE18_CYCLING_ROAD_SIGN def_object_events - object_event 36, 11, SPRITE_COOLTRAINER_M, STAY, RIGHT, 1, OPP_BIRD_KEEPER, 8 - object_event 40, 15, SPRITE_COOLTRAINER_M, STAY, LEFT, 2, OPP_BIRD_KEEPER, 9 - object_event 42, 13, SPRITE_COOLTRAINER_M, STAY, LEFT, 3, OPP_BIRD_KEEPER, 10 + object_event 36, 11, SPRITE_COOLTRAINER_M, STAY, RIGHT, SCRIPT_ROUTE18_COOLTRAINER_M1, OPP_BIRD_KEEPER, 8 + object_event 40, 15, SPRITE_COOLTRAINER_M, STAY, LEFT, SCRIPT_ROUTE18_COOLTRAINER_M2, OPP_BIRD_KEEPER, 9 + object_event 42, 13, SPRITE_COOLTRAINER_M, STAY, LEFT, SCRIPT_ROUTE18_COOLTRAINER_M3, OPP_BIRD_KEEPER, 10 def_warps_to ROUTE_18 diff --git a/data/maps/objects/Route18Gate1F.asm b/data/maps/objects/Route18Gate1F.asm index cc994a36..f5699ba0 100644 --- a/data/maps/objects/Route18Gate1F.asm +++ b/data/maps/objects/Route18Gate1F.asm @@ -1,3 +1,6 @@ + object_const_def + const ROUTE18GATE1F_GUARD + Route18Gate1F_Object: db $a ; border block @@ -11,6 +14,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, TEXT_ROUTE18GATE1F_GUARD def_warps_to ROUTE_18_GATE_1F diff --git a/data/maps/objects/Route18Gate2F.asm b/data/maps/objects/Route18Gate2F.asm index 5a05f82b..92d42985 100644 --- a/data/maps/objects/Route18Gate2F.asm +++ b/data/maps/objects/Route18Gate2F.asm @@ -1,3 +1,6 @@ + object_const_def + const ROUTE18GATE2F_YOUNGSTER + Route18Gate2F_Object: db $a ; border block @@ -5,10 +8,10 @@ Route18Gate2F_Object: warp_event 7, 7, ROUTE_18_GATE_1F, 5 def_bg_events - bg_event 1, 2, 2 ; Route18GateUpstairsText2 - bg_event 6, 2, 3 ; Route18GateUpstairsText3 + bg_event 1, 2, TEXT_ROUTE18GATE2F_LEFT_BINOCULARS + bg_event 6, 2, TEXT_ROUTE18GATE2F_RIGHT_BINOCULARS def_object_events - object_event 4, 2, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 1 ; person + object_event 4, 2, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, TEXT_ROUTE18GATE2F_YOUNGSTER def_warps_to ROUTE_18_GATE_2F diff --git a/data/maps/objects/Route19.asm b/data/maps/objects/Route19.asm index 90d253f4..7c5f6f7f 100644 --- a/data/maps/objects/Route19.asm +++ b/data/maps/objects/Route19.asm @@ -1,21 +1,33 @@ + object_const_def + const ROUTE19_COOLTRAINER_M1 + const ROUTE19_COOLTRAINER_M2 + const ROUTE19_SWIMMER1 + const ROUTE19_SWIMMER2 + const ROUTE19_SWIMMER3 + const ROUTE19_SWIMMER4 + const ROUTE19_SWIMMER5 + const ROUTE19_SWIMMER6 + const ROUTE19_SWIMMER7 + const ROUTE19_SWIMMER8 + Route19_Object: db $43 ; border block def_warp_events def_bg_events - bg_event 11, 9, 11 ; Route19Text11 + bg_event 11, 9, TEXT_ROUTE19_SIGN 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 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 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 10, 44, SPRITE_SWIMMER, STAY, DOWN, 10, OPP_BEAUTY, 14 + object_event 8, 7, SPRITE_COOLTRAINER_M, STAY, LEFT, TEXT_ROUTE19_COOLTRAINER_M1, OPP_SWIMMER, 2 + object_event 13, 7, SPRITE_COOLTRAINER_M,STAY, LEFT, TEXT_ROUTE19_COOLTRAINER_M2, OPP_SWIMMER, 3 + object_event 13, 25, SPRITE_SWIMMER, STAY, LEFT, TEXT_ROUTE19_SWIMMER1, OPP_SWIMMER, 4 + object_event 4, 27, SPRITE_SWIMMER, STAY, RIGHT, TEXT_ROUTE19_SWIMMER2, OPP_SWIMMER, 5 + object_event 16, 31, SPRITE_SWIMMER, STAY, UP, TEXT_ROUTE19_SWIMMER3, OPP_SWIMMER, 6 + object_event 9, 11, SPRITE_SWIMMER, STAY, DOWN, TEXT_ROUTE19_SWIMMER4, OPP_SWIMMER, 7 + object_event 8, 43, SPRITE_SWIMMER, STAY, LEFT, TEXT_ROUTE19_SWIMMER5, OPP_BEAUTY, 12 + object_event 11, 43, SPRITE_SWIMMER, STAY, RIGHT, TEXT_ROUTE19_SWIMMER6, OPP_BEAUTY, 13 + object_event 9, 42, SPRITE_SWIMMER, STAY, UP, TEXT_ROUTE19_SWIMMER7, OPP_SWIMMER, 8 + object_event 10, 44, SPRITE_SWIMMER, STAY, DOWN, TEXT_ROUTE19_SWIMMER8, OPP_BEAUTY, 14 def_warps_to ROUTE_19 diff --git a/data/maps/objects/Route2.asm b/data/maps/objects/Route2.asm index 6ff5c0c7..45e4d2d0 100644 --- a/data/maps/objects/Route2.asm +++ b/data/maps/objects/Route2.asm @@ -1,3 +1,7 @@ + object_const_def + const ROUTE2_MOON_STONE + const ROUTE2_HP_UP + Route2_Object: db $f ; border block @@ -10,12 +14,12 @@ Route2_Object: warp_event 3, 43, VIRIDIAN_FOREST_SOUTH_GATE, 3 def_bg_events - bg_event 5, 65, 3 ; Route2Text3 - bg_event 11, 11, 4 ; Route2Text4 + bg_event 5, 65, TEXT_ROUTE2_SIGN + bg_event 11, 11, TEXT_ROUTE2_DIGLETTS_CAVE_SIGN def_object_events - object_event 13, 54, SPRITE_POKE_BALL, STAY, NONE, 1, MOON_STONE - object_event 13, 45, SPRITE_POKE_BALL, STAY, NONE, 2, HP_UP + object_event 13, 54, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROUTE2_MOON_STONE, MOON_STONE + object_event 13, 45, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROUTE2_HP_UP, HP_UP def_warps_to ROUTE_2 diff --git a/data/maps/objects/Route20.asm b/data/maps/objects/Route20.asm index bd9697c2..eaa80344 100644 --- a/data/maps/objects/Route20.asm +++ b/data/maps/objects/Route20.asm @@ -1,3 +1,15 @@ + object_const_def + const ROUTE20_SWIMMER1 + const ROUTE20_SWIMMER2 + const ROUTE20_SWIMMER3 + const ROUTE20_SWIMMER4 + const ROUTE20_SWIMMER5 + const ROUTE20_SWIMMER6 + const ROUTE20_COOLTRAINER_M + const ROUTE20_SWIMMER7 + const ROUTE20_SWIMMER8 + const ROUTE20_SWIMMER9 + Route20_Object: db $43 ; border block @@ -6,19 +18,19 @@ Route20_Object: warp_event 58, 9, SEAFOAM_ISLANDS_1F, 3 def_bg_events - bg_event 51, 7, 11 ; Route20Text11 - bg_event 57, 11, 12 ; Route20Text12 + bg_event 51, 7, TEXT_ROUTE20_SEAFOAM_ISLANDS_WEST_SIGN + bg_event 57, 11, TEXT_ROUTE20_SEAFOAM_ISLANDS_EAST_SIGN def_object_events - 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 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 87, 8, SPRITE_SWIMMER, STAY, UP, TEXT_ROUTE20_SWIMMER1, OPP_SWIMMER, 9 + object_event 68, 11, SPRITE_SWIMMER, STAY, UP, TEXT_ROUTE20_SWIMMER2, OPP_BEAUTY, 15 + object_event 45, 10, SPRITE_SWIMMER, STAY, DOWN, TEXT_ROUTE20_SWIMMER3, OPP_BEAUTY, 6 + object_event 55, 14, SPRITE_SWIMMER, STAY, RIGHT, TEXT_ROUTE20_SWIMMER4, OPP_JR_TRAINER_F, 24 + object_event 38, 13, SPRITE_SWIMMER, STAY, DOWN, TEXT_ROUTE20_SWIMMER5, OPP_SWIMMER, 10 + object_event 87, 13, SPRITE_SWIMMER, STAY, UP, TEXT_ROUTE20_SWIMMER6, OPP_SWIMMER, 11 + object_event 34, 9, SPRITE_COOLTRAINER_M, STAY, UP, TEXT_ROUTE20_COOLTRAINER_M, OPP_BIRD_KEEPER, 11 + object_event 25, 7, SPRITE_SWIMMER, STAY, UP, TEXT_ROUTE20_SWIMMER7, OPP_BEAUTY, 7 + object_event 24, 12, SPRITE_SWIMMER, STAY, DOWN, TEXT_ROUTE20_SWIMMER8, OPP_JR_TRAINER_F, 16 + object_event 15, 8, SPRITE_SWIMMER, STAY, UP, TEXT_ROUTE20_SWIMMER9, OPP_BEAUTY, 8 def_warps_to ROUTE_20 diff --git a/data/maps/objects/Route21.asm b/data/maps/objects/Route21.asm index 52012684..94cfa568 100644 --- a/data/maps/objects/Route21.asm +++ b/data/maps/objects/Route21.asm @@ -1,3 +1,14 @@ + object_const_def + const ROUTE21_FISHER1 + const ROUTE21_FISHER2 + const ROUTE21_SWIMMER1 + const ROUTE21_SWIMMER2 + const ROUTE21_SWIMMER3 + const ROUTE21_SWIMMER4 + const ROUTE21_SWIMMER5 + const ROUTE21_FISHER3 + const ROUTE21_FISHER4 + Route21_Object: db $43 ; border block @@ -6,14 +17,14 @@ 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 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 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 + object_event 4, 24, SPRITE_FISHER, STAY, LEFT, TEXT_ROUTE21_FISHER1, OPP_FISHER, 7 + object_event 6, 25, SPRITE_FISHER, STAY, DOWN, TEXT_ROUTE21_FISHER2, OPP_FISHER, 9 + object_event 10, 31, SPRITE_SWIMMER, STAY, UP, TEXT_ROUTE21_SWIMMER1, OPP_SWIMMER, 12 + object_event 12, 30, SPRITE_SWIMMER, STAY, RIGHT, TEXT_ROUTE21_SWIMMER2, OPP_CUE_BALL, 9 + object_event 16, 63, SPRITE_SWIMMER, STAY, DOWN, TEXT_ROUTE21_SWIMMER3, OPP_SWIMMER, 13 + object_event 5, 71, SPRITE_SWIMMER, STAY, RIGHT, TEXT_ROUTE21_SWIMMER4, OPP_SWIMMER, 14 + object_event 15, 71, SPRITE_SWIMMER, STAY, LEFT, TEXT_ROUTE21_SWIMMER5, OPP_SWIMMER, 15 + object_event 14, 56, SPRITE_FISHER, STAY, LEFT, TEXT_ROUTE21_FISHER3, OPP_FISHER, 8 + object_event 17, 57, SPRITE_FISHER, STAY, RIGHT, TEXT_ROUTE21_FISHER4, OPP_FISHER, 10 def_warps_to ROUTE_21 diff --git a/data/maps/objects/Route22.asm b/data/maps/objects/Route22.asm index 096d490c..1fc18704 100644 --- a/data/maps/objects/Route22.asm +++ b/data/maps/objects/Route22.asm @@ -1,3 +1,7 @@ + object_const_def + const ROUTE22_RIVAL1 + const ROUTE22_RIVAL2 + Route22_Object: db $2c ; border block @@ -5,10 +9,10 @@ Route22_Object: warp_event 8, 5, ROUTE_22_GATE, 1 def_bg_events - bg_event 7, 11, 3 ; Route22FrontGateText + bg_event 7, 11, TEXT_ROUTE22_POKEMON_LEAGUE_SIGN 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, TEXT_ROUTE22_RIVAL1 + object_event 25, 5, SPRITE_BLUE, STAY, NONE, TEXT_ROUTE22_RIVAL2 def_warps_to ROUTE_22 diff --git a/data/maps/objects/Route22Gate.asm b/data/maps/objects/Route22Gate.asm index 086616ca..6ebe7d7e 100644 --- a/data/maps/objects/Route22Gate.asm +++ b/data/maps/objects/Route22Gate.asm @@ -1,3 +1,6 @@ + object_const_def + const ROUTE22GATE_GUARD + Route22Gate_Object: db $a ; border block @@ -10,6 +13,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, TEXT_ROUTE22GATE_GUARD def_warps_to ROUTE_22_GATE diff --git a/data/maps/objects/Route23.asm b/data/maps/objects/Route23.asm index 4a9f65f6..f13409a2 100644 --- a/data/maps/objects/Route23.asm +++ b/data/maps/objects/Route23.asm @@ -1,3 +1,12 @@ + object_const_def + const ROUTE23_GUARD1 + const ROUTE23_GUARD2 + const ROUTE23_SWIMMER1 + const ROUTE23_SWIMMER2 + const ROUTE23_GUARD3 + const ROUTE23_GUARD4 + const ROUTE23_GUARD5 + Route23_Object: db $f ; border block @@ -8,15 +17,15 @@ Route23_Object: warp_event 14, 31, VICTORY_ROAD_2F, 2 def_bg_events - bg_event 3, 33, 8 ; Route23Text8 + bg_event 3, 33, TEXT_ROUTE23_VICTORY_ROAD_GATE_SIGN def_object_events - 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 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 4, 35, SPRITE_GUARD, STAY, DOWN, TEXT_ROUTE23_GUARD1 + object_event 10, 56, SPRITE_GUARD, STAY, DOWN, TEXT_ROUTE23_GUARD2 + object_event 8, 85, SPRITE_SWIMMER, STAY, DOWN, TEXT_ROUTE23_SWIMMER1 + object_event 11, 96, SPRITE_SWIMMER, STAY, DOWN, TEXT_ROUTE23_SWIMMER2 + object_event 12, 105, SPRITE_GUARD, STAY, DOWN, TEXT_ROUTE23_GUARD3 + object_event 8, 119, SPRITE_GUARD, STAY, DOWN, TEXT_ROUTE23_GUARD4 + object_event 8, 136, SPRITE_GUARD, STAY, DOWN, TEXT_ROUTE23_GUARD5 def_warps_to ROUTE_23 diff --git a/data/maps/objects/Route24.asm b/data/maps/objects/Route24.asm index 80dca821..6c0b6ad6 100644 --- a/data/maps/objects/Route24.asm +++ b/data/maps/objects/Route24.asm @@ -1,3 +1,13 @@ + object_const_def + const ROUTE24_COOLTRAINER_M1 + const ROUTE24_COOLTRAINER_M2 + const ROUTE24_COOLTRAINER_M3 + const ROUTE24_COOLTRAINER_F1 + const ROUTE24_YOUNGSTER_1 + const ROUTE24_COOLTRAINER_F2 + const ROUTE24_YOUNGSTER_2 + const ROUTE24_TM_THUNDER_WAVE + Route24_Object: db $2c ; border block @@ -6,13 +16,13 @@ Route24_Object: def_bg_events 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 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 11, 15, SPRITE_COOLTRAINER_M, STAY, LEFT, TEXT_ROUTE24_COOLTRAINER_M1, OPP_ROCKET, 6 + object_event 5, 20, SPRITE_COOLTRAINER_M, STAY, UP, TEXT_ROUTE24_COOLTRAINER_M2, OPP_JR_TRAINER_M, 2 + object_event 11, 19, SPRITE_COOLTRAINER_M, STAY, LEFT, TEXT_ROUTE24_COOLTRAINER_M3, OPP_JR_TRAINER_M, 3 + object_event 10, 22, SPRITE_COOLTRAINER_F, STAY, RIGHT, TEXT_ROUTE24_COOLTRAINER_F1, OPP_LASS, 7 + object_event 11, 25, SPRITE_YOUNGSTER, STAY, LEFT, TEXT_ROUTE24_YOUNGSTER_1, OPP_YOUNGSTER, 4 + object_event 10, 28, SPRITE_COOLTRAINER_F, STAY, RIGHT, TEXT_ROUTE24_COOLTRAINER_F2, OPP_LASS, 8 + object_event 11, 31, SPRITE_YOUNGSTER, STAY, LEFT, TEXT_ROUTE24_YOUNGSTER_2, OPP_BUG_CATCHER, 9 + object_event 10, 5, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROUTE24_TM_THUNDER_WAVE, TM_THUNDER_WAVE def_warps_to ROUTE_24 diff --git a/data/maps/objects/Route25.asm b/data/maps/objects/Route25.asm index f0814b23..897c4298 100644 --- a/data/maps/objects/Route25.asm +++ b/data/maps/objects/Route25.asm @@ -1,3 +1,15 @@ + object_const_def + const ROUTE25_YOUNGSTER1 + const ROUTE25_YOUNGSTER2 + const ROUTE25_COOLTRAINER_M + const ROUTE25_COOLTRAINER_F1 + const ROUTE25_YOUNGSTER3 + const ROUTE25_COOLTRAINER_F2 + const ROUTE25_HIKER1 + const ROUTE25_HIKER2 + const ROUTE25_HIKER3 + const ROUTE25_TM_SEISMIC_TOSS + Route25_Object: db $2c ; border block @@ -5,18 +17,18 @@ Route25_Object: warp_event 45, 3, BILLS_HOUSE, 1 def_bg_events - bg_event 43, 3, 11 ; Route25Text11 + bg_event 43, 3, TEXT_ROUTE25_BILL_SIGN 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, TEXT_ROUTE25_YOUNGSTER1, OPP_YOUNGSTER, 5 + object_event 18, 5, SPRITE_YOUNGSTER, STAY, UP, TEXT_ROUTE25_YOUNGSTER2, OPP_YOUNGSTER, 6 + object_event 24, 4, SPRITE_COOLTRAINER_M, STAY, DOWN, TEXT_ROUTE25_COOLTRAINER_M, OPP_JR_TRAINER_M, 2 + object_event 18, 8, SPRITE_COOLTRAINER_F, STAY, RIGHT, TEXT_ROUTE25_COOLTRAINER_F1, OPP_LASS, 9 + object_event 32, 3, SPRITE_YOUNGSTER, STAY, LEFT, TEXT_ROUTE25_YOUNGSTER3, OPP_YOUNGSTER, 7 + object_event 37, 4, SPRITE_COOLTRAINER_F, STAY, DOWN, TEXT_ROUTE25_COOLTRAINER_F2, OPP_LASS, 10 + object_event 8, 4, SPRITE_HIKER, STAY, RIGHT, TEXT_ROUTE25_HIKER1, OPP_HIKER, 2 + object_event 23, 9, SPRITE_HIKER, STAY, UP, TEXT_ROUTE25_HIKER2, OPP_HIKER, 3 + object_event 13, 7, SPRITE_HIKER, STAY, RIGHT, TEXT_ROUTE25_HIKER3, OPP_HIKER, 4 + object_event 22, 2, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROUTE25_TM_SEISMIC_TOSS, TM_SEISMIC_TOSS def_warps_to ROUTE_25 diff --git a/data/maps/objects/Route2Gate.asm b/data/maps/objects/Route2Gate.asm index 02205d00..acbe73e9 100644 --- a/data/maps/objects/Route2Gate.asm +++ b/data/maps/objects/Route2Gate.asm @@ -1,3 +1,7 @@ + object_const_def + const ROUTE2_OAKS_AIDE + const ROUTE2_YOUNGSTER + Route2Gate_Object: db $a ; border block @@ -10,7 +14,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, TEXT_ROUTE2GATE_OAKS_AIDE + object_event 5, 4, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, TEXT_ROUTE2GATE_YOUNGSTER def_warps_to ROUTE_2_GATE diff --git a/data/maps/objects/Route2TradeHouse.asm b/data/maps/objects/Route2TradeHouse.asm index 7b30b9e8..ef2785ba 100644 --- a/data/maps/objects/Route2TradeHouse.asm +++ b/data/maps/objects/Route2TradeHouse.asm @@ -1,3 +1,7 @@ + object_const_def + const ROUTE2TRADEHOUSE_SCIENTIST + const ROUTE2TRADEHOUSE_GAMEBOY_KID + Route2TradeHouse_Object: db $a ; border block @@ -8,7 +12,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, TEXT_ROUTE2TRADEHOUSE_SCIENTIST + object_event 4, 1, SPRITE_GAMEBOY_KID, STAY, DOWN, TEXT_ROUTE2TRADEHOUSE_GAMEBOY_KID def_warps_to ROUTE_2_TRADE_HOUSE diff --git a/data/maps/objects/Route3.asm b/data/maps/objects/Route3.asm index dc27fe24..3db963ad 100644 --- a/data/maps/objects/Route3.asm +++ b/data/maps/objects/Route3.asm @@ -1,20 +1,31 @@ + object_const_def + const ROUTE3_SUPER_NERD + const ROUTE3_YOUNGSTER1 + const ROUTE3_YOUNGSTER2 + const ROUTE3_COOLTRAINER_F1 + const ROUTE3_YOUNGSTER3 + const ROUTE3_COOLTRAINER_F2 + const ROUTE3_YOUNGSTER4 + const ROUTE3_YOUNGSTER5 + const ROUTE3_COOLTRAINER_F3 + Route3_Object: db $2c ; border block def_warp_events def_bg_events - bg_event 59, 9, 10 ; Route3Text10 + bg_event 59, 9, 10 ; Route3SignText 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 33, 10, SPRITE_COOLTRAINER_F, STAY, UP, 9, OPP_LASS, 3 + object_event 57, 11, SPRITE_SUPER_NERD, STAY, NONE, TEXT_ROUTE3_SUPER_NERD + object_event 10, 6, SPRITE_YOUNGSTER, STAY, RIGHT, TEXT_ROUTE3_YOUNGSTER1, OPP_BUG_CATCHER, 4 + object_event 14, 4, SPRITE_YOUNGSTER, STAY, DOWN, TEXT_ROUTE3_YOUNGSTER2, OPP_YOUNGSTER, 1 + object_event 16, 9, SPRITE_COOLTRAINER_F, STAY, LEFT, TEXT_ROUTE3_COOLTRAINER_F1, OPP_LASS, 1 + object_event 19, 5, SPRITE_YOUNGSTER, STAY, DOWN, TEXT_ROUTE3_YOUNGSTER3, OPP_BUG_CATCHER, 5 + object_event 23, 4, SPRITE_COOLTRAINER_F, STAY, LEFT, TEXT_ROUTE3_COOLTRAINER_F2, OPP_LASS, 2 + object_event 22, 9, SPRITE_YOUNGSTER, STAY, LEFT, TEXT_ROUTE3_YOUNGSTER4, OPP_YOUNGSTER, 2 + object_event 24, 6, SPRITE_YOUNGSTER, STAY, RIGHT, TEXT_ROUTE3_YOUNGSTER5, OPP_BUG_CATCHER, 6 + object_event 33, 10, SPRITE_COOLTRAINER_F, STAY, UP, TEXT_ROUTE3_COOLTRAINER_F3, OPP_LASS, 3 def_warps_to ROUTE_3 diff --git a/data/maps/objects/Route4.asm b/data/maps/objects/Route4.asm index 2917de1f..b34c913d 100644 --- a/data/maps/objects/Route4.asm +++ b/data/maps/objects/Route4.asm @@ -1,3 +1,8 @@ + object_const_def + const ROUTE4_COOLTRAINER_F1 + const ROUTE4_COOLTRAINER_F2 + const ROUTE4_TM_WHIRLWIND + Route4_Object: db $2c ; border block @@ -7,13 +12,13 @@ Route4_Object: warp_event 24, 5, MT_MOON_B1F, 8 def_bg_events - bg_event 12, 5, 4 ; PokeCenterSignText - bg_event 17, 7, 5 ; Route4Text5 - bg_event 27, 7, 6 ; Route4Text6 + bg_event 12, 5, TEXT_ROUTE4_POKECENTER_SIGN + bg_event 17, 7, TEXT_ROUTE4_MT_MOON_SIGN + bg_event 27, 7, TEXT_ROUTE4_SIGN 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, TEXT_ROUTE4_COOLTRAINER_F1 + object_event 63, 3, SPRITE_COOLTRAINER_F, STAY, RIGHT, TEXT_ROUTE4_COOLTRAINER_F2, OPP_LASS, 4 + object_event 57, 3, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROUTE4_TM_WHIRLWIND, TM_WHIRLWIND def_warps_to ROUTE_4 diff --git a/data/maps/objects/Route5.asm b/data/maps/objects/Route5.asm index 2e91a7c6..5165bc5d 100644 --- a/data/maps/objects/Route5.asm +++ b/data/maps/objects/Route5.asm @@ -9,7 +9,7 @@ Route5_Object: warp_event 10, 21, DAYCARE, 1 def_bg_events - bg_event 17, 29, 1 ; Route5Text1 + bg_event 17, 29, TEXT_ROUTE5_UNDERGROUND_PATH_SIGN def_object_events diff --git a/data/maps/objects/Route5Gate.asm b/data/maps/objects/Route5Gate.asm index de4ddab2..87b7b5f2 100644 --- a/data/maps/objects/Route5Gate.asm +++ b/data/maps/objects/Route5Gate.asm @@ -1,3 +1,6 @@ + object_const_def + const ROUTE5GATE_GUARD + Route5Gate_Object: db $a ; border block @@ -10,6 +13,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, TEXT_ROUTE5GATE_GUARD def_warps_to ROUTE_5_GATE diff --git a/data/maps/objects/Route6.asm b/data/maps/objects/Route6.asm index 33748f0f..461ccf27 100644 --- a/data/maps/objects/Route6.asm +++ b/data/maps/objects/Route6.asm @@ -1,3 +1,11 @@ + object_const_def + const ROUTE6_COOLTRAINER_M1 + const ROUTE6_COOLTRAINER_F1 + const ROUTE6_YOUNGSTER_1 + const ROUTE6_COOLTRAINER_M2 + const ROUTE6_COOLTRAINER_F2 + const ROUTE6_YOUNGSTER_2 + Route6_Object: db $f ; border block @@ -8,14 +16,14 @@ Route6_Object: warp_event 17, 13, UNDERGROUND_PATH_ROUTE_6, 1 def_bg_events - bg_event 19, 15, 7 ; Route6Text7 + bg_event 19, 15, TEXT_ROUTE6_UNDERGROUND_PATH_SIGN 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 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 + object_event 10, 21, SPRITE_COOLTRAINER_M, STAY, RIGHT, TEXT_ROUTE6_COOLTRAINER_M1, OPP_JR_TRAINER_M, 4 + object_event 11, 21, SPRITE_COOLTRAINER_F, STAY, LEFT, TEXT_ROUTE6_COOLTRAINER_F1, OPP_JR_TRAINER_F, 2 + object_event 0, 15, SPRITE_YOUNGSTER, STAY, RIGHT, TEXT_ROUTE6_YOUNGSTER_1, OPP_BUG_CATCHER, 10 + object_event 11, 31, SPRITE_COOLTRAINER_M, STAY, LEFT, TEXT_ROUTE6_COOLTRAINER_M2, OPP_JR_TRAINER_M, 5 + object_event 11, 30, SPRITE_COOLTRAINER_F, STAY, LEFT, TEXT_ROUTE6_COOLTRAINER_F2, OPP_JR_TRAINER_F, 3 + object_event 19, 26, SPRITE_YOUNGSTER, STAY, LEFT, TEXT_ROUTE6_YOUNGSTER_2, OPP_BUG_CATCHER, 11 def_warps_to ROUTE_6 diff --git a/data/maps/objects/Route6Gate.asm b/data/maps/objects/Route6Gate.asm index d37213c9..bce3596e 100644 --- a/data/maps/objects/Route6Gate.asm +++ b/data/maps/objects/Route6Gate.asm @@ -1,3 +1,6 @@ + object_const_def + const ROUTE6GATE_GUARD + Route6Gate_Object: db $a ; border block @@ -10,6 +13,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, TEXT_ROUTE6GATE_GUARD def_warps_to ROUTE_6_GATE diff --git a/data/maps/objects/Route7.asm b/data/maps/objects/Route7.asm index ec5f2e8a..206ff833 100644 --- a/data/maps/objects/Route7.asm +++ b/data/maps/objects/Route7.asm @@ -9,7 +9,7 @@ Route7_Object: warp_event 5, 13, UNDERGROUND_PATH_ROUTE_7, 1 def_bg_events - bg_event 3, 13, 1 ; Route7Text1 + bg_event 3, 13, TEXT_ROUTE7_UNDERGROUND_PATH_SIGN def_object_events diff --git a/data/maps/objects/Route7Gate.asm b/data/maps/objects/Route7Gate.asm index 8cc58d9b..18931e9e 100644 --- a/data/maps/objects/Route7Gate.asm +++ b/data/maps/objects/Route7Gate.asm @@ -1,3 +1,6 @@ + object_const_def + const ROUTE7GATE_GUARD + Route7Gate_Object: db $a ; border block @@ -10,6 +13,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, TEXT_ROUTE7GATE_GUARD def_warps_to ROUTE_7_GATE diff --git a/data/maps/objects/Route8.asm b/data/maps/objects/Route8.asm index 61faa47f..de0a1a26 100644 --- a/data/maps/objects/Route8.asm +++ b/data/maps/objects/Route8.asm @@ -1,3 +1,14 @@ + object_const_def + const ROUTE8_SUPER_NERD1 + const ROUTE8_GAMBLER1 + const ROUTE8_SUPER_NERD2 + const ROUTE8_COOLTRAINER_F1 + const ROUTE8_SUPER_NERD3 + const ROUTE8_COOLTRAINER_F2 + const ROUTE8_COOLTRAINER_F3 + const ROUTE8_GAMBLER2 + const ROUTE8_COOLTRAINER_F4 + Route8_Object: db $2c ; border block @@ -9,17 +20,17 @@ Route8_Object: warp_event 13, 3, UNDERGROUND_PATH_ROUTE_8, 1 def_bg_events - bg_event 17, 3, 10 ; Route8Text10 + bg_event 17, 3, TEXT_ROUTE8_UNDERGROUND_SIGN 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 46, 13, SPRITE_GAMBLER, STAY, DOWN, 8, OPP_GAMBLER, 7 - object_event 51, 12, SPRITE_COOLTRAINER_F, STAY, LEFT, 9, OPP_LASS, 16 + object_event 8, 5, SPRITE_SUPER_NERD, STAY, RIGHT, TEXT_ROUTE8_SUPER_NERD1, OPP_SUPER_NERD, 3 + object_event 13, 9, SPRITE_GAMBLER, STAY, UP, TEXT_ROUTE8_GAMBLER1, OPP_GAMBLER, 5 + object_event 42, 6, SPRITE_SUPER_NERD, STAY, UP, TEXT_ROUTE8_SUPER_NERD2, OPP_SUPER_NERD, 4 + object_event 26, 3, SPRITE_COOLTRAINER_F, STAY, LEFT, TEXT_ROUTE8_COOLTRAINER_F1, OPP_LASS, 13 + object_event 26, 4, SPRITE_SUPER_NERD, STAY, RIGHT, TEXT_ROUTE8_SUPER_NERD3, OPP_SUPER_NERD, 5 + object_event 26, 5, SPRITE_COOLTRAINER_F, STAY, LEFT, TEXT_ROUTE8_COOLTRAINER_F2, OPP_LASS, 14 + object_event 26, 6, SPRITE_COOLTRAINER_F, STAY, RIGHT, TEXT_ROUTE8_COOLTRAINER_F3, OPP_LASS, 15 + object_event 46, 13, SPRITE_GAMBLER, STAY, DOWN, TEXT_ROUTE8_GAMBLER2, OPP_GAMBLER, 7 + object_event 51, 12, SPRITE_COOLTRAINER_F, STAY, LEFT, TEXT_ROUTE8_COOLTRAINER_F4, OPP_LASS, 16 def_warps_to ROUTE_8 diff --git a/data/maps/objects/Route8Gate.asm b/data/maps/objects/Route8Gate.asm index 47a24967..37000dd4 100644 --- a/data/maps/objects/Route8Gate.asm +++ b/data/maps/objects/Route8Gate.asm @@ -1,3 +1,6 @@ + object_const_def + const ROUTE8GATE_GUARD + Route8Gate_Object: db $a ; border block @@ -10,6 +13,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, TEXT_ROUTE8GATE_GUARD def_warps_to ROUTE_8_GATE diff --git a/data/maps/objects/Route9.asm b/data/maps/objects/Route9.asm index a9be69be..21c742e9 100644 --- a/data/maps/objects/Route9.asm +++ b/data/maps/objects/Route9.asm @@ -1,21 +1,33 @@ + object_const_def + const ROUTE9_COOLTRAINER_F1 + const ROUTE9_COOLTRAINER_M1 + const ROUTE9_COOLTRAINER_M2 + const ROUTE9_COOLTRAINER_F2 + const ROUTE9_HIKER_1 + const ROUTE9_HIKER_2 + const ROUTE9_YOUNGSTER_1 + const ROUTE9_HIKER_3 + const ROUTE9_YOUNGSTER_2 + const ROUTE9_TM_TELEPORT + Route9_Object: db $2c ; border block def_warp_events def_bg_events - bg_event 25, 7, 11 ; Route9Text11 + bg_event 25, 7, TEXT_ROUTE9_SIGN 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 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 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 10, 15, SPRITE_POKE_BALL, STAY, NONE, 10, TM_TELEPORT + object_event 13, 10, SPRITE_COOLTRAINER_F, STAY, LEFT, TEXT_ROUTE9_COOLTRAINER_F1, OPP_JR_TRAINER_F, 5 + object_event 24, 7, SPRITE_COOLTRAINER_M, STAY, LEFT, TEXT_ROUTE9_COOLTRAINER_M1, OPP_JR_TRAINER_M, 7 + object_event 31, 7, SPRITE_COOLTRAINER_M, STAY, RIGHT, TEXT_ROUTE9_COOLTRAINER_M2, OPP_JR_TRAINER_M, 8 + object_event 48, 8, SPRITE_COOLTRAINER_F, STAY, RIGHT, TEXT_ROUTE9_COOLTRAINER_F2, OPP_JR_TRAINER_F, 6 + object_event 16, 15, SPRITE_HIKER, STAY, LEFT, TEXT_ROUTE9_HIKER_1, OPP_HIKER, 11 + object_event 43, 3, SPRITE_HIKER, STAY, LEFT, TEXT_ROUTE9_HIKER_2, OPP_HIKER, 6 + object_event 22, 2, SPRITE_YOUNGSTER, STAY, DOWN, TEXT_ROUTE9_YOUNGSTER_1, OPP_BUG_CATCHER, 13 + object_event 45, 15, SPRITE_HIKER, STAY, RIGHT, TEXT_ROUTE9_HIKER_3, OPP_HIKER, 5 + object_event 40, 8, SPRITE_YOUNGSTER, STAY, RIGHT, TEXT_ROUTE9_YOUNGSTER_2, OPP_BUG_CATCHER, 14 + object_event 10, 15, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROUTE9_TM_TELEPORT, TM_TELEPORT def_warps_to ROUTE_9 diff --git a/data/maps/objects/SSAnne1F.asm b/data/maps/objects/SSAnne1F.asm index 61184a1b..0a00befd 100644 --- a/data/maps/objects/SSAnne1F.asm +++ b/data/maps/objects/SSAnne1F.asm @@ -1,3 +1,7 @@ + object_const_def + const SSANNE1F_WAITER + const SSANNE1F_SAILOR + SSAnne1F_Object: db $c ; border block @@ -17,7 +21,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, TEXT_SSANNE1F_WAITER + object_event 27, 5, SPRITE_SAILOR, STAY, NONE, TEXT_SSANNE1F_SAILOR def_warps_to SS_ANNE_1F diff --git a/data/maps/objects/SSAnne1FRooms.asm b/data/maps/objects/SSAnne1FRooms.asm index 6192c31a..c23fe124 100644 --- a/data/maps/objects/SSAnne1FRooms.asm +++ b/data/maps/objects/SSAnne1FRooms.asm @@ -1,3 +1,16 @@ + object_const_def + const SSANNE1FROOMS_GENTLEMAN1 + const SSANNE1FROOMS_GENTLEMAN2 + const SSANNE1FROOMS_YOUNGSTER + const SSANNE1FROOMS_COOLTRAINER_F + const SSANNE1FROOMS_GIRL1 + const SSANNE1FROOMS_MIDDLE_AGED_MAN + const SSANNE1FROOMS_LITTLE_GIRL + const SSANNE1FROOMS_WIGGLYTUFF + const SSANNE1FROOMS_GIRL2 + const SSANNE1FROOMS_TM_BODY_SLAM + const SSANNE1FROOMS_GENTLEMAN3 + SSAnne1FRooms_Object: db $c ; border block @@ -12,16 +25,16 @@ 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 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 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 + object_event 2, 3, SPRITE_GENTLEMAN, STAY, LEFT, TEXT_SSANNE1FROOMS_GENTLEMAN1, OPP_GENTLEMAN, 1 + object_event 11, 4, SPRITE_GENTLEMAN, STAY, UP, TEXT_SSANNE1FROOMS_GENTLEMAN2, OPP_GENTLEMAN, 2 + object_event 11, 14, SPRITE_YOUNGSTER, STAY, UP, TEXT_SSANNE1FROOMS_YOUNGSTER, OPP_YOUNGSTER, 8 + object_event 13, 11, SPRITE_COOLTRAINER_F, STAY, LEFT, TEXT_SSANNE1FROOMS_COOLTRAINER_F, OPP_LASS, 11 + object_event 22, 3, SPRITE_GIRL, WALK, UP_DOWN, TEXT_SSANNE1FROOMS_GIRL1 + object_event 0, 14, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, TEXT_SSANNE1FROOMS_MIDDLE_AGED_MAN + object_event 2, 11, SPRITE_LITTLE_GIRL, STAY, DOWN, TEXT_SSANNE1FROOMS_LITTLE_GIRL + object_event 3, 11, SPRITE_FAIRY, STAY, DOWN, TEXT_SSANNE1FROOMS_WIGGLYTUFF + object_event 10, 13, SPRITE_GIRL, STAY, RIGHT, TEXT_SSANNE1FROOMS_GIRL2 + object_event 12, 15, SPRITE_POKE_BALL, STAY, NONE, TEXT_SSANNE1FROOMS_TM_BODY_SLAM, TM_BODY_SLAM + object_event 21, 13, SPRITE_GENTLEMAN, WALK, LEFT_RIGHT, TEXT_SSANNE1FROOMS_GENTLEMAN3 def_warps_to SS_ANNE_1F_ROOMS diff --git a/data/maps/objects/SSAnne2F.asm b/data/maps/objects/SSAnne2F.asm index cfd93189..283ca70f 100644 --- a/data/maps/objects/SSAnne2F.asm +++ b/data/maps/objects/SSAnne2F.asm @@ -1,3 +1,7 @@ + object_const_def + const SSANNE2F_WAITER + const SSANNE2F_RIVAL + SSAnne2F_Object: db $c ; border block @@ -15,7 +19,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, TEXT_SSANNE2F_WAITER + object_event 36, 4, SPRITE_BLUE, STAY, DOWN, TEXT_SSANNE2F_RIVAL, OPP_RIVAL1, 1 def_warps_to SS_ANNE_2F diff --git a/data/maps/objects/SSAnne2FRooms.asm b/data/maps/objects/SSAnne2FRooms.asm index 1a9a1cb1..22e59bbe 100644 --- a/data/maps/objects/SSAnne2FRooms.asm +++ b/data/maps/objects/SSAnne2FRooms.asm @@ -1,3 +1,18 @@ + object_const_def + const SSANNE2FROOMS_GENTLEMAN1 + const SSANNE2FROOMS_FISHER + const SSANNE2FROOMS_GENTLEMAN2 + const SSANNE2FROOMS_COOLTRAINER_F + const SSANNE2FROOMS_GENTLEMAN3 + const SSANNE2FROOMS_MAX_ETHER + const SSANNE2FROOMS_GENTLEMAN4 + const SSANNE2FROOMS_GRAMPS + const SSANNE2FROOMS_RARE_CANDY + const SSANNE2FROOMS_GENTLEMAN5 + const SSANNE2FROOMS_LITTLE_BOY + const SSANNE2FROOMS_BRUNETTE_GIRL + const SSANNE2FROOMS_BEAUTY + SSAnne2FRooms_Object: db $c ; border block @@ -18,18 +33,18 @@ 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 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 - object_event 20, 12, SPRITE_BEAUTY, STAY, RIGHT, 13 ; person + object_event 10, 2, SPRITE_GENTLEMAN, STAY, RIGHT, TEXT_SSANNE2FROOMS_GENTLEMAN1, OPP_GENTLEMAN, 3 + object_event 13, 4, SPRITE_FISHER, STAY, LEFT, TEXT_SSANNE2FROOMS_FISHER, OPP_FISHER, 1 + object_event 0, 14, SPRITE_GENTLEMAN, STAY, RIGHT, TEXT_SSANNE2FROOMS_GENTLEMAN2, OPP_GENTLEMAN, 5 + object_event 2, 11, SPRITE_COOLTRAINER_F, STAY, DOWN, TEXT_SSANNE2FROOMS_COOLTRAINER_F, OPP_LASS, 12 + object_event 1, 2, SPRITE_GENTLEMAN, STAY, DOWN, TEXT_SSANNE2FROOMS_GENTLEMAN3 + object_event 12, 1, SPRITE_POKE_BALL, STAY, NONE, TEXT_SSANNE2FROOMS_MAX_ETHER, MAX_ETHER + object_event 21, 2, SPRITE_GENTLEMAN, STAY, DOWN, TEXT_SSANNE2FROOMS_GENTLEMAN4 + object_event 22, 1, SPRITE_GRAMPS, STAY, DOWN, TEXT_SSANNE2FROOMS_GRAMPS + object_event 0, 12, SPRITE_POKE_BALL, STAY, NONE, TEXT_SSANNE2FROOMS_RARE_CANDY, RARE_CANDY + object_event 12, 12, SPRITE_GENTLEMAN, STAY, DOWN, TEXT_SSANNE2FROOMS_GENTLEMAN5 + object_event 11, 14, SPRITE_LITTLE_BOY, STAY, NONE, TEXT_SSANNE2FROOMS_LITTLE_BOY + object_event 22, 12, SPRITE_BRUNETTE_GIRL, STAY, LEFT, TEXT_SSANNE2FROOMS_BRUNETTE_GIRL + object_event 20, 12, SPRITE_BEAUTY, STAY, RIGHT, TEXT_SSANNE2FROOMS_BEAUTY def_warps_to SS_ANNE_2F_ROOMS diff --git a/data/maps/objects/SSAnne3F.asm b/data/maps/objects/SSAnne3F.asm index 09c4b5bd..db904ad6 100644 --- a/data/maps/objects/SSAnne3F.asm +++ b/data/maps/objects/SSAnne3F.asm @@ -1,3 +1,6 @@ + object_const_def + const SSANNE3F_SAILOR + SSAnne3F_Object: db $c ; border block @@ -8,6 +11,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, TEXT_SSANNE3F_SAILOR def_warps_to SS_ANNE_3F diff --git a/data/maps/objects/SSAnneB1FRooms.asm b/data/maps/objects/SSAnneB1FRooms.asm index 3c7da689..f7654fbb 100644 --- a/data/maps/objects/SSAnneB1FRooms.asm +++ b/data/maps/objects/SSAnneB1FRooms.asm @@ -1,3 +1,16 @@ + object_const_def + const SSANNEB1FROOMS_SAILOR1 + const SSANNEB1FROOMS_SAILOR2 + const SSANNEB1FROOMS_SAILOR3 + const SSANNEB1FROOMS_SAILOR4 + const SSANNEB1FROOMS_SAILOR5 + const SSANNEB1FROOMS_FISHER + const SSANNEB1FROOMS_SUPER_NERD + const SSANNEB1FROOMS_MACHOKE + const SSANNEB1FROOMS_ETHER + const SSANNEB1FROOMS_TM_REST + const SSANNEB1FROOMS_MAX_POTION + SSAnneB1FRooms_Object: db $c ; border block @@ -16,14 +29,14 @@ 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 10, 13, SPRITE_SUPER_NERD, STAY, RIGHT, 7 ; person - object_event 11, 12, SPRITE_MONSTER, STAY, NONE, 8 ; person + object_event 0, 13, SPRITE_SAILOR, STAY, DOWN, TEXT_SSANNEB1FROOMS_SAILOR1, OPP_SAILOR, 3 + object_event 2, 11, SPRITE_SAILOR, STAY, DOWN, TEXT_SSANNEB1FROOMS_SAILOR2, OPP_SAILOR, 4 + object_event 12, 3, SPRITE_SAILOR, STAY, LEFT, TEXT_SSANNEB1FROOMS_SAILOR3, OPP_SAILOR, 5 + object_event 22, 2, SPRITE_SAILOR, STAY, DOWN, TEXT_SSANNEB1FROOMS_SAILOR4, OPP_SAILOR, 6 + object_event 0, 2, SPRITE_SAILOR, STAY, RIGHT, TEXT_SSANNEB1FROOMS_SAILOR5, OPP_SAILOR, 7 + object_event 0, 4, SPRITE_FISHER, STAY, RIGHT, TEXT_SSANNEB1FROOMS_FISHER, OPP_FISHER, 2 + object_event 10, 13, SPRITE_SUPER_NERD, STAY, RIGHT, TEXT_SSANNEB1FROOMS_SUPER_NERD + object_event 11, 12, SPRITE_MONSTER, STAY, NONE, TEXT_SSANNEB1FROOMS_MACHOKE 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 diff --git a/data/maps/objects/SSAnneBow.asm b/data/maps/objects/SSAnneBow.asm index 6374f009..41e5c049 100644 --- a/data/maps/objects/SSAnneBow.asm +++ b/data/maps/objects/SSAnneBow.asm @@ -1,3 +1,10 @@ + object_const_def + const SSANNEBOW_SUPER_NERD + const SSANNEBOW_SAILOR1 + const SSANNEBOW_COOLTRAINER_M + const SSANNEBOW_SAILOR2 + const SSANNEBOW_SAILOR3 + SSAnneBow_Object: db $23 ; border block @@ -8,10 +15,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, TEXT_SSANNEBOW_SUPER_NERD + object_event 4, 9, SPRITE_SAILOR, STAY, NONE, TEXT_SSANNEBOW_SAILOR1 + object_event 7, 11, SPRITE_COOLTRAINER_M, STAY, NONE, TEXT_SSANNEBOW_COOLTRAINER_M + object_event 4, 4, SPRITE_SAILOR, STAY, DOWN, TEXT_SSANNEBOW_SAILOR2, OPP_SAILOR, 1 + object_event 10, 8, SPRITE_SAILOR, STAY, UP, TEXT_SSANNEBOW_SAILOR3, OPP_SAILOR, 2 def_warps_to SS_ANNE_BOW diff --git a/data/maps/objects/SSAnneCaptainsRoom.asm b/data/maps/objects/SSAnneCaptainsRoom.asm index 195e4183..7121a7b3 100644 --- a/data/maps/objects/SSAnneCaptainsRoom.asm +++ b/data/maps/objects/SSAnneCaptainsRoom.asm @@ -1,3 +1,6 @@ + object_const_def + const SSANNECAPTAINSROOM_CAPTAIN + SSAnneCaptainsRoom_Object: db $c ; border block @@ -5,10 +8,10 @@ SSAnneCaptainsRoom_Object: warp_event 0, 7, SS_ANNE_2F, 9 def_bg_events - bg_event 4, 1, 2 ; SSAnne7Text2 - bg_event 1, 2, 3 ; SSAnne7Text3 + bg_event 4, 1, TEXT_SSANNECAPTAINSROOM_TRASH + bg_event 1, 2, TEXT_SSANNECAPTAINSROOM_SEASICK_BOOK def_object_events - object_event 4, 2, SPRITE_CAPTAIN, STAY, UP, 1 ; person + object_event 4, 2, SPRITE_CAPTAIN, STAY, UP, TEXT_SSANNECAPTAINSROOM_CAPTAIN def_warps_to SS_ANNE_CAPTAINS_ROOM diff --git a/data/maps/objects/SSAnneKitchen.asm b/data/maps/objects/SSAnneKitchen.asm index c651679e..d44e9547 100644 --- a/data/maps/objects/SSAnneKitchen.asm +++ b/data/maps/objects/SSAnneKitchen.asm @@ -1,3 +1,12 @@ + object_const_def + const SSANNEKITCHEN_COOK1 + const SSANNEKITCHEN_COOK2 + const SSANNEKITCHEN_COOK3 + const SSANNEKITCHEN_COOK4 + const SSANNEKITCHEN_COOK5 + const SSANNEKITCHEN_COOK6 + const SSANNEKITCHEN_COOK7 + SSAnneKitchen_Object: db $c ; border block @@ -7,12 +16,12 @@ 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 13, 10, SPRITE_COOK, STAY, NONE, 6 ; person - object_event 11, 13, SPRITE_COOK, STAY, UP, 7 ; person + object_event 1, 8, SPRITE_COOK, WALK, UP_DOWN, TEXT_SSANNEKITCHEN_COOK1 + object_event 5, 8, SPRITE_COOK, WALK, UP_DOWN, TEXT_SSANNEKITCHEN_COOK2 + object_event 9, 7, SPRITE_COOK, WALK, UP_DOWN, TEXT_SSANNEKITCHEN_COOK3 + object_event 13, 6, SPRITE_COOK, STAY, NONE, TEXT_SSANNEKITCHEN_COOK4 + object_event 13, 8, SPRITE_COOK, STAY, NONE, TEXT_SSANNEKITCHEN_COOK5 + object_event 13, 10, SPRITE_COOK, STAY, NONE, TEXT_SSANNEKITCHEN_COOK6 + object_event 11, 13, SPRITE_COOK, STAY, UP, TEXT_SSANNEKITCHEN_COOK7 def_warps_to SS_ANNE_KITCHEN diff --git a/data/maps/objects/SafariZoneCenter.asm b/data/maps/objects/SafariZoneCenter.asm index 1c8efe95..ac176e14 100644 --- a/data/maps/objects/SafariZoneCenter.asm +++ b/data/maps/objects/SafariZoneCenter.asm @@ -1,3 +1,6 @@ + object_const_def + const SAFARIZONECENTER_NUGGET + SafariZoneCenter_Object: db $0 ; border block @@ -13,10 +16,10 @@ SafariZoneCenter_Object: warp_event 17, 19, SAFARI_ZONE_CENTER_REST_HOUSE, 1 def_bg_events - bg_event 18, 20, 2 ; SafariZoneCenterText2 - bg_event 14, 22, 3 ; SafariZoneCenterText3 + bg_event 18, 20, TEXT_SAFARIZONECENTER_REST_HOUSE_SIGN + bg_event 14, 22, TEXT_SAFARIZONECENTER_TRAINER_TIPS_SIGN def_object_events - object_event 14, 10, SPRITE_POKE_BALL, STAY, NONE, 1, NUGGET + object_event 14, 10, SPRITE_POKE_BALL, STAY, NONE, TEXT_SAFARIZONECENTER_NUGGET, NUGGET def_warps_to SAFARI_ZONE_CENTER diff --git a/data/maps/objects/SafariZoneCenterRestHouse.asm b/data/maps/objects/SafariZoneCenterRestHouse.asm index ff48d19c..06ec0d22 100644 --- a/data/maps/objects/SafariZoneCenterRestHouse.asm +++ b/data/maps/objects/SafariZoneCenterRestHouse.asm @@ -1,3 +1,7 @@ + object_const_def + const SAFARIZONECENTERRESTHOUSE_GIRL + const SAFARIZONECENTERRESTHOUSE_SCIENTIST + SafariZoneCenterRestHouse_Object: db $a ; border block @@ -8,7 +12,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, TEXT_SAFARIZONECENTERRESTHOUSE_GIRL + object_event 1, 4, SPRITE_SCIENTIST, WALK, UP_DOWN, TEXT_SAFARIZONECENTERRESTHOUSE_SCIENTIST def_warps_to SAFARI_ZONE_CENTER_REST_HOUSE diff --git a/data/maps/objects/SafariZoneEast.asm b/data/maps/objects/SafariZoneEast.asm index 30fb4039..0b4e26b4 100644 --- a/data/maps/objects/SafariZoneEast.asm +++ b/data/maps/objects/SafariZoneEast.asm @@ -1,3 +1,9 @@ + object_const_def + const SAFARIZONEEAST_FULL_RESTORE + const SAFARIZONEEAST_MAX_RESTORE + const SAFARIZONEEAST_CARBOS + const SAFARIZONEEAST_TM_EGG_BOMB + SafariZoneEast_Object: db $0 ; border block @@ -9,14 +15,14 @@ SafariZoneEast_Object: warp_event 25, 9, SAFARI_ZONE_EAST_REST_HOUSE, 1 def_bg_events - bg_event 26, 10, 5 ; SafariZoneEastText5 - bg_event 6, 4, 6 ; SafariZoneEastText6 - bg_event 5, 23, 7 ; SafariZoneEastText7 + bg_event 26, 10, TEXT_SAFARIZONEEAST_REST_HOUSE_SIGN + bg_event 6, 4, TEXT_SAFARIZONEEAST_TRAINER_TIPS + bg_event 5, 23, TEXT_SAFARIZONEEAST_SIGN 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 20, 13, SPRITE_POKE_BALL, STAY, NONE, 3, CARBOS - object_event 15, 12, SPRITE_POKE_BALL, STAY, NONE, 4, TM_EGG_BOMB + object_event 21, 10, SPRITE_POKE_BALL, STAY, NONE, TEXT_SAFARIZONEEAST_FULL_RESTORE, FULL_RESTORE + object_event 3, 7, SPRITE_POKE_BALL, STAY, NONE, TEXT_SAFARIZONEEAST_MAX_RESTORE, MAX_POTION + object_event 20, 13, SPRITE_POKE_BALL, STAY, NONE, TEXT_SAFARIZONEEAST_CARBOS, CARBOS + object_event 15, 12, SPRITE_POKE_BALL, STAY, NONE, TEXT_SAFARIZONEEAST_TM_EGG_BOMB, TM_EGG_BOMB def_warps_to SAFARI_ZONE_EAST diff --git a/data/maps/objects/SafariZoneEastRestHouse.asm b/data/maps/objects/SafariZoneEastRestHouse.asm index bf506605..7c89d27e 100644 --- a/data/maps/objects/SafariZoneEastRestHouse.asm +++ b/data/maps/objects/SafariZoneEastRestHouse.asm @@ -1,3 +1,8 @@ + object_const_def + const SAFARIZONEEASTRESTHOUSE_SCIENTIST + const SAFARIZONEEASTRESTHOUSE_ROCKER + const SAFARIZONEEASTRESTHOUSE_SILPH_WORKER_M + SafariZoneEastRestHouse_Object: db $a ; border block @@ -8,8 +13,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, TEXT_SAFARIZONEEASTRESTHOUSE_SCIENTIST + object_event 4, 2, SPRITE_ROCKER, STAY, NONE, TEXT_SAFARIZONEEASTRESTHOUSE_ROCKER + object_event 5, 2, SPRITE_SILPH_WORKER_M, STAY, NONE, TEXT_SAFARIZONEEASTRESTHOUSE_SILPH_WORKER_M def_warps_to SAFARI_ZONE_EAST_REST_HOUSE diff --git a/data/maps/objects/SafariZoneGate.asm b/data/maps/objects/SafariZoneGate.asm index ba6f7017..c9542e69 100644 --- a/data/maps/objects/SafariZoneGate.asm +++ b/data/maps/objects/SafariZoneGate.asm @@ -1,3 +1,7 @@ + object_const_def + const SAFARIZONEGATE_SAFARI_ZONE_WORKER1 + const SAFARIZONEGATE_SAFARI_ZONE_WORKER2 + SafariZoneGate_Object: db $a ; border block @@ -10,7 +14,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, TEXT_SAFARIZONEGATE_SAFARI_ZONE_WORKER1 + object_event 1, 4, SPRITE_SAFARI_ZONE_WORKER, STAY, RIGHT, TEXT_SAFARIZONEGATE_SAFARI_ZONE_WORKER2 def_warps_to SAFARI_ZONE_GATE diff --git a/data/maps/objects/SafariZoneNorth.asm b/data/maps/objects/SafariZoneNorth.asm index 97dc0d55..2ee7b17a 100644 --- a/data/maps/objects/SafariZoneNorth.asm +++ b/data/maps/objects/SafariZoneNorth.asm @@ -1,3 +1,7 @@ + object_const_def + const SAFARIZONENORTH_PROTEIN + const SAFARIZONENORTH_TM_SKULL_BASH + SafariZoneNorth_Object: db $0 ; border block @@ -13,14 +17,14 @@ SafariZoneNorth_Object: warp_event 35, 3, SAFARI_ZONE_NORTH_REST_HOUSE, 1 def_bg_events - bg_event 36, 4, 3 ; SafariZoneNorthText3 - bg_event 4, 25, 4 ; SafariZoneNorthText4 - bg_event 13, 31, 5 ; SafariZoneNorthText5 - bg_event 19, 33, 6 ; SafariZoneNorthText6 - bg_event 26, 28, 7 ; SafariZoneNorthText7 + bg_event 36, 4, TEXT_SAFARIZONENORTH_REST_HOUSE_SIGN + bg_event 4, 25, TEXT_SAFARIZONENORTH_TRAINER_TIPS_1 + bg_event 13, 31, TEXT_SAFARIZONENORTH_SIGN + bg_event 19, 33, TEXT_SAFARIZONENORTH_TRAINER_TIPS_2 + bg_event 26, 28, TEXT_SAFARIZONENORTH_TRAINER_TIPS_3 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, TEXT_SAFARIZONENORTH_PROTEIN, PROTEIN + object_event 19, 7, SPRITE_POKE_BALL, STAY, NONE, TEXT_SAFARIZONENORTH_TM_SKULL_BASH, TM_SKULL_BASH def_warps_to SAFARI_ZONE_NORTH diff --git a/data/maps/objects/SafariZoneNorthRestHouse.asm b/data/maps/objects/SafariZoneNorthRestHouse.asm index 8fbacd81..edb99c6b 100644 --- a/data/maps/objects/SafariZoneNorthRestHouse.asm +++ b/data/maps/objects/SafariZoneNorthRestHouse.asm @@ -1,3 +1,8 @@ + object_const_def + const SAFARIZONENORTHRESTHOUSE_SCIENTIST + const SAFARIZONENORTHRESTHOUSE_SAFARI_ZONE_WORKER + const SAFARIZONENORTHRESTHOUSE_GENTLEMAN + SafariZoneNorthRestHouse_Object: db $a ; border block @@ -8,8 +13,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, TEXT_SAFARIZONENORTHRESTHOUSE_SCIENTIST + object_event 3, 4, SPRITE_SAFARI_ZONE_WORKER, STAY, NONE, TEXT_SAFARIZONENORTHRESTHOUSE_SAFARI_ZONE_WORKER + object_event 1, 5, SPRITE_GENTLEMAN, WALK, UP_DOWN, TEXT_SAFARIZONENORTHRESTHOUSE_GENTLEMAN def_warps_to SAFARI_ZONE_NORTH_REST_HOUSE diff --git a/data/maps/objects/SafariZoneSecretHouse.asm b/data/maps/objects/SafariZoneSecretHouse.asm index 5d3a28c2..44ebd342 100644 --- a/data/maps/objects/SafariZoneSecretHouse.asm +++ b/data/maps/objects/SafariZoneSecretHouse.asm @@ -1,3 +1,6 @@ + object_const_def + const SAFARIZONESECRETHOUSE_FISHING_GURU + SafariZoneSecretHouse_Object: db $17 ; border block @@ -8,6 +11,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, TEXT_SAFARIZONESECRETHOUSE_FISHING_GURU def_warps_to SAFARI_ZONE_SECRET_HOUSE diff --git a/data/maps/objects/SafariZoneWest.asm b/data/maps/objects/SafariZoneWest.asm index dca3d3a8..284cd244 100644 --- a/data/maps/objects/SafariZoneWest.asm +++ b/data/maps/objects/SafariZoneWest.asm @@ -1,3 +1,9 @@ + object_const_def + const SAFARIZONEWEST_MAX_POTION + const SAFARIZONEWEST_TM_DOUBLE_TEAM + const SAFARIZONEWEST_MAX_REVIVE + const SAFARIZONEWEST_GOLD_TEETH + SafariZoneWest_Object: db $0 ; border block @@ -12,15 +18,15 @@ SafariZoneWest_Object: warp_event 11, 11, SAFARI_ZONE_WEST_REST_HOUSE, 1 def_bg_events - bg_event 12, 12, 5 ; SafariZoneWestText5 - bg_event 17, 3, 6 ; SafariZoneWestText6 - bg_event 26, 4, 7 ; SafariZoneWestText7 - bg_event 24, 22, 8 ; SafariZoneWestText8 + bg_event 12, 12, TEXT_SAFARIZONEWEST_REST_HOUSE_SIGN + bg_event 17, 3, TEXT_SAFARIZONEWEST_FIND_WARDENS_TEETH_SIGN + bg_event 26, 4, TEXT_SAFARIZONEWEST_TRAINER_TIPS + bg_event 24, 22, TEXT_SAFARIZONEWEST_SIGN 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 18, 18, SPRITE_POKE_BALL, STAY, NONE, 3, MAX_REVIVE - object_event 19, 7, SPRITE_POKE_BALL, STAY, NONE, 4, GOLD_TEETH + object_event 8, 20, SPRITE_POKE_BALL, STAY, NONE, TEXT_SAFARIZONEWEST_MAX_POTION, MAX_POTION + object_event 9, 7, SPRITE_POKE_BALL, STAY, NONE, TEXT_SAFARIZONEWEST_TM_DOUBLE_TEAM, TM_DOUBLE_TEAM + object_event 18, 18, SPRITE_POKE_BALL, STAY, NONE, TEXT_SAFARIZONEWEST_MAX_REVIVE, MAX_REVIVE + object_event 19, 7, SPRITE_POKE_BALL, STAY, NONE, TEXT_SAFARIZONEWEST_GOLD_TEETH, GOLD_TEETH def_warps_to SAFARI_ZONE_WEST diff --git a/data/maps/objects/SafariZoneWestRestHouse.asm b/data/maps/objects/SafariZoneWestRestHouse.asm index c63886b7..bf2eabe2 100644 --- a/data/maps/objects/SafariZoneWestRestHouse.asm +++ b/data/maps/objects/SafariZoneWestRestHouse.asm @@ -1,3 +1,8 @@ + object_const_def + const SAFARIZONEWESTRESTHOUSE_SCIENTIST + const SAFARIZONEWESTRESTHOUSE_COOLTRAINER_M + const SAFARIZONEWESTRESTHOUSE_SILPH_WORKER_F + SafariZoneWestRestHouse_Object: db $a ; border block @@ -8,8 +13,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, TEXT_SAFARIZONEWESTRESTHOUSE_SCIENTIST + object_event 0, 2, SPRITE_COOLTRAINER_M, STAY, RIGHT, TEXT_SAFARIZONEWESTRESTHOUSE_COOLTRAINER_M + object_event 6, 2, SPRITE_SILPH_WORKER_F, STAY, DOWN, TEXT_SAFARIZONEWESTRESTHOUSE_SILPH_WORKER_F def_warps_to SAFARI_ZONE_WEST_REST_HOUSE diff --git a/data/maps/objects/SaffronCity.asm b/data/maps/objects/SaffronCity.asm index 2fddfd5e..181b5c07 100644 --- a/data/maps/objects/SaffronCity.asm +++ b/data/maps/objects/SaffronCity.asm @@ -1,3 +1,20 @@ + object_const_def + const SAFFRONCITY_ROCKET1 + const SAFFRONCITY_ROCKET2 + const SAFFRONCITY_ROCKET3 + const SAFFRONCITY_ROCKET4 + const SAFFRONCITY_ROCKET5 + const SAFFRONCITY_ROCKET6 + const SAFFRONCITY_ROCKET7 + const SAFFRONCTIY_SCIENTIST + const SAFFRONCITY_SILPH_WORKER_M + const SAFFRONCITY_SILPH_WORKER_F + const SAFFRONCITY_GENTLEMAN + const SAFFRONCITY_PIDGEOT + const SAFFRONCITY_ROCKER + const SAFFRONCITY_ROCKET8 + const SAFFRONCITY_ROCKET9 + SaffronCity_Object: db $f ; border block @@ -12,32 +29,32 @@ SaffronCity_Object: warp_event 29, 29, MR_PSYCHICS_HOUSE, 1 def_bg_events - bg_event 17, 5, 16 ; SaffronCityText16 - bg_event 27, 5, 17 ; SaffronCityText17 - bg_event 35, 5, 18 ; SaffronCityText18 - bg_event 26, 11, 19 ; MartSignText - bg_event 39, 19, 20 ; SaffronCityText20 - bg_event 5, 21, 21 ; SaffronCityText21 - bg_event 15, 21, 22 ; SaffronCityText22 - bg_event 10, 29, 23 ; PokeCenterSignText - bg_event 27, 29, 24 ; SaffronCityText24 - bg_event 1, 19, 25 ; SaffronCityText25 + bg_event 17, 5, TEXT_SAFFRONCITY_SIGN + bg_event 27, 5, TEXT_SAFFRONCITY_FIGHTING_DOJO_SIGN + bg_event 35, 5, TEXT_SAFFRONCITY_GYM_SIGN + bg_event 26, 11, TEXT_SAFFRONCITY_MART_SIGN + bg_event 39, 19, TEXT_SAFFRONCITY_TRAINER_TIPS1 + bg_event 5, 21, TEXT_SAFFRONCITY_TRAINER_TIPS2 + bg_event 15, 21, TEXT_SAFFRONCITY_SILPH_CO_SIGN + bg_event 10, 29, TEXT_SAFFRONCITY_POKECENTER_SIGN + bg_event 27, 29, TEXT_SAFFRONCITY_MR_PSYCHICS_HOUSE_SIGN + bg_event 1, 19, TEXT_SAFFRONCITY_SILPH_CO_LATEST_PRODUCT_SIGN 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 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 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, 22, SPRITE_ROCKET, STAY, DOWN, 14 ; person - object_event 19, 22, SPRITE_ROCKET, STAY, DOWN, 15 ; person + object_event 7, 6, SPRITE_ROCKET, STAY, NONE, TEXT_SAFFRONCITY_ROCKET1 + object_event 20, 8, SPRITE_ROCKET, WALK, LEFT_RIGHT, TEXT_SAFFRONCITY_ROCKET2 + object_event 34, 4, SPRITE_ROCKET, STAY, NONE, TEXT_SAFFRONCITY_ROCKET3 + object_event 13, 12, SPRITE_ROCKET, STAY, NONE, TEXT_SAFFRONCITY_ROCKET4 + object_event 11, 25, SPRITE_ROCKET, WALK, LEFT_RIGHT, TEXT_SAFFRONCITY_ROCKET5 + object_event 32, 13, SPRITE_ROCKET, WALK, LEFT_RIGHT, TEXT_SAFFRONCITY_ROCKET6 + object_event 18, 30, SPRITE_ROCKET, WALK, LEFT_RIGHT, TEXT_SAFFRONCITY_ROCKET7 + object_event 8, 14, SPRITE_SCIENTIST, WALK, ANY_DIR, TEXT_SAFFRONCITY_SCIENTIST + object_event 23, 23, SPRITE_SILPH_WORKER_M, STAY, NONE, TEXT_SAFFRONCITY_SILPH_WORKER_M + object_event 17, 30, SPRITE_SILPH_WORKER_F, WALK, LEFT_RIGHT, TEXT_SAFFRONCITY_SILPH_WORKER_F + object_event 30, 12, SPRITE_GENTLEMAN, STAY, DOWN, TEXT_SAFFRONCITY_GENTLEMAN + object_event 31, 12, SPRITE_BIRD, STAY, DOWN, TEXT_SAFFRONCITY_PIDGEOT + object_event 18, 8, SPRITE_ROCKER, STAY, UP, TEXT_SAFFRONCITY_ROCKER + object_event 18, 22, SPRITE_ROCKET, STAY, DOWN, TEXT_SAFFRONCITY_ROCKET8 + object_event 19, 22, SPRITE_ROCKET, STAY, DOWN, TEXT_SAFFRONCITY_ROCKET9 def_warps_to SAFFRON_CITY diff --git a/data/maps/objects/SaffronGym.asm b/data/maps/objects/SaffronGym.asm index 7c6e83e5..af4bd68e 100644 --- a/data/maps/objects/SaffronGym.asm +++ b/data/maps/objects/SaffronGym.asm @@ -1,3 +1,14 @@ + object_const_def + const SAFFRONGYM_SABRINA + const SAFFRONGYM_CHANNELER1 + const SAFFRONGYM_YOUNGSTER1 + const SAFFRONGYM_CHANNELER2 + const SAFFRONGYM_YOUNGSTER2 + const SAFFRONGYM_CHANNELER3 + const SAFFRONGYM_YOUNGSTER3 + const SAFFRONGYM_YOUNGSTER4 + const SAFFRONGYM_GYM_GUIDE + SaffronGym_Object: db $2e ; border block @@ -38,14 +49,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 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 10, 15, SPRITE_GYM_GUIDE, STAY, DOWN, 9 ; person + object_event 9, 8, SPRITE_GIRL, STAY, DOWN, TEXT_SAFFRONGYM_SABRINA, OPP_SABRINA, 1 + object_event 10, 1, SPRITE_CHANNELER, STAY, DOWN, TEXT_SAFFRONGYM_CHANNELER1, OPP_CHANNELER, 22 + object_event 17, 1, SPRITE_YOUNGSTER, STAY, DOWN, TEXT_SAFFRONGYM_YOUNGSTER1, OPP_PSYCHIC_TR, 1 + object_event 3, 7, SPRITE_CHANNELER, STAY, DOWN, TEXT_SAFFRONGYM_CHANNELER2, OPP_CHANNELER, 23 + object_event 17, 7, SPRITE_YOUNGSTER, STAY, DOWN, TEXT_SAFFRONGYM_YOUNGSTER2, OPP_PSYCHIC_TR, 2 + object_event 3, 13, SPRITE_CHANNELER, STAY, DOWN, TEXT_SAFFRONGYM_CHANNELER3, OPP_CHANNELER, 24 + object_event 17, 13, SPRITE_YOUNGSTER, STAY, DOWN, TEXT_SAFFRONGYM_YOUNGSTER3, OPP_PSYCHIC_TR, 3 + object_event 3, 1, SPRITE_YOUNGSTER, STAY, DOWN, TEXT_SAFFRONGYM_YOUNGSTER4, OPP_PSYCHIC_TR, 4 + object_event 10, 15, SPRITE_GYM_GUIDE, STAY, DOWN, TEXT_SAFFRONGYM_GYM_GUIDE def_warps_to SAFFRON_GYM diff --git a/data/maps/objects/SaffronMart.asm b/data/maps/objects/SaffronMart.asm index d9dd6881..7a2d9eb1 100644 --- a/data/maps/objects/SaffronMart.asm +++ b/data/maps/objects/SaffronMart.asm @@ -1,3 +1,8 @@ + object_const_def + const SAFFRONMART_CLERK + const SAFFRONMART_SUPER_NERD + const SAFFRONMART_COOLTRAINER_F + SaffronMart_Object: db $0 ; border block @@ -8,8 +13,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, TEXT_SAFFRONMART_CLERK + object_event 4, 2, SPRITE_SUPER_NERD, STAY, NONE, TEXT_SAFFRONMART_SUPER_NERD + object_event 6, 5, SPRITE_COOLTRAINER_F, WALK, ANY_DIR, TEXT_SAFFRONMART_COOLTRAINER_F def_warps_to SAFFRON_MART diff --git a/data/maps/objects/SaffronPidgeyHouse.asm b/data/maps/objects/SaffronPidgeyHouse.asm index 8a5249e5..3fc0cb9d 100644 --- a/data/maps/objects/SaffronPidgeyHouse.asm +++ b/data/maps/objects/SaffronPidgeyHouse.asm @@ -1,3 +1,9 @@ + object_const_def + const SAFFRONPIDGEYHOUSE_BRUNETTE_GIRL + const SAFFRONPIDGEYHOUSE_PIDGEY + const SAFFRONPIDGEYHOUSE_YOUNGSTER + const SAFFRONPIDGEYHOUSE_PAPER + SaffronPidgeyHouse_Object: db $a ; border block @@ -8,9 +14,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, TEXT_SAFFRONPIDGEYHOUSE_BRUNETTE_GIRL + object_event 0, 4, SPRITE_BIRD, WALK, UP_DOWN, TEXT_SAFFRONPIDGEYHOUSE_PIDGEY + object_event 4, 1, SPRITE_YOUNGSTER, STAY, DOWN, TEXT_SAFFRONPIDGEYHOUSE_YOUNGSTER + object_event 3, 3, SPRITE_PAPER, STAY, NONE, TEXT_SAFFRONPIDGEYHOUSE_PAPER def_warps_to SAFFRON_PIDGEY_HOUSE diff --git a/data/maps/objects/SaffronPokecenter.asm b/data/maps/objects/SaffronPokecenter.asm index ca94086b..3169ea43 100644 --- a/data/maps/objects/SaffronPokecenter.asm +++ b/data/maps/objects/SaffronPokecenter.asm @@ -1,3 +1,9 @@ + object_const_def + const SAFFRONPOKECENTER_NURSE + const SAFFRONPOKECENTER_BEAUTY + const SAFFRONPOKECENTER_GENTLEMAN + const SAFFRONPOKECENTER_LINK_RECEPTIONIST + SaffronPokecenter_Object: db $0 ; border block @@ -8,9 +14,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, TEXT_SAFFRONPOKECENTER_NURSE + object_event 5, 5, SPRITE_BEAUTY, STAY, NONE, TEXT_SAFFRONPOKECENTER_BEAUTY + object_event 8, 3, SPRITE_GENTLEMAN, STAY, DOWN, TEXT_SAFFRONPOKECENTER_GENTLEMAN + object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, TEXT_SAFFRONPOKECENTER_LINK_RECEPTIONIST def_warps_to SAFFRON_POKECENTER diff --git a/data/maps/objects/SeafoamIslands1F.asm b/data/maps/objects/SeafoamIslands1F.asm index f5e3347b..a9004284 100644 --- a/data/maps/objects/SeafoamIslands1F.asm +++ b/data/maps/objects/SeafoamIslands1F.asm @@ -1,3 +1,7 @@ + object_const_def + const SEAFOAMISLANDS1F_BOULDER1 + const SEAFOAMISLANDS1F_BOULDER2 + SeafoamIslands1F_Object: db $7d ; border block @@ -13,8 +17,8 @@ SeafoamIslands1F_Object: def_bg_events 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 18, 10, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, TEXT_SEAFOAMISLANDS1F_BOULDER1 + object_event 26, 7, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, TEXT_SEAFOAMISLANDS1F_BOULDER2 def_warps_to SEAFOAM_ISLANDS_1F diff --git a/data/maps/objects/SeafoamIslandsB1F.asm b/data/maps/objects/SeafoamIslandsB1F.asm index 165fc440..c941ea21 100644 --- a/data/maps/objects/SeafoamIslandsB1F.asm +++ b/data/maps/objects/SeafoamIslandsB1F.asm @@ -1,3 +1,7 @@ + object_const_def + const SEAFOAMISLANDSB1F_BOULDER1 + const SEAFOAMISLANDSB1F_BOULDER2 + SeafoamIslandsB1F_Object: db $7d ; border block @@ -13,7 +17,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, TEXT_SEAFOAMISLANDSB1F_BOULDER1 + object_event 22, 6, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, TEXT_SEAFOAMISLANDSB1F_BOULDER2 def_warps_to SEAFOAM_ISLANDS_B1F diff --git a/data/maps/objects/SeafoamIslandsB2F.asm b/data/maps/objects/SeafoamIslandsB2F.asm index 1ab5b373..26bf3b07 100644 --- a/data/maps/objects/SeafoamIslandsB2F.asm +++ b/data/maps/objects/SeafoamIslandsB2F.asm @@ -1,3 +1,7 @@ + object_const_def + const SEAFOAMISLANDSB2F_BOULDER1 + const SEAFOAMISLANDSB2F_BOULDER2 + SeafoamIslandsB2F_Object: db $7d ; border block @@ -13,7 +17,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, TEXT_SEAFOAMISLANDSB2F_BOULDER1 + object_event 23, 6, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, TEXT_SEAFOAMISLANDSB2F_BOULDER2 def_warps_to SEAFOAM_ISLANDS_B2F diff --git a/data/maps/objects/SeafoamIslandsB3F.asm b/data/maps/objects/SeafoamIslandsB3F.asm index 4657a80a..667e6ff7 100644 --- a/data/maps/objects/SeafoamIslandsB3F.asm +++ b/data/maps/objects/SeafoamIslandsB3F.asm @@ -1,3 +1,11 @@ + object_const_def + const SEAFOAMISLANDSB3F_BOULDER1 + const SEAFOAMISLANDSB3F_BOULDER2 + const SEAFOAMISLANDSB3F_BOULDER3 + const SEAFOAMISLANDSB3F_BOULDER4 + const SEAFOAMISLANDSB3F_BOULDER5 + const SEAFOAMISLANDSB3F_BOULDER6 + SeafoamIslandsB3F_Object: db $7d ; border block @@ -13,11 +21,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, TEXT_SEAFOAMISLANDSB3F_BOULDER1 + object_event 3, 15, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, TEXT_SEAFOAMISLANDSB3F_BOULDER2 + object_event 8, 14, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, TEXT_SEAFOAMISLANDSB3F_BOULDER3 + object_event 9, 14, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, TEXT_SEAFOAMISLANDSB3F_BOULDER4 + object_event 18, 6, SPRITE_BOULDER, STAY, NONE, TEXT_SEAFOAMISLANDSB3F_BOULDER5 + object_event 19, 6, SPRITE_BOULDER, STAY, NONE, TEXT_SEAFOAMISLANDSB3F_BOULDER6 def_warps_to SEAFOAM_ISLANDS_B3F diff --git a/data/maps/objects/SeafoamIslandsB4F.asm b/data/maps/objects/SeafoamIslandsB4F.asm index c6e769e0..0948200d 100644 --- a/data/maps/objects/SeafoamIslandsB4F.asm +++ b/data/maps/objects/SeafoamIslandsB4F.asm @@ -1,3 +1,8 @@ + object_const_def + const SEAFOAMISLANDSB4F_BOULDER1 + const SEAFOAMISLANDSB4F_BOULDER2 + const SEAFOAMISLANDSB4F_ARTICUNO + SeafoamIslandsB4F_Object: db $7d ; border block @@ -8,12 +13,12 @@ SeafoamIslandsB4F_Object: warp_event 25, 4, SEAFOAM_ISLANDS_B3F, 3 def_bg_events - bg_event 9, 15, 4 ; SeafoamIslands5Text4 - bg_event 23, 1, 5 ; SeafoamIslands5Text5 + bg_event 9, 15, TEXT_SEAFOAMISLANDSB4F_BOULDERS_SIGN + bg_event 23, 1, TEXT_SEAFOAMISLANDSB4F_DANGER_SIGN 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, TEXT_SEAFOAMISLANDSB4F_BOULDER1 + object_event 5, 15, SPRITE_BOULDER, STAY, NONE, TEXT_SEAFOAMISLANDSB4F_BOULDER2 + object_event 6, 1, SPRITE_BIRD, STAY, DOWN, TEXT_SEAFOAMISLANDSB4F_ARTICUNO, ARTICUNO, 50 def_warps_to SEAFOAM_ISLANDS_B4F diff --git a/data/maps/objects/SilphCo10F.asm b/data/maps/objects/SilphCo10F.asm index 20249425..6904165a 100644 --- a/data/maps/objects/SilphCo10F.asm +++ b/data/maps/objects/SilphCo10F.asm @@ -1,3 +1,11 @@ + object_const_def + const SILPHCO10F_ROCKET + const SILPHCO10F_SCIENTIST + const SILPHCO10F_SILPH_WORKER_F + const SILPHCO10F_TM_EARTHQUAKE + const SILPHCO10F_RARE_CANDY + const SILPHCO10F_CARBOS + SilphCo10F_Object: db $2e ; border block @@ -12,11 +20,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, TEXT_SILPHCO10F_ROCKET, OPP_ROCKET, 39 + object_event 10, 2, SPRITE_SCIENTIST, STAY, LEFT, TEXT_SILPHCO10F_SCIENTIST, OPP_SCIENTIST, 11 + object_event 9, 15, SPRITE_SILPH_WORKER_F, WALK, ANY_DIR, TEXT_SILPHCO10F_SILPH_WORKER_F + object_event 2, 12, SPRITE_POKE_BALL, STAY, NONE, TEXT_SILPHCO10F_TM_EARTHQUAKE, TM_EARTHQUAKE + object_event 4, 14, SPRITE_POKE_BALL, STAY, NONE, TEXT_SILPHCO10F_RARE_CANDY, RARE_CANDY + object_event 5, 11, SPRITE_POKE_BALL, STAY, NONE, TEXT_SILPHCO10F_CARBOS, CARBOS def_warps_to SILPH_CO_10F diff --git a/data/maps/objects/SilphCo11F.asm b/data/maps/objects/SilphCo11F.asm index 9651c32b..1ee5ffe6 100644 --- a/data/maps/objects/SilphCo11F.asm +++ b/data/maps/objects/SilphCo11F.asm @@ -1,3 +1,10 @@ + object_const_def + const SILPHCO11F_SILPH_PRESIDENT + const SILPHCO11F_BEAUTY + const SILPHCO11F_GIOVANNI + const SILPHCO11F_ROCKET1 + const SILPHCO11F_ROCKET2 + SilphCo11F_Object: db $d ; border block @@ -10,10 +17,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, TEXT_SILPHCO11F_SILPH_PRESIDENT + object_event 10, 5, SPRITE_BEAUTY, STAY, DOWN, TEXT_SILPHCO11F_BEAUTY + object_event 6, 9, SPRITE_GIOVANNI, STAY, DOWN, TEXT_SILPHCO11F_GIOVANNI, OPP_GIOVANNI, 2 + object_event 3, 16, SPRITE_ROCKET, STAY, UP, TEXT_SILPHCO11F_ROCKET1, OPP_ROCKET, 41 + object_event 15, 9, SPRITE_ROCKET, STAY, UP, TEXT_SILPHCO11F_ROCKET2, OPP_ROCKET, 40 def_warps_to SILPH_CO_11F diff --git a/data/maps/objects/SilphCo1F.asm b/data/maps/objects/SilphCo1F.asm index 605edd9d..3d1873b5 100644 --- a/data/maps/objects/SilphCo1F.asm +++ b/data/maps/objects/SilphCo1F.asm @@ -1,3 +1,6 @@ + object_const_def + const SILPHCO1F_LINK_RECEPTIONIST + SilphCo1F_Object: db $2e ; border block @@ -11,6 +14,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, TEXT_SILPHCO1F_LINK_RECEPTIONIST def_warps_to SILPH_CO_1F diff --git a/data/maps/objects/SilphCo2F.asm b/data/maps/objects/SilphCo2F.asm index 3ee8de9c..b618708a 100644 --- a/data/maps/objects/SilphCo2F.asm +++ b/data/maps/objects/SilphCo2F.asm @@ -1,3 +1,10 @@ + object_const_def + const SILPHCO2F_SILPH_WORKER_F + const SILPHCO2F_SCIENTIST1 + const SILPHCO2F_SCIENTIST2 + const SILPHCO2F_ROCKET1 + const SILPHCO2F_ROCKET2 + SilphCo2F_Object: db $2e ; border block @@ -13,10 +20,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 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 10, 1, SPRITE_SILPH_WORKER_F, STAY, UP, TEXT_SILPHCO2F_SILPH_WORKER_F + object_event 5, 12, SPRITE_SCIENTIST, STAY, DOWN, TEXT_SILPHCO2F_SCIENTIST1, OPP_SCIENTIST, 2 + object_event 24, 13, SPRITE_SCIENTIST, STAY, LEFT, TEXT_SILPHCO2F_SCIENTIST2, OPP_SCIENTIST, 3 + object_event 16, 11, SPRITE_ROCKET, STAY, UP, TEXT_SILPHCO2F_ROCKET1, OPP_ROCKET, 23 + object_event 24, 7, SPRITE_ROCKET, STAY, UP, TEXT_SILPHCO2F_ROCKET2, OPP_ROCKET, 24 def_warps_to SILPH_CO_2F diff --git a/data/maps/objects/SilphCo3F.asm b/data/maps/objects/SilphCo3F.asm index 6b050aad..f22eee82 100644 --- a/data/maps/objects/SilphCo3F.asm +++ b/data/maps/objects/SilphCo3F.asm @@ -1,3 +1,9 @@ + object_const_def + const SILPHCO3F_SILPH_WORKER_M + const SILPHCO3F_ROCKET + const SILPHCO3F_SCIENTIST + const SILPHCO3F_HYPER_POTION + SilphCo3F_Object: db $2e ; border block @@ -16,9 +22,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_M, STAY, NONE, TEXT_SILPHCO3F_SILPH_WORKER_M + object_event 20, 7, SPRITE_ROCKET, STAY, LEFT, TEXT_SILPHCO3F_ROCKET, OPP_ROCKET, 25 + object_event 7, 9, SPRITE_SCIENTIST, STAY, DOWN, TEXT_SILPHCO3F_SCIENTIST, OPP_SCIENTIST, 4 + object_event 8, 5, SPRITE_POKE_BALL, STAY, NONE, TEXT_SILPHCO3F_HYPER_POTION, HYPER_POTION def_warps_to SILPH_CO_3F diff --git a/data/maps/objects/SilphCo4F.asm b/data/maps/objects/SilphCo4F.asm index 7dbc12ca..cf471cb4 100644 --- a/data/maps/objects/SilphCo4F.asm +++ b/data/maps/objects/SilphCo4F.asm @@ -1,3 +1,12 @@ + object_const_def + const SILPHCO4F_SILPH_WORKER_M + const SILPHCO4F_ROCKET1 + const SILPHCO4F_SCIENTIST + const SILPHCO4F_ROCKET2 + const SILPHCO4F_FULL_HEAL + const SILPHCO4F_MAX_REVIVE + const SILPHCO4F_ESCAPE_ROPE + SilphCo4F_Object: db $2e ; border block @@ -13,12 +22,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 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 6, 2, SPRITE_SILPH_WORKER_M, STAY, NONE, TEXT_SILPHCO4F_SILPH_WORKER_M + object_event 9, 14, SPRITE_ROCKET, STAY, RIGHT, TEXT_SILPHCO4F_ROCKET1, OPP_ROCKET, 26 + object_event 14, 6, SPRITE_SCIENTIST, STAY, LEFT, TEXT_SILPHCO4F_SCIENTIST, OPP_SCIENTIST, 5 + object_event 26, 10, SPRITE_ROCKET, STAY, UP, TEXT_SILPHCO4F_ROCKET2, OPP_ROCKET, 27 + object_event 3, 9, SPRITE_POKE_BALL, STAY, NONE, TEXT_SILPHCO4F_FULL_HEAL, FULL_HEAL + object_event 4, 7, SPRITE_POKE_BALL, STAY, NONE, TEXT_SILPHCO4F_MAX_REVIVE, MAX_REVIVE + object_event 5, 8, SPRITE_POKE_BALL, STAY, NONE, TEXT_SILPHCO4F_ESCAPE_ROPE, ESCAPE_ROPE def_warps_to SILPH_CO_4F diff --git a/data/maps/objects/SilphCo5F.asm b/data/maps/objects/SilphCo5F.asm index 7910f473..c6cc7e34 100644 --- a/data/maps/objects/SilphCo5F.asm +++ b/data/maps/objects/SilphCo5F.asm @@ -1,3 +1,16 @@ + object_const_def + const SILPHCO5F_SILPH_WORKER_M + const SILPHCO5F_ROCKET1 + const SILPHCO5F_SCIENTIST + const SILPHCO5F_ROCKER + const SILPHCO5F_ROCKET2 + const SILPHCO5F_TM_TAKE_DOWN + const SILPHCO5F_PROTEIN + const SILPHCO5F_CARD_KEY + const SILPHCO5F_POKEMON_REPORT1 + const SILPHCO5F_POKEMON_REPORT2 + const SILPHCO5F_POKEMON_REPORT3 + SilphCo5F_Object: db $2e ; border block @@ -13,16 +26,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 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 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 13, 9, SPRITE_SILPH_WORKER_M, STAY, NONE, TEXT_SILPHCO5F_SILPH_WORKER_M + object_event 8, 16, SPRITE_ROCKET, STAY, RIGHT, TEXT_SILPHCO5F_ROCKET1, OPP_ROCKET, 28 + object_event 8, 3, SPRITE_SCIENTIST, STAY, RIGHT, TEXT_SILPHCO5F_SCIENTIST, OPP_SCIENTIST, 6 + object_event 18, 10, SPRITE_ROCKER, STAY, UP, TEXT_SILPHCO5F_ROCKER, OPP_JUGGLER, 1 + object_event 28, 4, SPRITE_ROCKET, STAY, UP, TEXT_SILPHCO5F_ROCKET2, OPP_ROCKET, 29 + object_event 2, 13, SPRITE_POKE_BALL, STAY, NONE, TEXT_SILPHCO5F_TM_TAKE_DOWN, TM_TAKE_DOWN + object_event 4, 6, SPRITE_POKE_BALL, STAY, NONE, TEXT_SILPHCO5F_PROTEIN, PROTEIN + object_event 21, 16, SPRITE_POKE_BALL, STAY, NONE, TEXT_SILPHCO5F_CARD_KEY, CARD_KEY + object_event 22, 12, SPRITE_CLIPBOARD, STAY, NONE, TEXT_SILPHCO5F_POKEMON_REPORT1 + object_event 25, 10, SPRITE_CLIPBOARD, STAY, NONE, TEXT_SILPHCO5F_POKEMON_REPORT2 + object_event 24, 6, SPRITE_CLIPBOARD, STAY, NONE, TEXT_SILPHCO5F_POKEMON_REPORT3 def_warps_to SILPH_CO_5F diff --git a/data/maps/objects/SilphCo6F.asm b/data/maps/objects/SilphCo6F.asm index 2495790d..5dc9c87b 100644 --- a/data/maps/objects/SilphCo6F.asm +++ b/data/maps/objects/SilphCo6F.asm @@ -1,3 +1,15 @@ + object_const_def + const SILPHCO6F_SILPH_WORKER_M1 + const SILPHCO6F_SILPH_WORKER_M2 + const SILPHCO6F_SILPH_WORKER_F1 + const SILPHCO6F_SILPH_WORKER_F2 + const SILPHCO6F_SILPH_WORKER_M3 + const SILPHCO6F_ROCKET1 + const SILPHCO6F_SCIENTIST + const SILPHCO6F_ROCKET2 + const SILPHCO6F_HP_UP + const SILPHCO6F_X_ACCURACY + SilphCo6F_Object: db $2e ; border block @@ -11,15 +23,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 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 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 10, 6, SPRITE_SILPH_WORKER_M, STAY, NONE, TEXT_SILPHCO6F_SILPH_WORKER_M1 + object_event 20, 6, SPRITE_SILPH_WORKER_M, STAY, NONE, TEXT_SILPHCO6F_SILPH_WORKER_M2 + object_event 21, 6, SPRITE_SILPH_WORKER_F, STAY, DOWN, TEXT_SILPHCO6F_SILPH_WORKER_F1 + object_event 11, 10, SPRITE_SILPH_WORKER_F, STAY, RIGHT, TEXT_SILPHCO6F_SILPH_WORKER_F2 + object_event 18, 13, SPRITE_SILPH_WORKER_M, STAY, UP, TEXT_SILPHCO6F_SILPH_WORKER_M3 + object_event 17, 3, SPRITE_ROCKET, STAY, RIGHT, TEXT_SILPHCO6F_ROCKET1, OPP_ROCKET, 30 + object_event 7, 8, SPRITE_SCIENTIST, STAY, DOWN, TEXT_SILPHCO6F_SCIENTIST, OPP_SCIENTIST, 7 + object_event 14, 15, SPRITE_ROCKET, STAY, LEFT, TEXT_SILPHCO6F_ROCKET2, OPP_ROCKET, 31 + object_event 3, 12, SPRITE_POKE_BALL, STAY, NONE, TEXT_SILPHCO6F_HP_UP, HP_UP + object_event 2, 15, SPRITE_POKE_BALL, STAY, NONE, TEXT_SILPHCO6F_X_ACCURACY, X_ACCURACY def_warps_to SILPH_CO_6F diff --git a/data/maps/objects/SilphCo7F.asm b/data/maps/objects/SilphCo7F.asm index b7854e3c..2d5ed33c 100644 --- a/data/maps/objects/SilphCo7F.asm +++ b/data/maps/objects/SilphCo7F.asm @@ -1,3 +1,16 @@ + object_const_def + const SILPHCO7F_SILPH_WORKER_M1 + const SILPHCO7F_SILPH_WORKER_M2 + const SILPHCO7F_SILPH_WORKER_M3 + const SILPHCO7F_SILPH_WORKER_M4 + const SILPHCO7F_ROCKET1 + const SILPHCO7F_SCIENTIST + const SILPHCO7F_ROCKET2 + const SILPHCO7F_ROCKET3 + const SILPHCO7F_RIVAL + const SILPHCO7F_CALCIUM + const SILPHCO7F_TM_SWORDS_DANCE + SilphCo7F_Object: db $2e ; border block @@ -12,16 +25,16 @@ SilphCo7F_Object: def_bg_events def_object_events - 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 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 24, 11, SPRITE_POKE_BALL, STAY, NONE, 11, TM_SWORDS_DANCE + object_event 1, 5, SPRITE_SILPH_WORKER_M, STAY, NONE, TEXT_SILPHCO7F_SILPH_WORKER_M1 + object_event 13, 13, SPRITE_SILPH_WORKER_M, STAY, UP, TEXT_SILPHCO7F_SILPH_WORKER_M2 + object_event 7, 10, SPRITE_SILPH_WORKER_M, STAY, NONE, TEXT_SILPHCO7F_SILPH_WORKER_M3 + object_event 10, 8, SPRITE_SILPH_WORKER_F, STAY, NONE, TEXT_SILPHCO7F_SILPH_WORKER_M4 + object_event 13, 1, SPRITE_ROCKET, STAY, DOWN, TEXT_SILPHCO7F_ROCKET1, OPP_ROCKET, 32 + object_event 2, 13, SPRITE_SCIENTIST, STAY, DOWN, TEXT_SILPHCO7F_SCIENTIST, OPP_SCIENTIST, 8 + object_event 20, 2, SPRITE_ROCKET, STAY, LEFT, TEXT_SILPHCO7F_ROCKET2, OPP_ROCKET, 33 + object_event 19, 14, SPRITE_ROCKET, STAY, RIGHT, TEXT_SILPHCO7F_ROCKET3, OPP_ROCKET, 34 + object_event 3, 7, SPRITE_BLUE, STAY, UP, TEXT_SILPHCO7F_RIVAL + object_event 1, 9, SPRITE_POKE_BALL, STAY, NONE, TEXT_SILPHCO7F_CALCIUM, CALCIUM + object_event 24, 11, SPRITE_POKE_BALL, STAY, NONE, TEXT_SILPHCO7F_TM_SWORDS_DANCE, TM_SWORDS_DANCE def_warps_to SILPH_CO_7F diff --git a/data/maps/objects/SilphCo8F.asm b/data/maps/objects/SilphCo8F.asm index ded21400..7f0bbc78 100644 --- a/data/maps/objects/SilphCo8F.asm +++ b/data/maps/objects/SilphCo8F.asm @@ -1,3 +1,9 @@ + object_const_def + const SILPHCO8F_SILPH_WORKER_M + const SILPHCO8F_ROCKET1 + const SILPHCO8F_SCIENTIST + const SILPHCO8F_ROCKET2 + SilphCo8F_Object: db $2e ; border block @@ -13,9 +19,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 12, 15, SPRITE_ROCKET, STAY, RIGHT, 4, OPP_ROCKET, 36 + object_event 4, 2, SPRITE_SILPH_WORKER_M, STAY, NONE, TEXT_SILPHCO8F_SILPH_WORKER_M + object_event 19, 2, SPRITE_ROCKET, STAY, LEFT, TEXT_SILPHCO8F_ROCKET1, OPP_ROCKET, 35 + object_event 10, 2, SPRITE_SCIENTIST, STAY, DOWN, TEXT_SILPHCO8F_SCIENTIST, OPP_SCIENTIST, 9 + object_event 12, 15, SPRITE_ROCKET, STAY, RIGHT, TEXT_SILPHCO8F_ROCKET2, OPP_ROCKET, 36 def_warps_to SILPH_CO_8F diff --git a/data/maps/objects/SilphCo9F.asm b/data/maps/objects/SilphCo9F.asm index 261df23c..59cb2c5b 100644 --- a/data/maps/objects/SilphCo9F.asm +++ b/data/maps/objects/SilphCo9F.asm @@ -1,3 +1,9 @@ + object_const_def + const SILPHCO9F_NURSE + const SILPHCO9F_ROCKET1 + const SILPHCO9F_SCIENTIST + const SILPHCO9F_ROCKET2 + SilphCo9F_Object: db $2e ; border block @@ -11,9 +17,9 @@ 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 21, 13, SPRITE_SCIENTIST, STAY, DOWN, 3, OPP_SCIENTIST, 10 - object_event 13, 16, SPRITE_ROCKET, STAY, UP, 4, OPP_ROCKET, 38 + object_event 3, 14, SPRITE_NURSE, STAY, DOWN, TEXT_SILPHCO9F_NURSE + object_event 2, 4, SPRITE_ROCKET, STAY, UP, TEXT_SILPHCO9F_ROCKET1, OPP_ROCKET, 37 + object_event 21, 13, SPRITE_SCIENTIST, STAY, DOWN, TEXT_SILPHCO9F_SCIENTIST, OPP_SCIENTIST, 10 + object_event 13, 16, SPRITE_ROCKET, STAY, UP, TEXT_SILPHCO9F_ROCKET2, OPP_ROCKET, 38 def_warps_to SILPH_CO_9F diff --git a/data/maps/objects/SilphCoElevator.asm b/data/maps/objects/SilphCoElevator.asm index 1451fccd..6a8f3572 100644 --- a/data/maps/objects/SilphCoElevator.asm +++ b/data/maps/objects/SilphCoElevator.asm @@ -6,7 +6,7 @@ SilphCoElevator_Object: warp_event 2, 3, UNUSED_MAP_ED, 1 def_bg_events - bg_event 3, 0, 1 ; SilphCoElevatorText1 + bg_event 3, 0, TEXT_SILPHCOELEVATOR_ELEVATOR def_object_events diff --git a/data/maps/objects/TradeCenter.asm b/data/maps/objects/TradeCenter.asm index 9bc1f72d..edc3e0b5 100644 --- a/data/maps/objects/TradeCenter.asm +++ b/data/maps/objects/TradeCenter.asm @@ -1,3 +1,6 @@ + object_const_def + const TRADECENTER_OPPONENT + TradeCenter_Object: db $e ; border block @@ -6,6 +9,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, TEXT_TRADECENTER_OPPONENT def_warps_to TRADE_CENTER diff --git a/data/maps/objects/UndergroundPathRoute5.asm b/data/maps/objects/UndergroundPathRoute5.asm index 7ffaeffc..56402b41 100644 --- a/data/maps/objects/UndergroundPathRoute5.asm +++ b/data/maps/objects/UndergroundPathRoute5.asm @@ -1,3 +1,6 @@ + object_const_def + const UNDERGROUNDPATHROUTE5_LITTLE_GIRL + UndergroundPathRoute5_Object: db $a ; border block @@ -9,6 +12,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, TEXT_UNDERGROUNDPATHROUTE5_LITTLE_GIRL def_warps_to UNDERGROUND_PATH_ROUTE_5 diff --git a/data/maps/objects/UndergroundPathRoute6.asm b/data/maps/objects/UndergroundPathRoute6.asm index cee23de3..a1ac3acf 100644 --- a/data/maps/objects/UndergroundPathRoute6.asm +++ b/data/maps/objects/UndergroundPathRoute6.asm @@ -1,3 +1,6 @@ + object_const_def + const UNDERGROUNDPATHROUTE6_GIRL + UndergroundPathRoute6_Object: db $a ; border block @@ -9,6 +12,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, TEXT_UNDERGROUNDPATHROUTE6_GIRL def_warps_to UNDERGROUND_PATH_ROUTE_6 diff --git a/data/maps/objects/UndergroundPathRoute7.asm b/data/maps/objects/UndergroundPathRoute7.asm index 47ae45f9..d7772f6c 100644 --- a/data/maps/objects/UndergroundPathRoute7.asm +++ b/data/maps/objects/UndergroundPathRoute7.asm @@ -1,3 +1,6 @@ + object_const_def + const UNDERGROUNDPATHROUTE7_MIDDLE_AGED_MAN + UndergroundPathRoute7_Object: db $a ; border block @@ -9,6 +12,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, TEXT_UNDERGROUNDPATHROUTE7_MIDDLE_AGED_MAN def_warps_to UNDERGROUND_PATH_ROUTE_7 diff --git a/data/maps/objects/UndergroundPathRoute7Copy.asm b/data/maps/objects/UndergroundPathRoute7Copy.asm index b4e7e7fd..9c3841cb 100644 --- a/data/maps/objects/UndergroundPathRoute7Copy.asm +++ b/data/maps/objects/UndergroundPathRoute7Copy.asm @@ -1,3 +1,7 @@ + object_const_def + const UNDERGROUNDPATHROUTE7COPY_UNUSED_GIRL + const UNDERGROUNDPATHROUTE7COPY_UNUSED_MIDDLE_AGED_MAN + UndergroundPathRoute7Copy_Object: db $a ; border block @@ -9,7 +13,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, TEXT_UNDERGROUNDPATHROUTE7COPY_UNUSED_GIRL + object_event 2, 4, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, TEXT_UNDERGROUNDPATHROUTE7COPY_UNUSED_MIDDLE_AGED_MAN def_warps_to UNDERGROUND_PATH_ROUTE_7_COPY diff --git a/data/maps/objects/UndergroundPathRoute8.asm b/data/maps/objects/UndergroundPathRoute8.asm index c36b1d42..751690f4 100644 --- a/data/maps/objects/UndergroundPathRoute8.asm +++ b/data/maps/objects/UndergroundPathRoute8.asm @@ -1,3 +1,6 @@ + object_const_def + const UNDERGROUNDPATHROUTE8_GIRL + UndergroundPathRoute8_Object: db $a ; border block @@ -9,6 +12,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, TEXT_UNDERGROUNDPATHROUTE8_GIRL def_warps_to UNDERGROUND_PATH_ROUTE_8 diff --git a/data/maps/objects/VermilionCity.asm b/data/maps/objects/VermilionCity.asm index ca652afc..1146d2b8 100644 --- a/data/maps/objects/VermilionCity.asm +++ b/data/maps/objects/VermilionCity.asm @@ -1,3 +1,11 @@ + object_const_def + const VERMILIONCITY_BEAUTY + const VERMILIONCITY_GAMBLER1 + const VERMILIONCITY_SAILOR1 + const VERMILIONCITY_GAMBLER2 + const VERMILIONCITY_MACHOP + const VERMILIONCITY_SAILOR2 + VermilionCity_Object: db $43 ; border block @@ -13,20 +21,20 @@ 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, TEXT_VERMILIONCITY_SIGN + bg_event 37, 13, TEXT_VERMILIONCITY_NOTICE_SIGN + bg_event 24, 13, TEXT_VERMILIONCITY_MART_SIGN + bg_event 12, 3, TEXT_VERMILIONCITY_POKECENTER_SIGN + bg_event 7, 13, TEXT_VERMILIONCITY_POKEMON_FAN_CLUB_SIGN + bg_event 7, 19, TEXT_VERMILIONCITY_GYM_SIGN + bg_event 29, 15, TEXT_VERMILIONCITY_HARBOR_SIGN 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, 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, 7, SPRITE_BEAUTY, WALK, LEFT_RIGHT, TEXT_VERMILIONCITY_BEAUTY + object_event 14, 6, SPRITE_GAMBLER, STAY, NONE, TEXT_VERMILIONCITY_GAMBLER1 + object_event 19, 30, SPRITE_SAILOR, STAY, UP, TEXT_VERMILIONCITY_SAILOR1 + object_event 30, 7, SPRITE_GAMBLER, STAY, NONE, TEXT_VERMILIONCITY_GAMBLER2 + object_event 29, 9, SPRITE_MONSTER, WALK, UP_DOWN, TEXT_VERMILIONCITY_MACHOP + object_event 25, 27, SPRITE_SAILOR, WALK, LEFT_RIGHT, TEXT_VERMILIONCITY_SAILOR2 def_warps_to VERMILION_CITY diff --git a/data/maps/objects/VermilionGym.asm b/data/maps/objects/VermilionGym.asm index a91c66ca..0defc08f 100644 --- a/data/maps/objects/VermilionGym.asm +++ b/data/maps/objects/VermilionGym.asm @@ -1,3 +1,10 @@ + object_const_def + const VERMILIONGYM_LT_SURGE + const VERMILIONGYM_GENTLEMAN + const VERMILIONGYM_SUPER_NERD + const VERMILIONGYM_SAILOR + const VERMILIONGYM_GYM_GUIDE + VermilionGym_Object: db $3 ; border block @@ -8,10 +15,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, TEXT_VERMILIONGYM_LT_SURGE, OPP_LT_SURGE, 1 + object_event 9, 6, SPRITE_GENTLEMAN, STAY, LEFT, TEXT_VERMILIONGYM_GENTLEMAN, OPP_GENTLEMAN, 3 + object_event 3, 8, SPRITE_SUPER_NERD, STAY, LEFT, TEXT_VERMILIONGYM_SUPER_NERD, OPP_ROCKER, 1 + object_event 0, 10, SPRITE_SAILOR, STAY, RIGHT, TEXT_VERMILIONGYM_SAILOR, OPP_SAILOR, 8 + object_event 4, 14, SPRITE_GYM_GUIDE, STAY, DOWN, TEXT_VERMILIONGYM_GYM_GUIDE def_warps_to VERMILION_GYM diff --git a/data/maps/objects/VermilionMart.asm b/data/maps/objects/VermilionMart.asm index 19d65e3b..7cab5e7a 100644 --- a/data/maps/objects/VermilionMart.asm +++ b/data/maps/objects/VermilionMart.asm @@ -1,3 +1,8 @@ + object_const_def + const VERMILIONMART_CLERK + const VERMILIONMART_COOLTRAINER_M + const VERMILIONMART_COOLTRAINER_F + VermilionMart_Object: db $0 ; border block @@ -8,8 +13,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, TEXT_VERMILIONMART_CLERK + object_event 5, 6, SPRITE_COOLTRAINER_M, STAY, NONE, TEXT_VERMILIONMART_COOLTRAINER_M + object_event 3, 3, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, TEXT_VERMILIONMART_COOLTRAINER_F def_warps_to VERMILION_MART diff --git a/data/maps/objects/VermilionOldRodHouse.asm b/data/maps/objects/VermilionOldRodHouse.asm index a0767f20..3efb3956 100644 --- a/data/maps/objects/VermilionOldRodHouse.asm +++ b/data/maps/objects/VermilionOldRodHouse.asm @@ -1,3 +1,6 @@ + object_const_def + const VERMILIONOLDRODHOUSE_FISHING_GURU + VermilionOldRodHouse_Object: db $a ; border block @@ -8,6 +11,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, TEXT_VERMILIONOLDRODHOUSE_FISHING_GURU def_warps_to VERMILION_OLD_ROD_HOUSE diff --git a/data/maps/objects/VermilionPidgeyHouse.asm b/data/maps/objects/VermilionPidgeyHouse.asm index ce8d3f3e..6ffd9064 100644 --- a/data/maps/objects/VermilionPidgeyHouse.asm +++ b/data/maps/objects/VermilionPidgeyHouse.asm @@ -1,3 +1,8 @@ + object_const_def + const VERMILIONPIDGEYHOUSE_YOUNGSTER + const VERMILIONPIDGEYHOUSE_PIDGEY + const VERMILIONPIDGEYHOUSE_LETTER + VermilionPidgeyHouse_Object: db $a ; border block @@ -8,8 +13,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, TEXT_VERMILIONPIDGEYHOUSE_YOUNGSTER + object_event 3, 5, SPRITE_BIRD, WALK, LEFT_RIGHT, TEXT_VERMILIONPIDGEYHOUSE_PIDGEY + object_event 4, 3, SPRITE_PAPER, STAY, NONE, TEXT_VERMILIONPIDGEYHOUSE_LETTER def_warps_to VERMILION_PIDGEY_HOUSE diff --git a/data/maps/objects/VermilionPokecenter.asm b/data/maps/objects/VermilionPokecenter.asm index f88552b4..5793aae0 100644 --- a/data/maps/objects/VermilionPokecenter.asm +++ b/data/maps/objects/VermilionPokecenter.asm @@ -1,3 +1,9 @@ + object_const_def + const VERMILIONPOKECENTER_NURSE + const VERMILIONPOKECENTER_FISHING_GURU + const VERMILIONPOKECENTER_SAILOR + const VERMILIONPOKECENTER_LINK_RECEPTIONIST + VermilionPokecenter_Object: db $0 ; border block @@ -8,9 +14,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, TEXT_VERMILIONPOKECENTER_NURSE + object_event 10, 5, SPRITE_FISHING_GURU, STAY, NONE, TEXT_VERMILIONPOKECENTER_FISHING_GURU + object_event 5, 4, SPRITE_SAILOR, STAY, NONE, TEXT_VERMILIONPOKECENTER_SAILOR + object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, TEXT_VERMILIONPOKECENTER_LINK_RECEPTIONIST def_warps_to VERMILION_POKECENTER diff --git a/data/maps/objects/VermilionTradeHouse.asm b/data/maps/objects/VermilionTradeHouse.asm index 299e5093..3d83357c 100644 --- a/data/maps/objects/VermilionTradeHouse.asm +++ b/data/maps/objects/VermilionTradeHouse.asm @@ -1,3 +1,6 @@ + object_const_def + const VERMILIONTRADEHOUSE_LITTLE_GIRL + VermilionTradeHouse_Object: db $a ; border block @@ -8,6 +11,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, TEXT_VERMILIONTRADEHOUSE_LITTLE_GIRL def_warps_to VERMILION_TRADE_HOUSE diff --git a/data/maps/objects/VictoryRoad1F.asm b/data/maps/objects/VictoryRoad1F.asm index d923948a..40295c81 100644 --- a/data/maps/objects/VictoryRoad1F.asm +++ b/data/maps/objects/VictoryRoad1F.asm @@ -1,3 +1,12 @@ + object_const_def + const VICTORYROAD1F_COOLTRAINER_F + const VICTORYROAD1F_COOLTRAINER_M + const VICTORYROAD1F_TM_SKY_ATTACK + const VICTORYROAD1F_RARE_CANDY + const VICTORYROAD1F_BOULDER1 + const VICTORYROAD1F_BOULDER2 + const VICTORYROAD1F_BOULDER3 + VictoryRoad1F_Object: db $7d ; border block @@ -9,12 +18,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, TEXT_VICTORYROAD1F_COOLTRAINER_F, OPP_COOLTRAINER_F, 5 + object_event 3, 2, SPRITE_COOLTRAINER_M, STAY, DOWN, TEXT_VICTORYROAD1F_COOLTRAINER_M, OPP_COOLTRAINER_M, 5 + object_event 11, 0, SPRITE_POKE_BALL, STAY, NONE, TEXT_VICTORYROAD1F_TM_SKY_ATTACK, TM_SKY_ATTACK + object_event 9, 2, SPRITE_POKE_BALL, STAY, NONE, TEXT_VICTORYROAD1F_RARE_CANDY, RARE_CANDY + object_event 5, 15, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, TEXT_VICTORYROAD1F_BOULDER1 + object_event 14, 2, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, TEXT_VICTORYROAD1F_BOULDER2 + object_event 2, 10, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, TEXT_VICTORYROAD1F_BOULDER3 def_warps_to VICTORY_ROAD_1F diff --git a/data/maps/objects/VictoryRoad2F.asm b/data/maps/objects/VictoryRoad2F.asm index 36357e07..09fc4458 100644 --- a/data/maps/objects/VictoryRoad2F.asm +++ b/data/maps/objects/VictoryRoad2F.asm @@ -1,3 +1,18 @@ + object_const_def + const VICTORYROAD2F_HIKER + const VICTORYROAD2F_SUPER_NERD1 + const VICTORYROAD2F_COOLTRAINER_M + const VICTORYROAD2F_SUPER_NERD2 + const VICTORYROAD2F_SUPER_NERD3 + const VICTORYROAD2F_MOLTRES + const VICTORYROAD2F_TM_SUBMISSION + const VICTORYROAD2F_FULL_HEAL + const VICTORYROAD2F_TM_MEGA_KICK + const VICTORYROAD2F_GUARD_SPEC + const VICTORYROAD2F_BOULDER1 + const VICTORYROAD2F_BOULDER2 + const VICTORYROAD2F_BOULDER3 + VictoryRoad2F_Object: db $7d ; border block @@ -13,18 +28,18 @@ VictoryRoad2F_Object: def_bg_events def_object_events - 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 23, 16, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 13 ; person + object_event 12, 9, SPRITE_HIKER, STAY, LEFT, TEXT_VICTORYROAD2F_HIKER, OPP_BLACKBELT, 9 + object_event 21, 13, SPRITE_SUPER_NERD, STAY, LEFT, TEXT_VICTORYROAD2F_SUPER_NERD1, OPP_JUGGLER, 2 + object_event 19, 8, SPRITE_COOLTRAINER_M, STAY, DOWN, TEXT_VICTORYROAD2F_COOLTRAINER_M, OPP_TAMER, 5 + object_event 4, 2, SPRITE_SUPER_NERD, STAY, DOWN, TEXT_VICTORYROAD2F_SUPER_NERD2, OPP_POKEMANIAC, 6 + object_event 26, 3, SPRITE_SUPER_NERD, STAY, LEFT, TEXT_VICTORYROAD2F_SUPER_NERD3, OPP_JUGGLER, 5 + object_event 11, 5, SPRITE_BIRD, STAY, UP, TEXT_VICTORYROAD2F_MOLTRES, MOLTRES, 50 + object_event 27, 5, SPRITE_POKE_BALL, STAY, NONE, TEXT_VICTORYROAD2F_TM_SUBMISSION, TM_SUBMISSION + object_event 18, 9, SPRITE_POKE_BALL, STAY, NONE, TEXT_VICTORYROAD2F_FULL_HEAL, FULL_HEAL + object_event 9, 11, SPRITE_POKE_BALL, STAY, NONE, TEXT_VICTORYROAD2F_TM_MEGA_KICK, TM_MEGA_KICK + object_event 11, 0, SPRITE_POKE_BALL, STAY, NONE, TEXT_VICTORYROAD2F_GUARD_SPEC, GUARD_SPEC + object_event 4, 14, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, TEXT_VICTORYROAD2F_BOULDER1 + object_event 5, 5, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, TEXT_VICTORYROAD2F_BOULDER2 + object_event 23, 16, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, TEXT_VICTORYROAD2F_BOULDER3 def_warps_to VICTORY_ROAD_2F diff --git a/data/maps/objects/VictoryRoad3F.asm b/data/maps/objects/VictoryRoad3F.asm index 8ee97878..ad6b4df1 100644 --- a/data/maps/objects/VictoryRoad3F.asm +++ b/data/maps/objects/VictoryRoad3F.asm @@ -1,3 +1,15 @@ + object_const_def + const VICTORYROAD3F_COOLTRAINER_M1 + const VICTORYROAD3F_COOLTRAINER_F1 + const VICTORYROAD3F_COOLTRAINER_M2 + const VICTORYROAD3F_COOLTRAINER_F2 + const VICTORYROAD3F_MAX_REVIVE + const VICTORYROAD3F_TM_EXPLOSION + const VICTORYROAD3F_BOULDER1 + const VICTORYROAD3F_BOULDER2 + const VICTORYROAD3F_BOULDER3 + const VICTORYROAD3F_BOULDER4 + VictoryRoad3F_Object: db $7d ; border block @@ -10,15 +22,15 @@ 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 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 + object_event 28, 5, SPRITE_COOLTRAINER_M, STAY, LEFT, TEXT_VICTORYROAD3F_COOLTRAINER_M1, OPP_COOLTRAINER_M, 2 + object_event 7, 13, SPRITE_COOLTRAINER_F, STAY, RIGHT, TEXT_VICTORYROAD3F_COOLTRAINER_F1, OPP_COOLTRAINER_F, 2 + object_event 6, 14, SPRITE_COOLTRAINER_M, STAY, LEFT, TEXT_VICTORYROAD3F_COOLTRAINER_M2, OPP_COOLTRAINER_M, 3 + object_event 13, 3, SPRITE_COOLTRAINER_F, STAY, RIGHT, TEXT_VICTORYROAD3F_COOLTRAINER_F2, OPP_COOLTRAINER_F, 3 + object_event 26, 5, SPRITE_POKE_BALL, STAY, NONE, TEXT_VICTORYROAD3F_MAX_REVIVE, MAX_REVIVE + object_event 7, 7, SPRITE_POKE_BALL, STAY, NONE, TEXT_VICTORYROAD3F_TM_EXPLOSION, TM_EXPLOSION + object_event 22, 3, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, TEXT_VICTORYROAD3F_BOULDER1 + object_event 13, 12, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, TEXT_VICTORYROAD3F_BOULDER2 + object_event 24, 10, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, TEXT_VICTORYROAD3F_BOULDER3 + object_event 22, 15, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, TEXT_VICTORYROAD3F_BOULDER4 def_warps_to VICTORY_ROAD_3F diff --git a/data/maps/objects/ViridianCity.asm b/data/maps/objects/ViridianCity.asm index 56bf7390..b3a64f36 100644 --- a/data/maps/objects/ViridianCity.asm +++ b/data/maps/objects/ViridianCity.asm @@ -1,3 +1,12 @@ + object_const_def + const VIRIDIANCITY_YOUNGSTER1 + const VIRIDIANCITY_GAMBLER1 + const VIRIDIANCITY_YOUNGSTER2 + const VIRIDIANCITY_GIRL + const VIRIDIANCITY_OLD_MAN_SLEEPY + const VIRIDIANCITY_FISHER + const VIRIDIANCITY_OLD_MAN + ViridianCity_Object: db $f ; border block @@ -9,20 +18,20 @@ 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, TEXT_VIRIDIANCITY_SIGN + bg_event 19, 1, TEXT_VIRIDIANCITY_TRAINER_TIPS1 + bg_event 21, 29, TEXT_VIRIDIANCITY_TRAINER_TIPS2 + bg_event 30, 19, TEXT_VIRIDIANCITY_MART_SIGN + bg_event 24, 25, TEXT_VIRIDIANCITY_POKECENTER_SIGN + bg_event 27, 7, TEXT_VIRIDIANCITY_GYM_SIGN 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, 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 13, 20, SPRITE_YOUNGSTER, WALK, ANY_DIR, TEXT_VIRIDIANCITY_YOUNGSTER1 + object_event 30, 8, SPRITE_GAMBLER, STAY, NONE, TEXT_VIRIDIANCITY_GAMBLER1 + object_event 30, 25, SPRITE_YOUNGSTER, WALK, ANY_DIR, TEXT_VIRIDIANCITY_YOUNGSTER2 + object_event 17, 9, SPRITE_GIRL, STAY, RIGHT, TEXT_VIRIDIANCITY_GIRL + object_event 18, 9, SPRITE_GAMBLER_ASLEEP, STAY, NONE, TEXT_VIRIDIANCITY_OLD_MAN_SLEEPY + object_event 6, 23, SPRITE_FISHER, STAY, DOWN, TEXT_VIRIDIANCITY_FISHER + object_event 17, 5, SPRITE_GAMBLER, WALK, LEFT_RIGHT, TEXT_VIRIDIANCITY_OLD_MAN def_warps_to VIRIDIAN_CITY diff --git a/data/maps/objects/ViridianForest.asm b/data/maps/objects/ViridianForest.asm index 7a0a644c..ca3fc30b 100644 --- a/data/maps/objects/ViridianForest.asm +++ b/data/maps/objects/ViridianForest.asm @@ -1,3 +1,13 @@ + object_const_def + const VIRIDIANFOREST_YOUNGSTER1 + const VIRIDIANFOREST_YOUNGSTER2 + const VIRIDIANFOREST_YOUNGSTER3 + const VIRIDIANFOREST_YOUNGSTER4 + const VIRIDIANFOREST_ANTIDOTE + const VIRIDIANFOREST_POTION + const VIRIDIANFOREST_POKE_BALL + const VIRIDIANFOREST_YOUNGSTER5 + ViridianForest_Object: db $3 ; border block @@ -10,21 +20,21 @@ ViridianForest_Object: 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, TEXT_VIRIDIANFOREST_TRAINER_TIPS1 + bg_event 16, 32, TEXT_VIRIDIANFOREST_USE_ANTIDOTE_SIGN + bg_event 26, 17, TEXT_VIRIDIANFOREST_TRAINER_TIPS2 + bg_event 4, 24, TEXT_VIRIDIANFOREST_TRAINER_TIPS3 + bg_event 18, 45, TEXT_VIRIDIANFOREST_TRAINER_TIPS4 + bg_event 2, 1, TEXT_VIRIDIANFOREST_LEAVING_SIGN 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 16, 43, SPRITE_YOUNGSTER, STAY, NONE, TEXT_VIRIDIANFOREST_YOUNGSTER1 + object_event 30, 33, SPRITE_YOUNGSTER, STAY, LEFT, TEXT_VIRIDIANFOREST_YOUNGSTER2, OPP_BUG_CATCHER, 1 + object_event 30, 19, SPRITE_YOUNGSTER, STAY, LEFT, TEXT_VIRIDIANFOREST_YOUNGSTER3, OPP_BUG_CATCHER, 2 + object_event 2, 18, SPRITE_YOUNGSTER, STAY, LEFT, TEXT_VIRIDIANFOREST_YOUNGSTER4, OPP_BUG_CATCHER, 3 + object_event 25, 11, SPRITE_POKE_BALL, STAY, NONE, TEXT_VIRIDIANFOREST_ANTIDOTE, ANTIDOTE + object_event 12, 29, SPRITE_POKE_BALL, STAY, NONE, TEXT_VIRIDIANFOREST_POTION, POTION + object_event 1, 31, SPRITE_POKE_BALL, STAY, NONE, TEXT_VIRIDIANFOREST_POKE_BALL, POKE_BALL + object_event 27, 40, SPRITE_YOUNGSTER, STAY, NONE, TEXT_VIRIDIANFOREST_YOUNGSTER5 def_warps_to VIRIDIAN_FOREST diff --git a/data/maps/objects/ViridianForestNorthGate.asm b/data/maps/objects/ViridianForestNorthGate.asm index fcb0fc2b..bd804359 100644 --- a/data/maps/objects/ViridianForestNorthGate.asm +++ b/data/maps/objects/ViridianForestNorthGate.asm @@ -1,3 +1,7 @@ + object_const_def + const VIRIDIANFORESTNORTHGATE_SUPER_NERD + const VIRIDIANFORESTNORTHGATE_GRAMPS + ViridianForestNorthGate_Object: db $a ; border block @@ -10,7 +14,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, TEXT_VIRIDIANFORESTNORTHGATE_SUPER_NERD + object_event 2, 5, SPRITE_GRAMPS, STAY, NONE, TEXT_VIRIDIANFORESTNORTHGATE_GRAMPS def_warps_to VIRIDIAN_FOREST_NORTH_GATE diff --git a/data/maps/objects/ViridianForestSouthGate.asm b/data/maps/objects/ViridianForestSouthGate.asm index e5dad809..15ada6ff 100644 --- a/data/maps/objects/ViridianForestSouthGate.asm +++ b/data/maps/objects/ViridianForestSouthGate.asm @@ -1,3 +1,7 @@ + object_const_def + const VIRIDIANFORESTSOUTHGATE_GIRL + const VIRIDIANFORESTSOUTHGATE_LITTLE_GIRL + ViridianForestSouthGate_Object: db $a ; border block @@ -10,7 +14,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, TEXT_VIRIDIANFORESTSOUTHGATE_GIRL + object_event 2, 4, SPRITE_LITTLE_GIRL, WALK, UP_DOWN, TEXT_VIRIDIANFORESTSOUTHGATE_LITTLE_GIRL def_warps_to VIRIDIAN_FOREST_SOUTH_GATE diff --git a/data/maps/objects/ViridianGym.asm b/data/maps/objects/ViridianGym.asm index 735cecf4..d58736da 100644 --- a/data/maps/objects/ViridianGym.asm +++ b/data/maps/objects/ViridianGym.asm @@ -1,3 +1,16 @@ + object_const_def + const VIRIDIANGYM_GIOVANNI + const VIRIDIANGYM_COOLTRAINER_M1 + const VIRIDIANGYM_HIKER1 + const VIRIDIANGYM_ROCKER1 + const VIRIDIANGYM_HIKER2 + const VIRIDIANGYM_COOLTRAINER_M2 + const VIRIDIANGYM_HIKER3 + const VIRIDIANGYM_ROCKER2 + const VIRIDIANGYM_COOLTRAINER_M3 + const VIRIDIANGYM_GYM_GUIDE + const VIRIDIANGYM_REVIVE + ViridianGym_Object: db $3 ; border block @@ -8,16 +21,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 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 16, 15, SPRITE_GYM_GUIDE, STAY, DOWN, 10 ; person - object_event 16, 9, SPRITE_POKE_BALL, STAY, NONE, 11, REVIVE + object_event 2, 1, SPRITE_GIOVANNI, STAY, DOWN, TEXT_VIRIDIANGYM_GIOVANNI, OPP_GIOVANNI, 3 + object_event 12, 7, SPRITE_COOLTRAINER_M, STAY, DOWN, TEXT_VIRIDIANGYM_COOLTRAINER_M1, OPP_COOLTRAINER_M, 9 + object_event 11, 11, SPRITE_HIKER, STAY, UP, TEXT_VIRIDIANGYM_HIKER1, OPP_BLACKBELT, 6 + object_event 10, 7, SPRITE_ROCKER, STAY, DOWN, TEXT_VIRIDIANGYM_ROCKER1, OPP_TAMER, 3 + object_event 3, 7, SPRITE_HIKER, STAY, LEFT, TEXT_VIRIDIANGYM_HIKER2, OPP_BLACKBELT, 7 + object_event 13, 5, SPRITE_COOLTRAINER_M, STAY, RIGHT, TEXT_VIRIDIANGYM_COOLTRAINER_M2, OPP_COOLTRAINER_M, 10 + object_event 10, 1, SPRITE_HIKER, STAY, DOWN, TEXT_VIRIDIANGYM_HIKER3, OPP_BLACKBELT, 8 + object_event 2, 16, SPRITE_ROCKER, STAY, RIGHT, TEXT_VIRIDIANGYM_ROCKER2, OPP_TAMER, 4 + object_event 6, 5, SPRITE_COOLTRAINER_M, STAY, DOWN, TEXT_VIRIDIANGYM_COOLTRAINER_M3, OPP_COOLTRAINER_M, 1 + object_event 16, 15, SPRITE_GYM_GUIDE, STAY, DOWN, TEXT_VIRIDIANGYM_GYM_GUIDE + object_event 16, 9, SPRITE_POKE_BALL, STAY, NONE, TEXT_VIRIDIANGYM_REVIVE, REVIVE def_warps_to VIRIDIAN_GYM diff --git a/data/maps/objects/ViridianMart.asm b/data/maps/objects/ViridianMart.asm index 291dd00f..05d8048e 100644 --- a/data/maps/objects/ViridianMart.asm +++ b/data/maps/objects/ViridianMart.asm @@ -1,3 +1,8 @@ + object_const_def + const VIRIDIANMART_CLERK + const VIRIDIANMART_YOUNGSTER + const VIRIDIANMART_COOLTRAINER_M + ViridianMart_Object: db $0 ; border block @@ -8,8 +13,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, TEXT_VIRIDIANMART_CLERK + object_event 5, 5, SPRITE_YOUNGSTER, WALK, UP_DOWN, TEXT_VIRIDIANMART_YOUNGSTER + object_event 3, 3, SPRITE_COOLTRAINER_M, STAY, NONE, TEXT_VIRIDIANMART_COOLTRAINER_M def_warps_to VIRIDIAN_MART diff --git a/data/maps/objects/ViridianNicknameHouse.asm b/data/maps/objects/ViridianNicknameHouse.asm index 2f3befb2..29e1873c 100644 --- a/data/maps/objects/ViridianNicknameHouse.asm +++ b/data/maps/objects/ViridianNicknameHouse.asm @@ -1,3 +1,9 @@ + object_const_def + const VIRIDIANNICKNAMEHOUSE_BALDING_GUY + const VIRIDIANNICKNAMEHOUSE_LITTLE_GIRL + const VIRIDIANNICKNAMEHOUSE_SPEAROW + const VIRIDIANNICKNAMEHOUSE_SPEARY_SIGN + ViridianNicknameHouse_Object: db $a ; border block @@ -8,9 +14,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, TEXT_VIRIDIANNICKNAMEHOUSE_BALDING_GUY + object_event 1, 4, SPRITE_LITTLE_GIRL, WALK, UP_DOWN, TEXT_VIRIDIANNICKNAMEHOUSE_LITTLE_GIRL + object_event 5, 5, SPRITE_BIRD, WALK, LEFT_RIGHT, TEXT_VIRIDIANNICKNAMEHOUSE_SPEAROW + object_event 4, 0, SPRITE_CLIPBOARD, STAY, NONE, TEXT_VIRIDIANNICKNAMEHOUSE_SPEARY_SIGN def_warps_to VIRIDIAN_NICKNAME_HOUSE diff --git a/data/maps/objects/ViridianPokecenter.asm b/data/maps/objects/ViridianPokecenter.asm index 618f5798..e4b564fa 100644 --- a/data/maps/objects/ViridianPokecenter.asm +++ b/data/maps/objects/ViridianPokecenter.asm @@ -1,3 +1,9 @@ + object_const_def + const VIRIDIANPOKECENTER_NURSE + const VIRIDIANPOKECENTER_GENTLEMAN + const VIRIDIANPOKECENTER_COOLTRAINER_M + const VIRIDIANPOKECENTER_LINK_RECEPTIONIST + ViridianPokecenter_Object: db $0 ; border block @@ -8,9 +14,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, TEXT_VIRIDIANPOKECENTER_NURSE + object_event 10, 5, SPRITE_GENTLEMAN, WALK, UP_DOWN, TEXT_VIRIDIANPOKECENTER_GENTLEMAN + object_event 4, 3, SPRITE_COOLTRAINER_M, STAY, NONE, TEXT_VIRIDIANPOKECENTER_COOLTRAINER_M + object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, TEXT_VIRIDIANPOKECENTER_LINK_RECEPTIONIST def_warps_to VIRIDIAN_POKECENTER diff --git a/data/maps/objects/ViridianSchoolHouse.asm b/data/maps/objects/ViridianSchoolHouse.asm index 745bf72b..a389cb9d 100644 --- a/data/maps/objects/ViridianSchoolHouse.asm +++ b/data/maps/objects/ViridianSchoolHouse.asm @@ -1,3 +1,7 @@ + object_const_def + const VIRIDIANSCHOOLHOUSE_BRUNETTE_GIRL + const VIRIDIANSCHOOLHOUSE_COOLTRAINER_F + ViridianSchoolHouse_Object: db $a ; border block @@ -8,7 +12,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, TEXT_VIRIDIANSCHOOLHOUSE_BRUNETTE_GIRL + object_event 4, 1, SPRITE_COOLTRAINER_F, STAY, DOWN, TEXT_VIRIDIANSCHOOLHOUSE_COOLTRAINER_F def_warps_to VIRIDIAN_SCHOOL_HOUSE diff --git a/data/maps/objects/WardensHouse.asm b/data/maps/objects/WardensHouse.asm index 63e461c4..40aee76d 100644 --- a/data/maps/objects/WardensHouse.asm +++ b/data/maps/objects/WardensHouse.asm @@ -1,3 +1,8 @@ + object_const_def + const WARDENSHOUSE_WARDEN + const WARDENSHOUSE_RARE_CANDY + const WARDENSHOUSE_BOULDER + WardensHouse_Object: db $17 ; border block @@ -6,12 +11,12 @@ WardensHouse_Object: warp_event 5, 7, LAST_MAP, 4 def_bg_events - bg_event 4, 3, 4 ; FuchsiaHouse2Text4 - bg_event 5, 3, 5 ; FuchsiaHouse2Text5 + bg_event 4, 3, TEXT_WARDENSHOUSE_DISPLAY_LEFT + bg_event 5, 3, TEXT_WARDENSHOUSE_DISPLAY_RIGHT 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, TEXT_WARDENSHOUSE_WARDEN + object_event 8, 3, SPRITE_POKE_BALL, STAY, NONE, TEXT_WARDENSHOUSE_RARE_CANDY, RARE_CANDY + object_event 8, 4, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, TEXT_WARDENSHOUSE_BOULDER def_warps_to WARDENS_HOUSE diff --git a/data/maps/sprite_sets.asm b/data/maps/sprite_sets.asm index 76ddee34..0bf49db6 100644 --- a/data/maps/sprite_sets.asm +++ b/data/maps/sprite_sets.asm @@ -146,8 +146,8 @@ SpriteSets: ; SPRITESET_SAFFRON db SPRITE_ROCKET db SPRITE_SCIENTIST - db SPRITE_SILPH_WORKER - db SPRITE_ERIKA + db SPRITE_SILPH_WORKER_M + db SPRITE_SILPH_WORKER_F db SPRITE_GENTLEMAN db SPRITE_BIRD db SPRITE_ROCKER @@ -172,7 +172,7 @@ SpriteSets: ; SPRITESET_CYCLING_ROAD db SPRITE_BIKER db SPRITE_COOLTRAINER_M - db SPRITE_SILPH_WORKER + db SPRITE_SILPH_WORKER_M db SPRITE_FISHER db SPRITE_ROCKER db SPRITE_HIKER |