Merge branch 'master' into clone-union
This commit is contained in:
@@ -19,18 +19,18 @@ SaffronCity_PokemonTrainerFanClub_OnFrame::
|
||||
SaffronCity_PokemonTrainerFanClub_EventScript_MeetFirstFans::
|
||||
lockall
|
||||
textcolor NPC_TEXT_COLOR_FEMALE
|
||||
applymovement LOCALID_BATTLE_GIRL, Movement_WalkInPlaceFasterDown
|
||||
applymovement LOCALID_BATTLE_GIRL, Common_Movement_WalkInPlaceFasterDown
|
||||
waitmovement 0
|
||||
playse SE_PIN
|
||||
applymovement LOCALID_BATTLE_GIRL, Movement_ExclamationMark
|
||||
applymovement LOCALID_BATTLE_GIRL, Common_Movement_ExclamationMark
|
||||
waitmovement 0
|
||||
applymovement LOCALID_BATTLE_GIRL, Movement_Delay48
|
||||
applymovement LOCALID_BATTLE_GIRL, Common_Movement_Delay48
|
||||
waitmovement 0
|
||||
msgbox SaffronCity_PokemonTrainerFanClub_Text_HuhYou
|
||||
closemessage
|
||||
applymovement LOCALID_BATTLE_GIRL, SaffronCity_PokemonTrainerFanClub_Movement_FanApproachPlayer
|
||||
waitmovement 0
|
||||
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
|
||||
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
|
||||
waitmovement 0
|
||||
msgbox SaffronCity_PokemonTrainerFanClub_Text_YourePlayerWereYourFansNow
|
||||
setvar VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 2
|
||||
|
||||
Reference in New Issue
Block a user