summaryrefslogtreecommitdiff
path: root/data/scripts/gabby_and_ty.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts/gabby_and_ty.inc')
-rw-r--r--data/scripts/gabby_and_ty.inc30
1 files changed, 15 insertions, 15 deletions
diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc
index d4b05a096..5a03a0e98 100644
--- a/data/scripts/gabby_and_ty.inc
+++ b/data/scripts/gabby_and_ty.inc
@@ -1,7 +1,7 @@
EventScript_28CCAA:: @ 828CCAA
setvar VAR_0x8005, 8
special InterviewBefore
- compare_var_to_value VAR_RESULT, 1
+ compare VAR_RESULT, 1
goto_eq EventScript_28CCC6
setvar VAR_0x8005, 8
special InterviewAfter
@@ -213,12 +213,12 @@ Route120_EventScript_28CF36:: @ 828CF36
Route111_EventScript_28CF56:: @ 828CF56
special GabbyAndTyBeforeInterview
- special GabbyAndTySetScriptVarsToFieldObjectLocalIds
- compare_var_to_value VAR_FACING, 2
+ special GabbyAndTySetScriptVarsToEventObjectLocalIds
+ compare VAR_FACING, 2
call_if 1, Route111_EventScript_28CF94
- compare_var_to_value VAR_FACING, 1
+ compare VAR_FACING, 1
call_if 1, Route111_EventScript_28CF9F
- compare_var_to_value VAR_FACING, 4
+ compare VAR_FACING, 4
call_if 1, Route111_EventScript_28CFB1
checkflag FLAG_0x001
goto_eq Route111_EventScript_28D0EE
@@ -247,17 +247,17 @@ Route111_EventScript_28CFC3:: @ 828CFC3
Route118_EventScript_28CFC3:: @ 828CFC3
Route120_EventScript_28CFC3:: @ 828CFC3
special GabbyAndTyBeforeInterview
- special GabbyAndTySetScriptVarsToFieldObjectLocalIds
- compare_var_to_value VAR_FACING, 2
+ special GabbyAndTySetScriptVarsToEventObjectLocalIds
+ compare VAR_FACING, 2
call_if 1, Route111_EventScript_28CF94
- compare_var_to_value VAR_FACING, 1
+ compare VAR_FACING, 1
call_if 1, Route111_EventScript_28CF9F
- compare_var_to_value VAR_FACING, 4
+ compare VAR_FACING, 4
call_if 1, Route111_EventScript_28CFB1
checkflag FLAG_0x001
goto_eq Route111_EventScript_28D0EE
specialvar VAR_RESULT, GabbyAndTyGetLastQuote
- compare_var_to_value VAR_RESULT, 0
+ compare VAR_RESULT, 0
goto_eq Route111_EventScript_28D053
msgbox Route111_Text_28B137, 4
specialvar VAR_RESULT, GabbyAndTyGetLastBattleTrivia
@@ -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
@@ -312,14 +312,14 @@ Route111_EventScript_28D099:: @ 828D099
end
Route111_EventScript_28D0A7:: @ 828D0A7
- compare_var_to_value VAR_RESULT, 0
+ compare VAR_RESULT, 0
goto_eq Route111_EventScript_28D0E1
msgbox Route111_Text_28B433, 4
setvar VAR_0x8004, 10
call Route111_EventScript_271E7C
lock
faceplayer
- compare_var_to_value VAR_RESULT, 0
+ compare VAR_RESULT, 0
goto_eq Route111_EventScript_28D0E1
msgbox Route111_Text_28B4AB, 4
special GabbyAndTyAfterInterview