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_House2 | |
| parent | 87fd6b8dc21b37b656f16e3f11832c6951328750 (diff) | |
improve goto_if macros
Diffstat (limited to 'data/maps/FallarborTown_House2')
| -rw-r--r-- | data/maps/FallarborTown_House2/scripts.inc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/data/maps/FallarborTown_House2/scripts.inc b/data/maps/FallarborTown_House2/scripts.inc index 2fddd2fd4..962c4f64e 100644 --- a/data/maps/FallarborTown_House2/scripts.inc +++ b/data/maps/FallarborTown_House2/scripts.inc @@ -5,8 +5,7 @@ FallarborTown_House2_EventScript_201383:: @ 8201383 lockall applymovement 1, FallarborTown_House2_Movement_27259E waitmovement 0 - checkflag FLAG_TEMP_1 - goto_eq FallarborTown_House2_EventScript_2013A8 + goto_if_set FLAG_TEMP_1, FallarborTown_House2_EventScript_2013A8 msgbox FallarborTown_House2_Text_20145C, MSGBOX_DEFAULT setflag FLAG_TEMP_1 goto FallarborTown_House2_EventScript_2013A8 @@ -15,7 +14,7 @@ FallarborTown_House2_EventScript_201383:: @ 8201383 FallarborTown_House2_EventScript_2013A8:: @ 82013A8 checkitem ITEM_HEART_SCALE, 1 compare VAR_RESULT, 0 - goto_eq FallarborTown_House2_EventScript_201452 + goto_if_eq FallarborTown_House2_EventScript_201452 msgbox FallarborTown_House2_Text_201541, MSGBOX_YESNO switch VAR_RESULT case 0, FallarborTown_House2_EventScript_201452 @@ -27,12 +26,12 @@ FallarborTown_House2_EventScript_2013D6:: @ 82013D6 special sub_81B951C waitstate compare VAR_0x8004, 255 - goto_eq FallarborTown_House2_EventScript_201452 + goto_if_eq FallarborTown_House2_EventScript_201452 special sub_81B98DC compare VAR_RESULT, 1 - goto_eq FallarborTown_House2_EventScript_201444 + goto_if_eq FallarborTown_House2_EventScript_201444 compare VAR_0x8005, 0 - goto_eq FallarborTown_House2_EventScript_201436 + goto_if_eq FallarborTown_House2_EventScript_201436 goto FallarborTown_House2_EventScript_20140C end @@ -41,7 +40,7 @@ FallarborTown_House2_EventScript_20140C:: @ 820140C special TeachMoveTutorMove waitstate compare VAR_0x8004, 0 - goto_eq FallarborTown_House2_EventScript_2013D6 + goto_if_eq FallarborTown_House2_EventScript_2013D6 msgbox FallarborTown_House2_Text_201627, MSGBOX_DEFAULT takeitem ITEM_HEART_SCALE, 1 goto FallarborTown_House2_EventScript_201452 |