mirror of
https://github.com/pret/pokeemerald.git
synced 2026-09-29 05:18:30 -05:00
Refactor field moves (#6660)
This commit is contained in:
@@ -1,8 +1,7 @@
|
||||
@ Interact with cuttable tree
|
||||
EventScript_CutTree::
|
||||
lockall
|
||||
goto_if_unset FLAG_BADGE01_GET, EventScript_CheckTreeCantCut
|
||||
checkpartymove MOVE_CUT
|
||||
checkfieldmove FIELD_MOVE_CUT, TRUE
|
||||
goto_if_eq VAR_RESULT, PARTY_SIZE, EventScript_CheckTreeCantCut
|
||||
setfieldeffectargument 0, VAR_RESULT
|
||||
bufferpartymonnick STR_VAR_1, VAR_RESULT
|
||||
@@ -64,8 +63,7 @@ EventScript_UseRockSmash::
|
||||
@ Interact with smashable rock
|
||||
EventScript_RockSmash::
|
||||
lockall
|
||||
goto_if_unset FLAG_BADGE03_GET, EventScript_CantSmashRock
|
||||
checkpartymove MOVE_ROCK_SMASH
|
||||
checkfieldmove FIELD_MOVE_ROCK_SMASH, TRUE
|
||||
goto_if_eq VAR_RESULT, PARTY_SIZE, EventScript_CantSmashRock
|
||||
setfieldeffectargument 0, VAR_RESULT
|
||||
bufferpartymonnick STR_VAR_1, VAR_RESULT
|
||||
@@ -225,9 +223,8 @@ Text_CantSmash:
|
||||
|
||||
EventScript_StrengthBoulder::
|
||||
lockall
|
||||
goto_if_unset FLAG_BADGE04_GET, EventScript_CantStrength
|
||||
goto_if_set FLAG_SYS_USE_STRENGTH, EventScript_CheckActivatedBoulder
|
||||
checkpartymove MOVE_STRENGTH
|
||||
checkfieldmove FIELD_MOVE_STRENGTH, TRUE
|
||||
goto_if_eq VAR_RESULT, PARTY_SIZE, EventScript_CantStrength
|
||||
setfieldeffectargument 0, VAR_RESULT
|
||||
msgbox Text_WantToStrength, MSGBOX_YESNO
|
||||
@@ -286,7 +283,7 @@ Text_StrengthActivated:
|
||||
|
||||
EventScript_UseWaterfall::
|
||||
lockall
|
||||
checkpartymove MOVE_WATERFALL
|
||||
checkfieldmove FIELD_MOVE_WATERFALL
|
||||
goto_if_eq VAR_RESULT, PARTY_SIZE, EventScript_CantWaterfall
|
||||
bufferpartymonnick STR_VAR_1, VAR_RESULT
|
||||
setfieldeffectargument 0, VAR_RESULT
|
||||
@@ -321,7 +318,7 @@ Text_MonUsedWaterfall:
|
||||
|
||||
EventScript_UseDive::
|
||||
lockall
|
||||
checkpartymove MOVE_DIVE
|
||||
checkfieldmove FIELD_MOVE_DIVE
|
||||
goto_if_eq VAR_RESULT, PARTY_SIZE, EventScript_CantDive
|
||||
copyvar 0x8004 VAR_RESULT
|
||||
bufferpartymonnick STR_VAR_1, VAR_RESULT
|
||||
@@ -348,7 +345,7 @@ EventScript_EndDive::
|
||||
|
||||
EventScript_UseDiveUnderwater::
|
||||
lockall
|
||||
checkpartymove MOVE_DIVE
|
||||
checkfieldmove FIELD_MOVE_DIVE
|
||||
goto_if_eq VAR_RESULT, PARTY_SIZE, EventScript_CantSurface
|
||||
bufferpartymonnick STR_VAR_1, VAR_RESULT
|
||||
setfieldeffectargument 0, VAR_RESULT
|
||||
|
||||
Reference in New Issue
Block a user