summaryrefslogtreecommitdiff
path: root/data/scripts/maps/Route104.inc
diff options
context:
space:
mode:
authorcamthesaxman <cameronghall@cox.net>2017-09-24 14:28:51 -0500
committercamthesaxman <cameronghall@cox.net>2017-09-24 14:28:51 -0500
commit86e7bf1fd61b151011038cdb281db3de0a1d9e6a (patch)
tree5a29fa240501cdf4046a4f97e1197cd8c52cf447 /data/scripts/maps/Route104.inc
parentae5ec7f5b05218ba21c53ef632590a5243a7f647 (diff)
Replace more script commands and fix German build
Diffstat (limited to 'data/scripts/maps/Route104.inc')
-rw-r--r--data/scripts/maps/Route104.inc26
1 files changed, 13 insertions, 13 deletions
diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc
index d829c6a93..584ab47dd 100644
--- a/data/scripts/maps/Route104.inc
+++ b/data/scripts/maps/Route104.inc
@@ -18,9 +18,9 @@ Route104_MapScript1_14EEA8:: @ 814EEA8
Route104_EventScript_14EEAE:: @ 814EEAE
checkflag 127
- jumpif 0, Route104_EventScript_14EEC4
+ goto_if 0, Route104_EventScript_14EEC4
checkflag 2057
- jumpif 0, Route104_EventScript_14EEC4
+ goto_if 0, Route104_EventScript_14EEC4
clearflag 906
return
@@ -32,11 +32,11 @@ Route104_EventScript_14EEC8:: @ 814EEC8
lock
faceplayer
checkflag 246
- jumpeq Route104_EventScript_14EEFF
+ goto_if_eq Route104_EventScript_14EEFF
msgbox Route104_Text_1C55B9, 4
giveitem ITEM_CHESTO_BERRY
compare RESULT, 0
- jumpeq Route104_EventScript_1A029B
+ goto_if_eq Route104_EventScript_1A029B
setflag 246
msgbox Route104_Text_1C5665, 4
release
@@ -51,11 +51,11 @@ Route104_EventScript_14EF09:: @ 814EF09
lock
faceplayer
checkflag 279
- jumpeq Route104_EventScript_14EF38
+ goto_if_eq Route104_EventScript_14EF38
msgbox Route104_Text_16DD91, 4
giveitem ITEM_WHITE_HERB
compare RESULT, 0
- jumpeq Route104_EventScript_1A029B
+ goto_if_eq Route104_EventScript_1A029B
setflag 279
release
end
@@ -105,11 +105,11 @@ Route104_EventScript_14EF93:: @ 814EF93
lock
faceplayer
checkflag 262
- jumpeq Route104_EventScript_14EFC2
+ goto_if_eq Route104_EventScript_14EFC2
msgbox Route104_Text_16DC5F, 4
giveitem ITEM_TM09
compare RESULT, 0
- jumpeq Route104_EventScript_1A029B
+ goto_if_eq Route104_EventScript_1A029B
setflag 262
release
end
@@ -159,9 +159,9 @@ Route104_EventScript_14EFD5:: @ 814EFD5
moveoffscreen 2
setvar 0x408e, 0
checkflag 189
- jumpif 0, Route104_EventScript_14F08B
+ goto_if 0, Route104_EventScript_14F08B
checkflag 189
- jumpeq Route104_EventScript_14F095
+ goto_if_eq Route104_EventScript_14F095
end
Route104_EventScript_14F08B:: @ 814F08B
@@ -411,7 +411,7 @@ Route104_EventScript_14F1A0:: @ 814F1A0
trainerbattle 0, OPPONENT_HALEY_1, 0, Route104_Text_1B8770, Route104_Text_1B87A7
specialval RESULT, sub_8082C68
compare RESULT, 1
- jumpeq Route104_EventScript_14F1C7
+ goto_if_eq Route104_EventScript_14F1C7
msgbox Route104_Text_1B87C3, 6
end
@@ -424,7 +424,7 @@ Route104_EventScript_14F1DE:: @ 814F1DE
trainerbattle 0, OPPONENT_WINSTON_1, 0, Route104_Text_1B88D4, Route104_Text_1B8911
specialval RESULT, sub_8082C68
compare RESULT, 1
- jumpeq Route104_EventScript_14F205
+ goto_if_eq Route104_EventScript_14F205
msgbox Route104_Text_1B8925, 6
end
@@ -437,7 +437,7 @@ Route104_EventScript_14F21C:: @ 814F21C
trainerbattle 0, OPPONENT_CINDY_1, 0, Route104_Text_1B8A24, Route104_Text_1B8A61
specialval RESULT, sub_8082C68
compare RESULT, 1
- jumpeq Route104_EventScript_14F243
+ goto_if_eq Route104_EventScript_14F243
msgbox Route104_Text_1B8A69, 6
end