diff options
Diffstat (limited to 'data/scripts')
| -rw-r--r-- | data/scripts/move_tutors.inc | 10 | ||||
| -rw-r--r-- | data/scripts/trainer_card.inc | 10 | ||||
| -rw-r--r-- | data/scripts/white_out.inc | 4 |
3 files changed, 15 insertions, 9 deletions
diff --git a/data/scripts/move_tutors.inc b/data/scripts/move_tutors.inc index 205b452c5..43fb61017 100644 --- a/data/scripts/move_tutors.inc +++ b/data/scripts/move_tutors.inc @@ -446,6 +446,8 @@ EventScript_BodySlamTaught:: @ 81C4DE2 release end +.set LOCALID_CAPE_BRINK_TUTOR, 1 + TwoIsland_CapeBrink_House_EventScript_StarterTutor:: @ 81C4DEC goto_if_questlog EventScript_ReleaseEnd special QuestLog_CutRecording @@ -518,22 +520,22 @@ CapeBrinkTutor_EventScript_ChooseMon:: @ 81C4EDA end CapeBrinkTutor_EventScript_JumpInPlaceDown:: @ 81C4EF0 - applymovement 1, Movement_JumpInPlaceDown + applymovement LOCALID_CAPE_BRINK_TUTOR, Movement_JumpInPlaceDown waitmovement 0 return CapeBrinkTutor_EventScript_JumpInPlaceUp:: @ 81C4EFB - applymovement 1, Movement_JumpInPlaceUp + applymovement LOCALID_CAPE_BRINK_TUTOR, Movement_JumpInPlaceUp waitmovement 0 return CapeBrinkTutor_EventScript_JumpInPlaceLeft:: @ 81C4F06 - applymovement 1, Movement_JumpInPlaceLeft + applymovement LOCALID_CAPE_BRINK_TUTOR, Movement_JumpInPlaceLeft waitmovement 0 return CapeBrinkTutor_EventScript_JumpInPlaceRight:: @ 81C4F11 - applymovement 1, Movement_JumpInPlaceRight + applymovement LOCALID_CAPE_BRINK_TUTOR, Movement_JumpInPlaceRight waitmovement 0 return diff --git a/data/scripts/trainer_card.inc b/data/scripts/trainer_card.inc index 253e2837a..6b702f1a6 100644 --- a/data/scripts/trainer_card.inc +++ b/data/scripts/trainer_card.inc @@ -1,3 +1,5 @@ +.set LOCALID_STICKER_MAN, 1 + CeladonCity_GameCorner_EventScript_PhotoPrinter:: @ 81B2867 lockall showmoneybox 0, 0, 0 @@ -74,12 +76,12 @@ FourIsland_House2_EventScript_StickerMan:: @ 81B2938 FourIsland_House2_EventScript_MeetStickerMan:: @ 81B2951 setflag FLAG_MET_STICKER_MAN msgbox FourIsland_House2_Text_WishICouldShowOffStickers - applymovement 1, Movement_FacePlayer + applymovement LOCALID_STICKER_MAN, Movement_FacePlayer waitmovement 0 playse SE_PIN - applymovement 1, Movement_ExclamationMark + applymovement LOCALID_STICKER_MAN, Movement_ExclamationMark waitmovement 0 - applymovement 1, Movement_Delay48 + applymovement LOCALID_STICKER_MAN, Movement_Delay48 waitmovement 0 compare VAR_0x8008, 0 goto_if_eq FourIsland_House2_EventScript_StickerManNothingToBrag @@ -89,7 +91,7 @@ FourIsland_House2_EventScript_MeetStickerMan:: @ 81B2951 end FourIsland_House2_EventScript_StickerManAskForBrag:: @ 81B2994 - applymovement 1, Movement_FacePlayer + applymovement LOCALID_STICKER_MAN, Movement_FacePlayer waitmovement 0 goto_if_questlog EventScript_ReleaseEnd special QuestLog_CutRecording diff --git a/data/scripts/white_out.inc b/data/scripts/white_out.inc index 2758737bc..7c2199c8e 100644 --- a/data/scripts/white_out.inc +++ b/data/scripts/white_out.inc @@ -19,10 +19,12 @@ EventScript_AfterWhiteOutHealMsg:: @ 81A8DCF msgbox Text_MonsHealed return +@ LOCALID_MOM set by PalletTown_PlayersHouse_1F + EventScript_AfterWhiteOutMomHeal:: @ 81A8DD8 lockall textcolor 1 - applymovement 1, Movement_WalkInPlaceFastestDown + applymovement LOCALID_MOM, Movement_WalkInPlaceFastestDown waitmovement 0 msgbox Text_HadQuiteAnExperienceTakeRest call EventScript_OutOfCenterPartyHeal |