diff options
| author | Melody <melody@pallet.town> | 2018-12-21 20:28:24 -0500 |
|---|---|---|
| committer | Melody <melody@pallet.town> | 2018-12-21 20:28:24 -0500 |
| commit | ac2e4adf2da2f30a741556e20e5bc9a494997581 (patch) | |
| tree | 1a05a202cfece044d546094581d8463a9b6e452c /data/maps/MossdeepCity/scripts.inc | |
| parent | 87fd6b8dc21b37b656f16e3f11832c6951328750 (diff) | |
improve goto_if macros
Diffstat (limited to 'data/maps/MossdeepCity/scripts.inc')
| -rw-r--r-- | data/maps/MossdeepCity/scripts.inc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc index a4a87e3e7..745790458 100644 --- a/data/maps/MossdeepCity/scripts.inc +++ b/data/maps/MossdeepCity/scripts.inc @@ -14,8 +14,7 @@ MossdeepCity_MapScript1_1E4A9C: @ 81E4A9C MossdeepCity_EventScript_1E4AB2:: @ 81E4AB2 lock faceplayer - checkflag FLAG_0x07B - goto_eq MossdeepCity_EventScript_1E4AC7 + goto_if_set FLAG_0x07B, MossdeepCity_EventScript_1E4AC7 msgbox MossdeepCity_Text_1E4E90, MSGBOX_DEFAULT release end @@ -28,8 +27,7 @@ MossdeepCity_EventScript_1E4AC7:: @ 81E4AC7 MossdeepCity_EventScript_1E4AD1:: @ 81E4AD1 lock faceplayer - checkflag FLAG_0x07B - goto_eq MossdeepCity_EventScript_1E4AE6 + goto_if_set FLAG_0x07B, MossdeepCity_EventScript_1E4AE6 msgbox MossdeepCity_Text_1E4F50, MSGBOX_DEFAULT release end @@ -227,15 +225,14 @@ MossdeepCity_EventScript_1E4C10:: @ 81E4C10 MossdeepCity_EventScript_1E4C26:: @ 81E4C26 lock faceplayer - checkflag FLAG_0x114 - goto_eq MossdeepCity_EventScript_1E4C68 + goto_if_set FLAG_0x114, MossdeepCity_EventScript_1E4C68 msgbox MossdeepCity_Text_1E4CED, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq MossdeepCity_EventScript_1E4C72 + goto_if_eq MossdeepCity_EventScript_1E4C72 msgbox MossdeepCity_Text_1E4D5B, MSGBOX_DEFAULT giveitem_std ITEM_KINGS_ROCK compare VAR_RESULT, 0 - goto_eq MossdeepCity_EventScript_272054 + goto_if_eq MossdeepCity_EventScript_272054 setflag FLAG_0x114 release end |