diff options
| author | scnorton <scnorton@biociphers.org> | 2018-01-18 12:53:31 -0500 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2018-01-18 12:53:31 -0500 |
| commit | c6ff1a6ce39cb67c6de21f2e4938ea62c97ee7e5 (patch) | |
| tree | 47e2f5eaa84c3cc97b96bdf06170136abe446d81 /data/scripts/maps/Route123.inc | |
| parent | 3c2b1731eeb7037a1b681444b1c126fc239a904e (diff) | |
| parent | 24e0edee9f428a68715c47051ebba3cda5a3e5a7 (diff) | |
Merge branch 'master' into link
Diffstat (limited to 'data/scripts/maps/Route123.inc')
| -rw-r--r-- | data/scripts/maps/Route123.inc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/data/scripts/maps/Route123.inc b/data/scripts/maps/Route123.inc index 8eb397fd4..f6d535e38 100644 --- a/data/scripts/maps/Route123.inc +++ b/data/scripts/maps/Route123.inc @@ -3,7 +3,7 @@ Route123_MapScripts:: @ 81F6147 .byte 0 Route123_MapScript1_1F614D: @ 81F614D - special sub_8139668 + special SetRoute123Weather end Route123_EventScript_1F6151:: @ 81F6151 @@ -12,12 +12,12 @@ Route123_EventScript_1F6151:: @ 81F6151 checkflag FLAG_0x0E8 goto_eq Route123_EventScript_1F61A0 msgbox Route123_Text_1F641E, 4 - special sub_81390E0 - compare_var_to_value VAR_RESULT, 0 + special IsGrassTypeInParty + compare VAR_RESULT, 0 goto_eq Route123_EventScript_1F619E msgbox Route123_Text_1F645D, 4 giveitem_std ITEM_TM19 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route123_EventScript_272054 setflag FLAG_0x0E8 msgbox Route123_Text_1F64CF, 4 @@ -62,8 +62,8 @@ Route123_EventScript_1F61F3:: @ 81F61F3 Route123_EventScript_1F620A:: @ 81F620A trainerbattle 2, TRAINER_CAMERON_1, 0, Route123_Text_29FDBA, Route123_Text_29FE1E, Route123_EventScript_1F6236 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route123_EventScript_1F6255 msgbox Route123_Text_29FE2A, 4 release @@ -87,8 +87,8 @@ Route123_EventScript_1F6255:: @ 81F6255 Route123_EventScript_1F626C:: @ 81F626C trainerbattle 2, TRAINER_JACKI_1, 0, Route123_Text_29FF61, Route123_Text_29FFD8, Route123_EventScript_1F6298 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route123_EventScript_1F62B7 msgbox Route123_Text_29FFE5, 4 release @@ -162,8 +162,8 @@ Route123_EventScript_1F63A5:: @ 81F63A5 Route123_EventScript_1F63BC:: @ 81F63BC trainerbattle 2, TRAINER_FERNANDO_1, 0, Route123_Text_2A0323, Route123_Text_2A035C, Route123_EventScript_1F63E8 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route123_EventScript_1F6407 msgbox Route123_Text_2A0389, 4 release |