From 55c6221567697dd3953accd97f6e93a3d3233fc8 Mon Sep 17 00:00:00 2001 From: vulcandth Date: Fri, 24 Jun 2022 16:06:12 -0500 Subject: [PATCH] `def_script_pointers` `def_text_pointers` `object_const_def` --- data/items/marts.asm | 12 +- data/maps/objects/AgathasRoom.asm | 5 +- data/maps/objects/BikeShop.asm | 11 +- data/maps/objects/BillsHouse.asm | 11 +- data/maps/objects/BluesHouse.asm | 11 +- data/maps/objects/BrunosRoom.asm | 5 +- data/maps/objects/CeladonChiefHouse.asm | 11 +- data/maps/objects/CeladonCity.asm | 47 ++- data/maps/objects/CeladonDiner.asm | 17 +- data/maps/objects/CeladonGym.asm | 26 +- data/maps/objects/CeladonHotel.asm | 11 +- data/maps/objects/CeladonMansion1F.asm | 16 +- data/maps/objects/CeladonMansion2F.asm | 2 +- data/maps/objects/CeladonMansion3F.asm | 22 +- data/maps/objects/CeladonMansionRoof.asm | 2 +- data/maps/objects/CeladonMansionRoofHouse.asm | 8 +- data/maps/objects/CeladonMart1F.asm | 9 +- data/maps/objects/CeladonMart2F.asm | 6 +- data/maps/objects/CeladonMart3F.asm | 41 +- data/maps/objects/CeladonMart4F.asm | 13 +- data/maps/objects/CeladonMart5F.asm | 16 +- data/maps/objects/CeladonMartElevator.asm | 2 +- data/maps/objects/CeladonMartRoof.asm | 16 +- data/maps/objects/CeladonPokecenter.asm | 14 +- data/maps/objects/CeruleanBadgeHouse.asm | 5 +- data/maps/objects/CeruleanCave1F.asm | 11 +- data/maps/objects/CeruleanCave2F.asm | 11 +- data/maps/objects/CeruleanCaveB1F.asm | 11 +- data/maps/objects/CeruleanCity.asm | 47 ++- data/maps/objects/CeruleanGym.asm | 14 +- data/maps/objects/CeruleanMart.asm | 11 +- data/maps/objects/ChampionsRoom.asm | 8 +- data/maps/objects/GameCorner.asm | 37 +- macros/const.asm | 5 + macros/scripts/maps.asm | 12 + scripts/AgathasRoom.asm | 46 +-- scripts/BikeShop.asm | 80 ++-- scripts/BillsHouse.asm | 110 +++--- scripts/BluesHouse.asm | 44 +-- scripts/BrunosRoom.asm | 44 +-- scripts/CeladonChiefHouse.asm | 20 +- scripts/CeladonCity.asm | 132 +++---- scripts/CeladonDiner.asm | 54 +-- scripts/CeladonGym.asm | 94 ++--- scripts/CeladonHotel.asm | 20 +- scripts/CeladonMansion1F.asm | 32 +- scripts/CeladonMansion2F.asm | 8 +- scripts/CeladonMansion3F.asm | 56 +-- scripts/CeladonMansionRoof.asm | 8 +- scripts/CeladonMansionRoofHouse.asm | 12 +- scripts/CeladonMart1F.asm | 20 +- scripts/CeladonMart2F.asm | 24 +- scripts/CeladonMart3F.asm | 113 +++--- scripts/CeladonMart4F.asm | 22 +- scripts/CeladonMart5F.asm | 24 +- scripts/CeladonMartElevator.asm | 6 +- scripts/CeladonMartRoof.asm | 40 +- scripts/CeladonPokecenter.asm | 22 +- scripts/CeruleanBadgeHouse.asm | 76 ++-- scripts/CeruleanCave1F.asm | 8 +- scripts/CeruleanCave2F.asm | 8 +- scripts/CeruleanCaveB1F.asm | 18 +- scripts/CeruleanCity.asm | 243 ++++++------ scripts/CeruleanGym.asm | 90 ++--- scripts/CeruleanMart.asm | 16 +- scripts/ChampionsRoom.asm | 178 ++++----- scripts/GameCorner.asm | 372 +++++++++--------- text/AgathasRoom.asm | 2 +- text/BikeShop.asm | 18 +- text/BillsHouse.asm | 12 +- text/BluesHouse.asm | 8 +- text/BrunosRoom.asm | 2 +- text/CeladonChiefHouse.asm | 6 +- text/CeladonCity.asm | 40 +- text/CeladonDiner.asm | 16 +- text/CeladonGym.asm | 12 +- text/CeladonHotel.asm | 6 +- text/CeladonMansion1F.asm | 10 +- text/CeladonMansion2F.asm | 2 +- text/CeladonMansion3F.asm | 18 +- text/CeladonMansionRoof.asm | 2 +- text/CeladonMansionRoofHouse.asm | 2 +- text/CeladonMart1F.asm | 6 +- text/CeladonMart2F.asm | 6 +- text/CeladonMart3F.asm | 30 +- text/CeladonMart4F.asm | 6 +- text/CeladonMart5F.asm | 6 +- text/CeladonMartRoof.asm | 8 +- text/CeladonPokecenter.asm | 4 +- text/CeruleanBadgeHouse.asm | 22 +- text/CeruleanCity.asm | 54 +-- text/CeruleanGym.asm | 16 +- text/CeruleanMart.asm | 4 +- text/ChampionsRoom.asm | 16 +- text/GameCorner.asm | 60 +-- 95 files changed, 1562 insertions(+), 1378 deletions(-) diff --git a/data/items/marts.asm b/data/items/marts.asm index c6a80de571..81c417ab0d 100644 --- a/data/items/marts.asm +++ b/data/items/marts.asm @@ -7,7 +7,7 @@ ViridianCashierText:: PewterCashierText:: script_mart POKE_BALL, POTION, ESCAPE_ROPE, ANTIDOTE, BURN_HEAL, AWAKENING, PARLYZ_HEAL -CeruleanCashierText:: +CeruleanMartClerkText:: script_mart POKE_BALL, POTION, REPEL, ANTIDOTE, BURN_HEAL, AWAKENING, PARLYZ_HEAL BikeShopCashierText:: ; unreferenced @@ -19,19 +19,19 @@ VermilionCashierText:: LavenderCashierText:: script_mart GREAT_BALL, SUPER_POTION, REVIVE, ESCAPE_ROPE, SUPER_REPEL, ANTIDOTE, BURN_HEAL, ICE_HEAL, PARLYZ_HEAL -CeladonMart2Clerk1Text:: +CeladonMart2FClerk1Text:: script_mart GREAT_BALL, SUPER_POTION, REVIVE, SUPER_REPEL, ANTIDOTE, BURN_HEAL, ICE_HEAL, AWAKENING, PARLYZ_HEAL -CeladonMart2Clerk2Text:: +CeladonMart2FClerk2Text:: script_mart TM_DOUBLE_TEAM, TM_REFLECT, TM_RAZOR_WIND, TM_HORN_DRILL, TM_EGG_BOMB, TM_MEGA_PUNCH, TM_MEGA_KICK, TM_TAKE_DOWN, TM_SUBMISSION -CeladonMart4ClerkText:: +CeladonMart4FClerkText:: script_mart POKE_DOLL, FIRE_STONE, THUNDER_STONE, WATER_STONE, LEAF_STONE -CeladonMart5Clerk1Text:: +CeladonMart5FClerk1Text:: script_mart X_ACCURACY, GUARD_SPEC, DIRE_HIT, X_ATTACK, X_DEFEND, X_SPEED, X_SPECIAL -CeladonMart5Clerk2Text:: +CeladonMart5FClerk2Text:: script_mart HP_UP, PROTEIN, IRON, CARBOS, CALCIUM FuchsiaCashierText:: diff --git a/data/maps/objects/AgathasRoom.asm b/data/maps/objects/AgathasRoom.asm index afccd1be98..6cd6f21daa 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 1fa8f6e6f8..30d32490fc 100644 --- a/data/maps/objects/BikeShop.asm +++ b/data/maps/objects/BikeShop.asm @@ -1,3 +1,8 @@ + object_const_def + const BIKESHOP_BIKE_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_BIKE_CLERK ; person + object_event 5, 6, SPRITE_MIDDLE_AGED_WOMAN, WALK, UP_DOWN, TEXT_BIKESHOP_MIDDLE_AGED_WOMAN ; person + object_event 1, 3, SPRITE_YOUNGSTER, STAY, UP, TEXT_BIKESHOP_YOUNGSTER ; person def_warps_to BIKE_SHOP diff --git a/data/maps/objects/BillsHouse.asm b/data/maps/objects/BillsHouse.asm index db8f8433b6..c844bce5b8 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 ; person + object_event 4, 4, SPRITE_SUPER_NERD, STAY, NONE, TEXT_BILLSHOUSE_BILL_SS_TICKET ; person + object_event 6, 5, SPRITE_SUPER_NERD, STAY, NONE, TEXT_BILLSHOUSE_BILL_CHECK_OUT_MY_RARE_POKEMON ; person def_warps_to BILLS_HOUSE diff --git a/data/maps/objects/BluesHouse.asm b/data/maps/objects/BluesHouse.asm index ac200b2837..9633c1d05d 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 1e8a0a2776..e4cd569255 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 8bec11b09f..a6e456784e 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 CELADONCHEIFHOUSE_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 ; person + object_event 1, 4, SPRITE_ROCKET, WALK, ANY_DIR, TEXT_CELADONCHIEFHOUSE_ROCKET ; person + object_event 5, 6, SPRITE_SAILOR, STAY, LEFT, TEXT_CELADONCHEIFHOUSE_SAILOR ; person def_warps_to CELADON_CHIEF_HOUSE diff --git a/data/maps/objects/CeladonCity.asm b/data/maps/objects/CeladonCity.asm index 1644335bfe..82efdea252 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 ; person + object_event 11, 28, SPRITE_GRAMPS, STAY, UP, TEXT_CELADONCITY_GRAMPS1 ; person + object_event 14, 19, SPRITE_GIRL, WALK, UP_DOWN, TEXT_CELADONCITY_GIRL ; person + object_event 25, 22, SPRITE_GRAMPS, STAY, DOWN, TEXT_CELADONCITY_GRAMPS2 ; person + object_event 22, 16, SPRITE_GRAMPS, STAY, DOWN, TEXT_CELADONCITY_GRAMPS3 ; person + object_event 32, 12, SPRITE_FISHER, STAY, LEFT, TEXT_CELADONCITY_FISHER ; person + object_event 30, 12, SPRITE_MONSTER, STAY, RIGHT, TEXT_CELADONCITY_POLIWRATH ; person + object_event 32, 29, SPRITE_ROCKET, WALK, LEFT_RIGHT, TEXT_CELADONCITY_ROCKET1 ; person + object_event 42, 14, SPRITE_ROCKET, WALK, LEFT_RIGHT, TEXT_CELADONCITY_ROCKET2 ; person def_warps_to CELADON_CITY diff --git a/data/maps/objects/CeladonDiner.asm b/data/maps/objects/CeladonDiner.asm index 33ea922b32..596534333c 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 ; person + object_event 7, 2, SPRITE_MIDDLE_AGED_WOMAN, STAY, NONE, TEXT_CELADONDINER_MIDDLE_AGED_WOMAN ; person + object_event 1, 4, SPRITE_MIDDLE_AGED_MAN, STAY, DOWN, TEXT_CELADONDINER_MIDDLE_AGED_MAN ; person + object_event 5, 3, SPRITE_FISHER, STAY, RIGHT, TEXT_CELADONDINER_FISHER ; person + object_event 0, 1, SPRITE_GYM_GUIDE, STAY, DOWN, TEXT_CELADONDINER_GYM_GUIDE ; person def_warps_to CELADON_DINER diff --git a/data/maps/objects/CeladonGym.asm b/data/maps/objects/CeladonGym.asm index 294e727d0c..b96d3e34b5 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_ERIKA, 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 13aaff6456..d930211868 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 ; person + object_event 2, 4, SPRITE_BEAUTY, STAY, NONE, TEXT_CELADONHOTEL_BEAUTY ; person + object_event 8, 4, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, TEXT_CELADONHOTEL_SUPER_NERD ; person def_warps_to CELADON_HOTEL diff --git a/data/maps/objects/CeladonMansion1F.asm b/data/maps/objects/CeladonMansion1F.asm index 4966c903a9..0909fc50cb 100644 --- a/data/maps/objects/CeladonMansion1F.asm +++ b/data/maps/objects/CeladonMansion1F.asm @@ -1,3 +1,9 @@ + object_const_def + const CELADONMANSION_1F_MEOWTH + const CELADONMANSION_1F_GRANNY + const CELADONMANSION_1F_CLEFAIRY + const CELADONMANSION_1F_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_CELADONMANSION_1F_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_CELADONMANSION_1F_MEOWTH ; person + object_event 1, 5, SPRITE_GRANNY, STAY, DOWN, TEXT_CELADONMANSION_1F_GRANNY ; person + object_event 1, 8, SPRITE_FAIRY, WALK, LEFT_RIGHT, TEXT_CELADONMANSION_1F_CLEFAIRY ; person + object_event 4, 4, SPRITE_MONSTER, WALK, UP_DOWN, TEXT_CELADONMANSION_1F_NIDORANF ; person def_warps_to CELADON_MANSION_1F diff --git a/data/maps/objects/CeladonMansion2F.asm b/data/maps/objects/CeladonMansion2F.asm index c2546d7225..2774f95cba 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_CELADONMANSION_2F_MEETING_ROOM_SIGN def_object_events diff --git a/data/maps/objects/CeladonMansion3F.asm b/data/maps/objects/CeladonMansion3F.asm index b4f9c37bfa..62c9229dbd 100644 --- a/data/maps/objects/CeladonMansion3F.asm +++ b/data/maps/objects/CeladonMansion3F.asm @@ -1,3 +1,9 @@ + object_const_def + const CELADONMANSION_3F_PROGRAMMER + const CELADONMANSION_3F_GRAPHIC_ARTIST + const CELADONMANSION_3F_WRITER + const CELADONMANSION_3F_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_CELADONMANSION_3F_GAME_PROGRAM_PC + bg_event 4, 3, TEXT_CELADONMANSION_3F_PLAYING_GAME_PC + bg_event 1, 6, TEXT_CELADONMANSION_3F_GAME_SCRIPT_PC + bg_event 4, 9, TEXT_CELADONMANSION_3F_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_CELADONMANSION_3F_PROGRAMMER ; person + object_event 3, 4, SPRITE_CLERK, STAY, UP, TEXT_CELADONMANSION_3F_GRAPHIC_ARTIST ; person + object_event 0, 7, SPRITE_SUPER_NERD, STAY, UP, TEXT_CELADONMANSION_3F_WRITER ; person + object_event 2, 3, SPRITE_SILPH_WORKER, STAY, NONE, TEXT_CELADONMANSION_3F_GAME_DESIGNER ; person def_warps_to CELADON_MANSION_3F diff --git a/data/maps/objects/CeladonMansionRoof.asm b/data/maps/objects/CeladonMansionRoof.asm index e28249e2cf..1212e27ee7 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_CELADONMANSION_ROOF_HOUSE_SIGN def_object_events diff --git a/data/maps/objects/CeladonMansionRoofHouse.asm b/data/maps/objects/CeladonMansionRoofHouse.asm index c5111a763e..d53840c22e 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 ; person + object_event 4, 3, SPRITE_POKE_BALL, STAY, NONE, TEXT_CELADONMANSION_ROOF_HOUSE_EEVEE_POKEBALL ; person def_warps_to CELADON_MANSION_ROOF_HOUSE diff --git a/data/maps/objects/CeladonMart1F.asm b/data/maps/objects/CeladonMart1F.asm index d7f8924fac..ca1e9d97d5 100644 --- a/data/maps/objects/CeladonMart1F.asm +++ b/data/maps/objects/CeladonMart1F.asm @@ -1,3 +1,6 @@ + object_const_def + const CELADONMART_1F_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_CELADONMART_1F_DIRECTORY_SIGN + bg_event 14, 1, TEXT_CELADONMART_1F_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_CELADONMART_1F_RECEPTIONIST ; person def_warps_to CELADON_MART_1F diff --git a/data/maps/objects/CeladonMart2F.asm b/data/maps/objects/CeladonMart2F.asm index 9eaa16057c..519f309a66 100644 --- a/data/maps/objects/CeladonMart2F.asm +++ b/data/maps/objects/CeladonMart2F.asm @@ -7,11 +7,11 @@ CeladonMart2F_Object: warp_event 1, 1, CELADON_MART_ELEVATOR, 1 def_bg_events - bg_event 14, 1, 5 ; CeladonMart2Text5 + bg_event 14, 1, TEXT_CELADONMART_2F_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 5, 3, SPRITE_CLERK, STAY, DOWN, TEXT_CELADONMART_2F_CLERK1 ; person + object_event 6, 3, SPRITE_CLERK, STAY, DOWN, TEXT_CELADONMART_2F_CLERK2 ; person object_event 19, 5, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, 3 ; person object_event 14, 4, SPRITE_GIRL, WALK, UP_DOWN, 4 ; person diff --git a/data/maps/objects/CeladonMart3F.asm b/data/maps/objects/CeladonMart3F.asm index 85f0cf1c12..d1b49710b7 100644 --- a/data/maps/objects/CeladonMart3F.asm +++ b/data/maps/objects/CeladonMart3F.asm @@ -1,3 +1,10 @@ + object_const_def + const CELADONMART_3F_CLERK + const CELADONMART_3F_GAMEBOY_KID1 + const CELADONMART_3F_GAMEBOY_KID2 + const CELADONMART_3F_GAMEBOY_KID3 + const CELADONMART_3F_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_CELADONMART_3F_SNES1 + bg_event 3, 4, TEXT_CELADONMART_3F_RPG + bg_event 5, 4, TEXT_CELADONMART_3F_SNES2 + bg_event 6, 4, TEXT_CELADONMART_3F_SPORTS_GAME + bg_event 2, 6, TEXT_CELADONMART_3F_SNES3 + bg_event 3, 6, TEXT_CELADONMART_3F_PUZZLE_GAME + bg_event 5, 6, TEXT_CELADONMART_3F_SNES4 + bg_event 6, 6, TEXT_CELADONMART_3F_FIGHTING_GAME + bg_event 14, 1, TEXT_CELADONMART_3F_CURRENT_FLOOR_SIGN + bg_event 4, 1, TEXT_CELADONMART_3F_POKEMON_POSTER1 + bg_event 6, 1, TEXT_CELADONMART_3F_POKEMON_POSTER2 + bg_event 10, 1, TEXT_CELADONMART_3F_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_CELADONMART_3F_CLERK ; person + object_event 11, 6, SPRITE_GAMEBOY_KID, STAY, RIGHT, TEXT_CELADONMART_3F_GAMEBOY_KID1 ; person + object_event 7, 2, SPRITE_GAMEBOY_KID, STAY, DOWN, TEXT_CELADONMART_3F_GAMEBOY_KID2 ; person + object_event 8, 2, SPRITE_GAMEBOY_KID, STAY, DOWN, TEXT_CELADONMART_3F_GAMEBOY_KID3 ; person + object_event 2, 5, SPRITE_LITTLE_BOY, STAY, UP, TEXT_CELADONMART_3F_LITTLE_BOY ; person def_warps_to CELADON_MART_3F diff --git a/data/maps/objects/CeladonMart4F.asm b/data/maps/objects/CeladonMart4F.asm index 7f18869247..39655630bd 100644 --- a/data/maps/objects/CeladonMart4F.asm +++ b/data/maps/objects/CeladonMart4F.asm @@ -1,3 +1,8 @@ + object_const_def + const CELADONMART_4F_CLERK + const CELADONMART_4F_SUPER_NERD + const CELADONMART_4F_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_CELADONMART_4F_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_CELADONMART_4F_CLERK ; person + object_event 15, 5, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, TEXT_CELADONMART_4F_SUPER_NERD ; person + object_event 5, 2, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, TEXT_CELADONMART_4F_YOUNGSTER ; person def_warps_to CELADON_MART_4F diff --git a/data/maps/objects/CeladonMart5F.asm b/data/maps/objects/CeladonMart5F.asm index 35cb45b870..02866cdcd8 100644 --- a/data/maps/objects/CeladonMart5F.asm +++ b/data/maps/objects/CeladonMart5F.asm @@ -1,3 +1,9 @@ + object_const_def + const CELADONMART_5F_GENTLEMAN + const CELADONMART_5F_SAILOR + const CELADONMART_5F_CLERK1 + const CELADONMART_5F_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_CELADONMART_5F_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_CELADONMART_5F_GENTLEMAN ; person + object_event 2, 6, SPRITE_SAILOR, STAY, NONE, TEXT_CELADONMART_5F_SAILOR ; person + object_event 5, 3, SPRITE_CLERK, STAY, DOWN, TEXT_CELADONMART_5F_CLERK1 ; person + object_event 6, 3, SPRITE_CLERK, STAY, DOWN, TEXT_CELADONMART_5F_CLERK2 ; person def_warps_to CELADON_MART_5F diff --git a/data/maps/objects/CeladonMartElevator.asm b/data/maps/objects/CeladonMartElevator.asm index c24e48dfdf..ca7b00678a 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_CELADONMART_ELEVARTOR def_object_events diff --git a/data/maps/objects/CeladonMartRoof.asm b/data/maps/objects/CeladonMartRoof.asm index f56a0b0df7..365392efc9 100644 --- a/data/maps/objects/CeladonMartRoof.asm +++ b/data/maps/objects/CeladonMartRoof.asm @@ -1,3 +1,7 @@ + object_const_def + const CELADONMART_ROOF_SUPER_NERD + const CELADONMART_ROOF_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_CELADONMART_ROOF_VENDING_MACHINE1 + bg_event 11, 1, TEXT_CELADONMART_ROOF_VENDING_MACHINE2 + bg_event 12, 2, TEXT_CELADONMART_ROOF_VENDING_MACHINE3 + bg_event 13, 2, TEXT_CELADONMART_ROOF_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_CELADONMART_ROOF_SUPER_NERD ; person + object_event 5, 5, SPRITE_LITTLE_GIRL, WALK, ANY_DIR, TEXT_CELADONMART_ROOF_LITTLE_GIRL ; person def_warps_to CELADON_MART_ROOF diff --git a/data/maps/objects/CeladonPokecenter.asm b/data/maps/objects/CeladonPokecenter.asm index 40c466a0ff..986b2726ab 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 ; person + object_event 7, 3, SPRITE_GENTLEMAN, WALK, LEFT_RIGHT, TEXT_CELADONPOKECENTER_GENTLEMAN ; person + object_event 10, 5, SPRITE_BEAUTY, WALK, ANY_DIR, TEXT_CELADONPOKECENTER_BEAUTY ; person + object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, TEXT_CELADONPOKECENTER_LINK_RECEPTIONIST ; person def_warps_to CELADON_POKECENTER diff --git a/data/maps/objects/CeruleanBadgeHouse.asm b/data/maps/objects/CeruleanBadgeHouse.asm index 145dde8105..70b226b332 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 ; person def_warps_to CERULEAN_BADGE_HOUSE diff --git a/data/maps/objects/CeruleanCave1F.asm b/data/maps/objects/CeruleanCave1F.asm index b858a40fb4..a8d8bf3c4e 100644 --- a/data/maps/objects/CeruleanCave1F.asm +++ b/data/maps/objects/CeruleanCave1F.asm @@ -1,3 +1,8 @@ + object_const_def + const CERULEANCAVE_1F_FULL_RESTORE + const CERULEANCAVE_1F_MAX_ELIXER + const CERULEANCAVE_1F_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_CERULEANCAVE_1F_MAX_ELIXER, MAX_ELIXER + object_event 5, 0, SPRITE_POKE_BALL, STAY, NONE, TEXT_CERULEANCAVE_1F_NUGGET, NUGGET def_warps_to CERULEAN_CAVE_1F diff --git a/data/maps/objects/CeruleanCave2F.asm b/data/maps/objects/CeruleanCave2F.asm index 18765fe82e..790c2fc8a8 100644 --- a/data/maps/objects/CeruleanCave2F.asm +++ b/data/maps/objects/CeruleanCave2F.asm @@ -1,3 +1,8 @@ + object_const_def + const CERULEANCAVE_2F_PP_UP + const CERULEANCAVE_2F_ULTRA_BALL + const CERULEANCAVE_2F_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_CERULEANCAVE_2F_PP_UP, PP_UP + object_event 4, 15, SPRITE_POKE_BALL, STAY, NONE, TEXT_CERULEANCAVE_2F_ULTRA_BALL, ULTRA_BALL + object_event 13, 6, SPRITE_POKE_BALL, STAY, NONE, TEXT_CERULEANCAVE_2F_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 5173fee61b..54d5f6382b 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_CERULEANCAVE_B1F_MEWTWO, MEWTWO, 70 + object_event 16, 9, SPRITE_POKE_BALL, STAY, NONE, TEXT_CERULEANCAVE_B1F_ULTRA_BALL, ULTRA_BALL + object_event 18, 1, SPRITE_POKE_BALL, STAY, NONE, TEXT_CERULEANCAVE_B1F_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 23863aa0db..4c76177266 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_GUARD_MOVED + const CERULEANCITY_COOLTRAINER_F1 + const CERULEANCITY_SLOWBRO + const CERULEANCITY_COOLTRAINER_F2 + const CERULEANCITY_SUPER_NERD3 + const CERULEANCITY_GUARD_BLOCKING + 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 ; person + 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 ; person + object_event 15, 18, SPRITE_SUPER_NERD, WALK, UP_DOWN, TEXT_CERULEANCITY_SUPER_NERD1 ; person + object_event 9, 21, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, TEXT_CERULEANCITY_SUPER_NERD2 ; person + object_event 28, 12, SPRITE_GUARD, STAY, DOWN, TEXT_CERULEANCITY_GUARD_MOVED ; person + object_event 29, 26, SPRITE_COOLTRAINER_F, STAY, LEFT, TEXT_CERULEANCITY_COOLTRAINER_F1 ; person + object_event 28, 26, SPRITE_MONSTER, STAY, DOWN, TEXT_CERULEANCITY_SLOWBRO ; person + object_event 9, 27, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, TEXT_CERULEANCITY_COOLTRAINER_F2 ; person + object_event 4, 12, SPRITE_SUPER_NERD, STAY, DOWN, TEXT_CERULEANCITY_SUPER_NERD3 ; person + object_event 27, 12, SPRITE_GUARD, STAY, DOWN, TEXT_CERULEANCITY_GUARD_BLOCKING ; person def_warps_to CERULEAN_CITY diff --git a/data/maps/objects/CeruleanGym.asm b/data/maps/objects/CeruleanGym.asm index a6be4cae6e..1e1b20e0e0 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 ; person def_warps_to CERULEAN_GYM diff --git a/data/maps/objects/CeruleanMart.asm b/data/maps/objects/CeruleanMart.asm index 0f5a827605..6cbc51af3c 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 ; person + object_event 3, 4, SPRITE_COOLTRAINER_M, WALK, UP_DOWN, TEXT_CERULEANMART_COOLTRAINER_M ; person + object_event 6, 2, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, TEXT_CERULEANMART_COOLTRAINER_F ; person def_warps_to CERULEAN_MART diff --git a/data/maps/objects/ChampionsRoom.asm b/data/maps/objects/ChampionsRoom.asm index fa5efd8fdd..7dab830c58 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 ; person + object_event 3, 7, SPRITE_OAK, STAY, UP, TEXT_CHAMPIONSROOM_OAK ; person def_warps_to CHAMPIONS_ROOM diff --git a/data/maps/objects/GameCorner.asm b/data/maps/objects/GameCorner.asm index 2b4c8f7226..5d5c5ce72f 100644 --- a/data/maps/objects/GameCorner.asm +++ b/data/maps/objects/GameCorner.asm @@ -1,3 +1,16 @@ + object_const_def + const CELADONGAMECORNER_BEAUTY1 + const CELADONGAMECORNER_CLERK1 + const CELADONGAMECORNER_MIDDLE_AGED_MAN1 + const CELADONGAMECORNER_BEAUTY2 + const CELADONGAMECORNER_FISHING_GURU + const CELADONGAMECORNER_MIDDLE_AGED_WOMAN + const CELADONGAMECORNER_GYM_GUIDE + const CELADONGAMECORNER_GAMBLER + const CELADONGAMECORNER_CLERK2 + const CELADONGAMECORNER_GENTLEMAN + const CELADONGAMECORNER_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_CELADONGAMECORNER_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_CELADONGAMECORNER_BEAUTY1 ; person + object_event 5, 6, SPRITE_CLERK, STAY, DOWN, TEXT_CELADONGAMECORNER_CLERK1 ; person + object_event 2, 10, SPRITE_MIDDLE_AGED_MAN, STAY, LEFT, TEXT_CELADONGAMECORNER_MIDDLE_AGED_MAN1 ; person + object_event 2, 13, SPRITE_BEAUTY, STAY, LEFT, TEXT_CELADONGAMECORNER_BEAUTY2 ; person + object_event 5, 11, SPRITE_FISHING_GURU, STAY, RIGHT, TEXT_CELADONGAMECORNER_FISHING_GURU ; person + object_event 8, 11, SPRITE_MIDDLE_AGED_WOMAN, STAY, LEFT, TEXT_CELADONGAMECORNER_MIDDLE_AGED_WOMAN ; person + object_event 8, 14, SPRITE_GYM_GUIDE, STAY, LEFT, TEXT_CELADONGAMECORNER_GYM_GUIDE ; person + object_event 11, 15, SPRITE_GAMBLER, STAY, RIGHT, TEXT_CELADONGAMECORNER_GAMBLER ; person + object_event 14, 11, SPRITE_CLERK, STAY, LEFT, TEXT_CELADONGAMECORNER_CLERK2 ; person + object_event 17, 13, SPRITE_GENTLEMAN, STAY, RIGHT, TEXT_CELADONGAMECORNER_GENTLEMAN ; person + object_event 9, 5, SPRITE_ROCKET, STAY, UP, TEXT_CELADONGAMECORNER_ROCKET, OPP_ROCKET, 7 def_warps_to GAME_CORNER diff --git a/macros/const.asm b/macros/const.asm index 7c7f859185..e0a84404b0 100644 --- a/macros/const.asm +++ b/macros/const.asm @@ -39,6 +39,11 @@ MACRO const_next endc ENDM +MACRO dw_const + dw \1 + const \2 +ENDM + MACRO rb_skip IF _NARG == 1 rsset _RS + \1 diff --git a/macros/scripts/maps.asm b/macros/scripts/maps.asm index 5c1a8ad569..8037d0a7a6 100644 --- a/macros/scripts/maps.asm +++ b/macros/scripts/maps.asm @@ -208,3 +208,15 @@ MACRO connection db _y, _x dw wOverworldMap + _win ENDM + +MACRO def_script_pointers +\1_ScriptPointers: + const_def +ENDM + +MACRO def_text_pointers +\1_TextPointers: + const_def 1 +ENDM + +DEF object_const_def EQUS "const_def 1" diff --git a/scripts/AgathasRoom.asm b/scripts/AgathasRoom.asm index abe22a4f63..3ea9bd81b6 100644 --- a/scripts/AgathasRoom.asm +++ b/scripts/AgathasRoom.asm @@ -26,18 +26,18 @@ AgathaShowOrHideExitBlock: predef_jump ReplaceTileBlock ResetAgathaScript: - xor a + xor a ; SCRIPT_AGATHASROOM_DEFAULT ld [wAgathasRoomCurScript], a ret -AgathasRoom_ScriptPointers: - dw AgathaScript0 - dw DisplayEnemyTrainerTextAndStartBattle - dw AgathaScript2 - dw AgathaScript3 - dw AgathaScript4 + def_script_pointers AgathasRoom + dw_const AgathasRoomDefaultScript, SCRIPT_AGATHASROOM_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_AGATHASROOM_AGATHA_START_BATTLE + dw_const AgathasRoomAgathaEndBattleScript, SCRIPT_AGATHASROOM_AGATHA_END_BATTLE + dw_const AgathasRoomPlayerIsMovingScript, SCRIPT_AGATHASROOM_PLAYER_IS_MOVING + dw_const AgathasRoomNoopScript, SCRIPT_AGATHASROOM_NOOP -AgathaScript4: +AgathasRoomNoopScript: ret AgathaScriptWalkIntoRoom: @@ -53,12 +53,12 @@ AgathaScriptWalkIntoRoom: ld a, $6 ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates - ld a, $3 + ld a, SCRIPT_AGATHASROOM_PLAYER_IS_MOVING ld [wAgathasRoomCurScript], a ld [wCurMapScript], a ret -AgathaScript0: +AgathasRoomDefaultScript: ld hl, AgathaEntranceCoords call ArePlayerCoordsInArray jp nc, CheckFightingMapTrainers @@ -73,15 +73,15 @@ AgathaScript0: CheckAndSetEvent EVENT_AUTOWALKED_INTO_AGATHAS_ROOM jr z, AgathaScriptWalkIntoRoom .stopPlayerFromLeaving - ld a, $2 + ld a, TEXT_AGATHASROOM_AGATHA_DONT_RUN_AWAY ldh [hSpriteIndexOrTextID], a - call DisplayTextID ; "Don't run away!" + call DisplayTextID ld a, D_UP ld [wSimulatedJoypadStatesEnd], a ld a, $1 ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates - ld a, $3 + ld a, SCRIPT_AGATHASROOM_PLAYER_IS_MOVING ld [wAgathasRoomCurScript], a ld [wCurMapScript], a ret @@ -93,7 +93,7 @@ AgathaEntranceCoords: dbmapcoord 5, 11 db -1 ; end -AgathaScript3: +AgathasRoomPlayerIsMovingScript: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -104,21 +104,21 @@ AgathaScript3: ld [wCurMapScript], a ret -AgathaScript2: +AgathasRoomAgathaEndBattleScript: call EndTrainerBattle ld a, [wIsInBattle] cp $ff jp z, ResetAgathaScript - ld a, $1 + ld a, TEXT_AGATHASROOM_AGATHA ldh [hSpriteIndexOrTextID], a call DisplayTextID - ld a, $1 + ld a, SCRIPT_CHAMPIONSROOM_PLAYER_ENTERS ld [wChampionsRoomCurScript], a ret -AgathasRoom_TextPointers: - dw AgathaText1 - dw AgathaDontRunAwayText + def_text_pointers AgathasRoom + dw_const AgathasRoomAgathaText, TEXT_AGATHASROOM_AGATHA + dw_const AgathasRoomAgathaDontRunAwayText, TEXT_AGATHASROOM_AGATHA_DONT_RUN_AWAY AgathasRoomTrainerHeaders: def_trainers @@ -126,7 +126,7 @@ AgathasRoomTrainerHeader0: trainer EVENT_BEAT_AGATHAS_ROOM_TRAINER_0, 0, AgathaBeforeBattleText, AgathaEndBattleText, AgathaAfterBattleText db -1 ; end -AgathaText1: +AgathasRoomAgathaText: text_asm ld hl, AgathasRoomTrainerHeader0 call TalkToTrainer @@ -144,6 +144,6 @@ AgathaAfterBattleText: text_far _AgathaAfterBattleText text_end -AgathaDontRunAwayText: - text_far _AgathaDontRunAwayText +AgathasRoomAgathaDontRunAwayText: + text_far _AgathasRoomAgathaDontRunAwayText text_end diff --git a/scripts/BikeShop.asm b/scripts/BikeShop.asm index f5f0539ed2..bb55c01697 100644 --- a/scripts/BikeShop.asm +++ b/scripts/BikeShop.asm @@ -1,23 +1,23 @@ BikeShop_Script: jp EnableAutoTextBoxDrawing -BikeShop_TextPointers: - dw BikeShopText1 - dw BikeShopText2 - dw BikeShopText3 + def_text_pointers BikeShop + dw_const BikeShopBikeClerkText, TEXT_BIKESHOP_BIKE_CLERK + dw_const BikeShopMiddleAgedWomanText, TEXT_BIKESHOP_MIDDLE_AGED_WOMAN + dw_const BikeShopYoungsterText, TEXT_BIKESHOP_YOUNGSTER -BikeShopText1: +BikeShopBikeClerkText: text_asm CheckEvent EVENT_GOT_BICYCLE - jr z, .asm_260d4 - ld hl, BikeShopText_1d82f + jr z, .dontHaveBike + ld hl, BikeShopClerkHowDoYouLikeYourBicycleText call PrintText jp .Done -.asm_260d4 +.dontHaveBike ld b, BIKE_VOUCHER call IsItemInBag - jr z, .asm_41190 - ld hl, BikeShopText_1d81f + jr z, .dontHaveVoucher + ld hl, BikeShopClerkOhThatsAVoucherText call PrintText lb bc, BICYCLE, 1 call GiveItem @@ -26,15 +26,15 @@ BikeShopText1: ldh [hItemToRemoveID], a farcall RemoveItemByID SetEvent EVENT_GOT_BICYCLE - ld hl, BikeShopText_1d824 + ld hl, BikeShopExchangedVoucherText call PrintText jr .Done .BagFull - ld hl, BikeShopText_1d834 + ld hl, BikeShopBagFullText call PrintText jr .Done -.asm_41190 - ld hl, BikeShopText_1d810 +.dontHaveVoucher + ld hl, BikeShopClerkWelcomeText call PrintText xor a ld [wCurrentMenuItem], a @@ -60,7 +60,7 @@ BikeShopText1: hlcoord 8, 3 ld de, BikeShopMenuPrice call PlaceString - ld hl, BikeShopText_1d815 + ld hl, BikeShopClerkDoYouLikeItText call PrintText call HandleMenuInput bit BIT_B_BUTTON, a @@ -85,24 +85,24 @@ BikeShopMenuText: BikeShopMenuPrice: db "¥1000000@" -BikeShopText_1d810: - text_far _BikeShopText_1d810 +BikeShopClerkWelcomeText: + text_far _BikeShopClerkWelcomeText text_end -BikeShopText_1d815: - text_far _BikeShopText_1d815 +BikeShopClerkDoYouLikeItText: + text_far _BikeShopClerkDoYouLikeItText text_end BikeShopCantAffordText: text_far _BikeShopCantAffordText text_end -BikeShopText_1d81f: - text_far _BikeShopText_1d81f +BikeShopClerkOhThatsAVoucherText: + text_far _BikeShopClerkOhThatsAVoucherText text_end -BikeShopText_1d824: - text_far _BikeShopText_1d824 +BikeShopExchangedVoucherText: + text_far _BikeShopExchangedVoucherText sound_get_key_item text_end @@ -110,38 +110,38 @@ BikeShopComeAgainText: text_far _BikeShopComeAgainText text_end -BikeShopText_1d82f: - text_far _BikeShopText_1d82f +BikeShopClerkHowDoYouLikeYourBicycleText: + text_far _BikeShopClerkHowDoYouLikeYourBicycleText text_end -BikeShopText_1d834: - text_far _BikeShopText_1d834 +BikeShopBagFullText: + text_far _BikeShopBagFullText text_end -BikeShopText2: +BikeShopMiddleAgedWomanText: text_asm - ld hl, BikeShopText_1d843 + ld hl, .Text call PrintText jp TextScriptEnd -BikeShopText_1d843: - text_far _BikeShopText_1d843 +.Text: + text_far _BikeShopMiddleAgedWomanText text_end -BikeShopText3: +BikeShopYoungsterText: text_asm CheckEvent EVENT_GOT_BICYCLE - ld hl, BikeShopText_1d861 - jr nz, .asm_34d2d - ld hl, BikeShopText_1d85c -.asm_34d2d + ld hl, .CoolBikeText + jr nz, .gotBike + ld hl, .TheseBikesAreExpensiveText +.gotBike call PrintText jp TextScriptEnd -BikeShopText_1d85c: - text_far _BikeShopText_1d85c +.TheseBikesAreExpensiveText: + text_far _BikeShopYoungsterTheseBikesAreExpensiveText text_end -BikeShopText_1d861: - text_far _BikeShopText_1d861 +.CoolBikeText: + text_far _BikeShopYoungsterCoolBikeText text_end diff --git a/scripts/BillsHouse.asm b/scripts/BillsHouse.asm index 2085f417eb..d55611deea 100644 --- a/scripts/BillsHouse.asm +++ b/scripts/BillsHouse.asm @@ -4,28 +4,28 @@ BillsHouse_Script: ld hl, BillsHouse_ScriptPointers jp CallFunctionInTable -BillsHouse_ScriptPointers: - dw BillsHouseScript0 - dw BillsHouseScript1 - dw BillsHouseScript2 - dw BillsHouseScript3 - dw BillsHouseScript4 - dw BillsHouseScript5 - -BillsHouseScript0: + def_script_pointers BillsHouse + dw_const BillsHouseDefaultScript, SCRIPT_BILLSHOUSE_DEFAULT + dw_const BillsHousePokemonWalkToMachineScript, SCRIPT_BILLSHOUSE_POKEMON_WALK_TO_MACHINE + dw_const BillsHousePokemonEntersMachineScript, SCRIPT_BILLSHOUSE_POKEMON_ENTERS_MACHINE + dw_const BillsHouseBillExitsMachineScript, SCRIPT_BILLSHOUSE_BILL_EXITS_MACHINE + dw_const BillsHouseCleanupScript, SCRIPT_BILLSHOUSE_CLEANUP + dw_const BillsHousePCScript, SCRIPT_BILLSHOUSE_PC + +BillsHouseDefaultScript: ret -BillsHouseScript1: +BillsHousePokemonWalkToMachineScript: ld a, [wSpritePlayerStateData1FacingDirection] and a ; cp SPRITE_FACING_DOWN ld de, MovementData_1e79c jr nz, .notDown ld de, MovementData_1e7a0 .notDown - ld a, $1 + ld a, BILLSHOUSE_BILL_POKEMON ldh [hSpriteIndex], a call MoveSprite - ld a, $2 + ld a, SCRIPT_BILLSHOUSE_POKEMON_ENTERS_MACHINE ld [wBillsHouseCurScript], a ret @@ -44,7 +44,7 @@ MovementData_1e7a0: db NPC_MOVEMENT_UP db -1 ; end -BillsHouseScript2: +BillsHousePokemonEntersMachineScript: ld a, [wd730] bit 0, a ret nz @@ -54,16 +54,16 @@ BillsHouseScript2: SetEvent EVENT_BILL_SAID_USE_CELL_SEPARATOR xor a ld [wJoyIgnore], a - ld a, $3 + ld a, SCRIPT_BILLSHOUSE_BILL_EXITS_MACHINE ld [wBillsHouseCurScript], a ret -BillsHouseScript3: +BillsHouseBillExitsMachineScript: CheckEvent EVENT_USED_CELL_SEPARATOR_ON_BILL ret z ld a, $f0 ld [wJoyIgnore], a - ld a, $2 + ld a, BILLSHOUSE_BILL1 ld [wSpriteIndex], a ld a, $c ldh [hSpriteScreenYCoord], a @@ -79,11 +79,11 @@ BillsHouseScript3: predef ShowObject ld c, 8 call DelayFrames - ld a, $2 + ld a, BILLSHOUSE_BILL1 ldh [hSpriteIndex], a ld de, MovementData_1e807 call MoveSprite - ld a, $4 + ld a, SCRIPT_BILLSHOUSE_CLEANUP ld [wBillsHouseCurScript], a ret @@ -95,7 +95,7 @@ MovementData_1e807: db NPC_MOVEMENT_DOWN db -1 ; end -BillsHouseScript4: +BillsHouseCleanupScript: ld a, [wd730] bit 0, a ret nz @@ -103,70 +103,70 @@ BillsHouseScript4: ld [wJoyIgnore], a SetEvent EVENT_MET_BILL_2 ; this event seems redundant SetEvent EVENT_MET_BILL - ld a, $0 + ld a, SCRIPT_BILLSHOUSE_DEFAULT ld [wBillsHouseCurScript], a ret -BillsHouseScript5: - ld a, $4 +BillsHousePCScript: + ld a, TEXT_BILLSHOUSE_ACTIVATE_PC ldh [hSpriteIndexOrTextID], a call DisplayTextID - ld a, $0 + ld a, SCRIPT_BILLSHOUSE_DEFAULT ld [wBillsHouseCurScript], a ret -BillsHouse_TextPointers: - dw BillsHouseText1 - dw BillsHouseText2 - dw BillsHouseText3 - dw BillsHouseText4 + def_text_pointers BillsHouse + dw_const BillsHouseBillPokemonText, TEXT_BILLSHOUSE_BILL_POKEMON + dw_const BillsHouseBillSSTicketText, TEXT_BILLSHOUSE_BILL_SS_TICKET + dw_const BillsHouseBillCheckOutMyRarePokemonText, TEXT_BILLSHOUSE_BILL_CHECK_OUT_MY_RARE_POKEMON + dw_const BillsHouseActivatePCScript, TEXT_BILLSHOUSE_ACTIVATE_PC -BillsHouseText4: +BillsHouseActivatePCScript: script_bills_pc -BillsHouseText1: +BillsHouseBillPokemonText: text_asm - ld hl, BillsHouseText_1e865 + ld hl, .ImNotAPokemonText call PrintText call YesNoChoice ld a, [wCurrentMenuItem] and a jr nz, .asm_1e85a .asm_1e84d - ld hl, BillsHouseText_1e86a + ld hl, .UseSeparationSystemText call PrintText - ld a, $1 + ld a, SCRIPT_BILLSHOUSE_POKEMON_WALK_TO_MACHINE ld [wBillsHouseCurScript], a jr .asm_1e862 .asm_1e85a - ld hl, BillsHouseText_1e86f + ld hl, .NoYouGottaHelpText call PrintText jr .asm_1e84d .asm_1e862 jp TextScriptEnd -BillsHouseText_1e865: - text_far _BillsHouseText_1e865 +.ImNotAPokemonText: + text_far _BillsHouseBillImNotAPokemonText text_end -BillsHouseText_1e86a: - text_far _BillsHouseText_1e86a +.UseSeparationSystemText: + text_far _BillsHouseBillUseSeparationSystemText text_end -BillsHouseText_1e86f: - text_far _BillsHouseText_1e86f +.NoYouGottaHelpText: + text_far _BillsHouseBillNoYouGottaHelpText text_end -BillsHouseText2: +BillsHouseBillSSTicketText: text_asm CheckEvent EVENT_GOT_SS_TICKET jr nz, .asm_1e8a9 - ld hl, BillThankYouText + ld hl, .ThankYouText call PrintText lb bc, S_S_TICKET, 1 call GiveItem jr nc, .BagFull - ld hl, SSTicketReceivedText + ld hl, .SSTicketReceivedText call PrintText SetEvent EVENT_GOT_SS_TICKET ld a, HS_CERULEAN_GUARD_1 @@ -176,39 +176,39 @@ BillsHouseText2: ld [wMissableObjectIndex], a predef HideObject .asm_1e8a9 - ld hl, BillsHouseText_1e8cb + ld hl, .WhyDontYouGoInsteadOfMeText call PrintText jr .asm_1e8b7 .BagFull - ld hl, SSTicketNoRoomText + ld hl, .SSTicketNoRoomText call PrintText .asm_1e8b7 jp TextScriptEnd -BillThankYouText: - text_far _BillThankYouText +.ThankYouText: + text_far _BillsHouseBillThankYouText text_end -SSTicketReceivedText: +.SSTicketReceivedText: text_far _SSTicketReceivedText sound_get_key_item text_promptbutton text_end -SSTicketNoRoomText: +.SSTicketNoRoomText: text_far _SSTicketNoRoomText text_end -BillsHouseText_1e8cb: - text_far _BillsHouseText_1e8cb +.WhyDontYouGoInsteadOfMeText: + text_far _BillsHouseBillWhyDontYouGoInsteadOfMeText text_end -BillsHouseText3: +BillsHouseBillCheckOutMyRarePokemonText: text_asm - ld hl, BillsHouseText_1e8da + ld hl, .Text call PrintText jp TextScriptEnd -BillsHouseText_1e8da: - text_far _BillsHouseText_1e8da +.Text: + text_far _BillsHouseBillCheckOutMyRarePokemonText text_end diff --git a/scripts/BluesHouse.asm b/scripts/BluesHouse.asm index 1ab0fd0632..bf0c1a6893 100644 --- a/scripts/BluesHouse.asm +++ b/scripts/BluesHouse.asm @@ -4,23 +4,23 @@ BluesHouse_Script: ld a, [wBluesHouseCurScript] jp CallFunctionInTable -BluesHouse_ScriptPointers: - dw BluesHouseScript0 - dw BluesHouseScript1 + def_script_pointers BluesHouse + dw_const BluesHouseDefaultScript, SCRIPT_BLUESHOUSE_DEFAULT + dw_const BluesHouseNoopScript, SCRIPT_BLUESHOUSE_NOOP -BluesHouseScript0: +BluesHouseDefaultScript: SetEvent EVENT_ENTERED_BLUES_HOUSE - ld a, $1 + ld a, SCRIPT_BLUESHOUSE_NOOP ld [wBluesHouseCurScript], a ret -BluesHouseScript1: +BluesHouseNoopScript: ret -BluesHouse_TextPointers: - dw BluesHouseDaisySittingText - dw BluesHouseDaisyWalkingText - dw BluesHouseTownMapText + def_text_pointers BluesHouse + dw_const BluesHouseDaisySittingText, TEXT_BLUESHOUSE_DAISY_SITTING + dw_const BluesHouseDaisyWalkingText, TEXT_BLUESHOUSE_DAISY_WALKING + dw_const BluesHouseTownMapText, TEXT_BLUESHOUSE_TOWN_MAP BluesHouseDaisySittingText: text_asm @@ -28,12 +28,12 @@ BluesHouseDaisySittingText: jr nz, .got_town_map CheckEvent EVENT_GOT_POKEDEX jr nz, .give_town_map - ld hl, DaisyInitialText + ld hl, BluesHouseDaisyRivalAtLabText call PrintText jr .done .give_town_map - ld hl, DaisyOfferMapText + ld hl, BluesHouseDaisyOfferMapText call PrintText lb bc, TOWN_MAP, 1 call GiveItem @@ -47,22 +47,22 @@ BluesHouseDaisySittingText: jr .done .got_town_map - ld hl, DaisyUseMapText + ld hl, BluesHouseDaisyUseMapText call PrintText jr .done .bag_full - ld hl, DaisyBagFullText + ld hl, BluesHouseDaisyBagFullText call PrintText .done jp TextScriptEnd -DaisyInitialText: - text_far _DaisyInitialText +BluesHouseDaisyRivalAtLabText: + text_far _BluesHouseDaisyRivalAtLabText text_end -DaisyOfferMapText: - text_far _DaisyOfferMapText +BluesHouseDaisyOfferMapText: + text_far _BluesHouseDaisyOfferMapText text_end GotMapText: @@ -70,12 +70,12 @@ GotMapText: sound_get_key_item text_end -DaisyBagFullText: - text_far _DaisyBagFullText +BluesHouseDaisyBagFullText: + text_far _BluesHouseDaisyBagFullText text_end -DaisyUseMapText: - text_far _DaisyUseMapText +BluesHouseDaisyUseMapText: + text_far _BluesHouseDaisyUseMapText text_end BluesHouseDaisyWalkingText: diff --git a/scripts/BrunosRoom.asm b/scripts/BrunosRoom.asm index ca8f5418bf..df0fa36e20 100644 --- a/scripts/BrunosRoom.asm +++ b/scripts/BrunosRoom.asm @@ -26,18 +26,18 @@ BrunoShowOrHideExitBlock: predef_jump ReplaceTileBlock ResetBrunoScript: - xor a + xor a ; SCRIPT_BRUNOSROOM_DEFAULT ld [wBrunosRoomCurScript], a ret -BrunosRoom_ScriptPointers: - dw BrunoScript0 - dw DisplayEnemyTrainerTextAndStartBattle - dw BrunoScript2 - dw BrunoScript3 - dw BrunoScript4 + def_script_pointers BrunosRoom + dw_const BrunosRoomDefaultScript, SCRIPT_BRUNOSROOM_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_BRUNOSROOM_BRUNO_START_BATTLE + dw_const BrunosRoomBrunoEndBattleScript, SCRIPT_BRUNOSROOM_BRUNO_END_BATTLE + dw_const BrunosRoomPlayerIsMovingScript, SCRIPT_BRUNOSROOM_PLAYER_IS_MOVING + dw_const BrunosRoomNoopScript, SCRIPT_BRUNOSROOM_NOOP -BrunoScript4: +BrunosRoomNoopScript: ret BrunoScriptWalkIntoRoom: @@ -53,12 +53,12 @@ BrunoScriptWalkIntoRoom: ld a, $6 ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates - ld a, $3 + ld a, SCRIPT_BRUNOSROOM_PLAYER_IS_MOVING ld [wBrunosRoomCurScript], a ld [wCurMapScript], a ret -BrunoScript0: +BrunosRoomDefaultScript: ld hl, BrunoEntranceCoords call ArePlayerCoordsInArray jp nc, CheckFightingMapTrainers @@ -73,7 +73,7 @@ BrunoScript0: CheckAndSetEvent EVENT_AUTOWALKED_INTO_BRUNOS_ROOM jr z, BrunoScriptWalkIntoRoom .stopPlayerFromLeaving - ld a, $2 + ld a, TEXT_BRUNOSROOM_BRUNO_DONT_RUN_AWAY ldh [hSpriteIndexOrTextID], a call DisplayTextID ; "Don't run away!" ld a, D_UP @@ -81,7 +81,7 @@ BrunoScript0: ld a, $1 ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates - ld a, $3 + ld a, SCRIPT_BRUNOSROOM_PLAYER_IS_MOVING ld [wBrunosRoomCurScript], a ld [wCurMapScript], a ret @@ -93,29 +93,29 @@ BrunoEntranceCoords: dbmapcoord 5, 11 db -1 ; end -BrunoScript3: +BrunosRoomPlayerIsMovingScript: ld a, [wSimulatedJoypadStatesIndex] and a ret nz call Delay3 - xor a + xor a ; SCRIPT_BRUNOSROOM_DEFAULT ld [wJoyIgnore], a ld [wBrunosRoomCurScript], a ld [wCurMapScript], a ret -BrunoScript2: +BrunosRoomBrunoEndBattleScript: call EndTrainerBattle ld a, [wIsInBattle] cp $ff jp z, ResetBrunoScript - ld a, $1 + ld a, TEXT_BRUNOSROOM_BRUNO ldh [hSpriteIndexOrTextID], a jp DisplayTextID -BrunosRoom_TextPointers: - dw BrunoText1 - dw BrunoDontRunAwayText + def_text_pointers BrunosRoom + dw_const BrunosRoomBrunoText, TEXT_BRUNOSROOM_BRUNO + dw_const BrunosRoomBrunoDontRunAwayText, TEXT_BRUNOSROOM_BRUNO_DONT_RUN_AWAY BrunosRoomTrainerHeaders: def_trainers @@ -123,7 +123,7 @@ BrunosRoomTrainerHeader0: trainer EVENT_BEAT_BRUNOS_ROOM_TRAINER_0, 0, BrunoBeforeBattleText, BrunoEndBattleText, BrunoAfterBattleText db -1 ; end -BrunoText1: +BrunosRoomBrunoText: text_asm ld hl, BrunosRoomTrainerHeader0 call TalkToTrainer @@ -141,6 +141,6 @@ BrunoAfterBattleText: text_far _BrunoAfterBattleText text_end -BrunoDontRunAwayText: - text_far _BrunoDontRunAwayText +BrunosRoomBrunoDontRunAwayText: + text_far _BrunosRoomBrunoDontRunAwayText text_end diff --git a/scripts/CeladonChiefHouse.asm b/scripts/CeladonChiefHouse.asm index ad604b9806..a3651fba9b 100644 --- a/scripts/CeladonChiefHouse.asm +++ b/scripts/CeladonChiefHouse.asm @@ -2,19 +2,19 @@ CeladonChiefHouse_Script: call EnableAutoTextBoxDrawing ret -CeladonChiefHouse_TextPointers: - dw CeladonHouseText1 - dw CeladonHouseText2 - dw CeladonHouseText3 + def_text_pointers CeladonChiefHouse + dw_const CeladonChiefHouseChiefText, TEXT_CELADONCHIEFHOUSE_CHIEF + dw_const CeladonChiefHouseRocketText, TEXT_CELADONCHIEFHOUSE_ROCKET + dw_const CeladonChiefHouseSailorText, TEXT_CELADONCHEIFHOUSE_SAILOR -CeladonHouseText1: - text_far _CeladonHouseText1 +CeladonChiefHouseChiefText: + text_far _CeladonChiefHouseChiefText text_end -CeladonHouseText2: - text_far _CeladonHouseText2 +CeladonChiefHouseRocketText: + text_far _CeladonChiefHouseRocketText text_end -CeladonHouseText3: - text_far _CeladonHouseText3 +CeladonChiefHouseSailorText: + text_far _CeladonChiefHouseSailorText text_end diff --git a/scripts/CeladonCity.asm b/scripts/CeladonCity.asm index bd0228d8af..393b9f5e38 100644 --- a/scripts/CeladonCity.asm +++ b/scripts/CeladonCity.asm @@ -4,129 +4,129 @@ CeladonCity_Script: ResetEvent EVENT_67F ret -CeladonCity_TextPointers: - dw CeladonCityText1 - dw CeladonCityText2 - dw CeladonCityText3 - dw CeladonCityText4 - dw CeladonCityText5 - dw CeladonCityText6 - dw CeladonCityText7 - dw CeladonCityText8 - dw CeladonCityText9 - dw CeladonCityText10 - dw CeladonCityText11 - dw PokeCenterSignText - dw CeladonCityText13 - dw CeladonCityText14 - dw CeladonCityText15 - dw CeladonCityText16 - dw CeladonCityText17 - dw CeladonCityText18 + def_text_pointers CeladonCity + dw_const CeladonCityLittleGirlText, TEXT_CELADONCITY_LITTLE_GIRL + dw_const CeladonCityGramps1Text, TEXT_CELADONCITY_GRAMPS1 + dw_const CeladonCityGirlText, TEXT_CELADONCITY_GIRL + dw_const CeladonCityGramps2Text, TEXT_CELADONCITY_GRAMPS2 + dw_const CeladonCityGramps3Text, TEXT_CELADONCITY_GRAMPS3 + dw_const CeladonCityFisherText, TEXT_CELADONCITY_FISHER + dw_const CeladonCityPoliwrathText, TEXT_CELADONCITY_POLIWRATH + dw_const CeladonCityRocket1Text, TEXT_CELADONCITY_ROCKET1 + dw_const CeladonCityRocket2Text, TEXT_CELADONCITY_ROCKET2 + dw_const CeladonCityTrainerTips1Text, TEXT_CELADONCITY_TRAINER_TIPS1 + dw_const CeladonCitySignText, TEXT_CELADONCITY_SIGN + dw_const PokeCenterSignText, TEXT_CELADONCITY_POKECENTER_SIGN + dw_const CeladonCityGymSignText, TEXT_CELADONCITY_GYM_SIGN + dw_const CeladonCityMansionSignText, TEXT_CELADONCITY_MANSION_SIGN + dw_const CeladonCityDeptStoreSignText, TEXT_CELADONCITY_DEPTSTORE_SIGN + dw_const CeladonCityTrainerTips2Text, TEXT_CELADONCITY_TRAINER_TIPS2 + dw_const CeladonCityPrizeExchangeSignText, TEXT_CELADONCITY_PRIZEEXCHANGE_SIGN + dw_const CeladonCityGameCornerSignText, TEXT_CELADONCITY_GAMECORNER_SIGN -CeladonCityText1: - text_far _CeladonCityText1 +CeladonCityLittleGirlText: + text_far _CeladonCityLittleGirlText text_end -CeladonCityText2: - text_far _CeladonCityText2 +CeladonCityGramps1Text: + text_far _CeladonCityGramps1Text text_end -CeladonCityText3: - text_far _CeladonCityText3 +CeladonCityGirlText: + text_far _CeladonCityGirlText text_end -CeladonCityText4: - text_far _CeladonCityText4 +CeladonCityGramps2Text: + text_far _CeladonCityGramps2Text text_end -CeladonCityText5: +CeladonCityGramps3Text: text_asm CheckEvent EVENT_GOT_TM41 - jr nz, .asm_7053f - ld hl, TM41PreText + jr nz, .gotTM41 + ld hl, .Text call PrintText lb bc, TM_SOFTBOILED, 1 call GiveItem jr c, .Success - ld hl, TM41NoRoomText + ld hl, .TM41NoRoomText call PrintText jr .Done .Success - ld hl, ReceivedTM41Text + ld hl, .ReceivedTM41Text call PrintText SetEvent EVENT_GOT_TM41 jr .Done -.asm_7053f - ld hl, TM41ExplanationText +.gotTM41 + ld hl, .TM41ExplanationText call PrintText .Done jp TextScriptEnd -TM41PreText: - text_far _TM41PreText +.Text: + text_far _CeledonCityGramps3Text text_end -ReceivedTM41Text: - text_far _ReceivedTM41Text +.ReceivedTM41Text: + text_far _CeledonCityGramps3ReceivedTM41Text sound_get_item_1 text_end -TM41ExplanationText: - text_far _TM41ExplanationText +.TM41ExplanationText: + text_far _CeledonCityGramps3TM41ExplanationText text_end -TM41NoRoomText: - text_far _TM41NoRoomText +.TM41NoRoomText: + text_far _CeledonCityGramps3TM41NoRoomText text_end -CeladonCityText6: - text_far _CeladonCityText6 +CeladonCityFisherText: + text_far _CeladonCityFisherText text_end -CeladonCityText7: - text_far _CeladonCityText7 +CeladonCityPoliwrathText: + text_far _CeladonCityPoliwrathText text_asm ld a, POLIWRATH call PlayCry jp TextScriptEnd -CeladonCityText8: - text_far _CeladonCityText8 +CeladonCityRocket1Text: + text_far _CeladonCityRocket1Text text_end -CeladonCityText9: - text_far _CeladonCityText9 +CeladonCityRocket2Text: + text_far _CeladonCityRocket2Text text_end -CeladonCityText10: - text_far _CeladonCityText10 +CeladonCityTrainerTips1Text: + text_far _CeladonCityTrainerTips1Text text_end -CeladonCityText11: - text_far _CeladonCityText11 +CeladonCitySignText: + text_far _CeladonCitySignText text_end -CeladonCityText13: - text_far _CeladonCityText13 +CeladonCityGymSignText: + text_far _CeladonCityGymSignText text_end -CeladonCityText14: - text_far _CeladonCityText14 +CeladonCityMansionSignText: + text_far _CeladonCityMansionSignText text_end -CeladonCityText15: - text_far _CeladonCityText15 +CeladonCityDeptStoreSignText: + text_far _CeladonCityDeptStoreSignText text_end -CeladonCityText16: - text_far _CeladonCityText16 +CeladonCityTrainerTips2Text: + text_far _CeladonCityTrainerTips2Text text_end -CeladonCityText17: - text_far _CeladonCityText17 +CeladonCityPrizeExchangeSignText: + text_far _CeladonCityPrizeExchangeSignText text_end -CeladonCityText18: - text_far _CeladonCityText18 +CeladonCityGameCornerSignText: + text_far _CeladonCityGameCornerSignText text_end diff --git a/scripts/CeladonDiner.asm b/scripts/CeladonDiner.asm index e95035f061..be4c4579ba 100644 --- a/scripts/CeladonDiner.asm +++ b/scripts/CeladonDiner.asm @@ -2,65 +2,65 @@ CeladonDiner_Script: call EnableAutoTextBoxDrawing ret -CeladonDiner_TextPointers: - dw CeladonDinerText1 - dw CeladonDinerText2 - dw CeladonDinerText3 - dw CeladonDinerText4 - dw CeladonDinerText5 + def_text_pointers CeladonDiner + dw_const CeladonDinerCookText, TEXT_CELADONDINER_COOK + dw_const CeladonDinerMiddleAgedWomanText, TEXT_CELADONDINER_MIDDLE_AGED_WOMAN + dw_const CeladonDinerMiddleAgedManText, TEXT_CELADONDINER_MIDDLE_AGED_MAN + dw_const CeladonDinerFisherText, TEXT_CELADONDINER_FISHER + dw_const CeladonDinerGymGuideText, TEXT_CELADONDINER_GYM_GUIDE -CeladonDinerText1: - text_far _CeladonDinerText1 +CeladonDinerCookText: + text_far _CeladonDinerCookText text_end -CeladonDinerText2: - text_far _CeladonDinerText2 +CeladonDinerMiddleAgedWomanText: + text_far _CeladonDinerMiddleAgedWomanText text_end -CeladonDinerText3: - text_far _CeladonDinerText3 +CeladonDinerMiddleAgedManText: + text_far _CeladonDinerMiddleAgedManText text_end -CeladonDinerText4: - text_far _CeladonDinerText4 +CeladonDinerFisherText: + text_far _CeladonDinerFisherText text_end -CeladonDinerText5: +CeladonDinerGymGuideText: text_asm CheckEvent EVENT_GOT_COIN_CASE jr nz, .got_item - ld hl, CeladonDinerText_491a7 + ld hl, .ImFlatOutBustedText call PrintText lb bc, COIN_CASE, 1 call GiveItem jr nc, .bag_full SetEvent EVENT_GOT_COIN_CASE - ld hl, ReceivedCoinCaseText + ld hl, .ReceivedCoinCaseText call PrintText jr .done .bag_full - ld hl, CoinCaseNoRoomText + ld hl, .CoinCaseNoRoomText call PrintText jr .done .got_item - ld hl, CeladonDinerText_491b7 + ld hl, .WinItBackText call PrintText .done jp TextScriptEnd -CeladonDinerText_491a7: - text_far _CeladonDinerText_491a7 +.ImFlatOutBustedText: + text_far _CeladonDinerGymGuideImFlatOutBustedText text_end -ReceivedCoinCaseText: - text_far _ReceivedCoinCaseText +.ReceivedCoinCaseText: + text_far _CeladonDinerGymGuideReceivedCoinCaseText sound_get_key_item text_end -CoinCaseNoRoomText: - text_far _CoinCaseNoRoomText +.CoinCaseNoRoomText: + text_far _CeladonDinerGymGuideCoinCaseNoRoomText text_end -CeladonDinerText_491b7: - text_far _CeladonDinerText_491b7 +.WinItBackText: + text_far _CeladonDinerGymGuideWinItBackText text_end diff --git a/scripts/CeladonGym.asm b/scripts/CeladonGym.asm index 2ffa1995cb..d0047ddbc6 100644 --- a/scripts/CeladonGym.asm +++ b/scripts/CeladonGym.asm @@ -23,19 +23,19 @@ CeladonGym_Script: db "ERIKA@" CeladonGymResetScripts: - xor a + xor a ; SCRIPT_CELADONGYM_DEFAULT ld [wJoyIgnore], a ld [wCeladonGymCurScript], a ld [wCurMapScript], a ret -CeladonGym_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - dw CeladonGymErikaPostBattle + def_script_pointers CeladonGym + dw_const CheckFightingMapTrainers, SCRIPT_CELADONGYM_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_CELADONGYM_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_CELADONGYM_END_BATTLE + dw_const CeladonGymErikaPostBattleScript, SCRIPT_CELADONGYM_ERIKA_POST_BATTLE -CeladonGymErikaPostBattle: +CeladonGymErikaPostBattleScript: ld a, [wIsInBattle] cp $ff jp z, CeladonGymResetScripts @@ -43,20 +43,20 @@ CeladonGymErikaPostBattle: ld [wJoyIgnore], a CeladonGymReceiveTM21: - ld a, $9 + ld a, TEXT_CELADONGYM_RAINBOWBADGE_INFO ldh [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_BEAT_ERIKA lb bc, TM_MEGA_DRAIN, 1 call GiveItem jr nc, .BagFull - ld a, $a + ld a, TEXT_CELADONGYM_RECEIVED_TM21 ldh [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_GOT_TM21 jr .gymVictory .BagFull - ld a, $b + ld a, TEXT_CELADONGYM_TM21_NO_ROOM ldh [hSpriteIndexOrTextID], a call DisplayTextID .gymVictory @@ -70,18 +70,18 @@ CeladonGymReceiveTM21: jp CeladonGymResetScripts -CeladonGym_TextPointers: - dw ErikaText - dw CeladonGymTrainerText1 - dw CeladonGymTrainerText2 - dw CeladonGymTrainerText3 - dw CeladonGymTrainerText4 - dw CeladonGymTrainerText5 - dw CeladonGymTrainerText6 - dw CeladonGymTrainerText7 - dw ErikaRainbowBadgeInfoText - dw ReceivedTM21Text - dw TM21NoRoomText + def_text_pointers CeladonGym + dw_const CeladonGymErikaText, TEXT_CELADONGYM_ERIKA + dw_const CeladonGymCoolTrainerF1Text, TEXT_CELADONGYM_COOLTRAINER_F1 + dw_const CeladonGymBeauty1Text, TEXT_CELADONGYM_BEAUTY1 + dw_const CeladonGymCoolTrainerF2Text, TEXT_CELADONGYM_COOLTRAINER_F2 + dw_const CeladonGymBeauty2Text, TEXT_CELADONGYM_BEAUTY2 + dw_const CeladonGymCoolTrainerF3Text, TEXT_CELADONGYM_COOLTRAINER_F3 + dw_const CeladonGymBeauty3Text, TEXT_CELADONGYM_BEAUTY3 + dw_const CeladonGymCoolTrainerF4Text, TEXT_CELADONGYM_COOLTRAINER_F4 + dw_const CeladonGymRainbowBadgeInfoText, TEXT_CELADONGYM_RAINBOWBADGE_INFO + dw_const CeladonGymReceivedTM21Text, TEXT_CELADONGYM_RECEIVED_TM21 + dw_const CeladonGymTM21NoRoomText, TEXT_CELADONGYM_TM21_NO_ROOM CeladonGymTrainerHeaders: def_trainers 2 @@ -101,7 +101,7 @@ CeladonGymTrainerHeader6: trainer EVENT_BEAT_CELADON_GYM_TRAINER_6, 3, CeladonGymBattleText8, CeladonGymEndBattleText8, CeladonGymAfterBattleText8 db -1 ; end -ErikaText: +CeladonGymErikaText: text_asm CheckEvent EVENT_BEAT_ERIKA jr z, .beforeBeat @@ -111,17 +111,17 @@ ErikaText: call DisableWaitingAfterTextDisplay jr .done .afterBeat - ld hl, ErikaPostBattleAdviceText + ld hl, .PostBattleAdviceText call PrintText jr .done .beforeBeat - ld hl, ErikaPreBattleText + ld hl, .PreBattleText call PrintText ld hl, wd72d set 6, [hl] set 7, [hl] - ld hl, ReceivedRainbowBadgeText - ld de, ReceivedRainbowBadgeText + ld hl, .ReceivedRainbowBadgeText + ld de, .ReceivedRainbowBadgeText call SaveEndBattleTextPointers ldh a, [hSpriteIndex] ld [wSpriteIndex], a @@ -129,39 +129,39 @@ ErikaText: call InitBattleEnemyParameters ld a, $4 ld [wGymLeaderNo], a - ld a, $3 + ld a, SCRIPT_CELADONGYM_ERIKA_POST_BATTLE ld [wCeladonGymCurScript], a ld [wCurMapScript], a .done jp TextScriptEnd -ErikaPreBattleText: - text_far _ErikaPreBattleText +.PreBattleText: + text_far _CeladonGymErikaPreBattleText text_end -ReceivedRainbowBadgeText: - text_far _ReceivedRainbowBadgeText +.ReceivedRainbowBadgeText: + text_far _CeladonGymErikaReceivedRainbowBadgeText text_end -ErikaPostBattleAdviceText: - text_far _ErikaPostBattleAdviceText +.PostBattleAdviceText: + text_far _CeladonGymErikaPostBattleAdviceText text_end -ErikaRainbowBadgeInfoText: - text_far _ErikaRainbowBadgeInfoText +CeladonGymRainbowBadgeInfoText: + text_far _CeladonGymRainbowBadgeInfoText text_end -ReceivedTM21Text: - text_far _ReceivedTM21Text +CeladonGymReceivedTM21Text: + text_far _CeladonGymReceivedTM21Text sound_get_item_1 text_far _TM21ExplanationText text_end -TM21NoRoomText: - text_far _TM21NoRoomText +CeladonGymTM21NoRoomText: + text_far _CeladonGymTM21NoRoomText text_end -CeladonGymTrainerText1: +CeladonGymCoolTrainerF1Text: text_asm ld hl, CeladonGymTrainerHeader0 call TalkToTrainer @@ -179,7 +179,7 @@ CeladonGymAfterBattleText2: text_far _CeladonGymAfterBattleText2 text_end -CeladonGymTrainerText2: +CeladonGymBeauty1Text: text_asm ld hl, CeladonGymTrainerHeader1 call TalkToTrainer @@ -197,7 +197,7 @@ CeladonGymAfterBattleText3: text_far _CeladonGymAfterBattleText3 text_end -CeladonGymTrainerText3: +CeladonGymCoolTrainerF2Text: text_asm ld hl, CeladonGymTrainerHeader2 call TalkToTrainer @@ -215,7 +215,7 @@ CeladonGymAfterBattleText4: text_far _CeladonGymAfterBattleText4 text_end -CeladonGymTrainerText4: +CeladonGymBeauty2Text: text_asm ld hl, CeladonGymTrainerHeader3 call TalkToTrainer @@ -233,7 +233,7 @@ CeladonGymAfterBattleText5: text_far _CeladonGymAfterBattleText5 text_end -CeladonGymTrainerText5: +CeladonGymCoolTrainerF3Text: text_asm ld hl, CeladonGymTrainerHeader4 call TalkToTrainer @@ -251,7 +251,7 @@ CeladonGymAfterBattleText6: text_far _CeladonGymAfterBattleText6 text_end -CeladonGymTrainerText6: +CeladonGymBeauty3Text: text_asm ld hl, CeladonGymTrainerHeader5 call TalkToTrainer @@ -269,7 +269,7 @@ CeladonGymAfterBattleText7: text_far _CeladonGymAfterBattleText7 text_end -CeladonGymTrainerText7: +CeladonGymCoolTrainerF4Text: text_asm ld hl, CeladonGymTrainerHeader6 call TalkToTrainer diff --git a/scripts/CeladonHotel.asm b/scripts/CeladonHotel.asm index 2cdd95b081..8d9e3a5b3e 100644 --- a/scripts/CeladonHotel.asm +++ b/scripts/CeladonHotel.asm @@ -1,19 +1,19 @@ CeladonHotel_Script: jp EnableAutoTextBoxDrawing -CeladonHotel_TextPointers: - dw CeladonHotelText1 - dw CeladonHotelText2 - dw CeladonHotelText3 + def_text_pointers CeladonHotel + dw_const CeladonHotelGrannyText, TEXT_CELADONHOTEL_GRANNY + dw_const CeladonHotelBeautyText, TEXT_CELADONHOTEL_BEAUTY + dw_const CeladonHotelSuperNerdText, TEXT_CELADONHOTEL_SUPER_NERD -CeladonHotelText1: - text_far _CeladonHotelText1 +CeladonHotelGrannyText: + text_far _CeladonHotelGrannyText text_end -CeladonHotelText2: - text_far _CeladonHotelText2 +CeladonHotelBeautyText: + text_far _CeladonHotelBeautyText text_end -CeladonHotelText3: - text_far _CeladonHotelText3 +CeladonHotelSuperNerdText: + text_far _CeladonHotelSuperNerdText text_end diff --git a/scripts/CeladonMansion1F.asm b/scripts/CeladonMansion1F.asm index fa901ff933..9850531dfa 100644 --- a/scripts/CeladonMansion1F.asm +++ b/scripts/CeladonMansion1F.asm @@ -1,39 +1,39 @@ CeladonMansion1F_Script: jp EnableAutoTextBoxDrawing -CeladonMansion1F_TextPointers: - dw CeladonMansion1Text1 - dw CeladonMansion1Text2 - dw CeladonMansion1Text3 - dw CeladonMansion1Text4 - dw CeladonMansion1Text5 + def_text_pointers CeladonMansion1F + dw_const CeladonMansion1FMeowthText, TEXT_CELADONMANSION_1F_MEOWTH + dw_const CeladonMansion1FGrannyText, TEXT_CELADONMANSION_1F_GRANNY + dw_const CeladonMansion1FClefairyText, TEXT_CELADONMANSION_1F_CLEFAIRY + dw_const CeladonMansion1FNidoranFText, TEXT_CELADONMANSION_1F_NIDORANF + dw_const CeladonMansion1FManagersSuiteSignText, TEXT_CELADONMANSION_1F_MANAGERS_SUITE_SIGN CeladonMansion1_PlayCryScript: call PlayCry jp TextScriptEnd -CeladonMansion1Text1: - text_far _CeladonMansion1Text1 +CeladonMansion1FMeowthText: + text_far _CeladonMansion1FMeowthText text_asm ld a, MEOWTH jp CeladonMansion1_PlayCryScript -CeladonMansion1Text2: - text_far _CeladonMansion1Text2 +CeladonMansion1FGrannyText: + text_far _CeladonMansion1FGrannyText text_end -CeladonMansion1Text3: - text_far _CeladonMansion1Text3 +CeladonMansion1FClefairyText: + text_far _CeladonMansion1FClefairyText text_asm ld a, CLEFAIRY jp CeladonMansion1_PlayCryScript -CeladonMansion1Text4: - text_far _CeladonMansion1Text4 +CeladonMansion1FNidoranFText: + text_far _CeladonMansion1FNidoranFText text_asm ld a, NIDORAN_F jp CeladonMansion1_PlayCryScript -CeladonMansion1Text5: - text_far _CeladonMansion1Text5 +CeladonMansion1FManagersSuiteSignText: + text_far _CeladonMansion1FManagersSuiteSignText text_end diff --git a/scripts/CeladonMansion2F.asm b/scripts/CeladonMansion2F.asm index 8f83e86a7e..1e7fdbfce6 100644 --- a/scripts/CeladonMansion2F.asm +++ b/scripts/CeladonMansion2F.asm @@ -2,9 +2,9 @@ CeladonMansion2F_Script: call EnableAutoTextBoxDrawing ret -CeladonMansion2F_TextPointers: - dw CeladonMansion2Text1 + def_text_pointers CeladonMansion2F + dw_const CeladonMansion2FMeetingRoomSignText, TEXT_CELADONMANSION_2F_MEETING_ROOM_SIGN -CeladonMansion2Text1: - text_far _CeladonMansion2Text1 +CeladonMansion2FMeetingRoomSignText: + text_far _CeladonMansion2FMeetingRoomSignText text_end diff --git a/scripts/CeladonMansion3F.asm b/scripts/CeladonMansion3F.asm index f897279304..c2da6a1eb1 100644 --- a/scripts/CeladonMansion3F.asm +++ b/scripts/CeladonMansion3F.asm @@ -1,29 +1,29 @@ CeladonMansion3F_Script: jp EnableAutoTextBoxDrawing -CeladonMansion3F_TextPointers: - dw ProgrammerText - dw GraphicArtistText - dw WriterText - dw DirectorText - dw GameFreakPCText1 - dw GameFreakPCText2 - dw GameFreakPCText3 - dw GameFreakSignText + def_text_pointers CeladonMansion3F + dw_const CeladonMansion3FProgrammerText, TEXT_CELADONMANSION_3F_PROGRAMMER + dw_const CeladonMansion3FGraphicArtistText, TEXT_CELADONMANSION_3F_GRAPHIC_ARTIST + dw_const CeladonMansion3FWriterText, TEXT_CELADONMANSION_3F_WRITER + dw_const CeladonMansion3FGameDesignerText, TEXT_CELADONMANSION_3F_GAME_DESIGNER + dw_const CeladonMansion3FGameProgramPCText, TEXT_CELADONMANSION_3F_GAME_PROGRAM_PC + dw_const CeladonMansion3FPlayingGamePCText, TEXT_CELADONMANSION_3F_PLAYING_GAME_PC + dw_const CeladonMansion3FGameScriptPCText, TEXT_CELADONMANSION_3F_GAME_SCRIPT_PC + dw_const CeladonMansion3FDevRoomSignText, TEXT_CELADONMANSION_3F_DEV_ROOM_SIGN -ProgrammerText: - text_far _ProgrammerText +CeladonMansion3FProgrammerText: + text_far _CeladonMansion3FProgrammerText text_end -GraphicArtistText: - text_far _GraphicArtistText +CeladonMansion3FGraphicArtistText: + text_far _CeladonMansion3FGraphicArtistText text_end -WriterText: - text_far _WriterText +CeladonMansion3FWriterText: + text_far _CeladonMansion3FWriterText text_end -DirectorText: +CeladonMansion3FGameDesignerText: text_asm ld hl, wPokedexOwned ld b, wPokedexOwnedEnd - wPokedexOwned @@ -31,7 +31,7 @@ DirectorText: ld a, [wNumSetBits] cp NUM_POKEMON - 1 ; discount Mew jr nc, .completed_dex - ld hl, .GameDesignerText + ld hl, .Text jr .done .completed_dex ld hl, .CompletedDexText @@ -39,12 +39,12 @@ DirectorText: call PrintText jp TextScriptEnd -.GameDesignerText: - text_far _GameDesignerText +.Text: + text_far _CeladonMansion3FGameDesignerText text_end .CompletedDexText: - text_far _CompletedDexText + text_far _CeladonMansion3FGameDesignerCompletedDexText text_promptbutton text_asm callfar DisplayDiploma @@ -52,18 +52,18 @@ DirectorText: ld [wDoNotWaitForButtonPressAfterDisplayingText], a jp TextScriptEnd -GameFreakPCText1: - text_far _CeladonMansion3Text5 +CeladonMansion3FGameProgramPCText: + text_far _CeladonMansion3FGameProgramPCText text_end -GameFreakPCText2: - text_far _CeladonMansion3Text6 +CeladonMansion3FPlayingGamePCText: + text_far _CeladonMansion3FPlayingGamePCText text_end -GameFreakPCText3: - text_far _CeladonMansion3Text7 +CeladonMansion3FGameScriptPCText: + text_far _CeladonMansion3FGameScriptPCText text_end -GameFreakSignText: - text_far _CeladonMansion3Text8 +CeladonMansion3FDevRoomSignText: + text_far _CeladonMansion3FDevRoomSignText text_end diff --git a/scripts/CeladonMansionRoof.asm b/scripts/CeladonMansionRoof.asm index 860fcbdf79..bc5308cddd 100644 --- a/scripts/CeladonMansionRoof.asm +++ b/scripts/CeladonMansionRoof.asm @@ -1,9 +1,9 @@ CeladonMansionRoof_Script: jp EnableAutoTextBoxDrawing -CeladonMansionRoof_TextPointers: - dw CeladonMansion4Text1 + def_text_pointers CeladonMansionRoof + dw_const CeladonMansionRoofHouseSignText, TEXT_CELADONMANSION_ROOF_HOUSE_SIGN -CeladonMansion4Text1: - text_far _CeladonMansion4Text1 +CeladonMansionRoofHouseSignText: + text_far _CeladonMansionRoofHouseSignText text_end diff --git a/scripts/CeladonMansionRoofHouse.asm b/scripts/CeladonMansionRoofHouse.asm index bd564dccb3..284e30c471 100644 --- a/scripts/CeladonMansionRoofHouse.asm +++ b/scripts/CeladonMansionRoofHouse.asm @@ -1,15 +1,15 @@ CeladonMansionRoofHouse_Script: jp EnableAutoTextBoxDrawing -CeladonMansionRoofHouse_TextPointers: - dw CeladonMansion5Text1 - dw CeladonMansion5Text2 + def_text_pointers CeladonMansionRoofHouse + dw_const CeladonMansionRoofHouseHikerText, TEXT_CELADONMANSION_ROOF_HOUSE_HIKER + dw_const CeladonMansionRoofHouseEeveePokeballText, TEXT_CELADONMANSION_ROOF_HOUSE_EEVEE_POKEBALL -CeladonMansion5Text1: - text_far _CeladonMansion5Text1 +CeladonMansionRoofHouseHikerText: + text_far _CeladonMansionRoofHouseHikerText text_end -CeladonMansion5Text2: +CeladonMansionRoofHouseEeveePokeballText: text_asm lb bc, EEVEE, 25 call GivePokemon diff --git a/scripts/CeladonMart1F.asm b/scripts/CeladonMart1F.asm index dca3c79675..a5c14b6906 100644 --- a/scripts/CeladonMart1F.asm +++ b/scripts/CeladonMart1F.asm @@ -1,19 +1,19 @@ CeladonMart1F_Script: jp EnableAutoTextBoxDrawing -CeladonMart1F_TextPointers: - dw CeladonMart1Text1 - dw CeladonMart1Text2 - dw CeladonMart1Text3 + def_text_pointers CeladonMart1F + dw_const CeladonMart1FReceptionistText, TEXT_CELADONMART_1F_RECEPTIONIST + dw_const CeladonMart1FDirectorySignText, TEXT_CELADONMART_1F_DIRECTORY_SIGN + dw_const CeladonMart1FCurrentFloorSignText, TEXT_CELADONMART_1F_CURRENT_FLOOR_SIGN -CeladonMart1Text1: - text_far _CeladonMart1Text1 +CeladonMart1FReceptionistText: + text_far _CeladonMart1FReceptionistText text_end -CeladonMart1Text2: - text_far _CeladonMart1Text2 +CeladonMart1FDirectorySignText: + text_far _CeladonMart1FDirectorySignText text_end -CeladonMart1Text3: - text_far _CeladonMart1Text3 +CeladonMart1FCurrentFloorSignText: + text_far _CeladonMart1FCurrentFloorSignText text_end diff --git a/scripts/CeladonMart2F.asm b/scripts/CeladonMart2F.asm index 1182712836..1bf5bfc9c8 100644 --- a/scripts/CeladonMart2F.asm +++ b/scripts/CeladonMart2F.asm @@ -1,21 +1,21 @@ CeladonMart2F_Script: jp EnableAutoTextBoxDrawing -CeladonMart2F_TextPointers: - dw CeladonMart2Clerk1Text - dw CeladonMart2Clerk2Text - dw CeladonMart2Text3 - dw CeladonMart2Text4 - dw CeladonMart2Text5 + def_text_pointers CeladonMart2F + dw_const CeladonMart2FClerk1Text, TEXT_CELADONMART_2F_CLERK1 + dw_const CeladonMart2FClerk2Text, TEXT_CELADONMART_2F_CLERK2 + dw_const CeladonMart2FMiddleAgedManText, TEXT_CELADONMART_2F_MIDDLE_AGED_MAN + dw_const CeladonMart2FGirlText, TEXT_CELADONMART_2F_GIRL + dw_const CeladonMart2FCurrentFloorSignText, TEXT_CELADONMART_2F_CURRENT_FLOOR_SIGN -CeladonMart2Text3: - text_far _CeladonMart2Text3 +CeladonMart2FMiddleAgedManText: + text_far _CeladonMart2FMiddleAgedManText text_end -CeladonMart2Text4: - text_far _CeladonMart2Text4 +CeladonMart2FGirlText: + text_far _CeladonMart2FGirlText text_end -CeladonMart2Text5: - text_far _CeladonMart2Text5 +CeladonMart2FCurrentFloorSignText: + text_far _CeladonMart2FCurrentFloorSignText text_end diff --git a/scripts/CeladonMart3F.asm b/scripts/CeladonMart3F.asm index 5508198235..b5eca3fce3 100644 --- a/scripts/CeladonMart3F.asm +++ b/scripts/CeladonMart3F.asm @@ -1,108 +1,103 @@ CeladonMart3F_Script: jp EnableAutoTextBoxDrawing -CeladonMart3F_TextPointers: - dw CeladonMart3Text1 - dw CeladonMart3Text2 - dw CeladonMart3Text3 - dw CeladonMart3Text4 - dw CeladonMart3Text5 - dw CeladonMart3Text6 - dw CeladonMart3Text7 - dw CeladonMart3Text8 - dw CeladonMart3Text9 - dw CeladonMart3Text10 - dw CeladonMart3Text11 - dw CeladonMart3Text12 - dw CeladonMart3Text13 - dw CeladonMart3Text14 - dw CeladonMart3Text15 - dw CeladonMart3Text16 - dw CeladonMart3Text17 - -CeladonMart3Text1: + def_text_pointers CeladonMart3F + dw_const CeladonMart3FClerkText, TEXT_CELADONMART_3F_CLERK + dw_const CeladonMart3FGameBoyKid1Text, TEXT_CELADONMART_3F_GAMEBOY_KID1 + dw_const CeladonMart3FGameBoyKid2Text, TEXT_CELADONMART_3F_GAMEBOY_KID2 + dw_const CeladonMart3FGameBoyKid3Text, TEXT_CELADONMART_3F_GAMEBOY_KID3 + dw_const CeladonMart3FLittleBoyText, TEXT_CELADONMART_3F_LITTLE_BOY + dw_const CeladonMart3FSNESText, TEXT_CELADONMART_3F_SNES1 + dw_const CeladonMart3FRPGText, TEXT_CELADONMART_3F_RPG + dw_const CeladonMart3FSNESText, TEXT_CELADONMART_3F_SNES2 + dw_const CeladonMart3FSportsGameText, TEXT_CELADONMART_3F_SPORTS_GAME + dw_const CeladonMart3FSNESText, TEXT_CELADONMART_3F_SNES3 + dw_const CeladonMart3FPuzzleGameText, TEXT_CELADONMART_3F_PUZZLE_GAME + dw_const CeladonMart3FSNESText, TEXT_CELADONMART_3F_SNES4 + dw_const CeladonMart3FFightingGameText, TEXT_CELADONMART_3F_FIGHTING_GAME + dw_const CeladonMart3FCurrentFloorSignText, TEXT_CELADONMART_3F_CURRENT_FLOOR_SIGN + dw_const CeladonMart3FPokemonPosterText, TEXT_CELADONMART_3F_POKEMON_POSTER1 + dw_const CeladonMart3FPokemonPosterText, TEXT_CELADONMART_3F_POKEMON_POSTER2 + dw_const CeladonMart3FPokemonPosterText, TEXT_CELADONMART_3F_POKEMON_POSTER3 + +CeladonMart3FClerkText: text_asm CheckEvent EVENT_GOT_TM18 jr nz, .got_item - ld hl, TM18PreReceiveText + ld hl, .TM18PreReceiveText call PrintText lb bc, TM_COUNTER, 1 call GiveItem jr nc, .bag_full SetEvent EVENT_GOT_TM18 - ld hl, ReceivedTM18Text + ld hl, .ReceivedTM18Text jr .done .bag_full - ld hl, TM18NoRoomText + ld hl, .TM18NoRoomText jr .done .got_item - ld hl, TM18ExplanationText + ld hl, .TM18ExplanationText .done call PrintText jp TextScriptEnd -TM18PreReceiveText: - text_far _TM18PreReceiveText +.TM18PreReceiveText: + text_far _CeladonMart3FClerkTM18PreReceiveText text_end -ReceivedTM18Text: - text_far _ReceivedTM18Text +.ReceivedTM18Text: + text_far _CeladonMart3FClerkReceivedTM18Text sound_get_item_1 text_end -TM18ExplanationText: - text_far _TM18ExplanationText +.TM18ExplanationText: + text_far _CeladonMart3FClerkTM18ExplanationText text_end -TM18NoRoomText: - text_far _TM18NoRoomText +.TM18NoRoomText: + text_far _CeladonMart3FClerkTM18NoRoomText text_end -CeladonMart3Text2: - text_far _CeladonMart3Text2 +CeladonMart3FGameBoyKid1Text: + text_far _CeladonMart3FGameBoyKid1Text text_end -CeladonMart3Text3: - text_far _CeladonMart3Text3 +CeladonMart3FGameBoyKid2Text: + text_far _CeladonMart3FGameBoyKid2Text text_end -CeladonMart3Text4: - text_far _CeladonMart3Text4 +CeladonMart3FGameBoyKid3Text: + text_far _CeladonMart3FGameBoyKid3Text text_end -CeladonMart3Text5: - text_far _CeladonMart3Text5 +CeladonMart3FLittleBoyText: + text_far _CeladonMart3FLittleBoyText text_end -CeladonMart3Text12: -CeladonMart3Text10: -CeladonMart3Text8: -CeladonMart3Text6: - text_far _CeladonMart3Text6 +CeladonMart3FSNESText: + text_far _CeladonMart3FSNESText text_end -CeladonMart3Text7: - text_far _CeladonMart3Text7 +CeladonMart3FRPGText: + text_far _CeladonMart3FRPGText text_end -CeladonMart3Text9: - text_far _CeladonMart3Text9 +CeladonMart3FSportsGameText: + text_far _CeladonMart3FSportsGameText text_end -CeladonMart3Text11: - text_far _CeladonMart3Text11 +CeladonMart3FPuzzleGameText: + text_far _CeladonMart3FPuzzleGameText text_end -CeladonMart3Text13: - text_far _CeladonMart3Text13 +CeladonMart3FFightingGameText: + text_far _CeladonMart3FFightingGameText text_end -CeladonMart3Text14: - text_far _CeladonMart3Text14 +CeladonMart3FCurrentFloorSignText: + text_far _CeladonMart3FCurrentFloorSignText text_end -CeladonMart3Text17: -CeladonMart3Text16: -CeladonMart3Text15: - text_far _CeladonMart3Text15 +CeladonMart3FPokemonPosterText: + text_far _CeladonMart3FPokemonPosterText text_end diff --git a/scripts/CeladonMart4F.asm b/scripts/CeladonMart4F.asm index 1365dd0d41..bcecfb557b 100644 --- a/scripts/CeladonMart4F.asm +++ b/scripts/CeladonMart4F.asm @@ -1,20 +1,20 @@ CeladonMart4F_Script: jp EnableAutoTextBoxDrawing -CeladonMart4F_TextPointers: - dw CeladonMart4ClerkText - dw CeladonMart4Text2 - dw CeladonMart4Text3 - dw CeladonMart4Text4 + def_text_pointers CeladonMart4F + dw_const CeladonMart4FClerkText, TEXT_CELADONMART_4F_CLERK + dw_const CeladonMart4FSuperNerdText, TEXT_CELADONMART_4F_SUPER_NERD + dw_const CeladonMart4FYoungsterText, TEXT_CELADONMART_4F_YOUNGSTER + dw_const CeladonMart4FCurrentFloorSignText, TEXT_CELADONMART_4F_CURRENT_FLOOR_SIGN -CeladonMart4Text2: - text_far _CeladonMart4Text2 +CeladonMart4FSuperNerdText: + text_far _CeladonMart4FSuperNerdText text_end -CeladonMart4Text3: - text_far _CeladonMart4Text3 +CeladonMart4FYoungsterText: + text_far _CeladonMart4FYoungsterText text_end -CeladonMart4Text4: - text_far _CeladonMart4Text4 +CeladonMart4FCurrentFloorSignText: + text_far _CeladonMart4FCurrentFloorSignText text_end diff --git a/scripts/CeladonMart5F.asm b/scripts/CeladonMart5F.asm index 91748706f8..0bfaa8983c 100644 --- a/scripts/CeladonMart5F.asm +++ b/scripts/CeladonMart5F.asm @@ -1,21 +1,21 @@ CeladonMart5F_Script: jp EnableAutoTextBoxDrawing -CeladonMart5F_TextPointers: - dw CeladonMart5Text1 - dw CeladonMart5Text2 - dw CeladonMart5Clerk1Text - dw CeladonMart5Clerk2Text - dw CeladonMart5Text5 + def_text_pointers CeladonMart5F + dw_const CeladonMart5FGentlemanText, TEXT_CELADONMART_5F_GENTLEMAN + dw_const CeladonMart5FSailorText, TEXT_CELADONMART_5F_SAILOR + dw_const CeladonMart5FClerk1Text, TEXT_CELADONMART_5F_CLERK1 + dw_const CeladonMart5FClerk2Text, TEXT_CELADONMART_5F_CLERK2 + dw_const CeladonMart5FCurrentFloorSignText, TEXT_CELADONMART_5F_CURRENT_FLOOR_SIGN -CeladonMart5Text1: - text_far _CeladonMart5Text1 +CeladonMart5FGentlemanText: + text_far _CeladonMart5FGentlemanText text_end -CeladonMart5Text2: - text_far _CeladonMart5Text2 +CeladonMart5FSailorText: + text_far _CeladonMart5FSailorText text_end -CeladonMart5Text5: - text_far _CeladonMart5Text5 +CeladonMart5FCurrentFloorSignText: + text_far _CeladonMart5FCurrentFloorSignText text_end diff --git a/scripts/CeladonMartElevator.asm b/scripts/CeladonMartElevator.asm index b657b3f9c3..7918bff2a9 100644 --- a/scripts/CeladonMartElevator.asm +++ b/scripts/CeladonMartElevator.asm @@ -61,10 +61,10 @@ CeladonMartElevatorWarpMapsEnd: CeladonMartElevatorScript_48654: farjp ShakeElevator -CeladonMartElevator_TextPointers: - dw CeladonMartElevatorText1 + def_text_pointers CeladonMartElevator + dw_const CeladonMartElevatorText, TEXT_CELADONMART_ELEVARTOR -CeladonMartElevatorText1: +CeladonMartElevatorText: text_asm call CeladonMartElevatorScript_48631 ld hl, CeladonMartElevatorWarpMaps diff --git a/scripts/CeladonMartRoof.asm b/scripts/CeladonMartRoof.asm index 37b8671efb..81a3427073 100644 --- a/scripts/CeladonMartRoof.asm +++ b/scripts/CeladonMartRoof.asm @@ -205,19 +205,19 @@ CeladonMartRoofScript_PrintDrinksInBag: pop hl jr .loop -CeladonMartRoof_TextPointers: - dw CeladonMartRoofText1 - dw CeladonMartRoofText2 - dw CeladonMartRoofText5 - dw CeladonMartRoofText5 - dw CeladonMartRoofText5 - dw CeladonMartRoofText6 - -CeladonMartRoofText1: - text_far _CeladonMartRoofText1 + def_text_pointers CeladonMartRoof + dw_const CeladonMartRoofSuperNerdText, TEXT_CELADONMART_ROOF_SUPER_NERD + dw_const CeladonMartRoofLittleGirlText, TEXT_CELADONMART_ROOF_LITTLE_GIRL + dw_const CeladonMartRoofVendingMachineText, TEXT_CELADONMART_ROOF_VENDING_MACHINE1 + dw_const CeladonMartRoofVendingMachineText, TEXT_CELADONMART_ROOF_VENDING_MACHINE2 + dw_const CeladonMartRoofVendingMachineText, TEXT_CELADONMART_ROOF_VENDING_MACHINE3 + dw_const CeladonMartRoofCurrentFloorSignText, TEXT_CELADONMART_ROOF_CURRENT_FLOOR_SIGN + +CeladonMartRoofSuperNerdText: + text_far _CeladonMartRoofSuperNerdText text_end -CeladonMartRoofText2: +CeladonMartRoofLittleGirlText: text_asm call CeladonMartRoofScript_GetDrinksInBag ld a, [wFilteredBagItemsCount] @@ -225,7 +225,7 @@ CeladonMartRoofText2: jr z, .noDrinksInBag ld a, 1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, CeladonMartRoofText4 + ld hl, .GiveHerADrinkText call PrintText call YesNoChoice ld a, [wCurrentMenuItem] @@ -234,22 +234,22 @@ CeladonMartRoofText2: call CeladonMartRoofScript_GiveDrinkToGirl jr .done .noDrinksInBag - ld hl, CeladonMartRoofText3 + ld hl, .ImThirstyText call PrintText .done jp TextScriptEnd -CeladonMartRoofText3: - text_far _CeladonMartRoofText_48598 +.ImThirstyText: + text_far _CeladonMartRoofLittleGirlImThirstyText text_end -CeladonMartRoofText4: - text_far _CeladonMartRoofText4 +.GiveHerADrinkText: + text_far _CeladonMartRoofLittleGirlGiveHerADrinkText text_end -CeladonMartRoofText5: +CeladonMartRoofVendingMachineText: script_vending_machine -CeladonMartRoofText6: - text_far _CeladonMartRoofText6 +CeladonMartRoofCurrentFloorSignText: + text_far _CeladonMartRoofCurrentFloorSignText text_end diff --git a/scripts/CeladonPokecenter.asm b/scripts/CeladonPokecenter.asm index 0f28e1b2de..62a38766c2 100644 --- a/scripts/CeladonPokecenter.asm +++ b/scripts/CeladonPokecenter.asm @@ -2,22 +2,22 @@ CeladonPokecenter_Script: call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing -CeladonPokecenter_TextPointers: - dw CeladonHealNurseText - dw CeladonPokecenterText2 - dw CeladonPokecenterText3 - dw CeladonTradeNurseText + def_text_pointers CeladonPokecenter + dw_const CeladonPokecenterNurseText, TEXT_CELADONPOKECENTER_NURSE + dw_const CeladonPokecenterGentlemanText, TEXT_CELADONPOKECENTER_GENTLEMAN + dw_const CeladonPokecenterBeautyText, TEXT_CELADONPOKECENTER_BEAUTY + dw_const CeladonPokecenterLinkReceptionistText, TEXT_CELADONPOKECENTER_LINK_RECEPTIONIST -CeladonTradeNurseText: +CeladonPokecenterLinkReceptionistText: script_cable_club_receptionist -CeladonHealNurseText: +CeladonPokecenterNurseText: script_pokecenter_nurse -CeladonPokecenterText2: - text_far _CeladonPokecenterText2 +CeladonPokecenterGentlemanText: + text_far _CeladonPokecenterGentlemanText text_end -CeladonPokecenterText3: - text_far _CeladonPokecenterText3 +CeladonPokecenterBeautyText: + text_far _CeladonPokecenterBeautyText text_end diff --git a/scripts/CeruleanBadgeHouse.asm b/scripts/CeruleanBadgeHouse.asm index 5e35b0797f..4c0c8b6d2e 100644 --- a/scripts/CeruleanBadgeHouse.asm +++ b/scripts/CeruleanBadgeHouse.asm @@ -5,20 +5,20 @@ CeruleanBadgeHouse_Script: ld [wDoNotWaitForButtonPressAfterDisplayingText], a ret -CeruleanBadgeHouse_TextPointers: - dw CeruleanHouse2Text1 + def_text_pointers CeruleanBadgeHouse + dw_const CeruleanBadgeHouseMiddleAgedManText, TEXT_CERULEANBADGEHOUSE_MIDDLE_AGED_MAN -CeruleanHouse2Text1: +CeruleanBadgeHouseMiddleAgedManText: text_asm - ld hl, CeruleanHouse2Text_74e77 + ld hl, .Text call PrintText xor a ld [wCurrentMenuItem], a ld [wListScrollOffset], a .asm_74e23 - ld hl, CeruleanHouse2Text_74e7c + ld hl, .WhichBadgeText call PrintText - ld hl, BadgeItemList + ld hl, .BadgeItemList call LoadItemList ld hl, wItemList ld a, l @@ -47,11 +47,11 @@ CeruleanHouse2Text1: .asm_74e60 xor a ld [wListScrollOffset], a - ld hl, CeruleanHouse2Text_74e81 + ld hl, .VisitAnyTimeText call PrintText jp TextScriptEnd -BadgeItemList: +.BadgeItemList: db 8 ; # db BOULDERBADGE db CASCADEBADGE @@ -63,56 +63,56 @@ BadgeItemList: db EARTHBADGE db -1 ; end -CeruleanHouse2Text_74e77: - text_far _CeruleanHouse2Text_74e77 +.Text: + text_far _CeruleanBadgeHouseMiddleAgedManText text_end -CeruleanHouse2Text_74e7c: - text_far _CeruleanHouse2Text_74e7c +.WhichBadgeText: + text_far _CeruleanBadgeHouseMiddleAgedManWhichBadgeText text_end -CeruleanHouse2Text_74e81: - text_far _CeruleanHouse2Text_74e81 +.VisitAnyTimeText: + text_far _CeruleanBadgeHouseMiddleAgedManVisitAnyTimeText text_end TextPointers_74e86: - dw CeruleanHouse2Text_74e96 - dw CeruleanHouse2Text_74e9b - dw CeruleanHouse2Text_74ea0 - dw CeruleanHouse2Text_74ea5 - dw CeruleanHouse2Text_74eaa - dw CeruleanHouse2Text_74eaf - dw CeruleanHouse2Text_74eb4 - dw CeruleanHouse2Text_74eb9 + dw CeruleanBadgeHouseBoulderBadgeText + dw CeruleanBadgeHouseCascadeBadgeText + dw CeruleanBadgeHouseThunderBadgeText + dw CeruleanBadgeHouseRainbowBadgeText + dw CeruleanBadgeHouseSoulBadgeText + dw CeruleanBadgeHouseMarshBadgeText + dw CeruleanBadgeHouseVolcanoBadgeText + dw CeruleanBadgeHouseEarthBadgeText -CeruleanHouse2Text_74e96: - text_far _CeruleanHouse2Text_74e96 +CeruleanBadgeHouseBoulderBadgeText: + text_far _CeruleanBadgeHouseBoulderBadgeText text_end -CeruleanHouse2Text_74e9b: - text_far _CeruleanHouse2Text_74e9b +CeruleanBadgeHouseCascadeBadgeText: + text_far _CeruleanBadgeHouseCascadeBadgeText text_end -CeruleanHouse2Text_74ea0: - text_far _CeruleanHouse2Text_74ea0 +CeruleanBadgeHouseThunderBadgeText: + text_far _CeruleanBadgeHouseThunderBadgeText text_end -CeruleanHouse2Text_74ea5: - text_far _CeruleanHouse2Text_74ea5 +CeruleanBadgeHouseRainbowBadgeText: + text_far _CeruleanBadgeHouseRainbowBadgeText text_end -CeruleanHouse2Text_74eaa: - text_far _CeruleanHouse2Text_74eaa +CeruleanBadgeHouseSoulBadgeText: + text_far _CeruleanBadgeHouseSoulBadgeText text_end -CeruleanHouse2Text_74eaf: - text_far _CeruleanHouse2Text_74eaf +CeruleanBadgeHouseMarshBadgeText: + text_far _CeruleanBadgeHouseMarshBadgeText text_end -CeruleanHouse2Text_74eb4: - text_far _CeruleanHouse2Text_74eb4 +CeruleanBadgeHouseVolcanoBadgeText: + text_far _CeruleanBadgeHouseVolcanoBadgeText text_end -CeruleanHouse2Text_74eb9: - text_far _CeruleanHouse2Text_74eb9 +CeruleanBadgeHouseEarthBadgeText: + text_far _CeruleanBadgeHouseEarthBadgeText text_end diff --git a/scripts/CeruleanCave1F.asm b/scripts/CeruleanCave1F.asm index 6f5c7b1354..dceed136e5 100644 --- a/scripts/CeruleanCave1F.asm +++ b/scripts/CeruleanCave1F.asm @@ -1,7 +1,7 @@ CeruleanCave1F_Script: jp EnableAutoTextBoxDrawing -CeruleanCave1F_TextPointers: - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText + def_text_pointers CeruleanCave1F + dw_const PickUpItemText, TEXT_CERULEANCAVE1F_FULL_RESTORE + dw_const PickUpItemText, TEXT_CERULEANCAVE_1F_MAX_ELIXER + dw_const PickUpItemText, TEXT_CERULEANCAVE_1F_NUGGET diff --git a/scripts/CeruleanCave2F.asm b/scripts/CeruleanCave2F.asm index 1bc8457b66..83a5c11e97 100644 --- a/scripts/CeruleanCave2F.asm +++ b/scripts/CeruleanCave2F.asm @@ -1,7 +1,7 @@ CeruleanCave2F_Script: jp EnableAutoTextBoxDrawing -CeruleanCave2F_TextPointers: - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText + def_text_pointers CeruleanCave2F + dw_const PickUpItemText, TEXT_CERULEANCAVE_2F_PP_UP + dw_const PickUpItemText, TEXT_CERULEANCAVE_2F_ULTRA_BALL + dw_const PickUpItemText, TEXT_CERULEANCAVE_2F_FULL_RESTORE diff --git a/scripts/CeruleanCaveB1F.asm b/scripts/CeruleanCaveB1F.asm index 0c0ce76655..2eede6e684 100644 --- a/scripts/CeruleanCaveB1F.asm +++ b/scripts/CeruleanCaveB1F.asm @@ -7,15 +7,15 @@ CeruleanCaveB1F_Script: ld [wCeruleanCaveB1FCurScript], a ret -CeruleanCaveB1F_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers CeruleanCaveB1F + dw_const CheckFightingMapTrainers, SCRIPT_CERULEANCAVE_B1F_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_CERULEANCAVE_B1F_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_CERULEANCAVE_B1F_END_BATTLE -CeruleanCaveB1F_TextPointers: - dw MewtwoText - dw PickUpItemText - dw PickUpItemText + def_text_pointers CeruleanCaveB1F + dw_const CeruleanCaveB1FMewtwoText, TEXT_CERULEANCAVE_B1F_MEWTWO + dw_const PickUpItemText, TEXT_CERULEANCAVE_B1F_ULTRA_BALL + dw_const PickUpItemText, TEXT_CERULEANCAVE_B1F_MAX_REVIVE CeruleanCaveB1FTrainerHeaders: def_trainers @@ -23,7 +23,7 @@ MewtwoTrainerHeader: trainer EVENT_BEAT_MEWTWO, 0, MewtwoBattleText, MewtwoBattleText, MewtwoBattleText db -1 ; end -MewtwoText: +CeruleanCaveB1FMewtwoText: text_asm ld hl, MewtwoTrainerHeader call TalkToTrainer diff --git a/scripts/CeruleanCity.asm b/scripts/CeruleanCity.asm index ae4350cd2f..971b49fe58 100644 --- a/scripts/CeruleanCity.asm +++ b/scripts/CeruleanCity.asm @@ -5,36 +5,36 @@ CeruleanCity_Script: jp CallFunctionInTable CeruleanCityScript_1948c: - xor a + xor a ; SCRIPT_CERULEANCITY_DEFAULT ld [wJoyIgnore], a ld [wCeruleanCityCurScript], a ld a, HS_CERULEAN_RIVAL ld [wMissableObjectIndex], a predef_jump HideObject -CeruleanCity_ScriptPointers: - dw CeruleanCityScript0 - dw CeruleanCityScript1 - dw CeruleanCityScript2 - dw CeruleanCityScript3 - dw CeruleanCityScript4 + def_script_pointers CeruleanCity + dw_const CeruleanCityDefaultScript, SCRIPT_CERULEANCITY_DEFAULT + dw_const CeruleanCityRivalBattleScript, SCRIPT_CERULEANCITY_RIVAL_BATTLE + dw_const CeruleanCityRivalDefeatedScript, SCRIPT_CERULEANCITY_RIVAL_DEFEATED + dw_const CeruleanCityRivalCleanupScript, SCRIPT_CERULEANCITY_RIVAL_CLEANUP + dw_const CeruleanCityRocketDefeatedScript, SCRIPT_CERULEANCITY_ROCKET_DEFEATED -CeruleanCityScript4: +CeruleanCityRocketDefeatedScript: ld a, [wIsInBattle] cp $ff jp z, CeruleanCityScript_1948c ld a, $f0 ld [wJoyIgnore], a SetEvent EVENT_BEAT_CERULEAN_ROCKET_THIEF - ld a, $2 + ld a, TEXT_CERULEANCITY_ROCKET ldh [hSpriteIndexOrTextID], a call DisplayTextID - xor a + xor a ; SCRIPT_CERULEANCITY_DEFAULT ld [wJoyIgnore], a ld [wCeruleanCityCurScript], a ret -CeruleanCityScript0: +CeruleanCityDefaultScript: IF DEF(_DEBUG) call DebugPressedOrHeldB ret nz @@ -56,7 +56,7 @@ ENDC ld a, b ld [wSprite02StateData1FacingDirection], a call Delay3 - ld a, $2 + ld a, TEXT_CERULEANCITY_ROCKET ldh [hSpriteIndexOrTextID], a jp DisplayTextID .skipRocketThiefEncounter @@ -82,7 +82,7 @@ ENDC ld a, [wXCoord] cp 20 ; is the player standing on the right side of the bridge? jr z, .playerOnRightSideOfBridge - ld a, $1 + ld a, CERULEANCITY_RIVAL ldh [hSpriteIndex], a ld a, SPRITESTATEDATA2_MAPX ldh [hSpriteDataOffset], a @@ -93,10 +93,10 @@ ENDC ld [wMissableObjectIndex], a predef ShowObject ld de, CeruleanCityMovement1 - ld a, $1 + ld a, CERULEANCITY_RIVAL ldh [hSpriteIndex], a call MoveSprite - ld a, $1 + ld a, SCRIPT_CERULEANCITY_RIVAL_BATTLE ld [wCeruleanCityCurScript], a ret @@ -117,26 +117,26 @@ CeruleanCityMovement1: db -1 ; end CeruleanCityScript_1955d: - ld a, 1 + ld a, CERULEANCITY_RIVAL ldh [hSpriteIndex], a xor a ; SPRITE_FACING_DOWN ldh [hSpriteFacingDirection], a jp SetSpriteFacingDirectionAndDelay ; face object -CeruleanCityScript1: +CeruleanCityRivalBattleScript: ld a, [wd730] bit 0, a ret nz xor a ld [wJoyIgnore], a - ld a, $1 + ld a, TEXT_CERULEANCITY_RIVAL ldh [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd72d set 6, [hl] set 7, [hl] - ld hl, CeruleanCityText_1966d - ld de, CeruleanCityText_19672 + ld hl, CeruleanCityRivalDefeatedText + ld de, CeruleanCityRivalVictoryText call SaveEndBattleTextPointers ld a, OPP_RIVAL1 ld [wCurOpponent], a @@ -160,11 +160,11 @@ CeruleanCityScript1: xor a ldh [hJoyHeld], a call CeruleanCityScript_1955d - ld a, $2 + ld a, SCRIPT_CERULEANCITY_RIVAL_DEFEATED ld [wCeruleanCityCurScript], a ret -CeruleanCityScript2: +CeruleanCityRivalDefeatedScript: ld a, [wIsInBattle] cp $ff jp z, CeruleanCityScript_1948c @@ -172,14 +172,14 @@ CeruleanCityScript2: ld a, $f0 ld [wJoyIgnore], a SetEvent EVENT_BEAT_CERULEAN_RIVAL - ld a, $1 + ld a, TEXT_CERULEANCITY_RIVAL ldh [hSpriteIndexOrTextID], a call DisplayTextID ld a, SFX_STOP_ALL_MUSIC ld [wNewSoundID], a call PlaySound farcall Music_RivalAlternateStart - ld a, $1 + ld a, CERULEANCITY_RIVAL ldh [hSpriteIndex], a call SetSpriteMovementBytesToFF ld a, [wXCoord] @@ -190,10 +190,10 @@ CeruleanCityScript2: .playerOnRightSideOfBridge ld de, CeruleanCityMovement3 .skip - ld a, $1 + ld a, CERULEANCITY_RIVAL ldh [hSpriteIndex], a call MoveSprite - ld a, $3 + ld a, SCRIPT_CERULEANCITY_RIVAL_CLEANUP ld [wCeruleanCityCurScript], a ret @@ -217,7 +217,7 @@ CeruleanCityMovement4: db NPC_MOVEMENT_DOWN db -1 ; end -CeruleanCityScript3: +CeruleanCityRivalCleanupScript: ld a, [wd730] bit 0, a ret nz @@ -231,229 +231,228 @@ CeruleanCityScript3: ld [wCeruleanCityCurScript], a ret -CeruleanCity_TextPointers: - dw CeruleanCityText1 - dw CeruleanCityText2 - dw CeruleanCityText3 - dw CeruleanCityText4 - dw CeruleanCityText5 - dw CeruleanCityText6 - dw CeruleanCityText7 - dw CeruleanCityText8 - dw CeruleanCityText9 - dw CeruleanCityText10 - dw CeruleanCityText11 - dw CeruleanCityText12 - dw CeruleanCityText13 - dw MartSignText - dw PokeCenterSignText - dw CeruleanCityText16 - dw CeruleanCityText17 - -CeruleanCityText1: + def_text_pointers CeruleanCity + dw_const CeruleanCityRivalText, TEXT_CERULEANCITY_RIVAL + dw_const CeruleanCityRocketText, TEXT_CERULEANCITY_ROCKET + dw_const CeruleanCityCooltrainerMText, TEXT_CERULEANCITY_COOLTRAINER_M + dw_const CeruleanCitySuperNerd1Text, TEXT_CERULEANCITY_SUPER_NERD1 + dw_const CeruleanCitySuperNerd2Text, TEXT_CERULEANCITY_SUPER_NERD2 + dw_const CeruleanCityGuardText, TEXT_CERULEANCITY_GUARD_MOVED + dw_const CeruleanCityCooltrainerF1Text, TEXT_CERULEANCITY_COOLTRAINER_F1 + dw_const CeruleanCitySlowbroText, TEXT_CERULEANCITY_SLOWBRO + dw_const CeruleanCityCooltrainerF2Text, TEXT_CERULEANCITY_COOLTRAINER_F2 + dw_const CeruleanCitySuperNerd3Text, TEXT_CERULEANCITY_SUPER_NERD3 + dw_const CeruleanCityGuardText, TEXT_CERULEANCITY_GUARD_BLOCKING + dw_const CeruleanCitySignText, TEXT_CERULEANCITY_SIGN + dw_const CeruleanCityTrainerTipsText, TEXT_CERULEANCITY_TRAINER_TIPS + dw_const MartSignText, TEXT_CERULEANCITY_MART_SIGN + dw_const PokeCenterSignText, TEXT_CERULEANCITY_POKECENTER_SIGN + dw_const CeruleanCityBikeShopSign, TEXT_CERULEANCITY_BIKESHOP_SIGN + dw_const CeruleanCityGymSign, TEXT_CERULEANCITY_GYM_SIGN + +CeruleanCityRivalText: text_asm CheckEvent EVENT_BEAT_CERULEAN_RIVAL ; do pre-battle text - jr z, .PreBattleText + jr z, .PreBattle ; or talk about bill - ld hl, CeruleanCityText_19677 + ld hl, CeruleanCityRivalIWentToBillsText call PrintText jr .end -.PreBattleText - ld hl, CeruleanCityText_19668 +.PreBattle + ld hl, .PreBattleText call PrintText .end jp TextScriptEnd -CeruleanCityText_19668: - text_far _CeruleanCityText_19668 +.PreBattleText: + text_far _CeruleanCityRivalPreBattleText text_end -CeruleanCityText_1966d: - text_far _CeruleanCityText_1966d +CeruleanCityRivalDefeatedText: + text_far _CeruleanCityRivalDefeatedText text_end -CeruleanCityText_19672: - text_far _CeruleanCityText_19672 +CeruleanCityRivalVictoryText: + text_far _CeruleanCityRivalVictoryText text_end -CeruleanCityText_19677: - text_far _CeruleanCityText_19677 +CeruleanCityRivalIWentToBillsText: + text_far _CeruleanCityRivalIWentToBillsText text_end -CeruleanCityText2: +CeruleanCityRocketText: text_asm CheckEvent EVENT_BEAT_CERULEAN_ROCKET_THIEF jr nz, .beatRocketThief - ld hl, CeruleanCityText_196d9 + ld hl, .Text call PrintText ld hl, wd72d set 6, [hl] set 7, [hl] - ld hl, CeruleanCityText_196ee - ld de, CeruleanCityText_196ee + ld hl, .IGiveUpText + ld de, .IGiveUpText call SaveEndBattleTextPointers ldh a, [hSpriteIndexOrTextID] ld [wSpriteIndex], a call EngageMapTrainer call InitBattleEnemyParameters - ld a, $4 + ld a, SCRIPT_CERULEANCITY_ROCKET_DEFEATED ld [wCeruleanCityCurScript], a jp TextScriptEnd .beatRocketThief - ld hl, CeruleanCityText_196f3 + ld hl, .IllReturnTheTMText call PrintText lb bc, TM_DIG, 1 call GiveItem jr c, .Success - ld hl, TM28NoRoomText + ld hl, .TM28NoRoomText call PrintText jr .Done .Success ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, ReceivedTM28Text + ld hl, .ReceivedTM28Text call PrintText farcall CeruleanHideRocket .Done jp TextScriptEnd -CeruleanCityText_196d9: - text_far _CeruleanCityText_196d9 +.Text: + text_far _CeruleanCityRocketText text_end -ReceivedTM28Text: - text_far _ReceivedTM28Text +.ReceivedTM28Text: + text_far _CeruleanCityRocketReceivedTM28Text sound_get_item_1 - text_far _ReceivedTM28Text2 + text_far _CeruleanCityRocketIBetterGetMovingText text_waitbutton text_end -TM28NoRoomText: - text_far _TM28NoRoomText +.TM28NoRoomText: + text_far _CeruleanCityRocketTM28NoRoomText text_end -CeruleanCityText_196ee: - text_far _CeruleanCityText_196ee +.IGiveUpText: + text_far _CeruleanCityRocketIGiveUpText text_end -CeruleanCityText_196f3: - text_far _CeruleanCityText_196f3 +.IllReturnTheTMText: + text_far _CeruleanCityRocketIllReturnTheTMText text_end -CeruleanCityText3: - text_far _CeruleanCityText3 +CeruleanCityCooltrainerMText: + text_far _CeruleanCityCooltrainerMText text_end -CeruleanCityText4: - text_far _CeruleanCityText4 +CeruleanCitySuperNerd1Text: + text_far _CeruleanCitySuperNerd1Text text_end -CeruleanCityText5: - text_far _CeruleanCityText5 +CeruleanCitySuperNerd2Text: + text_far _CeruleanCitySuperNerd2Text text_end -CeruleanCityText11: -CeruleanCityText6: - text_far _CeruleanCityText6 +CeruleanCityGuardText: + text_far _CeruleanCityGuardText text_end -CeruleanCityText7: +CeruleanCityCooltrainerF1Text: text_asm ldh a, [hRandomAdd] cp 180 ; 76/256 chance of 1st dialogue jr c, .notFirstText - ld hl, CeruleanCityText_19730 + ld hl, .SlowbroUseSonicboomText call PrintText jr .end .notFirstText cp 100 ; 80/256 chance of 2nd dialogue jr c, .notSecondText - ld hl, CeruleanCityText_19735 + ld hl, .SlowbroPunchText call PrintText jr .end .notSecondText ; 100/256 chance of 3rd dialogue - ld hl, CeruleanCityText_1973a + ld hl, .SlowbroWithdrawText call PrintText .end jp TextScriptEnd -CeruleanCityText_19730: - text_far _CeruleanCityText_19730 +.SlowbroUseSonicboomText: + text_far _CeruleanCityCooltrainerF1SlowbroUseSonicboomText text_end -CeruleanCityText_19735: - text_far _CeruleanCityText_19735 +.SlowbroPunchText: + text_far _CeruleanCityCooltrainerF1SlowbroPunchText text_end -CeruleanCityText_1973a: - text_far _CeruleanCityText_1973a +.SlowbroWithdrawText: + text_far _CeruleanCityCooltrainerF1SlowbroWithdrawText text_end -CeruleanCityText8: +CeruleanCitySlowbroText: text_asm ldh a, [hRandomAdd] cp 180 ; 76/256 chance of 1st dialogue jr c, .notFirstText - ld hl, CeruleanCityText_1976f + ld hl, .TookASnoozeText call PrintText jr .end .notFirstText cp 120 ; 60/256 chance of 2nd dialogue jr c, .notSecondText - ld hl, CeruleanCityText_19774 + ld hl, .IsLoafingAroundText call PrintText jr .end .notSecondText cp 60 ; 60/256 chance of 3rd dialogue jr c, .notThirdText - ld hl, CeruleanCityText_19779 + ld hl, .TurnedAwayText call PrintText jr .end .notThirdText ; 60/256 chance of 4th dialogue - ld hl, CeruleanCityText_1977e + ld hl, .IgnoredOrdersText call PrintText .end jp TextScriptEnd -CeruleanCityText_1976f: - text_far _CeruleanCityText_1976f +.TookASnoozeText: + text_far _CeruleanCitySlowbroTookASnoozeText text_end -CeruleanCityText_19774: - text_far _CeruleanCityText_19774 +.IsLoafingAroundText: + text_far _CeruleanCitySlowbroIsLoafingAroundText text_end -CeruleanCityText_19779: - text_far _CeruleanCityText_19779 +.TurnedAwayText: + text_far _CeruleanCitySlowbroTurnedAwayText text_end -CeruleanCityText_1977e: - text_far _CeruleanCityText_1977e +.IgnoredOrdersText: + text_far _CeruleanCitySlowbroIgnoredOrdersText text_end -CeruleanCityText9: - text_far _CeruleanCityText9 +CeruleanCityCooltrainerF2Text: + text_far _CeruleanCityCooltrainerF2Text text_end -CeruleanCityText10: - text_far _CeruleanCityText10 +CeruleanCitySuperNerd3Text: + text_far _CeruleanCitySuperNerd3Text text_end -CeruleanCityText12: - text_far _CeruleanCityText12 +CeruleanCitySignText: + text_far _CeruleanCitySignText text_end -CeruleanCityText13: - text_far _CeruleanCityText13 +CeruleanCityTrainerTipsText: + text_far _CeruleanCityTrainerTipsText text_end -CeruleanCityText16: - text_far _CeruleanCityText16 +CeruleanCityBikeShopSign: + text_far _CeruleanCityBikeShopSign text_end -CeruleanCityText17: - text_far _CeruleanCityText17 +CeruleanCityGymSign: + text_far _CeruleanCityGymSign text_end diff --git a/scripts/CeruleanGym.asm b/scripts/CeruleanGym.asm index 798716e3de..7d35a31540 100644 --- a/scripts/CeruleanGym.asm +++ b/scripts/CeruleanGym.asm @@ -23,19 +23,19 @@ CeruleanGym_Script: db "MISTY@" CeruleanGymResetScripts: - xor a + xor a ; SCRIPT_CERULEANGYM_DEFAULT ld [wJoyIgnore], a ld [wCeruleanGymCurScript], a ld [wCurMapScript], a ret -CeruleanGym_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - dw CeruleanGymMistyPostBattle + def_script_pointers CeruleanGym + dw_const CheckFightingMapTrainers, SCRIPT_CERULEANGYM_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_CERULEANGYM_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_CERULEANGYM_END_BATTLE + dw_const CeruleanGymMistyPostBattleScript, SCRIPT_CERULEANGYM_POST_BATTLE -CeruleanGymMistyPostBattle: +CeruleanGymMistyPostBattleScript: ld a, [wIsInBattle] cp $ff jp z, CeruleanGymResetScripts @@ -43,20 +43,20 @@ CeruleanGymMistyPostBattle: ld [wJoyIgnore], a CeruleanGymReceiveTM11: - ld a, $5 + ld a, TEXT_CERULEANGYM_MISTY_CASCADE_BADGE_INFO ldh [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_BEAT_MISTY lb bc, TM_BUBBLEBEAM, 1 call GiveItem jr nc, .BagFull - ld a, $6 + ld a, TEXT_CERULEANGYM_MISTY_RECEIVED_TM11 ldh [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_GOT_TM11 jr .gymVictory .BagFull - ld a, $7 + ld a, TEXT_CERULEANGYM_MISTY_TM11_NO_ROOM ldh [hSpriteIndexOrTextID], a call DisplayTextID .gymVictory @@ -70,14 +70,14 @@ CeruleanGymReceiveTM11: jp CeruleanGymResetScripts -CeruleanGym_TextPointers: - dw MistyText - dw CeruleanGymTrainerText1 - dw CeruleanGymTrainerText2 - dw CeruleanGymGuideText - dw MistyCascadeBadgeInfoText - dw ReceivedTM11Text - dw TM11NoRoomText + def_text_pointers CeruleanGym + dw_const CeruleanGymMistyText, TEXT_CERULEANGYM_MISTY + dw_const CeruleanGymCooltrainerFText, TEXT_CERULEANGYM_COOLTRAINER_F + dw_const CeruleanGymSwimmerText, TEXT_CERULEANGYM_SWIMMER + dw_const CeruleanGymGymGuideText, TEXT_CERULEANGYM_GYM_GUIDE + dw_const CeruleanGymMistyCascadeBadgeInfoText, TEXT_CERULEANGYM_MISTY_CASCADE_BADGE_INFO + dw_const CeruleanGymMistyReceivedTM11Text, TEXT_CERULEANGYM_MISTY_RECEIVED_TM11 + dw_const CeruleanGymMistyTM11NoRoomText, TEXT_CERULEANGYM_MISTY_TM11_NO_ROOM CeruleanGymTrainerHeaders: def_trainers 2 @@ -87,7 +87,7 @@ CeruleanGymTrainerHeader1: trainer EVENT_BEAT_CERULEAN_GYM_TRAINER_1, 3, CeruleanGymBattleText2, CeruleanGymEndBattleText2, CeruleanGymAfterBattleText2 db -1 ; end -MistyText: +CeruleanGymMistyText: text_asm CheckEvent EVENT_BEAT_MISTY jr z, .beforeBeat @@ -97,17 +97,17 @@ MistyText: call DisableWaitingAfterTextDisplay jr .done .afterBeat - ld hl, TM11ExplanationText + ld hl, .TM11ExplanationText call PrintText jr .done .beforeBeat - ld hl, MistyPreBattleText + ld hl, .PreBattleText call PrintText ld hl, wd72d set 6, [hl] set 7, [hl] - ld hl, ReceivedCascadeBadgeText - ld de, ReceivedCascadeBadgeText + ld hl, CeruleanGymMistyReceivedCascadeBadgeText + ld de, CeruleanGymMistyReceivedCascadeBadgeText call SaveEndBattleTextPointers ldh a, [hSpriteIndex] ld [wSpriteIndex], a @@ -117,39 +117,39 @@ MistyText: ld [wGymLeaderNo], a xor a ldh [hJoyHeld], a - ld a, $3 + ld a, SCRIPT_CERULEANGYM_POST_BATTLE ld [wCeruleanGymCurScript], a .done jp TextScriptEnd -MistyPreBattleText: - text_far _MistyPreBattleText +.PreBattleText: + text_far _CeruleanGymMistyPreBattleText text_end -TM11ExplanationText: - text_far _TM11ExplanationText +.TM11ExplanationText: + text_far _CeruleanGymMistyTM11ExplanationText text_end -MistyCascadeBadgeInfoText: - text_far _MistyCascadeBadgeInfoText +CeruleanGymMistyCascadeBadgeInfoText: + text_far _CeruleanGymMistyCascadeBadgeInfoText text_end -ReceivedTM11Text: - text_far _ReceivedTM11Text +CeruleanGymMistyReceivedTM11Text: + text_far _CeruleanGymMistyReceivedTM11Text sound_get_item_1 text_end -TM11NoRoomText: - text_far _TM11NoRoomText +CeruleanGymMistyTM11NoRoomText: + text_far _CeruleanGymMistyTM11NoRoomText text_end -ReceivedCascadeBadgeText: - text_far _ReceivedCascadeBadgeText +CeruleanGymMistyReceivedCascadeBadgeText: + text_far _CeruleanGymMistyReceivedCascadeBadgeText sound_get_key_item ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded text_promptbutton text_end -CeruleanGymTrainerText1: +CeruleanGymCooltrainerFText: text_asm ld hl, CeruleanGymTrainerHeader0 call TalkToTrainer @@ -167,7 +167,7 @@ CeruleanGymAfterBattleText1: text_far _CeruleanGymAfterBattleText1 text_end -CeruleanGymTrainerText2: +CeruleanGymSwimmerText: text_asm ld hl, CeruleanGymTrainerHeader1 call TalkToTrainer @@ -185,23 +185,23 @@ CeruleanGymAfterBattleText2: text_far _CeruleanGymAfterBattleText2 text_end -CeruleanGymGuideText: +CeruleanGymGymGuideText: text_asm CheckEvent EVENT_BEAT_MISTY jr nz, .afterBeat - ld hl, CeruleanGymGuidePreBattleText + ld hl, .ChampInMakingText call PrintText jr .done .afterBeat - ld hl, CeruleanGymGuidePostBattleText + ld hl, .BeatMistyText call PrintText .done jp TextScriptEnd -CeruleanGymGuidePreBattleText: - text_far _CeruleanGymGuidePreBattleText +.ChampInMakingText: + text_far _CeruleanGymGymGuideChampInMakingText text_end -CeruleanGymGuidePostBattleText: - text_far _CeruleanGymGuidePostBattleText +.BeatMistyText: + text_far _CeruleanGymGymGuideBeatMistyText text_end diff --git a/scripts/CeruleanMart.asm b/scripts/CeruleanMart.asm index beb0fa1b34..a778428fe9 100644 --- a/scripts/CeruleanMart.asm +++ b/scripts/CeruleanMart.asm @@ -1,15 +1,15 @@ CeruleanMart_Script: jp EnableAutoTextBoxDrawing -CeruleanMart_TextPointers: - dw CeruleanCashierText - dw CeruleanMartText2 - dw CeruleanMartText3 + def_text_pointers CeruleanMart + dw_const CeruleanMartClerkText, TEXT_CERULEANMART_CLERK + dw_const CeruleanMartCooltrainerMText, TEXT_CERULEANMART_COOLTRAINER_M + dw_const CeruleanMartCooltrainerFText, TEXT_CERULEANMART_COOLTRAINER_F -CeruleanMartText2: - text_far _CeruleanMartText2 +CeruleanMartCooltrainerMText: + text_far _CeruleanMartCooltrainerMText text_end -CeruleanMartText3: - text_far _CeruleanMartText3 +CeruleanMartCooltrainerFText: + text_far _CeruleanMartCooltrainerFText text_end diff --git a/scripts/ChampionsRoom.asm b/scripts/ChampionsRoom.asm index 11f99ee154..e226eea94c 100644 --- a/scripts/ChampionsRoom.asm +++ b/scripts/ChampionsRoom.asm @@ -4,48 +4,48 @@ ChampionsRoom_Script: ld a, [wChampionsRoomCurScript] jp CallFunctionInTable -ResetGaryScript: - xor a +ResetRivalScript: + xor a ; SCENE_CHAMPIONSROOM_DEFAULT ld [wJoyIgnore], a ld [wChampionsRoomCurScript], a ret -ChampionsRoom_ScriptPointers: - dw GaryScript0 - dw GaryScript1 - dw GaryScript2 - dw GaryScript3 - dw GaryScript4 - dw GaryScript5 - dw GaryScript6 - dw GaryScript7 - dw GaryScript8 - dw GaryScript9 - dw GaryScript10 + def_script_pointers ChampionsRoom + dw_const ChampionsRoomDefaultScript, SCRIPT_CHAMPIONSROOM_DEFAULT + dw_const ChampionsRoomPlayerEntersScript, SCRIPT_CHAMPIONSROOM_PLAYER_ENTERS + dw_const ChampionsRoomRivalReadyToBattleScript, SCRIPT_CHAMPIONSROOM_RIVAL_READY_TO_BATTLE + dw_const ChampionsRoomRivalDefeatedScript, SCRIPT_CHAMPIONSROOM_RIVAL_DEFEATED + dw_const ChampionsRoomOakArrivesScript, SCRIPT_CHAMPIONSROOM_OAK_ARRIVES + dw_const ChampionsRoomOakCongratulatesPlayerScript, SCRIPT_CHAMPIONSROOM_OAK_CONGRATULATES_PLAYER + dw_const ChampionsRoomOakDisappointedWithRivalScript, SCRIPT_CHAMPIONSROOM_OAK_DISAPPOINTED_WITH_RIVAL + dw_const ChampionsRoomOakComeWithMeScript, SCRIPT_CHAMPIONSROOM_OAK_COME_WITH_ME + dw_const ChampionsRoomOakExitsScript, SCRIPT_CHAMPIONSROOM_OAK_EXITS + dw_const ChampionsRoomPlayerFollowsOakScript, SCRIPT_CHAMPIONSROOM_PLAYER_FOLLOWS_OAK + dw_const ChampionsRoomCleanupScript, SCRIPT_CHAMPIONSROOM_CLEANUP_SCRIPT -GaryScript0: +ChampionsRoomDefaultScript: ret -GaryScript1: +ChampionsRoomPlayerEntersScript: ld a, $ff ld [wJoyIgnore], a ld hl, wSimulatedJoypadStatesEnd - ld de, GaryEntrance_RLEMovement + ld de, RivalEntrance_RLEMovement call DecodeRLEList dec a ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates - ld a, $2 + ld a, SCRIPT_CHAMPIONSROOM_RIVAL_READY_TO_BATTLE ld [wChampionsRoomCurScript], a ret -GaryEntrance_RLEMovement: +RivalEntrance_RLEMovement: db D_UP, 1 db D_RIGHT, 1 db D_UP, 3 db -1 ; end -GaryScript2: +ChampionsRoomRivalReadyToBattleScript: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -54,15 +54,15 @@ GaryScript2: ld [wJoyIgnore], a ld hl, wOptions res 7, [hl] ; Turn on battle animations to make the battle feel more epic. - ld a, $1 + ld a, TEXT_CHAMPIONSROOM_RIVAL ldh [hSpriteIndexOrTextID], a call DisplayTextID call Delay3 ld hl, wd72d set 6, [hl] set 7, [hl] - ld hl, GaryDefeatedText - ld de, GaryVictoryText + ld hl, RivalDefeatedText + ld de, RivalVictoryText call SaveEndBattleTextPointers ld a, OPP_RIVAL3 ld [wCurOpponent], a @@ -85,44 +85,44 @@ GaryScript2: xor a ldh [hJoyHeld], a - ld a, $3 + ld a, SCRIPT_CHAMPIONSROOM_RIVAL_DEFEATED ld [wChampionsRoomCurScript], a ret -GaryScript3: +ChampionsRoomRivalDefeatedScript: ld a, [wIsInBattle] cp $ff - jp z, ResetGaryScript + jp z, ResetRivalScript call UpdateSprites SetEvent EVENT_BEAT_CHAMPION_RIVAL ld a, $f0 ld [wJoyIgnore], a - ld a, $1 + ld a, TEXT_CHAMPIONSROOM_RIVAL ldh [hSpriteIndexOrTextID], a - call GaryScript_760c8 - ld a, $1 + call RivalScript_760c8 + ld a, CHAMPIONSROOM_RIVAL ldh [hSpriteIndex], a call SetSpriteMovementBytesToFF - ld a, $4 + ld a, SCRIPT_CHAMPIONSROOM_OAK_ARRIVES ld [wChampionsRoomCurScript], a ret -GaryScript4: +ChampionsRoomOakArrivesScript: farcall Music_Cities1AlternateTempo - ld a, $2 + ld a, TEXT_CHAMPIONSROOM_OAK ldh [hSpriteIndexOrTextID], a - call GaryScript_760c8 - ld a, $2 + call RivalScript_760c8 + ld a, CHAMPIONSROOM_OAK ldh [hSpriteIndex], a call SetSpriteMovementBytesToFF ld de, OakEntranceAfterVictoryMovement - ld a, $2 + ld a, CHAMPIONSROOM_OAK ldh [hSpriteIndex], a call MoveSprite ld a, HS_CHAMPIONS_ROOM_OAK ld [wMissableObjectIndex], a predef ShowObject - ld a, $5 + ld a, SCRIPT_CHAMPIONSROOM_OAK_CONGRATULATES_PLAYER ld [wChampionsRoomCurScript], a ret @@ -134,76 +134,76 @@ OakEntranceAfterVictoryMovement: db NPC_MOVEMENT_UP db -1 ; end -GaryScript5: +ChampionsRoomOakCongratulatesPlayerScript: ld a, [wd730] bit 0, a ret nz ld a, PLAYER_DIR_LEFT ld [wPlayerMovingDirection], a - ld a, $1 + ld a, CHAMPIONSROOM_RIVAL ldh [hSpriteIndex], a ld a, SPRITE_FACING_LEFT ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay - ld a, $2 + ld a, CHAMPIONSROOM_OAK ldh [hSpriteIndex], a xor a ; SPRITE_FACING_DOWN ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay - ld a, $3 + ld a, TEXT_CHAMPIONSROOM_OAK_CONGRATULATES_PLAYER ldh [hSpriteIndexOrTextID], a - call GaryScript_760c8 - ld a, $6 + call RivalScript_760c8 + ld a, SCRIPT_CHAMPIONSROOM_OAK_DISAPPOINTED_WITH_RIVAL ld [wChampionsRoomCurScript], a ret -GaryScript6: - ld a, $2 +ChampionsRoomOakDisappointedWithRivalScript: + ld a, CHAMPIONSROOM_OAK ldh [hSpriteIndex], a ld a, SPRITE_FACING_RIGHT ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay - ld a, $4 + ld a, TEXT_CHAMPIONSROOM_OAK_DISAPPOINTED_WITH_RIVAL ldh [hSpriteIndexOrTextID], a - call GaryScript_760c8 - ld a, $7 + call RivalScript_760c8 + ld a, SCRIPT_CHAMPIONSROOM_OAK_COME_WITH_ME ld [wChampionsRoomCurScript], a ret -GaryScript7: - ld a, $2 +ChampionsRoomOakComeWithMeScript: + ld a, CHAMPIONSROOM_OAK ldh [hSpriteIndex], a xor a ; SPRITE_FACING_DOWN ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay - ld a, $5 + ld a, TEXT_CHAMPIONSROOM_OAK_COME_WITH_ME ldh [hSpriteIndexOrTextID], a - call GaryScript_760c8 - ld de, OakExitGaryRoomMovement - ld a, $2 + call RivalScript_760c8 + ld de, OakExitChampionsRoomMovement + ld a, CHAMPIONSROOM_OAK ldh [hSpriteIndex], a call MoveSprite - ld a, $8 + ld a, SCRIPT_CHAMPIONSROOM_OAK_EXITS ld [wChampionsRoomCurScript], a ret -OakExitGaryRoomMovement: +OakExitChampionsRoomMovement: db NPC_MOVEMENT_UP db NPC_MOVEMENT_UP db -1 ; end -GaryScript8: +ChampionsRoomOakExitsScript: ld a, [wd730] bit 0, a ret nz ld a, HS_CHAMPIONS_ROOM_OAK ld [wMissableObjectIndex], a predef HideObject - ld a, $9 + ld a, SCRIPT_CHAMPIONSROOM_PLAYER_FOLLOWS_OAK ld [wChampionsRoomCurScript], a ret -GaryScript9: +ChampionsRoomPlayerFollowsOakScript: ld a, $ff ld [wJoyIgnore], a ld hl, wSimulatedJoypadStatesEnd @@ -212,7 +212,7 @@ GaryScript9: dec a ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates - ld a, $a + ld a, SCRIPT_CHAMPIONSROOM_CLEANUP_SCRIPT ld [wChampionsRoomCurScript], a ret @@ -221,17 +221,17 @@ WalkToHallOfFame_RLEMovment: db D_LEFT, 1 db -1 ; end -GaryScript10: +ChampionsRoomCleanupScript: ld a, [wSimulatedJoypadStatesIndex] and a ret nz xor a ld [wJoyIgnore], a - ld a, $0 + ld a, SCRIPT_CHAMPIONSROOM_DEFAULT ld [wChampionsRoomCurScript], a ret -GaryScript_760c8: +RivalScript_760c8: ld a, $f0 ld [wJoyIgnore], a call DisplayTextID @@ -239,60 +239,60 @@ GaryScript_760c8: ld [wJoyIgnore], a ret -ChampionsRoom_TextPointers: - dw GaryText1 - dw GaryText2 - dw GaryText3 - dw GaryText4 - dw GaryText5 + def_text_pointers ChampionsRoom + dw_const ChampionsRoomRivalText, TEXT_CHAMPIONSROOM_RIVAL + dw_const ChampionsRoomOakText, TEXT_CHAMPIONSROOM_OAK + dw_const ChampionsRoomOakCongratulatesPlayerText, TEXT_CHAMPIONSROOM_OAK_CONGRATULATES_PLAYER + dw_const ChampionsRoomOakDisappointedWithRivalText, TEXT_CHAMPIONSROOM_OAK_DISAPPOINTED_WITH_RIVAL + dw_const ChampionsRoomOakComeWithMeText, TEXT_CHAMPIONSROOM_OAK_COME_WITH_ME -GaryText1: +ChampionsRoomRivalText: text_asm CheckEvent EVENT_BEAT_CHAMPION_RIVAL - ld hl, GaryChampionIntroText + ld hl, .IntroText jr z, .printText - ld hl, GaryText_76103 + ld hl, ChampionsRoomRivalAfterBattleText .printText call PrintText jp TextScriptEnd -GaryChampionIntroText: - text_far _GaryChampionIntroText +.IntroText: + text_far _ChampionsRoomRivalIntroText text_end -GaryDefeatedText: - text_far _GaryDefeatedText +RivalDefeatedText: + text_far _RivalDefeatedText text_end -GaryVictoryText: - text_far _GaryVictoryText +RivalVictoryText: + text_far _RivalVictoryText text_end -GaryText_76103: - text_far _GaryText_76103 +ChampionsRoomRivalAfterBattleText: + text_far _ChampionsRoomRivalAfterBattleText text_end -GaryText2: - text_far _GaryText2 +ChampionsRoomOakText: + text_far _ChampionsRoomOakText text_end -GaryText3: +ChampionsRoomOakCongratulatesPlayerText: text_asm ld a, [wPlayerStarter] ld [wd11e], a call GetMonName - ld hl, GaryText_76120 + ld hl, .Text call PrintText jp TextScriptEnd -GaryText_76120: - text_far _GaryText_76120 +.Text: + text_far _ChampionsRoomOakCongratulatesPlayerText text_end -GaryText4: - text_far _GaryText_76125 +ChampionsRoomOakDisappointedWithRivalText: + text_far _ChampionsRoomOakDisappointedWithRivalText text_end -GaryText5: - text_far _GaryText_7612a +ChampionsRoomOakComeWithMeText: + text_far _ChampionsRoomOakComeWithMeText text_end diff --git a/scripts/GameCorner.asm b/scripts/GameCorner.asm index 04c8504ebc..b7a0848551 100644 --- a/scripts/GameCorner.asm +++ b/scripts/GameCorner.asm @@ -1,12 +1,12 @@ GameCorner_Script: - call CeladonGameCornerScript_48bcf - call CeladonGameCornerScript_48bec + call CeladonGameCornerSelectLuckySlotMachine + call CeladonGameCornerSetRocketHideoutDoorTile call EnableAutoTextBoxDrawing ld hl, GameCorner_ScriptPointers ld a, [wGameCornerCurScript] jp CallFunctionInTable -CeladonGameCornerScript_48bcf: +CeladonGameCornerSelectLuckySlotMachine: ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] @@ -23,7 +23,7 @@ CeladonGameCornerScript_48bcf: ld [wLuckySlotHiddenObjectIndex], a ret -CeladonGameCornerScript_48bec: +CeladonGameCornerSetRocketHideoutDoorTile: ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] @@ -35,53 +35,53 @@ CeladonGameCornerScript_48bec: lb bc, 2, 8 predef_jump ReplaceTileBlock -CeladonGameCornerScript_48c07: - xor a +CeladonGameCornerReenterMapAfterPlayerLoss: + xor a ; SCRIPT_CELADONGAMECORNER_DEFAULT ld [wJoyIgnore], a ld [wGameCornerCurScript], a ld [wCurMapScript], a ret -GameCorner_ScriptPointers: - dw CeladonGameCornerScript0 - dw CeladonGameCornerScript1 - dw CeladonGameCornerScript2 + def_script_pointers GameCorner + dw_const CeladonGameCornerDefaultScript, SCRIPT_CELADONGAMECORNER_DEFAULT + dw_const CeladonGameCornerRocketBattleScript, SCRIPT_CELADONGAMECORNER_ROCKET_BATTLE + dw_const CeladonGameCornerRocketExitScript, SCRIPT_CELADONGAMECORNER_ROCKET_EXIT -CeladonGameCornerScript0: +CeladonGameCornerDefaultScript: ret -CeladonGameCornerScript1: +CeladonGameCornerRocketBattleScript: ld a, [wIsInBattle] cp $ff - jp z, CeladonGameCornerScript_48c07 + jp z, CeladonGameCornerReenterMapAfterPlayerLoss ld a, $f0 ld [wJoyIgnore], a - ld a, $d + ld a, TEXT_CELADONGAMECORNER_ROCKET_AFTER_BATTLE ldh [hSpriteIndexOrTextID], a call DisplayTextID - ld a, $b + ld a, CELADONGAMECORNER_ROCKET ldh [hSpriteIndex], a call SetSpriteMovementBytesToFF - ld de, MovementData_48c5a + ld de, CeladonGameCornerMovement_Grunt_WalkAroundPlayer ld a, [wYCoord] cp 6 jr nz, .asm_48c43 - ld de, MovementData_48c63 + ld de, CeladonGameCornerMovement_Grunt_WalkDirect jr .asm_48c4d .asm_48c43 ld a, [wXCoord] cp 8 jr nz, .asm_48c4d - ld de, MovementData_48c63 + ld de, CeladonGameCornerMovement_Grunt_WalkDirect .asm_48c4d - ld a, $b + ld a, CELADONGAMECORNER_ROCKET ldh [hSpriteIndex], a call MoveSprite - ld a, $2 + ld a, SCRIPT_CELADONGAMECORNER_ROCKET_EXIT ld [wGameCornerCurScript], a ret -MovementData_48c5a: +CeladonGameCornerMovement_Grunt_WalkAroundPlayer: db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT @@ -92,7 +92,7 @@ MovementData_48c5a: db NPC_MOVEMENT_RIGHT db -1 ; end -MovementData_48c63: +CeladonGameCornerMovement_Grunt_WalkDirect: db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT @@ -100,7 +100,7 @@ MovementData_48c63: db NPC_MOVEMENT_RIGHT db -1 ; end -CeladonGameCornerScript2: +CeladonGameCornerRocketExitScript: ld a, [wd730] bit 0, a ret nz @@ -112,53 +112,59 @@ CeladonGameCornerScript2: ld hl, wCurrentMapScriptFlags set 5, [hl] set 6, [hl] - ld a, $0 + ld a, SCRIPT_CELADONGAMECORNER_DEFAULT ld [wGameCornerCurScript], a ret -GameCorner_TextPointers: - dw CeladonGameCornerText1 - dw CeladonGameCornerText2 - dw CeladonGameCornerText3 - dw CeladonGameCornerText4 - dw CeladonGameCornerText5 - dw CeladonGameCornerText6 - dw CeladonGameCornerText7 - dw CeladonGameCornerText8 - dw CeladonGameCornerText9 - dw CeladonGameCornerText10 - dw CeladonGameCornerText11 - dw CeladonGameCornerText12 - dw CeladonGameCornerText13 - -CeladonGameCornerText1: - text_far _CeladonGameCornerText1 + def_text_pointers GameCorner + dw_const CeladonGameCornerBeauty1Text, TEXT_CELADONGAMECORNER_BEAUTY1 + dw_const CeladonGameCornerClerk1Text, TEXT_CELADONGAMECORNER_CLERK1 + dw_const CeladonGameCornerMiddleAgedMan1Text, TEXT_CELADONGAMECORNER_MIDDLE_AGED_MAN1 + dw_const CeladonGameCornerBeauty2Text, TEXT_CELADONGAMECORNER_BEAUTY2 + dw_const CeladonGameCornerFishingGuruText, TEXT_CELADONGAMECORNER_FISHING_GURU + dw_const CeladonGameCornerMiddleAgedWomanText, TEXT_CELADONGAMECORNER_MIDDLE_AGED_WOMAN + dw_const CeladonGameCornerGymGuideText, TEXT_CELADONGAMECORNER_GYM_GUIDE + dw_const CeladonGameCornerGamblerText, TEXT_CELADONGAMECORNER_GAMBLER + dw_const CeladonGameCornerClerk2Text, TEXT_CELADONGAMECORNER_CLERK2 + dw_const CeladonGameCornerGentlemanText, TEXT_CELADONGAMECORNER_GENTLEMAN + dw_const CeladonGameCornerRocketText, TEXT_CELADONGAMECORNER_ROCKET + dw_const CeladonGameCornerPosterText, TEXT_CELADONGAMECORNER_POSTER + dw_const CeladonGameCornerRocketAfterBattleText, TEXT_CELADONGAMECORNER_ROCKET_AFTER_BATTLE + +CeladonGameCornerBeauty1Text: + text_far _CeladonGameCornerBeauty1Text text_end -CeladonGameCornerText2: +CeladonGameCornerClerk1Text: text_asm - call CeladonGameCornerScript_48f1e - ld hl, CeladonGameCornerText_48d22 + ; Show player's coins + call CeladonGameCornerDrawCoinBox + ld hl, .DoYouNeedSomeGameCoins call PrintText call YesNoChoice ld a, [wCurrentMenuItem] and a - jr nz, .asm_48d0f + jr nz, .declined + ; Can only get more coins if you + ; - have the Coin Case ld b, COIN_CASE call IsItemInBag - jr z, .asm_48d19 + jr z, .no_coin_ciase + ; - have room in the Coin Case for at least 9 coins call Has9990Coins - jr nc, .asm_48d14 + jr nc, .coin_case_full + ; - have at least 1000 yen xor a ldh [hMoney], a ldh [hMoney + 2], a ld a, $10 ldh [hMoney + 1], a call HasEnoughMoney - jr nc, .asm_48cdb - ld hl, CeladonGameCornerText_48d31 - jr .asm_48d1c -.asm_48cdb + jr nc, .buy_coins + ld hl, .CantAffordTheCoins + jr .print_ret +.buy_coins + ; Spend 1000 yen xor a ldh [hMoney], a ldh [hMoney + 2], a @@ -168,6 +174,7 @@ CeladonGameCornerText2: ld de, wPlayerMoney + 2 ld c, $3 predef SubBCDPredef + ; Receive 50 coins xor a ldh [hUnusedCoinsByte], a ldh [hCoins], a @@ -177,64 +184,65 @@ CeladonGameCornerText2: ld hl, hCoins + 1 ld c, $2 predef AddBCDPredef - call CeladonGameCornerScript_48f1e - ld hl, CeladonGameCornerText_48d27 - jr .asm_48d1c -.asm_48d0f - ld hl, CeladonGameCornerText_48d2c - jr .asm_48d1c -.asm_48d14 - ld hl, CeladonGameCornerText_48d36 - jr .asm_48d1c -.asm_48d19 - ld hl, CeladonGameCornerText_48d3b -.asm_48d1c + ; Update display + call CeladonGameCornerDrawCoinBox + ld hl, .ThanksHereAre50Coins + jr .print_ret +.declined + ld hl, .PleaseComePlaySometime + jr .print_ret +.coin_case_full + ld hl, .CoinCaseIsFull + jr .print_ret +.no_coin_ciase + ld hl, .DontHaveCoinCase +.print_ret call PrintText jp TextScriptEnd -CeladonGameCornerText_48d22: - text_far _CeladonGameCornerText_48d22 +.DoYouNeedSomeGameCoins: + text_far _CeladonGameCornerClerk1DoYouNeedSomeGameCoinsText text_end -CeladonGameCornerText_48d27: - text_far _CeladonGameCornerText_48d27 +.ThanksHereAre50Coins: + text_far _CeladonGameCornerClerk1ThanksHereAre50CoinsText text_end -CeladonGameCornerText_48d2c: - text_far _CeladonGameCornerText_48d2c +.PleaseComePlaySometime: + text_far _CeladonGameCornerClerk1PleaseComePlaySometimeText text_end -CeladonGameCornerText_48d31: - text_far _CeladonGameCornerText_48d31 +.CantAffordTheCoins: + text_far _CeladonGameCornerClerk1CantAffordTheCoinsText text_end -CeladonGameCornerText_48d36: - text_far _CeladonGameCornerText_48d36 +.CoinCaseIsFull: + text_far _CeladonGameCornerClerk1CoinCaseIsFullText text_end -CeladonGameCornerText_48d3b: - text_far _CeladonGameCornerText_48d3b +.DontHaveCoinCase: + text_far _CeladonGameCornerClerk1DontHaveCoinCaseText text_end -CeladonGameCornerText3: - text_far _CeladonGameCornerText3 +CeladonGameCornerMiddleAgedMan1Text: + text_far _CeladonGameCornerMiddleAgedMan1Text text_end -CeladonGameCornerText4: - text_far _CeladonGameCornerText4 +CeladonGameCornerBeauty2Text: + text_far _CeladonGameCornerBeauty2Text text_end -CeladonGameCornerText5: +CeladonGameCornerFishingGuruText: text_asm CheckEvent EVENT_GOT_10_COINS - jr nz, .asm_48d89 - ld hl, CeladonGameCornerText_48d9c + jr nz, .alreadyGotNpcCoins + ld hl, .WantToPlayText call PrintText ld b, COIN_CASE call IsItemInBag - jr z, .asm_48d93 + jr z, .dontHaveCoinCase call Has9990Coins - jr nc, .asm_48d8e + jr nc, .coinCaseFull xor a ldh [hUnusedCoinsByte], a ldh [hCoins], a @@ -247,74 +255,74 @@ CeladonGameCornerText5: SetEvent EVENT_GOT_10_COINS ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, Received10CoinsText - jr .asm_48d96 -.asm_48d89 - ld hl, CeladonGameCornerText_48dac - jr .asm_48d96 -.asm_48d8e - ld hl, CeladonGameCornerText_48da7 - jr .asm_48d96 -.asm_48d93 - ld hl, CeladonGameCornerText_48f19 -.asm_48d96 + ld hl, .Received10CoinsText + jr .print_ret +.alreadyGotNpcCoins + ld hl, .WinsComeAndGoText + jr .print_ret +.coinCaseFull + ld hl, .DontNeedMyCoinsText + jr .print_ret +.dontHaveCoinCase + ld hl, CeladonGameCornerOopsForgotCoinCaseText +.print_ret call PrintText jp TextScriptEnd -CeladonGameCornerText_48d9c: - text_far _CeladonGameCornerText_48d9c +.WantToPlayText: + text_far _CeladonGameCornerFishingGuruWantToPlayText text_end -Received10CoinsText: - text_far _Received10CoinsText +.Received10CoinsText: + text_far _CeladonGameCornerFishingGuruReceived10CoinsText sound_get_item_1 text_end -CeladonGameCornerText_48da7: - text_far _CeladonGameCornerText_48da7 +.DontNeedMyCoinsText: + text_far _CeladonGameCornerFishingGuruDontNeedMyCoinsText text_end -CeladonGameCornerText_48dac: - text_far _CeladonGameCornerText_48dac +.WinsComeAndGoText: + text_far _CeladonGameCornerFishingGuruWinsComeAndGoText text_end -CeladonGameCornerText6: - text_far _CeladonGameCornerText6 +CeladonGameCornerMiddleAgedWomanText: + text_far _CeladonGameCornerMiddleAgedWomanText text_end -CeladonGameCornerText7: +CeladonGameCornerGymGuideText: text_asm CheckEvent EVENT_BEAT_ERIKA - ld hl, CeladonGameCornerText_48dca - jr z, .asm_48dc4 - ld hl, CeladonGameCornerText_48dcf -.asm_48dc4 + ld hl, CeladonGameCornerGymGuideChampInMakingText + jr z, .not_defeated + ld hl, CeladonGameCornerGymGuideTheyOfferRarePokemonText +.not_defeated call PrintText jp TextScriptEnd -CeladonGameCornerText_48dca: - text_far _CeladonGameCornerText_48dca +CeladonGameCornerGymGuideChampInMakingText: + text_far _CeladonGameCornerGymGuideChampInMakingText text_end -CeladonGameCornerText_48dcf: - text_far _CeladonGameCornerText_48dcf +CeladonGameCornerGymGuideTheyOfferRarePokemonText: + text_far _CeladonGameCornerGymGuideTheyOfferRarePokemonText text_end -CeladonGameCornerText8: - text_far _CeladonGameCornerText8 +CeladonGameCornerGamblerText: + text_far _CeladonGameCornerGamblerText text_end -CeladonGameCornerText9: +CeladonGameCornerClerk2Text: text_asm CheckEvent EVENT_GOT_20_COINS_2 - jr nz, .asm_48e13 - ld hl, CeladonGameCornerText_48e26 + jr nz, .alreadyGotNpcCoins + ld hl, .WantSomeCoinsText call PrintText ld b, COIN_CASE call IsItemInBag - jr z, .asm_48e1d + jr z, .dontHaveCoinCase call Has9990Coins - jr nc, .asm_48e18 + jr nc, .coinCaseFull xor a ldh [hUnusedCoinsByte], a ldh [hCoins], a @@ -325,48 +333,48 @@ CeladonGameCornerText9: ld c, $2 predef AddBCDPredef SetEvent EVENT_GOT_20_COINS_2 - ld hl, Received20CoinsText - jr .asm_48e20 -.asm_48e13 - ld hl, CeladonGameCornerText_48e36 - jr .asm_48e20 -.asm_48e18 - ld hl, CeladonGameCornerText_48e31 - jr .asm_48e20 -.asm_48e1d - ld hl, CeladonGameCornerText_48f19 -.asm_48e20 + ld hl, .Received20CoinsText + jr .print_ret +.alreadyGotNpcCoins + ld hl, .INeedMoreCoinsText + jr .print_ret +.coinCaseFull + ld hl, .YouHaveLotsOfCoinsText + jr .print_ret +.dontHaveCoinCase + ld hl, CeladonGameCornerOopsForgotCoinCaseText +.print_ret call PrintText jp TextScriptEnd -CeladonGameCornerText_48e26: - text_far _CeladonGameCornerText_48e26 +.WantSomeCoinsText: + text_far _CeladonGameCornerClerk2WantSomeCoinsText text_end -Received20CoinsText: - text_far _Received20CoinsText +.Received20CoinsText: + text_far _CeladonGameCornerClerk2Received20CoinsText sound_get_item_1 text_end -CeladonGameCornerText_48e31: - text_far _CeladonGameCornerText_48e31 +.YouHaveLotsOfCoinsText: + text_far _CeladonGameCornerClerk2YouHaveLotsOfCoinsText text_end -CeladonGameCornerText_48e36: - text_far _CeladonGameCornerText_48e36 +.INeedMoreCoinsText: + text_far _CeladonGameCornerClerk2INeedMoreCoinsText text_end -CeladonGameCornerText10: +CeladonGameCornerGentlemanText: text_asm CheckEvent EVENT_GOT_20_COINS - jr nz, .asm_48e75 - ld hl, CeladonGameCornerText_48e88 + jr nz, .alreadyGotNpcCoins + ld hl, .ThrowingMeOffText call PrintText ld b, COIN_CASE call IsItemInBag - jr z, .asm_48e7f + jr z, .dontHaveCoinCase call Has9990Coins - jr z, .asm_48e7a + jr z, .coinCaseFull xor a ldh [hUnusedCoinsByte], a ldh [hCoins], a @@ -377,46 +385,46 @@ CeladonGameCornerText10: ld c, $2 predef AddBCDPredef SetEvent EVENT_GOT_20_COINS - ld hl, CeladonGameCornerText_48e8d - jr .asm_48e82 -.asm_48e75 - ld hl, CeladonGameCornerText_48e98 - jr .asm_48e82 -.asm_48e7a - ld hl, CeladonGameCornerText_48e93 - jr .asm_48e82 -.asm_48e7f - ld hl, CeladonGameCornerText_48f19 -.asm_48e82 + ld hl, .Received20CoinsText + jr .print_ret +.alreadyGotNpcCoins + ld hl, .CloselyWatchTheReelsText + jr .print_ret +.coinCaseFull + ld hl, .YouGotYourOwnCoinsText + jr .print_ret +.dontHaveCoinCase + ld hl, CeladonGameCornerOopsForgotCoinCaseText +.print_ret call PrintText jp TextScriptEnd -CeladonGameCornerText_48e88: - text_far _CeladonGameCornerText_48e88 +.ThrowingMeOffText: + text_far _CeladonGameCornerGentlemanThrowingMeOffText text_end -CeladonGameCornerText_48e8d: - text_far _CeladonGameCornerText_48e8d +.Received20CoinsText: + text_far _CeladonGameCornerGentlemanReceived20CoinsText sound_get_item_1 text_end -CeladonGameCornerText_48e93: - text_far _CeladonGameCornerText_48e93 +.YouGotYourOwnCoinsText: + text_far _CeladonGameCornerGentlemanYouGotYourOwnCoinsText text_end -CeladonGameCornerText_48e98: - text_far _CeladonGameCornerText_48e98 +.CloselyWatchTheReelsText: + text_far _CeladonGameCornerGentlemanCloselyWatchTheReelsText text_end -CeladonGameCornerText11: +CeladonGameCornerRocketText: text_asm - ld hl, CeladonGameCornerText_48ece + ld hl, .ImGuardingThisPosterText call PrintText ld hl, wd72d set 6, [hl] set 7, [hl] - ld hl, CeladonGameCornerText_48ed3 - ld de, CeladonGameCornerText_48ed3 + ld hl, .BattleEndText + ld de, .BattleEndText call SaveEndBattleTextPointers ldh a, [hSpriteIndex] ld [wSpriteIndex], a @@ -426,27 +434,27 @@ CeladonGameCornerText11: ldh [hJoyHeld], a ldh [hJoyPressed], a ldh [hJoyReleased], a - ld a, $1 + ld a, SCRIPT_CELADONGAMECORNER_ROCKET_BATTLE ld [wGameCornerCurScript], a jp TextScriptEnd -CeladonGameCornerText_48ece: - text_far _CeladonGameCornerText_48ece +.ImGuardingThisPosterText: + text_far _CeladonGameCornerRocketImGuardingThisPosterText text_end -CeladonGameCornerText_48ed3: - text_far _CeladonGameCornerText_48ed3 +.BattleEndText: + text_far _CeladonGameCornerRocketBattleEndText text_end -CeladonGameCornerText13: - text_far _CeladonGameCornerText_48ed8 +CeladonGameCornerRocketAfterBattleText: + text_far _CeladonGameCornerRocketAfterBattleText text_end -CeladonGameCornerText12: +CeladonGameCornerPosterText: text_asm ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, CeladonGameCornerText_48f09 + ld hl, .SwitchBehindPosterText call PrintText call WaitForSoundToFinish ld a, SFX_GO_INSIDE @@ -459,19 +467,19 @@ CeladonGameCornerText12: predef ReplaceTileBlock jp TextScriptEnd -CeladonGameCornerText_48f09: - text_far _CeladonGameCornerText_48f09 +.SwitchBehindPosterText: + text_far _CeladonGameCornerPosterSwitchBehindPosterText text_asm ld a, SFX_SWITCH call PlaySound call WaitForSoundToFinish jp TextScriptEnd -CeladonGameCornerText_48f19: - text_far _CeladonGameCornerText_48f19 +CeladonGameCornerOopsForgotCoinCaseText: + text_far _CeladonGameCornerOopsForgotCoinCaseText text_end -CeladonGameCornerScript_48f1e: +CeladonGameCornerDrawCoinBox: ld hl, wd730 set 6, [hl] hlcoord 11, 0 diff --git a/text/AgathasRoom.asm b/text/AgathasRoom.asm index 9ef5059a7a..fbebcf454d 100644 --- a/text/AgathasRoom.asm +++ b/text/AgathasRoom.asm @@ -38,7 +38,7 @@ _AgathaAfterBattleText:: cont "along now, child!" done -_AgathaDontRunAwayText:: +_AgathasRoomAgathaDontRunAwayText:: text "Someone's voice:" line "Don't run away!" done diff --git a/text/BikeShop.asm b/text/BikeShop.asm index 5d71133c37..fcfc7b0321 100644 --- a/text/BikeShop.asm +++ b/text/BikeShop.asm @@ -1,4 +1,4 @@ -_BikeShopText_1d810:: +_BikeShopClerkWelcomeText:: text "Hi! Welcome to" line "our BIKE SHOP." @@ -6,7 +6,7 @@ _BikeShopText_1d810:: line "the BIKE for you!" prompt -_BikeShopText_1d815:: +_BikeShopClerkDoYouLikeItText:: text "It's a cool BIKE!" line "Do you want it?" done @@ -16,7 +16,7 @@ _BikeShopCantAffordText:: line "afford it!" prompt -_BikeShopText_1d81f:: +_BikeShopClerkOhThatsAVoucherText:: text "Oh, that's..." para "A BIKE VOUCHER!" @@ -24,7 +24,7 @@ _BikeShopText_1d81f:: para "OK! Here you go!" prompt -_BikeShopText_1d824:: +_BikeShopExchangedVoucherText:: text " exchanged" line "the BIKE VOUCHER" cont "for a BICYCLE.@" @@ -35,7 +35,7 @@ _BikeShopComeAgainText:: line "some time!" done -_BikeShopText_1d82f:: +_BikeShopClerkHowDoYouLikeYourBicycleText:: text "How do you like" line "your new BICYCLE?" @@ -44,12 +44,12 @@ _BikeShopText_1d82f:: cont "and in caves!" done -_BikeShopText_1d834:: +_BikeShopBagFullText:: text "You better make" line "room for this!" done -_BikeShopText_1d843:: +_BikeShopMiddleAgedWomanText:: text "A plain city BIKE" line "is good enough" cont "for me!" @@ -59,13 +59,13 @@ _BikeShopText_1d843:: cont "on an MTB!" done -_BikeShopText_1d85c:: +_BikeShopYoungsterTheseBikesAreExpensiveText:: text "These BIKEs are" line "cool, but they're" cont "way expensive!" done -_BikeShopText_1d861:: +_BikeShopYoungsterCoolBikeText:: text "Wow. Your BIKE is" line "really cool!" done diff --git a/text/BillsHouse.asm b/text/BillsHouse.asm index 9bbea9d78d..be39b7b473 100644 --- a/text/BillsHouse.asm +++ b/text/BillsHouse.asm @@ -1,4 +1,4 @@ -_BillsHouseText_1e865:: +_BillsHouseBillImNotAPokemonText:: text "Hiya! I'm a" line "#MON..." cont "...No I'm not!" @@ -19,7 +19,7 @@ _BillsHouseText_1e865:: line "Help me out here!" done -_BillsHouseText_1e86a:: +_BillsHouseBillUseSeparationSystemText:: text "When I'm in the" line "TELEPORTER, go to" cont "my PC and run the" @@ -27,7 +27,7 @@ _BillsHouseText_1e86a:: cont "System!" done -_BillsHouseText_1e86f:: +_BillsHouseBillNoYouGottaHelpText:: text "No!? Come on, you" line "gotta help a guy" cont "in deep trouble!" @@ -37,7 +37,7 @@ _BillsHouseText_1e86f:: cont "OK? All right!" prompt -_BillThankYouText:: +_BillsHouseBillThankYouText:: text "BILL: Yeehah!" line "Thanks, bud! I" cont "owe you one!" @@ -65,7 +65,7 @@ _SSTicketNoRoomText:: line "much stuff, bud!" done -_BillsHouseText_1e8cb:: +_BillsHouseBillWhyDontYouGoInsteadOfMeText:: text "That cruise ship," line "S.S.ANNE, is in" cont "VERMILION CITY." @@ -80,7 +80,7 @@ _BillsHouseText_1e8cb:: cont "instead of me?" done -_BillsHouseText_1e8da:: +_BillsHouseBillCheckOutMyRarePokemonText:: text "BILL: Look, bud," line "just check out" cont "some of my rare" diff --git a/text/BluesHouse.asm b/text/BluesHouse.asm index 8b3cdd201d..53309b2b0c 100644 --- a/text/BluesHouse.asm +++ b/text/BluesHouse.asm @@ -1,10 +1,10 @@ -_DaisyInitialText:: +_BluesHouseDaisyRivalAtLabText:: text "Hi !" line " is out at" cont "Grandpa's lab." done -_DaisyOfferMapText:: +_BluesHouseDaisyOfferMapText:: text "Grandpa asked you" line "to run an errand?" cont "Here, this will" @@ -18,12 +18,12 @@ _GotMapText:: text "!@" text_end -_DaisyBagFullText:: +_BluesHouseDaisyBagFullText:: text "You have too much" line "stuff with you." done -_DaisyUseMapText:: +_BluesHouseDaisyUseMapText:: text "Use the TOWN MAP" line "to find out where" cont "you are." diff --git a/text/BrunosRoom.asm b/text/BrunosRoom.asm index 9c493c4ac5..ac00ae609f 100644 --- a/text/BrunosRoom.asm +++ b/text/BrunosRoom.asm @@ -31,7 +31,7 @@ _BrunoAfterBattleText:: cont "challenge!" done -_BrunoDontRunAwayText:: +_BrunosRoomBrunoDontRunAwayText:: text "Someone's voice:" line "Don't run away!" done diff --git a/text/CeladonChiefHouse.asm b/text/CeladonChiefHouse.asm index 19e59bd605..075b8d49c2 100644 --- a/text/CeladonChiefHouse.asm +++ b/text/CeladonChiefHouse.asm @@ -1,10 +1,10 @@ -_CeladonHouseText1:: +_CeladonChiefHouseChiefText:: text "Hehehe! The slots" line "just reel in the" cont "dough, big time!" done -_CeladonHouseText2:: +_CeladonChiefHouseRocketText:: text "CHIEF!" para "We just shipped" @@ -12,7 +12,7 @@ _CeladonHouseText2:: cont "slot prizes!" done -_CeladonHouseText3:: +_CeladonChiefHouseSailorText:: text "Don't touch the" line "poster at the" cont "GAME CORNER!" diff --git a/text/CeladonCity.asm b/text/CeladonCity.asm index 12146016d7..8baaf8d3e8 100644 --- a/text/CeladonCity.asm +++ b/text/CeladonCity.asm @@ -1,4 +1,4 @@ -_CeladonCityText1:: +_CeladonCityLittleGirlText:: text "I got my KOFFING" line "in CINNABAR!" @@ -7,19 +7,19 @@ _CeladonCityText1:: cont "when it's angry!" done -_CeladonCityText2:: +_CeladonCityGramps1Text:: text "Heheh! This GYM" line "is great! It's" cont "full of women!" done -_CeladonCityText3:: +_CeladonCityGirlText:: text "The GAME CORNER" line "is bad for our" cont "city's image!" done -_CeladonCityText4:: +_CeladonCityGramps2Text:: text "Moan! I blew it" line "all at the slots!" @@ -28,7 +28,7 @@ _CeladonCityText4:: cont "coins for prizes!" done -_TM41PreText:: +_CeledonCityGramps3Text:: text "Hello, there!" para "I've seen you," @@ -39,14 +39,14 @@ _TM41PreText:: line "dropping by!" prompt -_ReceivedTM41Text:: +_CeledonCityGramps3ReceivedTM41Text:: text " received" line "@" text_ram wStringBuffer text "!@" text_end -_TM41ExplanationText:: +_CeledonCityGramps3TM41ExplanationText:: text "TM41 teaches" line "SOFTBOILED!" @@ -57,12 +57,12 @@ _TM41ExplanationText:: line "CHANSEY!" done -_TM41NoRoomText:: +_CeledonCityGramps3TM41NoRoomText:: text "Oh, your pack is" line "full of items!" done -_CeladonCityText6:: +_CeladonCityFisherText:: text "This is my trusted" line "pal, POLIWRATH!" @@ -71,22 +71,22 @@ _CeladonCityText6:: cont "used WATER STONE!" done -_CeladonCityText7:: +_CeladonCityPoliwrathText:: text "POLIWRATH: Ribi" line "ribit!@" text_end -_CeladonCityText8:: +_CeladonCityRocket1Text:: text "What are you" line "staring at?" done -_CeladonCityText9:: +_CeladonCityRocket2Text:: text "Keep out of TEAM" line "ROCKET's way!" done -_CeladonCityText10:: +_CeladonCityTrainerTips1Text:: text "TRAINER TIPS" para "X ACCURACY boosts" @@ -102,13 +102,13 @@ _CeladonCityText10:: cont "STORE!" done -_CeladonCityText11:: +_CeladonCitySignText:: text "CELADON CITY" line "The City of" cont "Rainbow Dreams" done -_CeladonCityText13:: +_CeladonCityGymSignText:: text "CELADON CITY" line "#MON GYM" cont "LEADER: ERIKA" @@ -117,17 +117,17 @@ _CeladonCityText13:: line "Princess!" done -_CeladonCityText14:: +_CeladonCityMansionSignText:: text "CELADON MANSION" done -_CeladonCityText15:: +_CeladonCityDeptStoreSignText:: text "Find what you" line "need at CELADON" cont "DEPT. STORE!" done -_CeladonCityText16:: +_CeladonCityTrainerTips2Text:: text "TRAINER TIPS" para "GUARD SPEC." @@ -141,13 +141,13 @@ _CeladonCityText16:: cont "STORE!" done -_CeladonCityText17:: +_CeladonCityPrizeExchangeSignText:: text "Coins exchanged" line "for prizes!" cont "PRIZE EXCHANGE" done -_CeladonCityText18:: +_CeladonCityGameCornerSignText:: text "ROCKET GAME CORNER" line "The playground" cont "for grown-ups!" diff --git a/text/CeladonDiner.asm b/text/CeladonDiner.asm index b91cb5a98b..c46811f77d 100644 --- a/text/CeladonDiner.asm +++ b/text/CeladonDiner.asm @@ -1,24 +1,24 @@ -_CeladonDinerText1:: +_CeladonDinerCookText:: text "Hi!" para "We're taking a" line "break now." done -_CeladonDinerText2:: +_CeladonDinerMiddleAgedWomanText:: text "My #MON are" line "weak, so I often" cont "have to go to the" cont "DRUG STORE." done -_CeladonDinerText3:: +_CeladonDinerMiddleAgedManText:: text "Psst! There's a" line "basement under" cont "the GAME CORNER." done -_CeladonDinerText4:: +_CeladonDinerFisherText:: text "Munch..." para "The man at that" @@ -26,7 +26,7 @@ _CeladonDinerText4:: cont "at the slots." done -_CeladonDinerText_491a7:: +_CeladonDinerGymGuideImFlatOutBustedText:: text "Go ahead! Laugh!" para "I'm flat out" @@ -41,19 +41,19 @@ _CeladonDinerText_491a7:: cont "more!" prompt -_ReceivedCoinCaseText:: +_CeladonDinerGymGuideReceivedCoinCaseText:: text " received" line "a @" text_ram wStringBuffer text "!@" text_end -_CoinCaseNoRoomText:: +_CeladonDinerGymGuideCoinCaseNoRoomText:: text "Make room for" line "this!" done -_CeladonDinerText_491b7:: +_CeladonDinerGymGuideWinItBackText:: text "I always thought" line "I was going to" cont "win it back..." diff --git a/text/CeladonGym.asm b/text/CeladonGym.asm index f4ca049a0c..6f6b2cc332 100644 --- a/text/CeladonGym.asm +++ b/text/CeladonGym.asm @@ -1,4 +1,4 @@ -_ErikaPreBattleText:: +_CeladonGymErikaPreBattleText:: text "Hello. Lovely" line "weather isn't it?" cont "It's so pleasant." @@ -25,7 +25,7 @@ _ErikaPreBattleText:: line "shall not lose." done -_ReceivedRainbowBadgeText:: +_CeladonGymErikaReceivedRainbowBadgeText:: text "Oh!" line "I concede defeat." @@ -36,7 +36,7 @@ _ReceivedRainbowBadgeText:: line "the RAINBOWBADGE." prompt -_ErikaPostBattleAdviceText:: +_CeladonGymErikaPostBattleAdviceText:: text "You are cataloging" line "#MON? I must" cont "say I'm impressed." @@ -47,7 +47,7 @@ _ErikaPostBattleAdviceText:: cont "unattractive." done -_ErikaRainbowBadgeInfoText:: +_CeladonGymRainbowBadgeInfoText:: text "The RAINBOWBADGE" line "will make #MON" cont "up to L50 obey." @@ -61,7 +61,7 @@ _ErikaRainbowBadgeInfoText:: line "this with you." done -_ReceivedTM21Text:: +_CeladonGymReceivedTM21Text:: text " received" line "@" text_ram wStringBuffer @@ -80,7 +80,7 @@ _TM21ExplanationText:: cont "your #MON!" done -_TM21NoRoomText:: +_CeladonGymTM21NoRoomText:: text "You should make" line "room for this." done diff --git a/text/CeladonHotel.asm b/text/CeladonHotel.asm index f2eb059e01..4753178fe7 100644 --- a/text/CeladonHotel.asm +++ b/text/CeladonHotel.asm @@ -1,4 +1,4 @@ -_CeladonHotelText1:: +_CeladonHotelGrannyText:: text "#MON? No, this" line "is a hotel for" cont "people." @@ -6,7 +6,7 @@ _CeladonHotelText1:: para "We're full up." done -_CeladonHotelText2:: +_CeladonHotelBeautyText:: text "I'm on vacation" line "with my brother" cont "and boy friend." @@ -15,7 +15,7 @@ _CeladonHotelText2:: line "pretty city!" done -_CeladonHotelText3:: +_CeladonHotelSuperNerdText:: text "Why did she bring" line "her brother?" done diff --git a/text/CeladonMansion1F.asm b/text/CeladonMansion1F.asm index 14a48a8197..8773ff31b4 100644 --- a/text/CeladonMansion1F.asm +++ b/text/CeladonMansion1F.asm @@ -1,8 +1,8 @@ -_CeladonMansion1Text1:: +_CeladonMansion1FMeowthText:: text "MEOWTH: Meow!@" text_end -_CeladonMansion1Text2:: +_CeladonMansion1FGrannyText:: text "My dear #MON" line "keep me company." @@ -10,17 +10,17 @@ _CeladonMansion1Text2:: line "money home!" done -_CeladonMansion1Text3:: +_CeladonMansion1FClefairyText:: text "CLEFAIRY: Pi" line "pippippi!@" text_end -_CeladonMansion1Text4:: +_CeladonMansion1FNidoranFText:: text "NIDORAN: Kya" line "kyaoo!@" text_end -_CeladonMansion1Text5:: +_CeladonMansion1FManagersSuiteSignText:: text "CELADON MANSION" line "Manager's Suite" done diff --git a/text/CeladonMansion2F.asm b/text/CeladonMansion2F.asm index b2ecb4fa92..b057b3e8a6 100644 --- a/text/CeladonMansion2F.asm +++ b/text/CeladonMansion2F.asm @@ -1,4 +1,4 @@ -_CeladonMansion2Text1:: +_CeladonMansion2FMeetingRoomSignText:: text "GAME FREAK" line "Meeting Room" done diff --git a/text/CeladonMansion3F.asm b/text/CeladonMansion3F.asm index 714ecf19c1..36a1c08578 100644 --- a/text/CeladonMansion3F.asm +++ b/text/CeladonMansion3F.asm @@ -1,15 +1,15 @@ -_ProgrammerText:: +_CeladonMansion3FProgrammerText:: text "Me? I'm the" line "programmer!" done -_GraphicArtistText:: +_CeladonMansion3FGraphicArtistText:: text "I'm the graphic" line "artist!" cont "I drew you!" done -_WriterText:: +_CeladonMansion3FWriterText:: text "I wrote the story!" line "Isn't ERIKA cute?" @@ -20,7 +20,7 @@ _WriterText:: line "I like her!" done -_GameDesignerText:: +_CeladonMansion3FGameDesignerText:: text "Is that right?" para "I'm the game" @@ -34,7 +34,7 @@ _GameDesignerText:: line "come tell me!" done -_CompletedDexText:: +_CeladonMansion3FGameDesignerCompletedDexText:: text "Wow! Excellent!" line "You completed" cont "your #DEX!" @@ -42,26 +42,26 @@ _CompletedDexText:: cont "...@" text_end -_CeladonMansion3Text5:: +_CeladonMansion3FGameProgramPCText:: text "It's the game" line "program! Messing" cont "with it could bug" cont "out the game!" done -_CeladonMansion3Text6:: +_CeladonMansion3FPlayingGamePCText:: text "Someone's playing" line "a game instead of" cont "working!" done -_CeladonMansion3Text7:: +_CeladonMansion3FGameScriptPCText:: text "It's the script!" line "Better not look" cont "at the ending!" done -_CeladonMansion3Text8:: +_CeladonMansion3FDevRoomSignText:: text "GAME FREAK" line "Development Room" done diff --git a/text/CeladonMansionRoof.asm b/text/CeladonMansionRoof.asm index c8fd7ec88e..67963cb367 100644 --- a/text/CeladonMansionRoof.asm +++ b/text/CeladonMansionRoof.asm @@ -1,3 +1,3 @@ -_CeladonMansion4Text1:: +_CeladonMansionRoofHouseSignText:: text "I KNOW EVERYTHING!" done diff --git a/text/CeladonMansionRoofHouse.asm b/text/CeladonMansionRoofHouse.asm index dab81a8dc3..c3cef1ba49 100644 --- a/text/CeladonMansionRoofHouse.asm +++ b/text/CeladonMansionRoofHouse.asm @@ -1,4 +1,4 @@ -_CeladonMansion5Text1:: +_CeladonMansionRoofHouseHikerText:: text "I know everything" line "about the world" cont "of #MON in" diff --git a/text/CeladonMart1F.asm b/text/CeladonMart1F.asm index 8d805edc7a..c9975da986 100644 --- a/text/CeladonMart1F.asm +++ b/text/CeladonMart1F.asm @@ -1,4 +1,4 @@ -_CeladonMart1Text1:: +_CeladonMart1FReceptionistText:: text "Hello! Welcome to" line "CELADON DEPT." cont "STORE." @@ -8,7 +8,7 @@ _CeladonMart1Text1:: cont "the store layout." done -_CeladonMart1Text2:: +_CeladonMart1FDirectorySignText:: text "1F: SERVICE" line " COUNTER" @@ -25,7 +25,7 @@ _CeladonMart1Text2:: line "VENDING MACHINES" done -_CeladonMart1Text3:: +_CeladonMart1FCurrentFloorSignText:: text "1F: SERVICE" line " COUNTER" done diff --git a/text/CeladonMart2F.asm b/text/CeladonMart2F.asm index 74869902bf..05cf93f9cd 100644 --- a/text/CeladonMart2F.asm +++ b/text/CeladonMart2F.asm @@ -1,4 +1,4 @@ -_CeladonMart2Text3:: +_CeladonMart2FMiddleAgedManText:: text "SUPER REPEL keeps" line "weak #MON at" cont "bay..." @@ -7,13 +7,13 @@ _CeladonMart2Text3:: line "powerful REPEL!" done -_CeladonMart2Text4:: +_CeladonMart2FGirlText:: text "For long outings," line "you should buy" cont "REVIVE." done -_CeladonMart2Text5:: +_CeladonMart2FCurrentFloorSignText:: text "Top Grade Items" line "for Trainers!" diff --git a/text/CeladonMart3F.asm b/text/CeladonMart3F.asm index c24763e46d..a3211c5d69 100644 --- a/text/CeladonMart3F.asm +++ b/text/CeladonMart3F.asm @@ -1,4 +1,4 @@ -_TM18PreReceiveText:: +_CeladonMart3FClerkTM18PreReceiveText:: text "Oh, hi! I finally" line "finished #MON!" @@ -7,26 +7,26 @@ _TM18PreReceiveText:: cont "useful!" prompt -_ReceivedTM18Text:: +_CeladonMart3FClerkReceivedTM18Text:: text " received" line "@" text_ram wStringBuffer text "!@" text_end -_TM18ExplanationText:: +_CeladonMart3FClerkTM18ExplanationText:: text "TM18 is COUNTER!" line "Not like the one" cont "I'm leaning on," cont "mind you!" done -_TM18NoRoomText:: +_CeladonMart3FClerkTM18NoRoomText:: text "Your pack is full" line "of items!" done -_CeladonMart3Text2:: +_CeladonMart3FGameBoyKid1Text:: text "Captured #MON" line "are registered" cont "with an ID No." @@ -36,7 +36,7 @@ _CeladonMart3Text2:: cont "caught it!" done -_CeladonMart3Text3:: +_CeladonMart3FGameBoyKid2Text:: text "All right!" para "My buddy's going" @@ -45,7 +45,7 @@ _CeladonMart3Text3:: cont "GRAVELER!" done -_CeladonMart3Text4:: +_CeladonMart3FGameBoyKid3Text:: text "Come on GRAVELER!" para "I love GRAVELER!" @@ -58,42 +58,42 @@ _CeladonMart3Text4:: cont "#MON!" done -_CeladonMart3Text5:: +_CeladonMart3FLittleBoyText:: text "You can identify" line "#MON you got" cont "in trades by" cont "their ID Numbers!" done -_CeladonMart3Text6:: +_CeladonMart3FSNESText:: text "It's an SNES!" done -_CeladonMart3Text7:: +_CeladonMart3FRPGText:: text "An RPG! There's" line "no time for that!" done -_CeladonMart3Text9:: +_CeladonMart3FSportsGameText:: text "A sports game!" line "Dad'll like that!" done -_CeladonMart3Text11:: +_CeladonMart3FPuzzleGameText:: text "A puzzle game!" line "Looks addictive!" done -_CeladonMart3Text13:: +_CeladonMart3FFightingGameText:: text "A fighting game!" line "Looks tough!" done -_CeladonMart3Text14:: +_CeladonMart3FCurrentFloorSignText:: text "3F: TV GAME SHOP" done -_CeladonMart3Text15:: +_CeladonMart3FPokemonPosterText:: text "Red and Blue!" line "Both are #MON!" done diff --git a/text/CeladonMart4F.asm b/text/CeladonMart4F.asm index 78fa0b66b1..d08e8d8956 100644 --- a/text/CeladonMart4F.asm +++ b/text/CeladonMart4F.asm @@ -1,10 +1,10 @@ -_CeladonMart4Text2:: +_CeladonMart4FSuperNerdText:: text "I'm getting a" line "# DOLL for my" cont "girl friend!" done -_CeladonMart4Text3:: +_CeladonMart4FYoungsterText:: text "I heard something" line "useful." @@ -14,7 +14,7 @@ _CeladonMart4Text3:: cont "with a # DOLL!" done -_CeladonMart4Text4:: +_CeladonMart4FCurrentFloorSignText:: text "Express yourself" line "with gifts!" diff --git a/text/CeladonMart5F.asm b/text/CeladonMart5F.asm index 1871194bcb..7d3193a675 100644 --- a/text/CeladonMart5F.asm +++ b/text/CeladonMart5F.asm @@ -1,4 +1,4 @@ -_CeladonMart5Text1:: +_CeladonMart5FGentlemanText:: text "#MON ability" line "enhancers can be" cont "bought only here." @@ -11,7 +11,7 @@ _CeladonMart5Text1:: line "increase SPEED." done -_CeladonMart5Text2:: +_CeladonMart5FSailorText:: text "I'm here for" line "#MON ability" cont "enhancers." @@ -23,6 +23,6 @@ _CeladonMart5Text2:: line "DEFENSE!" done -_CeladonMart5Text5:: +_CeladonMart5FCurrentFloorSignText:: text "5F: DRUG STORE" done diff --git a/text/CeladonMartRoof.asm b/text/CeladonMartRoof.asm index cbedb3b742..7d3dff300f 100644 --- a/text/CeladonMartRoof.asm +++ b/text/CeladonMartRoof.asm @@ -97,7 +97,7 @@ _CeladonMartRoofText_4852c:: cont "after all!@" text_end -_CeladonMartRoofText1:: +_CeladonMartRoofSuperNerdText:: text "My sister is a" line "trainer, believe" cont "it or not." @@ -107,13 +107,13 @@ _CeladonMartRoofText1:: cont "drives me nuts!" done -_CeladonMartRoofText_48598:: +_CeladonMartRoofLittleGirlImThirstyText:: text "I'm thirsty!" line "I want something" cont "to drink!" done -_CeladonMartRoofText4:: +_CeladonMartRoofLittleGirlGiveHerADrinkText:: text "I'm thirsty!" line "I want something" cont "to drink!" @@ -121,7 +121,7 @@ _CeladonMartRoofText4:: para "Give her a drink?" done -_CeladonMartRoofText6:: +_CeladonMartRoofCurrentFloorSignText:: text "ROOFTOP SQUARE:" line "VENDING MACHINES" done diff --git a/text/CeladonPokecenter.asm b/text/CeladonPokecenter.asm index a04f51c98e..38ceaf2f78 100644 --- a/text/CeladonPokecenter.asm +++ b/text/CeladonPokecenter.asm @@ -1,11 +1,11 @@ -_CeladonPokecenterText2:: +_CeladonPokecenterGentlemanText:: text "# FLUTE awakens" line "#MON with a" cont "sound that only" cont "they can hear!" done -_CeladonPokecenterText3:: +_CeladonPokecenterBeautyText:: text "I rode uphill on" line "CYCLING ROAD from" cont "FUCHSIA!" diff --git a/text/CeruleanBadgeHouse.asm b/text/CeruleanBadgeHouse.asm index 9d701443d2..60fea5b56b 100644 --- a/text/CeruleanBadgeHouse.asm +++ b/text/CeruleanBadgeHouse.asm @@ -1,4 +1,4 @@ -_CeruleanHouse2Text_74e77:: +_CeruleanBadgeHouseMiddleAgedManText:: text "#MON BADGEs" line "are owned only by" cont "skilled trainers." @@ -10,7 +10,7 @@ _CeruleanHouse2Text_74e77:: line "amazing secrets!" prompt -_CeruleanHouse2Text_74e7c:: +_CeruleanBadgeHouseMiddleAgedManWhichBadgeText:: text "Now then..." para "Which of the 8" @@ -18,12 +18,12 @@ _CeruleanHouse2Text_74e7c:: cont "describe?" done -_CeruleanHouse2Text_74e81:: +_CeruleanBadgeHouseMiddleAgedManVisitAnyTimeText:: text "Come visit me any" line "time you wish." done -_CeruleanHouse2Text_74e96:: +_CeruleanBadgeHouseBoulderBadgeText:: text "The ATTACK of all" line "#MON increases" cont "a little bit." @@ -33,7 +33,7 @@ _CeruleanHouse2Text_74e96:: cont "time you desire." prompt -_CeruleanHouse2Text_74e9b:: +_CeruleanBadgeHouseCascadeBadgeText:: text "#MON up to L30" line "will obey you." @@ -45,7 +45,7 @@ _CeruleanHouse2Text_74e9b:: cont "of battle." prompt -_CeruleanHouse2Text_74ea0:: +_CeruleanBadgeHouseThunderBadgeText:: text "The SPEED of all" line "#MON increases" cont "a little bit." @@ -55,7 +55,7 @@ _CeruleanHouse2Text_74ea0:: cont "of battle." prompt -_CeruleanHouse2Text_74ea5:: +_CeruleanBadgeHouseRainbowBadgeText:: text "#MON up to L50" line "will obey you." @@ -67,7 +67,7 @@ _CeruleanHouse2Text_74ea5:: cont "side of battle." prompt -_CeruleanHouse2Text_74eaa:: +_CeruleanBadgeHouseSoulBadgeText:: text "The DEFENSE of all" line "#MON increases" cont "a little bit." @@ -77,7 +77,7 @@ _CeruleanHouse2Text_74eaa:: cont "of battle." prompt -_CeruleanHouse2Text_74eaf:: +_CeruleanBadgeHouseMarshBadgeText:: text "#MON up to L70" line "will obey you." @@ -85,13 +85,13 @@ _CeruleanHouse2Text_74eaf:: line "become unruly!" prompt -_CeruleanHouse2Text_74eb4:: +_CeruleanBadgeHouseVolcanoBadgeText:: text "Your #MON's" line "SPECIAL abilities" cont "increase a bit." prompt -_CeruleanHouse2Text_74eb9:: +_CeruleanBadgeHouseEarthBadgeText:: text "All #MON will" line "obey you!" prompt diff --git a/text/CeruleanCity.asm b/text/CeruleanCity.asm index d0884a3996..63c67d5823 100644 --- a/text/CeruleanCity.asm +++ b/text/CeruleanCity.asm @@ -1,4 +1,4 @@ -_CeruleanCityText_19668:: +_CeruleanCityRivalPreBattleText:: text ": Yo!" line "!" @@ -16,19 +16,19 @@ _CeruleanCityText_19668:: cont "!" done -_CeruleanCityText_1966d:: +_CeruleanCityRivalDefeatedText:: text "Hey!" line "Take it easy!" cont "You won already!" prompt -_CeruleanCityText_19672:: +_CeruleanCityRivalVictoryText:: text "Heh!" line "You're no match" cont "for my genius!" prompt -_CeruleanCityText_19677:: +_CeruleanCityRivalIWentToBillsText:: text ": Hey," line "guess what?" @@ -58,7 +58,7 @@ _CeruleanCityText_19677:: cont "Smell ya later!" done -_CeruleanCityText_196d9:: +_CeruleanCityRocketText:: text "Hey! Stay out!" line "It's not your" cont "yard! Huh? Me?" @@ -68,19 +68,19 @@ _CeruleanCityText_196d9:: cont "you believe me?" done -_ReceivedTM28Text:: +_CeruleanCityRocketReceivedTM28Text:: text " recovered" line "TM28!@" text_end -_ReceivedTM28Text2:: +_CeruleanCityRocketIBetterGetMovingText:: text_start para "I better get" line "moving! Bye!@" text_end -_TM28NoRoomText:: +_CeruleanCityRocketTM28NoRoomText:: text "Make room for" line "this!" @@ -88,25 +88,25 @@ _TM28NoRoomText:: line "I give it to you!" done -_CeruleanCityText_196ee:: +_CeruleanCityRocketIGiveUpText:: text "Stop!" line "I give up! I'll" cont "leave quietly!" prompt -_CeruleanCityText_196f3:: +_CeruleanCityRocketIllReturnTheTMText:: text "OK! I'll return" line "the TM I stole!" prompt -_CeruleanCityText3:: +_CeruleanCityCooltrainerMText:: text "You're a trainer" line "too? Collecting," cont "fighting, it's a" cont "tough life." done -_CeruleanCityText4:: +_CeruleanCitySuperNerd1Text:: text "That bush in" line "front of the shop" cont "is in the way." @@ -115,14 +115,14 @@ _CeruleanCityText4:: line "way around." done -_CeruleanCityText5:: +_CeruleanCitySuperNerd2Text:: text "You're making an" line "encyclopedia on" cont "#MON? That" cont "sounds amusing." done -_CeruleanCityText6:: +_CeruleanCityGuardText:: text "The people here" line "were robbed." @@ -136,20 +136,20 @@ _CeruleanCityText6:: cont "with the ROCKETs!" done -_CeruleanCityText_19730:: +_CeruleanCityCooltrainerF1SlowbroUseSonicboomText:: text "OK! SLOWBRO!" line "Use SONICBOOM!" cont "Come on, SLOWBRO" cont "pay attention!" done -_CeruleanCityText_19735:: +_CeruleanCityCooltrainerF1SlowbroPunchText:: text "SLOWBRO punch!" line "No! You blew it" cont "again!" done -_CeruleanCityText_1973a:: +_CeruleanCityCooltrainerF1SlowbroWithdrawText:: text "SLOWBRO, WITHDRAW!" line "No! That's wrong!" @@ -162,27 +162,27 @@ _CeruleanCityText_1973a:: cont "as a trainer!" done -_CeruleanCityText_1976f:: +_CeruleanCitySlowbroTookASnoozeText:: text "SLOWBRO took a" line "snooze..." done -_CeruleanCityText_19774:: +_CeruleanCitySlowbroIsLoafingAroundText:: text "SLOWBRO is" line "loafing around..." done -_CeruleanCityText_19779:: +_CeruleanCitySlowbroTurnedAwayText:: text "SLOWBRO turned" line "away..." done -_CeruleanCityText_1977e:: +_CeruleanCitySlowbroIgnoredOrdersText:: text "SLOWBRO" line "ignored orders..." done -_CeruleanCityText9:: +_CeruleanCityCooltrainerF2Text:: text "I want a bright" line "red BICYCLE!" @@ -191,7 +191,7 @@ _CeruleanCityText9:: cont "get dirty!" done -_CeruleanCityText10:: +_CeruleanCitySuperNerd3Text:: text "This is CERULEAN" line "CAVE! Horribly" cont "strong #MON" @@ -203,14 +203,14 @@ _CeruleanCityText10:: cont "is allowed in!" done -_CeruleanCityText12:: +_CeruleanCitySignText:: text "CERULEAN CITY" line "A Mysterious," cont "Blue Aura" cont "Surrounds It" done -_CeruleanCityText13:: +_CeruleanCityTrainerTipsText:: text "TRAINER TIPS" para "Pressing B Button" @@ -219,13 +219,13 @@ _CeruleanCityText13:: cont "process." done -_CeruleanCityText16:: +_CeruleanCityBikeShopSign:: text "Grass and caves" line "handled easily!" cont "BIKE SHOP" done -_CeruleanCityText17:: +_CeruleanCityGymSign:: text "CERULEAN CITY" line "#MON GYM" cont "LEADER: MISTY" diff --git a/text/CeruleanGym.asm b/text/CeruleanGym.asm index 2c90ed15fb..d734b45597 100644 --- a/text/CeruleanGym.asm +++ b/text/CeruleanGym.asm @@ -1,4 +1,4 @@ -_MistyPreBattleText:: +_CeruleanGymMistyPreBattleText:: text "Hi, you're a new" line "face!" @@ -17,7 +17,7 @@ _MistyPreBattleText:: cont "#MON!" done -_TM11ExplanationText:: +_CeruleanGymMistyTM11ExplanationText:: text "TM11 teaches" line "BUBBLEBEAM!" @@ -25,7 +25,7 @@ _TM11ExplanationText:: line "aquatic #MON!" done -_MistyCascadeBadgeInfoText:: +_CeruleanGymMistyCascadeBadgeInfoText:: text "The CASCADEBADGE" line "makes all #MON" cont "up to L30 obey!" @@ -45,17 +45,17 @@ _MistyCascadeBadgeInfoText:: line "my favorite TM!" done -_ReceivedTM11Text:: +_CeruleanGymMistyReceivedTM11Text:: text " received" line "TM11!@" text_end -_TM11NoRoomText:: +_CeruleanGymMistyTM11NoRoomText:: text "You better make" line "room for this!" done -_ReceivedCascadeBadgeText:: +_CeruleanGymMistyReceivedCascadeBadgeText:: text "Wow!" line "You're too much!" @@ -105,7 +105,7 @@ _CeruleanGymAfterBattleText2:: line "someone like you!" done -_CeruleanGymGuidePreBattleText:: +_CeruleanGymGymGuideChampInMakingText:: text "Yo! Champ in" line "making!" @@ -123,7 +123,7 @@ _CeruleanGymGuidePreBattleText:: line "electricity!" done -_CeruleanGymGuidePostBattleText:: +_CeruleanGymGymGuideBeatMistyText:: text "You beat MISTY!" line "What'd I tell ya?" diff --git a/text/CeruleanMart.asm b/text/CeruleanMart.asm index 86a7458872..0039b93390 100644 --- a/text/CeruleanMart.asm +++ b/text/CeruleanMart.asm @@ -1,4 +1,4 @@ -_CeruleanMartText2:: +_CeruleanMartCooltrainerMText:: text "Use REPEL to keep" line "bugs and weak" cont "#MON away." @@ -9,7 +9,7 @@ _CeruleanMartText2:: cont "for best results!" done -_CeruleanMartText3:: +_CeruleanMartCooltrainerFText:: text "Have you seen any" line "RARE CANDY?" diff --git a/text/ChampionsRoom.asm b/text/ChampionsRoom.asm index 575b7da469..92f23f69c8 100644 --- a/text/ChampionsRoom.asm +++ b/text/ChampionsRoom.asm @@ -1,4 +1,4 @@ -_GaryChampionIntroText:: +_ChampionsRoomRivalIntroText:: text ": Hey!" para "I was looking" @@ -35,7 +35,7 @@ _GaryChampionIntroText:: cont "in the world!" done -_GaryDefeatedText:: +_RivalDefeatedText:: text "NO!" line "That can't be!" cont "You beat my best!" @@ -49,7 +49,7 @@ _GaryDefeatedText:: cont "It's not fair!" prompt -_GaryVictoryText:: +_RivalVictoryText:: text "Hahaha!" line "I won, I won!" @@ -65,7 +65,7 @@ _GaryVictoryText:: line "Hahaha!" prompt -_GaryText_76103:: +_ChampionsRoomRivalAfterBattleText:: text "Why?" line "Why did I lose?" @@ -81,11 +81,11 @@ _GaryText_76103:: line "like to admit it." done -_GaryText2:: +_ChampionsRoomOakText:: text "OAK: !" done -_GaryText_76120:: +_ChampionsRoomOakCongratulatesPlayerText:: text "OAK: So, you won!" line "Congratulations!" cont "You're the new" @@ -103,7 +103,7 @@ _GaryText_76120:: line "come of age!" done -_GaryText_76125:: +_ChampionsRoomOakDisappointedWithRivalText:: text "OAK: ! I'm" line "disappointed!" @@ -129,7 +129,7 @@ _GaryText_76125:: cont "a champ again!" done -_GaryText_7612a:: +_ChampionsRoomOakComeWithMeText:: text "OAK: !" para "You understand" diff --git a/text/GameCorner.asm b/text/GameCorner.asm index 1868daf8b7..e4eca5c0b7 100644 --- a/text/GameCorner.asm +++ b/text/GameCorner.asm @@ -1,4 +1,4 @@ -_CeladonGameCornerText1:: +_CeladonGameCornerBeauty1Text:: text "Welcome!" para "You can exchange" @@ -7,7 +7,7 @@ _CeladonGameCornerText1:: cont "next door." done -_CeladonGameCornerText_48d22:: +_CeladonGameCornerClerk1DoYouNeedSomeGameCoinsText:: text "Welcome to ROCKET" line "GAME CORNER!" @@ -19,32 +19,32 @@ _CeladonGameCornerText_48d22:: cont "like some?" done -_CeladonGameCornerText_48d27:: +_CeladonGameCornerClerk1ThanksHereAre50CoinsText:: text "Thanks! Here are" line "your 50 coins!" done -_CeladonGameCornerText_48d2c:: +_CeladonGameCornerClerk1PleaseComePlaySometimeText:: text "No? Please come" line "play sometime!" done -_CeladonGameCornerText_48d31:: +_CeladonGameCornerClerk1CantAffordTheCoinsText:: text "You can't afford" line "the coins!" done -_CeladonGameCornerText_48d36:: +_CeladonGameCornerClerk1CoinCaseIsFullText:: text "Oops! Your COIN" line "CASE is full." done -_CeladonGameCornerText_48d3b:: +_CeladonGameCornerClerk1DontHaveCoinCaseText:: text "You don't have a" line "COIN CASE!" done -_CeladonGameCornerText3:: +_CeladonGameCornerMiddleAgedMan1Text:: text "Keep this quiet." para "It's rumored that" @@ -52,38 +52,38 @@ _CeladonGameCornerText3:: cont "by TEAM ROCKET." done -_CeladonGameCornerText4:: +_CeladonGameCornerBeauty2Text:: text "I think these" line "machines have" cont "different odds." done -_CeladonGameCornerText_48d9c:: +_CeladonGameCornerFishingGuruWantToPlayText:: text "Kid, do you want" line "to play?" prompt -_Received10CoinsText:: +_CeladonGameCornerFishingGuruReceived10CoinsText:: text " received" line "10 coins!@" text_end -_CeladonGameCornerText_48da7:: +_CeladonGameCornerFishingGuruDontNeedMyCoinsText:: text "You don't need my" line "coins!" done -_CeladonGameCornerText_48dac:: +_CeladonGameCornerFishingGuruWinsComeAndGoText:: text "Wins seem to come" line "and go." done -_CeladonGameCornerText6:: +_CeladonGameCornerMiddleAgedWomanText:: text "I'm having a" line "wonderful time!" done -_CeladonGameCornerText_48dca:: +_CeladonGameCornerGymGuideChampInMakingText:: text "Hey!" para "You have better" @@ -100,7 +100,7 @@ _CeladonGameCornerText_48dca:: cont "be fooled!" done -_CeladonGameCornerText_48dcf:: +_CeladonGameCornerGymGuideTheyOfferRarePokemonText:: text "They offer rare" line "#MON that can" cont "be exchanged for" @@ -110,73 +110,73 @@ _CeladonGameCornerText_48dcf:: line "seem to win!" done -_CeladonGameCornerText8:: +_CeladonGameCornerGamblerText:: text "Games are scary!" line "It's so easy to" cont "get hooked!" done -_CeladonGameCornerText_48e26:: +_CeladonGameCornerClerk2WantSomeCoinsText:: text "What's up? Want" line "some coins?" prompt -_Received20CoinsText:: +_CeladonGameCornerClerk2Received20CoinsText:: text " received" line "20 coins!@" text_end -_CeladonGameCornerText_48e31:: +_CeladonGameCornerClerk2YouHaveLotsOfCoinsText:: text "You have lots of" line "coins!" done -_CeladonGameCornerText_48e36:: +_CeladonGameCornerClerk2INeedMoreCoinsText:: text "Darn! I need more" line "coins for the" cont "#MON I want!" done -_CeladonGameCornerText_48e88:: +_CeladonGameCornerGentlemanThrowingMeOffText:: text "Hey, what? You're" line "throwing me off!" cont "Here are some" cont "coins, shoo!" prompt -_CeladonGameCornerText_48e8d:: +_CeladonGameCornerGentlemanReceived20CoinsText:: text " received" line "20 coins!@" text_end -_CeladonGameCornerText_48e93:: +_CeladonGameCornerGentlemanYouGotYourOwnCoinsText:: text "You've got your" line "own coins!" done -_CeladonGameCornerText_48e98:: +_CeladonGameCornerGentlemanCloselyWatchTheReelsText:: text "The trick is to" line "watch the reels" cont "closely!" done -_CeladonGameCornerText_48ece:: +_CeladonGameCornerRocketImGuardingThisPosterText:: text "I'm guarding this" line "poster!" cont "Go away, or else!" done -_CeladonGameCornerText_48ed3:: +_CeladonGameCornerRocketBattleEndText:: text "Dang!" prompt -_CeladonGameCornerText_48ed8:: +_CeladonGameCornerRocketAfterBattleText:: text "Our hideout might" line "be discovered! I" cont "better tell BOSS!" done -_CeladonGameCornerText_48f09:: +_CeladonGameCornerPosterSwitchBehindPosterText:: text "Hey!" para "A switch behind" @@ -184,7 +184,7 @@ _CeladonGameCornerText_48f09:: cont "Let's push it!@" text_end -_CeladonGameCornerText_48f19:: +_CeladonGameCornerOopsForgotCoinCaseText:: text "Oops! Forgot the" line "COIN CASE!" done