summaryrefslogtreecommitdiff
path: root/data/scripts/maps/Route109.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts/maps/Route109.inc')
-rw-r--r--data/scripts/maps/Route109.inc112
1 files changed, 56 insertions, 56 deletions
diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc
index 58c38173e..9f0ef8c8d 100644
--- a/data/scripts/maps/Route109.inc
+++ b/data/scripts/maps/Route109.inc
@@ -3,11 +3,11 @@ Route109_MapScripts:: @ 814F4D2
Route109_EventScript_14F4D3:: @ 814F4D3
call Route109_EventScript_1A010C
- spritelevelup 2, 0, 24, 0
- spritelevelup 255, 0, 24, 0
- move 2, Route109_Movement_14F67B
- waitmove 0
- disappear 2
+ setobjectpriority 2, 0, 24, 0
+ setobjectpriority 255, 0, 24, 0
+ applymovement 2, Route109_Movement_14F67B
+ waitmovement 0
+ removeobject 2
switch FACING
case 1, Route109_EventScript_14F518
case 3, Route109_EventScript_14F538
@@ -15,49 +15,49 @@ Route109_EventScript_14F4D3:: @ 814F4D3
end
Route109_EventScript_14F518:: @ 814F518
- move 255, Route109_Movement_14F66D
- waitmove 0
- jump Route109_EventScript_14F548
+ applymovement 255, Route109_Movement_14F66D
+ waitmovement 0
+ goto Route109_EventScript_14F548
end
Route109_EventScript_14F528:: @ 814F528
- move 255, Route109_Movement_14F675
- waitmove 0
- jump Route109_EventScript_14F548
+ applymovement 255, Route109_Movement_14F675
+ waitmovement 0
+ goto Route109_EventScript_14F548
end
Route109_EventScript_14F538:: @ 814F538
- move 255, Route109_Movement_14F678
- waitmove 0
- jump Route109_EventScript_14F548
+ applymovement 255, Route109_Movement_14F678
+ waitmovement 0
+ goto Route109_EventScript_14F548
end
Route109_EventScript_14F548:: @ 814F548
- spriteinvisible 255, 0, 24
+ hideobject 255, 0, 24
call Route109_EventScript_1A02E7
- move 1, Route109_Movement_14F5BF
- move 255, Route109_Movement_14F5BF
- waitmove 0
+ applymovement 1, Route109_Movement_14F5BF
+ applymovement 255, Route109_Movement_14F5BF
+ waitmovement 0
call Route109_EventScript_1A02EF
- spritevisible 255, 0, 11
- move 255, Route109_Movement_14F670
- waitmove 0
- reappear 4
+ showobject 255, 0, 11
+ applymovement 255, Route109_Movement_14F670
+ waitmovement 0
+ addobject 4
clearflag 743
- movespriteperm 2, 12, 8
- reappear 2
- spritelevelup 2, 0, 11, 0
- move 2, Route109_Movement_14F67D
- waitmove 0
+ setobjectxyperm 2, 12, 8
+ addobject 2
+ setobjectpriority 2, 0, 11, 0
+ applymovement 2, Route109_Movement_14F67D
+ waitmovement 0
clearflag 740
setflag 744
- spriteinvisible 1, 0, 24
+ hideobject 1, 0, 24
msgbox Route109_Text_16B4B5, 4
- closebutton
+ closemessage
copyvar 0x4096, 0x8008
- restorespritelevel 255, 0, 24
- restorespritelevel 2, 0, 11
- moveoffscreen 2
+ resetobjectpriority 255, 0, 24
+ resetobjectpriority 2, 0, 11
+ moveobjectoffscreen 2
release
end
@@ -272,22 +272,22 @@ Route109_EventScript_14F680:: @ 814F680
lock
faceplayer
checkflag 149
- jumpif 0, Route109_EventScript_14F691
- jump Route109_EventScript_14F6AF
+ goto_if 0, Route109_EventScript_14F691
+ goto Route109_EventScript_14F6AF
end
Route109_EventScript_14F691:: @ 814F691
message Route109_Text_16E0F9
msgbox Route109_Text_16E0F9, 5
compare RESULT, 0
- jumpeq Route109_EventScript_14F6F1
- jump Route109_EventScript_14F6E2
+ goto_if_eq Route109_EventScript_14F6F1
+ goto Route109_EventScript_14F6E2
end
Route109_EventScript_14F6AF:: @ 814F6AF
message Route109_Text_16E26A
- waittext
- multichoicedef 21, 8, 14, 1, 0
+ waitmessage
+ multichoicedefault 21, 8, 14, 1, 0
switch RESULT
case 0, Route109_EventScript_14F6E2
case 1, Route109_EventScript_14F6FB
@@ -296,8 +296,8 @@ Route109_EventScript_14F6AF:: @ 814F6AF
Route109_EventScript_14F6E2:: @ 814F6E2
msgbox Route109_Text_16E159, 4
- closebutton
- jump Route109_EventScript_14F4D3
+ closemessage
+ goto Route109_EventScript_14F4D3
end
Route109_EventScript_14F6F1:: @ 814F6F1
@@ -318,9 +318,9 @@ Route109_EventScript_14F70E:: @ 814F70E
lock
faceplayer
msgbox Route109_Text_16E405, 4
- closebutton
- move LAST_TALKED, Route109_Movement_1A083D
- waitmove 0
+ closemessage
+ applymovement LAST_TALKED, Route109_Movement_1A083D
+ waitmovement 0
release
end
@@ -329,22 +329,22 @@ Route109_EventScript_14F725:: @ 814F725
faceplayer
special GetPlayerBigGuyGirlString
checkflag 280
- jumpeq Route109_EventScript_14F762
+ goto_if_eq Route109_EventScript_14F762
msgbox Route109_Text_16E433, 4
giveitem ITEM_SOFT_SAND
compare RESULT, 0
- jumpeq Route109_EventScript_1A029B
- closebutton
- move LAST_TALKED, Route109_Movement_1A083D
- waitmove 0
+ goto_if_eq Route109_EventScript_1A029B
+ closemessage
+ applymovement LAST_TALKED, Route109_Movement_1A083D
+ waitmovement 0
setflag 280
release
end
Route109_EventScript_14F762:: @ 814F762
msgbox Route109_Text_16E446, 4
- move LAST_TALKED, Route109_Movement_1A083D
- waitmove 0
+ applymovement LAST_TALKED, Route109_Movement_1A083D
+ waitmovement 0
release
end
@@ -359,8 +359,8 @@ Route109_EventScript_14F77F:: @ 814F77F
Route109_EventScript_14F788:: @ 814F788
lock
faceplayer
- checksound
- pokecry SPECIES_ZIGZAGOON, 0
+ waitse
+ playpokecry SPECIES_ZIGZAGOON, 0
msgbox Route109_Text_16E5CA, 4
waitpokecry
release
@@ -396,9 +396,9 @@ Route109_EventScript_14F7F2:: @ 814F7F2
Route109_EventScript_14F809:: @ 814F809
trainerbattle 0, OPPONENT_RICKY_1, 0, Route109_Text_1B9C23, Route109_Text_1B9C65
- specialval RESULT, sub_8082C68
+ specialvar RESULT, sub_8082C68
compare RESULT, 1
- jumpeq Route109_EventScript_14F830
+ goto_if_eq Route109_EventScript_14F830
msgbox Route109_Text_1B9C6E, 6
end
@@ -409,9 +409,9 @@ Route109_EventScript_14F830:: @ 814F830
Route109_EventScript_14F847:: @ 814F847
trainerbattle 0, OPPONENT_LOLA_1, 0, Route109_Text_1B9D54, Route109_Text_1B9D87
- specialval RESULT, sub_8082C68
+ specialvar RESULT, sub_8082C68
compare RESULT, 1
- jumpeq Route109_EventScript_14F86E
+ goto_if_eq Route109_EventScript_14F86E
msgbox Route109_Text_1B9D8E, 6
end