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/FallarborTown_House1 | |
| parent | 87fd6b8dc21b37b656f16e3f11832c6951328750 (diff) | |
improve goto_if macros
Diffstat (limited to 'data/maps/FallarborTown_House1')
| -rw-r--r-- | data/maps/FallarborTown_House1/scripts.inc | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/data/maps/FallarborTown_House1/scripts.inc b/data/maps/FallarborTown_House1/scripts.inc index 470d80267..94dc3e5a7 100644 --- a/data/maps/FallarborTown_House1/scripts.inc +++ b/data/maps/FallarborTown_House1/scripts.inc @@ -4,11 +4,10 @@ FallarborTown_House1_MapScripts:: @ 8200F12 FallarborTown_House1_EventScript_200F13:: @ 8200F13 lock faceplayer - checkflag FLAG_0x0E5 - goto_eq FallarborTown_House1_EventScript_200FB2 + goto_if_set FLAG_0x0E5, FallarborTown_House1_EventScript_200FB2 checkitem ITEM_METEORITE, 1 compare VAR_RESULT, 1 - goto_eq FallarborTown_House1_EventScript_200F38 + goto_if_eq FallarborTown_House1_EventScript_200F38 msgbox FallarborTown_House1_Text_200FEE, MSGBOX_DEFAULT release end @@ -19,11 +18,11 @@ FallarborTown_House1_EventScript_200F38:: @ 8200F38 checkflag FLAG_TEMP_2 call_if 1, FallarborTown_House1_EventScript_200F9C compare VAR_RESULT, 0 - goto_eq FallarborTown_House1_EventScript_200FA5 + goto_if_eq FallarborTown_House1_EventScript_200FA5 msgbox FallarborTown_House1_Text_201159, MSGBOX_DEFAULT giveitem_std ITEM_TM27 compare VAR_RESULT, 0 - goto_eq FallarborTown_House1_EventScript_272054 + goto_if_eq FallarborTown_House1_EventScript_272054 setvar VAR_0x8004, 280 call FallarborTown_House1_EventScript_2723E4 setflag FLAG_0x0E5 @@ -54,10 +53,8 @@ FallarborTown_House1_EventScript_200FB2:: @ 8200FB2 FallarborTown_House1_EventScript_200FBC:: @ 8200FBC lock faceplayer - checkflag FLAG_0x0E5 - goto_eq FallarborTown_House1_EventScript_200FE4 - checkflag FLAG_0x08B - goto_eq FallarborTown_House1_EventScript_200FDA + goto_if_set FLAG_0x0E5, FallarborTown_House1_EventScript_200FE4 + goto_if_set FLAG_0x08B, FallarborTown_House1_EventScript_200FDA msgbox FallarborTown_House1_Text_2012BC, MSGBOX_DEFAULT release end |