diff options
author | Marcus Huderle <huderlem@gmail.com> | 2017-12-21 11:59:37 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-21 11:59:37 -0600 |
commit | 85a8e5f1ded5a0a2354916617dd0b82091a42ee0 (patch) | |
tree | 9d04e3c1d115d496af910f2a1714e6e3fe82d77b /data/scripts/maps/Route114.inc | |
parent | 871ae4c283ec8bc7730df52790b5ca53baa82230 (diff) | |
parent | 19895d28322609e6f67797bfec9851e0cb5a2182 (diff) |
Merge pull request #497 from huderlem/script_commands
Port event script names from pokeemerald
Diffstat (limited to 'data/scripts/maps/Route114.inc')
-rw-r--r-- | data/scripts/maps/Route114.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc index 3d1da2014..302c162b0 100644 --- a/data/scripts/maps/Route114.inc +++ b/data/scripts/maps/Route114.inc @@ -11,7 +11,7 @@ Route114_EventScript_150733:: @ 8150733 random 5 addvar RESULT, 15 addvar RESULT, 133 - giveitem RESULT + giveitem_std RESULT compare RESULT, 0 goto_if_eq Route114_EventScript_1A029B setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE114 @@ -30,7 +30,7 @@ Route114_EventScript_150782:: @ 8150782 checkflag FLAG_RECEIVED_TM05 goto_if_eq Route114_EventScript_1507B9 msgbox Route114_Text_170154, 4 - giveitem ITEM_TM05 + giveitem_std ITEM_TM05 compare RESULT, 0 goto_if_eq Route114_EventScript_1A029B setflag FLAG_RECEIVED_TM05 @@ -47,9 +47,9 @@ Route114_EventScript_1507C3:: @ 81507C3 lock faceplayer waitse - playpokecry SPECIES_POOCHYENA, 2 + playmoncry SPECIES_POOCHYENA, 2 msgbox Route114_Text_1701F9, 4 - waitpokecry + waitmoncry release end |