diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 52cbb5f2af..b2ae0f2f41 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -758,13 +758,11 @@ BattleScript_OctolockEndTurn:: playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_SPDEF, STAT_CHANGE_NEGATIVE setstatchanger STAT_DEF, 1, TRUE statbuffchange STAT_CHANGE_ALLOW_PTR | STAT_CHANGE_NOT_PROTECT_AFFECTED, BattleScript_OctolockTryLowerSpDef -BattleScript_OctolockTryLowerDef: printfromtable gStatDownStringIds waitmessage B_WAIT_TIME_LONG BattleScript_OctolockTryLowerSpDef: setstatchanger STAT_SPDEF, 1, TRUE statbuffchange STAT_CHANGE_ALLOW_PTR | STAT_CHANGE_NOT_PROTECT_AFFECTED, BattleScript_OctlockTurnDmgEnd -BattleScript_OctolockTurnDmgPrintMsg: printfromtable gStatDownStringIds waitmessage B_WAIT_TIME_LONG BattleScript_OctlockTurnDmgEnd: @@ -904,7 +902,6 @@ BattleScript_EffectStuffCheeks:: jumpifnotberry BS_ATTACKER, BattleScript_ButItFailed attackanimation waitanimation -BattleScript_StuffCheeksEatBerry: setbyte sBERRY_OVERRIDE, 1 orword gHitMarker, HITMARKER_DISABLE_ANIMATION consumeberry BS_ATTACKER, TRUE @@ -1116,10 +1113,6 @@ BattleScript_StrengthSapLower: waitmessage B_WAIT_TIME_LONG goto BattleScript_StrengthSapHp @ Drain HP without lowering a stat -BattleScript_StrengthSapTryHp: - jumpiffullhp BS_ATTACKER, BattleScript_ButItFailed - attackanimation - waitanimation BattleScript_StrengthSapHp: jumpifability BS_TARGET, ABILITY_LIQUID_OOZE, BattleScript_StrengthSapManipulateDmg jumpifstatus3 BS_ATTACKER, STATUS3_HEAL_BLOCK, BattleScript_MoveEnd @@ -1250,8 +1243,6 @@ BattleScript_EffectPartingShotTrySpAtk: BattleScript_EffectPartingShotSwitch: moveendall goto BattleScript_MoveSwitch -BattleScript_PartingShotEnd: - end BattleScript_EffectPowder:: attackcanceler @@ -1454,7 +1445,6 @@ BattleScript_RototillerLoop: jumpifstat BS_TARGET, CMP_EQUAL, STAT_SPATK, MAX_STAT_STAGE, BattleScript_RototillerCantRaiseMultipleStats BattleScript_RototillerCheckAffected: jumpifnotrototilleraffected BS_TARGET, BattleScript_RototillerNoEffect -BattleScript_RototillerAffected: setbyte sSTAT_ANIM_PLAYED, FALSE playstatchangeanimation BS_TARGET, BIT_ATK | BIT_SPATK, 0 setstatchanger STAT_ATK, 1, FALSE @@ -1685,7 +1675,6 @@ BattleScript_EffectAutotomize:: BattleScript_AutotomizeAttackAnim:: attackanimation waitanimation -BattleScript_AutotomizeDoAnim:: setgraphicalstatchangevalues playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1 BattleScript_AutotomizePrintString:: @@ -2596,7 +2585,6 @@ BattleScript_TryTailwindAbilitiesLoop_Iter: BattleScript_TryTailwindAbilitiesLoop_Increment: addbyte gBattlerTarget, 0x1 jumpifbytenotequal gBattlerTarget, gBattlersCount, BattleScript_TryTailwindAbilitiesLoop_Iter -BattleScript_TryTailwindAbilitiesLoop_Ret: restoretarget return @@ -2697,7 +2685,6 @@ BattleScript_EffectPlaceholder:: goto BattleScript_MoveEnd BattleScript_EffectHit:: -BattleScript_HitFromAtkCanceler:: attackcanceler BattleScript_HitFromAccCheck:: accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE @@ -3187,14 +3174,6 @@ BattleScript_RoarBlockedByDynamax: waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd -BattleScript_EffectMultiHit:: - attackcanceler - accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE - attackstring - ppreduce - setmultihitcounter 0 - initmultihitstring - sethword sMULTIHIT_EFFECT, 0 BattleScript_MultiHitLoop:: jumpifhasnohp BS_ATTACKER, BattleScript_MultiHitEnd jumpifhasnohp BS_TARGET, BattleScript_MultiHitPrintStrings @@ -3607,7 +3586,6 @@ BattleScript_EffectParalyze:: jumpifshieldsdown BS_TARGET, BattleScript_AbilityProtectsDoesntAffect jumpifsubstituteblocks BattleScript_ButItFailed typecalc -BattleScript_BattleScript_EffectParalyzeNoTypeCalc: jumpifmovehadnoeffect BattleScript_ButItFailed jumpifstatus BS_TARGET, STATUS1_PARALYSIS, BattleScript_AlreadyParalyzed jumpifelectricabilityaffected BS_TARGET, ABILITY_VOLT_ABSORB, BattleScript_VoltAbsorbHeal @@ -4534,7 +4512,6 @@ BattleScript_EffectTeleport:: .else jumpifbattletype BATTLE_TYPE_TRAINER, BattleScript_FailedFromAtkCanceler .endif -BattleScript_EffectTeleportTryToRunAway: attackcanceler attackstring ppreduce @@ -6394,7 +6371,6 @@ BattleScript_WindPowerActivates:: setcharge BS_TARGET printstring STRINGID_BEINGHITCHARGEDPKMNWITHPOWER waitmessage B_WAIT_TIME_LONG -BattleScript_WindPowerActivates_Ret: return BattleScript_ToxicDebrisActivates:: @@ -7081,7 +7057,6 @@ BattleScript_CottonDownTargetSpeedCantGoLower: BattleScript_CottonDownLoopIncrement: addbyte gBattlerTarget, 1 jumpifbytenotequal gBattlerTarget, gBattlersCount, BattleScript_CottonDownLoop -BattleScript_CottonDownReturn: swapattackerwithtarget copybyte gBattlerAttacker, sSAVED_BATTLER return @@ -7700,7 +7675,6 @@ BattleScript_ActivateWeatherAbilities: BattleScript_ActivateWeatherAbilities_Loop: copybyte sBATTLER, gBattlerTarget activateweatherchangeabilities BS_TARGET -BattleScript_ActivateWeatherAbilities_Increment: addbyte gBattlerTarget, 1 jumpifbytenotequal gBattlerTarget, gBattlersCount, BattleScript_ActivateWeatherAbilities_Loop restoretarget @@ -7759,7 +7733,6 @@ BattleScript_IntimidateEffect_WaitString: BattleScript_IntimidateLoopIncrement: addbyte gBattlerTarget, 1 jumpifbytenotequal gBattlerTarget, gBattlersCount, BattleScript_IntimidateLoop -BattleScript_IntimidateEnd: copybyte sBATTLER, gBattlerAttacker destroyabilitypopup copybyte gBattlerTarget, sSAVED_BATTLER @@ -7825,7 +7798,6 @@ BattleScript_SupersweetSyrupEffect_WaitString: BattleScript_SupersweetSyrupLoopIncrement: addbyte gBattlerTarget, 1 jumpifbytenotequal gBattlerTarget, gBattlersCount, BattleScript_SupersweetSyrupLoop -BattleScript_SupersweetSyrupEnd: copybyte sBATTLER, gBattlerAttacker destroyabilitypopup copybyte gBattlerTarget, sSAVED_BATTLER @@ -7984,7 +7956,6 @@ BattleScript_ActivateTerrainSeed: removeitem BS_TARGET BattleScript_ActivateTerrainAbility: activateterrainchangeabilities BS_TARGET -BattleScript_ActivateTerrainEffects_Increment: addbyte gBattlerTarget, 0x1 jumpifbytenotequal gBattlerTarget, gBattlersCount, BattleScript_ActivateTerrainSeed restoretarget @@ -8240,14 +8211,12 @@ BattleScript_GrassyTerrainLoop: checkgrassyterrainheal BS_ATTACKER, BattleScript_GrassyTerrainLoopIncrement printstring STRINGID_GRASSYTERRAINHEALS waitmessage B_WAIT_TIME_LONG -BattleScript_GrassyTerrainHpChange: orword gHitMarker, HITMARKER_IGNORE_BIDE | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE healthbarupdate BS_ATTACKER datahpupdate BS_ATTACKER BattleScript_GrassyTerrainLoopIncrement:: addbyte gBattleCommunication, 1 jumpifbytenotequal gBattleCommunication, gBattlersCount, BattleScript_GrassyTerrainLoop -BattleScript_GrassyTerrainLoopEnd:: bicword gHitMarker, HITMARKER_IGNORE_BIDE | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE jumpifword CMP_COMMON_BITS, gFieldStatuses, STATUS_FIELD_TERRAIN_PERMANENT, BattleScript_GrassyTerrainHealEnd BattleScript_GrassyTerrainHealEnd: @@ -8256,7 +8225,6 @@ BattleScript_GrassyTerrainHealEnd: BattleScript_AbilityNoSpecificStatLoss:: pause B_WAIT_TIME_SHORT call BattleScript_AbilityPopUp -BattleScript_AbilityNoSpecificStatLossPrint: printstring STRINGID_PKMNSXPREVENTSYLOSS waitmessage B_WAIT_TIME_LONG setbyte cMULTISTRING_CHOOSER, B_MSG_STAT_FELL_EMPTY @@ -9033,16 +9001,6 @@ BattleScript_ArenaTurnBeginning:: volumeup end2 -@ Unused -BattleScript_ArenaNothingDecided:: - playse SE_DING_DONG - arenadrawreftextbox - arenajudgmentstring B_MSG_REF_NOTHING_IS_DECIDED - arenawaitmessage B_MSG_REF_NOTHING_IS_DECIDED - pause B_WAIT_TIME_LONG - arenaerasereftextbox - end2 - BattleScript_ArenaDoJudgment:: makevisible BS_PLAYER1 waitstate @@ -9316,7 +9274,6 @@ BattleScript_EffectExtremeEvoboost:: BattleScript_ExtremeEvoboostAnim: attackanimation waitanimation -BattleScript_ExtremeEvoboostAtk:: setbyte sSTAT_ANIM_PLAYED, FALSE playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_DEF | BIT_SPEED | BIT_SPATK | BIT_SPDEF, 0x0 setstatchanger STAT_ATK, 2, FALSE @@ -9890,7 +9847,6 @@ BattleScript_CouldntFullyProtect:: return BattleScript_BerserkGeneRet:: -BattleScript_BerserkGeneRet_Anim: savetarget copybyte gBattlerTarget, sBATTLER statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_BerserkGeneRet_TryConfuse diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s index 3cee2d32ae..6238afb36c 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -159,7 +159,6 @@ BattleScript_SafariBallThrow:: BattleScript_SuccessBallThrow:: setbyte sMON_CAUGHT, TRUE incrementgamestat GAME_STAT_POKEMON_CAPTURES -BattleScript_PrintCaughtMonInfo:: printstring STRINGID_GOTCHAPKMNCAUGHTPLAYER jumpifbyte CMP_NOT_EQUAL, sEXP_CATCH, TRUE, BattleScript_TryPrintCaughtMonInfo setbyte sGIVEEXP_STATE, 0