diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-02-13 15:13:30 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-02-13 15:13:30 -0500 |
| commit | 3b2eaeedbc4c658389c7fceb93e6bbd07e8a6283 (patch) | |
| tree | e9a403e858cf8d93cfee9eb80b5d8c79cc4e4159 /data/scripts/gabby_and_ty.inc | |
| parent | cafbffd5b82836d779ec446e2362a9885fd18c4a (diff) | |
| parent | b4f4d2c0f03462dcdf3492aad27890294600eb2e (diff) | |
Merge branch 'master' into modern_gcc
Diffstat (limited to 'data/scripts/gabby_and_ty.inc')
| -rw-r--r-- | data/scripts/gabby_and_ty.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index 29e05c513..f8d57f084 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -201,7 +201,7 @@ Route120_EventScript_1AE582:: @ 81AE582 Route111_EventScript_1AE5A2:: @ 81AE5A2 special GabbyAndTyBeforeInterview - special GabbyAndTySetScriptVarsToEventObjectLocalIds + special GabbyAndTySetScriptVarsToObjectEventLocalIds compare VAR_FACING, 2 call_if_eq Route111_EventScript_1AE5E0 compare VAR_FACING, 1 @@ -234,7 +234,7 @@ Route111_EventScript_1AE60F:: @ 81AE60F Route118_EventScript_1AE60F:: @ 81AE60F Route120_EventScript_1AE60F:: @ 81AE60F special GabbyAndTyBeforeInterview - special GabbyAndTySetScriptVarsToEventObjectLocalIds + special GabbyAndTySetScriptVarsToObjectEventLocalIds compare VAR_FACING, 2 call_if_eq Route111_EventScript_1AE5E0 compare VAR_FACING, 1 |