diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-01-09 16:48:01 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-01-09 16:48:01 -0500 |
| commit | c7722a492017dbd8a5fb3bb216062eb62129daf5 (patch) | |
| tree | 2a5c0ba6a6b9364aa93eb4a9a89b35153954ab63 /data/scripts/maps/Route123.inc | |
| parent | 2d141bc612ffecc984f6b4238c2791ba8419a192 (diff) | |
| parent | 85174ad6193d3d58b92deaaedf8c510440ed85ee (diff) | |
fixing merge conflicts
Diffstat (limited to 'data/scripts/maps/Route123.inc')
| -rw-r--r-- | data/scripts/maps/Route123.inc | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/data/scripts/maps/Route123.inc b/data/scripts/maps/Route123.inc index 891a395f0..5f77ea023 100644 --- a/data/scripts/maps/Route123.inc +++ b/data/scripts/maps/Route123.inc @@ -9,17 +9,16 @@ Route123_MapScript1_151C59:: @ 8151C59 Route123_EventScript_151C5D:: @ 8151C5D lock faceplayer - checkflag 232 - jumpeq Route123_EventScript_151CAC + goto_if_set FLAG_RECEIVED_TM19, Route123_EventScript_151CAC msgbox Route123_Text_171D83, 4 special IsGrassTypeInParty compare RESULT, 0 - jumpeq Route123_EventScript_151CAA + goto_if_eq Route123_EventScript_151CAA msgbox Route123_Text_171DC2, 4 - giveitem ITEM_TM19 + giveitem_std ITEM_TM19 compare RESULT, 0 - jumpeq Route123_EventScript_1A029B - setflag 232 + goto_if_eq Route123_EventScript_1A029B + setflag FLAG_RECEIVED_TM19 msgbox Route123_Text_171E34, 4 release end @@ -62,9 +61,9 @@ Route123_EventScript_151CFF:: @ 8151CFF Route123_EventScript_151D16:: @ 8151D16 trainerbattle 0, OPPONENT_CAMERON_1, 0, Route123_Text_1C013F, Route123_Text_1C01A3 - specialval RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 - jumpeq Route123_EventScript_151D3D + goto_if_eq Route123_EventScript_151D3D msgbox Route123_Text_1C01B1, 6 end @@ -75,9 +74,9 @@ Route123_EventScript_151D3D:: @ 8151D3D Route123_EventScript_151D54:: @ 8151D54 trainerbattle 0, OPPONENT_JACKI_1, 0, Route123_Text_1C028C, Route123_Text_1C0303 - specialval RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 - jumpeq Route123_EventScript_151D7B + goto_if_eq Route123_EventScript_151D7B msgbox Route123_Text_1C030F, 6 end |