diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-06 20:57:36 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-06 20:57:36 -0500 |
| commit | 86f0291f63ff6bc580476dae3c00fc4d6d7b15da (patch) | |
| tree | 37d03c82f0b43a4a0b856610c5b36fe96dc3ebed /data/scripts/maps/Route104.inc | |
| parent | deac7fd3706ea9de855330881e2555a8c70d72f3 (diff) | |
| parent | 680d3fd7b980578024226eccffe2e01072826227 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby
Diffstat (limited to 'data/scripts/maps/Route104.inc')
| -rw-r--r-- | data/scripts/maps/Route104.inc | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index c90a97531..a3824efcf 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -17,10 +17,8 @@ Route104_MapScript1_14EEA8:: @ 814EEA8 end Route104_EventScript_14EEAE:: @ 814EEAE - checkflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER - goto_if 0, Route104_EventScript_14EEC4 - checkflag FLAG_BADGE03_GET - goto_if 0, Route104_EventScript_14EEC4 + goto_if_unset FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_EventScript_14EEC4 + goto_if_unset FLAG_BADGE03_GET, Route104_EventScript_14EEC4 clearflag FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE return @@ -31,8 +29,7 @@ Route104_EventScript_14EEC4:: @ 814EEC4 Route104_EventScript_14EEC8:: @ 814EEC8 lock faceplayer - checkflag FLAG_RECEIVED_CHESTO_BERRY_ROUTE104 - goto_if_eq Route104_EventScript_14EEFF + goto_if_set FLAG_RECEIVED_CHESTO_BERRY_ROUTE104, Route104_EventScript_14EEFF msgbox Route104_Text_1C55B9, 4 giveitem_std ITEM_CHESTO_BERRY compare RESULT, 0 @@ -50,8 +47,7 @@ Route104_EventScript_14EEFF:: @ 814EEFF Route104_EventScript_14EF09:: @ 814EF09 lock faceplayer - checkflag FLAG_RECEIVED_WHITE_HERB - goto_if_eq Route104_EventScript_14EF38 + goto_if_set FLAG_RECEIVED_WHITE_HERB, Route104_EventScript_14EF38 msgbox Route104_Text_16DD91, 4 giveitem_std ITEM_WHITE_HERB compare RESULT, 0 @@ -104,8 +100,7 @@ Route104_EventScript_14EF8A:: @ 814EF8A Route104_EventScript_14EF93:: @ 814EF93 lock faceplayer - checkflag FLAG_RECEIVED_TM09 - goto_if_eq Route104_EventScript_14EFC2 + goto_if_set FLAG_RECEIVED_TM09, Route104_EventScript_14EFC2 msgbox Route104_Text_16DC5F, 4 giveitem_std ITEM_TM09 compare RESULT, 0 @@ -158,10 +153,8 @@ Route104_EventScript_14EFD5:: @ 814EFD5 resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 0 - checkflag FLAG_DELIVERED_STEVEN_LETTER - goto_if 0, Route104_EventScript_14F08B - checkflag FLAG_DELIVERED_STEVEN_LETTER - goto_if_eq Route104_EventScript_14F095 + goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_14F08B + goto_if_set FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_14F095 end Route104_EventScript_14F08B:: @ 814F08B |