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_Gym/scripts.inc | |
| parent | 87fd6b8dc21b37b656f16e3f11832c6951328750 (diff) | |
improve goto_if macros
Diffstat (limited to 'data/maps/RustboroCity_Gym/scripts.inc')
| -rw-r--r-- | data/maps/RustboroCity_Gym/scripts.inc | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/data/maps/RustboroCity_Gym/scripts.inc b/data/maps/RustboroCity_Gym/scripts.inc index 6f161d048..2308c0292 100644 --- a/data/maps/RustboroCity_Gym/scripts.inc +++ b/data/maps/RustboroCity_Gym/scripts.inc @@ -5,9 +5,8 @@ RustboroCity_Gym_EventScript_212F31:: @ 8212F31 trainerbattle_single TRAINER_ROXANNE_1, RustboroCity_Gym_Text_21362A, RustboroCity_Gym_Text_21370B, RustboroCity_Gym_EventScript_212F66, NO_MUSIC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq RustboroCity_Gym_EventScript_212FC8 - checkflag FLAG_0x0A5 - goto_if 0, RustboroCity_Gym_EventScript_212FA4 + goto_if_eq RustboroCity_Gym_EventScript_212FC8 + goto_if_unset FLAG_0x0A5, RustboroCity_Gym_EventScript_212FA4 msgbox RustboroCity_Gym_Text_2139A7, MSGBOX_DEFAULT release end @@ -31,7 +30,7 @@ RustboroCity_Gym_EventScript_212F66:: @ 8212F66 RustboroCity_Gym_EventScript_212FA4:: @ 8212FA4 giveitem_std ITEM_TM39 compare VAR_RESULT, 0 - goto_eq RustboroCity_Gym_EventScript_272054 + goto_if_eq RustboroCity_Gym_EventScript_272054 setflag FLAG_0x0A5 msgbox RustboroCity_Gym_Text_2138B1, MSGBOX_DEFAULT release @@ -60,8 +59,7 @@ RustboroCity_Gym_EventScript_213011:: @ 8213011 RustboroCity_Gym_EventScript_213028:: @ 8213028 lock faceplayer - checkflag FLAG_0x4F0 - goto_eq RustboroCity_Gym_EventScript_21303D + goto_if_set FLAG_0x4F0, RustboroCity_Gym_EventScript_21303D msgbox RustboroCity_Gym_Text_21309D, MSGBOX_DEFAULT release end @@ -73,15 +71,13 @@ RustboroCity_Gym_EventScript_21303D:: @ 821303D RustboroCity_Gym_EventScript_213047:: @ 8213047 lockall - checkflag FLAG_BADGE01_GET - goto_eq RustboroCity_Gym_EventScript_213067 + goto_if_set FLAG_BADGE01_GET, RustboroCity_Gym_EventScript_213067 goto RustboroCity_Gym_EventScript_213071 end RustboroCity_Gym_EventScript_213057:: @ 8213057 lockall - checkflag FLAG_BADGE01_GET - goto_eq RustboroCity_Gym_EventScript_213067 + goto_if_set FLAG_BADGE01_GET, RustboroCity_Gym_EventScript_213067 goto RustboroCity_Gym_EventScript_213071 end |