diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-04-06 00:37:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-06 00:37:08 -0400 |
| commit | 93d17ef7c886b96791931ba50406b59756e1bdbd (patch) | |
| tree | a96f8cc5e480114dadd1362372da0606c26bc928 /data/event_scripts.s | |
| parent | 5f1a4de374417b7580131d45c0a478f062f3916f (diff) | |
| parent | 35a578c62050893d5f347f637acbdcbbfb99f311 (diff) | |
Merge branch 'master' into doc-rm
Diffstat (limited to 'data/event_scripts.s')
| -rw-r--r-- | data/event_scripts.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 0a54d8e1a..ec9409782 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1223,10 +1223,10 @@ EventScript_DoInGameTrade:: @ 81A8CD9 faceplayer return -gUnknown_81A8CED:: @ 81A8CED - special sub_810C3A4 +EventScript_VsSeekerChargingDone:: @ 81A8CED + special VsSeekerFreezeObjectsAfterChargeComplete waitstate - special sub_810C444 + special VsSeekerResetObjectMovementAfterChargeComplete releaseall end |