summaryrefslogtreecommitdiff
path: root/data/maps/Route104/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/Route104/scripts.inc')
-rw-r--r--data/maps/Route104/scripts.inc8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc
index fd195b973..74a7e3ddf 100644
--- a/data/maps/Route104/scripts.inc
+++ b/data/maps/Route104/scripts.inc
@@ -13,7 +13,7 @@ Route104_EventScript_1ECC47:: @ 81ECC47
end
Route104_OnTransition: @ 81ECC4E
- call Common_EventScript_SetupRivalGender
+ call Common_EventScript_SetupRivalGfxId
call Route104_EventScript_1ECC78
call Route104_EventScript_1ECC5E
end
@@ -364,7 +364,7 @@ Route104_EventScript_1ED099:: @ 81ED099
applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED34F
waitmovement 0
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE104
- call Route104_EventScript_2720A0
+ call Common_EventScript_PlayBrineysBoatMusic
goto_if_set FLAG_ENABLE_NORMAN_MATCH_CALL, Route104_EventScript_1ED0D9
goto_if_unset FLAG_ENABLE_NORMAN_MATCH_CALL, Route104_EventScript_1ED0EF
end
@@ -398,7 +398,7 @@ Route104_EventScript_1ED139:: @ 81ED139
delay 50
applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED353
waitmovement 0
- call Route104_EventScript_2720A8
+ call Common_EventScript_StopBrineysBoatMusic
showobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN
applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED355
waitmovement 0
@@ -410,7 +410,7 @@ Route104_EventScript_1ED139:: @ 81ED139
waitmovement 0
addobject 4
clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
- call Route104_EventScript_2720A8
+ call Common_EventScript_StopBrineysBoatMusic
setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
hideobjectat 7, MAP_ROUTE104
copyvar VAR_BRINEY_LOCATION, VAR_0x8008