Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Deprecate sStatusFlagsForMoveEffects (#7063)

Browse Source
This commit is contained in:
Alex 2025-06-05 14:32:28 +02:00 committed by GitHub
parent 3decd3da0a
commit 020be9d5b0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 1163 additions and 1182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
asm/macros/battle_script.inc
View File

@ -116,12 +116,10 @@
.byte 0x17
.endm
.macro clearstatusfromeffect battler:req, moveEffect=0
.if \moveEffect != 0
setmoveeffect \moveEffect
.endif
.macro clearstatus2 battler:req, status2:req
.byte 0x18
.byte \battler
.4byte \status2
.endm
.macro tryfaintmon battler:req

12
data/battle_scripts_1.s
View File

@ -736,7 +736,7 @@ BattleScript_SkyDropChangedTarget:
BattleScript_SkyDropFlyingConfuseLock:
seteffectprimary MOVE_EFFECT_CONFUSION
BattleScript_SkyDropFlyingAlreadyConfused:
clearstatusfromeffect BS_TARGET, MOVE_EFFECT_THRASH
clearstatus2 BS_TARGET, STATUS2_LOCK_CONFUSE
jumpifstatus2 BS_TARGET, STATUS2_CONFUSION, BattleScript_MoveEnd
setbyte BS_ATTACKER, BS_TARGET
goto BattleScript_ThrashConfuses
@ -3569,7 +3569,7 @@ BattleScript_EffectGeomancy::
BattleScript_GeomancySecondTurn:
attackcanceler
setbyte sB_ANIM_TURN, 1
clearstatusfromeffect BS_ATTACKER, MOVE_EFFECT_CHARGING
clearstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS
orword gHitMarker, HITMARKER_NO_PPDEDUCT
attackstring
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPATK, MAX_STAT_STAGE, BattleScript_GeomancyDoMoveAnim
@ -3641,7 +3641,7 @@ BattleScript_TwoTurnMovesSecondTurn::
BattleScript_TwoTurnMovesSecondTurnRet:
setbyte sB_ANIM_TURN, 1
setbyte sB_ANIM_TARGETS_HIT, 0
clearstatusfromeffect BS_ATTACKER, MOVE_EFFECT_CHARGING
clearstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS
clearsemiinvulnerablebit @ only for moves with EFFECT_SEMI_INVULNERABLE/EFFECT_SKY_DROP
return
@ -3681,7 +3681,7 @@ BattleScript_EffectRage::
seteffectprimary MOVE_EFFECT_RAGE
goto BattleScript_HitFromAtkString
BattleScript_RageMiss::
clearstatusfromeffect BS_ATTACKER, MOVE_EFFECT_RAGE
clearstatus2 BS_ATTACKER, STATUS2_RAGE
goto BattleScript_PrintMoveMissed
BattleScript_EffectMimic::
@ -5827,7 +5827,7 @@ BattleScript_BideStoringEnergy::
BattleScript_BideAttack::
attackcanceler
clearstatusfromeffect BS_ATTACKER, MOVE_EFFECT_CHARGING
clearstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS
printstring STRINGID_PKMNUNLEASHEDENERGY
waitmessage B_WAIT_TIME_LONG
accuracycheck BattleScript_MoveMissed, ACC_CURR_MOVE
@ -5850,7 +5850,7 @@ BattleScript_BideAttack::
BattleScript_BideNoEnergyToAttack::
attackcanceler
clearstatusfromeffect BS_ATTACKER, MOVE_EFFECT_CHARGING
clearstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS
printstring STRINGID_PKMNUNLEASHEDENERGY
waitmessage B_WAIT_TIME_LONG
goto BattleScript_ButItFailed

2327
src/battle_script_commands.c
View File

File diff suppressed because it is too large Load Diff