mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2025-02-25 13:45:29 +01:00
Replaced jumpifbyte with jumpifhalfword in a few BattleScripts
This commit is contained in:
parent
4c90cbe625
commit
442376e75b
@ -3168,7 +3168,7 @@ BattleScript_EffectRecoilIfMiss::
|
|||||||
accuracycheck BattleScript_MoveMissedDoDamage, ACC_CURR_MOVE
|
accuracycheck BattleScript_MoveMissedDoDamage, ACC_CURR_MOVE
|
||||||
.if B_CRASH_IF_TARGET_IMMUNE >= GEN_4
|
.if B_CRASH_IF_TARGET_IMMUNE >= GEN_4
|
||||||
typecalc
|
typecalc
|
||||||
jumpifbyte CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE, BattleScript_MoveMissedDoDamage
|
jumpifhalfword CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE, BattleScript_MoveMissedDoDamage
|
||||||
.endif
|
.endif
|
||||||
goto BattleScript_HitFromAtkString
|
goto BattleScript_HitFromAtkString
|
||||||
BattleScript_MoveMissedDoDamage::
|
BattleScript_MoveMissedDoDamage::
|
||||||
@ -3179,7 +3179,7 @@ BattleScript_MoveMissedDoDamage::
|
|||||||
resultmessage
|
resultmessage
|
||||||
waitmessage B_WAIT_TIME_LONG
|
waitmessage B_WAIT_TIME_LONG
|
||||||
.if B_CRASH_IF_TARGET_IMMUNE < GEN_4
|
.if B_CRASH_IF_TARGET_IMMUNE < GEN_4
|
||||||
jumpifbyte CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE, BattleScript_MoveEnd
|
jumpifhalfword CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE, BattleScript_MoveEnd
|
||||||
.endif
|
.endif
|
||||||
printstring STRINGID_PKMNCRASHED
|
printstring STRINGID_PKMNCRASHED
|
||||||
waitmessage B_WAIT_TIME_LONG
|
waitmessage B_WAIT_TIME_LONG
|
||||||
@ -3925,7 +3925,7 @@ BattleScript_TripleKickPrintStrings::
|
|||||||
resultmessage
|
resultmessage
|
||||||
waitmessage B_WAIT_TIME_LONG
|
waitmessage B_WAIT_TIME_LONG
|
||||||
jumpifbyte CMP_EQUAL, sMULTIHIT_STRING + 4, 0, BattleScript_TripleKickEnd
|
jumpifbyte CMP_EQUAL, sMULTIHIT_STRING + 4, 0, BattleScript_TripleKickEnd
|
||||||
jumpifbyte CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE, BattleScript_TripleKickEnd
|
jumpifhalfword CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE, BattleScript_TripleKickEnd
|
||||||
copyarray gBattleTextBuff1, sMULTIHIT_STRING, 6
|
copyarray gBattleTextBuff1, sMULTIHIT_STRING, 6
|
||||||
printstring STRINGID_HITXTIMES
|
printstring STRINGID_HITXTIMES
|
||||||
waitmessage B_WAIT_TIME_LONG
|
waitmessage B_WAIT_TIME_LONG
|
||||||
@ -4272,7 +4272,7 @@ BattleScript_EffectRapidSpin::
|
|||||||
waitmessage B_WAIT_TIME_LONG
|
waitmessage B_WAIT_TIME_LONG
|
||||||
resultmessage
|
resultmessage
|
||||||
waitmessage B_WAIT_TIME_LONG
|
waitmessage B_WAIT_TIME_LONG
|
||||||
jumpifbyte CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE, BattleScript_MoveEnd
|
jumpifhalfword CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE, BattleScript_MoveEnd
|
||||||
setmoveeffect MOVE_EFFECT_RAPIDSPIN | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
|
setmoveeffect MOVE_EFFECT_RAPIDSPIN | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
|
||||||
seteffectwithchance
|
seteffectwithchance
|
||||||
setstatchanger STAT_SPEED, 1, FALSE
|
setstatchanger STAT_SPEED, 1, FALSE
|
||||||
|
Loading…
x
Reference in New Issue
Block a user