summaryrefslogtreecommitdiff
path: root/data/maps/Route119
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/Route119')
-rw-r--r--data/maps/Route119/scripts.inc12
1 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc
index 4a5e60ada..f8fac02a7 100644
--- a/data/maps/Route119/scripts.inc
+++ b/data/maps/Route119/scripts.inc
@@ -10,13 +10,13 @@ Route119_MapScript1_1F442F: @ 81F442F
Route119_EventScript_1F4439:: @ 81F4439
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
- goto_if_ne Route119_EventScript_27374E
+ goto_if_ne Common_EventScript_NopReturn
removeobject VAR_LAST_TALKED
return
Route119_MapScript1_1F444D: @ 81F444D
- call Route119_EventScript_271ED7
- call Route119_EventScript_271EFB
+ call Common_EventScript_SetupRivalGender
+ call Common_EventScript_SetupRivalOnBikeGender
compare VAR_WEATHER_INSTITUTE_STATE, 1
call_if_eq Route119_EventScript_1F4466
special SetRoute119Weather
@@ -51,7 +51,7 @@ Route119_EventScript_1F4488:: @ 81F4488
call_if_eq Route119_EventScript_1F46C6
compare VAR_TEMP_1, 2
call_if_eq Route119_EventScript_1F46D1
- applymovement EVENT_OBJ_ID_PLAYER, Route119_Movement_2725AA
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
waitmovement 0
delay 30
compare VAR_TEMP_1, 1
@@ -459,7 +459,7 @@ Route119_EventScript_1F49A3:: @ 81F49A3
faceplayer
msgbox Route119_Text_1F50EB, MSGBOX_DEFAULT
closemessage
- applymovement VAR_LAST_TALKED, Route119_Movement_2725A2
+ applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -469,7 +469,7 @@ Route119_EventScript_1F49BA:: @ 81F49BA
faceplayer
msgbox Route119_Text_1F5147, MSGBOX_DEFAULT
closemessage
- applymovement VAR_LAST_TALKED, Route119_Movement_2725A2
+ applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end