Merge branch 'master' into clone-union

This commit is contained in:
GriffinR
2022-09-03 14:31:04 -04:00
committed by GitHub
353 changed files with 20156 additions and 19152 deletions
+3 -3
View File
@@ -9,7 +9,7 @@ ViridianCity_School_EventScript_Lass::
faceplayer
msgbox ViridianCity_School_Text_TryingToMemorizeNotes
closemessage
applymovement LOCALID_LASS, Movement_WalkInPlaceFasterUp
applymovement LOCALID_LASS, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
release
end
@@ -19,7 +19,7 @@ ViridianCity_School_EventScript_Woman::
faceplayer
msgbox ViridianCity_School_Text_ReadBlackboardCarefully
closemessage
applymovement LOCALID_WOMAN, Movement_FaceOriginalDirection
applymovement LOCALID_WOMAN, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -36,7 +36,7 @@ ViridianCity_School_EventScript_Notebook::
msgbox ViridianCity_School_Text_TurnThePage, MSGBOX_YESNO
goto_if_eq VAR_RESULT, NO, ViridianCity_School_EventScript_StopReadingNotebook
msgbox ViridianCity_School_Text_NotebookFourthPage
applymovement LOCALID_LASS, Movement_WalkInPlaceFasterUp
applymovement LOCALID_LASS, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
textcolor NPC_TEXT_COLOR_FEMALE
msgbox ViridianCity_School_Text_HeyDontLookAtMyNotes