From 2c87516ca3efa260b96b92ededb24d75edfe49e8 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Tue, 12 Sep 2017 20:23:23 -0500 Subject: more labels and fix build --- data/field_move_scripts.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/field_move_scripts.inc') diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index 315217055..acf5e9e17 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -90,7 +90,7 @@ DoRockSmashMovement: @ 81B0F0C specialval RESULT, sub_810F5BC compare RESULT, 1 jumpeq DoRockSmashMovement_Done - special RockSmashWildEncounter + special ScrSpecial_RockSmashWildEncounter compare RESULT, 0 jumpeq DoRockSmashMovement_Done waitstate -- cgit v1.2.3 From 270bd98d41a19c516a4be95f522deb26cc4300a9 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Wed, 13 Sep 2017 00:03:22 -0500 Subject: more labeling --- data/field_move_scripts.inc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'data/field_move_scripts.inc') diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index acf5e9e17..9911dca3a 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -1,4 +1,4 @@ -CuttableTreeScript:: @ 81B0DCC +S_CuttableTree:: @ 81B0DCC lockall checkflag 2055 jumpif 0, CannotUseCut @@ -18,7 +18,7 @@ CuttableTreeScript:: @ 81B0DCC jump DoTreeCutMovement end -UseCutScript:: @ 81B0E16 +S_UseCut:: @ 81B0E16 lockall doanimation 2 waitstate @@ -56,7 +56,7 @@ UsedCutRockSmashText: @ 81B0E82 CannotUseCutText: @ 81B0E8E .string "This tree looks like it can be CUT down.$" -BreakableRockScript:: @ 81B0EB7 +S_BreakableRock:: @ 81B0EB7 lockall checkflag 2057 jumpif 0, CannotUseRockSmash @@ -76,7 +76,7 @@ BreakableRockScript:: @ 81B0EB7 jump DoRockSmashMovement end -UseRockSmashScript:: @ 81B0F01 +S_UseRockSmash:: @ 81B0F01 lockall doanimation 37 waitstate @@ -123,7 +123,7 @@ CannotUseRockSmashText: @ 81B0F90 .string "It’s a rugged rock, but a POKéMON\n" .string "may be able to smash it.$" -PushableBoulderScript:: @ 81B0FCB +S_PushableBoulder:: @ 81B0FCB lockall checkflag 2058 jumpif 0, CannotUseStrength @@ -142,7 +142,7 @@ PushableBoulderScript:: @ 81B0FCB jump UsedStrength end -UseStrengthScript:: @ 81B100E +S_UseStrength:: @ 81B100E lockall doanimation 40 waitstate @@ -188,7 +188,7 @@ AlreadyUsedStrengthText: @ 81B1127 .string "STRENGTH made it possible to move\n" .string "boulders around.$" -UseWaterfallScript:: @ 81B115A +S_UseWaterfall:: @ 81B115A lockall checkattack MOVE_WATERFALL compare RESULT, 6 @@ -202,7 +202,7 @@ UseWaterfallScript:: @ 81B115A doanimation 43 jump Waterfall_Done -CannotUseWaterfallScript:: @ 81B1194 +S_CannotUseWaterfall:: @ 81B1194 lockall Waterfall_NoMonKnows: @ 81B1195 msgbox CannotUseWaterfallText, 4 @@ -244,7 +244,7 @@ Dive_Done: @ 81B1267 releaseall end -UnderwaterUseDiveScript:: @ 81B1269 +S_UseDiveUnderwater:: @ 81B1269 lockall checkattack MOVE_DIVE compare RESULT, 6 -- cgit v1.2.3 From ae5ec7f5b05218ba21c53ef632590a5243a7f647 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 24 Sep 2017 14:17:14 -0500 Subject: Replace script commands: snop -> nop, snop1 -> nop1, jump -> goto --- data/field_move_scripts.inc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'data/field_move_scripts.inc') diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index 9911dca3a..cdda2edcc 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -15,14 +15,14 @@ S_CuttableTree:: @ 81B0DCC closebutton doanimation 2 waitstate - jump DoTreeCutMovement + goto DoTreeCutMovement end S_UseCut:: @ 81B0E16 lockall doanimation 2 waitstate - jump DoTreeCutMovement + goto DoTreeCutMovement end DoTreeCutMovement: @ 81B0E21 @@ -73,14 +73,14 @@ S_BreakableRock:: @ 81B0EB7 closebutton doanimation 37 waitstate - jump DoRockSmashMovement + goto DoRockSmashMovement end S_UseRockSmash:: @ 81B0F01 lockall doanimation 37 waitstate - jump DoRockSmashMovement + goto DoRockSmashMovement end DoRockSmashMovement: @ 81B0F0C @@ -139,14 +139,14 @@ S_PushableBoulder:: @ 81B0FCB closebutton doanimation 40 waitstate - jump UsedStrength + goto UsedStrength end S_UseStrength:: @ 81B100E lockall doanimation 40 waitstate - jump UsedStrength + goto UsedStrength end UsedStrength: @ 81B1019 @@ -200,7 +200,7 @@ S_UseWaterfall:: @ 81B115A jumpeq Waterfall_Done msgbox UsedWaterfallText, 4 doanimation 43 - jump Waterfall_Done + goto Waterfall_Done S_CannotUseWaterfall:: @ 81B1194 lockall @@ -234,7 +234,7 @@ UseDiveScript:: @ 81B1220 jumpeq Dive_Done msgbox UsedDiveText, 4 doanimation 44 - jump Dive_Done + goto Dive_Done lockall CannotUseDive: @ 81B125F @@ -257,12 +257,12 @@ S_UseDiveUnderwater:: @ 81B1269 jumpeq UnderwaterDive_Done msgbox UsedDiveText, 4 doanimation 44 - jump UnderwaterDive_Done + goto UnderwaterDive_Done UnderwaterCannotUseDive: @ 81B12A7 lockall msgbox UnderwaterCannotUseDiveText, 4 - jump UnderwaterDive_Done + goto UnderwaterDive_Done @ not used SurfacingBlocked: @ 81B12B5 -- cgit v1.2.3 From 86e7bf1fd61b151011038cdb281db3de0a1d9e6a Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 24 Sep 2017 14:28:51 -0500 Subject: Replace more script commands and fix German build --- data/field_move_scripts.inc | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'data/field_move_scripts.inc') diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index cdda2edcc..c3aeeab7a 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -1,16 +1,16 @@ S_CuttableTree:: @ 81B0DCC lockall checkflag 2055 - jumpif 0, CannotUseCut + goto_if 0, CannotUseCut checkattack MOVE_CUT compare RESULT, 6 - jumpeq CannotUseCut + goto_if_eq CannotUseCut setanimation 0, RESULT bufferpartypoke 0, RESULT bufferattack 1, MOVE_CUT msgbox UseCutPromptText, 5 compare RESULT, 0 - jumpeq Cut_ChoseNo + goto_if_eq Cut_ChoseNo msgbox UsedCutRockSmashText, 4 closebutton doanimation 2 @@ -59,16 +59,16 @@ CannotUseCutText: @ 81B0E8E S_BreakableRock:: @ 81B0EB7 lockall checkflag 2057 - jumpif 0, CannotUseRockSmash + goto_if 0, CannotUseRockSmash checkattack MOVE_ROCK_SMASH compare RESULT, 6 - jumpeq CannotUseRockSmash + goto_if_eq CannotUseRockSmash setanimation 0, RESULT bufferpartypoke 0, RESULT bufferattack 1, MOVE_ROCK_SMASH msgbox UseRockSmashPromptText, 5 compare RESULT, 0 - jumpeq RockSmash_ChoseNo + goto_if_eq RockSmash_ChoseNo msgbox UsedCutRockSmashText, 4 closebutton doanimation 37 @@ -89,10 +89,10 @@ DoRockSmashMovement: @ 81B0F0C disappear LAST_TALKED specialval RESULT, sub_810F5BC compare RESULT, 1 - jumpeq DoRockSmashMovement_Done + goto_if_eq DoRockSmashMovement_Done special ScrSpecial_RockSmashWildEncounter compare RESULT, 0 - jumpeq DoRockSmashMovement_Done + goto_if_eq DoRockSmashMovement_Done waitstate releaseall end @@ -126,16 +126,16 @@ CannotUseRockSmashText: @ 81B0F90 S_PushableBoulder:: @ 81B0FCB lockall checkflag 2058 - jumpif 0, CannotUseStrength + goto_if 0, CannotUseStrength checkflag 2089 - jumpeq AlreadyUsedStrength + goto_if_eq AlreadyUsedStrength checkattack 70 compare RESULT, 6 - jumpeq CannotUseStrength + goto_if_eq CannotUseStrength setanimation 0, RESULT msgbox UseStrengthPromptText, 5 compare RESULT, 0 - jumpeq Strength_ChoseNo + goto_if_eq Strength_ChoseNo closebutton doanimation 40 waitstate @@ -192,12 +192,12 @@ S_UseWaterfall:: @ 81B115A lockall checkattack MOVE_WATERFALL compare RESULT, 6 - jumpeq Waterfall_NoMonKnows + goto_if_eq Waterfall_NoMonKnows bufferpartypoke 0, RESULT setanimation 0, RESULT msgbox UseWaterfallPromptText, 5 compare RESULT, 0 - jumpeq Waterfall_Done + goto_if_eq Waterfall_Done msgbox UsedWaterfallText, 4 doanimation 43 goto Waterfall_Done @@ -225,13 +225,13 @@ UseDiveScript:: @ 81B1220 lockall checkattack MOVE_DIVE compare RESULT, 6 - jumpeq CannotUseDive + goto_if_eq CannotUseDive bufferpartypoke 0, RESULT setanimation 0, RESULT setanimation 1, 1 msgbox UseDivePromptText, 5 compare RESULT, 0 - jumpeq Dive_Done + goto_if_eq Dive_Done msgbox UsedDiveText, 4 doanimation 44 goto Dive_Done @@ -248,13 +248,13 @@ S_UseDiveUnderwater:: @ 81B1269 lockall checkattack MOVE_DIVE compare RESULT, 6 - jumpeq UnderwaterCannotUseDive + goto_if_eq UnderwaterCannotUseDive bufferpartypoke 0, RESULT setanimation 0, RESULT setanimation 1, 1 msgbox UnderwaterUseDivePromptText, 5 compare RESULT, 0 - jumpeq UnderwaterDive_Done + goto_if_eq UnderwaterDive_Done msgbox UsedDiveText, 4 doanimation 44 goto UnderwaterDive_Done -- cgit v1.2.3 From 1e2601a0287fdacfb8f0d680fbe82a274414ea65 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 24 Sep 2017 17:10:51 -0500 Subject: more script command renaming --- data/field_move_scripts.inc | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'data/field_move_scripts.inc') diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index c3aeeab7a..3716eab3c 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -3,13 +3,13 @@ S_CuttableTree:: @ 81B0DCC checkflag 2055 goto_if 0, CannotUseCut checkattack MOVE_CUT - compare RESULT, 6 + compare_var_to_imm RESULT, 6 goto_if_eq CannotUseCut setanimation 0, RESULT bufferpartypoke 0, RESULT bufferattack 1, MOVE_CUT msgbox UseCutPromptText, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Cut_ChoseNo msgbox UsedCutRockSmashText, 4 closebutton @@ -61,13 +61,13 @@ S_BreakableRock:: @ 81B0EB7 checkflag 2057 goto_if 0, CannotUseRockSmash checkattack MOVE_ROCK_SMASH - compare RESULT, 6 + compare_var_to_imm RESULT, 6 goto_if_eq CannotUseRockSmash setanimation 0, RESULT bufferpartypoke 0, RESULT bufferattack 1, MOVE_ROCK_SMASH msgbox UseRockSmashPromptText, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq RockSmash_ChoseNo msgbox UsedCutRockSmashText, 4 closebutton @@ -88,10 +88,10 @@ DoRockSmashMovement: @ 81B0F0C waitmove 0 disappear LAST_TALKED specialval RESULT, sub_810F5BC - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq DoRockSmashMovement_Done special ScrSpecial_RockSmashWildEncounter - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq DoRockSmashMovement_Done waitstate releaseall @@ -130,11 +130,11 @@ S_PushableBoulder:: @ 81B0FCB checkflag 2089 goto_if_eq AlreadyUsedStrength checkattack 70 - compare RESULT, 6 + compare_var_to_imm RESULT, 6 goto_if_eq CannotUseStrength setanimation 0, RESULT msgbox UseStrengthPromptText, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Strength_ChoseNo closebutton doanimation 40 @@ -191,12 +191,12 @@ AlreadyUsedStrengthText: @ 81B1127 S_UseWaterfall:: @ 81B115A lockall checkattack MOVE_WATERFALL - compare RESULT, 6 + compare_var_to_imm RESULT, 6 goto_if_eq Waterfall_NoMonKnows bufferpartypoke 0, RESULT setanimation 0, RESULT msgbox UseWaterfallPromptText, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Waterfall_Done msgbox UsedWaterfallText, 4 doanimation 43 @@ -224,13 +224,13 @@ UsedWaterfallText: @ 81B120D UseDiveScript:: @ 81B1220 lockall checkattack MOVE_DIVE - compare RESULT, 6 + compare_var_to_imm RESULT, 6 goto_if_eq CannotUseDive bufferpartypoke 0, RESULT setanimation 0, RESULT setanimation 1, 1 msgbox UseDivePromptText, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Dive_Done msgbox UsedDiveText, 4 doanimation 44 @@ -247,13 +247,13 @@ Dive_Done: @ 81B1267 S_UseDiveUnderwater:: @ 81B1269 lockall checkattack MOVE_DIVE - compare RESULT, 6 + compare_var_to_imm RESULT, 6 goto_if_eq UnderwaterCannotUseDive bufferpartypoke 0, RESULT setanimation 0, RESULT setanimation 1, 1 msgbox UnderwaterUseDivePromptText, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq UnderwaterDive_Done msgbox UsedDiveText, 4 doanimation 44 -- cgit v1.2.3 From 207f8e6a76f6b13855780bb2608be9d8c1f14b15 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 24 Sep 2017 17:36:39 -0500 Subject: more script command renaming --- data/field_move_scripts.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/field_move_scripts.inc') diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index 3716eab3c..ad87919b5 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -87,7 +87,7 @@ DoRockSmashMovement: @ 81B0F0C move LAST_TALKED, RockSmashMovement waitmove 0 disappear LAST_TALKED - specialval RESULT, sub_810F5BC + specialvar RESULT, sub_810F5BC compare_var_to_imm RESULT, 1 goto_if_eq DoRockSmashMovement_Done special ScrSpecial_RockSmashWildEncounter -- cgit v1.2.3 From 598756eaa47b523bd557a619e05cb23399ac02e5 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 24 Sep 2017 17:57:54 -0500 Subject: more script command renaming --- data/field_move_scripts.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data/field_move_scripts.inc') diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index ad87919b5..ac70163aa 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -26,8 +26,8 @@ S_UseCut:: @ 81B0E16 end DoTreeCutMovement: @ 81B0E21 - move LAST_TALKED, TreeCutMovement @ tree cut animation - waitmove 0 + applymovement LAST_TALKED, TreeCutMovement @ tree cut animation + waitmovement 0 disappear LAST_TALKED @ tree disappears releaseall end @@ -84,8 +84,8 @@ S_UseRockSmash:: @ 81B0F01 end DoRockSmashMovement: @ 81B0F0C - move LAST_TALKED, RockSmashMovement - waitmove 0 + applymovement LAST_TALKED, RockSmashMovement + waitmovement 0 disappear LAST_TALKED specialvar RESULT, sub_810F5BC compare_var_to_imm RESULT, 1 -- cgit v1.2.3 From 9458b3fad18eea3fbd9168a88dd33e8aa10abcda Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Tue, 26 Sep 2017 14:09:41 -0500 Subject: single compare macro --- data/field_move_scripts.inc | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'data/field_move_scripts.inc') diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index ac70163aa..7df5ac90f 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -3,13 +3,13 @@ S_CuttableTree:: @ 81B0DCC checkflag 2055 goto_if 0, CannotUseCut checkattack MOVE_CUT - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq CannotUseCut setanimation 0, RESULT bufferpartypoke 0, RESULT bufferattack 1, MOVE_CUT msgbox UseCutPromptText, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Cut_ChoseNo msgbox UsedCutRockSmashText, 4 closebutton @@ -61,13 +61,13 @@ S_BreakableRock:: @ 81B0EB7 checkflag 2057 goto_if 0, CannotUseRockSmash checkattack MOVE_ROCK_SMASH - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq CannotUseRockSmash setanimation 0, RESULT bufferpartypoke 0, RESULT bufferattack 1, MOVE_ROCK_SMASH msgbox UseRockSmashPromptText, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq RockSmash_ChoseNo msgbox UsedCutRockSmashText, 4 closebutton @@ -88,10 +88,10 @@ DoRockSmashMovement: @ 81B0F0C waitmovement 0 disappear LAST_TALKED specialvar RESULT, sub_810F5BC - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq DoRockSmashMovement_Done special ScrSpecial_RockSmashWildEncounter - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq DoRockSmashMovement_Done waitstate releaseall @@ -130,11 +130,11 @@ S_PushableBoulder:: @ 81B0FCB checkflag 2089 goto_if_eq AlreadyUsedStrength checkattack 70 - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq CannotUseStrength setanimation 0, RESULT msgbox UseStrengthPromptText, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Strength_ChoseNo closebutton doanimation 40 @@ -191,12 +191,12 @@ AlreadyUsedStrengthText: @ 81B1127 S_UseWaterfall:: @ 81B115A lockall checkattack MOVE_WATERFALL - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq Waterfall_NoMonKnows bufferpartypoke 0, RESULT setanimation 0, RESULT msgbox UseWaterfallPromptText, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Waterfall_Done msgbox UsedWaterfallText, 4 doanimation 43 @@ -224,13 +224,13 @@ UsedWaterfallText: @ 81B120D UseDiveScript:: @ 81B1220 lockall checkattack MOVE_DIVE - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq CannotUseDive bufferpartypoke 0, RESULT setanimation 0, RESULT setanimation 1, 1 msgbox UseDivePromptText, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Dive_Done msgbox UsedDiveText, 4 doanimation 44 @@ -247,13 +247,13 @@ Dive_Done: @ 81B1267 S_UseDiveUnderwater:: @ 81B1269 lockall checkattack MOVE_DIVE - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq UnderwaterCannotUseDive bufferpartypoke 0, RESULT setanimation 0, RESULT setanimation 1, 1 msgbox UnderwaterUseDivePromptText, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq UnderwaterDive_Done msgbox UsedDiveText, 4 doanimation 44 -- cgit v1.2.3 From b4ba35a54c0f6204e34d2814351162c79ea4c0ba Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Tue, 26 Sep 2017 14:33:52 -0500 Subject: more command renaming --- data/field_move_scripts.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/field_move_scripts.inc') diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index 7df5ac90f..592dd7003 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -28,7 +28,7 @@ S_UseCut:: @ 81B0E16 DoTreeCutMovement: @ 81B0E21 applymovement LAST_TALKED, TreeCutMovement @ tree cut animation waitmovement 0 - disappear LAST_TALKED @ tree disappears + removeobject LAST_TALKED @ tree disappears releaseall end @@ -86,7 +86,7 @@ S_UseRockSmash:: @ 81B0F01 DoRockSmashMovement: @ 81B0F0C applymovement LAST_TALKED, RockSmashMovement waitmovement 0 - disappear LAST_TALKED + removeobject LAST_TALKED specialvar RESULT, sub_810F5BC compare RESULT, 1 goto_if_eq DoRockSmashMovement_Done -- cgit v1.2.3 From e926119b726839bc687c503db3680899906aad0d Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sat, 30 Sep 2017 17:04:25 -0500 Subject: update --- data/field_move_scripts.inc | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'data/field_move_scripts.inc') diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index 592dd7003..94f6b356c 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -2,7 +2,7 @@ S_CuttableTree:: @ 81B0DCC lockall checkflag 2055 goto_if 0, CannotUseCut - checkattack MOVE_CUT + checkpokemove MOVE_CUT compare RESULT, 6 goto_if_eq CannotUseCut setanimation 0, RESULT @@ -12,7 +12,7 @@ S_CuttableTree:: @ 81B0DCC compare RESULT, 0 goto_if_eq Cut_ChoseNo msgbox UsedCutRockSmashText, 4 - closebutton + closemessage doanimation 2 waitstate goto DoTreeCutMovement @@ -42,7 +42,7 @@ CannotUseCut: @ 81B0E32 end Cut_ChoseNo: @ 81B0E3C - closebutton + closemessage releaseall end @@ -60,7 +60,7 @@ S_BreakableRock:: @ 81B0EB7 lockall checkflag 2057 goto_if 0, CannotUseRockSmash - checkattack MOVE_ROCK_SMASH + checkpokemove MOVE_ROCK_SMASH compare RESULT, 6 goto_if_eq CannotUseRockSmash setanimation 0, RESULT @@ -70,7 +70,7 @@ S_BreakableRock:: @ 81B0EB7 compare RESULT, 0 goto_if_eq RockSmash_ChoseNo msgbox UsedCutRockSmashText, 4 - closebutton + closemessage doanimation 37 waitstate goto DoRockSmashMovement @@ -111,7 +111,7 @@ CannotUseRockSmash: @ 81B0F3E end RockSmash_ChoseNo: @ 81B0F48 - closebutton + closemessage releaseall end @@ -129,14 +129,14 @@ S_PushableBoulder:: @ 81B0FCB goto_if 0, CannotUseStrength checkflag 2089 goto_if_eq AlreadyUsedStrength - checkattack 70 + checkpokemove 70 compare RESULT, 6 goto_if_eq CannotUseStrength setanimation 0, RESULT msgbox UseStrengthPromptText, 5 compare RESULT, 0 goto_if_eq Strength_ChoseNo - closebutton + closemessage doanimation 40 waitstate goto UsedStrength @@ -166,7 +166,7 @@ AlreadyUsedStrength: @ 81B1030 end Strength_ChoseNo: @ 81B103A - closebutton + closemessage releaseall end @@ -190,7 +190,7 @@ AlreadyUsedStrengthText: @ 81B1127 S_UseWaterfall:: @ 81B115A lockall - checkattack MOVE_WATERFALL + checkpokemove MOVE_WATERFALL compare RESULT, 6 goto_if_eq Waterfall_NoMonKnows bufferpartypoke 0, RESULT @@ -223,7 +223,7 @@ UsedWaterfallText: @ 81B120D UseDiveScript:: @ 81B1220 lockall - checkattack MOVE_DIVE + checkpokemove MOVE_DIVE compare RESULT, 6 goto_if_eq CannotUseDive bufferpartypoke 0, RESULT @@ -246,7 +246,7 @@ Dive_Done: @ 81B1267 S_UseDiveUnderwater:: @ 81B1269 lockall - checkattack MOVE_DIVE + checkpokemove MOVE_DIVE compare RESULT, 6 goto_if_eq UnderwaterCannotUseDive bufferpartypoke 0, RESULT -- cgit v1.2.3 From 6ca1e8747d0278eb5a8e5d7f5ec74801a3e1aded Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 1 Oct 2017 11:51:50 -0500 Subject: fix more command names --- data/field_move_scripts.inc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'data/field_move_scripts.inc') diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index 94f6b356c..a3fbce103 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -6,8 +6,8 @@ S_CuttableTree:: @ 81B0DCC compare RESULT, 6 goto_if_eq CannotUseCut setanimation 0, RESULT - bufferpartypoke 0, RESULT - bufferattack 1, MOVE_CUT + getpartypokename 0, RESULT + getmovename 1, MOVE_CUT msgbox UseCutPromptText, 5 compare RESULT, 0 goto_if_eq Cut_ChoseNo @@ -64,8 +64,8 @@ S_BreakableRock:: @ 81B0EB7 compare RESULT, 6 goto_if_eq CannotUseRockSmash setanimation 0, RESULT - bufferpartypoke 0, RESULT - bufferattack 1, MOVE_ROCK_SMASH + getpartypokename 0, RESULT + getmovename 1, MOVE_ROCK_SMASH msgbox UseRockSmashPromptText, 5 compare RESULT, 0 goto_if_eq RockSmash_ChoseNo @@ -193,7 +193,7 @@ S_UseWaterfall:: @ 81B115A checkpokemove MOVE_WATERFALL compare RESULT, 6 goto_if_eq Waterfall_NoMonKnows - bufferpartypoke 0, RESULT + getpartypokename 0, RESULT setanimation 0, RESULT msgbox UseWaterfallPromptText, 5 compare RESULT, 0 @@ -226,7 +226,7 @@ UseDiveScript:: @ 81B1220 checkpokemove MOVE_DIVE compare RESULT, 6 goto_if_eq CannotUseDive - bufferpartypoke 0, RESULT + getpartypokename 0, RESULT setanimation 0, RESULT setanimation 1, 1 msgbox UseDivePromptText, 5 @@ -249,7 +249,7 @@ S_UseDiveUnderwater:: @ 81B1269 checkpokemove MOVE_DIVE compare RESULT, 6 goto_if_eq UnderwaterCannotUseDive - bufferpartypoke 0, RESULT + getpartypokename 0, RESULT setanimation 0, RESULT setanimation 1, 1 msgbox UnderwaterUseDivePromptText, 5 -- cgit v1.2.3 From 89092b609a9af15a35b0151442e9881aeab28708 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 1 Oct 2017 12:21:52 -0500 Subject: fix more command names --- data/field_move_scripts.inc | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'data/field_move_scripts.inc') diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index a3fbce103..c36f95460 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -5,7 +5,7 @@ S_CuttableTree:: @ 81B0DCC checkpokemove MOVE_CUT compare RESULT, 6 goto_if_eq CannotUseCut - setanimation 0, RESULT + setfieldeffect 0, RESULT getpartypokename 0, RESULT getmovename 1, MOVE_CUT msgbox UseCutPromptText, 5 @@ -13,14 +13,14 @@ S_CuttableTree:: @ 81B0DCC goto_if_eq Cut_ChoseNo msgbox UsedCutRockSmashText, 4 closemessage - doanimation 2 + dofieldeffect 2 waitstate goto DoTreeCutMovement end S_UseCut:: @ 81B0E16 lockall - doanimation 2 + dofieldeffect 2 waitstate goto DoTreeCutMovement end @@ -63,7 +63,7 @@ S_BreakableRock:: @ 81B0EB7 checkpokemove MOVE_ROCK_SMASH compare RESULT, 6 goto_if_eq CannotUseRockSmash - setanimation 0, RESULT + setfieldeffect 0, RESULT getpartypokename 0, RESULT getmovename 1, MOVE_ROCK_SMASH msgbox UseRockSmashPromptText, 5 @@ -71,14 +71,14 @@ S_BreakableRock:: @ 81B0EB7 goto_if_eq RockSmash_ChoseNo msgbox UsedCutRockSmashText, 4 closemessage - doanimation 37 + dofieldeffect 37 waitstate goto DoRockSmashMovement end S_UseRockSmash:: @ 81B0F01 lockall - doanimation 37 + dofieldeffect 37 waitstate goto DoRockSmashMovement end @@ -132,19 +132,19 @@ S_PushableBoulder:: @ 81B0FCB checkpokemove 70 compare RESULT, 6 goto_if_eq CannotUseStrength - setanimation 0, RESULT + setfieldeffect 0, RESULT msgbox UseStrengthPromptText, 5 compare RESULT, 0 goto_if_eq Strength_ChoseNo closemessage - doanimation 40 + dofieldeffect 40 waitstate goto UsedStrength end S_UseStrength:: @ 81B100E lockall - doanimation 40 + dofieldeffect 40 waitstate goto UsedStrength end @@ -194,12 +194,12 @@ S_UseWaterfall:: @ 81B115A compare RESULT, 6 goto_if_eq Waterfall_NoMonKnows getpartypokename 0, RESULT - setanimation 0, RESULT + setfieldeffect 0, RESULT msgbox UseWaterfallPromptText, 5 compare RESULT, 0 goto_if_eq Waterfall_Done msgbox UsedWaterfallText, 4 - doanimation 43 + dofieldeffect 43 goto Waterfall_Done S_CannotUseWaterfall:: @ 81B1194 @@ -227,13 +227,13 @@ UseDiveScript:: @ 81B1220 compare RESULT, 6 goto_if_eq CannotUseDive getpartypokename 0, RESULT - setanimation 0, RESULT - setanimation 1, 1 + setfieldeffect 0, RESULT + setfieldeffect 1, 1 msgbox UseDivePromptText, 5 compare RESULT, 0 goto_if_eq Dive_Done msgbox UsedDiveText, 4 - doanimation 44 + dofieldeffect 44 goto Dive_Done lockall @@ -250,13 +250,13 @@ S_UseDiveUnderwater:: @ 81B1269 compare RESULT, 6 goto_if_eq UnderwaterCannotUseDive getpartypokename 0, RESULT - setanimation 0, RESULT - setanimation 1, 1 + setfieldeffect 0, RESULT + setfieldeffect 1, 1 msgbox UnderwaterUseDivePromptText, 5 compare RESULT, 0 goto_if_eq UnderwaterDive_Done msgbox UsedDiveText, 4 - doanimation 44 + dofieldeffect 44 goto UnderwaterDive_Done UnderwaterCannotUseDive: @ 81B12A7 -- cgit v1.2.3 From 79e3d29c29335d7e1fb8478b16d100b1844f2da4 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 2 Dec 2017 14:38:49 -0800 Subject: Use constants for all SYS flags --- data/field_move_scripts.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'data/field_move_scripts.inc') diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index c36f95460..8fcf91616 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -1,6 +1,6 @@ S_CuttableTree:: @ 81B0DCC lockall - checkflag 2055 + checkflag BADGE01_GET goto_if 0, CannotUseCut checkpokemove MOVE_CUT compare RESULT, 6 @@ -58,7 +58,7 @@ CannotUseCutText: @ 81B0E8E S_BreakableRock:: @ 81B0EB7 lockall - checkflag 2057 + checkflag BADGE03_GET goto_if 0, CannotUseRockSmash checkpokemove MOVE_ROCK_SMASH compare RESULT, 6 @@ -125,9 +125,9 @@ CannotUseRockSmashText: @ 81B0F90 S_PushableBoulder:: @ 81B0FCB lockall - checkflag 2058 + checkflag BADGE04_GET goto_if 0, CannotUseStrength - checkflag 2089 + checkflag SYS_USE_STRENGTH goto_if_eq AlreadyUsedStrength checkpokemove 70 compare RESULT, 6 @@ -150,7 +150,7 @@ S_UseStrength:: @ 81B100E end UsedStrength: @ 81B1019 - setflag 2089 + setflag SYS_USE_STRENGTH msgbox UsedStrengthText, 3 releaseall end -- cgit v1.2.3 From 88716f4c0e053a984eeb4bef92fefa42027dd22a Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 17 Dec 2017 20:07:53 -0800 Subject: Use FLAG_ prefix for all flags --- data/field_move_scripts.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'data/field_move_scripts.inc') diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index 8fcf91616..86b81dd01 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -1,6 +1,6 @@ S_CuttableTree:: @ 81B0DCC lockall - checkflag BADGE01_GET + checkflag FLAG_BADGE01_GET goto_if 0, CannotUseCut checkpokemove MOVE_CUT compare RESULT, 6 @@ -58,7 +58,7 @@ CannotUseCutText: @ 81B0E8E S_BreakableRock:: @ 81B0EB7 lockall - checkflag BADGE03_GET + checkflag FLAG_BADGE03_GET goto_if 0, CannotUseRockSmash checkpokemove MOVE_ROCK_SMASH compare RESULT, 6 @@ -125,9 +125,9 @@ CannotUseRockSmashText: @ 81B0F90 S_PushableBoulder:: @ 81B0FCB lockall - checkflag BADGE04_GET + checkflag FLAG_BADGE04_GET goto_if 0, CannotUseStrength - checkflag SYS_USE_STRENGTH + checkflag FLAG_SYS_USE_STRENGTH goto_if_eq AlreadyUsedStrength checkpokemove 70 compare RESULT, 6 @@ -150,7 +150,7 @@ S_UseStrength:: @ 81B100E end UsedStrength: @ 81B1019 - setflag SYS_USE_STRENGTH + setflag FLAG_SYS_USE_STRENGTH msgbox UsedStrengthText, 3 releaseall end -- cgit v1.2.3 From a753c44277c050fb24aaf97a8947c7f54e0dacd7 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 20 Dec 2017 19:58:17 -0600 Subject: Use event script macro names from pokeemerald --- data/field_move_scripts.inc | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'data/field_move_scripts.inc') diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index 86b81dd01..0a0eeaa73 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -2,12 +2,12 @@ S_CuttableTree:: @ 81B0DCC lockall checkflag FLAG_BADGE01_GET goto_if 0, CannotUseCut - checkpokemove MOVE_CUT + checkpartymove MOVE_CUT compare RESULT, 6 goto_if_eq CannotUseCut - setfieldeffect 0, RESULT - getpartypokename 0, RESULT - getmovename 1, MOVE_CUT + setfieldeffectargument 0, RESULT + bufferpartymonnick 0, RESULT + buffermovename 1, MOVE_CUT msgbox UseCutPromptText, 5 compare RESULT, 0 goto_if_eq Cut_ChoseNo @@ -60,12 +60,12 @@ S_BreakableRock:: @ 81B0EB7 lockall checkflag FLAG_BADGE03_GET goto_if 0, CannotUseRockSmash - checkpokemove MOVE_ROCK_SMASH + checkpartymove MOVE_ROCK_SMASH compare RESULT, 6 goto_if_eq CannotUseRockSmash - setfieldeffect 0, RESULT - getpartypokename 0, RESULT - getmovename 1, MOVE_ROCK_SMASH + setfieldeffectargument 0, RESULT + bufferpartymonnick 0, RESULT + buffermovename 1, MOVE_ROCK_SMASH msgbox UseRockSmashPromptText, 5 compare RESULT, 0 goto_if_eq RockSmash_ChoseNo @@ -129,10 +129,10 @@ S_PushableBoulder:: @ 81B0FCB goto_if 0, CannotUseStrength checkflag FLAG_SYS_USE_STRENGTH goto_if_eq AlreadyUsedStrength - checkpokemove 70 + checkpartymove 70 compare RESULT, 6 goto_if_eq CannotUseStrength - setfieldeffect 0, RESULT + setfieldeffectargument 0, RESULT msgbox UseStrengthPromptText, 5 compare RESULT, 0 goto_if_eq Strength_ChoseNo @@ -190,11 +190,11 @@ AlreadyUsedStrengthText: @ 81B1127 S_UseWaterfall:: @ 81B115A lockall - checkpokemove MOVE_WATERFALL + checkpartymove MOVE_WATERFALL compare RESULT, 6 goto_if_eq Waterfall_NoMonKnows - getpartypokename 0, RESULT - setfieldeffect 0, RESULT + bufferpartymonnick 0, RESULT + setfieldeffectargument 0, RESULT msgbox UseWaterfallPromptText, 5 compare RESULT, 0 goto_if_eq Waterfall_Done @@ -223,12 +223,12 @@ UsedWaterfallText: @ 81B120D UseDiveScript:: @ 81B1220 lockall - checkpokemove MOVE_DIVE + checkpartymove MOVE_DIVE compare RESULT, 6 goto_if_eq CannotUseDive - getpartypokename 0, RESULT - setfieldeffect 0, RESULT - setfieldeffect 1, 1 + bufferpartymonnick 0, RESULT + setfieldeffectargument 0, RESULT + setfieldeffectargument 1, 1 msgbox UseDivePromptText, 5 compare RESULT, 0 goto_if_eq Dive_Done @@ -246,12 +246,12 @@ Dive_Done: @ 81B1267 S_UseDiveUnderwater:: @ 81B1269 lockall - checkpokemove MOVE_DIVE + checkpartymove MOVE_DIVE compare RESULT, 6 goto_if_eq UnderwaterCannotUseDive - getpartypokename 0, RESULT - setfieldeffect 0, RESULT - setfieldeffect 1, 1 + bufferpartymonnick 0, RESULT + setfieldeffectargument 0, RESULT + setfieldeffectargument 1, 1 msgbox UnderwaterUseDivePromptText, 5 compare RESULT, 0 goto_if_eq UnderwaterDive_Done -- cgit v1.2.3 From 7158286302493c6fe34068926b351292af2cb6a9 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 1 Jan 2018 13:59:39 -0600 Subject: Label a bunch more specials --- data/field_move_scripts.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/field_move_scripts.inc') diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index 0a0eeaa73..0a7112125 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -87,7 +87,7 @@ DoRockSmashMovement: @ 81B0F0C applymovement LAST_TALKED, RockSmashMovement waitmovement 0 removeobject LAST_TALKED - specialvar RESULT, sub_810F5BC + specialvar RESULT, TryUpdateRusturfTunnelState compare RESULT, 1 goto_if_eq DoRockSmashMovement_Done special ScrSpecial_RockSmashWildEncounter -- cgit v1.2.3 From f0097860b0098ae465204152fb3a38d69422b27e Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 4 Jan 2018 16:19:02 -0800 Subject: Use MSGBOX_YESNO and YES/NO constants for yes/no message boxes --- data/field_move_scripts.inc | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'data/field_move_scripts.inc') diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index 0a7112125..a4a7513e5 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -8,8 +8,8 @@ S_CuttableTree:: @ 81B0DCC setfieldeffectargument 0, RESULT bufferpartymonnick 0, RESULT buffermovename 1, MOVE_CUT - msgbox UseCutPromptText, 5 - compare RESULT, 0 + msgbox UseCutPromptText, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Cut_ChoseNo msgbox UsedCutRockSmashText, 4 closemessage @@ -66,8 +66,8 @@ S_BreakableRock:: @ 81B0EB7 setfieldeffectargument 0, RESULT bufferpartymonnick 0, RESULT buffermovename 1, MOVE_ROCK_SMASH - msgbox UseRockSmashPromptText, 5 - compare RESULT, 0 + msgbox UseRockSmashPromptText, MSGBOX_YESNO + compare RESULT, NO goto_if_eq RockSmash_ChoseNo msgbox UsedCutRockSmashText, 4 closemessage @@ -133,8 +133,8 @@ S_PushableBoulder:: @ 81B0FCB compare RESULT, 6 goto_if_eq CannotUseStrength setfieldeffectargument 0, RESULT - msgbox UseStrengthPromptText, 5 - compare RESULT, 0 + msgbox UseStrengthPromptText, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Strength_ChoseNo closemessage dofieldeffect 40 @@ -195,8 +195,8 @@ S_UseWaterfall:: @ 81B115A goto_if_eq Waterfall_NoMonKnows bufferpartymonnick 0, RESULT setfieldeffectargument 0, RESULT - msgbox UseWaterfallPromptText, 5 - compare RESULT, 0 + msgbox UseWaterfallPromptText, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Waterfall_Done msgbox UsedWaterfallText, 4 dofieldeffect 43 @@ -229,8 +229,8 @@ UseDiveScript:: @ 81B1220 bufferpartymonnick 0, RESULT setfieldeffectargument 0, RESULT setfieldeffectargument 1, 1 - msgbox UseDivePromptText, 5 - compare RESULT, 0 + msgbox UseDivePromptText, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Dive_Done msgbox UsedDiveText, 4 dofieldeffect 44 @@ -252,8 +252,8 @@ S_UseDiveUnderwater:: @ 81B1269 bufferpartymonnick 0, RESULT setfieldeffectargument 0, RESULT setfieldeffectargument 1, 1 - msgbox UnderwaterUseDivePromptText, 5 - compare RESULT, 0 + msgbox UnderwaterUseDivePromptText, MSGBOX_YESNO + compare RESULT, NO goto_if_eq UnderwaterDive_Done msgbox UsedDiveText, 4 dofieldeffect 44 -- cgit v1.2.3 From aed64560bc222e4ea5ccec266c0d77859a05eaac Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 5 Jan 2018 11:36:47 -0800 Subject: Add friendly macros for goto_if and call_if variants --- data/field_move_scripts.inc | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'data/field_move_scripts.inc') 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 -- cgit v1.2.3