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

+1 -1
View File
@@ -44,7 +44,7 @@ SaffronCity_EventScript_RocketGrunt7::
SaffronCity_EventScript_DoorGuardGrunt::
lock
goto_if_set FLAG_RESCUED_MR_FUJI, SaffronCity_EventScript_DoorGuardAsleep
applymovement LOCALID_DOOR_GUARD_GRUNT, Movement_FacePlayer
applymovement LOCALID_DOOR_GUARD_GRUNT, Common_Movement_FacePlayer
waitmovement 0
msgbox SaffronCity_Text_ImASecurityGuard
release