summaryrefslogtreecommitdiff
path: root/data/maps/Route109/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/Route109/scripts.inc')
-rw-r--r--data/maps/Route109/scripts.inc124
1 files changed, 62 insertions, 62 deletions
diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc
index eeb21cacf..a0099f5ec 100644
--- a/data/maps/Route109/scripts.inc
+++ b/data/maps/Route109/scripts.inc
@@ -2,7 +2,7 @@ Route109_MapScripts:: @ 814F4D2
.byte 0
Route109_EventScript_14F4D3:: @ 814F4D3
- call Route109_EventScript_1A010C
+ call EventScript_BackupMrBrineyLocation
setobjectpriority 2, MAP_ROUTE109, 0
setobjectpriority 255, MAP_ROUTE109, 0
applymovement 2, Route109_Movement_14F67B
@@ -15,32 +15,32 @@ Route109_EventScript_14F4D3:: @ 814F4D3
end
Route109_EventScript_14F518:: @ 814F518
- applymovement 255, Route109_Movement_14F66D
+ applymovement OBJ_EVENT_ID_PLAYER, Route109_Movement_14F66D
waitmovement 0
goto Route109_EventScript_14F548
end
Route109_EventScript_14F528:: @ 814F528
- applymovement 255, Route109_Movement_14F675
+ applymovement OBJ_EVENT_ID_PLAYER, Route109_Movement_14F675
waitmovement 0
goto Route109_EventScript_14F548
end
Route109_EventScript_14F538:: @ 814F538
- applymovement 255, Route109_Movement_14F678
+ applymovement OBJ_EVENT_ID_PLAYER, Route109_Movement_14F678
waitmovement 0
goto Route109_EventScript_14F548
end
Route109_EventScript_14F548:: @ 814F548
- hideobjectat 255, MAP_ROUTE109
- call Route109_EventScript_1A02E7
+ hideobjectat OBJ_EVENT_ID_PLAYER, MAP_ROUTE109
+ call Common_EventScript_PlayBrineysBoatMusic
applymovement 1, Route109_Movement_14F5BF
- applymovement 255, Route109_Movement_14F5BF
+ applymovement OBJ_EVENT_ID_PLAYER, Route109_Movement_14F5BF
waitmovement 0
- call Route109_EventScript_1A02EF
- showobjectat 255, MAP_DEWFORD_TOWN
- applymovement 255, Route109_Movement_14F670
+ call Common_EventScript_StopBrineysBoatMusic
+ showobjectat OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN
+ applymovement OBJ_EVENT_ID_PLAYER, Route109_Movement_14F670
waitmovement 0
addobject 4
clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD
@@ -52,10 +52,10 @@ Route109_EventScript_14F548:: @ 814F548
clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109
hideobjectat 1, MAP_ROUTE109
- msgbox Route109_Text_16B4B5, 4
+ msgbox Route109_Text_16B4B5, MSGBOX_DEFAULT
closemessage
copyvar VAR_BRINEY_LOCATION, VAR_0x8008
- resetobjectpriority 255, MAP_ROUTE109
+ resetobjectpriority OBJ_EVENT_ID_PLAYER, MAP_ROUTE109
resetobjectpriority 2, MAP_DEWFORD_TOWN
moveobjectoffscreen 2
release
@@ -235,38 +235,38 @@ Route109_Movement_14F5BF:: @ 814F5BF
walk_left
walk_left
walk_in_place_fastest_down
- end_movement
+ step_end
Route109_Movement_14F66D:: @ 814F66D
walk_down
walk_down
- end_movement
+ step_end
Route109_Movement_14F670:: @ 814F670
walk_down
walk_down
walk_left
walk_in_place_fastest_right
- end_movement
+ step_end
Route109_Movement_14F675:: @ 814F675
walk_right
walk_down
- end_movement
+ step_end
Route109_Movement_14F678:: @ 814F678
walk_left
walk_down
- end_movement
+ step_end
Route109_Movement_14F67B:: @ 814F67B
walk_down
- end_movement
+ step_end
Route109_Movement_14F67D:: @ 814F67D
walk_down
walk_in_place_fastest_left
- end_movement
+ step_end
Route109_EventScript_14F680:: @ 814F680
lock
@@ -294,31 +294,31 @@ Route109_EventScript_14F6AF:: @ 814F6AF
end
Route109_EventScript_14F6E2:: @ 814F6E2
- msgbox Route109_Text_16E159, 4
+ msgbox Route109_Text_16E159, MSGBOX_DEFAULT
closemessage
goto Route109_EventScript_14F4D3
end
Route109_EventScript_14F6F1:: @ 814F6F1
- msgbox Route109_Text_16E1B1, 4
+ msgbox Route109_Text_16E1B1, MSGBOX_DEFAULT
release
end
Route109_EventScript_14F6FB:: @ 814F6FB
- msgbox Route109_Text_16E2C5, 4
+ msgbox Route109_Text_16E2C5, MSGBOX_DEFAULT
release
end
Route109_EventScript_14F705:: @ 814F705
- msgbox Route109_Text_16E307, 2
+ msgbox Route109_Text_16E307, MSGBOX_NPC
end
Route109_EventScript_14F70E:: @ 814F70E
lock
faceplayer
- msgbox Route109_Text_16E405, 4
+ msgbox Route109_Text_16E405, MSGBOX_DEFAULT
closemessage
- applymovement VAR_LAST_TALKED, Route109_Movement_1A083D
+ applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -328,30 +328,30 @@ Route109_EventScript_14F725:: @ 814F725
faceplayer
special GetPlayerBigGuyGirlString
goto_if_set FLAG_RECEIVED_SOFT_SAND, Route109_EventScript_14F762
- msgbox Route109_Text_16E433, 4
- giveitem_std ITEM_SOFT_SAND
+ msgbox Route109_Text_16E433, MSGBOX_DEFAULT
+ giveitem ITEM_SOFT_SAND
compare VAR_RESULT, 0
- goto_if_eq Route109_EventScript_1A029B
+ goto_if_eq Common_EventScript_ShowBagIsFull
closemessage
- applymovement VAR_LAST_TALKED, Route109_Movement_1A083D
+ applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
waitmovement 0
setflag FLAG_RECEIVED_SOFT_SAND
release
end
Route109_EventScript_14F762:: @ 814F762
- msgbox Route109_Text_16E446, 4
- applymovement VAR_LAST_TALKED, Route109_Movement_1A083D
+ msgbox Route109_Text_16E446, MSGBOX_DEFAULT
+ applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
Route109_EventScript_14F776:: @ 814F776
- msgbox Route109_Text_16E35B, 2
+ msgbox Route109_Text_16E35B, MSGBOX_NPC
end
Route109_EventScript_14F77F:: @ 814F77F
- msgbox Route109_Text_16E4D5, 2
+ msgbox Route109_Text_16E4D5, MSGBOX_NPC
end
Route109_EventScript_14F788:: @ 814F788
@@ -359,86 +359,86 @@ Route109_EventScript_14F788:: @ 814F788
faceplayer
waitse
playmoncry SPECIES_ZIGZAGOON, 0
- msgbox Route109_Text_16E5CA, 4
+ msgbox Route109_Text_16E5CA, MSGBOX_DEFAULT
waitmoncry
release
end
Route109_EventScript_14F79B:: @ 814F79B
- msgbox Route109_Text_16E5DC, 3
+ msgbox Route109_Text_16E5DC, MSGBOX_SIGN
end
Route109_EventScript_14F7A4:: @ 814F7A4
- msgbox Route109_Text_16E62C, 3
+ msgbox Route109_Text_16E62C, MSGBOX_SIGN
end
Route109_EventScript_14F7AD:: @ 814F7AD
- trainerbattle 0, TRAINER_DAVID, 0, Route109_Text_1B9A1C, Route109_Text_1B9A59
- msgbox Route109_Text_1B9A6D, 6
+ trainerbattle_single TRAINER_DAVID, Route109_Text_1B9A1C, Route109_Text_1B9A59
+ msgbox Route109_Text_1B9A6D, MSGBOX_AUTOCLOSE
end
Route109_EventScript_14F7C4:: @ 814F7C4
- trainerbattle 0, TRAINER_ALICE, 0, Route109_Text_1B9AAD, Route109_Text_1B9AD9
- msgbox Route109_Text_1B9AEB, 6
+ trainerbattle_single TRAINER_ALICE, Route109_Text_1B9AAD, Route109_Text_1B9AD9
+ msgbox Route109_Text_1B9AEB, MSGBOX_AUTOCLOSE
end
Route109_EventScript_14F7DB:: @ 814F7DB
- trainerbattle 0, TRAINER_HUEY, 0, Route109_Text_1B9B11, Route109_Text_1B9B57
- msgbox Route109_Text_1B9B68, 6
+ trainerbattle_single TRAINER_HUEY, Route109_Text_1B9B11, Route109_Text_1B9B57
+ msgbox Route109_Text_1B9B68, MSGBOX_AUTOCLOSE
end
Route109_EventScript_14F7F2:: @ 814F7F2
- trainerbattle 0, TRAINER_EDMOND, 0, Route109_Text_1B9B91, Route109_Text_1B9BAE
- msgbox Route109_Text_1B9BD3, 6
+ trainerbattle_single TRAINER_EDMOND, Route109_Text_1B9B91, Route109_Text_1B9BAE
+ msgbox Route109_Text_1B9BD3, MSGBOX_AUTOCLOSE
end
Route109_EventScript_14F809:: @ 814F809
- trainerbattle 0, TRAINER_RICKY_1, 0, Route109_Text_1B9C23, Route109_Text_1B9C65
+ trainerbattle_single TRAINER_RICKY_1, Route109_Text_1B9C23, Route109_Text_1B9C65
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_if_eq Route109_EventScript_14F830
- msgbox Route109_Text_1B9C6E, 6
+ msgbox Route109_Text_1B9C6E, MSGBOX_AUTOCLOSE
end
Route109_EventScript_14F830:: @ 814F830
- trainerbattle 5, TRAINER_RICKY_1, 0, Route109_Text_1B9CB3, Route109_Text_1B9CEB
- msgbox Route109_Text_1B9D10, 6
+ trainerbattle_rematch TRAINER_RICKY_1, Route109_Text_1B9CB3, Route109_Text_1B9CEB
+ msgbox Route109_Text_1B9D10, MSGBOX_AUTOCLOSE
end
Route109_EventScript_14F847:: @ 814F847
- trainerbattle 0, TRAINER_LOLA_1, 0, Route109_Text_1B9D54, Route109_Text_1B9D87
+ trainerbattle_single TRAINER_LOLA_1, Route109_Text_1B9D54, Route109_Text_1B9D87
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_if_eq Route109_EventScript_14F86E
- msgbox Route109_Text_1B9D8E, 6
+ msgbox Route109_Text_1B9D8E, MSGBOX_AUTOCLOSE
end
Route109_EventScript_14F86E:: @ 814F86E
- trainerbattle 5, TRAINER_LOLA_1, 0, Route109_Text_1B9DD8, Route109_Text_1B9E16
- msgbox Route109_Text_1B9E1D, 6
+ trainerbattle_rematch TRAINER_LOLA_1, Route109_Text_1B9DD8, Route109_Text_1B9E16
+ msgbox Route109_Text_1B9E1D, MSGBOX_AUTOCLOSE
end
Route109_EventScript_14F885:: @ 814F885
- trainerbattle 0, TRAINER_CARMEN, 0, Route109_Text_1B9E60, Route109_Text_1B9EA1
- msgbox Route109_Text_1B9ECA, 6
+ trainerbattle_single TRAINER_CARMEN, Route109_Text_1B9E60, Route109_Text_1B9EA1
+ msgbox Route109_Text_1B9ECA, MSGBOX_AUTOCLOSE
end
Route109_EventScript_14F89C:: @ 814F89C
- trainerbattle 0, TRAINER_GWEN, 0, Route109_Text_1B9F07, Route109_Text_1B9F31
- msgbox Route109_Text_1B9F44, 6
+ trainerbattle_single TRAINER_GWEN, Route109_Text_1B9F07, Route109_Text_1B9F31
+ msgbox Route109_Text_1B9F44, MSGBOX_AUTOCLOSE
end
Route109_EventScript_14F8B3:: @ 814F8B3
- trainerbattle 0, TRAINER_CARTER, 0, Route109_Text_1B9F65, Route109_Text_1B9F9C
- msgbox Route109_Text_1B9FB7, 6
+ trainerbattle_single TRAINER_CARTER, Route109_Text_1B9F65, Route109_Text_1B9F9C
+ msgbox Route109_Text_1B9FB7, MSGBOX_AUTOCLOSE
end
Route109_EventScript_14F8CA:: @ 814F8CA
- trainerbattle 4, TRAINER_MEL_AND_PAUL, 0, Route109_Text_1B9FF6, Route109_Text_1BA052, Route109_Text_1BA0BF
- msgbox Route109_Text_1BA069, 6
+ trainerbattle_double TRAINER_MEL_AND_PAUL, Route109_Text_1B9FF6, Route109_Text_1BA052, Route109_Text_1BA0BF
+ msgbox Route109_Text_1BA069, MSGBOX_AUTOCLOSE
end
Route109_EventScript_14F8E5:: @ 814F8E5
- trainerbattle 4, TRAINER_MEL_AND_PAUL, 0, Route109_Text_1BA114, Route109_Text_1BA15F, Route109_Text_1BA1D0
- msgbox Route109_Text_1BA193, 6
+ trainerbattle_double TRAINER_MEL_AND_PAUL, Route109_Text_1BA114, Route109_Text_1BA15F, Route109_Text_1BA1D0
+ msgbox Route109_Text_1BA193, MSGBOX_AUTOCLOSE
end