diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-25 02:24:20 -0500 |
|---|---|---|
| committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-25 02:24:20 -0500 |
| commit | 4e5fae008625d236d98d4958594c938bc17f83da (patch) | |
| tree | 38d9d2e8215684ff90f8e50c7dd2efd40a2cbc71 /data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc | |
| parent | 87859a655b810aeaad7e7e1f5b066731f7e79ece (diff) | |
| parent | a589d4a630a130e78bdf0819b807a133562d4449 (diff) | |
Merge branch 'master' into event-vars
Diffstat (limited to 'data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc')
| -rw-r--r-- | data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc index 9ee00e67c..de161a10c 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc @@ -32,9 +32,9 @@ MossdeepCity_SpaceCenter_2F_MapScript2_223DB5: @ 8223DB5 MossdeepCity_SpaceCenter_2F_EventScript_223DBF:: @ 8223DBF playse SE_PIN - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_272598 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_ExclamationMark waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_27259A + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_Delay48 waitmovement 0 msgbox MossdeepCity_SpaceCenter_2F_Text_2243A4, MSGBOX_YESNO compare VAR_RESULT, 1 @@ -57,13 +57,13 @@ MossdeepCity_SpaceCenter_2F_EventScript_223E09:: @ 8223E09 trainerbattle_no_intro TRAINER_GRUNT_34, MossdeepCity_SpaceCenter_2F_Text_224461 applymovement 6, MossdeepCity_SpaceCenter_2F_Movement_223E85 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox MossdeepCity_SpaceCenter_2F_Text_22446E, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GRUNT_35, MossdeepCity_SpaceCenter_2F_Text_224499 applymovement 5, MossdeepCity_SpaceCenter_2F_Movement_223E81 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox MossdeepCity_SpaceCenter_2F_Text_2244AB, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GRUNT_36, MossdeepCity_SpaceCenter_2F_Text_2244F1 @@ -173,7 +173,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_223F59:: @ 8223F59 lock faceplayer msgbox MossdeepCity_SpaceCenter_2F_Text_2245D9, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -231,20 +231,20 @@ MossdeepCity_SpaceCenter_2F_Movement_223FCF: @ 8223FCF step_end MossdeepCity_SpaceCenter_2F_EventScript_223FDA:: @ 8223FDA - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_27259E + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 msgbox MossdeepCity_SpaceCenter_2F_Text_2247FF, MSGBOX_YESNO compare VAR_RESULT, 1 goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_22400C msgbox MossdeepCity_SpaceCenter_2F_Text_224854, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 releaseall end MossdeepCity_SpaceCenter_2F_EventScript_22400C:: @ 822400C - applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_2725AA + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown waitmovement 0 special SavePlayerParty fadescreen 1 @@ -277,12 +277,12 @@ MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071 msgbox MossdeepCity_SpaceCenter_2F_Text_2248C2, MSGBOX_DEFAULT closemessage delay 20 - applymovement 9, MossdeepCity_SpaceCenter_2F_Movement_2725A4 - applymovement 8, MossdeepCity_SpaceCenter_2F_Movement_2725AA + applymovement 9, Common_Movement_WalkInPlaceLeft + applymovement 8, Common_Movement_WalkInPlaceDown waitmovement 0 delay 60 - applymovement 9, MossdeepCity_SpaceCenter_2F_Movement_2725A6 - applymovement 8, MossdeepCity_SpaceCenter_2F_Movement_2725A8 + applymovement 9, Common_Movement_WalkInPlaceUp + applymovement 8, Common_Movement_WalkInPlaceRight waitmovement 0 delay 20 msgbox MossdeepCity_SpaceCenter_2F_Text_2249DC, MSGBOX_DEFAULT |