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/RustboroCity_DevonCorp_3F | |
| parent | 87fd6b8dc21b37b656f16e3f11832c6951328750 (diff) | |
improve goto_if macros
Diffstat (limited to 'data/maps/RustboroCity_DevonCorp_3F')
| -rw-r--r-- | data/maps/RustboroCity_DevonCorp_3F/scripts.inc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index ce5a555ef..a13d38a18 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -150,10 +150,8 @@ RustboroCity_DevonCorp_3F_Movement_212566: @ 8212566 RustboroCity_DevonCorp_3F_EventScript_21256C:: @ 821256C lock faceplayer - checkflag FLAG_0x110 - goto_eq RustboroCity_DevonCorp_3F_EventScript_2125CC - checkflag FLAG_0x0BD - goto_eq RustboroCity_DevonCorp_3F_EventScript_212595 + goto_if_set FLAG_0x110, RustboroCity_DevonCorp_3F_EventScript_2125CC + goto_if_set FLAG_0x0BD, RustboroCity_DevonCorp_3F_EventScript_212595 msgbox RustboroCity_DevonCorp_3F_Text_212A09, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_2725A2 @@ -165,7 +163,7 @@ RustboroCity_DevonCorp_3F_EventScript_212595:: @ 8212595 msgbox RustboroCity_DevonCorp_3F_Text_212A29, MSGBOX_DEFAULT giveitem_std ITEM_EXP_SHARE compare VAR_RESULT, 0 - goto_eq RustboroCity_DevonCorp_3F_EventScript_272054 + goto_if_eq RustboroCity_DevonCorp_3F_EventScript_272054 setflag FLAG_0x110 msgbox RustboroCity_DevonCorp_3F_Text_212A9E, MSGBOX_DEFAULT closemessage @@ -185,8 +183,7 @@ RustboroCity_DevonCorp_3F_EventScript_2125CC:: @ 82125CC RustboroCity_DevonCorp_3F_EventScript_2125E1:: @ 82125E1 lock faceplayer - checkflag FLAG_0x100 - goto_eq RustboroCity_DevonCorp_3F_EventScript_2125F6 + goto_if_set FLAG_0x100, RustboroCity_DevonCorp_3F_EventScript_2125F6 msgbox RustboroCity_DevonCorp_3F_Text_212E41, MSGBOX_DEFAULT release end |