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/ShoalCave_LowTideLowerRoom/scripts.inc | |
| parent | 87fd6b8dc21b37b656f16e3f11832c6951328750 (diff) | |
improve goto_if macros
Diffstat (limited to 'data/maps/ShoalCave_LowTideLowerRoom/scripts.inc')
| -rw-r--r-- | data/maps/ShoalCave_LowTideLowerRoom/scripts.inc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc index fc0fb32a7..1e2e756d7 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc @@ -7,8 +7,7 @@ ShoalCave_LowTideLowerRoom_MapScript1_23715C: @ 823715C end ShoalCave_LowTideLowerRoom_EventScript_237162:: @ 8237162 - checkflag FLAG_0x3BB - goto_eq ShoalCave_LowTideLowerRoom_EventScript_237175 + goto_if_set FLAG_0x3BB, ShoalCave_LowTideLowerRoom_EventScript_237175 setmetatile 18, 2, 856, 1 return @@ -17,11 +16,10 @@ ShoalCave_LowTideLowerRoom_EventScript_237175:: @ 8237175 ShoalCave_LowTideLowerRoom_EventScript_237176:: @ 8237176 lockall - checkflag FLAG_0x3BB - goto_eq ShoalCave_LowTideLowerRoom_EventScript_2371A8 + goto_if_set FLAG_0x3BB, ShoalCave_LowTideLowerRoom_EventScript_2371A8 giveitem_std ITEM_SHOAL_SALT compare VAR_RESULT, 0 - goto_eq ShoalCave_LowTideLowerRoom_EventScript_272054 + goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_272054 setmetatile 18, 2, 858, 0 special DrawWholeMapView setflag FLAG_0x3BB @@ -36,12 +34,11 @@ ShoalCave_LowTideLowerRoom_EventScript_2371A8:: @ 82371A8 ShoalCave_LowTideLowerRoom_EventScript_2371B2:: @ 82371B2 lock faceplayer - checkflag FLAG_0x11B - goto_eq ShoalCave_LowTideLowerRoom_EventScript_2371E1 + goto_if_set FLAG_0x11B, ShoalCave_LowTideLowerRoom_EventScript_2371E1 msgbox ShoalCave_LowTideLowerRoom_Text_2371EB, MSGBOX_DEFAULT giveitem_std ITEM_FOCUS_BAND compare VAR_RESULT, 0 - goto_eq ShoalCave_LowTideLowerRoom_EventScript_272054 + goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_272054 setflag FLAG_0x11B release end |