diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-01-05 11:36:47 -0800 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-01-05 11:36:47 -0800 |
| commit | aed64560bc222e4ea5ccec266c0d77859a05eaac (patch) | |
| tree | ecdbc1f85cf112f24207adb27b63b93d1e503edf /data/field_move_scripts.inc | |
| parent | f5fbe5b66226f4e7e38fe5d4638831d1ce19b36b (diff) | |
Add friendly macros for goto_if and call_if variants
Diffstat (limited to 'data/field_move_scripts.inc')
| -rw-r--r-- | data/field_move_scripts.inc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index a4a7513e5..f5ba25643 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -1,7 +1,6 @@ S_CuttableTree:: @ 81B0DCC lockall - checkflag FLAG_BADGE01_GET - goto_if 0, CannotUseCut + goto_if_unset FLAG_BADGE01_GET, CannotUseCut checkpartymove MOVE_CUT compare RESULT, 6 goto_if_eq CannotUseCut @@ -58,8 +57,7 @@ CannotUseCutText: @ 81B0E8E S_BreakableRock:: @ 81B0EB7 lockall - checkflag FLAG_BADGE03_GET - goto_if 0, CannotUseRockSmash + goto_if_unset FLAG_BADGE03_GET, CannotUseRockSmash checkpartymove MOVE_ROCK_SMASH compare RESULT, 6 goto_if_eq CannotUseRockSmash @@ -125,10 +123,8 @@ CannotUseRockSmashText: @ 81B0F90 S_PushableBoulder:: @ 81B0FCB lockall - checkflag FLAG_BADGE04_GET - goto_if 0, CannotUseStrength - checkflag FLAG_SYS_USE_STRENGTH - goto_if_eq AlreadyUsedStrength + goto_if_unset FLAG_BADGE04_GET, CannotUseStrength + goto_if_set FLAG_SYS_USE_STRENGTH, AlreadyUsedStrength checkpartymove 70 compare RESULT, 6 goto_if_eq CannotUseStrength |