diff options
92 files changed, 612 insertions, 564 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index a7c2dc93f..5e05b3c79 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -462,7 +462,7 @@ EventScript_SecretBasePCShowMainMenu:: @ 823B4D3 goto EventScript_23B531 end -gUnknown_0823B4E8:: @ 823B4E8 ;EventScript_SecretBasePCCancel? +EventScript_SecretBasePCCancel:: @ 823B4E8 lockall goto EventScript_SecretBasePCShowMainMenu end @@ -512,10 +512,10 @@ EventScript_RecordMixingSecretBasePC:: @ 823B589 waitmessage waitbuttonpress playse SE_SELECT - goto EventScript_23B5A1 + goto EventScript_SecretBasePCStartMenu end -EventScript_23B5A1:: @ 823B5A1 +EventScript_SecretBasePCStartMenu:: @ 823B5A1 message Text_SecretBasePCStartMenu waitmessage multichoice 0, 0, 7, 0 @@ -527,9 +527,9 @@ EventScript_23B5A1:: @ 823B5A1 case 127, EventScript_23B66E end -gUnknown_0823B5E9:: @ 823B5E9 +EventScript_SecretBasePCStart:: @ 823B5E9 lockall - goto EventScript_23B5A1 + goto EventScript_SecretBasePCStartMenu end EventScript_23B5F0:: @ 823B5F0 @@ -541,7 +541,7 @@ EventScript_23B5F0:: @ 823B5F0 special CopyCurSecretBaseOwnerName_StrVar1 msgbox Text_WantToRegisterSecretBase, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq EventScript_23B5A1 + goto_if_eq EventScript_SecretBasePCStartMenu msgbox Text_2767D1, MSGBOX_SIGN special ToggleCurSecretBaseRegistry special DoSecretBasePCTurnOffEffect @@ -551,7 +551,7 @@ EventScript_23B5F0:: @ 823B5F0 EventScript_23B62F:: @ 823B62F msgbox Text_276731, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq EventScript_23B5A1 + goto_if_eq EventScript_SecretBasePCStartMenu msgbox Text_2767E9, MSGBOX_SIGN special ToggleCurSecretBaseRegistry special DoSecretBasePCTurnOffEffect @@ -567,7 +567,7 @@ EventScript_CantRegisterTooManyBases:: @ 823B652 EventScript_23B660:: @ 823B660 msgbox Text_276835, MSGBOX_DEFAULT - goto EventScript_23B5A1 + goto EventScript_SecretBasePCStartMenu end EventScript_23B66E:: @ 823B66E @@ -611,29 +611,29 @@ EventScript_SecretBaseShieldOrToyTV:: @ 823B68C end EventScript_23B6BC:: @ 823B6BC - msgbox Text_27692B, MSGBOX_SIGN + msgbox SecretBase_Text_BattleTowerShield, MSGBOX_SIGN end EventScript_23B6C5:: @ 823B6C5 - msgbox Text_276974, MSGBOX_SIGN + msgbox SecretBase_Text_ToyTV, MSGBOX_SIGN end EventScript_23B6CE:: @ 823B6CE - msgbox Text_2769B8, MSGBOX_SIGN + msgbox SecretBase_Text_SeedotTV, MSGBOX_SIGN end EventScript_23B6D7:: @ 823B6D7 - msgbox Text_2769FF, MSGBOX_SIGN + msgbox SecretBase_Text_SkittyTV, MSGBOX_SIGN end -gText_23B6E0:: @ 823B6E0 +gText_SmallIndentInWall:: @ 823B6E0 .string "There's a small indent in the wall.$" -gText_23B704:: @ 823B704 +gText_UseSecretPower:: @ 823B704 .string "There's a small indent in the wall.\p" .string "Use the SECRET POWER?$" -gText_23B73E:: @ 823B73E +gText_DiscoveredSmallCavern:: @ 823B73E .string "Discovered a small cavern!$" SecretBase_RedCave1_Text_23B759: @ 823B759 @@ -1204,90 +1204,66 @@ EverGrandeCity_HallOfFame_EventScript_ResetEliteFour:: @ 82718CC setvar VAR_ELITE_4_STATE, 0 return -DewfordTown_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE -FallarborTown_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE -LavaridgeTown_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE -MauvilleCity_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE -OldaleTown_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE -PetalburgCity_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE -RustboroCity_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE -SlateportCity_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE -VerdanturfTown_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE +Common_EventScript_UpdateBrineyLocation:: @ 82718DE goto_if_unset FLAG_RECEIVED_POKENAV, Common_EventScript_NopReturn goto_if_set FLAG_DEFEATED_PETALBURG_GYM, Common_EventScript_NopReturn - goto_if_unset FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT, OldaleTown_PokemonCenter_1F_EventScript_27190C - goto_if_unset FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN, OldaleTown_PokemonCenter_1F_EventScript_271912 - goto_if_unset FLAG_HIDE_ROUTE_108_MR_BRINEY, OldaleTown_PokemonCenter_1F_EventScript_271918 + goto_if_unset FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT, EventScript_SetBrineyLocation_House + goto_if_unset FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN, EventScript_SetBrineyLocation_Dewford + goto_if_unset FLAG_HIDE_ROUTE_108_MR_BRINEY, EventScript_SetBrineyLocation_Route108 return -OldaleTown_PokemonCenter_1F_EventScript_27190C:: @ 827190C +EventScript_SetBrineyLocation_House:: @ 827190C setvar VAR_BRINEY_LOCATION, 1 return -OldaleTown_PokemonCenter_1F_EventScript_271912:: @ 8271912 +EventScript_SetBrineyLocation_Dewford:: @ 8271912 setvar VAR_BRINEY_LOCATION, 2 return -OldaleTown_PokemonCenter_1F_EventScript_271918:: @ 8271918 +EventScript_SetBrineyLocation_Route108:: @ 8271918 setvar VAR_BRINEY_LOCATION, 3 return -BattleFrontier_PokemonCenter_1F_EventScript_27191E:: @ 827191E -DewfordTown_PokemonCenter_1F_EventScript_27191E:: @ 827191E -EverGrandeCity_PokemonCenter_1F_EventScript_27191E:: @ 827191E -EverGrandeCity_PokemonLeague_1F_EventScript_27191E:: @ 827191E -FallarborTown_PokemonCenter_1F_EventScript_27191E:: @ 827191E -FortreeCity_PokemonCenter_1F_EventScript_27191E:: @ 827191E -LavaridgeTown_PokemonCenter_1F_EventScript_27191E:: @ 827191E -LilycoveCity_PokemonCenter_1F_EventScript_27191E:: @ 827191E -MauvilleCity_PokemonCenter_1F_EventScript_27191E:: @ 827191E -MossdeepCity_PokemonCenter_1F_EventScript_27191E:: @ 827191E -OldaleTown_PokemonCenter_1F_EventScript_27191E:: @ 827191E -PacifidlogTown_PokemonCenter_1F_EventScript_27191E:: @ 827191E -PetalburgCity_PokemonCenter_1F_EventScript_27191E:: @ 827191E -RustboroCity_PokemonCenter_1F_EventScript_27191E:: @ 827191E -SlateportCity_PokemonCenter_1F_EventScript_27191E:: @ 827191E -SootopolisCity_PokemonCenter_1F_EventScript_27191E:: @ 827191E -TrainerHill_Entrance_EventScript_27191E:: @ 827191E -VerdanturfTown_PokemonCenter_1F_EventScript_27191E:: @ 827191E +Common_EventScript_PkmnCenterNurse:: @ 827191E lock faceplayer setvar VAR_0x8004, 0 specialvar VAR_RESULT, CountPlayerTrainerStars compare VAR_RESULT, 4 - goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_271A68 - msgbox gUnknown_082726EB, MSGBOX_YESNO + goto_if_eq EventScript_PkmnCenterNurse_GoldCard + msgbox gText_WouldYouLikeToRestYourPkmn, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_27195A + goto_if_eq EventScript_PkmnCenterNurse_HealPkmn compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_271954 + goto_if_eq EventScript_PkmnCenterNurse_Goodbye end -OldaleTown_PokemonCenter_1F_EventScript_271954:: @ 8271954 - message gUnknown_082727DB +EventScript_PkmnCenterNurse_Goodbye:: @ 8271954 + message gText_WeHopeToSeeYouAgain return -OldaleTown_PokemonCenter_1F_EventScript_27195A:: @ 827195A +@ VAR_0x8004 is 1 when player has Gold Card; jumps are identical +EventScript_PkmnCenterNurse_HealPkmn:: @ 827195A incrementgamestat 15 compare VAR_0x8004, 0 - call_if_eq OldaleTown_PokemonCenter_1F_EventScript_271987 + call_if_eq EventScript_PkmnCenterNurse_IllTakeYourPkmn compare VAR_0x8004, 1 - call_if_eq OldaleTown_PokemonCenter_1F_EventScript_27198D + call_if_eq EventScript_PkmnCenterNurse_IllTakeYourPkmn2 waitmessage - call OldaleTown_PokemonCenter_1F_EventScript_271993 - goto_if_unset FLAG_POKERUS_EXPLAINED, OldaleTown_PokemonCenter_1F_EventScript_271A43 - goto OldaleTown_PokemonCenter_1F_EventScript_2719B1 + call EventScript_PkmnCenterNurse_TakeAndHealPkmn + goto_if_unset FLAG_POKERUS_EXPLAINED, EventScript_PkmnCenterNurse_CheckPokerus + goto EventScript_PkmnCenterNurse_CheckTrainerHillAndUnionRoom end -OldaleTown_PokemonCenter_1F_EventScript_271987:: @ 8271987 - message gUnknown_08272768 +EventScript_PkmnCenterNurse_IllTakeYourPkmn:: @ 8271987 + message gText_IllTakeYourPkmn return -OldaleTown_PokemonCenter_1F_EventScript_27198D:: @ 827198D - message gUnknown_082729C0 +EventScript_PkmnCenterNurse_IllTakeYourPkmn2:: @ 827198D + message gText_IllTakeYourPkmn2 return -OldaleTown_PokemonCenter_1F_EventScript_271993:: @ 8271993 +EventScript_PkmnCenterNurse_TakeAndHealPkmn:: @ 8271993 applymovement VAR_0x800B, Common_Movement_WalkInPlaceLeft waitmovement 0 dofieldeffect FLDEFF_POKECENTER_HEAL @@ -1297,88 +1273,89 @@ OldaleTown_PokemonCenter_1F_EventScript_271993:: @ 8271993 special HealPlayerParty return -OldaleTown_PokemonCenter_1F_EventScript_2719B1:: @ 82719B1 - specialvar VAR_RESULT, sub_8139ED0 +EventScript_PkmnCenterNurse_CheckTrainerHillAndUnionRoom:: @ 82719B1 + specialvar VAR_RESULT, PlayerAtTrainerHillEntrance compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_2719E2 - specialvar VAR_RESULT, sp182_move_string + goto_if_eq EventScript_PkmnCenterNurse_ReturnPkmn + specialvar VAR_RESULT, BufferUnionRoomPlayerName copyvar VAR_0x8008, VAR_RESULT compare VAR_0x8008, 0 - goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_2719E2 + goto_if_eq EventScript_PkmnCenterNurse_ReturnPkmn compare VAR_0x8008, 1 - goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_271A19 + goto_if_eq EventScript_PkmnCenterNurse_PlayerWaitingInUnionRoom end -OldaleTown_PokemonCenter_1F_EventScript_2719E2:: @ 82719E2 +@ VAR_0x8004 is 1 when player has Gold Card +EventScript_PkmnCenterNurse_ReturnPkmn:: @ 82719E2 compare VAR_0x8004, 1 - goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_271A03 - message gUnknown_08272798 + goto_if_eq EventScript_PkmnCenterNurse_ReturnPkmn2 + message gText_RestoredPkmnToFullHealth waitmessage - applymovement VAR_0x800B, OldaleTown_PokemonCenter_1F_Movement_271AD0 + applymovement VAR_0x800B, EventScript_PkmnCenterNurse_Bow waitmovement 0 - message gUnknown_082727DB + message gText_WeHopeToSeeYouAgain return -OldaleTown_PokemonCenter_1F_EventScript_271A03:: @ 8271A03 - message gUnknown_082729F0 +EventScript_PkmnCenterNurse_ReturnPkmn2:: @ 8271A03 + message gText_ThankYouForWaiting waitmessage - applymovement VAR_0x800B, OldaleTown_PokemonCenter_1F_Movement_271AD0 + applymovement VAR_0x800B, EventScript_PkmnCenterNurse_Bow waitmovement 0 - message gUnknown_08272A07 + message gText_WeHopeToSeeYouAgain2 return -OldaleTown_PokemonCenter_1F_EventScript_271A19:: @ 8271A19 - goto_if_set FLAG_NURSE_UNION_ROOM_REMINDER, OldaleTown_PokemonCenter_1F_EventScript_2719E2 - msgbox gUnknown_08272798, MSGBOX_DEFAULT +EventScript_PkmnCenterNurse_PlayerWaitingInUnionRoom:: @ 8271A19 + goto_if_set FLAG_NURSE_UNION_ROOM_REMINDER, EventScript_PkmnCenterNurse_ReturnPkmn + msgbox gText_RestoredPkmnToFullHealth, MSGBOX_DEFAULT setflag FLAG_NURSE_UNION_ROOM_REMINDER - message OldaleTown_PokemonCenter_1F_Text_278A48 + message CableClub_Text_PlayerIsWaiting waitmessage - applymovement VAR_0x800B, OldaleTown_PokemonCenter_1F_Movement_271AD0 + applymovement VAR_0x800B, EventScript_PkmnCenterNurse_Bow waitmovement 0 - message gUnknown_082727DB + message gText_WeHopeToSeeYouAgain return -OldaleTown_PokemonCenter_1F_EventScript_271A43:: @ 8271A43 +EventScript_PkmnCenterNurse_CheckPokerus:: @ 8271A43 specialvar VAR_RESULT, IsPokerusInParty compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_Explain_Pokerus + goto_if_eq EventScript_PkmnCenterNurse_ExplainPokerus compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_2719B1 + goto_if_eq EventScript_PkmnCenterNurse_CheckTrainerHillAndUnionRoom end -OldaleTown_PokemonCenter_1F_EventScript_Explain_Pokerus:: @ 8271A5F +EventScript_PkmnCenterNurse_ExplainPokerus:: @ 8271A5F message gText_PokerusExplanation setflag FLAG_POKERUS_EXPLAINED return -OldaleTown_PokemonCenter_1F_EventScript_271A68:: @ 8271A68 - goto_if_set FLAG_OLDALE_NURSE_MENTIONS_GOLD_CARD, OldaleTown_PokemonCenter_1F_EventScript_271AAC - setflag FLAG_OLDALE_NURSE_MENTIONS_GOLD_CARD - msgbox gUnknown_082727F5, MSGBOX_DEFAULT +EventScript_PkmnCenterNurse_GoldCard:: @ 8271A68 + goto_if_set FLAG_NURSE_MENTIONS_GOLD_CARD, EventScript_PkmnCenterNurse_AskForUsual + setflag FLAG_NURSE_MENTIONS_GOLD_CARD + msgbox gText_WelcomeCutShort, MSGBOX_DEFAULT playse SE_PIN applymovement VAR_0x800B, Common_Movement_ExclamationMark waitmovement 0 applymovement VAR_0x800B, Common_Movement_Delay48 waitmovement 0 - msgbox gUnknown_08272860, MSGBOX_YESNO + msgbox gText_NoticesGoldCard, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_271AC5 - message gUnknown_08272A07 + goto_if_eq EventScript_PkmnCenterNurse_GoldCardHealPkmn + message gText_WeHopeToSeeYouAgain2 return -OldaleTown_PokemonCenter_1F_EventScript_271AAC:: @ 8271AAC - msgbox gUnknown_08272982, MSGBOX_YESNO +EventScript_PkmnCenterNurse_AskForUsual:: @ 8271AAC + msgbox gText_YouWantTheUsual, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_271AC5 - message gUnknown_08272A07 + goto_if_eq EventScript_PkmnCenterNurse_GoldCardHealPkmn + message gText_WeHopeToSeeYouAgain2 return -OldaleTown_PokemonCenter_1F_EventScript_271AC5:: @ 8271AC5 +EventScript_PkmnCenterNurse_GoldCardHealPkmn:: @ 8271AC5 setvar VAR_0x8004, 1 - goto OldaleTown_PokemonCenter_1F_EventScript_27195A + goto EventScript_PkmnCenterNurse_HealPkmn end -OldaleTown_PokemonCenter_1F_Movement_271AD0: @ 8271AD0 +EventScript_PkmnCenterNurse_Bow: @ 8271AD0 nurse_joy_bow delay_4 step_end @@ -1439,7 +1416,7 @@ EventScript_271B85:: @ 8271B85 return EventScript_271B95:: @ 8271B95 - message gUnknown_08272A78 + message gText_ObtainedTheItem waitfanfare msgbox gText_PutItemInPocket, MSGBOX_DEFAULT setvar VAR_RESULT, 1 @@ -1473,9 +1450,9 @@ EventScript_271BC5:: @ 8271BC5 EventScript_271BE0:: @ 8271BE0 playfanfare MUS_FANFA4 - message gUnknown_08272B09 + message gText_ObtainedTheMon waitfanfare - msgbox gUnknown_08272B48, MSGBOX_DEFAULT + msgbox gText_TheMonWasTransferredToThePC, MSGBOX_DEFAULT setvar VAR_RESULT, 1 return @@ -1534,7 +1511,7 @@ EventScript_271C9B:: @ 8271C9B return EventScript_271CA1:: @ 8271CA1 - msgbox gUnknown_08272A78, MSGBOX_DEFAULT + msgbox gText_ObtainedTheItem, MSGBOX_DEFAULT msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT setvar VAR_RESULT, 0 return @@ -1740,77 +1717,71 @@ EventScript_CantSurf:: @ 8271ED6 Common_EventScript_SetupRivalGender:: @ 8271ED7 checkplayergender compare VAR_RESULT, MALE - goto_if_eq RustboroCity_EventScript_271EEF + goto_if_eq EventScript_SetupRivalFemale compare VAR_RESULT, FEMALE - goto_if_eq RustboroCity_EventScript_271EF5 + goto_if_eq EventScript_SetupRivalMale end -RustboroCity_EventScript_271EEF:: @ 8271EEF +EventScript_SetupRivalFemale:: @ 8271EEF setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL return -RustboroCity_EventScript_271EF5:: @ 8271EF5 +EventScript_SetupRivalMale:: @ 8271EF5 setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL return Common_EventScript_SetupRivalOnBikeGender:: @ 8271EFB checkplayergender compare VAR_RESULT, MALE - goto_if_eq LavaridgeTown_EventScript_271F13 + goto_if_eq EventScript_SetupRivalOnBikeFemale compare VAR_RESULT, FEMALE - goto_if_eq LavaridgeTown_EventScript_271F19 + goto_if_eq EventScript_SetupRivalOnBikeMale end -LavaridgeTown_EventScript_271F13:: @ 8271F13 +EventScript_SetupRivalOnBikeFemale:: @ 8271F13 setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_MAY_MACH_BIKE return -LavaridgeTown_EventScript_271F19:: @ 8271F19 +EventScript_SetupRivalOnBikeMale:: @ 8271F19 setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE return -EventScript_271F1F:: @ 8271F1F +@ Unused +Common_EventScript_SetupRivalSameGender:: @ 8271F1F checkplayergender compare VAR_RESULT, MALE - goto_if_eq EventScript_271F37 + goto_if_eq EventScript_SetupRivalMale2 compare VAR_RESULT, FEMALE - goto_if_eq EventScript_271F3D + goto_if_eq EventScript_SetupRivalFemale2 end -EventScript_271F37:: @ 8271F37 +EventScript_SetupRivalMale2:: @ 8271F37 setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL return -EventScript_271F3D:: @ 8271F3D +EventScript_SetupRivalFemale2:: @ 8271F3D setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL return -DewfordTown_Gym_EventScript_271F43:: @ 8271F43 -FortreeCity_Gym_EventScript_271F43:: @ 8271F43 -LavaridgeTown_Gym_1F_EventScript_271F43:: @ 8271F43 -MauvilleCity_Gym_EventScript_271F43:: @ 8271F43 -MossdeepCity_Gym_EventScript_271F43:: @ 8271F43 -PetalburgCity_Gym_EventScript_271F43:: @ 8271F43 -RustboroCity_Gym_EventScript_271F43:: @ 8271F43 -SootopolisCity_Gym_1F_EventScript_271F43:: @ 8271F43 +Common_EventScript_SetGymTrainers:: @ 8271F43 switch VAR_0x8008 - case 1, DewfordTown_Gym_EventScript_271FA1 - case 2, DewfordTown_Gym_EventScript_271FAB - case 3, DewfordTown_Gym_EventScript_271FBE - case 4, DewfordTown_Gym_EventScript_271FCE - case 5, DewfordTown_Gym_EventScript_271FE7 - case 6, DewfordTown_Gym_EventScript_271FFD - case 7, DewfordTown_Gym_EventScript_272010 - case 8, DewfordTown_Gym_EventScript_272035 + case 1, RusboroCity_Gym_SetGymTrainers + case 2, DewfordTown_Gym_SetGymTrainers + case 3, MauvilleCity_Gym_SetGymTrainers + case 4, LavaridgeTown_Gym_SetGymTrainers + case 5, PetalburgCity_Gym_SetGymTrainers + case 6, FortreeCity_Gym_SetGymTrainers + case 7, MossdeepCity_Gym_SetGymTrainers + case 8, SootopolisCity_Gym_SetGymTrainers end -DewfordTown_Gym_EventScript_271FA1:: @ 8271FA1 +RusboroCity_Gym_SetGymTrainers:: @ 8271FA1 settrainerflag TRAINER_JOSH settrainerflag TRAINER_TOMMY settrainerflag TRAINER_MARC return -DewfordTown_Gym_EventScript_271FAB:: @ 8271FAB +DewfordTown_Gym_SetGymTrainers:: @ 8271FAB settrainerflag TRAINER_TAKAO settrainerflag TRAINER_JOCELYN settrainerflag TRAINER_LAURA @@ -1819,7 +1790,7 @@ DewfordTown_Gym_EventScript_271FAB:: @ 8271FAB settrainerflag TRAINER_LILITH return -DewfordTown_Gym_EventScript_271FBE:: @ 8271FBE +MauvilleCity_Gym_SetGymTrainers:: @ 8271FBE settrainerflag TRAINER_KIRK settrainerflag TRAINER_SHAWN settrainerflag TRAINER_BEN @@ -1827,7 +1798,7 @@ DewfordTown_Gym_EventScript_271FBE:: @ 8271FBE settrainerflag TRAINER_ANGELO return -DewfordTown_Gym_EventScript_271FCE:: @ 8271FCE +LavaridgeTown_Gym_SetGymTrainers:: @ 8271FCE settrainerflag TRAINER_COLE settrainerflag TRAINER_AXLE settrainerflag TRAINER_KEEGAN @@ -1838,7 +1809,7 @@ DewfordTown_Gym_EventScript_271FCE:: @ 8271FCE settrainerflag TRAINER_ELI return -DewfordTown_Gym_EventScript_271FE7:: @ 8271FE7 +PetalburgCity_Gym_SetGymTrainers:: @ 8271FE7 settrainerflag TRAINER_RANDALL settrainerflag TRAINER_PARKER settrainerflag TRAINER_GEORGE @@ -1848,7 +1819,7 @@ DewfordTown_Gym_EventScript_271FE7:: @ 8271FE7 settrainerflag TRAINER_JODY return -DewfordTown_Gym_EventScript_271FFD:: @ 8271FFD +FortreeCity_Gym_SetGymTrainers:: @ 8271FFD settrainerflag TRAINER_JARED settrainerflag TRAINER_FLINT settrainerflag TRAINER_ASHLEY @@ -1857,7 +1828,7 @@ DewfordTown_Gym_EventScript_271FFD:: @ 8271FFD settrainerflag TRAINER_DARIUS return -DewfordTown_Gym_EventScript_272010:: @ 8272010 +MossdeepCity_Gym_SetGymTrainers:: @ 8272010 settrainerflag TRAINER_PRESTON settrainerflag TRAINER_VIRGIL settrainerflag TRAINER_BLAKE @@ -1872,7 +1843,7 @@ DewfordTown_Gym_EventScript_272010:: @ 8272010 settrainerflag TRAINER_NICHOLAS return -DewfordTown_Gym_EventScript_272035:: @ 8272035 +SootopolisCity_Gym_SetGymTrainers:: @ 8272035 settrainerflag TRAINER_ANDREA settrainerflag TRAINER_CRISSY settrainerflag TRAINER_BRIANNA @@ -1929,16 +1900,12 @@ EventScript_RegionMap:: @ 827208F releaseall end -DewfordTown_EventScript_2720A0:: @ 82720A0 -Route104_EventScript_2720A0:: @ 82720A0 -Route109_EventScript_2720A0:: @ 82720A0 +Common_EventScript_PlayBrineysBoatMusic:: @ 82720A0 setflag FLAG_SPECIAL_FLAG_0x4001 playbgm MUS_M_BOAT, 0 return -DewfordTown_EventScript_2720A8:: @ 82720A8 -Route104_EventScript_2720A8:: @ 82720A8 -Route109_EventScript_2720A8:: @ 82720A8 +Common_EventScript_StopBrineysBoatMusic:: @ 82720A8 clearflag FLAG_SPECIAL_FLAG_0x4001 fadedefaultbgm return @@ -1997,7 +1964,7 @@ Route103_EventScript_272141:: @ 8272141 goto_if_unset FLAG_ENABLE_PROF_BIRCH_MATCH_CALL, Route101_EventScript_1FA2D2 Route101_EventScript_272155:: @ 8272155 - msgbox gUnknown_082A5C9C, MSGBOX_YESNO + msgbox gBirchDexRatingText_AreYouCurious, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq Route101_EventScript_27216F call Route101_EventScript_272184 @@ -2005,7 +1972,7 @@ Route101_EventScript_272155:: @ 8272155 end Route101_EventScript_27216F:: @ 827216F - msgbox Route101_Text_2A5CEB, MSGBOX_DEFAULT + msgbox gBirchDexRatingText_Cancel, MSGBOX_DEFAULT release end @@ -2025,7 +1992,7 @@ Route101_EventScript_272184:: @ 8272184 copyvar VAR_0x800A, VAR_RESULT buffernumberstring 0, VAR_0x8008 buffernumberstring 1, VAR_0x8009 - msgbox gUnknown_082A5D2C, MSGBOX_DEFAULT + msgbox gBirchDexRatingText_SoYouveSeenAndCaught, MSGBOX_DEFAULT call Route101_EventScript_272179 compare VAR_0x800A, 0 goto_if_eq Common_EventScript_NopReturn @@ -2035,7 +2002,7 @@ Route101_EventScript_272184:: @ 8272184 copyvar VAR_0x8009, VAR_0x8006 buffernumberstring 0, VAR_0x8008 buffernumberstring 1, VAR_0x8009 - msgbox gUnknown_082A633D, MSGBOX_DEFAULT + msgbox gBirchDexRatingText_OnANationwideBasis, MSGBOX_DEFAULT return BattleFrontier_OutsideWest_EventScript_2721E2:: @ 82721E2 @@ -2236,16 +2203,16 @@ Route119_EventScript_272365:: @ 8272365 clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_if_eq Route119_EventScript_2723C1 + goto_if_eq EventScript_RemoveKecleon compare VAR_RESULT, 4 - goto_if_eq Route119_EventScript_2723C1 + goto_if_eq EventScript_RemoveKecleon compare VAR_RESULT, 5 - goto_if_eq Route119_EventScript_2723C1 + goto_if_eq EventScript_RemoveKecleon release end -Route119_EventScript_2723C1:: @ 82723C1 - goto Route119_EventScript_27376D +EventScript_RemoveKecleon:: @ 82723C1 + goto Common_EventScript_RemoveStaticPokemon end FortreeCity_Movement_2723C7: @ 82723C7 @@ -2274,18 +2241,16 @@ Route120_Movement_2723C7: @ 82723C7 set_visible step_end -Common_EventScript_NameReceivedPokemon:: @ 82723DD +Common_EventScript_NameReceivedPartyMon:: @ 82723DD fadescreen 1 special ChangePokemonNickname waitstate return -FallarborTown_House1_EventScript_2723E4:: @ 82723E4 -GraniteCave_StevensRoom_EventScript_2723E4:: @ 82723E4 -SlateportCity_OceanicMuseum_2F_EventScript_2723E4:: @ 82723E4 +Common_EventScript_PlayerHandedOverTheItem:: @ 82723E4 bufferitemname 0, VAR_0x8004 playfanfare MUS_ME_WAZA - message gUnknown_08273161 + message gText_PlayerHandedOverTheItem waitmessage waitfanfare takeitem VAR_0x8004, 1 @@ -2521,196 +2486,302 @@ gText_AccessedPlayersPC:: @ 82726C2 gText_AccessedLanettesPC:: @ 82726D4 .string "Accessed LANETTE's PC.$" -gUnknown_082726EB:: @ 82726EB - .string "Hello, and welcome to\nthe POKéMON CENTER.\pWe restore your tired POKéMON\nto full health.\pWould you like to rest your POKéMON?$" +gText_WouldYouLikeToRestYourPkmn:: @ 82726EB + .string "Hello, and welcome to\n" + .string "the POKéMON CENTER.\p" + .string "We restore your tired POKéMON\n" + .string "to full health.\p" + .string "Would you like to rest your POKéMON?$" -gUnknown_08272768:: @ 8272768 - .string "Okay, I'll take your POKéMON\nfor a few seconds.$" +gText_IllTakeYourPkmn:: @ 8272768 + .string "Okay, I'll take your POKéMON\n" + .string "for a few seconds.$" -gUnknown_08272798:: @ 8272798 - .string "Thank you for waiting.\pWe've restored your POKéMON\nto full health.$" +gText_RestoredPkmnToFullHealth:: @ 8272798 + .string "Thank you for waiting.\p" + .string "We've restored your POKéMON\n" + .string "to full health.$" -gUnknown_082727DB:: @ 82727DB +gText_WeHopeToSeeYouAgain:: @ 82727DB .string "We hope to see you again!$" -gUnknown_082727F5:: @ 82727F5 - .string "Hello, and welcome to\nthe POKéMON CENTER.\pWe restore your tired POKéMON\nto full health.\pWould you like to…$" - -gUnknown_08272860:: @ 8272860 - .string "Th-that card…\nCould it be… The GOLD CARD?!\pOh, the gold color is brilliant!\nThe four stars seem to sparkle!\pI've seen several TRAINERS with\na SILVER CARD before, but, {PLAYER},\lyou're the first TRAINER I've ever\lseen with a GOLD CARD!\pOkay, {PLAYER}, please allow me\nthe honor of resting your POKéMON!$" - -gUnknown_08272982:: @ 8272982 - .string "I'm delighted to see you, {PLAYER}!\nYou want the usual, am I right?$" - -gUnknown_082729C0:: @ 82729C0 - .string "Okay, I'll take your POKéMON\nfor a few seconds.$" - -gUnknown_082729F0:: @ 82729F0 +gText_WelcomeCutShort:: @ 82727F5 + .string "Hello, and welcome to\n" + .string "the POKéMON CENTER.\p" + .string "We restore your tired POKéMON\n" + .string "to full health.\p" + .string "Would you like to…$" + +gText_NoticesGoldCard:: @ 8272860 + .string "Th-that card…\n" + .string "Could it be… The GOLD CARD?!\p" + .string "Oh, the gold color is brilliant!\n" + .string "The four stars seem to sparkle!\p" + .string "I've seen several TRAINERS with\n" + .string "a SILVER CARD before, but, {PLAYER},\l" + .string "you're the first TRAINER I've ever\l" + .string "seen with a GOLD CARD!\p" + .string "Okay, {PLAYER}, please allow me\n" + .string "the honor of resting your POKéMON!$" + +gText_YouWantTheUsual:: @ 8272982 + .string "I'm delighted to see you, {PLAYER}!\n" + .string "You want the usual, am I right?$" + +gText_IllTakeYourPkmn2:: @ 82729C0 + .string "Okay, I'll take your POKéMON\n" + .string "for a few seconds.$" + +gText_ThankYouForWaiting:: @ 82729F0 .string "Thank you for waiting.$" -gUnknown_08272A07:: @ 8272A07 +gText_WeHopeToSeeYouAgain2:: @ 8272A07 .string "We hope to see you again!$" -gUnknown_08272A21:: @ 8272A21 - .string "Welcome!\pHow may I serve you?$" +gText_HowMayIServeYou:: @ 8272A21 + .string "Welcome!\p" + .string "How may I serve you?$" -gUnknown_08272A3F:: @ 8272A3F +gText_PleaseComeAgain:: @ 8272A3F .string "Please come again!$" -gUnknown_08272A52:: @ 8272A52 - .string "{PLAYER}{KUN}, welcome!\pWhat can I do for you?$" +gText_PlayerWhatCanIDoForYou:: @ 8272A52 + .string "{PLAYER}{STRING 5}, welcome!\p" + .string "What can I do for you?$" -gUnknown_08272A78:: @ 8272A78 +gText_ObtainedTheItem:: @ 8272A78 .string "Obtained the {STR_VAR_2}!$" -gUnknown_08272A89:: @ 8272A89 +gText_TheBagIsFull:: @ 8272A89 .string "The BAG is full…$" gText_PutItemInPocket:: @ 8272A9A - .string "{PLAYER} put away the {STR_VAR_2}\nin the {STR_VAR_3} POCKET.$" + .string "{PLAYER} put away the {STR_VAR_2}\n" + .string "in the {STR_VAR_3} POCKET.$" gText_PlayerFoundOneItem:: @ 8272ABF .string "{PLAYER} found one {STR_VAR_2}!$" gText_TooBadBagIsFull:: @ 8272AD0 - .string "Too bad!\nThe BAG is full…$" + .string "Too bad!\n" + .string "The BAG is full…$" gText_PlayerPutItemInBag:: @ 8272AEA - .string "{PLAYER} put away the {STR_VAR_2}\nin the BAG.$" + .string "{PLAYER} put away the {STR_VAR_2}\n" + .string "in the BAG.$" -gUnknown_08272B09:: @ 8272B09 +gText_ObtainedTheMon:: @ 8272B09 .string "Obtained the {STR_VAR_2}!$" gText_NoRoomLeftForAnother:: @ 8272B1A - .string "Too bad! There's no room left for\nanother {STR_VAR_2}…$" + .string "Too bad! There's no room left for\n" + .string "another {STR_VAR_2}…$" -gUnknown_08272B48:: @ 8272B48 - .string "The {STR_VAR_2} was transferred\nto the PC.$" +gText_TheMonWasTransferredToThePC:: @ 8272B48 + .string "The {STR_VAR_2} was transferred\n" + .string "to the PC.$" gText_PokemartSign:: @ 8272B6A - .string "“Selected items for your convenience!”\nPOKéMON MART$" + .string "“Selected items for your convenience!”\n" + .string "POKéMON MART$" gText_PokemonCenterSign:: @ 8272B9E - .string "“Rejuvenate your tired partners!”\nPOKéMON CENTER$" + .string "“Rejuvenate your tired partners!”\n" + .string "POKéMON CENTER$" -gUnknown_08272BCF:: @ 8272BCF - .string "{STR_VAR_1} might like this program.\n… … … … … … … … … … … … … … … …\pBetter get going!$" +gText_MomOrDadMightLikeThisProgram:: @ 8272BCF + .string "{STR_VAR_1} might like this program.\n" + .string "… … … … … … … … … … … … … … … …\p" + .string "Better get going!$" -gUnknown_08272C1D:: @ 8272C1D - .string "Welcome to LILYCOVE DEPARTMENT STORE.\pWhich floor would you like?$" +gText_WhichFloorWouldYouLike:: @ 8272C1D + .string "Welcome to LILYCOVE DEPARTMENT STORE.\p" + .string "Which floor would you like?$" -gUnknown_08272C5F:: @ 8272C5F - .string "The sandstorm is vicious.\nIt's impossible to keep going.$" +gText_SandstormIsVicious:: @ 8272C5F + .string "The sandstorm is vicious.\n" + .string "It's impossible to keep going.$" gText_SelectWithoutRegisteredItem:: @ 8272C98 - .string "An item in the BAG can be\nregistered to SELECT for easy use.$" + .string "An item in the BAG can be\n" + .string "registered to SELECT for easy use.$" -gUnknown_08272CD5:: @ 8272CD5 - .string "There's an e-mail from POKéMON TRAINER\nSCHOOL.\p… … … … … …\pA POKéMON may learn up to four moves.\pA TRAINER's expertise is tested on the\nmove sets chosen for POKéMON.\p… … … … … …$" +gText_PokemonTrainerSchoolEmail:: @ 8272CD5 + .string "There's an e-mail from POKéMON TRAINER\n" + .string "SCHOOL.\p" + .string "… … … … … …\p" + .string "A POKéMON may learn up to four moves.\p" + .string "A TRAINER's expertise is tested on the\n" + .string "move sets chosen for POKéMON.\p" + .string "… … … … … …$" gText_PlayerHouseBootPC:: @ 8272D87 .string "{PLAYER} booted up the PC.$" -gUnknown_08272D9C:: @ 8272D9C +gText_PokeblockLinkCanceled:: @ 8272D9C .string "The link was canceled.$" -gUnknown_08272DB3:: @ 8272DB3 - .string "Want to give a nickname to\nthe {STR_VAR_2} you received?$" +gText_UnusedNicknameReceivedPokemon:: @ 8272DB3 + .string "Want to give a nickname to\n" + .string "the {STR_VAR_2} you received?$" -gUnknown_08272DE3:: @ 8272DE3 - .string "{PLAYER} is out of usable\nPOKéMON!\p{PLAYER} whited out!$" +gText_PlayerWhitedOut:: @ 8272DE3 + .string "{PLAYER} is out of usable\n" + .string "POKéMON!\p{PLAYER} whited out!$" gText_RegisteredTrainerinPokeNav:: @ 8272E0F - .string "Registered {STR_VAR_1} {STR_VAR_2}\nin the POKéNAV.$" - -gUnknown_08272E30:: @ 8272E30 - .string "Do you know the TM SECRET POWER?\pOur group, we love the TM SECRET\nPOWER.\pOne of our members will give it to you.\nCome back and show me if you get it.\pWe'll accept you as a member and sell\nyou good stuff in secrecy.$" + .string "Registered {STR_VAR_1} {STR_VAR_2}\n" + .string "in the POKéNAV.$" + +gText_ComeBackWithSecretPower:: @ 8272E30 + .string "Do you know the TM SECRET POWER?\p" + .string "Our group, we love the TM SECRET\n" + .string "POWER.\p" + .string "One of our members will give it to you.\n" + .string "Come back and show me if you get it.\p" + .string "We'll accept you as a member and sell\n" + .string "you good stuff in secrecy.$" gText_PokerusExplanation:: @ 8272F07 - .string "Your POKéMON may be infected with\nPOKéRUS.\pLittle is known about the POKéRUS\nexcept that they are microscopic life-\lforms that attach to POKéMON.\pWhile infected, POKéMON are said to\ngrow exceptionally well.$" + .string "Your POKéMON may be infected with\n" + .string "POKéRUS.\p" + .string "Little is known about the POKéRUS\n" + .string "except that they are microscopic life-\l" + .string "forms that attach to POKéMON.\p" + .string "While infected, POKéMON are said to\n" + .string "grow exceptionally well.$" .include "data/text/surf.inc" -gUnknown_0827301B:: @ 827301B - .string "It sounded as if a door opened\nsomewhere far away.$" +gText_DoorOpenedFarAway:: @ 827301B + .string "It sounded as if a door opened\n" + .string "somewhere far away.$" -gUnknown_0827304E:: @ 827304E +gText_BigHoleInTheWall:: @ 827304E .string "There is a big hole in the wall.$" -gUnknown_0827306F:: @ 827306F - .string "I'm terribly sorry.\nThe POKéMON WIRELESS CLUB is\lundergoing adjustments now.$" +gText_SorryWirelessClubAdjustments:: @ 827306F + .string "I'm terribly sorry.\n" + .string "The POKéMON WIRELESS CLUB is\l" + .string "undergoing adjustments now.$" -gUnknown_082730BC:: @ 82730BC - .string "It appears to be undergoing\nadjustments…$" +gText_UndergoingAdjustments:: @ 82730BC + .string "It appears to be undergoing\n" + .string "adjustments…$" -gUnknown_082730E5:: @ 82730E5 - .string "I'm terribly sorry. The TRADE CENTER\nis undergoing inspections.$" +@ Unused +gText_SorryTradeCenterInspections:: @ 82730E5 + .string "I'm terribly sorry. The TRADE CENTER\n" + .string "is undergoing inspections.$" -gUnknown_08273125:: @ 8273125 - .string "I'm terribly sorry. The RECORD CORNER\nis under preparation.$" +@ Unused +gText_SorryRecordCornerPreparation:: @ 8273125 + .string "I'm terribly sorry. The RECORD CORNER\n" + .string "is under preparation.$" -gUnknown_08273161:: @ 8273161 - .string "{PLAYER} handed over the\n{STR_VAR_1}.$" +gText_PlayerHandedOverTheItem:: @ 8273161 + .string "{PLAYER} handed over the\n" + .string "{STR_VAR_1}.$" -gUnknown_08273178:: @ 8273178 - .string "Thank you for accessing the\nMYSTERY GIFT System.$" +gText_ThankYouForAccessingMysteryGift:: @ 8273178 + .string "Thank you for accessing the\n" + .string "MYSTERY GIFT System.$" gText_PlayerFoundOneItemTwoLines:: @ 82731A9 - .string "{PLAYER} found one {STR_VAR_1}\n{STR_VAR_2}!$" + .string "{PLAYER} found one {STR_VAR_1}\n" + .string "{STR_VAR_2}!$" gText_Sudowoodo_Attacked:: @ 82731BD - .string "The weird tree doesn't like the\nWAILMER PAIL!\pThe weird tree attacked!$" + .string "The weird tree doesn't like the\n" + .string "WAILMER PAIL!\p" + .string "The weird tree attacked!$" gText_LegendaryFlewAway:: @ 8273204 .string "The {STR_VAR_1} flew away!$" gText_PkmnTransferredSomeonesPC:: @ 8273216 - .string "{STR_VAR_2} was transferred to\nSOMEONE'S PC.\pIt was placed in \nBOX “{STR_VAR_1}.”$" + .string "{STR_VAR_2} was transferred to\n" + .string "SOMEONE'S PC.\p" + .string "It was placed in \n" + .string "BOX “{STR_VAR_1}.”$" gText_PkmnTransferredLanettesPC:: @ 8273256 - .string "{STR_VAR_2} was transferred to\nLANETTE'S PC.\pIt was placed in \nBOX “{STR_VAR_1}.”$" + .string "{STR_VAR_2} was transferred to\nLANETTE'S PC.\p" + .string "It was placed in \n" + .string "BOX “{STR_VAR_1}.”$" gText_PkmnBoxSomeonesPCFull:: @ 8273296 - .string "BOX “{STR_VAR_3}” on\nSOMEONE'S PC was full.\p{STR_VAR_2} was transferred to\nBOX “{STR_VAR_1}.”$" + .string "BOX “{STR_VAR_3}” on\n" + .string "SOMEONE'S PC was full.\p" + .string "{STR_VAR_2} was transferred to\n" + .string "BOX “{STR_VAR_1}.”$" gText_PkmnBoxLanettesPCFull:: @ 82732D9 - .string "BOX “{STR_VAR_3}” on\nLANETTE'S PC was full.\p{STR_VAR_2} was transferred to\nBOX “{STR_VAR_1}.”$" + .string "BOX “{STR_VAR_3}” on\n" + .string "LANETTE'S PC was full.\p" + .string "{STR_VAR_2} was transferred to\n" + .string "BOX “{STR_VAR_1}.”$" -gUnknown_0827331C:: @ 827331C - .string "There's no more room for POKéMON!\pThe POKéMON BOXES are full and\ncan't accept any more!$" +gText_NoMoreRoomForPokemon:: @ 827331C + .string "There's no more room for POKéMON!\p" + .string "The POKéMON BOXES are full and\n" + .string "can't accept any more!$" gText_NicknameThisPokemon:: @ 8273374 - .string "Do you want to give a nickname to\nthis {STR_VAR_1}?$" + .string "Do you want to give a nickname to\n" + .string "this {STR_VAR_1}?$" -gUnknown_0827339F:: @ 827339F - .string "There is a questionnaire.\nWould you like to fill it out?$" +gText_FillOutQuestionnaire:: @ 827339F + .string "There is a questionnaire.\n" + .string "Would you like to fill it out?$" -gUnknown_082733D8:: @ 82733D8 - .string "Thank you for taking the time to\nfill out our questionnaire.\pYour feedback will be used for\nfuture reference.$" +gText_ThankYouForTakingQuestionnaire:: @ 82733D8 + .string "Thank you for taking the time to\n" + .string "fill out our questionnaire.\p" + .string "Your feedback will be used for\n" + .string "future reference.$" gUnknown_08273446:: @ 8273446 - .string "Oh, hello!\nYou know those words?\pThat means you must know about\nthe MYSTERY GIFT.\pFrom now on, you should be\nreceiving MYSTERY GIFTS!$" + .string "Oh, hello!\n" + .string "You know those words?\p" + .string "That means you must know about\n" + .string "the MYSTERY GIFT.\p" + .string "From now on, you should be\n" + .string "receiving MYSTERY GIFTS!$" gUnknown_082734CC:: @ 82734CC - .string "Once you save your game, you can\naccess the MYSTERY GIFT.$" + .string "Once you save your game, you can\n" + .string "access the MYSTERY GIFT.$" gUnknown_08273506:: @ 8273506 - .string "Oh, hello!\nYou know those words?\pThat means you must know about\nthe MYSTERY EVENT.$" + .string "Oh, hello!\n" + .string "You know those words?\p" + .string "That means you must know about\n" + .string "the MYSTERY EVENT.$" gUnknown_08273559:: @ 8273559 - .string "Once you save your game, you can\naccess the MYSTERY EVENT.$" + .string "Once you save your game, you can\n" + .string "access the MYSTERY EVENT.$" gUnknown_08273594:: @ 8273594 - .string "Thank you for using the MYSTERY\nEVENT System.\pYou must be {PLAYER}.\nThere is a ticket here for you.$" + .string "Thank you for using the MYSTERY\n" + .string "EVENT System.\p" + .string "You must be {PLAYER}.\n" + .string "There is a ticket here for you.$" gUnknown_082735F2:: @ 82735F2 - .string "It appears to be for use at\nthe LILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$" + .string "It appears to be for use at\n" + .string "the LILYCOVE CITY port.\p" + .string "Why not give it a try and see what\n" + .string "it is about?$" gText_UnusualWeatherEnded_Rain:: @ 8273656 - .string "The massive downpour appears to\nhave stopped…$" + .string "The massive downpour appears to\n" + .string "have stopped…$" gText_UnusualWeatherEnded_Sun:: @ 8273684 - .string "The intense sunshine appears to\nhave subsided…$" + .string "The intense sunshine appears to\n" + .string "have subsided…$" EventScript_SelectWithoutRegisteredItem:: @ 82736B3 msgbox gText_SelectWithoutRegisteredItem, MSGBOX_SIGN @@ -2728,7 +2799,7 @@ EventScript_Poison:: @ 82736BC end EventScript_2736D9:: @ 82736D9 - message gUnknown_08272DE3 + message gText_PlayerWhitedOut waitmessage waitbuttonpress special sub_80B05B4 @@ -2744,7 +2815,7 @@ EventScript_2736F4:: @ 82736F4 return EventScript_2736F8:: @ 82736F8 - message gUnknown_08272DE3 + message gText_PlayerWhitedOut waitmessage waitbuttonpress setvar VAR_0x8004, 16 @@ -2771,11 +2842,12 @@ EventScript_2736F8:: @ 82736F8 Common_EventScript_NopReturn:: @ 827374E return -EventScript_UnusedSetVarResult1:: @ 827374F +@ Unused +EventScript_CableClub_SetVarResult1:: @ 827374F setvar VAR_RESULT, 1 return -OldaleTown_PokemonCenter_2F_EventScript_273755:: @ 8273755 +EventScript_CableClub_SetVarResult0:: @ 8273755 setvar VAR_RESULT, 0 return @@ -2839,30 +2911,14 @@ VerdanturfTown_PokemonCenter_2F_EventScript_273767:: @ 8273767 call OldaleTown_PokemonCenter_2F_EventScript_2776A4 end -AncientTomb_EventScript_27376D:: @ 827376D -AquaHideout_B1F_EventScript_27376D:: @ 827376D -DesertRuins_EventScript_27376D:: @ 827376D -IslandCave_EventScript_27376D:: @ 827376D -MarineCave_End_EventScript_27376D:: @ 827376D -NewMauville_Inside_EventScript_27376D:: @ 827376D -Route119_EventScript_27376D:: @ 827376D -TerraCave_End_EventScript_27376D:: @ 827376D +Common_EventScript_RemoveStaticPokemon:: @ 827376D fadescreenswapbuffers 1 removeobject VAR_LAST_TALKED fadescreenswapbuffers 0 release end -AncientTomb_EventScript_273776:: @ 8273776 -BirthIsland_Exterior_EventScript_273776:: @ 8273776 -DesertRuins_EventScript_273776:: @ 8273776 -FarawayIsland_Interior_EventScript_273776:: @ 8273776 -IslandCave_EventScript_273776:: @ 8273776 -MarineCave_End_EventScript_273776:: @ 8273776 -NavelRock_Bottom_EventScript_273776:: @ 8273776 -NavelRock_Top_EventScript_273776:: @ 8273776 -SouthernIsland_Interior_EventScript_273776:: @ 8273776 -TerraCave_End_EventScript_273776:: @ 8273776 +Common_EventScript_LegendaryFlewAway:: @ 8273776 fadescreenswapbuffers 1 removeobject VAR_LAST_TALKED fadescreenswapbuffers 0 @@ -2871,19 +2927,14 @@ TerraCave_End_EventScript_273776:: @ 8273776 release end -LittlerootTown_ProfessorBirchsLab_EventScript_27378B:: @ 827378B -MossdeepCity_StevensHouse_EventScript_27378B:: @ 827378B -Route119_WeatherInstitute_2F_EventScript_27378B:: @ 827378B -RustboroCity_DevonCorp_2F_EventScript_27378B:: @ 827378B +@ VAR_0x8004 here is used by ChangePokemonNickname +Common_EventScript_GetGiftMonPartySlot:: @ 827378B getpartysize subvar VAR_RESULT, 1 copyvar VAR_0x8004, VAR_RESULT return -LittlerootTown_ProfessorBirchsLab_EventScript_273797:: @ 8273797 -MossdeepCity_StevensHouse_EventScript_273797:: @ 8273797 -Route119_WeatherInstitute_2F_EventScript_273797:: @ 8273797 -RustboroCity_DevonCorp_2F_EventScript_273797:: @ 8273797 +Common_EventScript_NameReceivedBoxMon:: @ 8273797 fadescreen 1 special ChangeBoxPokemonNickname waitstate @@ -2927,17 +2978,14 @@ LittlerootTown_ProfessorBirchsLab_EventScript_2737FF:: @ 82737FF msgbox gText_PkmnBoxLanettesPCFull, MSGBOX_DEFAULT return -LittlerootTown_ProfessorBirchsLab_EventScript_273811:: @ 8273811 -MossdeepCity_StevensHouse_EventScript_273811:: @ 8273811 -Route119_WeatherInstitute_2F_EventScript_273811:: @ 8273811 -RustboroCity_DevonCorp_2F_EventScript_273811:: @ 8273811 - msgbox gUnknown_0827331C, MSGBOX_DEFAULT +Common_EventScript_NoMoreRoomForPokemon:: @ 8273811 + msgbox gText_NoMoreRoomForPokemon, MSGBOX_DEFAULT release end EventScript_Questionnaire:: @ 827381B lockall - msgbox gUnknown_0827339F, MSGBOX_YESNO + msgbox gText_FillOutQuestionnaire, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq EventScript_2738FD setvar VAR_0x8004, EASY_CHAT_TYPE_QUESTIONNAIRE @@ -2994,7 +3042,7 @@ EventScript_2738FD:: @ 82738FD EventScript_2738FF:: @ 82738FF applymovement VAR_0x8008, Common_Movement_FaceDown waitmovement 0 - msgbox gUnknown_082733D8, MSGBOX_DEFAULT + msgbox gText_ThankYouForTakingQuestionnaire, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/AncientTomb/scripts.inc b/data/maps/AncientTomb/scripts.inc index 9bc404af6..48962d957 100644 --- a/data/maps/AncientTomb/scripts.inc +++ b/data/maps/AncientTomb/scripts.inc @@ -47,7 +47,7 @@ AncientTomb_EventScript_239033:: @ 8239033 end AncientTomb_EventScript_239046:: @ 8239046 - msgbox gUnknown_0827304E, MSGBOX_DEFAULT + msgbox gText_BigHoleInTheWall, MSGBOX_DEFAULT releaseall end @@ -84,11 +84,11 @@ AncientTomb_EventScript_23905A:: @ 823905A AncientTomb_EventScript_2390A1:: @ 82390A1 setflag FLAG_DEFEATED_REGISTEEL - goto AncientTomb_EventScript_27376D + goto Common_EventScript_RemoveStaticPokemon end AncientTomb_EventScript_2390AA:: @ 82390AA - setvar VAR_0x8004, 403 - goto AncientTomb_EventScript_273776 + setvar VAR_0x8004, SPECIES_REGISTEEL + goto Common_EventScript_LegendaryFlewAway end diff --git a/data/maps/AquaHideout_B1F/scripts.inc b/data/maps/AquaHideout_B1F/scripts.inc index 589e41612..135926c77 100644 --- a/data/maps/AquaHideout_B1F/scripts.inc +++ b/data/maps/AquaHideout_B1F/scripts.inc @@ -51,7 +51,7 @@ AquaHideout_B1F_EventScript_2339EB:: @ 82339EB AquaHideout_B1F_EventScript_233A2F:: @ 8233A2F setflag FLAG_DEFEATED_ELECTRODE_1_AQUA_HIDEOUT - goto AquaHideout_B1F_EventScript_27376D + goto Common_EventScript_RemoveStaticPokemon end AquaHideout_B1F_EventScript_233A38:: @ 8233A38 @@ -78,7 +78,7 @@ AquaHideout_B1F_EventScript_233A38:: @ 8233A38 AquaHideout_B1F_EventScript_233A7C:: @ 8233A7C setflag FLAG_DEFEATED_ELECTRODE_2_AQUA_HIDEOUT - goto AquaHideout_B1F_EventScript_27376D + goto Common_EventScript_RemoveStaticPokemon end AquaHideout_B1F_EventScript_233A85:: @ 8233A85 diff --git a/data/maps/BattleFrontier_Mart/scripts.inc b/data/maps/BattleFrontier_Mart/scripts.inc index d84b2cb0a..59ba707d8 100644 --- a/data/maps/BattleFrontier_Mart/scripts.inc +++ b/data/maps/BattleFrontier_Mart/scripts.inc @@ -4,10 +4,10 @@ BattleFrontier_Mart_MapScripts:: @ 8267ACB BattleFrontier_Mart_EventScript_267ACC:: @ 8267ACC lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemart BattleFrontier_Mart_Pokemart_267AE4 - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/BattleFrontier_OutsideEast/scripts.inc b/data/maps/BattleFrontier_OutsideEast/scripts.inc index b502da8ec..3873c5c01 100644 --- a/data/maps/BattleFrontier_OutsideEast/scripts.inc +++ b/data/maps/BattleFrontier_OutsideEast/scripts.inc @@ -145,7 +145,7 @@ BattleFrontier_OutsideEast_EventScript_242CFC:: @ 8242CFC BattleFrontier_OutsideEast_EventScript_242D60:: @ 8242D60 setflag FLAG_DEFEATED_SUDOWOODO - goto IslandCave_EventScript_27376D + goto Common_EventScript_RemoveStaticPokemon end BattleFrontier_OutsideEast_Movement_242D69: @ 8242D69 diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc index c99a0de38..167f9afa0 100644 --- a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc +++ b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc @@ -9,7 +9,7 @@ BattleFrontier_PokemonCenter_1F_MapScript1_267904: @ 8267904 BattleFrontier_PokemonCenter_1F_EventScript_267908:: @ 8267908 setvar VAR_0x800B, 1 - call BattleFrontier_PokemonCenter_1F_EventScript_27191E + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index 3eb491e0f..b37d60a41 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -79,9 +79,9 @@ BirthIsland_Exterior_EventScript_267FC1:: @ 8267FC1 delay 40 waitmoncry setvar VAR_LAST_TALKED, 2 - setvar VAR_0x8004, 410 - setvar VAR_0x8005, 30 - setvar VAR_0x8006, 0 + setvar VAR_0x8004, SPECIES_DEOXYS + setvar VAR_0x8005, 30 @level + setvar VAR_0x8006, ITEM_NONE special CreateObedientEnemyMon setflag FLAG_SYS_CTRL_OBJ_DELETE special BattleSetup_StartLegendaryBattle @@ -100,13 +100,13 @@ BirthIsland_Exterior_EventScript_267FC1:: @ 8267FC1 BirthIsland_Exterior_EventScript_26803B:: @ 826803B setflag FLAG_DEFEATED_DEOXYS - setvar VAR_0x8004, 410 - goto BirthIsland_Exterior_EventScript_273776 + setvar VAR_0x8004, SPECIES_DEOXYS + goto Common_EventScript_LegendaryFlewAway end BirthIsland_Exterior_EventScript_268049:: @ 8268049 - setvar VAR_0x8004, 410 - goto BirthIsland_Exterior_EventScript_273776 + setvar VAR_0x8004, SPECIES_DEOXYS + goto Common_EventScript_LegendaryFlewAway end BirthIsland_Exterior_Movement_268054: @ 8268054 diff --git a/data/maps/DesertRuins/scripts.inc b/data/maps/DesertRuins/scripts.inc index 5cadf3ec0..525bdff4a 100644 --- a/data/maps/DesertRuins/scripts.inc +++ b/data/maps/DesertRuins/scripts.inc @@ -47,7 +47,7 @@ DesertRuins_EventScript_22D9DB:: @ 822D9DB end DesertRuins_EventScript_22D9EE:: @ 822D9EE - msgbox gUnknown_0827304E, MSGBOX_DEFAULT + msgbox gText_BigHoleInTheWall, MSGBOX_DEFAULT releaseall end @@ -84,11 +84,11 @@ DesertRuins_EventScript_22DA02:: @ 822DA02 DesertRuins_EventScript_22DA49:: @ 822DA49 setflag FLAG_DEFEATED_REGIROCK - goto DesertRuins_EventScript_27376D + goto Common_EventScript_RemoveStaticPokemon end DesertRuins_EventScript_22DA52:: @ 822DA52 - setvar VAR_0x8004, 401 - goto DesertRuins_EventScript_273776 + setvar VAR_0x8004, SPECIES_REGIROCK + goto Common_EventScript_LegendaryFlewAway end diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc index fa29f4099..f5830ed45 100644 --- a/data/maps/DewfordTown/scripts.inc +++ b/data/maps/DewfordTown/scripts.inc @@ -124,12 +124,12 @@ DewfordTown_EventScript_1E9660:: @ 81E9660 applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9911 waitmovement 0 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN - call DewfordTown_EventScript_2720A0 + call Common_EventScript_PlayBrineysBoatMusic applymovement 4, DewfordTown_Movement_1E97A2 applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E97A2 waitmovement 0 showobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE104 - call DewfordTown_EventScript_2720A8 + call Common_EventScript_StopBrineysBoatMusic applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9914 waitmovement 0 showobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE104 @@ -156,11 +156,11 @@ DewfordTown_EventScript_1E96E7:: @ 81E96E7 applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9911 waitmovement 0 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN - call DewfordTown_EventScript_2720A0 + call Common_EventScript_PlayBrineysBoatMusic applymovement 4, DewfordTown_Movement_1E9865 applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9865 waitmovement 0 - call DewfordTown_EventScript_2720A8 + call Common_EventScript_StopBrineysBoatMusic showobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE109 applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9918 waitmovement 0 diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc index 5601c7477..7e406ea25 100644 --- a/data/maps/DewfordTown_Gym/scripts.inc +++ b/data/maps/DewfordTown_Gym/scripts.inc @@ -177,7 +177,7 @@ DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7 compare VAR_PETALBURG_GYM_STATE, 6 call_if_eq DewfordTown_Gym_EventScript_271E84 setvar VAR_0x8008, 2 - call DewfordTown_Gym_EventScript_271F43 + call Common_EventScript_SetGymTrainers call DewfordTown_Gym_EventScript_1FC855 closemessage delay 30 diff --git a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc index be9005d7d..bde0f84fb 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc @@ -5,12 +5,12 @@ DewfordTown_PokemonCenter_1F_MapScripts:: @ 81FC523 DewfordTown_PokemonCenter_1F_OnTransition: @ 81FC52E setrespawn HEAL_LOCATION_DEWFORD_TOWN - call DewfordTown_PokemonCenter_1F_EventScript_2718DE + call Common_EventScript_UpdateBrineyLocation end DewfordTown_PokemonCenter_1F_EventScript_1FC537:: @ 81FC537 setvar VAR_0x800B, 1 - call DewfordTown_PokemonCenter_1F_EventScript_27191E + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc index 0b292530e..b9dcc07dd 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc @@ -15,7 +15,7 @@ EverGrandeCity_PokemonCenter_1F_EventScript_229A4C:: @ 8229A4C EverGrandeCity_PokemonCenter_1F_EventScript_229A59:: @ 8229A59 setvar VAR_0x800B, 1 - call EverGrandeCity_PokemonCenter_1F_EventScript_27191E + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc index f688918ea..25899420f 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc @@ -16,7 +16,7 @@ EverGrandeCity_PokemonLeague_1F_EventScript_2295ED:: @ 82295ED EverGrandeCity_PokemonLeague_1F_EventScript_2295FC:: @ 82295FC setvar VAR_0x800B, 1 - call EverGrandeCity_PokemonLeague_1F_EventScript_27191E + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release @@ -25,10 +25,10 @@ EverGrandeCity_PokemonLeague_1F_EventScript_2295FC:: @ 82295FC EverGrandeCity_PokemonLeague_1F_EventScript_22960A:: @ 822960A lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemart EverGrandeCity_PokemonLeague_1F_Pokemart_229624 - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/FallarborTown_House1/scripts.inc b/data/maps/FallarborTown_House1/scripts.inc index 2255f90d3..e3299e096 100644 --- a/data/maps/FallarborTown_House1/scripts.inc +++ b/data/maps/FallarborTown_House1/scripts.inc @@ -21,8 +21,8 @@ FallarborTown_House1_EventScript_200F38:: @ 8200F38 giveitem_std ITEM_TM27 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull - setvar VAR_0x8004, 280 - call FallarborTown_House1_EventScript_2723E4 + setvar VAR_0x8004, ITEM_METEORITE + call Common_EventScript_PlayerHandedOverTheItem setflag FLAG_RECEIVED_TM27 msgbox FallarborTown_House1_Text_2011A5, MSGBOX_DEFAULT release diff --git a/data/maps/FallarborTown_Mart/scripts.inc b/data/maps/FallarborTown_Mart/scripts.inc index bd9de930c..3ae8dc9dd 100644 --- a/data/maps/FallarborTown_Mart/scripts.inc +++ b/data/maps/FallarborTown_Mart/scripts.inc @@ -4,10 +4,10 @@ FallarborTown_Mart_MapScripts:: @ 81FFCBE FallarborTown_Mart_EventScript_1FFCBF:: @ 81FFCBF lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemart FallarborTown_Mart_Pokemart_1FFCD8 - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc index 5dbd35b48..062e6dedc 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc @@ -5,12 +5,12 @@ FallarborTown_PokemonCenter_1F_MapScripts:: @ 8200BCD FallarborTown_PokemonCenter_1F_OnTransition: @ 8200BD8 setrespawn HEAL_LOCATION_FALLARBOR_TOWN - call FallarborTown_PokemonCenter_1F_EventScript_2718DE + call Common_EventScript_UpdateBrineyLocation end FallarborTown_PokemonCenter_1F_EventScript_200BE1:: @ 8200BE1 setvar VAR_0x800B, 1 - call FallarborTown_PokemonCenter_1F_EventScript_27191E + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release diff --git a/data/maps/FarawayIsland_Interior/scripts.inc b/data/maps/FarawayIsland_Interior/scripts.inc index de6545ec3..f8394f161 100644 --- a/data/maps/FarawayIsland_Interior/scripts.inc +++ b/data/maps/FarawayIsland_Interior/scripts.inc @@ -136,9 +136,9 @@ FarawayIsland_Interior_EventScript_267DF2:: @ 8267DF2 special sub_81D4BEC delay 40 waitmoncry - setvar VAR_0x8004, 151 - setvar VAR_0x8005, 30 - setvar VAR_0x8006, 0 + setvar VAR_0x8004, SPECIES_MEW + setvar VAR_0x8005, 30 @level + setvar VAR_0x8006, ITEM_NONE special CreateObedientEnemyMon setflag FLAG_SYS_CTRL_OBJ_DELETE special BattleSetup_StartLegendaryBattle @@ -159,13 +159,13 @@ FarawayIsland_Interior_EventScript_267DF2:: @ 8267DF2 FarawayIsland_Interior_EventScript_267E96:: @ 8267E96 setflag FLAG_DEFEATED_MEW - setvar VAR_0x8004, 151 - goto FarawayIsland_Interior_EventScript_273776 + setvar VAR_0x8004, SPECIES_MEW + goto Common_EventScript_LegendaryFlewAway end FarawayIsland_Interior_EventScript_267EA4:: @ 8267EA4 - setvar VAR_0x8004, 151 - goto FarawayIsland_Interior_EventScript_273776 + setvar VAR_0x8004, SPECIES_MEW + goto Common_EventScript_LegendaryFlewAway end FarawayIsland_Interior_EventScript_267EAF:: @ 8267EAF diff --git a/data/maps/FortreeCity_DecorationShop/scripts.inc b/data/maps/FortreeCity_DecorationShop/scripts.inc index 3b0021cf3..14c864ee5 100644 --- a/data/maps/FortreeCity_DecorationShop/scripts.inc +++ b/data/maps/FortreeCity_DecorationShop/scripts.inc @@ -12,10 +12,10 @@ FortreeCity_DecorationShop_EventScript_218017:: @ 8218017 FortreeCity_DecorationShop_EventScript_218020:: @ 8218020 lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemartdecoration FortreeCity_DecorationShop_PokemartDecor_Desks - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end @@ -36,10 +36,10 @@ FortreeCity_DecorationShop_PokemartDecor_Desks: @ 8218038 FortreeCity_DecorationShop_EventScript_21804C:: @ 821804C lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemartdecoration FortreeCity_DecorationShop_PokemartDecor_Chairs - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/FortreeCity_Gym/scripts.inc b/data/maps/FortreeCity_Gym/scripts.inc index 1b3cf29e9..59ca317a7 100644 --- a/data/maps/FortreeCity_Gym/scripts.inc +++ b/data/maps/FortreeCity_Gym/scripts.inc @@ -33,7 +33,7 @@ FortreeCity_Gym_EventScript_2165FD:: @ 82165FD setflag FLAG_DEFEATED_FORTREE_GYM setflag FLAG_BADGE06_GET setvar VAR_0x8008, 6 - call FortreeCity_Gym_EventScript_271F43 + call Common_EventScript_SetGymTrainers call FortreeCity_Gym_EventScript_21666A closemessage delay 30 diff --git a/data/maps/FortreeCity_Mart/scripts.inc b/data/maps/FortreeCity_Mart/scripts.inc index 8d2f9b568..30caaeff3 100644 --- a/data/maps/FortreeCity_Mart/scripts.inc +++ b/data/maps/FortreeCity_Mart/scripts.inc @@ -4,10 +4,10 @@ FortreeCity_Mart_MapScripts:: @ 8217665 FortreeCity_Mart_EventScript_217666:: @ 8217666 lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemart FortreeCity_Mart_Pokemart_217680 - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc index 0c62f97e2..2b7594959 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc @@ -9,7 +9,7 @@ FortreeCity_PokemonCenter_1F_OnTransition: @ 82173E3 FortreeCity_PokemonCenter_1F_EventScript_2173E7:: @ 82173E7 setvar VAR_0x800B, 1 - call FortreeCity_PokemonCenter_1F_EventScript_27191E + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release diff --git a/data/maps/GraniteCave_StevensRoom/scripts.inc b/data/maps/GraniteCave_StevensRoom/scripts.inc index d29ee13f2..c08e4c6af 100644 --- a/data/maps/GraniteCave_StevensRoom/scripts.inc +++ b/data/maps/GraniteCave_StevensRoom/scripts.inc @@ -5,8 +5,8 @@ GraniteCave_StevensRoom_EventScript_22DC7B:: @ 822DC7B lock faceplayer msgbox GraniteCave_StevensRoom_Text_22DD5A, MSGBOX_DEFAULT - setvar VAR_0x8004, 274 - call GraniteCave_StevensRoom_EventScript_2723E4 + setvar VAR_0x8004, ITEM_LETTER + call Common_EventScript_PlayerHandedOverTheItem setflag FLAG_DELIVERED_STEVEN_LETTER msgbox GraniteCave_StevensRoom_Text_22DDBD, MSGBOX_DEFAULT giveitem_std ITEM_TM47 diff --git a/data/maps/IslandCave/scripts.inc b/data/maps/IslandCave/scripts.inc index 911e882f2..4664b7dcd 100644 --- a/data/maps/IslandCave/scripts.inc +++ b/data/maps/IslandCave/scripts.inc @@ -61,7 +61,7 @@ IslandCave_EventScript_238EEF:: @ 8238EEF end IslandCave_EventScript_238F13:: @ 8238F13 - msgbox gUnknown_0827304E, MSGBOX_DEFAULT + msgbox gText_BigHoleInTheWall, MSGBOX_DEFAULT releaseall end @@ -113,10 +113,10 @@ IslandCave_EventScript_238F58:: @ 8238F58 IslandCave_EventScript_238F9F:: @ 8238F9F setflag FLAG_DEFEATED_REGICE - goto IslandCave_EventScript_27376D + goto Common_EventScript_RemoveStaticPokemon end IslandCave_EventScript_238FA8:: @ 8238FA8 - setvar VAR_0x8004, 402 - goto IslandCave_EventScript_273776 + setvar VAR_0x8004, SPECIES_REGICE + goto Common_EventScript_LegendaryFlewAway end diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc index 8eec8cf43..2399c4d3f 100644 --- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc @@ -80,7 +80,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1 compare VAR_PETALBURG_GYM_STATE, 6 call_if_eq LavaridgeTown_Gym_1F_EventScript_271E84 setvar VAR_0x8008, 4 - call LavaridgeTown_Gym_1F_EventScript_271F43 + call Common_EventScript_SetGymTrainers setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY setvar VAR_LAVARIDGE_TOWN_STATE, 1 call LavaridgeTown_Gym_1F_EventScript_1FE841 diff --git a/data/maps/LavaridgeTown_HerbShop/scripts.inc b/data/maps/LavaridgeTown_HerbShop/scripts.inc index f6ad8e26b..c7ae5fb9e 100644 --- a/data/maps/LavaridgeTown_HerbShop/scripts.inc +++ b/data/maps/LavaridgeTown_HerbShop/scripts.inc @@ -7,7 +7,7 @@ LavaridgeTown_HerbShop_EventScript_1FE4D7:: @ 81FE4D7 message LavaridgeTown_HerbShop_Text_1FE53E waitmessage pokemart LavaridgeTown_HerbShop_Pokemart_1FE4F0 - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/LavaridgeTown_Mart/scripts.inc b/data/maps/LavaridgeTown_Mart/scripts.inc index ff9772b1d..d1d2ec4d2 100644 --- a/data/maps/LavaridgeTown_Mart/scripts.inc +++ b/data/maps/LavaridgeTown_Mart/scripts.inc @@ -4,10 +4,10 @@ LavaridgeTown_Mart_MapScripts:: @ 81FF9CD LavaridgeTown_Mart_EventScript_1FF9CE:: @ 81FF9CE lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemart LavaridgeTown_Mart_Pokemart_1FF9E8 - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc index 4905a5bce..3968430dd 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc @@ -5,12 +5,12 @@ LavaridgeTown_PokemonCenter_1F_MapScripts:: @ 81FFAFA LavaridgeTown_PokemonCenter_1F_OnTransition: @ 81FFB05 setrespawn HEAL_LOCATION_LAVARIDGE_TOWN - call LavaridgeTown_PokemonCenter_1F_EventScript_2718DE + call Common_EventScript_UpdateBrineyLocation end LavaridgeTown_PokemonCenter_1F_EventScript_1FFB0E:: @ 81FFB0E setvar VAR_0x800B, 1 - call LavaridgeTown_PokemonCenter_1F_EventScript_27191E + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc index 18fc0404b..172fc3a25 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc @@ -8,7 +8,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_220624:: @ 8220624 call_if_unset FLAG_TEMP_2, LilycoveCity_DepartmentStoreElevator_EventScript_2207FC copyvar VAR_0x8005, VAR_DEPT_STORE_FLOOR special sub_8139B60 - message gUnknown_08272C1D + message gText_WhichFloorWouldYouLike waitmessage setvar VAR_0x8004, 0 specialvar VAR_RESULT, sub_81399F4 diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc index b8d0a7c44..54578616b 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc @@ -21,10 +21,10 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22022B:: @ 822022B LilycoveCity_DepartmentStoreRooftop_EventScript_22022F:: @ 822022F lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemartdecoration LilycoveCity_DepartmentStoreRooftop_PokemartDecor_220248 - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end @@ -190,7 +190,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_220442:: @ 8220442 end LilycoveCity_DepartmentStoreRooftop_EventScript_220450:: @ 8220450 - msgbox gUnknown_08272A89, MSGBOX_DEFAULT + msgbox gText_TheBagIsFull, MSGBOX_DEFAULT goto LilycoveCity_DepartmentStoreRooftop_EventScript_22045E end diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc index 4d4edf373..33f0bff9a 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc @@ -16,10 +16,10 @@ LilycoveCity_DepartmentStore_2F_EventScript_21FB3F:: @ 821FB3F LilycoveCity_DepartmentStore_2F_EventScript_21FB48:: @ 821FB48 lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemart LilycoveCity_DepartmentStore_2F_Pokemart_21FB60 - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end @@ -43,10 +43,10 @@ LilycoveCity_DepartmentStore_2F_Pokemart_21FB60: @ 821FB60 LilycoveCity_DepartmentStore_2F_EventScript_21FB7A:: @ 821FB7A lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemart LilycoveCity_DepartmentStore_2F_Pokemart_21FB94 - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc index 053ff4632..23c24b681 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc @@ -4,10 +4,10 @@ LilycoveCity_DepartmentStore_3F_MapScripts:: @ 821FC64 LilycoveCity_DepartmentStore_3F_EventScript_21FC65:: @ 821FC65 lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemart LilycoveCity_DepartmentStore_3F_Pokemart_21FC7C - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end @@ -25,10 +25,10 @@ LilycoveCity_DepartmentStore_3F_Pokemart_21FC7C: @ 821FC7C LilycoveCity_DepartmentStore_3F_EventScript_21FC8C:: @ 821FC8C lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemart LilycoveCity_DepartmentStore_3F_Pokemart_21FCA4 - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc index d78baaf3d..25bc7c33c 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc @@ -16,10 +16,10 @@ LilycoveCity_DepartmentStore_4F_EventScript_21FDFD:: @ 821FDFD LilycoveCity_DepartmentStore_4F_EventScript_21FE06:: @ 821FE06 lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemart LilycoveCity_DepartmentStore_4F_Pokemart_21FE20 - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end @@ -36,10 +36,10 @@ LilycoveCity_DepartmentStore_4F_Pokemart_21FE20: @ 821FE20 LilycoveCity_DepartmentStore_4F_EventScript_21FE2C:: @ 821FE2C lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemart LilycoveCity_DepartmentStore_4F_Pokemart_21FE44 - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc index 6b5796604..32908ff29 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc @@ -16,10 +16,10 @@ LilycoveCity_DepartmentStore_5F_EventScript_21FF9A:: @ 821FF9A LilycoveCity_DepartmentStore_5F_EventScript_21FFA6:: @ 821FFA6 lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_Dolls - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end @@ -44,10 +44,10 @@ LilycoveCity_DepartmentStore_5F_Pokemart_Dolls: @ 821FFC0 LilycoveCity_DepartmentStore_5F_EventScript_21FFDC:: @ 821FFDC lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_Cushions - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end @@ -69,10 +69,10 @@ LilycoveCity_DepartmentStore_5F_Pokemart_Cushions: @ 821FFF4 LilycoveCity_DepartmentStore_5F_EventScript_22000A:: @ 822000A lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_Posters - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end @@ -94,10 +94,10 @@ LilycoveCity_DepartmentStore_5F_Pokemart_Posters: @ 8220024 LilycoveCity_DepartmentStore_5F_EventScript_22003A:: @ 822003A lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_Mats - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc index c2e1deb5d..615153530 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc @@ -26,7 +26,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_21C5E4:: @ 821C5E4 LilycoveCity_PokemonCenter_1F_EventScript_21C5E8:: @ 821C5E8 setvar VAR_0x800B, 1 - call LilycoveCity_PokemonCenter_1F_EventScript_27191E + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc index 3bb088ccf..cd1213382 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc @@ -271,7 +271,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F863F:: @ 81F863F end LittlerootTown_BrendansHouse_2F_EventScript_1F864C:: @ 81F864C - msgbox gUnknown_08272CD5, MSGBOX_DEFAULT + msgbox gText_PokemonTrainerSchoolEmail, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc index dde6df71d..2a1e5434a 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc @@ -307,7 +307,7 @@ EventScript_PlayerPCFemale:: @ 81F9553 end LittlerootTown_MaysHouse_2F_EventScript_1F956C:: @ 81F956C - msgbox gUnknown_08272CD5, MSGBOX_DEFAULT + msgbox gText_PokemonTrainerSchoolEmail, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index c4f704520..656090bb7 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -107,7 +107,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9DDB:: @ 81F9DDB LittlerootTown_ProfessorBirchsLab_EventScript_1F9E07:: @ 81F9E07 setvar VAR_0x8004, 0 - call Common_EventScript_NameReceivedPokemon + call Common_EventScript_NameReceivedPartyMon goto LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17 end @@ -341,7 +341,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA06C:: @ 81FA06C compare VAR_RESULT, 1 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0CC erasemonpic - goto LittlerootTown_ProfessorBirchsLab_EventScript_273811 + goto Common_EventScript_NoMoreRoomForPokemon end LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1:: @ 81FA0A1 @@ -350,8 +350,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1:: @ 81FA0A1 msgbox gText_NicknameThisPokemon, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD - call LittlerootTown_ProfessorBirchsLab_EventScript_27378B - call Common_EventScript_NameReceivedPokemon + call Common_EventScript_GetGiftMonPartySlot + call Common_EventScript_NameReceivedPartyMon goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD end @@ -361,7 +361,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA0CC:: @ 81FA0CC msgbox gText_NicknameThisPokemon, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2 - call LittlerootTown_ProfessorBirchsLab_EventScript_273797 + call Common_EventScript_NameReceivedBoxMon goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2 end @@ -386,7 +386,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA10D:: @ 81FA10D compare VAR_RESULT, 1 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA16D erasemonpic - goto LittlerootTown_ProfessorBirchsLab_EventScript_273811 + goto Common_EventScript_NoMoreRoomForPokemon end LittlerootTown_ProfessorBirchsLab_EventScript_1FA142:: @ 81FA142 @@ -395,8 +395,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA142:: @ 81FA142 msgbox gText_NicknameThisPokemon, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E - call LittlerootTown_ProfessorBirchsLab_EventScript_27378B - call Common_EventScript_NameReceivedPokemon + call Common_EventScript_GetGiftMonPartySlot + call Common_EventScript_NameReceivedPartyMon goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E end @@ -406,7 +406,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA16D:: @ 81FA16D msgbox gText_NicknameThisPokemon, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA193 - call LittlerootTown_ProfessorBirchsLab_EventScript_273797 + call Common_EventScript_NameReceivedBoxMon goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA193 end @@ -431,7 +431,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA1AE:: @ 81FA1AE compare VAR_RESULT, 1 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA20E erasemonpic - goto LittlerootTown_ProfessorBirchsLab_EventScript_273811 + goto Common_EventScript_NoMoreRoomForPokemon end LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3:: @ 81FA1E3 @@ -440,8 +440,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3:: @ 81FA1E3 msgbox gText_NicknameThisPokemon, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F - call LittlerootTown_ProfessorBirchsLab_EventScript_27378B - call Common_EventScript_NameReceivedPokemon + call Common_EventScript_GetGiftMonPartySlot + call Common_EventScript_NameReceivedPartyMon goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F end @@ -451,7 +451,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA20E:: @ 81FA20E msgbox gText_NicknameThisPokemon, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA234 - call LittlerootTown_ProfessorBirchsLab_EventScript_273797 + call Common_EventScript_NameReceivedBoxMon goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA234 end diff --git a/data/maps/MarineCave_End/scripts.inc b/data/maps/MarineCave_End/scripts.inc index be3a6a57b..2fadf18ca 100644 --- a/data/maps/MarineCave_End/scripts.inc +++ b/data/maps/MarineCave_End/scripts.inc @@ -55,12 +55,12 @@ MarineCave_End_EventScript_23B01B:: @ 823B01B MarineCave_End_EventScript_23B084:: @ 823B084 setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 1 setflag FLAG_DEFEATED_KYOGRE - goto MarineCave_End_EventScript_27376D + goto Common_EventScript_RemoveStaticPokemon end MarineCave_End_EventScript_23B092:: @ 823B092 - setvar VAR_0x8004, 404 - goto MarineCave_End_EventScript_273776 + setvar VAR_0x8004, SPECIES_KYOGRE + goto Common_EventScript_LegendaryFlewAway end MarineCave_End_Movement_23B09D: @ 823B09D diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc index 811cdc9de..10837e269 100644 --- a/data/maps/MauvilleCity_Gym/scripts.inc +++ b/data/maps/MauvilleCity_Gym/scripts.inc @@ -98,7 +98,7 @@ MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B compare VAR_PETALBURG_GYM_STATE, 6 call_if_eq MauvilleCity_Gym_EventScript_271E84 setvar VAR_0x8008, 3 - call MauvilleCity_Gym_EventScript_271F43 + call Common_EventScript_SetGymTrainers special MauvilleGymSpecial3 special DrawWholeMapView playse SE_KI_GASYAN diff --git a/data/maps/MauvilleCity_Mart/scripts.inc b/data/maps/MauvilleCity_Mart/scripts.inc index 44e36489a..25d52e015 100644 --- a/data/maps/MauvilleCity_Mart/scripts.inc +++ b/data/maps/MauvilleCity_Mart/scripts.inc @@ -4,10 +4,10 @@ MauvilleCity_Mart_MapScripts:: @ 82110E5 MauvilleCity_Mart_EventScript_2110E6:: @ 82110E6 lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemart MauvilleCity_Mart_Pokemart_211100 - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc index 50250de8e..6343bd090 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc @@ -5,7 +5,7 @@ MauvilleCity_PokemonCenter_1F_MapScripts:: @ 8210E5B MauvilleCity_PokemonCenter_1F_OnTransition: @ 8210E66 setrespawn HEAL_LOCATION_MAUVILLE_CITY - call MauvilleCity_PokemonCenter_1F_EventScript_2718DE + call Common_EventScript_UpdateBrineyLocation goto MauvilleCity_PokemonCenter_1F_EventScript_210E74 end @@ -15,7 +15,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_210E74:: @ 8210E74 MauvilleCity_PokemonCenter_1F_EventScript_210E78:: @ 8210E78 setvar VAR_0x800B, 1 - call MauvilleCity_PokemonCenter_1F_EventScript_27191E + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc index 3779fa8d2..0b0bed197 100644 --- a/data/maps/MossdeepCity_Gym/scripts.inc +++ b/data/maps/MossdeepCity_Gym/scripts.inc @@ -65,7 +65,7 @@ MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1 clearflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY clearflag FLAG_UNKNOWN_0x393 setvar VAR_0x8008, 7 - call MossdeepCity_Gym_EventScript_271F43 + call Common_EventScript_SetGymTrainers clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS clearflag FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA clearflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA diff --git a/data/maps/MossdeepCity_Mart/scripts.inc b/data/maps/MossdeepCity_Mart/scripts.inc index 11c911c45..1a555af48 100644 --- a/data/maps/MossdeepCity_Mart/scripts.inc +++ b/data/maps/MossdeepCity_Mart/scripts.inc @@ -4,10 +4,10 @@ MossdeepCity_Mart_MapScripts:: @ 82223C7 MossdeepCity_Mart_EventScript_2223C8:: @ 82223C8 lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemart MossdeepCity_Mart_Pokemart_2223E0 - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc index 3806bfc5a..6611238ab 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc @@ -9,7 +9,7 @@ MossdeepCity_PokemonCenter_1F_OnTransition: @ 822224A MossdeepCity_PokemonCenter_1F_EventScript_22224E:: @ 822224E setvar VAR_0x800B, 1 - call MossdeepCity_PokemonCenter_1F_EventScript_27191E + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc index 69b5a01d4..cd6fee3cc 100644 --- a/data/maps/MossdeepCity_StevensHouse/scripts.inc +++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc @@ -90,7 +90,7 @@ MossdeepCity_StevensHouse_EventScript_222865:: @ 8222865 goto_if_eq MossdeepCity_StevensHouse_EventScript_222895 compare VAR_RESULT, 1 goto_if_eq MossdeepCity_StevensHouse_EventScript_2228BD - goto MossdeepCity_StevensHouse_EventScript_273811 + goto Common_EventScript_NoMoreRoomForPokemon end MossdeepCity_StevensHouse_EventScript_222895:: @ 8222895 @@ -98,8 +98,8 @@ MossdeepCity_StevensHouse_EventScript_222895:: @ 8222895 msgbox gText_NicknameThisPokemon, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq MossdeepCity_StevensHouse_EventScript_222901 - call MossdeepCity_StevensHouse_EventScript_27378B - call Common_EventScript_NameReceivedPokemon + call Common_EventScript_GetGiftMonPartySlot + call Common_EventScript_NameReceivedPartyMon goto MossdeepCity_StevensHouse_EventScript_222901 end @@ -108,7 +108,7 @@ MossdeepCity_StevensHouse_EventScript_2228BD:: @ 82228BD msgbox gText_NicknameThisPokemon, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq MossdeepCity_StevensHouse_EventScript_2228E0 - call MossdeepCity_StevensHouse_EventScript_273797 + call Common_EventScript_NameReceivedBoxMon goto MossdeepCity_StevensHouse_EventScript_2228E0 end diff --git a/data/maps/NavelRock_Bottom/scripts.inc b/data/maps/NavelRock_Bottom/scripts.inc index f3c244e3d..c67c9897c 100644 --- a/data/maps/NavelRock_Bottom/scripts.inc +++ b/data/maps/NavelRock_Bottom/scripts.inc @@ -52,9 +52,9 @@ NavelRock_Bottom_EventScript_2692A2:: @ 82692A2 playmoncry SPECIES_LUGIA, 2 waitmoncry delay 20 - setvar VAR_0x8004, 249 - setvar VAR_0x8005, 70 - setvar VAR_0x8006, 0 + setvar VAR_0x8004, SPECIES_LUGIA + setvar VAR_0x8005, 70 @level + setvar VAR_0x8006, ITEM_NONE special CreateObedientEnemyMon setflag FLAG_SYS_CTRL_OBJ_DELETE special BattleSetup_StartLegendaryBattle @@ -73,11 +73,11 @@ NavelRock_Bottom_EventScript_2692A2:: @ 82692A2 NavelRock_Bottom_EventScript_269336:: @ 8269336 setflag FLAG_DEFEATED_LUGIA - setvar VAR_0x8004, 249 - goto NavelRock_Bottom_EventScript_273776 + setvar VAR_0x8004, SPECIES_LUGIA + goto Common_EventScript_LegendaryFlewAway end NavelRock_Bottom_EventScript_269344:: @ 8269344 - setvar VAR_0x8004, 249 - goto NavelRock_Bottom_EventScript_273776 + setvar VAR_0x8004, SPECIES_LUGIA + goto Common_EventScript_LegendaryFlewAway end diff --git a/data/maps/NavelRock_Top/scripts.inc b/data/maps/NavelRock_Top/scripts.inc index 816e20206..577d2cdd3 100644 --- a/data/maps/NavelRock_Top/scripts.inc +++ b/data/maps/NavelRock_Top/scripts.inc @@ -56,9 +56,9 @@ NavelRock_Top_EventScript_26916F:: @ 826916F applymovement 1, NavelRock_Top_Movement_26923A waitmovement 0 special RemoveCameraObject - setvar VAR_0x8004, 250 - setvar VAR_0x8005, 70 - setvar VAR_0x8006, 0 + setvar VAR_0x8004, SPECIES_HO_OH + setvar VAR_0x8005, 70 @level + setvar VAR_0x8006, ITEM_NONE special CreateObedientEnemyMon setflag FLAG_SYS_CTRL_OBJ_DELETE special BattleSetup_StartLegendaryBattle @@ -78,13 +78,13 @@ NavelRock_Top_EventScript_26916F:: @ 826916F NavelRock_Top_EventScript_269217:: @ 8269217 setflag FLAG_DEFEATED_HO_OH - setvar VAR_0x8004, 250 - goto NavelRock_Top_EventScript_273776 + setvar VAR_0x8004, SPECIES_HO_OH + goto Common_EventScript_LegendaryFlewAway end NavelRock_Top_EventScript_269225:: @ 8269225 - setvar VAR_0x8004, 250 - goto NavelRock_Top_EventScript_273776 + setvar VAR_0x8004, SPECIES_HO_OH + goto Common_EventScript_LegendaryFlewAway end NavelRock_Top_Movement_269230: @ 8269230 diff --git a/data/maps/NewMauville_Inside/scripts.inc b/data/maps/NewMauville_Inside/scripts.inc index 5d871f170..427b0ed72 100644 --- a/data/maps/NewMauville_Inside/scripts.inc +++ b/data/maps/NewMauville_Inside/scripts.inc @@ -202,7 +202,7 @@ NewMauville_Inside_EventScript_2377AF:: @ 82377AF NewMauville_Inside_EventScript_2377F3:: @ 82377F3 setflag FLAG_DEFEATED_VOLTORB_1_NEW_MAUVILLE - goto NewMauville_Inside_EventScript_27376D + goto Common_EventScript_RemoveStaticPokemon end NewMauville_Inside_EventScript_2377FC:: @ 82377FC @@ -229,7 +229,7 @@ NewMauville_Inside_EventScript_2377FC:: @ 82377FC NewMauville_Inside_EventScript_237840:: @ 8237840 setflag FLAG_DEFEATED_VOLTORB_2_NEW_MAUVILLE - goto NewMauville_Inside_EventScript_27376D + goto Common_EventScript_RemoveStaticPokemon end NewMauville_Inside_EventScript_237849:: @ 8237849 @@ -256,7 +256,7 @@ NewMauville_Inside_EventScript_237849:: @ 8237849 NewMauville_Inside_EventScript_23788D:: @ 823788D setflag FLAG_DEFEATED_VOLTORB_3_NEW_MAUVILLE - goto NewMauville_Inside_EventScript_27376D + goto Common_EventScript_RemoveStaticPokemon end NewMauville_Inside_Text_237896: @ 8237896 diff --git a/data/maps/OldaleTown_Mart/scripts.inc b/data/maps/OldaleTown_Mart/scripts.inc index 980b0e4d6..38b978d45 100644 --- a/data/maps/OldaleTown_Mart/scripts.inc +++ b/data/maps/OldaleTown_Mart/scripts.inc @@ -4,11 +4,11 @@ OldaleTown_Mart_MapScripts:: @ 81FC23F OldaleTown_Mart_EventScript_1FC240:: @ 81FC240 lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_Mart_EventScript_1FC26C pokemart OldaleTown_Mart_Pokemart_1FC260 - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end @@ -23,7 +23,7 @@ OldaleTown_Mart_Pokemart_1FC260: @ 81FC260 OldaleTown_Mart_EventScript_1FC26C:: @ 81FC26C pokemart OldaleTown_Mart_Pokemart_1FC27C - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc index 2396573dc..87c8693a7 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc @@ -5,12 +5,12 @@ OldaleTown_PokemonCenter_1F_MapScripts:: @ 81FC006 OldaleTown_PokemonCenter_1F_OnTransition: @ 81FC011 setrespawn HEAL_LOCATION_OLDALE_TOWN - call OldaleTown_PokemonCenter_1F_EventScript_2718DE + call Common_EventScript_UpdateBrineyLocation end OldaleTown_PokemonCenter_1F_EventScript_1FC01A:: @ 81FC01A setvar VAR_0x800B, 1 - call OldaleTown_PokemonCenter_1F_EventScript_27191E + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc index f4fe115e5..1a30d620b 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc @@ -9,7 +9,7 @@ PacifidlogTown_PokemonCenter_1F_OnTransition: @ 82034B2 PacifidlogTown_PokemonCenter_1F_EventScript_2034B6:: @ 82034B6 setvar VAR_0x800B, 1 - call PacifidlogTown_PokemonCenter_1F_EventScript_27191E + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index a64c314a5..d3c971b2f 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -423,7 +423,7 @@ PetalburgCity_Gym_EventScript_204E3B:: @ 8204E3B setflag FLAG_HIDE_MAUVILLE_GYM_WATTSON clearflag FLAG_HIDE_MAUVILLE_CITY_WATTSON setvar VAR_0x8008, 5 - call PetalburgCity_Gym_EventScript_271F43 + call Common_EventScript_SetGymTrainers clearflag FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN call PetalburgCity_Gym_EventScript_2048FF special DrawWholeMapView diff --git a/data/maps/PetalburgCity_Mart/scripts.inc b/data/maps/PetalburgCity_Mart/scripts.inc index 2bd72b69e..0b4d9808f 100644 --- a/data/maps/PetalburgCity_Mart/scripts.inc +++ b/data/maps/PetalburgCity_Mart/scripts.inc @@ -4,11 +4,11 @@ PetalburgCity_Mart_MapScripts:: @ 8207D68 PetalburgCity_Mart_EventScript_207D69:: @ 8207D69 lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage goto_if_set FLAG_PETALBURG_MART_EXPANDED_ITEMS, PetalburgCity_Mart_EventScript_207DA6 pokemart PetalburgCity_Mart_Pokemart_207D8C - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end @@ -31,7 +31,7 @@ PetalburgCity_Mart_Pokemart_207D8C: @ 8207D8C PetalburgCity_Mart_EventScript_207DA6:: @ 8207DA6 pokemart PetalburgCity_Mart_Pokemart_207DB8 - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc index 286b9f7d9..85a16914f 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc @@ -5,12 +5,12 @@ PetalburgCity_PokemonCenter_1F_MapScripts:: @ 82079E8 PetalburgCity_PokemonCenter_1F_OnTransition: @ 82079F3 setrespawn HEAL_LOCATION_PETALBURG_CITY - call PetalburgCity_PokemonCenter_1F_EventScript_2718DE + call Common_EventScript_UpdateBrineyLocation end PetalburgCity_PokemonCenter_1F_EventScript_2079FC:: @ 82079FC setvar VAR_0x800B, 1 - call PetalburgCity_PokemonCenter_1F_EventScript_27191E + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index fd195b973..2a7965331 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -364,7 +364,7 @@ Route104_EventScript_1ED099:: @ 81ED099 applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED34F waitmovement 0 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE104 - call Route104_EventScript_2720A0 + call Common_EventScript_PlayBrineysBoatMusic goto_if_set FLAG_ENABLE_NORMAN_MATCH_CALL, Route104_EventScript_1ED0D9 goto_if_unset FLAG_ENABLE_NORMAN_MATCH_CALL, Route104_EventScript_1ED0EF end @@ -398,7 +398,7 @@ Route104_EventScript_1ED139:: @ 81ED139 delay 50 applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED353 waitmovement 0 - call Route104_EventScript_2720A8 + call Common_EventScript_StopBrineysBoatMusic showobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED355 waitmovement 0 @@ -410,7 +410,7 @@ Route104_EventScript_1ED139:: @ 81ED139 waitmovement 0 addobject 4 clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN - call Route104_EventScript_2720A8 + call Common_EventScript_StopBrineysBoatMusic setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT hideobjectat 7, MAP_ROUTE104 copyvar VAR_BRINEY_LOCATION, VAR_0x8008 diff --git a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc index c70318fc9..0b8d2217f 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc @@ -46,10 +46,10 @@ Route104_PrettyPetalFlowerShop_EventScript_22A3DB:: @ 822A3DB return Route104_PrettyPetalFlowerShop_EventScript_22A3E4:: @ 822A3E4 - message gUnknown_08272A52 + message gText_PlayerWhatCanIDoForYou waitmessage pokemartdecoration2 Route104_PrettyPetalFlowerShop_Pokemart_Plants - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc index 6447b49c5..c91d0f0ab 100644 --- a/data/maps/Route109/scripts.inc +++ b/data/maps/Route109/scripts.inc @@ -34,12 +34,12 @@ Route109_EventScript_1EE7C5:: @ 81EE7C5 Route109_EventScript_1EE7D5:: @ 81EE7D5 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE109 - call Route109_EventScript_2720A0 + call Common_EventScript_PlayBrineysBoatMusic applymovement 1, Route109_Movement_1EE84F applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_1EE84F waitmovement 0 delay 50 - call Route109_EventScript_2720A8 + call Common_EventScript_StopBrineysBoatMusic showobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_1EE900 waitmovement 0 diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index c913d7e6e..da307aaa0 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -209,7 +209,7 @@ Route111_EventScript_1F0F2E:: @ 81F0F2E end Route111_EventScript_1F0F45:: @ 81F0F45 - msgbox gUnknown_08272C5F, MSGBOX_DEFAULT + msgbox gText_SandstormIsVicious, MSGBOX_DEFAULT closemessage compare VAR_0x8004, 0 call_if_eq Route111_EventScript_1F0F7C diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index 9257b3a64..c4d92c172 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -89,7 +89,7 @@ Route119_WeatherInstitute_2F_EventScript_27004D:: @ 827004D goto_if_eq Route119_WeatherInstitute_2F_EventScript_270085 compare VAR_RESULT, 1 goto_if_eq Route119_WeatherInstitute_2F_EventScript_2700AD - goto Route119_WeatherInstitute_2F_EventScript_273811 + goto Common_EventScript_NoMoreRoomForPokemon end Route119_WeatherInstitute_2F_EventScript_270085:: @ 8270085 @@ -97,8 +97,8 @@ Route119_WeatherInstitute_2F_EventScript_270085:: @ 8270085 msgbox gText_NicknameThisPokemon, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq Route119_WeatherInstitute_2F_EventScript_2700EA - call Route119_WeatherInstitute_2F_EventScript_27378B - call Common_EventScript_NameReceivedPokemon + call Common_EventScript_GetGiftMonPartySlot + call Common_EventScript_NameReceivedPartyMon goto Route119_WeatherInstitute_2F_EventScript_2700EA end @@ -107,7 +107,7 @@ Route119_WeatherInstitute_2F_EventScript_2700AD:: @ 82700AD msgbox gText_NicknameThisPokemon, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq Route119_WeatherInstitute_2F_EventScript_2700D0 - call Route119_WeatherInstitute_2F_EventScript_273797 + call Common_EventScript_NameReceivedBoxMon goto Route119_WeatherInstitute_2F_EventScript_2700D0 end diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc index e5ac226c5..f5528087b 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc @@ -162,7 +162,7 @@ RustboroCity_DevonCorp_2F_EventScript_211A3E:: @ 8211A3E goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A6E compare VAR_RESULT, 1 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A96 - goto RustboroCity_DevonCorp_2F_EventScript_273811 + goto Common_EventScript_NoMoreRoomForPokemon end RustboroCity_DevonCorp_2F_EventScript_211A6E:: @ 8211A6E @@ -170,8 +170,8 @@ RustboroCity_DevonCorp_2F_EventScript_211A6E:: @ 8211A6E msgbox gText_NicknameThisPokemon, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211AD7 - call RustboroCity_DevonCorp_2F_EventScript_27378B - call Common_EventScript_NameReceivedPokemon + call Common_EventScript_GetGiftMonPartySlot + call Common_EventScript_NameReceivedPartyMon goto RustboroCity_DevonCorp_2F_EventScript_211AD7 end @@ -180,7 +180,7 @@ RustboroCity_DevonCorp_2F_EventScript_211A96:: @ 8211A96 msgbox gText_NicknameThisPokemon, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211AB9 - call RustboroCity_DevonCorp_2F_EventScript_273797 + call Common_EventScript_NameReceivedBoxMon goto RustboroCity_DevonCorp_2F_EventScript_211AB9 end @@ -211,7 +211,7 @@ RustboroCity_DevonCorp_2F_EventScript_211AE1:: @ 8211AE1 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B11 compare VAR_RESULT, 1 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B39 - goto RustboroCity_DevonCorp_2F_EventScript_273811 + goto Common_EventScript_NoMoreRoomForPokemon end RustboroCity_DevonCorp_2F_EventScript_211B11:: @ 8211B11 @@ -219,8 +219,8 @@ RustboroCity_DevonCorp_2F_EventScript_211B11:: @ 8211B11 msgbox gText_NicknameThisPokemon, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B7A - call RustboroCity_DevonCorp_2F_EventScript_27378B - call Common_EventScript_NameReceivedPokemon + call Common_EventScript_GetGiftMonPartySlot + call Common_EventScript_NameReceivedPartyMon goto RustboroCity_DevonCorp_2F_EventScript_211B7A end @@ -229,7 +229,7 @@ RustboroCity_DevonCorp_2F_EventScript_211B39:: @ 8211B39 msgbox gText_NicknameThisPokemon, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B5C - call RustboroCity_DevonCorp_2F_EventScript_273797 + call Common_EventScript_NameReceivedBoxMon goto RustboroCity_DevonCorp_2F_EventScript_211B5C end diff --git a/data/maps/RustboroCity_Gym/scripts.inc b/data/maps/RustboroCity_Gym/scripts.inc index 04027dfa7..dc11d3a10 100644 --- a/data/maps/RustboroCity_Gym/scripts.inc +++ b/data/maps/RustboroCity_Gym/scripts.inc @@ -21,7 +21,7 @@ RustboroCity_Gym_EventScript_212F66:: @ 8212F66 setvar VAR_RUSTBORO_CITY_STATE, 1 addvar VAR_PETALBURG_GYM_STATE, 1 setvar VAR_0x8008, 1 - call RustboroCity_Gym_EventScript_271F43 + call Common_EventScript_SetGymTrainers compare VAR_PETALBURG_GYM_STATE, 6 call_if_eq RustboroCity_Gym_EventScript_271E84 goto RustboroCity_Gym_EventScript_212FA4 diff --git a/data/maps/RustboroCity_Mart/scripts.inc b/data/maps/RustboroCity_Mart/scripts.inc index a5693847c..88a540356 100644 --- a/data/maps/RustboroCity_Mart/scripts.inc +++ b/data/maps/RustboroCity_Mart/scripts.inc @@ -4,7 +4,7 @@ RustboroCity_Mart_MapScripts:: @ 8214F05 RustboroCity_Mart_EventScript_214F06:: @ 8214F06 lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage goto_if_unset FLAG_MET_DEVON_EMPLOYEE, RustboroCity_Mart_EventScript_214F21 goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_Mart_EventScript_214F48 @@ -12,7 +12,7 @@ RustboroCity_Mart_EventScript_214F06:: @ 8214F06 RustboroCity_Mart_EventScript_214F21:: @ 8214F21 pokemart RustboroCity_Mart_Pokemart_214F30 - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end @@ -33,7 +33,7 @@ RustboroCity_Mart_Pokemart_214F30: @ 8214F30 RustboroCity_Mart_EventScript_214F48:: @ 8214F48 pokemart RustboroCity_Mart_Pokemart_214F58 - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc index 4d50ca89c..116d0fb50 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc @@ -5,12 +5,12 @@ RustboroCity_PokemonCenter_1F_MapScripts:: @ 8214D62 RustboroCity_PokemonCenter_1F_OnTransition: @ 8214D6D setrespawn HEAL_LOCATION_RUSTBORO_CITY - call RustboroCity_PokemonCenter_1F_EventScript_2718DE + call Common_EventScript_UpdateBrineyLocation end RustboroCity_PokemonCenter_1F_EventScript_214D76:: @ 8214D76 setvar VAR_0x800B, 1 - call RustboroCity_PokemonCenter_1F_EventScript_27191E + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release diff --git a/data/maps/SealedChamber_InnerRoom/scripts.inc b/data/maps/SealedChamber_InnerRoom/scripts.inc index 5c4cb2199..b34355e3f 100644 --- a/data/maps/SealedChamber_InnerRoom/scripts.inc +++ b/data/maps/SealedChamber_InnerRoom/scripts.inc @@ -27,7 +27,7 @@ SealedChamber_InnerRoom_EventScript_2391F8:: @ 82391F8 waitstate playse SE_DOOR delay 40 - msgbox gUnknown_0827301B, MSGBOX_DEFAULT + msgbox gText_DoorOpenedFarAway, MSGBOX_DEFAULT closemessage fadeinbgm 0 setflag FLAG_REGI_DOORS_OPENED diff --git a/data/maps/SealedChamber_OuterRoom/scripts.inc b/data/maps/SealedChamber_OuterRoom/scripts.inc index 865be8963..4d9ed93d4 100644 --- a/data/maps/SealedChamber_OuterRoom/scripts.inc +++ b/data/maps/SealedChamber_OuterRoom/scripts.inc @@ -116,7 +116,7 @@ SealedChamber_OuterRoom_EventScript_2391D0:: @ 82391D0 end SealedChamber_OuterRoom_EventScript_2391E3:: @ 82391E3 - msgbox gUnknown_0827304E, MSGBOX_DEFAULT + msgbox gText_BigHoleInTheWall, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index a1ddb122d..dd639201e 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -122,7 +122,7 @@ SlateportCity_EventScript_1DCDBD:: @ 81DCDBD message SlateportCity_Text_1DD64A waitmessage pokemart SlateportCity_Pokemart_1DCDD4 - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end @@ -489,10 +489,10 @@ SlateportCity_EventScript_1DD153:: @ 81DD153 SlateportCity_EventScript_1DD16A:: @ 81DD16A lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemartdecoration SlateportCity_PokemartDecor_Dolls - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end @@ -506,7 +506,7 @@ SlateportCity_PokemartDecor_Dolls: @ 81DD184 end SlateportCity_EventScript_1DD18E:: @ 81DD18E - msgbox gUnknown_08272E30, MSGBOX_DEFAULT + msgbox gText_ComeBackWithSecretPower, MSGBOX_DEFAULT release end @@ -514,10 +514,10 @@ SlateportCity_EventScript_1DD198:: @ 81DD198 lock faceplayer goto_if_unset FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_1DD18E - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemartdecoration SlateportCity_PokemartDecor_1DD1B8 - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end @@ -543,10 +543,10 @@ SlateportCity_PokemartDecor_1DD1B8: @ 81DD1B8 SlateportCity_EventScript_1DD1D8:: @ 81DD1D8 lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemart SlateportCity_Pokemart_1DD1F0 - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end @@ -873,7 +873,7 @@ SlateportCity_EventScript_1DD557:: @ 81DD557 end SlateportCity_EventScript_1DD5C1:: @ 81DD5C1 - msgbox gUnknown_08272A89, MSGBOX_DEFAULT + msgbox gText_TheBagIsFull, MSGBOX_DEFAULT special RemoveBerryPowderVendorMenu release end diff --git a/data/maps/SlateportCity_House1/scripts.inc b/data/maps/SlateportCity_House1/scripts.inc index 0a5808820..418d0d354 100644 --- a/data/maps/SlateportCity_House1/scripts.inc +++ b/data/maps/SlateportCity_House1/scripts.inc @@ -57,7 +57,7 @@ SlateportCity_House1_EventScript_209B50:: @ 8209B50 SlateportCity_House1_EventScript_209B5A:: @ 8209B5A msgbox SlateportCity_House1_Text_209CA4, MSGBOX_DEFAULT - call Common_EventScript_NameReceivedPokemon + call Common_EventScript_NameReceivedPartyMon specialvar VAR_RESULT, TV_PutNameRaterShowOnTheAirIfNicknameChanged special TV_CopyNicknameToStringVar1AndEnsureTerminated compare VAR_RESULT, 1 diff --git a/data/maps/SlateportCity_Mart/scripts.inc b/data/maps/SlateportCity_Mart/scripts.inc index cc1eff7f6..63042338b 100644 --- a/data/maps/SlateportCity_Mart/scripts.inc +++ b/data/maps/SlateportCity_Mart/scripts.inc @@ -4,10 +4,10 @@ SlateportCity_Mart_MapScripts:: @ 820DC48 SlateportCity_Mart_EventScript_20DC49:: @ 820DC49 lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemart SlateportCity_Mart_Pokemart_20DC60 - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc index d15a23558..7a03202ad 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc @@ -71,8 +71,8 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_20C2BE, MSGBOX_DEFAULT - setvar VAR_0x8004, 269 - call SlateportCity_OceanicMuseum_2F_EventScript_2723E4 + setvar VAR_0x8004, ITEM_DEVON_GOODS + call Common_EventScript_PlayerHandedOverTheItem msgbox SlateportCity_OceanicMuseum_2F_Text_20C36C, MSGBOX_DEFAULT closemessage fadescreen 1 diff --git a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc index 4c6b3ec7f..a6c344a21 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc @@ -5,12 +5,12 @@ SlateportCity_PokemonCenter_1F_MapScripts:: @ 820DABF SlateportCity_PokemonCenter_1F_OnTransition: @ 820DACA setrespawn HEAL_LOCATION_SLATEPORT_CITY - call SlateportCity_PokemonCenter_1F_EventScript_2718DE + call Common_EventScript_UpdateBrineyLocation end SlateportCity_PokemonCenter_1F_EventScript_20DAD3:: @ 820DAD3 setvar VAR_0x800B, 1 - call SlateportCity_PokemonCenter_1F_EventScript_27191E + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc index 8db708e9c..fa69aadc2 100644 --- a/data/maps/SootopolisCity_Gym_1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc @@ -109,7 +109,7 @@ SootopolisCity_Gym_1F_EventScript_224F82:: @ 8224F82 setvar VAR_SOOTOPOLIS_CITY_STATE, 6 clearflag FLAG_HIDE_SOOTOPOLIS_CITY_MAN_1 setvar VAR_0x8008, 8 - call SootopolisCity_Gym_1F_EventScript_271F43 + call Common_EventScript_SetGymTrainers call SootopolisCity_Gym_1F_EventScript_224FD4 closemessage delay 30 diff --git a/data/maps/SootopolisCity_Mart/scripts.inc b/data/maps/SootopolisCity_Mart/scripts.inc index fe0270d62..0b477ce47 100644 --- a/data/maps/SootopolisCity_Mart/scripts.inc +++ b/data/maps/SootopolisCity_Mart/scripts.inc @@ -4,10 +4,10 @@ SootopolisCity_Mart_MapScripts:: @ 8226794 SootopolisCity_Mart_EventScript_226795:: @ 8226795 lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemart SootopolisCity_Mart_Pokemart_2267AC - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc index d3dfb91b0..41a180c4f 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc @@ -9,7 +9,7 @@ SootopolisCity_PokemonCenter_1F_OnTransition: @ 82264FC SootopolisCity_PokemonCenter_1F_EventScript_226500:: @ 8226500 setvar VAR_0x800B, 1 - call SootopolisCity_PokemonCenter_1F_EventScript_27191E + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release diff --git a/data/maps/SouthernIsland_Interior/scripts.inc b/data/maps/SouthernIsland_Interior/scripts.inc index a87b59079..c7bd4d9a0 100644 --- a/data/maps/SouthernIsland_Interior/scripts.inc +++ b/data/maps/SouthernIsland_Interior/scripts.inc @@ -24,12 +24,12 @@ SouthernIsland_Interior_OnTransition: @ 8242A6E SouthernIsland_Interior_EventScript_242A8A:: @ 8242A8A setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LATIOS - setvar VAR_TEMP_4, 408 + setvar VAR_TEMP_4, SPECIES_LATIOS return SouthernIsland_Interior_EventScript_242A95:: @ 8242A95 setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LATIAS - setvar VAR_TEMP_4, 407 + setvar VAR_TEMP_4, SPECIES_LATIAS return SouthernIsland_Interior_EventScript_242AA0:: @ 8242AA0 @@ -99,12 +99,12 @@ SouthernIsland_Interior_EventScript_242AD0:: @ 8242AD0 SouthernIsland_Interior_EventScript_242B81:: @ 8242B81 setflag FLAG_DEFEATED_LATIAS_OR_LATIOS copyvar VAR_0x8004, VAR_TEMP_4 - goto SouthernIsland_Interior_EventScript_273776 + goto Common_EventScript_LegendaryFlewAway end SouthernIsland_Interior_EventScript_242B8F:: @ 8242B8F copyvar VAR_0x8004, VAR_TEMP_4 - goto SouthernIsland_Interior_EventScript_273776 + goto Common_EventScript_LegendaryFlewAway end SouthernIsland_Interior_EventScript_242B9A:: @ 8242B9A @@ -113,16 +113,16 @@ SouthernIsland_Interior_EventScript_242B9A:: @ 8242B9A end SouthernIsland_Interior_EventScript_242BA4:: @ 8242BA4 - setvar VAR_0x8004, 408 - setvar VAR_0x8005, 50 - setvar VAR_0x8006, 191 + setvar VAR_0x8004, SPECIES_LATIOS + setvar VAR_0x8005, 50 @level + setvar VAR_0x8006, ITEM_SOUL_DEW special CreateObedientEnemyMon return SouthernIsland_Interior_EventScript_242BB7:: @ 8242BB7 - setvar VAR_0x8004, 407 - setvar VAR_0x8005, 50 - setvar VAR_0x8006, 191 + setvar VAR_0x8004, SPECIES_LATIAS + setvar VAR_0x8005, 50 @level + setvar VAR_0x8006, ITEM_SOUL_DEW special CreateObedientEnemyMon return diff --git a/data/maps/TerraCave_End/scripts.inc b/data/maps/TerraCave_End/scripts.inc index 79b209e8a..df2e6f969 100644 --- a/data/maps/TerraCave_End/scripts.inc +++ b/data/maps/TerraCave_End/scripts.inc @@ -55,12 +55,12 @@ TerraCave_End_EventScript_23B0EC:: @ 823B0EC TerraCave_End_EventScript_23B155:: @ 823B155 setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 1 setflag FLAG_DEFEATED_GROUDON - goto TerraCave_End_EventScript_27376D + goto Common_EventScript_RemoveStaticPokemon end TerraCave_End_EventScript_23B163:: @ 823B163 - setvar VAR_0x8004, 405 - goto TerraCave_End_EventScript_273776 + setvar VAR_0x8004, SPECIES_GROUDON + goto Common_EventScript_LegendaryFlewAway end TerraCave_End_Movement_23B16E: @ 823B16E diff --git a/data/maps/TrainerHill_Entrance/scripts.inc b/data/maps/TrainerHill_Entrance/scripts.inc index 5be00aa9d..03ddc47c2 100644 --- a/data/maps/TrainerHill_Entrance/scripts.inc +++ b/data/maps/TrainerHill_Entrance/scripts.inc @@ -105,7 +105,7 @@ TrainerHill_Entrance_EventScript_2681EE:: @ 82681EE TrainerHill_Entrance_EventScript_2681EF:: @ 82681EF setvar VAR_0x800B, 2 - call TrainerHill_Entrance_EventScript_27191E + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release @@ -261,11 +261,11 @@ TrainerHill_Entrance_EventScript_2683BE:: @ 82683BE TrainerHill_Entrance_EventScript_2683C7:: @ 82683C7 lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage goto_if_set FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_268402 pokemart TrainerHill_Entrance_Pokemart_2683E8 - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end @@ -288,7 +288,7 @@ TrainerHill_Entrance_Pokemart_2683E8: @ 82683E8 TrainerHill_Entrance_EventScript_268402:: @ 8268402 pokemart TrainerHill_Entrance_Pokemart_268414 - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/TrainerHill_Roof/scripts.inc b/data/maps/TrainerHill_Roof/scripts.inc index bf467e100..f7ced5d07 100644 --- a/data/maps/TrainerHill_Roof/scripts.inc +++ b/data/maps/TrainerHill_Roof/scripts.inc @@ -29,14 +29,14 @@ TrainerHill_Roof_EventScript_268FF2:: @ 8268FF2 TrainerHill_Roof_EventScript_269020:: @ 8269020 msgbox TrainerHill_Roof_Text_268AC5, MSGBOX_DEFAULT playfanfare MUS_FANFA1 - message gUnknown_08272A78 + message gText_ObtainedTheItem waitfanfare waitmessage goto TrainerHill_Roof_EventScript_269054 TrainerHill_Roof_EventScript_269037:: @ 8269037 msgbox TrainerHill_Roof_Text_268AC5, MSGBOX_DEFAULT - msgbox gUnknown_08272A89, MSGBOX_DEFAULT + msgbox gText_TheBagIsFull, MSGBOX_DEFAULT msgbox TrainerHill_Roof_Text_268B07, MSGBOX_DEFAULT goto TrainerHill_Roof_EventScript_269054 diff --git a/data/maps/VerdanturfTown_Mart/scripts.inc b/data/maps/VerdanturfTown_Mart/scripts.inc index 6457aa626..2b3ccfc3a 100644 --- a/data/maps/VerdanturfTown_Mart/scripts.inc +++ b/data/maps/VerdanturfTown_Mart/scripts.inc @@ -4,10 +4,10 @@ VerdanturfTown_Mart_MapScripts:: @ 8202586 VerdanturfTown_Mart_EventScript_202587:: @ 8202587 lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemart VerdanturfTown_Mart_Pokemart_2025A0 - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc index 5eb738e73..f785e8771 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc @@ -5,12 +5,12 @@ VerdanturfTown_PokemonCenter_1F_MapScripts:: @ 8202726 VerdanturfTown_PokemonCenter_1F_OnTransition: @ 8202731 setrespawn HEAL_LOCATION_VERDANTURF_TOWN - call VerdanturfTown_PokemonCenter_1F_EventScript_2718DE + call Common_EventScript_UpdateBrineyLocation end VerdanturfTown_PokemonCenter_1F_EventScript_20273A:: @ 820273A setvar VAR_0x800B, 1 - call VerdanturfTown_PokemonCenter_1F_EventScript_27191E + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index eeecf2d75..dd024ecff 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -47,7 +47,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276B19:: @ 8276B19 gotoram OldaleTown_PokemonCenter_2F_EventScript_276B1A:: @ 8276B1A - msgbox gUnknown_08273178, MSGBOX_NPC + msgbox gText_ThankYouForAccessingMysteryGift, MSGBOX_NPC end OldaleTown_PokemonCenter_2F_EventScript_276B23:: @ 8276B23 @@ -64,7 +64,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276B23:: @ 8276B23 end OldaleTown_PokemonCenter_2F_EventScript_276B62:: @ 8276B62 - msgbox gUnknown_08273178, MSGBOX_DEFAULT + msgbox gText_ThankYouForAccessingMysteryGift, MSGBOX_DEFAULT release end @@ -707,13 +707,13 @@ OldaleTown_PokemonCenter_2F_EventScript_277328:: @ 8277328 release end -OldaleTown_PokemonCenter_2F_EventScript_277335:: @ 8277335 - msgbox gUnknown_0827306F, MSGBOX_DEFAULT +CableClub_EventScript_WirelessClubAdjustements:: @ 8277335 + msgbox gText_SorryWirelessClubAdjustments, MSGBOX_DEFAULT release end OldaleTown_PokemonCenter_2F_EventScript_27733F:: @ 827733F - msgbox gUnknown_082730BC, MSGBOX_DEFAULT + msgbox gText_UndergoingAdjustments, MSGBOX_DEFAULT releaseall end @@ -977,7 +977,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27751B:: @ 827751B lock faceplayer setvar VAR_FRONTIER_FACILITY, 8 - goto_if_unset FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_2F_EventScript_277335 + goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements specialvar VAR_RESULT, sub_813990C compare VAR_RESULT, 1 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27731B @@ -1052,12 +1052,12 @@ OldaleTown_PokemonCenter_2F_EventScript_277626:: @ 8277626 OldaleTown_PokemonCenter_2F_EventScript_27764C:: @ 827764C msgbox OldaleTown_PokemonCenter_2F_Text_27893E, MSGBOX_DEFAULT - goto OldaleTown_PokemonCenter_2F_EventScript_273755 + goto EventScript_CableClub_SetVarResult0 end OldaleTown_PokemonCenter_2F_EventScript_27765A:: @ 827765A msgbox OldaleTown_PokemonCenter_2F_Text_27897B, MSGBOX_DEFAULT - goto OldaleTown_PokemonCenter_2F_EventScript_273755 + goto EventScript_CableClub_SetVarResult0 end OldaleTown_PokemonCenter_2F_EventScript_277668:: @ 8277668 @@ -1068,7 +1068,7 @@ OldaleTown_PokemonCenter_2F_EventScript_277668:: @ 8277668 OldaleTown_PokemonCenter_2F_EventScript_277672:: @ 8277672 lock faceplayer - goto_if_unset FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_2F_EventScript_277335 + goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements msgbox OldaleTown_PokemonCenter_2F_Text_279937, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27769A @@ -1085,7 +1085,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2776A4:: @ 82776A4 lock faceplayer setvar VAR_FRONTIER_FACILITY, 9 - goto_if_unset FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_2F_EventScript_277335 + goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements specialvar VAR_RESULT, sub_813990C compare VAR_RESULT, 1 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27731B @@ -1856,7 +1856,7 @@ OldaleTown_PokemonCenter_2F_Text_278A39: @ 8278A39 .string "Oh…\n" .string "Excuse me!$" -OldaleTown_PokemonCenter_1F_Text_278A48: @ 8278A48 +CableClub_Text_PlayerIsWaiting: @ 8278A48 .string "It appears as if {STR_VAR_1} is playing\n" .string "right now.\l" .string "Go for it!$" diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index a26ecb4c9..3269ec233 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -679,7 +679,7 @@ EventScript_PblocLink_DifferentSelections: @ 8294183 EventScript_PblocLink_CloseLink: @ 8294190 special CloseLink - msgbox gUnknown_08272D9C, MSGBOX_DEFAULT + msgbox gText_PokeblockLinkCanceled, MSGBOX_DEFAULT releaseall end diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc index 81bd388f8..02d331611 100644 --- a/data/scripts/secret_base.inc +++ b/data/scripts/secret_base.inc @@ -336,7 +336,7 @@ EventScript_275A50:: @ 8275A50 compare VAR_RESULT, 6 goto_if_eq EventScript_275A91 bufferpartymonnick 0, VAR_RESULT - msgbox gText_23B704, MSGBOX_YESNO + msgbox gText_UseSecretPower, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq EventScript_275CDE msgbox Text_MonUsedHM, MSGBOX_DEFAULT @@ -354,12 +354,12 @@ EventScript_275A86:: @ 8275A86 end EventScript_275A91:: @ 8275A91 - msgbox gText_23B6E0, MSGBOX_DEFAULT + msgbox gText_SmallIndentInWall, MSGBOX_DEFAULT releaseall end EventScript_275A9B:: @ 8275A9B - msgbox gText_23B73E, MSGBOX_DEFAULT + msgbox gText_DiscoveredSmallCavern, MSGBOX_DEFAULT goto EventScript_275B5B end @@ -1087,19 +1087,19 @@ Text_276835: @ 8276835 .string "Up to ten SECRET BASE locations\n" .string "may be registered.$" -Text_27692B: @ 827692B +SecretBase_Text_BattleTowerShield: @ 827692B .string "A shield of {STR_VAR_2} that marks winning\n" .string "{STR_VAR_1} times in a row at the BATTLE TOWER.$" -Text_276974: @ 8276974 +SecretBase_Text_ToyTV: @ 8276974 .string "A realistic toy TV. It could be easily\n" .string "mistaken for the real thing.$" -Text_2769B8: @ 82769B8 +SecretBase_Text_SeedotTV: @ 82769B8 .string "A toy TV shaped like a SEEDOT.\n" .string "It looks ready to roll away on its own…$" -Text_2769FF: @ 82769FF +SecretBase_Text_SkittyTV: @ 82769FF .string "A toy TV shaped like a SKITTY.\n" .string "It looks ready to stroll away…$" diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc index 4a276ffc0..a91237257 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -30,7 +30,7 @@ EventScript_27EE54:: @ 827EE54 EventScript_27EE8A:: @ 827EE8A special GetMomOrDadStringForTVMessage - msgbox gUnknown_08272BCF, MSGBOX_DEFAULT + msgbox gText_MomOrDadMightLikeThisProgram, MSGBOX_DEFAULT special TurnOffTVScreen releaseall end @@ -69,7 +69,7 @@ EventScript_27EED0:: @ 827EED0 EventScript_27EED8:: @ 827EED8 special GetMomOrDadStringForTVMessage - msgbox gUnknown_08272BCF, MSGBOX_DEFAULT + msgbox gText_MomOrDadMightLikeThisProgram, MSGBOX_DEFAULT goto EventScript_27EED0 end diff --git a/data/specials.inc b/data/specials.inc index ba93b098d..fb66bb0a6 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -429,7 +429,7 @@ gSpecials:: @ 81DBA64 def_special UnionRoomSpecial def_special sub_801A42C def_special sub_8016934 - def_special sp182_move_string + def_special BufferUnionRoomPlayerName def_special sub_801DC20 def_special sub_81B8958 def_special sub_8018090 @@ -523,7 +523,7 @@ gSpecials:: @ 81DBA64 def_special TryBufferWaldaPhrase def_special DoWaldaNamingScreen def_special TryGetWallpaperWithWaldaPhrase - def_special sub_8139ED0 + def_special PlayerAtTrainerHillEntrance def_special sub_813B968 def_special sub_80F8B94 def_special ShowTrainerHillRecords diff --git a/data/text/pokedex_rating.inc b/data/text/pokedex_rating.inc index d61f364e9..4c6c3f2b6 100644 --- a/data/text/pokedex_rating.inc +++ b/data/text/pokedex_rating.inc @@ -1,13 +1,13 @@ -gUnknown_082A5C9C:: @ 82A5C9C +gBirchDexRatingText_AreYouCurious:: @ 82A5C9C .string "PROF. BIRCH: Ah, {PLAYER}{KUN}!\p" .string "Are you curious about how your\n" .string "POKéDEX is coming along?$" -Route101_Text_2A5CEB: @ 82A5CEB +gBirchDexRatingText_Cancel: @ 82A5CEB .string "Hm? Oh, you haven't caught enough\n" .string "POKéMON to make it worthwhile.$" -gUnknown_082A5D2C:: @ 82A5D2C +gBirchDexRatingText_SoYouveSeenAndCaught:: @ 82A5D2C .string "Hmhm…\p" .string "So, you've seen {STR_VAR_1} POKéMON,\n" .string "and you've caught {STR_VAR_2} POKéMON…$" @@ -108,7 +108,7 @@ gBirchDexRatingText_DexCompleted:: @ 82A6312 .string "Congratulations!\n" .string "Your POKéDEX is complete!$" -gUnknown_082A633D:: @ 82A633D +gBirchDexRatingText_OnANationwideBasis:: @ 82A633D .string "Hmhm…\n" .string "On a nationwide basis…\p" .string "You've seen {STR_VAR_1} POKéMON,\n" diff --git a/include/constants/flags.h b/include/constants/flags.h index 7aa5c3ed3..3dbf38780 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -367,7 +367,7 @@ #define FLAG_MET_SLATEPORT_FANCLUB_CHAIRMAN 0x156 #define FLAG_MET_BATTLE_FRONTIER_BETTOR 0x157 #define FLAG_ENABLE_MR_STONE_POKENAV 0x158 -#define FLAG_OLDALE_NURSE_MENTIONS_GOLD_CARD 0x159 +#define FLAG_NURSE_MENTIONS_GOLD_CARD 0x159 #define FLAG_MET_FRONTIER_BEAUTY_MOVE_TUTOR 0x15A #define FLAG_MET_FRONTIER_SWIMMER_MOVE_TUTOR 0x15B diff --git a/include/event_scripts.h b/include/event_scripts.h index fc0b3cde0..0cb09f9e1 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -1,8 +1,8 @@ #ifndef GUARD_EVENT_SCRIPTS_H #define GUARD_EVENT_SCRIPTS_H -extern const u8 gUnknown_0823B4E8[]; -extern const u8 gUnknown_0823B5E9[]; +extern const u8 EventScript_SecretBasePCCancel[]; +extern const u8 EventScript_SecretBasePCStart[]; extern const u8 EventScript_TestSignpostMsg[]; extern const u8 EventScript_TryGetTrainerScript[]; extern const u8 EventScript_275BB7[]; diff --git a/src/decoration.c b/src/decoration.c index 974859c88..a200768a4 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -633,7 +633,7 @@ static void DecorationMenuAction_Cancel(u8 taskId) RemoveDecorationWindow(0); if (!gDecorationContext.isPlayerRoom) { - ScriptContext1_SetupScript(gUnknown_0823B4E8); + ScriptContext1_SetupScript(EventScript_SecretBasePCCancel); DestroyTask(taskId); } else diff --git a/src/field_specials.c b/src/field_specials.c index 99e8e93a9..cb02f1f96 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -2009,7 +2009,7 @@ bool8 warp0_in_pokecenter(void) return FALSE; } -bool32 sub_8139ED0(void) +bool32 PlayerAtTrainerHillEntrance(void) { if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(TRAINER_HILL_ENTRANCE) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_HILL_ENTRANCE)) { diff --git a/src/match_call.c b/src/match_call.c index b02af9977..172831792 100644 --- a/src/match_call.c +++ b/src/match_call.c @@ -965,9 +965,9 @@ static const struct MatchCallText *const sMatchCallGeneralTopics[] = sMatchCallBattlePyramidTexts, }; -extern const u8 gUnknown_082A5C9C[]; -extern const u8 gUnknown_082A5D2C[]; -extern const u8 gUnknown_082A633D[]; +extern const u8 gBirchDexRatingText_AreYouCurious[]; +extern const u8 gBirchDexRatingText_SoYouveSeenAndCaught[]; +extern const u8 gBirchDexRatingText_OnANationwideBasis[]; void InitMatchCallCounters(void) { @@ -1979,10 +1979,10 @@ void sub_8197080(u8 *destStr) ConvertIntToDecimalStringN(gStringVar1, numSeen, 0, 3); ConvertIntToDecimalStringN(gStringVar2, numCaught, 0, 3); dexRatingLevel = GetPokedexRatingLevel(numCaught); - str = StringCopy(buffer, gUnknown_082A5C9C); + str = StringCopy(buffer, gBirchDexRatingText_AreYouCurious); str[0] = CHAR_PROMPT_CLEAR; str++; - str = StringCopy(str, gUnknown_082A5D2C); + str = StringCopy(str, gBirchDexRatingText_SoYouveSeenAndCaught); str[0] = CHAR_PROMPT_CLEAR; str++; StringCopy(str, sBirchDexRatingTexts[dexRatingLevel]); @@ -1996,7 +1996,7 @@ void sub_8197080(u8 *destStr) numCaught = GetNationalPokedexCount(FLAG_GET_CAUGHT); ConvertIntToDecimalStringN(gStringVar1, numSeen, 0, 3); ConvertIntToDecimalStringN(gStringVar2, numCaught, 0, 3); - StringExpandPlaceholders(str, gUnknown_082A633D); + StringExpandPlaceholders(str, gBirchDexRatingText_OnANationwideBasis); } Free(buffer); diff --git a/src/secret_base.c b/src/secret_base.c index 12cb8cd61..0b5f1cae5 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -1077,9 +1077,9 @@ static void ReturnToMainRegistryMenu(u8 taskId) static void GoToSecretBasePCMainMenu(u8 taskId) { if (VarGet(VAR_CURRENT_SECRET_BASE) == 0) - ScriptContext1_SetupScript(gUnknown_0823B4E8); + ScriptContext1_SetupScript(EventScript_SecretBasePCCancel); else - ScriptContext1_SetupScript(gUnknown_0823B5E9); + ScriptContext1_SetupScript(EventScript_SecretBasePCStart); DestroyTask(taskId); } diff --git a/src/union_room.c b/src/union_room.c index 01288c8cc..8c88c19f8 100644 --- a/src/union_room.c +++ b/src/union_room.c @@ -50,7 +50,7 @@ #include "constants/songs.h" #include "constants/species.h" -EWRAM_DATA u8 gUnknown_02022C20[12] = {}; +EWRAM_DATA u8 sUnionRoomPlayerName[12] = {}; EWRAM_DATA u8 gUnknown_02022C2C = 0; EWRAM_DATA u8 gUnknown_02022C2D = 0; EWRAM_DATA union UnkUnion_Main gUnknown_02022C30 = {}; @@ -4101,7 +4101,7 @@ void sub_8016934(void) { struct UnkStruct_URoom *ptr; - gUnknown_02022C20[0] = EOS; + sUnionRoomPlayerName[0] = EOS; CreateTask(sub_801697C, 0); gUnknown_02022C30.uRoom = gUnknown_02022C30.uRoom; // Needed to match. gUnknown_02022C30.uRoom = ptr = AllocZeroed(0x26C); @@ -4110,7 +4110,7 @@ void sub_8016934(void) ptr->textState = 0; ptr->field_10 = 0; ptr->field_12 = 0; - gUnknown_02022C20[0] = EOS; + sUnionRoomPlayerName[0] = EOS; } void sub_801697C(u8 taskId) @@ -4149,7 +4149,7 @@ void sub_801697C(u8 taskId) { case 1: case 2: - if (gUnknown_02022C20[0] == EOS) + if (sUnionRoomPlayerName[0] == EOS) { for (i = 0; i < PLAYER_NAME_LENGTH + 1; i++) { @@ -4158,7 +4158,7 @@ void sub_801697C(u8 taskId) sub_8018404(text, &structPtr->field_0->arr[i]); if (sub_800E540(ReadAsU16(structPtr->field_0->arr[i].unk.field_0.unk_00.playerTrainerId), text)) { - StringCopy(gUnknown_02022C20, text); + StringCopy(sUnionRoomPlayerName, text); break; } } @@ -4182,12 +4182,12 @@ void sub_801697C(u8 taskId) } } -bool16 sp182_move_string(void) +bool16 BufferUnionRoomPlayerName(void) { - if (gUnknown_02022C20[0] != EOS) + if (sUnionRoomPlayerName[0] != EOS) { - StringCopy(gStringVar1, gUnknown_02022C20); - gUnknown_02022C20[0] = EOS; + StringCopy(gStringVar1, sUnionRoomPlayerName); + sUnionRoomPlayerName[0] = EOS; return TRUE; } else |