diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-06-25 17:50:27 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-06-25 17:50:27 -0500 |
| commit | 605f8ac1141daf66d3428923e004f82f5a5e1594 (patch) | |
| tree | a3e5fae5d271175c7f10b6b455fcdc7f0fdd553e /data-de/field_move_scripts.inc | |
| parent | e88e39d5fda1644f77e41fd652d4310612da7532 (diff) | |
| parent | 659437f07a44b6f560bb58d6c12d141ed8ba7643 (diff) | |
Merge branch 'master' into contest_link_80C2020
Diffstat (limited to 'data-de/field_move_scripts.inc')
| -rw-r--r-- | data-de/field_move_scripts.inc | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/data-de/field_move_scripts.inc b/data-de/field_move_scripts.inc index 86a4d1b24..ef06df21f 100644 --- a/data-de/field_move_scripts.inc +++ b/data-de/field_move_scripts.inc @@ -12,14 +12,14 @@ S_CuttableTree:: @ 81B0DCC goto_if_eq Cut_ChoseNo msgbox UsedCutRockSmashText, 4 closemessage - dofieldeffect 2 + dofieldeffect FLDEFF_USE_CUT_ON_TREE waitstate goto DoTreeCutMovement end -S_UseCut:: @ 81B0E16 +DoCutFieldEffectScript:: @ 81B0E16 lockall - dofieldeffect 2 + dofieldeffect FLDEFF_USE_CUT_ON_TREE waitstate goto DoTreeCutMovement end @@ -32,8 +32,8 @@ DoTreeCutMovement: @ 81B0E21 end TreeCutMovement: @ 81B0E30 - step_5b - step_end + cut_tree + end_movement CannotUseCut: @ 81B0E32 msgbox CannotUseCutText, 3 @@ -72,14 +72,14 @@ S_BreakableRock:: @ 81B0EB7 goto_if_eq RockSmash_ChoseNo msgbox UsedCutRockSmashText, 4 closemessage - dofieldeffect 37 + dofieldeffect FLDEFF_USE_ROCK_SMASH waitstate goto DoRockSmashMovement end S_UseRockSmash:: @ 81B0F01 lockall - dofieldeffect 37 + dofieldeffect FLDEFF_USE_ROCK_SMASH waitstate goto DoRockSmashMovement end @@ -103,8 +103,8 @@ DoRockSmashMovement_Done: @ 81B0F3A end RockSmashMovement: @ 81B0F3C - step_5a - step_end + rock_smash_break + end_movement CannotUseRockSmash: @ 81B0F3E msgbox CannotUseRockSmashText, 3 @@ -136,14 +136,14 @@ S_PushableBoulder:: @ 81B0FCB compare RESULT, NO goto_if_eq Strength_ChoseNo closemessage - dofieldeffect 40 + dofieldeffect FLDEFF_USE_STRENGTH waitstate goto UsedStrength end S_UseStrength:: @ 81B100E lockall - dofieldeffect 40 + dofieldeffect FLDEFF_USE_STRENGTH waitstate goto UsedStrength end @@ -198,7 +198,7 @@ S_UseWaterfall:: @ 81B115A compare RESULT, NO goto_if_eq Waterfall_Done msgbox UsedWaterfallText, 4 - dofieldeffect 43 + dofieldeffect FLDEFF_USE_WATERFALL goto Waterfall_Done S_CannotUseWaterfall:: @ 81B1194 @@ -232,7 +232,7 @@ UseDiveScript:: @ 81B1220 compare RESULT, NO goto_if_eq Dive_Done msgbox UsedDiveText, 4 - dofieldeffect 44 + dofieldeffect FLDEFF_USE_DIVE goto Dive_Done lockall @@ -255,7 +255,7 @@ S_UseDiveUnderwater:: @ 81B1269 compare RESULT, NO goto_if_eq UnderwaterDive_Done msgbox UsedDiveText, 4 - dofieldeffect 44 + dofieldeffect FLDEFF_USE_DIVE goto UnderwaterDive_Done UnderwaterCannotUseDive: @ 81B12A7 |