diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-28 22:14:47 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-28 22:14:47 -0500 |
| commit | 9d2ee97519aa8ee3c5e5c0d11f49f5a77e4f870e (patch) | |
| tree | 763431b9969206b11c5c42c7154c19ad5d21f421 /data/scripts/gabby_and_ty.inc | |
| parent | 857b166086756ccc92e58981493513a7f00920ff (diff) | |
| parent | 86a36767dba19e84297047addf1d1d776e2efdec (diff) | |
Merge branch 'master' into slot_machine
Diffstat (limited to 'data/scripts/gabby_and_ty.inc')
| -rw-r--r-- | data/scripts/gabby_and_ty.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index a3d79d09e..ff45d2cff 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -215,19 +215,19 @@ Route111_EventScript_1AE5A2:: @ 81AE5A2 end Route111_EventScript_1AE5E0:: @ 81AE5E0 - applymovement 0x8004, Route111_Movement_1AE699 + applymovement VAR_SPECIAL_4, Route111_Movement_1AE699 waitmovement 0 return Route111_EventScript_1AE5EB:: @ 81AE5EB - applymovement 0x8004, Route111_Movement_1AE69B - applymovement 0x8005, Route111_Movement_1A0841 + applymovement VAR_SPECIAL_4, Route111_Movement_1AE69B + applymovement VAR_SPECIAL_5, Route111_Movement_1A0841 waitmovement 0 return Route111_EventScript_1AE5FD:: @ 81AE5FD - applymovement 0x8004, Route111_Movement_1AE69D - applymovement 0x8005, Route111_Movement_1A083F + applymovement VAR_SPECIAL_4, Route111_Movement_1AE69D + applymovement VAR_SPECIAL_5, Route111_Movement_1A083F waitmovement 0 return @@ -303,7 +303,7 @@ Route111_EventScript_1AE6F3:: @ 81AE6F3 compare RESULT, 0 goto_if_eq Route111_EventScript_1AE72D msgbox Route111_Text_1AC40F, 4 - setvar 0x8004, 10 + setvar VAR_SPECIAL_4, 10 call Route111_EventScript_1A00F3 lock faceplayer |