Merge branch 'master' into clone-union

This commit is contained in:
GriffinR
2022-08-17 15:41:50 -04:00
committed by GitHub
322 changed files with 12564 additions and 12748 deletions
+6 -9
View File
@@ -9,7 +9,7 @@ ViridianCity_School_EventScript_Lass::
faceplayer
msgbox ViridianCity_School_Text_TryingToMemorizeNotes
closemessage
applymovement LOCALID_LASS, Movement_WalkInPlaceFastestUp
applymovement LOCALID_LASS, Movement_WalkInPlaceFasterUp
waitmovement 0
release
end
@@ -28,20 +28,17 @@ ViridianCity_School_EventScript_Notebook::
lockall
msgbox ViridianCity_School_Text_NotebookFirstPage
msgbox ViridianCity_School_Text_TurnThePage, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq ViridianCity_School_EventScript_StopReadingNotebook
goto_if_eq VAR_RESULT, NO, ViridianCity_School_EventScript_StopReadingNotebook
msgbox ViridianCity_School_Text_NotebookSecondPage
msgbox ViridianCity_School_Text_TurnThePage, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq ViridianCity_School_EventScript_StopReadingNotebook
goto_if_eq VAR_RESULT, NO, ViridianCity_School_EventScript_StopReadingNotebook
msgbox ViridianCity_School_Text_NotebookThirdPage
msgbox ViridianCity_School_Text_TurnThePage, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq ViridianCity_School_EventScript_StopReadingNotebook
goto_if_eq VAR_RESULT, NO, ViridianCity_School_EventScript_StopReadingNotebook
msgbox ViridianCity_School_Text_NotebookFourthPage
applymovement LOCALID_LASS, Movement_WalkInPlaceFastestUp
applymovement LOCALID_LASS, Movement_WalkInPlaceFasterUp
waitmovement 0
textcolor 1
textcolor NPC_TEXT_COLOR_FEMALE
msgbox ViridianCity_School_Text_HeyDontLookAtMyNotes
releaseall
end