Merge branch 'master' into clone-union

This commit is contained in:
GriffinR authored and GitHub committed 2022-09-03 14:31:04 -04:00
commit 0400ee2124
353 files changed
+20156 -19152

No files matched your search

+5 -5
View File
@@ -22,14 +22,14 @@ PewterCity_Museum_1F_EventScript_Scientist1BehindCounter::
PewterCity_Museum_1F_EventScript_AmberHasGeneticMatter::
msgbox PewterCity_Museum_1F_Text_AmberContainsGeneticMatter
applymovement LOCALID_SCIENTIST1, Movement_FaceOriginalDirection
applymovement LOCALID_SCIENTIST1, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
PewterCity_Museum_1F_EventScript_ExplainAmber::
msgbox PewterCity_Museum_1F_Text_AmberIsFossilizedSap
applymovement LOCALID_SCIENTIST1, Movement_FaceOriginalDirection
applymovement LOCALID_SCIENTIST1, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -37,7 +37,7 @@ PewterCity_Museum_1F_EventScript_ExplainAmber::
PewterCity_Museum_1F_EventScript_EntranceTriggerLeft::
lockall
setvar VAR_TEMP_1, 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
goto PewterCity_Museum_1F_EventScript_EntranceTrigger
end
@@ -45,7 +45,7 @@ PewterCity_Museum_1F_EventScript_EntranceTriggerLeft::
PewterCity_Museum_1F_EventScript_EntranceTriggerMid::
lockall
setvar VAR_TEMP_1, 1
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
goto PewterCity_Museum_1F_EventScript_EntranceTrigger
end
@@ -53,7 +53,7 @@ PewterCity_Museum_1F_EventScript_EntranceTriggerMid::
PewterCity_Museum_1F_EventScript_EntranceTriggerRight::
lockall
setvar VAR_TEMP_1, 2
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
goto PewterCity_Museum_1F_EventScript_EntranceTrigger
end