diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-01-06 10:03:30 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-06 10:03:30 -0800 |
| commit | 7bf330e9f2b048a9b3d7882c80c9aa413c55484a (patch) | |
| tree | d04ef83bc1ef18ceea4177fd7444b454291a81bc /data-de/field_move_scripts.inc | |
| parent | b396c6038cec6eba5eed46ed8f70f6a465acc2a6 (diff) | |
| parent | 43b4ba34dc05dc6be31b58f0b18df1b3d57f608d (diff) | |
Merge pull request #508 from huderlem/friendly_macros
call_if and goto_if macros
Diffstat (limited to 'data-de/field_move_scripts.inc')
| -rw-r--r-- | data-de/field_move_scripts.inc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/data-de/field_move_scripts.inc b/data-de/field_move_scripts.inc index 91f6ca620..86a4d1b24 100644 --- a/data-de/field_move_scripts.inc +++ b/data-de/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 @@ -61,8 +60,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 @@ -128,10 +126,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 |