diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-07-22 13:14:58 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-07-22 13:14:58 +0200 |
| commit | 1e9143e0b22bc72cb77866e10817bc509064842a (patch) | |
| tree | 87b77fdd2c19d34cb7ac10870fdc4c30188e2d70 /data/scripts/gabby_and_ty.inc | |
| parent | c9d486a5d3ea6bf7d256c2d7ca7f10339e498427 (diff) | |
| parent | 06b3ce408f774c7192202308e783cc22bb8e7643 (diff) | |
merge union room with master
Diffstat (limited to 'data/scripts/gabby_and_ty.inc')
| -rw-r--r-- | data/scripts/gabby_and_ty.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index 269ef2530..5a03a0e98 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -213,7 +213,7 @@ Route120_EventScript_28CF36:: @ 828CF36 Route111_EventScript_28CF56:: @ 828CF56 special GabbyAndTyBeforeInterview - special GabbyAndTySetScriptVarsToFieldObjectLocalIds + special GabbyAndTySetScriptVarsToEventObjectLocalIds compare VAR_FACING, 2 call_if 1, Route111_EventScript_28CF94 compare VAR_FACING, 1 @@ -247,7 +247,7 @@ Route111_EventScript_28CFC3:: @ 828CFC3 Route118_EventScript_28CFC3:: @ 828CFC3 Route120_EventScript_28CFC3:: @ 828CFC3 special GabbyAndTyBeforeInterview - special GabbyAndTySetScriptVarsToFieldObjectLocalIds + special GabbyAndTySetScriptVarsToEventObjectLocalIds compare VAR_FACING, 2 call_if 1, Route111_EventScript_28CF94 compare VAR_FACING, 1 @@ -270,15 +270,15 @@ Route120_EventScript_28CFC3:: @ 828CFC3 end Route111_Movement_28D04D: @ 828D04D - step_1d + walk_in_place_down step_end Route111_Movement_28D04F: @ 828D04F - step_1e + walk_in_place_up step_end Route111_Movement_28D051: @ 828D051 - step_1f + walk_in_place_left step_end Route111_EventScript_28D053:: @ 828D053 |