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/Route114.inc | |
| parent | 2d141bc612ffecc984f6b4238c2791ba8419a192 (diff) | |
| parent | 85174ad6193d3d58b92deaaedf8c510440ed85ee (diff) | |
fixing merge conflicts
Diffstat (limited to 'data/scripts/maps/Route114.inc')
| -rw-r--r-- | data/scripts/maps/Route114.inc | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc index cfe1dfe7d..30ab8c572 100644 --- a/data/scripts/maps/Route114.inc +++ b/data/scripts/maps/Route114.inc @@ -4,17 +4,16 @@ Route114_MapScripts:: @ 8150732 Route114_EventScript_150733:: @ 8150733 lock faceplayer - checkdailyflags - checkflag 2251 - jumpeq Route114_EventScript_150778 + dodailyevents + goto_if_set FLAG_DAILY_RECEIVED_BERRY_ROUTE114, Route114_EventScript_150778 msgbox Route114_Text_1C5803, 4 random 5 addvar RESULT, 15 addvar RESULT, 133 - giveitem RESULT + giveitem_std RESULT compare RESULT, 0 - jumpeq Route114_EventScript_1A029B - setflag 2251 + goto_if_eq Route114_EventScript_1A029B + setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE114 msgbox Route114_Text_1C5861, 4 release end @@ -27,13 +26,12 @@ Route114_EventScript_150778:: @ 8150778 Route114_EventScript_150782:: @ 8150782 lock faceplayer - checkflag 231 - jumpeq Route114_EventScript_1507B9 + goto_if_set FLAG_RECEIVED_TM05, Route114_EventScript_1507B9 msgbox Route114_Text_170154, 4 - giveitem ITEM_TM05 + giveitem_std ITEM_TM05 compare RESULT, 0 - jumpeq Route114_EventScript_1A029B - setflag 231 + goto_if_eq Route114_EventScript_1A029B + setflag FLAG_RECEIVED_TM05 msgbox Route114_Text_1701C5, 4 release end @@ -46,10 +44,10 @@ Route114_EventScript_1507B9:: @ 81507B9 Route114_EventScript_1507C3:: @ 81507C3 lock faceplayer - checksound - pokecry SPECIES_POOCHYENA, 2 + waitse + playmoncry SPECIES_POOCHYENA, 2 msgbox Route114_Text_1701F9, 4 - waitpokecry + waitmoncry release end @@ -87,9 +85,9 @@ Route114_EventScript_150836:: @ 8150836 Route114_EventScript_15084D:: @ 815084D trainerbattle 0, OPPONENT_STEVE_1, 0, Route114_Text_1BC2F5, Route114_Text_1BC327 - specialval RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 - jumpeq Route114_EventScript_150874 + goto_if_eq Route114_EventScript_150874 msgbox Route114_Text_1BC337, 6 end @@ -100,9 +98,9 @@ Route114_EventScript_150874:: @ 8150874 Route114_EventScript_15088B:: @ 815088B trainerbattle 0, OPPONENT_BERNIE_1, 0, Route114_Text_1BC45A, Route114_Text_1BC499 - specialval RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 - jumpeq Route114_EventScript_1508B2 + goto_if_eq Route114_EventScript_1508B2 msgbox Route114_Text_1BC4B5, 6 end |