diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-09-24 14:28:51 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-09-24 14:28:51 -0500 |
| commit | 86e7bf1fd61b151011038cdb281db3de0a1d9e6a (patch) | |
| tree | 5a29fa240501cdf4046a4f97e1197cd8c52cf447 /data/scripts/maps/Route119.inc | |
| parent | ae5ec7f5b05218ba21c53ef632590a5243a7f647 (diff) | |
Replace more script commands and fix German build
Diffstat (limited to 'data/scripts/maps/Route119.inc')
| -rw-r--r-- | data/scripts/maps/Route119.inc | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index bd73bbf31..0d71ac056 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -5,14 +5,14 @@ Route119_MapScripts:: @ 8151167 Route119_MapScript1_151172:: @ 8151172 checkflag 2145 - callif 1, Route119_EventScript_15117C + call_if 1, Route119_EventScript_15117C end Route119_EventScript_15117C:: @ 815117C compare 0x8004, 6 - callif 1, Route119_EventScript_151193 + call_if 1, Route119_EventScript_151193 compare 0x8004, 7 - callif 1, Route119_EventScript_151197 + call_if 1, Route119_EventScript_151197 return Route119_EventScript_151193:: @ 8151193 @@ -28,7 +28,7 @@ Route119_MapScript1_15119B:: @ 815119B call Route119_EventScript_1A0172 call Route119_EventScript_1A0196 compare 0x40b3, 1 - callif 1, Route119_EventScript_1511B9 + call_if 1, Route119_EventScript_1511B9 special SetRoute119Weather end @@ -53,29 +53,29 @@ Route119_EventScript_1511DB:: @ 81511DB reappear 25 checkgender compare RESULT, 0 - callif 1, Route119_EventScript_151254 + call_if 1, Route119_EventScript_151254 compare RESULT, 1 - callif 1, Route119_EventScript_151259 + call_if 1, Route119_EventScript_151259 pause 65 compare 0x4001, 1 - callif 1, Route119_EventScript_1513A6 + call_if 1, Route119_EventScript_1513A6 compare 0x4001, 2 - callif 1, Route119_EventScript_1513B1 + call_if 1, Route119_EventScript_1513B1 move 255, Route119_Movement_1A0845 waitmove 0 pause 30 compare 0x4001, 1 - callif 1, Route119_EventScript_1513D2 + call_if 1, Route119_EventScript_1513D2 compare 0x4001, 2 - callif 1, Route119_EventScript_1513E1 + call_if 1, Route119_EventScript_1513E1 disappear 25 reappear 16 pause 30 checkgender compare RESULT, 0 - jumpeq Route119_EventScript_15125E + goto_if_eq Route119_EventScript_15125E compare RESULT, 1 - jumpeq Route119_EventScript_1512D8 + goto_if_eq Route119_EventScript_1512D8 releaseall end @@ -155,16 +155,16 @@ Route119_EventScript_151352:: @ 8151352 Route119_EventScript_151362:: @ 8151362 closebutton compare 0x4001, 1 - callif 1, Route119_EventScript_1513D2 + call_if 1, Route119_EventScript_1513D2 compare 0x4001, 2 - callif 1, Route119_EventScript_1513E1 + call_if 1, Route119_EventScript_1513E1 disappear 16 reappear 25 pause 30 compare 0x4001, 1 - callif 1, Route119_EventScript_1513BC + call_if 1, Route119_EventScript_1513BC compare 0x4001, 2 - callif 1, Route119_EventScript_1513C7 + call_if 1, Route119_EventScript_1513C7 disappear 25 setvar 0x4072, 1 playmusicbattle 0 @@ -298,7 +298,7 @@ Route119_EventScript_1514BF:: @ 81514BF trainerbattle 0, OPPONENT_JACKSON_1, 0, Route119_Text_1BE8BB, Route119_Text_1BE90E specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route119_EventScript_1514E6 + goto_if_eq Route119_EventScript_1514E6 msgbox Route119_Text_1BE937, 6 end @@ -311,7 +311,7 @@ Route119_EventScript_1514FD:: @ 81514FD trainerbattle 0, OPPONENT_CATHERINE_1, 0, Route119_Text_1BEA3A, Route119_Text_1BEA88 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route119_EventScript_151524 + goto_if_eq Route119_EventScript_151524 msgbox Route119_Text_1BEAB3, 6 end |