summaryrefslogtreecommitdiff
path: root/data/maps/BattleFrontier_ScottsHouse/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/BattleFrontier_ScottsHouse/scripts.inc')
-rw-r--r--data/maps/BattleFrontier_ScottsHouse/scripts.inc16
1 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/BattleFrontier_ScottsHouse/scripts.inc b/data/maps/BattleFrontier_ScottsHouse/scripts.inc
index 6f8d6ee4b..52863d474 100644
--- a/data/maps/BattleFrontier_ScottsHouse/scripts.inc
+++ b/data/maps/BattleFrontier_ScottsHouse/scripts.inc
@@ -181,14 +181,14 @@ BattleFrontier_ScottsHouse_EventScript_263943:: @ 8263943
compare VAR_FACING, 3
call_if_eq BattleFrontier_ScottsHouse_EventScript_263A34
msgbox BattleFrontier_ScottsHouse_Text_263B29, MSGBOX_DEFAULT
- applymovement 1, BattleFrontier_ScottsHouse_Movement_27259E
+ applymovement 1, Common_Movement_FacePlayer
waitmovement 0
msgbox BattleFrontier_ScottsHouse_Text_263BD4, MSGBOX_DEFAULT
- compare VAR_0x40D1, 13
+ compare VAR_SCOTT_STATE, 13
goto_if_eq BattleFrontier_ScottsHouse_EventScript_2639BC
- compare VAR_0x40D1, 9
+ compare VAR_SCOTT_STATE, 9
goto_if_ge BattleFrontier_ScottsHouse_EventScript_2639CB
- compare VAR_0x40D1, 6
+ compare VAR_SCOTT_STATE, 6
goto_if_ge BattleFrontier_ScottsHouse_EventScript_2639DA
goto BattleFrontier_ScottsHouse_EventScript_2639E9
end
@@ -227,22 +227,22 @@ BattleFrontier_ScottsHouse_EventScript_2639F8:: @ 82639F8
end
BattleFrontier_ScottsHouse_EventScript_263A13:: @ 8263A13
- applymovement 1, BattleFrontier_ScottsHouse_Movement_2725A6
+ applymovement 1, Common_Movement_WalkInPlaceUp
waitmovement 0
return
BattleFrontier_ScottsHouse_EventScript_263A1E:: @ 8263A1E
- applymovement 1, BattleFrontier_ScottsHouse_Movement_2725AA
+ applymovement 1, Common_Movement_WalkInPlaceDown
waitmovement 0
return
BattleFrontier_ScottsHouse_EventScript_263A29:: @ 8263A29
- applymovement 1, BattleFrontier_ScottsHouse_Movement_2725A8
+ applymovement 1, Common_Movement_WalkInPlaceRight
waitmovement 0
return
BattleFrontier_ScottsHouse_EventScript_263A34:: @ 8263A34
- applymovement 1, BattleFrontier_ScottsHouse_Movement_2725A4
+ applymovement 1, Common_Movement_WalkInPlaceLeft
waitmovement 0
return