From 5dcb0c3657c10223a4c63b370e52c00a734c7167 Mon Sep 17 00:00:00 2001 From: Rachel Date: Sat, 6 Jan 2024 23:39:13 -0800 Subject: [PATCH 1/7] Update battle-constant headers for assembler compatibility --- asm/macros/btlcmd.inc | 1224 +++++++++++++++++++++ consts/battle.json | 240 +++- include/battle/battle_lib.h | 2 +- include/battle/btlcmd.h | 191 +--- include/constants/battle.h | 37 +- include/constants/battle/condition.h | 2 +- include/constants/battle/message_tags.h | 1 - include/constants/battle/moves.h | 53 +- include/constants/battle/scripts.h | 12 - include/constants/battle/side_effects.h | 13 +- include/constants/battle/system_control.h | 45 +- src/overlay016/battle_controller.c | 10 +- src/overlay016/battle_lib.c | 39 +- src/overlay016/battle_script.c | 204 ++-- 14 files changed, 1645 insertions(+), 428 deletions(-) create mode 100644 asm/macros/btlcmd.inc delete mode 100644 include/constants/battle/scripts.h diff --git a/asm/macros/btlcmd.inc b/asm/macros/btlcmd.inc new file mode 100644 index 0000000000..dbc6c8f05b --- /dev/null +++ b/asm/macros/btlcmd.inc @@ -0,0 +1,1224 @@ + .ifndef ASM_BATTLE_SCRIPT_INC + .set ASM_BATTLE_SCRIPT_INC, 1 +#define __ASM_PM_ +#include "constants/battle.h" +#include "gmm/pl_msg_0368.h" +#include "battle/btlcmd.h" + .include "consts/generated/asm/battle.inc" + .include "consts/generated/asm/btlcmd.inc" + + .macro PlayEncounterAnimation + .long 0 + .endm + + .macro SetPokemonEncounter battler + .long 1 + .long \battler + .endm + + .macro PokemonSlideIn battler + .long 2 + .long \battler + .endm + + .macro PokemonSendOut battler + .long 3 + .long \battler + .endm + + .macro RecallPokemon battler + .long 4 + .long \battler + .endm + + .macro DeletePokemon battler + .long 5 + .long \battler + .endm + + .macro SetTrainerEncounter battler + .long 6 + .long \battler + .endm + + .macro ThrowPokeball battler, type + .long 7 + .long \battler + .long \type + .endm + + .macro TrainerSlideOut battler + .long 8 + .long \battler + .endm + + .macro TrainerSlideIn battler, pos + .long 9 + .long \battler + .long \pos + .endm + + .macro BackgroundSlideIn + .long 10 + .endm + + .macro HealthbarSlideIn battler + .long 11 + .long \battler + .endm + + .macro HealthbarSlideInDelay battler + .long 12 + .long \battler + .endm + + .macro HealthbarSlideOut battler + .long 13 + .long \battler + .endm + + .macro Wait + .long 14 + .endm + + .macro CalcDamage + .long 15 + .endm + + .macro CalcMaxDamage + .long 16 + .endm + + .macro PrintAttackMessage + .long 17 + .endm + + .macro PrintMessage msg_id, tag, arg_0, arg_1, arg_2, arg_3, arg_4, arg_5 + .long 18 + .long \msg_id + .long \tag + .if \tag > TAG_NONE + .long \arg_0 + .if \tag > TAG_TRNAME + .long \arg_1 + .if \tag > TAG_TRCLASS_TRNAME + .long \arg_2 + .if \tag > TAG_TRCLASS_TRNAME_ITEM + .long \arg_3 + .if \tag > TAG_TRCLASS_TRNAME_TRCLASS_TRNAME + .long \arg_4 + .long \arg_5 + .endif + .endif + .endif + .endif + .endif + .endm + + .macro PrintGlobalMessage msg_id, tag, arg_0, arg_1, arg_2, arg_3, arg_4, arg_5 + .long 19 + .long \msg_id + .long \tag + .if \tag > TAG_NONE + .long \arg_0 + .if \tag > TAG_TRNAME + .long \arg_1 + .if \tag > TAG_TRCLASS_TRNAME + .long \arg_2 + .if \tag > TAG_TRCLASS_TRNAME_ITEM + .long \arg_3 + .if \tag > TAG_TRCLASS_TRNAME_TRCLASS_TRNAME + .long \arg_4 + .long \arg_5 + .endif + .endif + .endif + .endif + .endif + .endm + + .macro PrintBufferedMessage + .long 20 + .endm + + .macro BufferMessage msg_id, tag, arg_0, arg_1, arg_2, arg_3, arg_4, arg_5 + .long 21 + .long \msg_id + .long \tag + .if \tag > TAG_NONE + .long \arg_0 + .if \tag > TAG_TRNAME + .long \arg_1 + .if \tag > TAG_TRCLASS_TRNAME + .long \arg_2 + .if \tag > TAG_TRCLASS_TRNAME_ITEM + .long \arg_3 + .if \tag > TAG_TRCLASS_TRNAME_TRCLASS_TRNAME + .long \arg_4 + .long \arg_5 + .endif + .endif + .endif + .endif + .endif + .endm + + .macro BufferLocalMessage battler, msg_id, tag, arg_0, arg_1, arg_2, arg_3, arg_4, arg_5 + .long 22 + .long \battler + .long \msg_id + .long \tag + .if \tag > TAG_NONE + .long \arg_0 + .if \tag > TAG_TRNAME + .long \arg_1 + .if \tag > TAG_TRCLASS_TRNAME + .long \arg_2 + .if \tag > TAG_TRCLASS_TRNAME_ITEM + .long \arg_3 + .if \tag > TAG_TRCLASS_TRNAME_TRCLASS_TRNAME + .long \arg_4 + .long \arg_5 + .endif + .endif + .endif + .endif + .endif + .endm + + .macro PlayMoveAnimation move_src + .long 23 + .long \move_src + .endm + + .macro PlayMoveAnimationOnMons move_src, attacker, defender + .long 24 + .long \move_src + .long \attacker + .long \defender + .endm + + .macro FlickerMon battler + .long 25 + .long \battler + .endm + + .macro UpdateHealthBarValue battler + .long 26 + .long \battler + .endm + + .macro UpdateHealthBar battler + .long 27 + .long \battler + .endm + + .macro TryFaintMon battler + .long 28 + .long \battler + .endm + + .macro PlayFaintAnimation + .long 29 + .endm + + .macro WaitButtonABTime frames + .long 30 + .long \frames + .endm + + .macro PlaySound battler, sdat_id + .long 31 + .long \battler + .long \sdat_id + .endm + + .macro CompareVarToValue op, var, val, jump + .long 32 + .long \op + .long \var + .long \val + .long (\jump-.) / 4 - 1 + .endm + + .macro CompareMonDataToValue op, battler, param, val, jump + .long 33 + .long \op + .long \battler + .long \param + .long \val + .long (\jump-.) / 4 - 1 + .endm + + .macro FadeOutBattle + .long 34 + .endm + + .macro GoToSubscript subscript + .long 35 + .long \subscript + .endm + + .macro GoToEffectScript + .long 36 + .endm + + .macro GoToMoveScript is_target_set + .long 37 + .long \is_target_set + .endm + + .macro CalcCrit + .long 38 + .endm + + .macro CalcExpGain jump + .long 39 + .long (\jump-.) / 4 - 1 + .endm + + .macro StartGetExpTask + .long 40 + .endm + + .macro WaitGetExpTask + .long 41 + .endm + + .macro Dummy2A arg_0 + .long 42 + .long \arg_0 + .endm + + .macro ShowParty + .long 43 + .endm + + .macro WaitMonSelection + .long 44 + .endm + + .macro SwitchAndUpdateMon battler + .long 45 + .long \battler + .endm + + .macro GoToIfAnySwitches jump + .long 46 + .long (\jump-.) / 4 - 1 + .endm + + .macro StartCatchMonTask is_safari_capture + .long 47 + .long \is_safari_capture + .endm + + .macro WaitCatchMonTask + .long 48 + .endm + + .macro SetMultiHit hits, flags + .long 49 + .long \hits + .long \flags + .endm + + .macro UpdateVar op, var, val + .long 50 + .long \op + .long \var + .long \val + .endm + + .macro ChangeStatStage jump_no_change, jump_blocked, jump_substitute + .long 51 + .long (\jump_no_change-.) / 4 - 3 + .long (\jump_blocked-.) / 4 - 2 + .long (\jump_substitute-.) / 4 - 1 + .endm + + .macro UpdateMonData op, battler, param, val + .long 52 + .long \op + .long \battler + .long \param + .long \val + .endm + + .macro ClearVolatileStatus battler, status + .long 53 + .long \battler + .long \status + .endm + + .macro ToggleVanish battler, toggle + .long 54 + .long \battler + .long \toggle + .endm + + .macro CheckAbility op, battler, ability, jump + .long 55 + .long \op + .long \battler + .long \ability + .long (\jump-.) / 4 - 1 + .endm + + .macro Random upper_bound, offset + .long 56 + .long \upper_bound + .long \offset + .endm + + .macro UpdateVarFromVar op, dst, src + .long 57 + .long \op + .long \dst + .long \src + .endm + + .macro UpdateMonDataFromVar op, battler, dst, src + .long 58 + .long \op + .long \battler + .long \dst + .long \src + .endm + + .macro GoTo jump + .long 59 + .long (\jump-.) / 4 - 1 + .endm + + .macro Call subscript + .long 60 + .long \subscript + .endm + + .macro CallFromVar var + .long 61 + .long \var + .endm + + .macro SetMirrorMove + .long 62 + .endm + + .macro ResetAllStatChanges + .long 63 + .endm + + .macro LockMoveChoice battler + .long 64 + .long \battler + .endm + + .macro UnlockMoveChoice battler + .long 65 + .long \battler + .endm + + .macro SetHealthbarStatus battler, status + .long 66 + .long \battler + .long \status + .endm + + .macro PrintTrainerMessage battler, type + .long 67 + .long \battler + .long \type + .endm + + .macro PayPrizeMoney + .long 68 + .endm + + .macro PlayBattleAnimation battler, animation + .long 69 + .long \battler + .long \animation + .endm + + .macro PlayBattleAnimationOnMons attacker, defender, animation + .long 70 + .long \attacker + .long \defender + .long \animation + .endm + + .macro PlayBattleAnimationFromVar battler, var + .long 71 + .long \battler + .long \var + .endm + + .macro PrintRecallMessage battler + .long 72 + .long \battler + .endm + + .macro PrintSendOutMessage battler + .long 73 + .long \battler + .endm + + .macro PrintEncounterMessage battler + .long 74 + .long \battler + .endm + + .macro PrintFirstSendOutMessage battler + .long 75 + .long \battler + .endm + + .macro PrintBufferedTrainerMessage battler + .long 76 + .long \battler + .endm + + .macro TryConversion jump_if_fail + .long 77 + .long (\jump_if_fail-.) / 4 - 1 + .endm + + .macro CompareVarToVar op, lhs, rhs, jump + .long 78 + .long \op + .long \lhs + .long \rhs + .long (\jump-.) / 4 - 1 + .endm + + .macro CompareMonDataToVar op, battler, lhs, rhs, jump + .long 79 + .long \op + .long \battler + .long \lhs + .long \rhs + .long (\jump-.) / 4 - 1 + .endm + + .macro AddPayDayMoney + .long 80 + .endm + + .macro TryLightScreen jump_if_fail + .long 81 + .long (\jump_if_fail-.) / 4 - 1 + .endm + + .macro TryReflect jump_if_fail + .long 82 + .long (\jump_if_fail-.) / 4 - 1 + .endm + + .macro TryMist jump_if_fail + .long 83 + .long (\jump_if_fail-.) / 4 - 1 + .endm + + .macro TryOHKOMove + .long 84 + .endm + + .macro DivideVarByValue var, val + .long 85 + .long \var + .long \val + .endm + + .macro DivideVarByVar dividend, divisor + .long 86 + .long \dividend + .long \divisor + .endm + + .macro TryMimic jump_if_fail + .long 87 + .long (\jump_if_fail-.) / 4 - 1 + .endm + + .macro Metronome + .long 88 + .endm + + .macro TryDisable jump_if_fail + .long 89 + .long (\jump_if_fail-.) / 4 - 1 + .endm + + .macro Counter + .long 90 + .endm + + .macro MirrorCoat + .long 91 + .endm + + .macro TryEncore jump_if_fail + .long 92 + .long (\jump_if_fail-.) / 4 - 1 + .endm + + .macro TryConversion2 jump_if_fail + .long 93 + .long (\jump_if_fail-.) / 4 - 1 + .endm + + .macro TrySketch jump_if_fail + .long 94 + .long (\jump_if_fail-.) / 4 - 1 + .endm + + .macro TrySleepTalk jump_if_fail + .long 95 + .long (\jump_if_fail-.) / 4 - 1 + .endm + + .macro CalcFlailPower + .long 96 + .endm + + .macro TrySpite jump_if_fail + .long 97 + .long (\jump_if_fail-.) / 4 - 1 + .endm + + .macro TryPartyStatusRefresh + .long 98 + .endm + + .macro TryStealItem jump_if_fail, jump_sticky_hold + .long 99 + .long (\jump_if_fail-.) / 4 - 2 + .long (\jump_sticky_hold-.) / 4 - 1 + .endm + + .macro TryProtection jump_if_fail + .long 100 + .long (\jump_if_fail-.) / 4 - 1 + .endm + + .macro TrySubstitute jump_if_fail + .long 101 + .long (\jump_if_fail-.) / 4 - 1 + .endm + + .macro TryWhirlwind jump_if_fail + .long 102 + .long (\jump_if_fail-.) / 4 - 1 + .endm + + .macro Transform + .long 103 + .endm + + .macro TrySpikes jump_if_fail + .long 104 + .long (\jump_if_fail-.) / 4 - 1 + .endm + + .macro CheckSpikes battler, jump_no_spikes + .long 105 + .long \battler + .long (\jump_no_spikes-.) / 4 - 1 + .endm + + .macro TryPerishSong jump_if_fail + .long 106 + .long (\jump_if_fail-.) / 4 - 1 + .endm + + .macro GetMonBySpeedOrder dst_var + .long 107 + .long \dst_var + .endm + + .macro GoToIfValidMon var, jump + .long 108 + .long \var + .long (\jump-.) / 4 - 1 + .endm + + .macro EndOfTurnWeatherEffect battler + .long 109 + .long \battler + .endm + + .macro CalcRolloutPower + .long 110 + .endm + + .macro CalcFuryCutterPower + .long 111 + .endm + + .macro TryAttract jump_if_fail + .long 112 + .long (\jump_if_fail-.) / 4 - 1 + .endm + + .macro TrySafeguard jump_if_fail + .long 113 + .long (\jump_if_fail-.) / 4 - 1 + .endm + + .macro Present jump_if_heal + .long 114 + .long (\jump_if_heal-.) / 4 - 1 + .endm + + .macro CalcMagnitudePower + .long 115 + .endm + + .macro TryReplaceFaintedMon battler, open_party_list, jump_if_fail + .long 116 + .long \battler + .long \open_party_list + .long (\jump_if_fail-.) / 4 - 1 + .endm + + .macro RapidSpin + .long 117 + .endm + + .macro WeatherHPRecovery + .long 118 + .endm + + .macro CalcHiddenPowerParams + .long 119 + .endm + + .macro CopyStatStages + .long 120 + .endm + + .macro TryFutureSight jump_if_fail + .long 121 + .long (\jump_if_fail-.) / 4 - 1 + .endm + + .macro CheckMoveHit attacker, defender, move_src, jump_if_miss + .long 122 + .long \attacker + .long \defender + .long \move_src + .long (\jump_if_miss-.) / 4 - 1 + .endm + + .macro TryTeleport jump_if_fail + .long 123 + .long (\jump_if_fail-.) / 4 - 1 + .endm + + .macro BeatUp + .long 124 + .endm + + .macro FollowMe + .long 125 + .endm + + .macro TryHelpingHand jump_if_fail + .long 126 + .long (\jump_if_fail-.) / 4 - 1 + .endm + + .macro TrySwapItems jump_if_fail, jump_sticky_hold + .long 127 + .long (\jump_if_fail-.) / 4 - 2 + .long (\jump_sticky_hold-.) / 4 - 1 + .endm + + .macro TryWish jump_if_fail + .long 128 + .long (\jump_if_fail-.) / 4 - 1 + .endm + + .macro TryAssist jump_if_fail + .long 129 + .long (\jump_if_fail-.) / 4 - 1 + .endm + + .macro TrySetMagicCoat jump_if_fail + .long 130 + .long (\jump_if_fail-.) / 4 - 1 + .endm + + .macro MagicCoat + .long 131 + .endm + + .macro CalcRevengePowerMul + .long 132 + .endm + + .macro TryBreakScreens jump_no_screens + .long 133 + .long (\jump_no_screens-.) / 4 - 1 + .endm + + .macro TryYawn jump_if_fail + .long 134 + .long (\jump_if_fail-.) / 4 - 1 + .endm + + .macro TryKnockOff jump_if_fail + .long 135 + .long (\jump_if_fail-.) / 4 - 1 + .endm + + .macro CalcHPFalloffPower + .long 136 + .endm + + .macro TryImprison jump_if_fail + .long 137 + .long (\jump_if_fail-.) / 4 - 1 + .endm + + .macro TryGrudge jump_if_fail + .long 138 + .long (\jump_if_fail-.) / 4 - 1 + .endm + + .macro TrySnatch jump_if_fail + .long 139 + .long (\jump_if_fail-.) / 4 - 1 + .endm + + .macro CalcWeightBasedPower + .long 140 + .endm + + .macro CalcWeatherBallParams + .long 141 + .endm + + .macro TryPursuit jump_no_trigger + .long 142 + .long (\jump_no_trigger-.) / 4 - 1 + .endm + + .macro ApplyTypeEffectiveness + .long 143 + .endm + + .macro IfTurnFlag battler, flag, compare_to, jump + .long 144 + .long \battler + .long \flag + .long \compare_to + .long (\jump-.) / 4 - 1 + .endm + + .macro SetTurnFlag battler, flag, val + .long 145 + .long \battler + .long \flag + .long \val + .endm + + .macro CalcGyroBallPower + .long 146 + .endm + + .macro TryMetalBurst jump_if_fail + .long 147 + .long (\jump_if_fail-.) / 4 - 1 + .endm + + .macro CalcPaybackPower + .long 148 + .endm + + .macro CalcTrumpCardPower + .long 149 + .endm + + .macro CalcWringOutPower + .long 150 + .endm + + .macro TryMeFirst jump_if_fail + .long 151 + .long (\jump_if_fail-.) / 4 - 1 + .endm + + .macro TryCopycat jump_if_fail + .long 152 + .long (\jump_if_fail-.) / 4 - 1 + .endm + + .macro CalcPunishmentPower + .long 153 + .endm + + .macro TrySuckerPunch jump_if_fail + .long 154 + .long (\jump_if_fail-.) / 4 - 1 + .endm + + .macro CheckSideCondition battler, op, condition, jump + .long 155 + .long \battler + .long \op + .long \condition + .long (\jump-.) / 4 - 1 + .endm + + .macro TryFeint jump_if_fail + .long 156 + .long (\jump_if_fail-.) / 4 - 1 + .endm + + .macro CheckCanShareStatus jump_if_fail + .long 157 + .long (\jump_if_fail-.) / 4 - 1 + .endm + + .macro TryLastResort jump_if_fail + .long 158 + .long (\jump_if_fail-.) / 4 - 1 + .endm + + .macro TryToxicSpikes jump_if_fail + .long 159 + .long (\jump_if_fail-.) / 4 - 1 + .endm + + .macro CheckToxicSpikes battler, jump_no_spikes + .long 160 + .long \battler + .long (\jump_no_spikes-.) / 4 - 1 + .endm + + .macro CheckIgnorableAbility op, battler, ability, jump + .long 161 + .long \op + .long \battler + .long \ability + .long (\jump-.) / 4 - 1 + .endm + + .macro IfSameSide battler_1, battler_2, jump_same_side + .long 162 + .long \battler_1 + .long \battler_2 + .long (\jump_same_side-.) / 4 - 1 + .endm + + .macro GenerateEndOfBattleItem + .long 163 + .endm + + .macro TrickRoom + .long 164 + .endm + + .macro IfMovedThisTurn battler, jump + .long 165 + .long \battler + .long (\jump-.) / 4 - 1 + .endm + + .macro CheckItemHoldEffect op, battler, effect, jump + .long 166 + .long \op + .long \battler + .long \effect + .long (\jump-.) / 4 - 1 + .endm + + .macro GetItemHoldEffect battler, dst + .long 167 + .long \battler + .long \dst + .endm + + .macro GetItemEffectParam battler, dst + .long 168 + .long \battler + .long \dst + .endm + + .macro TryCamouflage jump_if_fail + .long 169 + .long (\jump_if_fail-.) / 4 - 1 + .endm + + .macro GetTerrainMove + .long 170 + .endm + + .macro GetTerrainSecondaryEffect + .long 171 + .endm + + .macro CalcNaturalGiftParams jump_if_fail + .long 172 + .long (\jump_if_fail-.) / 4 - 1 + .endm + + .macro TryPluck jump_sticky_hold, jump_no_effect + .long 173 + .long (\jump_sticky_hold-.) / 4 - 2 + .long (\jump_no_effect-.) / 4 - 1 + .endm + + .macro TryFling jump_no_effect + .long 174 + .long (\jump_no_effect-.) / 4 - 1 + .endm + + .macro YesNoMenu type + .long 175 + .long \type + .endm + + .macro WaitYesNoResult jump_yes, jump_no + .long 176 + .long (\jump_yes-.) / 4 - 2 + .long (\jump_no-.) / 4 - 1 + .endm + + .macro ChoosePokemonMenu + .long 177 + .endm + + .macro WaitPokemonMenuResult jump_cancel + .long 178 + .long (\jump_cancel-.) / 4 - 1 + .endm + + .macro SetLinkBattleResult + .long 179 + .endm + + .macro CheckStealthRock battler, jump_no_rocks + .long 180 + .long \battler + .long (\jump_no_rocks-.) / 4 - 1 + .endm + + .macro CheckEffectActivation jump_no_effect + .long 181 + .long (\jump_no_effect-.) / 4 - 1 + .endm + + .macro CheckChatterActivation jump_no_effect + .long 182 + .long (\jump_no_effect-.) / 4 - 1 + .endm + + .macro GetCurrentMoveData param + .long 183 + .long \param + .endm + + .macro SetMosaic battler, distortion, delay + .long 184 + .long \battler + .long \distortion + .long \delay + .endm + + .macro ChangeForm battler + .long 185 + .long \battler + .endm + + .macro SetBattleBackground + .long 186 + .endm + + .macro UseBagItem battler + .long 187 + .long \battler + .endm + + .macro TryEscape battler, jump_if_fail + .long 188 + .long \battler + .long (\jump_if_fail-.) / 4 - 1 + .endm + + .macro ShowBattleStartPartyGauge battler + .long 189 + .long \battler + .endm + + .macro HideBattleStartPartyGauge battler + .long 190 + .long \battler + .endm + + .macro ShowPartyGauge battler + .long 191 + .long \battler + .endm + + .macro HidePartyGauge battler + .long 192 + .long \battler + .endm + + .macro LoadPartyGaugeGraphics + .long 193 + .endm + + .macro FreePartyGaugeGraphics + .long 194 + .endm + + .macro IncrementGameStat battler, battler_type, game_stat + .long 195 + .long \battler + .long \battler_type + .long \game_stat + .endm + + .macro RestoreSprite battler + .long 196 + .long \battler + .endm + + .macro TriggerAbilityOnHit jump_no_effect + .long 197 + .long (\jump_no_effect-.) / 4 - 1 + .endm + + .macro SpriteToOAM battler + .long 198 + .long \battler + .endm + + .macro OAMToSprite battler + .long 199 + .long \battler + .endm + + .macro CheckBlackOut battler, jump + .long 200 + .long \battler + .long (\jump-.) / 4 - 1 + .endm + + .macro BoostRandomStatBy2 jump_no_change + .long 201 + .long (\jump_no_change-.) / 4 - 1 + .endm + + .macro RemoveItem battler + .long 202 + .long \battler + .endm + + .macro TryRecycle jump_if_fail + .long 203 + .long (\jump_if_fail-.) / 4 - 1 + .endm + + .macro TriggerHeldItemOnHit jump_no_effect + .long 204 + .long (\jump_no_effect-.) / 4 - 1 + .endm + + .macro PrintBattleResultMessage + .long 205 + .endm + + .macro PrintEscapeMessage + .long 206 + .endm + + .macro PrintForfeitMessage + .long 207 + .endm + + .macro CheckHoldOnWith1HP battler + .long 208 + .long \battler + .endm + + .macro TryRestoreStatusOnSwitch battler, jump_no_effect + .long 209 + .long \battler + .long (\jump_no_effect-.) / 4 - 1 + .endm + + .macro CheckSubstitute battler, jump_sub_active + .long 210 + .long \battler + .long (\jump_sub_active-.) / 4 - 1 + .endm + + .macro CheckIgnoreWeather jump + .long 211 + .long (\jump-.) / 4 - 1 + .endm + + .macro SetRandomTarget battler + .long 212 + .long \battler + .endm + + .macro TriggerHeldItemOnPivotMove jump_no_effect + .long 213 + .long (\jump_no_effect-.) / 4 - 1 + .endm + + .macro RefreshSprite battler + .long 214 + .long \battler + .endm + + .macro PlayMoveHitSound battler + .long 215 + .long \battler + .endm + + .macro PlayBGM battler, sdat_id + .long 216 + .long \battler + .long \sdat_id + .endm + + .macro CheckSafariGameDone jump_not_over + .long 217 + .long (\jump_not_over)-.) / 4 - 1 + .endm + + .macro WaitTime delay + .long 218 + .long \delay + .endm + + .macro CheckCurMoveIsType type, jump + .long 219 + .long \type + .long (\jump)-.) / 4 - 1 + .endm + + .macro LoadArchivedMonData species, form_var, param + .long 220 + .long \species + .long \form_var + .long \param + .endm + + .macro RefreshMonData battler + .long 221 + .long \battler + .endm + + .macro End + .long 222 + .endm + + .endif // ASM_BATTLE_SCRIPT_INC diff --git a/consts/battle.json b/consts/battle.json index 3396ea5088..1048c549cb 100644 --- a/consts/battle.json +++ b/consts/battle.json @@ -5,7 +5,18 @@ "@MessageTag", "@MoveSubscriptPointer", "@SideEffectType", - "@Terrain" + "@Terrain", + "@BattleAnimation" + ], + "btlcmd": [ + "@BattleScriptVar", + "@BattlerID", + "@OpCode", + "@CheckHaveOp", + "@MessageStatusCondition", + "@TurnFlag", + "@CheckSideConditionOp", + "@SideCondition" ] }, "definitions": { @@ -549,6 +560,231 @@ "TERRAIN_GIRATINA", "TERRAIN_MAX" ] + }, + "@BattleAnimation": { + "type": "enum", + "values": [ + "BATTLE_ANIMATION_NONE", + "BATTLE_ANIMATION_ASLEEP", + "BATTLE_ANIMATION_POISONED", + "BATTLE_ANIMATION_BURNED", + "BATTLE_ANIMATION_FROZEN", + "BATTLE_ANIMATION_PARALYZED", + "BATTLE_ANIMATION_CONFUSED", + "BATTLE_ANIMATION_INFATUATED", + "BATTLE_ANIMATION_LEVEL_UP", + "BATTLE_ANIMATION_BAG_ITEM", + "BATTLE_ANIMATION_HELD_ITEM", + "BATTLE_ANIMATION_SHINY", + "BATTLE_ANIMATION_STAT_BOOST", + "BATTLE_ANIMATION_STAT_DROP", + "BATTLE_ANIMATION_RESTORE_HP", + "BATTLE_ANIMATION_SUB_OUT", + "BATTLE_ANIMATION_SUB_IN", + "BATTLE_ANIMATION_ITEM_ESCAPE", + "BATTLE_ANIMATION_WEATHER_FOG", + "BATTLE_ANIMATION_WEATHER_RAIN", + "BATTLE_ANIMATION_WEATHER_HAIL", + "BATTLE_ANIMATION_WEATHER_SAND", + "BATTLE_ANIMATION_WEATHER_SUN", + "BATTLE_ANIMATION_UNUSED_23", + "BATTLE_ANIMATION_UNUSED_24", + "BATTLE_ANIMATION_SUBSTITUTE_IN", + "BATTLE_ANIMATION_SUBSTITUTE_OUT", + "BATTLE_ANIMATION_HAPPY", + "BATTLE_ANIMATION_EATING", + "BATTLE_ANIMATION_ANGRY", + "BATTLE_ANIMATION_DAMAGE_CURSE", + "BATTLE_ANIMATION_DAMAGE_NIGHTMARE", + "BATTLE_ANIMATION_DAMAGE_LEECH_SEED", + "BATTLE_ANIMATION_DAMAGE_BIND", + "BATTLE_ANIMATION_DAMAGE_WRAP", + "BATTLE_ANIMATION_DAMAGE_FIRE_SPIN", + "BATTLE_ANIMATION_DAMAGE_MAGMA_STORM", + "BATTLE_ANIMATION_DAMAGE_CLAMP", + "BATTLE_ANIMATION_DAMAGE_WHIRLPOOL", + "BATTLE_ANIMATION_DAMAGE_SAND_TOMB", + "BATTLE_ANIMATION_DAMAGE_INGRAIN" + ] + }, + "@BattleScriptVar": { + "type": "enum", + "values": [ + "BTLVAR_BATTLE_TYPE", + "BTLVAR_CRITICAL_BOOSTS", + "BTLVAR_SIDE_EFFECT_FLAGS_DIRECT", + "BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT", + "BTLVAR_SIDE_EFFECT_FLAGS_ABILITY", + "BTLVAR_SIDE_EFFECT_TYPE", + "BTLVAR_BATTLE_CTX_STATUS", + "BTLVAR_FIELD_CONDITIONS", + "BTLVAR_POWER_MULTI", + "BTLVAR_CALC_TEMP", + "BTLVAR_MOVE_STATUS_FLAGS", + "BTLVAR_SIDE_CONDITIONS_ATTACKER", + "BTLVAR_SIDE_CONDITIONS_DEFENDER", + "BTLVAR_SIDE_CONDITIONS_EFFECT_MON", + "BTLVAR_DAMAGE", + "BTLVAR_ATTACKER", + "BTLVAR_DEFENDER", + "BTLVAR_SIDE_EFFECT_MON", + "BTLVAR_FAINTED_MON", + "BTLVAR_SWITCHED_MON", + "BTLVAR_MSG_BATTLER_TEMP", + "BTLVAR_ATTACKER_STORED_DAMAGE", + "BTLVAR_MSG_TEMP", + "BTLVAR_PAY_DAY_COUNT", + "BTLVAR_CURRENT_MOVE", + "BTLVAR_TOTAL_TURNS", + "BTLVAR_MSG_ATTACKER", + "BTLVAR_MSG_DEFENDER", + "BTLVAR_MOVE_TEMP", + "BTLVAR_LAST_BATTLER_ID", + "BTLVAR_MOVE_POWER", + "BTLVAR_AFTER_MOVE_MESSAGE_TYPE", + "BTLVAR_HP_CALC_TEMP", + "BTLVAR_RESULT_MASK", + "BTLVAR_SIDE_EFFECT_PARAM", + "BTLVAR_MSG_MOVE_TEMP", + "BTLVAR_MSG_ITEM_TEMP", + "BTLVAR_MSG_ABILITY_TEMP", + "BTLVAR_WEATHER_TURNS", + "BTLVAR_BATTLER_SPEED_TEMP", + "BTLVAR_MULTI_HIT_LOOP", + "BTLVAR_ATTACKER_PHYSICAL_DAMAGE_MASK", + "BTLVAR_ATTACKER_SPECIAL_DAMAGE_MASK", + "BTLVAR_SCRIPT_TEMP", + "BTLVAR_CRITICAL_MUL", + "BTLVAR_ATTACKER_LAST_DAMAGE_TAKEN", + "BTLVAR_DEFENDER_LAST_DAMAGE_TAKEN", + "BTLVAR_ATTACKER_SELF_TURN_STATUS_FLAGS", + "BTLVAR_DEFENDER_SELF_TURN_STATUS_FLAGS", + "BTLVAR_SIDE_EFFECT_MON_SELF_TURN_STATUS_FLAGS", + "BTLVAR_FLING_TEMP", + "BTLVAR_FLING_SCRIPT", + "BTLVAR_BATTLE_SYS_STATUS", + "BTLVAR_ATTACKER_LOCKED_MOVE", + "BTLVAR_HIT_DAMAGE", + "BTLVAR_NUM_SAFARI_BALLS", + "BTLVAR_SWITCHED_MON_TEMP", + "BTLVAR_MOVE_TYPE", + "BTLVAR_MOVE_EFFECT_CHANCE", + "BTLVAR_REGULATION_FLAG", + "BTLVAR_BATTLE_CTX_STATUS_2", + "BTLVAR_TURN_ORDER_COUNTER", + "BTLVAR_MAX_BATTLERS", + "BTLVAR_ATTACKER_TEMP", + "BTLVAR_DEFENDER_TEMP", + "BTLVAR_DEFENDER_PHYSICAL_DAMAGE_TAKEN", + "BTLVAR_MSG_BATTLER_TEMP_ASSURANCE_DAMAGE_MASK", + "BTLVAR_DEFENDER_ASSURANCE_DAMAGE_MASK", + "BTLVAR_ATTACKER_SHELL_BELL_DAMAGE_DEALT", + "BTLVAR_WAITING_BATTLERS" + ] + }, + "@BattlerID": { + "type": "enum", + "values": [ + "BTLSCR_ALL_BATTLERS", + "BTLSCR_ATTACKER", + "BTLSCR_DEFENDER", + "BTLSCR_PLAYER", + "BTLSCR_ENEMY", + "BTLSCR_FAINTED_MON", + "BTLSCR_SWITCHED_MON", + "BTLSCR_SIDE_EFFECT_MON", + "BTLSCR_ABILITY_MON", + "BTLSCR_PLAYER_SLOT_1", + "BTLSCR_ENEMY_SLOT_1", + "BTLSCR_PLAYER_SLOT_2", + "BTLSCR_ENEMY_SLOT_2", + "BTLSCR_UNUSED_13", + "BTLSCR_MSG_ATTACKER", + "BTLSCR_MSG_DEFENDER", + "BTLSCR_ATTACKER_PARTNER", + "BTLSCR_DEFENDER_PARTNER", + "BTLSCR_FORCED_OUT", + "BTLSCR_ATTACKER_ENEMY", + "BTLSCR_DEFENDER_ENEMY", + "BTLSCR_MSG_BATTLER_TEMP", + "BTLSCR_SWITCHED_MON_AFTER" + ] + }, + "@OpCode": { + "type": "enum", + "values": [ + "OPCODE_EQU", + "OPCODE_NEQ", + "OPCODE_GT", + "OPCODE_LTE", + "OPCODE_FLAG_SET", + "OPCODE_FLAG_NOT", + "OPCODE_AND", + "OPCODE_SET", + "OPCODE_ADD", + "OPCODE_SUB", + "OPCODE_FLAG_ON", + "OPCODE_FLAG_OFF", + "OPCODE_MUL", + "OPCODE_DIV", + "OPCODE_LEFT_SHIFT", + "OPCODE_RIGHT_SHIFT", + "OPCODE_FLAG_INDEX", + "OPCODE_GET", + "OPCODE_SUB_TO_ZERO", + "OPCODE_BITWISE_XOR", + "OPCODE_BITWISE_AND" + ] + }, + "@CheckHaveOp": { + "type": "enum", + "values": [ + "CHECK_HAVE", + "CHECK_NOT_HAVE" + ] + }, + "@MessageStatusCondition": { + "type": "enum", + "values": [ + "MSGCOND_SLEEP", + "MSGCOND_POISON", + "MSGCOND_BURN", + "MSGCOND_PARALYSIS", + "MSGCOND_FREEZE", + "MSGCOND_CONFUSION", + "MSGCOND_INFATUATION" + ] + }, + "@TurnFlag": { + "type": "enum", + "values": [ + "TURN_FLAG_STRUGGLING", + "TURN_FLAG_PP_DECREMENTED", + "TURN_FLAG_PROTECTING", + "TURN_FLAG_HELPING_HAND", + "TURN_FLAG_MAGIC_COAT", + "TURN_FLAG_SNATCHING", + "TURN_FLAG_ROOSTING" + ] + }, + "@CheckSideConditionOp": { + "type": "enum", + "values": [ + "CHECK_SIDE_COND_VAL_ZERO", + "CHECK_SIDE_COND_VAL_NOT_ZERO", + "CHECK_SIDE_COND_CLEAR" + ] + }, + "@SideCondition": { + "type": "enum", + "values": [ + "SIDE_COND_REFLECT_TURNS", + "SIDE_COND_LIGHT_SCREEN_TURNS", + "SIDE_COND_MIST_TURNS", + "SIDE_COND_SAFEGUARD_TURNS", + "SIDE_COND_SPIKES_LAYERS", + "SIDE_COND_TOXIC_SPIKES_LAYERS" + ] } } -} \ No newline at end of file +} diff --git a/include/battle/battle_lib.h b/include/battle/battle_lib.h index cf05ac58b9..d3eb1be7e0 100644 --- a/include/battle/battle_lib.h +++ b/include/battle/battle_lib.h @@ -441,7 +441,7 @@ void Battler_UnlockMoveChoice(BattleSystem *battleSys, BattleContext *battleCtx, * @param battler * @return A value representing the battler's status non-volatile status. */ -enum StatusEffect Battler_StatusCondition(BattleContext *battleCtx, int battler); +enum BattleAnimation Battler_StatusCondition(BattleContext *battleCtx, int battler); /** * @brief Check if the given trainer has a trainer message to be shown. diff --git a/include/battle/btlcmd.h b/include/battle/btlcmd.h index 9fccfafd3e..b23bda55ce 100644 --- a/include/battle/btlcmd.h +++ b/include/battle/btlcmd.h @@ -1,198 +1,13 @@ #ifndef POKEPLATINUM_BATTLE_BTLCMD_H #define POKEPLATINUM_BATTLE_BTLCMD_H -enum BattleScriptVars { - BTLVAR_BATTLE_TYPE = 0, - BTLVAR_CRITICAL_BOOSTS, - BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, - BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, - BTLVAR_SIDE_EFFECT_FLAGS_ABILITY, - BTLVAR_SIDE_EFFECT_TYPE, - BTLVAR_BATTLE_CTX_STATUS, - BTLVAR_FIELD_CONDITIONS, - BTLVAR_POWER_MULTI, - BTLVAR_CALC_TEMP, - BTLVAR_MOVE_STATUS_FLAGS, - BTLVAR_SIDE_CONDITIONS_ATTACKER, - BTLVAR_SIDE_CONDITIONS_DEFENDER, - BTLVAR_SIDE_CONDITIONS_EFFECT_MON, - BTLVAR_DAMAGE, - BTLVAR_ATTACKER, - BTLVAR_DEFENDER, - BTLVAR_SIDE_EFFECT_MON, - BTLVAR_FAINTED_MON, - BTLVAR_SWITCHED_MON, - BTLVAR_MSG_BATTLER_TEMP, - BTLVAR_ATTACKER_STORED_DAMAGE, - BTLVAR_MSG_TEMP, - BTLVAR_PAY_DAY_COUNT, - BTLVAR_CURRENT_MOVE, - BTLVAR_TOTAL_TURNS, - BTLVAR_MSG_ATTACKER, - BTLVAR_MSG_DEFENDER, - BTLVAR_MOVE_TEMP, - BTLVAR_LAST_BATTLER_ID, - BTLVAR_MOVE_POWER, - BTLVAR_AFTER_MOVE_MESSAGE_TYPE, - BTLVAR_HP_CALC_TEMP, - BTLVAR_RESULT_MASK, - BTLVAR_SIDE_EFFECT_PARAM, - BTLVAR_MSG_MOVE_TEMP, - BTLVAR_MSG_ITEM_TEMP, - BTLVAR_MSG_ABILITY_TEMP, - BTLVAR_WEATHER_TURNS, - BTLVAR_BATTLER_SPEED_TEMP, - BTLVAR_MULTI_HIT_LOOP, - BTLVAR_ATTACKER_PHYSICAL_DAMAGE_MASK, - BTLVAR_ATTACKER_SPECIAL_DAMAGE_MASK, - BTLVAR_SCRIPT_TEMP, - BTLVAR_CRITICAL_MUL, - BTLVAR_ATTACKER_LAST_DAMAGE_TAKEN, - BTLVAR_DEFENDER_LAST_DAMAGE_TAKEN, - BTLVAR_ATTACKER_SELF_TURN_STATUS_FLAGS, - BTLVAR_DEFENDER_SELF_TURN_STATUS_FLAGS, - BTLVAR_SIDE_EFFECT_MON_SELF_TURN_STATUS_FLAGS, - BTLVAR_FLING_TEMP, - BTLVAR_FLING_SCRIPT, - BTLVAR_BATTLE_SYS_STATUS, - BTLVAR_ATTACKER_LOCKED_MOVE, - BTLVAR_HIT_DAMAGE, - BTLVAR_NUM_SAFARI_BALLS, - BTLVAR_SWITCHED_MON_TEMP, - BTLVAR_MOVE_TYPE, - BTLVAR_MOVE_EFFECT_CHANCE, - BTLVAR_REGULATION_FLAG, - BTLVAR_BATTLE_CTX_STATUS_2, - BTLVAR_TURN_ORDER_COUNTER, - BTLVAR_MAX_BATTLERS, - BTLVAR_ATTACKER_TEMP, - BTLVAR_DEFENDER_TEMP, - BTLVAR_DEFENDER_PHYSICAL_DAMAGE_TAKEN, - BTLVAR_MSG_BATTLER_TEMP_ASSURANCE_DAMAGE_MASK, - BTLVAR_DEFENDER_ASSURANCE_DAMAGE_MASK, - BTLVAR_ATTACKER_SHELL_BELL_DAMAGE_DEALT, - BTLVAR_WAITING_BATTLERS, -}; +#ifndef __ASM_PM_ +#include "consts/generated/c/btlcmd.h" +#endif -#define BTLSCR_ALL_BATTLERS 0 -#define BTLSCR_ATTACKER 1 -#define BTLSCR_DEFENDER 2 -#define BTLSCR_PLAYER 3 -#define BTLSCR_ENEMY 4 -#define BTLSCR_FAINTED_MON 5 -#define BTLSCR_SWITCHED_MON 6 -#define BTLSCR_SIDE_EFFECT_MON 7 -#define BTLSCR_ABILITY_MON 8 -#define BTLSCR_PLAYER_SLOT_1 9 -#define BTLSCR_ENEMY_SLOT_1 10 -#define BTLSCR_PLAYER_SLOT_2 11 -#define BTLSCR_ENEMY_SLOT_2 12 -// 13 undefined -#define BTLSCR_MSG_ATTACKER 14 -#define BTLSCR_MSG_DEFENDER 15 -#define BTLSCR_ATTACKER_PARTNER 16 -#define BTLSCR_DEFENDER_PARTNER 17 -#define BTLSCR_FORCED_OUT 18 -#define BTLSCR_ATTACKER_ENEMY 19 -#define BTLSCR_DEFENDER_ENEMY 20 -#define BTLSCR_MSG_BATTLER_TEMP 21 -#define BTLSCR_SWITCHED_MON_AFTER 22 #define BTLSCR_MSG_TEMP (0xFF) #define WEATHER_EFFECT_HYDRATION 1 #define WEATHER_EFFECT_SOLAR_POWER 2 -enum OpCode { - IFOP_EQU = 0, - IFOP_NEQ, - IFOP_GT, - IFOP_LTE, - IFOP_FLAG_SET, - IFOP_FLAG_NOT, - IFOP_AND, - - VALOP_SET, - VALOP_ADD, - VALOP_SUB, - VALOP_FLAG_ON, - VALOP_FLAG_OFF, - VALOP_MUL, - VALOP_DIV, - VALOP_LSH, - VALOP_RSH, - VALOP_FLAG_INDEX, - VALOP_GET, - VALOP_SUB_TO_ZERO, - VALOP_XOR, - VALOP_AND, -}; - -enum CheckHaveOp { - CHECK_HAVE, - CHECK_NOT_HAVE, -}; - -enum StatusEffect { - STATUS_EFFECT_NONE = 0, - - STATUS_EFFECT_SLEEP, - STATUS_EFFECT_POISON, - STATUS_EFFECT_BURN, - STATUS_EFFECT_FREEZE, - STATUS_EFFECT_PARALYSIS, - - STATUS_EFFECT_LEVEL_UP = 8, - - STATUS_EFFECT_STAGE_UP = 12, - STATUS_EFFECT_STAGE_DOWN, - - STATUS_EFFECT_CHANGE_FORM_OUT = 15, - STATUS_EFFECT_CHANGE_FORM_IN, - STATUS_EFFECT_ITEM_ESCAPE, - STATUS_EFFECT_WEATHER_FOG, - STATUS_EFFECT_WEATHER_RAIN, - STATUS_EFFECT_WEATHER_HAIL, - STATUS_EFFECT_WEATHER_SAND, - STATUS_EFFECT_WEATHER_SUN, - - STATUS_EFFECT_SUBSTITUTE_ON = 25, - STATUS_EFFECT_SUBSTITUTE_OFF, -}; - -enum MessageStatusCondition { - MSGCOND_SLEEP = 0, - MSGCOND_POISON, - MSGCOND_BURN, - MSGCOND_PARALYSIS, - MSGCOND_FREEZE, - MSGCOND_CONFUSION, - MSGCOND_INFATUATION, -}; - -enum TurnFlag { - TURN_FLAG_STRUGGLING = 0, - TURN_FLAG_PP_DECREMENTED, - TURN_FLAG_PROTECTING, - TURN_FLAG_HELPING_HAND, - TURN_FLAG_MAGIC_COAT, - TURN_FLAG_SNATCHING, - TURN_FLAG_ROOSTING, -}; - -enum CheckSideConditionOp { - CHECK_SIDE_COND_VAL_ZERO = 0, - CHECK_SIDE_COND_VAL_NOT_ZERO, - CHECK_SIDE_COND_CLEAR, -}; - -enum SideCondition { - SIDE_COND_REFLECT_TURNS = 0, - SIDE_COND_LIGHT_SCREEN_TURNS, - SIDE_COND_MIST_TURNS, - SIDE_COND_SAFEGUARD_TURNS, - SIDE_COND_SPIKES_LAYERS, - SIDE_COND_TOXIC_SPIKES_LAYERS, -}; - #endif // POKEPLATINUM_BATTLE_BTLCMD_H - diff --git a/include/constants/battle.h b/include/constants/battle.h index da8eeff85c..c572b784dc 100644 --- a/include/constants/battle.h +++ b/include/constants/battle.h @@ -1,17 +1,33 @@ #ifndef POKEPLATINUM_CONSTANTS_BATTLE_H #define POKEPLATINUM_CONSTANTS_BATTLE_H +#ifndef __ASM_PM_ +#include "consts/generated/c/battle.h" + +enum BattleActions { + BATTLE_ACTION_PICK_COMMAND = 0, + BATTLE_ACTION_CHOOSE_TARGET, + BATTLE_ACTION_TEMP_VALUE, + BATTLE_ACTION_SELECTED_COMMAND, + + MAX_BATTLE_ACTIONS +}; + +enum BattlerBootState { + BATTLER_BOOT_STATE_NORMAL = 0, + BATTLER_BOOT_STATE_AI, + BATTLER_BOOT_STATE_LINK, +}; +#endif + #include "constants/battle/condition.h" #include "constants/battle/message_tags.h" #include "constants/battle/moves.h" -#include "constants/battle/scripts.h" #include "constants/battle/side_effects.h" #include "constants/battle/system_control.h" #include "constants/battle/terrain.h" #include "constants/battle/turn_flags.h" -#include "consts/generated/c/battle.h" - #define BATTLE_TYPE_SINGLES (0 << 0) #define BATTLE_TYPE_WILD_MON (0 << 0) #define BATTLE_TYPE_TRAINER (1 << 0) @@ -147,19 +163,4 @@ #define NO_PARTNER_SLOT_1 (1 << 2) #define NO_PARTNER_SLOT_2 (1 << 3) -enum BattleActions { - BATTLE_ACTION_PICK_COMMAND = 0, - BATTLE_ACTION_CHOOSE_TARGET, - BATTLE_ACTION_TEMP_VALUE, - BATTLE_ACTION_SELECTED_COMMAND, - - MAX_BATTLE_ACTIONS -}; - -enum BattlerBootState { - BATTLER_BOOT_STATE_NORMAL = 0, - BATTLER_BOOT_STATE_AI, - BATTLER_BOOT_STATE_LINK, -}; - #endif // POKEPLATINUM_CONSTANTS_BATTLE_H diff --git a/include/constants/battle/condition.h b/include/constants/battle/condition.h index 5d0884d700..ab7b6c8922 100644 --- a/include/constants/battle/condition.h +++ b/include/constants/battle/condition.h @@ -125,4 +125,4 @@ #define OVERWORLD_WEATHER_HARSH_SUN 1001 #define OVERWORLD_WEATHER_TRICK_ROOM 1002 -#endif // POKEPLATINUM_CONSTANTS_BATTLE_CONDITION_H \ No newline at end of file +#endif // POKEPLATINUM_CONSTANTS_BATTLE_CONDITION_H diff --git a/include/constants/battle/message_tags.h b/include/constants/battle/message_tags.h index 4edc389f47..910079d4a2 100644 --- a/include/constants/battle/message_tags.h +++ b/include/constants/battle/message_tags.h @@ -3,6 +3,5 @@ #define TAG_SIDE_LOCAL_MESSAGE (1 << 6) // adjust the message for the side's source (e.g. "The foe's X used Y!") #define TAG_GLOBAL_MESSAGE (1 << 7) // do not perform any message adjustment for a calling side -#define TAG_IGNORE_SIDES ~(TAG_USE_DIRECTION | TAG_SKIP_DIRECTION) #endif // POKEPLATINUM_CONSTANTS_BATTLE_MESSAGE_TAGS_H diff --git a/include/constants/battle/moves.h b/include/constants/battle/moves.h index cb83630daa..cd88831fd5 100644 --- a/include/constants/battle/moves.h +++ b/include/constants/battle/moves.h @@ -31,25 +31,13 @@ #define MOVE_EFFECT_SHADOW_FORCE (1 << 29) #define MOVE_EFFECT_IMPRISONED (1 << 30) // applied to mons which are affected by Imprison -#define MOVE_EFFECT_SEMI_INVULNERABLE (MOVE_EFFECT_AIRBORNE \ - | MOVE_EFFECT_UNDERGROUND \ - | MOVE_EFFECT_UNDERWATER \ - | MOVE_EFFECT_SHADOW_FORCE) -#define MOVE_EFFECT_BATON_PASSED (MOVE_EFFECT_LEECH_SEED_RECIPIENT \ - | MOVE_EFFECT_LEECH_SEED \ - | MOVE_EFFECT_LOCK_ON \ - | MOVE_EFFECT_PERISH_SONG \ - | MOVE_EFFECT_INGRAIN \ - | MOVE_EFFECT_MUD_SPORT \ - | MOVE_EFFECT_WATER_SPORT \ - | MOVE_EFFECT_NO_CRITICAL \ - | MOVE_EFFECT_POWER_TRICK \ - | MOVE_EFFECT_AQUA_RING \ - | MOVE_EFFECT_ABILITY_SUPPRESSED \ - | MOVE_EFFECT_EMBARGO \ - | MOVE_EFFECT_HEAL_BLOCK \ - | MOVE_EFFECT_MAGNET_RISE) -#define MOVE_EFFECT_NO_WEATHER_DAMAGE (MOVE_EFFECT_UNDERGROUND | MOVE_EFFECT_UNDERWATER) +#define MOVE_EFFECT_SEMI_INVULNERABLE (MOVE_EFFECT_AIRBORNE | MOVE_EFFECT_UNDERGROUND | MOVE_EFFECT_UNDERWATER | MOVE_EFFECT_SHADOW_FORCE) + +#define MOVE_EFFECT_BATON_PASSED (MOVE_EFFECT_LEECH_SEED_RECIPIENT | MOVE_EFFECT_LEECH_SEED | MOVE_EFFECT_LOCK_ON | MOVE_EFFECT_PERISH_SONG | MOVE_EFFECT_INGRAIN \ + | MOVE_EFFECT_MUD_SPORT | MOVE_EFFECT_WATER_SPORT | MOVE_EFFECT_NO_CRITICAL | MOVE_EFFECT_POWER_TRICK|MOVE_EFFECT_AQUA_RING \ + | MOVE_EFFECT_ABILITY_SUPPRESSED | MOVE_EFFECT_EMBARGO | MOVE_EFFECT_HEAL_BLOCK | MOVE_EFFECT_MAGNET_RISE) + +#define MOVE_EFFECT_NO_WEATHER_DAMAGE (MOVE_EFFECT_UNDERGROUND | MOVE_EFFECT_UNDERWATER) #define MOVE_EFFECT_LOCK_ON_SHIFT 3 #define MOVE_EFFECT_YAWN_SHIFT 11 @@ -80,23 +68,11 @@ #define MOVE_STATUS_NO_MORE_WORK (1 << 31) -#define MOVE_STATUS_DID_NOT_HIT (MOVE_STATUS_MISSED \ - | MOVE_STATUS_INEFFECTIVE \ - | MOVE_STATUS_FAILED \ - | MOVE_STATUS_LEVITATED \ - | MOVE_STATUS_ONE_HIT_KO_FAILED \ - | MOVE_STATUS_MULTI_HIT_DISRUPTED \ - | MOVE_STATUS_PROTECTED \ - | MOVE_STATUS_SEMI_INVULNERABLE \ - | MOVE_STATUS_LOST_FOCUS \ - | MOVE_STATUS_WONDER_GUARD \ - | MOVE_STATUS_STURDY \ - | MOVE_STATUS_MAGNET_RISE) - -#define MOVE_STATUS_NO_EFFECTS (MOVE_STATUS_DID_NOT_HIT \ - | MOVE_STATUS_NO_PP \ - | MOVE_STATUS_NO_MORE_WORK) +#define MOVE_STATUS_DID_NOT_HIT (MOVE_STATUS_MISSED | MOVE_STATUS_INEFFECTIVE | MOVE_STATUS_FAILED | MOVE_STATUS_LEVITATED \ + | MOVE_STATUS_ONE_HIT_KO_FAILED | MOVE_STATUS_MULTI_HIT_DISRUPTED | MOVE_STATUS_PROTECTED | MOVE_STATUS_SEMI_INVULNERABLE \ + | MOVE_STATUS_LOST_FOCUS | MOVE_STATUS_WONDER_GUARD | MOVE_STATUS_STURDY | MOVE_STATUS_MAGNET_RISE) +#define MOVE_STATUS_NO_EFFECTS (MOVE_STATUS_DID_NOT_HIT | MOVE_STATUS_NO_PP | MOVE_STATUS_NO_MORE_WORK) #define MOVE_STATUS_DID_NOT_AFFECT (MOVE_STATUS_INEFFECTIVE | MOVE_STATUS_WONDER_GUARD) #define MOVE_STATUS_IMMUNE (MOVE_STATUS_DID_NOT_AFFECT | MOVE_STATUS_LEVITATED | MOVE_STATUS_MAGNET_RISE) #define MOVE_STATUS_GENERAL_MISS (MOVE_STATUS_MISSED | MOVE_STATUS_SEMI_INVULNERABLE) @@ -115,10 +91,7 @@ #define RANGE_USER_OR_ALLY (1 << 9) #define RANGE_SINGLE_TARGET_ME_FIRST (1 << 10) -#define RANGE_MY_SIDE (RANGE_SINGLE_TARGET_SPECIAL \ - | RANGE_USER \ - | RANGE_FIELD \ - | RANGE_USER_OR_ALLY) +#define RANGE_MY_SIDE (RANGE_SINGLE_TARGET_SPECIAL | RANGE_USER | RANGE_FIELD | RANGE_USER_OR_ALLY) #define MOVE_FLAG_MAKES_CONTACT (1 << 0) #define MOVE_FLAG_CAN_PROTECT (1 << 1) @@ -129,4 +102,4 @@ #define MOVE_FLAG_HIDES_HP_GAUGES (1 << 6) #define MOVE_FLAG_HIDES_SHADOWS (1 << 7) -#endif // POKEPLATINUM_CONSTANTS_BATTLE_MOVES_H \ No newline at end of file +#endif // POKEPLATINUM_CONSTANTS_BATTLE_MOVES_H diff --git a/include/constants/battle/scripts.h b/include/constants/battle/scripts.h deleted file mode 100644 index 2d127b78a3..0000000000 --- a/include/constants/battle/scripts.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef POKEPLATINUM_CONSTANTS_BATTLE_SCRIPTS_H -#define POKEPLATINUM_CONSTANTS_BATTLE_SCRIPTS_H - -enum { - BATTLE_SCRIPT_ANIMATION_DEEP_FOG = 18, - BATTLE_SCRIPT_ANIMATION_RAINING, - BATTLE_SCRIPT_ANIMATION_HAILING, - BATTLE_SCRIPT_ANIMATION_SANDSTORM, - BATTLE_SCRIPT_ANIMATION_SUNNY, -}; - -#endif // POKEPLATINUM_CONSTANTS_BATTLE_SCRIPTS_H \ No newline at end of file diff --git a/include/constants/battle/side_effects.h b/include/constants/battle/side_effects.h index 994f313c02..1bba18cbaf 100644 --- a/include/constants/battle/side_effects.h +++ b/include/constants/battle/side_effects.h @@ -11,15 +11,10 @@ #define MOVE_SIDE_EFFECT_TO_ATTACKER (1 << 30) #define MOVE_SIDE_EFFECT_TO_DEFENDER (1 << 31) -#define MOVE_SIDE_EFFECT_FLAGS (MOVE_SIDE_EFFECT_BREAK_SCREENS \ - | MOVE_SIDE_EFFECT_CHECK_SUBSTITUTE \ - | MOVE_SIDE_EFFECT_CHECK_HP_AND_SUBSTITUTE \ - | MOVE_SIDE_EFFECT_PROBABILISTIC \ - | MOVE_SIDE_EFFECT_CANNOT_PREVENT \ - | MOVE_SIDE_EFFECT_CHECK_HP \ - | MOVE_SIDE_EFFECT_ON_HIT \ - | MOVE_SIDE_EFFECT_TO_ATTACKER \ - | MOVE_SIDE_EFFECT_TO_DEFENDER) +#define MOVE_SIDE_EFFECT_FLAGS (MOVE_SIDE_EFFECT_BREAK_SCREENS | MOVE_SIDE_EFFECT_CHECK_SUBSTITUTE | MOVE_SIDE_EFFECT_CHECK_HP_AND_SUBSTITUTE \ + | MOVE_SIDE_EFFECT_PROBABILISTIC | MOVE_SIDE_EFFECT_CANNOT_PREVENT | MOVE_SIDE_EFFECT_CHECK_HP \ + | MOVE_SIDE_EFFECT_ON_HIT | MOVE_SIDE_EFFECT_TO_ATTACKER | MOVE_SIDE_EFFECT_TO_DEFENDER) + #define MOVE_SIDE_EFFECT_SUBSCRIPT_POINTER (~MOVE_SIDE_EFFECT_FLAGS) #endif // POKEPLATINUM_CONSTANTS_BATTLE_SIDE_EFFECTS_H diff --git a/include/constants/battle/system_control.h b/include/constants/battle/system_control.h index edd6122494..54665266c3 100644 --- a/include/constants/battle/system_control.h +++ b/include/constants/battle/system_control.h @@ -28,29 +28,16 @@ #define SYSCTL_MON_FAINTED ((1 << 24) | (1 << 25) | (1 << 26) | (1 << 27)) #define SYSCTL_MON_SELFDESTRUCTED ((1 << 28) | (1 << 29) | (1 << 30) | (1 << 31)) -#define SYSCTL_INIT (~(SYSCTL_SKIP_ATTACK_MESSAGE \ - | SYSCTL_CHECK_LOOP_ONLY_ONCE \ - | SYSCTL_HIT_DURING_FLY \ - | SYSCTL_HIT_DURING_DIG \ - | SYSCTL_HIT_DURING_DIVE \ - | SYSCTL_FIRST_OF_MULTI_TURN \ - | SYSCTL_SKIP_SPRITE_BLINK \ - | SYSCTL_TRY_SYNCHRONIZE_STATUS \ - | SYSCTL_BATON_PASS \ - | SYSCTL_LAST_OF_MULTI_TURN \ - | SYSCTL_NONSTANDARD_ACC_CHECK \ - | SYSCTL_IGNORE_TYPE_CHECKS \ - | SYSCTL_CRASH_DAMAGE \ - | SYSCTL_MOVE_HIT \ - | SYSCTL_PLAYED_MOVE_ANIMATION \ - | SYSCTL_IGNORE_IMMUNITIES \ - | SYSCTL_MULTI_HIT_SKIP_MESSAGE \ - | SYSCTL_FAIL_STAT_STAGE_CHANGE \ - | SYSCTL_MESSAGE_AFTER_MISS \ - | SYSCTL_HIT_DURING_SHADOW_FORCE \ - | SYSCTL_REUSE_LAST_MOVE \ - | SYSCTL_TURN_OFF_MESSAGES \ - | SYSCTL_APPLY_SECONDARY_EFFECT)) +#define SYSCTL_INIT_P1 (SYSCTL_SKIP_ATTACK_MESSAGE | SYSCTL_CHECK_LOOP_ONLY_ONCE | SYSCTL_HIT_DURING_FLY \ + | SYSCTL_HIT_DURING_DIG | SYSCTL_HIT_DURING_DIVE | SYSCTL_FIRST_OF_MULTI_TURN \ + | SYSCTL_SKIP_SPRITE_BLINK | SYSCTL_TRY_SYNCHRONIZE_STATUS | SYSCTL_BATON_PASS \ + | SYSCTL_LAST_OF_MULTI_TURN | SYSCTL_NONSTANDARD_ACC_CHECK | SYSCTL_IGNORE_TYPE_CHECKS) +#define SYSCTL_INIT_P2 (SYSCTL_CRASH_DAMAGE | SYSCTL_MOVE_HIT | SYSCTL_PLAYED_MOVE_ANIMATION \ + | SYSCTL_IGNORE_IMMUNITIES | SYSCTL_MULTI_HIT_SKIP_MESSAGE | SYSCTL_FAIL_STAT_STAGE_CHANGE \ + | SYSCTL_MESSAGE_AFTER_MISS | SYSCTL_HIT_DURING_SHADOW_FORCE | SYSCTL_REUSE_LAST_MOVE \ + | SYSCTL_TURN_OFF_MESSAGES | SYSCTL_APPLY_SECONDARY_EFFECT) + +#define SYSCTL_INIT (~(SYSCTL_INIT_P1 | SYSCTL_INIT_P2)) #define SYSCTL_MON_FAINTED_SHIFT 24 #define SYSCTL_MON_SELFDESTRUCTED_SHIFT 28 @@ -67,12 +54,12 @@ #define SYSCTL_LINK_WAITING ((1 << 24) | (1 << 25) | SYSCTL_FORM_CHANGE | (1 << 27)) #define SYSCTL_PAYOUT_EXP ((1 << 28) | (1 << 29) | (1 << 30) | (1 << 31)) -#define SYSCTL_INIT2 (~(SYSCTL_UPDATE_STAT_STAGES \ - | SYSCTL_ATTACK_MESSAGE_SHOWN \ - | SYSCTL_MAGIC_COAT_REFLECTED \ - | SYSCTL_UTURN_ACTIVE \ - | SYSCTL_MOVE_SUCCEEDED \ - | SYSCTL_RECOVER_HP_VISUAL)) +#define SYSCTL_INIT2 (~(SYSCTL_UPDATE_STAT_STAGES \ + | SYSCTL_ATTACK_MESSAGE_SHOWN \ + | SYSCTL_MAGIC_COAT_REFLECTED \ + | SYSCTL_UTURN_ACTIVE \ + | SYSCTL_MOVE_SUCCEEDED \ + | SYSCTL_RECOVER_HP_VISUAL)) #define SYSCTL_LINK_WAITING_SHIFT 24 #define SYSCTL_PAYOUT_EXP_SHIFT 28 diff --git a/src/overlay016/battle_controller.c b/src/overlay016/battle_controller.c index 997c200b04..f9656243a0 100644 --- a/src/overlay016/battle_controller.c +++ b/src/overlay016/battle_controller.c @@ -1127,7 +1127,7 @@ static void BattleController_CheckFieldConditions(BattleSystem *battleSys, Battl } } - battleCtx->scriptTemp = BATTLE_SCRIPT_ANIMATION_RAINING; + battleCtx->scriptTemp = BATTLE_ANIMATION_WEATHER_RAIN; state = STATE_BREAK_OUT; } @@ -1152,7 +1152,7 @@ static void BattleController_CheckFieldConditions(BattleSystem *battleSys, Battl } } - battleCtx->scriptTemp = BATTLE_SCRIPT_ANIMATION_SANDSTORM; + battleCtx->scriptTemp = BATTLE_ANIMATION_WEATHER_SAND; state = STATE_BREAK_OUT; } @@ -1177,7 +1177,7 @@ static void BattleController_CheckFieldConditions(BattleSystem *battleSys, Battl } } - battleCtx->scriptTemp = BATTLE_SCRIPT_ANIMATION_SUNNY; + battleCtx->scriptTemp = BATTLE_ANIMATION_WEATHER_SUN; state = STATE_BREAK_OUT; } @@ -1202,7 +1202,7 @@ static void BattleController_CheckFieldConditions(BattleSystem *battleSys, Battl } } - battleCtx->scriptTemp = BATTLE_SCRIPT_ANIMATION_HAILING; + battleCtx->scriptTemp = BATTLE_ANIMATION_WEATHER_HAIL; state = STATE_BREAK_OUT; } @@ -1216,7 +1216,7 @@ static void BattleController_CheckFieldConditions(BattleSystem *battleSys, Battl PrepareSubroutineSequence(battleCtx, BATTLE_SUBSEQ_WEATHER_CONTINUES); - battleCtx->scriptTemp = BATTLE_SCRIPT_ANIMATION_DEEP_FOG; + battleCtx->scriptTemp = BATTLE_ANIMATION_WEATHER_FOG; state = STATE_BREAK_OUT; } diff --git a/src/overlay016/battle_lib.c b/src/overlay016/battle_lib.c index 2e8949bfbb..c4f726789b 100644 --- a/src/overlay016/battle_lib.c +++ b/src/overlay016/battle_lib.c @@ -23,7 +23,6 @@ #include "battle/battle_controller.h" #include "battle/battle_message.h" #include "battle/battle_mon.h" -#include "battle/btlcmd.h" #include "battle/common.h" #include "unk_020021B0.h" @@ -1845,23 +1844,23 @@ void Battler_UnlockMoveChoice(BattleSystem *battleSys, BattleContext *battleCtx, battleCtx->battleMons[battler].moveEffectsData.furyCutterCount = 0; } -enum StatusEffect Battler_StatusCondition(BattleContext *battleCtx, int battler) +enum BattleAnimation Battler_StatusCondition(BattleContext *battleCtx, int battler) { if (battleCtx->battleMons[battler].status & MON_CONDITION_SLEEP) { - return STATUS_EFFECT_SLEEP; + return BATTLE_ANIMATION_ASLEEP; } else if (battleCtx->battleMons[battler].status & MON_CONDITION_POISON) { - return STATUS_EFFECT_POISON; + return BATTLE_ANIMATION_POISONED; } else if (battleCtx->battleMons[battler].status & MON_CONDITION_BURN) { - return STATUS_EFFECT_BURN; + return BATTLE_ANIMATION_BURNED; } else if (battleCtx->battleMons[battler].status & MON_CONDITION_FREEZE) { - return STATUS_EFFECT_FREEZE; + return BATTLE_ANIMATION_FROZEN; } else if (battleCtx->battleMons[battler].status & MON_CONDITION_PARALYSIS) { - return STATUS_EFFECT_PARALYSIS; + return BATTLE_ANIMATION_PARALYZED; } else if (battleCtx->battleMons[battler].status & MON_CONDITION_TOXIC) { - return STATUS_EFFECT_POISON; + return BATTLE_ANIMATION_POISONED; } - return STATUS_EFFECT_NONE; + return BATTLE_ANIMATION_NONE; } enum { @@ -7309,17 +7308,17 @@ void BattleSystem_SortMonActionOrder(BattleSystem *battleSys, BattleContext *bat } } -static const enum StatusEffect sEffectsAlwaysShown[] = { - STATUS_EFFECT_CHANGE_FORM_OUT, - STATUS_EFFECT_CHANGE_FORM_IN, - STATUS_EFFECT_ITEM_ESCAPE, - STATUS_EFFECT_WEATHER_FOG, - STATUS_EFFECT_WEATHER_RAIN, - STATUS_EFFECT_WEATHER_HAIL, - STATUS_EFFECT_WEATHER_SAND, - STATUS_EFFECT_WEATHER_SUN, - STATUS_EFFECT_SUBSTITUTE_ON, - STATUS_EFFECT_SUBSTITUTE_OFF, +static const enum BattleAnimation sEffectsAlwaysShown[] = { + BATTLE_ANIMATION_SUB_OUT, + BATTLE_ANIMATION_SUB_IN, + BATTLE_ANIMATION_ITEM_ESCAPE, + BATTLE_ANIMATION_WEATHER_FOG, + BATTLE_ANIMATION_WEATHER_RAIN, + BATTLE_ANIMATION_WEATHER_HAIL, + BATTLE_ANIMATION_WEATHER_SAND, + BATTLE_ANIMATION_WEATHER_SUN, + BATTLE_ANIMATION_SUBSTITUTE_IN, + BATTLE_ANIMATION_SUBSTITUTE_OUT, }; BOOL BattleSystem_ShouldShowStatusEffect(BattleContext *battleCtx, int battler, int status) diff --git a/src/overlay016/battle_script.c b/src/overlay016/battle_script.c index 4e56a8c550..ab4faf0c25 100644 --- a/src/overlay016/battle_script.c +++ b/src/overlay016/battle_script.c @@ -2137,43 +2137,43 @@ static BOOL BtlCmd_If(BattleSystem *battleSys, BattleContext *battleCtx) int *data = BattleScript_VarAddress(battleSys, battleCtx, srcVar); switch (op) { - case IFOP_EQU: + case OPCODE_EQU: if (*data != compareTo) { jump = 0; } break; - case IFOP_NEQ: + case OPCODE_NEQ: if (*data == compareTo) { jump = 0; } break; - case IFOP_GT: + case OPCODE_GT: if (*data <= compareTo) { jump = 0; } break; - case IFOP_LTE: + case OPCODE_LTE: if (*data > compareTo) { jump = 0; } break; - case IFOP_FLAG_SET: + case OPCODE_FLAG_SET: if ((*data & compareTo) == FALSE) { jump = 0; } break; - case IFOP_FLAG_NOT: + case OPCODE_FLAG_NOT: if (*data & compareTo) { jump = 0; } break; - case IFOP_AND: + case OPCODE_AND: if ((*data & compareTo) != compareTo) { jump = 0; } @@ -2218,43 +2218,43 @@ static BOOL BtlCmd_IfMonData(BattleSystem *battleSys, BattleContext *battleCtx) int data = BattleMon_Get(battleCtx, battler, srcParam, NULL); switch (op) { - case IFOP_EQU: + case OPCODE_EQU: if (data != compareTo) { jump = 0; } break; - case IFOP_NEQ: + case OPCODE_NEQ: if (data == compareTo) { jump = 0; } break; - case IFOP_GT: + case OPCODE_GT: if (data <= compareTo) { jump = 0; } break; - case IFOP_LTE: + case OPCODE_LTE: if (data > compareTo) { jump = 0; } break; - case IFOP_FLAG_SET: + case OPCODE_FLAG_SET: if ((data & compareTo) == FALSE) { jump = 0; } break; - case IFOP_FLAG_NOT: + case OPCODE_FLAG_NOT: if (data & compareTo) { jump = 0; } break; - case IFOP_AND: + case OPCODE_AND: if ((data & compareTo) != compareTo) { jump = 0; } @@ -2921,64 +2921,64 @@ static BOOL BtlCmd_SetVarValue(BattleSystem *battleSys, BattleContext *battleCtx u32 mask; switch (op) { - case VALOP_SET: + case OPCODE_SET: *var = srcVal; break; - case VALOP_ADD: + case OPCODE_ADD: *var += srcVal; break; - case VALOP_SUB: + case OPCODE_SUB: *var -= srcVal; break; - case VALOP_FLAG_ON: + case OPCODE_FLAG_ON: *var |= srcVal; break; - case VALOP_FLAG_OFF: + case OPCODE_FLAG_OFF: *var &= FLAG_NEGATE(srcVal); break; - case VALOP_MUL: + case OPCODE_MUL: *var *= srcVal; break; - case VALOP_DIV: + case OPCODE_DIV: *var /= srcVal; break; - case VALOP_LSH: + case OPCODE_LEFT_SHIFT: *var = *var << srcVal; break; - case VALOP_RSH: + case OPCODE_RIGHT_SHIFT: mask = *var; mask = mask >> srcVal; *var = mask; break; - case VALOP_FLAG_INDEX: + case OPCODE_FLAG_INDEX: *var = FlagIndex(srcVal); break; - case VALOP_GET: + case OPCODE_GET: GF_ASSERT(FALSE); break; - case VALOP_SUB_TO_ZERO: + case OPCODE_SUB_TO_ZERO: *var -= srcVal; if (*var < 0) { *var = 0; } break; - case VALOP_XOR: + case OPCODE_BITWISE_XOR: *var ^= srcVal; break; - case VALOP_AND: + case OPCODE_BITWISE_AND: *var &= srcVal; break; @@ -3061,19 +3061,19 @@ static BOOL BtlCmd_ChangeStatStage(BattleSystem *battleSys, BattleContext *battl if (battleCtx->sideEffectParam >= MOVE_SUBSCRIPT_PTR_ATTACK_DOWN_2_STAGES) { statOffset = battleCtx->sideEffectParam - MOVE_SUBSCRIPT_PTR_ATTACK_DOWN_2_STAGES; stageChange = -2; - battleCtx->scriptTemp = STATUS_EFFECT_STAGE_DOWN; + battleCtx->scriptTemp = BATTLE_ANIMATION_STAT_DROP; } else if (battleCtx->sideEffectParam >= MOVE_SUBSCRIPT_PTR_ATTACK_UP_2_STAGES) { statOffset = battleCtx->sideEffectParam - MOVE_SUBSCRIPT_PTR_ATTACK_UP_2_STAGES; stageChange = 2; - battleCtx->scriptTemp = STATUS_EFFECT_STAGE_UP; + battleCtx->scriptTemp = BATTLE_ANIMATION_STAT_BOOST; } else if (battleCtx->sideEffectParam >= MOVE_SUBSCRIPT_PTR_ATTACK_DOWN_1_STAGE) { statOffset = battleCtx->sideEffectParam - MOVE_SUBSCRIPT_PTR_ATTACK_DOWN_1_STAGE; stageChange = -1; - battleCtx->scriptTemp = STATUS_EFFECT_STAGE_DOWN; + battleCtx->scriptTemp = BATTLE_ANIMATION_STAT_DROP; } else { statOffset = battleCtx->sideEffectParam - MOVE_SUBSCRIPT_PTR_ATTACK_UP_1_STAGE; stageChange = 1; - battleCtx->scriptTemp = STATUS_EFFECT_STAGE_UP; + battleCtx->scriptTemp = BATTLE_ANIMATION_STAT_BOOST; } if (stageChange > 0) { @@ -3237,53 +3237,53 @@ static BOOL BtlCmd_SetMonDataValue(BattleSystem *battleSys, BattleContext *battl int monData = BattleMon_Get(battleCtx, battler, paramID, NULL); switch (op) { - case VALOP_SET: + case OPCODE_SET: monData = srcVal; break; - case VALOP_ADD: + case OPCODE_ADD: monData += srcVal; break; - case VALOP_SUB: + case OPCODE_SUB: monData -= srcVal; break; - case VALOP_FLAG_ON: + case OPCODE_FLAG_ON: monData |= srcVal; break; - case VALOP_FLAG_OFF: + case OPCODE_FLAG_OFF: monData &= FLAG_NEGATE(srcVal); break; - case VALOP_MUL: + case OPCODE_MUL: monData *= srcVal; break; - case VALOP_DIV: + case OPCODE_DIV: monData /= srcVal; break; - case VALOP_LSH: + case OPCODE_LEFT_SHIFT: monData = monData << srcVal; break; - case VALOP_RSH: + case OPCODE_RIGHT_SHIFT: u32 mask = monData; mask = mask >> srcVal; monData = mask; break; - case VALOP_FLAG_INDEX: + case OPCODE_FLAG_INDEX: monData = FlagIndex(srcVal); break; - case VALOP_GET: + case OPCODE_GET: GF_ASSERT(FALSE); break; - case VALOP_SUB_TO_ZERO: + case OPCODE_SUB_TO_ZERO: monData -= srcVal; if (monData < 0) { @@ -3291,11 +3291,11 @@ static BOOL BtlCmd_SetMonDataValue(BattleSystem *battleSys, BattleContext *battl } break; - case VALOP_XOR: + case OPCODE_BITWISE_XOR: monData ^= srcVal; break; - case VALOP_AND: + case OPCODE_BITWISE_AND: monData &= srcVal; break; @@ -3468,53 +3468,53 @@ static BOOL BtlCmd_SetVarFromVar(BattleSystem *battleSys, BattleContext *battleC int *srcData = BattleScript_VarAddress(battleSys, battleCtx, srcVar); switch (op) { - case VALOP_SET: + case OPCODE_SET: *dstData = *srcData; break; - case VALOP_ADD: + case OPCODE_ADD: *dstData += *srcData; break; - case VALOP_SUB: + case OPCODE_SUB: *dstData -= *srcData; break; - case VALOP_FLAG_ON: + case OPCODE_FLAG_ON: *dstData |= *srcData; break; - case VALOP_FLAG_OFF: + case OPCODE_FLAG_OFF: *dstData &= FLAG_NEGATE(*srcData); break; - case VALOP_MUL: + case OPCODE_MUL: *dstData *= *srcData; break; - case VALOP_DIV: + case OPCODE_DIV: *dstData /= *srcData; break; - case VALOP_LSH: + case OPCODE_LEFT_SHIFT: *dstData = *dstData << *srcData; break; - case VALOP_RSH: + case OPCODE_RIGHT_SHIFT: u32 tmp = *dstData; tmp = tmp >> *srcData; *dstData = tmp; break; - case VALOP_FLAG_INDEX: + case OPCODE_FLAG_INDEX: *dstData = FlagIndex(*srcData); break; - case VALOP_GET: + case OPCODE_GET: *srcData = *dstData; break; - case VALOP_SUB_TO_ZERO: + case OPCODE_SUB_TO_ZERO: *dstData -= *srcData; if (*dstData < 0) { @@ -3522,11 +3522,11 @@ static BOOL BtlCmd_SetVarFromVar(BattleSystem *battleSys, BattleContext *battleC } break; - case VALOP_XOR: + case OPCODE_BITWISE_XOR: *dstData ^= *srcData; break; - case VALOP_AND: + case OPCODE_BITWISE_AND: *dstData &= *srcData; break; @@ -3566,53 +3566,53 @@ static BOOL BtlCmd_SetMonDataFromVar(BattleSystem *battleSys, BattleContext *bat int *varData = BattleScript_VarAddress(battleSys, battleCtx, var); switch (op) { - case VALOP_SET: + case OPCODE_SET: monData = *varData; break; - case VALOP_ADD: + case OPCODE_ADD: monData += *varData; break; - case VALOP_SUB: + case OPCODE_SUB: monData -= *varData; break; - case VALOP_FLAG_ON: + case OPCODE_FLAG_ON: monData |= *varData; break; - case VALOP_FLAG_OFF: + case OPCODE_FLAG_OFF: monData &= FLAG_NEGATE(*varData); break; - case VALOP_MUL: + case OPCODE_MUL: monData *= *varData; break; - case VALOP_DIV: + case OPCODE_DIV: monData /= *varData; break; - case VALOP_LSH: + case OPCODE_LEFT_SHIFT: monData = monData << *varData; break; - case VALOP_RSH: + case OPCODE_RIGHT_SHIFT: u32 mask = monData; mask = mask >> *varData; monData = mask; break; - case VALOP_FLAG_INDEX: + case OPCODE_FLAG_INDEX: monData = FlagIndex(*varData); break; - case VALOP_GET: + case OPCODE_GET: *varData = monData; break; - case VALOP_SUB_TO_ZERO: + case OPCODE_SUB_TO_ZERO: monData -= *varData; if (monData < 0) { @@ -3620,11 +3620,11 @@ static BOOL BtlCmd_SetMonDataFromVar(BattleSystem *battleSys, BattleContext *bat } break; - case VALOP_XOR: + case OPCODE_BITWISE_XOR: monData ^= *varData; break; - case VALOP_AND: + case OPCODE_BITWISE_AND: monData &= *varData; break; @@ -3633,7 +3633,7 @@ static BOOL BtlCmd_SetMonDataFromVar(BattleSystem *battleSys, BattleContext *bat break; } - if (op != VALOP_GET) { + if (op != OPCODE_GET) { if (paramID == BATTLEMON_ABILITY) { BattleAI_SetAbility(battleCtx, battler, monData); } @@ -3987,10 +3987,10 @@ static BOOL BtlCmd_PlayStatusEffect(BattleSystem *battleSys, BattleContext *batt int effect = BattleScript_Read(battleCtx); if (BattleSystem_AnimationsOn(battleSys) == TRUE - || effect == STATUS_EFFECT_CHANGE_FORM_OUT - || effect == STATUS_EFFECT_CHANGE_FORM_IN - || effect == STATUS_EFFECT_SUBSTITUTE_OFF - || effect == STATUS_EFFECT_SUBSTITUTE_ON) { + || effect == BATTLE_ANIMATION_SUB_OUT + || effect == BATTLE_ANIMATION_SUB_IN + || effect == BATTLE_ANIMATION_SUBSTITUTE_OUT + || effect == BATTLE_ANIMATION_SUBSTITUTE_IN) { int battler = BattleScript_Battler(battleSys, battleCtx, inBattler); if (BattleSystem_ShouldShowStatusEffect(battleCtx, battler, effect) == TRUE) { BattleIO_PlayStatusEffect(battleSys, battleCtx, battler, effect); @@ -4023,10 +4023,10 @@ static BOOL BtlCmd_PlayStatusEffectAToD(BattleSystem *battleSys, BattleContext * int effect = BattleScript_Read(battleCtx); if (BattleSystem_AnimationsOn(battleSys) == TRUE - || effect == STATUS_EFFECT_CHANGE_FORM_OUT - || effect == STATUS_EFFECT_CHANGE_FORM_IN - || effect == STATUS_EFFECT_SUBSTITUTE_OFF - || effect == STATUS_EFFECT_SUBSTITUTE_ON) { + || effect == BATTLE_ANIMATION_SUB_OUT + || effect == BATTLE_ANIMATION_SUB_IN + || effect == BATTLE_ANIMATION_SUBSTITUTE_OUT + || effect == BATTLE_ANIMATION_SUBSTITUTE_IN) { int attacker = BattleScript_Battler(battleSys, battleCtx, inAttacker); int defender = BattleScript_Battler(battleSys, battleCtx, inDefender); @@ -4060,10 +4060,10 @@ static BOOL BtlCmd_PlayStatusEffectFromVar(BattleSystem *battleSys, BattleContex int *effect = BattleScript_VarAddress(battleSys, battleCtx, var); if ((BattleSystem_AnimationsOn(battleSys) == TRUE - || var == STATUS_EFFECT_CHANGE_FORM_OUT // bug: this should be *effect, not var - || var == STATUS_EFFECT_CHANGE_FORM_IN // bug: this should be *effect, not var - || *effect == STATUS_EFFECT_SUBSTITUTE_OFF - || *effect == STATUS_EFFECT_SUBSTITUTE_ON) + || var == BATTLE_ANIMATION_SUB_OUT // bug: this should be *effect, not var + || var == BATTLE_ANIMATION_SUB_IN // bug: this should be *effect, not var + || *effect == BATTLE_ANIMATION_SUBSTITUTE_OUT + || *effect == BATTLE_ANIMATION_SUBSTITUTE_IN) && BattleSystem_ShouldShowStatusEffect(battleCtx, battler, *effect) == TRUE) { BattleIO_PlayStatusEffect(battleSys, battleCtx, battler, *effect); } @@ -4280,43 +4280,43 @@ static BOOL BtlCmd_IfVar(BattleSystem *battleSys, BattleContext *battleCtx) u32 *rhs = BattleScript_VarAddress(battleSys, battleCtx, rhsVar); switch (op) { - case IFOP_EQU: + case OPCODE_EQU: if (*lhs != *rhs) { jump = 0; } break; - case IFOP_NEQ: + case OPCODE_NEQ: if (*lhs == *rhs) { jump = 0; } break; - case IFOP_GT: + case OPCODE_GT: if (*lhs <= *rhs) { jump = 0; } break; - case IFOP_LTE: + case OPCODE_LTE: if (*lhs > *rhs) { jump = 0; } break; - case IFOP_FLAG_SET: + case OPCODE_FLAG_SET: if ((*lhs & *rhs) == FALSE) { jump = 0; } break; - case IFOP_FLAG_NOT: + case OPCODE_FLAG_NOT: if (*lhs & *rhs) { jump = 0; } break; - case IFOP_AND: + case OPCODE_AND: if ((*lhs & *rhs) != *rhs) { jump = 0; } @@ -4361,43 +4361,43 @@ static BOOL BtlCmd_IfMonDataVar(BattleSystem *battleSys, BattleContext *battleCt u32 *rhs = BattleScript_VarAddress(battleSys, battleCtx, rhsVar); switch (op) { - case IFOP_EQU: + case OPCODE_EQU: if (lhs != *rhs) { jump = 0; } break; - case IFOP_NEQ: + case OPCODE_NEQ: if (lhs == *rhs) { jump = 0; } break; - case IFOP_GT: + case OPCODE_GT: if (lhs <= *rhs) { jump = 0; } break; - case IFOP_LTE: + case OPCODE_LTE: if (lhs > *rhs) { jump = 0; } break; - case IFOP_FLAG_SET: + case OPCODE_FLAG_SET: if ((lhs & *rhs) == FALSE) { jump = 0; } break; - case IFOP_FLAG_NOT: + case OPCODE_FLAG_NOT: if (lhs & *rhs) { jump = 0; } break; - case IFOP_AND: + case OPCODE_AND: if ((lhs & *rhs) != *rhs) { jump = 0; } @@ -10072,7 +10072,7 @@ static void BattleScript_GetExpTask(SysTask *task, void *inData) if (Pokemon_ShouldLevelUp(mon)) { // Only play the special level-up animation for an active battler if (data->battleCtx->selectedPartySlot[expBattler] == slot) { - BattleIO_PlayStatusEffect(data->battleSys, data->battleCtx, expBattler, STATUS_EFFECT_LEVEL_UP); + BattleIO_PlayStatusEffect(data->battleSys, data->battleCtx, expBattler, BATTLE_ANIMATION_LEVEL_UP); BattleIO_PlayLevelUpAnimation(data->battleSys, expBattler); } From ba60196b55419f8f0583cf51f5378758b2caae36 Mon Sep 17 00:00:00 2001 From: Rachel Date: Sun, 21 Jan 2024 16:39:23 -0800 Subject: [PATCH 2/7] Move global-level consts used by battle scripts to constgen manifest --- consts/battle.json | 130 ++++ consts/global.json | 867 +++++++++++++++++++++++++++ consts/meson.build | 6 +- include/battle/battle_lib.h | 121 +--- include/constants/abilities.h | 131 ---- include/constants/gender.h | 10 - include/constants/items.h | 170 +----- include/constants/moves.h | 476 +-------------- include/constants/pokemon.h | 66 +- include/data/trainer_class_genders.h | 2 +- include/move_table.h | 17 +- res/items/meson.build | 6 +- res/items/pl_item_data_format.txt | 4 +- src/overlay016/battle_controller.c | 2 +- src/overlay016/battle_lib.c | 5 +- src/overlay016/battle_script.c | 5 +- src/pokemon.c | 2 +- 17 files changed, 1034 insertions(+), 986 deletions(-) create mode 100644 consts/global.json delete mode 100644 include/constants/abilities.h delete mode 100644 include/constants/gender.h diff --git a/consts/battle.json b/consts/battle.json index 1048c549cb..a24ab26abe 100644 --- a/consts/battle.json +++ b/consts/battle.json @@ -17,6 +17,10 @@ "@TurnFlag", "@CheckSideConditionOp", "@SideCondition" + ], + "battle_lib_params": [ + "@BattleContextParam", + "@BattleMonParam" ] }, "definitions": { @@ -785,6 +789,132 @@ "SIDE_COND_SPIKES_LAYERS", "SIDE_COND_TOXIC_SPIKES_LAYERS" ] + }, + "@BattleContextParam": { + "type": "enum", + "values": [ + "BATTLECTX_SIDE_CONDITIONS_MASK", + "BATTLECTX_SIDE_MIST_TURNS", + "BATTLECTX_SELECTED_PARTY_SLOT", + "BATTLECTX_TOTAL_TURNS", + "BATTLECTX_LEVEL_UP_MONS", + "BATTLECTX_SAFARI_ESCAPE_COUNT", + "BATTLECTX_TOTAL_FAINTED_FOR", + "BATTLECTX_TOTAL_DAMAGE_FOR", + "BATTLECTX_ACTION_FOR", + "BATTLECTX_AICTX_DEFENDER", + "BATTLECTX_SWITCHING_MASK", + "BATTLECTX_AICTX_SELECTED_TARGET", + "BATTLECTX_ACTION_TEMP_FOR", + "BATTLECTX_CONTROL_COMMAND", + "BATTLECTX_NEXT_CONTROL_COMMAND" + ] + }, + "@BattleMonParam": { + "type": "enum", + "values": [ + "BATTLEMON_SPECIES", + "BATTLEMON_ATTACK", + "BATTLEMON_DEFENSE", + "BATTLEMON_SPEED", + "BATTLEMON_SP_ATTACK", + "BATTLEMON_SP_DEFENSE", + "BATTLEMON_MOVE_1", + "BATTLEMON_MOVE_2", + "BATTLEMON_MOVE_3", + "BATTLEMON_MOVE_4", + "BATTLEMON_HP_IV", + "BATTLEMON_ATTACK_IV", + "BATTLEMON_DEFENSE_IV", + "BATTLEMON_SPEED_IV", + "BATTLEMON_SP_ATTACK_IV", + "BATTLEMON_SP_DEFENSE_IV", + "BATTLEMON_IS_EGG", + "BATTLEMON_HAS_NICKNAME", + "BATTLEMON_HP_STAGE", + "BATTLEMON_ATTACK_STAGE", + "BATTLEMON_DEFENSE_STAGE", + "BATTLEMON_SPEED_STAGE", + "BATTLEMON_SP_ATTACK_STAGE", + "BATTLEMON_SP_DEFENSE_STAGE", + "BATTLEMON_ACCURACY_STAGE", + "BATTLEMON_EVASION_STAGE", + "BATTLEMON_ABILITY", + "BATTLEMON_TYPE_1", + "BATTLEMON_TYPE_2", + "BATTLEMON_GENDER", + "BATTLEMON_IS_SHINY", + "BATTLEMON_CUR_PP_1", + "BATTLEMON_CUR_PP_2", + "BATTLEMON_CUR_PP_3", + "BATTLEMON_CUR_PP_4", + "BATTLEMON_PP_UPS_1", + "BATTLEMON_PP_UPS_2", + "BATTLEMON_PP_UPS_3", + "BATTLEMON_PP_UPS_4", + "BATTLEMON_MAX_PP_1", + "BATTLEMON_MAX_PP_2", + "BATTLEMON_MAX_PP_3", + "BATTLEMON_MAX_PP_4", + "BATTLEMON_LEVEL", + "BATTLEMON_FRIENDSHIP", + "BATTLEMON_NICKNAME", + "BATTLEMON_NICKNAME_STRBUF", + "BATTLEMON_CUR_HP", + "BATTLEMON_MAX_HP", + "BATTLEMON_OT_NAME", + "BATTLEMON_EXP", + "BATTLEMON_PERSONALITY", + "BATTLEMON_STATUS", + "BATTLEMON_VOLATILE_STATUS", + "BATTLEMON_OT_ID", + "BATTLEMON_HELD_ITEM", + "BATTLEMON_TIMES_DAMAGED", + "BATTLEMON_TRAINER_MESSAGE_FLAGS", + "BATTLEMON_OT_GENDER", + "BATTLEMON_MOVE_EFFECTS_MASK", + "BATTLEMON_MOVE_EFFECTS_TEMP", + "BATTLEMON_DISABLED_TURNS", + "BATTLEMON_ENCORED_TURNS", + "BATTLEMON_CHARGED_TURNS", + "BATTLEMON_TAUNTED_TURNS", + "BATTLEMON_SUCCESSFUL_PROTECT_TURNS", + "BATTLEMON_PERISH_SONG_TURNS", + "BATTLEMON_ROLLOUT_COUNT", + "BATTLEMON_FURY_CUTTER_COUNT", + "BATTLEMON_STOCKPILE_COUNT", + "BATTLEMON_STOCKPILE_DEF_BOOSTS", + "BATTLEMON_STOCKPILE_SPDEF_BOOSTS", + "BATTLEMON_TRUANT", + "BATTLEMON_FLASH_FIRE", + "BATTLEMON_LOCK_ON_TARGET", + "BATTLEMON_MIMICKED_MOVE_SLOT", + "BATTLEMON_BIND_TARGET", + "BATTLEMON_MEAN_LOOK_TARGET", + "BATTLEMON_LAST_RESORT_COUNT", + "BATTLEMON_MAGNET_RISE_TURNS", + "BATTLEMON_HEAL_BLOCK_TURNS", + "BATTLEMON_EMBARGO_TURNS", + "BATTLEMON_CAN_UNBURDEN", + "BATTLEMON_METRONOME_TURNS", + "BATTLEMON_MICLE_BERRY", + "BATTLEMON_CUSTAP_BERRY", + "BATTLEMON_QUICK_CLAW", + "BATTLEMON_RECHARGE_TURN_NUMBER", + "BATTLEMON_FAKE_OUT_TURN_NUMBER", + "BATTLEMON_SLOW_START_TURN_NUMBER", + "BATTLEMON_SUBSTITUTE_HP", + "BATTLEMON_TRANSFORMED_PERSONALITY", + "BATTLEMON_DISABLED_MOVE", + "BATTLEMON_ENCORED_MOVE", + "BATTLEMON_BINDING_MOVE", + "BATTLEMON_ITEM_HP_RECOVERY", + "BATTLEMON_SLOW_START_ANNOUNCED", + "BATTLEMON_SLOW_START_FINISHED", + "BATTLEMON_FORM_NUM", + "BATTLEMON_UNUSED_99", + "BATTLEMON_TEMP" + ] } } } diff --git a/consts/global.json b/consts/global.json new file mode 100644 index 0000000000..90572bf77f --- /dev/null +++ b/consts/global.json @@ -0,0 +1,867 @@ +{ + "targets": { + "abilities": [ + "@Ability" + ], + "moves": [ + "@MoveAttribute", + "@Move" + ], + "pokemon": [ + "@PokemonType", + "@PokemonPersonalDataParam" + ], + "items": [ + "@ItemHoldEffect" + ], + "gender": [ + "@Gender" + ] + }, + "definitions": { + "@Ability": { + "type": "enum", + "values": [ + "ABILITY_NONE", + "ABILITY_STENCH", + "ABILITY_DRIZZLE", + "ABILITY_SPEED_BOOST", + "ABILITY_BATTLE_ARMOR", + "ABILITY_STURDY", + "ABILITY_DAMP", + "ABILITY_LIMBER", + "ABILITY_SAND_VEIL", + "ABILITY_STATIC", + "ABILITY_VOLT_ABSORB", + "ABILITY_WATER_ABSORB", + "ABILITY_OBLIVIOUS", + "ABILITY_CLOUD_NINE", + "ABILITY_COMPOUND_EYES", + "ABILITY_INSOMNIA", + "ABILITY_COLOR_CHANGE", + "ABILITY_IMMUNITY", + "ABILITY_FLASH_FIRE", + "ABILITY_SHIELD_DUST", + "ABILITY_OWN_TEMPO", + "ABILITY_SUCTION_CUPS", + "ABILITY_INTIMIDATE", + "ABILITY_SHADOW_TAG", + "ABILITY_ROUGH_SKIN", + "ABILITY_WONDER_GUARD", + "ABILITY_LEVITATE", + "ABILITY_EFFECT_SPORE", + "ABILITY_SYNCHRONIZE", + "ABILITY_CLEAR_BODY", + "ABILITY_NATURAL_CURE", + "ABILITY_LIGHTNING_ROD", + "ABILITY_SERENE_GRACE", + "ABILITY_SWIFT_SWIM", + "ABILITY_CHLOROPHYLL", + "ABILITY_ILLUMINATE", + "ABILITY_TRACE", + "ABILITY_HUGE_POWER", + "ABILITY_POISON_POINT", + "ABILITY_INNER_FOCUS", + "ABILITY_MAGMA_ARMOR", + "ABILITY_WATER_VEIL", + "ABILITY_MAGNET_PULL", + "ABILITY_SOUNDPROOF", + "ABILITY_RAIN_DISH", + "ABILITY_SAND_STREAM", + "ABILITY_PRESSURE", + "ABILITY_THICK_FAT", + "ABILITY_EARLY_BIRD", + "ABILITY_FLAME_BODY", + "ABILITY_RUN_AWAY", + "ABILITY_KEEN_EYE", + "ABILITY_HYPER_CUTTER", + "ABILITY_PICKUP", + "ABILITY_TRUANT", + "ABILITY_HUSTLE", + "ABILITY_CUTE_CHARM", + "ABILITY_PLUS", + "ABILITY_MINUS", + "ABILITY_FORECAST", + "ABILITY_STICKY_HOLD", + "ABILITY_SHED_SKIN", + "ABILITY_GUTS", + "ABILITY_MARVEL_SCALE", + "ABILITY_LIQUID_OOZE", + "ABILITY_OVERGROW", + "ABILITY_BLAZE", + "ABILITY_TORRENT", + "ABILITY_SWARM", + "ABILITY_ROCK_HEAD", + "ABILITY_DROUGHT", + "ABILITY_ARENA_TRAP", + "ABILITY_VITAL_SPIRIT", + "ABILITY_WHITE_SMOKE", + "ABILITY_PURE_POWER", + "ABILITY_SHELL_ARMOR", + "ABILITY_AIR_LOCK", + "ABILITY_TANGLED_FEET", + "ABILITY_MOTOR_DRIVE", + "ABILITY_RIVALRY", + "ABILITY_STEADFAST", + "ABILITY_SNOW_CLOAK", + "ABILITY_GLUTTONY", + "ABILITY_ANGER_POINT", + "ABILITY_UNBURDEN", + "ABILITY_HEATPROOF", + "ABILITY_SIMPLE", + "ABILITY_DRY_SKIN", + "ABILITY_DOWNLOAD", + "ABILITY_IRON_FIST", + "ABILITY_POISON_HEAL", + "ABILITY_ADAPTABILITY", + "ABILITY_SKILL_LINK", + "ABILITY_HYDRATION", + "ABILITY_SOLAR_POWER", + "ABILITY_QUICK_FEET", + "ABILITY_NORMALIZE", + "ABILITY_SNIPER", + "ABILITY_MAGIC_GUARD", + "ABILITY_NO_GUARD", + "ABILITY_STALL", + "ABILITY_TECHNICIAN", + "ABILITY_LEAF_GUARD", + "ABILITY_KLUTZ", + "ABILITY_MOLD_BREAKER", + "ABILITY_SUPER_LUCK", + "ABILITY_AFTERMATH", + "ABILITY_ANTICIPATION", + "ABILITY_FOREWARN", + "ABILITY_UNAWARE", + "ABILITY_TINTED_LENS", + "ABILITY_FILTER", + "ABILITY_SLOW_START", + "ABILITY_SCRAPPY", + "ABILITY_STORM_DRAIN", + "ABILITY_ICE_BODY", + "ABILITY_SOLID_ROCK", + "ABILITY_SNOW_WARNING", + "ABILITY_HONEY_GATHER", + "ABILITY_FRISK", + "ABILITY_RECKLESS", + "ABILITY_MULTITYPE", + "ABILITY_FLOWER_GIFT", + "ABILITY_BAD_DREAMS" + ] + }, + "@MoveAttribute": { + "type": "enum", + "values": [ + "MOVEATTRIBUTE_EFFECT", + "MOVEATTRIBUTE_CLASS", + "MOVEATTRIBUTE_POWER", + "MOVEATTRIBUTE_TYPE", + "MOVEATTRIBUTE_ACCURACY", + "MOVEATTRIBUTE_PP", + "MOVEATTRIBUTE_EFFECT_CHANCE", + "MOVEATTRIBUTE_RANGE", + "MOVEATTRIBUTE_PRIORTY", + "MOVEATTRIBUTE_FLAGS", + "MOVEATTRIBUTE_CONTEST_EFFECT", + "MOVEATTRIBUTE_CONTEST_TYPE" + ] + }, + "@Move": { + "type": "enum", + "values": [ + "MOVE_NONE", + "MOVE_POUND", + "MOVE_KARATE_CHOP", + "MOVE_DOUBLE_SLAP", + "MOVE_COMET_PUNCH", + "MOVE_MEGA_PUNCH", + "MOVE_PAY_DAY", + "MOVE_FIRE_PUNCH", + "MOVE_ICE_PUNCH", + "MOVE_THUNDER_PUNCH", + "MOVE_SCRATCH", + "MOVE_VICE_GRIP", + "MOVE_GUILLOTINE", + "MOVE_RAZOR_WIND", + "MOVE_SWORDS_DANCE", + "MOVE_CUT", + "MOVE_GUST", + "MOVE_WING_ATTACK", + "MOVE_WHIRLWIND", + "MOVE_FLY", + "MOVE_BIND", + "MOVE_SLAM", + "MOVE_VINE_WHIP", + "MOVE_STOMP", + "MOVE_DOUBLE_KICK", + "MOVE_MEGA_KICK", + "MOVE_JUMP_KICK", + "MOVE_ROLLING_KICK", + "MOVE_SAND_ATTACK", + "MOVE_HEADBUTT", + "MOVE_HORN_ATTACK", + "MOVE_FURY_ATTACK", + "MOVE_HORN_DRILL", + "MOVE_TACKLE", + "MOVE_BODY_SLAM", + "MOVE_WRAP", + "MOVE_TAKE_DOWN", + "MOVE_THRASH", + "MOVE_DOUBLE_EDGE", + "MOVE_TAIL_WHIP", + "MOVE_POISON_STING", + "MOVE_TWINEEDLE", + "MOVE_PIN_MISSILE", + "MOVE_LEER", + "MOVE_BITE", + "MOVE_GROWL", + "MOVE_ROAR", + "MOVE_SING", + "MOVE_SUPERSONIC", + "MOVE_SONIC_BOOM", + "MOVE_DISABLE", + "MOVE_ACID", + "MOVE_EMBER", + "MOVE_FLAMETHROWER", + "MOVE_MIST", + "MOVE_WATER_GUN", + "MOVE_HYDRO_PUMP", + "MOVE_SURF", + "MOVE_ICE_BEAM", + "MOVE_BLIZZARD", + "MOVE_PSYBEAM", + "MOVE_BUBBLE_BEAM", + "MOVE_AURORA_BEAM", + "MOVE_HYPER_BEAM", + "MOVE_PECK", + "MOVE_DRILL_PECK", + "MOVE_SUBMISSION", + "MOVE_LOW_KICK", + "MOVE_COUNTER", + "MOVE_SEISMIC_TOSS", + "MOVE_STRENGTH", + "MOVE_ABSORB", + "MOVE_MEGA_DRAIN", + "MOVE_LEECH_SEED", + "MOVE_GROWTH", + "MOVE_RAZOR_LEAF", + "MOVE_SOLAR_BEAM", + "MOVE_POISON_POWDER", + "MOVE_STUN_SPORE", + "MOVE_SLEEP_POWDER", + "MOVE_PETAL_DANCE", + "MOVE_STRING_SHOT", + "MOVE_DRAGON_RAGE", + "MOVE_FIRE_SPIN", + "MOVE_THUNDER_SHOCK", + "MOVE_THUNDERBOLT", + "MOVE_THUNDER_WAVE", + "MOVE_THUNDER", + "MOVE_ROCK_THROW", + "MOVE_EARTHQUAKE", + "MOVE_FISSURE", + "MOVE_DIG", + "MOVE_TOXIC", + "MOVE_CONFUSION", + "MOVE_PSYCHIC", + "MOVE_HYPNOSIS", + "MOVE_MEDITATE", + "MOVE_AGILITY", + "MOVE_QUICK_ATTACK", + "MOVE_RAGE", + "MOVE_TELEPORT", + "MOVE_NIGHT_SHADE", + "MOVE_MIMIC", + "MOVE_SCREECH", + "MOVE_DOUBLE_TEAM", + "MOVE_RECOVER", + "MOVE_HARDEN", + "MOVE_MINIMIZE", + "MOVE_SMOKE_SCREEN", + "MOVE_CONFUSE_RAY", + "MOVE_WITHDRAW", + "MOVE_DEFENSE_CURL", + "MOVE_BARRIER", + "MOVE_LIGHT_SCREEN", + "MOVE_HAZE", + "MOVE_REFLECT", + "MOVE_FOCUS_ENERGY", + "MOVE_BIDE", + "MOVE_METRONOME", + "MOVE_MIRROR_MOVE", + "MOVE_SELFDESTRUCT", + "MOVE_EGG_BOMB", + "MOVE_LICK", + "MOVE_SMOG", + "MOVE_SLUDGE", + "MOVE_BONE_CLUB", + "MOVE_FIRE_BLAST", + "MOVE_WATERFALL", + "MOVE_CLAMP", + "MOVE_SWIFT", + "MOVE_SKULL_BASH", + "MOVE_SPIKE_CANNON", + "MOVE_CONSTRICT", + "MOVE_AMNESIA", + "MOVE_KINESIS", + "MOVE_SOFTBOILED", + "MOVE_HI_JUMP_KICK", + "MOVE_GLARE", + "MOVE_DREAM_EATER", + "MOVE_POISON_GAS", + "MOVE_BARRAGE", + "MOVE_LEECH_LIFE", + "MOVE_LOVELY_KISS", + "MOVE_SKY_ATTACK", + "MOVE_TRANSFORM", + "MOVE_BUBBLE", + "MOVE_DIZZY_PUNCH", + "MOVE_SPORE", + "MOVE_FLASH", + "MOVE_PSYWAVE", + "MOVE_SPLASH", + "MOVE_ACID_ARMOR", + "MOVE_CRABHAMMER", + "MOVE_EXPLOSION", + "MOVE_FURY_SWIPES", + "MOVE_BONEMERANG", + "MOVE_REST", + "MOVE_ROCK_SLIDE", + "MOVE_HYPER_FANG", + "MOVE_SHARPEN", + "MOVE_CONVERSION", + "MOVE_TRI_ATTACK", + "MOVE_SUPER_FANG", + "MOVE_SLASH", + "MOVE_SUBSTITUTE", + "MOVE_STRUGGLE", + "MOVE_SKETCH", + "MOVE_TRIPLE_KICK", + "MOVE_THIEF", + "MOVE_SPIDER_WEB", + "MOVE_MIND_READER", + "MOVE_NIGHTMARE", + "MOVE_FLAME_WHEEL", + "MOVE_SNORE", + "MOVE_CURSE", + "MOVE_FLAIL", + "MOVE_CONVERSION_2", + "MOVE_AEROBLAST", + "MOVE_COTTON_SPORE", + "MOVE_REVERSAL", + "MOVE_SPITE", + "MOVE_POWDER_SNOW", + "MOVE_PROTECT", + "MOVE_MACH_PUNCH", + "MOVE_SCARY_FACE", + "MOVE_FAINT_ATTACK", + "MOVE_SWEET_KISS", + "MOVE_BELLY_DRUM", + "MOVE_SLUDGE_BOMB", + "MOVE_MUD_SLAP", + "MOVE_OCTAZOOKA", + "MOVE_SPIKES", + "MOVE_ZAP_CANNON", + "MOVE_FORESIGHT", + "MOVE_DESTINY_BOND", + "MOVE_PERISH_SONG", + "MOVE_ICY_WIND", + "MOVE_DETECT", + "MOVE_BONE_RUSH", + "MOVE_LOCK_ON", + "MOVE_OUTRAGE", + "MOVE_SANDSTORM", + "MOVE_GIGA_DRAIN", + "MOVE_ENDURE", + "MOVE_CHARM", + "MOVE_ROLLOUT", + "MOVE_FALSE_SWIPE", + "MOVE_SWAGGER", + "MOVE_MILK_DRINK", + "MOVE_SPARK", + "MOVE_FURY_CUTTER", + "MOVE_STEEL_WING", + "MOVE_MEAN_LOOK", + "MOVE_ATTRACT", + "MOVE_SLEEP_TALK", + "MOVE_HEAL_BELL", + "MOVE_RETURN", + "MOVE_PRESENT", + "MOVE_FRUSTRATION", + "MOVE_SAFEGUARD", + "MOVE_PAIN_SPLIT", + "MOVE_SACRED_FIRE", + "MOVE_MAGNITUDE", + "MOVE_DYNAMIC_PUNCH", + "MOVE_MEGAHORN", + "MOVE_DRAGON_BREATH", + "MOVE_BATON_PASS", + "MOVE_ENCORE", + "MOVE_PURSUIT", + "MOVE_RAPID_SPIN", + "MOVE_SWEET_SCENT", + "MOVE_IRON_TAIL", + "MOVE_METAL_CLAW", + "MOVE_VITAL_THROW", + "MOVE_MORNING_SUN", + "MOVE_SYNTHESIS", + "MOVE_MOONLIGHT", + "MOVE_HIDDEN_POWER", + "MOVE_CROSS_CHOP", + "MOVE_TWISTER", + "MOVE_RAIN_DANCE", + "MOVE_SUNNY_DAY", + "MOVE_CRUNCH", + "MOVE_MIRROR_COAT", + "MOVE_PSYCH_UP", + "MOVE_EXTREME_SPEED", + "MOVE_ANCIENT_POWER", + "MOVE_SHADOW_BALL", + "MOVE_FUTURE_SIGHT", + "MOVE_ROCK_SMASH", + "MOVE_WHIRLPOOL", + "MOVE_BEAT_UP", + "MOVE_FAKE_OUT", + "MOVE_UPROAR", + "MOVE_STOCKPILE", + "MOVE_SPIT_UP", + "MOVE_SWALLOW", + "MOVE_HEAT_WAVE", + "MOVE_HAIL", + "MOVE_TORMENT", + "MOVE_FLATTER", + "MOVE_WILL_O_WISP", + "MOVE_MEMENTO", + "MOVE_FACADE", + "MOVE_FOCUS_PUNCH", + "MOVE_SMELLING_SALT", + "MOVE_FOLLOW_ME", + "MOVE_NATURE_POWER", + "MOVE_CHARGE", + "MOVE_TAUNT", + "MOVE_HELPING_HAND", + "MOVE_TRICK", + "MOVE_ROLE_PLAY", + "MOVE_WISH", + "MOVE_ASSIST", + "MOVE_INGRAIN", + "MOVE_SUPERPOWER", + "MOVE_MAGIC_COAT", + "MOVE_RECYCLE", + "MOVE_REVENGE", + "MOVE_BRICK_BREAK", + "MOVE_YAWN", + "MOVE_KNOCK_OFF", + "MOVE_ENDEAVOR", + "MOVE_ERUPTION", + "MOVE_SKILL_SWAP", + "MOVE_IMPRISON", + "MOVE_REFRESH", + "MOVE_GRUDGE", + "MOVE_SNATCH", + "MOVE_SECRET_POWER", + "MOVE_DIVE", + "MOVE_ARM_THRUST", + "MOVE_CAMOUFLAGE", + "MOVE_TAIL_GLOW", + "MOVE_LUSTER_PURGE", + "MOVE_MIST_BALL", + "MOVE_FEATHER_DANCE", + "MOVE_TEETER_DANCE", + "MOVE_BLAZE_KICK", + "MOVE_MUD_SPORT", + "MOVE_ICE_BALL", + "MOVE_NEEDLE_ARM", + "MOVE_SLACK_OFF", + "MOVE_HYPER_VOICE", + "MOVE_POISON_FANG", + "MOVE_CRUSH_CLAW", + "MOVE_BLAST_BURN", + "MOVE_HYDRO_CANNON", + "MOVE_METEOR_MASH", + "MOVE_ASTONISH", + "MOVE_WEATHER_BALL", + "MOVE_AROMATHERAPY", + "MOVE_FAKE_TEARS", + "MOVE_AIR_CUTTER", + "MOVE_OVERHEAT", + "MOVE_ODOR_SLEUTH", + "MOVE_ROCK_TOMB", + "MOVE_SILVER_WIND", + "MOVE_METAL_SOUND", + "MOVE_GRASS_WHISTLE", + "MOVE_TICKLE", + "MOVE_COSMIC_POWER", + "MOVE_WATER_SPOUT", + "MOVE_SIGNAL_BEAM", + "MOVE_SHADOW_PUNCH", + "MOVE_EXTRASENSORY", + "MOVE_SKY_UPPERCUT", + "MOVE_SAND_TOMB", + "MOVE_SHEER_COLD", + "MOVE_MUDDY_WATER", + "MOVE_BULLET_SEED", + "MOVE_AERIAL_ACE", + "MOVE_ICICLE_SPEAR", + "MOVE_IRON_DEFENSE", + "MOVE_BLOCK", + "MOVE_HOWL", + "MOVE_DRAGON_CLAW", + "MOVE_FRENZY_PLANT", + "MOVE_BULK_UP", + "MOVE_BOUNCE", + "MOVE_MUD_SHOT", + "MOVE_POISON_TAIL", + "MOVE_COVET", + "MOVE_VOLT_TACKLE", + "MOVE_MAGICAL_LEAF", + "MOVE_WATER_SPORT", + "MOVE_CALM_MIND", + "MOVE_LEAF_BLADE", + "MOVE_DRAGON_DANCE", + "MOVE_ROCK_BLAST", + "MOVE_SHOCK_WAVE", + "MOVE_WATER_PULSE", + "MOVE_DOOM_DESIRE", + "MOVE_PSYCHO_BOOST", + "MOVE_ROOST", + "MOVE_GRAVITY", + "MOVE_MIRACLE_EYE", + "MOVE_WAKE_UP_SLAP", + "MOVE_HAMMER_ARM", + "MOVE_GYRO_BALL", + "MOVE_HEALING_WISH", + "MOVE_BRINE", + "MOVE_NATURAL_GIFT", + "MOVE_FEINT", + "MOVE_PLUCK", + "MOVE_TAILWIND", + "MOVE_ACUPRESSURE", + "MOVE_METAL_BURST", + "MOVE_U_TURN", + "MOVE_CLOSE_COMBAT", + "MOVE_PAYBACK", + "MOVE_ASSURANCE", + "MOVE_EMBARGO", + "MOVE_FLING", + "MOVE_PSYCHO_SHIFT", + "MOVE_TRUMP_CARD", + "MOVE_HEAL_BLOCK", + "MOVE_WRING_OUT", + "MOVE_POWER_TRICK", + "MOVE_GASTRO_ACID", + "MOVE_LUCKY_CHANT", + "MOVE_ME_FIRST", + "MOVE_COPYCAT", + "MOVE_POWER_SWAP", + "MOVE_GUARD_SWAP", + "MOVE_PUNISHMENT", + "MOVE_LAST_RESORT", + "MOVE_WORRY_SEED", + "MOVE_SUCKER_PUNCH", + "MOVE_TOXIC_SPIKES", + "MOVE_HEART_SWAP", + "MOVE_AQUA_RING", + "MOVE_MAGNET_RISE", + "MOVE_FLARE_BLITZ", + "MOVE_FORCE_PALM", + "MOVE_AURA_SPHERE", + "MOVE_ROCK_POLISH", + "MOVE_POISON_JAB", + "MOVE_DARK_PULSE", + "MOVE_NIGHT_SLASH", + "MOVE_AQUA_TAIL", + "MOVE_SEED_BOMB", + "MOVE_AIR_SLASH", + "MOVE_X_SCISSOR", + "MOVE_BUG_BUZZ", + "MOVE_DRAGON_PULSE", + "MOVE_DRAGON_RUSH", + "MOVE_POWER_GEM", + "MOVE_DRAIN_PUNCH", + "MOVE_VACUUM_WAVE", + "MOVE_FOCUS_BLAST", + "MOVE_ENERGY_BALL", + "MOVE_BRAVE_BIRD", + "MOVE_EARTH_POWER", + "MOVE_SWITCHEROO", + "MOVE_GIGA_IMPACT", + "MOVE_NASTY_PLOT", + "MOVE_BULLET_PUNCH", + "MOVE_AVALANCHE", + "MOVE_ICE_SHARD", + "MOVE_SHADOW_CLAW", + "MOVE_THUNDER_FANG", + "MOVE_ICE_FANG", + "MOVE_FIRE_FANG", + "MOVE_SHADOW_SNEAK", + "MOVE_MUD_BOMB", + "MOVE_PSYCHO_CUT", + "MOVE_ZEN_HEADBUTT", + "MOVE_MIRROR_SHOT", + "MOVE_FLASH_CANNON", + "MOVE_ROCK_CLIMB", + "MOVE_DEFOG", + "MOVE_TRICK_ROOM", + "MOVE_DRACO_METEOR", + "MOVE_DISCHARGE", + "MOVE_LAVA_PLUME", + "MOVE_LEAF_STORM", + "MOVE_POWER_WHIP", + "MOVE_ROCK_WRECKER", + "MOVE_CROSS_POISON", + "MOVE_GUNK_SHOT", + "MOVE_IRON_HEAD", + "MOVE_MAGNET_BOMB", + "MOVE_STONE_EDGE", + "MOVE_CAPTIVATE", + "MOVE_STEALTH_ROCK", + "MOVE_GRASS_KNOT", + "MOVE_CHATTER", + "MOVE_JUDGMENT", + "MOVE_BUG_BITE", + "MOVE_CHARGE_BEAM", + "MOVE_WOOD_HAMMER", + "MOVE_AQUA_JET", + "MOVE_ATTACK_ORDER", + "MOVE_DEFEND_ORDER", + "MOVE_HEAL_ORDER", + "MOVE_HEAD_SMASH", + "MOVE_DOUBLE_HIT", + "MOVE_ROAR_OF_TIME", + "MOVE_SPACIAL_REND", + "MOVE_LUNAR_DANCE", + "MOVE_CRUSH_GRIP", + "MOVE_MAGMA_STORM", + "MOVE_DARK_VOID", + "MOVE_SEED_FLARE", + "MOVE_OMINOUS_WIND", + "MOVE_SHADOW_FORCE", + "MAX_MOVES" + ] + }, + "@PokemonType": { + "type": "enum", + "as_preproc": true, + "values": [ + "TYPE_NORMAL", + "TYPE_FIGHTING", + "TYPE_FLYING", + "TYPE_POISON", + "TYPE_GROUND", + "TYPE_ROCK", + "TYPE_BUG", + "TYPE_GHOST", + "TYPE_STEEL", + "TYPE_MYSTERY", + "TYPE_FIRE", + "TYPE_WATER", + "TYPE_GRASS", + "TYPE_ELECTRIC", + "TYPE_PSYCHIC", + "TYPE_ICE", + "TYPE_DRAGON", + "TYPE_DARK", + "NUMBER_OF_MON_TYPES" + ] + }, + "@PokemonPersonalDataParam": { + "type": "enum", + "values": [ + "MON_DATA_PERSONAL_BASE_HP", + "MON_DATA_PERSONAL_BASE_ATK", + "MON_DATA_PERSONAL_BASE_DEF", + "MON_DATA_PERSONAL_BASE_SPEED", + "MON_DATA_PERSONAL_BASE_SP_ATK", + "MON_DATA_PERSONAL_BASE_SP_DEF", + "MON_DATA_PERSONAL_TYPE_1", + "MON_DATA_PERSONAL_TYPE_2", + "MON_DATA_PERSONAL_CATCH_RATE", + "MON_DATA_PERSONAL_BASE_EXP", + "MON_DATA_PERSONAL_EV_HP_YIELD", + "MON_DATA_PERSONAL_EV_ATK_YIELD", + "MON_DATA_PERSONAL_EV_DEF_YIELD", + "MON_DATA_PERSONAL_EV_SPEED_YIELD", + "MON_DATA_PERSONAL_EV_SP_ATK_YIELD", + "MON_DATA_PERSONAL_EV_SP_DEF_YIELD", + "MON_DATA_PERSONAL_ITEM1", + "MON_DATA_PERSONAL_ITEM2", + "MON_DATA_PERSONAL_GENDER", + "MON_DATA_PERSONAL_HATCH_CYCLE", + "MON_DATA_PERSONAL_BASE_FRIENDSHIP", + "MON_DATA_PERSONAL_EXP_RATE", + "MON_DATA_PERSONAL_EGG_GROUP_1", + "MON_DATA_PERSONAL_EGG_GROUP_2", + "MON_DATA_PERSONAL_ABILITY_1", + "MON_DATA_PERSONAL_ABILITY_2", + "MON_DATA_PERSONAL_GREAT_MARSH_FLEE_RATE", + "MON_DATA_PERSONAL_COLOR", + "MON_DATA_PERSONAL_FLIP_SPRITE", + "MON_DATA_PERSONAL_TM_LEARNSET_MASK_1", + "MON_DATA_PERSONAL_TM_LEARNSET_MASK_2", + "MON_DATA_PERSONAL_TM_LEARNSET_MASK_3", + "MON_DATA_PERSONAL_TM_LEARNSET_MASK_4" + ] + }, + "@ItemHoldEffect": { + "type": "enum", + "as_preproc": true, + "values": [ + "HOLD_EFFECT_NONE", + "HOLD_EFFECT_HP_RESTORE", + "HOLD_EFFECT_GIRATINA_BOOST", + "HOLD_EFFECT_DIALGA_BOOST", + "HOLD_EFFECT_PALKIA_BOOST", + "HOLD_EFFECT_PRZ_RESTORE", + "HOLD_EFFECT_SLP_RESTORE", + "HOLD_EFFECT_PSN_RESTORE", + "HOLD_EFFECT_BRN_RESTORE", + "HOLD_EFFECT_FRZ_RESTORE", + "HOLD_EFFECT_PP_RESTORE", + "HOLD_EFFECT_CONFUSE_RESTORE", + "HOLD_EFFECT_STATUS_RESTORE", + "HOLD_EFFECT_HP_PCT_RESTORE", + "HOLD_EFFECT_HP_RESTORE_SPICY", + "HOLD_EFFECT_HP_RESTORE_DRY", + "HOLD_EFFECT_HP_RESTORE_SWEET", + "HOLD_EFFECT_HP_RESTORE_BITTER", + "HOLD_EFFECT_HP_RESTORE_SOUR", + "HOLD_EFFECT_WEAKEN_SE_FIRE", + "HOLD_EFFECT_WEAKEN_SE_WATER", + "HOLD_EFFECT_WEAKEN_SE_ELECTRIC", + "HOLD_EFFECT_WEAKEN_SE_GRASS", + "HOLD_EFFECT_WEAKEN_SE_ICE", + "HOLD_EFFECT_WEAKEN_SE_FIGHT", + "HOLD_EFFECT_WEAKEN_SE_POISON", + "HOLD_EFFECT_WEAKEN_SE_GROUND", + "HOLD_EFFECT_WEAKEN_SE_FLYING", + "HOLD_EFFECT_WEAKEN_SE_PSYCHIC", + "HOLD_EFFECT_WEAKEN_SE_BUG", + "HOLD_EFFECT_WEAKEN_SE_ROCK", + "HOLD_EFFECT_WEAKEN_SE_GHOST", + "HOLD_EFFECT_WEAKEN_SE_DRAGON", + "HOLD_EFFECT_WEAKEN_SE_DARK", + "HOLD_EFFECT_WEAKEN_SE_STEEL", + "HOLD_EFFECT_WEAKEN_NORMAL", + "HOLD_EFFECT_PINCH_ATK_UP", + "HOLD_EFFECT_PINCH_DEF_UP", + "HOLD_EFFECT_PINCH_SPEED_UP", + "HOLD_EFFECT_PINCH_SPATK_UP", + "HOLD_EFFECT_PINCH_SPDEF_UP", + "HOLD_EFFECT_PINCH_CRITRATE_UP", + "HOLD_EFFECT_PINCH_RANDOM_UP", + "HOLD_EFFECT_HP_RESTORE_SE", + "HOLD_EFFECT_PINCH_ACC_UP", + "HOLD_EFFECT_PINCH_PRIORITY", + "HOLD_EFFECT_RECOIL_PHYSICAL", + "HOLD_EFFECT_RECOIL_SPECIAL", + "HOLD_EFFECT_ACC_REDUCE", + "HOLD_EFFECT_STATDOWN_RESTORE", + "HOLD_EFFECT_EVS_UP_SPEED_DOWN", + "HOLD_EFFECT_EXP_SHARE", + "HOLD_EFFECT_SOMETIMES_PRIORITY", + "HOLD_EFFECT_FRIENDSHIP_UP", + "HOLD_EFFECT_HEAL_INFATUATION", + "HOLD_EFFECT_CHOICE_ATK", + "HOLD_EFFECT_SOMETIMES_FLINCH", + "HOLD_EFFECT_STRENGTHEN_BUG", + "HOLD_EFFECT_MONEY_UP", + "HOLD_EFFECT_ENCOUNTERS_DOWN", + "HOLD_EFFECT_LATI_SPECIAL", + "HOLD_EFFECT_CLAMPERL_SPATK", + "HOLD_EFFECT_CLAMPERL_SPDEF", + "HOLD_EFFECT_FLEE", + "HOLD_EFFECT_NO_EVOLVE", + "HOLD_EFFECT_MAYBE_ENDURE", + "HOLD_EFFECT_EXP_UP", + "HOLD_EFFECT_CRITRATE_UP", + "HOLD_EFFECT_STRENGTHEN_STEEL", + "HOLD_EFFECT_HP_RESTORE_GRADUAL", + "HOLD_EFFECT_EVOLVE_SEADRA", + "HOLD_EFFECT_PIKA_SPATK_UP", + "HOLD_EFFECT_STRENGTHEN_GROUND", + "HOLD_EFFECT_STRENGTHEN_ROCK", + "HOLD_EFFECT_STRENGTHEN_GRASS", + "HOLD_EFFECT_STRENGTHEN_DARK", + "HOLD_EFFECT_STRENGTHEN_FIGHT", + "HOLD_EFFECT_STRENGTHEN_ELECTRIC", + "HOLD_EFFECT_STRENGTHEN_WATER", + "HOLD_EFFECT_STRENGTHEN_FLYING", + "HOLD_EFFECT_STRENGTHEN_POISON", + "HOLD_EFFECT_STRENGTHEN_ICE", + "HOLD_EFFECT_STRENGTHEN_GHOST", + "HOLD_EFFECT_STRENGTHEN_PSYCHIC", + "HOLD_EFFECT_STRENGTHEN_FIRE", + "HOLD_EFFECT_STRENGTHEN_DRAGON", + "HOLD_EFFECT_STRENGTHEN_NORMAL", + "HOLD_EFFECT_EVOLVE_PORYGON", + "HOLD_EFFECT_HP_RESTORE_ON_DMG", + "HOLD_EFFECT_CHANSEY_CRITRATE_UP", + "HOLD_EFFECT_DITTO_DEF_UP", + "HOLD_EFFECT_CUBONE_ATK_UP", + "HOLD_EFFECT_FARFETCHD_CRITRATE_UP", + "HOLD_EFFECT_ACCURACY_UP", + "HOLD_EFFECT_POWER_UP_PHYS", + "HOLD_EFFECT_POWER_UP_SPEC", + "HOLD_EFFECT_POWER_UP_SE", + "HOLD_EFFECT_EXTEND_SCREENS", + "HOLD_EFFECT_HP_DRAIN_ON_ATK", + "HOLD_EFFECT_CHARGE_SKIP", + "HOLD_EFFECT_PSN_USER", + "HOLD_EFFECT_BRN_USER", + "HOLD_EFFECT_DITTO_SPEED_UP", + "HOLD_EFFECT_ENDURE", + "HOLD_EFFECT_ACCURACY_UP_SLOWER", + "HOLD_EFFECT_BOOST_REPEATED", + "HOLD_EFFECT_SPEED_DOWN_GROUNDED", + "HOLD_EFFECT_PRIORITY_DOWN", + "HOLD_EFFECT_RECIPROCATE_INFAT", + "HOLD_EFFECT_HP_RESTORE_PSN_TYPE", + "HOLD_EFFECT_EXTEND_HAIL", + "HOLD_EFFECT_EXTEND_SANDSTORM", + "HOLD_EFFECT_EXTEND_SUN", + "HOLD_EFFECT_EXTEND_RAIN", + "HOLD_EFFECT_EXTEND_TRAPPING", + "HOLD_EFFECT_CHOICE_SPEED", + "HOLD_EFFECT_DMG_USER_CONTACT_XFR", + "HOLD_EFFECT_LVLUP_ATK_EV_UP", + "HOLD_EFFECT_LVLUP_DEF_EV_UP", + "HOLD_EFFECT_LVLUP_SPATK_EV_UP", + "HOLD_EFFECT_LVLUP_SPDEF_EV_UP", + "HOLD_EFFECT_LVLUP_SPEED_EV_UP", + "HOLD_EFFECT_LVLUP_HP_EV_UP", + "HOLD_EFFECT_SWITCH", + "HOLD_EFFECT_LEECH_BOOST", + "HOLD_EFFECT_CHOICE_SPATK", + "HOLD_EFFECT_ARCEUS_FIRE", + "HOLD_EFFECT_ARCEUS_WATER", + "HOLD_EFFECT_ARCEUS_ELECTRIC", + "HOLD_EFFECT_ARCEUS_GRASS", + "HOLD_EFFECT_ARCEUS_ICE", + "HOLD_EFFECT_ARCEUS_FIGHTING", + "HOLD_EFFECT_ARCEUS_POISON", + "HOLD_EFFECT_ARCEUS_GROUND", + "HOLD_EFFECT_ARCEUS_FLYING", + "HOLD_EFFECT_ARCEUS_PSYCHIC", + "HOLD_EFFECT_ARCEUS_BUG", + "HOLD_EFFECT_ARCEUS_ROCK", + "HOLD_EFFECT_ARCEUS_GHOST", + "HOLD_EFFECT_ARCEUS_DRAGON", + "HOLD_EFFECT_ARCEUS_DARK", + "HOLD_EFFECT_ARCEUS_STEEL", + "HOLD_EFFECT_EVOLVE_RHYDON", + "HOLD_EFFECT_EVOLVE_ELECTABUZZ", + "HOLD_EFFECT_EVOLVE_MAGMAR", + "HOLD_EFFECT_EVOLVE_PORYGON2", + "HOLD_EFFECT_EVOLVE_DUSCLOPS" + ] + }, + "@Gender": { + "type": "enum", + "values": [ + "GENDER_MALE", + "GENDER_FEMALE", + "GENDER_NONE" + ] + } + } +} \ No newline at end of file diff --git a/consts/meson.build b/consts/meson.build index 443966e991..ae25ba2d01 100644 --- a/consts/meson.build +++ b/consts/meson.build @@ -1,12 +1,10 @@ consts_manifests = files( - 'battle.json' + 'battle.json', + 'global.json', ) -gen_consts_includes = include_directories('.') - gen_consts_root = meson.current_build_dir() / 'generated' gen_c_consts_root = gen_consts_root / 'c' -gen_asm_consts_root = gen_consts_root / 'asm' generated_c_consts = custom_target('gen_c_consts', build_by_default: true, diff --git a/include/battle/battle_lib.h b/include/battle/battle_lib.h index d3eb1be7e0..8f36d897b9 100644 --- a/include/battle/battle_lib.h +++ b/include/battle/battle_lib.h @@ -10,126 +10,7 @@ #include "battle/battle_message.h" #include "battle/btlcmd.h" -enum BattleContextParam { - BATTLECTX_SIDE_CONDITIONS_MASK = 0, - BATTLECTX_SIDE_MIST_TURNS, - BATTLECTX_SELECTED_PARTY_SLOT, - BATTLECTX_TOTAL_TURNS, - BATTLECTX_LEVEL_UP_MONS, - BATTLECTX_SAFARI_ESCAPE_COUNT, - BATTLECTX_TOTAL_FAINTED_FOR, - BATTLECTX_TOTAL_DAMAGE_FOR, - BATTLECTX_ACTION_FOR, - BATTLECTX_AICTX_DEFENDER, - BATTLECTX_SWITCHING_MASK, - BATTLECTX_AICTX_SELECTED_TARGET, - BATTLECTX_ACTION_TEMP_FOR, - BATTLECTX_CONTROL_COMMAND, - BATTLECTX_NEXT_CONTROL_COMMAND -}; - -enum BattleMonParam { - BATTLEMON_SPECIES = 0, - BATTLEMON_ATTACK, - BATTLEMON_DEFENSE, - BATTLEMON_SPEED, - BATTLEMON_SP_ATTACK, - BATTLEMON_SP_DEFENSE, - BATTLEMON_MOVE_1, - BATTLEMON_MOVE_2, - BATTLEMON_MOVE_3, - BATTLEMON_MOVE_4, - BATTLEMON_HP_IV, - BATTLEMON_ATTACK_IV, - BATTLEMON_DEFENSE_IV, - BATTLEMON_SPEED_IV, - BATTLEMON_SP_ATTACK_IV, - BATTLEMON_SP_DEFENSE_IV, - BATTLEMON_IS_EGG, - BATTLEMON_HAS_NICKNAME, - BATTLEMON_HP_STAGE, - BATTLEMON_ATTACK_STAGE, - BATTLEMON_DEFENSE_STAGE, - BATTLEMON_SPEED_STAGE, - BATTLEMON_SP_ATTACK_STAGE, - BATTLEMON_SP_DEFENSE_STAGE, - BATTLEMON_ACCURACY_STAGE, - BATTLEMON_EVASION_STAGE, - BATTLEMON_ABILITY, - BATTLEMON_TYPE_1, - BATTLEMON_TYPE_2, - BATTLEMON_GENDER, - BATTLEMON_IS_SHINY, - BATTLEMON_CUR_PP_1, - BATTLEMON_CUR_PP_2, - BATTLEMON_CUR_PP_3, - BATTLEMON_CUR_PP_4, - BATTLEMON_PP_UPS_1, - BATTLEMON_PP_UPS_2, - BATTLEMON_PP_UPS_3, - BATTLEMON_PP_UPS_4, - BATTLEMON_MAX_PP_1, - BATTLEMON_MAX_PP_2, - BATTLEMON_MAX_PP_3, - BATTLEMON_MAX_PP_4, - BATTLEMON_LEVEL, - BATTLEMON_FRIENDSHIP, - BATTLEMON_NICKNAME, - BATTLEMON_NICKNAME_STRBUF, - BATTLEMON_CUR_HP, - BATTLEMON_MAX_HP, - BATTLEMON_OT_NAME, - BATTLEMON_EXP, - BATTLEMON_PERSONALITY, - BATTLEMON_STATUS, - BATTLEMON_VOLATILE_STATUS, - BATTLEMON_OT_ID, - BATTLEMON_HELD_ITEM, - BATTLEMON_TIMES_DAMAGED, - BATTLEMON_TRAINER_MESSAGE_FLAGS, - BATTLEMON_OT_GENDER, - BATTLEMON_MOVE_EFFECTS_MASK, - BATTLEMON_MOVE_EFFECTS_TEMP, - BATTLEMON_DISABLED_TURNS, - BATTLEMON_ENCORED_TURNS, - BATTLEMON_CHARGED_TURNS, - BATTLEMON_TAUNTED_TURNS, - BATTLEMON_SUCCESSFUL_PROTECT_TURNS, - BATTLEMON_PERISH_SONG_TURNS, - BATTLEMON_ROLLOUT_COUNT, - BATTLEMON_FURY_CUTTER_COUNT, - BATTLEMON_STOCKPILE_COUNT, - BATTLEMON_STOCKPILE_DEF_BOOSTS, - BATTLEMON_STOCKPILE_SPDEF_BOOSTS, - BATTLEMON_TRUANT, - BATTLEMON_FLASH_FIRE, - BATTLEMON_LOCK_ON_TARGET, - BATTLEMON_MIMICKED_MOVE_SLOT, - BATTLEMON_BIND_TARGET, - BATTLEMON_MEAN_LOOK_TARGET, - BATTLEMON_LAST_RESORT_COUNT, - BATTLEMON_MAGNET_RISE_TURNS, - BATTLEMON_HEAL_BLOCK_TURNS, - BATTLEMON_EMBARGO_TURNS, - BATTLEMON_CAN_UNBURDEN, - BATTLEMON_METRONOME_TURNS, - BATTLEMON_MICLE_BERRY, - BATTLEMON_CUSTAP_BERRY, - BATTLEMON_QUICK_CLAW, - BATTLEMON_RECHARGE_TURN_NUMBER, - BATTLEMON_FAKE_OUT_TURN_NUMBER, - BATTLEMON_SLOW_START_TURN_NUMBER, - BATTLEMON_SUBSTITUTE_HP, - BATTLEMON_TRANSFORMED_PERSONALITY, - BATTLEMON_DISABLED_MOVE, - BATTLEMON_ENCORED_MOVE, - BATTLEMON_BINDING_MOVE, - BATTLEMON_ITEM_HP_RECOVERY, - BATTLEMON_SLOW_START_ANNOUNCED, - BATTLEMON_SLOW_START_FINISHED, - BATTLEMON_FORM_NUM, - BATTLEMON_TEMP = 100, -}; +#include "consts/generated/c/battle_lib_params.h" // defs for BattleContextParam and BattleMonParam enum CountAbilityMode { COUNT_ALL_BATTLERS_OUR_SIDE = 0, //< Count all the battlers on our side with the ability diff --git a/include/constants/abilities.h b/include/constants/abilities.h deleted file mode 100644 index a91fdf34d1..0000000000 --- a/include/constants/abilities.h +++ /dev/null @@ -1,131 +0,0 @@ -#ifndef POKEPLATINUM_CONSTANTS_ABILITIES_H -#define POKEPLATINUM_CONSTANTS_ABILITIES_H - -enum Ability { - ABILITY_NONE = 0, - ABILITY_STENCH, - ABILITY_DRIZZLE, - ABILITY_SPEED_BOOST, - ABILITY_BATTLE_ARMOR, - ABILITY_STURDY, - ABILITY_DAMP, - ABILITY_LIMBER, - ABILITY_SAND_VEIL, - ABILITY_STATIC, - ABILITY_VOLT_ABSORB, - ABILITY_WATER_ABSORB, - ABILITY_OBLIVIOUS, - ABILITY_CLOUD_NINE, - ABILITY_COMPOUND_EYES, - ABILITY_INSOMNIA, - ABILITY_COLOR_CHANGE, - ABILITY_IMMUNITY, - ABILITY_FLASH_FIRE, - ABILITY_SHIELD_DUST, - ABILITY_OWN_TEMPO, - ABILITY_SUCTION_CUPS, - ABILITY_INTIMIDATE, - ABILITY_SHADOW_TAG, - ABILITY_ROUGH_SKIN, - ABILITY_WONDER_GUARD, - ABILITY_LEVITATE, - ABILITY_EFFECT_SPORE, - ABILITY_SYNCHRONIZE, - ABILITY_CLEAR_BODY, - ABILITY_NATURAL_CURE, - ABILITY_LIGHTNING_ROD, - ABILITY_SERENE_GRACE, - ABILITY_SWIFT_SWIM, - ABILITY_CHLOROPHYLL, - ABILITY_ILLUMINATE, - ABILITY_TRACE, - ABILITY_HUGE_POWER, - ABILITY_POISON_POINT, - ABILITY_INNER_FOCUS, - ABILITY_MAGMA_ARMOR, - ABILITY_WATER_VEIL, - ABILITY_MAGNET_PULL, - ABILITY_SOUNDPROOF, - ABILITY_RAIN_DISH, - ABILITY_SAND_STREAM, - ABILITY_PRESSURE, - ABILITY_THICK_FAT, - ABILITY_EARLY_BIRD, - ABILITY_FLAME_BODY, - ABILITY_RUN_AWAY, - ABILITY_KEEN_EYE, - ABILITY_HYPER_CUTTER, - ABILITY_PICKUP, - ABILITY_TRUANT, - ABILITY_HUSTLE, - ABILITY_CUTE_CHARM, - ABILITY_PLUS, - ABILITY_MINUS, - ABILITY_FORECAST, - ABILITY_STICKY_HOLD, - ABILITY_SHED_SKIN, - ABILITY_GUTS, - ABILITY_MARVEL_SCALE, - ABILITY_LIQUID_OOZE, - ABILITY_OVERGROW, - ABILITY_BLAZE, - ABILITY_TORRENT, - ABILITY_SWARM, - ABILITY_ROCK_HEAD, - ABILITY_DROUGHT, - ABILITY_ARENA_TRAP, - ABILITY_VITAL_SPIRIT, - ABILITY_WHITE_SMOKE, - ABILITY_PURE_POWER, - ABILITY_SHELL_ARMOR, - ABILITY_AIR_LOCK, - ABILITY_TANGLED_FEET, - ABILITY_MOTOR_DRIVE, - ABILITY_RIVALRY, - ABILITY_STEADFAST, - ABILITY_SNOW_CLOAK, - ABILITY_GLUTTONY, - ABILITY_ANGER_POINT, - ABILITY_UNBURDEN, - ABILITY_HEATPROOF, - ABILITY_SIMPLE, - ABILITY_DRY_SKIN, - ABILITY_DOWNLOAD, - ABILITY_IRON_FIST, - ABILITY_POISON_HEAL, - ABILITY_ADAPTABILITY, - ABILITY_SKILL_LINK, - ABILITY_HYDRATION, - ABILITY_SOLAR_POWER, - ABILITY_QUICK_FEET, - ABILITY_NORMALIZE, - ABILITY_SNIPER, - ABILITY_MAGIC_GUARD, - ABILITY_NO_GUARD, - ABILITY_STALL, - ABILITY_TECHNICIAN, - ABILITY_LEAF_GUARD, - ABILITY_KLUTZ, - ABILITY_MOLD_BREAKER, - ABILITY_SUPER_LUCK, - ABILITY_AFTERMATH, - ABILITY_ANTICIPATION, - ABILITY_FOREWARN, - ABILITY_UNAWARE, - ABILITY_TINTED_LENS, - ABILITY_FILTER, - ABILITY_SLOW_START, - ABILITY_SCRAPPY, - ABILITY_STORM_DRAIN, - ABILITY_ICE_BODY, - ABILITY_SOLID_ROCK, - ABILITY_SNOW_WARNING, - ABILITY_HONEY_GATHER, - ABILITY_FRISK, - ABILITY_RECKLESS, - ABILITY_MULTITYPE, - ABILITY_FLOWER_GIFT, - ABILITY_BAD_DREAMS, -}; - -#endif // POKEPLATINUM_CONSTANTS_ABILITIES_H \ No newline at end of file diff --git a/include/constants/gender.h b/include/constants/gender.h deleted file mode 100644 index 1d6e2b61ef..0000000000 --- a/include/constants/gender.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef POKEPLATINUM_CONSTANTS_GENDER_H -#define POKEPLATINUM_CONSTANTS_GENDER_H - -enum Gender { - GENDER_MALE, - GENDER_FEMALE, - GENDER_NONE -}; - -#endif // POKEPLATINUM_CONSTANTS_GENDER_H diff --git a/include/constants/items.h b/include/constants/items.h index 16e42c7975..48db908372 100644 --- a/include/constants/items.h +++ b/include/constants/items.h @@ -1,15 +1,8 @@ #ifndef POKEPLATINUM_CONSTANTS_ITEMS_H #define POKEPLATINUM_CONSTANTS_ITEMS_H -#define POCKET_ITEMS 0 -#define POCKET_MEDICINE 1 -#define POCKET_BALLS 2 -#define POCKET_TMHMS 3 -#define POCKET_BERRIES 4 -#define POCKET_MAIL 5 -#define POCKET_BATTLE_ITEMS 6 -#define POCKET_KEY_ITEMS 7 -#define POCKET_MAX 8 +#ifndef __ASM_PM_ +#include "consts/generated/c/items.h" enum { BATTLE_POCKET_RECOVER_HP = 0, @@ -29,6 +22,17 @@ enum { ITEM_TYPE_MAX }; +#endif // __ASM_PM_ + +#define POCKET_ITEMS 0 +#define POCKET_MEDICINE 1 +#define POCKET_BALLS 2 +#define POCKET_TMHMS 3 +#define POCKET_BERRIES 4 +#define POCKET_MAIL 5 +#define POCKET_BATTLE_ITEMS 6 +#define POCKET_KEY_ITEMS 7 +#define POCKET_MAX 8 #define ITEM_RECOVER_CONFUSION (1 << 0) #define ITEM_RECOVER_PARALYSIS (1 << 1) @@ -42,154 +46,6 @@ enum { | ITEM_RECOVER_FREEZE \ | ITEM_RECOVER_PARALYSIS) -#define HOLD_EFFECT_NONE 0 -#define HOLD_EFFECT_HP_RESTORE 1 -#define HOLD_EFFECT_GIRATINA_BOOST 2 -#define HOLD_EFFECT_DIALGA_BOOST 3 -#define HOLD_EFFECT_PALKIA_BOOST 4 -#define HOLD_EFFECT_PRZ_RESTORE 5 -#define HOLD_EFFECT_SLP_RESTORE 6 -#define HOLD_EFFECT_PSN_RESTORE 7 -#define HOLD_EFFECT_BRN_RESTORE 8 -#define HOLD_EFFECT_FRZ_RESTORE 9 -#define HOLD_EFFECT_PP_RESTORE 10 -#define HOLD_EFFECT_CONFUSE_RESTORE 11 -#define HOLD_EFFECT_STATUS_RESTORE 12 -#define HOLD_EFFECT_HP_PCT_RESTORE 13 -#define HOLD_EFFECT_HP_RESTORE_SPICY 14 -#define HOLD_EFFECT_HP_RESTORE_DRY 15 -#define HOLD_EFFECT_HP_RESTORE_SWEET 16 -#define HOLD_EFFECT_HP_RESTORE_BITTER 17 -#define HOLD_EFFECT_HP_RESTORE_SOUR 18 -#define HOLD_EFFECT_WEAKEN_SE_FIRE 19 -#define HOLD_EFFECT_WEAKEN_SE_WATER 20 -#define HOLD_EFFECT_WEAKEN_SE_ELECTRIC 21 -#define HOLD_EFFECT_WEAKEN_SE_GRASS 22 -#define HOLD_EFFECT_WEAKEN_SE_ICE 23 -#define HOLD_EFFECT_WEAKEN_SE_FIGHT 24 -#define HOLD_EFFECT_WEAKEN_SE_POISON 25 -#define HOLD_EFFECT_WEAKEN_SE_GROUND 26 -#define HOLD_EFFECT_WEAKEN_SE_FLYING 27 -#define HOLD_EFFECT_WEAKEN_SE_PSYCHIC 28 -#define HOLD_EFFECT_WEAKEN_SE_BUG 29 -#define HOLD_EFFECT_WEAKEN_SE_ROCK 30 -#define HOLD_EFFECT_WEAKEN_SE_GHOST 31 -#define HOLD_EFFECT_WEAKEN_SE_DRAGON 32 -#define HOLD_EFFECT_WEAKEN_SE_DARK 33 -#define HOLD_EFFECT_WEAKEN_SE_STEEL 34 -#define HOLD_EFFECT_WEAKEN_NORMAL 35 -#define HOLD_EFFECT_PINCH_ATK_UP 36 -#define HOLD_EFFECT_PINCH_DEF_UP 37 -#define HOLD_EFFECT_PINCH_SPEED_UP 38 -#define HOLD_EFFECT_PINCH_SPATK_UP 39 -#define HOLD_EFFECT_PINCH_SPDEF_UP 40 -#define HOLD_EFFECT_PINCH_CRITRATE_UP 41 -#define HOLD_EFFECT_PINCH_RANDOM_UP 42 -#define HOLD_EFFECT_HP_RESTORE_SE 43 -#define HOLD_EFFECT_PINCH_ACC_UP 44 -#define HOLD_EFFECT_PINCH_PRIORITY 45 -#define HOLD_EFFECT_RECOIL_PHYSICAL 46 -#define HOLD_EFFECT_RECOIL_SPECIAL 47 -#define HOLD_EFFECT_ACC_REDUCE 48 -#define HOLD_EFFECT_STATDOWN_RESTORE 49 -#define HOLD_EFFECT_EVS_UP_SPEED_DOWN 50 -#define HOLD_EFFECT_EXP_SHARE 51 -#define HOLD_EFFECT_SOMETIMES_PRIORITY 52 -#define HOLD_EFFECT_FRIENDSHIP_UP 53 -#define HOLD_EFFECT_HEAL_INFATUATION 54 -#define HOLD_EFFECT_CHOICE_ATK 55 -#define HOLD_EFFECT_SOMETIMES_FLINCH 56 -#define HOLD_EFFECT_STRENGTHEN_BUG 57 -#define HOLD_EFFECT_MONEY_UP 58 -#define HOLD_EFFECT_ENCOUNTERS_DOWN 59 -#define HOLD_EFFECT_LATI_SPECIAL 60 -#define HOLD_EFFECT_CLAMPERL_SPATK 61 -#define HOLD_EFFECT_CLAMPERL_SPDEF 62 -#define HOLD_EFFECT_FLEE 63 -#define HOLD_EFFECT_NO_EVOLVE 64 -#define HOLD_EFFECT_MAYBE_ENDURE 65 -#define HOLD_EFFECT_EXP_UP 66 -#define HOLD_EFFECT_CRITRATE_UP 67 -#define HOLD_EFFECT_STRENGTHEN_STEEL 68 -#define HOLD_EFFECT_HP_RESTORE_GRADUAL 69 -#define HOLD_EFFECT_EVOLVE_SEADRA 70 -#define HOLD_EFFECT_PIKA_SPATK_UP 71 -#define HOLD_EFFECT_STRENGTHEN_GROUND 72 -#define HOLD_EFFECT_STRENGTHEN_ROCK 73 -#define HOLD_EFFECT_STRENGTHEN_GRASS 74 -#define HOLD_EFFECT_STRENGTHEN_DARK 75 -#define HOLD_EFFECT_STRENGTHEN_FIGHT 76 -#define HOLD_EFFECT_STRENGTHEN_ELECTRIC 77 -#define HOLD_EFFECT_STRENGTHEN_WATER 78 -#define HOLD_EFFECT_STRENGTHEN_FLYING 79 -#define HOLD_EFFECT_STRENGTHEN_POISON 80 -#define HOLD_EFFECT_STRENGTHEN_ICE 81 -#define HOLD_EFFECT_STRENGTHEN_GHOST 82 -#define HOLD_EFFECT_STRENGTHEN_PSYCHIC 83 -#define HOLD_EFFECT_STRENGTHEN_FIRE 84 -#define HOLD_EFFECT_STRENGTHEN_DRAGON 85 -#define HOLD_EFFECT_STRENGTHEN_NORMAL 86 -#define HOLD_EFFECT_EVOLVE_PORYGON 87 -#define HOLD_EFFECT_HP_RESTORE_ON_DMG 88 -#define HOLD_EFFECT_CHANSEY_CRITRATE_UP 89 -#define HOLD_EFFECT_DITTO_DEF_UP 90 -#define HOLD_EFFECT_CUBONE_ATK_UP 91 -#define HOLD_EFFECT_FARFETCHD_CRITRATE_UP 92 -#define HOLD_EFFECT_ACCURACY_UP 93 -#define HOLD_EFFECT_POWER_UP_PHYS 94 -#define HOLD_EFFECT_POWER_UP_SPEC 95 -#define HOLD_EFFECT_POWER_UP_SE 96 -#define HOLD_EFFECT_EXTEND_SCREENS 97 -#define HOLD_EFFECT_HP_DRAIN_ON_ATK 98 -#define HOLD_EFFECT_CHARGE_SKIP 99 -#define HOLD_EFFECT_PSN_USER 100 -#define HOLD_EFFECT_BRN_USER 101 -#define HOLD_EFFECT_DITTO_SPEED_UP 102 -#define HOLD_EFFECT_ENDURE 103 -#define HOLD_EFFECT_ACCURACY_UP_SLOWER 104 -#define HOLD_EFFECT_BOOST_REPEATED 105 -#define HOLD_EFFECT_SPEED_DOWN_GROUNDED 106 -#define HOLD_EFFECT_PRIORITY_DOWN 107 -#define HOLD_EFFECT_RECIPROCATE_INFAT 108 -#define HOLD_EFFECT_HP_RESTORE_PSN_TYPE 109 -#define HOLD_EFFECT_EXTEND_HAIL 110 -#define HOLD_EFFECT_EXTEND_SANDSTORM 111 -#define HOLD_EFFECT_EXTEND_SUN 112 -#define HOLD_EFFECT_EXTEND_RAIN 113 -#define HOLD_EFFECT_EXTEND_TRAPPING 114 -#define HOLD_EFFECT_CHOICE_SPEED 115 -#define HOLD_EFFECT_DMG_USER_CONTACT_XFR 116 -#define HOLD_EFFECT_LVLUP_ATK_EV_UP 117 -#define HOLD_EFFECT_LVLUP_DEF_EV_UP 118 -#define HOLD_EFFECT_LVLUP_SPATK_EV_UP 119 -#define HOLD_EFFECT_LVLUP_SPDEF_EV_UP 120 -#define HOLD_EFFECT_LVLUP_SPEED_EV_UP 121 -#define HOLD_EFFECT_LVLUP_HP_EV_UP 122 -#define HOLD_EFFECT_SWITCH 123 -#define HOLD_EFFECT_LEECH_BOOST 124 -#define HOLD_EFFECT_CHOICE_SPATK 125 -#define HOLD_EFFECT_ARCEUS_FIRE 126 -#define HOLD_EFFECT_ARCEUS_WATER 127 -#define HOLD_EFFECT_ARCEUS_ELECTRIC 128 -#define HOLD_EFFECT_ARCEUS_GRASS 129 -#define HOLD_EFFECT_ARCEUS_ICE 130 -#define HOLD_EFFECT_ARCEUS_FIGHTING 131 -#define HOLD_EFFECT_ARCEUS_POISON 132 -#define HOLD_EFFECT_ARCEUS_GROUND 133 -#define HOLD_EFFECT_ARCEUS_FLYING 134 -#define HOLD_EFFECT_ARCEUS_PSYCHIC 135 -#define HOLD_EFFECT_ARCEUS_BUG 136 -#define HOLD_EFFECT_ARCEUS_ROCK 137 -#define HOLD_EFFECT_ARCEUS_GHOST 138 -#define HOLD_EFFECT_ARCEUS_DRAGON 139 -#define HOLD_EFFECT_ARCEUS_DARK 140 -#define HOLD_EFFECT_ARCEUS_STEEL 141 -#define HOLD_EFFECT_EVOLVE_RHYDON 142 -#define HOLD_EFFECT_EVOLVE_ELECTABUZZ 143 -#define HOLD_EFFECT_EVOLVE_MAGMAR 144 -#define HOLD_EFFECT_EVOLVE_PORYGON2 145 -#define HOLD_EFFECT_EVOLVE_DUSCLOPS 146 - #define FLING_EFFECT_NONE 0 #define FLING_EFFECT_PRZ_RESTORE 1 #define FLING_EFFECT_SLP_RESTORE 2 diff --git a/include/constants/moves.h b/include/constants/moves.h index 50d60b5634..e401e74c65 100644 --- a/include/constants/moves.h +++ b/include/constants/moves.h @@ -1,484 +1,14 @@ #ifndef POKEPLATINUM_CONSTANTS_MOVES_H #define POKEPLATINUM_CONSTANTS_MOVES_H +#include "consts/generated/c/moves.h" + #define LEARNED_MOVES_MAX 4 #define CLASS_PHYSICAL 0 #define CLASS_SPECIAL 1 #define CLASS_STATUS 2 -enum { - MOVE_NONE = 0, - MOVE_POUND, - MOVE_KARATE_CHOP, - MOVE_DOUBLE_SLAP, - MOVE_COMET_PUNCH, - MOVE_MEGA_PUNCH, - MOVE_PAY_DAY, - MOVE_FIRE_PUNCH, - MOVE_ICE_PUNCH, - MOVE_THUNDER_PUNCH, - MOVE_SCRATCH, - MOVE_VICE_GRIP, - MOVE_GUILLOTINE, - MOVE_RAZOR_WIND, - MOVE_SWORDS_DANCE, - MOVE_CUT, - MOVE_GUST, - MOVE_WING_ATTACK, - MOVE_WHIRLWIND, - MOVE_FLY, - MOVE_BIND, - MOVE_SLAM, - MOVE_VINE_WHIP, - MOVE_STOMP, - MOVE_DOUBLE_KICK, - MOVE_MEGA_KICK, - MOVE_JUMP_KICK, - MOVE_ROLLING_KICK, - MOVE_SAND_ATTACK, - MOVE_HEADBUTT, - MOVE_HORN_ATTACK, - MOVE_FURY_ATTACK, - MOVE_HORN_DRILL, - MOVE_TACKLE, - MOVE_BODY_SLAM, - MOVE_WRAP, - MOVE_TAKE_DOWN, - MOVE_THRASH, - MOVE_DOUBLE_EDGE, - MOVE_TAIL_WHIP, - MOVE_POISON_STING, - MOVE_TWINEEDLE, - MOVE_PIN_MISSILE, - MOVE_LEER, - MOVE_BITE, - MOVE_GROWL, - MOVE_ROAR, - MOVE_SING, - MOVE_SUPERSONIC, - MOVE_SONIC_BOOM, - MOVE_DISABLE, - MOVE_ACID, - MOVE_EMBER, - MOVE_FLAMETHROWER, - MOVE_MIST, - MOVE_WATER_GUN, - MOVE_HYDRO_PUMP, - MOVE_SURF, - MOVE_ICE_BEAM, - MOVE_BLIZZARD, - MOVE_PSYBEAM, - MOVE_BUBBLE_BEAM, - MOVE_AURORA_BEAM, - MOVE_HYPER_BEAM, - MOVE_PECK, - MOVE_DRILL_PECK, - MOVE_SUBMISSION, - MOVE_LOW_KICK, - MOVE_COUNTER, - MOVE_SEISMIC_TOSS, - MOVE_STRENGTH, - MOVE_ABSORB, - MOVE_MEGA_DRAIN, - MOVE_LEECH_SEED, - MOVE_GROWTH, - MOVE_RAZOR_LEAF, - MOVE_SOLAR_BEAM, - MOVE_POISON_POWDER, - MOVE_STUN_SPORE, - MOVE_SLEEP_POWDER, - MOVE_PETAL_DANCE, - MOVE_STRING_SHOT, - MOVE_DRAGON_RAGE, - MOVE_FIRE_SPIN, - MOVE_THUNDER_SHOCK, - MOVE_THUNDERBOLT, - MOVE_THUNDER_WAVE, - MOVE_THUNDER, - MOVE_ROCK_THROW, - MOVE_EARTHQUAKE, - MOVE_FISSURE, - MOVE_DIG, - MOVE_TOXIC, - MOVE_CONFUSION, - MOVE_PSYCHIC, - MOVE_HYPNOSIS, - MOVE_MEDITATE, - MOVE_AGILITY, - MOVE_QUICK_ATTACK, - MOVE_RAGE, - MOVE_TELEPORT, - MOVE_NIGHT_SHADE, - MOVE_MIMIC, - MOVE_SCREECH, - MOVE_DOUBLE_TEAM, - MOVE_RECOVER, - MOVE_HARDEN, - MOVE_MINIMIZE, - MOVE_SMOKE_SCREEN, - MOVE_CONFUSE_RAY, - MOVE_WITHDRAW, - MOVE_DEFENSE_CURL, - MOVE_BARRIER, - MOVE_LIGHT_SCREEN, - MOVE_HAZE, - MOVE_REFLECT, - MOVE_FOCUS_ENERGY, - MOVE_BIDE, - MOVE_METRONOME, - MOVE_MIRROR_MOVE, - MOVE_SELFDESTRUCT, - MOVE_EGG_BOMB, - MOVE_LICK, - MOVE_SMOG, - MOVE_SLUDGE, - MOVE_BONE_CLUB, - MOVE_FIRE_BLAST, - MOVE_WATERFALL, - MOVE_CLAMP, - MOVE_SWIFT, - MOVE_SKULL_BASH, - MOVE_SPIKE_CANNON, - MOVE_CONSTRICT, - MOVE_AMNESIA, - MOVE_KINESIS, - MOVE_SOFTBOILED, - MOVE_HI_JUMP_KICK, - MOVE_GLARE, - MOVE_DREAM_EATER, - MOVE_POISON_GAS, - MOVE_BARRAGE, - MOVE_LEECH_LIFE, - MOVE_LOVELY_KISS, - MOVE_SKY_ATTACK, - MOVE_TRANSFORM, - MOVE_BUBBLE, - MOVE_DIZZY_PUNCH, - MOVE_SPORE, - MOVE_FLASH, - MOVE_PSYWAVE, - MOVE_SPLASH, - MOVE_ACID_ARMOR, - MOVE_CRABHAMMER, - MOVE_EXPLOSION, - MOVE_FURY_SWIPES, - MOVE_BONEMERANG, - MOVE_REST, - MOVE_ROCK_SLIDE, - MOVE_HYPER_FANG, - MOVE_SHARPEN, - MOVE_CONVERSION, - MOVE_TRI_ATTACK, - MOVE_SUPER_FANG, - MOVE_SLASH, - MOVE_SUBSTITUTE, - MOVE_STRUGGLE, - MOVE_SKETCH, - MOVE_TRIPLE_KICK, - MOVE_THIEF, - MOVE_SPIDER_WEB, - MOVE_MIND_READER, - MOVE_NIGHTMARE, - MOVE_FLAME_WHEEL, - MOVE_SNORE, - MOVE_CURSE, - MOVE_FLAIL, - MOVE_CONVERSION_2, - MOVE_AEROBLAST, - MOVE_COTTON_SPORE, - MOVE_REVERSAL, - MOVE_SPITE, - MOVE_POWDER_SNOW, - MOVE_PROTECT, - MOVE_MACH_PUNCH, - MOVE_SCARY_FACE, - MOVE_FAINT_ATTACK, - MOVE_SWEET_KISS, - MOVE_BELLY_DRUM, - MOVE_SLUDGE_BOMB, - MOVE_MUD_SLAP, - MOVE_OCTAZOOKA, - MOVE_SPIKES, - MOVE_ZAP_CANNON, - MOVE_FORESIGHT, - MOVE_DESTINY_BOND, - MOVE_PERISH_SONG, - MOVE_ICY_WIND, - MOVE_DETECT, - MOVE_BONE_RUSH, - MOVE_LOCK_ON, - MOVE_OUTRAGE, - MOVE_SANDSTORM, - MOVE_GIGA_DRAIN, - MOVE_ENDURE, - MOVE_CHARM, - MOVE_ROLLOUT, - MOVE_FALSE_SWIPE, - MOVE_SWAGGER, - MOVE_MILK_DRINK, - MOVE_SPARK, - MOVE_FURY_CUTTER, - MOVE_STEEL_WING, - MOVE_MEAN_LOOK, - MOVE_ATTRACT, - MOVE_SLEEP_TALK, - MOVE_HEAL_BELL, - MOVE_RETURN, - MOVE_PRESENT, - MOVE_FRUSTRATION, - MOVE_SAFEGUARD, - MOVE_PAIN_SPLIT, - MOVE_SACRED_FIRE, - MOVE_MAGNITUDE, - MOVE_DYNAMIC_PUNCH, - MOVE_MEGAHORN, - MOVE_DRAGON_BREATH, - MOVE_BATON_PASS, - MOVE_ENCORE, - MOVE_PURSUIT, - MOVE_RAPID_SPIN, - MOVE_SWEET_SCENT, - MOVE_IRON_TAIL, - MOVE_METAL_CLAW, - MOVE_VITAL_THROW, - MOVE_MORNING_SUN, - MOVE_SYNTHESIS, - MOVE_MOONLIGHT, - MOVE_HIDDEN_POWER, - MOVE_CROSS_CHOP, - MOVE_TWISTER, - MOVE_RAIN_DANCE, - MOVE_SUNNY_DAY, - MOVE_CRUNCH, - MOVE_MIRROR_COAT, - MOVE_PSYCH_UP, - MOVE_EXTREME_SPEED, - MOVE_ANCIENT_POWER, - MOVE_SHADOW_BALL, - MOVE_FUTURE_SIGHT, - MOVE_ROCK_SMASH, - MOVE_WHIRLPOOL, - MOVE_BEAT_UP, - MOVE_FAKE_OUT, - MOVE_UPROAR, - MOVE_STOCKPILE, - MOVE_SPIT_UP, - MOVE_SWALLOW, - MOVE_HEAT_WAVE, - MOVE_HAIL, - MOVE_TORMENT, - MOVE_FLATTER, - MOVE_WILL_O_WISP, - MOVE_MEMENTO, - MOVE_FACADE, - MOVE_FOCUS_PUNCH, - MOVE_SMELLING_SALT, - MOVE_FOLLOW_ME, - MOVE_NATURE_POWER, - MOVE_CHARGE, - MOVE_TAUNT, - MOVE_HELPING_HAND, - MOVE_TRICK, - MOVE_ROLE_PLAY, - MOVE_WISH, - MOVE_ASSIST, - MOVE_INGRAIN, - MOVE_SUPERPOWER, - MOVE_MAGIC_COAT, - MOVE_RECYCLE, - MOVE_REVENGE, - MOVE_BRICK_BREAK, - MOVE_YAWN, - MOVE_KNOCK_OFF, - MOVE_ENDEAVOR, - MOVE_ERUPTION, - MOVE_SKILL_SWAP, - MOVE_IMPRISON, - MOVE_REFRESH, - MOVE_GRUDGE, - MOVE_SNATCH, - MOVE_SECRET_POWER, - MOVE_DIVE, - MOVE_ARM_THRUST, - MOVE_CAMOUFLAGE, - MOVE_TAIL_GLOW, - MOVE_LUSTER_PURGE, - MOVE_MIST_BALL, - MOVE_FEATHER_DANCE, - MOVE_TEETER_DANCE, - MOVE_BLAZE_KICK, - MOVE_MUD_SPORT, - MOVE_ICE_BALL, - MOVE_NEEDLE_ARM, - MOVE_SLACK_OFF, - MOVE_HYPER_VOICE, - MOVE_POISON_FANG, - MOVE_CRUSH_CLAW, - MOVE_BLAST_BURN, - MOVE_HYDRO_CANNON, - MOVE_METEOR_MASH, - MOVE_ASTONISH, - MOVE_WEATHER_BALL, - MOVE_AROMATHERAPY, - MOVE_FAKE_TEARS, - MOVE_AIR_CUTTER, - MOVE_OVERHEAT, - MOVE_ODOR_SLEUTH, - MOVE_ROCK_TOMB, - MOVE_SILVER_WIND, - MOVE_METAL_SOUND, - MOVE_GRASS_WHISTLE, - MOVE_TICKLE, - MOVE_COSMIC_POWER, - MOVE_WATER_SPOUT, - MOVE_SIGNAL_BEAM, - MOVE_SHADOW_PUNCH, - MOVE_EXTRASENSORY, - MOVE_SKY_UPPERCUT, - MOVE_SAND_TOMB, - MOVE_SHEER_COLD, - MOVE_MUDDY_WATER, - MOVE_BULLET_SEED, - MOVE_AERIAL_ACE, - MOVE_ICICLE_SPEAR, - MOVE_IRON_DEFENSE, - MOVE_BLOCK, - MOVE_HOWL, - MOVE_DRAGON_CLAW, - MOVE_FRENZY_PLANT, - MOVE_BULK_UP, - MOVE_BOUNCE, - MOVE_MUD_SHOT, - MOVE_POISON_TAIL, - MOVE_COVET, - MOVE_VOLT_TACKLE, - MOVE_MAGICAL_LEAF, - MOVE_WATER_SPORT, - MOVE_CALM_MIND, - MOVE_LEAF_BLADE, - MOVE_DRAGON_DANCE, - MOVE_ROCK_BLAST, - MOVE_SHOCK_WAVE, - MOVE_WATER_PULSE, - MOVE_DOOM_DESIRE, - MOVE_PSYCHO_BOOST, - MOVE_ROOST, - MOVE_GRAVITY, - MOVE_MIRACLE_EYE, - MOVE_WAKE_UP_SLAP, - MOVE_HAMMER_ARM, - MOVE_GYRO_BALL, - MOVE_HEALING_WISH, - MOVE_BRINE, - MOVE_NATURAL_GIFT, - MOVE_FEINT, - MOVE_PLUCK, - MOVE_TAILWIND, - MOVE_ACUPRESSURE, - MOVE_METAL_BURST, - MOVE_U_TURN, - MOVE_CLOSE_COMBAT, - MOVE_PAYBACK, - MOVE_ASSURANCE, - MOVE_EMBARGO, - MOVE_FLING, - MOVE_PSYCHO_SHIFT, - MOVE_TRUMP_CARD, - MOVE_HEAL_BLOCK, - MOVE_WRING_OUT, - MOVE_POWER_TRICK, - MOVE_GASTRO_ACID, - MOVE_LUCKY_CHANT, - MOVE_ME_FIRST, - MOVE_COPYCAT, - MOVE_POWER_SWAP, - MOVE_GUARD_SWAP, - MOVE_PUNISHMENT, - MOVE_LAST_RESORT, - MOVE_WORRY_SEED, - MOVE_SUCKER_PUNCH, - MOVE_TOXIC_SPIKES, - MOVE_HEART_SWAP, - MOVE_AQUA_RING, - MOVE_MAGNET_RISE, - MOVE_FLARE_BLITZ, - MOVE_FORCE_PALM, - MOVE_AURA_SPHERE, - MOVE_ROCK_POLISH, - MOVE_POISON_JAB, - MOVE_DARK_PULSE, - MOVE_NIGHT_SLASH, - MOVE_AQUA_TAIL, - MOVE_SEED_BOMB, - MOVE_AIR_SLASH, - MOVE_X_SCISSOR, - MOVE_BUG_BUZZ, - MOVE_DRAGON_PULSE, - MOVE_DRAGON_RUSH, - MOVE_POWER_GEM, - MOVE_DRAIN_PUNCH, - MOVE_VACUUM_WAVE, - MOVE_FOCUS_BLAST, - MOVE_ENERGY_BALL, - MOVE_BRAVE_BIRD, - MOVE_EARTH_POWER, - MOVE_SWITCHEROO, - MOVE_GIGA_IMPACT, - MOVE_NASTY_PLOT, - MOVE_BULLET_PUNCH, - MOVE_AVALANCHE, - MOVE_ICE_SHARD, - MOVE_SHADOW_CLAW, - MOVE_THUNDER_FANG, - MOVE_ICE_FANG, - MOVE_FIRE_FANG, - MOVE_SHADOW_SNEAK, - MOVE_MUD_BOMB, - MOVE_PSYCHO_CUT, - MOVE_ZEN_HEADBUTT, - MOVE_MIRROR_SHOT, - MOVE_FLASH_CANNON, - MOVE_ROCK_CLIMB, - MOVE_DEFOG, - MOVE_TRICK_ROOM, - MOVE_DRACO_METEOR, - MOVE_DISCHARGE, - MOVE_LAVA_PLUME, - MOVE_LEAF_STORM, - MOVE_POWER_WHIP, - MOVE_ROCK_WRECKER, - MOVE_CROSS_POISON, - MOVE_GUNK_SHOT, - MOVE_IRON_HEAD, - MOVE_MAGNET_BOMB, - MOVE_STONE_EDGE, - MOVE_CAPTIVATE, - MOVE_STEALTH_ROCK, - MOVE_GRASS_KNOT, - MOVE_CHATTER, - MOVE_JUDGMENT, - MOVE_BUG_BITE, - MOVE_CHARGE_BEAM, - MOVE_WOOD_HAMMER, - MOVE_AQUA_JET, - MOVE_ATTACK_ORDER, - MOVE_DEFEND_ORDER, - MOVE_HEAL_ORDER, - MOVE_HEAD_SMASH, - MOVE_DOUBLE_HIT, - MOVE_ROAR_OF_TIME, - MOVE_SPACIAL_REND, - MOVE_LUNAR_DANCE, - MOVE_CRUSH_GRIP, - MOVE_MAGMA_STORM, - MOVE_DARK_VOID, - MOVE_SEED_FLARE, - MOVE_OMINOUS_WIND, - MOVE_SHADOW_FORCE, - - NUM_MOVES = MOVE_SHADOW_FORCE, - MAX_MOVES -}; +#define NUM_MOVES MOVE_SHADOW_FORCE #endif //POKEPLATINUM_CONSTANTS_MOVES_H diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 358102c9a7..65eb414818 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -1,32 +1,7 @@ #ifndef POKEPLATINUM_CONSTANTS_POKEMON_H #define POKEPLATINUM_CONSTANTS_POKEMON_H -/** - * @brief Pokemon Types - * (Can't make this an enum yet due to issues with csv2bin) - */ -// enum PokemonType { -#define TYPE_NORMAL 0 -#define TYPE_FIGHTING 1 -#define TYPE_FLYING 2 -#define TYPE_POISON 3 -#define TYPE_GROUND 4 -#define TYPE_ROCK 5 -#define TYPE_BUG 6 -#define TYPE_GHOST 7 -#define TYPE_STEEL 8 -#define TYPE_MYSTERY 9 -#define TYPE_FIRE 10 -#define TYPE_WATER 11 -#define TYPE_GRASS 12 -#define TYPE_ELECTRIC 13 -#define TYPE_PSYCHIC 14 -#define TYPE_ICE 15 -#define TYPE_DRAGON 16 -#define TYPE_DARK 17 -#define NUMBER_OF_MON_TYPES 18 -#define TYPE_NONE 255 -// }; +#include "consts/generated/c/pokemon.h" // defs for PokemonType and PokemonPersonalDataParam /** * @brief Pokemon Stats @@ -239,43 +214,4 @@ enum PokemonDataParam { MON_DATA_179, }; -/** - * @brief PokemonPersonalData Parameters - */ -enum PokemonPersonalDataParam { - MON_DATA_PERSONAL_BASE_HP = 0, - MON_DATA_PERSONAL_BASE_ATK, - MON_DATA_PERSONAL_BASE_DEF, - MON_DATA_PERSONAL_BASE_SPEED, - MON_DATA_PERSONAL_BASE_SP_ATK, - MON_DATA_PERSONAL_BASE_SP_DEF, - MON_DATA_PERSONAL_TYPE_1, - MON_DATA_PERSONAL_TYPE_2, - MON_DATA_PERSONAL_CATCH_RATE, - MON_DATA_PERSONAL_BASE_EXP, - MON_DATA_PERSONAL_EV_HP_YIELD, - MON_DATA_PERSONAL_EV_ATK_YIELD, - MON_DATA_PERSONAL_EV_DEF_YIELD, - MON_DATA_PERSONAL_EV_SPEED_YIELD, - MON_DATA_PERSONAL_EV_SP_ATK_YIELD, - MON_DATA_PERSONAL_EV_SP_DEF_YIELD, - MON_DATA_PERSONAL_ITEM1, - MON_DATA_PERSONAL_ITEM2, - MON_DATA_PERSONAL_GENDER, - MON_DATA_PERSONAL_HATCH_CYCLE, - MON_DATA_PERSONAL_BASE_FRIENDSHIP, - MON_DATA_PERSONAL_EXP_RATE, - MON_DATA_PERSONAL_EGG_GROUP_1, - MON_DATA_PERSONAL_EGG_GROUP_2, - MON_DATA_PERSONAL_ABILITY_1, - MON_DATA_PERSONAL_ABILITY_2, - MON_DATA_PERSONAL_GREAT_MARSH_FLEE_RATE, - MON_DATA_PERSONAL_COLOR, - MON_DATA_PERSONAL_FLIP_SPRITE, - MON_DATA_PERSONAL_TM_LEARNSET_MASK_1, - MON_DATA_PERSONAL_TM_LEARNSET_MASK_2, - MON_DATA_PERSONAL_TM_LEARNSET_MASK_3, - MON_DATA_PERSONAL_TM_LEARNSET_MASK_4, -}; - #endif // POKEPLATINUM_CONSTANTS_POKEMON_H diff --git a/include/data/trainer_class_genders.h b/include/data/trainer_class_genders.h index 6e71684325..6bd12c87ff 100644 --- a/include/data/trainer_class_genders.h +++ b/include/data/trainer_class_genders.h @@ -1,4 +1,4 @@ -#include "constants/gender.h" +#include "consts/generated/c/gender.h" #include "constants/trainer.h" static const u8 sTrainerClassGender[] = { diff --git a/include/move_table.h b/include/move_table.h index 9d5858ce60..a3fe4b3ef9 100644 --- a/include/move_table.h +++ b/include/move_table.h @@ -1,6 +1,8 @@ #ifndef POKEPLATINUM_MOVE_TABLE_H #define POKEPLATINUM_MOVE_TABLE_H +#include "consts/generated/c/moves.h" // def for MoveAttribute + typedef struct MoveContestData { u8 effect; u8 type; @@ -21,21 +23,6 @@ typedef struct MoveTable { MoveContestData contest; } MoveTable; -enum MoveAttribute { - MOVEATTRIBUTE_EFFECT = 0, - MOVEATTRIBUTE_CLASS, - MOVEATTRIBUTE_POWER, - MOVEATTRIBUTE_TYPE, - MOVEATTRIBUTE_ACCURACY, - MOVEATTRIBUTE_PP, - MOVEATTRIBUTE_EFFECT_CHANCE, - MOVEATTRIBUTE_RANGE, - MOVEATTRIBUTE_PRIORTY, - MOVEATTRIBUTE_FLAGS, - MOVEATTRIBUTE_CONTEST_EFFECT, - MOVEATTRIBUTE_CONTEST_TYPE, -}; - /** * @brief Load the full move table into a destination buffer. * diff --git a/res/items/meson.build b/res/items/meson.build index e9f11abf90..2bebc138ab 100644 --- a/res/items/meson.build +++ b/res/items/meson.build @@ -14,7 +14,8 @@ nuts_data_narc = custom_target('nuts_data.narc', '@OUTPUT0@', '@INPUT0@', '--narc', - '-i', '@SOURCE_ROOT@/include' + '-i', '@SOURCE_ROOT@/include', + '-i', '@SOURCE_ROOT@/build', ] ) @@ -35,7 +36,8 @@ pl_item_data_narc = custom_target('pl_item_data.narc', '@INPUT0@', '--narc', '--pad', '0xFF', - '-i', '@SOURCE_ROOT@/include' + '-i', '@SOURCE_ROOT@/include', + '-i', '@SOURCE_ROOT@/build', ] ) diff --git a/res/items/pl_item_data_format.txt b/res/items/pl_item_data_format.txt index ec8b9b2bd1..4fc236a8b4 100644 --- a/res/items/pl_item_data_format.txt +++ b/res/items/pl_item_data_format.txt @@ -1,12 +1,12 @@ item:skip:constants/items.h:ITEM_ price:u16 -holdEffect:u8:constants/items.h:HOLD_EFFECT_ +holdEffect:u8:consts/generated/c/items.h:HOLD_EFFECT_ holdEffectParam:u8 pluckEffect:u8 flingEffect:u8 flingPower:u8 naturalGiftPower:u8 -naturalGiftType:u16.5:constants/pokemon.h:TYPE_ +naturalGiftType:u16.5:consts/generated/c/pokemon.h:TYPE_ prevent_toss:u16.1:bool selectable:u16.1:bool fieldPocket:u16.4:constants/items.h:POCKET_ diff --git a/src/overlay016/battle_controller.c b/src/overlay016/battle_controller.c index f9656243a0..bcfeeb4eaf 100644 --- a/src/overlay016/battle_controller.c +++ b/src/overlay016/battle_controller.c @@ -1,7 +1,7 @@ #include #include -#include "constants/abilities.h" +#include "consts/generated/c/abilities.h" #include "constants/battle.h" #include "constants/heap.h" #include "constants/items.h" diff --git a/src/overlay016/battle_lib.c b/src/overlay016/battle_lib.c index c4f726789b..cc97fdbffc 100644 --- a/src/overlay016/battle_lib.c +++ b/src/overlay016/battle_lib.c @@ -1,10 +1,11 @@ #include #include -#include "constants/abilities.h" +#include "consts/generated/c/abilities.h" +#include "consts/generated/c/gender.h" + #include "constants/battle.h" #include "constants/flavor.h" -#include "constants/gender.h" #include "constants/heap.h" #include "constants/items.h" #include "constants/sound.h" diff --git a/src/overlay016/battle_script.c b/src/overlay016/battle_script.c index ab4faf0c25..361b4781d1 100644 --- a/src/overlay016/battle_script.c +++ b/src/overlay016/battle_script.c @@ -1,9 +1,10 @@ #include #include -#include "constants/abilities.h" +#include "consts/generated/c/abilities.h" +#include "consts/generated/c/gender.h" + #include "constants/battle.h" -#include "constants/gender.h" #include "constants/heap.h" #include "constants/items.h" #include "constants/narc.h" diff --git a/src/pokemon.c b/src/pokemon.c index 53d79cb173..736dec94f7 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -49,10 +49,10 @@ #include "unk_02092494.h" #include "flags.h" +#include "consts/generated/c/gender.h" #include "constants/pokemon.h" #include "constants/species.h" #include "constants/items.h" -#include "constants/gender.h" #include "constants/moves.h" // Columns: Spicy, Dry, Sweet, Bitter, Sour From f46a747f0e5ce16a8262baa256cbaf06d542dba5 Mon Sep 17 00:00:00 2001 From: Rachel Date: Sun, 21 Jan 2024 17:02:06 -0800 Subject: [PATCH 3/7] Rename BATTLE_SUBSEQ consts to BATTLE_SUBSCRIPT + move to constgen manifest --- consts/battle.json | 10 + consts/meson.build | 19 +- consts/narc_files.json | 311 ++++++++++++ include/constants/battle/system_control.h | 6 + .../narc_files/battle_skill_subseq.h | 303 ------------ include/data/move_side_effect_subscripts.h | 292 ++++++------ src/overlay016/battle_controller.c | 265 ++++++----- src/overlay016/battle_lib.c | 444 +++++++++--------- src/overlay016/battle_script.c | 26 +- 9 files changed, 857 insertions(+), 819 deletions(-) create mode 100644 consts/narc_files.json delete mode 100644 include/constants/narc_files/battle_skill_subseq.h diff --git a/consts/battle.json b/consts/battle.json index a24ab26abe..3cbe7521af 100644 --- a/consts/battle.json +++ b/consts/battle.json @@ -21,6 +21,9 @@ "battle_lib_params": [ "@BattleContextParam", "@BattleMonParam" + ], + "battle_controller_params": [ + "@AfterMoveMessageType" ] }, "definitions": { @@ -915,6 +918,13 @@ "BATTLEMON_UNUSED_99", "BATTLEMON_TEMP" ] + }, + "@AfterMoveMessageType": { + "type": "enum", + "values": [ + "AFTER_MOVE_MESSAGE_ONE_HIT", + "AFTER_MOVE_MESSAGE_MULTI_HIT" + ] } } } diff --git a/consts/meson.build b/consts/meson.build index ae25ba2d01..2212591674 100644 --- a/consts/meson.build +++ b/consts/meson.build @@ -1,15 +1,17 @@ consts_manifests = files( 'battle.json', 'global.json', + 'narc_files.json', ) gen_consts_root = meson.current_build_dir() / 'generated' gen_c_consts_root = gen_consts_root / 'c' +gen_asm_consts_root = gen_consts_root / 'asm' -generated_c_consts = custom_target('gen_c_consts', +custom_target('generated_consts_c', build_by_default: true, capture: true, - output: 'gen_c_consts', + output: 'generated_consts_c', input: consts_manifests, command: [ constgen_py, @@ -18,3 +20,16 @@ generated_c_consts = custom_target('gen_c_consts', '-l', 'c' ] ) + +generated_consts_asm = custom_target('generated_consts_asm', + build_by_default: true, + capture: true, + output: 'generated_consts_asm', + input: consts_manifests, + command: [ + constgen_py, + '-f', '@INPUT@', + '-r', gen_asm_consts_root, + '-l', 'asm' + ] +) diff --git a/consts/narc_files.json b/consts/narc_files.json new file mode 100644 index 0000000000..9c4e60f6ad --- /dev/null +++ b/consts/narc_files.json @@ -0,0 +1,311 @@ +{ + "targets": { + "battle_subscripts": [ + "@BattleSubscriptNARC" + ] + }, + "definitions": { + "@BattleSubscriptNARC": { + "type": "enum", + "values": [ + "BATTLE_SUBSCRIPT_START_ENCOUNTER", + "BATTLE_SUBSCRIPT_USE_MOVE", + "BATTLE_SUBSCRIPT_UPDATE_HP", + "BATTLE_SUBSCRIPT_ESCAPE", + "BATTLE_SUBSCRIPT_BATTLE_WON", + "BATTLE_SUBSCRIPT_BATTLE_LOST", + "BATTLE_SUBSCRIPT_FAINT_MON", + "BATTLE_SUBSCRIPT_MISSED", + "BATTLE_SUBSCRIPT_ESCAPE_FAILED", + "BATTLE_SUBSCRIPT_SWITCH_POKEMON", + "BATTLE_SUBSCRIPT_SHOW_PARTY_LIST", + "BATTLE_SUBSCRIPT_THROW_POKEBALL", + "BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE", + "BATTLE_SUBSCRIPT_VANISH_ON_CHARGE_TURN", + "BATTLE_SUBSCRIPT_FLINCH_MON", + "BATTLE_SUBSCRIPT_FLINCHED", + "BATTLE_SUBSCRIPT_CRITICAL_HIT", + "BATTLE_SUBSCRIPT_HIT_X_TIMES", + "BATTLE_SUBSCRIPT_FALL_ASLEEP", + "BATTLE_SUBSCRIPT_WAKE_UP", + "BATTLE_SUBSCRIPT_SLEEPING", + "BATTLE_SUBSCRIPT_MOVE_FOLLOWUP_MESSAGE", + "BATTLE_SUBSCRIPT_POISON", + "BATTLE_SUBSCRIPT_POISON_DAMAGE", + "BATTLE_SUBSCRIPT_DRAIN_HALF_DAMAGE_DEALT", + "BATTLE_SUBSCRIPT_BURN", + "BATTLE_SUBSCRIPT_BURN_DAMAGE", + "BATTLE_SUBSCRIPT_FREEZE", + "BATTLE_SUBSCRIPT_FROZEN", + "BATTLE_SUBSCRIPT_THAW_OUT", + "BATTLE_SUBSCRIPT_DEFROSTED_BY_MOVE", + "BATTLE_SUBSCRIPT_PARALYZE", + "BATTLE_SUBSCRIPT_FULLY_PARALYZED", + "BATTLE_SUBSCRIPT_DREAM_EATER", + "BATTLE_SUBSCRIPT_RESET_ALL_STAT_STAGES", + "BATTLE_SUBSCRIPT_BIDE_START", + "BATTLE_SUBSCRIPT_BIDE_END", + "BATTLE_SUBSCRIPT_CONFUSE", + "BATTLE_SUBSCRIPT_CONFUSED", + "BATTLE_SUBSCRIPT_HURT_SELF_IN_CONFUSION", + "BATTLE_SUBSCRIPT_SNAP_OUT_OF_CONFUSION", + "BATTLE_SUBSCRIPT_TRAINER_MESSAGE", + "BATTLE_SUBSCRIPT_NO_PP", + "BATTLE_SUBSCRIPT_STRUGGLE", + "BATTLE_SUBSCRIPT_THRASH", + "BATTLE_SUBSCRIPT_CONVERSION", + "BATTLE_SUBSCRIPT_RECOVER_HALF_MAX_HP", + "BATTLE_SUBSCRIPT_BADLY_POISON", + "BATTLE_SUBSCRIPT_PAY_DAY", + "BATTLE_SUBSCRIPT_LIGHT_SCREEN", + "BATTLE_SUBSCRIPT_MOVE_EFFECT_END", + "BATTLE_SUBSCRIPT_THRASH_END", + "BATTLE_SUBSCRIPT_REFLECT", + "BATTLE_SUBSCRIPT_ANIMATION_PREPARED_MESSAGE", + "BATTLE_SUBSCRIPT_MIST", + "BATTLE_SUBSCRIPT_REST", + "BATTLE_SUBSCRIPT_UPROAR", + "BATTLE_SUBSCRIPT_SHOW_PREPARED_MESSAGE", + "BATTLE_SUBSCRIPT_BIND_START", + "BATTLE_SUBSCRIPT_BIND_EFFECT", + "BATTLE_SUBSCRIPT_BIND_END", + "BATTLE_SUBSCRIPT_CRASH_ON_MISS", + "BATTLE_SUBSCRIPT_FOCUS_ENERGY", + "BATTLE_SUBSCRIPT_RECOIL_1_4", + "BATTLE_SUBSCRIPT_RECHARGE_TURN", + "BATTLE_SUBSCRIPT_RECHARGING", + "BATTLE_SUBSCRIPT_SET_RAGE_FLAG", + "BATTLE_SUBSCRIPT_MIMIC", + "BATTLE_SUBSCRIPT_LEECH_SEED_START", + "BATTLE_SUBSCRIPT_LEECH_SEED_EFFECT", + "BATTLE_SUBSCRIPT_DISABLE_START", + "BATTLE_SUBSCRIPT_MOVE_IS_DISABLED", + "BATTLE_SUBSCRIPT_DISABLE_END", + "BATTLE_SUBSCRIPT_ENCORE_START", + "BATTLE_SUBSCRIPT_ENCORE_END", + "BATTLE_SUBSCRIPT_BUT_IT_FAILED", + "BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION", + "BATTLE_SUBSCRIPT_PAIN_SPLIT", + "BATTLE_SUBSCRIPT_CONVERSION_2", + "BATTLE_SUBSCRIPT_LOCK_ON", + "BATTLE_SUBSCRIPT_SKETCH", + "BATTLE_SUBSCRIPT_FEINT", + "BATTLE_SUBSCRIPT_DESTINY_BOND", + "BATTLE_SUBSCRIPT_FAINT_CHECK_DESTINY_BOND", + "BATTLE_SUBSCRIPT_REDUCE_TARGET_PP", + "BATTLE_SUBSCRIPT_STEAL_ITEM", + "BATTLE_SUBSCRIPT_MEAN_LOOK", + "BATTLE_SUBSCRIPT_PROTECT", + "BATTLE_SUBSCRIPT_HEAL_BELL", + "BATTLE_SUBSCRIPT_TRY_SUBSTITUTE", + "BATTLE_SUBSCRIPT_HIT_SUBSTITUTE", + "BATTLE_SUBSCRIPT_FORCE_TARGET_TO_SWITCH_OR_FLEE", + "BATTLE_SUBSCRIPT_TRANSFORM_INTO_TARGET", + "BATTLE_SUBSCRIPT_NIGHTMARE_START", + "BATTLE_SUBSCRIPT_NIGHTMARE_EFFECT", + "BATTLE_SUBSCRIPT_MINIMIZE", + "BATTLE_SUBSCRIPT_CURSE_NORMAL", + "BATTLE_SUBSCRIPT_CURSE_GHOST", + "BATTLE_SUBSCRIPT_CURSE_DAMAGE", + "BATTLE_SUBSCRIPT_HAZARDS_CHECK", + "BATTLE_SUBSCRIPT_FORESIGHT", + "BATTLE_SUBSCRIPT_PERISH_SONG_START", + "BATTLE_SUBSCRIPT_CONTINUE_PERISH_SONG", + "BATTLE_SUBSCRIPT_WEATHER_START", + "BATTLE_SUBSCRIPT_WEATHER_CONTINUES", + "BATTLE_SUBSCRIPT_SWAGGER", + "BATTLE_SUBSCRIPT_INFATUATE", + "BATTLE_SUBSCRIPT_INFATUATED", + "BATTLE_SUBSCRIPT_IMMOBILIZED_BY_LOVE", + "BATTLE_SUBSCRIPT_SAFEGUARD_START", + "BATTLE_SUBSCRIPT_SAFEGUARD_END", + "BATTLE_SUBSCRIPT_RECOVER_HP", + "BATTLE_SUBSCRIPT_PRESENT_HEAL", + "BATTLE_SUBSCRIPT_MAGNITUDE", + "BATTLE_SUBSCRIPT_BATON_PASS", + "BATTLE_SUBSCRIPT_RAPID_SPIN", + "BATTLE_SUBSCRIPT_BREAK_BIND_EFFECT", + "BATTLE_SUBSCRIPT_BLOW_AWAY_HAZARDS", + "BATTLE_SUBSCRIPT_GIVE_TARGET_OWN_STATUS", + "BATTLE_SUBSCRIPT_BOOST_ALL_STATS", + "BATTLE_SUBSCRIPT_BELLY_DRUM", + "BATTLE_SUBSCRIPT_FUTURE_SIGHT_DAMAGE", + "BATTLE_SUBSCRIPT_TELEPORT", + "BATTLE_SUBSCRIPT_FUTURE_SIGHT_START", + "BATTLE_SUBSCRIPT_STOCKPILE", + "BATTLE_SUBSCRIPT_SWALLOW", + "BATTLE_SUBSCRIPT_PRINT_MESSAGE_AND_PLAY_ANIMATION", + "BATTLE_SUBSCRIPT_TORMENT_START", + "BATTLE_SUBSCRIPT_FLATTER", + "BATTLE_SUBSCRIPT_MEMENTO", + "BATTLE_SUBSCRIPT_HEAL_TARGET_PARALYSIS", + "BATTLE_SUBSCRIPT_CHARGE", + "BATTLE_SUBSCRIPT_TAUNT_START", + "BATTLE_SUBSCRIPT_MOVE_FAIL_TAUNTED", + "BATTLE_SUBSCRIPT_EXCHANGE_ITEMS", + "BATTLE_SUBSCRIPT_COPY_ABILITY", + "BATTLE_SUBSCRIPT_WISH_HEAL", + "BATTLE_SUBSCRIPT_INGRAIN_HEAL", + "BATTLE_SUBSCRIPT_USER_ATK_AND_DEF_DOWN_1_STAGE", + "BATTLE_SUBSCRIPT_MAGIC_COAT", + "BATTLE_SUBSCRIPT_BREAK_SCREENS", + "BATTLE_SUBSCRIPT_YAWN", + "BATTLE_SUBSCRIPT_KNOCK_OFF", + "BATTLE_SUBSCRIPT_EXCHANGE_ABILITIES", + "BATTLE_SUBSCRIPT_MOVE_IS_IMPRISONED", + "BATTLE_SUBSCRIPT_RECOVER_PSN_PRZ_BRN", + "BATTLE_SUBSCRIPT_SNATCH", + "BATTLE_SUBSCRIPT_RECOIL_1_3", + "BATTLE_SUBSCRIPT_TARGET_ATK_AND_DEF_DOWN_1_STAGE", + "BATTLE_SUBSCRIPT_USER_DEF_AND_SPDEF_UP_1_STAGE", + "BATTLE_SUBSCRIPT_USER_ATK_AND_DEF_UP_1_STAGE", + "BATTLE_SUBSCRIPT_USER_SPATK_AND_SPDEF_UP_1_STAGE", + "BATTLE_SUBSCRIPT_USER_ATK_AND_SPEED_UP_1_STAGE", + "BATTLE_SUBSCRIPT_PURSUIT", + "BATTLE_SUBSCRIPT_ROOST", + "BATTLE_SUBSCRIPT_HEAL_TARGET_SLEEP", + "BATTLE_SUBSCRIPT_GRAVITY_START", + "BATTLE_SUBSCRIPT_MOVE_FAIL_GRAVITY", + "BATTLE_SUBSCRIPT_MIRACLE_EYE", + "BATTLE_SUBSCRIPT_HEALING_WISH", + "BATTLE_SUBSCRIPT_TAILWIND_START", + "BATTLE_SUBSCRIPT_USER_DEF_AND_SPDEF_DOWN_1_STAGE", + "BATTLE_SUBSCRIPT_USER_SWAP_ATK_AND_DEF", + "BATTLE_SUBSCRIPT_SUPPRESS_TARGET_ABILITY", + "BATTLE_SUBSCRIPT_LUCKY_CHANT_START", + "BATTLE_SUBSCRIPT_EXCHANGE_ATK_AND_SPATK_STAGES", + "BATTLE_SUBSCRIPT_EXCHANGE_DEF_AND_SPDEF_STAGES", + "BATTLE_SUBSCRIPT_GIVE_TARGET_INSOMNIA", + "BATTLE_SUBSCRIPT_EXCHANGE_ALL_STAT_STAGES", + "BATTLE_SUBSCRIPT_AQUA_RING_HEAL", + "BATTLE_SUBSCRIPT_RECOIL_1_3_CHANCE_TO_BURN", + "BATTLE_SUBSCRIPT_DEFOG", + "BATTLE_SUBSCRIPT_DEFOG_MESSAGE", + "BATTLE_SUBSCRIPT_HEAL_BLOCK_START", + "BATTLE_SUBSCRIPT_MOVE_IS_HEAL_BLOCKED", + "BATTLE_SUBSCRIPT_ATTACK_THEN_SWITCH_OUT", + "BATTLE_SUBSCRIPT_MOVE_FAIL_MISSED", + "BATTLE_SUBSCRIPT_MOLD_BREAKER", + "BATTLE_SUBSCRIPT_ABILITY_RESTORES_HP", + "BATTLE_SUBSCRIPT_ABSORB_AND_BOOST_FIRE_TYPE_MOVES", + "BATTLE_SUBSCRIPT_LIGHTNING_ROD_REDIRECTED", + "BATTLE_SUBSCRIPT_BLOCKED_BY_SOUNDPROOF", + "BATTLE_SUBSCRIPT_ABSORB_AND_SPEED_UP_1_STAGE", + "BATTLE_SUBSCRIPT_DRIZZLE", + "BATTLE_SUBSCRIPT_SAND_STREAM", + "BATTLE_SUBSCRIPT_DROUGHT", + "BATTLE_SUBSCRIPT_INTIMIDATE", + "BATTLE_SUBSCRIPT_TRACE", + "BATTLE_SUBSCRIPT_COLOR_CHANGE", + "BATTLE_SUBSCRIPT_ROUGH_SKIN", + "BATTLE_SUBSCRIPT_ABILITY_RESTORE_STATUS", + "BATTLE_SUBSCRIPT_LOAFING_AROUND", + "BATTLE_SUBSCRIPT_ABILITY_HP_RESTORE_GRADUAL", + "BATTLE_SUBSCRIPT_AFTERMATH", + "BATTLE_SUBSCRIPT_ANTICIPATION", + "BATTLE_SUBSCRIPT_FOREWARN", + "BATTLE_SUBSCRIPT_SLOW_START", + "BATTLE_SUBSCRIPT_SLOW_START_END", + "BATTLE_SUBSCRIPT_HELD_ITEM_HP_RESTORE", + "BATTLE_SUBSCRIPT_HELD_ITEM_PRZ_RESTORE", + "BATTLE_SUBSCRIPT_HELD_ITEM_SLP_RESTORE", + "BATTLE_SUBSCRIPT_HELD_ITEM_PSN_RESTORE", + "BATTLE_SUBSCRIPT_HELD_ITEM_BRN_RESTORE", + "BATTLE_SUBSCRIPT_HELD_ITEM_FRZ_RESTORE", + "BATTLE_SUBSCRIPT_HELD_ITEM_PP_RESTORE", + "BATTLE_SUBSCRIPT_HELD_ITEM_CNF_RESTORE", + "BATTLE_SUBSCRIPT_HELD_ITEM_MULTI_RESTORE", + "BATTLE_SUBSCRIPT_HELD_ITEM_DISLIKE_FLAVOR", + "BATTLE_SUBSCRIPT_HELD_ITEM_RAISE_STAT", + "BATTLE_SUBSCRIPT_HELD_ITEM_RAISE_CRIT", + "BATTLE_SUBSCRIPT_HELD_ITEM_SHARPLY_RAISE_STAT", + "BATTLE_SUBSCRIPT_HELD_ITEM_STATDOWN_RESTORE", + "BATTLE_SUBSCRIPT_HELD_ITEM_HEAL_INFATUATION", + "BATTLE_SUBSCRIPT_RESTORE_A_LITTLE_HP", + "BATTLE_SUBSCRIPT_LOSE_HP_FROM_ITEM", + "BATTLE_SUBSCRIPT_LOSE_HP_FROM_ITEM_WITH_MESSAGE", + "BATTLE_SUBSCRIPT_TRANSFER_STICKY_BARB", + "BATTLE_SUBSCRIPT_ITEM_SKIP_CHARGE_TURN", + "BATTLE_SUBSCRIPT_EMBARGO_START", + "BATTLE_SUBSCRIPT_PLUCK", + "BATTLE_SUBSCRIPT_FLING", + "BATTLE_SUBSCRIPT_ABILITY_FORBIDS_STATUS", + "BATTLE_SUBSCRIPT_ESCAPE_ITEM", + "BATTLE_SUBSCRIPT_BATTLE_ITEM", + "BATTLE_SUBSCRIPT_BAG_ITEM_HP_RESTORE", + "BATTLE_SUBSCRIPT_BAG_ITEM_PP_RESTORE", + "BATTLE_SUBSCRIPT_RECOIL_1_3_CHANCE_TO_PARALYZE", + "BATTLE_SUBSCRIPT_SAFARI_THROW_BAIT", + "BATTLE_SUBSCRIPT_SAFARI_THROW_ROCK", + "BATTLE_SUBSCRIPT_SAFARI_ESCAPE", + "BATTLE_SUBSCRIPT_ENEMY_ESCAPE", + "BATTLE_SUBSCRIPT_REPLACE_FAINTED", + "BATTLE_SUBSCRIPT_TIGHTEN_FOCUS", + "BATTLE_SUBSCRIPT_TAILWIND_END", + "BATTLE_SUBSCRIPT_RAINING_END", + "BATTLE_SUBSCRIPT_SANDSTORM_END", + "BATTLE_SUBSCRIPT_SUNNY_END", + "BATTLE_SUBSCRIPT_HAILING_END", + "BATTLE_SUBSCRIPT_GRAVITY_END", + "BATTLE_SUBSCRIPT_CANNOT_HEAL", + "BATTLE_SUBSCRIPT_UPROAR_CONTINUES", + "BATTLE_SUBSCRIPT_UPROAR_END", + "BATTLE_SUBSCRIPT_MAGNET_RISE_END", + "BATTLE_SUBSCRIPT_HEAL_BLOCK_END", + "BATTLE_SUBSCRIPT_EMBARGO_END", + "BATTLE_SUBSCRIPT_RAGE_IS_BUILDING", + "BATTLE_SUBSCRIPT_RECOIL_1_2", + "BATTLE_SUBSCRIPT_BURN_OR_FLINCH", + "BATTLE_SUBSCRIPT_FREEZE_OR_FLINCH", + "BATTLE_SUBSCRIPT_PARALYZE_OR_FLINCH", + "BATTLE_SUBSCRIPT_LUCKY_CHANT_END", + "BATTLE_SUBSCRIPT_TRICK_ROOM_END", + "BATTLE_SUBSCRIPT_SNOW_WARNING", + "BATTLE_SUBSCRIPT_FRISK", + "BATTLE_SUBSCRIPT_DISOBEY_WHILE_ASLEEP", + "BATTLE_SUBSCRIPT_DISOBEY_DO_NOTHING", + "BATTLE_SUBSCRIPT_DISOBEY_ORDERS", + "BATTLE_SUBSCRIPT_DISOBEY_SLEEP", + "BATTLE_SUBSCRIPT_DISOBEY_HIT_SELF", + "BATTLE_SUBSCRIPT_CHARGE_MOVE_CLEANUP", + "BATTLE_SUBSCRIPT_CHATTER", + "BATTLE_SUBSCRIPT_LUNAR_DANCE", + "BATTLE_SUBSCRIPT_FORM_CHANGE", + "BATTLE_SUBSCRIPT_BAD_DREAMS", + "BATTLE_SUBSCRIPT_TYPE_RESIST_BERRY", + "BATTLE_SUBSCRIPT_HELD_ITEM_TEMP_ACC_UP", + "BATTLE_SUBSCRIPT_HELD_ITEM_RECOIL_WHEN_HIT", + "BATTLE_SUBSCRIPT_USE_POTION", + "BATTLE_SUBSCRIPT_USE_STATUS_RECOVERY", + "BATTLE_SUBSCRIPT_USE_STAT_BOOSTER", + "BATTLE_SUBSCRIPT_USE_GUARD_SPEC", + "BATTLE_SUBSCRIPT_OVERWORLD_RAIN", + "BATTLE_SUBSCRIPT_OVERWORLD_HAIL", + "BATTLE_SUBSCRIPT_OVERWORLD_SAND", + "BATTLE_SUBSCRIPT_OVERWORLD_FOG", + "BATTLE_SUBSCRIPT_THROW_SAFARI_BALL", + "BATTLE_SUBSCRIPT_GRANT_EXP", + "BATTLE_SUBSCRIPT_AFTER_SELFDESTRUCT", + "BATTLE_SUBSCRIPT_CHECK_QUICK_CLAW", + "BATTLE_SUBSCRIPT_PUSH_ATTACKER_AND_DEFENDER", + "BATTLE_SUBSCRIPT_POP_ATTACKER_AND_DEFENDER", + "BATTLE_SUBSCRIPT_NO_TARGET", + "BATTLE_SUBSCRIPT_BIDE_NO_TARGET", + "BATTLE_SUBSCRIPT_LINK_WIN_LOSE", + "BATTLE_SUBSCRIPT_ESCAPE_SUCCESS", + "BATTLE_SUBSCRIPT_PRESSURE", + "BATTLE_SUBSCRIPT_ENEMY_ESCAPE_FAILED", + "BATTLE_SUBSCRIPT_VANISH_OFF", + "BATTLE_SUBSCRIPT_TAUNT_END", + "BATTLE_SUBSCRIPT_USE_FULL_RESTORE", + "BATTLE_SUBSCRIPT_PLUCK_CHECK", + "BATTLE_SUBSCRIPT_WAIT_MOVE_ANIMATION", + "BATTLE_SUBSCRIPT_POWER_HERB_SKULL_BASH", + "BATTLE_SUBSCRIPT_CHECK_SHAYMIN_FORM", + "BATTLE_SUBSCRIPT_OVERWORLD_SUN", + "BATTLE_SUBSCRIPT_OVERWORLD_TRICK_ROOM", + "BATTLE_SUBSCRIPT_GIRATINA_FORM_CHANGE" + ] + } + } +} diff --git a/include/constants/battle/system_control.h b/include/constants/battle/system_control.h index 54665266c3..022377f8cf 100644 --- a/include/constants/battle/system_control.h +++ b/include/constants/battle/system_control.h @@ -75,6 +75,12 @@ #define SYSCTL_HIT_MULTIPLE_TARGETS (SYSCTL_SKIP_OBEDIENCE_CHECK | SYSCTL_SKIP_STATUS_CHECK | SYSCTL_SKIP_PP_DECREMENT) #define SYSCTL_TWO_HITS (SYSCTL_SKIP_OBEDIENCE_CHECK | SYSCTL_SKIP_STATUS_CHECK | SYSCTL_SKIP_PP_DECREMENT) +#define SYSCTL_TRIPLE_KICK (SYSCTL_SKIP_OBEDIENCE_CHECK \ + | SYSCTL_SKIP_STATUS_CHECK \ + | SYSCTL_SKIP_PP_DECREMENT \ + | SYSCTL_SKIP_IMMUNITY_TRIGGERS \ + | SYSCTL_SKIP_ACCURACY_OVERRIDES \ + | SYSCTL_SKIP_STOLEN_CHECK) #define SYSCTL_MULTI_HIT_MOVE (SYSCTL_SKIP_OBEDIENCE_CHECK \ | SYSCTL_SKIP_STATUS_CHECK \ | SYSCTL_SKIP_PP_DECREMENT \ diff --git a/include/constants/narc_files/battle_skill_subseq.h b/include/constants/narc_files/battle_skill_subseq.h deleted file mode 100644 index e91008cf2a..0000000000 --- a/include/constants/narc_files/battle_skill_subseq.h +++ /dev/null @@ -1,303 +0,0 @@ -#ifndef POKEPLATINUM_NARC_FILES_BATTLE_SKILL_SUBSEQ_H -#define POKEPLATINUM_NARC_FILES_BATTLE_SKILL_SUBSEQ_H - -enum NARCFilesBattleSubSeq { - BATTLE_SUBSEQ_START_ENCOUNTER = 0, - BATTLE_SUBSEQ_USE_MOVE, - BATTLE_SUBSEQ_UPDATE_HP, - BATTLE_SUBSEQ_ESCAPE, - BATTLE_SUBSEQ_BATTLE_WON, - BATTLE_SUBSEQ_BATTLE_LOST, - BATTLE_SUBSEQ_FAINT_MON, - BATTLE_SUBSEQ_MISSED, - BATTLE_SUBSEQ_ESCAPE_FAILED, - BATTLE_SUBSEQ_SWITCH_POKEMON, - BATTLE_SUBSEQ_SHOW_PARTY_LIST, - BATTLE_SUBSEQ_THROW_POKEBALL, - BATTLE_SUBSEQ_UPDATE_STAT_STAGE, - BATTLE_SUBSEQ_VANISH_ON_CHARGE_TURN, - BATTLE_SUBSEQ_FLINCH_MON, - BATTLE_SUBSEQ_FLINCHED, - BATTLE_SUBSEQ_CRITICAL_HIT, - BATTLE_SUBSEQ_HIT_X_TIMES, - BATTLE_SUBSEQ_FALL_ASLEEP, - BATTLE_SUBSEQ_WAKE_UP, - BATTLE_SUBSEQ_SLEEPING, - BATTLE_SUBSEQ_MOVE_FOLLOWUP_MESSAGE, - BATTLE_SUBSEQ_POISON, - BATTLE_SUBSEQ_POISON_DAMAGE, - BATTLE_SUBSEQ_DRAIN_HALF_DAMAGE_DEALT, - BATTLE_SUBSEQ_BURN, - BATTLE_SUBSEQ_BURN_DAMAGE, - BATTLE_SUBSEQ_FREEZE, - BATTLE_SUBSEQ_FROZEN, - BATTLE_SUBSEQ_THAW_OUT, - BATTLE_SUBSEQ_DEFROSTED_BY_MOVE, - BATTLE_SUBSEQ_PARALYZE, - BATTLE_SUBSEQ_FULLY_PARALYZED, - BATTLE_SUBSEQ_DREAM_EATER, - BATTLE_SUBSEQ_RESET_ALL_STAT_STAGES, - BATTLE_SUBSEQ_BIDE_START, - BATTLE_SUBSEQ_BIDE_END, - BATTLE_SUBSEQ_CONFUSE, - BATTLE_SUBSEQ_CONFUSED, - BATTLE_SUBSEQ_HURT_SELF_IN_CONFUSION, - BATTLE_SUBSEQ_SNAP_OUT_OF_CONFUSION, - BATTLE_SUBSEQ_TRAINER_MESSAGE, - BATTLE_SUBSEQ_NO_PP, - BATTLE_SUBSEQ_STRUGGLE, - BATTLE_SUBSEQ_THRASH, - BATTLE_SUBSEQ_CONVERSION, - BATTLE_SUBSEQ_RECOVER_HALF_MAX_HP, - BATTLE_SUBSEQ_BADLY_POISON, - BATTLE_SUBSEQ_PAY_DAY, - BATTLE_SUBSEQ_LIGHT_SCREEN, - BATTLE_SUBSEQ_MOVE_EFFECT_END, - BATTLE_SUBSEQ_THRASH_END, - BATTLE_SUBSEQ_REFLECT, - - BATTLE_SUBSEQ_MIST = 54, - BATTLE_SUBSEQ_REST, - BATTLE_SUBSEQ_UPROAR, - - BATTLE_SUBSEQ_BIND_START = 58, - BATTLE_SUBSEQ_BIND_EFFECT, - BATTLE_SUBSEQ_BIND_END, - - BATTLE_SUBSEQ_FOCUS_ENERGY = 62, - BATTLE_SUBSEQ_RECOIL_1_4, - BATTLE_SUBSEQ_RECHARGE_TURN, - BATTLE_SUBSEQ_RECHARGING, - BATTLE_SUBSEQ_SET_RAGE_FLAG, - BATTLE_SUSBEQ_MIMIC, - BATTLE_SUBSEQ_LEECH_SEED_START, - BATTLE_SUBSEQ_LEECH_SEED_EFFECT, - BATTLE_SUBSEQ_DISABLE_START, - BATTLE_SUBSEQ_MOVE_IS_DISABLED, - BATTLE_SUBSEQ_DISABLE_END, - BATTLE_SUBSEQ_ENCORE_START, - BATTLE_SUBSEQ_ENCORE_END, - - BATTLE_SUBSEQ_PAIN_SPLIT = 77, - BATTLE_SUBSEQ_CONVERSION_2, - BATTLE_SUBSEQ_LOCK_ON, - BATTLE_SUBSEQ_SKETCH, - BATTLE_SUBSEQ_FEINT, - BATTLE_SUBSEQ_DESTINY_BOND, - BATTLE_SUBSEQ_FAINT_CHECK_DESTINY_BOND, - BATTLE_SUBSEQ_REDUCE_TARGET_PP, - BATTLE_SUBSEQ_STEAL_ITEM, - BATTLE_SUBSEQ_MEAN_LOOK, - BATTLE_SUBSEQ_PROTECT, - BATTLE_SUBSEQ_HEAL_BELL, - BATTLE_SUBSEQ_TRY_SUBSTITUTE, - BATTLE_SUBSEQ_HIT_SUBSTITUTE, - BATTLE_SUBSEQ_FORCE_TARGET_TO_SWITCH_OR_FLEE, - BATTLE_SUSBEQ_TRANSFORM_INTO_TARGET, - BATTLE_SUBSEQ_NIGHTMARE_START, - BATTLE_SUBSEQ_NIGHTMARE_EFFECT, - BATTLE_SUBSEQ_MINIMIZE, - BATTLE_SUBSEQ_CURSE_NORMAL, - BATTLE_SUBSEQ_CURSE_GHOST, - BATTLE_SUBSEQ_CURSE_DAMAGE, - BATTLE_SUBSEQ_HAZARDS_CHECK, - BATTLE_SUBSEQ_FORESIGHT, - BATTLE_SUBSEQ_PERISH_SONG_START, - BATTLE_SUBSEQ_CONTINUE_PERISH_SONG, - BATTLE_SUBSEQ_WEATHER_START, - BATTLE_SUBSEQ_WEATHER_CONTINUES, - BATTLE_SUBSEQ_SWAGGER, - BATTLE_SUBSEQ_INFATUATE, - BATTLE_SUBSEQ_INFATUATED, - BATTLE_SUBSEQ_IMMOBILIZED_BY_LOVE, - BATTLE_SUBSEQ_SAFEGUARD_START, - BATTLE_SUBSEQ_SAFEGUARD_END, - - BATTLE_SUBSEQ_PRESENT_HEAL = 112, - BATTLE_SUBSEQ_MAGNITUDE, - BATTLE_SUBSEQ_BATON_PASS, - BATTLE_SUBSEQ_RAPID_SPIN, - BATTLE_SUBSEQ_BREAK_BIND_EFFECT, - BATTLE_SUBSEQ_BLOW_AWAY_HAZARDS, - BATTLE_SUBSEQ_GIVE_TARGET_OWN_STATUS, - BATTLE_SUBSEQ_BOOST_ALL_STATS, - BATTLE_SUBSEQ_BELLY_DRUM, - BATTLE_SUBSEQ_FUTURE_SIGHT_DAMAGE, - BATTLE_SUBSEQ_TELEPORT, - BATTLE_SUBSEQ_FUTURE_SIGHT_START, - BATTLE_SUBSEQ_STOCKPILE, - BATTLE_SUBSEQ_SWALLOW, - BATTLE_SUBSEQ_PRINT_MESSAGE_AND_PLAY_ANIMATION, - BATTLE_SUBSEQ_TORMENT_START, - BATTLE_SUBSEQ_FLATTER, - BATTLE_SUBSEQ_MEMENTO, - BATTLE_SUBSEQ_HEAL_TARGET_PARALYSIS, - BATTLE_SUBSEQ_CHARGE, - BATTLE_SUBSEQ_TAUNT_START, - BATTLE_SUBSEQ_MOVE_FAIL_TAUNTED, - BATTLE_SUBSEQ_EXCHANGE_ITEMS, - BATTLE_SUBSEQ_COPY_ABILITY, - BATTLE_SUBSEQ_WISH_HEAL, - BATTLE_SUBSEQ_INGRAIN_HEAL, - BATTLE_SUBSEQ_USER_ATK_AND_DEF_DOWN_1_STAGE, - BATTLE_SUBSEQ_MAGIC_COAT, - BATTLE_SUBSEQ_BREAK_SCREENS, - BATTLE_SUBSEQ_YAWN, - BATTLE_SUBSEQ_KNOCK_OFF, - BATTLE_SUBSEQ_EXCHANGE_ABILITIES, - BATTLE_SUBSEQ_MOVE_IS_IMPRISONED, - BATTLE_SUBSEQ_RECOVER_PSN_PRZ_BRN, - BATTLE_SUBSEQ_SNATCH, - BATTLE_SUBSEQ_RECOIL_1_3, - BATTLE_SUBSEQ_TARGET_ATK_AND_DEF_DOWN_1_STAGE, - - BATTLE_SUBSEQ_USER_DEF_AND_SPDEF_UP_1_STAGE = 149, - BATTLE_SUBSEQ_USER_ATK_AND_DEF_UP_1_STAGE, - BATTLE_SUBSEQ_USER_SPATK_AND_SPDEF_UP_1_STAGE, - BATTLE_SUBSEQ_USER_ATK_AND_SPEED_UP_1_STAGE, - BATTLE_SUBSEQ_PURSUIT, - BATTLE_SUBSEQ_ROOST, - BATTLE_SUBSEQ_HEAL_TARGET_SLEEP, - BATTLE_SUBSEQ_GRAVITY_START, - BATTLE_SUBSEQ_MOVE_FAIL_GRAVITY, - BATTLE_SUBSEQ_MIRACLE_EYE, - BATTLE_SUBSEQ_HEALING_WISH, - BATTLE_SUBSEQ_TAILWIND_START, - BATTLE_SUBSEQ_USER_DEF_AND_SPDEF_DOWN_1_STAGE, - BATTLE_SUBSEQ_USER_SWAP_ATK_AND_DEF, - BATTLE_SUBSEQ_SUPPRESS_TARGET_ABILITY, - BATTLE_SUBSEQ_LUCKY_CHANT_START, - BATTLE_SUBSEQ_EXCHANGE_ATK_AND_SPATK_STAGES, - BATTLE_SUBSEQ_EXCHANGE_DEF_AND_SPDEF_STAGES, - BATTLE_SUBSEQ_GIVE_TARGET_INSOMNIA, - BATTLE_SUBSEQ_EXCHANGE_ALL_STAT_STAGES, - BATTLE_SUBSEQ_AQUA_RING_HEAL, - BATTLE_SUBSEQ_RECOIL_1_3_CHANCE_TO_BURN, - BATTLE_SUBSEQ_DEFOG, - - BATTLE_SUBSEQ_HEAL_BLOCK_START = 173, - BATTLE_SUBSEQ_MOVE_IS_HEAL_BLOCKED, - BATTLE_SUBSEQ_ATTACK_THEN_SWITCH_OUT, - - BATTLE_SUBSEQ_MOLD_BREAKER = 177, - BATTLE_SUBSEQ_ABILITY_RESTORES_HP, - BATTLE_SUBSEQ_ABSORB_AND_BOOST_FIRE_TYPE_MOVES, - BATTLE_SUBSEQ_LIGHTNING_ROD_REDIRECTED, - BATTLE_SUBSEQ_BLOCKED_BY_SOUNDPROOF, - BATTLE_SUBSEQ_ABSORB_AND_SPEED_UP_1_STAGE, - BATTLE_SUBSEQ_DRIZZLE, - BATTLE_SUBSEQ_SAND_STREAM, - BATTLE_SUBSEQ_DROUGHT, - BATTLE_SUBSEQ_INTIMIDATE, - BATTLE_SUBSEQ_TRACE, - BATTLE_SUBSEQ_COLOR_CHANGE, - BATTLE_SUBSEQ_ROUGH_SKIN, - BATTLE_SUBSEQ_ABILITY_RESTORE_STATUS, - BATTLE_SUBSEQ_LOAFING_AROUND, - - BATTLE_SUBSEQ_AFTERMATH = 193, - BATTLE_SUBSEQ_ANTICIPATION, - BATTLE_SUBSEQ_FOREWARN, - BATTLE_SUBSEQ_SLOW_START, - BATTLE_SUBSEQ_SLOW_START_END, - BATTLE_SUBSEQ_HELD_ITEM_HP_RESTORE, - BATTLE_SUBSEQ_HELD_ITEM_PRZ_RESTORE, - BATTLE_SUBSEQ_HELD_ITEM_SLP_RESTORE, - BATTLE_SUBSEQ_HELD_ITEM_PSN_RESTORE, - BATTLE_SUBSEQ_HELD_ITEM_BRN_RESTORE, - BATTLE_SUBSEQ_HELD_ITEM_FRZ_RESTORE, - BATTLE_SUBSEQ_HELD_ITEM_PP_RESTORE, - BATTLE_SUBSEQ_HELD_ITEM_CNF_RESTORE, - BATTLE_SUBSEQ_HELD_ITEM_MULTI_RESTORE, - BATTLE_SUBSEQ_HELD_ITEM_DISLIKE_FLAVOR, - BATTLE_SUBSEQ_HELD_ITEM_RAISE_STAT, - BATTLE_SUBSEQ_HELD_ITEM_RAISE_CRIT, - BATTLE_SUBSEQ_HELD_ITEM_SHARPLY_RAISE_STAT, - BATTLE_SUBSEQ_HELD_ITEM_STATDOWN_RESTORE, - BATTLE_SUBSEQ_HELD_ITEM_HEAL_INFATUATION, - BATTLE_SUBSEQ_RESTORE_A_LITTLE_HP, - BATTLE_SUBSEQ_LOSE_HP_FROM_ITEM, - BATTLE_SUBSEQ_LOSE_HP_FROM_ITEM_WITH_MESSAGE, - BATTLE_SUBSEQ_TRANSFER_STICKY_BARB = 216, - - BATTLE_SUBSEQ_EMBARGO_START = 218, - BATTLE_SUBSEQ_PLUCK, - BATTLE_SUBSEQ_FLING, - BATTLE_SUBSEQ_ABILITY_FORBIDS_STATUS, - BATTLE_SUBSEQ_ESCAPE_ITEM, - BATTLE_SUBSEQ_BATTLE_ITEM, - - BATTLE_SUBSEQ_RECOIL_1_3_CHANCE_TO_PARALYZE = 226, - BATTLE_SUBSEQ_SAFARI_THROW_BAIT, - BATTLE_SUBSEQ_SAFARI_THROW_ROCK, - BATTLE_SUBSEQ_SAFARI_ESCAPE, - BATTLE_SUBSEQ_ENEMY_ESCAPE, - BATTLE_SUBSEQ_REPLACE_FAINTED, - BATTLE_SUBSEQ_TIGHTEN_FOCUS, - BATTLE_SUBSEQ_TAILWIND_END, - BATTLE_SUBSEQ_RAINING_END, - BATTLE_SUBSEQ_SANDSTORM_END, - BATTLE_SUBSEQ_SUNNY_END, - BATTLE_SUBSEQ_HAILING_END, - BATTLE_SUBSEQ_GRAVITY_END, - BATTLE_SUBSEQ_CANNOT_HEAL, - BATTLE_SUBSEQ_UPROAR_CONTINUES, - BATTLE_SUBSEQ_UPROAR_END, - BATTLE_SUBSEQ_MAGNET_RISE_END, - BATTLE_SUBSEQ_HEAL_BLOCK_END, - BATTLE_SUBSEQ_EMBARGO_END, - BATTLE_SUBSEQ_RAGE_IS_BUILDING, - BATTLE_SUBSEQ_RECOIL_1_2, - BATTLE_SUBSEQ_BURN_OR_FLINCH, - BATTLE_SUBSEQ_FREEZE_OR_FLINCH, - BATTLE_SUBSEQ_PARALYZE_OR_FLINCH, - - BATTLE_SUBSEQ_LUCKY_CHANT_END = 250, - BATTLE_SUBSEQ_TRICK_ROOM_END, - BATTLE_SUBSEQ_SNOW_WARNING, - BATTLE_SUBSEQ_FRISK, - BATTLE_SUBSEQ_DISOBEY_WHILE_ASLEEP, - BATTLE_SUBSEQ_DISOBEY_DO_NOTHING, - BATTLE_SUBSEQ_DISOBEY_ORDERS, - BATTLE_SUBSEQ_DISOBEY_SLEEP, - BATTLE_SUBSEQ_DISOBEY_HIT_SELF, - - BATTLE_SUBSEQ_CHATTER = 260, - BATTLE_SUBSEQ_LUNAR_DANCE, - BATTLE_SUBSEQ_FORM_CHANGE, - BATTLE_SUBSEQ_BAD_DREAMS, - - BATTLE_SUBSEQ_HELD_ITEM_TEMP_ACC_UP = 265, - BATTLE_SUBSEQ_HELD_ITEM_RECOIL_WHEN_HIT, - BATTLE_SUBSEQ_USE_POTION, - BATTLE_SUBSEQ_USE_STATUS_RECOVERY, - BATTLE_SUBSEQ_USE_STAT_BOOSTER, - BATTLE_SUBSEQ_USE_GUARD_SPEC, - BATTLE_SUBSEQ_OVERWORLD_RAIN, - BATTLE_SUBSEQ_OVERWORLD_HAIL, - BATTLE_SUBSEQ_OVERWORLD_SAND, - BATTLE_SUBSEQ_OVERWORLD_FOG, - BATTLE_SUBSEQ_THROW_SAFARI_BALL, - BATTLE_SUBSEQ_GRANT_EXP, - BATTLE_SUBSEQ_AFTER_SELFDESTRUCT, - BATTLE_SUBSEQ_CHECK_QUICK_CLAW, - - BATTLE_SUBSEQ_NO_TARGET = 281, - BATTLE_SUBSEQ_BIDE_NO_TARGET, - - BATTLE_SUBSEQ_PRESSURE = 285, - BATTLE_SUBSEQ_ENEMY_ESCAPE_FAILED, - BATTLE_SUBSEQ_VANISH_OFF, - - BATTLE_SUBSEQ_TAUNT_END = 288, - BATTLE_SUBSEQ_USE_FULL_RESTORE, - - BATTLE_SUBSEQ_WAIT_MOVE_ANIMATION = 291, - - BATTLE_SUBSEQ_CHECK_SHAYMIN_FORM = 293, - BATTLE_SUBSEQ_OVERWORLD_SUN, - BATTLE_SUBSEQ_OVERWORLD_TRICK_ROOM, - BATTLE_SUBSEQ_GIRATINA_FORM_CHANGE, -}; - -#endif // POKEPLATINUM_NARC_FILES_BATTLE_SKILL_SUBSEQ_H diff --git a/include/data/move_side_effect_subscripts.h b/include/data/move_side_effect_subscripts.h index f1731c77e4..3ed1fd70a3 100644 --- a/include/data/move_side_effect_subscripts.h +++ b/include/data/move_side_effect_subscripts.h @@ -1,150 +1,152 @@ #include "constants/battle/side_effects.h" -#include "constants/narc_files/battle_skill_subseq.h" + +#include "consts/generated/c/battle.h" +#include "consts/generated/c/battle_subscripts.h" static const int sSideEffectSubscripts[] = { [MOVE_SUBSCRIPT_PTR_NONE] = NULL, - [MOVE_SUBSCRIPT_PTR_SLEEP] = BATTLE_SUBSEQ_FALL_ASLEEP, - [MOVE_SUBSCRIPT_PTR_POISON] = BATTLE_SUBSEQ_POISON, - [MOVE_SUBSCRIPT_PTR_BURN] = BATTLE_SUBSEQ_BURN, - [MOVE_SUBSCRIPT_PTR_FREEZE] = BATTLE_SUBSEQ_FREEZE, - [MOVE_SUBSCRIPT_PTR_PARALYZE] = BATTLE_SUBSEQ_PARALYZE, - [MOVE_SUBSCRIPT_PTR_BADLY_POISON] = BATTLE_SUBSEQ_BADLY_POISON, - [MOVE_SUBSCRIPT_PTR_CONFUSE] = BATTLE_SUBSEQ_CONFUSE, - [MOVE_SUBSCRIPT_PTR_FLINCH] = BATTLE_SUBSEQ_FLINCH_MON, - [MOVE_SUBSCRIPT_PTR_REST] = BATTLE_SUBSEQ_REST, - [MOVE_SUBSCRIPT_PTR_UPROAR] = BATTLE_SUBSEQ_UPROAR, - [MOVE_SUBSCRIPT_PTR_PAY_DAY] = BATTLE_SUBSEQ_PAY_DAY, - [MOVE_SUBSCRIPT_PTR_VANISH_CHARGE_TURN] = BATTLE_SUBSEQ_VANISH_ON_CHARGE_TURN, - [MOVE_SUBSCRIPT_PTR_BIND_TARGET] = BATTLE_SUBSEQ_BIND_START, - [MOVE_SUBSCRIPT_PTR_QUARTER_RECOIL] = BATTLE_SUBSEQ_RECOIL_1_4, - [MOVE_SUBSCRIPT_PTR_ATTACK_UP_1_STAGE] = BATTLE_SUBSEQ_UPDATE_STAT_STAGE, - [MOVE_SUBSCRIPT_PTR_DEFENSE_UP_1_STAGE] = BATTLE_SUBSEQ_UPDATE_STAT_STAGE, - [MOVE_SUBSCRIPT_PTR_SPEED_UP_1_STAGE] = BATTLE_SUBSEQ_UPDATE_STAT_STAGE, - [MOVE_SUBSCRIPT_PTR_SP_ATTACK_UP_1_STAGE] = BATTLE_SUBSEQ_UPDATE_STAT_STAGE, - [MOVE_SUBSCRIPT_PTR_SP_DEFENSE_UP_1_STAGE] = BATTLE_SUBSEQ_UPDATE_STAT_STAGE, - [MOVE_SUBSCRIPT_PTR_ACCURACY_UP_1_STAGE] = BATTLE_SUBSEQ_UPDATE_STAT_STAGE, - [MOVE_SUBSCRIPT_PTR_EVASION_UP_1_STAGE] = BATTLE_SUBSEQ_UPDATE_STAT_STAGE, - [MOVE_SUBSCRIPT_PTR_ATTACK_DOWN_1_STAGE] = BATTLE_SUBSEQ_UPDATE_STAT_STAGE, - [MOVE_SUBSCRIPT_PTR_DEFENSE_DOWN_1_STAGE] = BATTLE_SUBSEQ_UPDATE_STAT_STAGE, - [MOVE_SUBSCRIPT_PTR_SPEED_DOWN_1_STAGE] = BATTLE_SUBSEQ_UPDATE_STAT_STAGE, - [MOVE_SUBSCRIPT_PTR_SP_ATTACK_DOWN_1_STAGE] = BATTLE_SUBSEQ_UPDATE_STAT_STAGE, - [MOVE_SUBSCRIPT_PTR_SP_DEFENSE_DOWN_1_STAGE] = BATTLE_SUBSEQ_UPDATE_STAT_STAGE, - [MOVE_SUBSCRIPT_PTR_ACCURACY_DOWN_1_STAGE] = BATTLE_SUBSEQ_UPDATE_STAT_STAGE, - [MOVE_SUBSCRIPT_PTR_EVASION_DOWN_1_STAGE] = BATTLE_SUBSEQ_UPDATE_STAT_STAGE, - [MOVE_SUBSCRIPT_PTR_RECHARGE_TURN] = BATTLE_SUBSEQ_RECHARGE_TURN, - [MOVE_SUBSCRIPT_PTR_SET_RAGE_FLAG] = BATTLE_SUBSEQ_SET_RAGE_FLAG, - [MOVE_SUBSCRIPT_PTR_STEAL_ITEM] = BATTLE_SUBSEQ_STEAL_ITEM, - [MOVE_SUBSCRIPT_PTR_MEAN_LOOK] = BATTLE_SUBSEQ_MEAN_LOOK, - [MOVE_SUBSCRIPT_PTR_NIGHTMARE_START] = BATTLE_SUBSEQ_NIGHTMARE_START, - [MOVE_SUBSCRIPT_PTR_BOOST_ALL_STATS] = BATTLE_SUBSEQ_BOOST_ALL_STATS, - [MOVE_SUBSCRIPT_PTR_RAPID_SPIN] = BATTLE_SUBSEQ_RAPID_SPIN, - [MOVE_SUBSCRIPT_PTR_HEAL_TARGET_PARALYSIS] = BATTLE_SUBSEQ_HEAL_TARGET_PARALYSIS, - [MOVE_SUBSCRIPT_PTR_USER_ATK_AND_DEF_DOWN_1_STAGE] = BATTLE_SUBSEQ_USER_ATK_AND_DEF_DOWN_1_STAGE, - [MOVE_SUBSCRIPT_PTR_RECOIL_1_3] = BATTLE_SUBSEQ_RECOIL_1_3, - [MOVE_SUBSCRIPT_PTR_ATTACK_UP_2_STAGES] = BATTLE_SUBSEQ_UPDATE_STAT_STAGE, - [MOVE_SUBSCRIPT_PTR_DEFENSE_UP_2_STAGES] = BATTLE_SUBSEQ_UPDATE_STAT_STAGE, - [MOVE_SUBSCRIPT_PTR_SPEED_UP_2_STAGES] = BATTLE_SUBSEQ_UPDATE_STAT_STAGE, - [MOVE_SUBSCRIPT_PTR_SP_ATTACK_UP_2_STAGES] = BATTLE_SUBSEQ_UPDATE_STAT_STAGE, - [MOVE_SUBSCRIPT_PTR_SP_DEFENSE_UP_2_STAGES] = BATTLE_SUBSEQ_UPDATE_STAT_STAGE, - [MOVE_SUBSCRIPT_PTR_ACCURACY_UP_2_STAGES] = BATTLE_SUBSEQ_UPDATE_STAT_STAGE, - [MOVE_SUBSCRIPT_PTR_EVASION_UP_2_STAGES] = BATTLE_SUBSEQ_UPDATE_STAT_STAGE, - [MOVE_SUBSCRIPT_PTR_ATTACK_DOWN_2_STAGES] = BATTLE_SUBSEQ_UPDATE_STAT_STAGE, - [MOVE_SUBSCRIPT_PTR_DEFENSE_DOWN_2_STAGES] = BATTLE_SUBSEQ_UPDATE_STAT_STAGE, - [MOVE_SUBSCRIPT_PTR_SPEED_DOWN_2_STAGES] = BATTLE_SUBSEQ_UPDATE_STAT_STAGE, - [MOVE_SUBSCRIPT_PTR_SP_ATTACK_DOWN_2_STAGES] = BATTLE_SUBSEQ_UPDATE_STAT_STAGE, - [MOVE_SUBSCRIPT_PTR_SP_DEFENSE_DOWN_2_STAGES] = BATTLE_SUBSEQ_UPDATE_STAT_STAGE, - [MOVE_SUBSCRIPT_PTR_ACCURACY_DOWN_2_STAGES] = BATTLE_SUBSEQ_UPDATE_STAT_STAGE, - [MOVE_SUBSCRIPT_PTR_EVASION_DOWN_2_STAGES] = BATTLE_SUBSEQ_UPDATE_STAT_STAGE, - [MOVE_SUBSCRIPT_PTR_THRASH] = BATTLE_SUBSEQ_THRASH, - [MOVE_SUBSCRIPT_PTR_KNOCK_OFF] = BATTLE_SUBSEQ_KNOCK_OFF, - [MOVE_SUBSCRIPT_PTR_USER_DEF_AND_SPDEF_UP_1_STAGE] = BATTLE_SUBSEQ_USER_DEF_AND_SPDEF_UP_1_STAGE, - [MOVE_SUBSCRIPT_PTR_USER_ATK_AND_DEF_UP_1_STAGE] = BATTLE_SUBSEQ_USER_ATK_AND_DEF_UP_1_STAGE, - [MOVE_SUBSCRIPT_PTR_TARGET_ATK_AND_DEF_DOWN_1_STAGE] = BATTLE_SUBSEQ_TARGET_ATK_AND_DEF_DOWN_1_STAGE, - [MOVE_SUBSCRIPT_PTR_USER_SPATK_AND_SPDEF_UP_1_STAGE] = BATTLE_SUBSEQ_USER_SPATK_AND_SPDEF_UP_1_STAGE, - [MOVE_SUBSCRIPT_PTR_USER_ATK_AND_SPEED_UP_1_STAGE] = BATTLE_SUBSEQ_USER_ATK_AND_SPEED_UP_1_STAGE, - [MOVE_SUBSCRIPT_PTR_DRAIN_HALF_DAMAGE_DEALT] = BATTLE_SUBSEQ_DRAIN_HALF_DAMAGE_DEALT, - [MOVE_SUBSCRIPT_PTR_DREAM_EATER] = BATTLE_SUBSEQ_DREAM_EATER, - [MOVE_SUBSCRIPT_PTR_RESET_ALL_STAT_STAGES] = BATTLE_SUBSEQ_RESET_ALL_STAT_STAGES, - [MOVE_SUBSCRIPT_PTR_BIDE_START] = BATTLE_SUBSEQ_BIDE_START, - [MOVE_SUBSCRIPT_PTR_STRUGGLE] = BATTLE_SUBSEQ_STRUGGLE, - [MOVE_SUBSCRIPT_PTR_CONVERSION] = BATTLE_SUBSEQ_CONVERSION, - [MOVE_SUBSCRIPT_PTR_RECOVER_HALF_MAX_HP] = BATTLE_SUBSEQ_RECOVER_HALF_MAX_HP, - [MOVE_SUBSCRIPT_PTR_LIGHT_SCREEN] = BATTLE_SUBSEQ_LIGHT_SCREEN, - [MOVE_SUBSCRIPT_PTR_REFLECT] = BATTLE_SUBSEQ_REFLECT, - [MOVE_SUBSCRIPT_PTR_MIST] = BATTLE_SUBSEQ_MIST, - [MOVE_SUBSCRIPT_PTR_FOCUS_ENERGY] = BATTLE_SUBSEQ_FOCUS_ENERGY, - [MOVE_SUBSCRIPT_PTR_MIMIC] = BATTLE_SUSBEQ_MIMIC, - [MOVE_SUBSCRIPT_PTR_LEECH_SEED_START] = BATTLE_SUBSEQ_LEECH_SEED_START, - [MOVE_SUBSCRIPT_PTR_DISABLE_START] = BATTLE_SUBSEQ_DISABLE_START, - [MOVE_SUBSCRIPT_PTR_ENCORE_START] = BATTLE_SUBSEQ_ENCORE_START, - [MOVE_SUBSCRIPT_PTR_PAIN_SPLIT] = BATTLE_SUBSEQ_PAIN_SPLIT, - [MOVE_SUBSCRIPT_PTR_CONVERSION_2] = BATTLE_SUBSEQ_CONVERSION_2, - [MOVE_SUBSCRIPT_PTR_LOCK_ON] = BATTLE_SUBSEQ_LOCK_ON, - [MOVE_SUBSCRIPT_PTR_SKETCH] = BATTLE_SUBSEQ_SKETCH, - [MOVE_SUBSCRIPT_PTR_FEINT] = BATTLE_SUBSEQ_FEINT, - [MOVE_SUBSCRIPT_PTR_DESTINY_BOND] = BATTLE_SUBSEQ_DESTINY_BOND, - [MOVE_SUBSCRIPT_PTR_REDUCE_TARGET_PP] = BATTLE_SUBSEQ_REDUCE_TARGET_PP, - [MOVE_SUBSCRIPT_PTR_PROTECT] = BATTLE_SUBSEQ_PROTECT, - [MOVE_SUBSCRIPT_PTR_HEAL_BELL] = BATTLE_SUBSEQ_HEAL_BELL, - [MOVE_SUBSCRIPT_PTR_TRY_SUBSTITUTE] = BATTLE_SUBSEQ_TRY_SUBSTITUTE, - [MOVE_SUBSCRIPT_PTR_FORCE_TARGET_TO_SWITCH_OR_FLEE] = BATTLE_SUBSEQ_FORCE_TARGET_TO_SWITCH_OR_FLEE, - [MOVE_SUBSCRIPT_PTR_TRANSFORM_INTO_TARGET] = BATTLE_SUSBEQ_TRANSFORM_INTO_TARGET, - [MOVE_SUBSCRIPT_PTR_MINIMIZE] = BATTLE_SUBSEQ_MINIMIZE, - [MOVE_SUBSCRIPT_PTR_CURSE_NORMAL] = BATTLE_SUBSEQ_CURSE_NORMAL, - [MOVE_SUBSCRIPT_PTR_CURSE_GHOST] = BATTLE_SUBSEQ_CURSE_GHOST, - [MOVE_SUBSCRIPT_PTR_PRINT_MESSAGE_AND_PLAY_ANIMATION] = BATTLE_SUBSEQ_PRINT_MESSAGE_AND_PLAY_ANIMATION, - [MOVE_SUBSCRIPT_PTR_FORESIGHT] = BATTLE_SUBSEQ_FORESIGHT, - [MOVE_SUBSCRIPT_PTR_PERISH_SONG_START] = BATTLE_SUBSEQ_PERISH_SONG_START, - [MOVE_SUBSCRIPT_PTR_WEATHER_START] = BATTLE_SUBSEQ_WEATHER_START, - [MOVE_SUBSCRIPT_PTR_SWAGGER] = BATTLE_SUBSEQ_SWAGGER, - [MOVE_SUBSCRIPT_PTR_INFATUATE] = BATTLE_SUBSEQ_INFATUATE, - [MOVE_SUBSCRIPT_PTR_SAFEGUARD_START] = BATTLE_SUBSEQ_SAFEGUARD_START, - [MOVE_SUBSCRIPT_PTR_PRESENT_HEAL] = BATTLE_SUBSEQ_PRESENT_HEAL, - [MOVE_SUBSCRIPT_PTR_MAGNITUDE] = BATTLE_SUBSEQ_MAGNITUDE, - [MOVE_SUBSCRIPT_PTR_BATON_PASS] = BATTLE_SUBSEQ_BATON_PASS, - [MOVE_SUBSCRIPT_PTR_BELLY_DRUM] = BATTLE_SUBSEQ_BELLY_DRUM, - [MOVE_SUBSCRIPT_PTR_TELEPORT] = BATTLE_SUBSEQ_TELEPORT, - [MOVE_SUBSCRIPT_PTR_FUTURE_SIGHT_START] = BATTLE_SUBSEQ_FUTURE_SIGHT_START, - [MOVE_SUBSCRIPT_PTR_STOCKPILE] = BATTLE_SUBSEQ_STOCKPILE, - [MOVE_SUBSCRIPT_PTR_SWALLOW] = BATTLE_SUBSEQ_SWALLOW, - [MOVE_SUBSCRIPT_PTR_TORMENT_START] = BATTLE_SUBSEQ_TORMENT_START, - [MOVE_SUBSCRIPT_PTR_FLATTER] = BATTLE_SUBSEQ_FLATTER, - [MOVE_SUBSCRIPT_PTR_MEMENTO] = BATTLE_SUBSEQ_MEMENTO, - [MOVE_SUBSCRIPT_PTR_CHARGE] = BATTLE_SUBSEQ_CHARGE, - [MOVE_SUBSCRIPT_PTR_TAUNT_START] = BATTLE_SUBSEQ_TAUNT_START, - [MOVE_SUBSCRIPT_PTR_EXCHANGE_ITEMS] = BATTLE_SUBSEQ_EXCHANGE_ITEMS, - [MOVE_SUBSCRIPT_PTR_COPY_ABILITY] = BATTLE_SUBSEQ_COPY_ABILITY, - [MOVE_SUBSCRIPT_PTR_BREAK_SCREENS] = BATTLE_SUBSEQ_BREAK_SCREENS, - [MOVE_SUBSCRIPT_PTR_YAWN] = BATTLE_SUBSEQ_YAWN, - [MOVE_SUBSCRIPT_PTR_EXCHANGE_ABILITIES] = BATTLE_SUBSEQ_EXCHANGE_ABILITIES, - [MOVE_SUBSCRIPT_PTR_RECOVER_PSN_PRZ_BRN] = BATTLE_SUBSEQ_RECOVER_PSN_PRZ_BRN, - [MOVE_SUBSCRIPT_PTR_ROOST] = BATTLE_SUBSEQ_ROOST, - [MOVE_SUBSCRIPT_PTR_HEAL_TARGET_SLEEP] = BATTLE_SUBSEQ_HEAL_TARGET_SLEEP, - [MOVE_SUBSCRIPT_PTR_GRAVITY_START] = BATTLE_SUBSEQ_GRAVITY_START, - [MOVE_SUBSCRIPT_PTR_MIRACLE_EYE] = BATTLE_SUBSEQ_MIRACLE_EYE, - [MOVE_SUBSCRIPT_PTR_HEALING_WISH] = BATTLE_SUBSEQ_HEALING_WISH, - [MOVE_SUBSCRIPT_PTR_TAILWIND_START] = BATTLE_SUBSEQ_TAILWIND_START, - [MOVE_SUBSCRIPT_PTR_USER_DEF_AND_SPDEF_DOWN_1_STAGE] = BATTLE_SUBSEQ_USER_DEF_AND_SPDEF_DOWN_1_STAGE, - [MOVE_SUBSCRIPT_PTR_USER_SWAP_ATK_AND_DEF] = BATTLE_SUBSEQ_USER_SWAP_ATK_AND_DEF, - [MOVE_SUBSCRIPT_PTR_SUPPRESS_TARGET_ABILITY] = BATTLE_SUBSEQ_SUPPRESS_TARGET_ABILITY, - [MOVE_SUBSCRIPT_PTR_LUCKY_CHANT_START] = BATTLE_SUBSEQ_LUCKY_CHANT_START, - [MOVE_SUBSCRIPT_PTR_EXCHANGE_ATK_AND_SPATK_STAGES] = BATTLE_SUBSEQ_EXCHANGE_ATK_AND_SPATK_STAGES, - [MOVE_SUBSCRIPT_PTR_EXCHANGE_DEF_AND_SPDEF_STAGES] = BATTLE_SUBSEQ_EXCHANGE_DEF_AND_SPDEF_STAGES, - [MOVE_SUBSCRIPT_PTR_GIVE_TARGET_INSOMNIA] = BATTLE_SUBSEQ_GIVE_TARGET_INSOMNIA, - [MOVE_SUBSCRIPT_PTR_EXCHANGE_ALL_STAT_STAGES] = BATTLE_SUBSEQ_EXCHANGE_ALL_STAT_STAGES, - [MOVE_SUBSCRIPT_PTR_RECOIL_1_3_CHANCE_TO_BURN] = BATTLE_SUBSEQ_RECOIL_1_3_CHANCE_TO_BURN, - [MOVE_SUBSCRIPT_PTR_DEFOG] = BATTLE_SUBSEQ_DEFOG, - [MOVE_SUBSCRIPT_PTR_HEAL_BLOCK_START] = BATTLE_SUBSEQ_HEAL_BLOCK_START, - [MOVE_SUBSCRIPT_PTR_ATTACK_THEN_SWITCH_OUT] = BATTLE_SUBSEQ_ATTACK_THEN_SWITCH_OUT, - [MOVE_SUBSCRIPT_PTR_EMBARGO_START] = BATTLE_SUBSEQ_EMBARGO_START, - [MOVE_SUBSCRIPT_PTR_PLUCK] = BATTLE_SUBSEQ_PLUCK, - [MOVE_SUBSCRIPT_PTR_FLING] = BATTLE_SUBSEQ_FLING, - [MOVE_SUBSCRIPT_PTR_RECOIL_1_3_CHANCE_TO_PARALYZE] = BATTLE_SUBSEQ_RECOIL_1_3_CHANCE_TO_PARALYZE, - [MOVE_SUBSCRIPT_PTR_RECOIL_1_2] = BATTLE_SUBSEQ_RECOIL_1_2, - [MOVE_SUBSCRIPT_PTR_BURN_OR_FLINCH] = BATTLE_SUBSEQ_BURN_OR_FLINCH, - [MOVE_SUBSCRIPT_PTR_FREEZE_OR_FLINCH] = BATTLE_SUBSEQ_FREEZE_OR_FLINCH, - [MOVE_SUBSCRIPT_PTR_PARALYZE_OR_FLINCH] = BATTLE_SUBSEQ_PARALYZE_OR_FLINCH, - [MOVE_SUBSCRIPT_PTR_CHATTER] = BATTLE_SUBSEQ_CHATTER, - [MOVE_SUBSCRIPT_PTR_LUNAR_DANCE] = BATTLE_SUBSEQ_LUNAR_DANCE, - [MOVE_SUBSCRIPT_PTR_GIVE_TARGET_OWN_STATUS] = BATTLE_SUBSEQ_GIVE_TARGET_OWN_STATUS, + [MOVE_SUBSCRIPT_PTR_SLEEP] = BATTLE_SUBSCRIPT_FALL_ASLEEP, + [MOVE_SUBSCRIPT_PTR_POISON] = BATTLE_SUBSCRIPT_POISON, + [MOVE_SUBSCRIPT_PTR_BURN] = BATTLE_SUBSCRIPT_BURN, + [MOVE_SUBSCRIPT_PTR_FREEZE] = BATTLE_SUBSCRIPT_FREEZE, + [MOVE_SUBSCRIPT_PTR_PARALYZE] = BATTLE_SUBSCRIPT_PARALYZE, + [MOVE_SUBSCRIPT_PTR_BADLY_POISON] = BATTLE_SUBSCRIPT_BADLY_POISON, + [MOVE_SUBSCRIPT_PTR_CONFUSE] = BATTLE_SUBSCRIPT_CONFUSE, + [MOVE_SUBSCRIPT_PTR_FLINCH] = BATTLE_SUBSCRIPT_FLINCH_MON, + [MOVE_SUBSCRIPT_PTR_REST] = BATTLE_SUBSCRIPT_REST, + [MOVE_SUBSCRIPT_PTR_UPROAR] = BATTLE_SUBSCRIPT_UPROAR, + [MOVE_SUBSCRIPT_PTR_PAY_DAY] = BATTLE_SUBSCRIPT_PAY_DAY, + [MOVE_SUBSCRIPT_PTR_VANISH_CHARGE_TURN] = BATTLE_SUBSCRIPT_VANISH_ON_CHARGE_TURN, + [MOVE_SUBSCRIPT_PTR_BIND_TARGET] = BATTLE_SUBSCRIPT_BIND_START, + [MOVE_SUBSCRIPT_PTR_QUARTER_RECOIL] = BATTLE_SUBSCRIPT_RECOIL_1_4, + [MOVE_SUBSCRIPT_PTR_ATTACK_UP_1_STAGE] = BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE, + [MOVE_SUBSCRIPT_PTR_DEFENSE_UP_1_STAGE] = BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE, + [MOVE_SUBSCRIPT_PTR_SPEED_UP_1_STAGE] = BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE, + [MOVE_SUBSCRIPT_PTR_SP_ATTACK_UP_1_STAGE] = BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE, + [MOVE_SUBSCRIPT_PTR_SP_DEFENSE_UP_1_STAGE] = BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE, + [MOVE_SUBSCRIPT_PTR_ACCURACY_UP_1_STAGE] = BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE, + [MOVE_SUBSCRIPT_PTR_EVASION_UP_1_STAGE] = BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE, + [MOVE_SUBSCRIPT_PTR_ATTACK_DOWN_1_STAGE] = BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE, + [MOVE_SUBSCRIPT_PTR_DEFENSE_DOWN_1_STAGE] = BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE, + [MOVE_SUBSCRIPT_PTR_SPEED_DOWN_1_STAGE] = BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE, + [MOVE_SUBSCRIPT_PTR_SP_ATTACK_DOWN_1_STAGE] = BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE, + [MOVE_SUBSCRIPT_PTR_SP_DEFENSE_DOWN_1_STAGE] = BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE, + [MOVE_SUBSCRIPT_PTR_ACCURACY_DOWN_1_STAGE] = BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE, + [MOVE_SUBSCRIPT_PTR_EVASION_DOWN_1_STAGE] = BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE, + [MOVE_SUBSCRIPT_PTR_RECHARGE_TURN] = BATTLE_SUBSCRIPT_RECHARGE_TURN, + [MOVE_SUBSCRIPT_PTR_SET_RAGE_FLAG] = BATTLE_SUBSCRIPT_SET_RAGE_FLAG, + [MOVE_SUBSCRIPT_PTR_STEAL_ITEM] = BATTLE_SUBSCRIPT_STEAL_ITEM, + [MOVE_SUBSCRIPT_PTR_MEAN_LOOK] = BATTLE_SUBSCRIPT_MEAN_LOOK, + [MOVE_SUBSCRIPT_PTR_NIGHTMARE_START] = BATTLE_SUBSCRIPT_NIGHTMARE_START, + [MOVE_SUBSCRIPT_PTR_BOOST_ALL_STATS] = BATTLE_SUBSCRIPT_BOOST_ALL_STATS, + [MOVE_SUBSCRIPT_PTR_RAPID_SPIN] = BATTLE_SUBSCRIPT_RAPID_SPIN, + [MOVE_SUBSCRIPT_PTR_HEAL_TARGET_PARALYSIS] = BATTLE_SUBSCRIPT_HEAL_TARGET_PARALYSIS, + [MOVE_SUBSCRIPT_PTR_USER_ATK_AND_DEF_DOWN_1_STAGE] = BATTLE_SUBSCRIPT_USER_ATK_AND_DEF_DOWN_1_STAGE, + [MOVE_SUBSCRIPT_PTR_RECOIL_1_3] = BATTLE_SUBSCRIPT_RECOIL_1_3, + [MOVE_SUBSCRIPT_PTR_ATTACK_UP_2_STAGES] = BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE, + [MOVE_SUBSCRIPT_PTR_DEFENSE_UP_2_STAGES] = BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE, + [MOVE_SUBSCRIPT_PTR_SPEED_UP_2_STAGES] = BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE, + [MOVE_SUBSCRIPT_PTR_SP_ATTACK_UP_2_STAGES] = BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE, + [MOVE_SUBSCRIPT_PTR_SP_DEFENSE_UP_2_STAGES] = BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE, + [MOVE_SUBSCRIPT_PTR_ACCURACY_UP_2_STAGES] = BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE, + [MOVE_SUBSCRIPT_PTR_EVASION_UP_2_STAGES] = BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE, + [MOVE_SUBSCRIPT_PTR_ATTACK_DOWN_2_STAGES] = BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE, + [MOVE_SUBSCRIPT_PTR_DEFENSE_DOWN_2_STAGES] = BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE, + [MOVE_SUBSCRIPT_PTR_SPEED_DOWN_2_STAGES] = BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE, + [MOVE_SUBSCRIPT_PTR_SP_ATTACK_DOWN_2_STAGES] = BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE, + [MOVE_SUBSCRIPT_PTR_SP_DEFENSE_DOWN_2_STAGES] = BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE, + [MOVE_SUBSCRIPT_PTR_ACCURACY_DOWN_2_STAGES] = BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE, + [MOVE_SUBSCRIPT_PTR_EVASION_DOWN_2_STAGES] = BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE, + [MOVE_SUBSCRIPT_PTR_THRASH] = BATTLE_SUBSCRIPT_THRASH, + [MOVE_SUBSCRIPT_PTR_KNOCK_OFF] = BATTLE_SUBSCRIPT_KNOCK_OFF, + [MOVE_SUBSCRIPT_PTR_USER_DEF_AND_SPDEF_UP_1_STAGE] = BATTLE_SUBSCRIPT_USER_DEF_AND_SPDEF_UP_1_STAGE, + [MOVE_SUBSCRIPT_PTR_USER_ATK_AND_DEF_UP_1_STAGE] = BATTLE_SUBSCRIPT_USER_ATK_AND_DEF_UP_1_STAGE, + [MOVE_SUBSCRIPT_PTR_TARGET_ATK_AND_DEF_DOWN_1_STAGE] = BATTLE_SUBSCRIPT_TARGET_ATK_AND_DEF_DOWN_1_STAGE, + [MOVE_SUBSCRIPT_PTR_USER_SPATK_AND_SPDEF_UP_1_STAGE] = BATTLE_SUBSCRIPT_USER_SPATK_AND_SPDEF_UP_1_STAGE, + [MOVE_SUBSCRIPT_PTR_USER_ATK_AND_SPEED_UP_1_STAGE] = BATTLE_SUBSCRIPT_USER_ATK_AND_SPEED_UP_1_STAGE, + [MOVE_SUBSCRIPT_PTR_DRAIN_HALF_DAMAGE_DEALT] = BATTLE_SUBSCRIPT_DRAIN_HALF_DAMAGE_DEALT, + [MOVE_SUBSCRIPT_PTR_DREAM_EATER] = BATTLE_SUBSCRIPT_DREAM_EATER, + [MOVE_SUBSCRIPT_PTR_RESET_ALL_STAT_STAGES] = BATTLE_SUBSCRIPT_RESET_ALL_STAT_STAGES, + [MOVE_SUBSCRIPT_PTR_BIDE_START] = BATTLE_SUBSCRIPT_BIDE_START, + [MOVE_SUBSCRIPT_PTR_STRUGGLE] = BATTLE_SUBSCRIPT_STRUGGLE, + [MOVE_SUBSCRIPT_PTR_CONVERSION] = BATTLE_SUBSCRIPT_CONVERSION, + [MOVE_SUBSCRIPT_PTR_RECOVER_HALF_MAX_HP] = BATTLE_SUBSCRIPT_RECOVER_HALF_MAX_HP, + [MOVE_SUBSCRIPT_PTR_LIGHT_SCREEN] = BATTLE_SUBSCRIPT_LIGHT_SCREEN, + [MOVE_SUBSCRIPT_PTR_REFLECT] = BATTLE_SUBSCRIPT_REFLECT, + [MOVE_SUBSCRIPT_PTR_MIST] = BATTLE_SUBSCRIPT_MIST, + [MOVE_SUBSCRIPT_PTR_FOCUS_ENERGY] = BATTLE_SUBSCRIPT_FOCUS_ENERGY, + [MOVE_SUBSCRIPT_PTR_MIMIC] = BATTLE_SUBSCRIPT_MIMIC, + [MOVE_SUBSCRIPT_PTR_LEECH_SEED_START] = BATTLE_SUBSCRIPT_LEECH_SEED_START, + [MOVE_SUBSCRIPT_PTR_DISABLE_START] = BATTLE_SUBSCRIPT_DISABLE_START, + [MOVE_SUBSCRIPT_PTR_ENCORE_START] = BATTLE_SUBSCRIPT_ENCORE_START, + [MOVE_SUBSCRIPT_PTR_PAIN_SPLIT] = BATTLE_SUBSCRIPT_PAIN_SPLIT, + [MOVE_SUBSCRIPT_PTR_CONVERSION_2] = BATTLE_SUBSCRIPT_CONVERSION_2, + [MOVE_SUBSCRIPT_PTR_LOCK_ON] = BATTLE_SUBSCRIPT_LOCK_ON, + [MOVE_SUBSCRIPT_PTR_SKETCH] = BATTLE_SUBSCRIPT_SKETCH, + [MOVE_SUBSCRIPT_PTR_FEINT] = BATTLE_SUBSCRIPT_FEINT, + [MOVE_SUBSCRIPT_PTR_DESTINY_BOND] = BATTLE_SUBSCRIPT_DESTINY_BOND, + [MOVE_SUBSCRIPT_PTR_REDUCE_TARGET_PP] = BATTLE_SUBSCRIPT_REDUCE_TARGET_PP, + [MOVE_SUBSCRIPT_PTR_PROTECT] = BATTLE_SUBSCRIPT_PROTECT, + [MOVE_SUBSCRIPT_PTR_HEAL_BELL] = BATTLE_SUBSCRIPT_HEAL_BELL, + [MOVE_SUBSCRIPT_PTR_TRY_SUBSTITUTE] = BATTLE_SUBSCRIPT_TRY_SUBSTITUTE, + [MOVE_SUBSCRIPT_PTR_FORCE_TARGET_TO_SWITCH_OR_FLEE] = BATTLE_SUBSCRIPT_FORCE_TARGET_TO_SWITCH_OR_FLEE, + [MOVE_SUBSCRIPT_PTR_TRANSFORM_INTO_TARGET] = BATTLE_SUBSCRIPT_TRANSFORM_INTO_TARGET, + [MOVE_SUBSCRIPT_PTR_MINIMIZE] = BATTLE_SUBSCRIPT_MINIMIZE, + [MOVE_SUBSCRIPT_PTR_CURSE_NORMAL] = BATTLE_SUBSCRIPT_CURSE_NORMAL, + [MOVE_SUBSCRIPT_PTR_CURSE_GHOST] = BATTLE_SUBSCRIPT_CURSE_GHOST, + [MOVE_SUBSCRIPT_PTR_PRINT_MESSAGE_AND_PLAY_ANIMATION] = BATTLE_SUBSCRIPT_PRINT_MESSAGE_AND_PLAY_ANIMATION, + [MOVE_SUBSCRIPT_PTR_FORESIGHT] = BATTLE_SUBSCRIPT_FORESIGHT, + [MOVE_SUBSCRIPT_PTR_PERISH_SONG_START] = BATTLE_SUBSCRIPT_PERISH_SONG_START, + [MOVE_SUBSCRIPT_PTR_WEATHER_START] = BATTLE_SUBSCRIPT_WEATHER_START, + [MOVE_SUBSCRIPT_PTR_SWAGGER] = BATTLE_SUBSCRIPT_SWAGGER, + [MOVE_SUBSCRIPT_PTR_INFATUATE] = BATTLE_SUBSCRIPT_INFATUATE, + [MOVE_SUBSCRIPT_PTR_SAFEGUARD_START] = BATTLE_SUBSCRIPT_SAFEGUARD_START, + [MOVE_SUBSCRIPT_PTR_PRESENT_HEAL] = BATTLE_SUBSCRIPT_PRESENT_HEAL, + [MOVE_SUBSCRIPT_PTR_MAGNITUDE] = BATTLE_SUBSCRIPT_MAGNITUDE, + [MOVE_SUBSCRIPT_PTR_BATON_PASS] = BATTLE_SUBSCRIPT_BATON_PASS, + [MOVE_SUBSCRIPT_PTR_BELLY_DRUM] = BATTLE_SUBSCRIPT_BELLY_DRUM, + [MOVE_SUBSCRIPT_PTR_TELEPORT] = BATTLE_SUBSCRIPT_TELEPORT, + [MOVE_SUBSCRIPT_PTR_FUTURE_SIGHT_START] = BATTLE_SUBSCRIPT_FUTURE_SIGHT_START, + [MOVE_SUBSCRIPT_PTR_STOCKPILE] = BATTLE_SUBSCRIPT_STOCKPILE, + [MOVE_SUBSCRIPT_PTR_SWALLOW] = BATTLE_SUBSCRIPT_SWALLOW, + [MOVE_SUBSCRIPT_PTR_TORMENT_START] = BATTLE_SUBSCRIPT_TORMENT_START, + [MOVE_SUBSCRIPT_PTR_FLATTER] = BATTLE_SUBSCRIPT_FLATTER, + [MOVE_SUBSCRIPT_PTR_MEMENTO] = BATTLE_SUBSCRIPT_MEMENTO, + [MOVE_SUBSCRIPT_PTR_CHARGE] = BATTLE_SUBSCRIPT_CHARGE, + [MOVE_SUBSCRIPT_PTR_TAUNT_START] = BATTLE_SUBSCRIPT_TAUNT_START, + [MOVE_SUBSCRIPT_PTR_EXCHANGE_ITEMS] = BATTLE_SUBSCRIPT_EXCHANGE_ITEMS, + [MOVE_SUBSCRIPT_PTR_COPY_ABILITY] = BATTLE_SUBSCRIPT_COPY_ABILITY, + [MOVE_SUBSCRIPT_PTR_BREAK_SCREENS] = BATTLE_SUBSCRIPT_BREAK_SCREENS, + [MOVE_SUBSCRIPT_PTR_YAWN] = BATTLE_SUBSCRIPT_YAWN, + [MOVE_SUBSCRIPT_PTR_EXCHANGE_ABILITIES] = BATTLE_SUBSCRIPT_EXCHANGE_ABILITIES, + [MOVE_SUBSCRIPT_PTR_RECOVER_PSN_PRZ_BRN] = BATTLE_SUBSCRIPT_RECOVER_PSN_PRZ_BRN, + [MOVE_SUBSCRIPT_PTR_ROOST] = BATTLE_SUBSCRIPT_ROOST, + [MOVE_SUBSCRIPT_PTR_HEAL_TARGET_SLEEP] = BATTLE_SUBSCRIPT_HEAL_TARGET_SLEEP, + [MOVE_SUBSCRIPT_PTR_GRAVITY_START] = BATTLE_SUBSCRIPT_GRAVITY_START, + [MOVE_SUBSCRIPT_PTR_MIRACLE_EYE] = BATTLE_SUBSCRIPT_MIRACLE_EYE, + [MOVE_SUBSCRIPT_PTR_HEALING_WISH] = BATTLE_SUBSCRIPT_HEALING_WISH, + [MOVE_SUBSCRIPT_PTR_TAILWIND_START] = BATTLE_SUBSCRIPT_TAILWIND_START, + [MOVE_SUBSCRIPT_PTR_USER_DEF_AND_SPDEF_DOWN_1_STAGE] = BATTLE_SUBSCRIPT_USER_DEF_AND_SPDEF_DOWN_1_STAGE, + [MOVE_SUBSCRIPT_PTR_USER_SWAP_ATK_AND_DEF] = BATTLE_SUBSCRIPT_USER_SWAP_ATK_AND_DEF, + [MOVE_SUBSCRIPT_PTR_SUPPRESS_TARGET_ABILITY] = BATTLE_SUBSCRIPT_SUPPRESS_TARGET_ABILITY, + [MOVE_SUBSCRIPT_PTR_LUCKY_CHANT_START] = BATTLE_SUBSCRIPT_LUCKY_CHANT_START, + [MOVE_SUBSCRIPT_PTR_EXCHANGE_ATK_AND_SPATK_STAGES] = BATTLE_SUBSCRIPT_EXCHANGE_ATK_AND_SPATK_STAGES, + [MOVE_SUBSCRIPT_PTR_EXCHANGE_DEF_AND_SPDEF_STAGES] = BATTLE_SUBSCRIPT_EXCHANGE_DEF_AND_SPDEF_STAGES, + [MOVE_SUBSCRIPT_PTR_GIVE_TARGET_INSOMNIA] = BATTLE_SUBSCRIPT_GIVE_TARGET_INSOMNIA, + [MOVE_SUBSCRIPT_PTR_EXCHANGE_ALL_STAT_STAGES] = BATTLE_SUBSCRIPT_EXCHANGE_ALL_STAT_STAGES, + [MOVE_SUBSCRIPT_PTR_RECOIL_1_3_CHANCE_TO_BURN] = BATTLE_SUBSCRIPT_RECOIL_1_3_CHANCE_TO_BURN, + [MOVE_SUBSCRIPT_PTR_DEFOG] = BATTLE_SUBSCRIPT_DEFOG, + [MOVE_SUBSCRIPT_PTR_HEAL_BLOCK_START] = BATTLE_SUBSCRIPT_HEAL_BLOCK_START, + [MOVE_SUBSCRIPT_PTR_ATTACK_THEN_SWITCH_OUT] = BATTLE_SUBSCRIPT_ATTACK_THEN_SWITCH_OUT, + [MOVE_SUBSCRIPT_PTR_EMBARGO_START] = BATTLE_SUBSCRIPT_EMBARGO_START, + [MOVE_SUBSCRIPT_PTR_PLUCK] = BATTLE_SUBSCRIPT_PLUCK, + [MOVE_SUBSCRIPT_PTR_FLING] = BATTLE_SUBSCRIPT_FLING, + [MOVE_SUBSCRIPT_PTR_RECOIL_1_3_CHANCE_TO_PARALYZE] = BATTLE_SUBSCRIPT_RECOIL_1_3_CHANCE_TO_PARALYZE, + [MOVE_SUBSCRIPT_PTR_RECOIL_1_2] = BATTLE_SUBSCRIPT_RECOIL_1_2, + [MOVE_SUBSCRIPT_PTR_BURN_OR_FLINCH] = BATTLE_SUBSCRIPT_BURN_OR_FLINCH, + [MOVE_SUBSCRIPT_PTR_FREEZE_OR_FLINCH] = BATTLE_SUBSCRIPT_FREEZE_OR_FLINCH, + [MOVE_SUBSCRIPT_PTR_PARALYZE_OR_FLINCH] = BATTLE_SUBSCRIPT_PARALYZE_OR_FLINCH, + [MOVE_SUBSCRIPT_PTR_CHATTER] = BATTLE_SUBSCRIPT_CHATTER, + [MOVE_SUBSCRIPT_PTR_LUNAR_DANCE] = BATTLE_SUBSCRIPT_LUNAR_DANCE, + [MOVE_SUBSCRIPT_PTR_GIVE_TARGET_OWN_STATUS] = BATTLE_SUBSCRIPT_GIVE_TARGET_OWN_STATUS, }; diff --git a/src/overlay016/battle_controller.c b/src/overlay016/battle_controller.c index bcfeeb4eaf..36469e307f 100644 --- a/src/overlay016/battle_controller.c +++ b/src/overlay016/battle_controller.c @@ -2,6 +2,9 @@ #include #include "consts/generated/c/abilities.h" +#include "consts/generated/c/battle_controller_params.h" +#include "consts/generated/c/battle_subscripts.h" + #include "constants/battle.h" #include "constants/heap.h" #include "constants/items.h" @@ -11,7 +14,6 @@ #include "constants/sdat.h" #include "constants/species.h" #include "constants/trainer.h" -#include "constants/narc_files/battle_skill_subseq.h" #include "constants/savedata/record.h" #include "nitro/types.h" @@ -233,7 +235,7 @@ static void BattleController_InitBattleMons(BattleSystem *battleSys, BattleConte static void BattleController_StartEncounter(BattleSystem *battleSys, BattleContext *battleCtx) { - LOAD_SUBSEQ(BATTLE_SUBSEQ_START_ENCOUNTER); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_START_ENCOUNTER); battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; battleCtx->commandNext = BATTLE_CONTROL_TRAINER_MESSAGE; } @@ -241,7 +243,7 @@ static void BattleController_StartEncounter(BattleSystem *battleSys, BattleConte static void BattleController_TrainerMessage(BattleSystem *battleSys, BattleContext *battleCtx) { if (BattleSystem_CheckTrainerMessage(battleSys, battleCtx)) { - LOAD_SUBSEQ(BATTLE_SUBSEQ_TRAINER_MESSAGE); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_TRAINER_MESSAGE); battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; battleCtx->commandNext = BATTLE_CONTROL_SHOW_BATTLE_MON; } else { @@ -826,7 +828,7 @@ static void BattleController_CheckPreMoveActions(BattleSystem *battleSys, Battle BattleIO_ClearMessageBox(battleSys); battleCtx->msgBattlerTemp = battler; - LOAD_SUBSEQ(BATTLE_SUBSEQ_TIGHTEN_FOCUS); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_TIGHTEN_FOCUS); battleCtx->commandNext = battleCtx->command; battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; @@ -952,7 +954,7 @@ static void BattleController_CheckFieldConditions(BattleSystem *battleSys, Battl battleCtx->sideConditionsMask[side] &= ~SIDE_CONDITION_REFLECT; battleCtx->msgMoveTemp = MOVE_REFLECT; - PrepareSubroutineSequence(battleCtx, BATTLE_SUBSEQ_MOVE_EFFECT_END); + PrepareSubroutineSequence(battleCtx, BATTLE_SUBSCRIPT_MOVE_EFFECT_END); battleCtx->msgBattlerTemp = BattleSystem_SideToBattler(battleSys, battleCtx, side); state = STATE_BREAK_OUT; } @@ -975,7 +977,7 @@ static void BattleController_CheckFieldConditions(BattleSystem *battleSys, Battl battleCtx->sideConditionsMask[side] &= ~SIDE_CONDITION_LIGHT_SCREEN; battleCtx->msgMoveTemp = MOVE_LIGHT_SCREEN; - PrepareSubroutineSequence(battleCtx, BATTLE_SUBSEQ_MOVE_EFFECT_END); + PrepareSubroutineSequence(battleCtx, BATTLE_SUBSCRIPT_MOVE_EFFECT_END); battleCtx->msgBattlerTemp = BattleSystem_SideToBattler(battleSys, battleCtx, side); state = STATE_BREAK_OUT; } @@ -998,7 +1000,7 @@ static void BattleController_CheckFieldConditions(BattleSystem *battleSys, Battl battleCtx->sideConditionsMask[side] &= ~SIDE_CONDITION_MIST; battleCtx->msgMoveTemp = MOVE_MIST; - PrepareSubroutineSequence(battleCtx, BATTLE_SUBSEQ_MOVE_EFFECT_END); + PrepareSubroutineSequence(battleCtx, BATTLE_SUBSCRIPT_MOVE_EFFECT_END); battleCtx->msgBattlerTemp = BattleSystem_SideToBattler(battleSys, battleCtx, side); state = STATE_BREAK_OUT; } @@ -1021,7 +1023,7 @@ static void BattleController_CheckFieldConditions(BattleSystem *battleSys, Battl battleCtx->sideConditionsMask[side] &= ~SIDE_CONDITION_SAFEGUARD; battleCtx->msgBattlerTemp = battleCtx->sideConditions[side].safeguardUser; - PrepareSubroutineSequence(battleCtx, BATTLE_SUBSEQ_SAFEGUARD_END); + PrepareSubroutineSequence(battleCtx, BATTLE_SUBSCRIPT_SAFEGUARD_END); battleCtx->msgBattlerTemp = BattleSystem_SideToBattler(battleSys, battleCtx, side); state = STATE_BREAK_OUT; } @@ -1043,7 +1045,7 @@ static void BattleController_CheckFieldConditions(BattleSystem *battleSys, Battl battleCtx->sideConditionsMask[side] -= SIDE_CONDITION_TAILWIND_SHIFT; if ((battleCtx->sideConditionsMask[side] & SIDE_CONDITION_TAILWIND) == FALSE) { - PrepareSubroutineSequence(battleCtx, BATTLE_SUBSEQ_TAILWIND_END); + PrepareSubroutineSequence(battleCtx, BATTLE_SUBSCRIPT_TAILWIND_END); battleCtx->msgBattlerTemp = BattleSystem_SideToBattler(battleSys, battleCtx, side); state = STATE_BREAK_OUT; } @@ -1066,7 +1068,7 @@ static void BattleController_CheckFieldConditions(BattleSystem *battleSys, Battl battleCtx->sideConditionsMask[side] -= SIDE_CONDITION_LUCKY_CHANT_SHIFT; if ((battleCtx->sideConditionsMask[side] & SIDE_CONDITION_LUCKY_CHANT) == FALSE) { - PrepareSubroutineSequence(battleCtx, BATTLE_SUBSEQ_LUCKY_CHANT_END); + PrepareSubroutineSequence(battleCtx, BATTLE_SUBSCRIPT_LUCKY_CHANT_END); battleCtx->msgBattlerTemp = BattleSystem_SideToBattler(battleSys, battleCtx, side); state = STATE_BREAK_OUT; } @@ -1096,7 +1098,7 @@ static void BattleController_CheckFieldConditions(BattleSystem *battleSys, Battl battleCtx->hpCalcTemp = BattleSystem_Divide(battleCtx->battleMons[side].maxHP, 2); - PrepareSubroutineSequence(battleCtx, BATTLE_SUBSEQ_WISH_HEAL); + PrepareSubroutineSequence(battleCtx, BATTLE_SUBSCRIPT_WISH_HEAL); state = STATE_BREAK_OUT; } @@ -1115,15 +1117,15 @@ static void BattleController_CheckFieldConditions(BattleSystem *battleSys, Battl battleCtx->msgBuffer.id = 801; // "Rain continues to fall." battleCtx->msgBuffer.tags = TAG_NONE; - PrepareSubroutineSequence(battleCtx, BATTLE_SUBSEQ_WEATHER_CONTINUES); + PrepareSubroutineSequence(battleCtx, BATTLE_SUBSCRIPT_WEATHER_CONTINUES); } else { if (--battleCtx->fieldConditions.weatherTurns == 0) { - PrepareSubroutineSequence(battleCtx, BATTLE_SUBSEQ_RAINING_END); + PrepareSubroutineSequence(battleCtx, BATTLE_SUBSCRIPT_RAINING_END); } else { battleCtx->msgBuffer.id = 801; // "Rain continues to fall." battleCtx->msgBuffer.tags = TAG_NONE; - PrepareSubroutineSequence(battleCtx, BATTLE_SUBSEQ_WEATHER_CONTINUES); + PrepareSubroutineSequence(battleCtx, BATTLE_SUBSCRIPT_WEATHER_CONTINUES); } } @@ -1140,15 +1142,15 @@ static void BattleController_CheckFieldConditions(BattleSystem *battleSys, Battl battleCtx->msgBuffer.id = 805; // "The sandstorm rages." battleCtx->msgBuffer.tags = TAG_NONE; - PrepareSubroutineSequence(battleCtx, BATTLE_SUBSEQ_WEATHER_CONTINUES); + PrepareSubroutineSequence(battleCtx, BATTLE_SUBSCRIPT_WEATHER_CONTINUES); } else { if (--battleCtx->fieldConditions.weatherTurns == 0) { - PrepareSubroutineSequence(battleCtx, BATTLE_SUBSEQ_SANDSTORM_END); + PrepareSubroutineSequence(battleCtx, BATTLE_SUBSCRIPT_SANDSTORM_END); } else { battleCtx->msgBuffer.id = 805; // "The sandstorm rages." battleCtx->msgBuffer.tags = TAG_NONE; - PrepareSubroutineSequence(battleCtx, BATTLE_SUBSEQ_WEATHER_CONTINUES); + PrepareSubroutineSequence(battleCtx, BATTLE_SUBSCRIPT_WEATHER_CONTINUES); } } @@ -1165,15 +1167,15 @@ static void BattleController_CheckFieldConditions(BattleSystem *battleSys, Battl battleCtx->msgBuffer.id = 808; // "The sunlight is strong." battleCtx->msgBuffer.tags = TAG_NONE; - PrepareSubroutineSequence(battleCtx, BATTLE_SUBSEQ_WEATHER_CONTINUES); + PrepareSubroutineSequence(battleCtx, BATTLE_SUBSCRIPT_WEATHER_CONTINUES); } else { if (--battleCtx->fieldConditions.weatherTurns == 0) { - PrepareSubroutineSequence(battleCtx, BATTLE_SUBSEQ_SUNNY_END); + PrepareSubroutineSequence(battleCtx, BATTLE_SUBSCRIPT_SUNNY_END); } else { battleCtx->msgBuffer.id = 808; // "The sunlight is strong." battleCtx->msgBuffer.tags = TAG_NONE; - PrepareSubroutineSequence(battleCtx, BATTLE_SUBSEQ_WEATHER_CONTINUES); + PrepareSubroutineSequence(battleCtx, BATTLE_SUBSCRIPT_WEATHER_CONTINUES); } } @@ -1190,15 +1192,15 @@ static void BattleController_CheckFieldConditions(BattleSystem *battleSys, Battl battleCtx->msgBuffer.id = 811; // "Hail continues to fall." battleCtx->msgBuffer.tags = TAG_NONE; - PrepareSubroutineSequence(battleCtx, BATTLE_SUBSEQ_WEATHER_CONTINUES); + PrepareSubroutineSequence(battleCtx, BATTLE_SUBSCRIPT_WEATHER_CONTINUES); } else { if (--battleCtx->fieldConditions.weatherTurns == 0) { - PrepareSubroutineSequence(battleCtx, BATTLE_SUBSEQ_HAILING_END); + PrepareSubroutineSequence(battleCtx, BATTLE_SUBSCRIPT_HAILING_END); } else { battleCtx->msgBuffer.id = 811; // "Hail continues to fall." battleCtx->msgBuffer.tags = TAG_NONE; - PrepareSubroutineSequence(battleCtx, BATTLE_SUBSEQ_WEATHER_CONTINUES); + PrepareSubroutineSequence(battleCtx, BATTLE_SUBSCRIPT_WEATHER_CONTINUES); } } @@ -1214,7 +1216,7 @@ static void BattleController_CheckFieldConditions(BattleSystem *battleSys, Battl battleCtx->msgBuffer.id = 813; // "The fog is deep..." battleCtx->msgBuffer.tags = TAG_NONE; - PrepareSubroutineSequence(battleCtx, BATTLE_SUBSEQ_WEATHER_CONTINUES); + PrepareSubroutineSequence(battleCtx, BATTLE_SUBSCRIPT_WEATHER_CONTINUES); battleCtx->scriptTemp = BATTLE_ANIMATION_WEATHER_FOG; state = STATE_BREAK_OUT; @@ -1228,7 +1230,7 @@ static void BattleController_CheckFieldConditions(BattleSystem *battleSys, Battl battleCtx->fieldConditionsMask -= (1 << FIELD_CONDITION_GRAVITY_SHIFT); if ((battleCtx->fieldConditionsMask & FIELD_CONDITION_GRAVITY) == 0) { - PrepareSubroutineSequence(battleCtx, BATTLE_SUBSEQ_GRAVITY_END); + PrepareSubroutineSequence(battleCtx, BATTLE_SUBSCRIPT_GRAVITY_END); state = STATE_BREAK_OUT; } } @@ -1313,10 +1315,10 @@ static void BattleController_CheckMonConditions(BattleSystem *battleSys, BattleC && battleCtx->battleMons[battler].curHP) { if (battleCtx->battleMons[battler].moveEffectsData.healBlockTurns) { battleCtx->msgBattlerTemp = battler; - LOAD_SUBSEQ(BATTLE_SUBSEQ_CANNOT_HEAL); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_CANNOT_HEAL); } else { battleCtx->msgBattlerTemp = battler; - LOAD_SUBSEQ(BATTLE_SUBSEQ_INGRAIN_HEAL); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_INGRAIN_HEAL); } battleCtx->commandNext = battleCtx->command; @@ -1334,12 +1336,12 @@ static void BattleController_CheckMonConditions(BattleSystem *battleSys, BattleC && battleCtx->battleMons[battler].curHP) { if (battleCtx->battleMons[battler].moveEffectsData.healBlockTurns) { battleCtx->msgBattlerTemp = battler; - LOAD_SUBSEQ(BATTLE_SUBSEQ_CANNOT_HEAL); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_CANNOT_HEAL); } else { battleCtx->msgBattlerTemp = battler; battleCtx->msgMoveTemp = MOVE_AQUA_RING; battleCtx->hpCalcTemp = BattleSystem_Divide(battleCtx->battleMons[battler].maxHP, 16); - LOAD_SUBSEQ(BATTLE_SUBSEQ_AQUA_RING_HEAL); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_AQUA_RING_HEAL); } battleCtx->commandNext = battleCtx->command; @@ -1382,7 +1384,7 @@ static void BattleController_CheckMonConditions(BattleSystem *battleSys, BattleC battleCtx->msgAttacker = battleCtx->battleMons[battler].moveEffectsMask & MOVE_EFFECT_LEECH_SEED_RECIPIENT; battleCtx->msgDefender = battler; - PrepareSubroutineSequence(battleCtx, BATTLE_SUBSEQ_LEECH_SEED_EFFECT); + PrepareSubroutineSequence(battleCtx, BATTLE_SUBSCRIPT_LEECH_SEED_EFFECT); state = STATE_BREAK_OUT; } @@ -1394,7 +1396,7 @@ static void BattleController_CheckMonConditions(BattleSystem *battleSys, BattleC battleCtx->msgBattlerTemp = battler; battleCtx->hpCalcTemp = BattleSystem_Divide(battleCtx->battleMons[battler].maxHP * -1, 8); - PrepareSubroutineSequence(battleCtx, BATTLE_SUBSEQ_POISON_DAMAGE); + PrepareSubroutineSequence(battleCtx, BATTLE_SUBSCRIPT_POISON_DAMAGE); state = STATE_BREAK_OUT; } @@ -1414,7 +1416,7 @@ static void BattleController_CheckMonConditions(BattleSystem *battleSys, BattleC battleCtx->hpCalcTemp *= ((battleCtx->battleMons[battler].status & MON_CONDITION_TOXIC_COUNTER) >> 8); battleCtx->hpCalcTemp *= -1; - PrepareSubroutineSequence(battleCtx, BATTLE_SUBSEQ_POISON_DAMAGE); + PrepareSubroutineSequence(battleCtx, BATTLE_SUBSCRIPT_POISON_DAMAGE); state = STATE_BREAK_OUT; } @@ -1425,7 +1427,7 @@ static void BattleController_CheckMonConditions(BattleSystem *battleSys, BattleC if ((battleCtx->battleMons[battler].status & MON_CONDITION_BURN) && battleCtx->battleMons[battler].curHP) { battleCtx->msgBattlerTemp = battler; - PrepareSubroutineSequence(battleCtx, BATTLE_SUBSEQ_BURN_DAMAGE); + PrepareSubroutineSequence(battleCtx, BATTLE_SUBSCRIPT_BURN_DAMAGE); state = STATE_BREAK_OUT; } @@ -1437,7 +1439,7 @@ static void BattleController_CheckMonConditions(BattleSystem *battleSys, BattleC if (battleCtx->battleMons[battler].status & MON_CONDITION_SLEEP) { battleCtx->msgBattlerTemp = battler; - PrepareSubroutineSequence(battleCtx, BATTLE_SUBSEQ_NIGHTMARE_EFFECT); + PrepareSubroutineSequence(battleCtx, BATTLE_SUBSCRIPT_NIGHTMARE_EFFECT); state = STATE_BREAK_OUT; } else { battleCtx->battleMons[battler].statusVolatile &= ~VOLATILE_CONDITION_NIGHTMARE; @@ -1451,7 +1453,7 @@ static void BattleController_CheckMonConditions(BattleSystem *battleSys, BattleC if ((battleCtx->battleMons[battler].statusVolatile & VOLATILE_CONDITION_CURSE) && battleCtx->battleMons[battler].curHP) { battleCtx->msgBattlerTemp = battler; - PrepareSubroutineSequence(battleCtx, BATTLE_SUBSEQ_CURSE_DAMAGE); + PrepareSubroutineSequence(battleCtx, BATTLE_SUBSCRIPT_CURSE_DAMAGE); state = STATE_BREAK_OUT; } @@ -1464,9 +1466,9 @@ static void BattleController_CheckMonConditions(BattleSystem *battleSys, BattleC if (battleCtx->battleMons[battler].statusVolatile & VOLATILE_CONDITION_BIND) { battleCtx->hpCalcTemp = BattleSystem_Divide(battleCtx->battleMons[battler].maxHP * -1, 16); - LOAD_SUBSEQ(BATTLE_SUBSEQ_BIND_EFFECT); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_BIND_EFFECT); } else { - LOAD_SUBSEQ(BATTLE_SUBSEQ_BIND_END); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_BIND_END); } battleCtx->msgMoveTemp = battleCtx->battleMons[battler].moveEffectsData.bindingMove; @@ -1489,7 +1491,7 @@ static void BattleController_CheckMonConditions(BattleSystem *battleSys, BattleC && battleCtx->scriptTemp) { battleCtx->hpCalcTemp = BattleSystem_Divide(battleCtx->battleMons[battler].maxHP * -1, 8); - LOAD_SUBSEQ(BATTLE_SUBSEQ_BAD_DREAMS); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_BAD_DREAMS); battleCtx->battleStatusMask |= SYSCTL_SKIP_SPRITE_BLINK; battleCtx->msgBattlerTemp = battler; battleCtx->commandNext = battleCtx->command; @@ -1509,7 +1511,7 @@ static void BattleController_CheckMonConditions(BattleSystem *battleSys, BattleC && battleCtx->battleMons[j].curHP && Battler_Ability(battleCtx, j) != ABILITY_SOUNDPROOF) { battleCtx->msgBattlerTemp = j; - PrepareSubroutineSequence(battleCtx, BATTLE_SUBSEQ_WAKE_UP); + PrepareSubroutineSequence(battleCtx, BATTLE_SUBSCRIPT_WAKE_UP); break; } } @@ -1522,13 +1524,13 @@ static void BattleController_CheckMonConditions(BattleSystem *battleSys, BattleC battleCtx->battleMons[battler].statusVolatile -= (1 << VOLATILE_CONDITION_UPROAR_SHIFT); if (BattleContext_MoveFailed(battleCtx, battler)) { - i = BATTLE_SUBSEQ_UPROAR_END; + i = BATTLE_SUBSCRIPT_UPROAR_END; battleCtx->battleMons[battler].statusVolatile &= ~VOLATILE_CONDITION_UPROAR; battleCtx->fieldConditionsMask &= ((FlagIndex(battler) << FIELD_CONDITION_UPROAR_SHIFT) ^ 0xFFFFFFFF); } else if (battleCtx->battleMons[battler].statusVolatile & VOLATILE_CONDITION_UPROAR) { - i = BATTLE_SUBSEQ_UPROAR_CONTINUES; + i = BATTLE_SUBSCRIPT_UPROAR_CONTINUES; } else { - i = BATTLE_SUBSEQ_UPROAR_END; + i = BATTLE_SUBSCRIPT_UPROAR_END; battleCtx->battleMons[battler].statusVolatile &= ~VOLATILE_CONDITION_UPROAR; battleCtx->fieldConditionsMask &= ((FlagIndex(battler) << FIELD_CONDITION_UPROAR_SHIFT) ^ 0xFFFFFFFF); } @@ -1553,7 +1555,7 @@ static void BattleController_CheckMonConditions(BattleSystem *battleSys, BattleC && (battleCtx->battleMons[battler].statusVolatile & VOLATILE_CONDITION_CONFUSION) == FALSE) { battleCtx->sideEffectMon = battler; - PrepareSubroutineSequence(battleCtx, BATTLE_SUBSEQ_THRASH_END); + PrepareSubroutineSequence(battleCtx, BATTLE_SUBSCRIPT_THRASH_END); state = STATE_BREAK_OUT; } } @@ -1579,7 +1581,7 @@ static void BattleController_CheckMonConditions(BattleSystem *battleSys, BattleC battleCtx->battleMons[battler].moveEffectsData.disabledMove = 0; battleCtx->msgBattlerTemp = battler; - PrepareSubroutineSequence(battleCtx, BATTLE_SUBSEQ_DISABLE_END); + PrepareSubroutineSequence(battleCtx, BATTLE_SUBSCRIPT_DISABLE_END); state = STATE_BREAK_OUT; } } @@ -1606,7 +1608,7 @@ static void BattleController_CheckMonConditions(BattleSystem *battleSys, BattleC battleCtx->battleMons[battler].moveEffectsData.encoredMove = 0; battleCtx->msgBattlerTemp = battler; - PrepareSubroutineSequence(battleCtx, BATTLE_SUBSEQ_ENCORE_END); + PrepareSubroutineSequence(battleCtx, BATTLE_SUBSCRIPT_ENCORE_END); state = STATE_BREAK_OUT; } } @@ -1636,7 +1638,7 @@ static void BattleController_CheckMonConditions(BattleSystem *battleSys, BattleC && --battleCtx->battleMons[battler].moveEffectsData.tauntedTurns == 0) { battleCtx->msgBattlerTemp = battler; - PrepareSubroutineSequence(battleCtx, BATTLE_SUBSEQ_TAUNT_END); + PrepareSubroutineSequence(battleCtx, BATTLE_SUBSCRIPT_TAUNT_END); state = STATE_BREAK_OUT; } @@ -1648,7 +1650,7 @@ static void BattleController_CheckMonConditions(BattleSystem *battleSys, BattleC && --battleCtx->battleMons[battler].moveEffectsData.magnetRiseTurns == 0) { battleCtx->msgBattlerTemp = battler; - PrepareSubroutineSequence(battleCtx, BATTLE_SUBSEQ_MAGNET_RISE_END); + PrepareSubroutineSequence(battleCtx, BATTLE_SUBSCRIPT_MAGNET_RISE_END); state = STATE_BREAK_OUT; } @@ -1660,7 +1662,7 @@ static void BattleController_CheckMonConditions(BattleSystem *battleSys, BattleC && --battleCtx->battleMons[battler].moveEffectsData.healBlockTurns == 0) { battleCtx->msgBattlerTemp = battler; - PrepareSubroutineSequence(battleCtx, BATTLE_SUBSEQ_HEAL_BLOCK_END); + PrepareSubroutineSequence(battleCtx, BATTLE_SUBSCRIPT_HEAL_BLOCK_END); state = STATE_BREAK_OUT; } @@ -1672,7 +1674,7 @@ static void BattleController_CheckMonConditions(BattleSystem *battleSys, BattleC && --battleCtx->battleMons[battler].moveEffectsData.embargoTurns == 0) { battleCtx->msgBattlerTemp = battler; - PrepareSubroutineSequence(battleCtx, BATTLE_SUBSEQ_EMBARGO_END); + PrepareSubroutineSequence(battleCtx, BATTLE_SUBSCRIPT_EMBARGO_END); state = STATE_BREAK_OUT; } @@ -1687,7 +1689,7 @@ static void BattleController_CheckMonConditions(BattleSystem *battleSys, BattleC battleCtx->sideEffectMon = battler; battleCtx->sideEffectType = SIDE_EFFECT_TYPE_MOVE_EFFECT; - PrepareSubroutineSequence(battleCtx, BATTLE_SUBSEQ_FALL_ASLEEP); + PrepareSubroutineSequence(battleCtx, BATTLE_SUBSCRIPT_FALL_ASLEEP); state = STATE_BREAK_OUT; } } @@ -1778,7 +1780,7 @@ static void BattleController_CheckSideConditions(BattleSystem *battleSys, Battle battleCtx->msgMoveTemp = battleCtx->fieldConditions.futureSightMove[battler]; battleCtx->hpCalcTemp = battleCtx->fieldConditions.futureSightDamage[battler]; - PrepareSubroutineSequence(battleCtx, BATTLE_SUBSEQ_FUTURE_SIGHT_DAMAGE); + PrepareSubroutineSequence(battleCtx, BATTLE_SUBSCRIPT_FUTURE_SIGHT_DAMAGE); return; } } @@ -1809,7 +1811,7 @@ static void BattleController_CheckSideConditions(BattleSystem *battleSys, Battle } battleCtx->msgBattlerTemp = battler; - PrepareSubroutineSequence(battleCtx, BATTLE_SUBSEQ_CONTINUE_PERISH_SONG); + PrepareSubroutineSequence(battleCtx, BATTLE_SUBSCRIPT_CONTINUE_PERISH_SONG); return; } } @@ -1822,7 +1824,7 @@ static void BattleController_CheckSideConditions(BattleSystem *battleSys, Battle if (battleCtx->fieldConditionsMask & FIELD_CONDITION_TRICK_ROOM) { battleCtx->fieldConditionsMask -= (1 << FIELD_CONDITION_TRICK_ROOM_SHIFT); if ((battleCtx->fieldConditionsMask & FIELD_CONDITION_TRICK_ROOM) == FALSE) { - PrepareSubroutineSequence(battleCtx, BATTLE_SUBSEQ_TRICK_ROOM_END); + PrepareSubroutineSequence(battleCtx, BATTLE_SUBSCRIPT_TRICK_ROOM_END); return; } } @@ -1911,11 +1913,11 @@ static void BattleController_ItemCommand(BattleSystem *battleSys, BattleContext if (Battler_Side(battleSys, battleCtx->attacker)) { switch (battleCtx->aiContext.usedItemType[battleCtx->attacker >> 1]) { case ITEM_TYPE_FULL_RESTORE: - nextSeq = BATTLE_SUBSEQ_USE_FULL_RESTORE; + nextSeq = BATTLE_SUBSCRIPT_USE_FULL_RESTORE; break; case ITEM_TYPE_RECOVER_HP: - nextSeq = BATTLE_SUBSEQ_USE_POTION; + nextSeq = BATTLE_SUBSCRIPT_USE_POTION; break; case ITEM_TYPE_RECOVER_STATUS: @@ -1926,16 +1928,16 @@ static void BattleController_ItemCommand(BattleSystem *battleSys, BattleContext battleCtx->msgTemp = LowestBit(battleCtx->aiContext.usedItemCondition[battleCtx->attacker >> 1]); } - nextSeq = BATTLE_SUBSEQ_USE_STATUS_RECOVERY; + nextSeq = BATTLE_SUBSCRIPT_USE_STATUS_RECOVERY; break; case ITEM_TYPE_STAT_BOOSTER: battleCtx->msgTemp = battleCtx->aiContext.usedItemCondition[battleCtx->attacker >> 1]; - nextSeq = BATTLE_SUBSEQ_USE_STAT_BOOSTER; + nextSeq = BATTLE_SUBSCRIPT_USE_STAT_BOOSTER; break; case ITEM_TYPE_GUARD_SPEC: - nextSeq = BATTLE_SUBSEQ_USE_GUARD_SPEC; + nextSeq = BATTLE_SUBSCRIPT_USE_GUARD_SPEC; break; } @@ -1946,15 +1948,15 @@ static void BattleController_ItemCommand(BattleSystem *battleSys, BattleContext case BATTLE_POCKET_RECOVER_HP: case BATTLE_POCKET_BATTLE_ITEMS: if (used->item == ITEM_POKE_DOLL || used->item == ITEM_FLUFFY_TAIL) { - nextSeq = BATTLE_SUBSEQ_ESCAPE_ITEM; + nextSeq = BATTLE_SUBSCRIPT_ESCAPE_ITEM; } else { - nextSeq = BATTLE_SUBSEQ_BATTLE_ITEM; + nextSeq = BATTLE_SUBSCRIPT_BATTLE_ITEM; } break; case BATTLE_POCKET_POKE_BALLS: - nextSeq = BATTLE_SUBSEQ_THROW_POKEBALL; + nextSeq = BATTLE_SUBSCRIPT_THROW_POKEBALL; if ((BattleSystem_BattleType(battleSys) & BATTLE_TYPE_TRAINER) == FALSE && (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_CATCH_TUTORIAL) == FALSE) { Bag_SubtractItem(BattleSystem_Bag(battleSys), used->item, 1, HEAP_ID_BATTLE); @@ -1975,7 +1977,7 @@ static void BattleController_ItemCommand(BattleSystem *battleSys, BattleContext static void BattleController_SwitchCommand(BattleSystem *battleSys, BattleContext *battleCtx) { - LOAD_SUBSEQ(BATTLE_SUBSEQ_SWITCH_POKEMON); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_SWITCH_POKEMON); battleCtx->attacker = battleCtx->battlerActionOrder[battleCtx->turnOrderCounter]; battleCtx->switchedMon = battleCtx->attacker; @@ -1992,24 +1994,24 @@ static void BattleController_FleeCommand(BattleSystem *battleSys, BattleContext if (Battler_Side(battleSys, battleCtx->attacker) && (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_LINK) == FALSE) { if (ATTACKING_MON.statusVolatile & (VOLATILE_CONDITION_BIND | VOLATILE_CONDITION_MEAN_LOOK)) { - LOAD_SUBSEQ(BATTLE_SUBSEQ_ENEMY_ESCAPE_FAILED); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_ENEMY_ESCAPE_FAILED); battleCtx->scriptCursor = 0; battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; battleCtx->commandNext = BATTLE_CONTROL_MOVE_END; } else { - LOAD_SUBSEQ(BATTLE_SUBSEQ_ENEMY_ESCAPE); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_ENEMY_ESCAPE); battleCtx->scriptCursor = 0; battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; battleCtx->commandNext = BATTLE_CONTROL_FIGHT_END; } } else { if (Battler_CanEscape(battleSys, battleCtx, battleCtx->attacker)) { - LOAD_SUBSEQ(BATTLE_SUBSEQ_ESCAPE); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_ESCAPE); battleCtx->scriptCursor = 0; battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; battleCtx->commandNext = BATTLE_CONTROL_FIGHT_END; } else { - LOAD_SUBSEQ(BATTLE_SUBSEQ_ESCAPE_FAILED); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_ESCAPE_FAILED); battleCtx->scriptCursor = 0; battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; battleCtx->commandNext = BATTLE_CONTROL_MOVE_END; @@ -2019,7 +2021,7 @@ static void BattleController_FleeCommand(BattleSystem *battleSys, BattleContext static void BattleController_SafariBallCommand(BattleSystem *battleSys, BattleContext *battleCtx) { - LOAD_SUBSEQ(BATTLE_SUBSEQ_THROW_SAFARI_BALL); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_THROW_SAFARI_BALL); battleCtx->attacker = BATTLER_US; battleCtx->defender = BATTLER_THEM; @@ -2034,7 +2036,7 @@ static void BattleController_SafariBallCommand(BattleSystem *battleSys, BattleCo static void BattleController_SafariBaitCommand(BattleSystem *battleSys, BattleContext *battleCtx) { - LOAD_SUBSEQ(BATTLE_SUBSEQ_SAFARI_THROW_BAIT); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_SAFARI_THROW_BAIT); battleCtx->attacker = BATTLER_US; battleCtx->defender = BATTLER_THEM; @@ -2056,7 +2058,7 @@ static void BattleController_SafariBaitCommand(BattleSystem *battleSys, BattleCo static void BattleController_SafariRockCommand(BattleSystem *battleSys, BattleContext *battleCtx) { - LOAD_SUBSEQ(BATTLE_SUBSEQ_SAFARI_THROW_ROCK); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_SAFARI_THROW_ROCK); battleCtx->attacker = BATTLER_US; battleCtx->defender = BATTLER_THEM; @@ -2079,7 +2081,7 @@ static void BattleController_SafariRockCommand(BattleSystem *battleSys, BattleCo static void BattleController_SafariFleeCommand(BattleSystem *battleSys, BattleContext *battleCtx) { - LOAD_SUBSEQ(BATTLE_SUBSEQ_SAFARI_ESCAPE); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_SAFARI_ESCAPE); battleCtx->attacker = BATTLER_US; battleCtx->defender = BATTLER_THEM; @@ -2163,7 +2165,7 @@ static int BattleController_CheckObedience(BattleSystem *battleSys, BattleContex if ((ATTACKING_MON.status & MON_CONDITION_SLEEP) && (battleCtx->moveCur == MOVE_SNORE || battleCtx->moveCur == MOVE_SLEEP_TALK)) { - *nextSeq = BATTLE_SUBSEQ_DISOBEY_WHILE_ASLEEP; + *nextSeq = BATTLE_SUBSCRIPT_DISOBEY_WHILE_ASLEEP; return OBEY_CHECK_DO_NOTHING; } @@ -2172,7 +2174,7 @@ static int BattleController_CheckObedience(BattleSystem *battleSys, BattleContex rand1 = BattleSystem_CheckInvalidMoves(battleSys, battleCtx, battleCtx->attacker, FlagIndex(ATTACKER_MOVE_SLOT), CHECK_INVALID_ALL); if (rand1 == STRUGGLING_ALL) { - *nextSeq = BATTLE_SUBSEQ_DISOBEY_DO_NOTHING; + *nextSeq = BATTLE_SUBSCRIPT_DISOBEY_DO_NOTHING; return OBEY_CHECK_DO_NOTHING; } @@ -2191,7 +2193,7 @@ static int BattleController_CheckObedience(BattleSystem *battleSys, BattleContex ATTACKER_ACTION[BATTLE_ACTION_CHOOSE_TARGET] = battleCtx->defender; } - *nextSeq = BATTLE_SUBSEQ_DISOBEY_ORDERS; + *nextSeq = BATTLE_SUBSCRIPT_DISOBEY_ORDERS; battleCtx->multiHitCheckFlags |= SYSCTL_SKIP_OBEDIENCE_CHECK; return OBEY_CHECK_DIFFERENT_MOVE; } @@ -2202,7 +2204,7 @@ static int BattleController_CheckObedience(BattleSystem *battleSys, BattleContex && Battler_Ability(battleCtx, battleCtx->attacker) != ABILITY_VITAL_SPIRIT && Battler_Ability(battleCtx, battleCtx->attacker) != ABILITY_INSOMNIA && (battleCtx->fieldConditionsMask & FIELD_CONDITION_UPROAR) == FALSE) { - *nextSeq = BATTLE_SUBSEQ_DISOBEY_SLEEP; + *nextSeq = BATTLE_SUBSCRIPT_DISOBEY_SLEEP; return OBEY_CHECK_DO_NOTHING; } @@ -2215,12 +2217,12 @@ static int BattleController_CheckObedience(BattleSystem *battleSys, BattleContex battleCtx->hpCalcTemp = BattleSystem_CalcDamageVariance(battleSys, battleCtx, battleCtx->hpCalcTemp); battleCtx->hpCalcTemp *= -1; - *nextSeq = BATTLE_SUBSEQ_DISOBEY_HIT_SELF; + *nextSeq = BATTLE_SUBSCRIPT_DISOBEY_HIT_SELF; battleCtx->battleStatusMask |= SYSCTL_CHECK_LOOP_ONLY_ONCE; return OBEY_CHECK_HIT_SELF; } - *nextSeq = BATTLE_SUBSEQ_DISOBEY_DO_NOTHING; + *nextSeq = BATTLE_SUBSCRIPT_DISOBEY_DO_NOTHING; return OBEY_CHECK_DO_NOTHING; } @@ -2309,7 +2311,7 @@ static BOOL BattleController_HasNoTarget(BattleSystem *battleSys, BattleContext BOOL solarMove = FALSE; if (NO_TARGET) { - LOAD_SUBSEQ(BATTLE_SUBSEQ_NO_TARGET); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_NO_TARGET); battleCtx->commandNext = BATTLE_CONTROL_UPDATE_MOVE_BUFFERS; battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; @@ -2433,7 +2435,7 @@ static BOOL BattleController_CheckStatusDisruption(BattleSystem *battleSys, Batt && Battler_Ability(battleCtx, battleCtx->attacker) != ABILITY_SOUNDPROOF) { battleCtx->msgBattlerTemp = battleCtx->attacker; - LOAD_SUBSEQ(BATTLE_SUBSEQ_WAKE_UP); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_WAKE_UP); battleCtx->commandNext = battleCtx->command; battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; result = CHECK_STATUS_GO_TO_SCRIPT; @@ -2453,7 +2455,7 @@ static BOOL BattleController_CheckStatusDisruption(BattleSystem *battleSys, Batt if (ATTACKING_MON.status & MON_CONDITION_SLEEP) { if (battleCtx->moveCur != MOVE_SNORE && battleCtx->moveTemp != MOVE_SLEEP_TALK) { - LOAD_SUBSEQ(BATTLE_SUBSEQ_SLEEPING); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_SLEEPING); battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; battleCtx->commandNext = BATTLE_CONTROL_UPDATE_MOVE_BUFFERS; @@ -2463,7 +2465,7 @@ static BOOL BattleController_CheckStatusDisruption(BattleSystem *battleSys, Batt } else { battleCtx->msgBattlerTemp = battleCtx->attacker; - LOAD_SUBSEQ(BATTLE_SUBSEQ_WAKE_UP); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_WAKE_UP); battleCtx->commandNext = battleCtx->command; battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; @@ -2480,7 +2482,7 @@ static BOOL BattleController_CheckStatusDisruption(BattleSystem *battleSys, Batt if (BattleSystem_RandNext(battleSys) % 5 != 0) { if (moveEffect != BATTLE_EFFECT_THAW_AND_BURN_HIT && moveEffect != BATTLE_EFFECT_RECOIL_BURN_HIT) { - LOAD_SUBSEQ(BATTLE_SUBSEQ_FROZEN); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_FROZEN); battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; battleCtx->commandNext = BATTLE_CONTROL_UPDATE_MOVE_BUFFERS; @@ -2489,7 +2491,7 @@ static BOOL BattleController_CheckStatusDisruption(BattleSystem *battleSys, Batt } else { battleCtx->msgBattlerTemp = battleCtx->attacker; - LOAD_SUBSEQ(BATTLE_SUBSEQ_THAW_OUT); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_THAW_OUT); battleCtx->commandNext = battleCtx->command; battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; result = CHECK_STATUS_GO_TO_SCRIPT; @@ -2501,7 +2503,7 @@ static BOOL BattleController_CheckStatusDisruption(BattleSystem *battleSys, Batt case CHECK_STATUS_STATE_TRUANT: if (Battler_CheckTruant(battleCtx, battleCtx->attacker) == TRUE) { - LOAD_SUBSEQ(BATTLE_SUBSEQ_LOAFING_AROUND); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_LOAFING_AROUND); battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; battleCtx->commandNext = BATTLE_CONTROL_UPDATE_MOVE_BUFFERS; @@ -2515,7 +2517,7 @@ static BOOL BattleController_CheckStatusDisruption(BattleSystem *battleSys, Batt if (ATTACKING_MON.statusVolatile & VOLATILE_CONDITION_RECHARGING) { ATTACKING_MON.statusVolatile &= ~VOLATILE_CONDITION_RECHARGING; - LOAD_SUBSEQ(BATTLE_SUBSEQ_RECHARGING); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_RECHARGING); battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; battleCtx->commandNext = BATTLE_CONTROL_UPDATE_MOVE_BUFFERS; @@ -2530,7 +2532,7 @@ static BOOL BattleController_CheckStatusDisruption(BattleSystem *battleSys, Batt ATTACKING_MON.statusVolatile &= ~VOLATILE_CONDITION_FLINCH; battleCtx->moveFailFlags[battleCtx->attacker].flinched = TRUE; - LOAD_SUBSEQ(BATTLE_SUBSEQ_FLINCHED); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_FLINCHED); battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; battleCtx->commandNext = BATTLE_CONTROL_UPDATE_MOVE_BUFFERS; @@ -2544,7 +2546,7 @@ static BOOL BattleController_CheckStatusDisruption(BattleSystem *battleSys, Batt if (ATTACKING_MON.moveEffectsData.disabledMove == battleCtx->moveTemp) { battleCtx->moveFailFlags[battleCtx->attacker].disabled = TRUE; - LOAD_SUBSEQ(BATTLE_SUBSEQ_MOVE_IS_DISABLED); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_MOVE_IS_DISABLED); battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; battleCtx->commandNext = BATTLE_CONTROL_UPDATE_MOVE_BUFFERS; @@ -2559,7 +2561,7 @@ static BOOL BattleController_CheckStatusDisruption(BattleSystem *battleSys, Batt && battleCtx->aiContext.moveTable[battleCtx->moveCur].power == 0) { battleCtx->moveFailFlags[battleCtx->attacker].taunted = TRUE; - LOAD_SUBSEQ(BATTLE_SUBSEQ_MOVE_FAIL_TAUNTED); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_MOVE_FAIL_TAUNTED); battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; battleCtx->commandNext = BATTLE_CONTROL_UPDATE_MOVE_BUFFERS; @@ -2573,7 +2575,7 @@ static BOOL BattleController_CheckStatusDisruption(BattleSystem *battleSys, Batt if (Move_Imprisoned(battleSys, battleCtx, battleCtx->attacker, battleCtx->moveCur)) { battleCtx->moveFailFlags[battleCtx->attacker].imprisoned = TRUE; - LOAD_SUBSEQ(BATTLE_SUBSEQ_MOVE_IS_IMPRISONED); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_MOVE_IS_IMPRISONED); battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; battleCtx->commandNext = BATTLE_CONTROL_UPDATE_MOVE_BUFFERS; @@ -2587,7 +2589,7 @@ static BOOL BattleController_CheckStatusDisruption(BattleSystem *battleSys, Batt if (Move_FailsInHighGravity(battleSys, battleCtx, battleCtx->attacker, battleCtx->moveCur)) { battleCtx->moveFailFlags[battleCtx->attacker].gravity = TRUE; - LOAD_SUBSEQ(BATTLE_SUBSEQ_MOVE_FAIL_GRAVITY); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_MOVE_FAIL_GRAVITY); battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; battleCtx->commandNext = BATTLE_CONTROL_UPDATE_MOVE_BUFFERS; @@ -2601,7 +2603,7 @@ static BOOL BattleController_CheckStatusDisruption(BattleSystem *battleSys, Batt if (Move_HealBlocked(battleSys, battleCtx, battleCtx->attacker, battleCtx->moveCur)) { battleCtx->moveFailFlags[battleCtx->attacker].healBlocked = TRUE; - LOAD_SUBSEQ(BATTLE_SUBSEQ_MOVE_IS_HEAL_BLOCKED); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_MOVE_IS_HEAL_BLOCKED); battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; battleCtx->commandNext = BATTLE_CONTROL_UPDATE_MOVE_BUFFERS; @@ -2619,7 +2621,7 @@ static BOOL BattleController_CheckStatusDisruption(BattleSystem *battleSys, Batt if (ATTACKING_MON.statusVolatile & VOLATILE_CONDITION_CONFUSION) { if (BattleSystem_RandNext(battleSys) & 1) { - LOAD_SUBSEQ(BATTLE_SUBSEQ_CONFUSED); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_CONFUSED); battleCtx->commandNext = battleCtx->command; battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; @@ -2633,14 +2635,14 @@ static BOOL BattleController_CheckStatusDisruption(BattleSystem *battleSys, Batt battleCtx->hpCalcTemp = BattleSystem_CalcDamageVariance(battleSys, battleCtx, battleCtx->hpCalcTemp); battleCtx->hpCalcTemp *= -1; - LOAD_SUBSEQ(BATTLE_SUBSEQ_HURT_SELF_IN_CONFUSION); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_HURT_SELF_IN_CONFUSION); battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; battleCtx->commandNext = BATTLE_CONTROL_LOOP_FAINTED; result = CHECK_STATUS_DISRUPT_MOVE; } } else { - LOAD_SUBSEQ(BATTLE_SUBSEQ_SNAP_OUT_OF_CONFUSION); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_SNAP_OUT_OF_CONFUSION); battleCtx->commandNext = battleCtx->command; battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; @@ -2655,7 +2657,7 @@ static BOOL BattleController_CheckStatusDisruption(BattleSystem *battleSys, Batt if (BattleSystem_RandNext(battleSys) % 4 == 0) { battleCtx->moveFailFlags[battleCtx->attacker].paralyzed = TRUE; - LOAD_SUBSEQ(BATTLE_SUBSEQ_FULLY_PARALYZED); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_FULLY_PARALYZED); battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; battleCtx->commandNext = BATTLE_CONTROL_UPDATE_MOVE_BUFFERS; @@ -2673,7 +2675,7 @@ static BOOL BattleController_CheckStatusDisruption(BattleSystem *battleSys, Batt ); if (BattleSystem_RandNext(battleSys) & 1) { - LOAD_SUBSEQ(BATTLE_SUBSEQ_INFATUATED); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_INFATUATED); battleCtx->commandNext = battleCtx->command; battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; @@ -2681,7 +2683,7 @@ static BOOL BattleController_CheckStatusDisruption(BattleSystem *battleSys, Batt } else { battleCtx->moveFailFlags[battleCtx->attacker].infatuated = TRUE; - LOAD_SUBSEQ(BATTLE_SUBSEQ_IMMOBILIZED_BY_LOVE); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_IMMOBILIZED_BY_LOVE); battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; battleCtx->commandNext = BATTLE_CONTROL_UPDATE_MOVE_BUFFERS; @@ -2708,7 +2710,7 @@ static BOOL BattleController_CheckStatusDisruption(BattleSystem *battleSys, Batt battleCtx->defender = BattleSystem_RandomOpponent(battleSys, battleCtx, battleCtx->attacker); if (DEFENDING_MON.curHP == 0) { - LOAD_SUBSEQ(BATTLE_SUBSEQ_BIDE_NO_TARGET); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_BIDE_NO_TARGET); battleCtx->commandNext = BATTLE_CONTROL_UPDATE_MOVE_BUFFERS; battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; @@ -2718,7 +2720,7 @@ static BOOL BattleController_CheckStatusDisruption(BattleSystem *battleSys, Batt } } - LOAD_SUBSEQ(BATTLE_SUBSEQ_BIDE_END); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_BIDE_END); battleCtx->commandNext = battleCtx->command; battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; @@ -2729,7 +2731,7 @@ static BOOL BattleController_CheckStatusDisruption(BattleSystem *battleSys, Batt case CHECK_STATUS_STATE_SELF_THAW: if ((ATTACKING_MON.status & MON_CONDITION_FREEZE) && (moveEffect == BATTLE_EFFECT_THAW_AND_BURN_HIT || moveEffect == BATTLE_EFFECT_RECOIL_BURN_HIT)) { - LOAD_SUBSEQ(BATTLE_SUBSEQ_DEFROSTED_BY_MOVE); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_DEFROSTED_BY_MOVE); battleCtx->commandNext = battleCtx->command; battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; @@ -2790,7 +2792,7 @@ static BOOL BattleController_TriggerImmunityAbilities(BattleSystem *battleSys, B int nextSeq = BattleSystem_TriggerImmunityAbility(battleCtx, battleCtx->attacker, battleCtx->defender); if ((nextSeq && (battleCtx->moveStatusFlags & MOVE_STATUS_DID_NOT_HIT) == FALSE) - || nextSeq == BATTLE_SUBSEQ_BLOCKED_BY_SOUNDPROOF) { + || nextSeq == BATTLE_SUBSCRIPT_BLOCKED_BY_SOUNDPROOF) { LOAD_SUBSEQ(nextSeq); battleCtx->commandNext = battleCtx->command; battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; @@ -2823,7 +2825,7 @@ static BOOL BattleController_TriggerImmunityAbilities(BattleSystem *battleSys, B */ static BOOL BattleController_LoadQuickClawCheck(BattleSystem *battleSys, BattleContext *battleCtx) { - LOAD_SUBSEQ(BATTLE_SUBSEQ_CHECK_QUICK_CLAW); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_CHECK_QUICK_CLAW); battleCtx->commandNext = battleCtx->command; battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; @@ -3077,7 +3079,7 @@ static BOOL BattleController_MoveStolen(BattleSystem *battleSys, BattleContext * battleCtx->battleStatusMask |= SYSCTL_REUSE_LAST_MOVE; - LOAD_SUBSEQ(BATTLE_SUBSEQ_MAGIC_COAT); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_MAGIC_COAT); battleCtx->commandNext = battleCtx->command; battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; @@ -3101,7 +3103,7 @@ static BOOL BattleController_MoveStolen(BattleSystem *battleSys, BattleContext * battleCtx->battleStatusMask |= SYSCTL_REUSE_LAST_MOVE; } - LOAD_SUBSEQ(BATTLE_SUBSEQ_SNATCH); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_SNATCH); battleCtx->commandNext = battleCtx->command; battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; @@ -3315,7 +3317,7 @@ static void BattleController_CheckMoveFailure(BattleSystem *battleSys, BattleCon if (battleCtx->moveStatusFlags & MOVE_STATUS_NO_MORE_WORK) { battleCtx->command = BATTLE_CONTROL_LOOP_SPREAD_MOVES; } else if (battleCtx->moveStatusFlags & MOVE_STATUS_NO_PP) { - LOAD_SUBSEQ(BATTLE_SUBSEQ_NO_PP); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_NO_PP); battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; battleCtx->commandNext = BATTLE_CONTROL_UPDATE_MOVE_BUFFERS; } else if (battleCtx->multiHitLoop && (battleCtx->moveStatusFlags & MOVE_STATUS_MISSED)) { @@ -3324,7 +3326,7 @@ static void BattleController_CheckMoveFailure(BattleSystem *battleSys, BattleCon battleCtx->moveStatusFlags |= MOVE_STATUS_MULTI_HIT_DISRUPTED; battleCtx->command = BATTLE_CONTROL_AFTER_MOVE_MESSAGE; } else if (battleCtx->moveStatusFlags & MOVE_STATUS_DID_NOT_HIT) { - LOAD_SUBSEQ(BATTLE_SUBSEQ_MISSED); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_MISSED); battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; battleCtx->commandNext = BATTLE_CONTROL_LOOP_FAINTED; // crash damage can kill } else { @@ -3334,7 +3336,7 @@ static void BattleController_CheckMoveFailure(BattleSystem *battleSys, BattleCon static void BattleController_UseMove(BattleSystem *battleSys, BattleContext *battleCtx) { - LOAD_SUBSEQ(BATTLE_SUBSEQ_USE_MOVE); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_USE_MOVE); battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; battleCtx->commandNext = BATTLE_CONTROL_UPDATE_HP; } @@ -3372,7 +3374,7 @@ static void BattleController_UpdateHP(BattleSystem *battleSys, BattleContext *ba DEFENDER_SELF_TURN_FLAGS.statusFlags |= SELF_TURN_FLAG_SUBSTITUTE_HIT; battleCtx->msgBattlerTemp = battleCtx->defender; - LOAD_SUBSEQ(BATTLE_SUBSEQ_HIT_SUBSTITUTE); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_HIT_SUBSTITUTE); battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; battleCtx->commandNext = BATTLE_CONTROL_AFTER_MOVE_MESSAGE; @@ -3436,7 +3438,7 @@ static void BattleController_UpdateHP(BattleSystem *battleSys, BattleContext *ba battleCtx->msgBattlerTemp = battleCtx->defender; battleCtx->hpCalcTemp = battleCtx->damage; - LOAD_SUBSEQ(BATTLE_SUBSEQ_UPDATE_HP); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_UPDATE_HP); battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; battleCtx->commandNext = BATTLE_CONTROL_AFTER_MOVE_MESSAGE; battleCtx->battleStatusMask |= SYSCTL_MOVE_HIT; @@ -3445,11 +3447,6 @@ static void BattleController_UpdateHP(BattleSystem *battleSys, BattleContext *ba } } -enum { - AFTER_MOVE_MESSAGE_ONE_HIT = 0, - AFTER_MOVE_MESSAGE_MULTI_HIT -}; - enum { AFTER_MOVE_MESSAGE_START = 0, @@ -3504,7 +3501,7 @@ static void BattleController_AfterMoveMessage(BattleSystem *battleSys, BattleCon battleCtx->afterMoveMessageState++; // Shaymin changes forms from Sky to Land whenever it is Frozen. - LOAD_SUBSEQ(BATTLE_SUBSEQ_CHECK_SHAYMIN_FORM); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_CHECK_SHAYMIN_FORM); battleCtx->commandNext = battleCtx->command; battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; @@ -3564,7 +3561,7 @@ static void BattleController_AfterMoveMessage(BattleSystem *battleSys, BattleCon battleCtx->afterMoveMessageState++; // Shaymin changes forms from Sky to Land whenever it is Frozen. - LOAD_SUBSEQ(BATTLE_SUBSEQ_CHECK_SHAYMIN_FORM); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_CHECK_SHAYMIN_FORM); battleCtx->commandNext = battleCtx->command; battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; @@ -3651,7 +3648,7 @@ static void BattleController_AfterMoveEffects(BattleSystem *battleSys, BattleCon && (battleCtx->battleMons[battleCtx->afterMoveEffectTemp].moveEffectsTemp & MOVE_EFFECT_SEMI_INVULNERABLE)) { battleCtx->battleMons[battleCtx->afterMoveEffectTemp].moveEffectsTemp &= ~MOVE_EFFECT_SEMI_INVULNERABLE; - LOAD_SUBSEQ(BATTLE_SUBSEQ_VANISH_OFF); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_VANISH_OFF); battleCtx->msgBattlerTemp = battleCtx->afterMoveEffectTemp; battleCtx->commandNext = battleCtx->command; battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; @@ -3726,7 +3723,7 @@ static void BattleController_AfterMoveEffects(BattleSystem *battleSys, BattleCon && moveType == TYPE_FIRE) { battleCtx->msgBattlerTemp = battleCtx->defender; - LOAD_SUBSEQ(BATTLE_SUBSEQ_THAW_OUT); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_THAW_OUT); battleCtx->commandNext = battleCtx->command; battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; @@ -3799,7 +3796,7 @@ static void BattleController_LoopMultiHit(BattleSystem *battleSys, BattleContext } else { battleCtx->msgTemp = battleCtx->multiHitNumHits; - LOAD_SUBSEQ(BATTLE_SUBSEQ_HIT_X_TIMES); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_HIT_X_TIMES); battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; battleCtx->commandNext = BATTLE_CONTROL_LOOP_FAINTED; } @@ -3812,7 +3809,7 @@ static void BattleController_LoopMultiHit(BattleSystem *battleSys, BattleContext battleCtx->msgTemp = battleCtx->multiHitNumHits - battleCtx->multiHitCounter; } - LOAD_SUBSEQ(BATTLE_SUBSEQ_HIT_X_TIMES); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_HIT_X_TIMES); battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; battleCtx->commandNext = BATTLE_CONTROL_LOOP_FAINTED; } @@ -3898,7 +3895,7 @@ static void BattleController_FaintAfterSelfdestruct(BattleSystem *battleSys, Bat battleCtx->faintedMon = LowestBit((battleCtx->battleStatusMask & SYSCTL_MON_SELFDESTRUCTED) >> SYSCTL_MON_SELFDESTRUCTED_SHIFT); battleCtx->battleStatusMask &= ~SYSCTL_MON_SELFDESTRUCTED; - LOAD_SUBSEQ(BATTLE_SUBSEQ_AFTER_SELFDESTRUCT); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_AFTER_SELFDESTRUCT); battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; battleCtx->commandNext = BATTLE_CONTROL_TRIGGER_AFTER_HIT_EFFECTS; } else { @@ -4020,11 +4017,11 @@ static void BattleController_HandleResult(BattleSystem *battleSys, BattleContext battleCtx->command = BATTLE_CONTROL_FIGHT_END; } else if (BattleSystem_ResultMask(battleSys) == BATTLE_RESULT_LOSE || BattleSystem_ResultMask(battleSys) == BATTLE_RESULT_DRAW) { - LOAD_SUBSEQ(BATTLE_SUBSEQ_BATTLE_LOST); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_BATTLE_LOST); battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; battleCtx->commandNext = BATTLE_CONTROL_FIGHT_END; } else if (BattleSystem_ResultMask(battleSys) == BATTLE_RESULT_WIN) { - LOAD_SUBSEQ(BATTLE_SUBSEQ_BATTLE_WON); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_BATTLE_WON); battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; battleCtx->commandNext = BATTLE_CONTROL_FIGHT_END; } else if (BattleSystem_ResultMask(battleSys) == BATTLE_RESULT_CAPTURED_MON) { @@ -4161,9 +4158,9 @@ static BOOL BattleController_ReplaceFainted(BattleSystem *battleSys, BattleConte battleCtx->scriptTemp = TRUE; } - LOAD_SUBSEQ(BATTLE_SUBSEQ_REPLACE_FAINTED); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_REPLACE_FAINTED); } else { - LOAD_SUBSEQ(BATTLE_SUBSEQ_SHOW_PARTY_LIST); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_SHOW_PARTY_LIST); } result = TRUE; @@ -4427,9 +4424,9 @@ static BOOL BattleController_AnyFainted(BattleContext *battleCtx, int nextCmd, i battleCtx->faintedMon = LowestBit(battlerBit >> SYSCTL_MON_FAINTED_SHIFT); if (onlyFaint == TRUE) { - LOAD_SUBSEQ(BATTLE_SUBSEQ_FAINT_MON); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_FAINT_MON); } else { - LOAD_SUBSEQ(BATTLE_SUBSEQ_FAINT_CHECK_DESTINY_BOND); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_FAINT_CHECK_DESTINY_BOND); } battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; @@ -4463,7 +4460,7 @@ static BOOL BattleController_AnyExpPayout(BattleContext *battleCtx, int nextCmd, battleCtx->battleStatusMask2 &= (battler ^ 0xFFFFFFFF); battleCtx->faintedMon = LowestBit(battler >> SYSCTL_PAYOUT_EXP_SHIFT); - LOAD_SUBSEQ(BATTLE_SUBSEQ_GRANT_EXP); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_GRANT_EXP); battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; battleCtx->commandNext = nextCmd; @@ -4552,7 +4549,7 @@ static void BattleController_UpdateFlagsWhenHit(BattleSystem *battleSys, BattleC */ static BOOL BattleController_CriticalMessage(BattleSystem *battleSys, BattleContext *battleCtx) { - LOAD_SUBSEQ(BATTLE_SUBSEQ_CRITICAL_HIT); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_CRITICAL_HIT); battleCtx->commandNext = battleCtx->command; battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; @@ -4586,7 +4583,7 @@ static BOOL BattleController_FollowupMessage(BattleSystem *battleSys, BattleCont } if (result == TRUE) { - LOAD_SUBSEQ(BATTLE_SUBSEQ_MOVE_FOLLOWUP_MESSAGE); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_MOVE_FOLLOWUP_MESSAGE); battleCtx->commandNext = battleCtx->command; battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; } @@ -4616,7 +4613,7 @@ static BOOL BattleController_RageBuilding(BattleSystem *battleSys, BattleContext && DEFENDING_MON.statBoosts[BATTLE_STAT_ATTACK] < 12) { DEFENDING_MON.statBoosts[BATTLE_STAT_ATTACK]++; - LOAD_SUBSEQ(BATTLE_SUBSEQ_RAGE_IS_BUILDING); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_RAGE_IS_BUILDING); battleCtx->commandNext = battleCtx->command; battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; result = TRUE; @@ -4649,7 +4646,7 @@ static BOOL BattleController_CheckExtraFlinch(BattleSystem *battleSys, BattleCon battleCtx->sideEffectMon = battleCtx->defender; battleCtx->sideEffectType = SIDE_EFFECT_TYPE_INDIRECT; - LOAD_SUBSEQ(BATTLE_SUBSEQ_FLINCH_MON); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_FLINCH_MON); battleCtx->commandNext = battleCtx->command; battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; @@ -4675,7 +4672,7 @@ static BOOL BattleController_ToggleSemiInvulnMons(BattleSystem *battleSys, Battl && (battleCtx->battleMons[battleCtx->vanishedCheckTemp].moveEffectsTemp & MOVE_EFFECT_SEMI_INVULNERABLE)) { battleCtx->battleMons[battleCtx->vanishedCheckTemp].moveEffectsTemp &= ~MOVE_EFFECT_SEMI_INVULNERABLE; - LOAD_SUBSEQ(BATTLE_SUBSEQ_VANISH_OFF); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_VANISH_OFF); battleCtx->msgBattlerTemp = battleCtx->vanishedCheckTemp; battleCtx->commandNext = battleCtx->command; battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; @@ -4751,7 +4748,7 @@ static BOOL BattleController_TriggerAfterMoveHitEffects(BattleSystem *battleSys, battleCtx->hpCalcTemp = BattleSystem_Divide(ATTACKER_SELF_TURN_FLAGS.shellBellDamageDealt * -1, itemPower); battleCtx->msgBattlerTemp = battleCtx->attacker; - LOAD_SUBSEQ(BATTLE_SUBSEQ_RESTORE_A_LITTLE_HP); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_RESTORE_A_LITTLE_HP); battleCtx->commandNext = battleCtx->command; battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; @@ -4771,7 +4768,7 @@ static BOOL BattleController_TriggerAfterMoveHitEffects(BattleSystem *battleSys, battleCtx->hpCalcTemp = BattleSystem_Divide(battleCtx->battleMons[battleCtx->attacker].maxHP * -1, 10); battleCtx->msgBattlerTemp = battleCtx->attacker; - LOAD_SUBSEQ(BATTLE_SUBSEQ_LOSE_HP_FROM_ITEM); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_LOSE_HP_FROM_ITEM); battleCtx->commandNext = battleCtx->command; battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; diff --git a/src/overlay016/battle_lib.c b/src/overlay016/battle_lib.c index cc97fdbffc..e097329119 100644 --- a/src/overlay016/battle_lib.c +++ b/src/overlay016/battle_lib.c @@ -2,6 +2,7 @@ #include #include "consts/generated/c/abilities.h" +#include "consts/generated/c/battle_subscripts.h" #include "consts/generated/c/gender.h" #include "constants/battle.h" @@ -12,7 +13,6 @@ #include "constants/species.h" #include "constants/string.h" #include "constants/trainer.h" -#include "constants/narc_files/battle_skill_subseq.h" #include "struct_decls/struct_party_decl.h" #include "struct_decls/battle_system.h" @@ -1801,7 +1801,7 @@ BOOL BattleSystem_TriggerRedirectionAbilities(BattleSystem *battleSys, BattleCon if ((battleCtx->moveStatusFlags & MOVE_STATUS_NO_EFFECTS) == FALSE && DEFENDER_SELF_TURN_FLAGS.lightningRodActivated) { battleCtx->selfTurnFlags[battleCtx->defender].lightningRodActivated = FALSE; - LOAD_SUBSEQ(BATTLE_SUBSEQ_LIGHTNING_ROD_REDIRECTED); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_LIGHTNING_ROD_REDIRECTED); battleCtx->commandNext = battleCtx->command; battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; @@ -1811,7 +1811,7 @@ BOOL BattleSystem_TriggerRedirectionAbilities(BattleSystem *battleSys, BattleCon if ((battleCtx->moveStatusFlags & MOVE_STATUS_NO_EFFECTS) == FALSE && DEFENDER_SELF_TURN_FLAGS.stormDrainActivated) { battleCtx->selfTurnFlags[battleCtx->defender].stormDrainActivated = FALSE; - LOAD_SUBSEQ(BATTLE_SUBSEQ_LIGHTNING_ROD_REDIRECTED); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_LIGHTNING_ROD_REDIRECTED); battleCtx->commandNext = battleCtx->command; battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; @@ -3510,7 +3510,7 @@ int BattleSystem_TriggerImmunityAbility(BattleContext *battleCtx, int attacker, && moveType == TYPE_ELECTRIC && attacker != defender) { battleCtx->hpCalcTemp = BattleSystem_Divide(battleCtx->battleMons[defender].maxHP, 4); - subscript = BATTLE_SUBSEQ_ABILITY_RESTORES_HP; + subscript = BATTLE_SUBSCRIPT_ABILITY_RESTORES_HP; } if (Battler_IgnorableAbility(battleCtx, attacker, defender, ABILITY_WATER_ABSORB) == TRUE @@ -3518,7 +3518,7 @@ int BattleSystem_TriggerImmunityAbility(BattleContext *battleCtx, int attacker, && (battleCtx->battleStatusMask & SYSCTL_FIRST_OF_MULTI_TURN) == FALSE // do not proc on first turn of Dive && CURRENT_MOVE_DATA.power) { battleCtx->hpCalcTemp = BattleSystem_Divide(battleCtx->battleMons[defender].maxHP, 4); - subscript = BATTLE_SUBSEQ_ABILITY_RESTORES_HP; + subscript = BATTLE_SUBSCRIPT_ABILITY_RESTORES_HP; } if (Battler_IgnorableAbility(battleCtx, attacker, defender, ABILITY_FLASH_FIRE) == TRUE @@ -3526,13 +3526,13 @@ int BattleSystem_TriggerImmunityAbility(BattleContext *battleCtx, int attacker, && (battleCtx->battleMons[defender].status & MON_CONDITION_FREEZE) == FALSE && (battleCtx->battleStatusMask & SYSCTL_FIRST_OF_MULTI_TURN) == FALSE && (CURRENT_MOVE_DATA.power || battleCtx->moveCur == MOVE_WILL_O_WISP)) { - subscript = BATTLE_SUBSEQ_ABSORB_AND_BOOST_FIRE_TYPE_MOVES; + subscript = BATTLE_SUBSCRIPT_ABSORB_AND_BOOST_FIRE_TYPE_MOVES; } if (Battler_IgnorableAbility(battleCtx, attacker, defender, ABILITY_SOUNDPROOF) == TRUE) { for (int i = 0; i < NELEMS(sSoundMoves); i++) { if (sSoundMoves[i] == battleCtx->moveCur) { - subscript = BATTLE_SUBSEQ_BLOCKED_BY_SOUNDPROOF; + subscript = BATTLE_SUBSCRIPT_BLOCKED_BY_SOUNDPROOF; break; } } @@ -3541,7 +3541,7 @@ int BattleSystem_TriggerImmunityAbility(BattleContext *battleCtx, int attacker, if (Battler_IgnorableAbility(battleCtx, attacker, defender, ABILITY_MOTOR_DRIVE) == TRUE && moveType == TYPE_ELECTRIC && attacker != defender) { - subscript = BATTLE_SUBSEQ_ABSORB_AND_SPEED_UP_1_STAGE; + subscript = BATTLE_SUBSCRIPT_ABSORB_AND_SPEED_UP_1_STAGE; } if (Battler_IgnorableAbility(battleCtx, attacker, defender, ABILITY_DRY_SKIN) == TRUE @@ -3549,7 +3549,7 @@ int BattleSystem_TriggerImmunityAbility(BattleContext *battleCtx, int attacker, && (battleCtx->battleStatusMask & SYSCTL_FIRST_OF_MULTI_TURN) == FALSE && CURRENT_MOVE_DATA.power) { battleCtx->hpCalcTemp = BattleSystem_Divide(battleCtx->battleMons[defender].maxHP, 4); - subscript = BATTLE_SUBSEQ_ABILITY_RESTORES_HP; + subscript = BATTLE_SUBSCRIPT_ABILITY_RESTORES_HP; } return subscript; @@ -3568,7 +3568,7 @@ BOOL BattleSystem_TriggerTurnEndAbility(BattleSystem *battleSys, BattleContext * battleCtx->sideEffectParam = MOVE_SUBSCRIPT_PTR_SPEED_UP_1_STAGE; battleCtx->sideEffectType = SIDE_EFFECT_TYPE_ABILITY; battleCtx->sideEffectMon = battler; - subscript = BATTLE_SUBSEQ_UPDATE_STAT_STAGE; + subscript = BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE; result = TRUE; } break; @@ -3590,7 +3590,7 @@ BOOL BattleSystem_TriggerTurnEndAbility(BattleSystem *battleSys, BattleContext * } battleCtx->msgBattlerTemp = battler; - subscript = BATTLE_SUBSEQ_ABILITY_RESTORE_STATUS; + subscript = BATTLE_SUBSCRIPT_ABILITY_RESTORE_STATUS; result = TRUE; } break; @@ -3676,35 +3676,35 @@ int BattleSystem_TriggerEffectOnSwitch(BattleSystem *battleSys, BattleContext *b case OVERWORLD_WEATHER_RAINING: case OVERWORLD_WEATHER_HEAVY_RAIN: case OVERWORLD_WEATHER_THUNDERSTORM: - subscript = BATTLE_SUBSEQ_OVERWORLD_RAIN; + subscript = BATTLE_SUBSCRIPT_OVERWORLD_RAIN; result = SWITCH_IN_CHECK_RESULT_BREAK; break; case OVERWORLD_WEATHER_SNOWING: case OVERWORLD_WEATHER_HEAVY_SNOW: case OVERWORLD_WEATHER_BLIZZARD: - subscript = BATTLE_SUBSEQ_OVERWORLD_HAIL; + subscript = BATTLE_SUBSCRIPT_OVERWORLD_HAIL; result = SWITCH_IN_CHECK_RESULT_BREAK; break; case OVERWORLD_WEATHER_SANDSTORM: - subscript = BATTLE_SUBSEQ_OVERWORLD_SAND; + subscript = BATTLE_SUBSCRIPT_OVERWORLD_SAND; result = SWITCH_IN_CHECK_RESULT_BREAK; break; case OVERWORLD_WEATHER_FOG: case OVERWORLD_WEATHER_DEEP_FOG: - subscript = BATTLE_SUBSEQ_OVERWORLD_FOG; + subscript = BATTLE_SUBSCRIPT_OVERWORLD_FOG; result = SWITCH_IN_CHECK_RESULT_BREAK; break; case OVERWORLD_WEATHER_HARSH_SUN: - subscript = BATTLE_SUBSEQ_OVERWORLD_SUN; + subscript = BATTLE_SUBSCRIPT_OVERWORLD_SUN; result = SWITCH_IN_CHECK_RESULT_BREAK; break; case OVERWORLD_WEATHER_TRICK_ROOM: - subscript = BATTLE_SUBSEQ_OVERWORLD_TRICK_ROOM; + subscript = BATTLE_SUBSCRIPT_OVERWORLD_TRICK_ROOM; result = SWITCH_IN_CHECK_RESULT_BREAK; break; @@ -3736,7 +3736,7 @@ int BattleSystem_TriggerEffectOnSwitch(BattleSystem *battleSys, BattleContext *b && Battler_Ability(battleCtx, battler) == ABILITY_TRACE) { battleCtx->battleMons[battler].traceAnnounced = TRUE; battleCtx->msgBattlerTemp = battler; - subscript = BATTLE_SUBSEQ_TRACE; + subscript = BATTLE_SUBSCRIPT_TRACE; result = SWITCH_IN_CHECK_RESULT_BREAK; break; } @@ -3758,7 +3758,7 @@ int BattleSystem_TriggerEffectOnSwitch(BattleSystem *battleSys, BattleContext *b battleCtx->battleMons[battler].weatherAbilityAnnounced = TRUE; if ((battleCtx->fieldConditionsMask & FIELD_CONDITION_RAINING_PERM) == FALSE) { - subscript = BATTLE_SUBSEQ_DRIZZLE; + subscript = BATTLE_SUBSCRIPT_DRIZZLE; result = SWITCH_IN_CHECK_RESULT_BREAK; } break; @@ -3767,7 +3767,7 @@ int BattleSystem_TriggerEffectOnSwitch(BattleSystem *battleSys, BattleContext *b battleCtx->battleMons[battler].weatherAbilityAnnounced = TRUE; if ((battleCtx->fieldConditionsMask & FIELD_CONDITION_SANDSTORM_PERM) == FALSE) { - subscript = BATTLE_SUBSEQ_SAND_STREAM; + subscript = BATTLE_SUBSCRIPT_SAND_STREAM; result = SWITCH_IN_CHECK_RESULT_BREAK; } break; @@ -3776,7 +3776,7 @@ int BattleSystem_TriggerEffectOnSwitch(BattleSystem *battleSys, BattleContext *b battleCtx->battleMons[battler].weatherAbilityAnnounced = TRUE; if ((battleCtx->fieldConditionsMask & FIELD_CONDITION_SUNNY_PERM) == FALSE) { - subscript = BATTLE_SUBSEQ_DROUGHT; + subscript = BATTLE_SUBSCRIPT_DROUGHT; result = SWITCH_IN_CHECK_RESULT_BREAK; } break; @@ -3785,7 +3785,7 @@ int BattleSystem_TriggerEffectOnSwitch(BattleSystem *battleSys, BattleContext *b battleCtx->battleMons[battler].weatherAbilityAnnounced = TRUE; if ((battleCtx->fieldConditionsMask & FIELD_CONDITION_HAILING_PERM) == FALSE) { - subscript = BATTLE_SUBSEQ_SNOW_WARNING; + subscript = BATTLE_SUBSCRIPT_SNOW_WARNING; result = SWITCH_IN_CHECK_RESULT_BREAK; } break; @@ -3812,7 +3812,7 @@ int BattleSystem_TriggerEffectOnSwitch(BattleSystem *battleSys, BattleContext *b && Battler_Ability(battleCtx, battler) == ABILITY_INTIMIDATE) { battleCtx->battleMons[battler].intimidateAnnounced = TRUE; battleCtx->msgBattlerTemp = battler; - subscript = BATTLE_SUBSEQ_INTIMIDATE; + subscript = BATTLE_SUBSCRIPT_INTIMIDATE; result = TRUE; break; } @@ -3857,7 +3857,7 @@ int BattleSystem_TriggerEffectOnSwitch(BattleSystem *battleSys, BattleContext *b battleCtx->sideEffectType = SIDE_EFFECT_TYPE_ABILITY; battleCtx->sideEffectMon = battler; - subscript = BATTLE_SUBSEQ_UPDATE_STAT_STAGE; + subscript = BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE; result = SWITCH_IN_CHECK_RESULT_BREAK; break; } @@ -3910,7 +3910,7 @@ int BattleSystem_TriggerEffectOnSwitch(BattleSystem *battleSys, BattleContext *b if (result == SWITCH_IN_CHECK_RESULT_BREAK) { battleCtx->msgBattlerTemp = battler; - subscript = BATTLE_SUBSEQ_ANTICIPATION; + subscript = BATTLE_SUBSCRIPT_ANTICIPATION; } break; } @@ -3982,7 +3982,7 @@ int BattleSystem_TriggerEffectOnSwitch(BattleSystem *battleSys, BattleContext *b if (maxPower) { battleCtx->msgBattlerTemp = battler; - subscript = BATTLE_SUBSEQ_FOREWARN; + subscript = BATTLE_SUBSCRIPT_FOREWARN; result = SWITCH_IN_CHECK_RESULT_BREAK; } else if (sumEnemyHP) { j = BattleSystem_RandomOpponent(battleSys, battleCtx, battler); @@ -3991,7 +3991,7 @@ int BattleSystem_TriggerEffectOnSwitch(BattleSystem *battleSys, BattleContext *b battleCtx->msgMoveTemp = battleCtx->battleMons[j].moves[BattleSystem_RandNext(battleSys) % k]; battleCtx->msgBattlerTemp = battler; - subscript = BATTLE_SUBSEQ_FOREWARN; + subscript = BATTLE_SUBSCRIPT_FOREWARN; result = SWITCH_IN_CHECK_RESULT_BREAK; } break; @@ -4041,7 +4041,7 @@ int BattleSystem_TriggerEffectOnSwitch(BattleSystem *battleSys, BattleContext *b if (result == SWITCH_IN_CHECK_RESULT_BREAK) { battleCtx->msgBattlerTemp = battler; - subscript = BATTLE_SUBSEQ_FRISK; + subscript = BATTLE_SUBSCRIPT_FRISK; break; } } @@ -4061,7 +4061,7 @@ int BattleSystem_TriggerEffectOnSwitch(BattleSystem *battleSys, BattleContext *b && battleCtx->totalTurns <= battleCtx->battleMons[battler].moveEffectsData.slowStartTurnNumber) { battleCtx->battleMons[battler].slowStartAnnounced = TRUE; battleCtx->msgBattlerTemp = battler; - subscript = BATTLE_SUBSEQ_SLOW_START; + subscript = BATTLE_SUBSCRIPT_SLOW_START; result = SWITCH_IN_CHECK_RESULT_BREAK; break; } @@ -4069,7 +4069,7 @@ int BattleSystem_TriggerEffectOnSwitch(BattleSystem *battleSys, BattleContext *b if ((battleCtx->battleMons[battler].slowStartFinished == 0) && (battleCtx->battleMons[battler].curHP) && (Battler_Ability(battleCtx, battler) == 112) && ((battleCtx->totalTurns - battleCtx->battleMons[battler].moveEffectsData.slowStartTurnNumber) == 5)) { battleCtx->battleMons[battler].slowStartFinished = 1; battleCtx->msgBattlerTemp = battler; - subscript = BATTLE_SUBSEQ_SLOW_START_END; + subscript = BATTLE_SUBSCRIPT_SLOW_START_END; result = SWITCH_IN_CHECK_RESULT_BREAK; break; } @@ -4089,7 +4089,7 @@ int BattleSystem_TriggerEffectOnSwitch(BattleSystem *battleSys, BattleContext *b && Battler_Ability(battleCtx, battler) == ABILITY_MOLD_BREAKER) { battleCtx->battleMons[battler].moldBreakerAnnounced = TRUE; battleCtx->msgBattlerTemp = battler; - subscript = BATTLE_SUBSEQ_MOLD_BREAKER; + subscript = BATTLE_SUBSCRIPT_MOLD_BREAKER; result = SWITCH_IN_CHECK_RESULT_BREAK; break; } @@ -4109,7 +4109,7 @@ int BattleSystem_TriggerEffectOnSwitch(BattleSystem *battleSys, BattleContext *b && Battler_Ability(battleCtx, battler) == ABILITY_PRESSURE) { battleCtx->battleMons[battler].pressureAnnounced = TRUE; battleCtx->msgBattlerTemp = battler; - subscript = BATTLE_SUBSEQ_PRESSURE; + subscript = BATTLE_SUBSCRIPT_PRESSURE; result = SWITCH_IN_CHECK_RESULT_BREAK; break; } @@ -4145,7 +4145,7 @@ int BattleSystem_TriggerEffectOnSwitch(BattleSystem *battleSys, BattleContext *b battler = battleCtx->monSpeedOrder[i]; if (BattleSystem_RecoverStatusByAbility(battleSys, battleCtx, battler, TRUE) == TRUE) { - subscript = BATTLE_SUBSEQ_ABILITY_FORBIDS_STATUS; + subscript = BATTLE_SUBSCRIPT_ABILITY_FORBIDS_STATUS; result = SWITCH_IN_CHECK_RESULT_BREAK; break; } @@ -4232,7 +4232,7 @@ BOOL BattleSystem_TriggerAbilityOnHit(BattleSystem *battleSys, BattleContext *ba battleCtx->sideEffectMon = battleCtx->attacker; battleCtx->msgBattlerTemp = battleCtx->defender; - *subscript = BATTLE_SUBSEQ_PARALYZE; + *subscript = BATTLE_SUBSCRIPT_PARALYZE; result = TRUE; } break; @@ -4256,7 +4256,7 @@ BOOL BattleSystem_TriggerAbilityOnHit(BattleSystem *battleSys, BattleContext *ba && CURRENT_MOVE_DATA.power && BattleMon_Get(battleCtx, battleCtx->defender, 27, NULL) != moveType && BattleMon_Get(battleCtx, battleCtx->defender, 28, NULL) != moveType) { - *subscript = BATTLE_SUBSEQ_COLOR_CHANGE; + *subscript = BATTLE_SUBSCRIPT_COLOR_CHANGE; battleCtx->msgTemp = moveType; result = TRUE; } @@ -4273,7 +4273,7 @@ BOOL BattleSystem_TriggerAbilityOnHit(BattleSystem *battleSys, BattleContext *ba battleCtx->hpCalcTemp = BattleSystem_Divide(ATTACKING_MON.maxHP * -1, 8); battleCtx->msgBattlerTemp = battleCtx->attacker; - *subscript = BATTLE_SUBSEQ_ROUGH_SKIN; + *subscript = BATTLE_SUBSCRIPT_ROUGH_SKIN; result = TRUE; } break; @@ -4290,13 +4290,13 @@ BOOL BattleSystem_TriggerAbilityOnHit(BattleSystem *battleSys, BattleContext *ba switch (BattleSystem_RandNext(battleSys) % 3) { case 0: default: - *subscript = BATTLE_SUBSEQ_POISON; + *subscript = BATTLE_SUBSCRIPT_POISON; break; case 1: - *subscript = BATTLE_SUBSEQ_PARALYZE; + *subscript = BATTLE_SUBSCRIPT_PARALYZE; break; case 2: - *subscript = BATTLE_SUBSEQ_FALL_ASLEEP; + *subscript = BATTLE_SUBSCRIPT_FALL_ASLEEP; break; } @@ -4321,7 +4321,7 @@ BOOL BattleSystem_TriggerAbilityOnHit(BattleSystem *battleSys, BattleContext *ba battleCtx->sideEffectMon = battleCtx->attacker; battleCtx->msgBattlerTemp = battleCtx->defender; - *subscript = BATTLE_SUBSEQ_POISON; + *subscript = BATTLE_SUBSCRIPT_POISON; result = TRUE; } break; @@ -4339,7 +4339,7 @@ BOOL BattleSystem_TriggerAbilityOnHit(BattleSystem *battleSys, BattleContext *ba battleCtx->sideEffectMon = battleCtx->attacker; battleCtx->msgBattlerTemp = battleCtx->defender; - *subscript = BATTLE_SUBSEQ_BURN; + *subscript = BATTLE_SUBSCRIPT_BURN; result = TRUE; } break; @@ -4358,7 +4358,7 @@ BOOL BattleSystem_TriggerAbilityOnHit(BattleSystem *battleSys, BattleContext *ba battleCtx->sideEffectMon = battleCtx->attacker; battleCtx->msgBattlerTemp = battleCtx->defender; - *subscript = BATTLE_SUBSEQ_INFATUATE; + *subscript = BATTLE_SUBSCRIPT_INFATUATE; result = TRUE; } break; @@ -4374,7 +4374,7 @@ BOOL BattleSystem_TriggerAbilityOnHit(BattleSystem *battleSys, BattleContext *ba battleCtx->hpCalcTemp = BattleSystem_Divide(ATTACKING_MON.maxHP * -1, 4); battleCtx->msgBattlerTemp = battleCtx->attacker; - *subscript = BATTLE_SUBSEQ_AFTERMATH; + *subscript = BATTLE_SUBSCRIPT_AFTERMATH; result = TRUE; } break; @@ -4450,7 +4450,7 @@ BOOL BattleSystem_RecoverStatusByAbility(BattleSystem *battleSys, BattleContext battleCtx->msgAbilityTemp = Battler_Ability(battleCtx, battler); if (skipLoad == FALSE) { - LOAD_SUBSEQ(BATTLE_SUBSEQ_ABILITY_FORBIDS_STATUS); + LOAD_SUBSEQ(BATTLE_SUBSCRIPT_ABILITY_FORBIDS_STATUS); battleCtx->commandNext = battleCtx->command; battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; } @@ -4523,11 +4523,11 @@ BOOL BattleSystem_SynchronizeStatus(BattleSystem *battleSys, BattleContext *batt if (result == TRUE) { if (battleCtx->battleMons[battleCtx->msgBattlerTemp].status & MON_CONDITION_ANY_POISON) { - nextSeq = BATTLE_SUBSEQ_POISON; + nextSeq = BATTLE_SUBSCRIPT_POISON; } else if (battleCtx->battleMons[battleCtx->msgBattlerTemp].status & MON_CONDITION_BURN) { - nextSeq = BATTLE_SUBSEQ_BURN; + nextSeq = BATTLE_SUBSCRIPT_BURN; } else if (battleCtx->battleMons[battleCtx->msgBattlerTemp].status & MON_CONDITION_PARALYSIS) { - nextSeq = BATTLE_SUBSEQ_PARALYZE; + nextSeq = BATTLE_SUBSCRIPT_PARALYZE; } if (nextSeq) { @@ -4568,7 +4568,7 @@ BOOL BattleSystem_SynchronizeStatus(BattleSystem *battleSys, BattleContext *batt } if (result == TRUE) { - nextSeq = BATTLE_SUBSEQ_INFATUATE; + nextSeq = BATTLE_SUBSCRIPT_INFATUATE; battleCtx->sideEffectType = SIDE_EFFECT_TYPE_HELD_ITEM; LOAD_SUBSEQ(nextSeq); @@ -4593,7 +4593,7 @@ BOOL BattleSystem_TriggerHeldItem(BattleSystem *battleSys, BattleContext *battle case HOLD_EFFECT_HP_RESTORE: if (battleCtx->battleMons[battler].curHP <= battleCtx->battleMons[battler].maxHP / 2) { battleCtx->hpCalcTemp = itemPower; - subscript = BATTLE_SUBSEQ_HELD_ITEM_HP_RESTORE; + subscript = BATTLE_SUBSCRIPT_HELD_ITEM_HP_RESTORE; result = TRUE; } break; @@ -4601,42 +4601,42 @@ BOOL BattleSystem_TriggerHeldItem(BattleSystem *battleSys, BattleContext *battle case HOLD_EFFECT_HP_PCT_RESTORE: if (battleCtx->battleMons[battler].curHP <= battleCtx->battleMons[battler].maxHP / 2) { battleCtx->hpCalcTemp = BattleSystem_Divide(battleCtx->battleMons[battler].maxHP * itemPower, 100); - subscript = BATTLE_SUBSEQ_HELD_ITEM_HP_RESTORE; + subscript = BATTLE_SUBSCRIPT_HELD_ITEM_HP_RESTORE; result = TRUE; } break; case HOLD_EFFECT_PRZ_RESTORE: if (battleCtx->battleMons[battler].status & MON_CONDITION_PARALYSIS) { - subscript = BATTLE_SUBSEQ_HELD_ITEM_PRZ_RESTORE; + subscript = BATTLE_SUBSCRIPT_HELD_ITEM_PRZ_RESTORE; result = TRUE; } break; case HOLD_EFFECT_SLP_RESTORE: if (battleCtx->battleMons[battler].status & MON_CONDITION_SLEEP) { - subscript = BATTLE_SUBSEQ_HELD_ITEM_SLP_RESTORE; + subscript = BATTLE_SUBSCRIPT_HELD_ITEM_SLP_RESTORE; result = TRUE; } break; case HOLD_EFFECT_PSN_RESTORE: if (battleCtx->battleMons[battler].status & MON_CONDITION_ANY_POISON) { - subscript = BATTLE_SUBSEQ_HELD_ITEM_PSN_RESTORE; + subscript = BATTLE_SUBSCRIPT_HELD_ITEM_PSN_RESTORE; result = TRUE; } break; case HOLD_EFFECT_BRN_RESTORE: if (battleCtx->battleMons[battler].status & MON_CONDITION_BURN) { - subscript = BATTLE_SUBSEQ_HELD_ITEM_BRN_RESTORE; + subscript = BATTLE_SUBSCRIPT_HELD_ITEM_BRN_RESTORE; result = TRUE; } break; case HOLD_EFFECT_FRZ_RESTORE: if (battleCtx->battleMons[battler].status & MON_CONDITION_FREEZE) { - subscript = BATTLE_SUBSEQ_HELD_ITEM_FRZ_RESTORE; + subscript = BATTLE_SUBSCRIPT_HELD_ITEM_FRZ_RESTORE; result = TRUE; } break; @@ -4653,7 +4653,7 @@ BOOL BattleSystem_TriggerHeldItem(BattleSystem *battleSys, BattleContext *battle BattleMon_AddVal(&battleCtx->battleMons[battler], BATTLEMON_CUR_PP_1 + i, itemPower); BattleMon_CopyToParty(battleSys, battleCtx, battler); battleCtx->msgMoveTemp = battleCtx->battleMons[battler].moves[i]; - subscript = BATTLE_SUBSEQ_HELD_ITEM_PP_RESTORE; + subscript = BATTLE_SUBSCRIPT_HELD_ITEM_PP_RESTORE; result = TRUE; } @@ -4662,7 +4662,7 @@ BOOL BattleSystem_TriggerHeldItem(BattleSystem *battleSys, BattleContext *battle case HOLD_EFFECT_CONFUSE_RESTORE: if (battleCtx->battleMons[battler].statusVolatile & VOLATILE_CONDITION_CONFUSION) { - subscript = BATTLE_SUBSEQ_HELD_ITEM_CNF_RESTORE; + subscript = BATTLE_SUBSCRIPT_HELD_ITEM_CNF_RESTORE; result = TRUE; } break; @@ -4671,32 +4671,32 @@ BOOL BattleSystem_TriggerHeldItem(BattleSystem *battleSys, BattleContext *battle if ((battleCtx->battleMons[battler].status & MON_CONDITION_ANY) || (battleCtx->battleMons[battler].statusVolatile & VOLATILE_CONDITION_CONFUSION)) { if (battleCtx->battleMons[battler].status & MON_CONDITION_PARALYSIS) { - subscript = BATTLE_SUBSEQ_HELD_ITEM_PRZ_RESTORE; + subscript = BATTLE_SUBSCRIPT_HELD_ITEM_PRZ_RESTORE; } if (battleCtx->battleMons[battler].status & MON_CONDITION_SLEEP) { - subscript = BATTLE_SUBSEQ_HELD_ITEM_SLP_RESTORE; + subscript = BATTLE_SUBSCRIPT_HELD_ITEM_SLP_RESTORE; } if (battleCtx->battleMons[battler].status & MON_CONDITION_ANY_POISON) { - subscript = BATTLE_SUBSEQ_HELD_ITEM_PSN_RESTORE; + subscript = BATTLE_SUBSCRIPT_HELD_ITEM_PSN_RESTORE; } if (battleCtx->battleMons[battler].status & MON_CONDITION_BURN) { - subscript = BATTLE_SUBSEQ_HELD_ITEM_BRN_RESTORE; + subscript = BATTLE_SUBSCRIPT_HELD_ITEM_BRN_RESTORE; } if (battleCtx->battleMons[battler].status & MON_CONDITION_FREEZE) { - subscript = BATTLE_SUBSEQ_HELD_ITEM_FRZ_RESTORE; + subscript = BATTLE_SUBSCRIPT_HELD_ITEM_FRZ_RESTORE; } if (battleCtx->battleMons[battler].statusVolatile & VOLATILE_CONDITION_CONFUSION) { - subscript = BATTLE_SUBSEQ_HELD_ITEM_CNF_RESTORE; + subscript = BATTLE_SUBSCRIPT_HELD_ITEM_CNF_RESTORE; } if ((battleCtx->battleMons[battler].status & MON_CONDITION_ANY) && (battleCtx->battleMons[battler].statusVolatile & VOLATILE_CONDITION_CONFUSION)) { - subscript = BATTLE_SUBSEQ_HELD_ITEM_MULTI_RESTORE; + subscript = BATTLE_SUBSCRIPT_HELD_ITEM_MULTI_RESTORE; } result = TRUE; @@ -4709,9 +4709,9 @@ BOOL BattleSystem_TriggerHeldItem(BattleSystem *battleSys, BattleContext *battle battleCtx->msgTemp = FLAVOR_SPICY; if (Pokemon_GetFlavorAffinityOf(battleCtx->battleMons[battler].personality, FLAVOR_SPICY) == -1) { - subscript = BATTLE_SUBSEQ_HELD_ITEM_DISLIKE_FLAVOR; + subscript = BATTLE_SUBSCRIPT_HELD_ITEM_DISLIKE_FLAVOR; } else { - subscript = BATTLE_SUBSEQ_HELD_ITEM_HP_RESTORE; + subscript = BATTLE_SUBSCRIPT_HELD_ITEM_HP_RESTORE; } result = TRUE; @@ -4724,9 +4724,9 @@ BOOL BattleSystem_TriggerHeldItem(BattleSystem *battleSys, BattleContext *battle battleCtx->msgTemp = FLAVOR_DRY; if (Pokemon_GetFlavorAffinityOf(battleCtx->battleMons[battler].personality, FLAVOR_DRY) == -1) { - subscript = BATTLE_SUBSEQ_HELD_ITEM_DISLIKE_FLAVOR; + subscript = BATTLE_SUBSCRIPT_HELD_ITEM_DISLIKE_FLAVOR; } else { - subscript = BATTLE_SUBSEQ_HELD_ITEM_HP_RESTORE; + subscript = BATTLE_SUBSCRIPT_HELD_ITEM_HP_RESTORE; } result = TRUE; @@ -4739,9 +4739,9 @@ BOOL BattleSystem_TriggerHeldItem(BattleSystem *battleSys, BattleContext *battle battleCtx->msgTemp = FLAVOR_SWEET; if (Pokemon_GetFlavorAffinityOf(battleCtx->battleMons[battler].personality, FLAVOR_SWEET) == -1) { - subscript = BATTLE_SUBSEQ_HELD_ITEM_DISLIKE_FLAVOR; + subscript = BATTLE_SUBSCRIPT_HELD_ITEM_DISLIKE_FLAVOR; } else { - subscript = BATTLE_SUBSEQ_HELD_ITEM_HP_RESTORE; + subscript = BATTLE_SUBSCRIPT_HELD_ITEM_HP_RESTORE; } result = TRUE; @@ -4754,9 +4754,9 @@ BOOL BattleSystem_TriggerHeldItem(BattleSystem *battleSys, BattleContext *battle battleCtx->msgTemp = FLAVOR_BITTER; if (Pokemon_GetFlavorAffinityOf(battleCtx->battleMons[battler].personality, FLAVOR_BITTER) == -1) { - subscript = BATTLE_SUBSEQ_HELD_ITEM_DISLIKE_FLAVOR; + subscript = BATTLE_SUBSCRIPT_HELD_ITEM_DISLIKE_FLAVOR; } else { - subscript = BATTLE_SUBSEQ_HELD_ITEM_HP_RESTORE; + subscript = BATTLE_SUBSCRIPT_HELD_ITEM_HP_RESTORE; } result = TRUE; @@ -4769,9 +4769,9 @@ BOOL BattleSystem_TriggerHeldItem(BattleSystem *battleSys, BattleContext *battle battleCtx->msgTemp = FLAVOR_SOUR; if (Pokemon_GetFlavorAffinityOf(battleCtx->battleMons[battler].personality, FLAVOR_SOUR) == -1) { - subscript = BATTLE_SUBSEQ_HELD_ITEM_DISLIKE_FLAVOR; + subscript = BATTLE_SUBSCRIPT_HELD_ITEM_DISLIKE_FLAVOR; } else { - subscript = BATTLE_SUBSEQ_HELD_ITEM_HP_RESTORE; + subscript = BATTLE_SUBSCRIPT_HELD_ITEM_HP_RESTORE; } result = TRUE; @@ -4786,7 +4786,7 @@ BOOL BattleSystem_TriggerHeldItem(BattleSystem *battleSys, BattleContext *battle if (battleCtx->battleMons[battler].curHP <= battleCtx->battleMons[battler].maxHP / itemPower && battleCtx->battleMons[battler].statBoosts[BATTLE_STAT_ATTACK] < 12) { battleCtx->msgTemp = BATTLE_STAT_ATTACK; - subscript = BATTLE_SUBSEQ_HELD_ITEM_RAISE_STAT; + subscript = BATTLE_SUBSCRIPT_HELD_ITEM_RAISE_STAT; result = TRUE; } break; @@ -4799,7 +4799,7 @@ BOOL BattleSystem_TriggerHeldItem(BattleSystem *battleSys, BattleContext *battle if (battleCtx->battleMons[battler].curHP <= battleCtx->battleMons[battler].maxHP / itemPower && battleCtx->battleMons[battler].statBoosts[BATTLE_STAT_DEFENSE] < 12) { battleCtx->msgTemp = BATTLE_STAT_DEFENSE; - subscript = BATTLE_SUBSEQ_HELD_ITEM_RAISE_STAT; + subscript = BATTLE_SUBSCRIPT_HELD_ITEM_RAISE_STAT; result = TRUE; } break; @@ -4812,7 +4812,7 @@ BOOL BattleSystem_TriggerHeldItem(BattleSystem *battleSys, BattleContext *battle if (battleCtx->battleMons[battler].curHP <= battleCtx->battleMons[battler].maxHP / itemPower && battleCtx->battleMons[battler].statBoosts[BATTLE_STAT_SPEED] < 12) { battleCtx->msgTemp = BATTLE_STAT_SPEED; - subscript = BATTLE_SUBSEQ_HELD_ITEM_RAISE_STAT; + subscript = BATTLE_SUBSCRIPT_HELD_ITEM_RAISE_STAT; result = TRUE; } break; @@ -4825,7 +4825,7 @@ BOOL BattleSystem_TriggerHeldItem(BattleSystem *battleSys, BattleContext *battle if (battleCtx->battleMons[battler].curHP <= battleCtx->battleMons[battler].maxHP / itemPower && battleCtx->battleMons[battler].statBoosts[BATTLE_STAT_SP_ATTACK] < 12) { battleCtx->msgTemp = BATTLE_STAT_SP_ATTACK; - subscript = BATTLE_SUBSEQ_HELD_ITEM_RAISE_STAT; + subscript = BATTLE_SUBSCRIPT_HELD_ITEM_RAISE_STAT; result = TRUE; } break; @@ -4838,7 +4838,7 @@ BOOL BattleSystem_TriggerHeldItem(BattleSystem *battleSys, BattleContext *battle if (battleCtx->battleMons[battler].curHP <= battleCtx->battleMons[battler].maxHP / itemPower && battleCtx->battleMons[battler].statBoosts[BATTLE_STAT_SP_DEFENSE] < 12) { battleCtx->msgTemp = BATTLE_STAT_SP_DEFENSE; - subscript = BATTLE_SUBSEQ_HELD_ITEM_RAISE_STAT; + subscript = BATTLE_SUBSCRIPT_HELD_ITEM_RAISE_STAT; result = TRUE; } break; @@ -4850,7 +4850,7 @@ BOOL BattleSystem_TriggerHeldItem(BattleSystem *battleSys, BattleContext *battle if (battleCtx->battleMons[battler].curHP <= battleCtx->battleMons[battler].maxHP / itemPower && (battleCtx->battleMons[battler].statusVolatile & VOLATILE_CONDITION_FOCUS_ENERGY) == FALSE) { - subscript = BATTLE_SUBSEQ_HELD_ITEM_RAISE_CRIT; + subscript = BATTLE_SUBSCRIPT_HELD_ITEM_RAISE_CRIT; result = TRUE; } break; @@ -4874,7 +4874,7 @@ BOOL BattleSystem_TriggerHeldItem(BattleSystem *battleSys, BattleContext *battle } while (battleCtx->battleMons[battler].statBoosts[BATTLE_STAT_ATTACK + i] == 12); battleCtx->msgTemp = BATTLE_STAT_ATTACK + i; - subscript = BATTLE_SUBSEQ_HELD_ITEM_SHARPLY_RAISE_STAT; + subscript = BATTLE_SUBSCRIPT_HELD_ITEM_SHARPLY_RAISE_STAT; result = TRUE; } } @@ -4889,7 +4889,7 @@ BOOL BattleSystem_TriggerHeldItem(BattleSystem *battleSys, BattleContext *battle } if (result == TRUE) { - subscript = BATTLE_SUBSEQ_HELD_ITEM_STATDOWN_RESTORE; + subscript = BATTLE_SUBSCRIPT_HELD_ITEM_STATDOWN_RESTORE; } break; } @@ -4897,7 +4897,7 @@ BOOL BattleSystem_TriggerHeldItem(BattleSystem *battleSys, BattleContext *battle case HOLD_EFFECT_HEAL_INFATUATION: if (battleCtx->battleMons[battler].statusVolatile & VOLATILE_CONDITION_ATTRACT) { battleCtx->msgTemp = MSGCOND_INFATUATION; - subscript = BATTLE_SUBSEQ_HELD_ITEM_HEAL_INFATUATION; + subscript = BATTLE_SUBSCRIPT_HELD_ITEM_HEAL_INFATUATION; result = TRUE; } break; @@ -4908,7 +4908,7 @@ BOOL BattleSystem_TriggerHeldItem(BattleSystem *battleSys, BattleContext *battle } if (battleCtx->battleMons[battler].curHP <= battleCtx->battleMons[battler].maxHP / itemPower) { - subscript = BATTLE_SUBSEQ_HELD_ITEM_TEMP_ACC_UP; + subscript = BATTLE_SUBSCRIPT_HELD_ITEM_TEMP_ACC_UP; result = TRUE; } break; @@ -4939,7 +4939,7 @@ BOOL BattleSystem_TriggerLeftovers(BattleSystem *battleSys, BattleContext *battl case HOLD_EFFECT_HP_RESTORE_GRADUAL: if (battleCtx->battleMons[battler].curHP < (battleCtx->battleMons[battler].maxHP)) { battleCtx->hpCalcTemp = BattleSystem_Divide(battleCtx->battleMons[battler].maxHP, 16); - subscript = BATTLE_SUBSEQ_RESTORE_A_LITTLE_HP; + subscript = BATTLE_SUBSCRIPT_RESTORE_A_LITTLE_HP; result = TRUE; } break; @@ -4948,12 +4948,12 @@ BOOL BattleSystem_TriggerLeftovers(BattleSystem *battleSys, BattleContext *battl if (MON_HAS_TYPE(battler, TYPE_POISON)) { if (battleCtx->battleMons[battler].curHP < (battleCtx->battleMons[battler].maxHP)) { battleCtx->hpCalcTemp = BattleSystem_Divide(battleCtx->battleMons[battler].maxHP, 16); - subscript = BATTLE_SUBSEQ_RESTORE_A_LITTLE_HP; + subscript = BATTLE_SUBSCRIPT_RESTORE_A_LITTLE_HP; result = TRUE; } } else if (Battler_Ability(battleCtx, battler) != ABILITY_MAGIC_GUARD) { battleCtx->hpCalcTemp = BattleSystem_Divide(battleCtx->battleMons[battler].maxHP * -1, 8); - subscript = BATTLE_SUBSEQ_LOSE_HP_FROM_ITEM_WITH_MESSAGE; + subscript = BATTLE_SUBSCRIPT_LOSE_HP_FROM_ITEM_WITH_MESSAGE; result = TRUE; } break; @@ -4983,7 +4983,7 @@ BOOL BattleSystem_TriggerHeldItemOnStatus(BattleSystem *battleSys, BattleContext case HOLD_EFFECT_HP_RESTORE: if (battleCtx->battleMons[battler].curHP <= battleCtx->battleMons[battler].maxHP / 2) { battleCtx->hpCalcTemp = itemPower; - *subscript = BATTLE_SUBSEQ_HELD_ITEM_HP_RESTORE; + *subscript = BATTLE_SUBSCRIPT_HELD_ITEM_HP_RESTORE; result = TRUE; } break; @@ -4991,42 +4991,42 @@ BOOL BattleSystem_TriggerHeldItemOnStatus(BattleSystem *battleSys, BattleContext case HOLD_EFFECT_HP_PCT_RESTORE: if (battleCtx->battleMons[battler].curHP <= battleCtx->battleMons[battler].maxHP / 2) { battleCtx->hpCalcTemp = BattleSystem_Divide(battleCtx->battleMons[battler].maxHP * itemPower, 100); - *subscript = BATTLE_SUBSEQ_HELD_ITEM_HP_RESTORE; + *subscript = BATTLE_SUBSCRIPT_HELD_ITEM_HP_RESTORE; result = TRUE; } break; case HOLD_EFFECT_PRZ_RESTORE: if (battleCtx->battleMons[battler].status & MON_CONDITION_PARALYSIS) { - *subscript = BATTLE_SUBSEQ_HELD_ITEM_PRZ_RESTORE; + *subscript = BATTLE_SUBSCRIPT_HELD_ITEM_PRZ_RESTORE; result = TRUE; } break; case HOLD_EFFECT_SLP_RESTORE: if (battleCtx->battleMons[battler].status & MON_CONDITION_SLEEP) { - *subscript = BATTLE_SUBSEQ_HELD_ITEM_SLP_RESTORE; + *subscript = BATTLE_SUBSCRIPT_HELD_ITEM_SLP_RESTORE; result = TRUE; } break; case HOLD_EFFECT_PSN_RESTORE: if (battleCtx->battleMons[battler].status & MON_CONDITION_ANY_POISON) { - *subscript = BATTLE_SUBSEQ_HELD_ITEM_PSN_RESTORE; + *subscript = BATTLE_SUBSCRIPT_HELD_ITEM_PSN_RESTORE; result = TRUE; } break; case HOLD_EFFECT_BRN_RESTORE: if (battleCtx->battleMons[battler].status & MON_CONDITION_BURN) { - *subscript = BATTLE_SUBSEQ_HELD_ITEM_BRN_RESTORE; + *subscript = BATTLE_SUBSCRIPT_HELD_ITEM_BRN_RESTORE; result = TRUE; } break; case HOLD_EFFECT_FRZ_RESTORE: if (battleCtx->battleMons[battler].status & MON_CONDITION_FREEZE) { - *subscript = BATTLE_SUBSEQ_HELD_ITEM_FRZ_RESTORE; + *subscript = BATTLE_SUBSCRIPT_HELD_ITEM_FRZ_RESTORE; result = TRUE; } break; @@ -5043,7 +5043,7 @@ BOOL BattleSystem_TriggerHeldItemOnStatus(BattleSystem *battleSys, BattleContext BattleMon_AddVal(&battleCtx->battleMons[battler], BATTLEMON_CUR_PP_1 + i, itemPower); BattleMon_CopyToParty(battleSys, battleCtx, battler); battleCtx->msgMoveTemp = battleCtx->battleMons[battler].moves[i]; - *subscript = BATTLE_SUBSEQ_HELD_ITEM_PP_RESTORE; + *subscript = BATTLE_SUBSCRIPT_HELD_ITEM_PP_RESTORE; result = TRUE; } @@ -5052,7 +5052,7 @@ BOOL BattleSystem_TriggerHeldItemOnStatus(BattleSystem *battleSys, BattleContext case HOLD_EFFECT_CONFUSE_RESTORE: if (battleCtx->battleMons[battler].statusVolatile & VOLATILE_CONDITION_CONFUSION) { - *subscript = BATTLE_SUBSEQ_HELD_ITEM_CNF_RESTORE; + *subscript = BATTLE_SUBSCRIPT_HELD_ITEM_CNF_RESTORE; result = TRUE; } break; @@ -5061,32 +5061,32 @@ BOOL BattleSystem_TriggerHeldItemOnStatus(BattleSystem *battleSys, BattleContext if ((battleCtx->battleMons[battler].status & MON_CONDITION_ANY) || (battleCtx->battleMons[battler].statusVolatile & VOLATILE_CONDITION_CONFUSION)) { if (battleCtx->battleMons[battler].status & MON_CONDITION_PARALYSIS) { - *subscript = BATTLE_SUBSEQ_HELD_ITEM_PRZ_RESTORE; + *subscript = BATTLE_SUBSCRIPT_HELD_ITEM_PRZ_RESTORE; } if (battleCtx->battleMons[battler].status & MON_CONDITION_SLEEP) { - *subscript = BATTLE_SUBSEQ_HELD_ITEM_SLP_RESTORE; + *subscript = BATTLE_SUBSCRIPT_HELD_ITEM_SLP_RESTORE; } if (battleCtx->battleMons[battler].status & MON_CONDITION_ANY_POISON) { - *subscript = BATTLE_SUBSEQ_HELD_ITEM_PSN_RESTORE; + *subscript = BATTLE_SUBSCRIPT_HELD_ITEM_PSN_RESTORE; } if (battleCtx->battleMons[battler].status & MON_CONDITION_BURN) { - *subscript = BATTLE_SUBSEQ_HELD_ITEM_BRN_RESTORE; + *subscript = BATTLE_SUBSCRIPT_HELD_ITEM_BRN_RESTORE; } if (battleCtx->battleMons[battler].status & MON_CONDITION_FREEZE) { - *subscript = BATTLE_SUBSEQ_HELD_ITEM_FRZ_RESTORE; + *subscript = BATTLE_SUBSCRIPT_HELD_ITEM_FRZ_RESTORE; } if (battleCtx->battleMons[battler].statusVolatile & VOLATILE_CONDITION_CONFUSION) { - *subscript = BATTLE_SUBSEQ_HELD_ITEM_CNF_RESTORE; + *subscript = BATTLE_SUBSCRIPT_HELD_ITEM_CNF_RESTORE; } if ((battleCtx->battleMons[battler].status & MON_CONDITION_ANY) && (battleCtx->battleMons[battler].statusVolatile & VOLATILE_CONDITION_CONFUSION)) { - *subscript = BATTLE_SUBSEQ_HELD_ITEM_MULTI_RESTORE; + *subscript = BATTLE_SUBSCRIPT_HELD_ITEM_MULTI_RESTORE; } result = TRUE; @@ -5102,7 +5102,7 @@ BOOL BattleSystem_TriggerHeldItemOnStatus(BattleSystem *battleSys, BattleContext } if (result == TRUE) { - *subscript = BATTLE_SUBSEQ_HELD_ITEM_STATDOWN_RESTORE; + *subscript = BATTLE_SUBSCRIPT_HELD_ITEM_STATDOWN_RESTORE; } break; } @@ -5110,7 +5110,7 @@ BOOL BattleSystem_TriggerHeldItemOnStatus(BattleSystem *battleSys, BattleContext case HOLD_EFFECT_HEAL_INFATUATION: if (battleCtx->battleMons[battler].statusVolatile & VOLATILE_CONDITION_ATTRACT) { battleCtx->msgTemp = MSGCOND_INFATUATION; - *subscript = BATTLE_SUBSEQ_HELD_ITEM_HEAL_INFATUATION; + *subscript = BATTLE_SUBSCRIPT_HELD_ITEM_HEAL_INFATUATION; result = TRUE; } break; @@ -5121,7 +5121,7 @@ BOOL BattleSystem_TriggerHeldItemOnStatus(BattleSystem *battleSys, BattleContext } if (battleCtx->battleMons[battler].curHP <= battleCtx->battleMons[battler].maxHP / itemPower) { - *subscript = BATTLE_SUBSEQ_HELD_ITEM_TEMP_ACC_UP; + *subscript = BATTLE_SUBSCRIPT_HELD_ITEM_TEMP_ACC_UP; result = TRUE; } break; @@ -5132,9 +5132,9 @@ BOOL BattleSystem_TriggerHeldItemOnStatus(BattleSystem *battleSys, BattleContext battleCtx->msgTemp = FLAVOR_SPICY; if (Pokemon_GetFlavorAffinityOf(battleCtx->battleMons[battler].personality, FLAVOR_SPICY) == -1) { - *subscript = BATTLE_SUBSEQ_HELD_ITEM_DISLIKE_FLAVOR; + *subscript = BATTLE_SUBSCRIPT_HELD_ITEM_DISLIKE_FLAVOR; } else { - *subscript = BATTLE_SUBSEQ_HELD_ITEM_HP_RESTORE; + *subscript = BATTLE_SUBSCRIPT_HELD_ITEM_HP_RESTORE; } result = TRUE; @@ -5147,9 +5147,9 @@ BOOL BattleSystem_TriggerHeldItemOnStatus(BattleSystem *battleSys, BattleContext battleCtx->msgTemp = FLAVOR_DRY; if (Pokemon_GetFlavorAffinityOf(battleCtx->battleMons[battler].personality, FLAVOR_DRY) == -1) { - *subscript = BATTLE_SUBSEQ_HELD_ITEM_DISLIKE_FLAVOR; + *subscript = BATTLE_SUBSCRIPT_HELD_ITEM_DISLIKE_FLAVOR; } else { - *subscript = BATTLE_SUBSEQ_HELD_ITEM_HP_RESTORE; + *subscript = BATTLE_SUBSCRIPT_HELD_ITEM_HP_RESTORE; } result = TRUE; @@ -5162,9 +5162,9 @@ BOOL BattleSystem_TriggerHeldItemOnStatus(BattleSystem *battleSys, BattleContext battleCtx->msgTemp = FLAVOR_SWEET; if (Pokemon_GetFlavorAffinityOf(battleCtx->battleMons[battler].personality, FLAVOR_SWEET) == -1) { - *subscript = BATTLE_SUBSEQ_HELD_ITEM_DISLIKE_FLAVOR; + *subscript = BATTLE_SUBSCRIPT_HELD_ITEM_DISLIKE_FLAVOR; } else { - *subscript = BATTLE_SUBSEQ_HELD_ITEM_HP_RESTORE; + *subscript = BATTLE_SUBSCRIPT_HELD_ITEM_HP_RESTORE; } result = TRUE; @@ -5177,9 +5177,9 @@ BOOL BattleSystem_TriggerHeldItemOnStatus(BattleSystem *battleSys, BattleContext battleCtx->msgTemp = FLAVOR_BITTER; if (Pokemon_GetFlavorAffinityOf(battleCtx->battleMons[battler].personality, FLAVOR_BITTER) == -1) { - *subscript = BATTLE_SUBSEQ_HELD_ITEM_DISLIKE_FLAVOR; + *subscript = BATTLE_SUBSCRIPT_HELD_ITEM_DISLIKE_FLAVOR; } else { - *subscript = BATTLE_SUBSEQ_HELD_ITEM_HP_RESTORE; + *subscript = BATTLE_SUBSCRIPT_HELD_ITEM_HP_RESTORE; } result = TRUE; @@ -5192,9 +5192,9 @@ BOOL BattleSystem_TriggerHeldItemOnStatus(BattleSystem *battleSys, BattleContext battleCtx->msgTemp = FLAVOR_SOUR; if (Pokemon_GetFlavorAffinityOf(battleCtx->battleMons[battler].personality, FLAVOR_SOUR) == -1) { - *subscript = BATTLE_SUBSEQ_HELD_ITEM_DISLIKE_FLAVOR; + *subscript = BATTLE_SUBSCRIPT_HELD_ITEM_DISLIKE_FLAVOR; } else { - *subscript = BATTLE_SUBSEQ_HELD_ITEM_HP_RESTORE; + *subscript = BATTLE_SUBSCRIPT_HELD_ITEM_HP_RESTORE; } result = TRUE; @@ -5209,7 +5209,7 @@ BOOL BattleSystem_TriggerHeldItemOnStatus(BattleSystem *battleSys, BattleContext if (battleCtx->battleMons[battler].curHP <= battleCtx->battleMons[battler].maxHP / itemPower && battleCtx->battleMons[battler].statBoosts[BATTLE_STAT_ATTACK] < 12) { battleCtx->msgTemp = BATTLE_STAT_ATTACK; - *subscript = BATTLE_SUBSEQ_HELD_ITEM_RAISE_STAT; + *subscript = BATTLE_SUBSCRIPT_HELD_ITEM_RAISE_STAT; result = TRUE; } break; @@ -5222,7 +5222,7 @@ BOOL BattleSystem_TriggerHeldItemOnStatus(BattleSystem *battleSys, BattleContext if (battleCtx->battleMons[battler].curHP <= battleCtx->battleMons[battler].maxHP / itemPower && battleCtx->battleMons[battler].statBoosts[BATTLE_STAT_DEFENSE] < 12) { battleCtx->msgTemp = BATTLE_STAT_DEFENSE; - *subscript = BATTLE_SUBSEQ_HELD_ITEM_RAISE_STAT; + *subscript = BATTLE_SUBSCRIPT_HELD_ITEM_RAISE_STAT; result = TRUE; } break; @@ -5235,7 +5235,7 @@ BOOL BattleSystem_TriggerHeldItemOnStatus(BattleSystem *battleSys, BattleContext if (battleCtx->battleMons[battler].curHP <= battleCtx->battleMons[battler].maxHP / itemPower && battleCtx->battleMons[battler].statBoosts[BATTLE_STAT_SPEED] < 12) { battleCtx->msgTemp = BATTLE_STAT_SPEED; - *subscript = BATTLE_SUBSEQ_HELD_ITEM_RAISE_STAT; + *subscript = BATTLE_SUBSCRIPT_HELD_ITEM_RAISE_STAT; result = TRUE; } break; @@ -5248,7 +5248,7 @@ BOOL BattleSystem_TriggerHeldItemOnStatus(BattleSystem *battleSys, BattleContext if (battleCtx->battleMons[battler].curHP <= battleCtx->battleMons[battler].maxHP / itemPower && battleCtx->battleMons[battler].statBoosts[BATTLE_STAT_SP_ATTACK] < 12) { battleCtx->msgTemp = BATTLE_STAT_SP_ATTACK; - *subscript = BATTLE_SUBSEQ_HELD_ITEM_RAISE_STAT; + *subscript = BATTLE_SUBSCRIPT_HELD_ITEM_RAISE_STAT; result = TRUE; } break; @@ -5261,7 +5261,7 @@ BOOL BattleSystem_TriggerHeldItemOnStatus(BattleSystem *battleSys, BattleContext if (battleCtx->battleMons[battler].curHP <= battleCtx->battleMons[battler].maxHP / itemPower && battleCtx->battleMons[battler].statBoosts[BATTLE_STAT_SP_DEFENSE] < 12) { battleCtx->msgTemp = BATTLE_STAT_SP_DEFENSE; - *subscript = BATTLE_SUBSEQ_HELD_ITEM_RAISE_STAT; + *subscript = BATTLE_SUBSCRIPT_HELD_ITEM_RAISE_STAT; result = TRUE; } break; @@ -5273,7 +5273,7 @@ BOOL BattleSystem_TriggerHeldItemOnStatus(BattleSystem *battleSys, BattleContext if (battleCtx->battleMons[battler].curHP <= battleCtx->battleMons[battler].maxHP / itemPower && (battleCtx->battleMons[battler].statusVolatile & VOLATILE_CONDITION_FOCUS_ENERGY) == FALSE) { - *subscript = BATTLE_SUBSEQ_HELD_ITEM_RAISE_CRIT; + *subscript = BATTLE_SUBSCRIPT_HELD_ITEM_RAISE_CRIT; result = TRUE; } break; @@ -5297,7 +5297,7 @@ BOOL BattleSystem_TriggerHeldItemOnStatus(BattleSystem *battleSys, BattleContext } while (battleCtx->battleMons[battler].statBoosts[BATTLE_STAT_ATTACK + i] == 12); battleCtx->msgTemp = BATTLE_STAT_ATTACK + i; - *subscript = BATTLE_SUBSEQ_HELD_ITEM_SHARPLY_RAISE_STAT; + *subscript = BATTLE_SUBSCRIPT_HELD_ITEM_SHARPLY_RAISE_STAT; result = TRUE; } } @@ -5324,21 +5324,21 @@ BOOL BattleSystem_TriggerDetrimentalHeldItem(BattleSystem *battleSys, BattleCont case HOLD_EFFECT_PSN_USER: battleCtx->sideEffectMon = battler; battleCtx->sideEffectType = SIDE_EFFECT_TYPE_HELD_ITEM; - subscript = BATTLE_SUBSEQ_BADLY_POISON; + subscript = BATTLE_SUBSCRIPT_BADLY_POISON; result = TRUE; break; case HOLD_EFFECT_BRN_USER: battleCtx->sideEffectMon = battler; battleCtx->sideEffectType = SIDE_EFFECT_TYPE_HELD_ITEM; - subscript = BATTLE_SUBSEQ_BURN; + subscript = BATTLE_SUBSCRIPT_BURN; result = TRUE; break; case HOLD_EFFECT_DMG_USER_CONTACT_XFR: if (Battler_Ability(battleCtx, battler) != ABILITY_MAGIC_GUARD) { battleCtx->hpCalcTemp = BattleSystem_Divide(battleCtx->battleMons[battler].maxHP * -1, itemPower); - subscript = BATTLE_SUBSEQ_LOSE_HP_FROM_ITEM_WITH_MESSAGE; + subscript = BATTLE_SUBSCRIPT_LOSE_HP_FROM_ITEM_WITH_MESSAGE; result = TRUE; } break; @@ -5400,7 +5400,7 @@ BOOL BattleSystem_TriggerHeldItemOnHit(BattleSystem *battleSys, BattleContext *b && (DEFENDER_SELF_TURN_FLAGS.physicalDamageTaken || DEFENDER_SELF_TURN_FLAGS.specialDamageTaken) && (battleCtx->battleStatusMask2 & SYSCTL_UTURN_ACTIVE) == FALSE && (CURRENT_MOVE_DATA.flags & MOVE_FLAG_MAKES_CONTACT)) { - *subscript = BATTLE_SUBSEQ_TRANSFER_STICKY_BARB; + *subscript = BATTLE_SUBSCRIPT_TRANSFER_STICKY_BARB; result = TRUE; } break; @@ -5411,7 +5411,7 @@ BOOL BattleSystem_TriggerHeldItemOnHit(BattleSystem *battleSys, BattleContext *b && (battleCtx->battleStatusMask2 & SYSCTL_UTURN_ACTIVE) == FALSE && DEFENDER_SELF_TURN_FLAGS.physicalDamageTaken) { battleCtx->hpCalcTemp = BattleSystem_Divide(ATTACKING_MON.maxHP * -1, itemPower); - *subscript = BATTLE_SUBSEQ_HELD_ITEM_RECOIL_WHEN_HIT; + *subscript = BATTLE_SUBSCRIPT_HELD_ITEM_RECOIL_WHEN_HIT; result = TRUE; } break; @@ -5421,7 +5421,7 @@ BOOL BattleSystem_TriggerHeldItemOnHit(BattleSystem *battleSys, BattleContext *b && Battler_Ability(battleCtx, battleCtx->attacker) != ABILITY_MAGIC_GUARD && DEFENDER_SELF_TURN_FLAGS.specialDamageTaken) { battleCtx->hpCalcTemp = BattleSystem_Divide(ATTACKING_MON.maxHP * -1, itemPower); - *subscript = BATTLE_SUBSEQ_HELD_ITEM_RECOIL_WHEN_HIT; + *subscript = BATTLE_SUBSCRIPT_HELD_ITEM_RECOIL_WHEN_HIT; result = TRUE; } break; @@ -5429,7 +5429,7 @@ BOOL BattleSystem_TriggerHeldItemOnHit(BattleSystem *battleSys, BattleContext *b case HOLD_EFFECT_HP_RESTORE_SE: if (DEFENDING_MON.curHP && (battleCtx->moveStatusFlags & MOVE_STATUS_SUPER_EFFECTIVE)) { battleCtx->hpCalcTemp = BattleSystem_Divide(DEFENDING_MON.maxHP, itemPower); - *subscript = BATTLE_SUBSEQ_HELD_ITEM_HP_RESTORE; + *subscript = BATTLE_SUBSCRIPT_HELD_ITEM_HP_RESTORE; battleCtx->msgBattlerTemp = battleCtx->defender; battleCtx->msgItemTemp = battleCtx->battleMons[battleCtx->defender].heldItem; result = TRUE; @@ -5559,7 +5559,7 @@ BOOL BattleSystem_PluckBerry(BattleSystem *battleSys, BattleContext *battleCtx, case PLUCK_EFFECT_HP_RESTORE: if (ATTACKING_MON.curHP != ATTACKING_MON.maxHP) { battleCtx->hpCalcTemp = power; - nextSeq = BATTLE_SUBSEQ_HELD_ITEM_HP_RESTORE; + nextSeq = BATTLE_SUBSCRIPT_HELD_ITEM_HP_RESTORE; } result = TRUE; @@ -5568,7 +5568,7 @@ BOOL BattleSystem_PluckBerry(BattleSystem *battleSys, BattleContext *battleCtx, case PLUCK_EFFECT_HP_PCT_RESTORE: if (ATTACKING_MON.curHP != ATTACKING_MON.maxHP) { battleCtx->hpCalcTemp = BattleSystem_Divide(ATTACKING_MON.maxHP * power, 100); - nextSeq = BATTLE_SUBSEQ_HELD_ITEM_HP_RESTORE; + nextSeq = BATTLE_SUBSCRIPT_HELD_ITEM_HP_RESTORE; } result = TRUE; @@ -5576,7 +5576,7 @@ BOOL BattleSystem_PluckBerry(BattleSystem *battleSys, BattleContext *battleCtx, case PLUCK_EFFECT_PRZ_RESTORE: if (ATTACKING_MON.status & MON_CONDITION_PARALYSIS) { - nextSeq = BATTLE_SUBSEQ_HELD_ITEM_PRZ_RESTORE; + nextSeq = BATTLE_SUBSCRIPT_HELD_ITEM_PRZ_RESTORE; } result = TRUE; @@ -5584,7 +5584,7 @@ BOOL BattleSystem_PluckBerry(BattleSystem *battleSys, BattleContext *battleCtx, case PLUCK_EFFECT_SLP_RESTORE: if (ATTACKING_MON.status & MON_CONDITION_SLEEP) { - nextSeq = BATTLE_SUBSEQ_HELD_ITEM_SLP_RESTORE; + nextSeq = BATTLE_SUBSCRIPT_HELD_ITEM_SLP_RESTORE; } result = TRUE; @@ -5592,7 +5592,7 @@ BOOL BattleSystem_PluckBerry(BattleSystem *battleSys, BattleContext *battleCtx, case PLUCK_EFFECT_PSN_RESTORE: if (ATTACKING_MON.status & MON_CONDITION_ANY_POISON) { - nextSeq = BATTLE_SUBSEQ_HELD_ITEM_PSN_RESTORE; + nextSeq = BATTLE_SUBSCRIPT_HELD_ITEM_PSN_RESTORE; } result = TRUE; @@ -5600,7 +5600,7 @@ BOOL BattleSystem_PluckBerry(BattleSystem *battleSys, BattleContext *battleCtx, case PLUCK_EFFECT_BRN_RESTORE: if (ATTACKING_MON.status & MON_CONDITION_BURN) { - nextSeq = BATTLE_SUBSEQ_HELD_ITEM_BRN_RESTORE; + nextSeq = BATTLE_SUBSCRIPT_HELD_ITEM_BRN_RESTORE; } result = TRUE; @@ -5608,7 +5608,7 @@ BOOL BattleSystem_PluckBerry(BattleSystem *battleSys, BattleContext *battleCtx, case PLUCK_EFFECT_FRZ_RESTORE: if (ATTACKING_MON.status & MON_CONDITION_FREEZE) { - nextSeq = BATTLE_SUBSEQ_HELD_ITEM_FRZ_RESTORE; + nextSeq = BATTLE_SUBSCRIPT_HELD_ITEM_FRZ_RESTORE; } result = TRUE; @@ -5634,7 +5634,7 @@ BOOL BattleSystem_PluckBerry(BattleSystem *battleSys, BattleContext *battleCtx, BattleMon_AddVal(&ATTACKING_MON, BATTLEMON_CUR_PP_1 + slot, power); BattleMon_CopyToParty(battleSys, battleCtx, battleCtx->attacker); battleCtx->msgMoveTemp = ATTACKING_MON.moves[slot]; - nextSeq = BATTLE_SUBSEQ_HELD_ITEM_PP_RESTORE; + nextSeq = BATTLE_SUBSCRIPT_HELD_ITEM_PP_RESTORE; result = TRUE; break; @@ -5642,7 +5642,7 @@ BOOL BattleSystem_PluckBerry(BattleSystem *battleSys, BattleContext *battleCtx, case PLUCK_EFFECT_CNF_RESTORE: if (ATTACKING_MON.statusVolatile & VOLATILE_CONDITION_CONFUSION) { - nextSeq = BATTLE_SUBSEQ_HELD_ITEM_CNF_RESTORE; + nextSeq = BATTLE_SUBSCRIPT_HELD_ITEM_CNF_RESTORE; } result = TRUE; @@ -5651,32 +5651,32 @@ BOOL BattleSystem_PluckBerry(BattleSystem *battleSys, BattleContext *battleCtx, case PLUCK_EFFECT_ALL_RESTORE: if ((ATTACKING_MON.status & MON_CONDITION_ANY) || (ATTACKING_MON.statusVolatile & VOLATILE_CONDITION_CONFUSION)) { if (ATTACKING_MON.status & MON_CONDITION_PARALYSIS) { - nextSeq = BATTLE_SUBSEQ_HELD_ITEM_PRZ_RESTORE; + nextSeq = BATTLE_SUBSCRIPT_HELD_ITEM_PRZ_RESTORE; } if (ATTACKING_MON.status & MON_CONDITION_SLEEP) { - nextSeq = BATTLE_SUBSEQ_HELD_ITEM_SLP_RESTORE; + nextSeq = BATTLE_SUBSCRIPT_HELD_ITEM_SLP_RESTORE; } if (ATTACKING_MON.status & MON_CONDITION_ANY_POISON) { - nextSeq = BATTLE_SUBSEQ_HELD_ITEM_PSN_RESTORE; + nextSeq = BATTLE_SUBSCRIPT_HELD_ITEM_PSN_RESTORE; } if (ATTACKING_MON.status & MON_CONDITION_BURN) { - nextSeq = BATTLE_SUBSEQ_HELD_ITEM_BRN_RESTORE; + nextSeq = BATTLE_SUBSCRIPT_HELD_ITEM_BRN_RESTORE; } if (ATTACKING_MON.status & MON_CONDITION_FREEZE) { - nextSeq = BATTLE_SUBSEQ_HELD_ITEM_FRZ_RESTORE; + nextSeq = BATTLE_SUBSCRIPT_HELD_ITEM_FRZ_RESTORE; } if (ATTACKING_MON.statusVolatile & VOLATILE_CONDITION_CONFUSION) { - nextSeq = BATTLE_SUBSEQ_HELD_ITEM_CNF_RESTORE; + nextSeq = BATTLE_SUBSCRIPT_HELD_ITEM_CNF_RESTORE; } if ((ATTACKING_MON.status & MON_CONDITION_ANY) && (ATTACKING_MON.statusVolatile & VOLATILE_CONDITION_CONFUSION)) { - nextSeq = BATTLE_SUBSEQ_HELD_ITEM_MULTI_RESTORE; + nextSeq = BATTLE_SUBSCRIPT_HELD_ITEM_MULTI_RESTORE; } } @@ -5689,9 +5689,9 @@ BOOL BattleSystem_PluckBerry(BattleSystem *battleSys, BattleContext *battleCtx, battleCtx->msgTemp = FLAVOR_SPICY; if (Pokemon_GetFlavorAffinityOf(ATTACKING_MON.personality, FLAVOR_SPICY) == -1) { - nextSeq = BATTLE_SUBSEQ_HELD_ITEM_DISLIKE_FLAVOR; + nextSeq = BATTLE_SUBSCRIPT_HELD_ITEM_DISLIKE_FLAVOR; } else { - nextSeq = BATTLE_SUBSEQ_HELD_ITEM_HP_RESTORE; + nextSeq = BATTLE_SUBSCRIPT_HELD_ITEM_HP_RESTORE; } } @@ -5704,9 +5704,9 @@ BOOL BattleSystem_PluckBerry(BattleSystem *battleSys, BattleContext *battleCtx, battleCtx->msgTemp = FLAVOR_DRY; if (Pokemon_GetFlavorAffinityOf(ATTACKING_MON.personality, FLAVOR_DRY) == -1) { - nextSeq = BATTLE_SUBSEQ_HELD_ITEM_DISLIKE_FLAVOR; + nextSeq = BATTLE_SUBSCRIPT_HELD_ITEM_DISLIKE_FLAVOR; } else { - nextSeq = BATTLE_SUBSEQ_HELD_ITEM_HP_RESTORE; + nextSeq = BATTLE_SUBSCRIPT_HELD_ITEM_HP_RESTORE; } } @@ -5719,9 +5719,9 @@ BOOL BattleSystem_PluckBerry(BattleSystem *battleSys, BattleContext *battleCtx, battleCtx->msgTemp = FLAVOR_SWEET; if (Pokemon_GetFlavorAffinityOf(ATTACKING_MON.personality, FLAVOR_SWEET) == -1) { - nextSeq = BATTLE_SUBSEQ_HELD_ITEM_DISLIKE_FLAVOR; + nextSeq = BATTLE_SUBSCRIPT_HELD_ITEM_DISLIKE_FLAVOR; } else { - nextSeq = BATTLE_SUBSEQ_HELD_ITEM_HP_RESTORE; + nextSeq = BATTLE_SUBSCRIPT_HELD_ITEM_HP_RESTORE; } } @@ -5734,9 +5734,9 @@ BOOL BattleSystem_PluckBerry(BattleSystem *battleSys, BattleContext *battleCtx, battleCtx->msgTemp = FLAVOR_BITTER; if (Pokemon_GetFlavorAffinityOf(ATTACKING_MON.personality, FLAVOR_BITTER) == -1) { - nextSeq = BATTLE_SUBSEQ_HELD_ITEM_DISLIKE_FLAVOR; + nextSeq = BATTLE_SUBSCRIPT_HELD_ITEM_DISLIKE_FLAVOR; } else { - nextSeq = BATTLE_SUBSEQ_HELD_ITEM_HP_RESTORE; + nextSeq = BATTLE_SUBSCRIPT_HELD_ITEM_HP_RESTORE; } } @@ -5749,9 +5749,9 @@ BOOL BattleSystem_PluckBerry(BattleSystem *battleSys, BattleContext *battleCtx, battleCtx->msgTemp = FLAVOR_SOUR; if (Pokemon_GetFlavorAffinityOf(ATTACKING_MON.personality, FLAVOR_SOUR) == -1) { - nextSeq = BATTLE_SUBSEQ_HELD_ITEM_DISLIKE_FLAVOR; + nextSeq = BATTLE_SUBSCRIPT_HELD_ITEM_DISLIKE_FLAVOR; } else { - nextSeq = BATTLE_SUBSEQ_HELD_ITEM_HP_RESTORE; + nextSeq = BATTLE_SUBSCRIPT_HELD_ITEM_HP_RESTORE; } } @@ -5761,7 +5761,7 @@ BOOL BattleSystem_PluckBerry(BattleSystem *battleSys, BattleContext *battleCtx, case PLUCK_EFFECT_ATK_UP: if (ATTACKING_MON.statBoosts[BATTLE_STAT_ATTACK] < 12) { battleCtx->msgTemp = BATTLE_STAT_ATTACK; - nextSeq = BATTLE_SUBSEQ_HELD_ITEM_RAISE_STAT; + nextSeq = BATTLE_SUBSCRIPT_HELD_ITEM_RAISE_STAT; } result = TRUE; @@ -5770,7 +5770,7 @@ BOOL BattleSystem_PluckBerry(BattleSystem *battleSys, BattleContext *battleCtx, case PLUCK_EFFECT_DEF_UP: if (ATTACKING_MON.statBoosts[BATTLE_STAT_DEFENSE] < 12) { battleCtx->msgTemp = BATTLE_STAT_DEFENSE; - nextSeq = BATTLE_SUBSEQ_HELD_ITEM_RAISE_STAT; + nextSeq = BATTLE_SUBSCRIPT_HELD_ITEM_RAISE_STAT; } result = TRUE; @@ -5779,7 +5779,7 @@ BOOL BattleSystem_PluckBerry(BattleSystem *battleSys, BattleContext *battleCtx, case PLUCK_EFFECT_SPEED_UP: if (ATTACKING_MON.statBoosts[BATTLE_STAT_SPEED] < 12) { battleCtx->msgTemp = BATTLE_STAT_SPEED; - nextSeq = BATTLE_SUBSEQ_HELD_ITEM_RAISE_STAT; + nextSeq = BATTLE_SUBSCRIPT_HELD_ITEM_RAISE_STAT; } result = TRUE; @@ -5788,7 +5788,7 @@ BOOL BattleSystem_PluckBerry(BattleSystem *battleSys, BattleContext *battleCtx, case PLUCK_EFFECT_SPATK_UP: if (ATTACKING_MON.statBoosts[BATTLE_STAT_SP_ATTACK] < 12) { battleCtx->msgTemp = BATTLE_STAT_SP_ATTACK; - nextSeq = BATTLE_SUBSEQ_HELD_ITEM_RAISE_STAT; + nextSeq = BATTLE_SUBSCRIPT_HELD_ITEM_RAISE_STAT; } result = TRUE; @@ -5797,7 +5797,7 @@ BOOL BattleSystem_PluckBerry(BattleSystem *battleSys, BattleContext *battleCtx, case PLUCK_EFFECT_SPDEF_UP: if (ATTACKING_MON.statBoosts[BATTLE_STAT_SP_DEFENSE] < 12) { battleCtx->msgTemp = BATTLE_STAT_SP_DEFENSE; - nextSeq = BATTLE_SUBSEQ_HELD_ITEM_RAISE_STAT; + nextSeq = BATTLE_SUBSCRIPT_HELD_ITEM_RAISE_STAT; } result = TRUE; @@ -5817,7 +5817,7 @@ BOOL BattleSystem_PluckBerry(BattleSystem *battleSys, BattleContext *battleCtx, } while (ATTACKING_MON.statBoosts[BATTLE_STAT_ATTACK + stat] == 12); battleCtx->msgTemp = BATTLE_STAT_ATTACK + stat; - nextSeq = BATTLE_SUBSEQ_HELD_ITEM_SHARPLY_RAISE_STAT; + nextSeq = BATTLE_SUBSCRIPT_HELD_ITEM_SHARPLY_RAISE_STAT; } result = TRUE; @@ -5826,14 +5826,14 @@ BOOL BattleSystem_PluckBerry(BattleSystem *battleSys, BattleContext *battleCtx, case PLUCK_EFFECT_CRIT_UP: if ((ATTACKING_MON.statusVolatile & VOLATILE_CONDITION_FOCUS_ENERGY) == FALSE) { - nextSeq = BATTLE_SUBSEQ_HELD_ITEM_RAISE_CRIT; + nextSeq = BATTLE_SUBSCRIPT_HELD_ITEM_RAISE_CRIT; } result = TRUE; break; case PLUCK_EFFECT_TEMP_ACC_UP: - nextSeq = BATTLE_SUBSEQ_HELD_ITEM_TEMP_ACC_UP; + nextSeq = BATTLE_SUBSCRIPT_HELD_ITEM_TEMP_ACC_UP; result = TRUE; break; @@ -5875,41 +5875,41 @@ BOOL BattleSystem_FlingItem(BattleSystem *battleSys, BattleContext *battleCtx, i switch (effect) { case FLING_EFFECT_HP_RESTORE: battleCtx->flingTemp = effectPower; - battleCtx->flingScript = BATTLE_SUBSEQ_HELD_ITEM_HP_RESTORE; + battleCtx->flingScript = BATTLE_SUBSCRIPT_HELD_ITEM_HP_RESTORE; break; case FLING_EFFECT_HP_PCT_RESTORE: battleCtx->flingTemp = BattleSystem_Divide(DEFENDING_MON.maxHP * effectPower, 100); - battleCtx->flingScript = BATTLE_SUBSEQ_HELD_ITEM_HP_RESTORE; + battleCtx->flingScript = BATTLE_SUBSCRIPT_HELD_ITEM_HP_RESTORE; break; case FLING_EFFECT_PRZ_RESTORE: if (DEFENDING_MON.status & MON_CONDITION_PARALYSIS) { - battleCtx->flingScript = BATTLE_SUBSEQ_HELD_ITEM_PRZ_RESTORE; + battleCtx->flingScript = BATTLE_SUBSCRIPT_HELD_ITEM_PRZ_RESTORE; } break; case FLING_EFFECT_SLP_RESTORE: if (DEFENDING_MON.status & MON_CONDITION_SLEEP) { - battleCtx->flingScript = BATTLE_SUBSEQ_HELD_ITEM_SLP_RESTORE; + battleCtx->flingScript = BATTLE_SUBSCRIPT_HELD_ITEM_SLP_RESTORE; } break; case FLING_EFFECT_PSN_RESTORE: if (DEFENDING_MON.status & MON_CONDITION_ANY_POISON) { - battleCtx->flingScript = BATTLE_SUBSEQ_HELD_ITEM_PSN_RESTORE; + battleCtx->flingScript = BATTLE_SUBSCRIPT_HELD_ITEM_PSN_RESTORE; } break; case FLING_EFFECT_BRN_RESTORE: if (DEFENDING_MON.status & MON_CONDITION_BURN) { - battleCtx->flingScript = BATTLE_SUBSEQ_HELD_ITEM_BRN_RESTORE; + battleCtx->flingScript = BATTLE_SUBSCRIPT_HELD_ITEM_BRN_RESTORE; } break; case FLING_EFFECT_FRZ_RESTORE: if (DEFENDING_MON.status & MON_CONDITION_FREEZE) { - battleCtx->flingScript = BATTLE_SUBSEQ_HELD_ITEM_FRZ_RESTORE; + battleCtx->flingScript = BATTLE_SUBSCRIPT_HELD_ITEM_FRZ_RESTORE; } break; @@ -5934,7 +5934,7 @@ BOOL BattleSystem_FlingItem(BattleSystem *battleSys, BattleContext *battleCtx, i BattleMon_AddVal(&DEFENDING_MON, BATTLEMON_CUR_PP_1 + slot, effectPower); BattleMon_CopyToParty(battleSys, battleCtx, battleCtx->defender); battleCtx->msgMoveTemp = DEFENDING_MON.moves[slot]; - battleCtx->flingScript = BATTLE_SUBSEQ_HELD_ITEM_PP_RESTORE; + battleCtx->flingScript = BATTLE_SUBSCRIPT_HELD_ITEM_PP_RESTORE; } break; @@ -5942,39 +5942,39 @@ BOOL BattleSystem_FlingItem(BattleSystem *battleSys, BattleContext *battleCtx, i case FLING_EFFECT_CNF_RESTORE: if (DEFENDING_MON.statusVolatile & VOLATILE_CONDITION_CONFUSION) { - battleCtx->flingScript = BATTLE_SUBSEQ_HELD_ITEM_CNF_RESTORE; + battleCtx->flingScript = BATTLE_SUBSCRIPT_HELD_ITEM_CNF_RESTORE; } break; case FLING_EFFECT_ALL_RESTORE: if ((DEFENDING_MON.status & MON_CONDITION_ANY) || (DEFENDING_MON.statusVolatile & VOLATILE_CONDITION_CONFUSION)) { if (DEFENDING_MON.status & MON_CONDITION_PARALYSIS) { - battleCtx->flingScript = BATTLE_SUBSEQ_HELD_ITEM_PRZ_RESTORE; + battleCtx->flingScript = BATTLE_SUBSCRIPT_HELD_ITEM_PRZ_RESTORE; } if (DEFENDING_MON.status & MON_CONDITION_SLEEP) { - battleCtx->flingScript = BATTLE_SUBSEQ_HELD_ITEM_SLP_RESTORE; + battleCtx->flingScript = BATTLE_SUBSCRIPT_HELD_ITEM_SLP_RESTORE; } if (DEFENDING_MON.status & MON_CONDITION_ANY_POISON) { - battleCtx->flingScript = BATTLE_SUBSEQ_HELD_ITEM_PSN_RESTORE; + battleCtx->flingScript = BATTLE_SUBSCRIPT_HELD_ITEM_PSN_RESTORE; } if (DEFENDING_MON.status & MON_CONDITION_BURN) { - battleCtx->flingScript = BATTLE_SUBSEQ_HELD_ITEM_BRN_RESTORE; + battleCtx->flingScript = BATTLE_SUBSCRIPT_HELD_ITEM_BRN_RESTORE; } if (DEFENDING_MON.status & MON_CONDITION_FREEZE) { - battleCtx->flingScript = BATTLE_SUBSEQ_HELD_ITEM_FRZ_RESTORE; + battleCtx->flingScript = BATTLE_SUBSCRIPT_HELD_ITEM_FRZ_RESTORE; } if (DEFENDING_MON.statusVolatile & VOLATILE_CONDITION_CONFUSION) { - battleCtx->flingScript = BATTLE_SUBSEQ_HELD_ITEM_CNF_RESTORE; + battleCtx->flingScript = BATTLE_SUBSCRIPT_HELD_ITEM_CNF_RESTORE; } if ((DEFENDING_MON.status & MON_CONDITION_ANY) && (DEFENDING_MON.statusVolatile & VOLATILE_CONDITION_CONFUSION)) { - battleCtx->flingScript = BATTLE_SUBSEQ_HELD_ITEM_MULTI_RESTORE; + battleCtx->flingScript = BATTLE_SUBSCRIPT_HELD_ITEM_MULTI_RESTORE; } } break; @@ -5984,9 +5984,9 @@ BOOL BattleSystem_FlingItem(BattleSystem *battleSys, BattleContext *battleCtx, i battleCtx->msgTemp = FLAVOR_SPICY; if (Pokemon_GetFlavorAffinityOf(DEFENDING_MON.personality, FLAVOR_SPICY) == -1) { - battleCtx->flingScript = BATTLE_SUBSEQ_HELD_ITEM_DISLIKE_FLAVOR; + battleCtx->flingScript = BATTLE_SUBSCRIPT_HELD_ITEM_DISLIKE_FLAVOR; } else { - battleCtx->flingScript = BATTLE_SUBSEQ_HELD_ITEM_HP_RESTORE; + battleCtx->flingScript = BATTLE_SUBSCRIPT_HELD_ITEM_HP_RESTORE; } break; @@ -5995,9 +5995,9 @@ BOOL BattleSystem_FlingItem(BattleSystem *battleSys, BattleContext *battleCtx, i battleCtx->msgTemp = FLAVOR_DRY; if (Pokemon_GetFlavorAffinityOf(DEFENDING_MON.personality, FLAVOR_DRY) == -1) { - battleCtx->flingScript = BATTLE_SUBSEQ_HELD_ITEM_DISLIKE_FLAVOR; + battleCtx->flingScript = BATTLE_SUBSCRIPT_HELD_ITEM_DISLIKE_FLAVOR; } else { - battleCtx->flingScript = BATTLE_SUBSEQ_HELD_ITEM_HP_RESTORE; + battleCtx->flingScript = BATTLE_SUBSCRIPT_HELD_ITEM_HP_RESTORE; } break; @@ -6006,9 +6006,9 @@ BOOL BattleSystem_FlingItem(BattleSystem *battleSys, BattleContext *battleCtx, i battleCtx->msgTemp = FLAVOR_SWEET; if (Pokemon_GetFlavorAffinityOf(DEFENDING_MON.personality, FLAVOR_SWEET) == -1) { - battleCtx->flingScript = BATTLE_SUBSEQ_HELD_ITEM_DISLIKE_FLAVOR; + battleCtx->flingScript = BATTLE_SUBSCRIPT_HELD_ITEM_DISLIKE_FLAVOR; } else { - battleCtx->flingScript = BATTLE_SUBSEQ_HELD_ITEM_HP_RESTORE; + battleCtx->flingScript = BATTLE_SUBSCRIPT_HELD_ITEM_HP_RESTORE; } break; @@ -6017,9 +6017,9 @@ BOOL BattleSystem_FlingItem(BattleSystem *battleSys, BattleContext *battleCtx, i battleCtx->msgTemp = FLAVOR_BITTER; if (Pokemon_GetFlavorAffinityOf(DEFENDING_MON.personality, FLAVOR_BITTER) == -1) { - battleCtx->flingScript = BATTLE_SUBSEQ_HELD_ITEM_DISLIKE_FLAVOR; + battleCtx->flingScript = BATTLE_SUBSCRIPT_HELD_ITEM_DISLIKE_FLAVOR; } else { - battleCtx->flingScript = BATTLE_SUBSEQ_HELD_ITEM_HP_RESTORE; + battleCtx->flingScript = BATTLE_SUBSCRIPT_HELD_ITEM_HP_RESTORE; } break; @@ -6028,9 +6028,9 @@ BOOL BattleSystem_FlingItem(BattleSystem *battleSys, BattleContext *battleCtx, i battleCtx->msgTemp = FLAVOR_SOUR; if (Pokemon_GetFlavorAffinityOf(DEFENDING_MON.personality, FLAVOR_SOUR) == -1) { - battleCtx->flingScript = BATTLE_SUBSEQ_HELD_ITEM_DISLIKE_FLAVOR; + battleCtx->flingScript = BATTLE_SUBSCRIPT_HELD_ITEM_DISLIKE_FLAVOR; } else { - battleCtx->flingScript = BATTLE_SUBSEQ_HELD_ITEM_HP_RESTORE; + battleCtx->flingScript = BATTLE_SUBSCRIPT_HELD_ITEM_HP_RESTORE; } break; @@ -6038,7 +6038,7 @@ BOOL BattleSystem_FlingItem(BattleSystem *battleSys, BattleContext *battleCtx, i for (int i = BATTLE_STAT_HP; i < BATTLE_STAT_MAX; i++) { if (DEFENDING_MON.statBoosts[i] < 6) { DEFENDING_MON.statBoosts[i] = 6; - battleCtx->flingScript = BATTLE_SUBSEQ_HELD_ITEM_STATDOWN_RESTORE; + battleCtx->flingScript = BATTLE_SUBSCRIPT_HELD_ITEM_STATDOWN_RESTORE; } } break; @@ -6046,72 +6046,72 @@ BOOL BattleSystem_FlingItem(BattleSystem *battleSys, BattleContext *battleCtx, i case FLING_EFFECT_HEAL_INFATUATION: if (DEFENDING_MON.statusVolatile & VOLATILE_CONDITION_ATTRACT) { battleCtx->msgTemp = MSGCOND_INFATUATION; - battleCtx->flingScript = BATTLE_SUBSEQ_HELD_ITEM_HEAL_INFATUATION; + battleCtx->flingScript = BATTLE_SUBSCRIPT_HELD_ITEM_HEAL_INFATUATION; } break; case FLING_EFFECT_FLINCH: battleCtx->sideEffectMon = battler; battleCtx->sideEffectType = SIDE_EFFECT_TYPE_INDIRECT; - battleCtx->flingScript = BATTLE_SUBSEQ_FLINCH_MON; + battleCtx->flingScript = BATTLE_SUBSCRIPT_FLINCH_MON; break; case FLING_EFFECT_PARALYZE: battleCtx->sideEffectMon = battler; battleCtx->sideEffectType = SIDE_EFFECT_TYPE_INDIRECT; - battleCtx->flingScript = BATTLE_SUBSEQ_PARALYZE; + battleCtx->flingScript = BATTLE_SUBSCRIPT_PARALYZE; break; case FLING_EFFECT_POISON: battleCtx->sideEffectMon = battler; battleCtx->sideEffectType = SIDE_EFFECT_TYPE_INDIRECT; - battleCtx->flingScript = BATTLE_SUBSEQ_POISON; + battleCtx->flingScript = BATTLE_SUBSCRIPT_POISON; break; case FLING_EFFECT_BADLY_POISON: battleCtx->sideEffectMon = battler; battleCtx->sideEffectType = SIDE_EFFECT_TYPE_INDIRECT; - battleCtx->flingScript = BATTLE_SUBSEQ_BADLY_POISON; + battleCtx->flingScript = BATTLE_SUBSCRIPT_BADLY_POISON; break; case FLING_EFFECT_BURN: battleCtx->sideEffectMon = battler; battleCtx->sideEffectType = SIDE_EFFECT_TYPE_INDIRECT; - battleCtx->flingScript = BATTLE_SUBSEQ_BURN; + battleCtx->flingScript = BATTLE_SUBSCRIPT_BURN; break; case FLING_EFFECT_ATK_UP: if (DEFENDING_MON.statBoosts[BATTLE_STAT_ATTACK] < 12) { battleCtx->msgTemp = BATTLE_STAT_ATTACK; - battleCtx->flingScript = BATTLE_SUBSEQ_HELD_ITEM_RAISE_STAT; + battleCtx->flingScript = BATTLE_SUBSCRIPT_HELD_ITEM_RAISE_STAT; } break; case FLING_EFFECT_DEF_UP: if (DEFENDING_MON.statBoosts[BATTLE_STAT_DEFENSE] < 12) { battleCtx->msgTemp = BATTLE_STAT_DEFENSE; - battleCtx->flingScript = BATTLE_SUBSEQ_HELD_ITEM_RAISE_STAT; + battleCtx->flingScript = BATTLE_SUBSCRIPT_HELD_ITEM_RAISE_STAT; } break; case FLING_EFFECT_SPEED_UP: if (DEFENDING_MON.statBoosts[BATTLE_STAT_SPEED] < 12) { battleCtx->msgTemp = BATTLE_STAT_SPEED; - battleCtx->flingScript = BATTLE_SUBSEQ_HELD_ITEM_RAISE_STAT; + battleCtx->flingScript = BATTLE_SUBSCRIPT_HELD_ITEM_RAISE_STAT; } break; case FLING_EFFECT_SPATK_UP: if (DEFENDING_MON.statBoosts[BATTLE_STAT_SP_ATTACK] < 12) { battleCtx->msgTemp = BATTLE_STAT_SP_ATTACK; - battleCtx->flingScript = BATTLE_SUBSEQ_HELD_ITEM_RAISE_STAT; + battleCtx->flingScript = BATTLE_SUBSCRIPT_HELD_ITEM_RAISE_STAT; } break; case FLING_EFFECT_SPDEF_UP: if (DEFENDING_MON.statBoosts[BATTLE_STAT_SP_DEFENSE] < 12) { battleCtx->msgTemp = BATTLE_STAT_SP_DEFENSE; - battleCtx->flingScript = BATTLE_SUBSEQ_HELD_ITEM_RAISE_STAT; + battleCtx->flingScript = BATTLE_SUBSCRIPT_HELD_ITEM_RAISE_STAT; } break; @@ -6130,7 +6130,7 @@ BOOL BattleSystem_FlingItem(BattleSystem *battleSys, BattleContext *battleCtx, i } while (DEFENDING_MON.statBoosts[BATTLE_STAT_ATTACK + stat] == 12); battleCtx->msgTemp = BATTLE_STAT_ATTACK + stat; - battleCtx->flingScript = BATTLE_SUBSEQ_HELD_ITEM_SHARPLY_RAISE_STAT; + battleCtx->flingScript = BATTLE_SUBSCRIPT_HELD_ITEM_SHARPLY_RAISE_STAT; } break; @@ -6138,12 +6138,12 @@ BOOL BattleSystem_FlingItem(BattleSystem *battleSys, BattleContext *battleCtx, i case FLING_EFFECT_CRIT_UP: if ((DEFENDING_MON.statusVolatile & VOLATILE_CONDITION_FOCUS_ENERGY) == FALSE) { - battleCtx->flingScript = BATTLE_SUBSEQ_HELD_ITEM_RAISE_CRIT; + battleCtx->flingScript = BATTLE_SUBSCRIPT_HELD_ITEM_RAISE_CRIT; } break; case FLING_EFFECT_TEMP_ACC_UP: - battleCtx->flingScript = BATTLE_SUBSEQ_HELD_ITEM_TEMP_ACC_UP; + battleCtx->flingScript = BATTLE_SUBSCRIPT_HELD_ITEM_TEMP_ACC_UP; break; default: @@ -6329,7 +6329,7 @@ BOOL BattleSystem_TriggerFormChange(BattleSystem *battleSys, BattleContext *batt battleCtx->battleMons[battleCtx->msgBattlerTemp].type1 = TYPE_NORMAL; battleCtx->battleMons[battleCtx->msgBattlerTemp].type2 = TYPE_NORMAL; battleCtx->battleMons[battleCtx->msgBattlerTemp].formNum = 0; - *subscript = BATTLE_SUBSEQ_FORM_CHANGE; + *subscript = BATTLE_SUBSCRIPT_FORM_CHANGE; result = TRUE; break; } else if (WEATHER_IS_SUN @@ -6338,7 +6338,7 @@ BOOL BattleSystem_TriggerFormChange(BattleSystem *battleSys, BattleContext *batt battleCtx->battleMons[battleCtx->msgBattlerTemp].type1 = TYPE_FIRE; battleCtx->battleMons[battleCtx->msgBattlerTemp].type2 = TYPE_FIRE; battleCtx->battleMons[battleCtx->msgBattlerTemp].formNum = 1; - *subscript = BATTLE_SUBSEQ_FORM_CHANGE; + *subscript = BATTLE_SUBSCRIPT_FORM_CHANGE; result = TRUE; break; } else if (WEATHER_IS_RAIN @@ -6347,7 +6347,7 @@ BOOL BattleSystem_TriggerFormChange(BattleSystem *battleSys, BattleContext *batt battleCtx->battleMons[battleCtx->msgBattlerTemp].type1 = TYPE_WATER; battleCtx->battleMons[battleCtx->msgBattlerTemp].type2 = TYPE_WATER; battleCtx->battleMons[battleCtx->msgBattlerTemp].formNum = 2; - *subscript = BATTLE_SUBSEQ_FORM_CHANGE; + *subscript = BATTLE_SUBSCRIPT_FORM_CHANGE; result = TRUE; break; } else if (WEATHER_IS_HAIL @@ -6356,7 +6356,7 @@ BOOL BattleSystem_TriggerFormChange(BattleSystem *battleSys, BattleContext *batt battleCtx->battleMons[battleCtx->msgBattlerTemp].type1 = TYPE_ICE; battleCtx->battleMons[battleCtx->msgBattlerTemp].type2 = TYPE_ICE; battleCtx->battleMons[battleCtx->msgBattlerTemp].formNum = 3; - *subscript = BATTLE_SUBSEQ_FORM_CHANGE; + *subscript = BATTLE_SUBSCRIPT_FORM_CHANGE; result = TRUE; break; } @@ -6365,7 +6365,7 @@ BOOL BattleSystem_TriggerFormChange(BattleSystem *battleSys, BattleContext *batt battleCtx->battleMons[battleCtx->msgBattlerTemp].type1 = TYPE_NORMAL; battleCtx->battleMons[battleCtx->msgBattlerTemp].type2 = TYPE_NORMAL; battleCtx->battleMons[battleCtx->msgBattlerTemp].formNum = 0; - *subscript = BATTLE_SUBSEQ_FORM_CHANGE; + *subscript = BATTLE_SUBSCRIPT_FORM_CHANGE; result = TRUE; break; } @@ -6377,28 +6377,28 @@ BOOL BattleSystem_TriggerFormChange(BattleSystem *battleSys, BattleContext *batt if ((battleCtx->fieldConditionsMask & FIELD_CONDITION_CASTFORM) == FALSE && battleCtx->battleMons[battleCtx->msgBattlerTemp].formNum == 1) { battleCtx->battleMons[battleCtx->msgBattlerTemp].formNum = 0; - *subscript = BATTLE_SUBSEQ_FORM_CHANGE; + *subscript = BATTLE_SUBSCRIPT_FORM_CHANGE; result = TRUE; break; } else if (WEATHER_IS_SUN && battleCtx->battleMons[battleCtx->msgBattlerTemp].formNum == 0) { battleCtx->battleMons[battleCtx->msgBattlerTemp].formNum = 1; - *subscript = BATTLE_SUBSEQ_FORM_CHANGE; + *subscript = BATTLE_SUBSCRIPT_FORM_CHANGE; result = TRUE; break; } else if (WEATHER_IS_RAIN && battleCtx->battleMons[battleCtx->msgBattlerTemp].formNum == 1) { battleCtx->battleMons[battleCtx->msgBattlerTemp].formNum = 0; - *subscript = BATTLE_SUBSEQ_FORM_CHANGE; + *subscript = BATTLE_SUBSCRIPT_FORM_CHANGE; result = TRUE; break; } else if (WEATHER_IS_HAIL && battleCtx->battleMons[battleCtx->msgBattlerTemp].formNum == 1) { battleCtx->battleMons[battleCtx->msgBattlerTemp].formNum = 0; - *subscript = BATTLE_SUBSEQ_FORM_CHANGE; + *subscript = BATTLE_SUBSCRIPT_FORM_CHANGE; result = TRUE; break; } } else if (battleCtx->battleMons[battleCtx->msgBattlerTemp].formNum == 1) { battleCtx->battleMons[battleCtx->msgBattlerTemp].formNum = 0; - *subscript = BATTLE_SUBSEQ_FORM_CHANGE; + *subscript = BATTLE_SUBSCRIPT_FORM_CHANGE; result = TRUE; break; } @@ -6411,7 +6411,7 @@ BOOL BattleSystem_TriggerFormChange(BattleSystem *battleSys, BattleContext *batt if (battleCtx->battleMons[battleCtx->msgBattlerTemp].formNum != arceusForm) { battleCtx->battleMons[battleCtx->msgBattlerTemp].formNum = arceusForm; - *subscript = BATTLE_SUBSEQ_FORM_CHANGE; + *subscript = BATTLE_SUBSCRIPT_FORM_CHANGE; result = TRUE; break; } @@ -6456,11 +6456,11 @@ BOOL BattleSystem_TriggerFormChange(BattleSystem *battleSys, BattleContext *batt BattleIO_UpdatePartyMon(battleSys, battleCtx, battleCtx->msgBattlerTemp); Heap_FreeToHeap(mon); - *subscript = BATTLE_SUBSEQ_FORM_CHANGE; + *subscript = BATTLE_SUBSCRIPT_FORM_CHANGE; result = TRUE; break; } else { - *subscript = BATTLE_SUBSEQ_GIRATINA_FORM_CHANGE; + *subscript = BATTLE_SUBSCRIPT_GIRATINA_FORM_CHANGE; result = TRUE; break; } @@ -7358,7 +7358,7 @@ BOOL BattleSystem_TriggerHeldItemOnPivotMove(BattleSystem *battleSys, BattleCont && ATTACKING_MON.curHP) { battleCtx->hpCalcTemp = BattleSystem_Divide(ATTACKER_SELF_TURN_FLAGS.shellBellDamageDealt * -1, attackerItemPower); battleCtx->msgBattlerTemp = battleCtx->attacker; - *subscript = BATTLE_SUBSEQ_RESTORE_A_LITTLE_HP; + *subscript = BATTLE_SUBSCRIPT_RESTORE_A_LITTLE_HP; result = TRUE; } @@ -7369,7 +7369,7 @@ BOOL BattleSystem_TriggerHeldItemOnPivotMove(BattleSystem *battleSys, BattleCont && ATTACKING_MON.curHP) { battleCtx->hpCalcTemp = BattleSystem_Divide(ATTACKING_MON.maxHP * -1, 10); battleCtx->msgBattlerTemp = battleCtx->attacker; - *subscript = BATTLE_SUBSEQ_LOSE_HP_FROM_ITEM; + *subscript = BATTLE_SUBSCRIPT_LOSE_HP_FROM_ITEM; result = TRUE; } @@ -7378,7 +7378,7 @@ BOOL BattleSystem_TriggerHeldItemOnPivotMove(BattleSystem *battleSys, BattleCont && Battler_Ability(battleCtx, battleCtx->attacker) != ABILITY_MAGIC_GUARD && DEFENDER_SELF_TURN_FLAGS.physicalDamageTaken) { battleCtx->hpCalcTemp = BattleSystem_Divide(ATTACKING_MON.maxHP * -1, defenderItemPower); - *subscript = BATTLE_SUBSEQ_HELD_ITEM_RECOIL_WHEN_HIT; + *subscript = BATTLE_SUBSCRIPT_HELD_ITEM_RECOIL_WHEN_HIT; result = TRUE; } @@ -7388,7 +7388,7 @@ BOOL BattleSystem_TriggerHeldItemOnPivotMove(BattleSystem *battleSys, BattleCont && (battleCtx->sideConditions[attackingSide].knockedOffItemsMask & FlagIndex(battleCtx->selectedPartySlot[battleCtx->attacker])) == FALSE && (DEFENDER_SELF_TURN_FLAGS.physicalDamageTaken || DEFENDER_SELF_TURN_FLAGS.specialDamageTaken) && (CURRENT_MOVE_DATA.flags & MOVE_FLAG_MAKES_CONTACT)) { - *subscript = BATTLE_SUBSEQ_TRANSFER_STICKY_BARB; + *subscript = BATTLE_SUBSCRIPT_TRANSFER_STICKY_BARB; result = TRUE; } diff --git a/src/overlay016/battle_script.c b/src/overlay016/battle_script.c index 361b4781d1..23d947eb68 100644 --- a/src/overlay016/battle_script.c +++ b/src/overlay016/battle_script.c @@ -2,6 +2,7 @@ #include #include "consts/generated/c/abilities.h" +#include "consts/generated/c/battle_subscripts.h" #include "consts/generated/c/gender.h" #include "constants/battle.h" @@ -12,7 +13,6 @@ #include "constants/sdat.h" #include "constants/species.h" #include "constants/trainer.h" -#include "constants/narc_files/battle_skill_subseq.h" #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02007768_decl.h" @@ -1838,7 +1838,7 @@ static BOOL BtlCmd_PlayMoveAnimation(BattleSystem *battleSys, BattleContext *bat } if (BattleSystem_AnimationsOn(battleSys) == FALSE) { - BattleScript_Call(battleCtx, NARC_INDEX_BATTLE__SKILL__SUB_SEQ, BATTLE_SUBSEQ_WAIT_MOVE_ANIMATION); + BattleScript_Call(battleCtx, NARC_INDEX_BATTLE__SKILL__SUB_SEQ, BATTLE_SUBSCRIPT_WAIT_MOVE_ANIMATION); } return FALSE; @@ -1883,7 +1883,7 @@ static BOOL BtlCmd_PlayMoveAnimationA2D(BattleSystem *battleSys, BattleContext * } if (BattleSystem_AnimationsOn(battleSys) == FALSE) { - BattleScript_Call(battleCtx, NARC_INDEX_BATTLE__SKILL__SUB_SEQ, BATTLE_SUBSEQ_WAIT_MOVE_ANIMATION); + BattleScript_Call(battleCtx, NARC_INDEX_BATTLE__SKILL__SUB_SEQ, BATTLE_SUBSCRIPT_WAIT_MOVE_ANIMATION); } return FALSE; @@ -2364,7 +2364,7 @@ static BOOL BtlCmd_JumpToMove(BattleSystem *battleSys, BattleContext *battleCtx) if (battleCtx->defender == BATTLER_NONE) { battleCtx->commandNext = BATTLE_CONTROL_UPDATE_MOVE_BUFFERS; - BattleScript_Jump(battleCtx, NARC_INDEX_BATTLE__SKILL__SUB_SEQ, BATTLE_SUBSEQ_NO_TARGET); + BattleScript_Jump(battleCtx, NARC_INDEX_BATTLE__SKILL__SUB_SEQ, BATTLE_SUBSCRIPT_NO_TARGET); } else { BattleScript_Jump(battleCtx, NARC_INDEX_BATTLE__SKILL__WAZA_SEQ, battleCtx->moveCur); } @@ -3748,7 +3748,7 @@ static BOOL BtlCmd_SetMirrorMove(BattleSystem *battleSys, BattleContext *battleC if (battleCtx->defender == BATTLER_NONE) { battleCtx->commandNext = BATTLE_CONTROL_UPDATE_MOVE_BUFFERS; - BattleScript_Jump(battleCtx, NARC_INDEX_BATTLE__SKILL__SUB_SEQ, BATTLE_SUBSEQ_NO_TARGET); + BattleScript_Jump(battleCtx, NARC_INDEX_BATTLE__SKILL__SUB_SEQ, BATTLE_SUBSCRIPT_NO_TARGET); } else { ATTACKER_ACTION[BATTLE_ACTION_CHOOSE_TARGET] = battleCtx->defender; BattleScript_Jump(battleCtx, NARC_INDEX_BATTLE__SKILL__WAZA_SEQ, move); @@ -4876,7 +4876,7 @@ static BOOL BtlCmd_Counter(BattleSystem *battleSys, BattleContext *battleCtx) // If there are no possible targets, fail if (DEFENDING_MON.curHP == 0) { battleCtx->commandNext = BATTLE_CONTROL_UPDATE_MOVE_BUFFERS; - BattleScript_Jump(battleCtx, NARC_INDEX_BATTLE__SKILL__SUB_SEQ, BATTLE_SUBSEQ_NO_TARGET); + BattleScript_Jump(battleCtx, NARC_INDEX_BATTLE__SKILL__SUB_SEQ, BATTLE_SUBSCRIPT_NO_TARGET); } } @@ -4929,7 +4929,7 @@ static BOOL BtlCmd_MirrorCoat(BattleSystem *battleSys, BattleContext *battleCtx) // If there are no possible targets, fail if (DEFENDING_MON.curHP == 0) { battleCtx->commandNext = BATTLE_CONTROL_UPDATE_MOVE_BUFFERS; - BattleScript_Jump(battleCtx, NARC_INDEX_BATTLE__SKILL__SUB_SEQ, BATTLE_SUBSEQ_NO_TARGET); + BattleScript_Jump(battleCtx, NARC_INDEX_BATTLE__SKILL__SUB_SEQ, BATTLE_SUBSCRIPT_NO_TARGET); } } @@ -6144,7 +6144,7 @@ static BOOL BtlCmd_RapidSpin(BattleSystem *battleSys, BattleContext *battleCtx) ATTACKING_MON.statusVolatile &= ~VOLATILE_CONDITION_BIND; battleCtx->msgBattlerTemp = ATTACKING_MON.moveEffectsData.bindTarget; battleCtx->msgMoveTemp = ATTACKING_MON.moveEffectsData.bindingMove; - BattleScript_Call(battleCtx, NARC_INDEX_BATTLE__SKILL__SUB_SEQ, BATTLE_SUBSEQ_BREAK_BIND_EFFECT); + BattleScript_Call(battleCtx, NARC_INDEX_BATTLE__SKILL__SUB_SEQ, BATTLE_SUBSCRIPT_BREAK_BIND_EFFECT); return FALSE; } @@ -6153,7 +6153,7 @@ static BOOL BtlCmd_RapidSpin(BattleSystem *battleSys, BattleContext *battleCtx) ATTACKING_MON.moveEffectsMask &= ~MOVE_EFFECT_LEECH_SEED; ATTACKING_MON.moveEffectsMask &= ~MOVE_EFFECT_LEECH_SEED_RECIPIENT; battleCtx->msgMoveTemp = MOVE_LEECH_SEED; - BattleScript_Call(battleCtx, NARC_INDEX_BATTLE__SKILL__SUB_SEQ, BATTLE_SUBSEQ_BLOW_AWAY_HAZARDS); + BattleScript_Call(battleCtx, NARC_INDEX_BATTLE__SKILL__SUB_SEQ, BATTLE_SUBSCRIPT_BLOW_AWAY_HAZARDS); return FALSE; } @@ -6162,7 +6162,7 @@ static BOOL BtlCmd_RapidSpin(BattleSystem *battleSys, BattleContext *battleCtx) battleCtx->sideConditionsMask[side] &= ~SIDE_CONDITION_SPIKES; battleCtx->sideConditions[side].spikesLayers = 0; battleCtx->msgMoveTemp = MOVE_SPIKES; - BattleScript_Call(battleCtx, NARC_INDEX_BATTLE__SKILL__SUB_SEQ, BATTLE_SUBSEQ_BLOW_AWAY_HAZARDS); + BattleScript_Call(battleCtx, NARC_INDEX_BATTLE__SKILL__SUB_SEQ, BATTLE_SUBSCRIPT_BLOW_AWAY_HAZARDS); return FALSE; } @@ -6172,7 +6172,7 @@ static BOOL BtlCmd_RapidSpin(BattleSystem *battleSys, BattleContext *battleCtx) battleCtx->sideConditions[side].toxicSpikesLayers = 0; battleCtx->msgMoveTemp = MOVE_TOXIC_SPIKES; - BattleScript_Call(battleCtx, NARC_INDEX_BATTLE__SKILL__SUB_SEQ, BATTLE_SUBSEQ_BLOW_AWAY_HAZARDS); + BattleScript_Call(battleCtx, NARC_INDEX_BATTLE__SKILL__SUB_SEQ, BATTLE_SUBSCRIPT_BLOW_AWAY_HAZARDS); return FALSE; } @@ -6180,7 +6180,7 @@ static BOOL BtlCmd_RapidSpin(BattleSystem *battleSys, BattleContext *battleCtx) if (battleCtx->sideConditionsMask[side] & SIDE_CONDITION_STEALTH_ROCK) { battleCtx->sideConditionsMask[side] &= ~SIDE_CONDITION_STEALTH_ROCK; battleCtx->msgMoveTemp = MOVE_STEALTH_ROCK; - BattleScript_Call(battleCtx, NARC_INDEX_BATTLE__SKILL__SUB_SEQ, BATTLE_SUBSEQ_BLOW_AWAY_HAZARDS); + BattleScript_Call(battleCtx, NARC_INDEX_BATTLE__SKILL__SUB_SEQ, BATTLE_SUBSCRIPT_BLOW_AWAY_HAZARDS); return FALSE; } @@ -7416,7 +7416,7 @@ static BOOL BtlCmd_TryMetalBurst(BattleSystem *battleSys, BattleContext *battleC if (DEFENDING_MON.curHP == 0) { battleCtx->commandNext = BATTLE_CONTROL_UPDATE_MOVE_BUFFERS; - BattleScript_Jump(battleCtx, NARC_INDEX_BATTLE__SKILL__SUB_SEQ, BATTLE_SUBSEQ_NO_TARGET); + BattleScript_Jump(battleCtx, NARC_INDEX_BATTLE__SKILL__SUB_SEQ, BATTLE_SUBSCRIPT_NO_TARGET); } } From 13e7b342c2870f9a4bfb71f297375f3416428533 Mon Sep 17 00:00:00 2001 From: Rachel Date: Sat, 6 Jan 2024 22:06:04 -0800 Subject: [PATCH 4/7] Dump battle scripts to ASM-macro definitions --- .../scripts/effects/effect_script_0000.s | 8 + .../scripts/effects/effect_script_0001.s | 7 + .../scripts/effects/effect_script_0002.s | 9 + .../scripts/effects/effect_script_0003.s | 9 + .../scripts/effects/effect_script_0004.s | 9 + .../scripts/effects/effect_script_0005.s | 9 + .../scripts/effects/effect_script_0006.s | 9 + .../scripts/effects/effect_script_0007.s | 32 ++++ .../scripts/effects/effect_script_0008.s | 22 +++ .../scripts/effects/effect_script_0009.s | 15 ++ .../scripts/effects/effect_script_0010.s | 7 + .../scripts/effects/effect_script_0011.s | 7 + .../scripts/effects/effect_script_0012.s | 8 + .../scripts/effects/effect_script_0013.s | 7 + .../scripts/effects/effect_script_0014.s | 8 + .../scripts/effects/effect_script_0015.s | 8 + .../scripts/effects/effect_script_0016.s | 7 + .../scripts/effects/effect_script_0017.s | 8 + .../scripts/effects/effect_script_0018.s | 7 + .../scripts/effects/effect_script_0019.s | 7 + .../scripts/effects/effect_script_0020.s | 7 + .../scripts/effects/effect_script_0021.s | 8 + .../scripts/effects/effect_script_0022.s | 8 + .../scripts/effects/effect_script_0023.s | 7 + .../scripts/effects/effect_script_0024.s | 7 + .../scripts/effects/effect_script_0025.s | 7 + .../scripts/effects/effect_script_0026.s | 13 ++ .../scripts/effects/effect_script_0027.s | 12 ++ .../scripts/effects/effect_script_0028.s | 7 + .../scripts/effects/effect_script_0029.s | 10 ++ .../scripts/effects/effect_script_0030.s | 7 + .../scripts/effects/effect_script_0031.s | 9 + .../scripts/effects/effect_script_0032.s | 7 + .../scripts/effects/effect_script_0033.s | 7 + .../scripts/effects/effect_script_0034.s | 9 + .../scripts/effects/effect_script_0035.s | 7 + .../scripts/effects/effect_script_0036.s | 11 ++ .../scripts/effects/effect_script_0037.s | 7 + .../scripts/effects/effect_script_0038.s | 7 + .../scripts/effects/effect_script_0039.s | 24 +++ .../scripts/effects/effect_script_0040.s | 10 ++ .../scripts/effects/effect_script_0041.s | 13 ++ .../scripts/effects/effect_script_0042.s | 9 + .../scripts/effects/effect_script_0043.s | 9 + .../scripts/effects/effect_script_0044.s | 10 ++ .../scripts/effects/effect_script_0045.s | 13 ++ .../scripts/effects/effect_script_0046.s | 7 + .../scripts/effects/effect_script_0047.s | 12 ++ .../scripts/effects/effect_script_0048.s | 13 ++ .../scripts/effects/effect_script_0049.s | 7 + .../scripts/effects/effect_script_0050.s | 7 + .../scripts/effects/effect_script_0051.s | 7 + .../scripts/effects/effect_script_0052.s | 7 + .../scripts/effects/effect_script_0053.s | 7 + .../scripts/effects/effect_script_0054.s | 7 + .../scripts/effects/effect_script_0055.s | 8 + .../scripts/effects/effect_script_0056.s | 8 + .../scripts/effects/effect_script_0057.s | 7 + .../scripts/effects/effect_script_0058.s | 7 + .../scripts/effects/effect_script_0059.s | 7 + .../scripts/effects/effect_script_0060.s | 7 + .../scripts/effects/effect_script_0061.s | 8 + .../scripts/effects/effect_script_0062.s | 7 + .../scripts/effects/effect_script_0063.s | 8 + .../scripts/effects/effect_script_0064.s | 8 + .../scripts/effects/effect_script_0065.s | 7 + .../scripts/effects/effect_script_0066.s | 7 + .../scripts/effects/effect_script_0067.s | 7 + .../scripts/effects/effect_script_0068.s | 9 + .../scripts/effects/effect_script_0069.s | 9 + .../scripts/effects/effect_script_0070.s | 9 + .../scripts/effects/effect_script_0071.s | 9 + .../scripts/effects/effect_script_0072.s | 9 + .../scripts/effects/effect_script_0073.s | 9 + .../scripts/effects/effect_script_0074.s | 8 + .../scripts/effects/effect_script_0075.s | 24 +++ .../scripts/effects/effect_script_0076.s | 9 + .../scripts/effects/effect_script_0077.s | 11 ++ .../scripts/effects/effect_script_0078.s | 8 + .../scripts/effects/effect_script_0079.s | 7 + .../scripts/effects/effect_script_0080.s | 9 + .../scripts/effects/effect_script_0081.s | 9 + .../scripts/effects/effect_script_0082.s | 7 + .../scripts/effects/effect_script_0083.s | 12 ++ .../scripts/effects/effect_script_0084.s | 7 + .../scripts/effects/effect_script_0085.s | 7 + .../scripts/effects/effect_script_0086.s | 7 + .../scripts/effects/effect_script_0087.s | 9 + .../scripts/effects/effect_script_0088.s | 16 ++ .../scripts/effects/effect_script_0089.s | 8 + .../scripts/effects/effect_script_0090.s | 7 + .../scripts/effects/effect_script_0091.s | 7 + .../scripts/effects/effect_script_0092.s | 18 ++ .../scripts/effects/effect_script_0093.s | 7 + .../scripts/effects/effect_script_0094.s | 7 + .../scripts/effects/effect_script_0095.s | 7 + .../scripts/effects/effect_script_0096.s | 8 + .../scripts/effects/effect_script_0097.s | 14 ++ .../scripts/effects/effect_script_0098.s | 7 + .../scripts/effects/effect_script_0099.s | 9 + .../scripts/effects/effect_script_0100.s | 7 + .../scripts/effects/effect_script_0101.s | 8 + .../scripts/effects/effect_script_0102.s | 7 + .../scripts/effects/effect_script_0103.s | 8 + .../scripts/effects/effect_script_0104.s | 11 ++ .../scripts/effects/effect_script_0105.s | 9 + .../scripts/effects/effect_script_0106.s | 7 + .../scripts/effects/effect_script_0107.s | 14 ++ .../scripts/effects/effect_script_0108.s | 7 + .../scripts/effects/effect_script_0109.s | 18 ++ .../scripts/effects/effect_script_0110.s | 8 + .../scripts/effects/effect_script_0111.s | 7 + .../scripts/effects/effect_script_0112.s | 14 ++ .../scripts/effects/effect_script_0113.s | 8 + .../scripts/effects/effect_script_0114.s | 7 + .../scripts/effects/effect_script_0115.s | 22 +++ .../scripts/effects/effect_script_0116.s | 7 + .../scripts/effects/effect_script_0117.s | 9 + .../scripts/effects/effect_script_0118.s | 7 + .../scripts/effects/effect_script_0119.s | 9 + .../scripts/effects/effect_script_0120.s | 8 + .../scripts/effects/effect_script_0121.s | 11 ++ .../scripts/effects/effect_script_0122.s | 16 ++ .../scripts/effects/effect_script_0123.s | 12 ++ .../scripts/effects/effect_script_0124.s | 7 + .../scripts/effects/effect_script_0125.s | 9 + .../scripts/effects/effect_script_0126.s | 16 ++ .../scripts/effects/effect_script_0127.s | 7 + .../scripts/effects/effect_script_0128.s | 8 + .../scripts/effects/effect_script_0129.s | 9 + .../scripts/effects/effect_script_0130.s | 13 ++ .../scripts/effects/effect_script_0131.s | 8 + .../scripts/effects/effect_script_0132.s | 10 ++ .../scripts/effects/effect_script_0133.s | 8 + .../scripts/effects/effect_script_0134.s | 8 + .../scripts/effects/effect_script_0135.s | 9 + .../scripts/effects/effect_script_0136.s | 22 +++ .../scripts/effects/effect_script_0137.s | 22 +++ .../scripts/effects/effect_script_0138.s | 9 + .../scripts/effects/effect_script_0139.s | 9 + .../scripts/effects/effect_script_0140.s | 9 + .../scripts/effects/effect_script_0141.s | 8 + .../scripts/effects/effect_script_0142.s | 7 + .../scripts/effects/effect_script_0143.s | 10 ++ .../scripts/effects/effect_script_0144.s | 8 + .../scripts/effects/effect_script_0145.s | 23 +++ .../scripts/effects/effect_script_0146.s | 15 ++ .../scripts/effects/effect_script_0147.s | 14 ++ .../scripts/effects/effect_script_0148.s | 16 ++ .../scripts/effects/effect_script_0149.s | 14 ++ .../scripts/effects/effect_script_0150.s | 14 ++ .../scripts/effects/effect_script_0151.s | 28 ++++ .../scripts/effects/effect_script_0152.s | 10 ++ .../scripts/effects/effect_script_0153.s | 12 ++ .../scripts/effects/effect_script_0154.s | 11 ++ .../scripts/effects/effect_script_0155.s | 27 +++ .../scripts/effects/effect_script_0156.s | 8 + .../scripts/effects/effect_script_0157.s | 8 + .../scripts/effects/effect_script_0158.s | 14 ++ .../scripts/effects/effect_script_0159.s | 12 ++ .../scripts/effects/effect_script_0160.s | 7 + .../scripts/effects/effect_script_0161.s | 33 ++++ .../scripts/effects/effect_script_0162.s | 34 ++++ .../scripts/effects/effect_script_0163.s | 8 + .../scripts/effects/effect_script_0164.s | 22 +++ .../scripts/effects/effect_script_0165.s | 7 + .../scripts/effects/effect_script_0166.s | 7 + .../scripts/effects/effect_script_0167.s | 7 + .../scripts/effects/effect_script_0168.s | 14 ++ .../scripts/effects/effect_script_0169.s | 12 ++ .../scripts/effects/effect_script_0170.s | 17 ++ .../scripts/effects/effect_script_0171.s | 18 ++ .../scripts/effects/effect_script_0172.s | 10 ++ .../scripts/effects/effect_script_0173.s | 15 ++ .../scripts/effects/effect_script_0174.s | 7 + .../scripts/effects/effect_script_0175.s | 7 + .../scripts/effects/effect_script_0176.s | 15 ++ .../scripts/effects/effect_script_0177.s | 7 + .../scripts/effects/effect_script_0178.s | 13 ++ .../scripts/effects/effect_script_0179.s | 11 ++ .../scripts/effects/effect_script_0180.s | 15 ++ .../scripts/effects/effect_script_0181.s | 15 ++ .../scripts/effects/effect_script_0182.s | 9 + .../scripts/effects/effect_script_0183.s | 14 ++ .../scripts/effects/effect_script_0184.s | 16 ++ .../scripts/effects/effect_script_0185.s | 9 + .../scripts/effects/effect_script_0186.s | 9 + .../scripts/effects/effect_script_0187.s | 7 + .../scripts/effects/effect_script_0188.s | 9 + .../scripts/effects/effect_script_0189.s | 16 ++ .../scripts/effects/effect_script_0190.s | 9 + .../scripts/effects/effect_script_0191.s | 7 + .../scripts/effects/effect_script_0192.s | 14 ++ .../scripts/effects/effect_script_0193.s | 7 + .../scripts/effects/effect_script_0194.s | 15 ++ .../scripts/effects/effect_script_0195.s | 14 ++ .../scripts/effects/effect_script_0196.s | 9 + .../scripts/effects/effect_script_0197.s | 9 + .../scripts/effects/effect_script_0198.s | 13 ++ .../scripts/effects/effect_script_0199.s | 7 + .../scripts/effects/effect_script_0200.s | 10 ++ .../scripts/effects/effect_script_0201.s | 15 ++ .../scripts/effects/effect_script_0202.s | 9 + .../scripts/effects/effect_script_0203.s | 9 + .../scripts/effects/effect_script_0204.s | 9 + .../scripts/effects/effect_script_0205.s | 7 + .../scripts/effects/effect_script_0206.s | 7 + .../scripts/effects/effect_script_0207.s | 9 + .../scripts/effects/effect_script_0208.s | 7 + .../scripts/effects/effect_script_0209.s | 10 ++ .../scripts/effects/effect_script_0210.s | 15 ++ .../scripts/effects/effect_script_0211.s | 7 + .../scripts/effects/effect_script_0212.s | 7 + .../scripts/effects/effect_script_0213.s | 15 ++ .../scripts/effects/effect_script_0214.s | 7 + .../scripts/effects/effect_script_0215.s | 12 ++ .../scripts/effects/effect_script_0216.s | 8 + .../scripts/effects/effect_script_0217.s | 18 ++ .../scripts/effects/effect_script_0218.s | 9 + .../scripts/effects/effect_script_0219.s | 9 + .../scripts/effects/effect_script_0220.s | 12 ++ .../scripts/effects/effect_script_0221.s | 18 ++ .../scripts/effects/effect_script_0222.s | 14 ++ .../scripts/effects/effect_script_0223.s | 14 ++ .../scripts/effects/effect_script_0224.s | 9 + .../scripts/effects/effect_script_0225.s | 7 + .../scripts/effects/effect_script_0226.s | 12 ++ .../scripts/effects/effect_script_0227.s | 12 ++ .../scripts/effects/effect_script_0228.s | 9 + .../scripts/effects/effect_script_0229.s | 9 + .../scripts/effects/effect_script_0230.s | 9 + .../scripts/effects/effect_script_0231.s | 15 ++ .../scripts/effects/effect_script_0232.s | 12 ++ .../scripts/effects/effect_script_0233.s | 24 +++ .../scripts/effects/effect_script_0234.s | 12 ++ .../scripts/effects/effect_script_0235.s | 9 + .../scripts/effects/effect_script_0236.s | 7 + .../scripts/effects/effect_script_0237.s | 9 + .../scripts/effects/effect_script_0238.s | 7 + .../scripts/effects/effect_script_0239.s | 7 + .../scripts/effects/effect_script_0240.s | 12 ++ .../scripts/effects/effect_script_0241.s | 15 ++ .../scripts/effects/effect_script_0242.s | 15 ++ .../scripts/effects/effect_script_0243.s | 7 + .../scripts/effects/effect_script_0244.s | 7 + .../scripts/effects/effect_script_0245.s | 9 + .../scripts/effects/effect_script_0246.s | 13 ++ .../scripts/effects/effect_script_0247.s | 7 + .../scripts/effects/effect_script_0248.s | 13 ++ .../scripts/effects/effect_script_0249.s | 14 ++ .../scripts/effects/effect_script_0250.s | 7 + .../scripts/effects/effect_script_0251.s | 15 ++ .../scripts/effects/effect_script_0252.s | 18 ++ .../scripts/effects/effect_script_0253.s | 13 ++ .../scripts/effects/effect_script_0254.s | 9 + .../scripts/effects/effect_script_0255.s | 27 +++ .../scripts/effects/effect_script_0256.s | 27 +++ .../scripts/effects/effect_script_0257.s | 14 ++ .../scripts/effects/effect_script_0258.s | 7 + .../scripts/effects/effect_script_0259.s | 22 +++ .../scripts/effects/effect_script_0260.s | 9 + .../scripts/effects/effect_script_0261.s | 15 ++ .../scripts/effects/effect_script_0262.s | 13 ++ .../scripts/effects/effect_script_0263.s | 28 ++++ .../scripts/effects/effect_script_0264.s | 7 + .../scripts/effects/effect_script_0265.s | 34 ++++ .../scripts/effects/effect_script_0266.s | 15 ++ .../scripts/effects/effect_script_0267.s | 9 + .../scripts/effects/effect_script_0268.s | 90 ++++++++++ .../scripts/effects/effect_script_0269.s | 13 ++ .../scripts/effects/effect_script_0270.s | 12 ++ .../scripts/effects/effect_script_0271.s | 9 + .../scripts/effects/effect_script_0272.s | 29 ++++ .../scripts/effects/effect_script_0273.s | 9 + .../scripts/effects/effect_script_0274.s | 9 + .../scripts/effects/effect_script_0275.s | 9 + .../scripts/effects/effect_script_0276.s | 9 + res/battle/scripts/moves/move_script_0000.s | 6 + res/battle/scripts/moves/move_script_0001.s | 6 + res/battle/scripts/moves/move_script_0002.s | 6 + res/battle/scripts/moves/move_script_0003.s | 6 + res/battle/scripts/moves/move_script_0004.s | 6 + res/battle/scripts/moves/move_script_0005.s | 6 + res/battle/scripts/moves/move_script_0006.s | 6 + res/battle/scripts/moves/move_script_0007.s | 6 + res/battle/scripts/moves/move_script_0008.s | 6 + res/battle/scripts/moves/move_script_0009.s | 6 + res/battle/scripts/moves/move_script_0010.s | 6 + res/battle/scripts/moves/move_script_0011.s | 6 + res/battle/scripts/moves/move_script_0012.s | 6 + res/battle/scripts/moves/move_script_0013.s | 8 + res/battle/scripts/moves/move_script_0014.s | 6 + res/battle/scripts/moves/move_script_0015.s | 6 + res/battle/scripts/moves/move_script_0016.s | 6 + res/battle/scripts/moves/move_script_0017.s | 6 + res/battle/scripts/moves/move_script_0018.s | 6 + res/battle/scripts/moves/move_script_0019.s | 8 + res/battle/scripts/moves/move_script_0020.s | 8 + res/battle/scripts/moves/move_script_0021.s | 6 + res/battle/scripts/moves/move_script_0022.s | 6 + res/battle/scripts/moves/move_script_0023.s | 6 + res/battle/scripts/moves/move_script_0024.s | 6 + res/battle/scripts/moves/move_script_0025.s | 6 + res/battle/scripts/moves/move_script_0026.s | 6 + res/battle/scripts/moves/move_script_0027.s | 6 + res/battle/scripts/moves/move_script_0028.s | 6 + res/battle/scripts/moves/move_script_0029.s | 6 + res/battle/scripts/moves/move_script_0030.s | 6 + res/battle/scripts/moves/move_script_0031.s | 6 + res/battle/scripts/moves/move_script_0032.s | 6 + res/battle/scripts/moves/move_script_0033.s | 6 + res/battle/scripts/moves/move_script_0034.s | 6 + res/battle/scripts/moves/move_script_0035.s | 8 + res/battle/scripts/moves/move_script_0036.s | 6 + res/battle/scripts/moves/move_script_0037.s | 6 + res/battle/scripts/moves/move_script_0038.s | 6 + res/battle/scripts/moves/move_script_0039.s | 6 + res/battle/scripts/moves/move_script_0040.s | 6 + res/battle/scripts/moves/move_script_0041.s | 6 + res/battle/scripts/moves/move_script_0042.s | 6 + res/battle/scripts/moves/move_script_0043.s | 6 + res/battle/scripts/moves/move_script_0044.s | 6 + res/battle/scripts/moves/move_script_0045.s | 6 + res/battle/scripts/moves/move_script_0046.s | 6 + res/battle/scripts/moves/move_script_0047.s | 6 + res/battle/scripts/moves/move_script_0048.s | 6 + res/battle/scripts/moves/move_script_0049.s | 6 + res/battle/scripts/moves/move_script_0050.s | 6 + res/battle/scripts/moves/move_script_0051.s | 6 + res/battle/scripts/moves/move_script_0052.s | 6 + res/battle/scripts/moves/move_script_0053.s | 6 + res/battle/scripts/moves/move_script_0054.s | 6 + res/battle/scripts/moves/move_script_0055.s | 6 + res/battle/scripts/moves/move_script_0056.s | 6 + res/battle/scripts/moves/move_script_0057.s | 6 + res/battle/scripts/moves/move_script_0058.s | 6 + res/battle/scripts/moves/move_script_0059.s | 6 + res/battle/scripts/moves/move_script_0060.s | 6 + res/battle/scripts/moves/move_script_0061.s | 6 + res/battle/scripts/moves/move_script_0062.s | 6 + res/battle/scripts/moves/move_script_0063.s | 6 + res/battle/scripts/moves/move_script_0064.s | 6 + res/battle/scripts/moves/move_script_0065.s | 6 + res/battle/scripts/moves/move_script_0066.s | 6 + res/battle/scripts/moves/move_script_0067.s | 6 + res/battle/scripts/moves/move_script_0068.s | 6 + res/battle/scripts/moves/move_script_0069.s | 6 + res/battle/scripts/moves/move_script_0070.s | 6 + res/battle/scripts/moves/move_script_0071.s | 6 + res/battle/scripts/moves/move_script_0072.s | 6 + res/battle/scripts/moves/move_script_0073.s | 6 + res/battle/scripts/moves/move_script_0074.s | 6 + res/battle/scripts/moves/move_script_0075.s | 6 + res/battle/scripts/moves/move_script_0076.s | 8 + res/battle/scripts/moves/move_script_0077.s | 6 + res/battle/scripts/moves/move_script_0078.s | 6 + res/battle/scripts/moves/move_script_0079.s | 6 + res/battle/scripts/moves/move_script_0080.s | 6 + res/battle/scripts/moves/move_script_0081.s | 6 + res/battle/scripts/moves/move_script_0082.s | 6 + res/battle/scripts/moves/move_script_0083.s | 8 + res/battle/scripts/moves/move_script_0084.s | 6 + res/battle/scripts/moves/move_script_0085.s | 6 + res/battle/scripts/moves/move_script_0086.s | 6 + res/battle/scripts/moves/move_script_0087.s | 6 + res/battle/scripts/moves/move_script_0088.s | 6 + res/battle/scripts/moves/move_script_0089.s | 6 + res/battle/scripts/moves/move_script_0090.s | 6 + res/battle/scripts/moves/move_script_0091.s | 8 + res/battle/scripts/moves/move_script_0092.s | 6 + res/battle/scripts/moves/move_script_0093.s | 6 + res/battle/scripts/moves/move_script_0094.s | 6 + res/battle/scripts/moves/move_script_0095.s | 6 + res/battle/scripts/moves/move_script_0096.s | 6 + res/battle/scripts/moves/move_script_0097.s | 6 + res/battle/scripts/moves/move_script_0098.s | 6 + res/battle/scripts/moves/move_script_0099.s | 6 + res/battle/scripts/moves/move_script_0100.s | 6 + res/battle/scripts/moves/move_script_0101.s | 6 + res/battle/scripts/moves/move_script_0102.s | 6 + res/battle/scripts/moves/move_script_0103.s | 6 + res/battle/scripts/moves/move_script_0104.s | 6 + res/battle/scripts/moves/move_script_0105.s | 6 + res/battle/scripts/moves/move_script_0106.s | 6 + res/battle/scripts/moves/move_script_0107.s | 6 + res/battle/scripts/moves/move_script_0108.s | 6 + res/battle/scripts/moves/move_script_0109.s | 6 + res/battle/scripts/moves/move_script_0110.s | 6 + res/battle/scripts/moves/move_script_0111.s | 6 + res/battle/scripts/moves/move_script_0112.s | 6 + res/battle/scripts/moves/move_script_0113.s | 6 + res/battle/scripts/moves/move_script_0114.s | 6 + res/battle/scripts/moves/move_script_0115.s | 6 + res/battle/scripts/moves/move_script_0116.s | 6 + res/battle/scripts/moves/move_script_0117.s | 6 + res/battle/scripts/moves/move_script_0118.s | 6 + res/battle/scripts/moves/move_script_0119.s | 6 + res/battle/scripts/moves/move_script_0120.s | 7 + res/battle/scripts/moves/move_script_0121.s | 6 + res/battle/scripts/moves/move_script_0122.s | 6 + res/battle/scripts/moves/move_script_0123.s | 6 + res/battle/scripts/moves/move_script_0124.s | 6 + res/battle/scripts/moves/move_script_0125.s | 6 + res/battle/scripts/moves/move_script_0126.s | 6 + res/battle/scripts/moves/move_script_0127.s | 6 + res/battle/scripts/moves/move_script_0128.s | 8 + res/battle/scripts/moves/move_script_0129.s | 6 + res/battle/scripts/moves/move_script_0130.s | 8 + res/battle/scripts/moves/move_script_0131.s | 6 + res/battle/scripts/moves/move_script_0132.s | 6 + res/battle/scripts/moves/move_script_0133.s | 6 + res/battle/scripts/moves/move_script_0134.s | 6 + res/battle/scripts/moves/move_script_0135.s | 6 + res/battle/scripts/moves/move_script_0136.s | 6 + res/battle/scripts/moves/move_script_0137.s | 6 + res/battle/scripts/moves/move_script_0138.s | 6 + res/battle/scripts/moves/move_script_0139.s | 6 + res/battle/scripts/moves/move_script_0140.s | 6 + res/battle/scripts/moves/move_script_0141.s | 6 + res/battle/scripts/moves/move_script_0142.s | 6 + res/battle/scripts/moves/move_script_0143.s | 8 + res/battle/scripts/moves/move_script_0144.s | 6 + res/battle/scripts/moves/move_script_0145.s | 6 + res/battle/scripts/moves/move_script_0146.s | 6 + res/battle/scripts/moves/move_script_0147.s | 6 + res/battle/scripts/moves/move_script_0148.s | 6 + res/battle/scripts/moves/move_script_0149.s | 6 + res/battle/scripts/moves/move_script_0150.s | 7 + res/battle/scripts/moves/move_script_0151.s | 6 + res/battle/scripts/moves/move_script_0152.s | 6 + res/battle/scripts/moves/move_script_0153.s | 7 + res/battle/scripts/moves/move_script_0154.s | 6 + res/battle/scripts/moves/move_script_0155.s | 6 + res/battle/scripts/moves/move_script_0156.s | 6 + res/battle/scripts/moves/move_script_0157.s | 6 + res/battle/scripts/moves/move_script_0158.s | 6 + res/battle/scripts/moves/move_script_0159.s | 6 + res/battle/scripts/moves/move_script_0160.s | 6 + res/battle/scripts/moves/move_script_0161.s | 6 + res/battle/scripts/moves/move_script_0162.s | 6 + res/battle/scripts/moves/move_script_0163.s | 6 + res/battle/scripts/moves/move_script_0164.s | 6 + res/battle/scripts/moves/move_script_0165.s | 6 + res/battle/scripts/moves/move_script_0166.s | 6 + res/battle/scripts/moves/move_script_0167.s | 6 + res/battle/scripts/moves/move_script_0168.s | 6 + res/battle/scripts/moves/move_script_0169.s | 6 + res/battle/scripts/moves/move_script_0170.s | 6 + res/battle/scripts/moves/move_script_0171.s | 6 + res/battle/scripts/moves/move_script_0172.s | 6 + res/battle/scripts/moves/move_script_0173.s | 6 + res/battle/scripts/moves/move_script_0174.s | 6 + res/battle/scripts/moves/move_script_0175.s | 6 + res/battle/scripts/moves/move_script_0176.s | 6 + res/battle/scripts/moves/move_script_0177.s | 6 + res/battle/scripts/moves/move_script_0178.s | 6 + res/battle/scripts/moves/move_script_0179.s | 6 + res/battle/scripts/moves/move_script_0180.s | 6 + res/battle/scripts/moves/move_script_0181.s | 6 + res/battle/scripts/moves/move_script_0182.s | 6 + res/battle/scripts/moves/move_script_0183.s | 6 + res/battle/scripts/moves/move_script_0184.s | 6 + res/battle/scripts/moves/move_script_0185.s | 6 + res/battle/scripts/moves/move_script_0186.s | 6 + res/battle/scripts/moves/move_script_0187.s | 6 + res/battle/scripts/moves/move_script_0188.s | 6 + res/battle/scripts/moves/move_script_0189.s | 6 + res/battle/scripts/moves/move_script_0190.s | 6 + res/battle/scripts/moves/move_script_0191.s | 6 + res/battle/scripts/moves/move_script_0192.s | 6 + res/battle/scripts/moves/move_script_0193.s | 6 + res/battle/scripts/moves/move_script_0194.s | 6 + res/battle/scripts/moves/move_script_0195.s | 6 + res/battle/scripts/moves/move_script_0196.s | 6 + res/battle/scripts/moves/move_script_0197.s | 6 + res/battle/scripts/moves/move_script_0198.s | 6 + res/battle/scripts/moves/move_script_0199.s | 6 + res/battle/scripts/moves/move_script_0200.s | 6 + res/battle/scripts/moves/move_script_0201.s | 6 + res/battle/scripts/moves/move_script_0202.s | 6 + res/battle/scripts/moves/move_script_0203.s | 6 + res/battle/scripts/moves/move_script_0204.s | 6 + res/battle/scripts/moves/move_script_0205.s | 6 + res/battle/scripts/moves/move_script_0206.s | 6 + res/battle/scripts/moves/move_script_0207.s | 6 + res/battle/scripts/moves/move_script_0208.s | 6 + res/battle/scripts/moves/move_script_0209.s | 6 + res/battle/scripts/moves/move_script_0210.s | 6 + res/battle/scripts/moves/move_script_0211.s | 6 + res/battle/scripts/moves/move_script_0212.s | 6 + res/battle/scripts/moves/move_script_0213.s | 6 + res/battle/scripts/moves/move_script_0214.s | 6 + res/battle/scripts/moves/move_script_0215.s | 6 + res/battle/scripts/moves/move_script_0216.s | 6 + res/battle/scripts/moves/move_script_0217.s | 6 + res/battle/scripts/moves/move_script_0218.s | 6 + res/battle/scripts/moves/move_script_0219.s | 6 + res/battle/scripts/moves/move_script_0220.s | 6 + res/battle/scripts/moves/move_script_0221.s | 6 + res/battle/scripts/moves/move_script_0222.s | 6 + res/battle/scripts/moves/move_script_0223.s | 6 + res/battle/scripts/moves/move_script_0224.s | 6 + res/battle/scripts/moves/move_script_0225.s | 6 + res/battle/scripts/moves/move_script_0226.s | 6 + res/battle/scripts/moves/move_script_0227.s | 6 + res/battle/scripts/moves/move_script_0228.s | 6 + res/battle/scripts/moves/move_script_0229.s | 6 + res/battle/scripts/moves/move_script_0230.s | 6 + res/battle/scripts/moves/move_script_0231.s | 6 + res/battle/scripts/moves/move_script_0232.s | 6 + res/battle/scripts/moves/move_script_0233.s | 6 + res/battle/scripts/moves/move_script_0234.s | 6 + res/battle/scripts/moves/move_script_0235.s | 6 + res/battle/scripts/moves/move_script_0236.s | 6 + res/battle/scripts/moves/move_script_0237.s | 6 + res/battle/scripts/moves/move_script_0238.s | 6 + res/battle/scripts/moves/move_script_0239.s | 6 + res/battle/scripts/moves/move_script_0240.s | 6 + res/battle/scripts/moves/move_script_0241.s | 6 + res/battle/scripts/moves/move_script_0242.s | 6 + res/battle/scripts/moves/move_script_0243.s | 6 + res/battle/scripts/moves/move_script_0244.s | 6 + res/battle/scripts/moves/move_script_0245.s | 6 + res/battle/scripts/moves/move_script_0246.s | 6 + res/battle/scripts/moves/move_script_0247.s | 6 + res/battle/scripts/moves/move_script_0248.s | 8 + res/battle/scripts/moves/move_script_0249.s | 6 + res/battle/scripts/moves/move_script_0250.s | 8 + res/battle/scripts/moves/move_script_0251.s | 6 + res/battle/scripts/moves/move_script_0252.s | 6 + res/battle/scripts/moves/move_script_0253.s | 6 + res/battle/scripts/moves/move_script_0254.s | 6 + res/battle/scripts/moves/move_script_0255.s | 6 + res/battle/scripts/moves/move_script_0256.s | 6 + res/battle/scripts/moves/move_script_0257.s | 6 + res/battle/scripts/moves/move_script_0258.s | 6 + res/battle/scripts/moves/move_script_0259.s | 6 + res/battle/scripts/moves/move_script_0260.s | 6 + res/battle/scripts/moves/move_script_0261.s | 6 + res/battle/scripts/moves/move_script_0262.s | 6 + res/battle/scripts/moves/move_script_0263.s | 6 + res/battle/scripts/moves/move_script_0264.s | 6 + res/battle/scripts/moves/move_script_0265.s | 6 + res/battle/scripts/moves/move_script_0266.s | 6 + res/battle/scripts/moves/move_script_0267.s | 6 + res/battle/scripts/moves/move_script_0268.s | 6 + res/battle/scripts/moves/move_script_0269.s | 6 + res/battle/scripts/moves/move_script_0270.s | 6 + res/battle/scripts/moves/move_script_0271.s | 6 + res/battle/scripts/moves/move_script_0272.s | 6 + res/battle/scripts/moves/move_script_0273.s | 6 + res/battle/scripts/moves/move_script_0274.s | 6 + res/battle/scripts/moves/move_script_0275.s | 6 + res/battle/scripts/moves/move_script_0276.s | 6 + res/battle/scripts/moves/move_script_0277.s | 6 + res/battle/scripts/moves/move_script_0278.s | 6 + res/battle/scripts/moves/move_script_0279.s | 6 + res/battle/scripts/moves/move_script_0280.s | 6 + res/battle/scripts/moves/move_script_0281.s | 6 + res/battle/scripts/moves/move_script_0282.s | 6 + res/battle/scripts/moves/move_script_0283.s | 6 + res/battle/scripts/moves/move_script_0284.s | 6 + res/battle/scripts/moves/move_script_0285.s | 6 + res/battle/scripts/moves/move_script_0286.s | 6 + res/battle/scripts/moves/move_script_0287.s | 6 + res/battle/scripts/moves/move_script_0288.s | 6 + res/battle/scripts/moves/move_script_0289.s | 6 + res/battle/scripts/moves/move_script_0290.s | 6 + res/battle/scripts/moves/move_script_0291.s | 8 + res/battle/scripts/moves/move_script_0292.s | 6 + res/battle/scripts/moves/move_script_0293.s | 6 + res/battle/scripts/moves/move_script_0294.s | 6 + res/battle/scripts/moves/move_script_0295.s | 6 + res/battle/scripts/moves/move_script_0296.s | 6 + res/battle/scripts/moves/move_script_0297.s | 6 + res/battle/scripts/moves/move_script_0298.s | 6 + res/battle/scripts/moves/move_script_0299.s | 6 + res/battle/scripts/moves/move_script_0300.s | 6 + res/battle/scripts/moves/move_script_0301.s | 6 + res/battle/scripts/moves/move_script_0302.s | 6 + res/battle/scripts/moves/move_script_0303.s | 6 + res/battle/scripts/moves/move_script_0304.s | 6 + res/battle/scripts/moves/move_script_0305.s | 6 + res/battle/scripts/moves/move_script_0306.s | 6 + res/battle/scripts/moves/move_script_0307.s | 6 + res/battle/scripts/moves/move_script_0308.s | 6 + res/battle/scripts/moves/move_script_0309.s | 6 + res/battle/scripts/moves/move_script_0310.s | 6 + res/battle/scripts/moves/move_script_0311.s | 6 + res/battle/scripts/moves/move_script_0312.s | 6 + res/battle/scripts/moves/move_script_0313.s | 6 + res/battle/scripts/moves/move_script_0314.s | 6 + res/battle/scripts/moves/move_script_0315.s | 6 + res/battle/scripts/moves/move_script_0316.s | 6 + res/battle/scripts/moves/move_script_0317.s | 6 + res/battle/scripts/moves/move_script_0318.s | 6 + res/battle/scripts/moves/move_script_0319.s | 6 + res/battle/scripts/moves/move_script_0320.s | 6 + res/battle/scripts/moves/move_script_0321.s | 6 + res/battle/scripts/moves/move_script_0322.s | 6 + res/battle/scripts/moves/move_script_0323.s | 6 + res/battle/scripts/moves/move_script_0324.s | 6 + res/battle/scripts/moves/move_script_0325.s | 6 + res/battle/scripts/moves/move_script_0326.s | 6 + res/battle/scripts/moves/move_script_0327.s | 6 + res/battle/scripts/moves/move_script_0328.s | 8 + res/battle/scripts/moves/move_script_0329.s | 6 + res/battle/scripts/moves/move_script_0330.s | 6 + res/battle/scripts/moves/move_script_0331.s | 6 + res/battle/scripts/moves/move_script_0332.s | 6 + res/battle/scripts/moves/move_script_0333.s | 6 + res/battle/scripts/moves/move_script_0334.s | 6 + res/battle/scripts/moves/move_script_0335.s | 6 + res/battle/scripts/moves/move_script_0336.s | 6 + res/battle/scripts/moves/move_script_0337.s | 6 + res/battle/scripts/moves/move_script_0338.s | 6 + res/battle/scripts/moves/move_script_0339.s | 6 + res/battle/scripts/moves/move_script_0340.s | 8 + res/battle/scripts/moves/move_script_0341.s | 6 + res/battle/scripts/moves/move_script_0342.s | 6 + res/battle/scripts/moves/move_script_0343.s | 6 + res/battle/scripts/moves/move_script_0344.s | 6 + res/battle/scripts/moves/move_script_0345.s | 6 + res/battle/scripts/moves/move_script_0346.s | 6 + res/battle/scripts/moves/move_script_0347.s | 6 + res/battle/scripts/moves/move_script_0348.s | 6 + res/battle/scripts/moves/move_script_0349.s | 6 + res/battle/scripts/moves/move_script_0350.s | 6 + res/battle/scripts/moves/move_script_0351.s | 6 + res/battle/scripts/moves/move_script_0352.s | 6 + res/battle/scripts/moves/move_script_0353.s | 8 + res/battle/scripts/moves/move_script_0354.s | 6 + res/battle/scripts/moves/move_script_0355.s | 6 + res/battle/scripts/moves/move_script_0356.s | 6 + res/battle/scripts/moves/move_script_0357.s | 6 + res/battle/scripts/moves/move_script_0358.s | 6 + res/battle/scripts/moves/move_script_0359.s | 6 + res/battle/scripts/moves/move_script_0360.s | 6 + res/battle/scripts/moves/move_script_0361.s | 6 + res/battle/scripts/moves/move_script_0362.s | 6 + res/battle/scripts/moves/move_script_0363.s | 6 + res/battle/scripts/moves/move_script_0364.s | 6 + res/battle/scripts/moves/move_script_0365.s | 6 + res/battle/scripts/moves/move_script_0366.s | 6 + res/battle/scripts/moves/move_script_0367.s | 6 + res/battle/scripts/moves/move_script_0368.s | 6 + res/battle/scripts/moves/move_script_0369.s | 6 + res/battle/scripts/moves/move_script_0370.s | 6 + res/battle/scripts/moves/move_script_0371.s | 6 + res/battle/scripts/moves/move_script_0372.s | 6 + res/battle/scripts/moves/move_script_0373.s | 6 + res/battle/scripts/moves/move_script_0374.s | 6 + res/battle/scripts/moves/move_script_0375.s | 6 + res/battle/scripts/moves/move_script_0376.s | 6 + res/battle/scripts/moves/move_script_0377.s | 6 + res/battle/scripts/moves/move_script_0378.s | 6 + res/battle/scripts/moves/move_script_0379.s | 6 + res/battle/scripts/moves/move_script_0380.s | 6 + res/battle/scripts/moves/move_script_0381.s | 6 + res/battle/scripts/moves/move_script_0382.s | 6 + res/battle/scripts/moves/move_script_0383.s | 6 + res/battle/scripts/moves/move_script_0384.s | 6 + res/battle/scripts/moves/move_script_0385.s | 6 + res/battle/scripts/moves/move_script_0386.s | 6 + res/battle/scripts/moves/move_script_0387.s | 6 + res/battle/scripts/moves/move_script_0388.s | 6 + res/battle/scripts/moves/move_script_0389.s | 6 + res/battle/scripts/moves/move_script_0390.s | 6 + res/battle/scripts/moves/move_script_0391.s | 6 + res/battle/scripts/moves/move_script_0392.s | 6 + res/battle/scripts/moves/move_script_0393.s | 6 + res/battle/scripts/moves/move_script_0394.s | 6 + res/battle/scripts/moves/move_script_0395.s | 6 + res/battle/scripts/moves/move_script_0396.s | 6 + res/battle/scripts/moves/move_script_0397.s | 6 + res/battle/scripts/moves/move_script_0398.s | 6 + res/battle/scripts/moves/move_script_0399.s | 6 + res/battle/scripts/moves/move_script_0400.s | 6 + res/battle/scripts/moves/move_script_0401.s | 6 + res/battle/scripts/moves/move_script_0402.s | 6 + res/battle/scripts/moves/move_script_0403.s | 6 + res/battle/scripts/moves/move_script_0404.s | 6 + res/battle/scripts/moves/move_script_0405.s | 6 + res/battle/scripts/moves/move_script_0406.s | 6 + res/battle/scripts/moves/move_script_0407.s | 6 + res/battle/scripts/moves/move_script_0408.s | 6 + res/battle/scripts/moves/move_script_0409.s | 6 + res/battle/scripts/moves/move_script_0410.s | 6 + res/battle/scripts/moves/move_script_0411.s | 6 + res/battle/scripts/moves/move_script_0412.s | 6 + res/battle/scripts/moves/move_script_0413.s | 6 + res/battle/scripts/moves/move_script_0414.s | 6 + res/battle/scripts/moves/move_script_0415.s | 6 + res/battle/scripts/moves/move_script_0416.s | 6 + res/battle/scripts/moves/move_script_0417.s | 6 + res/battle/scripts/moves/move_script_0418.s | 6 + res/battle/scripts/moves/move_script_0419.s | 6 + res/battle/scripts/moves/move_script_0420.s | 6 + res/battle/scripts/moves/move_script_0421.s | 6 + res/battle/scripts/moves/move_script_0422.s | 6 + res/battle/scripts/moves/move_script_0423.s | 6 + res/battle/scripts/moves/move_script_0424.s | 6 + res/battle/scripts/moves/move_script_0425.s | 6 + res/battle/scripts/moves/move_script_0426.s | 6 + res/battle/scripts/moves/move_script_0427.s | 6 + res/battle/scripts/moves/move_script_0428.s | 6 + res/battle/scripts/moves/move_script_0429.s | 6 + res/battle/scripts/moves/move_script_0430.s | 6 + res/battle/scripts/moves/move_script_0431.s | 6 + res/battle/scripts/moves/move_script_0432.s | 6 + res/battle/scripts/moves/move_script_0433.s | 6 + res/battle/scripts/moves/move_script_0434.s | 6 + res/battle/scripts/moves/move_script_0435.s | 6 + res/battle/scripts/moves/move_script_0436.s | 6 + res/battle/scripts/moves/move_script_0437.s | 6 + res/battle/scripts/moves/move_script_0438.s | 6 + res/battle/scripts/moves/move_script_0439.s | 6 + res/battle/scripts/moves/move_script_0440.s | 6 + res/battle/scripts/moves/move_script_0441.s | 6 + res/battle/scripts/moves/move_script_0442.s | 6 + res/battle/scripts/moves/move_script_0443.s | 6 + res/battle/scripts/moves/move_script_0444.s | 6 + res/battle/scripts/moves/move_script_0445.s | 6 + res/battle/scripts/moves/move_script_0446.s | 6 + res/battle/scripts/moves/move_script_0447.s | 6 + res/battle/scripts/moves/move_script_0448.s | 6 + res/battle/scripts/moves/move_script_0449.s | 6 + res/battle/scripts/moves/move_script_0450.s | 6 + res/battle/scripts/moves/move_script_0451.s | 6 + res/battle/scripts/moves/move_script_0452.s | 6 + res/battle/scripts/moves/move_script_0453.s | 6 + res/battle/scripts/moves/move_script_0454.s | 6 + res/battle/scripts/moves/move_script_0455.s | 6 + res/battle/scripts/moves/move_script_0456.s | 6 + res/battle/scripts/moves/move_script_0457.s | 6 + res/battle/scripts/moves/move_script_0458.s | 6 + res/battle/scripts/moves/move_script_0459.s | 6 + res/battle/scripts/moves/move_script_0460.s | 6 + res/battle/scripts/moves/move_script_0461.s | 6 + res/battle/scripts/moves/move_script_0462.s | 6 + res/battle/scripts/moves/move_script_0463.s | 8 + res/battle/scripts/moves/move_script_0464.s | 6 + res/battle/scripts/moves/move_script_0465.s | 6 + res/battle/scripts/moves/move_script_0466.s | 6 + res/battle/scripts/moves/move_script_0467.s | 8 + res/battle/scripts/moves/move_script_0468.s | 6 + res/battle/scripts/moves/move_script_0469.s | 6 + res/battle/scripts/moves/move_script_0470.s | 6 + res/battle/scripts/moves/move_script_0471.s | 6 + res/battle/scripts/moves/move_script_0472.s | 6 + res/battle/scripts/moves/move_script_0473.s | 6 + res/battle/scripts/moves/move_script_0474.s | 6 + res/battle/scripts/moves/move_script_0475.s | 6 + res/battle/scripts/moves/move_script_0476.s | 6 + res/battle/scripts/moves/move_script_0477.s | 6 + res/battle/scripts/moves/move_script_0478.s | 6 + res/battle/scripts/moves/move_script_0479.s | 6 + res/battle/scripts/moves/move_script_0480.s | 6 + res/battle/scripts/moves/move_script_0481.s | 6 + res/battle/scripts/moves/move_script_0482.s | 6 + res/battle/scripts/moves/move_script_0483.s | 6 + res/battle/scripts/moves/move_script_0484.s | 6 + res/battle/scripts/moves/move_script_0485.s | 6 + res/battle/scripts/moves/move_script_0486.s | 6 + res/battle/scripts/moves/move_script_0487.s | 6 + res/battle/scripts/moves/move_script_0488.s | 6 + res/battle/scripts/moves/move_script_0489.s | 6 + res/battle/scripts/moves/move_script_0490.s | 6 + res/battle/scripts/moves/move_script_0491.s | 6 + res/battle/scripts/moves/move_script_0492.s | 6 + res/battle/scripts/moves/move_script_0493.s | 6 + res/battle/scripts/moves/move_script_0494.s | 6 + res/battle/scripts/moves/move_script_0495.s | 6 + res/battle/scripts/moves/move_script_0496.s | 6 + res/battle/scripts/moves/move_script_0497.s | 6 + res/battle/scripts/moves/move_script_0498.s | 6 + res/battle/scripts/moves/move_script_0499.s | 6 + res/battle/scripts/moves/move_script_0500.s | 6 + .../scripts/subscripts/subscript_0000.s | 157 ++++++++++++++++++ .../scripts/subscripts/subscript_0001.s | 10 ++ .../scripts/subscripts/subscript_0002.s | 23 +++ .../scripts/subscripts/subscript_0003.s | 56 +++++++ .../scripts/subscripts/subscript_0004.s | 87 ++++++++++ .../scripts/subscripts/subscript_0005.s | 80 +++++++++ .../scripts/subscripts/subscript_0006.s | 18 ++ .../scripts/subscripts/subscript_0007.s | 100 +++++++++++ .../scripts/subscripts/subscript_0008.s | 10 ++ .../scripts/subscripts/subscript_0009.s | 52 ++++++ .../scripts/subscripts/subscript_0010.s | 29 ++++ .../scripts/subscripts/subscript_0011.s | 18 ++ .../scripts/subscripts/subscript_0012.s | 46 +++++ .../scripts/subscripts/subscript_0013.s | 16 ++ .../scripts/subscripts/subscript_0014.s | 36 ++++ .../scripts/subscripts/subscript_0015.s | 18 ++ .../scripts/subscripts/subscript_0016.s | 24 +++ .../scripts/subscripts/subscript_0017.s | 13 ++ .../scripts/subscripts/subscript_0018.s | 153 +++++++++++++++++ .../scripts/subscripts/subscript_0019.s | 22 +++ .../scripts/subscripts/subscript_0020.s | 12 ++ .../scripts/subscripts/subscript_0021.s | 59 +++++++ .../scripts/subscripts/subscript_0022.s | 131 +++++++++++++++ .../scripts/subscripts/subscript_0023.s | 30 ++++ .../scripts/subscripts/subscript_0024.s | 47 ++++++ .../scripts/subscripts/subscript_0025.s | 138 +++++++++++++++ .../scripts/subscripts/subscript_0026.s | 24 +++ .../scripts/subscripts/subscript_0027.s | 80 +++++++++ .../scripts/subscripts/subscript_0028.s | 12 ++ .../scripts/subscripts/subscript_0029.s | 12 ++ .../scripts/subscripts/subscript_0030.s | 12 ++ .../scripts/subscripts/subscript_0031.s | 104 ++++++++++++ .../scripts/subscripts/subscript_0032.s | 13 ++ .../scripts/subscripts/subscript_0033.s | 33 ++++ .../scripts/subscripts/subscript_0034.s | 11 ++ .../scripts/subscripts/subscript_0035.s | 10 ++ .../scripts/subscripts/subscript_0036.s | 27 +++ .../scripts/subscripts/subscript_0037.s | 89 ++++++++++ .../scripts/subscripts/subscript_0038.s | 12 ++ .../scripts/subscripts/subscript_0039.s | 20 +++ .../scripts/subscripts/subscript_0040.s | 10 ++ .../scripts/subscripts/subscript_0041.s | 13 ++ .../scripts/subscripts/subscript_0042.s | 13 ++ .../scripts/subscripts/subscript_0043.s | 16 ++ .../scripts/subscripts/subscript_0044.s | 10 ++ .../scripts/subscripts/subscript_0045.s | 16 ++ .../scripts/subscripts/subscript_0046.s | 12 ++ .../scripts/subscripts/subscript_0047.s | 144 ++++++++++++++++ .../scripts/subscripts/subscript_0048.s | 16 ++ .../scripts/subscripts/subscript_0049.s | 10 ++ .../scripts/subscripts/subscript_0050.s | 10 ++ .../scripts/subscripts/subscript_0051.s | 15 ++ .../scripts/subscripts/subscript_0052.s | 10 ++ .../scripts/subscripts/subscript_0053.s | 10 ++ .../scripts/subscripts/subscript_0054.s | 12 ++ .../scripts/subscripts/subscript_0055.s | 79 +++++++++ .../scripts/subscripts/subscript_0056.s | 17 ++ .../scripts/subscripts/subscript_0057.s | 9 + .../scripts/subscripts/subscript_0058.s | 22 +++ .../scripts/subscripts/subscript_0059.s | 49 ++++++ .../scripts/subscripts/subscript_0060.s | 10 ++ .../scripts/subscripts/subscript_0061.s | 26 +++ .../scripts/subscripts/subscript_0062.s | 12 ++ .../scripts/subscripts/subscript_0063.s | 22 +++ .../scripts/subscripts/subscript_0064.s | 9 + .../scripts/subscripts/subscript_0065.s | 11 ++ .../scripts/subscripts/subscript_0066.s | 7 + .../scripts/subscripts/subscript_0067.s | 17 ++ .../scripts/subscripts/subscript_0068.s | 38 +++++ .../scripts/subscripts/subscript_0069.s | 60 +++++++ .../scripts/subscripts/subscript_0070.s | 17 ++ .../scripts/subscripts/subscript_0071.s | 14 ++ .../scripts/subscripts/subscript_0072.s | 10 ++ .../scripts/subscripts/subscript_0073.s | 14 ++ .../scripts/subscripts/subscript_0074.s | 10 ++ .../scripts/subscripts/subscript_0075.s | 11 ++ .../scripts/subscripts/subscript_0076.s | 10 ++ .../scripts/subscripts/subscript_0077.s | 32 ++++ .../scripts/subscripts/subscript_0078.s | 16 ++ .../scripts/subscripts/subscript_0079.s | 20 +++ .../scripts/subscripts/subscript_0080.s | 17 ++ .../scripts/subscripts/subscript_0081.s | 22 +++ .../scripts/subscripts/subscript_0082.s | 11 ++ .../scripts/subscripts/subscript_0083.s | 39 +++++ .../scripts/subscripts/subscript_0084.s | 17 ++ .../scripts/subscripts/subscript_0085.s | 27 +++ .../scripts/subscripts/subscript_0086.s | 28 ++++ .../scripts/subscripts/subscript_0087.s | 13 ++ .../scripts/subscripts/subscript_0088.s | 42 +++++ .../scripts/subscripts/subscript_0089.s | 37 +++++ .../scripts/subscripts/subscript_0090.s | 29 ++++ .../scripts/subscripts/subscript_0091.s | 62 +++++++ .../scripts/subscripts/subscript_0092.s | 18 ++ .../scripts/subscripts/subscript_0093.s | 19 +++ .../scripts/subscripts/subscript_0094.s | 20 +++ .../scripts/subscripts/subscript_0095.s | 8 + .../scripts/subscripts/subscript_0096.s | 16 ++ .../scripts/subscripts/subscript_0097.s | 25 +++ .../scripts/subscripts/subscript_0098.s | 20 +++ .../scripts/subscripts/subscript_0099.s | 52 ++++++ .../scripts/subscripts/subscript_0100.s | 11 ++ .../scripts/subscripts/subscript_0101.s | 31 ++++ .../scripts/subscripts/subscript_0102.s | 14 ++ .../scripts/subscripts/subscript_0103.s | 7 + .../scripts/subscripts/subscript_0104.s | 56 +++++++ .../scripts/subscripts/subscript_0105.s | 24 +++ .../scripts/subscripts/subscript_0106.s | 66 ++++++++ .../scripts/subscripts/subscript_0107.s | 12 ++ .../scripts/subscripts/subscript_0108.s | 12 ++ .../scripts/subscripts/subscript_0109.s | 10 ++ .../scripts/subscripts/subscript_0110.s | 10 ++ .../scripts/subscripts/subscript_0111.s | 30 ++++ .../scripts/subscripts/subscript_0112.s | 21 +++ .../scripts/subscripts/subscript_0113.s | 21 +++ .../scripts/subscripts/subscript_0114.s | 22 +++ .../scripts/subscripts/subscript_0115.s | 7 + .../scripts/subscripts/subscript_0116.s | 10 ++ .../scripts/subscripts/subscript_0117.s | 10 ++ .../scripts/subscripts/subscript_0118.s | 34 ++++ .../scripts/subscripts/subscript_0119.s | 19 +++ .../scripts/subscripts/subscript_0120.s | 26 +++ .../scripts/subscripts/subscript_0121.s | 60 +++++++ .../scripts/subscripts/subscript_0122.s | 21 +++ .../scripts/subscripts/subscript_0123.s | 13 ++ .../scripts/subscripts/subscript_0124.s | 42 +++++ .../scripts/subscripts/subscript_0125.s | 13 ++ .../scripts/subscripts/subscript_0126.s | 16 ++ .../scripts/subscripts/subscript_0127.s | 18 ++ .../scripts/subscripts/subscript_0128.s | 24 +++ .../scripts/subscripts/subscript_0129.s | 43 +++++ .../scripts/subscripts/subscript_0130.s | 15 ++ .../scripts/subscripts/subscript_0131.s | 15 ++ .../scripts/subscripts/subscript_0132.s | 19 +++ .../scripts/subscripts/subscript_0133.s | 11 ++ .../scripts/subscripts/subscript_0134.s | 52 ++++++ .../scripts/subscripts/subscript_0135.s | 33 ++++ .../scripts/subscripts/subscript_0136.s | 36 ++++ .../scripts/subscripts/subscript_0137.s | 23 +++ .../scripts/subscripts/subscript_0138.s | 13 ++ .../scripts/subscripts/subscript_0139.s | 15 ++ .../scripts/subscripts/subscript_0140.s | 20 +++ .../scripts/subscripts/subscript_0141.s | 56 +++++++ .../scripts/subscripts/subscript_0142.s | 17 ++ .../scripts/subscripts/subscript_0143.s | 50 ++++++ .../scripts/subscripts/subscript_0144.s | 11 ++ .../scripts/subscripts/subscript_0145.s | 18 ++ .../scripts/subscripts/subscript_0146.s | 28 ++++ .../scripts/subscripts/subscript_0147.s | 22 +++ .../scripts/subscripts/subscript_0148.s | 34 ++++ .../scripts/subscripts/subscript_0149.s | 31 ++++ .../scripts/subscripts/subscript_0150.s | 31 ++++ .../scripts/subscripts/subscript_0151.s | 31 ++++ .../scripts/subscripts/subscript_0152.s | 31 ++++ .../scripts/subscripts/subscript_0153.s | 120 +++++++++++++ .../scripts/subscripts/subscript_0154.s | 16 ++ .../scripts/subscripts/subscript_0155.s | 15 ++ .../scripts/subscripts/subscript_0156.s | 43 +++++ .../scripts/subscripts/subscript_0157.s | 10 ++ .../scripts/subscripts/subscript_0158.s | 11 ++ .../scripts/subscripts/subscript_0159.s | 45 +++++ .../scripts/subscripts/subscript_0160.s | 17 ++ .../scripts/subscripts/subscript_0161.s | 13 ++ .../scripts/subscripts/subscript_0162.s | 15 ++ .../scripts/subscripts/subscript_0163.s | 20 +++ .../scripts/subscripts/subscript_0164.s | 12 ++ .../scripts/subscripts/subscript_0165.s | 18 ++ .../scripts/subscripts/subscript_0166.s | 18 ++ .../scripts/subscripts/subscript_0167.s | 21 +++ .../scripts/subscripts/subscript_0168.s | 62 +++++++ .../scripts/subscripts/subscript_0169.s | 21 +++ .../scripts/subscripts/subscript_0170.s | 11 ++ .../scripts/subscripts/subscript_0171.s | 73 ++++++++ .../scripts/subscripts/subscript_0172.s | 10 ++ .../scripts/subscripts/subscript_0173.s | 26 +++ .../scripts/subscripts/subscript_0174.s | 11 ++ .../scripts/subscripts/subscript_0175.s | 75 +++++++++ .../scripts/subscripts/subscript_0176.s | 11 ++ .../scripts/subscripts/subscript_0177.s | 10 ++ .../scripts/subscripts/subscript_0178.s | 25 +++ .../scripts/subscripts/subscript_0179.s | 22 +++ .../scripts/subscripts/subscript_0180.s | 13 ++ .../scripts/subscripts/subscript_0181.s | 13 ++ .../scripts/subscripts/subscript_0182.s | 25 +++ .../scripts/subscripts/subscript_0183.s | 14 ++ .../scripts/subscripts/subscript_0184.s | 14 ++ .../scripts/subscripts/subscript_0185.s | 14 ++ .../scripts/subscripts/subscript_0186.s | 24 +++ .../scripts/subscripts/subscript_0187.s | 13 ++ .../scripts/subscripts/subscript_0188.s | 12 ++ .../scripts/subscripts/subscript_0189.s | 12 ++ .../scripts/subscripts/subscript_0190.s | 13 ++ .../scripts/subscripts/subscript_0191.s | 11 ++ .../scripts/subscripts/subscript_0192.s | 12 ++ .../scripts/subscripts/subscript_0193.s | 12 ++ .../scripts/subscripts/subscript_0194.s | 10 ++ .../scripts/subscripts/subscript_0195.s | 10 ++ .../scripts/subscripts/subscript_0196.s | 10 ++ .../scripts/subscripts/subscript_0197.s | 10 ++ .../scripts/subscripts/subscript_0198.s | 15 ++ .../scripts/subscripts/subscript_0199.s | 15 ++ .../scripts/subscripts/subscript_0200.s | 16 ++ .../scripts/subscripts/subscript_0201.s | 15 ++ .../scripts/subscripts/subscript_0202.s | 15 ++ .../scripts/subscripts/subscript_0203.s | 15 ++ .../scripts/subscripts/subscript_0204.s | 13 ++ .../scripts/subscripts/subscript_0205.s | 14 ++ .../scripts/subscripts/subscript_0206.s | 17 ++ .../scripts/subscripts/subscript_0207.s | 16 ++ .../scripts/subscripts/subscript_0208.s | 14 ++ .../scripts/subscripts/subscript_0209.s | 14 ++ .../scripts/subscripts/subscript_0210.s | 23 +++ .../scripts/subscripts/subscript_0211.s | 13 ++ .../scripts/subscripts/subscript_0212.s | 14 ++ .../scripts/subscripts/subscript_0213.s | 14 ++ .../scripts/subscripts/subscript_0214.s | 8 + .../scripts/subscripts/subscript_0215.s | 14 ++ .../scripts/subscripts/subscript_0216.s | 9 + .../scripts/subscripts/subscript_0217.s | 23 +++ .../scripts/subscripts/subscript_0218.s | 24 +++ .../scripts/subscripts/subscript_0219.s | 24 +++ .../scripts/subscripts/subscript_0220.s | 13 ++ .../scripts/subscripts/subscript_0221.s | 30 ++++ .../scripts/subscripts/subscript_0222.s | 19 +++ .../scripts/subscripts/subscript_0223.s | 6 + .../scripts/subscripts/subscript_0224.s | 14 ++ .../scripts/subscripts/subscript_0225.s | 6 + .../scripts/subscripts/subscript_0226.s | 11 ++ .../scripts/subscripts/subscript_0227.s | 28 ++++ .../scripts/subscripts/subscript_0228.s | 26 +++ .../scripts/subscripts/subscript_0229.s | 10 ++ .../scripts/subscripts/subscript_0230.s | 15 ++ .../scripts/subscripts/subscript_0231.s | 69 ++++++++ .../scripts/subscripts/subscript_0232.s | 14 ++ .../scripts/subscripts/subscript_0233.s | 10 ++ .../scripts/subscripts/subscript_0234.s | 11 ++ .../scripts/subscripts/subscript_0235.s | 11 ++ .../scripts/subscripts/subscript_0236.s | 11 ++ .../scripts/subscripts/subscript_0237.s | 11 ++ .../scripts/subscripts/subscript_0238.s | 10 ++ .../scripts/subscripts/subscript_0239.s | 11 ++ .../scripts/subscripts/subscript_0240.s | 10 ++ .../scripts/subscripts/subscript_0241.s | 10 ++ .../scripts/subscripts/subscript_0242.s | 11 ++ .../scripts/subscripts/subscript_0243.s | 12 ++ .../scripts/subscripts/subscript_0244.s | 11 ++ .../scripts/subscripts/subscript_0245.s | 10 ++ .../scripts/subscripts/subscript_0246.s | 22 +++ .../scripts/subscripts/subscript_0247.s | 14 ++ .../scripts/subscripts/subscript_0248.s | 14 ++ .../scripts/subscripts/subscript_0249.s | 14 ++ .../scripts/subscripts/subscript_0250.s | 10 ++ .../scripts/subscripts/subscript_0251.s | 10 ++ .../scripts/subscripts/subscript_0252.s | 15 ++ .../scripts/subscripts/subscript_0253.s | 11 ++ .../scripts/subscripts/subscript_0254.s | 11 ++ .../scripts/subscripts/subscript_0255.s | 33 ++++ .../scripts/subscripts/subscript_0256.s | 11 ++ .../scripts/subscripts/subscript_0257.s | 14 ++ .../scripts/subscripts/subscript_0258.s | 15 ++ .../scripts/subscripts/subscript_0259.s | 9 + .../scripts/subscripts/subscript_0260.s | 10 ++ .../scripts/subscripts/subscript_0261.s | 53 ++++++ .../scripts/subscripts/subscript_0262.s | 35 ++++ .../scripts/subscripts/subscript_0263.s | 24 +++ .../scripts/subscripts/subscript_0264.s | 120 +++++++++++++ .../scripts/subscripts/subscript_0265.s | 14 ++ .../scripts/subscripts/subscript_0266.s | 19 +++ .../scripts/subscripts/subscript_0267.s | 21 +++ .../scripts/subscripts/subscript_0268.s | 61 +++++++ .../scripts/subscripts/subscript_0269.s | 17 ++ .../scripts/subscripts/subscript_0270.s | 17 ++ .../scripts/subscripts/subscript_0271.s | 13 ++ .../scripts/subscripts/subscript_0272.s | 13 ++ .../scripts/subscripts/subscript_0273.s | 13 ++ .../scripts/subscripts/subscript_0274.s | 13 ++ .../scripts/subscripts/subscript_0275.s | 34 ++++ .../scripts/subscripts/subscript_0276.s | 12 ++ .../scripts/subscripts/subscript_0277.s | 7 + .../scripts/subscripts/subscript_0278.s | 32 ++++ .../scripts/subscripts/subscript_0279.s | 8 + .../scripts/subscripts/subscript_0280.s | 8 + .../scripts/subscripts/subscript_0281.s | 19 +++ .../scripts/subscripts/subscript_0282.s | 15 ++ .../scripts/subscripts/subscript_0283.s | 12 ++ .../scripts/subscripts/subscript_0284.s | 15 ++ .../scripts/subscripts/subscript_0285.s | 10 ++ .../scripts/subscripts/subscript_0286.s | 10 ++ .../scripts/subscripts/subscript_0287.s | 8 + .../scripts/subscripts/subscript_0288.s | 11 ++ .../scripts/subscripts/subscript_0289.s | 10 ++ .../scripts/subscripts/subscript_0290.s | 11 ++ .../scripts/subscripts/subscript_0291.s | 6 + .../scripts/subscripts/subscript_0292.s | 27 +++ .../scripts/subscripts/subscript_0293.s | 34 ++++ .../scripts/subscripts/subscript_0294.s | 13 ++ .../scripts/subscripts/subscript_0295.s | 16 ++ .../scripts/subscripts/subscript_0296.s | 20 +++ 1075 files changed, 13421 insertions(+) create mode 100644 res/battle/scripts/effects/effect_script_0000.s create mode 100644 res/battle/scripts/effects/effect_script_0001.s create mode 100644 res/battle/scripts/effects/effect_script_0002.s create mode 100644 res/battle/scripts/effects/effect_script_0003.s create mode 100644 res/battle/scripts/effects/effect_script_0004.s create mode 100644 res/battle/scripts/effects/effect_script_0005.s create mode 100644 res/battle/scripts/effects/effect_script_0006.s create mode 100644 res/battle/scripts/effects/effect_script_0007.s create mode 100644 res/battle/scripts/effects/effect_script_0008.s create mode 100644 res/battle/scripts/effects/effect_script_0009.s create mode 100644 res/battle/scripts/effects/effect_script_0010.s create mode 100644 res/battle/scripts/effects/effect_script_0011.s create mode 100644 res/battle/scripts/effects/effect_script_0012.s create mode 100644 res/battle/scripts/effects/effect_script_0013.s create mode 100644 res/battle/scripts/effects/effect_script_0014.s create mode 100644 res/battle/scripts/effects/effect_script_0015.s create mode 100644 res/battle/scripts/effects/effect_script_0016.s create mode 100644 res/battle/scripts/effects/effect_script_0017.s create mode 100644 res/battle/scripts/effects/effect_script_0018.s create mode 100644 res/battle/scripts/effects/effect_script_0019.s create mode 100644 res/battle/scripts/effects/effect_script_0020.s create mode 100644 res/battle/scripts/effects/effect_script_0021.s create mode 100644 res/battle/scripts/effects/effect_script_0022.s create mode 100644 res/battle/scripts/effects/effect_script_0023.s create mode 100644 res/battle/scripts/effects/effect_script_0024.s create mode 100644 res/battle/scripts/effects/effect_script_0025.s create mode 100644 res/battle/scripts/effects/effect_script_0026.s create mode 100644 res/battle/scripts/effects/effect_script_0027.s create mode 100644 res/battle/scripts/effects/effect_script_0028.s create mode 100644 res/battle/scripts/effects/effect_script_0029.s create mode 100644 res/battle/scripts/effects/effect_script_0030.s create mode 100644 res/battle/scripts/effects/effect_script_0031.s create mode 100644 res/battle/scripts/effects/effect_script_0032.s create mode 100644 res/battle/scripts/effects/effect_script_0033.s create mode 100644 res/battle/scripts/effects/effect_script_0034.s create mode 100644 res/battle/scripts/effects/effect_script_0035.s create mode 100644 res/battle/scripts/effects/effect_script_0036.s create mode 100644 res/battle/scripts/effects/effect_script_0037.s create mode 100644 res/battle/scripts/effects/effect_script_0038.s create mode 100644 res/battle/scripts/effects/effect_script_0039.s create mode 100644 res/battle/scripts/effects/effect_script_0040.s create mode 100644 res/battle/scripts/effects/effect_script_0041.s create mode 100644 res/battle/scripts/effects/effect_script_0042.s create mode 100644 res/battle/scripts/effects/effect_script_0043.s create mode 100644 res/battle/scripts/effects/effect_script_0044.s create mode 100644 res/battle/scripts/effects/effect_script_0045.s create mode 100644 res/battle/scripts/effects/effect_script_0046.s create mode 100644 res/battle/scripts/effects/effect_script_0047.s create mode 100644 res/battle/scripts/effects/effect_script_0048.s create mode 100644 res/battle/scripts/effects/effect_script_0049.s create mode 100644 res/battle/scripts/effects/effect_script_0050.s create mode 100644 res/battle/scripts/effects/effect_script_0051.s create mode 100644 res/battle/scripts/effects/effect_script_0052.s create mode 100644 res/battle/scripts/effects/effect_script_0053.s create mode 100644 res/battle/scripts/effects/effect_script_0054.s create mode 100644 res/battle/scripts/effects/effect_script_0055.s create mode 100644 res/battle/scripts/effects/effect_script_0056.s create mode 100644 res/battle/scripts/effects/effect_script_0057.s create mode 100644 res/battle/scripts/effects/effect_script_0058.s create mode 100644 res/battle/scripts/effects/effect_script_0059.s create mode 100644 res/battle/scripts/effects/effect_script_0060.s create mode 100644 res/battle/scripts/effects/effect_script_0061.s create mode 100644 res/battle/scripts/effects/effect_script_0062.s create mode 100644 res/battle/scripts/effects/effect_script_0063.s create mode 100644 res/battle/scripts/effects/effect_script_0064.s create mode 100644 res/battle/scripts/effects/effect_script_0065.s create mode 100644 res/battle/scripts/effects/effect_script_0066.s create mode 100644 res/battle/scripts/effects/effect_script_0067.s create mode 100644 res/battle/scripts/effects/effect_script_0068.s create mode 100644 res/battle/scripts/effects/effect_script_0069.s create mode 100644 res/battle/scripts/effects/effect_script_0070.s create mode 100644 res/battle/scripts/effects/effect_script_0071.s create mode 100644 res/battle/scripts/effects/effect_script_0072.s create mode 100644 res/battle/scripts/effects/effect_script_0073.s create mode 100644 res/battle/scripts/effects/effect_script_0074.s create mode 100644 res/battle/scripts/effects/effect_script_0075.s create mode 100644 res/battle/scripts/effects/effect_script_0076.s create mode 100644 res/battle/scripts/effects/effect_script_0077.s create mode 100644 res/battle/scripts/effects/effect_script_0078.s create mode 100644 res/battle/scripts/effects/effect_script_0079.s create mode 100644 res/battle/scripts/effects/effect_script_0080.s create mode 100644 res/battle/scripts/effects/effect_script_0081.s create mode 100644 res/battle/scripts/effects/effect_script_0082.s create mode 100644 res/battle/scripts/effects/effect_script_0083.s create mode 100644 res/battle/scripts/effects/effect_script_0084.s create mode 100644 res/battle/scripts/effects/effect_script_0085.s create mode 100644 res/battle/scripts/effects/effect_script_0086.s create mode 100644 res/battle/scripts/effects/effect_script_0087.s create mode 100644 res/battle/scripts/effects/effect_script_0088.s create mode 100644 res/battle/scripts/effects/effect_script_0089.s create mode 100644 res/battle/scripts/effects/effect_script_0090.s create mode 100644 res/battle/scripts/effects/effect_script_0091.s create mode 100644 res/battle/scripts/effects/effect_script_0092.s create mode 100644 res/battle/scripts/effects/effect_script_0093.s create mode 100644 res/battle/scripts/effects/effect_script_0094.s create mode 100644 res/battle/scripts/effects/effect_script_0095.s create mode 100644 res/battle/scripts/effects/effect_script_0096.s create mode 100644 res/battle/scripts/effects/effect_script_0097.s create mode 100644 res/battle/scripts/effects/effect_script_0098.s create mode 100644 res/battle/scripts/effects/effect_script_0099.s create mode 100644 res/battle/scripts/effects/effect_script_0100.s create mode 100644 res/battle/scripts/effects/effect_script_0101.s create mode 100644 res/battle/scripts/effects/effect_script_0102.s create mode 100644 res/battle/scripts/effects/effect_script_0103.s create mode 100644 res/battle/scripts/effects/effect_script_0104.s create mode 100644 res/battle/scripts/effects/effect_script_0105.s create mode 100644 res/battle/scripts/effects/effect_script_0106.s create mode 100644 res/battle/scripts/effects/effect_script_0107.s create mode 100644 res/battle/scripts/effects/effect_script_0108.s create mode 100644 res/battle/scripts/effects/effect_script_0109.s create mode 100644 res/battle/scripts/effects/effect_script_0110.s create mode 100644 res/battle/scripts/effects/effect_script_0111.s create mode 100644 res/battle/scripts/effects/effect_script_0112.s create mode 100644 res/battle/scripts/effects/effect_script_0113.s create mode 100644 res/battle/scripts/effects/effect_script_0114.s create mode 100644 res/battle/scripts/effects/effect_script_0115.s create mode 100644 res/battle/scripts/effects/effect_script_0116.s create mode 100644 res/battle/scripts/effects/effect_script_0117.s create mode 100644 res/battle/scripts/effects/effect_script_0118.s create mode 100644 res/battle/scripts/effects/effect_script_0119.s create mode 100644 res/battle/scripts/effects/effect_script_0120.s create mode 100644 res/battle/scripts/effects/effect_script_0121.s create mode 100644 res/battle/scripts/effects/effect_script_0122.s create mode 100644 res/battle/scripts/effects/effect_script_0123.s create mode 100644 res/battle/scripts/effects/effect_script_0124.s create mode 100644 res/battle/scripts/effects/effect_script_0125.s create mode 100644 res/battle/scripts/effects/effect_script_0126.s create mode 100644 res/battle/scripts/effects/effect_script_0127.s create mode 100644 res/battle/scripts/effects/effect_script_0128.s create mode 100644 res/battle/scripts/effects/effect_script_0129.s create mode 100644 res/battle/scripts/effects/effect_script_0130.s create mode 100644 res/battle/scripts/effects/effect_script_0131.s create mode 100644 res/battle/scripts/effects/effect_script_0132.s create mode 100644 res/battle/scripts/effects/effect_script_0133.s create mode 100644 res/battle/scripts/effects/effect_script_0134.s create mode 100644 res/battle/scripts/effects/effect_script_0135.s create mode 100644 res/battle/scripts/effects/effect_script_0136.s create mode 100644 res/battle/scripts/effects/effect_script_0137.s create mode 100644 res/battle/scripts/effects/effect_script_0138.s create mode 100644 res/battle/scripts/effects/effect_script_0139.s create mode 100644 res/battle/scripts/effects/effect_script_0140.s create mode 100644 res/battle/scripts/effects/effect_script_0141.s create mode 100644 res/battle/scripts/effects/effect_script_0142.s create mode 100644 res/battle/scripts/effects/effect_script_0143.s create mode 100644 res/battle/scripts/effects/effect_script_0144.s create mode 100644 res/battle/scripts/effects/effect_script_0145.s create mode 100644 res/battle/scripts/effects/effect_script_0146.s create mode 100644 res/battle/scripts/effects/effect_script_0147.s create mode 100644 res/battle/scripts/effects/effect_script_0148.s create mode 100644 res/battle/scripts/effects/effect_script_0149.s create mode 100644 res/battle/scripts/effects/effect_script_0150.s create mode 100644 res/battle/scripts/effects/effect_script_0151.s create mode 100644 res/battle/scripts/effects/effect_script_0152.s create mode 100644 res/battle/scripts/effects/effect_script_0153.s create mode 100644 res/battle/scripts/effects/effect_script_0154.s create mode 100644 res/battle/scripts/effects/effect_script_0155.s create mode 100644 res/battle/scripts/effects/effect_script_0156.s create mode 100644 res/battle/scripts/effects/effect_script_0157.s create mode 100644 res/battle/scripts/effects/effect_script_0158.s create mode 100644 res/battle/scripts/effects/effect_script_0159.s create mode 100644 res/battle/scripts/effects/effect_script_0160.s create mode 100644 res/battle/scripts/effects/effect_script_0161.s create mode 100644 res/battle/scripts/effects/effect_script_0162.s create mode 100644 res/battle/scripts/effects/effect_script_0163.s create mode 100644 res/battle/scripts/effects/effect_script_0164.s create mode 100644 res/battle/scripts/effects/effect_script_0165.s create mode 100644 res/battle/scripts/effects/effect_script_0166.s create mode 100644 res/battle/scripts/effects/effect_script_0167.s create mode 100644 res/battle/scripts/effects/effect_script_0168.s create mode 100644 res/battle/scripts/effects/effect_script_0169.s create mode 100644 res/battle/scripts/effects/effect_script_0170.s create mode 100644 res/battle/scripts/effects/effect_script_0171.s create mode 100644 res/battle/scripts/effects/effect_script_0172.s create mode 100644 res/battle/scripts/effects/effect_script_0173.s create mode 100644 res/battle/scripts/effects/effect_script_0174.s create mode 100644 res/battle/scripts/effects/effect_script_0175.s create mode 100644 res/battle/scripts/effects/effect_script_0176.s create mode 100644 res/battle/scripts/effects/effect_script_0177.s create mode 100644 res/battle/scripts/effects/effect_script_0178.s create mode 100644 res/battle/scripts/effects/effect_script_0179.s create mode 100644 res/battle/scripts/effects/effect_script_0180.s create mode 100644 res/battle/scripts/effects/effect_script_0181.s create mode 100644 res/battle/scripts/effects/effect_script_0182.s create mode 100644 res/battle/scripts/effects/effect_script_0183.s create mode 100644 res/battle/scripts/effects/effect_script_0184.s create mode 100644 res/battle/scripts/effects/effect_script_0185.s create mode 100644 res/battle/scripts/effects/effect_script_0186.s create mode 100644 res/battle/scripts/effects/effect_script_0187.s create mode 100644 res/battle/scripts/effects/effect_script_0188.s create mode 100644 res/battle/scripts/effects/effect_script_0189.s create mode 100644 res/battle/scripts/effects/effect_script_0190.s create mode 100644 res/battle/scripts/effects/effect_script_0191.s create mode 100644 res/battle/scripts/effects/effect_script_0192.s create mode 100644 res/battle/scripts/effects/effect_script_0193.s create mode 100644 res/battle/scripts/effects/effect_script_0194.s create mode 100644 res/battle/scripts/effects/effect_script_0195.s create mode 100644 res/battle/scripts/effects/effect_script_0196.s create mode 100644 res/battle/scripts/effects/effect_script_0197.s create mode 100644 res/battle/scripts/effects/effect_script_0198.s create mode 100644 res/battle/scripts/effects/effect_script_0199.s create mode 100644 res/battle/scripts/effects/effect_script_0200.s create mode 100644 res/battle/scripts/effects/effect_script_0201.s create mode 100644 res/battle/scripts/effects/effect_script_0202.s create mode 100644 res/battle/scripts/effects/effect_script_0203.s create mode 100644 res/battle/scripts/effects/effect_script_0204.s create mode 100644 res/battle/scripts/effects/effect_script_0205.s create mode 100644 res/battle/scripts/effects/effect_script_0206.s create mode 100644 res/battle/scripts/effects/effect_script_0207.s create mode 100644 res/battle/scripts/effects/effect_script_0208.s create mode 100644 res/battle/scripts/effects/effect_script_0209.s create mode 100644 res/battle/scripts/effects/effect_script_0210.s create mode 100644 res/battle/scripts/effects/effect_script_0211.s create mode 100644 res/battle/scripts/effects/effect_script_0212.s create mode 100644 res/battle/scripts/effects/effect_script_0213.s create mode 100644 res/battle/scripts/effects/effect_script_0214.s create mode 100644 res/battle/scripts/effects/effect_script_0215.s create mode 100644 res/battle/scripts/effects/effect_script_0216.s create mode 100644 res/battle/scripts/effects/effect_script_0217.s create mode 100644 res/battle/scripts/effects/effect_script_0218.s create mode 100644 res/battle/scripts/effects/effect_script_0219.s create mode 100644 res/battle/scripts/effects/effect_script_0220.s create mode 100644 res/battle/scripts/effects/effect_script_0221.s create mode 100644 res/battle/scripts/effects/effect_script_0222.s create mode 100644 res/battle/scripts/effects/effect_script_0223.s create mode 100644 res/battle/scripts/effects/effect_script_0224.s create mode 100644 res/battle/scripts/effects/effect_script_0225.s create mode 100644 res/battle/scripts/effects/effect_script_0226.s create mode 100644 res/battle/scripts/effects/effect_script_0227.s create mode 100644 res/battle/scripts/effects/effect_script_0228.s create mode 100644 res/battle/scripts/effects/effect_script_0229.s create mode 100644 res/battle/scripts/effects/effect_script_0230.s create mode 100644 res/battle/scripts/effects/effect_script_0231.s create mode 100644 res/battle/scripts/effects/effect_script_0232.s create mode 100644 res/battle/scripts/effects/effect_script_0233.s create mode 100644 res/battle/scripts/effects/effect_script_0234.s create mode 100644 res/battle/scripts/effects/effect_script_0235.s create mode 100644 res/battle/scripts/effects/effect_script_0236.s create mode 100644 res/battle/scripts/effects/effect_script_0237.s create mode 100644 res/battle/scripts/effects/effect_script_0238.s create mode 100644 res/battle/scripts/effects/effect_script_0239.s create mode 100644 res/battle/scripts/effects/effect_script_0240.s create mode 100644 res/battle/scripts/effects/effect_script_0241.s create mode 100644 res/battle/scripts/effects/effect_script_0242.s create mode 100644 res/battle/scripts/effects/effect_script_0243.s create mode 100644 res/battle/scripts/effects/effect_script_0244.s create mode 100644 res/battle/scripts/effects/effect_script_0245.s create mode 100644 res/battle/scripts/effects/effect_script_0246.s create mode 100644 res/battle/scripts/effects/effect_script_0247.s create mode 100644 res/battle/scripts/effects/effect_script_0248.s create mode 100644 res/battle/scripts/effects/effect_script_0249.s create mode 100644 res/battle/scripts/effects/effect_script_0250.s create mode 100644 res/battle/scripts/effects/effect_script_0251.s create mode 100644 res/battle/scripts/effects/effect_script_0252.s create mode 100644 res/battle/scripts/effects/effect_script_0253.s create mode 100644 res/battle/scripts/effects/effect_script_0254.s create mode 100644 res/battle/scripts/effects/effect_script_0255.s create mode 100644 res/battle/scripts/effects/effect_script_0256.s create mode 100644 res/battle/scripts/effects/effect_script_0257.s create mode 100644 res/battle/scripts/effects/effect_script_0258.s create mode 100644 res/battle/scripts/effects/effect_script_0259.s create mode 100644 res/battle/scripts/effects/effect_script_0260.s create mode 100644 res/battle/scripts/effects/effect_script_0261.s create mode 100644 res/battle/scripts/effects/effect_script_0262.s create mode 100644 res/battle/scripts/effects/effect_script_0263.s create mode 100644 res/battle/scripts/effects/effect_script_0264.s create mode 100644 res/battle/scripts/effects/effect_script_0265.s create mode 100644 res/battle/scripts/effects/effect_script_0266.s create mode 100644 res/battle/scripts/effects/effect_script_0267.s create mode 100644 res/battle/scripts/effects/effect_script_0268.s create mode 100644 res/battle/scripts/effects/effect_script_0269.s create mode 100644 res/battle/scripts/effects/effect_script_0270.s create mode 100644 res/battle/scripts/effects/effect_script_0271.s create mode 100644 res/battle/scripts/effects/effect_script_0272.s create mode 100644 res/battle/scripts/effects/effect_script_0273.s create mode 100644 res/battle/scripts/effects/effect_script_0274.s create mode 100644 res/battle/scripts/effects/effect_script_0275.s create mode 100644 res/battle/scripts/effects/effect_script_0276.s create mode 100644 res/battle/scripts/moves/move_script_0000.s create mode 100644 res/battle/scripts/moves/move_script_0001.s create mode 100644 res/battle/scripts/moves/move_script_0002.s create mode 100644 res/battle/scripts/moves/move_script_0003.s create mode 100644 res/battle/scripts/moves/move_script_0004.s create mode 100644 res/battle/scripts/moves/move_script_0005.s create mode 100644 res/battle/scripts/moves/move_script_0006.s create mode 100644 res/battle/scripts/moves/move_script_0007.s create mode 100644 res/battle/scripts/moves/move_script_0008.s create mode 100644 res/battle/scripts/moves/move_script_0009.s create mode 100644 res/battle/scripts/moves/move_script_0010.s create mode 100644 res/battle/scripts/moves/move_script_0011.s create mode 100644 res/battle/scripts/moves/move_script_0012.s create mode 100644 res/battle/scripts/moves/move_script_0013.s create mode 100644 res/battle/scripts/moves/move_script_0014.s create mode 100644 res/battle/scripts/moves/move_script_0015.s create mode 100644 res/battle/scripts/moves/move_script_0016.s create mode 100644 res/battle/scripts/moves/move_script_0017.s create mode 100644 res/battle/scripts/moves/move_script_0018.s create mode 100644 res/battle/scripts/moves/move_script_0019.s create mode 100644 res/battle/scripts/moves/move_script_0020.s create mode 100644 res/battle/scripts/moves/move_script_0021.s create mode 100644 res/battle/scripts/moves/move_script_0022.s create mode 100644 res/battle/scripts/moves/move_script_0023.s create mode 100644 res/battle/scripts/moves/move_script_0024.s create mode 100644 res/battle/scripts/moves/move_script_0025.s create mode 100644 res/battle/scripts/moves/move_script_0026.s create mode 100644 res/battle/scripts/moves/move_script_0027.s create mode 100644 res/battle/scripts/moves/move_script_0028.s create mode 100644 res/battle/scripts/moves/move_script_0029.s create mode 100644 res/battle/scripts/moves/move_script_0030.s create mode 100644 res/battle/scripts/moves/move_script_0031.s create mode 100644 res/battle/scripts/moves/move_script_0032.s create mode 100644 res/battle/scripts/moves/move_script_0033.s create mode 100644 res/battle/scripts/moves/move_script_0034.s create mode 100644 res/battle/scripts/moves/move_script_0035.s create mode 100644 res/battle/scripts/moves/move_script_0036.s create mode 100644 res/battle/scripts/moves/move_script_0037.s create mode 100644 res/battle/scripts/moves/move_script_0038.s create mode 100644 res/battle/scripts/moves/move_script_0039.s create mode 100644 res/battle/scripts/moves/move_script_0040.s create mode 100644 res/battle/scripts/moves/move_script_0041.s create mode 100644 res/battle/scripts/moves/move_script_0042.s create mode 100644 res/battle/scripts/moves/move_script_0043.s create mode 100644 res/battle/scripts/moves/move_script_0044.s create mode 100644 res/battle/scripts/moves/move_script_0045.s create mode 100644 res/battle/scripts/moves/move_script_0046.s create mode 100644 res/battle/scripts/moves/move_script_0047.s create mode 100644 res/battle/scripts/moves/move_script_0048.s create mode 100644 res/battle/scripts/moves/move_script_0049.s create mode 100644 res/battle/scripts/moves/move_script_0050.s create mode 100644 res/battle/scripts/moves/move_script_0051.s create mode 100644 res/battle/scripts/moves/move_script_0052.s create mode 100644 res/battle/scripts/moves/move_script_0053.s create mode 100644 res/battle/scripts/moves/move_script_0054.s create mode 100644 res/battle/scripts/moves/move_script_0055.s create mode 100644 res/battle/scripts/moves/move_script_0056.s create mode 100644 res/battle/scripts/moves/move_script_0057.s create mode 100644 res/battle/scripts/moves/move_script_0058.s create mode 100644 res/battle/scripts/moves/move_script_0059.s create mode 100644 res/battle/scripts/moves/move_script_0060.s create mode 100644 res/battle/scripts/moves/move_script_0061.s create mode 100644 res/battle/scripts/moves/move_script_0062.s create mode 100644 res/battle/scripts/moves/move_script_0063.s create mode 100644 res/battle/scripts/moves/move_script_0064.s create mode 100644 res/battle/scripts/moves/move_script_0065.s create mode 100644 res/battle/scripts/moves/move_script_0066.s create mode 100644 res/battle/scripts/moves/move_script_0067.s create mode 100644 res/battle/scripts/moves/move_script_0068.s create mode 100644 res/battle/scripts/moves/move_script_0069.s create mode 100644 res/battle/scripts/moves/move_script_0070.s create mode 100644 res/battle/scripts/moves/move_script_0071.s create mode 100644 res/battle/scripts/moves/move_script_0072.s create mode 100644 res/battle/scripts/moves/move_script_0073.s create mode 100644 res/battle/scripts/moves/move_script_0074.s create mode 100644 res/battle/scripts/moves/move_script_0075.s create mode 100644 res/battle/scripts/moves/move_script_0076.s create mode 100644 res/battle/scripts/moves/move_script_0077.s create mode 100644 res/battle/scripts/moves/move_script_0078.s create mode 100644 res/battle/scripts/moves/move_script_0079.s create mode 100644 res/battle/scripts/moves/move_script_0080.s create mode 100644 res/battle/scripts/moves/move_script_0081.s create mode 100644 res/battle/scripts/moves/move_script_0082.s create mode 100644 res/battle/scripts/moves/move_script_0083.s create mode 100644 res/battle/scripts/moves/move_script_0084.s create mode 100644 res/battle/scripts/moves/move_script_0085.s create mode 100644 res/battle/scripts/moves/move_script_0086.s create mode 100644 res/battle/scripts/moves/move_script_0087.s create mode 100644 res/battle/scripts/moves/move_script_0088.s create mode 100644 res/battle/scripts/moves/move_script_0089.s create mode 100644 res/battle/scripts/moves/move_script_0090.s create mode 100644 res/battle/scripts/moves/move_script_0091.s create mode 100644 res/battle/scripts/moves/move_script_0092.s create mode 100644 res/battle/scripts/moves/move_script_0093.s create mode 100644 res/battle/scripts/moves/move_script_0094.s create mode 100644 res/battle/scripts/moves/move_script_0095.s create mode 100644 res/battle/scripts/moves/move_script_0096.s create mode 100644 res/battle/scripts/moves/move_script_0097.s create mode 100644 res/battle/scripts/moves/move_script_0098.s create mode 100644 res/battle/scripts/moves/move_script_0099.s create mode 100644 res/battle/scripts/moves/move_script_0100.s create mode 100644 res/battle/scripts/moves/move_script_0101.s create mode 100644 res/battle/scripts/moves/move_script_0102.s create mode 100644 res/battle/scripts/moves/move_script_0103.s create mode 100644 res/battle/scripts/moves/move_script_0104.s create mode 100644 res/battle/scripts/moves/move_script_0105.s create mode 100644 res/battle/scripts/moves/move_script_0106.s create mode 100644 res/battle/scripts/moves/move_script_0107.s create mode 100644 res/battle/scripts/moves/move_script_0108.s create mode 100644 res/battle/scripts/moves/move_script_0109.s create mode 100644 res/battle/scripts/moves/move_script_0110.s create mode 100644 res/battle/scripts/moves/move_script_0111.s create mode 100644 res/battle/scripts/moves/move_script_0112.s create mode 100644 res/battle/scripts/moves/move_script_0113.s create mode 100644 res/battle/scripts/moves/move_script_0114.s create mode 100644 res/battle/scripts/moves/move_script_0115.s create mode 100644 res/battle/scripts/moves/move_script_0116.s create mode 100644 res/battle/scripts/moves/move_script_0117.s create mode 100644 res/battle/scripts/moves/move_script_0118.s create mode 100644 res/battle/scripts/moves/move_script_0119.s create mode 100644 res/battle/scripts/moves/move_script_0120.s create mode 100644 res/battle/scripts/moves/move_script_0121.s create mode 100644 res/battle/scripts/moves/move_script_0122.s create mode 100644 res/battle/scripts/moves/move_script_0123.s create mode 100644 res/battle/scripts/moves/move_script_0124.s create mode 100644 res/battle/scripts/moves/move_script_0125.s create mode 100644 res/battle/scripts/moves/move_script_0126.s create mode 100644 res/battle/scripts/moves/move_script_0127.s create mode 100644 res/battle/scripts/moves/move_script_0128.s create mode 100644 res/battle/scripts/moves/move_script_0129.s create mode 100644 res/battle/scripts/moves/move_script_0130.s create mode 100644 res/battle/scripts/moves/move_script_0131.s create mode 100644 res/battle/scripts/moves/move_script_0132.s create mode 100644 res/battle/scripts/moves/move_script_0133.s create mode 100644 res/battle/scripts/moves/move_script_0134.s create mode 100644 res/battle/scripts/moves/move_script_0135.s create mode 100644 res/battle/scripts/moves/move_script_0136.s create mode 100644 res/battle/scripts/moves/move_script_0137.s create mode 100644 res/battle/scripts/moves/move_script_0138.s create mode 100644 res/battle/scripts/moves/move_script_0139.s create mode 100644 res/battle/scripts/moves/move_script_0140.s create mode 100644 res/battle/scripts/moves/move_script_0141.s create mode 100644 res/battle/scripts/moves/move_script_0142.s create mode 100644 res/battle/scripts/moves/move_script_0143.s create mode 100644 res/battle/scripts/moves/move_script_0144.s create mode 100644 res/battle/scripts/moves/move_script_0145.s create mode 100644 res/battle/scripts/moves/move_script_0146.s create mode 100644 res/battle/scripts/moves/move_script_0147.s create mode 100644 res/battle/scripts/moves/move_script_0148.s create mode 100644 res/battle/scripts/moves/move_script_0149.s create mode 100644 res/battle/scripts/moves/move_script_0150.s create mode 100644 res/battle/scripts/moves/move_script_0151.s create mode 100644 res/battle/scripts/moves/move_script_0152.s create mode 100644 res/battle/scripts/moves/move_script_0153.s create mode 100644 res/battle/scripts/moves/move_script_0154.s create mode 100644 res/battle/scripts/moves/move_script_0155.s create mode 100644 res/battle/scripts/moves/move_script_0156.s create mode 100644 res/battle/scripts/moves/move_script_0157.s create mode 100644 res/battle/scripts/moves/move_script_0158.s create mode 100644 res/battle/scripts/moves/move_script_0159.s create mode 100644 res/battle/scripts/moves/move_script_0160.s create mode 100644 res/battle/scripts/moves/move_script_0161.s create mode 100644 res/battle/scripts/moves/move_script_0162.s create mode 100644 res/battle/scripts/moves/move_script_0163.s create mode 100644 res/battle/scripts/moves/move_script_0164.s create mode 100644 res/battle/scripts/moves/move_script_0165.s create mode 100644 res/battle/scripts/moves/move_script_0166.s create mode 100644 res/battle/scripts/moves/move_script_0167.s create mode 100644 res/battle/scripts/moves/move_script_0168.s create mode 100644 res/battle/scripts/moves/move_script_0169.s create mode 100644 res/battle/scripts/moves/move_script_0170.s create mode 100644 res/battle/scripts/moves/move_script_0171.s create mode 100644 res/battle/scripts/moves/move_script_0172.s create mode 100644 res/battle/scripts/moves/move_script_0173.s create mode 100644 res/battle/scripts/moves/move_script_0174.s create mode 100644 res/battle/scripts/moves/move_script_0175.s create mode 100644 res/battle/scripts/moves/move_script_0176.s create mode 100644 res/battle/scripts/moves/move_script_0177.s create mode 100644 res/battle/scripts/moves/move_script_0178.s create mode 100644 res/battle/scripts/moves/move_script_0179.s create mode 100644 res/battle/scripts/moves/move_script_0180.s create mode 100644 res/battle/scripts/moves/move_script_0181.s create mode 100644 res/battle/scripts/moves/move_script_0182.s create mode 100644 res/battle/scripts/moves/move_script_0183.s create mode 100644 res/battle/scripts/moves/move_script_0184.s create mode 100644 res/battle/scripts/moves/move_script_0185.s create mode 100644 res/battle/scripts/moves/move_script_0186.s create mode 100644 res/battle/scripts/moves/move_script_0187.s create mode 100644 res/battle/scripts/moves/move_script_0188.s create mode 100644 res/battle/scripts/moves/move_script_0189.s create mode 100644 res/battle/scripts/moves/move_script_0190.s create mode 100644 res/battle/scripts/moves/move_script_0191.s create mode 100644 res/battle/scripts/moves/move_script_0192.s create mode 100644 res/battle/scripts/moves/move_script_0193.s create mode 100644 res/battle/scripts/moves/move_script_0194.s create mode 100644 res/battle/scripts/moves/move_script_0195.s create mode 100644 res/battle/scripts/moves/move_script_0196.s create mode 100644 res/battle/scripts/moves/move_script_0197.s create mode 100644 res/battle/scripts/moves/move_script_0198.s create mode 100644 res/battle/scripts/moves/move_script_0199.s create mode 100644 res/battle/scripts/moves/move_script_0200.s create mode 100644 res/battle/scripts/moves/move_script_0201.s create mode 100644 res/battle/scripts/moves/move_script_0202.s create mode 100644 res/battle/scripts/moves/move_script_0203.s create mode 100644 res/battle/scripts/moves/move_script_0204.s create mode 100644 res/battle/scripts/moves/move_script_0205.s create mode 100644 res/battle/scripts/moves/move_script_0206.s create mode 100644 res/battle/scripts/moves/move_script_0207.s create mode 100644 res/battle/scripts/moves/move_script_0208.s create mode 100644 res/battle/scripts/moves/move_script_0209.s create mode 100644 res/battle/scripts/moves/move_script_0210.s create mode 100644 res/battle/scripts/moves/move_script_0211.s create mode 100644 res/battle/scripts/moves/move_script_0212.s create mode 100644 res/battle/scripts/moves/move_script_0213.s create mode 100644 res/battle/scripts/moves/move_script_0214.s create mode 100644 res/battle/scripts/moves/move_script_0215.s create mode 100644 res/battle/scripts/moves/move_script_0216.s create mode 100644 res/battle/scripts/moves/move_script_0217.s create mode 100644 res/battle/scripts/moves/move_script_0218.s create mode 100644 res/battle/scripts/moves/move_script_0219.s create mode 100644 res/battle/scripts/moves/move_script_0220.s create mode 100644 res/battle/scripts/moves/move_script_0221.s create mode 100644 res/battle/scripts/moves/move_script_0222.s create mode 100644 res/battle/scripts/moves/move_script_0223.s create mode 100644 res/battle/scripts/moves/move_script_0224.s create mode 100644 res/battle/scripts/moves/move_script_0225.s create mode 100644 res/battle/scripts/moves/move_script_0226.s create mode 100644 res/battle/scripts/moves/move_script_0227.s create mode 100644 res/battle/scripts/moves/move_script_0228.s create mode 100644 res/battle/scripts/moves/move_script_0229.s create mode 100644 res/battle/scripts/moves/move_script_0230.s create mode 100644 res/battle/scripts/moves/move_script_0231.s create mode 100644 res/battle/scripts/moves/move_script_0232.s create mode 100644 res/battle/scripts/moves/move_script_0233.s create mode 100644 res/battle/scripts/moves/move_script_0234.s create mode 100644 res/battle/scripts/moves/move_script_0235.s create mode 100644 res/battle/scripts/moves/move_script_0236.s create mode 100644 res/battle/scripts/moves/move_script_0237.s create mode 100644 res/battle/scripts/moves/move_script_0238.s create mode 100644 res/battle/scripts/moves/move_script_0239.s create mode 100644 res/battle/scripts/moves/move_script_0240.s create mode 100644 res/battle/scripts/moves/move_script_0241.s create mode 100644 res/battle/scripts/moves/move_script_0242.s create mode 100644 res/battle/scripts/moves/move_script_0243.s create mode 100644 res/battle/scripts/moves/move_script_0244.s create mode 100644 res/battle/scripts/moves/move_script_0245.s create mode 100644 res/battle/scripts/moves/move_script_0246.s create mode 100644 res/battle/scripts/moves/move_script_0247.s create mode 100644 res/battle/scripts/moves/move_script_0248.s create mode 100644 res/battle/scripts/moves/move_script_0249.s create mode 100644 res/battle/scripts/moves/move_script_0250.s create mode 100644 res/battle/scripts/moves/move_script_0251.s create mode 100644 res/battle/scripts/moves/move_script_0252.s create mode 100644 res/battle/scripts/moves/move_script_0253.s create mode 100644 res/battle/scripts/moves/move_script_0254.s create mode 100644 res/battle/scripts/moves/move_script_0255.s create mode 100644 res/battle/scripts/moves/move_script_0256.s create mode 100644 res/battle/scripts/moves/move_script_0257.s create mode 100644 res/battle/scripts/moves/move_script_0258.s create mode 100644 res/battle/scripts/moves/move_script_0259.s create mode 100644 res/battle/scripts/moves/move_script_0260.s create mode 100644 res/battle/scripts/moves/move_script_0261.s create mode 100644 res/battle/scripts/moves/move_script_0262.s create mode 100644 res/battle/scripts/moves/move_script_0263.s create mode 100644 res/battle/scripts/moves/move_script_0264.s create mode 100644 res/battle/scripts/moves/move_script_0265.s create mode 100644 res/battle/scripts/moves/move_script_0266.s create mode 100644 res/battle/scripts/moves/move_script_0267.s create mode 100644 res/battle/scripts/moves/move_script_0268.s create mode 100644 res/battle/scripts/moves/move_script_0269.s create mode 100644 res/battle/scripts/moves/move_script_0270.s create mode 100644 res/battle/scripts/moves/move_script_0271.s create mode 100644 res/battle/scripts/moves/move_script_0272.s create mode 100644 res/battle/scripts/moves/move_script_0273.s create mode 100644 res/battle/scripts/moves/move_script_0274.s create mode 100644 res/battle/scripts/moves/move_script_0275.s create mode 100644 res/battle/scripts/moves/move_script_0276.s create mode 100644 res/battle/scripts/moves/move_script_0277.s create mode 100644 res/battle/scripts/moves/move_script_0278.s create mode 100644 res/battle/scripts/moves/move_script_0279.s create mode 100644 res/battle/scripts/moves/move_script_0280.s create mode 100644 res/battle/scripts/moves/move_script_0281.s create mode 100644 res/battle/scripts/moves/move_script_0282.s create mode 100644 res/battle/scripts/moves/move_script_0283.s create mode 100644 res/battle/scripts/moves/move_script_0284.s create mode 100644 res/battle/scripts/moves/move_script_0285.s create mode 100644 res/battle/scripts/moves/move_script_0286.s create mode 100644 res/battle/scripts/moves/move_script_0287.s create mode 100644 res/battle/scripts/moves/move_script_0288.s create mode 100644 res/battle/scripts/moves/move_script_0289.s create mode 100644 res/battle/scripts/moves/move_script_0290.s create mode 100644 res/battle/scripts/moves/move_script_0291.s create mode 100644 res/battle/scripts/moves/move_script_0292.s create mode 100644 res/battle/scripts/moves/move_script_0293.s create mode 100644 res/battle/scripts/moves/move_script_0294.s create mode 100644 res/battle/scripts/moves/move_script_0295.s create mode 100644 res/battle/scripts/moves/move_script_0296.s create mode 100644 res/battle/scripts/moves/move_script_0297.s create mode 100644 res/battle/scripts/moves/move_script_0298.s create mode 100644 res/battle/scripts/moves/move_script_0299.s create mode 100644 res/battle/scripts/moves/move_script_0300.s create mode 100644 res/battle/scripts/moves/move_script_0301.s create mode 100644 res/battle/scripts/moves/move_script_0302.s create mode 100644 res/battle/scripts/moves/move_script_0303.s create mode 100644 res/battle/scripts/moves/move_script_0304.s create mode 100644 res/battle/scripts/moves/move_script_0305.s create mode 100644 res/battle/scripts/moves/move_script_0306.s create mode 100644 res/battle/scripts/moves/move_script_0307.s create mode 100644 res/battle/scripts/moves/move_script_0308.s create mode 100644 res/battle/scripts/moves/move_script_0309.s create mode 100644 res/battle/scripts/moves/move_script_0310.s create mode 100644 res/battle/scripts/moves/move_script_0311.s create mode 100644 res/battle/scripts/moves/move_script_0312.s create mode 100644 res/battle/scripts/moves/move_script_0313.s create mode 100644 res/battle/scripts/moves/move_script_0314.s create mode 100644 res/battle/scripts/moves/move_script_0315.s create mode 100644 res/battle/scripts/moves/move_script_0316.s create mode 100644 res/battle/scripts/moves/move_script_0317.s create mode 100644 res/battle/scripts/moves/move_script_0318.s create mode 100644 res/battle/scripts/moves/move_script_0319.s create mode 100644 res/battle/scripts/moves/move_script_0320.s create mode 100644 res/battle/scripts/moves/move_script_0321.s create mode 100644 res/battle/scripts/moves/move_script_0322.s create mode 100644 res/battle/scripts/moves/move_script_0323.s create mode 100644 res/battle/scripts/moves/move_script_0324.s create mode 100644 res/battle/scripts/moves/move_script_0325.s create mode 100644 res/battle/scripts/moves/move_script_0326.s create mode 100644 res/battle/scripts/moves/move_script_0327.s create mode 100644 res/battle/scripts/moves/move_script_0328.s create mode 100644 res/battle/scripts/moves/move_script_0329.s create mode 100644 res/battle/scripts/moves/move_script_0330.s create mode 100644 res/battle/scripts/moves/move_script_0331.s create mode 100644 res/battle/scripts/moves/move_script_0332.s create mode 100644 res/battle/scripts/moves/move_script_0333.s create mode 100644 res/battle/scripts/moves/move_script_0334.s create mode 100644 res/battle/scripts/moves/move_script_0335.s create mode 100644 res/battle/scripts/moves/move_script_0336.s create mode 100644 res/battle/scripts/moves/move_script_0337.s create mode 100644 res/battle/scripts/moves/move_script_0338.s create mode 100644 res/battle/scripts/moves/move_script_0339.s create mode 100644 res/battle/scripts/moves/move_script_0340.s create mode 100644 res/battle/scripts/moves/move_script_0341.s create mode 100644 res/battle/scripts/moves/move_script_0342.s create mode 100644 res/battle/scripts/moves/move_script_0343.s create mode 100644 res/battle/scripts/moves/move_script_0344.s create mode 100644 res/battle/scripts/moves/move_script_0345.s create mode 100644 res/battle/scripts/moves/move_script_0346.s create mode 100644 res/battle/scripts/moves/move_script_0347.s create mode 100644 res/battle/scripts/moves/move_script_0348.s create mode 100644 res/battle/scripts/moves/move_script_0349.s create mode 100644 res/battle/scripts/moves/move_script_0350.s create mode 100644 res/battle/scripts/moves/move_script_0351.s create mode 100644 res/battle/scripts/moves/move_script_0352.s create mode 100644 res/battle/scripts/moves/move_script_0353.s create mode 100644 res/battle/scripts/moves/move_script_0354.s create mode 100644 res/battle/scripts/moves/move_script_0355.s create mode 100644 res/battle/scripts/moves/move_script_0356.s create mode 100644 res/battle/scripts/moves/move_script_0357.s create mode 100644 res/battle/scripts/moves/move_script_0358.s create mode 100644 res/battle/scripts/moves/move_script_0359.s create mode 100644 res/battle/scripts/moves/move_script_0360.s create mode 100644 res/battle/scripts/moves/move_script_0361.s create mode 100644 res/battle/scripts/moves/move_script_0362.s create mode 100644 res/battle/scripts/moves/move_script_0363.s create mode 100644 res/battle/scripts/moves/move_script_0364.s create mode 100644 res/battle/scripts/moves/move_script_0365.s create mode 100644 res/battle/scripts/moves/move_script_0366.s create mode 100644 res/battle/scripts/moves/move_script_0367.s create mode 100644 res/battle/scripts/moves/move_script_0368.s create mode 100644 res/battle/scripts/moves/move_script_0369.s create mode 100644 res/battle/scripts/moves/move_script_0370.s create mode 100644 res/battle/scripts/moves/move_script_0371.s create mode 100644 res/battle/scripts/moves/move_script_0372.s create mode 100644 res/battle/scripts/moves/move_script_0373.s create mode 100644 res/battle/scripts/moves/move_script_0374.s create mode 100644 res/battle/scripts/moves/move_script_0375.s create mode 100644 res/battle/scripts/moves/move_script_0376.s create mode 100644 res/battle/scripts/moves/move_script_0377.s create mode 100644 res/battle/scripts/moves/move_script_0378.s create mode 100644 res/battle/scripts/moves/move_script_0379.s create mode 100644 res/battle/scripts/moves/move_script_0380.s create mode 100644 res/battle/scripts/moves/move_script_0381.s create mode 100644 res/battle/scripts/moves/move_script_0382.s create mode 100644 res/battle/scripts/moves/move_script_0383.s create mode 100644 res/battle/scripts/moves/move_script_0384.s create mode 100644 res/battle/scripts/moves/move_script_0385.s create mode 100644 res/battle/scripts/moves/move_script_0386.s create mode 100644 res/battle/scripts/moves/move_script_0387.s create mode 100644 res/battle/scripts/moves/move_script_0388.s create mode 100644 res/battle/scripts/moves/move_script_0389.s create mode 100644 res/battle/scripts/moves/move_script_0390.s create mode 100644 res/battle/scripts/moves/move_script_0391.s create mode 100644 res/battle/scripts/moves/move_script_0392.s create mode 100644 res/battle/scripts/moves/move_script_0393.s create mode 100644 res/battle/scripts/moves/move_script_0394.s create mode 100644 res/battle/scripts/moves/move_script_0395.s create mode 100644 res/battle/scripts/moves/move_script_0396.s create mode 100644 res/battle/scripts/moves/move_script_0397.s create mode 100644 res/battle/scripts/moves/move_script_0398.s create mode 100644 res/battle/scripts/moves/move_script_0399.s create mode 100644 res/battle/scripts/moves/move_script_0400.s create mode 100644 res/battle/scripts/moves/move_script_0401.s create mode 100644 res/battle/scripts/moves/move_script_0402.s create mode 100644 res/battle/scripts/moves/move_script_0403.s create mode 100644 res/battle/scripts/moves/move_script_0404.s create mode 100644 res/battle/scripts/moves/move_script_0405.s create mode 100644 res/battle/scripts/moves/move_script_0406.s create mode 100644 res/battle/scripts/moves/move_script_0407.s create mode 100644 res/battle/scripts/moves/move_script_0408.s create mode 100644 res/battle/scripts/moves/move_script_0409.s create mode 100644 res/battle/scripts/moves/move_script_0410.s create mode 100644 res/battle/scripts/moves/move_script_0411.s create mode 100644 res/battle/scripts/moves/move_script_0412.s create mode 100644 res/battle/scripts/moves/move_script_0413.s create mode 100644 res/battle/scripts/moves/move_script_0414.s create mode 100644 res/battle/scripts/moves/move_script_0415.s create mode 100644 res/battle/scripts/moves/move_script_0416.s create mode 100644 res/battle/scripts/moves/move_script_0417.s create mode 100644 res/battle/scripts/moves/move_script_0418.s create mode 100644 res/battle/scripts/moves/move_script_0419.s create mode 100644 res/battle/scripts/moves/move_script_0420.s create mode 100644 res/battle/scripts/moves/move_script_0421.s create mode 100644 res/battle/scripts/moves/move_script_0422.s create mode 100644 res/battle/scripts/moves/move_script_0423.s create mode 100644 res/battle/scripts/moves/move_script_0424.s create mode 100644 res/battle/scripts/moves/move_script_0425.s create mode 100644 res/battle/scripts/moves/move_script_0426.s create mode 100644 res/battle/scripts/moves/move_script_0427.s create mode 100644 res/battle/scripts/moves/move_script_0428.s create mode 100644 res/battle/scripts/moves/move_script_0429.s create mode 100644 res/battle/scripts/moves/move_script_0430.s create mode 100644 res/battle/scripts/moves/move_script_0431.s create mode 100644 res/battle/scripts/moves/move_script_0432.s create mode 100644 res/battle/scripts/moves/move_script_0433.s create mode 100644 res/battle/scripts/moves/move_script_0434.s create mode 100644 res/battle/scripts/moves/move_script_0435.s create mode 100644 res/battle/scripts/moves/move_script_0436.s create mode 100644 res/battle/scripts/moves/move_script_0437.s create mode 100644 res/battle/scripts/moves/move_script_0438.s create mode 100644 res/battle/scripts/moves/move_script_0439.s create mode 100644 res/battle/scripts/moves/move_script_0440.s create mode 100644 res/battle/scripts/moves/move_script_0441.s create mode 100644 res/battle/scripts/moves/move_script_0442.s create mode 100644 res/battle/scripts/moves/move_script_0443.s create mode 100644 res/battle/scripts/moves/move_script_0444.s create mode 100644 res/battle/scripts/moves/move_script_0445.s create mode 100644 res/battle/scripts/moves/move_script_0446.s create mode 100644 res/battle/scripts/moves/move_script_0447.s create mode 100644 res/battle/scripts/moves/move_script_0448.s create mode 100644 res/battle/scripts/moves/move_script_0449.s create mode 100644 res/battle/scripts/moves/move_script_0450.s create mode 100644 res/battle/scripts/moves/move_script_0451.s create mode 100644 res/battle/scripts/moves/move_script_0452.s create mode 100644 res/battle/scripts/moves/move_script_0453.s create mode 100644 res/battle/scripts/moves/move_script_0454.s create mode 100644 res/battle/scripts/moves/move_script_0455.s create mode 100644 res/battle/scripts/moves/move_script_0456.s create mode 100644 res/battle/scripts/moves/move_script_0457.s create mode 100644 res/battle/scripts/moves/move_script_0458.s create mode 100644 res/battle/scripts/moves/move_script_0459.s create mode 100644 res/battle/scripts/moves/move_script_0460.s create mode 100644 res/battle/scripts/moves/move_script_0461.s create mode 100644 res/battle/scripts/moves/move_script_0462.s create mode 100644 res/battle/scripts/moves/move_script_0463.s create mode 100644 res/battle/scripts/moves/move_script_0464.s create mode 100644 res/battle/scripts/moves/move_script_0465.s create mode 100644 res/battle/scripts/moves/move_script_0466.s create mode 100644 res/battle/scripts/moves/move_script_0467.s create mode 100644 res/battle/scripts/moves/move_script_0468.s create mode 100644 res/battle/scripts/moves/move_script_0469.s create mode 100644 res/battle/scripts/moves/move_script_0470.s create mode 100644 res/battle/scripts/moves/move_script_0471.s create mode 100644 res/battle/scripts/moves/move_script_0472.s create mode 100644 res/battle/scripts/moves/move_script_0473.s create mode 100644 res/battle/scripts/moves/move_script_0474.s create mode 100644 res/battle/scripts/moves/move_script_0475.s create mode 100644 res/battle/scripts/moves/move_script_0476.s create mode 100644 res/battle/scripts/moves/move_script_0477.s create mode 100644 res/battle/scripts/moves/move_script_0478.s create mode 100644 res/battle/scripts/moves/move_script_0479.s create mode 100644 res/battle/scripts/moves/move_script_0480.s create mode 100644 res/battle/scripts/moves/move_script_0481.s create mode 100644 res/battle/scripts/moves/move_script_0482.s create mode 100644 res/battle/scripts/moves/move_script_0483.s create mode 100644 res/battle/scripts/moves/move_script_0484.s create mode 100644 res/battle/scripts/moves/move_script_0485.s create mode 100644 res/battle/scripts/moves/move_script_0486.s create mode 100644 res/battle/scripts/moves/move_script_0487.s create mode 100644 res/battle/scripts/moves/move_script_0488.s create mode 100644 res/battle/scripts/moves/move_script_0489.s create mode 100644 res/battle/scripts/moves/move_script_0490.s create mode 100644 res/battle/scripts/moves/move_script_0491.s create mode 100644 res/battle/scripts/moves/move_script_0492.s create mode 100644 res/battle/scripts/moves/move_script_0493.s create mode 100644 res/battle/scripts/moves/move_script_0494.s create mode 100644 res/battle/scripts/moves/move_script_0495.s create mode 100644 res/battle/scripts/moves/move_script_0496.s create mode 100644 res/battle/scripts/moves/move_script_0497.s create mode 100644 res/battle/scripts/moves/move_script_0498.s create mode 100644 res/battle/scripts/moves/move_script_0499.s create mode 100644 res/battle/scripts/moves/move_script_0500.s create mode 100644 res/battle/scripts/subscripts/subscript_0000.s create mode 100644 res/battle/scripts/subscripts/subscript_0001.s create mode 100644 res/battle/scripts/subscripts/subscript_0002.s create mode 100644 res/battle/scripts/subscripts/subscript_0003.s create mode 100644 res/battle/scripts/subscripts/subscript_0004.s create mode 100644 res/battle/scripts/subscripts/subscript_0005.s create mode 100644 res/battle/scripts/subscripts/subscript_0006.s create mode 100644 res/battle/scripts/subscripts/subscript_0007.s create mode 100644 res/battle/scripts/subscripts/subscript_0008.s create mode 100644 res/battle/scripts/subscripts/subscript_0009.s create mode 100644 res/battle/scripts/subscripts/subscript_0010.s create mode 100644 res/battle/scripts/subscripts/subscript_0011.s create mode 100644 res/battle/scripts/subscripts/subscript_0012.s create mode 100644 res/battle/scripts/subscripts/subscript_0013.s create mode 100644 res/battle/scripts/subscripts/subscript_0014.s create mode 100644 res/battle/scripts/subscripts/subscript_0015.s create mode 100644 res/battle/scripts/subscripts/subscript_0016.s create mode 100644 res/battle/scripts/subscripts/subscript_0017.s create mode 100644 res/battle/scripts/subscripts/subscript_0018.s create mode 100644 res/battle/scripts/subscripts/subscript_0019.s create mode 100644 res/battle/scripts/subscripts/subscript_0020.s create mode 100644 res/battle/scripts/subscripts/subscript_0021.s create mode 100644 res/battle/scripts/subscripts/subscript_0022.s create mode 100644 res/battle/scripts/subscripts/subscript_0023.s create mode 100644 res/battle/scripts/subscripts/subscript_0024.s create mode 100644 res/battle/scripts/subscripts/subscript_0025.s create mode 100644 res/battle/scripts/subscripts/subscript_0026.s create mode 100644 res/battle/scripts/subscripts/subscript_0027.s create mode 100644 res/battle/scripts/subscripts/subscript_0028.s create mode 100644 res/battle/scripts/subscripts/subscript_0029.s create mode 100644 res/battle/scripts/subscripts/subscript_0030.s create mode 100644 res/battle/scripts/subscripts/subscript_0031.s create mode 100644 res/battle/scripts/subscripts/subscript_0032.s create mode 100644 res/battle/scripts/subscripts/subscript_0033.s create mode 100644 res/battle/scripts/subscripts/subscript_0034.s create mode 100644 res/battle/scripts/subscripts/subscript_0035.s create mode 100644 res/battle/scripts/subscripts/subscript_0036.s create mode 100644 res/battle/scripts/subscripts/subscript_0037.s create mode 100644 res/battle/scripts/subscripts/subscript_0038.s create mode 100644 res/battle/scripts/subscripts/subscript_0039.s create mode 100644 res/battle/scripts/subscripts/subscript_0040.s create mode 100644 res/battle/scripts/subscripts/subscript_0041.s create mode 100644 res/battle/scripts/subscripts/subscript_0042.s create mode 100644 res/battle/scripts/subscripts/subscript_0043.s create mode 100644 res/battle/scripts/subscripts/subscript_0044.s create mode 100644 res/battle/scripts/subscripts/subscript_0045.s create mode 100644 res/battle/scripts/subscripts/subscript_0046.s create mode 100644 res/battle/scripts/subscripts/subscript_0047.s create mode 100644 res/battle/scripts/subscripts/subscript_0048.s create mode 100644 res/battle/scripts/subscripts/subscript_0049.s create mode 100644 res/battle/scripts/subscripts/subscript_0050.s create mode 100644 res/battle/scripts/subscripts/subscript_0051.s create mode 100644 res/battle/scripts/subscripts/subscript_0052.s create mode 100644 res/battle/scripts/subscripts/subscript_0053.s create mode 100644 res/battle/scripts/subscripts/subscript_0054.s create mode 100644 res/battle/scripts/subscripts/subscript_0055.s create mode 100644 res/battle/scripts/subscripts/subscript_0056.s create mode 100644 res/battle/scripts/subscripts/subscript_0057.s create mode 100644 res/battle/scripts/subscripts/subscript_0058.s create mode 100644 res/battle/scripts/subscripts/subscript_0059.s create mode 100644 res/battle/scripts/subscripts/subscript_0060.s create mode 100644 res/battle/scripts/subscripts/subscript_0061.s create mode 100644 res/battle/scripts/subscripts/subscript_0062.s create mode 100644 res/battle/scripts/subscripts/subscript_0063.s create mode 100644 res/battle/scripts/subscripts/subscript_0064.s create mode 100644 res/battle/scripts/subscripts/subscript_0065.s create mode 100644 res/battle/scripts/subscripts/subscript_0066.s create mode 100644 res/battle/scripts/subscripts/subscript_0067.s create mode 100644 res/battle/scripts/subscripts/subscript_0068.s create mode 100644 res/battle/scripts/subscripts/subscript_0069.s create mode 100644 res/battle/scripts/subscripts/subscript_0070.s create mode 100644 res/battle/scripts/subscripts/subscript_0071.s create mode 100644 res/battle/scripts/subscripts/subscript_0072.s create mode 100644 res/battle/scripts/subscripts/subscript_0073.s create mode 100644 res/battle/scripts/subscripts/subscript_0074.s create mode 100644 res/battle/scripts/subscripts/subscript_0075.s create mode 100644 res/battle/scripts/subscripts/subscript_0076.s create mode 100644 res/battle/scripts/subscripts/subscript_0077.s create mode 100644 res/battle/scripts/subscripts/subscript_0078.s create mode 100644 res/battle/scripts/subscripts/subscript_0079.s create mode 100644 res/battle/scripts/subscripts/subscript_0080.s create mode 100644 res/battle/scripts/subscripts/subscript_0081.s create mode 100644 res/battle/scripts/subscripts/subscript_0082.s create mode 100644 res/battle/scripts/subscripts/subscript_0083.s create mode 100644 res/battle/scripts/subscripts/subscript_0084.s create mode 100644 res/battle/scripts/subscripts/subscript_0085.s create mode 100644 res/battle/scripts/subscripts/subscript_0086.s create mode 100644 res/battle/scripts/subscripts/subscript_0087.s create mode 100644 res/battle/scripts/subscripts/subscript_0088.s create mode 100644 res/battle/scripts/subscripts/subscript_0089.s create mode 100644 res/battle/scripts/subscripts/subscript_0090.s create mode 100644 res/battle/scripts/subscripts/subscript_0091.s create mode 100644 res/battle/scripts/subscripts/subscript_0092.s create mode 100644 res/battle/scripts/subscripts/subscript_0093.s create mode 100644 res/battle/scripts/subscripts/subscript_0094.s create mode 100644 res/battle/scripts/subscripts/subscript_0095.s create mode 100644 res/battle/scripts/subscripts/subscript_0096.s create mode 100644 res/battle/scripts/subscripts/subscript_0097.s create mode 100644 res/battle/scripts/subscripts/subscript_0098.s create mode 100644 res/battle/scripts/subscripts/subscript_0099.s create mode 100644 res/battle/scripts/subscripts/subscript_0100.s create mode 100644 res/battle/scripts/subscripts/subscript_0101.s create mode 100644 res/battle/scripts/subscripts/subscript_0102.s create mode 100644 res/battle/scripts/subscripts/subscript_0103.s create mode 100644 res/battle/scripts/subscripts/subscript_0104.s create mode 100644 res/battle/scripts/subscripts/subscript_0105.s create mode 100644 res/battle/scripts/subscripts/subscript_0106.s create mode 100644 res/battle/scripts/subscripts/subscript_0107.s create mode 100644 res/battle/scripts/subscripts/subscript_0108.s create mode 100644 res/battle/scripts/subscripts/subscript_0109.s create mode 100644 res/battle/scripts/subscripts/subscript_0110.s create mode 100644 res/battle/scripts/subscripts/subscript_0111.s create mode 100644 res/battle/scripts/subscripts/subscript_0112.s create mode 100644 res/battle/scripts/subscripts/subscript_0113.s create mode 100644 res/battle/scripts/subscripts/subscript_0114.s create mode 100644 res/battle/scripts/subscripts/subscript_0115.s create mode 100644 res/battle/scripts/subscripts/subscript_0116.s create mode 100644 res/battle/scripts/subscripts/subscript_0117.s create mode 100644 res/battle/scripts/subscripts/subscript_0118.s create mode 100644 res/battle/scripts/subscripts/subscript_0119.s create mode 100644 res/battle/scripts/subscripts/subscript_0120.s create mode 100644 res/battle/scripts/subscripts/subscript_0121.s create mode 100644 res/battle/scripts/subscripts/subscript_0122.s create mode 100644 res/battle/scripts/subscripts/subscript_0123.s create mode 100644 res/battle/scripts/subscripts/subscript_0124.s create mode 100644 res/battle/scripts/subscripts/subscript_0125.s create mode 100644 res/battle/scripts/subscripts/subscript_0126.s create mode 100644 res/battle/scripts/subscripts/subscript_0127.s create mode 100644 res/battle/scripts/subscripts/subscript_0128.s create mode 100644 res/battle/scripts/subscripts/subscript_0129.s create mode 100644 res/battle/scripts/subscripts/subscript_0130.s create mode 100644 res/battle/scripts/subscripts/subscript_0131.s create mode 100644 res/battle/scripts/subscripts/subscript_0132.s create mode 100644 res/battle/scripts/subscripts/subscript_0133.s create mode 100644 res/battle/scripts/subscripts/subscript_0134.s create mode 100644 res/battle/scripts/subscripts/subscript_0135.s create mode 100644 res/battle/scripts/subscripts/subscript_0136.s create mode 100644 res/battle/scripts/subscripts/subscript_0137.s create mode 100644 res/battle/scripts/subscripts/subscript_0138.s create mode 100644 res/battle/scripts/subscripts/subscript_0139.s create mode 100644 res/battle/scripts/subscripts/subscript_0140.s create mode 100644 res/battle/scripts/subscripts/subscript_0141.s create mode 100644 res/battle/scripts/subscripts/subscript_0142.s create mode 100644 res/battle/scripts/subscripts/subscript_0143.s create mode 100644 res/battle/scripts/subscripts/subscript_0144.s create mode 100644 res/battle/scripts/subscripts/subscript_0145.s create mode 100644 res/battle/scripts/subscripts/subscript_0146.s create mode 100644 res/battle/scripts/subscripts/subscript_0147.s create mode 100644 res/battle/scripts/subscripts/subscript_0148.s create mode 100644 res/battle/scripts/subscripts/subscript_0149.s create mode 100644 res/battle/scripts/subscripts/subscript_0150.s create mode 100644 res/battle/scripts/subscripts/subscript_0151.s create mode 100644 res/battle/scripts/subscripts/subscript_0152.s create mode 100644 res/battle/scripts/subscripts/subscript_0153.s create mode 100644 res/battle/scripts/subscripts/subscript_0154.s create mode 100644 res/battle/scripts/subscripts/subscript_0155.s create mode 100644 res/battle/scripts/subscripts/subscript_0156.s create mode 100644 res/battle/scripts/subscripts/subscript_0157.s create mode 100644 res/battle/scripts/subscripts/subscript_0158.s create mode 100644 res/battle/scripts/subscripts/subscript_0159.s create mode 100644 res/battle/scripts/subscripts/subscript_0160.s create mode 100644 res/battle/scripts/subscripts/subscript_0161.s create mode 100644 res/battle/scripts/subscripts/subscript_0162.s create mode 100644 res/battle/scripts/subscripts/subscript_0163.s create mode 100644 res/battle/scripts/subscripts/subscript_0164.s create mode 100644 res/battle/scripts/subscripts/subscript_0165.s create mode 100644 res/battle/scripts/subscripts/subscript_0166.s create mode 100644 res/battle/scripts/subscripts/subscript_0167.s create mode 100644 res/battle/scripts/subscripts/subscript_0168.s create mode 100644 res/battle/scripts/subscripts/subscript_0169.s create mode 100644 res/battle/scripts/subscripts/subscript_0170.s create mode 100644 res/battle/scripts/subscripts/subscript_0171.s create mode 100644 res/battle/scripts/subscripts/subscript_0172.s create mode 100644 res/battle/scripts/subscripts/subscript_0173.s create mode 100644 res/battle/scripts/subscripts/subscript_0174.s create mode 100644 res/battle/scripts/subscripts/subscript_0175.s create mode 100644 res/battle/scripts/subscripts/subscript_0176.s create mode 100644 res/battle/scripts/subscripts/subscript_0177.s create mode 100644 res/battle/scripts/subscripts/subscript_0178.s create mode 100644 res/battle/scripts/subscripts/subscript_0179.s create mode 100644 res/battle/scripts/subscripts/subscript_0180.s create mode 100644 res/battle/scripts/subscripts/subscript_0181.s create mode 100644 res/battle/scripts/subscripts/subscript_0182.s create mode 100644 res/battle/scripts/subscripts/subscript_0183.s create mode 100644 res/battle/scripts/subscripts/subscript_0184.s create mode 100644 res/battle/scripts/subscripts/subscript_0185.s create mode 100644 res/battle/scripts/subscripts/subscript_0186.s create mode 100644 res/battle/scripts/subscripts/subscript_0187.s create mode 100644 res/battle/scripts/subscripts/subscript_0188.s create mode 100644 res/battle/scripts/subscripts/subscript_0189.s create mode 100644 res/battle/scripts/subscripts/subscript_0190.s create mode 100644 res/battle/scripts/subscripts/subscript_0191.s create mode 100644 res/battle/scripts/subscripts/subscript_0192.s create mode 100644 res/battle/scripts/subscripts/subscript_0193.s create mode 100644 res/battle/scripts/subscripts/subscript_0194.s create mode 100644 res/battle/scripts/subscripts/subscript_0195.s create mode 100644 res/battle/scripts/subscripts/subscript_0196.s create mode 100644 res/battle/scripts/subscripts/subscript_0197.s create mode 100644 res/battle/scripts/subscripts/subscript_0198.s create mode 100644 res/battle/scripts/subscripts/subscript_0199.s create mode 100644 res/battle/scripts/subscripts/subscript_0200.s create mode 100644 res/battle/scripts/subscripts/subscript_0201.s create mode 100644 res/battle/scripts/subscripts/subscript_0202.s create mode 100644 res/battle/scripts/subscripts/subscript_0203.s create mode 100644 res/battle/scripts/subscripts/subscript_0204.s create mode 100644 res/battle/scripts/subscripts/subscript_0205.s create mode 100644 res/battle/scripts/subscripts/subscript_0206.s create mode 100644 res/battle/scripts/subscripts/subscript_0207.s create mode 100644 res/battle/scripts/subscripts/subscript_0208.s create mode 100644 res/battle/scripts/subscripts/subscript_0209.s create mode 100644 res/battle/scripts/subscripts/subscript_0210.s create mode 100644 res/battle/scripts/subscripts/subscript_0211.s create mode 100644 res/battle/scripts/subscripts/subscript_0212.s create mode 100644 res/battle/scripts/subscripts/subscript_0213.s create mode 100644 res/battle/scripts/subscripts/subscript_0214.s create mode 100644 res/battle/scripts/subscripts/subscript_0215.s create mode 100644 res/battle/scripts/subscripts/subscript_0216.s create mode 100644 res/battle/scripts/subscripts/subscript_0217.s create mode 100644 res/battle/scripts/subscripts/subscript_0218.s create mode 100644 res/battle/scripts/subscripts/subscript_0219.s create mode 100644 res/battle/scripts/subscripts/subscript_0220.s create mode 100644 res/battle/scripts/subscripts/subscript_0221.s create mode 100644 res/battle/scripts/subscripts/subscript_0222.s create mode 100644 res/battle/scripts/subscripts/subscript_0223.s create mode 100644 res/battle/scripts/subscripts/subscript_0224.s create mode 100644 res/battle/scripts/subscripts/subscript_0225.s create mode 100644 res/battle/scripts/subscripts/subscript_0226.s create mode 100644 res/battle/scripts/subscripts/subscript_0227.s create mode 100644 res/battle/scripts/subscripts/subscript_0228.s create mode 100644 res/battle/scripts/subscripts/subscript_0229.s create mode 100644 res/battle/scripts/subscripts/subscript_0230.s create mode 100644 res/battle/scripts/subscripts/subscript_0231.s create mode 100644 res/battle/scripts/subscripts/subscript_0232.s create mode 100644 res/battle/scripts/subscripts/subscript_0233.s create mode 100644 res/battle/scripts/subscripts/subscript_0234.s create mode 100644 res/battle/scripts/subscripts/subscript_0235.s create mode 100644 res/battle/scripts/subscripts/subscript_0236.s create mode 100644 res/battle/scripts/subscripts/subscript_0237.s create mode 100644 res/battle/scripts/subscripts/subscript_0238.s create mode 100644 res/battle/scripts/subscripts/subscript_0239.s create mode 100644 res/battle/scripts/subscripts/subscript_0240.s create mode 100644 res/battle/scripts/subscripts/subscript_0241.s create mode 100644 res/battle/scripts/subscripts/subscript_0242.s create mode 100644 res/battle/scripts/subscripts/subscript_0243.s create mode 100644 res/battle/scripts/subscripts/subscript_0244.s create mode 100644 res/battle/scripts/subscripts/subscript_0245.s create mode 100644 res/battle/scripts/subscripts/subscript_0246.s create mode 100644 res/battle/scripts/subscripts/subscript_0247.s create mode 100644 res/battle/scripts/subscripts/subscript_0248.s create mode 100644 res/battle/scripts/subscripts/subscript_0249.s create mode 100644 res/battle/scripts/subscripts/subscript_0250.s create mode 100644 res/battle/scripts/subscripts/subscript_0251.s create mode 100644 res/battle/scripts/subscripts/subscript_0252.s create mode 100644 res/battle/scripts/subscripts/subscript_0253.s create mode 100644 res/battle/scripts/subscripts/subscript_0254.s create mode 100644 res/battle/scripts/subscripts/subscript_0255.s create mode 100644 res/battle/scripts/subscripts/subscript_0256.s create mode 100644 res/battle/scripts/subscripts/subscript_0257.s create mode 100644 res/battle/scripts/subscripts/subscript_0258.s create mode 100644 res/battle/scripts/subscripts/subscript_0259.s create mode 100644 res/battle/scripts/subscripts/subscript_0260.s create mode 100644 res/battle/scripts/subscripts/subscript_0261.s create mode 100644 res/battle/scripts/subscripts/subscript_0262.s create mode 100644 res/battle/scripts/subscripts/subscript_0263.s create mode 100644 res/battle/scripts/subscripts/subscript_0264.s create mode 100644 res/battle/scripts/subscripts/subscript_0265.s create mode 100644 res/battle/scripts/subscripts/subscript_0266.s create mode 100644 res/battle/scripts/subscripts/subscript_0267.s create mode 100644 res/battle/scripts/subscripts/subscript_0268.s create mode 100644 res/battle/scripts/subscripts/subscript_0269.s create mode 100644 res/battle/scripts/subscripts/subscript_0270.s create mode 100644 res/battle/scripts/subscripts/subscript_0271.s create mode 100644 res/battle/scripts/subscripts/subscript_0272.s create mode 100644 res/battle/scripts/subscripts/subscript_0273.s create mode 100644 res/battle/scripts/subscripts/subscript_0274.s create mode 100644 res/battle/scripts/subscripts/subscript_0275.s create mode 100644 res/battle/scripts/subscripts/subscript_0276.s create mode 100644 res/battle/scripts/subscripts/subscript_0277.s create mode 100644 res/battle/scripts/subscripts/subscript_0278.s create mode 100644 res/battle/scripts/subscripts/subscript_0279.s create mode 100644 res/battle/scripts/subscripts/subscript_0280.s create mode 100644 res/battle/scripts/subscripts/subscript_0281.s create mode 100644 res/battle/scripts/subscripts/subscript_0282.s create mode 100644 res/battle/scripts/subscripts/subscript_0283.s create mode 100644 res/battle/scripts/subscripts/subscript_0284.s create mode 100644 res/battle/scripts/subscripts/subscript_0285.s create mode 100644 res/battle/scripts/subscripts/subscript_0286.s create mode 100644 res/battle/scripts/subscripts/subscript_0287.s create mode 100644 res/battle/scripts/subscripts/subscript_0288.s create mode 100644 res/battle/scripts/subscripts/subscript_0289.s create mode 100644 res/battle/scripts/subscripts/subscript_0290.s create mode 100644 res/battle/scripts/subscripts/subscript_0291.s create mode 100644 res/battle/scripts/subscripts/subscript_0292.s create mode 100644 res/battle/scripts/subscripts/subscript_0293.s create mode 100644 res/battle/scripts/subscripts/subscript_0294.s create mode 100644 res/battle/scripts/subscripts/subscript_0295.s create mode 100644 res/battle/scripts/subscripts/subscript_0296.s diff --git a/res/battle/scripts/effects/effect_script_0000.s b/res/battle/scripts/effects/effect_script_0000.s new file mode 100644 index 0000000000..00538dae94 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0000.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0001.s b/res/battle/scripts/effects/effect_script_0001.s new file mode 100644 index 0000000000..205efe0477 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0001.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_SLEEP + End diff --git a/res/battle/scripts/effects/effect_script_0002.s b/res/battle/scripts/effects/effect_script_0002.s new file mode 100644 index 0000000000..9bcd1fb293 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0002.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_POISON + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0003.s b/res/battle/scripts/effects/effect_script_0003.s new file mode 100644 index 0000000000..c78af42e25 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0003.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_DRAIN_HALF_DAMAGE_DEALT + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0004.s b/res/battle/scripts/effects/effect_script_0004.s new file mode 100644 index 0000000000..5c7134cf8d --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0004.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_BURN + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0005.s b/res/battle/scripts/effects/effect_script_0005.s new file mode 100644 index 0000000000..abedba4ae0 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0005.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_FREEZE + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0006.s b/res/battle/scripts/effects/effect_script_0006.s new file mode 100644 index 0000000000..a2c4419116 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0006.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_PARALYZE + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0007.s b/res/battle/scripts/effects/effect_script_0007.s new file mode 100644 index 0000000000..06a48f8619 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0007.s @@ -0,0 +1,32 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CheckIgnorableAbility CHECK_HAVE, BTLSCR_ALL_BATTLERS, ABILITY_DAMP, _038 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_MON_SELFDESTRUCTED, _035 + UpdateVar OPCODE_SET, BTLVAR_CALC_TEMP, 0x10000000 + UpdateVarFromVar OPCODE_LEFT_SHIFT, BTLVAR_CALC_TEMP, BTLVAR_ATTACKER + UpdateVarFromVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, BTLVAR_CALC_TEMP + UpdateMonData OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_CUR_HP, 0 + UpdateVar OPCODE_SET, BTLVAR_HP_CALC_TEMP, 32767 + UpdateHealthBar BTLSCR_ATTACKER + Wait + Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION + +_035: + CalcCrit + CalcDamage + End + +_038: + PrintAttackMessage + Wait + WaitButtonABTime 30 + // {0}’s {1} prevents {2} from using {3}! + PrintMessage pl_msg_00000368_00628, TAG_NICKNAME_ABILITY_NICKNAME_MOVE, BTLSCR_ABILITY_MON, BTLSCR_ABILITY_MON, BTLSCR_ATTACKER, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_CHECK_LOOP_ONLY_ONCE + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_NO_MORE_WORK + End diff --git a/res/battle/scripts/effects/effect_script_0008.s b/res/battle/scripts/effects/effect_script_0008.s new file mode 100644 index 0000000000..dd7ba5e694 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0008.s @@ -0,0 +1,22 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CheckSubstitute BTLSCR_DEFENDER, _015 + CompareMonDataToValue OPCODE_FLAG_NOT, BTLSCR_DEFENDER, BATTLEMON_STATUS, MON_CONDITION_SLEEP, _015 + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_DREAM_EATER + CalcCrit + CalcDamage + End + +_015: + PrintAttackMessage + Wait + WaitButtonABTime 30 + // {0} wasn’t affected! + PrintMessage pl_msg_00000368_00060, TAG_NICKNAME, BTLSCR_DEFENDER + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_NO_MORE_WORK + End diff --git a/res/battle/scripts/effects/effect_script_0009.s b/res/battle/scripts/effects/effect_script_0009.s new file mode 100644 index 0000000000..1456399615 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0009.s @@ -0,0 +1,15 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PrintAttackMessage + Wait + WaitButtonABTime 30 + SetMirrorMove + // Mirror Move failed! + PrintMessage pl_msg_00000368_00798, TAG_NONE + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_NO_MORE_WORK + End diff --git a/res/battle/scripts/effects/effect_script_0010.s b/res/battle/scripts/effects/effect_script_0010.s new file mode 100644 index 0000000000..9e8c2378d2 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0010.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_ATTACK_UP_1_STAGE + End diff --git a/res/battle/scripts/effects/effect_script_0011.s b/res/battle/scripts/effects/effect_script_0011.s new file mode 100644 index 0000000000..c6a02cba65 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0011.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_DEFENSE_UP_1_STAGE + End diff --git a/res/battle/scripts/effects/effect_script_0012.s b/res/battle/scripts/effects/effect_script_0012.s new file mode 100644 index 0000000000..00538dae94 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0012.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0013.s b/res/battle/scripts/effects/effect_script_0013.s new file mode 100644 index 0000000000..a271e06d3e --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0013.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_SP_ATTACK_UP_1_STAGE + End diff --git a/res/battle/scripts/effects/effect_script_0014.s b/res/battle/scripts/effects/effect_script_0014.s new file mode 100644 index 0000000000..00538dae94 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0014.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0015.s b/res/battle/scripts/effects/effect_script_0015.s new file mode 100644 index 0000000000..00538dae94 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0015.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0016.s b/res/battle/scripts/effects/effect_script_0016.s new file mode 100644 index 0000000000..252814153d --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0016.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_EVASION_UP_1_STAGE + End diff --git a/res/battle/scripts/effects/effect_script_0017.s b/res/battle/scripts/effects/effect_script_0017.s new file mode 100644 index 0000000000..00538dae94 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0017.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0018.s b/res/battle/scripts/effects/effect_script_0018.s new file mode 100644 index 0000000000..14fd6d5f44 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0018.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_ATTACK_DOWN_1_STAGE + End diff --git a/res/battle/scripts/effects/effect_script_0019.s b/res/battle/scripts/effects/effect_script_0019.s new file mode 100644 index 0000000000..e25562914a --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0019.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_DEFENSE_DOWN_1_STAGE + End diff --git a/res/battle/scripts/effects/effect_script_0020.s b/res/battle/scripts/effects/effect_script_0020.s new file mode 100644 index 0000000000..bf0fb6fa80 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0020.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_SPEED_DOWN_1_STAGE + End diff --git a/res/battle/scripts/effects/effect_script_0021.s b/res/battle/scripts/effects/effect_script_0021.s new file mode 100644 index 0000000000..00538dae94 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0021.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0022.s b/res/battle/scripts/effects/effect_script_0022.s new file mode 100644 index 0000000000..00538dae94 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0022.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0023.s b/res/battle/scripts/effects/effect_script_0023.s new file mode 100644 index 0000000000..ad696a1028 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0023.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_ACCURACY_DOWN_1_STAGE + End diff --git a/res/battle/scripts/effects/effect_script_0024.s b/res/battle/scripts/effects/effect_script_0024.s new file mode 100644 index 0000000000..57494d2ec6 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0024.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_EVASION_DOWN_1_STAGE + End diff --git a/res/battle/scripts/effects/effect_script_0025.s b/res/battle/scripts/effects/effect_script_0025.s new file mode 100644 index 0000000000..2769194f36 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0025.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_RESET_ALL_STAT_STAGES + End diff --git a/res/battle/scripts/effects/effect_script_0026.s b/res/battle/scripts/effects/effect_script_0026.s new file mode 100644 index 0000000000..f1e9f6f7de --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0026.s @@ -0,0 +1,13 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_MOVE_LOCKED, _015 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_LAST_OF_MULTI_TURN, _015 + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_BIDE_START + End + +_015: + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_ATTACK_MESSAGE + End diff --git a/res/battle/scripts/effects/effect_script_0027.s b/res/battle/scripts/effects/effect_script_0027.s new file mode 100644 index 0000000000..540de6bc7c --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0027.s @@ -0,0 +1,12 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_THRASH, _009 + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_THRASH + +_009: + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0028.s b/res/battle/scripts/effects/effect_script_0028.s new file mode 100644 index 0000000000..bd3f90653d --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0028.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_FORCE_TARGET_TO_SWITCH_OR_FLEE + End diff --git a/res/battle/scripts/effects/effect_script_0029.s b/res/battle/scripts/effects/effect_script_0029.s new file mode 100644 index 0000000000..7438d6ee29 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0029.s @@ -0,0 +1,10 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + SetMultiHit 0, SYSCTL_MULTI_HIT_MOVE + UpdateVar OPCODE_SET, BTLVAR_AFTER_MOVE_MESSAGE_TYPE, AFTER_MOVE_MESSAGE_MULTI_HIT + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0030.s b/res/battle/scripts/effects/effect_script_0030.s new file mode 100644 index 0000000000..9b6eec118e --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0030.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_CONVERSION + End diff --git a/res/battle/scripts/effects/effect_script_0031.s b/res/battle/scripts/effects/effect_script_0031.s new file mode 100644 index 0000000000..dca24eca36 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0031.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_FLINCH + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0032.s b/res/battle/scripts/effects/effect_script_0032.s new file mode 100644 index 0000000000..8c7b28fd3f --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0032.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_RECOVER_HALF_MAX_HP + End diff --git a/res/battle/scripts/effects/effect_script_0033.s b/res/battle/scripts/effects/effect_script_0033.s new file mode 100644 index 0000000000..1359b771bd --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0033.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_BADLY_POISON + End diff --git a/res/battle/scripts/effects/effect_script_0034.s b/res/battle/scripts/effects/effect_script_0034.s new file mode 100644 index 0000000000..669cc02795 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0034.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_CHECK_SUBSTITUTE|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_PAY_DAY + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0035.s b/res/battle/scripts/effects/effect_script_0035.s new file mode 100644 index 0000000000..cb9abb795a --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0035.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_LIGHT_SCREEN + End diff --git a/res/battle/scripts/effects/effect_script_0036.s b/res/battle/scripts/effects/effect_script_0036.s new file mode 100644 index 0000000000..652198b394 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0036.s @@ -0,0 +1,11 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + Random 2, 3 + UpdateVar OPCODE_ADD, BTLVAR_CALC_TEMP, 0x80000000 + UpdateVarFromVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, BTLVAR_CALC_TEMP + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0037.s b/res/battle/scripts/effects/effect_script_0037.s new file mode 100644 index 0000000000..2c2165bc8f --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0037.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_REST + End diff --git a/res/battle/scripts/effects/effect_script_0038.s b/res/battle/scripts/effects/effect_script_0038.s new file mode 100644 index 0000000000..5edb2f3301 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0038.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + TryOHKOMove + End diff --git a/res/battle/scripts/effects/effect_script_0039.s b/res/battle/scripts/effects/effect_script_0039.s new file mode 100644 index 0000000000..91469ffd1e --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0039.s @@ -0,0 +1,24 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_MOVE_LOCKED, _031 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_LAST_OF_MULTI_TURN, _031 + CheckItemHoldEffect CHECK_HAVE, BTLSCR_ATTACKER, HOLD_EFFECT_CHARGE_SKIP, _024 + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_VANISH_CHARGE_TURN + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_ATTACK_MESSAGE|SYSCTL_CHECK_LOOP_ONLY_ONCE|SYSCTL_FIRST_OF_MULTI_TURN + End + +_024: + Call BATTLE_SUBSCRIPT_ITEM_SKIP_CHARGE_TURN + CompareVarToValue OPCODE_EQU, BTLVAR_DEFENDER, BATTLER_NONE, _037 + +_031: + UpdateVar OPCODE_ADD, BTLVAR_CRITICAL_BOOSTS, 1 + CalcCrit + CalcDamage + +_037: + Call BATTLE_SUBSCRIPT_CHARGE_MOVE_CLEANUP + End diff --git a/res/battle/scripts/effects/effect_script_0040.s b/res/battle/scripts/effects/effect_script_0040.s new file mode 100644 index 0000000000..4777eb7a66 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0040.s @@ -0,0 +1,10 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_IGNORE_TYPE_CHECKS + UpdateMonDataFromVar OPCODE_GET, BTLSCR_DEFENDER, BATTLEMON_CUR_HP, BTLVAR_DAMAGE + UpdateVar OPCODE_MUL, BTLVAR_DAMAGE, -1 + DivideVarByValue BTLVAR_DAMAGE, 2 + End diff --git a/res/battle/scripts/effects/effect_script_0041.s b/res/battle/scripts/effects/effect_script_0041.s new file mode 100644 index 0000000000..f0d95952ab --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0041.s @@ -0,0 +1,13 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_REGULATION_FLAG, 1, _013 + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_IGNORE_TYPE_CHECKS + UpdateVar OPCODE_SET, BTLVAR_DAMAGE, -40 + End + +_013: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/effects/effect_script_0042.s b/res/battle/scripts/effects/effect_script_0042.s new file mode 100644 index 0000000000..a13e2fc28c --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0042.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_CHECK_HP_AND_SUBSTITUTE|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_BIND_TARGET + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0043.s b/res/battle/scripts/effects/effect_script_0043.s new file mode 100644 index 0000000000..37f8fba0e2 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0043.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_ADD, BTLVAR_CRITICAL_BOOSTS, 1 + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0044.s b/res/battle/scripts/effects/effect_script_0044.s new file mode 100644 index 0000000000..ff4dfb1380 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0044.s @@ -0,0 +1,10 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + SetMultiHit 2, SYSCTL_MULTI_HIT_MOVE + UpdateVar OPCODE_SET, BTLVAR_AFTER_MOVE_MESSAGE_TYPE, AFTER_MOVE_MESSAGE_MULTI_HIT + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0045.s b/res/battle/scripts/effects/effect_script_0045.s new file mode 100644 index 0000000000..0d925c24bb --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0045.s @@ -0,0 +1,13 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CheckAbility CHECK_NOT_HAVE, BTLSCR_ATTACKER, ABILITY_RECKLESS, _008 + UpdateVar OPCODE_SET, BTLVAR_POWER_MULTI, 12 + +_008: + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_CRASH_DAMAGE + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0046.s b/res/battle/scripts/effects/effect_script_0046.s new file mode 100644 index 0000000000..8c4c60ab36 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0046.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_MIST + End diff --git a/res/battle/scripts/effects/effect_script_0047.s b/res/battle/scripts/effects/effect_script_0047.s new file mode 100644 index 0000000000..34243d3fbd --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0047.s @@ -0,0 +1,12 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_FOCUS_ENERGY, _010 + UpdateVar OPCODE_FLAG_ON, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_FOCUS_ENERGY + End + +_010: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/effects/effect_script_0048.s b/res/battle/scripts/effects/effect_script_0048.s new file mode 100644 index 0000000000..8ebb0a4088 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0048.s @@ -0,0 +1,13 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CheckAbility CHECK_NOT_HAVE, BTLSCR_ATTACKER, ABILITY_RECKLESS, _008 + UpdateVar OPCODE_SET, BTLVAR_POWER_MULTI, 12 + +_008: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_QUARTER_RECOIL + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0049.s b/res/battle/scripts/effects/effect_script_0049.s new file mode 100644 index 0000000000..05a0c990c3 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0049.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_CONFUSE + End diff --git a/res/battle/scripts/effects/effect_script_0050.s b/res/battle/scripts/effects/effect_script_0050.s new file mode 100644 index 0000000000..d1a1150a9e --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0050.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_ATTACK_UP_2_STAGES + End diff --git a/res/battle/scripts/effects/effect_script_0051.s b/res/battle/scripts/effects/effect_script_0051.s new file mode 100644 index 0000000000..3fbfc43ada --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0051.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_DEFENSE_UP_2_STAGES + End diff --git a/res/battle/scripts/effects/effect_script_0052.s b/res/battle/scripts/effects/effect_script_0052.s new file mode 100644 index 0000000000..ff7bbfe187 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0052.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_SPEED_UP_2_STAGES + End diff --git a/res/battle/scripts/effects/effect_script_0053.s b/res/battle/scripts/effects/effect_script_0053.s new file mode 100644 index 0000000000..b08d595ccd --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0053.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_SP_ATTACK_UP_2_STAGES + End diff --git a/res/battle/scripts/effects/effect_script_0054.s b/res/battle/scripts/effects/effect_script_0054.s new file mode 100644 index 0000000000..b56b6e102a --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0054.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_SP_DEFENSE_UP_2_STAGES + End diff --git a/res/battle/scripts/effects/effect_script_0055.s b/res/battle/scripts/effects/effect_script_0055.s new file mode 100644 index 0000000000..00538dae94 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0055.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0056.s b/res/battle/scripts/effects/effect_script_0056.s new file mode 100644 index 0000000000..00538dae94 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0056.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0057.s b/res/battle/scripts/effects/effect_script_0057.s new file mode 100644 index 0000000000..e066880698 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0057.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_CHECK_HP|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_TRANSFORM_INTO_TARGET + End diff --git a/res/battle/scripts/effects/effect_script_0058.s b/res/battle/scripts/effects/effect_script_0058.s new file mode 100644 index 0000000000..312b2d7289 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0058.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_ATTACK_DOWN_2_STAGES + End diff --git a/res/battle/scripts/effects/effect_script_0059.s b/res/battle/scripts/effects/effect_script_0059.s new file mode 100644 index 0000000000..a639bdc596 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0059.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_DEFENSE_DOWN_2_STAGES + End diff --git a/res/battle/scripts/effects/effect_script_0060.s b/res/battle/scripts/effects/effect_script_0060.s new file mode 100644 index 0000000000..2af978070a --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0060.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_SPEED_DOWN_2_STAGES + End diff --git a/res/battle/scripts/effects/effect_script_0061.s b/res/battle/scripts/effects/effect_script_0061.s new file mode 100644 index 0000000000..00538dae94 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0061.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0062.s b/res/battle/scripts/effects/effect_script_0062.s new file mode 100644 index 0000000000..17f1e2e730 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0062.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_SP_DEFENSE_DOWN_2_STAGES + End diff --git a/res/battle/scripts/effects/effect_script_0063.s b/res/battle/scripts/effects/effect_script_0063.s new file mode 100644 index 0000000000..00538dae94 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0063.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0064.s b/res/battle/scripts/effects/effect_script_0064.s new file mode 100644 index 0000000000..00538dae94 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0064.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0065.s b/res/battle/scripts/effects/effect_script_0065.s new file mode 100644 index 0000000000..c1965c632c --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0065.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_REFLECT + End diff --git a/res/battle/scripts/effects/effect_script_0066.s b/res/battle/scripts/effects/effect_script_0066.s new file mode 100644 index 0000000000..8f4809645e --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0066.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_POISON + End diff --git a/res/battle/scripts/effects/effect_script_0067.s b/res/battle/scripts/effects/effect_script_0067.s new file mode 100644 index 0000000000..151683d2eb --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0067.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_PARALYZE + End diff --git a/res/battle/scripts/effects/effect_script_0068.s b/res/battle/scripts/effects/effect_script_0068.s new file mode 100644 index 0000000000..3d7a37c43c --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0068.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_ATTACK_DOWN_1_STAGE + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0069.s b/res/battle/scripts/effects/effect_script_0069.s new file mode 100644 index 0000000000..7e8a7037ba --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0069.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_DEFENSE_DOWN_1_STAGE + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0070.s b/res/battle/scripts/effects/effect_script_0070.s new file mode 100644 index 0000000000..097fc4f708 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0070.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CalcCrit + CalcDamage + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_SPEED_DOWN_1_STAGE + End diff --git a/res/battle/scripts/effects/effect_script_0071.s b/res/battle/scripts/effects/effect_script_0071.s new file mode 100644 index 0000000000..0464f10ea3 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0071.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CalcCrit + CalcDamage + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_SP_ATTACK_DOWN_1_STAGE + End diff --git a/res/battle/scripts/effects/effect_script_0072.s b/res/battle/scripts/effects/effect_script_0072.s new file mode 100644 index 0000000000..1ba7f3501a --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0072.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CalcCrit + CalcDamage + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_SP_DEFENSE_DOWN_1_STAGE + End diff --git a/res/battle/scripts/effects/effect_script_0073.s b/res/battle/scripts/effects/effect_script_0073.s new file mode 100644 index 0000000000..dc26928ec4 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0073.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CalcCrit + CalcDamage + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_ACCURACY_DOWN_1_STAGE + End diff --git a/res/battle/scripts/effects/effect_script_0074.s b/res/battle/scripts/effects/effect_script_0074.s new file mode 100644 index 0000000000..00538dae94 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0074.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0075.s b/res/battle/scripts/effects/effect_script_0075.s new file mode 100644 index 0000000000..bd3617999e --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0075.s @@ -0,0 +1,24 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_MOVE_LOCKED, _026 + CheckItemHoldEffect CHECK_HAVE, BTLSCR_ATTACKER, HOLD_EFFECT_CHARGE_SKIP, _019 + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_VANISH_CHARGE_TURN + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_ATTACK_MESSAGE|SYSCTL_CHECK_LOOP_ONLY_ONCE|SYSCTL_FIRST_OF_MULTI_TURN + End + +_019: + Call BATTLE_SUBSCRIPT_ITEM_SKIP_CHARGE_TURN + CompareVarToValue OPCODE_EQU, BTLVAR_DEFENDER, BATTLER_NONE, _036 + +_026: + UpdateVar OPCODE_ADD, BTLVAR_CRITICAL_BOOSTS, 1 + CalcCrit + CalcDamage + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_FLINCH + +_036: + Call BATTLE_SUBSCRIPT_CHARGE_MOVE_CLEANUP + End diff --git a/res/battle/scripts/effects/effect_script_0076.s b/res/battle/scripts/effects/effect_script_0076.s new file mode 100644 index 0000000000..053a93c01a --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0076.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_CONFUSE + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0077.s b/res/battle/scripts/effects/effect_script_0077.s new file mode 100644 index 0000000000..baa3d2ec61 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0077.s @@ -0,0 +1,11 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_POISON + SetMultiHit 2, SYSCTL_MULTI_HIT_MOVE + UpdateVar OPCODE_SET, BTLVAR_AFTER_MOVE_MESSAGE_TYPE, AFTER_MOVE_MESSAGE_MULTI_HIT + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0078.s b/res/battle/scripts/effects/effect_script_0078.s new file mode 100644 index 0000000000..00538dae94 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0078.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0079.s b/res/battle/scripts/effects/effect_script_0079.s new file mode 100644 index 0000000000..4e943eebce --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0079.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_TRY_SUBSTITUTE + End diff --git a/res/battle/scripts/effects/effect_script_0080.s b/res/battle/scripts/effects/effect_script_0080.s new file mode 100644 index 0000000000..fe3971f01e --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0080.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_RECHARGE_TURN + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0081.s b/res/battle/scripts/effects/effect_script_0081.s new file mode 100644 index 0000000000..1f2ca2f6c2 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0081.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_SET_RAGE_FLAG + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0082.s b/res/battle/scripts/effects/effect_script_0082.s new file mode 100644 index 0000000000..4a045c36f8 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0082.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_MIMIC + End diff --git a/res/battle/scripts/effects/effect_script_0083.s b/res/battle/scripts/effects/effect_script_0083.s new file mode 100644 index 0000000000..6ed3a85e58 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0083.s @@ -0,0 +1,12 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PrintAttackMessage + Wait + WaitButtonABTime 30 + PlayMoveAnimation BTLSCR_ATTACKER + Wait + Metronome + GoToMoveScript FALSE diff --git a/res/battle/scripts/effects/effect_script_0084.s b/res/battle/scripts/effects/effect_script_0084.s new file mode 100644 index 0000000000..8559aa1478 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0084.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_CHECK_HP|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_LEECH_SEED_START + End diff --git a/res/battle/scripts/effects/effect_script_0085.s b/res/battle/scripts/effects/effect_script_0085.s new file mode 100644 index 0000000000..68139b68e4 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0085.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_SPLASH + End diff --git a/res/battle/scripts/effects/effect_script_0086.s b/res/battle/scripts/effects/effect_script_0086.s new file mode 100644 index 0000000000..0c7212f2bb --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0086.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_FLAG_ON, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_DISABLE_START + End diff --git a/res/battle/scripts/effects/effect_script_0087.s b/res/battle/scripts/effects/effect_script_0087.s new file mode 100644 index 0000000000..09ae7156db --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0087.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_IGNORE_TYPE_CHECKS + UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_LEVEL, BTLVAR_DAMAGE + UpdateVar OPCODE_MUL, BTLVAR_DAMAGE, -1 + End diff --git a/res/battle/scripts/effects/effect_script_0088.s b/res/battle/scripts/effects/effect_script_0088.s new file mode 100644 index 0000000000..bdefd3d307 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0088.s @@ -0,0 +1,16 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_IGNORE_TYPE_CHECKS + Random 10, 5 + UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_LEVEL, BTLVAR_DAMAGE + UpdateVarFromVar OPCODE_MUL, BTLVAR_DAMAGE, BTLVAR_CALC_TEMP + UpdateVar OPCODE_DIV, BTLVAR_DAMAGE, 10 + CompareVarToValue OPCODE_NEQ, BTLVAR_DAMAGE, 0, _028 + UpdateVar OPCODE_SET, BTLVAR_DAMAGE, 1 + +_028: + UpdateVar OPCODE_MUL, BTLVAR_DAMAGE, -1 + End diff --git a/res/battle/scripts/effects/effect_script_0089.s b/res/battle/scripts/effects/effect_script_0089.s new file mode 100644 index 0000000000..cb176d8b64 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0089.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_IGNORE_TYPE_CHECKS + Counter + End diff --git a/res/battle/scripts/effects/effect_script_0090.s b/res/battle/scripts/effects/effect_script_0090.s new file mode 100644 index 0000000000..61fcfd3bbc --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0090.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_ENCORE_START + End diff --git a/res/battle/scripts/effects/effect_script_0091.s b/res/battle/scripts/effects/effect_script_0091.s new file mode 100644 index 0000000000..2cc9a705e9 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0091.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_PAIN_SPLIT + End diff --git a/res/battle/scripts/effects/effect_script_0092.s b/res/battle/scripts/effects/effect_script_0092.s new file mode 100644 index 0000000000..0dda3df368 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0092.s @@ -0,0 +1,18 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareMonDataToValue OPCODE_FLAG_NOT, BTLSCR_ATTACKER, BATTLEMON_STATUS, MON_CONDITION_SLEEP, _019 + CompareVarToValue OPCODE_EQU, BTLVAR_MOVE_TEMP, MOVE_SLEEP_TALK, _012 + Call BATTLE_SUBSCRIPT_SLEEPING + +_012: + UpdateVar OPCODE_FLAG_ON, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_FLINCH + CalcCrit + CalcDamage + End + +_019: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/effects/effect_script_0093.s b/res/battle/scripts/effects/effect_script_0093.s new file mode 100644 index 0000000000..1f3f491f27 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0093.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_CONVERSION_2 + End diff --git a/res/battle/scripts/effects/effect_script_0094.s b/res/battle/scripts/effects/effect_script_0094.s new file mode 100644 index 0000000000..1b4168b258 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0094.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_CHECK_HP|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_LOCK_ON + End diff --git a/res/battle/scripts/effects/effect_script_0095.s b/res/battle/scripts/effects/effect_script_0095.s new file mode 100644 index 0000000000..3354d740d8 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0095.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_SKETCH + End diff --git a/res/battle/scripts/effects/effect_script_0096.s b/res/battle/scripts/effects/effect_script_0096.s new file mode 100644 index 0000000000..00538dae94 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0096.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0097.s b/res/battle/scripts/effects/effect_script_0097.s new file mode 100644 index 0000000000..e9d5aa50be --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0097.s @@ -0,0 +1,14 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareMonDataToValue OPCODE_FLAG_NOT, BTLSCR_ATTACKER, BATTLEMON_STATUS, MON_CONDITION_SLEEP, _013 + Call BATTLE_SUBSCRIPT_SLEEPING + TrySleepTalk _013 + Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION + GoToMoveScript FALSE + +_013: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/effects/effect_script_0098.s b/res/battle/scripts/effects/effect_script_0098.s new file mode 100644 index 0000000000..8246ddedca --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0098.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_DESTINY_BOND + End diff --git a/res/battle/scripts/effects/effect_script_0099.s b/res/battle/scripts/effects/effect_script_0099.s new file mode 100644 index 0000000000..687d306beb --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0099.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CalcFlailPower + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0100.s b/res/battle/scripts/effects/effect_script_0100.s new file mode 100644 index 0000000000..c174e94166 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0100.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_REDUCE_TARGET_PP + End diff --git a/res/battle/scripts/effects/effect_script_0101.s b/res/battle/scripts/effects/effect_script_0101.s new file mode 100644 index 0000000000..00538dae94 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0101.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0102.s b/res/battle/scripts/effects/effect_script_0102.s new file mode 100644 index 0000000000..f7074ad419 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0102.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_HEAL_BELL + End diff --git a/res/battle/scripts/effects/effect_script_0103.s b/res/battle/scripts/effects/effect_script_0103.s new file mode 100644 index 0000000000..00538dae94 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0103.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0104.s b/res/battle/scripts/effects/effect_script_0104.s new file mode 100644 index 0000000000..2f86bb9e31 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0104.s @@ -0,0 +1,11 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + SetMultiHit 3, SYSCTL_TRIPLE_KICK + UpdateVar OPCODE_SET, BTLVAR_AFTER_MOVE_MESSAGE_TYPE, AFTER_MOVE_MESSAGE_MULTI_HIT + UpdateVar OPCODE_ADD, BTLVAR_MOVE_POWER, 10 + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0105.s b/res/battle/scripts/effects/effect_script_0105.s new file mode 100644 index 0000000000..f0a059cff1 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0105.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_CHECK_SUBSTITUTE|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_STEAL_ITEM + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0106.s b/res/battle/scripts/effects/effect_script_0106.s new file mode 100644 index 0000000000..70d75557bb --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0106.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_CHECK_HP|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_MEAN_LOOK + End diff --git a/res/battle/scripts/effects/effect_script_0107.s b/res/battle/scripts/effects/effect_script_0107.s new file mode 100644 index 0000000000..c62848e378 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0107.s @@ -0,0 +1,14 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CheckSubstitute BTLSCR_DEFENDER, _019 + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_DEFENDER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_NIGHTMARE, _019 + CompareMonDataToValue OPCODE_FLAG_NOT, BTLSCR_DEFENDER, BATTLEMON_STATUS, MON_CONDITION_SLEEP, _019 + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_NIGHTMARE_START + End + +_019: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/effects/effect_script_0108.s b/res/battle/scripts/effects/effect_script_0108.s new file mode 100644 index 0000000000..1dc2c8382d --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0108.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_MINIMIZE + End diff --git a/res/battle/scripts/effects/effect_script_0109.s b/res/battle/scripts/effects/effect_script_0109.s new file mode 100644 index 0000000000..8a06bf4afe --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0109.s @@ -0,0 +1,18 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareMonDataToValue OPCODE_EQU, BTLSCR_ATTACKER, BATTLEMON_TYPE_1, TYPE_GHOST, _016 + CompareMonDataToValue OPCODE_EQU, BTLSCR_ATTACKER, BATTLEMON_TYPE_2, TYPE_GHOST, _016 + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_CURSE_NORMAL + End + +_016: + CompareVarToVar OPCODE_NEQ, BTLVAR_ATTACKER, BTLVAR_DEFENDER, _023 + SetRandomTarget BTLSCR_ATTACKER + +_023: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_CURSE_GHOST + UpdateVar OPCODE_SET, BTLVAR_MOVE_EFFECT_CHANCE, 1 + End diff --git a/res/battle/scripts/effects/effect_script_0110.s b/res/battle/scripts/effects/effect_script_0110.s new file mode 100644 index 0000000000..00538dae94 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0110.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0111.s b/res/battle/scripts/effects/effect_script_0111.s new file mode 100644 index 0000000000..18328a95ac --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0111.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_CHECK_HP|MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_PROTECT + End diff --git a/res/battle/scripts/effects/effect_script_0112.s b/res/battle/scripts/effects/effect_script_0112.s new file mode 100644 index 0000000000..f370ec9234 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0112.s @@ -0,0 +1,14 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + TrySpikes _010 + // Spikes were scattered all around your team’s feet! + BufferMessage pl_msg_00000368_00427, TAG_NONE_SIDE_CONSCIOUS, BTLSCR_ATTACKER_ENEMY + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_PRINT_MESSAGE_AND_PLAY_ANIMATION + End + +_010: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/effects/effect_script_0113.s b/res/battle/scripts/effects/effect_script_0113.s new file mode 100644 index 0000000000..a7a1640e2d --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0113.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_FORESIGHT + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_IGNORE_IMMUNITIES + End diff --git a/res/battle/scripts/effects/effect_script_0114.s b/res/battle/scripts/effects/effect_script_0114.s new file mode 100644 index 0000000000..d15c22fd8c --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0114.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_PERISH_SONG_START + End diff --git a/res/battle/scripts/effects/effect_script_0115.s b/res/battle/scripts/effects/effect_script_0115.s new file mode 100644 index 0000000000..54ba835ca2 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0115.s @@ -0,0 +1,22 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_SANDSTORM, _036 + // A sandstorm brewed! + BufferMessage pl_msg_00000368_00804, TAG_NONE + UpdateVar OPCODE_FLAG_OFF, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_WEATHER + UpdateVar OPCODE_FLAG_ON, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_SANDSTORM_TEMP + UpdateVar OPCODE_SET, BTLVAR_WEATHER_TURNS, 5 + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_WEATHER_START + CheckItemHoldEffect CHECK_NOT_HAVE, BTLSCR_ATTACKER, HOLD_EFFECT_EXTEND_SANDSTORM, _035 + GetItemEffectParam BTLSCR_ATTACKER, BTLVAR_CALC_TEMP + UpdateVarFromVar OPCODE_ADD, BTLVAR_WEATHER_TURNS, BTLVAR_CALC_TEMP + +_035: + End + +_036: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/effects/effect_script_0116.s b/res/battle/scripts/effects/effect_script_0116.s new file mode 100644 index 0000000000..18328a95ac --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0116.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_CHECK_HP|MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_PROTECT + End diff --git a/res/battle/scripts/effects/effect_script_0117.s b/res/battle/scripts/effects/effect_script_0117.s new file mode 100644 index 0000000000..0a7ace6404 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0117.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CalcRolloutPower + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0118.s b/res/battle/scripts/effects/effect_script_0118.s new file mode 100644 index 0000000000..c7a613bca2 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0118.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_SWAGGER + End diff --git a/res/battle/scripts/effects/effect_script_0119.s b/res/battle/scripts/effects/effect_script_0119.s new file mode 100644 index 0000000000..927b189899 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0119.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CalcFuryCutterPower + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0120.s b/res/battle/scripts/effects/effect_script_0120.s new file mode 100644 index 0000000000..998c97790b --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0120.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_INFATUATE + UpdateVarFromVar OPCODE_SET, BTLVAR_MSG_BATTLER_TEMP, BTLVAR_ATTACKER + End diff --git a/res/battle/scripts/effects/effect_script_0121.s b/res/battle/scripts/effects/effect_script_0121.s new file mode 100644 index 0000000000..e1a36ed0ae --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0121.s @@ -0,0 +1,11 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_FRIENDSHIP, BTLVAR_MOVE_POWER + UpdateVar OPCODE_MUL, BTLVAR_MOVE_POWER, 10 + UpdateVar OPCODE_DIV, BTLVAR_MOVE_POWER, 25 + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0122.s b/res/battle/scripts/effects/effect_script_0122.s new file mode 100644 index 0000000000..1ce610e1ee --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0122.s @@ -0,0 +1,16 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + Present _004 + CalcCrit + CalcDamage + End + +_004: + UpdateVarFromVar OPCODE_SET, BTLVAR_MSG_BATTLER_TEMP, BTLVAR_DEFENDER + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_PRESENT_HEAL + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_IGNORE_IMMUNITIES + UpdateVar OPCODE_SET, BTLVAR_MOVE_EFFECT_CHANCE, 1 + End diff --git a/res/battle/scripts/effects/effect_script_0123.s b/res/battle/scripts/effects/effect_script_0123.s new file mode 100644 index 0000000000..40fb079752 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0123.s @@ -0,0 +1,12 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_FRIENDSHIP, BTLVAR_MOVE_POWER + UpdateVar OPCODE_SUB, BTLVAR_MOVE_POWER, 255 + UpdateVar OPCODE_MUL, BTLVAR_MOVE_POWER, -10 + UpdateVar OPCODE_DIV, BTLVAR_MOVE_POWER, 25 + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0124.s b/res/battle/scripts/effects/effect_script_0124.s new file mode 100644 index 0000000000..c5c10478b5 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0124.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_SAFEGUARD_START + End diff --git a/res/battle/scripts/effects/effect_script_0125.s b/res/battle/scripts/effects/effect_script_0125.s new file mode 100644 index 0000000000..5c7134cf8d --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0125.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_BURN + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0126.s b/res/battle/scripts/effects/effect_script_0126.s new file mode 100644 index 0000000000..7b5220691e --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0126.s @@ -0,0 +1,16 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_HIT_DURING_DIG + UpdateVar OPCODE_SET, BTLVAR_POWER_MULTI, 10 + CompareMonDataToValue OPCODE_FLAG_NOT, BTLSCR_DEFENDER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_UNDERGROUND, _017 + UpdateVar OPCODE_SET, BTLVAR_POWER_MULTI, 20 + +_017: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_MAGNITUDE + CalcMagnitudePower + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0127.s b/res/battle/scripts/effects/effect_script_0127.s new file mode 100644 index 0000000000..d7d912831c --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0127.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_BATON_PASS + End diff --git a/res/battle/scripts/effects/effect_script_0128.s b/res/battle/scripts/effects/effect_script_0128.s new file mode 100644 index 0000000000..00538dae94 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0128.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0129.s b/res/battle/scripts/effects/effect_script_0129.s new file mode 100644 index 0000000000..0a617a998f --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0129.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_RAPID_SPIN + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0130.s b/res/battle/scripts/effects/effect_script_0130.s new file mode 100644 index 0000000000..76f0eb5baa --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0130.s @@ -0,0 +1,13 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_REGULATION_FLAG, 1, _013 + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_IGNORE_TYPE_CHECKS + UpdateVar OPCODE_SET, BTLVAR_DAMAGE, -20 + End + +_013: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/effects/effect_script_0131.s b/res/battle/scripts/effects/effect_script_0131.s new file mode 100644 index 0000000000..00538dae94 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0131.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0132.s b/res/battle/scripts/effects/effect_script_0132.s new file mode 100644 index 0000000000..ce90389985 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0132.s @@ -0,0 +1,10 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + WeatherHPRecovery + UpdateVarFromVar OPCODE_SET, BTLVAR_MSG_BATTLER_TEMP, BTLVAR_ATTACKER + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_PRESENT_HEAL + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_RECOVER_HP_VISUAL + End diff --git a/res/battle/scripts/effects/effect_script_0133.s b/res/battle/scripts/effects/effect_script_0133.s new file mode 100644 index 0000000000..00538dae94 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0133.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0134.s b/res/battle/scripts/effects/effect_script_0134.s new file mode 100644 index 0000000000..00538dae94 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0134.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0135.s b/res/battle/scripts/effects/effect_script_0135.s new file mode 100644 index 0000000000..a40ca34e67 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0135.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CalcHiddenPowerParams + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0136.s b/res/battle/scripts/effects/effect_script_0136.s new file mode 100644 index 0000000000..5064ed3f28 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0136.s @@ -0,0 +1,22 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_RAINING, _036 + // It started to rain! + BufferMessage pl_msg_00000368_00799, TAG_NONE + UpdateVar OPCODE_FLAG_OFF, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_WEATHER + UpdateVar OPCODE_FLAG_ON, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_RAINING_TEMP + UpdateVar OPCODE_SET, BTLVAR_WEATHER_TURNS, 5 + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_WEATHER_START + CheckItemHoldEffect CHECK_NOT_HAVE, BTLSCR_ATTACKER, HOLD_EFFECT_EXTEND_RAIN, _035 + GetItemEffectParam BTLSCR_ATTACKER, BTLVAR_CALC_TEMP + UpdateVarFromVar OPCODE_ADD, BTLVAR_WEATHER_TURNS, BTLVAR_CALC_TEMP + +_035: + End + +_036: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/effects/effect_script_0137.s b/res/battle/scripts/effects/effect_script_0137.s new file mode 100644 index 0000000000..7006d7a527 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0137.s @@ -0,0 +1,22 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_SUNNY, _036 + // The sunlight turned harsh! + BufferMessage pl_msg_00000368_00807, TAG_NONE + UpdateVar OPCODE_FLAG_OFF, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_WEATHER + UpdateVar OPCODE_FLAG_ON, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_SUNNY_TEMP + UpdateVar OPCODE_SET, BTLVAR_WEATHER_TURNS, 5 + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_WEATHER_START + CheckItemHoldEffect CHECK_NOT_HAVE, BTLSCR_ATTACKER, HOLD_EFFECT_EXTEND_SUN, _035 + GetItemEffectParam BTLSCR_ATTACKER, BTLVAR_CALC_TEMP + UpdateVarFromVar OPCODE_ADD, BTLVAR_WEATHER_TURNS, BTLVAR_CALC_TEMP + +_035: + End + +_036: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/effects/effect_script_0138.s b/res/battle/scripts/effects/effect_script_0138.s new file mode 100644 index 0000000000..a6290c0fb2 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0138.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_DEFENSE_UP_1_STAGE + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0139.s b/res/battle/scripts/effects/effect_script_0139.s new file mode 100644 index 0000000000..d79087e097 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0139.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_ATTACK_UP_1_STAGE + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0140.s b/res/battle/scripts/effects/effect_script_0140.s new file mode 100644 index 0000000000..5712ebc3d2 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0140.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_BOOST_ALL_STATS + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0141.s b/res/battle/scripts/effects/effect_script_0141.s new file mode 100644 index 0000000000..00538dae94 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0141.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0142.s b/res/battle/scripts/effects/effect_script_0142.s new file mode 100644 index 0000000000..a0b6eebc09 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0142.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_BELLY_DRUM + End diff --git a/res/battle/scripts/effects/effect_script_0143.s b/res/battle/scripts/effects/effect_script_0143.s new file mode 100644 index 0000000000..eb322a31c0 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0143.s @@ -0,0 +1,10 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CopyStatStages + // {0} copied {1}’s stat changes! + BufferMessage pl_msg_00000368_00452, TAG_NICKNAME_NICKNAME, BTLSCR_ATTACKER, BTLSCR_DEFENDER + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_PRINT_MESSAGE_AND_PLAY_ANIMATION + End diff --git a/res/battle/scripts/effects/effect_script_0144.s b/res/battle/scripts/effects/effect_script_0144.s new file mode 100644 index 0000000000..ac9eae29f5 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0144.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_IGNORE_TYPE_CHECKS + MirrorCoat + End diff --git a/res/battle/scripts/effects/effect_script_0145.s b/res/battle/scripts/effects/effect_script_0145.s new file mode 100644 index 0000000000..62a45ec637 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0145.s @@ -0,0 +1,23 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_MOVE_LOCKED, _030 + CheckItemHoldEffect CHECK_HAVE, BTLSCR_ATTACKER, HOLD_EFFECT_CHARGE_SKIP, _023 + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_VANISH_CHARGE_TURN + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_DEFENSE_UP_1_STAGE + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_ATTACK_MESSAGE|SYSCTL_CHECK_LOOP_ONLY_ONCE|SYSCTL_FIRST_OF_MULTI_TURN + End + +_023: + Call BATTLE_SUBSCRIPT_POWER_HERB_SKULL_BASH + CompareVarToValue OPCODE_EQU, BTLVAR_DEFENDER, BATTLER_NONE, _032 + +_030: + CalcCrit + CalcDamage + +_032: + Call BATTLE_SUBSCRIPT_CHARGE_MOVE_CLEANUP + End diff --git a/res/battle/scripts/effects/effect_script_0146.s b/res/battle/scripts/effects/effect_script_0146.s new file mode 100644 index 0000000000..b3fd2b49c2 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0146.s @@ -0,0 +1,15 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_FLINCH + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_HIT_DURING_FLY + UpdateVar OPCODE_SET, BTLVAR_POWER_MULTI, 10 + CompareMonDataToValue OPCODE_FLAG_NOT, BTLSCR_DEFENDER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_AIRBORNE, _021 + UpdateVar OPCODE_SET, BTLVAR_POWER_MULTI, 20 + +_021: + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0147.s b/res/battle/scripts/effects/effect_script_0147.s new file mode 100644 index 0000000000..2a671ae760 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0147.s @@ -0,0 +1,14 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_HIT_DURING_DIG + UpdateVar OPCODE_SET, BTLVAR_POWER_MULTI, 10 + CompareMonDataToValue OPCODE_FLAG_NOT, BTLSCR_DEFENDER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_UNDERGROUND, _017 + UpdateVar OPCODE_SET, BTLVAR_POWER_MULTI, 20 + +_017: + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0148.s b/res/battle/scripts/effects/effect_script_0148.s new file mode 100644 index 0000000000..92c8c0d426 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0148.s @@ -0,0 +1,16 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + TryFutureSight _010 + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_PRINT_MESSAGE_AND_PLAY_ANIMATION + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_HIT_DURING_FLY|SYSCTL_HIT_DURING_DIG|SYSCTL_HIT_DURING_DIVE|SYSCTL_NONSTANDARD_ACC_CHECK|SYSCTL_IGNORE_IMMUNITIES|SYSCTL_HIT_DURING_SHADOW_FORCE + End + +_010: + PrintAttackMessage + Wait + WaitButtonABTime 30 + Call BATTLE_SUBSCRIPT_BUT_IT_FAILED + End diff --git a/res/battle/scripts/effects/effect_script_0149.s b/res/battle/scripts/effects/effect_script_0149.s new file mode 100644 index 0000000000..b2979799d8 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0149.s @@ -0,0 +1,14 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_HIT_DURING_FLY + UpdateVar OPCODE_SET, BTLVAR_POWER_MULTI, 10 + CompareMonDataToValue OPCODE_FLAG_NOT, BTLSCR_DEFENDER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_AIRBORNE, _017 + UpdateVar OPCODE_SET, BTLVAR_POWER_MULTI, 20 + +_017: + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0150.s b/res/battle/scripts/effects/effect_script_0150.s new file mode 100644 index 0000000000..5856866954 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0150.s @@ -0,0 +1,14 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_FLINCH + UpdateVar OPCODE_SET, BTLVAR_POWER_MULTI, 10 + CompareMonDataToValue OPCODE_FLAG_NOT, BTLSCR_DEFENDER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_MINIMIZE, _017 + UpdateVar OPCODE_SET, BTLVAR_POWER_MULTI, 20 + +_017: + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0151.s b/res/battle/scripts/effects/effect_script_0151.s new file mode 100644 index 0000000000..8dfd5b5ab5 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0151.s @@ -0,0 +1,28 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CheckIgnoreWeather _006 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_SUNNY, _028 + +_006: + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_MOVE_LOCKED, _033 + CheckItemHoldEffect CHECK_HAVE, BTLSCR_ATTACKER, HOLD_EFFECT_CHARGE_SKIP, _026 + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_VANISH_CHARGE_TURN + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_ATTACK_MESSAGE|SYSCTL_CHECK_LOOP_ONLY_ONCE|SYSCTL_FIRST_OF_MULTI_TURN + End + +_026: + Call BATTLE_SUBSCRIPT_ITEM_SKIP_CHARGE_TURN + +_028: + CompareVarToValue OPCODE_EQU, BTLVAR_DEFENDER, BATTLER_NONE, _035 + +_033: + CalcCrit + CalcDamage + +_035: + Call BATTLE_SUBSCRIPT_CHARGE_MOVE_CLEANUP + End diff --git a/res/battle/scripts/effects/effect_script_0152.s b/res/battle/scripts/effects/effect_script_0152.s new file mode 100644 index 0000000000..fa65e48bf5 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0152.s @@ -0,0 +1,10 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_PARALYZE + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_HIT_DURING_FLY + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0153.s b/res/battle/scripts/effects/effect_script_0153.s new file mode 100644 index 0000000000..3ff4c76556 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0153.s @@ -0,0 +1,12 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_TYPE, BATTLE_TYPE_TRAINER, _009 + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_TELEPORT + End + +_009: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/effects/effect_script_0154.s b/res/battle/scripts/effects/effect_script_0154.s new file mode 100644 index 0000000000..21ee1322cf --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0154.s @@ -0,0 +1,11 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_IGNORE_IMMUNITIES + CalcCrit + BeatUp + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_FUTURE_SIGHT_START + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_MULTI_HIT_SKIP_MESSAGE + End diff --git a/res/battle/scripts/effects/effect_script_0155.s b/res/battle/scripts/effects/effect_script_0155.s new file mode 100644 index 0000000000..67ca272ba5 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0155.s @@ -0,0 +1,27 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_MOVE_LOCKED, _044 + CheckItemHoldEffect CHECK_HAVE, BTLSCR_ATTACKER, HOLD_EFFECT_CHARGE_SKIP, _024 + UpdateMonData OPCODE_FLAG_ON, BTLSCR_ATTACKER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_AIRBORNE + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_VANISH_CHARGE_TURN + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_ATTACK_MESSAGE|SYSCTL_CHECK_LOOP_ONLY_ONCE|SYSCTL_FIRST_OF_MULTI_TURN + End + +_024: + UpdateMonData OPCODE_FLAG_ON, BTLSCR_ATTACKER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_AIRBORNE + UpdateMonData OPCODE_FLAG_ON, BTLSCR_ATTACKER, BATTLEMON_MOVE_EFFECTS_TEMP, 64 + Call BATTLE_SUBSCRIPT_ITEM_SKIP_CHARGE_TURN + ToggleVanish BTLSCR_ATTACKER, TRUE + CompareVarToValue OPCODE_EQU, BTLVAR_DEFENDER, BATTLER_NONE, _046 + +_044: + CalcCrit + CalcDamage + +_046: + UpdateMonData OPCODE_FLAG_OFF, BTLSCR_ATTACKER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_SEMI_INVULNERABLE + Call BATTLE_SUBSCRIPT_CHARGE_MOVE_CLEANUP + End diff --git a/res/battle/scripts/effects/effect_script_0156.s b/res/battle/scripts/effects/effect_script_0156.s new file mode 100644 index 0000000000..2b3a5f203d --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0156.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateMonData OPCODE_FLAG_ON, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_DEFENSE_CURL + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_DEFENSE_UP_1_STAGE + End diff --git a/res/battle/scripts/effects/effect_script_0157.s b/res/battle/scripts/effects/effect_script_0157.s new file mode 100644 index 0000000000..00538dae94 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0157.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0158.s b/res/battle/scripts/effects/effect_script_0158.s new file mode 100644 index 0000000000..899a22851c --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0158.s @@ -0,0 +1,14 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareMonDataToVar OPCODE_NEQ, BTLSCR_ATTACKER, BATTLEMON_FAKE_OUT_TURN_NUMBER, BTLVAR_TOTAL_TURNS, _012 + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_FLINCH + CalcCrit + CalcDamage + End + +_012: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/effects/effect_script_0159.s b/res/battle/scripts/effects/effect_script_0159.s new file mode 100644 index 0000000000..5e825f5826 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0159.s @@ -0,0 +1,12 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_UPROAR, _009 + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_UPROAR + +_009: + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0160.s b/res/battle/scripts/effects/effect_script_0160.s new file mode 100644 index 0000000000..2c2453eed3 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0160.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_STOCKPILE + End diff --git a/res/battle/scripts/effects/effect_script_0161.s b/res/battle/scripts/effects/effect_script_0161.s new file mode 100644 index 0000000000..99ec5bb523 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0161.s @@ -0,0 +1,33 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareMonDataToValue OPCODE_EQU, BTLSCR_ATTACKER, BATTLEMON_STOCKPILE_COUNT, 0, _064 + UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_STOCKPILE_COUNT, BTLVAR_MOVE_POWER + UpdateVar OPCODE_MUL, BTLVAR_MOVE_POWER, 100 + UpdateMonData OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_STOCKPILE_COUNT, 0 + UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_STOCKPILE_DEF_BOOSTS, BTLVAR_CALC_TEMP + UpdateMonDataFromVar OPCODE_SUB_TO_ZERO, BTLSCR_ATTACKER, BATTLEMON_DEFENSE_STAGE, BTLVAR_CALC_TEMP + UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_STOCKPILE_SPDEF_BOOSTS, BTLVAR_CALC_TEMP + UpdateMonDataFromVar OPCODE_SUB_TO_ZERO, BTLSCR_ATTACKER, BATTLEMON_SP_DEFENSE_STAGE, BTLVAR_CALC_TEMP + UpdateMonData OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_STOCKPILE_DEF_BOOSTS, 0 + UpdateMonData OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_STOCKPILE_SPDEF_BOOSTS, 0 + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_MESSAGE_AFTER_MISS + // {0}’s stockpiled effect wore off! + BufferMessage pl_msg_00000368_00994, TAG_NICKNAME, BTLSCR_ATTACKER + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_PRINT_MESSAGE_AND_PLAY_ANIMATION + CalcCrit + CalcMaxDamage + End + +_064: + PrintAttackMessage + Wait + WaitButtonABTime 30 + // But it failed to spit up a thing! + PrintMessage pl_msg_00000368_00814, TAG_NONE + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_NO_MORE_WORK + End diff --git a/res/battle/scripts/effects/effect_script_0162.s b/res/battle/scripts/effects/effect_script_0162.s new file mode 100644 index 0000000000..4aad3c6adf --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0162.s @@ -0,0 +1,34 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareMonDataToValue OPCODE_EQU, BTLSCR_ATTACKER, BATTLEMON_STOCKPILE_COUNT, 0, _078 + UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_STOCKPILE_COUNT, BTLVAR_HP_CALC_TEMP + UpdateVar OPCODE_SUB, BTLVAR_HP_CALC_TEMP, 3 + UpdateVar OPCODE_MUL, BTLVAR_HP_CALC_TEMP, -1 + UpdateVar OPCODE_SET, BTLVAR_CALC_TEMP, 0x00000001 + UpdateVarFromVar OPCODE_LEFT_SHIFT, BTLVAR_CALC_TEMP, BTLVAR_HP_CALC_TEMP + UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_MAX_HP, BTLVAR_HP_CALC_TEMP + DivideVarByVar BTLVAR_HP_CALC_TEMP, BTLVAR_CALC_TEMP + UpdateMonData OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_STOCKPILE_COUNT, 0 + UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_STOCKPILE_DEF_BOOSTS, BTLVAR_CALC_TEMP + UpdateMonDataFromVar OPCODE_SUB_TO_ZERO, BTLSCR_ATTACKER, BATTLEMON_DEFENSE_STAGE, BTLVAR_CALC_TEMP + UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_STOCKPILE_SPDEF_BOOSTS, BTLVAR_CALC_TEMP + UpdateMonDataFromVar OPCODE_SUB_TO_ZERO, BTLSCR_ATTACKER, BATTLEMON_SP_DEFENSE_STAGE, BTLVAR_CALC_TEMP + UpdateMonData OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_STOCKPILE_DEF_BOOSTS, 0 + UpdateMonData OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_STOCKPILE_SPDEF_BOOSTS, 0 + UpdateVarFromVar OPCODE_SET, BTLVAR_MSG_BATTLER_TEMP, BTLVAR_ATTACKER + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_SWALLOW + End + +_078: + PrintAttackMessage + Wait + WaitButtonABTime 30 + // But it failed to swallow a thing! + PrintMessage pl_msg_00000368_00815, TAG_NONE + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_NO_MORE_WORK + End diff --git a/res/battle/scripts/effects/effect_script_0163.s b/res/battle/scripts/effects/effect_script_0163.s new file mode 100644 index 0000000000..00538dae94 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0163.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0164.s b/res/battle/scripts/effects/effect_script_0164.s new file mode 100644 index 0000000000..cb54fdbc56 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0164.s @@ -0,0 +1,22 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_HAILING_TEMP, _036 + // It started to hail! + BufferMessage pl_msg_00000368_00810, TAG_NONE + UpdateVar OPCODE_FLAG_OFF, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_WEATHER + UpdateVar OPCODE_FLAG_ON, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_HAILING_TEMP + UpdateVar OPCODE_SET, BTLVAR_WEATHER_TURNS, 5 + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_WEATHER_START + CheckItemHoldEffect CHECK_NOT_HAVE, BTLSCR_ATTACKER, HOLD_EFFECT_EXTEND_HAIL, _035 + GetItemEffectParam BTLSCR_ATTACKER, BTLVAR_CALC_TEMP + UpdateVarFromVar OPCODE_ADD, BTLVAR_WEATHER_TURNS, BTLVAR_CALC_TEMP + +_035: + End + +_036: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/effects/effect_script_0165.s b/res/battle/scripts/effects/effect_script_0165.s new file mode 100644 index 0000000000..984c1665d7 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0165.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_TORMENT_START + End diff --git a/res/battle/scripts/effects/effect_script_0166.s b/res/battle/scripts/effects/effect_script_0166.s new file mode 100644 index 0000000000..be96a29fe1 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0166.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_FLATTER + End diff --git a/res/battle/scripts/effects/effect_script_0167.s b/res/battle/scripts/effects/effect_script_0167.s new file mode 100644 index 0000000000..f1fcb03ae9 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0167.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_BURN + End diff --git a/res/battle/scripts/effects/effect_script_0168.s b/res/battle/scripts/effects/effect_script_0168.s new file mode 100644 index 0000000000..55736c6c47 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0168.s @@ -0,0 +1,14 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_CALC_TEMP, 0x10000000 + UpdateVarFromVar OPCODE_LEFT_SHIFT, BTLVAR_CALC_TEMP, BTLVAR_ATTACKER + UpdateVarFromVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, BTLVAR_CALC_TEMP + UpdateMonData OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_CUR_HP, 0 + UpdateVar OPCODE_SET, BTLVAR_HP_CALC_TEMP, 32767 + UpdateHealthBar BTLSCR_ATTACKER + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_HIT_DURING_FLY|SYSCTL_HIT_DURING_DIG|SYSCTL_HIT_DURING_DIVE|SYSCTL_HIT_DURING_SHADOW_FORCE + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_MEMENTO + End diff --git a/res/battle/scripts/effects/effect_script_0169.s b/res/battle/scripts/effects/effect_script_0169.s new file mode 100644 index 0000000000..1719869054 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0169.s @@ -0,0 +1,12 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareMonDataToValue OPCODE_FLAG_NOT, BTLSCR_ATTACKER, BATTLEMON_STATUS, MON_CONDITION_FACADE_BOOST, _009 + UpdateVar OPCODE_SET, BTLVAR_POWER_MULTI, 20 + +_009: + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0170.s b/res/battle/scripts/effects/effect_script_0170.s new file mode 100644 index 0000000000..99dbe8eb5e --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0170.s @@ -0,0 +1,17 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareVarToValue OPCODE_NEQ, BTLVAR_ATTACKER_PHYSICAL_DAMAGE_MASK, 0, _016 + CompareVarToValue OPCODE_NEQ, BTLVAR_ATTACKER_SPECIAL_DAMAGE_MASK, 0, _016 + UpdateVar OPCODE_SET, BTLVAR_MOVE_EFFECT_CHANCE, 1 + CalcCrit + CalcDamage + End + +_016: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_LOST_FOCUS + // {0} lost its focus and couldn’t move! + BufferMessage pl_msg_00000368_00600, TAG_NICKNAME, BTLSCR_ATTACKER + End diff --git a/res/battle/scripts/effects/effect_script_0171.s b/res/battle/scripts/effects/effect_script_0171.s new file mode 100644 index 0000000000..4efe4fa204 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0171.s @@ -0,0 +1,18 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CheckSubstitute BTLSCR_DEFENDER, _022 + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_DEFENDER, BATTLEMON_STATUS, MON_CONDITION_PARALYSIS, _014 + UpdateVar OPCODE_SET, BTLVAR_POWER_MULTI, 10 + GoTo _022 + +_014: + UpdateVar OPCODE_SET, BTLVAR_POWER_MULTI, 20 + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_HEAL_TARGET_PARALYSIS + +_022: + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0172.s b/res/battle/scripts/effects/effect_script_0172.s new file mode 100644 index 0000000000..8161b3fbd7 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0172.s @@ -0,0 +1,10 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + FollowMe + // {0} became the center of attention! + BufferMessage pl_msg_00000368_00484, TAG_NICKNAME, BTLSCR_ATTACKER + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_PRINT_MESSAGE_AND_PLAY_ANIMATION + End diff --git a/res/battle/scripts/effects/effect_script_0173.s b/res/battle/scripts/effects/effect_script_0173.s new file mode 100644 index 0000000000..b3f9e71006 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0173.s @@ -0,0 +1,15 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PrintAttackMessage + Wait + PlayMoveAnimation BTLSCR_ATTACKER + Wait + GetTerrainMove + // {0} turned into {1}! + PrintMessage pl_msg_00000368_00490, TAG_MOVE_MOVE, BTLSCR_ATTACKER, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + GoToMoveScript FALSE diff --git a/res/battle/scripts/effects/effect_script_0174.s b/res/battle/scripts/effects/effect_script_0174.s new file mode 100644 index 0000000000..9e8db791bb --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0174.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_CHARGE + End diff --git a/res/battle/scripts/effects/effect_script_0175.s b/res/battle/scripts/effects/effect_script_0175.s new file mode 100644 index 0000000000..b4927c3fdd --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0175.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_TAUNT_START + End diff --git a/res/battle/scripts/effects/effect_script_0176.s b/res/battle/scripts/effects/effect_script_0176.s new file mode 100644 index 0000000000..b23cb0a1dc --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0176.s @@ -0,0 +1,15 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + TryHelpingHand _015 + // {0} is ready to help {1}! + BufferMessage pl_msg_00000368_00503, TAG_NICKNAME_NICKNAME, BTLSCR_ATTACKER, BTLSCR_MSG_TEMP + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_PRINT_MESSAGE_AND_PLAY_ANIMATION + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_HIT_DURING_FLY|SYSCTL_HIT_DURING_DIG|SYSCTL_HIT_DURING_DIVE|SYSCTL_HIT_DURING_SHADOW_FORCE + End + +_015: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/effects/effect_script_0177.s b/res/battle/scripts/effects/effect_script_0177.s new file mode 100644 index 0000000000..384f0b1df3 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0177.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_EXCHANGE_ITEMS + End diff --git a/res/battle/scripts/effects/effect_script_0178.s b/res/battle/scripts/effects/effect_script_0178.s new file mode 100644 index 0000000000..0785a30f5d --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0178.s @@ -0,0 +1,13 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CheckAbility CHECK_HAVE, BTLSCR_ATTACKER, ABILITY_MULTITYPE, _015 + CompareMonDataToValue OPCODE_EQU, BTLSCR_ATTACKER, BATTLEMON_HELD_ITEM, ITEM_GRISEOUS_ORB, _015 + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_CHECK_HP|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_COPY_ABILITY + End + +_015: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/effects/effect_script_0179.s b/res/battle/scripts/effects/effect_script_0179.s new file mode 100644 index 0000000000..885ddab77a --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0179.s @@ -0,0 +1,11 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + TryWish _002 + End + +_002: + UpdateVar OPCODE_SET, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/effects/effect_script_0180.s b/res/battle/scripts/effects/effect_script_0180.s new file mode 100644 index 0000000000..5bf5382eff --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0180.s @@ -0,0 +1,15 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + TryAssist _008 + PrintAttackMessage + Wait + PlayMoveAnimation BTLSCR_ATTACKER + Wait + GoToMoveScript FALSE + +_008: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/effects/effect_script_0181.s b/res/battle/scripts/effects/effect_script_0181.s new file mode 100644 index 0000000000..41a02100e1 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0181.s @@ -0,0 +1,15 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_ATTACKER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_INGRAIN, _019 + UpdateMonData OPCODE_FLAG_ON, BTLSCR_ATTACKER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_INGRAIN + // {0} planted its roots! + BufferMessage pl_msg_00000368_00536, TAG_NICKNAME, BTLSCR_ATTACKER + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_PRINT_MESSAGE_AND_PLAY_ANIMATION + End + +_019: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/effects/effect_script_0182.s b/res/battle/scripts/effects/effect_script_0182.s new file mode 100644 index 0000000000..ce3a218aca --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0182.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_USER_ATK_AND_DEF_DOWN_1_STAGE + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0183.s b/res/battle/scripts/effects/effect_script_0183.s new file mode 100644 index 0000000000..8da86b08a9 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0183.s @@ -0,0 +1,14 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + TrySetMagicCoat _010 + // {0} shrouded itself with Magic Coat! + BufferMessage pl_msg_00000368_00571, TAG_NICKNAME, BTLSCR_ATTACKER + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_PRINT_MESSAGE_AND_PLAY_ANIMATION + End + +_010: + UpdateVar OPCODE_SET, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/effects/effect_script_0184.s b/res/battle/scripts/effects/effect_script_0184.s new file mode 100644 index 0000000000..f5fcef9bd7 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0184.s @@ -0,0 +1,16 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareMonDataToValue OPCODE_NEQ, BTLSCR_ATTACKER, BATTLEMON_HELD_ITEM, ITEM_NONE, _022 + TryRecycle _022 + UpdateMonDataFromVar OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_HELD_ITEM, BTLVAR_MSG_ITEM_TEMP + // {0} found one {1}! + BufferMessage pl_msg_00000368_00589, TAG_NICKNAME_ITEM, BTLSCR_ATTACKER, BTLSCR_MSG_TEMP + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_PRINT_MESSAGE_AND_PLAY_ANIMATION + End + +_022: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/effects/effect_script_0185.s b/res/battle/scripts/effects/effect_script_0185.s new file mode 100644 index 0000000000..b6983400d9 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0185.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CalcRevengePowerMul + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0186.s b/res/battle/scripts/effects/effect_script_0186.s new file mode 100644 index 0000000000..d70e434139 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0186.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_BREAK_SCREENS|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_BREAK_SCREENS + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0187.s b/res/battle/scripts/effects/effect_script_0187.s new file mode 100644 index 0000000000..07fcac9425 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0187.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_CHECK_HP|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_YAWN + End diff --git a/res/battle/scripts/effects/effect_script_0188.s b/res/battle/scripts/effects/effect_script_0188.s new file mode 100644 index 0000000000..7009f486ed --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0188.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_KNOCK_OFF + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0189.s b/res/battle/scripts/effects/effect_script_0189.s new file mode 100644 index 0000000000..34f0bac4c9 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0189.s @@ -0,0 +1,16 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateMonDataFromVar OPCODE_GET, BTLSCR_DEFENDER, BATTLEMON_CUR_HP, BTLVAR_DAMAGE + UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_CUR_HP, BTLVAR_CALC_TEMP + CompareVarToVar OPCODE_LTE, BTLVAR_DAMAGE, BTLVAR_CALC_TEMP, _027 + UpdateVarFromVar OPCODE_SUB, BTLVAR_DAMAGE, BTLVAR_CALC_TEMP + UpdateVar OPCODE_MUL, BTLVAR_DAMAGE, -1 + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_IGNORE_TYPE_CHECKS + End + +_027: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/effects/effect_script_0190.s b/res/battle/scripts/effects/effect_script_0190.s new file mode 100644 index 0000000000..5e84a6e781 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0190.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CalcHPFalloffPower + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0191.s b/res/battle/scripts/effects/effect_script_0191.s new file mode 100644 index 0000000000..28bddf6892 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0191.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_CHECK_HP|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_EXCHANGE_ABILITIES + End diff --git a/res/battle/scripts/effects/effect_script_0192.s b/res/battle/scripts/effects/effect_script_0192.s new file mode 100644 index 0000000000..aa079a87e0 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0192.s @@ -0,0 +1,14 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + TryImprison _010 + // {0} sealed the opponent’s move(s)! + BufferMessage pl_msg_00000368_00562, TAG_NICKNAME, BTLSCR_ATTACKER + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_PRINT_MESSAGE_AND_PLAY_ANIMATION + End + +_010: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/effects/effect_script_0193.s b/res/battle/scripts/effects/effect_script_0193.s new file mode 100644 index 0000000000..796d6a94ea --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0193.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_RECOVER_PSN_PRZ_BRN + End diff --git a/res/battle/scripts/effects/effect_script_0194.s b/res/battle/scripts/effects/effect_script_0194.s new file mode 100644 index 0000000000..75873a1a79 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0194.s @@ -0,0 +1,15 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_ATTACKER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_GRUDGE, _019 + UpdateMonData OPCODE_FLAG_ON, BTLSCR_ATTACKER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_GRUDGE + // {0} wants the foe to bear a grudge! + BufferMessage pl_msg_00000368_00565, TAG_NICKNAME, BTLSCR_ATTACKER + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_PRINT_MESSAGE_AND_PLAY_ANIMATION + End + +_019: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/effects/effect_script_0195.s b/res/battle/scripts/effects/effect_script_0195.s new file mode 100644 index 0000000000..39b7f603c6 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0195.s @@ -0,0 +1,14 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + TrySnatch _010 + // {0} waits for a target to make a move! + BufferMessage pl_msg_00000368_00577, TAG_NICKNAME, BTLSCR_ATTACKER + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_PRINT_MESSAGE_AND_PLAY_ANIMATION + End + +_010: + UpdateVar OPCODE_SET, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/effects/effect_script_0196.s b/res/battle/scripts/effects/effect_script_0196.s new file mode 100644 index 0000000000..dedee52f62 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0196.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CalcWeightBasedPower + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0197.s b/res/battle/scripts/effects/effect_script_0197.s new file mode 100644 index 0000000000..2f257220e8 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0197.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CalcCrit + CalcDamage + GetTerrainSecondaryEffect + End diff --git a/res/battle/scripts/effects/effect_script_0198.s b/res/battle/scripts/effects/effect_script_0198.s new file mode 100644 index 0000000000..90ea9902b1 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0198.s @@ -0,0 +1,13 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CheckAbility CHECK_NOT_HAVE, BTLSCR_ATTACKER, ABILITY_RECKLESS, _008 + UpdateVar OPCODE_SET, BTLVAR_POWER_MULTI, 12 + +_008: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_RECOIL_1_3 + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0199.s b/res/battle/scripts/effects/effect_script_0199.s new file mode 100644 index 0000000000..05a0c990c3 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0199.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_CONFUSE + End diff --git a/res/battle/scripts/effects/effect_script_0200.s b/res/battle/scripts/effects/effect_script_0200.s new file mode 100644 index 0000000000..edcf80d516 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0200.s @@ -0,0 +1,10 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_ADD, BTLVAR_CRITICAL_BOOSTS, 1 + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_BURN + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0201.s b/res/battle/scripts/effects/effect_script_0201.s new file mode 100644 index 0000000000..523c613cc6 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0201.s @@ -0,0 +1,15 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_ATTACKER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_MUD_SPORT, _018 + UpdateMonData OPCODE_FLAG_ON, BTLSCR_ATTACKER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_MUD_SPORT + // Electricity’s power was weakened! + BufferMessage pl_msg_00000368_00587, TAG_NONE + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_PRINT_MESSAGE_AND_PLAY_ANIMATION + End + +_018: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/effects/effect_script_0202.s b/res/battle/scripts/effects/effect_script_0202.s new file mode 100644 index 0000000000..f52970c6f6 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0202.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_BADLY_POISON + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0203.s b/res/battle/scripts/effects/effect_script_0203.s new file mode 100644 index 0000000000..1bff42a138 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0203.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CalcWeatherBallParams + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0204.s b/res/battle/scripts/effects/effect_script_0204.s new file mode 100644 index 0000000000..58b6622dbe --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0204.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_SP_ATTACK_DOWN_2_STAGES + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0205.s b/res/battle/scripts/effects/effect_script_0205.s new file mode 100644 index 0000000000..bb8e058da5 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0205.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_CHECK_HP|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_TARGET_ATK_AND_DEF_DOWN_1_STAGE + End diff --git a/res/battle/scripts/effects/effect_script_0206.s b/res/battle/scripts/effects/effect_script_0206.s new file mode 100644 index 0000000000..2a677cfbce --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0206.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_USER_DEF_AND_SPDEF_UP_1_STAGE + End diff --git a/res/battle/scripts/effects/effect_script_0207.s b/res/battle/scripts/effects/effect_script_0207.s new file mode 100644 index 0000000000..a737e61d03 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0207.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_HIT_DURING_FLY + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0208.s b/res/battle/scripts/effects/effect_script_0208.s new file mode 100644 index 0000000000..73c95a60e7 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0208.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_USER_ATK_AND_DEF_UP_1_STAGE + End diff --git a/res/battle/scripts/effects/effect_script_0209.s b/res/battle/scripts/effects/effect_script_0209.s new file mode 100644 index 0000000000..3d7708ff22 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0209.s @@ -0,0 +1,10 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_ADD, BTLVAR_CRITICAL_BOOSTS, 1 + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_POISON + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0210.s b/res/battle/scripts/effects/effect_script_0210.s new file mode 100644 index 0000000000..a3e7e423b3 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0210.s @@ -0,0 +1,15 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_ATTACKER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_WATER_SPORT, _018 + UpdateMonData OPCODE_FLAG_ON, BTLSCR_ATTACKER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_WATER_SPORT + // Fire’s power was weakened! + BufferMessage pl_msg_00000368_00588, TAG_NONE + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_PRINT_MESSAGE_AND_PLAY_ANIMATION + End + +_018: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/effects/effect_script_0211.s b/res/battle/scripts/effects/effect_script_0211.s new file mode 100644 index 0000000000..468f80f95a --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0211.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_USER_SPATK_AND_SPDEF_UP_1_STAGE + End diff --git a/res/battle/scripts/effects/effect_script_0212.s b/res/battle/scripts/effects/effect_script_0212.s new file mode 100644 index 0000000000..5413f74ace --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0212.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_USER_ATK_AND_SPEED_UP_1_STAGE + End diff --git a/res/battle/scripts/effects/effect_script_0213.s b/res/battle/scripts/effects/effect_script_0213.s new file mode 100644 index 0000000000..9d9c64714e --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0213.s @@ -0,0 +1,15 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + TryCamouflage _016 + UpdateMonData OPCODE_FLAG_ON, BTLSCR_ATTACKER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_CAMOUFLAGE + // {0} transformed into the {1} type! + BufferMessage pl_msg_00000368_00178, TAG_NICKNAME_TYPE, BTLSCR_ATTACKER, BTLSCR_MSG_TEMP + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_PRINT_MESSAGE_AND_PLAY_ANIMATION + End + +_016: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/effects/effect_script_0214.s b/res/battle/scripts/effects/effect_script_0214.s new file mode 100644 index 0000000000..c9069214f6 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0214.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_ROOST + End diff --git a/res/battle/scripts/effects/effect_script_0215.s b/res/battle/scripts/effects/effect_script_0215.s new file mode 100644 index 0000000000..b7d5abab93 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0215.s @@ -0,0 +1,12 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_GRAVITY, _009 + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_GRAVITY_START + End + +_009: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/effects/effect_script_0216.s b/res/battle/scripts/effects/effect_script_0216.s new file mode 100644 index 0000000000..c09c5819bb --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0216.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_MIRACLE_EYE + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_IGNORE_IMMUNITIES + End diff --git a/res/battle/scripts/effects/effect_script_0217.s b/res/battle/scripts/effects/effect_script_0217.s new file mode 100644 index 0000000000..ed17aa3087 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0217.s @@ -0,0 +1,18 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CheckSubstitute BTLSCR_DEFENDER, _022 + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_DEFENDER, BATTLEMON_STATUS, MON_CONDITION_SLEEP, _014 + UpdateVar OPCODE_SET, BTLVAR_POWER_MULTI, 10 + GoTo _022 + +_014: + UpdateVar OPCODE_SET, BTLVAR_POWER_MULTI, 20 + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_HEAL_TARGET_SLEEP + +_022: + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0218.s b/res/battle/scripts/effects/effect_script_0218.s new file mode 100644 index 0000000000..5893c0975c --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0218.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_SPEED_DOWN_1_STAGE + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0219.s b/res/battle/scripts/effects/effect_script_0219.s new file mode 100644 index 0000000000..33e0dc1b55 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0219.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CalcGyroBallPower + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0220.s b/res/battle/scripts/effects/effect_script_0220.s new file mode 100644 index 0000000000..44e1f746a4 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0220.s @@ -0,0 +1,12 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + TryReplaceFaintedMon BTLSCR_ATTACKER, TRUE, _008 + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_HEALING_WISH + End + +_008: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/effects/effect_script_0221.s b/res/battle/scripts/effects/effect_script_0221.s new file mode 100644 index 0000000000..2de0d2c513 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0221.s @@ -0,0 +1,18 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateMonDataFromVar OPCODE_GET, BTLSCR_DEFENDER, BATTLEMON_MAX_HP, BTLVAR_CALC_TEMP + UpdateVar OPCODE_DIV, BTLVAR_CALC_TEMP, 0x00000002 + CompareMonDataToVar OPCODE_GT, BTLSCR_DEFENDER, BATTLEMON_CUR_HP, BTLVAR_CALC_TEMP, _020 + UpdateVar OPCODE_SET, BTLVAR_POWER_MULTI, 20 + GoTo _024 + +_020: + UpdateVar OPCODE_SET, BTLVAR_POWER_MULTI, 10 + +_024: + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0222.s b/res/battle/scripts/effects/effect_script_0222.s new file mode 100644 index 0000000000..7b4d3fed18 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0222.s @@ -0,0 +1,14 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CalcNaturalGiftParams _006 + CalcCrit + CalcDamage + RemoveItem BTLSCR_ATTACKER + End + +_006: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/effects/effect_script_0223.s b/res/battle/scripts/effects/effect_script_0223.s new file mode 100644 index 0000000000..d6359e0f8a --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0223.s @@ -0,0 +1,14 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + TryFeint _008 + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_FEINT + CalcCrit + CalcDamage + End + +_008: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/effects/effect_script_0224.s b/res/battle/scripts/effects/effect_script_0224.s new file mode 100644 index 0000000000..de1448fe6e --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0224.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_PLUCK + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0225.s b/res/battle/scripts/effects/effect_script_0225.s new file mode 100644 index 0000000000..bd7191fca8 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0225.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_TAILWIND_START + End diff --git a/res/battle/scripts/effects/effect_script_0226.s b/res/battle/scripts/effects/effect_script_0226.s new file mode 100644 index 0000000000..44b7f96622 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0226.s @@ -0,0 +1,12 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CheckSubstitute BTLSCR_DEFENDER, _005 + BoostRandomStatBy2 _005 + End + +_005: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/effects/effect_script_0227.s b/res/battle/scripts/effects/effect_script_0227.s new file mode 100644 index 0000000000..0670611d62 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0227.s @@ -0,0 +1,12 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + TryMetalBurst _006 + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_IGNORE_TYPE_CHECKS + End + +_006: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/effects/effect_script_0228.s b/res/battle/scripts/effects/effect_script_0228.s new file mode 100644 index 0000000000..06363788ef --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0228.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_ATTACK_THEN_SWITCH_OUT + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0229.s b/res/battle/scripts/effects/effect_script_0229.s new file mode 100644 index 0000000000..0c74f71754 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0229.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_USER_DEF_AND_SPDEF_DOWN_1_STAGE + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0230.s b/res/battle/scripts/effects/effect_script_0230.s new file mode 100644 index 0000000000..e4e881370a --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0230.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CalcPaybackPower + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0231.s b/res/battle/scripts/effects/effect_script_0231.s new file mode 100644 index 0000000000..434c8ac016 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0231.s @@ -0,0 +1,15 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GetCurrentMoveData MOVEATTRIBUTE_POWER + UpdateVarFromVar OPCODE_SET, BTLVAR_MOVE_POWER, BTLVAR_CALC_TEMP + CompareVarToValue OPCODE_EQU, BTLVAR_DEFENDER_ASSURANCE_DAMAGE_MASK, 0, _018 + UpdateVarFromVar OPCODE_SET, BTLVAR_MOVE_POWER, BTLVAR_CALC_TEMP + UpdateVar OPCODE_MUL, BTLVAR_MOVE_POWER, 2 + +_018: + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0232.s b/res/battle/scripts/effects/effect_script_0232.s new file mode 100644 index 0000000000..01451dc8d8 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0232.s @@ -0,0 +1,12 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CheckSubstitute BTLSCR_DEFENDER, _007 + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_EMBARGO_START + End + +_007: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/effects/effect_script_0233.s b/res/battle/scripts/effects/effect_script_0233.s new file mode 100644 index 0000000000..fe5e85dff8 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0233.s @@ -0,0 +1,24 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareMonDataToValue OPCODE_EQU, BTLSCR_ATTACKER, BATTLEMON_ABILITY, ABILITY_MULTITYPE, _034 + CompareMonDataToValue OPCODE_EQU, BTLSCR_ATTACKER, BATTLEMON_HELD_ITEM, ITEM_GRISEOUS_ORB, _034 + TryFling _034 + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_FLING + CalcCrit + CalcDamage + PrintAttackMessage + Wait + WaitButtonABTime 30 + // {0} flung its {1}! + PrintMessage pl_msg_00000368_01144, TAG_NICKNAME_ITEM, BTLSCR_ATTACKER, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + RemoveItem BTLSCR_ATTACKER + End + +_034: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/effects/effect_script_0234.s b/res/battle/scripts/effects/effect_script_0234.s new file mode 100644 index 0000000000..6013083252 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0234.s @@ -0,0 +1,12 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CheckCanShareStatus _006 + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_GIVE_TARGET_OWN_STATUS + End + +_006: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/effects/effect_script_0235.s b/res/battle/scripts/effects/effect_script_0235.s new file mode 100644 index 0000000000..9239155b1f --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0235.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CalcTrumpCardPower + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0236.s b/res/battle/scripts/effects/effect_script_0236.s new file mode 100644 index 0000000000..ba325e44b7 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0236.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_HEAL_BLOCK_START + End diff --git a/res/battle/scripts/effects/effect_script_0237.s b/res/battle/scripts/effects/effect_script_0237.s new file mode 100644 index 0000000000..3742d3908a --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0237.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CalcWringOutPower + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0238.s b/res/battle/scripts/effects/effect_script_0238.s new file mode 100644 index 0000000000..8fc290fed4 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0238.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_USER_SWAP_ATK_AND_DEF + End diff --git a/res/battle/scripts/effects/effect_script_0239.s b/res/battle/scripts/effects/effect_script_0239.s new file mode 100644 index 0000000000..539b2c59a5 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0239.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_SUPPRESS_TARGET_ABILITY + End diff --git a/res/battle/scripts/effects/effect_script_0240.s b/res/battle/scripts/effects/effect_script_0240.s new file mode 100644 index 0000000000..20a44e27d1 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0240.s @@ -0,0 +1,12 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_SIDE_CONDITIONS_ATTACKER, SIDE_CONDITION_LUCKY_CHANT, _009 + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_LUCKY_CHANT_START + End + +_009: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/effects/effect_script_0241.s b/res/battle/scripts/effects/effect_script_0241.s new file mode 100644 index 0000000000..26045acdfe --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0241.s @@ -0,0 +1,15 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + TryMeFirst _008 + PrintAttackMessage + Wait + PlayMoveAnimation BTLSCR_ATTACKER + Wait + GoToMoveScript FALSE + +_008: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/effects/effect_script_0242.s b/res/battle/scripts/effects/effect_script_0242.s new file mode 100644 index 0000000000..d9d9a7cf0d --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0242.s @@ -0,0 +1,15 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + TryCopycat _008 + PrintAttackMessage + Wait + PlayMoveAnimation BTLSCR_ATTACKER + Wait + GoToMoveScript FALSE + +_008: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/effects/effect_script_0243.s b/res/battle/scripts/effects/effect_script_0243.s new file mode 100644 index 0000000000..5fd62db6f5 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0243.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_EXCHANGE_ATK_AND_SPATK_STAGES + End diff --git a/res/battle/scripts/effects/effect_script_0244.s b/res/battle/scripts/effects/effect_script_0244.s new file mode 100644 index 0000000000..a3029a0285 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0244.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_EXCHANGE_DEF_AND_SPDEF_STAGES + End diff --git a/res/battle/scripts/effects/effect_script_0245.s b/res/battle/scripts/effects/effect_script_0245.s new file mode 100644 index 0000000000..62d837b2c2 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0245.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CalcPunishmentPower + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0246.s b/res/battle/scripts/effects/effect_script_0246.s new file mode 100644 index 0000000000..a36e00e374 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0246.s @@ -0,0 +1,13 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + TryLastResort _004 + CalcCrit + CalcDamage + End + +_004: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/effects/effect_script_0247.s b/res/battle/scripts/effects/effect_script_0247.s new file mode 100644 index 0000000000..a7cfc146ad --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0247.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_GIVE_TARGET_INSOMNIA + End diff --git a/res/battle/scripts/effects/effect_script_0248.s b/res/battle/scripts/effects/effect_script_0248.s new file mode 100644 index 0000000000..6a95d2dd24 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0248.s @@ -0,0 +1,13 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + TrySuckerPunch _004 + CalcCrit + CalcDamage + End + +_004: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/effects/effect_script_0249.s b/res/battle/scripts/effects/effect_script_0249.s new file mode 100644 index 0000000000..3e0a48a05a --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0249.s @@ -0,0 +1,14 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + TryToxicSpikes _010 + // Poison spikes were scattered all around your team’s feet! + BufferMessage pl_msg_00000368_01063, TAG_NONE_SIDE_CONSCIOUS, BTLSCR_ATTACKER_ENEMY + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_PRINT_MESSAGE_AND_PLAY_ANIMATION + End + +_010: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/effects/effect_script_0250.s b/res/battle/scripts/effects/effect_script_0250.s new file mode 100644 index 0000000000..3a6476185f --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0250.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_CHECK_HP|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_EXCHANGE_ALL_STAT_STAGES + End diff --git a/res/battle/scripts/effects/effect_script_0251.s b/res/battle/scripts/effects/effect_script_0251.s new file mode 100644 index 0000000000..7c9be2bfbc --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0251.s @@ -0,0 +1,15 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_ATTACKER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_AQUA_RING, _019 + UpdateMonData OPCODE_FLAG_ON, BTLSCR_ATTACKER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_AQUA_RING + // {0} surrounded itself with a veil of water! + BufferMessage pl_msg_00000368_01027, TAG_NICKNAME, BTLSCR_ATTACKER + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_PRINT_MESSAGE_AND_PLAY_ANIMATION + End + +_019: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/effects/effect_script_0252.s b/res/battle/scripts/effects/effect_script_0252.s new file mode 100644 index 0000000000..b437bb561a --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0252.s @@ -0,0 +1,18 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareMonDataToValue OPCODE_NEQ, BTLSCR_ATTACKER, BATTLEMON_MAGNET_RISE_TURNS, 0, _035 + CheckAbility CHECK_HAVE, BTLSCR_ATTACKER, ABILITY_LEVITATE, _035 + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_ATTACKER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_INGRAIN, _035 + UpdateMonData OPCODE_FLAG_ON, BTLSCR_ATTACKER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_MAGNET_RISE + UpdateMonData OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_MAGNET_RISE_TURNS, 5 + // {0} levitated on electromagnetism! + BufferMessage pl_msg_00000368_01033, TAG_NICKNAME, BTLSCR_ATTACKER + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_PRINT_MESSAGE_AND_PLAY_ANIMATION + End + +_035: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/effects/effect_script_0253.s b/res/battle/scripts/effects/effect_script_0253.s new file mode 100644 index 0000000000..5a4267e203 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0253.s @@ -0,0 +1,13 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CheckAbility CHECK_NOT_HAVE, BTLSCR_ATTACKER, ABILITY_RECKLESS, _008 + UpdateVar OPCODE_SET, BTLVAR_POWER_MULTI, 12 + +_008: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_PROBABILISTIC|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_RECOIL_1_3_CHANCE_TO_BURN + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0254.s b/res/battle/scripts/effects/effect_script_0254.s new file mode 100644 index 0000000000..c3138e262e --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0254.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_STRUGGLE + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0255.s b/res/battle/scripts/effects/effect_script_0255.s new file mode 100644 index 0000000000..2e4b3a61b4 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0255.s @@ -0,0 +1,27 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_MOVE_LOCKED, _044 + CheckItemHoldEffect CHECK_HAVE, BTLSCR_ATTACKER, HOLD_EFFECT_CHARGE_SKIP, _024 + UpdateMonData OPCODE_FLAG_ON, BTLSCR_ATTACKER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_UNDERWATER + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_VANISH_CHARGE_TURN + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_ATTACK_MESSAGE|SYSCTL_CHECK_LOOP_ONLY_ONCE|SYSCTL_FIRST_OF_MULTI_TURN + End + +_024: + UpdateMonData OPCODE_FLAG_ON, BTLSCR_ATTACKER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_UNDERWATER + UpdateMonData OPCODE_FLAG_ON, BTLSCR_ATTACKER, BATTLEMON_MOVE_EFFECTS_TEMP, 262144 + Call BATTLE_SUBSCRIPT_ITEM_SKIP_CHARGE_TURN + ToggleVanish BTLSCR_ATTACKER, TRUE + CompareVarToValue OPCODE_EQU, BTLVAR_DEFENDER, BATTLER_NONE, _046 + +_044: + CalcCrit + CalcDamage + +_046: + UpdateMonData OPCODE_FLAG_OFF, BTLSCR_ATTACKER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_SEMI_INVULNERABLE + Call BATTLE_SUBSCRIPT_CHARGE_MOVE_CLEANUP + End diff --git a/res/battle/scripts/effects/effect_script_0256.s b/res/battle/scripts/effects/effect_script_0256.s new file mode 100644 index 0000000000..2f7450b5a8 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0256.s @@ -0,0 +1,27 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_MOVE_LOCKED, _044 + CheckItemHoldEffect CHECK_HAVE, BTLSCR_ATTACKER, HOLD_EFFECT_CHARGE_SKIP, _024 + UpdateMonData OPCODE_FLAG_ON, BTLSCR_ATTACKER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_UNDERGROUND + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_VANISH_CHARGE_TURN + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_ATTACK_MESSAGE|SYSCTL_CHECK_LOOP_ONLY_ONCE|SYSCTL_FIRST_OF_MULTI_TURN + End + +_024: + UpdateMonData OPCODE_FLAG_ON, BTLSCR_ATTACKER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_UNDERGROUND + UpdateMonData OPCODE_FLAG_ON, BTLSCR_ATTACKER, BATTLEMON_MOVE_EFFECTS_TEMP, 128 + Call BATTLE_SUBSCRIPT_ITEM_SKIP_CHARGE_TURN + ToggleVanish BTLSCR_ATTACKER, TRUE + CompareVarToValue OPCODE_EQU, BTLVAR_DEFENDER, BATTLER_NONE, _046 + +_044: + CalcCrit + CalcDamage + +_046: + UpdateMonData OPCODE_FLAG_OFF, BTLSCR_ATTACKER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_SEMI_INVULNERABLE + Call BATTLE_SUBSCRIPT_CHARGE_MOVE_CLEANUP + End diff --git a/res/battle/scripts/effects/effect_script_0257.s b/res/battle/scripts/effects/effect_script_0257.s new file mode 100644 index 0000000000..feab22c9f9 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0257.s @@ -0,0 +1,14 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_HIT_DURING_DIVE + UpdateVar OPCODE_SET, BTLVAR_POWER_MULTI, 10 + CompareMonDataToValue OPCODE_FLAG_NOT, BTLSCR_DEFENDER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_UNDERWATER, _017 + UpdateVar OPCODE_SET, BTLVAR_POWER_MULTI, 20 + +_017: + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0258.s b/res/battle/scripts/effects/effect_script_0258.s new file mode 100644 index 0000000000..0dc0cebb04 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0258.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_DEFOG + End diff --git a/res/battle/scripts/effects/effect_script_0259.s b/res/battle/scripts/effects/effect_script_0259.s new file mode 100644 index 0000000000..8d5776ae06 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0259.s @@ -0,0 +1,22 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_TRICK_ROOM, _014 + UpdateVar OPCODE_FLAG_ON, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_TRICK_ROOM_INIT + // {0} twisted the dimensions! + BufferMessage pl_msg_00000368_01070, TAG_NICKNAME, BTLSCR_ATTACKER + GoTo _022 + +_014: + UpdateVar OPCODE_FLAG_OFF, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_TRICK_ROOM + // {0} restored the twisted dimensions! + BufferMessage pl_msg_00000368_01073, TAG_NICKNAME, BTLSCR_ATTACKER + +_022: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_PRINT_MESSAGE_AND_PLAY_ANIMATION + TrickRoom + End + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/effects/effect_script_0260.s b/res/battle/scripts/effects/effect_script_0260.s new file mode 100644 index 0000000000..abedba4ae0 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0260.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_FREEZE + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0261.s b/res/battle/scripts/effects/effect_script_0261.s new file mode 100644 index 0000000000..4316e1888e --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0261.s @@ -0,0 +1,15 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_HIT_DURING_DIVE + UpdateVar OPCODE_SET, BTLVAR_POWER_MULTI, 10 + CompareMonDataToValue OPCODE_FLAG_NOT, BTLSCR_DEFENDER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_UNDERWATER, _017 + UpdateVar OPCODE_SET, BTLVAR_POWER_MULTI, 20 + +_017: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_CHECK_HP_AND_SUBSTITUTE|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_BIND_TARGET + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0262.s b/res/battle/scripts/effects/effect_script_0262.s new file mode 100644 index 0000000000..09f4cc8631 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0262.s @@ -0,0 +1,13 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CheckAbility CHECK_NOT_HAVE, BTLSCR_ATTACKER, ABILITY_RECKLESS, _008 + UpdateVar OPCODE_SET, BTLVAR_POWER_MULTI, 12 + +_008: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_PROBABILISTIC|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_RECOIL_1_3_CHANCE_TO_PARALYZE + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0263.s b/res/battle/scripts/effects/effect_script_0263.s new file mode 100644 index 0000000000..858cb2733b --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0263.s @@ -0,0 +1,28 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_MOVE_LOCKED, _044 + CheckItemHoldEffect CHECK_HAVE, BTLSCR_ATTACKER, HOLD_EFFECT_CHARGE_SKIP, _024 + UpdateMonData OPCODE_FLAG_ON, BTLSCR_ATTACKER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_AIRBORNE + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_VANISH_CHARGE_TURN + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_ATTACK_MESSAGE|SYSCTL_CHECK_LOOP_ONLY_ONCE|SYSCTL_FIRST_OF_MULTI_TURN + End + +_024: + UpdateMonData OPCODE_FLAG_ON, BTLSCR_ATTACKER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_AIRBORNE + UpdateMonData OPCODE_FLAG_ON, BTLSCR_ATTACKER, BATTLEMON_MOVE_EFFECTS_TEMP, 64 + Call BATTLE_SUBSCRIPT_ITEM_SKIP_CHARGE_TURN + ToggleVanish BTLSCR_ATTACKER, TRUE + CompareVarToValue OPCODE_EQU, BTLVAR_DEFENDER, BATTLER_NONE, _050 + +_044: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_PARALYZE + CalcCrit + CalcDamage + +_050: + UpdateMonData OPCODE_FLAG_OFF, BTLSCR_ATTACKER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_SEMI_INVULNERABLE + Call BATTLE_SUBSCRIPT_CHARGE_MOVE_CLEANUP + End diff --git a/res/battle/scripts/effects/effect_script_0264.s b/res/battle/scripts/effects/effect_script_0264.s new file mode 100644 index 0000000000..68139b68e4 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0264.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_SPLASH + End diff --git a/res/battle/scripts/effects/effect_script_0265.s b/res/battle/scripts/effects/effect_script_0265.s new file mode 100644 index 0000000000..dc34adad63 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0265.s @@ -0,0 +1,34 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CheckIgnorableAbility CHECK_HAVE, BTLSCR_DEFENDER, ABILITY_OBLIVIOUS, _048 + CompareMonDataToValue OPCODE_EQU, BTLSCR_ATTACKER, BATTLEMON_GENDER, GENDER_NONE, _032 + CompareMonDataToValue OPCODE_EQU, BTLSCR_DEFENDER, BATTLEMON_GENDER, GENDER_NONE, _032 + UpdateMonDataFromVar OPCODE_GET, BTLSCR_DEFENDER, BATTLEMON_GENDER, BTLVAR_CALC_TEMP + CompareMonDataToVar OPCODE_EQU, BTLSCR_ATTACKER, BATTLEMON_GENDER, BTLVAR_CALC_TEMP, _032 + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_SP_ATTACK_DOWN_2_STAGES + End + +_032: + PrintAttackMessage + Wait + WaitButtonABTime 15 + // It failed to affect {0}! + PrintMessage pl_msg_00000368_01235, TAG_NICKNAME, BTLSCR_DEFENDER + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_NO_MORE_WORK + End + +_048: + PrintAttackMessage + Wait + WaitButtonABTime 15 + // {0}’s {1} made {2} ineffective! + PrintMessage pl_msg_00000368_00714, TAG_NICKNAME_ABILITY_MOVE, BTLSCR_DEFENDER, BTLSCR_DEFENDER, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_NO_MORE_WORK + End diff --git a/res/battle/scripts/effects/effect_script_0266.s b/res/battle/scripts/effects/effect_script_0266.s new file mode 100644 index 0000000000..6928a206a8 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0266.s @@ -0,0 +1,15 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_SIDE_CONDITIONS_DEFENDER, SIDE_CONDITION_STEALTH_ROCK, _017 + UpdateVar OPCODE_FLAG_ON, BTLVAR_SIDE_CONDITIONS_DEFENDER, SIDE_CONDITION_STEALTH_ROCK + // Pointed stones float in the air around your team! + BufferMessage pl_msg_00000368_01077, TAG_NONE_SIDE_CONSCIOUS, BTLSCR_ATTACKER_ENEMY + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_PRINT_MESSAGE_AND_PLAY_ANIMATION + End + +_017: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/effects/effect_script_0267.s b/res/battle/scripts/effects/effect_script_0267.s new file mode 100644 index 0000000000..68126d9ca6 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0267.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_CHATTER + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0268.s b/res/battle/scripts/effects/effect_script_0268.s new file mode 100644 index 0000000000..1b02fab207 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0268.s @@ -0,0 +1,90 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CheckItemHoldEffect CHECK_HAVE, BTLSCR_ATTACKER, HOLD_EFFECT_ARCEUS_FIGHTING, _081 + CheckItemHoldEffect CHECK_HAVE, BTLSCR_ATTACKER, HOLD_EFFECT_ARCEUS_FLYING, _087 + CheckItemHoldEffect CHECK_HAVE, BTLSCR_ATTACKER, HOLD_EFFECT_ARCEUS_POISON, _093 + CheckItemHoldEffect CHECK_HAVE, BTLSCR_ATTACKER, HOLD_EFFECT_ARCEUS_GROUND, _099 + CheckItemHoldEffect CHECK_HAVE, BTLSCR_ATTACKER, HOLD_EFFECT_ARCEUS_ROCK, _105 + CheckItemHoldEffect CHECK_HAVE, BTLSCR_ATTACKER, HOLD_EFFECT_ARCEUS_BUG, _111 + CheckItemHoldEffect CHECK_HAVE, BTLSCR_ATTACKER, HOLD_EFFECT_ARCEUS_GHOST, _117 + CheckItemHoldEffect CHECK_HAVE, BTLSCR_ATTACKER, HOLD_EFFECT_ARCEUS_STEEL, _123 + CheckItemHoldEffect CHECK_HAVE, BTLSCR_ATTACKER, HOLD_EFFECT_ARCEUS_FIRE, _129 + CheckItemHoldEffect CHECK_HAVE, BTLSCR_ATTACKER, HOLD_EFFECT_ARCEUS_WATER, _135 + CheckItemHoldEffect CHECK_HAVE, BTLSCR_ATTACKER, HOLD_EFFECT_ARCEUS_GRASS, _141 + CheckItemHoldEffect CHECK_HAVE, BTLSCR_ATTACKER, HOLD_EFFECT_ARCEUS_ELECTRIC, _147 + CheckItemHoldEffect CHECK_HAVE, BTLSCR_ATTACKER, HOLD_EFFECT_ARCEUS_PSYCHIC, _153 + CheckItemHoldEffect CHECK_HAVE, BTLSCR_ATTACKER, HOLD_EFFECT_ARCEUS_ICE, _159 + CheckItemHoldEffect CHECK_HAVE, BTLSCR_ATTACKER, HOLD_EFFECT_ARCEUS_DRAGON, _165 + CheckItemHoldEffect CHECK_HAVE, BTLSCR_ATTACKER, HOLD_EFFECT_ARCEUS_DARK, _171 + GoTo _175 + +_081: + UpdateVar OPCODE_SET, BTLVAR_MOVE_TYPE, TYPE_FIGHTING + GoTo _175 + +_087: + UpdateVar OPCODE_SET, BTLVAR_MOVE_TYPE, TYPE_FLYING + GoTo _175 + +_093: + UpdateVar OPCODE_SET, BTLVAR_MOVE_TYPE, TYPE_POISON + GoTo _175 + +_099: + UpdateVar OPCODE_SET, BTLVAR_MOVE_TYPE, TYPE_GROUND + GoTo _175 + +_105: + UpdateVar OPCODE_SET, BTLVAR_MOVE_TYPE, TYPE_ROCK + GoTo _175 + +_111: + UpdateVar OPCODE_SET, BTLVAR_MOVE_TYPE, TYPE_BUG + GoTo _175 + +_117: + UpdateVar OPCODE_SET, BTLVAR_MOVE_TYPE, TYPE_GHOST + GoTo _175 + +_123: + UpdateVar OPCODE_SET, BTLVAR_MOVE_TYPE, TYPE_STEEL + GoTo _175 + +_129: + UpdateVar OPCODE_SET, BTLVAR_MOVE_TYPE, TYPE_FIRE + GoTo _175 + +_135: + UpdateVar OPCODE_SET, BTLVAR_MOVE_TYPE, TYPE_WATER + GoTo _175 + +_141: + UpdateVar OPCODE_SET, BTLVAR_MOVE_TYPE, TYPE_GRASS + GoTo _175 + +_147: + UpdateVar OPCODE_SET, BTLVAR_MOVE_TYPE, TYPE_ELECTRIC + GoTo _175 + +_153: + UpdateVar OPCODE_SET, BTLVAR_MOVE_TYPE, TYPE_PSYCHIC + GoTo _175 + +_159: + UpdateVar OPCODE_SET, BTLVAR_MOVE_TYPE, TYPE_ICE + GoTo _175 + +_165: + UpdateVar OPCODE_SET, BTLVAR_MOVE_TYPE, TYPE_DRAGON + GoTo _175 + +_171: + UpdateVar OPCODE_SET, BTLVAR_MOVE_TYPE, TYPE_DARK + +_175: + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0269.s b/res/battle/scripts/effects/effect_script_0269.s new file mode 100644 index 0000000000..3e5c3a5b35 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0269.s @@ -0,0 +1,13 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CheckAbility CHECK_NOT_HAVE, BTLSCR_ATTACKER, ABILITY_RECKLESS, _008 + UpdateVar OPCODE_SET, BTLVAR_POWER_MULTI, 12 + +_008: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_RECOIL_1_2 + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0270.s b/res/battle/scripts/effects/effect_script_0270.s new file mode 100644 index 0000000000..a61bfc9e0b --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0270.s @@ -0,0 +1,12 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + TryReplaceFaintedMon BTLSCR_ATTACKER, TRUE, _008 + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_LUNAR_DANCE + End + +_008: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/effects/effect_script_0271.s b/res/battle/scripts/effects/effect_script_0271.s new file mode 100644 index 0000000000..e69dc10870 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0271.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_SP_DEFENSE_DOWN_2_STAGES + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0272.s b/res/battle/scripts/effects/effect_script_0272.s new file mode 100644 index 0000000000..e97a041dc2 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0272.s @@ -0,0 +1,29 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_MOVE_LOCKED, _049 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_LAST_OF_MULTI_TURN, _049 + CheckItemHoldEffect CHECK_HAVE, BTLSCR_ATTACKER, HOLD_EFFECT_CHARGE_SKIP, _029 + UpdateMonData OPCODE_FLAG_ON, BTLSCR_ATTACKER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_SHADOW_FORCE + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_VANISH_CHARGE_TURN + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_ATTACK_MESSAGE|SYSCTL_CHECK_LOOP_ONLY_ONCE|SYSCTL_FIRST_OF_MULTI_TURN + End + +_029: + UpdateMonData OPCODE_FLAG_ON, BTLSCR_ATTACKER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_SHADOW_FORCE + UpdateMonData OPCODE_FLAG_ON, BTLSCR_ATTACKER, BATTLEMON_MOVE_EFFECTS_TEMP, 536870912 + Call BATTLE_SUBSCRIPT_ITEM_SKIP_CHARGE_TURN + ToggleVanish BTLSCR_ATTACKER, TRUE + CompareVarToValue OPCODE_EQU, BTLVAR_DEFENDER, BATTLER_NONE, _055 + +_049: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_FEINT + CalcCrit + CalcDamage + +_055: + UpdateMonData OPCODE_FLAG_OFF, BTLSCR_ATTACKER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_SEMI_INVULNERABLE + Call BATTLE_SUBSCRIPT_CHARGE_MOVE_CLEANUP + End diff --git a/res/battle/scripts/effects/effect_script_0273.s b/res/battle/scripts/effects/effect_script_0273.s new file mode 100644 index 0000000000..f980833968 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0273.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_BURN_OR_FLINCH + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0274.s b/res/battle/scripts/effects/effect_script_0274.s new file mode 100644 index 0000000000..62db9f6f25 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0274.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_FREEZE_OR_FLINCH + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0275.s b/res/battle/scripts/effects/effect_script_0275.s new file mode 100644 index 0000000000..32609a8616 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0275.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_PARALYZE_OR_FLINCH + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/effects/effect_script_0276.s b/res/battle/scripts/effects/effect_script_0276.s new file mode 100644 index 0000000000..480ea1bab7 --- /dev/null +++ b/res/battle/scripts/effects/effect_script_0276.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_SP_ATTACK_UP_1_STAGE + CalcCrit + CalcDamage + End diff --git a/res/battle/scripts/moves/move_script_0000.s b/res/battle/scripts/moves/move_script_0000.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0000.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0001.s b/res/battle/scripts/moves/move_script_0001.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0001.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0002.s b/res/battle/scripts/moves/move_script_0002.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0002.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0003.s b/res/battle/scripts/moves/move_script_0003.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0003.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0004.s b/res/battle/scripts/moves/move_script_0004.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0004.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0005.s b/res/battle/scripts/moves/move_script_0005.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0005.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0006.s b/res/battle/scripts/moves/move_script_0006.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0006.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0007.s b/res/battle/scripts/moves/move_script_0007.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0007.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0008.s b/res/battle/scripts/moves/move_script_0008.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0008.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0009.s b/res/battle/scripts/moves/move_script_0009.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0009.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0010.s b/res/battle/scripts/moves/move_script_0010.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0010.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0011.s b/res/battle/scripts/moves/move_script_0011.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0011.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0012.s b/res/battle/scripts/moves/move_script_0012.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0012.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0013.s b/res/battle/scripts/moves/move_script_0013.s new file mode 100644 index 0000000000..2a169994a6 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0013.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} whipped up a whirlwind! + BufferMessage pl_msg_00000368_00211, TAG_NICKNAME, BTLSCR_ATTACKER + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0014.s b/res/battle/scripts/moves/move_script_0014.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0014.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0015.s b/res/battle/scripts/moves/move_script_0015.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0015.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0016.s b/res/battle/scripts/moves/move_script_0016.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0016.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0017.s b/res/battle/scripts/moves/move_script_0017.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0017.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0018.s b/res/battle/scripts/moves/move_script_0018.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0018.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0019.s b/res/battle/scripts/moves/move_script_0019.s new file mode 100644 index 0000000000..99ef271155 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0019.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} flew up high! + BufferMessage pl_msg_00000368_00223, TAG_NICKNAME, BTLSCR_ATTACKER + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0020.s b/res/battle/scripts/moves/move_script_0020.s new file mode 100644 index 0000000000..cfe5f6f47e --- /dev/null +++ b/res/battle/scripts/moves/move_script_0020.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} was squeezed by {1}! + BufferMessage pl_msg_00000368_00235, TAG_NICKNAME_NICKNAME, BTLSCR_DEFENDER, BTLSCR_ATTACKER + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0021.s b/res/battle/scripts/moves/move_script_0021.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0021.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0022.s b/res/battle/scripts/moves/move_script_0022.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0022.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0023.s b/res/battle/scripts/moves/move_script_0023.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0023.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0024.s b/res/battle/scripts/moves/move_script_0024.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0024.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0025.s b/res/battle/scripts/moves/move_script_0025.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0025.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0026.s b/res/battle/scripts/moves/move_script_0026.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0026.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0027.s b/res/battle/scripts/moves/move_script_0027.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0027.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0028.s b/res/battle/scripts/moves/move_script_0028.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0028.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0029.s b/res/battle/scripts/moves/move_script_0029.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0029.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0030.s b/res/battle/scripts/moves/move_script_0030.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0030.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0031.s b/res/battle/scripts/moves/move_script_0031.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0031.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0032.s b/res/battle/scripts/moves/move_script_0032.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0032.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0033.s b/res/battle/scripts/moves/move_script_0033.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0033.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0034.s b/res/battle/scripts/moves/move_script_0034.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0034.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0035.s b/res/battle/scripts/moves/move_script_0035.s new file mode 100644 index 0000000000..902e0cfcd8 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0035.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} was wrapped by {1}! + BufferMessage pl_msg_00000368_00248, TAG_NICKNAME_NICKNAME, BTLSCR_DEFENDER, BTLSCR_ATTACKER + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0036.s b/res/battle/scripts/moves/move_script_0036.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0036.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0037.s b/res/battle/scripts/moves/move_script_0037.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0037.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0038.s b/res/battle/scripts/moves/move_script_0038.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0038.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0039.s b/res/battle/scripts/moves/move_script_0039.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0039.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0040.s b/res/battle/scripts/moves/move_script_0040.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0040.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0041.s b/res/battle/scripts/moves/move_script_0041.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0041.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0042.s b/res/battle/scripts/moves/move_script_0042.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0042.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0043.s b/res/battle/scripts/moves/move_script_0043.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0043.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0044.s b/res/battle/scripts/moves/move_script_0044.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0044.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0045.s b/res/battle/scripts/moves/move_script_0045.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0045.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0046.s b/res/battle/scripts/moves/move_script_0046.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0046.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0047.s b/res/battle/scripts/moves/move_script_0047.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0047.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0048.s b/res/battle/scripts/moves/move_script_0048.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0048.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0049.s b/res/battle/scripts/moves/move_script_0049.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0049.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0050.s b/res/battle/scripts/moves/move_script_0050.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0050.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0051.s b/res/battle/scripts/moves/move_script_0051.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0051.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0052.s b/res/battle/scripts/moves/move_script_0052.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0052.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0053.s b/res/battle/scripts/moves/move_script_0053.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0053.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0054.s b/res/battle/scripts/moves/move_script_0054.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0054.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0055.s b/res/battle/scripts/moves/move_script_0055.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0055.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0056.s b/res/battle/scripts/moves/move_script_0056.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0056.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0057.s b/res/battle/scripts/moves/move_script_0057.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0057.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0058.s b/res/battle/scripts/moves/move_script_0058.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0058.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0059.s b/res/battle/scripts/moves/move_script_0059.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0059.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0060.s b/res/battle/scripts/moves/move_script_0060.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0060.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0061.s b/res/battle/scripts/moves/move_script_0061.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0061.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0062.s b/res/battle/scripts/moves/move_script_0062.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0062.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0063.s b/res/battle/scripts/moves/move_script_0063.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0063.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0064.s b/res/battle/scripts/moves/move_script_0064.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0064.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0065.s b/res/battle/scripts/moves/move_script_0065.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0065.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0066.s b/res/battle/scripts/moves/move_script_0066.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0066.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0067.s b/res/battle/scripts/moves/move_script_0067.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0067.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0068.s b/res/battle/scripts/moves/move_script_0068.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0068.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0069.s b/res/battle/scripts/moves/move_script_0069.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0069.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0070.s b/res/battle/scripts/moves/move_script_0070.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0070.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0071.s b/res/battle/scripts/moves/move_script_0071.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0071.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0072.s b/res/battle/scripts/moves/move_script_0072.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0072.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0073.s b/res/battle/scripts/moves/move_script_0073.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0073.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0074.s b/res/battle/scripts/moves/move_script_0074.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0074.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0075.s b/res/battle/scripts/moves/move_script_0075.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0075.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0076.s b/res/battle/scripts/moves/move_script_0076.s new file mode 100644 index 0000000000..9f1faf27cd --- /dev/null +++ b/res/battle/scripts/moves/move_script_0076.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} absorbed light! + BufferMessage pl_msg_00000368_00214, TAG_NICKNAME, BTLSCR_ATTACKER + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0077.s b/res/battle/scripts/moves/move_script_0077.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0077.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0078.s b/res/battle/scripts/moves/move_script_0078.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0078.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0079.s b/res/battle/scripts/moves/move_script_0079.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0079.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0080.s b/res/battle/scripts/moves/move_script_0080.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0080.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0081.s b/res/battle/scripts/moves/move_script_0081.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0081.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0082.s b/res/battle/scripts/moves/move_script_0082.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0082.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0083.s b/res/battle/scripts/moves/move_script_0083.s new file mode 100644 index 0000000000..59f5f37998 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0083.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} was trapped in the vortex! + BufferMessage pl_msg_00000368_00242, TAG_NICKNAME, BTLSCR_DEFENDER + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0084.s b/res/battle/scripts/moves/move_script_0084.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0084.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0085.s b/res/battle/scripts/moves/move_script_0085.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0085.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0086.s b/res/battle/scripts/moves/move_script_0086.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0086.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0087.s b/res/battle/scripts/moves/move_script_0087.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0087.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0088.s b/res/battle/scripts/moves/move_script_0088.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0088.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0089.s b/res/battle/scripts/moves/move_script_0089.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0089.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0090.s b/res/battle/scripts/moves/move_script_0090.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0090.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0091.s b/res/battle/scripts/moves/move_script_0091.s new file mode 100644 index 0000000000..b374ff420b --- /dev/null +++ b/res/battle/scripts/moves/move_script_0091.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} burrowed its way under the ground! + BufferMessage pl_msg_00000368_00226, TAG_NICKNAME, BTLSCR_ATTACKER + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0092.s b/res/battle/scripts/moves/move_script_0092.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0092.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0093.s b/res/battle/scripts/moves/move_script_0093.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0093.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0094.s b/res/battle/scripts/moves/move_script_0094.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0094.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0095.s b/res/battle/scripts/moves/move_script_0095.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0095.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0096.s b/res/battle/scripts/moves/move_script_0096.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0096.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0097.s b/res/battle/scripts/moves/move_script_0097.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0097.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0098.s b/res/battle/scripts/moves/move_script_0098.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0098.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0099.s b/res/battle/scripts/moves/move_script_0099.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0099.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0100.s b/res/battle/scripts/moves/move_script_0100.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0100.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0101.s b/res/battle/scripts/moves/move_script_0101.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0101.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0102.s b/res/battle/scripts/moves/move_script_0102.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0102.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0103.s b/res/battle/scripts/moves/move_script_0103.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0103.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0104.s b/res/battle/scripts/moves/move_script_0104.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0104.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0105.s b/res/battle/scripts/moves/move_script_0105.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0105.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0106.s b/res/battle/scripts/moves/move_script_0106.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0106.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0107.s b/res/battle/scripts/moves/move_script_0107.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0107.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0108.s b/res/battle/scripts/moves/move_script_0108.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0108.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0109.s b/res/battle/scripts/moves/move_script_0109.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0109.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0110.s b/res/battle/scripts/moves/move_script_0110.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0110.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0111.s b/res/battle/scripts/moves/move_script_0111.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0111.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0112.s b/res/battle/scripts/moves/move_script_0112.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0112.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0113.s b/res/battle/scripts/moves/move_script_0113.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0113.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0114.s b/res/battle/scripts/moves/move_script_0114.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0114.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0115.s b/res/battle/scripts/moves/move_script_0115.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0115.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0116.s b/res/battle/scripts/moves/move_script_0116.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0116.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0117.s b/res/battle/scripts/moves/move_script_0117.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0117.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0118.s b/res/battle/scripts/moves/move_script_0118.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0118.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0119.s b/res/battle/scripts/moves/move_script_0119.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0119.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0120.s b/res/battle/scripts/moves/move_script_0120.s new file mode 100644 index 0000000000..9f53e3ac2b --- /dev/null +++ b/res/battle/scripts/moves/move_script_0120.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + IncrementGameStat BTLSCR_ATTACKER, BATTLER_TYPE_SOLO_PLAYER, 78 + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0121.s b/res/battle/scripts/moves/move_script_0121.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0121.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0122.s b/res/battle/scripts/moves/move_script_0122.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0122.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0123.s b/res/battle/scripts/moves/move_script_0123.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0123.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0124.s b/res/battle/scripts/moves/move_script_0124.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0124.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0125.s b/res/battle/scripts/moves/move_script_0125.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0125.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0126.s b/res/battle/scripts/moves/move_script_0126.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0126.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0127.s b/res/battle/scripts/moves/move_script_0127.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0127.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0128.s b/res/battle/scripts/moves/move_script_0128.s new file mode 100644 index 0000000000..8c986ff2dd --- /dev/null +++ b/res/battle/scripts/moves/move_script_0128.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {1} clamped {0}! + BufferMessage pl_msg_00000368_00255, TAG_NICKNAME_NICKNAME, BTLSCR_DEFENDER, BTLSCR_ATTACKER + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0129.s b/res/battle/scripts/moves/move_script_0129.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0129.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0130.s b/res/battle/scripts/moves/move_script_0130.s new file mode 100644 index 0000000000..a6b6ffd733 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0130.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} tucked in its head! + BufferMessage pl_msg_00000368_00217, TAG_NICKNAME, BTLSCR_ATTACKER + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0131.s b/res/battle/scripts/moves/move_script_0131.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0131.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0132.s b/res/battle/scripts/moves/move_script_0132.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0132.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0133.s b/res/battle/scripts/moves/move_script_0133.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0133.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0134.s b/res/battle/scripts/moves/move_script_0134.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0134.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0135.s b/res/battle/scripts/moves/move_script_0135.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0135.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0136.s b/res/battle/scripts/moves/move_script_0136.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0136.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0137.s b/res/battle/scripts/moves/move_script_0137.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0137.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0138.s b/res/battle/scripts/moves/move_script_0138.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0138.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0139.s b/res/battle/scripts/moves/move_script_0139.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0139.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0140.s b/res/battle/scripts/moves/move_script_0140.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0140.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0141.s b/res/battle/scripts/moves/move_script_0141.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0141.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0142.s b/res/battle/scripts/moves/move_script_0142.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0142.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0143.s b/res/battle/scripts/moves/move_script_0143.s new file mode 100644 index 0000000000..a2c3006af1 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0143.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} became cloaked in a harsh light! + BufferMessage pl_msg_00000368_00220, TAG_NICKNAME, BTLSCR_ATTACKER + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0144.s b/res/battle/scripts/moves/move_script_0144.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0144.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0145.s b/res/battle/scripts/moves/move_script_0145.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0145.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0146.s b/res/battle/scripts/moves/move_script_0146.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0146.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0147.s b/res/battle/scripts/moves/move_script_0147.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0147.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0148.s b/res/battle/scripts/moves/move_script_0148.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0148.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0149.s b/res/battle/scripts/moves/move_script_0149.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0149.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0150.s b/res/battle/scripts/moves/move_script_0150.s new file mode 100644 index 0000000000..7431cc7b1e --- /dev/null +++ b/res/battle/scripts/moves/move_script_0150.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + IncrementGameStat BTLSCR_ATTACKER, BATTLER_TYPE_SOLO_PLAYER, 76 + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0151.s b/res/battle/scripts/moves/move_script_0151.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0151.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0152.s b/res/battle/scripts/moves/move_script_0152.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0152.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0153.s b/res/battle/scripts/moves/move_script_0153.s new file mode 100644 index 0000000000..d3c296f29f --- /dev/null +++ b/res/battle/scripts/moves/move_script_0153.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + IncrementGameStat BTLSCR_ATTACKER, BATTLER_TYPE_SOLO_PLAYER, 79 + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0154.s b/res/battle/scripts/moves/move_script_0154.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0154.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0155.s b/res/battle/scripts/moves/move_script_0155.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0155.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0156.s b/res/battle/scripts/moves/move_script_0156.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0156.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0157.s b/res/battle/scripts/moves/move_script_0157.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0157.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0158.s b/res/battle/scripts/moves/move_script_0158.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0158.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0159.s b/res/battle/scripts/moves/move_script_0159.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0159.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0160.s b/res/battle/scripts/moves/move_script_0160.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0160.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0161.s b/res/battle/scripts/moves/move_script_0161.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0161.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0162.s b/res/battle/scripts/moves/move_script_0162.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0162.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0163.s b/res/battle/scripts/moves/move_script_0163.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0163.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0164.s b/res/battle/scripts/moves/move_script_0164.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0164.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0165.s b/res/battle/scripts/moves/move_script_0165.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0165.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0166.s b/res/battle/scripts/moves/move_script_0166.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0166.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0167.s b/res/battle/scripts/moves/move_script_0167.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0167.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0168.s b/res/battle/scripts/moves/move_script_0168.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0168.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0169.s b/res/battle/scripts/moves/move_script_0169.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0169.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0170.s b/res/battle/scripts/moves/move_script_0170.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0170.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0171.s b/res/battle/scripts/moves/move_script_0171.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0171.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0172.s b/res/battle/scripts/moves/move_script_0172.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0172.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0173.s b/res/battle/scripts/moves/move_script_0173.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0173.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0174.s b/res/battle/scripts/moves/move_script_0174.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0174.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0175.s b/res/battle/scripts/moves/move_script_0175.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0175.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0176.s b/res/battle/scripts/moves/move_script_0176.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0176.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0177.s b/res/battle/scripts/moves/move_script_0177.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0177.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0178.s b/res/battle/scripts/moves/move_script_0178.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0178.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0179.s b/res/battle/scripts/moves/move_script_0179.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0179.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0180.s b/res/battle/scripts/moves/move_script_0180.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0180.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0181.s b/res/battle/scripts/moves/move_script_0181.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0181.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0182.s b/res/battle/scripts/moves/move_script_0182.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0182.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0183.s b/res/battle/scripts/moves/move_script_0183.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0183.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0184.s b/res/battle/scripts/moves/move_script_0184.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0184.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0185.s b/res/battle/scripts/moves/move_script_0185.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0185.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0186.s b/res/battle/scripts/moves/move_script_0186.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0186.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0187.s b/res/battle/scripts/moves/move_script_0187.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0187.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0188.s b/res/battle/scripts/moves/move_script_0188.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0188.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0189.s b/res/battle/scripts/moves/move_script_0189.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0189.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0190.s b/res/battle/scripts/moves/move_script_0190.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0190.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0191.s b/res/battle/scripts/moves/move_script_0191.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0191.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0192.s b/res/battle/scripts/moves/move_script_0192.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0192.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0193.s b/res/battle/scripts/moves/move_script_0193.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0193.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0194.s b/res/battle/scripts/moves/move_script_0194.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0194.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0195.s b/res/battle/scripts/moves/move_script_0195.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0195.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0196.s b/res/battle/scripts/moves/move_script_0196.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0196.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0197.s b/res/battle/scripts/moves/move_script_0197.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0197.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0198.s b/res/battle/scripts/moves/move_script_0198.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0198.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0199.s b/res/battle/scripts/moves/move_script_0199.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0199.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0200.s b/res/battle/scripts/moves/move_script_0200.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0200.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0201.s b/res/battle/scripts/moves/move_script_0201.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0201.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0202.s b/res/battle/scripts/moves/move_script_0202.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0202.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0203.s b/res/battle/scripts/moves/move_script_0203.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0203.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0204.s b/res/battle/scripts/moves/move_script_0204.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0204.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0205.s b/res/battle/scripts/moves/move_script_0205.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0205.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0206.s b/res/battle/scripts/moves/move_script_0206.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0206.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0207.s b/res/battle/scripts/moves/move_script_0207.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0207.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0208.s b/res/battle/scripts/moves/move_script_0208.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0208.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0209.s b/res/battle/scripts/moves/move_script_0209.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0209.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0210.s b/res/battle/scripts/moves/move_script_0210.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0210.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0211.s b/res/battle/scripts/moves/move_script_0211.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0211.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0212.s b/res/battle/scripts/moves/move_script_0212.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0212.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0213.s b/res/battle/scripts/moves/move_script_0213.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0213.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0214.s b/res/battle/scripts/moves/move_script_0214.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0214.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0215.s b/res/battle/scripts/moves/move_script_0215.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0215.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0216.s b/res/battle/scripts/moves/move_script_0216.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0216.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0217.s b/res/battle/scripts/moves/move_script_0217.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0217.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0218.s b/res/battle/scripts/moves/move_script_0218.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0218.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0219.s b/res/battle/scripts/moves/move_script_0219.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0219.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0220.s b/res/battle/scripts/moves/move_script_0220.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0220.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0221.s b/res/battle/scripts/moves/move_script_0221.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0221.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0222.s b/res/battle/scripts/moves/move_script_0222.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0222.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0223.s b/res/battle/scripts/moves/move_script_0223.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0223.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0224.s b/res/battle/scripts/moves/move_script_0224.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0224.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0225.s b/res/battle/scripts/moves/move_script_0225.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0225.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0226.s b/res/battle/scripts/moves/move_script_0226.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0226.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0227.s b/res/battle/scripts/moves/move_script_0227.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0227.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0228.s b/res/battle/scripts/moves/move_script_0228.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0228.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0229.s b/res/battle/scripts/moves/move_script_0229.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0229.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0230.s b/res/battle/scripts/moves/move_script_0230.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0230.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0231.s b/res/battle/scripts/moves/move_script_0231.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0231.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0232.s b/res/battle/scripts/moves/move_script_0232.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0232.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0233.s b/res/battle/scripts/moves/move_script_0233.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0233.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0234.s b/res/battle/scripts/moves/move_script_0234.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0234.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0235.s b/res/battle/scripts/moves/move_script_0235.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0235.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0236.s b/res/battle/scripts/moves/move_script_0236.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0236.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0237.s b/res/battle/scripts/moves/move_script_0237.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0237.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0238.s b/res/battle/scripts/moves/move_script_0238.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0238.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0239.s b/res/battle/scripts/moves/move_script_0239.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0239.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0240.s b/res/battle/scripts/moves/move_script_0240.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0240.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0241.s b/res/battle/scripts/moves/move_script_0241.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0241.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0242.s b/res/battle/scripts/moves/move_script_0242.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0242.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0243.s b/res/battle/scripts/moves/move_script_0243.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0243.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0244.s b/res/battle/scripts/moves/move_script_0244.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0244.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0245.s b/res/battle/scripts/moves/move_script_0245.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0245.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0246.s b/res/battle/scripts/moves/move_script_0246.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0246.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0247.s b/res/battle/scripts/moves/move_script_0247.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0247.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0248.s b/res/battle/scripts/moves/move_script_0248.s new file mode 100644 index 0000000000..75e500990f --- /dev/null +++ b/res/battle/scripts/moves/move_script_0248.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} foresaw an attack! + BufferMessage pl_msg_00000368_00472, TAG_NICKNAME, BTLSCR_ATTACKER + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0249.s b/res/battle/scripts/moves/move_script_0249.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0249.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0250.s b/res/battle/scripts/moves/move_script_0250.s new file mode 100644 index 0000000000..59f5f37998 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0250.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} was trapped in the vortex! + BufferMessage pl_msg_00000368_00242, TAG_NICKNAME, BTLSCR_DEFENDER + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0251.s b/res/battle/scripts/moves/move_script_0251.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0251.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0252.s b/res/battle/scripts/moves/move_script_0252.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0252.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0253.s b/res/battle/scripts/moves/move_script_0253.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0253.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0254.s b/res/battle/scripts/moves/move_script_0254.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0254.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0255.s b/res/battle/scripts/moves/move_script_0255.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0255.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0256.s b/res/battle/scripts/moves/move_script_0256.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0256.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0257.s b/res/battle/scripts/moves/move_script_0257.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0257.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0258.s b/res/battle/scripts/moves/move_script_0258.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0258.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0259.s b/res/battle/scripts/moves/move_script_0259.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0259.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0260.s b/res/battle/scripts/moves/move_script_0260.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0260.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0261.s b/res/battle/scripts/moves/move_script_0261.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0261.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0262.s b/res/battle/scripts/moves/move_script_0262.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0262.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0263.s b/res/battle/scripts/moves/move_script_0263.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0263.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0264.s b/res/battle/scripts/moves/move_script_0264.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0264.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0265.s b/res/battle/scripts/moves/move_script_0265.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0265.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0266.s b/res/battle/scripts/moves/move_script_0266.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0266.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0267.s b/res/battle/scripts/moves/move_script_0267.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0267.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0268.s b/res/battle/scripts/moves/move_script_0268.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0268.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0269.s b/res/battle/scripts/moves/move_script_0269.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0269.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0270.s b/res/battle/scripts/moves/move_script_0270.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0270.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0271.s b/res/battle/scripts/moves/move_script_0271.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0271.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0272.s b/res/battle/scripts/moves/move_script_0272.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0272.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0273.s b/res/battle/scripts/moves/move_script_0273.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0273.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0274.s b/res/battle/scripts/moves/move_script_0274.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0274.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0275.s b/res/battle/scripts/moves/move_script_0275.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0275.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0276.s b/res/battle/scripts/moves/move_script_0276.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0276.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0277.s b/res/battle/scripts/moves/move_script_0277.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0277.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0278.s b/res/battle/scripts/moves/move_script_0278.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0278.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0279.s b/res/battle/scripts/moves/move_script_0279.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0279.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0280.s b/res/battle/scripts/moves/move_script_0280.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0280.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0281.s b/res/battle/scripts/moves/move_script_0281.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0281.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0282.s b/res/battle/scripts/moves/move_script_0282.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0282.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0283.s b/res/battle/scripts/moves/move_script_0283.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0283.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0284.s b/res/battle/scripts/moves/move_script_0284.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0284.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0285.s b/res/battle/scripts/moves/move_script_0285.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0285.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0286.s b/res/battle/scripts/moves/move_script_0286.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0286.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0287.s b/res/battle/scripts/moves/move_script_0287.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0287.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0288.s b/res/battle/scripts/moves/move_script_0288.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0288.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0289.s b/res/battle/scripts/moves/move_script_0289.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0289.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0290.s b/res/battle/scripts/moves/move_script_0290.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0290.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0291.s b/res/battle/scripts/moves/move_script_0291.s new file mode 100644 index 0000000000..1a50d893a7 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0291.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} hid underwater! + BufferMessage pl_msg_00000368_00229, TAG_NICKNAME, BTLSCR_ATTACKER + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0292.s b/res/battle/scripts/moves/move_script_0292.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0292.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0293.s b/res/battle/scripts/moves/move_script_0293.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0293.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0294.s b/res/battle/scripts/moves/move_script_0294.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0294.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0295.s b/res/battle/scripts/moves/move_script_0295.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0295.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0296.s b/res/battle/scripts/moves/move_script_0296.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0296.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0297.s b/res/battle/scripts/moves/move_script_0297.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0297.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0298.s b/res/battle/scripts/moves/move_script_0298.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0298.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0299.s b/res/battle/scripts/moves/move_script_0299.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0299.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0300.s b/res/battle/scripts/moves/move_script_0300.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0300.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0301.s b/res/battle/scripts/moves/move_script_0301.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0301.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0302.s b/res/battle/scripts/moves/move_script_0302.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0302.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0303.s b/res/battle/scripts/moves/move_script_0303.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0303.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0304.s b/res/battle/scripts/moves/move_script_0304.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0304.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0305.s b/res/battle/scripts/moves/move_script_0305.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0305.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0306.s b/res/battle/scripts/moves/move_script_0306.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0306.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0307.s b/res/battle/scripts/moves/move_script_0307.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0307.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0308.s b/res/battle/scripts/moves/move_script_0308.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0308.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0309.s b/res/battle/scripts/moves/move_script_0309.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0309.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0310.s b/res/battle/scripts/moves/move_script_0310.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0310.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0311.s b/res/battle/scripts/moves/move_script_0311.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0311.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0312.s b/res/battle/scripts/moves/move_script_0312.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0312.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0313.s b/res/battle/scripts/moves/move_script_0313.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0313.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0314.s b/res/battle/scripts/moves/move_script_0314.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0314.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0315.s b/res/battle/scripts/moves/move_script_0315.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0315.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0316.s b/res/battle/scripts/moves/move_script_0316.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0316.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0317.s b/res/battle/scripts/moves/move_script_0317.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0317.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0318.s b/res/battle/scripts/moves/move_script_0318.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0318.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0319.s b/res/battle/scripts/moves/move_script_0319.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0319.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0320.s b/res/battle/scripts/moves/move_script_0320.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0320.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0321.s b/res/battle/scripts/moves/move_script_0321.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0321.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0322.s b/res/battle/scripts/moves/move_script_0322.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0322.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0323.s b/res/battle/scripts/moves/move_script_0323.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0323.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0324.s b/res/battle/scripts/moves/move_script_0324.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0324.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0325.s b/res/battle/scripts/moves/move_script_0325.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0325.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0326.s b/res/battle/scripts/moves/move_script_0326.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0326.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0327.s b/res/battle/scripts/moves/move_script_0327.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0327.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0328.s b/res/battle/scripts/moves/move_script_0328.s new file mode 100644 index 0000000000..14abcb112f --- /dev/null +++ b/res/battle/scripts/moves/move_script_0328.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} was trapped by Sand Tomb! + BufferMessage pl_msg_00000368_00245, TAG_NICKNAME, BTLSCR_DEFENDER + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0329.s b/res/battle/scripts/moves/move_script_0329.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0329.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0330.s b/res/battle/scripts/moves/move_script_0330.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0330.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0331.s b/res/battle/scripts/moves/move_script_0331.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0331.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0332.s b/res/battle/scripts/moves/move_script_0332.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0332.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0333.s b/res/battle/scripts/moves/move_script_0333.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0333.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0334.s b/res/battle/scripts/moves/move_script_0334.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0334.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0335.s b/res/battle/scripts/moves/move_script_0335.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0335.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0336.s b/res/battle/scripts/moves/move_script_0336.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0336.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0337.s b/res/battle/scripts/moves/move_script_0337.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0337.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0338.s b/res/battle/scripts/moves/move_script_0338.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0338.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0339.s b/res/battle/scripts/moves/move_script_0339.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0339.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0340.s b/res/battle/scripts/moves/move_script_0340.s new file mode 100644 index 0000000000..4dd14068df --- /dev/null +++ b/res/battle/scripts/moves/move_script_0340.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} sprang up! + BufferMessage pl_msg_00000368_00232, TAG_NICKNAME, BTLSCR_ATTACKER + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0341.s b/res/battle/scripts/moves/move_script_0341.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0341.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0342.s b/res/battle/scripts/moves/move_script_0342.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0342.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0343.s b/res/battle/scripts/moves/move_script_0343.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0343.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0344.s b/res/battle/scripts/moves/move_script_0344.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0344.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0345.s b/res/battle/scripts/moves/move_script_0345.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0345.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0346.s b/res/battle/scripts/moves/move_script_0346.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0346.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0347.s b/res/battle/scripts/moves/move_script_0347.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0347.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0348.s b/res/battle/scripts/moves/move_script_0348.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0348.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0349.s b/res/battle/scripts/moves/move_script_0349.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0349.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0350.s b/res/battle/scripts/moves/move_script_0350.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0350.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0351.s b/res/battle/scripts/moves/move_script_0351.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0351.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0352.s b/res/battle/scripts/moves/move_script_0352.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0352.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0353.s b/res/battle/scripts/moves/move_script_0353.s new file mode 100644 index 0000000000..a8442813ae --- /dev/null +++ b/res/battle/scripts/moves/move_script_0353.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} chose {1} as its destiny! + BufferMessage pl_msg_00000368_00478, TAG_NICKNAME_MOVE, BTLSCR_ATTACKER, BTLSCR_ATTACKER + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0354.s b/res/battle/scripts/moves/move_script_0354.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0354.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0355.s b/res/battle/scripts/moves/move_script_0355.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0355.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0356.s b/res/battle/scripts/moves/move_script_0356.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0356.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0357.s b/res/battle/scripts/moves/move_script_0357.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0357.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0358.s b/res/battle/scripts/moves/move_script_0358.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0358.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0359.s b/res/battle/scripts/moves/move_script_0359.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0359.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0360.s b/res/battle/scripts/moves/move_script_0360.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0360.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0361.s b/res/battle/scripts/moves/move_script_0361.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0361.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0362.s b/res/battle/scripts/moves/move_script_0362.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0362.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0363.s b/res/battle/scripts/moves/move_script_0363.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0363.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0364.s b/res/battle/scripts/moves/move_script_0364.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0364.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0365.s b/res/battle/scripts/moves/move_script_0365.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0365.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0366.s b/res/battle/scripts/moves/move_script_0366.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0366.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0367.s b/res/battle/scripts/moves/move_script_0367.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0367.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0368.s b/res/battle/scripts/moves/move_script_0368.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0368.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0369.s b/res/battle/scripts/moves/move_script_0369.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0369.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0370.s b/res/battle/scripts/moves/move_script_0370.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0370.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0371.s b/res/battle/scripts/moves/move_script_0371.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0371.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0372.s b/res/battle/scripts/moves/move_script_0372.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0372.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0373.s b/res/battle/scripts/moves/move_script_0373.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0373.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0374.s b/res/battle/scripts/moves/move_script_0374.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0374.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0375.s b/res/battle/scripts/moves/move_script_0375.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0375.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0376.s b/res/battle/scripts/moves/move_script_0376.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0376.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0377.s b/res/battle/scripts/moves/move_script_0377.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0377.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0378.s b/res/battle/scripts/moves/move_script_0378.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0378.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0379.s b/res/battle/scripts/moves/move_script_0379.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0379.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0380.s b/res/battle/scripts/moves/move_script_0380.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0380.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0381.s b/res/battle/scripts/moves/move_script_0381.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0381.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0382.s b/res/battle/scripts/moves/move_script_0382.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0382.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0383.s b/res/battle/scripts/moves/move_script_0383.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0383.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0384.s b/res/battle/scripts/moves/move_script_0384.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0384.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0385.s b/res/battle/scripts/moves/move_script_0385.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0385.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0386.s b/res/battle/scripts/moves/move_script_0386.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0386.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0387.s b/res/battle/scripts/moves/move_script_0387.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0387.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0388.s b/res/battle/scripts/moves/move_script_0388.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0388.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0389.s b/res/battle/scripts/moves/move_script_0389.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0389.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0390.s b/res/battle/scripts/moves/move_script_0390.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0390.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0391.s b/res/battle/scripts/moves/move_script_0391.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0391.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0392.s b/res/battle/scripts/moves/move_script_0392.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0392.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0393.s b/res/battle/scripts/moves/move_script_0393.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0393.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0394.s b/res/battle/scripts/moves/move_script_0394.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0394.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0395.s b/res/battle/scripts/moves/move_script_0395.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0395.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0396.s b/res/battle/scripts/moves/move_script_0396.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0396.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0397.s b/res/battle/scripts/moves/move_script_0397.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0397.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0398.s b/res/battle/scripts/moves/move_script_0398.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0398.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0399.s b/res/battle/scripts/moves/move_script_0399.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0399.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0400.s b/res/battle/scripts/moves/move_script_0400.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0400.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0401.s b/res/battle/scripts/moves/move_script_0401.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0401.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0402.s b/res/battle/scripts/moves/move_script_0402.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0402.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0403.s b/res/battle/scripts/moves/move_script_0403.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0403.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0404.s b/res/battle/scripts/moves/move_script_0404.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0404.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0405.s b/res/battle/scripts/moves/move_script_0405.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0405.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0406.s b/res/battle/scripts/moves/move_script_0406.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0406.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0407.s b/res/battle/scripts/moves/move_script_0407.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0407.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0408.s b/res/battle/scripts/moves/move_script_0408.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0408.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0409.s b/res/battle/scripts/moves/move_script_0409.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0409.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0410.s b/res/battle/scripts/moves/move_script_0410.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0410.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0411.s b/res/battle/scripts/moves/move_script_0411.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0411.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0412.s b/res/battle/scripts/moves/move_script_0412.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0412.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0413.s b/res/battle/scripts/moves/move_script_0413.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0413.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0414.s b/res/battle/scripts/moves/move_script_0414.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0414.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0415.s b/res/battle/scripts/moves/move_script_0415.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0415.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0416.s b/res/battle/scripts/moves/move_script_0416.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0416.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0417.s b/res/battle/scripts/moves/move_script_0417.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0417.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0418.s b/res/battle/scripts/moves/move_script_0418.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0418.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0419.s b/res/battle/scripts/moves/move_script_0419.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0419.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0420.s b/res/battle/scripts/moves/move_script_0420.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0420.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0421.s b/res/battle/scripts/moves/move_script_0421.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0421.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0422.s b/res/battle/scripts/moves/move_script_0422.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0422.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0423.s b/res/battle/scripts/moves/move_script_0423.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0423.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0424.s b/res/battle/scripts/moves/move_script_0424.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0424.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0425.s b/res/battle/scripts/moves/move_script_0425.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0425.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0426.s b/res/battle/scripts/moves/move_script_0426.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0426.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0427.s b/res/battle/scripts/moves/move_script_0427.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0427.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0428.s b/res/battle/scripts/moves/move_script_0428.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0428.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0429.s b/res/battle/scripts/moves/move_script_0429.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0429.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0430.s b/res/battle/scripts/moves/move_script_0430.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0430.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0431.s b/res/battle/scripts/moves/move_script_0431.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0431.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0432.s b/res/battle/scripts/moves/move_script_0432.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0432.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0433.s b/res/battle/scripts/moves/move_script_0433.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0433.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0434.s b/res/battle/scripts/moves/move_script_0434.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0434.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0435.s b/res/battle/scripts/moves/move_script_0435.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0435.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0436.s b/res/battle/scripts/moves/move_script_0436.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0436.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0437.s b/res/battle/scripts/moves/move_script_0437.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0437.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0438.s b/res/battle/scripts/moves/move_script_0438.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0438.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0439.s b/res/battle/scripts/moves/move_script_0439.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0439.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0440.s b/res/battle/scripts/moves/move_script_0440.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0440.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0441.s b/res/battle/scripts/moves/move_script_0441.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0441.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0442.s b/res/battle/scripts/moves/move_script_0442.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0442.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0443.s b/res/battle/scripts/moves/move_script_0443.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0443.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0444.s b/res/battle/scripts/moves/move_script_0444.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0444.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0445.s b/res/battle/scripts/moves/move_script_0445.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0445.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0446.s b/res/battle/scripts/moves/move_script_0446.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0446.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0447.s b/res/battle/scripts/moves/move_script_0447.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0447.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0448.s b/res/battle/scripts/moves/move_script_0448.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0448.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0449.s b/res/battle/scripts/moves/move_script_0449.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0449.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0450.s b/res/battle/scripts/moves/move_script_0450.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0450.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0451.s b/res/battle/scripts/moves/move_script_0451.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0451.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0452.s b/res/battle/scripts/moves/move_script_0452.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0452.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0453.s b/res/battle/scripts/moves/move_script_0453.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0453.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0454.s b/res/battle/scripts/moves/move_script_0454.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0454.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0455.s b/res/battle/scripts/moves/move_script_0455.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0455.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0456.s b/res/battle/scripts/moves/move_script_0456.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0456.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0457.s b/res/battle/scripts/moves/move_script_0457.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0457.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0458.s b/res/battle/scripts/moves/move_script_0458.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0458.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0459.s b/res/battle/scripts/moves/move_script_0459.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0459.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0460.s b/res/battle/scripts/moves/move_script_0460.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0460.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0461.s b/res/battle/scripts/moves/move_script_0461.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0461.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0462.s b/res/battle/scripts/moves/move_script_0462.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0462.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0463.s b/res/battle/scripts/moves/move_script_0463.s new file mode 100644 index 0000000000..efb8667d3f --- /dev/null +++ b/res/battle/scripts/moves/move_script_0463.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} became trapped by swirling magma! + BufferMessage pl_msg_00000368_01247, TAG_NICKNAME, BTLSCR_DEFENDER + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0464.s b/res/battle/scripts/moves/move_script_0464.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0464.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0465.s b/res/battle/scripts/moves/move_script_0465.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0465.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0466.s b/res/battle/scripts/moves/move_script_0466.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0466.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0467.s b/res/battle/scripts/moves/move_script_0467.s new file mode 100644 index 0000000000..dfb31b9d90 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0467.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} vanished instantly! + BufferMessage pl_msg_00000368_01082, TAG_NICKNAME, BTLSCR_ATTACKER + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0468.s b/res/battle/scripts/moves/move_script_0468.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0468.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0469.s b/res/battle/scripts/moves/move_script_0469.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0469.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0470.s b/res/battle/scripts/moves/move_script_0470.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0470.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0471.s b/res/battle/scripts/moves/move_script_0471.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0471.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0472.s b/res/battle/scripts/moves/move_script_0472.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0472.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0473.s b/res/battle/scripts/moves/move_script_0473.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0473.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0474.s b/res/battle/scripts/moves/move_script_0474.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0474.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0475.s b/res/battle/scripts/moves/move_script_0475.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0475.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0476.s b/res/battle/scripts/moves/move_script_0476.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0476.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0477.s b/res/battle/scripts/moves/move_script_0477.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0477.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0478.s b/res/battle/scripts/moves/move_script_0478.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0478.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0479.s b/res/battle/scripts/moves/move_script_0479.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0479.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0480.s b/res/battle/scripts/moves/move_script_0480.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0480.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0481.s b/res/battle/scripts/moves/move_script_0481.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0481.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0482.s b/res/battle/scripts/moves/move_script_0482.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0482.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0483.s b/res/battle/scripts/moves/move_script_0483.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0483.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0484.s b/res/battle/scripts/moves/move_script_0484.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0484.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0485.s b/res/battle/scripts/moves/move_script_0485.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0485.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0486.s b/res/battle/scripts/moves/move_script_0486.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0486.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0487.s b/res/battle/scripts/moves/move_script_0487.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0487.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0488.s b/res/battle/scripts/moves/move_script_0488.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0488.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0489.s b/res/battle/scripts/moves/move_script_0489.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0489.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0490.s b/res/battle/scripts/moves/move_script_0490.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0490.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0491.s b/res/battle/scripts/moves/move_script_0491.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0491.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0492.s b/res/battle/scripts/moves/move_script_0492.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0492.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0493.s b/res/battle/scripts/moves/move_script_0493.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0493.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0494.s b/res/battle/scripts/moves/move_script_0494.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0494.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0495.s b/res/battle/scripts/moves/move_script_0495.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0495.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0496.s b/res/battle/scripts/moves/move_script_0496.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0496.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0497.s b/res/battle/scripts/moves/move_script_0497.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0497.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0498.s b/res/battle/scripts/moves/move_script_0498.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0498.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0499.s b/res/battle/scripts/moves/move_script_0499.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0499.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0500.s b/res/battle/scripts/moves/move_script_0500.s new file mode 100644 index 0000000000..67b69a0271 --- /dev/null +++ b/res/battle/scripts/moves/move_script_0500.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + GoToEffectScript diff --git a/res/battle/scripts/subscripts/subscript_0000.s b/res/battle/scripts/subscripts/subscript_0000.s new file mode 100644 index 0000000000..30e2244e6b --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0000.s @@ -0,0 +1,157 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_TYPE, BATTLE_TYPE_TRAINER, _118 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_TYPE, BATTLE_TYPE_SAFARI, _215 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_TYPE, BATTLE_TYPE_PAL_PARK, _237 + SetPokemonEncounter BTLSCR_ENEMY + SetTrainerEncounter BTLSCR_PLAYER + PlayEncounterAnimation + WaitTime 122 + HealthbarSlideInDelay BTLSCR_ENEMY + Wait + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_SYS_STATUS, BATTLE_STATUS_DISTORTION, _073 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_SYS_STATUS, BATTLE_STATUS_LEGENDARY, _067 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_SYS_STATUS, BATTLE_STATUS_FIRST_BATTLE, _055 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_SYS_STATUS, BATTLE_STATUS_HONEY_TREE, _061 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_TYPE, BATTLE_TYPE_DOUBLES, _079 + // A wild {0} appeared! + PrintGlobalMessage pl_msg_00000368_00965, TAG_NICKNAME, BTLSCR_ENEMY + GoTo _084 + +_055: + // Whoa! A wild {0} came charging! + PrintGlobalMessage pl_msg_00000368_01167, TAG_NICKNAME, BTLSCR_ENEMY + GoTo _084 + +_061: + // A wild {0} appeared from the tree you slathered with Honey! + PrintGlobalMessage pl_msg_00000368_00968, TAG_NICKNAME, BTLSCR_ENEMY + GoTo _084 + +_067: + // A wild {0} appeared! + PrintGlobalMessage pl_msg_00000368_01246, TAG_NICKNAME, BTLSCR_ENEMY + GoTo _084 + +_073: + // The Distortion World’s {0} appeared! + PrintGlobalMessage pl_msg_00000368_01268, TAG_NICKNAME, BTLSCR_ENEMY + GoTo _084 + +_079: + // A wild {0} and {1} appeared! + PrintGlobalMessage pl_msg_00000368_00967, TAG_NICKNAME_NICKNAME, BTLSCR_ENEMY_SLOT_1, BTLSCR_ENEMY_SLOT_2 + +_084: + Wait + WaitButtonABTime 30 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_TYPE, BATTLE_TYPE_2vs2, _098 + // Go! {0}! + PrintMessage pl_msg_00000368_00979, TAG_NICKNAME, BTLSCR_PLAYER + GoTo _100 + +_098: + PrintFirstSendOutMessage BTLSCR_PLAYER + +_100: + SpriteToOAM BTLSCR_ENEMY + Wait + ThrowPokeball BTLSCR_PLAYER, BTLSCR_THROW_POKE_BALL + PokemonSlideIn BTLSCR_PLAYER + WaitTime 96 + HealthbarSlideInDelay BTLSCR_PLAYER + Wait + OAMToSprite BTLSCR_ENEMY + Wait + GoTo _258 + +_118: + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_SYS_STATUS, BATTLE_STATUS_RECORDED, _169 + PlayEncounterAnimation + SetTrainerEncounter BTLSCR_ALL_BATTLERS + WaitTime 96 + LoadPartyGaugeGraphics + ShowBattleStartPartyGauge BTLSCR_ENEMY + ShowBattleStartPartyGauge BTLSCR_PLAYER + PrintEncounterMessage BTLSCR_ENEMY + Wait + WaitButtonABTime 30 + PrintFirstSendOutMessage BTLSCR_ENEMY + HideBattleStartPartyGauge BTLSCR_ENEMY + ThrowPokeball BTLSCR_ENEMY, BTLSCR_THROW_POKE_BALL + PokemonSlideIn BTLSCR_ENEMY + WaitTime 112 + HealthbarSlideInDelay BTLSCR_ENEMY + Wait + PrintFirstSendOutMessage BTLSCR_PLAYER + HideBattleStartPartyGauge BTLSCR_PLAYER + ThrowPokeball BTLSCR_PLAYER, BTLSCR_THROW_POKE_BALL + PokemonSlideIn BTLSCR_PLAYER + WaitTime 96 + HealthbarSlideInDelay BTLSCR_PLAYER + Wait + FreePartyGaugeGraphics + GoTo _258 + +_169: + PlayEncounterAnimation + SetTrainerEncounter BTLSCR_ALL_BATTLERS + WaitTime 96 + LoadPartyGaugeGraphics + ShowBattleStartPartyGauge BTLSCR_ENEMY + ShowBattleStartPartyGauge BTLSCR_PLAYER + PrintEncounterMessage BTLSCR_ENEMY + Wait + WaitButtonABTime 30 + PrintFirstSendOutMessage BTLSCR_PLAYER + HideBattleStartPartyGauge BTLSCR_PLAYER + ThrowPokeball BTLSCR_PLAYER, BTLSCR_THROW_POKE_BALL + PokemonSlideIn BTLSCR_PLAYER + WaitTime 96 + HealthbarSlideInDelay BTLSCR_PLAYER + Wait + PrintFirstSendOutMessage BTLSCR_ENEMY + HideBattleStartPartyGauge BTLSCR_ENEMY + ThrowPokeball BTLSCR_ENEMY, BTLSCR_THROW_POKE_BALL + PokemonSlideIn BTLSCR_ENEMY + WaitTime 112 + HealthbarSlideInDelay BTLSCR_ENEMY + Wait + FreePartyGaugeGraphics + GoTo _258 + +_215: + SetPokemonEncounter BTLSCR_ENEMY + SetTrainerEncounter BTLSCR_PLAYER + PlayEncounterAnimation + WaitTime 122 + HealthbarSlideInDelay BTLSCR_ENEMY + Wait + // A wild {0} appeared! + PrintGlobalMessage pl_msg_00000368_00965, TAG_NICKNAME, BTLSCR_ENEMY + Wait + HealthbarSlideIn BTLSCR_PLAYER + WaitButtonABTime 7 + Wait + GoTo _258 + +_237: + SetPokemonEncounter BTLSCR_ENEMY + SetTrainerEncounter BTLSCR_PLAYER + PlayEncounterAnimation + WaitTime 122 + HealthbarSlideInDelay BTLSCR_ENEMY + Wait + // Wow! {0}’s {1} is drawing close! + PrintGlobalMessage pl_msg_00000368_01219, TAG_TRNAME_NICKNAME, BTLSCR_ENEMY, BTLSCR_ENEMY + Wait + HealthbarSlideIn BTLSCR_PLAYER + WaitButtonABTime 7 + Wait + +_258: + SetBattleBackground + End diff --git a/res/battle/scripts/subscripts/subscript_0001.s b/res/battle/scripts/subscripts/subscript_0001.s new file mode 100644 index 0000000000..a0c6bbc920 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0001.s @@ -0,0 +1,10 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_DIRECT, _006 + Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION + +_006: + End diff --git a/res/battle/scripts/subscripts/subscript_0002.s b/res/battle/scripts/subscripts/subscript_0002.s new file mode 100644 index 0000000000..edab2cb603 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0002.s @@ -0,0 +1,23 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_SPRITE_BLINK, _016 + PlayMoveHitSound BTLSCR_MSG_TEMP + FlickerMon BTLSCR_MSG_TEMP + Wait + CompareVarToValue OPCODE_EQU, BTLVAR_WAITING_BATTLERS, 0, _016 + Call BATTLE_SUBSCRIPT_TYPE_RESIST_BERRY + +_016: + UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_SPRITE_BLINK + UpdateHealthBar BTLSCR_MSG_TEMP + Wait + UpdateHealthBarValue BTLSCR_MSG_TEMP + TryFaintMon BTLSCR_MSG_TEMP + CompareVarToValue OPCODE_GT, BTLVAR_HP_CALC_TEMP, 0, _036 + UpdateVarFromVar OPCODE_SET, BTLVAR_MSG_BATTLER_TEMP_ASSURANCE_DAMAGE_MASK, BTLVAR_HP_CALC_TEMP + +_036: + End diff --git a/res/battle/scripts/subscripts/subscript_0003.s b/res/battle/scripts/subscripts/subscript_0003.s new file mode 100644 index 0000000000..685b2e2fef --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0003.s @@ -0,0 +1,56 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + TryRestoreStatusOnSwitch BTLSCR_PLAYER_SLOT_1, _007 + UpdateMonData OPCODE_SET, BTLSCR_PLAYER_SLOT_1, BATTLEMON_STATUS, MON_CONDITION_NONE + +_007: + TryRestoreStatusOnSwitch BTLSCR_PLAYER_SLOT_2, _015 + UpdateMonData OPCODE_SET, BTLSCR_PLAYER_SLOT_2, BATTLEMON_STATUS, MON_CONDITION_NONE + +_015: + PlaySound BTLSCR_ATTACKER, 1791 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_TYPE, BATTLE_TYPE_FRONTIER, _065 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_TYPE, BATTLE_TYPE_LINK, _076 + CheckAbility CHECK_HAVE, BTLSCR_ATTACKER, ABILITY_RUN_AWAY, _043 + CheckItemHoldEffect CHECK_HAVE, BTLSCR_ATTACKER, HOLD_EFFECT_FLEE, _050 + // Got away safely! + PrintMessage pl_msg_00000368_00781, TAG_NONE + GoTo _055 + +_043: + // {0} fled using {1}! + PrintMessage pl_msg_00000368_00783, TAG_NICKNAME_ABILITY, BTLSCR_ATTACKER, BTLSCR_ATTACKER + GoTo _055 + +_050: + // {0} fled using its {1}! + PrintMessage pl_msg_00000368_00782, TAG_NICKNAME_ITEM, BTLSCR_ATTACKER, BTLSCR_ATTACKER + +_055: + Wait + WaitButtonABTime 30 + FadeOutBattle + Wait + UpdateVar OPCODE_FLAG_ON, BTLVAR_RESULT_MASK, BATTLE_RESULT_PLAYER_FLED + End + +_065: + PrintForfeitMessage + Wait + WaitButtonABTime 30 + FadeOutBattle + Wait + UpdateVar OPCODE_FLAG_OFF, BTLVAR_RESULT_MASK, BATTLE_RESULT_TRY_FLEE_WAIT + End + +_076: + PrintEscapeMessage + Wait + WaitButtonABTime 30 + FadeOutBattle + Wait + UpdateVar OPCODE_FLAG_OFF, BTLVAR_RESULT_MASK, BATTLE_RESULT_TRY_FLEE_WAIT + End diff --git a/res/battle/scripts/subscripts/subscript_0004.s b/res/battle/scripts/subscripts/subscript_0004.s new file mode 100644 index 0000000000..47ffcc53ee --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0004.s @@ -0,0 +1,87 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + TryRestoreStatusOnSwitch BTLSCR_PLAYER_SLOT_1, _007 + UpdateMonData OPCODE_SET, BTLSCR_PLAYER_SLOT_1, BATTLEMON_STATUS, MON_CONDITION_NONE + +_007: + TryRestoreStatusOnSwitch BTLSCR_PLAYER_SLOT_2, _015 + UpdateMonData OPCODE_SET, BTLSCR_PLAYER_SLOT_2, BATTLEMON_STATUS, MON_CONDITION_NONE + +_015: + CompareVarToValue OPCODE_FLAG_NOT, BTLVAR_BATTLE_TYPE, BATTLE_TYPE_TRAINER, _135 + CompareVarToValue OPCODE_EQU, BTLVAR_BATTLE_TYPE, BATTLE_TYPE_TRAINER|BATTLE_TYPE_DOUBLES|BATTLE_TYPE_LINK|BATTLE_TYPE_2vs2|BATTLE_TYPE_FRONTIER, _084 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_TYPE, BATTLE_TYPE_LINK, _153 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_TYPE, BATTLE_TYPE_2vs2, _087 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_TYPE, BATTLE_TYPE_TAG, _087 + // Player defeated {0} {1}! + PrintMessage pl_msg_00000368_00839, TAG_TRCLASS_TRNAME, BTLSCR_ENEMY_SLOT_1, BTLSCR_ENEMY_SLOT_1 + Wait + WaitButtonABTime 15 + TrainerSlideIn BTLSCR_ENEMY_SLOT_1, BATTLER_TYPE_SOLO_ENEMY + Wait + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_TYPE, BATTLE_TYPE_DOUBLES, _065 + PrintTrainerMessage BTLSCR_ENEMY_SLOT_1, TRAINER_MESSAGE_LOSE + Wait + WaitButtonABTime 60 + GoTo _121 + +_065: + PrintTrainerMessage BTLSCR_ENEMY_SLOT_1, TRAINER_MESSAGE_LOSE_1 + Wait + WaitButtonABTime 60 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_TYPE, BATTLE_TYPE_FRONTIER, _121 + PrintTrainerMessage BTLSCR_ENEMY_SLOT_1, TRAINER_MESSAGE_LOSE_2 + Wait + WaitButtonABTime 60 + GoTo _121 + +_084: + PlayBGM BTLSCR_PLAYER_SLOT_1, 1128 + +_087: + // Player beat {0} {1} and {2} {3}! + PrintMessage pl_msg_00000368_00953, TAG_TRCLASS_TRNAME_TRCLASS_TRNAME, BTLSCR_ENEMY_SLOT_1, BTLSCR_ENEMY_SLOT_1, BTLSCR_ENEMY_SLOT_2, BTLSCR_ENEMY_SLOT_2 + Wait + WaitButtonABTime 15 + TrainerSlideIn BTLSCR_ENEMY_SLOT_1, BATTLER_TYPE_SOLO_ENEMY + Wait + PrintTrainerMessage BTLSCR_ENEMY_SLOT_1, TRAINER_MESSAGE_LOSE + Wait + WaitButtonABTime 30 + TrainerSlideOut BTLSCR_ENEMY_SLOT_1 + Wait + TrainerSlideIn BTLSCR_ENEMY_SLOT_2, BATTLER_TYPE_SOLO_ENEMY + Wait + PrintTrainerMessage BTLSCR_ENEMY_SLOT_2, TRAINER_MESSAGE_LOSE + Wait + WaitButtonABTime 60 + SetLinkBattleResult + +_121: + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_TYPE, BATTLE_TYPE_FRONTIER, _150 + PayPrizeMoney + // {0} got ${1} for winning! + PrintMessage pl_msg_00000368_00033, TAG_TRNAME_NUM, BTLSCR_PLAYER, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 60 + +_135: + GenerateEndOfBattleItem + AddPayDayMoney + CompareVarToValue OPCODE_EQU, BTLVAR_MSG_TEMP, 0, _150 + // {0} picked up ${1}! + PrintMessage pl_msg_00000368_00341, TAG_TRNAME_NUM, BTLSCR_PLAYER, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 60 + +_150: + FadeOutBattle + Wait + End + +_153: + Call BATTLE_SUBSCRIPT_LINK_WIN_LOSE + End diff --git a/res/battle/scripts/subscripts/subscript_0005.s b/res/battle/scripts/subscripts/subscript_0005.s new file mode 100644 index 0000000000..1d8ed1ea65 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0005.s @@ -0,0 +1,80 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_TYPE, BATTLE_TYPE_FRONTIER, _068 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_TYPE, BATTLE_TYPE_LINK, _065 + // {0} is out of usable Pokémon! + PrintMessage pl_msg_00000368_00036, TAG_TRNAME, BTLSCR_PLAYER + Wait + WaitButtonABTime 30 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_TYPE, BATTLE_TYPE_FRONTIER, _050 + PayPrizeMoney + CompareVarToValue OPCODE_EQU, BTLVAR_MSG_TEMP, 0, _050 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_TYPE, BATTLE_TYPE_TRAINER, _042 + // {0} dropped ${1} in panic! + PrintMessage pl_msg_00000368_00034, TAG_TRNAME_NUM, BTLSCR_PLAYER, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + GoTo _050 + +_042: + // {0} paid out ${1} to the winner. + PrintMessage pl_msg_00000368_00035, TAG_TRNAME_NUM, BTLSCR_PLAYER, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + +_050: + // ... ... ... ... + PrintMessage pl_msg_00000368_00038, TAG_NONE + Wait + WaitButtonABTime 30 + // {0} blacked out! + PrintMessage pl_msg_00000368_00037, TAG_NONE + Wait + WaitButtonABTime 30 + FadeOutBattle + Wait + End + +_065: + Call BATTLE_SUBSCRIPT_LINK_WIN_LOSE + End + +_068: + CompareMonDataToValue OPCODE_EQU, BTLSCR_ENEMY_SLOT_1, BATTLEMON_CUR_HP, 0, _076 + RecallPokemon BTLSCR_ENEMY_SLOT_1 + +_076: + CompareVarToValue OPCODE_FLAG_NOT, BTLVAR_BATTLE_TYPE, BATTLE_TYPE_DOUBLES, _089 + CompareMonDataToValue OPCODE_EQU, BTLSCR_ENEMY_SLOT_2, BATTLEMON_CUR_HP, 0, _089 + RecallPokemon BTLSCR_ENEMY_SLOT_2 + +_089: + Wait + HealthbarSlideOut BTLSCR_ENEMY + Wait + TrainerSlideIn BTLSCR_ENEMY_SLOT_1, BATTLER_TYPE_SOLO_ENEMY + Wait + PrintTrainerMessage BTLSCR_ENEMY_SLOT_1, TRAINER_MESSAGE_WIN + Wait + WaitButtonABTime 30 + CompareVarToValue OPCODE_FLAG_NOT, BTLVAR_BATTLE_TYPE, BATTLE_TYPE_2vs2, _123 + TrainerSlideOut BTLSCR_ENEMY_SLOT_1 + Wait + TrainerSlideIn BTLSCR_ENEMY_SLOT_2, BATTLER_TYPE_SOLO_ENEMY + Wait + PrintTrainerMessage BTLSCR_ENEMY_SLOT_2, TRAINER_MESSAGE_WIN + Wait + WaitButtonABTime 60 + GoTo _125 + +_123: + WaitButtonABTime 30 + +_125: + SetLinkBattleResult + FadeOutBattle + Wait + End diff --git a/res/battle/scripts/subscripts/subscript_0006.s b/res/battle/scripts/subscripts/subscript_0006.s new file mode 100644 index 0000000000..a632b8ffcf --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0006.s @@ -0,0 +1,18 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + IncrementGameStat BTLSCR_FAINTED_MON, BATTLER_TYPE_SOLO_ENEMY, 41 + IncrementGameStat BTLSCR_FAINTED_MON, BATTLER_TYPE_SOLO_PLAYER, 96 + PlayFaintAnimation + Wait + HealthbarSlideOut BTLSCR_FAINTED_MON + // {0} fainted! + PrintMessage pl_msg_00000368_00030, TAG_NICKNAME, BTLSCR_FAINTED_MON + Wait + WaitButtonABTime 30 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_NO_EXPERIENCE_GIVEN, _023 + +_023: + End diff --git a/res/battle/scripts/subscripts/subscript_0007.s b/res/battle/scripts/subscripts/subscript_0007.s new file mode 100644 index 0000000000..6f2f09c0f4 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0007.s @@ -0,0 +1,100 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PrintAttackMessage + Wait + WaitButtonABTime 30 + CompareVarToValue OPCODE_FLAG_NOT, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_LOST_FOCUS, _011 + PrintBufferedMessage + GoTo _179 + +_011: + CompareVarToValue OPCODE_FLAG_NOT, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_SEMI_INVULNERABLE, _018 + GoTo _157 + +_018: + CompareVarToValue OPCODE_FLAG_NOT, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_PROTECTED, _069 + CompareVarToValue OPCODE_EQU, BTLVAR_CURRENT_MOVE, MOVE_SNORE, _058 + CompareVarToValue OPCODE_EQU, BTLVAR_CURRENT_MOVE, MOVE_NIGHTMARE, _058 + CompareVarToValue OPCODE_EQU, BTLVAR_CURRENT_MOVE, MOVE_FLING, _058 + CompareVarToValue OPCODE_EQU, BTLVAR_CURRENT_MOVE, MOVE_LAST_RESORT, _058 + CompareVarToValue OPCODE_EQU, BTLVAR_CURRENT_MOVE, MOVE_PSYCHO_SHIFT, _058 + CompareVarToValue OPCODE_EQU, BTLVAR_CURRENT_MOVE, MOVE_FAKE_OUT, _058 + CompareVarToValue OPCODE_NEQ, BTLVAR_CURRENT_MOVE, MOVE_NATURAL_GIFT, _063 + +_058: + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED, _097 + +_063: + // {0} protected itself! + PrintMessage pl_msg_00000368_00015, TAG_NICKNAME, BTLSCR_DEFENDER + GoTo _179 + +_069: + CompareVarToValue OPCODE_FLAG_NOT, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_LEVITATED, _081 + // {0} makes Ground moves miss by using {1}! + PrintMessage pl_msg_00000368_00021, TAG_NICKNAME_ABILITY, BTLSCR_DEFENDER, BTLSCR_DEFENDER + GoTo _179 + +_081: + CompareVarToValue OPCODE_FLAG_NOT, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_MAGNET_RISE, _097 + UpdateVar OPCODE_SET, BTLVAR_MSG_MOVE_TEMP, MOVE_MAGNET_RISE + // {0} evades Ground moves with {1}! + PrintMessage pl_msg_00000368_01036, TAG_NICKNAME_MOVE, BTLSCR_DEFENDER, BTLSCR_MSG_TEMP + GoTo _179 + +_097: + CompareVarToValue OPCODE_FLAG_NOT, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED, _107 + // But it failed! + PrintMessage pl_msg_00000368_00796, TAG_NONE + GoTo _179 + +_107: + CompareVarToValue OPCODE_FLAG_NOT, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_WONDER_GUARD, _119 + // {0} avoided damage by using {1}! + PrintMessage pl_msg_00000368_00018, TAG_NICKNAME_ABILITY, BTLSCR_DEFENDER, BTLSCR_DEFENDER + GoTo _179 + +_119: + CompareVarToValue OPCODE_FLAG_NOT, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_INEFFECTIVE, _134 + IncrementGameStat BTLSCR_ATTACKER, BATTLER_TYPE_SOLO_PLAYER, 95 + // It doesn’t affect {0}... + PrintMessage pl_msg_00000368_00027, TAG_NICKNAME, BTLSCR_DEFENDER + GoTo _179 + +_134: + CompareVarToValue OPCODE_FLAG_NOT, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_STURDY, _146 + // {0} was protected by {1}! + PrintMessage pl_msg_00000368_00625, TAG_NICKNAME_ABILITY, BTLSCR_DEFENDER, BTLSCR_DEFENDER + GoTo _179 + +_146: + CompareVarToValue OPCODE_FLAG_NOT, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_ONE_HIT_KO_FAILED, _157 + // {0} is unaffected! + PrintMessage pl_msg_00000368_00342, TAG_NICKNAME, BTLSCR_DEFENDER + GoTo _179 + +_157: + GetCurrentMoveData MOVEATTRIBUTE_RANGE + CompareVarToValue OPCODE_EQU, BTLVAR_CALC_TEMP, 0x00000004, _175 + CompareVarToValue OPCODE_EQU, BTLVAR_CALC_TEMP, 0x00000008, _175 + // {0}’s attack missed! + PrintMessage pl_msg_00000368_00012, TAG_NICKNAME, BTLSCR_ATTACKER + GoTo _179 + +_175: + // {0} avoided the attack! + PrintMessage pl_msg_00000368_00024, TAG_NICKNAME, BTLSCR_DEFENDER + +_179: + Wait + WaitButtonABTime 30 + CompareVarToValue OPCODE_FLAG_NOT, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_MESSAGE_AFTER_MISS, _189 + Call BATTLE_SUBSCRIPT_SHOW_PREPARED_MESSAGE + +_189: + UnlockMoveChoice BTLSCR_ATTACKER + Call BATTLE_SUBSCRIPT_CRASH_ON_MISS + End diff --git a/res/battle/scripts/subscripts/subscript_0008.s b/res/battle/scripts/subscripts/subscript_0008.s new file mode 100644 index 0000000000..7bf5fa6882 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0008.s @@ -0,0 +1,10 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // Can’t escape! + PrintMessage pl_msg_00000368_00042, TAG_NONE + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0009.s b/res/battle/scripts/subscripts/subscript_0009.s new file mode 100644 index 0000000000..20286ed5dd --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0009.s @@ -0,0 +1,52 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + TryRestoreStatusOnSwitch BTLSCR_SWITCHED_MON, _007 + UpdateMonData OPCODE_SET, BTLSCR_SWITCHED_MON, BATTLEMON_STATUS, MON_CONDITION_NONE + +_007: + PrintRecallMessage BTLSCR_SWITCHED_MON + Wait + Call BATTLE_SUBSCRIPT_PURSUIT + CompareMonDataToValue OPCODE_NEQ, BTLSCR_SWITCHED_MON, BATTLEMON_CUR_HP, 0, _020 + GoTo _026 + +_020: + RecallPokemon BTLSCR_SWITCHED_MON + Wait + HealthbarSlideOut BTLSCR_SWITCHED_MON + Wait + +_026: + SwitchAndUpdateMon BTLSCR_SWITCHED_MON + LoadPartyGaugeGraphics + ShowPartyGauge BTLSCR_SWITCHED_MON + Wait + CompareVarToValue OPCODE_EQU, BTLVAR_SCRIPT_TEMP, 1, _041 + PrintSendOutMessage BTLSCR_SWITCHED_MON + GoTo _045 + +_041: + // Go! {0}! + PrintMessage pl_msg_00000368_00979, TAG_NICKNAME, BTLSCR_SWITCHED_MON + +_045: + Wait + HidePartyGauge BTLSCR_SWITCHED_MON + Wait + FreePartyGaugeGraphics + PokemonSendOut BTLSCR_SWITCHED_MON + WaitTime 72 + HealthbarSlideIn BTLSCR_SWITCHED_MON + Wait + Call BATTLE_SUBSCRIPT_HAZARDS_CHECK + CompareVarToValue OPCODE_GT, BTLVAR_FAINTED_MON, BATTLER_ENEMY_SLOT_2, _079 + UpdateVarFromVar OPCODE_FLAG_INDEX, BTLVAR_SCRIPT_TEMP, BTLVAR_FAINTED_MON + UpdateVar OPCODE_LEFT_SHIFT, BTLVAR_SCRIPT_TEMP, 24 + CompareVarToVar OPCODE_FLAG_NOT, BTLVAR_BATTLE_CTX_STATUS, BTLVAR_SCRIPT_TEMP, _079 + Call BATTLE_SUBSCRIPT_FAINT_MON + +_079: + End diff --git a/res/battle/scripts/subscripts/subscript_0010.s b/res/battle/scripts/subscripts/subscript_0010.s new file mode 100644 index 0000000000..e8b3342801 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0010.s @@ -0,0 +1,29 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + ShowParty + WaitMonSelection + +_001: + SwitchAndUpdateMon BTLSCR_SWITCHED_MON + LoadPartyGaugeGraphics + ShowPartyGauge BTLSCR_SWITCHED_MON + Wait + PrintSendOutMessage BTLSCR_SWITCHED_MON + Wait + HidePartyGauge BTLSCR_SWITCHED_MON + Wait + FreePartyGaugeGraphics + PokemonSendOut BTLSCR_SWITCHED_MON + WaitTime 72 + HealthbarSlideIn BTLSCR_SWITCHED_MON + Wait + Call BATTLE_SUBSCRIPT_HAZARDS_CHECK + CompareVarToValue OPCODE_FLAG_NOT, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_MON_FAINTED, _030 + Call BATTLE_SUBSCRIPT_FAINT_MON + +_030: + GoToIfAnySwitches _001 + End diff --git a/res/battle/scripts/subscripts/subscript_0011.s b/res/battle/scripts/subscripts/subscript_0011.s new file mode 100644 index 0000000000..73aee39786 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0011.s @@ -0,0 +1,18 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} used one {1}! + PrintMessage pl_msg_00000368_00857, TAG_TRNAME_ITEM, BTLSCR_ATTACKER, BTLSCR_MSG_TEMP + Wait + StartCatchMonTask CAPTURE_NORMAL + WaitCatchMonTask + UpdateVarFromVar OPCODE_GET, BTLVAR_RESULT_MASK, BTLVAR_SCRIPT_TEMP + UpdateVar OPCODE_BITWISE_AND, BTLVAR_SCRIPT_TEMP, 255 + CompareVarToValue OPCODE_NEQ, BTLVAR_SCRIPT_TEMP, 4, _029 + TryRestoreStatusOnSwitch BTLSCR_PLAYER, _029 + UpdateMonData OPCODE_SET, BTLSCR_PLAYER, BATTLEMON_STATUS, MON_CONDITION_NONE + +_029: + End diff --git a/res/battle/scripts/subscripts/subscript_0012.s b/res/battle/scripts/subscripts/subscript_0012.s new file mode 100644 index 0000000000..ab813e0045 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0012.s @@ -0,0 +1,46 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + ChangeStatStage _041, _059, _060 + CompareVarToValue OPCODE_NEQ, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_DIRECT, _010 + PrintAttackMessage + Wait + +_010: + CompareVarToValue OPCODE_NEQ, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_DIRECT, _018 + PlayMoveAnimation BTLSCR_ATTACKER + Wait + +_018: + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_UPDATE_STAT_STAGES, _036 + PlayBattleAnimationFromVar BTLSCR_SIDE_EFFECT_MON, BTLVAR_SCRIPT_TEMP + Wait + CompareVarToValue OPCODE_FLAG_NOT, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_STAT_STAGE_CHANGE_SHOWN, _036 + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_UPDATE_STAT_STAGES + +_036: + PrintBufferedMessage + Wait + WaitButtonABTime 30 + End + +_041: + CompareVarToValue OPCODE_NEQ, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_DIRECT, _048 + PrintAttackMessage + Wait + +_048: + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_TURN_OFF_MESSAGES, _059 + WaitButtonABTime 30 + PrintBufferedMessage + Wait + WaitButtonABTime 30 + +_059: + End + +_060: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/subscripts/subscript_0013.s b/res/battle/scripts/subscripts/subscript_0013.s new file mode 100644 index 0000000000..e396d0824f --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0013.s @@ -0,0 +1,16 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PlayMoveAnimation BTLSCR_ATTACKER + Wait + PrintBufferedMessage + Wait + WaitButtonABTime 30 + LockMoveChoice BTLSCR_SIDE_EFFECT_MON + CompareMonDataToValue OPCODE_FLAG_NOT, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_SEMI_INVULNERABLE, _017 + ToggleVanish BTLSCR_SIDE_EFFECT_MON, TRUE + +_017: + End diff --git a/res/battle/scripts/subscripts/subscript_0014.s b/res/battle/scripts/subscripts/subscript_0014.s new file mode 100644 index 0000000000..0b435e1e91 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0014.s @@ -0,0 +1,36 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + IfMovedThisTurn BTLSCR_SIDE_EFFECT_MON, _025 + CheckSubstitute BTLSCR_SIDE_EFFECT_MON, _045 + CheckIgnorableAbility CHECK_HAVE, BTLSCR_SIDE_EFFECT_MON, ABILITY_INNER_FOCUS, _026 + CompareVarToValue OPCODE_NEQ, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_INDIRECT, _020 + CheckIgnorableAbility CHECK_HAVE, BTLSCR_SIDE_EFFECT_MON, ABILITY_SHIELD_DUST, _025 + +_020: + UpdateMonData OPCODE_FLAG_ON, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_FLINCH + +_025: + End + +_026: + CompareVarToValue OPCODE_EQU, BTLVAR_CURRENT_MOVE, MOVE_FAKE_OUT, _036 + CompareVarToValue OPCODE_NEQ, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_DIRECT, _044 + +_036: + // {0} won’t flinch because of its {1}! + PrintMessage pl_msg_00000368_00737, TAG_NICKNAME_ABILITY, BTLSCR_SIDE_EFFECT_MON, BTLSCR_SIDE_EFFECT_MON + Wait + WaitButtonABTime 30 + +_044: + End + +_045: + CompareVarToValue OPCODE_NEQ, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_DIRECT, _054 + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + +_054: + End diff --git a/res/battle/scripts/subscripts/subscript_0015.s b/res/battle/scripts/subscripts/subscript_0015.s new file mode 100644 index 0000000000..7fe193f156 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0015.s @@ -0,0 +1,18 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} flinched! + PrintMessage pl_msg_00000368_00181, TAG_NICKNAME, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + UnlockMoveChoice BTLSCR_ATTACKER + CheckAbility CHECK_NOT_HAVE, BTLSCR_ATTACKER, ABILITY_STEADFAST, _027 + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_ABILITY + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_PARAM, MOVE_SUBSCRIPT_PTR_SPEED_UP_1_STAGE + UpdateVarFromVar OPCODE_SET, BTLVAR_SIDE_EFFECT_MON, BTLVAR_ATTACKER + Call BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE + +_027: + End diff --git a/res/battle/scripts/subscripts/subscript_0016.s b/res/battle/scripts/subscripts/subscript_0016.s new file mode 100644 index 0000000000..7b4d013f0c --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0016.s @@ -0,0 +1,24 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareVarToValue OPCODE_EQU, BTLVAR_CRITICAL_MUL, 1, _049 + // A critical hit! + PrintMessage pl_msg_00000368_00774, TAG_NONE + Wait + WaitButtonABTime 30 + CheckAbility CHECK_NOT_HAVE, BTLSCR_DEFENDER, ABILITY_ANGER_POINT, _049 + CompareMonDataToValue OPCODE_EQU, BTLSCR_DEFENDER, BATTLEMON_CUR_HP, 0, _049 + CompareMonDataToValue OPCODE_EQU, BTLSCR_DEFENDER, BATTLEMON_ATTACK_STAGE, 12, _049 + PlayBattleAnimation BTLSCR_DEFENDER, BATTLE_ANIMATION_STAT_BOOST + Wait + UpdateMonData OPCODE_SET, BTLSCR_DEFENDER, BATTLEMON_ATTACK_STAGE, 12 + UpdateVar OPCODE_SET, BTLVAR_MSG_TEMP, 1 + // {0} maxed its {2} with {1}! + PrintMessage pl_msg_00000368_01093, TAG_NICKNAME_ABILITY_STAT, BTLSCR_DEFENDER, BTLSCR_DEFENDER, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + +_049: + End diff --git a/res/battle/scripts/subscripts/subscript_0017.s b/res/battle/scripts/subscripts/subscript_0017.s new file mode 100644 index 0000000000..e089c0fd9b --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0017.s @@ -0,0 +1,13 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_MULTI_HIT_SKIP_MESSAGE, _011 + // Hit {0} time(s)! + PrintMessage pl_msg_00000368_00046, TAG_NUMBER, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + +_011: + End diff --git a/res/battle/scripts/subscripts/subscript_0018.s b/res/battle/scripts/subscripts/subscript_0018.s new file mode 100644 index 0000000000..4e2c538789 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0018.s @@ -0,0 +1,153 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_DISOBEDIENCE, _147 + CompareVarToValue OPCODE_NEQ, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_MOVE_EFFECT, _055 + CheckAbility CHECK_HAVE, BTLSCR_SIDE_EFFECT_MON, ABILITY_INSOMNIA, _202 + CheckAbility CHECK_HAVE, BTLSCR_SIDE_EFFECT_MON, ABILITY_VITAL_SPIRIT, _202 + CheckIgnoreWeather _031 + CompareVarToValue OPCODE_FLAG_NOT, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_SUNNY, _031 + CheckAbility CHECK_HAVE, BTLSCR_SIDE_EFFECT_MON, ABILITY_LEAF_GUARD, _202 + +_031: + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_STATUS, MON_CONDITION_SLEEP, _274 + CheckAbility CHECK_HAVE, BTLSCR_SIDE_EFFECT_MON, ABILITY_SOUNDPROOF, _047 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_UPROAR, _292 + +_047: + CompareMonDataToValue OPCODE_NEQ, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_STATUS, MON_CONDITION_NONE, _237 + GoTo _147 + +_055: + CheckIgnorableAbility CHECK_HAVE, BTLSCR_SIDE_EFFECT_MON, ABILITY_INSOMNIA, _202 + CheckIgnorableAbility CHECK_HAVE, BTLSCR_SIDE_EFFECT_MON, ABILITY_VITAL_SPIRIT, _202 + CheckIgnoreWeather _077 + CompareVarToValue OPCODE_FLAG_NOT, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_SUNNY, _077 + CheckIgnorableAbility CHECK_HAVE, BTLSCR_SIDE_EFFECT_MON, ABILITY_LEAF_GUARD, _202 + +_077: + CompareVarToValue OPCODE_NEQ, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_INDIRECT, _087 + CheckIgnorableAbility CHECK_HAVE, BTLSCR_SIDE_EFFECT_MON, ABILITY_SHIELD_DUST, _237 + +_087: + CompareVarToValue OPCODE_NEQ, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_DIRECT, _094 + PrintAttackMessage + Wait + +_094: + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_ABILITY, _102 + CheckSubstitute BTLSCR_SIDE_EFFECT_MON, _237 + +_102: + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_STATUS, MON_CONDITION_SLEEP, _274 + CheckAbility CHECK_HAVE, BTLSCR_SIDE_EFFECT_MON, ABILITY_SOUNDPROOF, _118 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_UPROAR, _292 + +_118: + CompareMonDataToValue OPCODE_NEQ, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_STATUS, MON_CONDITION_NONE, _237 + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_ABILITY, _147 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_MISSED|MOVE_STATUS_SEMI_INVULNERABLE, _237 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_SIDE_CONDITIONS_EFFECT_MON, SIDE_CONDITION_SAFEGUARD, _319 + CompareVarToValue OPCODE_NEQ, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_DIRECT, _147 + PlayMoveAnimation BTLSCR_ATTACKER + Wait + +_147: + PlayBattleAnimation BTLSCR_SIDE_EFFECT_MON, BATTLE_ANIMATION_ASLEEP + Wait + Random 3, 2 + UpdateMonDataFromVar OPCODE_FLAG_ON, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_STATUS, BTLVAR_CALC_TEMP + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_ABILITY, _170 + // {0} fell asleep! + PrintMessage pl_msg_00000368_00047, TAG_NICKNAME, BTLSCR_SIDE_EFFECT_MON + GoTo _176 + +_170: + // {0}’s {1} made {2} fall asleep! + PrintMessage pl_msg_00000368_00050, TAG_NICKNAME_ABILITY_NICKNAME, BTLSCR_MSG_TEMP, BTLSCR_MSG_BATTLER_TEMP, BTLSCR_SIDE_EFFECT_MON + +_176: + Wait + WaitButtonABTime 30 + SetHealthbarStatus BTLSCR_SIDE_EFFECT_MON, BATTLE_ANIMATION_ASLEEP + Wait + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_SEMI_INVULNERABLE, _193 + UnlockMoveChoice BTLSCR_SIDE_EFFECT_MON + GoTo _201 + +_193: + UnlockMoveChoice BTLSCR_SIDE_EFFECT_MON + UpdateVarFromVar OPCODE_SET, BTLVAR_MSG_BATTLER_TEMP, BTLVAR_SIDE_EFFECT_MON + Call BATTLE_SUBSCRIPT_VANISH_OFF + +_201: + End + +_202: + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_INDIRECT, _337 + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_ABILITY, _337 + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_MOVE_EFFECT, _221 + PrintAttackMessage + Wait + WaitButtonABTime 30 + +_221: + // {0} stayed awake because of its {1}! + PrintMessage pl_msg_00000368_00329, TAG_NICKNAME_ABILITY, BTLSCR_SIDE_EFFECT_MON, BTLSCR_SIDE_EFFECT_MON + GoTo _330 + // {0}’s {1} suppressed {2}’s {3}! + PrintMessage pl_msg_00000368_00727, TAG_NICKNAME_ABILITY_NICKNAME_ABILITY, BTLSCR_SIDE_EFFECT_MON, BTLSCR_SIDE_EFFECT_MON, BTLSCR_MSG_TEMP, BTLSCR_MSG_BATTLER_TEMP + GoTo _330 + +_237: + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_INDIRECT, _337 + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_ABILITY, _337 + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_MOVE_EFFECT, _337 + WaitButtonABTime 30 + GetCurrentMoveData MOVEATTRIBUTE_RANGE + CompareVarToValue OPCODE_EQU, BTLVAR_CALC_TEMP, 0x00000004, _270 + CompareVarToValue OPCODE_EQU, BTLVAR_CALC_TEMP, 0x00000008, _270 + Call BATTLE_SUBSCRIPT_BUT_IT_FAILED + GoTo _337 + +_270: + Call BATTLE_SUBSCRIPT_MOVE_FAIL_MISSED + GoTo _337 + +_274: + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_INDIRECT, _337 + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_ABILITY, _337 + WaitButtonABTime 30 + // {0} is already asleep! + PrintMessage pl_msg_00000368_00057, TAG_NICKNAME, BTLSCR_SIDE_EFFECT_MON + GoTo _330 + +_292: + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_INDIRECT, _337 + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_UPROAR, _311 + WaitButtonABTime 30 + // But the uproar kept {0} awake! + PrintMessage pl_msg_00000368_00326, TAG_NICKNAME, BTLSCR_SIDE_EFFECT_MON + GoTo _330 + +_311: + WaitButtonABTime 30 + // But {0} can’t sleep in an uproar! + PrintMessage pl_msg_00000368_00323, TAG_NICKNAME, BTLSCR_SIDE_EFFECT_MON + GoTo _330 + +_319: + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_INDIRECT, _337 + WaitButtonABTime 30 + // {0} is protected by Safeguard! + PrintMessage pl_msg_00000368_00200, TAG_NICKNAME, BTLSCR_SIDE_EFFECT_MON + +_330: + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_NO_MORE_WORK + +_337: + End diff --git a/res/battle/scripts/subscripts/subscript_0019.s b/res/battle/scripts/subscripts/subscript_0019.s new file mode 100644 index 0000000000..37b5c91c47 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0019.s @@ -0,0 +1,22 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CheckAbility CHECK_HAVE, BTLSCR_MSG_TEMP, ABILITY_SOUNDPROOF, _015 + CompareVarToValue OPCODE_FLAG_NOT, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_UPROAR, _015 + // The uproar woke up the {0}! + PrintMessage pl_msg_00000368_00305, TAG_NICKNAME, BTLSCR_MSG_TEMP + GoTo _019 + +_015: + // {0} woke up! + PrintMessage pl_msg_00000368_00302, TAG_NICKNAME, BTLSCR_MSG_TEMP + +_019: + Wait + SetHealthbarStatus BTLSCR_MSG_TEMP, BATTLE_ANIMATION_NONE + WaitButtonABTime 30 + UpdateMonData OPCODE_FLAG_OFF, BTLSCR_MSG_TEMP, BATTLEMON_STATUS, MON_CONDITION_SLEEP + UpdateMonData OPCODE_FLAG_OFF, BTLSCR_MSG_TEMP, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_NIGHTMARE + End diff --git a/res/battle/scripts/subscripts/subscript_0020.s b/res/battle/scripts/subscripts/subscript_0020.s new file mode 100644 index 0000000000..befe661280 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0020.s @@ -0,0 +1,12 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} is fast asleep. + PrintMessage pl_msg_00000368_00299, TAG_NICKNAME, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + PlayBattleAnimation BTLSCR_ATTACKER, BATTLE_ANIMATION_ASLEEP + Wait + End diff --git a/res/battle/scripts/subscripts/subscript_0021.s b/res/battle/scripts/subscripts/subscript_0021.s new file mode 100644 index 0000000000..facea704a8 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0021.s @@ -0,0 +1,59 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + WaitButtonABTime 15 + CompareVarToValue OPCODE_FLAG_NOT, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_SPLASH, _011 + // But nothing happened! + PrintMessage pl_msg_00000368_00795, TAG_NONE + GoTo _095 + +_011: + CompareVarToValue OPCODE_FLAG_NOT, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_ENDURED_ITEM, _037 + PlayBattleAnimation BTLSCR_DEFENDER, BATTLE_ANIMATION_HELD_ITEM + Wait + // {0} hung on using its {1}! + PrintMessage pl_msg_00000368_00912, TAG_NICKNAME_ITEM, BTLSCR_DEFENDER, BTLSCR_DEFENDER + CheckItemHoldEffect CHECK_NOT_HAVE, BTLSCR_DEFENDER, HOLD_EFFECT_ENDURE, _032 + RemoveItem BTLSCR_DEFENDER + +_032: + Wait + WaitButtonABTime 30 + GoTo _067 + +_037: + CompareVarToValue OPCODE_FLAG_NOT, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_ENDURED, _057 + CompareMonDataToValue OPCODE_NEQ, BTLSCR_DEFENDER, BATTLEMON_CUR_HP, 1, _057 + // {0} endured the hit! + PrintMessage pl_msg_00000368_00445, TAG_NICKNAME, BTLSCR_DEFENDER + Wait + WaitButtonABTime 30 + GoTo _067 + +_057: + CompareVarToValue OPCODE_FLAG_NOT, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_ONE_HIT_KO, _067 + // It’s a one-hit KO! + PrintMessage pl_msg_00000368_00775, TAG_NONE + GoTo _095 + +_067: + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_IGNORE_TYPE_CHECKS, _098 + CompareVarToValue OPCODE_AND, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_SUPER_EFFECTIVE|MOVE_STATUS_NOT_VERY_EFFECTIVE, _098 + CompareVarToValue OPCODE_FLAG_NOT, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_SUPER_EFFECTIVE, _087 + // It’s super effective! + PrintMessage pl_msg_00000368_00780, TAG_NONE + GoTo _095 + +_087: + CompareVarToValue OPCODE_FLAG_NOT, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_NOT_VERY_EFFECTIVE, _098 + // It’s not very effective... + PrintMessage pl_msg_00000368_00779, TAG_NONE + +_095: + Wait + WaitButtonABTime 30 + +_098: + End diff --git a/res/battle/scripts/subscripts/subscript_0022.s b/res/battle/scripts/subscripts/subscript_0022.s new file mode 100644 index 0000000000..3e98f32680 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0022.s @@ -0,0 +1,131 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareVarToValue OPCODE_NEQ, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_TOXIC_SPIKES, _023 + CheckAbility CHECK_HAVE, BTLSCR_SIDE_EFFECT_MON, ABILITY_IMMUNITY, _177 + CheckIgnoreWeather _050 + CompareVarToValue OPCODE_FLAG_NOT, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_SUNNY, _050 + CheckAbility CHECK_HAVE, BTLSCR_SIDE_EFFECT_MON, ABILITY_LEAF_GUARD, _177 + GoTo _050 + +_023: + CheckIgnorableAbility CHECK_HAVE, BTLSCR_SIDE_EFFECT_MON, ABILITY_IMMUNITY, _177 + CheckIgnoreWeather _040 + CompareVarToValue OPCODE_FLAG_NOT, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_SUNNY, _040 + CheckIgnorableAbility CHECK_HAVE, BTLSCR_SIDE_EFFECT_MON, ABILITY_LEAF_GUARD, _177 + +_040: + CompareVarToValue OPCODE_NEQ, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_INDIRECT, _050 + CheckIgnorableAbility CHECK_HAVE, BTLSCR_SIDE_EFFECT_MON, ABILITY_SHIELD_DUST, _217 + +_050: + CompareVarToValue OPCODE_NEQ, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_DIRECT, _057 + PrintAttackMessage + Wait + +_057: + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_ABILITY, _065 + CheckSubstitute BTLSCR_SIDE_EFFECT_MON, _217 + +_065: + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_STATUS, MON_CONDITION_POISON, _243 + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_STATUS, MON_CONDITION_TOXIC, _243 + CompareMonDataToValue OPCODE_EQU, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_TYPE_1, TYPE_POISON, _266 + CompareMonDataToValue OPCODE_EQU, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_TYPE_2, TYPE_POISON, _266 + CompareMonDataToValue OPCODE_EQU, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_TYPE_1, TYPE_STEEL, _266 + CompareMonDataToValue OPCODE_EQU, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_TYPE_2, TYPE_STEEL, _266 + CompareMonDataToValue OPCODE_NEQ, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_STATUS, MON_CONDITION_NONE, _217 + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_ABILITY, _130 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_MISSED|MOVE_STATUS_SEMI_INVULNERABLE, _217 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_SIDE_CONDITIONS_EFFECT_MON, SIDE_CONDITION_SAFEGUARD, _294 + CompareVarToValue OPCODE_NEQ, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_DIRECT, _130 + PlayMoveAnimation BTLSCR_ATTACKER + Wait + +_130: + PlayBattleAnimation BTLSCR_SIDE_EFFECT_MON, BATTLE_ANIMATION_POISONED + Wait + UpdateMonData OPCODE_FLAG_ON, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_STATUS, MON_CONDITION_POISON + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_ABILITY, _150 + // {0} was poisoned! + PrintMessage pl_msg_00000368_00063, TAG_NICKNAME, BTLSCR_SIDE_EFFECT_MON + GoTo _156 + +_150: + // {0}’s {1} poisoned {2}! + PrintMessage pl_msg_00000368_00066, TAG_NICKNAME_ABILITY_NICKNAME, BTLSCR_MSG_TEMP, BTLSCR_MSG_BATTLER_TEMP, BTLSCR_SIDE_EFFECT_MON + +_156: + Wait + SetHealthbarStatus BTLSCR_SIDE_EFFECT_MON, BATTLE_ANIMATION_POISONED + WaitButtonABTime 30 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_TRY_SYNCHRONIZE_STATUS, _172 + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_TRY_SYNCHRONIZE_STATUS + End + +_172: + UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_TRY_SYNCHRONIZE_STATUS + End + +_177: + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_INDIRECT, _322 + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_ABILITY, _322 + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_MOVE_EFFECT, _201 + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_TOXIC_SPIKES, _201 + PrintAttackMessage + Wait + WaitButtonABTime 30 + +_201: + // {0}’s {1} prevents poisoning! + PrintMessage pl_msg_00000368_00650, TAG_NICKNAME_ABILITY, BTLSCR_SIDE_EFFECT_MON, BTLSCR_SIDE_EFFECT_MON + GoTo _315 + // {0}’s {1} suppressed {2}’s {3}! + PrintMessage pl_msg_00000368_00727, TAG_NICKNAME_ABILITY_NICKNAME_ABILITY, BTLSCR_SIDE_EFFECT_MON, BTLSCR_SIDE_EFFECT_MON, BTLSCR_MSG_TEMP, BTLSCR_MSG_BATTLER_TEMP + GoTo _315 + +_217: + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_INDIRECT, _322 + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_ABILITY, _322 + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_MOVE_EFFECT, _322 + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_TOXIC_SPIKES, _322 + WaitButtonABTime 30 + Call BATTLE_SUBSCRIPT_BUT_IT_FAILED + GoTo _322 + +_243: + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_INDIRECT, _322 + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_ABILITY, _322 + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_TOXIC_SPIKES, _322 + WaitButtonABTime 30 + // {0} is already poisoned. + PrintMessage pl_msg_00000368_00076, TAG_NICKNAME, BTLSCR_SIDE_EFFECT_MON + GoTo _315 + +_266: + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_INDIRECT, _322 + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_MOVE_EFFECT, _322 + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_TOXIC_SPIKES, _322 + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_ABILITY, _322 + WaitButtonABTime 30 + // It doesn’t affect {0}... + PrintMessage pl_msg_00000368_00027, TAG_NICKNAME, BTLSCR_SIDE_EFFECT_MON + GoTo _315 + +_294: + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_INDIRECT, _322 + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_MOVE_EFFECT, _322 + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_TOXIC_SPIKES, _322 + WaitButtonABTime 30 + // {0} is protected by Safeguard! + PrintMessage pl_msg_00000368_00200, TAG_NICKNAME, BTLSCR_SIDE_EFFECT_MON + +_315: + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_NO_MORE_WORK + +_322: + End diff --git a/res/battle/scripts/subscripts/subscript_0023.s b/res/battle/scripts/subscripts/subscript_0023.s new file mode 100644 index 0000000000..30ca668e1e --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0023.s @@ -0,0 +1,30 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CheckAbility CHECK_HAVE, BTLSCR_MSG_TEMP, ABILITY_MAGIC_GUARD, _055 + CheckAbility CHECK_NOT_HAVE, BTLSCR_MSG_TEMP, ABILITY_POISON_HEAL, _038 + UpdateMonDataFromVar OPCODE_GET, BTLSCR_MSG_TEMP, BATTLEMON_MAX_HP, BTLVAR_HP_CALC_TEMP + CompareMonDataToVar OPCODE_EQU, BTLSCR_MSG_TEMP, BATTLEMON_CUR_HP, BTLVAR_HP_CALC_TEMP, _055 + DivideVarByValue BTLVAR_HP_CALC_TEMP, 8 + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_SPRITE_BLINK + Call BATTLE_SUBSCRIPT_UPDATE_HP + // {0} restored HP using its {1}! + PrintMessage pl_msg_00000368_00635, TAG_NICKNAME_ABILITY, BTLSCR_MSG_TEMP, BTLSCR_MSG_BATTLER_TEMP + Wait + WaitButtonABTime 30 + End + +_038: + // {0} is hurt by poison! + PrintMessage pl_msg_00000368_00073, TAG_NICKNAME, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_POISONED + Wait + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_SPRITE_BLINK + GoToSubscript BATTLE_SUBSCRIPT_UPDATE_HP + +_055: + End diff --git a/res/battle/scripts/subscripts/subscript_0024.s b/res/battle/scripts/subscripts/subscript_0024.s new file mode 100644 index 0000000000..d968909605 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0024.s @@ -0,0 +1,47 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVarFromVar OPCODE_SET, BTLVAR_HP_CALC_TEMP, BTLVAR_HIT_DAMAGE + CompareVarToValue OPCODE_EQU, BTLVAR_HP_CALC_TEMP, 0, _011 + DivideVarByValue BTLVAR_HP_CALC_TEMP, 2 + +_011: + CheckItemHoldEffect CHECK_NOT_HAVE, BTLSCR_ATTACKER, HOLD_EFFECT_LEECH_BOOST, _031 + GetItemEffectParam BTLSCR_ATTACKER, BTLVAR_CALC_TEMP + UpdateVar OPCODE_ADD, BTLVAR_CALC_TEMP, 0x00000064 + UpdateVarFromVar OPCODE_MUL, BTLVAR_HP_CALC_TEMP, BTLVAR_CALC_TEMP + UpdateVar OPCODE_DIV, BTLVAR_HP_CALC_TEMP, 100 + +_031: + UpdateVarFromVar OPCODE_SET, BTLVAR_MSG_BATTLER_TEMP, BTLVAR_ATTACKER + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_SPRITE_BLINK + CheckAbility CHECK_HAVE, BTLSCR_DEFENDER, ABILITY_LIQUID_OOZE, _077 + CompareMonDataToValue OPCODE_NEQ, BTLSCR_ATTACKER, BATTLEMON_HEAL_BLOCK_TURNS, 0, _064 + UpdateVar OPCODE_MUL, BTLVAR_HP_CALC_TEMP, -1 + Call BATTLE_SUBSCRIPT_UPDATE_HP + // {0} had its energy drained! + PrintMessage pl_msg_00000368_00082, TAG_NICKNAME, BTLSCR_DEFENDER + Wait + WaitButtonABTime 30 + End + +_064: + UpdateVar OPCODE_SET, BTLVAR_MSG_MOVE_TEMP, MOVE_HEAL_BLOCK + // {0} was prevented from healing due to {1}! + PrintMessage pl_msg_00000368_01054, TAG_NICKNAME_MOVE, BTLSCR_ATTACKER, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + End + +_077: + CheckAbility CHECK_HAVE, BTLSCR_ATTACKER, ABILITY_MAGIC_GUARD, _090 + Call BATTLE_SUBSCRIPT_UPDATE_HP + // It sucked up the liquid ooze! + PrintMessage pl_msg_00000368_00720, TAG_NONE + Wait + WaitButtonABTime 30 + +_090: + End diff --git a/res/battle/scripts/subscripts/subscript_0025.s b/res/battle/scripts/subscripts/subscript_0025.s new file mode 100644 index 0000000000..67f5b5388a --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0025.s @@ -0,0 +1,138 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareVarToValue OPCODE_NEQ, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_HELD_ITEM, _052 + CheckAbility CHECK_HAVE, BTLSCR_SIDE_EFFECT_MON, ABILITY_WATER_VEIL, _211 + CheckIgnoreWeather _021 + CompareVarToValue OPCODE_FLAG_NOT, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_SUNNY, _021 + CheckAbility CHECK_HAVE, BTLSCR_SIDE_EFFECT_MON, ABILITY_LEAF_GUARD, _211 + +_021: + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_STATUS, MON_CONDITION_BURN, _211 + CompareMonDataToValue OPCODE_EQU, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_TYPE_1, TYPE_FIRE, _211 + CompareMonDataToValue OPCODE_EQU, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_TYPE_2, TYPE_FIRE, _211 + CompareMonDataToValue OPCODE_NEQ, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_STATUS, MON_CONDITION_NONE, _211 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_SIDE_CONDITIONS_EFFECT_MON, SIDE_CONDITION_SAFEGUARD, _211 + GoTo _141 + +_052: + CheckIgnorableAbility CHECK_HAVE, BTLSCR_SIDE_EFFECT_MON, ABILITY_WATER_VEIL, _264 + CheckIgnoreWeather _069 + CompareVarToValue OPCODE_FLAG_NOT, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_SUNNY, _069 + CheckIgnorableAbility CHECK_HAVE, BTLSCR_SIDE_EFFECT_MON, ABILITY_LEAF_GUARD, _264 + +_069: + CompareVarToValue OPCODE_NEQ, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_INDIRECT, _079 + CheckIgnorableAbility CHECK_HAVE, BTLSCR_SIDE_EFFECT_MON, ABILITY_SHIELD_DUST, _212 + +_079: + CompareVarToValue OPCODE_NEQ, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_DIRECT, _086 + PrintAttackMessage + Wait + +_086: + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_ABILITY, _094 + CheckSubstitute BTLSCR_SIDE_EFFECT_MON, _212 + +_094: + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_STATUS, MON_CONDITION_BURN, _228 + CompareMonDataToValue OPCODE_EQU, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_TYPE_1, TYPE_FIRE, _246 + CompareMonDataToValue OPCODE_EQU, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_TYPE_2, TYPE_FIRE, _246 + CompareMonDataToValue OPCODE_NEQ, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_STATUS, MON_CONDITION_NONE, _212 + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_ABILITY, _141 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_MISSED|MOVE_STATUS_SEMI_INVULNERABLE, _212 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_SIDE_CONDITIONS_EFFECT_MON, SIDE_CONDITION_SAFEGUARD, _294 + CompareVarToValue OPCODE_NEQ, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_DIRECT, _141 + PlayMoveAnimation BTLSCR_ATTACKER + Wait + +_141: + CompareVarToValue OPCODE_NEQ, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_HELD_ITEM, _152 + PlayBattleAnimation BTLSCR_SIDE_EFFECT_MON, BATTLE_ANIMATION_HELD_ITEM + Wait + WaitButtonABTime 15 + +_152: + PlayBattleAnimation BTLSCR_SIDE_EFFECT_MON, BATTLE_ANIMATION_BURNED + Wait + UpdateMonData OPCODE_FLAG_ON, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_STATUS, MON_CONDITION_BURN + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_ABILITY, _177 + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_HELD_ITEM, _185 + // {0} was burned! + PrintMessage pl_msg_00000368_00085, TAG_NICKNAME, BTLSCR_SIDE_EFFECT_MON + GoTo _190 + +_177: + // {0}’s {1} burned {2}! + PrintMessage pl_msg_00000368_00088, TAG_NICKNAME_ABILITY_NICKNAME, BTLSCR_MSG_TEMP, BTLSCR_MSG_BATTLER_TEMP, BTLSCR_SIDE_EFFECT_MON + GoTo _190 + +_185: + // {0} got a burn from the {1}! + PrintMessage pl_msg_00000368_01171, TAG_NICKNAME_ITEM, BTLSCR_SIDE_EFFECT_MON, BTLSCR_MSG_TEMP + +_190: + Wait + SetHealthbarStatus BTLSCR_SIDE_EFFECT_MON, BATTLE_ANIMATION_BURNED + WaitButtonABTime 30 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_TRY_SYNCHRONIZE_STATUS, _207 + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_TRY_SYNCHRONIZE_STATUS + GoTo _211 + +_207: + UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_TRY_SYNCHRONIZE_STATUS + +_211: + End + +_212: + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_INDIRECT, _312 + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_ABILITY, _312 + WaitButtonABTime 30 + Call BATTLE_SUBSCRIPT_BUT_IT_FAILED + GoTo _312 + +_228: + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_INDIRECT, _312 + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_ABILITY, _312 + WaitButtonABTime 30 + // {0} already has a burn. + PrintMessage pl_msg_00000368_00098, TAG_NICKNAME, BTLSCR_SIDE_EFFECT_MON + GoTo _305 + +_246: + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_INDIRECT, _312 + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_ABILITY, _312 + WaitButtonABTime 30 + // It doesn’t affect {0}... + PrintMessage pl_msg_00000368_00027, TAG_NICKNAME, BTLSCR_SIDE_EFFECT_MON + GoTo _305 + +_264: + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_INDIRECT, _312 + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_ABILITY, _312 + PrintAttackMessage + Wait + WaitButtonABTime 30 + // {0}’s {1} prevents burns! + PrintMessage pl_msg_00000368_00686, TAG_NICKNAME_ABILITY, BTLSCR_SIDE_EFFECT_MON, BTLSCR_SIDE_EFFECT_MON + GoTo _305 + // {0}’s {1} suppressed {2}’s {3}! + PrintMessage pl_msg_00000368_00727, TAG_NICKNAME_ABILITY_NICKNAME_ABILITY, BTLSCR_SIDE_EFFECT_MON, BTLSCR_SIDE_EFFECT_MON, BTLSCR_MSG_TEMP, BTLSCR_MSG_BATTLER_TEMP + GoTo _305 + +_294: + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_INDIRECT, _312 + WaitButtonABTime 30 + // {0} is protected by Safeguard! + PrintMessage pl_msg_00000368_00200, TAG_NICKNAME, BTLSCR_SIDE_EFFECT_MON + +_305: + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_NO_MORE_WORK + +_312: + End diff --git a/res/battle/scripts/subscripts/subscript_0026.s b/res/battle/scripts/subscripts/subscript_0026.s new file mode 100644 index 0000000000..700721008c --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0026.s @@ -0,0 +1,24 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CheckAbility CHECK_HAVE, BTLSCR_MSG_TEMP, ABILITY_MAGIC_GUARD, _041 + UpdateMonDataFromVar OPCODE_GET, BTLSCR_MSG_TEMP, BATTLEMON_MAX_HP, BTLVAR_HP_CALC_TEMP + DivideVarByValue BTLVAR_HP_CALC_TEMP, 8 + CheckAbility CHECK_NOT_HAVE, BTLSCR_MSG_TEMP, ABILITY_HEATPROOF, _020 + DivideVarByValue BTLVAR_HP_CALC_TEMP, 2 + +_020: + UpdateVar OPCODE_MUL, BTLVAR_HP_CALC_TEMP, -1 + // {0} is hurt by its burn! + PrintMessage pl_msg_00000368_00095, TAG_NICKNAME, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_BURNED + Wait + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_SPRITE_BLINK + GoToSubscript BATTLE_SUBSCRIPT_UPDATE_HP + +_041: + End diff --git a/res/battle/scripts/subscripts/subscript_0027.s b/res/battle/scripts/subscripts/subscript_0027.s new file mode 100644 index 0000000000..535cd308fe --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0027.s @@ -0,0 +1,80 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CheckIgnorableAbility CHECK_HAVE, BTLSCR_SIDE_EFFECT_MON, ABILITY_MAGMA_ARMOR, _128 + CheckIgnoreWeather _011 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_SUNNY, _095 + +_011: + CompareVarToValue OPCODE_NEQ, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_INDIRECT, _021 + CheckIgnorableAbility CHECK_HAVE, BTLSCR_SIDE_EFFECT_MON, ABILITY_SHIELD_DUST, _095 + +_021: + CompareVarToValue OPCODE_NEQ, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_DIRECT, _028 + PrintAttackMessage + Wait + +_028: + CheckSubstitute BTLSCR_SIDE_EFFECT_MON, _095 + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_STATUS, MON_CONDITION_FREEZE, _106 + CompareMonDataToValue OPCODE_EQU, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_TYPE_1, TYPE_ICE, _115 + CompareMonDataToValue OPCODE_EQU, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_TYPE_2, TYPE_ICE, _115 + CompareMonDataToValue OPCODE_NEQ, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_STATUS, MON_CONDITION_NONE, _095 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_MISSED|MOVE_STATUS_SEMI_INVULNERABLE, _095 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_SIDE_CONDITIONS_EFFECT_MON, SIDE_CONDITION_SAFEGUARD, _139 + CompareVarToValue OPCODE_NEQ, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_DIRECT, _073 + PlayMoveAnimation BTLSCR_ATTACKER + Wait + +_073: + PlayBattleAnimation BTLSCR_SIDE_EFFECT_MON, BATTLE_ANIMATION_FROZEN + Wait + UpdateMonData OPCODE_FLAG_ON, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_STATUS, MON_CONDITION_FREEZE + UnlockMoveChoice BTLSCR_SIDE_EFFECT_MON + // {0} was frozen solid! + PrintMessage pl_msg_00000368_00101, TAG_NICKNAME, BTLSCR_SIDE_EFFECT_MON + Wait + SetHealthbarStatus BTLSCR_SIDE_EFFECT_MON, BATTLE_ANIMATION_FROZEN + WaitButtonABTime 30 + End + +_095: + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_INDIRECT, _157 + WaitButtonABTime 30 + Call BATTLE_SUBSCRIPT_BUT_IT_FAILED + GoTo _157 + +_106: + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_INDIRECT, _157 + WaitButtonABTime 30 + GoTo _150 + +_115: + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_INDIRECT, _157 + WaitButtonABTime 30 + // It doesn’t affect {0}... + PrintMessage pl_msg_00000368_00027, TAG_NICKNAME, BTLSCR_SIDE_EFFECT_MON + GoTo _150 + +_128: + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_INDIRECT, _157 + PrintAttackMessage + Wait + WaitButtonABTime 30 + GoTo _150 + +_139: + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_INDIRECT, _157 + WaitButtonABTime 30 + // {0} is protected by Safeguard! + PrintMessage pl_msg_00000368_00200, TAG_NICKNAME, BTLSCR_SIDE_EFFECT_MON + +_150: + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_NO_MORE_WORK + +_157: + End diff --git a/res/battle/scripts/subscripts/subscript_0028.s b/res/battle/scripts/subscripts/subscript_0028.s new file mode 100644 index 0000000000..0829b0c9a5 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0028.s @@ -0,0 +1,12 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} is frozen solid! + PrintMessage pl_msg_00000368_00111, TAG_NICKNAME, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + PlayBattleAnimation BTLSCR_ATTACKER, BATTLE_ANIMATION_FROZEN + Wait + End diff --git a/res/battle/scripts/subscripts/subscript_0029.s b/res/battle/scripts/subscripts/subscript_0029.s new file mode 100644 index 0000000000..88055f87bb --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0029.s @@ -0,0 +1,12 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateMonData OPCODE_FLAG_OFF, BTLSCR_MSG_TEMP, BATTLEMON_STATUS, MON_CONDITION_FREEZE + // {0} thawed out! + PrintMessage pl_msg_00000368_00114, TAG_NICKNAME, BTLSCR_MSG_TEMP + Wait + SetHealthbarStatus BTLSCR_MSG_TEMP, BATTLE_ANIMATION_NONE + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0030.s b/res/battle/scripts/subscripts/subscript_0030.s new file mode 100644 index 0000000000..fb1832794c --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0030.s @@ -0,0 +1,12 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateMonData OPCODE_FLAG_OFF, BTLSCR_ATTACKER, BATTLEMON_STATUS, MON_CONDITION_FREEZE + // {0} was defrosted by {1}! + PrintMessage pl_msg_00000368_00117, TAG_NICKNAME_MOVE, BTLSCR_ATTACKER, BTLSCR_ATTACKER + Wait + SetHealthbarStatus BTLSCR_ATTACKER, BATTLE_ANIMATION_NONE + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0031.s b/res/battle/scripts/subscripts/subscript_0031.s new file mode 100644 index 0000000000..cd62c91766 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0031.s @@ -0,0 +1,104 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CheckIgnorableAbility CHECK_HAVE, BTLSCR_SIDE_EFFECT_MON, ABILITY_LIMBER, _170 + CheckIgnoreWeather _016 + CompareVarToValue OPCODE_FLAG_NOT, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_SUNNY, _016 + CheckIgnorableAbility CHECK_HAVE, BTLSCR_SIDE_EFFECT_MON, ABILITY_LEAF_GUARD, _170 + +_016: + CompareVarToValue OPCODE_NEQ, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_INDIRECT, _026 + CheckIgnorableAbility CHECK_HAVE, BTLSCR_SIDE_EFFECT_MON, ABILITY_SHIELD_DUST, _123 + +_026: + CompareVarToValue OPCODE_NEQ, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_DIRECT, _033 + PrintAttackMessage + Wait + +_033: + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_ABILITY, _041 + CheckSubstitute BTLSCR_SIDE_EFFECT_MON, _123 + +_041: + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_STATUS, MON_CONDITION_PARALYSIS, _139 + CompareMonDataToValue OPCODE_NEQ, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_STATUS, MON_CONDITION_NONE, _123 + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_ABILITY, _076 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_MISSED|MOVE_STATUS_SEMI_INVULNERABLE, _123 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_SIDE_CONDITIONS_EFFECT_MON, SIDE_CONDITION_SAFEGUARD, _200 + CompareVarToValue OPCODE_NEQ, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_DIRECT, _076 + PlayMoveAnimation BTLSCR_ATTACKER + Wait + +_076: + PlayBattleAnimation BTLSCR_SIDE_EFFECT_MON, BATTLE_ANIMATION_PARALYZED + Wait + UpdateMonData OPCODE_FLAG_ON, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_STATUS, MON_CONDITION_PARALYSIS + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_ABILITY, _096 + // {0} is paralyzed! It may be unable to move! + PrintMessage pl_msg_00000368_00120, TAG_NICKNAME, BTLSCR_SIDE_EFFECT_MON + GoTo _102 + +_096: + // {0}’s {1} paralyzed {2}! It may be unable to move! + PrintMessage pl_msg_00000368_00123, TAG_NICKNAME_ABILITY_NICKNAME, BTLSCR_MSG_TEMP, BTLSCR_MSG_BATTLER_TEMP, BTLSCR_SIDE_EFFECT_MON + +_102: + Wait + SetHealthbarStatus BTLSCR_SIDE_EFFECT_MON, BATTLE_ANIMATION_PARALYZED + WaitButtonABTime 30 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_TRY_SYNCHRONIZE_STATUS, _118 + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_TRY_SYNCHRONIZE_STATUS + End + +_118: + UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_TRY_SYNCHRONIZE_STATUS + End + +_123: + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_INDIRECT, _218 + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_ABILITY, _218 + WaitButtonABTime 30 + Call BATTLE_SUBSCRIPT_BUT_IT_FAILED + GoTo _218 + +_139: + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_INDIRECT, _218 + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_ABILITY, _218 + WaitButtonABTime 30 + // {0} is already paralyzed! + PrintMessage pl_msg_00000368_00133, TAG_NICKNAME, BTLSCR_SIDE_EFFECT_MON + GoTo _211 + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_INDIRECT, _218 + WaitButtonABTime 30 + // It doesn’t affect {0}... + PrintMessage pl_msg_00000368_00027, TAG_NICKNAME, BTLSCR_SIDE_EFFECT_MON + GoTo _211 + +_170: + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_INDIRECT, _218 + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_ABILITY, _218 + PrintAttackMessage + Wait + WaitButtonABTime 30 + // {0}’s {1} prevents paralysis! + PrintMessage pl_msg_00000368_00644, TAG_NICKNAME_ABILITY, BTLSCR_SIDE_EFFECT_MON, BTLSCR_SIDE_EFFECT_MON + GoTo _211 + // {0}’s {1} suppressed {2}’s {3}! + PrintMessage pl_msg_00000368_00727, TAG_NICKNAME_ABILITY_NICKNAME_ABILITY, BTLSCR_SIDE_EFFECT_MON, BTLSCR_SIDE_EFFECT_MON, BTLSCR_MSG_TEMP, BTLSCR_MSG_BATTLER_TEMP + GoTo _211 + +_200: + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_INDIRECT, _218 + WaitButtonABTime 30 + // {0} is protected by Safeguard! + PrintMessage pl_msg_00000368_00200, TAG_NICKNAME, BTLSCR_SIDE_EFFECT_MON + +_211: + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_NO_MORE_WORK + +_218: + End diff --git a/res/battle/scripts/subscripts/subscript_0032.s b/res/battle/scripts/subscripts/subscript_0032.s new file mode 100644 index 0000000000..ffe27119b3 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0032.s @@ -0,0 +1,13 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} is paralyzed! It can’t move! + PrintMessage pl_msg_00000368_00130, TAG_NICKNAME, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + PlayBattleAnimation BTLSCR_ATTACKER, BATTLE_ANIMATION_PARALYZED + Wait + UnlockMoveChoice BTLSCR_ATTACKER + End diff --git a/res/battle/scripts/subscripts/subscript_0033.s b/res/battle/scripts/subscripts/subscript_0033.s new file mode 100644 index 0000000000..6797dfc17b --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0033.s @@ -0,0 +1,33 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareMonDataToValue OPCODE_NEQ, BTLSCR_ATTACKER, BATTLEMON_HEAL_BLOCK_TURNS, 0, _059 + UpdateVarFromVar OPCODE_SET, BTLVAR_HP_CALC_TEMP, BTLVAR_HIT_DAMAGE + CompareVarToValue OPCODE_EQU, BTLVAR_HP_CALC_TEMP, 0, _037 + DivideVarByValue BTLVAR_HP_CALC_TEMP, 2 + CheckItemHoldEffect CHECK_NOT_HAVE, BTLSCR_ATTACKER, HOLD_EFFECT_LEECH_BOOST, _037 + GetItemEffectParam BTLSCR_ATTACKER, BTLVAR_CALC_TEMP + UpdateVar OPCODE_ADD, BTLVAR_CALC_TEMP, 0x00000064 + UpdateVarFromVar OPCODE_MUL, BTLVAR_HP_CALC_TEMP, BTLVAR_CALC_TEMP + UpdateVar OPCODE_DIV, BTLVAR_HP_CALC_TEMP, 100 + +_037: + UpdateVarFromVar OPCODE_SET, BTLVAR_MSG_BATTLER_TEMP, BTLVAR_ATTACKER + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_SPRITE_BLINK + UpdateVar OPCODE_MUL, BTLVAR_HP_CALC_TEMP, -1 + Call BATTLE_SUBSCRIPT_UPDATE_HP + // {0}’s dream was eaten! + PrintMessage pl_msg_00000368_00139, TAG_NICKNAME, BTLSCR_DEFENDER + Wait + WaitButtonABTime 30 + End + +_059: + UpdateVar OPCODE_SET, BTLVAR_MSG_MOVE_TEMP, MOVE_HEAL_BLOCK + // {0} was prevented from healing due to {1}! + PrintMessage pl_msg_00000368_01054, TAG_NICKNAME_MOVE, BTLSCR_ATTACKER, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0034.s b/res/battle/scripts/subscripts/subscript_0034.s new file mode 100644 index 0000000000..f3d4ff2c47 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0034.s @@ -0,0 +1,11 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + ResetAllStatChanges + // All stat changes were eliminated! + PrintMessage pl_msg_00000368_00817, TAG_NONE + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0035.s b/res/battle/scripts/subscripts/subscript_0035.s new file mode 100644 index 0000000000..b70da485d6 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0035.s @@ -0,0 +1,10 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION + LockMoveChoice BTLSCR_ATTACKER + UpdateMonData OPCODE_FLAG_ON, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_BIDE_1 + UpdateVar OPCODE_SET, BTLVAR_ATTACKER_STORED_DAMAGE, 0 + End diff --git a/res/battle/scripts/subscripts/subscript_0036.s b/res/battle/scripts/subscripts/subscript_0036.s new file mode 100644 index 0000000000..059ef80e99 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0036.s @@ -0,0 +1,27 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_BIDE, _038 + // {0} unleashed energy! + PrintMessage pl_msg_00000368_00335, TAG_NICKNAME, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_SET, BTLVAR_MOVE_EFFECT_CHANCE, 1 + UpdateMonData OPCODE_FLAG_OFF, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_MOVE_LOCKED + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_LAST_OF_MULTI_TURN + CompareVarToValue OPCODE_EQU, BTLVAR_DAMAGE, 0, _031 + End + +_031: + Call BATTLE_SUBSCRIPT_BUT_IT_FAILED + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_NO_MORE_WORK + End + +_038: + // {0} is storing energy! + PrintMessage pl_msg_00000368_00332, TAG_NICKNAME, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0037.s b/res/battle/scripts/subscripts/subscript_0037.s new file mode 100644 index 0000000000..dc8fedcd1d --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0037.s @@ -0,0 +1,89 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareVarToValue OPCODE_NEQ, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_HELD_ITEM, _022 + CheckAbility CHECK_HAVE, BTLSCR_SIDE_EFFECT_MON, ABILITY_OWN_TEMPO, _100 + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_CONFUSION, _100 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_SIDE_CONDITIONS_EFFECT_MON, SIDE_CONDITION_SAFEGUARD, _100 + GoTo _076 + +_022: + CheckIgnorableAbility CHECK_HAVE, BTLSCR_SIDE_EFFECT_MON, ABILITY_OWN_TEMPO, _141 + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_MOVE_EFFECT, _076 + CompareVarToValue OPCODE_NEQ, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_INDIRECT, _042 + CheckIgnorableAbility CHECK_HAVE, BTLSCR_SIDE_EFFECT_MON, ABILITY_SHIELD_DUST, _101 + +_042: + CompareVarToValue OPCODE_NEQ, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_DIRECT, _049 + PrintAttackMessage + Wait + +_049: + CheckSubstitute BTLSCR_SIDE_EFFECT_MON, _101 + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_CONFUSION, _128 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_MISSED|MOVE_STATUS_SEMI_INVULNERABLE, _101 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_SIDE_CONDITIONS_EFFECT_MON, SIDE_CONDITION_SAFEGUARD, _167 + CompareVarToValue OPCODE_NEQ, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_DIRECT, _076 + PlayMoveAnimation BTLSCR_ATTACKER + Wait + +_076: + PlayBattleAnimation BTLSCR_SIDE_EFFECT_MON, BATTLE_ANIMATION_CONFUSED + Wait + Random 3, 2 + UpdateMonDataFromVar OPCODE_FLAG_ON, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_VOLATILE_STATUS, BTLVAR_CALC_TEMP + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_MOVE_EFFECT, _185 + // {0} became confused! + PrintMessage pl_msg_00000368_00156, TAG_NICKNAME, BTLSCR_SIDE_EFFECT_MON + Wait + WaitButtonABTime 30 + +_100: + End + +_101: + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_INDIRECT, _185 + WaitButtonABTime 30 + GetCurrentMoveData MOVEATTRIBUTE_RANGE + CompareVarToValue OPCODE_EQU, BTLVAR_CALC_TEMP, 0x00000004, _124 + CompareVarToValue OPCODE_EQU, BTLVAR_CALC_TEMP, 0x00000008, _124 + Call BATTLE_SUBSCRIPT_BUT_IT_FAILED + GoTo _185 + +_124: + Call BATTLE_SUBSCRIPT_MOVE_FAIL_MISSED + GoTo _185 + +_128: + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_INDIRECT, _185 + WaitButtonABTime 30 + // {0} is already confused! + PrintMessage pl_msg_00000368_00159, TAG_NICKNAME, BTLSCR_SIDE_EFFECT_MON + GoTo _178 + +_141: + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_INDIRECT, _185 + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_HELD_ITEM, _185 + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_MOVE_EFFECT, _185 + PrintAttackMessage + Wait + WaitButtonABTime 30 + // {0}’s {1} prevents confusion! + PrintMessage pl_msg_00000368_00653, TAG_NICKNAME_ABILITY, BTLSCR_SIDE_EFFECT_MON, BTLSCR_SIDE_EFFECT_MON + GoTo _178 + +_167: + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_INDIRECT, _185 + WaitButtonABTime 30 + // {0} is protected by Safeguard! + PrintMessage pl_msg_00000368_00200, TAG_NICKNAME, BTLSCR_SIDE_EFFECT_MON + +_178: + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_NO_MORE_WORK + +_185: + End diff --git a/res/battle/scripts/subscripts/subscript_0038.s b/res/battle/scripts/subscripts/subscript_0038.s new file mode 100644 index 0000000000..22e23c18ec --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0038.s @@ -0,0 +1,12 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} is confused! + PrintMessage pl_msg_00000368_00150, TAG_NICKNAME, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + PlayBattleAnimation BTLSCR_ATTACKER, BATTLE_ANIMATION_CONFUSED + Wait + End diff --git a/res/battle/scripts/subscripts/subscript_0039.s b/res/battle/scripts/subscripts/subscript_0039.s new file mode 100644 index 0000000000..7ff20c99d1 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0039.s @@ -0,0 +1,20 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} is confused! + PrintMessage pl_msg_00000368_00150, TAG_NICKNAME, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + PlayBattleAnimation BTLSCR_ATTACKER, BATTLE_ANIMATION_CONFUSED + Wait + // It hurt itself in its confusion! + PrintMessage pl_msg_00000368_00797, TAG_NONE + Wait + WaitButtonABTime 30 + UnlockMoveChoice BTLSCR_ATTACKER + CheckHoldOnWith1HP BTLSCR_ATTACKER + Call BATTLE_SUBSCRIPT_UPDATE_HP + Call BATTLE_SUBSCRIPT_MOVE_FOLLOWUP_MESSAGE + End diff --git a/res/battle/scripts/subscripts/subscript_0040.s b/res/battle/scripts/subscripts/subscript_0040.s new file mode 100644 index 0000000000..d4cc4d6b55 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0040.s @@ -0,0 +1,10 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} snapped out of confusion! + PrintMessage pl_msg_00000368_00153, TAG_NICKNAME, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0041.s b/res/battle/scripts/subscripts/subscript_0041.s new file mode 100644 index 0000000000..e36f2ab1ef --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0041.s @@ -0,0 +1,13 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + TrainerSlideIn BTLSCR_ENEMY, BATTLER_TYPE_SOLO_ENEMY + Wait + PrintBufferedTrainerMessage BTLSCR_ENEMY + Wait + WaitButtonABTime 60 + TrainerSlideOut BTLSCR_ENEMY + Wait + End diff --git a/res/battle/scripts/subscripts/subscript_0042.s b/res/battle/scripts/subscripts/subscript_0042.s new file mode 100644 index 0000000000..00311b72ba --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0042.s @@ -0,0 +1,13 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PrintAttackMessage + Wait + WaitButtonABTime 30 + // But there was no PP left for the move! + PrintMessage pl_msg_00000368_00824, TAG_NONE + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0043.s b/res/battle/scripts/subscripts/subscript_0043.s new file mode 100644 index 0000000000..b869aa8e57 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0043.s @@ -0,0 +1,16 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVarFromVar OPCODE_SET, BTLVAR_MSG_BATTLER_TEMP, BTLVAR_ATTACKER + UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_MAX_HP, BTLVAR_HP_CALC_TEMP + UpdateVar OPCODE_MUL, BTLVAR_HP_CALC_TEMP, -1 + DivideVarByValue BTLVAR_HP_CALC_TEMP, 4 + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_SPRITE_BLINK + Call BATTLE_SUBSCRIPT_UPDATE_HP + // {0} is hit with recoil! + PrintMessage pl_msg_00000368_00279, TAG_NICKNAME, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0044.s b/res/battle/scripts/subscripts/subscript_0044.s new file mode 100644 index 0000000000..3f3be0fb61 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0044.s @@ -0,0 +1,10 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + Random 1, 2 + UpdateVar OPCODE_LEFT_SHIFT, BTLVAR_CALC_TEMP, 0x0000000A + UpdateMonDataFromVar OPCODE_FLAG_ON, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, BTLVAR_CALC_TEMP + UpdateVarFromVar OPCODE_SET, BTLVAR_ATTACKER_LOCKED_MOVE, BTLVAR_CURRENT_MOVE + End diff --git a/res/battle/scripts/subscripts/subscript_0045.s b/res/battle/scripts/subscripts/subscript_0045.s new file mode 100644 index 0000000000..78f13f0c44 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0045.s @@ -0,0 +1,16 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + TryConversion _012 + Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION + // {0} transformed into the {1} type! + PrintMessage pl_msg_00000368_00178, TAG_NICKNAME_TYPE, BTLSCR_ATTACKER, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + End + +_012: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/subscripts/subscript_0046.s b/res/battle/scripts/subscripts/subscript_0046.s new file mode 100644 index 0000000000..e829946300 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0046.s @@ -0,0 +1,12 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PrintAttackMessage + Wait + UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_MAX_HP, BTLVAR_HP_CALC_TEMP + DivideVarByValue BTLVAR_HP_CALC_TEMP, 2 + UpdateVarFromVar OPCODE_SET, BTLVAR_MSG_BATTLER_TEMP, BTLVAR_ATTACKER + Call BATTLE_SUBSCRIPT_RECOVER_HP + End diff --git a/res/battle/scripts/subscripts/subscript_0047.s b/res/battle/scripts/subscripts/subscript_0047.s new file mode 100644 index 0000000000..d7b258e2ed --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0047.s @@ -0,0 +1,144 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareVarToValue OPCODE_NEQ, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_TOXIC_SPIKES, _023 + CheckAbility CHECK_HAVE, BTLSCR_SIDE_EFFECT_MON, ABILITY_IMMUNITY, _249 + CheckIgnoreWeather _121 + CompareVarToValue OPCODE_FLAG_NOT, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_SUNNY, _121 + CheckAbility CHECK_HAVE, BTLSCR_SIDE_EFFECT_MON, ABILITY_LEAF_GUARD, _249 + GoTo _121 + +_023: + CompareVarToValue OPCODE_NEQ, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_HELD_ITEM, _094 + CheckAbility CHECK_HAVE, BTLSCR_SIDE_EFFECT_MON, ABILITY_IMMUNITY, _248 + CheckIgnoreWeather _045 + CompareVarToValue OPCODE_FLAG_NOT, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_SUNNY, _045 + CheckAbility CHECK_HAVE, BTLSCR_SIDE_EFFECT_MON, ABILITY_LEAF_GUARD, _248 + +_045: + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_STATUS, MON_CONDITION_POISON, _248 + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_STATUS, MON_CONDITION_TOXIC, _248 + CompareMonDataToValue OPCODE_EQU, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_TYPE_1, TYPE_POISON, _248 + CompareMonDataToValue OPCODE_EQU, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_TYPE_2, TYPE_POISON, _248 + CompareMonDataToValue OPCODE_EQU, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_TYPE_1, TYPE_STEEL, _248 + CompareMonDataToValue OPCODE_EQU, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_TYPE_2, TYPE_STEEL, _248 + CompareMonDataToValue OPCODE_NEQ, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_STATUS, MON_CONDITION_NONE, _248 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_SIDE_CONDITIONS_EFFECT_MON, SIDE_CONDITION_SAFEGUARD, _248 + GoTo _191 + +_094: + CheckIgnorableAbility CHECK_HAVE, BTLSCR_SIDE_EFFECT_MON, ABILITY_IMMUNITY, _249 + CheckIgnoreWeather _111 + CompareVarToValue OPCODE_FLAG_NOT, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_SUNNY, _111 + CheckIgnorableAbility CHECK_HAVE, BTLSCR_SIDE_EFFECT_MON, ABILITY_LEAF_GUARD, _249 + +_111: + CompareVarToValue OPCODE_NEQ, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_INDIRECT, _121 + CheckIgnorableAbility CHECK_HAVE, BTLSCR_SIDE_EFFECT_MON, ABILITY_SHIELD_DUST, _275 + +_121: + CompareVarToValue OPCODE_NEQ, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_DIRECT, _128 + PrintAttackMessage + Wait + +_128: + CheckSubstitute BTLSCR_SIDE_EFFECT_MON, _275 + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_STATUS, MON_CONDITION_POISON, _296 + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_STATUS, MON_CONDITION_TOXIC, _296 + CompareMonDataToValue OPCODE_EQU, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_TYPE_1, TYPE_POISON, _314 + CompareMonDataToValue OPCODE_EQU, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_TYPE_2, TYPE_POISON, _314 + CompareMonDataToValue OPCODE_EQU, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_TYPE_1, TYPE_STEEL, _314 + CompareMonDataToValue OPCODE_EQU, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_TYPE_2, TYPE_STEEL, _314 + CompareMonDataToValue OPCODE_NEQ, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_STATUS, MON_CONDITION_NONE, _275 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_MISSED|MOVE_STATUS_SEMI_INVULNERABLE, _275 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_SIDE_CONDITIONS_EFFECT_MON, SIDE_CONDITION_SAFEGUARD, _332 + CompareVarToValue OPCODE_NEQ, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_DIRECT, _191 + PlayMoveAnimation BTLSCR_ATTACKER + Wait + +_191: + CompareVarToValue OPCODE_NEQ, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_HELD_ITEM, _202 + PlayBattleAnimation BTLSCR_SIDE_EFFECT_MON, BATTLE_ANIMATION_HELD_ITEM + Wait + WaitButtonABTime 15 + +_202: + PlayBattleAnimation BTLSCR_SIDE_EFFECT_MON, BATTLE_ANIMATION_POISONED + Wait + UpdateMonData OPCODE_FLAG_ON, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_STATUS, MON_CONDITION_TOXIC + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_HELD_ITEM, _222 + // {0} was badly poisoned! + PrintMessage pl_msg_00000368_00079, TAG_NICKNAME, BTLSCR_SIDE_EFFECT_MON + GoTo _227 + +_222: + // {0} was badly poisoned by the {1}! + PrintMessage pl_msg_00000368_01168, TAG_NICKNAME_ITEM, BTLSCR_SIDE_EFFECT_MON, BTLSCR_MSG_TEMP + +_227: + Wait + SetHealthbarStatus BTLSCR_SIDE_EFFECT_MON, BATTLE_ANIMATION_POISONED + WaitButtonABTime 30 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_TRY_SYNCHRONIZE_STATUS, _244 + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_TRY_SYNCHRONIZE_STATUS + GoTo _248 + +_244: + UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_TRY_SYNCHRONIZE_STATUS + +_248: + End + +_249: + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_INDIRECT, _355 + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_MOVE_EFFECT, _266 + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_TOXIC_SPIKES, _266 + PrintAttackMessage + Wait + +_266: + WaitButtonABTime 30 + // {0}’s {1} prevents poisoning! + PrintMessage pl_msg_00000368_00650, TAG_NICKNAME_ABILITY, BTLSCR_SIDE_EFFECT_MON, BTLSCR_SIDE_EFFECT_MON + GoTo _348 + +_275: + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_INDIRECT, _355 + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_MOVE_EFFECT, _355 + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_TOXIC_SPIKES, _355 + WaitButtonABTime 30 + Call BATTLE_SUBSCRIPT_BUT_IT_FAILED + GoTo _355 + +_296: + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_INDIRECT, _355 + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_TOXIC_SPIKES, _355 + WaitButtonABTime 30 + // {0} is already poisoned. + PrintMessage pl_msg_00000368_00076, TAG_NICKNAME, BTLSCR_SIDE_EFFECT_MON + GoTo _348 + +_314: + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_INDIRECT, _355 + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_TOXIC_SPIKES, _355 + WaitButtonABTime 30 + // It doesn’t affect {0}... + PrintMessage pl_msg_00000368_00027, TAG_NICKNAME, BTLSCR_SIDE_EFFECT_MON + GoTo _348 + +_332: + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_INDIRECT, _355 + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_TOXIC_SPIKES, _355 + WaitButtonABTime 30 + // {0} is protected by Safeguard! + PrintMessage pl_msg_00000368_00200, TAG_NICKNAME, BTLSCR_SIDE_EFFECT_MON + +_348: + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_NO_MORE_WORK + +_355: + End diff --git a/res/battle/scripts/subscripts/subscript_0048.s b/res/battle/scripts/subscripts/subscript_0048.s new file mode 100644 index 0000000000..909efa5a8d --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0048.s @@ -0,0 +1,16 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_LEVEL, BTLVAR_CALC_TEMP + UpdateVar OPCODE_MUL, BTLVAR_CALC_TEMP, 0x00000005 + IfSameSide BTLSCR_ATTACKER, BTLSCR_ENEMY, _016 + UpdateVarFromVar OPCODE_ADD, BTLVAR_PAY_DAY_COUNT, BTLVAR_CALC_TEMP + +_016: + // Coins scattered everywhere! + PrintMessage pl_msg_00000368_00818, TAG_NONE + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0049.s b/res/battle/scripts/subscripts/subscript_0049.s new file mode 100644 index 0000000000..7252ab9e03 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0049.s @@ -0,0 +1,10 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + TryLightScreen _003 + Call BATTLE_SUBSCRIPT_ANIMATION_PREPARED_MESSAGE + +_003: + End diff --git a/res/battle/scripts/subscripts/subscript_0050.s b/res/battle/scripts/subscripts/subscript_0050.s new file mode 100644 index 0000000000..4dd10b928b --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0050.s @@ -0,0 +1,10 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // Your team’s {0} wore off! + BufferLocalMessage BTLSCR_MSG_TEMP, pl_msg_00000368_00288, TAG_MOVE, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0051.s b/res/battle/scripts/subscripts/subscript_0051.s new file mode 100644 index 0000000000..04b3a8c6bf --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0051.s @@ -0,0 +1,15 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_MOVE_EFFECT + Call BATTLE_SUBSCRIPT_CONFUSE + CompareMonDataToValue OPCODE_FLAG_NOT, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_CONFUSION, _018 + // {0} became confused due to fatigue! + PrintMessage pl_msg_00000368_00338, TAG_NICKNAME, BTLSCR_SIDE_EFFECT_MON + Wait + WaitButtonABTime 30 + +_018: + End diff --git a/res/battle/scripts/subscripts/subscript_0052.s b/res/battle/scripts/subscripts/subscript_0052.s new file mode 100644 index 0000000000..70394d9a4b --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0052.s @@ -0,0 +1,10 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + TryReflect _003 + Call BATTLE_SUBSCRIPT_ANIMATION_PREPARED_MESSAGE + +_003: + End diff --git a/res/battle/scripts/subscripts/subscript_0053.s b/res/battle/scripts/subscripts/subscript_0053.s new file mode 100644 index 0000000000..17f13705c0 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0053.s @@ -0,0 +1,10 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION + PrintBufferedMessage + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0054.s b/res/battle/scripts/subscripts/subscript_0054.s new file mode 100644 index 0000000000..987cc3f650 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0054.s @@ -0,0 +1,12 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + TryMist _007 + // Your team became shrouded in mist! + BufferMessage pl_msg_00000368_00271, TAG_NONE_SIDE_CONSCIOUS, BTLSCR_ATTACKER + Call BATTLE_SUBSCRIPT_ANIMATION_PREPARED_MESSAGE + +_007: + End diff --git a/res/battle/scripts/subscripts/subscript_0055.s b/res/battle/scripts/subscripts/subscript_0055.s new file mode 100644 index 0000000000..6af7941d95 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0055.s @@ -0,0 +1,79 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PrintAttackMessage + Wait + CheckAbility CHECK_HAVE, BTLSCR_ATTACKER, ABILITY_INSOMNIA, _098 + CheckAbility CHECK_HAVE, BTLSCR_ATTACKER, ABILITY_VITAL_SPIRIT, _098 + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_ATTACKER, BATTLEMON_STATUS, MON_CONDITION_SLEEP, _107 + CheckAbility CHECK_HAVE, BTLSCR_ATTACKER, ABILITY_SOUNDPROOF, _027 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_UPROAR, _115 + +_027: + UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_MAX_HP, BTLVAR_HP_CALC_TEMP + CompareMonDataToVar OPCODE_EQU, BTLSCR_ATTACKER, BATTLEMON_CUR_HP, BTLVAR_HP_CALC_TEMP, _137 + PlayMoveAnimation BTLSCR_ATTACKER + Wait + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_ATTACKER, BATTLEMON_STATUS, MON_CONDITION_NOT_SLEEP, _053 + // {0} went to sleep! + PrintMessage pl_msg_00000368_00205, TAG_NICKNAME, BTLSCR_ATTACKER + GoTo _065 + +_053: + SetHealthbarStatus BTLSCR_ATTACKER, BATTLE_ANIMATION_NONE + UpdateMonData OPCODE_FLAG_OFF, BTLSCR_ATTACKER, BATTLEMON_STATUS, MON_CONDITION_NOT_SLEEP + // {0} slept and became healthy! + PrintMessage pl_msg_00000368_00208, TAG_NICKNAME, BTLSCR_ATTACKER + +_065: + Wait + WaitButtonABTime 30 + UpdateMonData OPCODE_FLAG_ON, BTLSCR_ATTACKER, BATTLEMON_STATUS, MON_CONDITION_SLEEP_0|MON_CONDITION_SLEEP_1 + SetHealthbarStatus BTLSCR_ATTACKER, BATTLE_ANIMATION_ASLEEP + UpdateVarFromVar OPCODE_SET, BTLVAR_MSG_BATTLER_TEMP, BTLVAR_ATTACKER + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_SPRITE_BLINK + Call BATTLE_SUBSCRIPT_UPDATE_HP + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_ATTACKER, BATTLEMON_STATUS, MON_CONDITION_NOT_SLEEP, _053 + // {0} regained health! + PrintMessage pl_msg_00000368_00184, TAG_NICKNAME, BTLSCR_ATTACKER + GoTo _147 + +_098: + WaitButtonABTime 30 + // {0} stayed awake because of its {1}! + PrintMessage pl_msg_00000368_00329, TAG_NICKNAME_ABILITY, BTLSCR_ATTACKER, BTLSCR_ATTACKER + GoTo _143 + +_107: + WaitButtonABTime 30 + // {0} is already asleep! + PrintMessage pl_msg_00000368_00057, TAG_NICKNAME, BTLSCR_ATTACKER + GoTo _143 + +_115: + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_UPROAR, _129 + WaitButtonABTime 30 + // But the uproar kept {0} awake! + PrintMessage pl_msg_00000368_00326, TAG_NICKNAME, BTLSCR_ATTACKER + GoTo _143 + +_129: + WaitButtonABTime 30 + // But {0} can’t sleep in an uproar! + PrintMessage pl_msg_00000368_00323, TAG_NICKNAME, BTLSCR_ATTACKER + GoTo _143 + +_137: + WaitButtonABTime 30 + // {0}’s HP is full! + PrintMessage pl_msg_00000368_00187, TAG_NICKNAME, BTLSCR_ATTACKER + +_143: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_NO_MORE_WORK + +_147: + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0056.s b/res/battle/scripts/subscripts/subscript_0056.s new file mode 100644 index 0000000000..765d152d99 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0056.s @@ -0,0 +1,17 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVarFromVar OPCODE_SET, BTLVAR_ATTACKER_LOCKED_MOVE, BTLVAR_CURRENT_MOVE + Random 3, 3 + UpdateVar OPCODE_LEFT_SHIFT, BTLVAR_CALC_TEMP, 0x00000004 + UpdateMonDataFromVar OPCODE_FLAG_ON, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, BTLVAR_CALC_TEMP + UpdateVarFromVar OPCODE_FLAG_INDEX, BTLVAR_CALC_TEMP, BTLVAR_ATTACKER + UpdateVar OPCODE_LEFT_SHIFT, BTLVAR_CALC_TEMP, 0x00000008 + UpdateVarFromVar OPCODE_FLAG_ON, BTLVAR_FIELD_CONDITIONS, BTLVAR_CALC_TEMP + // {0} caused an uproar! + PrintMessage pl_msg_00000368_00308, TAG_NICKNAME, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0057.s b/res/battle/scripts/subscripts/subscript_0057.s new file mode 100644 index 0000000000..6aa46900c1 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0057.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PrintBufferedMessage + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0058.s b/res/battle/scripts/subscripts/subscript_0058.s new file mode 100644 index 0000000000..c26edf0dc6 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0058.s @@ -0,0 +1,22 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CheckSubstitute BTLSCR_SIDE_EFFECT_MON, _043 + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_DEFENDER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_BIND, _043 + PrintBufferedMessage + Wait + WaitButtonABTime 30 + Random 3, 3 + CheckItemHoldEffect CHECK_NOT_HAVE, BTLSCR_ATTACKER, HOLD_EFFECT_EXTEND_TRAPPING, _024 + UpdateVar OPCODE_SET, BTLVAR_CALC_TEMP, 0x00000006 + +_024: + UpdateVar OPCODE_LEFT_SHIFT, BTLVAR_CALC_TEMP, 0x0000000D + UpdateMonDataFromVar OPCODE_FLAG_ON, BTLSCR_DEFENDER, BATTLEMON_VOLATILE_STATUS, BTLVAR_CALC_TEMP + UpdateMonDataFromVar OPCODE_SET, BTLSCR_DEFENDER, BATTLEMON_BIND_TARGET, BTLVAR_ATTACKER + UpdateMonDataFromVar OPCODE_SET, BTLSCR_DEFENDER, BATTLEMON_BINDING_MOVE, BTLVAR_CURRENT_MOVE + +_043: + End diff --git a/res/battle/scripts/subscripts/subscript_0059.s b/res/battle/scripts/subscripts/subscript_0059.s new file mode 100644 index 0000000000..40c6178c06 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0059.s @@ -0,0 +1,49 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CheckAbility CHECK_HAVE, BTLSCR_MSG_TEMP, ABILITY_MAGIC_GUARD, _082 + CompareVarToValue OPCODE_EQU, BTLVAR_MSG_MOVE_TEMP, MOVE_WRAP, _039 + CompareVarToValue OPCODE_EQU, BTLVAR_MSG_MOVE_TEMP, MOVE_FIRE_SPIN, _044 + CompareVarToValue OPCODE_EQU, BTLVAR_MSG_MOVE_TEMP, MOVE_MAGMA_STORM, _049 + CompareVarToValue OPCODE_EQU, BTLVAR_MSG_MOVE_TEMP, MOVE_CLAMP, _054 + CompareVarToValue OPCODE_EQU, BTLVAR_MSG_MOVE_TEMP, MOVE_WHIRLPOOL, _059 + CompareVarToValue OPCODE_EQU, BTLVAR_MSG_MOVE_TEMP, MOVE_SAND_TOMB, _064 + PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_DAMAGE_BIND + GoTo _067 + +_039: + PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_DAMAGE_WRAP + GoTo _067 + +_044: + PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_DAMAGE_FIRE_SPIN + GoTo _067 + +_049: + PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_DAMAGE_MAGMA_STORM + GoTo _067 + +_054: + PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_DAMAGE_CLAMP + GoTo _067 + +_059: + PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_DAMAGE_WHIRLPOOL + GoTo _067 + +_064: + PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_DAMAGE_SAND_TOMB + +_067: + Wait + // {0} is hurt by {1}! + PrintMessage pl_msg_00000368_00262, TAG_NICKNAME_MOVE, BTLSCR_MSG_TEMP, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_SPRITE_BLINK + GoToSubscript BATTLE_SUBSCRIPT_UPDATE_HP + +_082: + End diff --git a/res/battle/scripts/subscripts/subscript_0060.s b/res/battle/scripts/subscripts/subscript_0060.s new file mode 100644 index 0000000000..e2419d916e --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0060.s @@ -0,0 +1,10 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} was freed from {1}! + PrintMessage pl_msg_00000368_00265, TAG_NICKNAME_MOVE, BTLSCR_MSG_TEMP, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0061.s b/res/battle/scripts/subscripts/subscript_0061.s new file mode 100644 index 0000000000..70676ed157 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0061.s @@ -0,0 +1,26 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CheckAbility CHECK_HAVE, BTLSCR_ATTACKER, ABILITY_MAGIC_GUARD, _054 + CompareVarToValue OPCODE_FLAG_NOT, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_CRASH_DAMAGE, _054 + // {0} kept going and crashed! + PrintMessage pl_msg_00000368_00268, TAG_NICKNAME, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + UpdateVarFromVar OPCODE_SET, BTLVAR_HP_CALC_TEMP, BTLVAR_DAMAGE + DivideVarByValue BTLVAR_HP_CALC_TEMP, 2 + UpdateMonDataFromVar OPCODE_GET, BTLSCR_DEFENDER, BATTLEMON_MAX_HP, BTLVAR_SCRIPT_TEMP + UpdateVar OPCODE_MUL, BTLVAR_SCRIPT_TEMP, -1 + DivideVarByValue BTLVAR_SCRIPT_TEMP, 2 + CompareVarToVar OPCODE_LTE, BTLVAR_SCRIPT_TEMP, BTLVAR_HP_CALC_TEMP, _044 + UpdateVarFromVar OPCODE_SET, BTLVAR_HP_CALC_TEMP, BTLVAR_SCRIPT_TEMP + +_044: + UpdateVarFromVar OPCODE_SET, BTLVAR_MSG_BATTLER_TEMP, BTLVAR_ATTACKER + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_SPRITE_BLINK + Call BATTLE_SUBSCRIPT_UPDATE_HP + +_054: + End diff --git a/res/battle/scripts/subscripts/subscript_0062.s b/res/battle/scripts/subscripts/subscript_0062.s new file mode 100644 index 0000000000..4211a2f09b --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0062.s @@ -0,0 +1,12 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION + UpdateMonData OPCODE_FLAG_ON, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_FOCUS_ENERGY + // {0} is getting pumped! + PrintMessage pl_msg_00000368_00276, TAG_NICKNAME, BTLSCR_SIDE_EFFECT_MON + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0063.s b/res/battle/scripts/subscripts/subscript_0063.s new file mode 100644 index 0000000000..cb8e5abfa6 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0063.s @@ -0,0 +1,22 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CheckAbility CHECK_HAVE, BTLSCR_ATTACKER, ABILITY_ROCK_HEAD, _038 + CheckAbility CHECK_HAVE, BTLSCR_ATTACKER, ABILITY_MAGIC_GUARD, _038 + UpdateVarFromVar OPCODE_SET, BTLVAR_MSG_BATTLER_TEMP, BTLVAR_ATTACKER + UpdateVarFromVar OPCODE_SET, BTLVAR_HP_CALC_TEMP, BTLVAR_HIT_DAMAGE + CompareVarToValue OPCODE_EQU, BTLVAR_HP_CALC_TEMP, 0, _025 + DivideVarByValue BTLVAR_HP_CALC_TEMP, 4 + +_025: + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_SPRITE_BLINK + Call BATTLE_SUBSCRIPT_UPDATE_HP + // {0} is hit with recoil! + PrintMessage pl_msg_00000368_00279, TAG_NICKNAME, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + +_038: + End diff --git a/res/battle/scripts/subscripts/subscript_0064.s b/res/battle/scripts/subscripts/subscript_0064.s new file mode 100644 index 0000000000..a7ae1ee321 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0064.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateMonData OPCODE_FLAG_ON, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_RECHARGING + UpdateVarFromVar OPCODE_SET, BTLVAR_ATTACKER_LOCKED_MOVE, BTLVAR_CURRENT_MOVE + UpdateMonDataFromVar OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_RECHARGE_TURN_NUMBER, BTLVAR_TOTAL_TURNS + End diff --git a/res/battle/scripts/subscripts/subscript_0065.s b/res/battle/scripts/subscripts/subscript_0065.s new file mode 100644 index 0000000000..33a68de685 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0065.s @@ -0,0 +1,11 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} must recharge! + PrintMessage pl_msg_00000368_00360, TAG_NICKNAME, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + UnlockMoveChoice BTLSCR_ATTACKER + End diff --git a/res/battle/scripts/subscripts/subscript_0066.s b/res/battle/scripts/subscripts/subscript_0066.s new file mode 100644 index 0000000000..257f336d37 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0066.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateMonData OPCODE_FLAG_ON, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_RAGE + End diff --git a/res/battle/scripts/subscripts/subscript_0067.s b/res/battle/scripts/subscripts/subscript_0067.s new file mode 100644 index 0000000000..e3fc821a42 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0067.s @@ -0,0 +1,17 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + TryMimic _016 + Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION + // {0} learned {1}! + PrintMessage pl_msg_00000368_00836, TAG_NICKNAME_MOVE, BTLSCR_ATTACKER, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_NO_MORE_WORK + End + +_016: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/subscripts/subscript_0068.s b/res/battle/scripts/subscripts/subscript_0068.s new file mode 100644 index 0000000000..4512dbd025 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0068.s @@ -0,0 +1,38 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CheckSubstitute BTLSCR_DEFENDER, _060 + CompareMonDataToValue OPCODE_EQU, BTLSCR_DEFENDER, BATTLEMON_TYPE_1, TYPE_GRASS, _065 + CompareMonDataToValue OPCODE_EQU, BTLSCR_DEFENDER, BATTLEMON_TYPE_2, TYPE_GRASS, _065 + PrintAttackMessage + Wait + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_DEFENDER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_LEECH_SEED, _046 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_MISSED|MOVE_STATUS_SEMI_INVULNERABLE, _046 + PlayMoveAnimation BTLSCR_ATTACKER + Wait + UpdateMonDataFromVar OPCODE_FLAG_ON, BTLSCR_DEFENDER, BATTLEMON_MOVE_EFFECTS_MASK, BTLVAR_ATTACKER + UpdateMonData OPCODE_FLAG_ON, BTLSCR_DEFENDER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_LEECH_SEED + // {0} was seeded! + PrintMessage pl_msg_00000368_00290, TAG_NICKNAME, BTLSCR_DEFENDER + GoTo _056 + +_046: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_NO_MORE_WORK + WaitButtonABTime 30 + // {0} evaded the attack! + PrintMessage pl_msg_00000368_00293, TAG_NICKNAME, BTLSCR_DEFENDER + +_056: + Wait + WaitButtonABTime 30 + End + +_060: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End + +_065: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_INEFFECTIVE + End diff --git a/res/battle/scripts/subscripts/subscript_0069.s b/res/battle/scripts/subscripts/subscript_0069.s new file mode 100644 index 0000000000..bedcf08fae --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0069.s @@ -0,0 +1,60 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PlayBattleAnimationOnMons BTLSCR_MSG_ATTACKER, BTLSCR_MSG_DEFENDER, BATTLE_ANIMATION_DAMAGE_LEECH_SEED + Wait + UpdateMonDataFromVar OPCODE_GET, BTLSCR_MSG_DEFENDER, BATTLEMON_MAX_HP, BTLVAR_HP_CALC_TEMP + DivideVarByValue BTLVAR_HP_CALC_TEMP, 8 + UpdateVar OPCODE_MUL, BTLVAR_HP_CALC_TEMP, -1 + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_SPRITE_BLINK + UpdateVarFromVar OPCODE_SET, BTLVAR_MSG_BATTLER_TEMP, BTLVAR_MSG_DEFENDER + Call BATTLE_SUBSCRIPT_UPDATE_HP + UpdateVarFromVar OPCODE_SET, BTLVAR_HP_CALC_TEMP, BTLVAR_HIT_DAMAGE + CheckItemHoldEffect CHECK_NOT_HAVE, BTLSCR_MSG_ATTACKER, HOLD_EFFECT_LEECH_BOOST, _050 + GetItemEffectParam BTLSCR_MSG_ATTACKER, BTLVAR_CALC_TEMP + UpdateVar OPCODE_ADD, BTLVAR_CALC_TEMP, 0x00000064 + UpdateVarFromVar OPCODE_MUL, BTLVAR_HP_CALC_TEMP, BTLVAR_CALC_TEMP + UpdateVar OPCODE_DIV, BTLVAR_HP_CALC_TEMP, 100 + +_050: + UpdateVarFromVar OPCODE_SET, BTLVAR_MSG_BATTLER_TEMP, BTLVAR_MSG_ATTACKER + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_SPRITE_BLINK + CheckAbility CHECK_HAVE, BTLSCR_MSG_DEFENDER, ABILITY_LIQUID_OOZE, _096 + CompareMonDataToValue OPCODE_NEQ, BTLSCR_MSG_TEMP, BATTLEMON_HEAL_BLOCK_TURNS, 0, _083 + UpdateVar OPCODE_MUL, BTLVAR_HP_CALC_TEMP, -1 + Call BATTLE_SUBSCRIPT_UPDATE_HP + // {0}’s health is sapped by Leech Seed! + PrintMessage pl_msg_00000368_00296, TAG_NICKNAME, BTLSCR_MSG_DEFENDER + Wait + WaitButtonABTime 30 + End + +_083: + UpdateVar OPCODE_SET, BTLVAR_MSG_MOVE_TEMP, MOVE_HEAL_BLOCK + // {0} was prevented from healing due to {1}! + PrintMessage pl_msg_00000368_01054, TAG_NICKNAME_MOVE, BTLSCR_MSG_TEMP, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + End + +_096: + CheckAbility CHECK_HAVE, BTLSCR_MSG_ATTACKER, ABILITY_MAGIC_GUARD, _110 + Call BATTLE_SUBSCRIPT_UPDATE_HP + // It sucked up the liquid ooze! + PrintMessage pl_msg_00000368_00720, TAG_NONE + Wait + WaitButtonABTime 30 + End + +_110: + // It sucked up the liquid ooze! + PrintMessage pl_msg_00000368_00720, TAG_NONE + Wait + WaitButtonABTime 30 + // {0}’s {1} suppressed {2}’s {3}! + PrintMessage pl_msg_00000368_00727, TAG_NICKNAME_ABILITY_NICKNAME_ABILITY, BTLSCR_MSG_ATTACKER, BTLSCR_MSG_ATTACKER, BTLSCR_MSG_DEFENDER, BTLSCR_MSG_DEFENDER + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0070.s b/res/battle/scripts/subscripts/subscript_0070.s new file mode 100644 index 0000000000..b2c79b1018 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0070.s @@ -0,0 +1,17 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_MISSED|MOVE_STATUS_SEMI_INVULNERABLE, _017 + TryDisable _017 + Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION + // {0}’s {1} was disabled! + PrintMessage pl_msg_00000368_00366, TAG_NICKNAME_MOVE, BTLSCR_DEFENDER, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + End + +_017: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/subscripts/subscript_0071.s b/res/battle/scripts/subscripts/subscript_0071.s new file mode 100644 index 0000000000..ad5bf3c7a4 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0071.s @@ -0,0 +1,14 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_MOVE_LOCKED, _005 + +_005: + // {0}’s {1} is disabled! + PrintMessage pl_msg_00000368_00609, TAG_NICKNAME_MOVE, BTLSCR_ATTACKER, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + UnlockMoveChoice BTLSCR_ATTACKER + End diff --git a/res/battle/scripts/subscripts/subscript_0072.s b/res/battle/scripts/subscripts/subscript_0072.s new file mode 100644 index 0000000000..ea9b190582 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0072.s @@ -0,0 +1,10 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} is no longer disabled! + PrintMessage pl_msg_00000368_00369, TAG_NICKNAME, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0073.s b/res/battle/scripts/subscripts/subscript_0073.s new file mode 100644 index 0000000000..0711d5ddd2 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0073.s @@ -0,0 +1,14 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + TryEncore _010 + Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION + // {0} received an encore! + PrintMessage pl_msg_00000368_00372, TAG_NICKNAME, BTLSCR_DEFENDER + Wait + WaitButtonABTime 30 + +_010: + End diff --git a/res/battle/scripts/subscripts/subscript_0074.s b/res/battle/scripts/subscripts/subscript_0074.s new file mode 100644 index 0000000000..2ab2af722e --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0074.s @@ -0,0 +1,10 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0}’s encore ended! + PrintMessage pl_msg_00000368_00375, TAG_NICKNAME, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0075.s b/res/battle/scripts/subscripts/subscript_0075.s new file mode 100644 index 0000000000..4b4d26570c --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0075.s @@ -0,0 +1,11 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // But it failed! + PrintMessage pl_msg_00000368_00796, TAG_NONE + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_NO_MORE_WORK + End diff --git a/res/battle/scripts/subscripts/subscript_0076.s b/res/battle/scripts/subscripts/subscript_0076.s new file mode 100644 index 0000000000..426f352167 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0076.s @@ -0,0 +1,10 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PrintAttackMessage + Wait + PlayMoveAnimation BTLSCR_ATTACKER + Wait + End diff --git a/res/battle/scripts/subscripts/subscript_0077.s b/res/battle/scripts/subscripts/subscript_0077.s new file mode 100644 index 0000000000..ab8a60c8a5 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0077.s @@ -0,0 +1,32 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CheckSubstitute BTLSCR_DEFENDER, _075 + Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION + UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_CUR_HP, BTLVAR_CALC_TEMP + UpdateMonDataFromVar OPCODE_GET, BTLSCR_DEFENDER, BATTLEMON_CUR_HP, BTLVAR_HP_CALC_TEMP + UpdateVarFromVar OPCODE_ADD, BTLVAR_CALC_TEMP, BTLVAR_HP_CALC_TEMP + UpdateVar OPCODE_DIV, BTLVAR_CALC_TEMP, 0x00000002 + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_SPRITE_BLINK + UpdateVarFromVar OPCODE_SET, BTLVAR_MSG_BATTLER_TEMP, BTLVAR_ATTACKER + UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_CUR_HP, BTLVAR_HP_CALC_TEMP + UpdateVarFromVar OPCODE_SUB, BTLVAR_HP_CALC_TEMP, BTLVAR_CALC_TEMP + UpdateVar OPCODE_MUL, BTLVAR_HP_CALC_TEMP, -1 + Call BATTLE_SUBSCRIPT_UPDATE_HP + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_SPRITE_BLINK + UpdateVarFromVar OPCODE_SET, BTLVAR_MSG_BATTLER_TEMP, BTLVAR_DEFENDER + UpdateMonDataFromVar OPCODE_GET, BTLSCR_DEFENDER, BATTLEMON_CUR_HP, BTLVAR_HP_CALC_TEMP + UpdateVarFromVar OPCODE_SUB, BTLVAR_HP_CALC_TEMP, BTLVAR_CALC_TEMP + UpdateVar OPCODE_MUL, BTLVAR_HP_CALC_TEMP, -1 + Call BATTLE_SUBSCRIPT_UPDATE_HP + // The battlers shared their pain! + PrintMessage pl_msg_00000368_00820, TAG_NONE + Wait + WaitButtonABTime 30 + End + +_075: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/subscripts/subscript_0078.s b/res/battle/scripts/subscripts/subscript_0078.s new file mode 100644 index 0000000000..bdf524ec79 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0078.s @@ -0,0 +1,16 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + TryConversion2 _012 + Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION + // {0} transformed into the {1} type! + PrintMessage pl_msg_00000368_00178, TAG_NICKNAME_TYPE, BTLSCR_ATTACKER, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + End + +_012: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/subscripts/subscript_0079.s b/res/battle/scripts/subscripts/subscript_0079.s new file mode 100644 index 0000000000..7366a4902d --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0079.s @@ -0,0 +1,20 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_MISSED|MOVE_STATUS_SEMI_INVULNERABLE, _033 + CheckSubstitute BTLSCR_DEFENDER, _033 + UpdateMonData OPCODE_FLAG_OFF, BTLSCR_DEFENDER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_LOCK_ON + UpdateMonData OPCODE_FLAG_ON, BTLSCR_DEFENDER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_LOCK_ON_1 + UpdateMonDataFromVar OPCODE_SET, BTLSCR_DEFENDER, BATTLEMON_LOCK_ON_TARGET, BTLVAR_ATTACKER + Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION + // {0} took aim at {1}! + PrintMessage pl_msg_00000368_00378, TAG_NICKNAME_NICKNAME, BTLSCR_ATTACKER, BTLSCR_DEFENDER + Wait + WaitButtonABTime 30 + End + +_033: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/subscripts/subscript_0080.s b/res/battle/scripts/subscripts/subscript_0080.s new file mode 100644 index 0000000000..669e68d035 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0080.s @@ -0,0 +1,17 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CheckSubstitute BTLSCR_DEFENDER, _015 + TrySketch _015 + Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION + // {0} sketched {1}! + PrintMessage pl_msg_00000368_00385, TAG_NICKNAME_MOVE, BTLSCR_ATTACKER, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + End + +_015: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/subscripts/subscript_0081.s b/res/battle/scripts/subscripts/subscript_0081.s new file mode 100644 index 0000000000..b9be5528df --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0081.s @@ -0,0 +1,22 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareVarToValue OPCODE_EQU, BTLVAR_CURRENT_MOVE, MOVE_FEINT, _015 + IfTurnFlag BTLSCR_DEFENDER, TURN_FLAG_PROTECTING, 0, _022 + // It broke through {0}’s protection! + PrintMessage pl_msg_00000368_01243, TAG_NICKNAME, BTLSCR_DEFENDER + GoTo _019 + +_015: + // {0} fell for the feint! + PrintMessage pl_msg_00000368_01048, TAG_NICKNAME, BTLSCR_DEFENDER + +_019: + Wait + WaitButtonABTime 30 + +_022: + SetTurnFlag BTLSCR_DEFENDER, TURN_FLAG_PROTECTING, 0 + End diff --git a/res/battle/scripts/subscripts/subscript_0082.s b/res/battle/scripts/subscripts/subscript_0082.s new file mode 100644 index 0000000000..5203b66bcb --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0082.s @@ -0,0 +1,11 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} is trying to take its foe with it! + PrintMessage pl_msg_00000368_00388, TAG_NICKNAME, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + UpdateMonData OPCODE_FLAG_ON, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_DESTINY_BOND + End diff --git a/res/battle/scripts/subscripts/subscript_0083.s b/res/battle/scripts/subscripts/subscript_0083.s new file mode 100644 index 0000000000..79837e14d1 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0083.s @@ -0,0 +1,39 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareMonDataToValue OPCODE_FLAG_NOT, BTLSCR_FAINTED_MON, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_DESTINY_BOND, _066 + IfSameSide BTLSCR_ATTACKER, BTLSCR_FAINTED_MON, _066 + CompareMonDataToValue OPCODE_EQU, BTLSCR_ATTACKER, BATTLEMON_CUR_HP, 0, _066 + // {0} took {1} down with it! + PrintMessage pl_msg_00000368_00391, TAG_NICKNAME_NICKNAME, BTLSCR_FAINTED_MON, BTLSCR_ATTACKER + UpdateVarFromVar OPCODE_GET, BTLVAR_FAINTED_MON, BTLVAR_LAST_BATTLER_ID + UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_CUR_HP, BTLVAR_HP_CALC_TEMP + UpdateVar OPCODE_MUL, BTLVAR_HP_CALC_TEMP, -1 + UpdateVarFromVar OPCODE_SET, BTLVAR_MSG_BATTLER_TEMP, BTLVAR_ATTACKER + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_SPRITE_BLINK + Call BATTLE_SUBSCRIPT_UPDATE_HP + PlayFaintAnimation + Wait + HealthbarSlideOut BTLSCR_FAINTED_MON + // {0} fainted! + PrintMessage pl_msg_00000368_00030, TAG_NICKNAME, BTLSCR_FAINTED_MON + Wait + WaitButtonABTime 30 + IncrementGameStat BTLSCR_FAINTED_MON, BATTLER_TYPE_SOLO_ENEMY, 41 + IncrementGameStat BTLSCR_FAINTED_MON, BATTLER_TYPE_SOLO_PLAYER, 96 + UpdateVarFromVar OPCODE_GET, BTLVAR_LAST_BATTLER_ID, BTLVAR_FAINTED_MON + +_066: + TryGrudge _076 + // {0}’s {1} lost all its PP due to the grudge! + PrintMessage pl_msg_00000368_00568, TAG_NICKNAME_MOVE, BTLSCR_ATTACKER, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + +_076: + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_NO_EXPERIENCE_GIVEN + Call BATTLE_SUBSCRIPT_FAINT_MON + UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_NO_EXPERIENCE_GIVEN + End diff --git a/res/battle/scripts/subscripts/subscript_0084.s b/res/battle/scripts/subscripts/subscript_0084.s new file mode 100644 index 0000000000..2950c7d989 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0084.s @@ -0,0 +1,17 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_MISSED|MOVE_STATUS_SEMI_INVULNERABLE, _018 + TrySpite _018 + Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION + // It reduced the PP of {0}’s {1} by {2}! + PrintMessage pl_msg_00000368_00398, TAG_NICKNAME_MOVE_NUMBER, BTLSCR_DEFENDER, BTLSCR_MSG_TEMP, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + End + +_018: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/subscripts/subscript_0085.s b/res/battle/scripts/subscripts/subscript_0085.s new file mode 100644 index 0000000000..79b34ea4c5 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0085.s @@ -0,0 +1,27 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + TryStealItem _048, _039 + UpdateVar OPCODE_SET, BTLVAR_MOVE_EFFECT_CHANCE, 1 + UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_PLAYED_MOVE_ANIMATION + PlayMoveAnimation BTLSCR_ATTACKER + Wait + // {0} stole {1}’s {2}! + PrintMessage pl_msg_00000368_00401, TAG_NICKNAME_NICKNAME_ITEM, BTLSCR_ATTACKER, BTLSCR_DEFENDER, BTLSCR_DEFENDER + Wait + WaitButtonABTime 30 + UpdateMonDataFromVar OPCODE_GET, BTLSCR_DEFENDER, BATTLEMON_HELD_ITEM, BTLVAR_SCRIPT_TEMP + UpdateMonDataFromVar OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_HELD_ITEM, BTLVAR_SCRIPT_TEMP + UpdateMonData OPCODE_SET, BTLSCR_DEFENDER, BATTLEMON_HELD_ITEM, ITEM_NONE + GoTo _048 + +_039: + // {0}’s {1} made {2} ineffective! + PrintMessage pl_msg_00000368_00714, TAG_NICKNAME_ABILITY_MOVE, BTLSCR_DEFENDER, BTLSCR_DEFENDER, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + +_048: + End diff --git a/res/battle/scripts/subscripts/subscript_0086.s b/res/battle/scripts/subscripts/subscript_0086.s new file mode 100644 index 0000000000..626c54c61c --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0086.s @@ -0,0 +1,28 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_PROTECTED, _044 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_DID_NOT_HIT, _038 + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_DEFENDER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_MEAN_LOOK, _048 + CheckSubstitute BTLSCR_DEFENDER, _048 + Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION + UpdateMonData OPCODE_FLAG_ON, BTLSCR_DEFENDER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_MEAN_LOOK + UpdateMonDataFromVar OPCODE_FLAG_ON, BTLSCR_DEFENDER, BATTLEMON_MEAN_LOOK_TARGET, BTLVAR_ATTACKER + // {0} can no longer escape! + PrintMessage pl_msg_00000368_00408, TAG_NICKNAME, BTLSCR_DEFENDER + Wait + WaitButtonABTime 30 + End + +_038: + UpdateVar OPCODE_FLAG_OFF, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_SEMI_INVULNERABLE + GoTo _048 + +_044: + UpdateVar OPCODE_FLAG_OFF, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_PROTECTED + +_048: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/subscripts/subscript_0087.s b/res/battle/scripts/subscripts/subscript_0087.s new file mode 100644 index 0000000000..c1399af766 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0087.s @@ -0,0 +1,13 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + TryProtection _006 + Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION + Call BATTLE_SUBSCRIPT_SHOW_PREPARED_MESSAGE + End + +_006: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/subscripts/subscript_0088.s b/res/battle/scripts/subscripts/subscript_0088.s new file mode 100644 index 0000000000..10b00e08e3 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0088.s @@ -0,0 +1,42 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + TryPartyStatusRefresh + CompareVarToValue OPCODE_EQU, BTLVAR_CURRENT_MOVE, MOVE_AROMATHERAPY, _010 + // A bell chimed! + PrintMessage pl_msg_00000368_00821, TAG_NONE + GoTo _013 + +_010: + // A soothing aroma wafted through the area! + PrintMessage pl_msg_00000368_00592, TAG_NONE + +_013: + Wait + WaitButtonABTime 30 + CompareVarToValue OPCODE_EQU, BTLVAR_CURRENT_MOVE, MOVE_AROMATHERAPY, _049 + CompareVarToValue OPCODE_FLAG_NOT, BTLVAR_CALC_TEMP, 0x00000001, _035 + // {0}’s {1} blocks {2}! + PrintMessage pl_msg_00000368_00689, TAG_NICKNAME_ABILITY_MOVE, BTLSCR_ATTACKER, BTLSCR_ATTACKER, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + +_035: + CompareVarToValue OPCODE_FLAG_NOT, BTLVAR_CALC_TEMP, 0x00000002, _049 + // {0}’s {1} blocks {2}! + PrintMessage pl_msg_00000368_00689, TAG_NICKNAME_ABILITY_MOVE, BTLSCR_ATTACKER_PARTNER, BTLSCR_ATTACKER_PARTNER, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + +_049: + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_CALC_TEMP, 0x00000004, _057 + SetHealthbarStatus BTLSCR_ATTACKER, BATTLE_ANIMATION_NONE + +_057: + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_CALC_TEMP, 0x00000008, _065 + SetHealthbarStatus BTLSCR_ATTACKER_PARTNER, BATTLE_ANIMATION_NONE + +_065: + End diff --git a/res/battle/scripts/subscripts/subscript_0089.s b/res/battle/scripts/subscripts/subscript_0089.s new file mode 100644 index 0000000000..63ab7eb512 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0089.s @@ -0,0 +1,37 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PrintAttackMessage + Wait + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_SUBSTITUTE, _043 + TrySubstitute _036 + PlayBattleAnimation BTLSCR_ATTACKER, BATTLE_ANIMATION_SUBSTITUTE_IN + Wait + UpdateMonData OPCODE_FLAG_ON, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_SUBSTITUTE + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_SPRITE_BLINK + UpdateVarFromVar OPCODE_SET, BTLVAR_MSG_BATTLER_TEMP, BTLVAR_ATTACKER + Call BATTLE_SUBSCRIPT_UPDATE_HP + // {0} made a substitute! + PrintMessage pl_msg_00000368_00348, TAG_NICKNAME, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + End + +_036: + WaitButtonABTime 30 + // It was too weak to make a substitute! + PrintMessage pl_msg_00000368_00819, TAG_NONE + GoTo _049 + +_043: + WaitButtonABTime 30 + // {0} already has a substitute! + PrintMessage pl_msg_00000368_00351, TAG_NICKNAME, BTLSCR_ATTACKER + +_049: + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_NO_MORE_WORK + End diff --git a/res/battle/scripts/subscripts/subscript_0090.s b/res/battle/scripts/subscripts/subscript_0090.s new file mode 100644 index 0000000000..49c03d2148 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0090.s @@ -0,0 +1,29 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_SPRITE_BLINK, _009 + PlayMoveHitSound BTLSCR_MSG_TEMP + FlickerMon BTLSCR_MSG_TEMP + Wait + +_009: + // The substitute took damage for {0}! + PrintMessage pl_msg_00000368_00354, TAG_NICKNAME, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_MSG_TEMP, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_SUBSTITUTE, _040 + PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_SUBSTITUTE_OUT + Wait + RestoreSprite BTLSCR_MSG_TEMP + Wait + PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_SUB_IN + Wait + // {0}’s substitute faded! + PrintMessage pl_msg_00000368_00357, TAG_NICKNAME, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + +_040: + End diff --git a/res/battle/scripts/subscripts/subscript_0091.s b/res/battle/scripts/subscripts/subscript_0091.s new file mode 100644 index 0000000000..fe9cdc6b34 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0091.s @@ -0,0 +1,62 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_SEMI_INVULNERABLE, _074 + CheckIgnorableAbility CHECK_HAVE, BTLSCR_DEFENDER, ABILITY_SUCTION_CUPS, _079 + CompareMonDataToValue OPCODE_EQU, BTLSCR_DEFENDER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_INGRAIN, _086 + CompareVarToValue OPCODE_EQU, BTLVAR_BATTLE_TYPE, BATTLE_TYPE_DOUBLES|BATTLE_TYPE_2vs2|BATTLE_TYPE_AI, _074 + TryWhirlwind _074 + Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION + TryRestoreStatusOnSwitch BTLSCR_DEFENDER, _032 + UpdateMonData OPCODE_SET, BTLSCR_DEFENDER, BATTLEMON_STATUS, MON_CONDITION_NONE + +_032: + DeletePokemon BTLSCR_DEFENDER + Wait + CompareVarToValue OPCODE_FLAG_NOT, BTLVAR_BATTLE_TYPE, BATTLE_TYPE_TRAINER, _067 + HealthbarSlideOut BTLSCR_DEFENDER + Wait + SwitchAndUpdateMon BTLSCR_FORCED_OUT + Wait + PokemonSendOut BTLSCR_DEFENDER + WaitTime 72 + HealthbarSlideIn BTLSCR_DEFENDER + Wait + // {0} was dragged out! + PrintMessage pl_msg_00000368_00603, TAG_NICKNAME, BTLSCR_DEFENDER + Wait + WaitButtonABTime 30 + UpdateVarFromVar OPCODE_SET, BTLVAR_SWITCHED_MON, BTLVAR_DEFENDER + Call BATTLE_SUBSCRIPT_HAZARDS_CHECK + End + +_067: + FadeOutBattle + Wait + UpdateVar OPCODE_FLAG_ON, BTLVAR_RESULT_MASK, BATTLE_RESULT_PLAYER_FLED + End + +_074: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End + +_079: + // {0} anchors itself with {1}! + BufferMessage pl_msg_00000368_00659, TAG_NICKNAME_ABILITY, BTLSCR_DEFENDER, BTLSCR_DEFENDER + GoTo _090 + +_086: + // {0} anchored itself with its roots! + BufferMessage pl_msg_00000368_00542, TAG_NICKNAME, BTLSCR_DEFENDER + +_090: + PrintAttackMessage + Wait + WaitButtonABTime 30 + PrintBufferedMessage + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_NO_MORE_WORK + End diff --git a/res/battle/scripts/subscripts/subscript_0092.s b/res/battle/scripts/subscripts/subscript_0092.s new file mode 100644 index 0000000000..8945746850 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0092.s @@ -0,0 +1,18 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_DEFENDER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_SEMI_INVULNERABLE, _023 + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_DEFENDER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_TRANSFORM, _023 + Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION + Transform + // {0} transformed into {1}! + PrintMessage pl_msg_00000368_00345, TAG_NICKNAME_POKE, BTLSCR_ATTACKER, BTLSCR_DEFENDER + Wait + WaitButtonABTime 30 + End + +_023: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/subscripts/subscript_0093.s b/res/battle/scripts/subscripts/subscript_0093.s new file mode 100644 index 0000000000..9136da8855 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0093.s @@ -0,0 +1,19 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CheckSubstitute BTLSCR_DEFENDER, _029 + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_DEFENDER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_NIGHTMARE, _029 + CompareMonDataToValue OPCODE_FLAG_NOT, BTLSCR_DEFENDER, BATTLEMON_STATUS, MON_CONDITION_SLEEP, _029 + Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION + UpdateMonData OPCODE_FLAG_ON, BTLSCR_DEFENDER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_NIGHTMARE + // {0} began having a nightmare! + PrintMessage pl_msg_00000368_00411, TAG_NICKNAME, BTLSCR_DEFENDER + Wait + WaitButtonABTime 30 + End + +_029: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/subscripts/subscript_0094.s b/res/battle/scripts/subscripts/subscript_0094.s new file mode 100644 index 0000000000..9c7a399660 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0094.s @@ -0,0 +1,20 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CheckAbility CHECK_HAVE, BTLSCR_MSG_TEMP, ABILITY_MAGIC_GUARD, _033 + PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_DAMAGE_NIGHTMARE + Wait + UpdateMonDataFromVar OPCODE_GET, BTLSCR_MSG_TEMP, BATTLEMON_MAX_HP, BTLVAR_HP_CALC_TEMP + DivideVarByValue BTLVAR_HP_CALC_TEMP, 4 + UpdateVar OPCODE_MUL, BTLVAR_HP_CALC_TEMP, -1 + // {0} is locked in a nightmare! + PrintMessage pl_msg_00000368_00414, TAG_NICKNAME, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_SPRITE_BLINK + GoToSubscript BATTLE_SUBSCRIPT_UPDATE_HP + +_033: + End diff --git a/res/battle/scripts/subscripts/subscript_0095.s b/res/battle/scripts/subscripts/subscript_0095.s new file mode 100644 index 0000000000..a6c3426ddf --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0095.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateMonData OPCODE_FLAG_ON, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_MINIMIZE + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_PARAM, MOVE_SUBSCRIPT_PTR_EVASION_UP_1_STAGE + GoToSubscript BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE diff --git a/res/battle/scripts/subscripts/subscript_0096.s b/res/battle/scripts/subscripts/subscript_0096.s new file mode 100644 index 0000000000..90f00cbf9c --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0096.s @@ -0,0 +1,16 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_PARAM, MOVE_SUBSCRIPT_PTR_SPEED_DOWN_1_STAGE + Call BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_ATTACK_MESSAGE|SYSCTL_PLAYED_MOVE_ANIMATION + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_STAT_STAGE_CHANGE_SHOWN + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_PARAM, MOVE_SUBSCRIPT_PTR_ATTACK_UP_1_STAGE + Call BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_PARAM, MOVE_SUBSCRIPT_PTR_DEFENSE_UP_1_STAGE + Call BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE + UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_UPDATE_STAT_STAGES + UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_STAT_STAGE_CHANGE_SHOWN + End diff --git a/res/battle/scripts/subscripts/subscript_0097.s b/res/battle/scripts/subscripts/subscript_0097.s new file mode 100644 index 0000000000..c268aef3b2 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0097.s @@ -0,0 +1,25 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_SEMI_INVULNERABLE, _051 + CheckSubstitute BTLSCR_DEFENDER, _051 + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_DEFENDER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_CURSE, _051 + Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION + UpdateMonData OPCODE_FLAG_ON, BTLSCR_DEFENDER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_CURSE + UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_MAX_HP, BTLVAR_HP_CALC_TEMP + UpdateVar OPCODE_MUL, BTLVAR_HP_CALC_TEMP, -1 + DivideVarByValue BTLVAR_HP_CALC_TEMP, 2 + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_SPRITE_BLINK + UpdateVarFromVar OPCODE_SET, BTLVAR_MSG_BATTLER_TEMP, BTLVAR_ATTACKER + Call BATTLE_SUBSCRIPT_UPDATE_HP + // {0} cut its own HP and laid a curse on {1}! + PrintMessage pl_msg_00000368_00417, TAG_NICKNAME_NICKNAME, BTLSCR_ATTACKER, BTLSCR_DEFENDER + Wait + WaitButtonABTime 30 + End + +_051: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/subscripts/subscript_0098.s b/res/battle/scripts/subscripts/subscript_0098.s new file mode 100644 index 0000000000..c5e66648cb --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0098.s @@ -0,0 +1,20 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CheckAbility CHECK_HAVE, BTLSCR_MSG_TEMP, ABILITY_MAGIC_GUARD, _033 + PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_DAMAGE_CURSE + Wait + UpdateMonDataFromVar OPCODE_GET, BTLSCR_MSG_TEMP, BATTLEMON_MAX_HP, BTLVAR_HP_CALC_TEMP + DivideVarByValue BTLVAR_HP_CALC_TEMP, 4 + UpdateVar OPCODE_MUL, BTLVAR_HP_CALC_TEMP, -1 + // {0} is afflicted by the curse! + PrintMessage pl_msg_00000368_00424, TAG_NICKNAME, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_SPRITE_BLINK + GoToSubscript BATTLE_SUBSCRIPT_UPDATE_HP + +_033: + End diff --git a/res/battle/scripts/subscripts/subscript_0099.s b/res/battle/scripts/subscripts/subscript_0099.s new file mode 100644 index 0000000000..c06405d7bf --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0099.s @@ -0,0 +1,52 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CheckAbility CHECK_HAVE, BTLSCR_SWITCHED_MON, ABILITY_MAGIC_GUARD, _105 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_GRAVITY, _037 + CheckItemHoldEffect CHECK_HAVE, BTLSCR_SWITCHED_MON, HOLD_EFFECT_SPEED_DOWN_GROUNDED, _037 + CheckAbility CHECK_HAVE, BTLSCR_SWITCHED_MON, ABILITY_LEVITATE, _085 + CompareMonDataToValue OPCODE_EQU, BTLSCR_SWITCHED_MON, BATTLEMON_TYPE_1, TYPE_FLYING, _085 + CompareMonDataToValue OPCODE_EQU, BTLSCR_SWITCHED_MON, BATTLEMON_TYPE_2, TYPE_FLYING, _085 + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_SWITCHED_MON, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_MAGNET_RISE, _085 + +_037: + CheckToxicSpikes BTLSCR_SWITCHED_MON, _065 + CompareVarToValue OPCODE_EQU, BTLVAR_CALC_TEMP, 0x00000002, _063 + CompareVarToValue OPCODE_EQU, BTLVAR_CALC_TEMP, 0x00000001, _059 + // The poison spikes disappeared from around your team’s feet! + PrintMessage pl_msg_00000368_01065, TAG_NONE_SIDE_CONSCIOUS, BTLSCR_SWITCHED_MON + Wait + WaitButtonABTime 30 + GoTo _065 + +_059: + Call BATTLE_SUBSCRIPT_POISON + GoTo _065 + +_063: + Call BATTLE_SUBSCRIPT_BADLY_POISON + +_065: + CheckSpikes BTLSCR_SWITCHED_MON, _085 + UpdateVarFromVar OPCODE_SET, BTLVAR_MSG_BATTLER_TEMP, BTLVAR_SWITCHED_MON + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_SPRITE_BLINK + Call BATTLE_SUBSCRIPT_UPDATE_HP + // {0} is hurt by the spikes! + PrintMessage pl_msg_00000368_00429, TAG_NICKNAME, BTLSCR_SWITCHED_MON + Wait + WaitButtonABTime 30 + +_085: + CheckStealthRock BTLSCR_SWITCHED_MON, _105 + UpdateVarFromVar OPCODE_SET, BTLVAR_MSG_BATTLER_TEMP, BTLVAR_SWITCHED_MON + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_SPRITE_BLINK + Call BATTLE_SUBSCRIPT_UPDATE_HP + // Pointed stones dug into {0}! + PrintMessage pl_msg_00000368_01079, TAG_NICKNAME, BTLSCR_SWITCHED_MON + Wait + WaitButtonABTime 30 + +_105: + End diff --git a/res/battle/scripts/subscripts/subscript_0100.s b/res/battle/scripts/subscripts/subscript_0100.s new file mode 100644 index 0000000000..610efd3dcf --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0100.s @@ -0,0 +1,11 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateMonData OPCODE_FLAG_ON, BTLSCR_DEFENDER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_FORESIGHT + // {0} identified {1}! + PrintMessage pl_msg_00000368_00432, TAG_NICKNAME_NICKNAME, BTLSCR_ATTACKER, BTLSCR_DEFENDER + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0101.s b/res/battle/scripts/subscripts/subscript_0101.s new file mode 100644 index 0000000000..9f7b0edfa5 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0101.s @@ -0,0 +1,31 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + TryPerishSong _045 + Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION + // All Pokémon hearing the song will faint in three turns! + PrintMessage pl_msg_00000368_00822, TAG_NONE + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_SET, BTLVAR_MSG_MOVE_TEMP, MOVE_PERISH_SONG + UpdateVar OPCODE_SET, BTLVAR_MSG_ABILITY_TEMP, ABILITY_SOUNDPROOF + UpdateVar OPCODE_SET, BTLVAR_BATTLER_SPEED_TEMP, 0 + +_021: + GetMonBySpeedOrder BTLVAR_MSG_BATTLER_TEMP + CheckIgnorableAbility CHECK_NOT_HAVE, BTLSCR_MSG_TEMP, ABILITY_SOUNDPROOF, _037 + // {0}’s {1} blocks {2}! + PrintMessage pl_msg_00000368_00689, TAG_NICKNAME_ABILITY_MOVE, BTLSCR_MSG_TEMP, BTLSCR_MSG_TEMP, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + +_037: + UpdateVar OPCODE_ADD, BTLVAR_BATTLER_SPEED_TEMP, 1 + GoToIfValidMon BTLVAR_BATTLER_SPEED_TEMP, _021 + End + +_045: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/subscripts/subscript_0102.s b/res/battle/scripts/subscripts/subscript_0102.s new file mode 100644 index 0000000000..c795fa22a6 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0102.s @@ -0,0 +1,14 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0}’s perish count fell to {1}! + PrintMessage pl_msg_00000368_00439, TAG_NICKNAME_NUM, BTLSCR_MSG_TEMP, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_MSG_TEMP, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_PERISH_SONG, _015 + Call BATTLE_SUBSCRIPT_UPDATE_HP + +_015: + End diff --git a/res/battle/scripts/subscripts/subscript_0103.s b/res/battle/scripts/subscripts/subscript_0103.s new file mode 100644 index 0000000000..41d7a80058 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0103.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + Call BATTLE_SUBSCRIPT_SHOW_PREPARED_MESSAGE + End diff --git a/res/battle/scripts/subscripts/subscript_0104.s b/res/battle/scripts/subscripts/subscript_0104.s new file mode 100644 index 0000000000..dc3501371e --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0104.s @@ -0,0 +1,56 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + Call BATTLE_SUBSCRIPT_SHOW_PREPARED_MESSAGE + PlayBattleAnimationFromVar BTLSCR_PLAYER, BTLVAR_SCRIPT_TEMP + Wait + UpdateVar OPCODE_SET, BTLVAR_BATTLER_SPEED_TEMP, 0 + +_009: + GetMonBySpeedOrder BTLVAR_MSG_BATTLER_TEMP + EndOfTurnWeatherEffect BTLSCR_MSG_TEMP + CompareVarToValue OPCODE_EQU, BTLVAR_SCRIPT_TEMP, 1, _098 + CompareVarToValue OPCODE_EQU, BTLVAR_HP_CALC_TEMP, 0, _090 + CompareVarToValue OPCODE_GT, BTLVAR_HP_CALC_TEMP, 0, _076 + CheckAbility CHECK_HAVE, BTLSCR_MSG_TEMP, ABILITY_MAGIC_GUARD, _090 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_SUNNY, _045 + // {1} is buffeted by the {0}! + PrintMessage pl_msg_00000368_00285, TAG_MOVE_NICKNAME, BTLSCR_MSG_TEMP, BTLSCR_MSG_TEMP + GoTo _062 + +_045: + CompareVarToValue OPCODE_EQU, BTLVAR_SCRIPT_TEMP, 2, _057 + // {0} is hurt by its {1}! + PrintMessage pl_msg_00000368_01090, TAG_NICKNAME_ABILITY, BTLSCR_MSG_TEMP, BTLSCR_MSG_BATTLER_TEMP + GoTo _062 + +_057: + // {0} lost some HP because of its {1}! + PrintMessage pl_msg_00000368_01096, TAG_NICKNAME_ABILITY, BTLSCR_MSG_TEMP, BTLSCR_MSG_BATTLER_TEMP + +_062: + Wait + WaitButtonABTime 30 + Call BATTLE_SUBSCRIPT_UPDATE_HP + CompareVarToValue OPCODE_FLAG_NOT, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_MON_FAINTED, _090 + Call BATTLE_SUBSCRIPT_FAINT_MON + GoTo _090 + +_076: + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_SPRITE_BLINK + Call BATTLE_SUBSCRIPT_UPDATE_HP + // {0} restored HP using its {1}! + PrintMessage pl_msg_00000368_00635, TAG_NICKNAME_ABILITY, BTLSCR_MSG_TEMP, BTLSCR_MSG_BATTLER_TEMP + Wait + WaitButtonABTime 30 + +_090: + UpdateVar OPCODE_ADD, BTLVAR_BATTLER_SPEED_TEMP, 1 + GoToIfValidMon BTLVAR_BATTLER_SPEED_TEMP, _009 + End + +_098: + Call BATTLE_SUBSCRIPT_ABILITY_RESTORE_STATUS + GoTo _090 diff --git a/res/battle/scripts/subscripts/subscript_0105.s b/res/battle/scripts/subscripts/subscript_0105.s new file mode 100644 index 0000000000..69dc679b76 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0105.s @@ -0,0 +1,24 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CheckSubstitute BTLSCR_DEFENDER, _031 + CompareMonDataToValue OPCODE_NEQ, BTLSCR_DEFENDER, BATTLEMON_ATTACK_STAGE, 12, _016 + CompareMonDataToValue OPCODE_FLAG_NOT, BTLSCR_DEFENDER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_CONFUSION, _028 + GoTo _031 + +_016: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_PARAM, MOVE_SUBSCRIPT_PTR_ATTACK_UP_2_STAGES + Call BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_DEFENDER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_CONFUSION, _030 + +_028: + Call BATTLE_SUBSCRIPT_CONFUSE + +_030: + End + +_031: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/subscripts/subscript_0106.s b/res/battle/scripts/subscripts/subscript_0106.s new file mode 100644 index 0000000000..e51443c4cf --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0106.s @@ -0,0 +1,66 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CheckIgnorableAbility CHECK_HAVE, BTLSCR_SIDE_EFFECT_MON, ABILITY_OBLIVIOUS, _055 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_MISSED|MOVE_STATUS_SEMI_INVULNERABLE, _108 + TryAttract _108 + Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_ABILITY, _029 + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_HELD_ITEM, _037 + // {0} fell in love! + PrintMessage pl_msg_00000368_00162, TAG_NICKNAME, BTLSCR_SIDE_EFFECT_MON + GoTo _047 + +_029: + // {0}’s {1} infatuated {2}! + PrintMessage pl_msg_00000368_00707, TAG_NICKNAME_ABILITY_NICKNAME, BTLSCR_MSG_TEMP, BTLSCR_MSG_BATTLER_TEMP, BTLSCR_SIDE_EFFECT_MON + GoTo _047 + +_037: + PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_HELD_ITEM + Wait + // {0}’s {1} infatuated {2}! + PrintMessage pl_msg_00000368_01150, TAG_NICKNAME_ITEM_NICKNAME, BTLSCR_MSG_TEMP, BTLSCR_MSG_BATTLER_TEMP, BTLSCR_SIDE_EFFECT_MON + +_047: + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_ON, BTLVAR_SIDE_EFFECT_MON_SELF_TURN_STATUS_FLAGS, SELF_TURN_FLAG_INFATUATED + End + +_055: + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_ABILITY, _082 + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_HELD_ITEM, _098 + PrintAttackMessage + Wait + WaitButtonABTime 30 + // {0}’s {1} prevents romance! + PrintMessage pl_msg_00000368_00647, TAG_NICKNAME_ABILITY, BTLSCR_SIDE_EFFECT_MON, BTLSCR_SIDE_EFFECT_MON + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_NO_MORE_WORK + End + +_082: + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_ABILITY, _117 + // {0}’s {1} suppressed {2}’s {3}! + PrintMessage pl_msg_00000368_00727, TAG_NICKNAME_ABILITY_NICKNAME_ABILITY, BTLSCR_SIDE_EFFECT_MON, BTLSCR_SIDE_EFFECT_MON, BTLSCR_MSG_TEMP, BTLSCR_MSG_BATTLER_TEMP + Wait + WaitButtonABTime 30 + End + +_098: + // {0}’s {1} made the {2} ineffective! + PrintMessage pl_msg_00000368_01147, TAG_NICKNAME_ABILITY_ITEM, BTLSCR_SIDE_EFFECT_MON, BTLSCR_SIDE_EFFECT_MON, BTLSCR_MSG_BATTLER_TEMP + Wait + WaitButtonABTime 30 + End + +_108: + CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_ABILITY, _117 + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + +_117: + End diff --git a/res/battle/scripts/subscripts/subscript_0107.s b/res/battle/scripts/subscripts/subscript_0107.s new file mode 100644 index 0000000000..282fb5a5d7 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0107.s @@ -0,0 +1,12 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} is in love with {1}! + PrintMessage pl_msg_00000368_00165, TAG_NICKNAME_NICKNAME, BTLSCR_ATTACKER, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + PlayBattleAnimation BTLSCR_ATTACKER, BATTLE_ANIMATION_INFATUATED + Wait + End diff --git a/res/battle/scripts/subscripts/subscript_0108.s b/res/battle/scripts/subscripts/subscript_0108.s new file mode 100644 index 0000000000..0b026fc8e0 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0108.s @@ -0,0 +1,12 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + Call BATTLE_SUBSCRIPT_INFATUATED + // {0} is immobilized by love! + PrintMessage pl_msg_00000368_00172, TAG_NICKNAME, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + UnlockMoveChoice BTLSCR_ATTACKER + End diff --git a/res/battle/scripts/subscripts/subscript_0109.s b/res/battle/scripts/subscripts/subscript_0109.s new file mode 100644 index 0000000000..803324944c --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0109.s @@ -0,0 +1,10 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + TrySafeguard _003 + Call BATTLE_SUBSCRIPT_ANIMATION_PREPARED_MESSAGE + +_003: + End diff --git a/res/battle/scripts/subscripts/subscript_0110.s b/res/battle/scripts/subscripts/subscript_0110.s new file mode 100644 index 0000000000..16e0f95c25 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0110.s @@ -0,0 +1,10 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // Your team is no longer protected by Safeguard! + PrintMessage pl_msg_00000368_00203, TAG_NONE_SIDE_CONSCIOUS, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0111.s b/res/battle/scripts/subscripts/subscript_0111.s new file mode 100644 index 0000000000..b804f8e5a8 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0111.s @@ -0,0 +1,30 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateMonDataFromVar OPCODE_GET, BTLSCR_MSG_TEMP, BATTLEMON_MAX_HP, BTLVAR_CALC_TEMP + CompareMonDataToVar OPCODE_EQU, BTLSCR_MSG_TEMP, BATTLEMON_CUR_HP, BTLVAR_CALC_TEMP, _036 + PlayMoveAnimation BTLSCR_ATTACKER + Wait + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_SPRITE_BLINK + CompareVarToValue OPCODE_FLAG_NOT, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_RECOVER_HP_VISUAL, _026 + PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_RESTORE_HP + Wait + +_026: + Call BATTLE_SUBSCRIPT_UPDATE_HP + // {0} regained health! + PrintMessage pl_msg_00000368_00184, TAG_NICKNAME, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + End + +_036: + WaitButtonABTime 30 + // {0}’s HP is full! + PrintMessage pl_msg_00000368_00187, TAG_NICKNAME, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_NO_MORE_WORK + End diff --git a/res/battle/scripts/subscripts/subscript_0112.s b/res/battle/scripts/subscripts/subscript_0112.s new file mode 100644 index 0000000000..a0b8967d74 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0112.s @@ -0,0 +1,21 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_DID_NOT_HIT, _014 + PrintAttackMessage + Wait + CompareMonDataToValue OPCODE_NEQ, BTLSCR_DEFENDER, BATTLEMON_HEAL_BLOCK_TURNS, 0, _015 + Call BATTLE_SUBSCRIPT_RECOVER_HP + +_014: + End + +_015: + UpdateVar OPCODE_SET, BTLVAR_MSG_MOVE_TEMP, MOVE_HEAL_BLOCK + // {0} was prevented from healing due to {1}! + PrintMessage pl_msg_00000368_01054, TAG_NICKNAME_MOVE, BTLSCR_DEFENDER, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0113.s b/res/battle/scripts/subscripts/subscript_0113.s new file mode 100644 index 0000000000..cbc3c80c07 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0113.s @@ -0,0 +1,21 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_PLAYED_MOVE_ANIMATION, _015 + PrintAttackMessage + Wait + WaitButtonABTime 30 + // Magnitude {0}! + PrintMessage pl_msg_00000368_00448, TAG_NUMBER, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + +_015: + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_DID_NOT_HIT, _023 + PlayMoveAnimation BTLSCR_ATTACKER + Wait + +_023: + End diff --git a/res/battle/scripts/subscripts/subscript_0114.s b/res/battle/scripts/subscripts/subscript_0114.s new file mode 100644 index 0000000000..00505605fd --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0114.s @@ -0,0 +1,22 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + TryReplaceFaintedMon BTLSCR_ATTACKER, TRUE, _029 + Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION + TryRestoreStatusOnSwitch BTLSCR_ATTACKER, _013 + UpdateMonData OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_STATUS, MON_CONDITION_NONE + +_013: + DeletePokemon BTLSCR_ATTACKER + Wait + HealthbarSlideOut BTLSCR_ATTACKER + Wait + UpdateVarFromVar OPCODE_SET, BTLVAR_SWITCHED_MON, BTLVAR_ATTACKER + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_BATON_PASS + GoToSubscript BATTLE_SUBSCRIPT_SHOW_PARTY_LIST + +_029: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/subscripts/subscript_0115.s b/res/battle/scripts/subscripts/subscript_0115.s new file mode 100644 index 0000000000..7a10465262 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0115.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + RapidSpin + End diff --git a/res/battle/scripts/subscripts/subscript_0116.s b/res/battle/scripts/subscripts/subscript_0116.s new file mode 100644 index 0000000000..f208c07d3d --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0116.s @@ -0,0 +1,10 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} got free of {1}’s {2}! + PrintMessage pl_msg_00000368_00459, TAG_NICKNAME_NICKNAME_MOVE, BTLSCR_ATTACKER, BTLSCR_MSG_TEMP, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0117.s b/res/battle/scripts/subscripts/subscript_0117.s new file mode 100644 index 0000000000..307dce081d --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0117.s @@ -0,0 +1,10 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} blew away {1}! + PrintMessage pl_msg_00000368_00466, TAG_NICKNAME_MOVE, BTLSCR_ATTACKER, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0118.s b/res/battle/scripts/subscripts/subscript_0118.s new file mode 100644 index 0000000000..e0930c21f6 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0118.s @@ -0,0 +1,34 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareMonDataToValue OPCODE_FLAG_NOT, BTLSCR_ATTACKER, BATTLEMON_STATUS, MON_CONDITION_SLEEP, _009 + Call BATTLE_SUBSCRIPT_FALL_ASLEEP + GoTo _041 + +_009: + CompareMonDataToValue OPCODE_FLAG_NOT, BTLSCR_ATTACKER, BATTLEMON_STATUS, MON_CONDITION_POISON, _019 + Call BATTLE_SUBSCRIPT_POISON + GoTo _041 + +_019: + CompareMonDataToValue OPCODE_FLAG_NOT, BTLSCR_ATTACKER, BATTLEMON_STATUS, MON_CONDITION_BURN, _029 + Call BATTLE_SUBSCRIPT_BURN + GoTo _041 + +_029: + CompareMonDataToValue OPCODE_FLAG_NOT, BTLSCR_ATTACKER, BATTLEMON_STATUS, MON_CONDITION_PARALYSIS, _039 + Call BATTLE_SUBSCRIPT_PARALYZE + GoTo _041 + +_039: + Call BATTLE_SUBSCRIPT_BADLY_POISON + +_041: + CompareMonDataToValue OPCODE_FLAG_NOT, BTLSCR_DEFENDER, BATTLEMON_STATUS, MON_CONDITION_ANY, _055 + SetHealthbarStatus BTLSCR_ATTACKER, BATTLE_ANIMATION_NONE + UpdateMonData OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_STATUS, MON_CONDITION_NONE + +_055: + End diff --git a/res/battle/scripts/subscripts/subscript_0119.s b/res/battle/scripts/subscripts/subscript_0119.s new file mode 100644 index 0000000000..ab39ff574e --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0119.s @@ -0,0 +1,19 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_STAT_STAGE_CHANGE_SHOWN + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_PARAM, MOVE_SUBSCRIPT_PTR_ATTACK_UP_1_STAGE + Call BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_PARAM, MOVE_SUBSCRIPT_PTR_DEFENSE_UP_1_STAGE + Call BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_PARAM, MOVE_SUBSCRIPT_PTR_SPEED_UP_1_STAGE + Call BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_PARAM, MOVE_SUBSCRIPT_PTR_SP_ATTACK_UP_1_STAGE + Call BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_PARAM, MOVE_SUBSCRIPT_PTR_SP_DEFENSE_UP_1_STAGE + Call BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE + UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_UPDATE_STAT_STAGES + UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_STAT_STAGE_CHANGE_SHOWN + End diff --git a/res/battle/scripts/subscripts/subscript_0120.s b/res/battle/scripts/subscripts/subscript_0120.s new file mode 100644 index 0000000000..74bf13df3c --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0120.s @@ -0,0 +1,26 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareMonDataToValue OPCODE_EQU, BTLSCR_ATTACKER, BATTLEMON_ATTACK_STAGE, 12, _052 + UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_MAX_HP, BTLVAR_HP_CALC_TEMP + DivideVarByValue BTLVAR_HP_CALC_TEMP, 2 + CompareMonDataToVar OPCODE_LTE, BTLSCR_ATTACKER, BATTLEMON_CUR_HP, BTLVAR_HP_CALC_TEMP, _052 + Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION + UpdateMonData OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_ATTACK_STAGE, 12 + UpdateVar OPCODE_MUL, BTLVAR_HP_CALC_TEMP, -1 + UpdateVarFromVar OPCODE_SET, BTLVAR_MSG_BATTLER_TEMP, BTLVAR_ATTACKER + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_SPRITE_BLINK + Call BATTLE_SUBSCRIPT_UPDATE_HP + PlayBattleAnimation BTLSCR_ATTACKER, BATTLE_ANIMATION_STAT_BOOST + Wait + // {0} cut its own HP and maximized its Attack! + PrintMessage pl_msg_00000368_00449, TAG_NICKNAME, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + End + +_052: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/subscripts/subscript_0121.s b/res/battle/scripts/subscripts/subscript_0121.s new file mode 100644 index 0000000000..0b9fdc7cba --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0121.s @@ -0,0 +1,60 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PrintBufferedMessage + Wait + WaitButtonABTime 30 + CheckMoveHit BTLSCR_MSG_ATTACKER, BTLSCR_MSG_TEMP, BTLSCR_MSG_TEMP, _117 + UpdateVar OPCODE_SET, BTLVAR_MOVE_EFFECT_CHANCE, 1 + PlayMoveAnimationOnMons BTLSCR_MSG_TEMP, BTLSCR_MSG_ATTACKER, BTLSCR_MSG_TEMP + Wait + UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_PLAYED_MOVE_ANIMATION + CompareMonDataToValue OPCODE_FLAG_NOT, BTLSCR_MSG_TEMP, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_SUBSTITUTE, _058 + UpdateVar OPCODE_MUL, BTLVAR_HP_CALC_TEMP, -1 + CompareMonDataToVar OPCODE_LTE, BTLSCR_MSG_TEMP, BATTLEMON_SUBSTITUTE_HP, BTLVAR_HP_CALC_TEMP, _044 + UpdateMonDataFromVar OPCODE_SUB, BTLSCR_MSG_TEMP, BATTLEMON_SUBSTITUTE_HP, BTLVAR_HP_CALC_TEMP + GoTo _054 + +_044: + UpdateMonData OPCODE_SET, BTLSCR_MSG_TEMP, BATTLEMON_SUBSTITUTE_HP, 0 + UpdateMonData OPCODE_FLAG_OFF, BTLSCR_MSG_TEMP, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_SUBSTITUTE + +_054: + Call BATTLE_SUBSCRIPT_HIT_SUBSTITUTE + GoTo _092 + +_058: + CheckHoldOnWith1HP BTLSCR_MSG_TEMP + Call BATTLE_SUBSCRIPT_UPDATE_HP + CompareMonDataToValue OPCODE_FLAG_NOT, BTLSCR_MSG_TEMP, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_RAGE, _092 + CompareMonDataToValue OPCODE_EQU, BTLSCR_MSG_TEMP, BATTLEMON_CUR_HP, 0, _092 + CompareMonDataToValue OPCODE_EQU, BTLSCR_MSG_TEMP, BATTLEMON_ATTACK_STAGE, 12, _092 + UpdateMonData OPCODE_ADD, BTLSCR_MSG_TEMP, BATTLEMON_ATTACK_STAGE, 1 + // {0}’s rage is building! + PrintMessage pl_msg_00000368_00363, TAG_NICKNAME, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + +_092: + CompareVarToValue OPCODE_FLAG_NOT, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_ENDURED_ITEM, _116 + PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_HELD_ITEM + Wait + // {0} hung on using its {1}! + PrintMessage pl_msg_00000368_00912, TAG_NICKNAME_ITEM, BTLSCR_MSG_TEMP, BTLSCR_MSG_BATTLER_TEMP + Wait + WaitButtonABTime 30 + CheckItemHoldEffect CHECK_NOT_HAVE, BTLSCR_MSG_TEMP, HOLD_EFFECT_ENDURE, _116 + RemoveItem BTLSCR_MSG_TEMP + +_116: + End + +_117: + WaitButtonABTime 30 + // But it failed! + PrintMessage pl_msg_00000368_00796, TAG_NONE + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0122.s b/res/battle/scripts/subscripts/subscript_0122.s new file mode 100644 index 0000000000..d22fa6bf67 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0122.s @@ -0,0 +1,21 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareVarToValue OPCODE_EQU, BTLVAR_BATTLE_TYPE, BATTLE_TYPE_DOUBLES|BATTLE_TYPE_2vs2|BATTLE_TYPE_AI, _026 + TryTeleport _026 + Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION + // {0} fled from battle! + PrintMessage pl_msg_00000368_00469, TAG_NICKNAME, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + FadeOutBattle + Wait + UpdateVar OPCODE_FLAG_ON, BTLVAR_RESULT_MASK, BATTLE_RESULT_PLAYER_FLED + IncrementGameStat BTLSCR_ATTACKER, BATTLER_TYPE_SOLO_ENEMY, 99 + End + +_026: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/subscripts/subscript_0123.s b/res/battle/scripts/subscripts/subscript_0123.s new file mode 100644 index 0000000000..1be87d4981 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0123.s @@ -0,0 +1,13 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PrintAttackMessage + Wait + WaitButtonABTime 15 + PrintBufferedMessage + Wait + PlayMoveAnimation BTLSCR_ATTACKER + Wait + End diff --git a/res/battle/scripts/subscripts/subscript_0124.s b/res/battle/scripts/subscripts/subscript_0124.s new file mode 100644 index 0000000000..7b9ce3bb31 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0124.s @@ -0,0 +1,42 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PrintAttackMessage + Wait + CompareMonDataToValue OPCODE_EQU, BTLSCR_ATTACKER, BATTLEMON_STOCKPILE_COUNT, 3, _077 + PlayMoveAnimation BTLSCR_ATTACKER + Wait + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_PLAYED_MOVE_ANIMATION + UpdateMonData OPCODE_ADD, BTLSCR_ATTACKER, BATTLEMON_STOCKPILE_COUNT, 1 + UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_STOCKPILE_COUNT, BTLVAR_MSG_TEMP + // {0} stockpiled {1}! + PrintMessage pl_msg_00000368_00317, TAG_NICKNAME_NUM, BTLSCR_ATTACKER, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_STAT_STAGE_CHANGE_SHOWN + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_PARAM, MOVE_SUBSCRIPT_PTR_DEFENSE_UP_1_STAGE + Call BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_FAIL_STAT_STAGE_CHANGE, _052 + UpdateMonData OPCODE_ADD, BTLSCR_ATTACKER, BATTLEMON_STOCKPILE_DEF_BOOSTS, 1 + +_052: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_PARAM, MOVE_SUBSCRIPT_PTR_SP_DEFENSE_UP_1_STAGE + Call BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_FAIL_STAT_STAGE_CHANGE, _068 + UpdateMonData OPCODE_ADD, BTLSCR_ATTACKER, BATTLEMON_STOCKPILE_SPDEF_BOOSTS, 1 + +_068: + UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_UPDATE_STAT_STAGES + UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_STAT_STAGE_CHANGE_SHOWN + End + +_077: + WaitButtonABTime 30 + // {0} can’t stockpile any more! + PrintMessage pl_msg_00000368_00320, TAG_NICKNAME_NUM, BTLSCR_ATTACKER, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_NO_MORE_WORK + End diff --git a/res/battle/scripts/subscripts/subscript_0125.s b/res/battle/scripts/subscripts/subscript_0125.s new file mode 100644 index 0000000000..2ab90e2c5a --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0125.s @@ -0,0 +1,13 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PrintAttackMessage + Wait + Call BATTLE_SUBSCRIPT_RECOVER_HP + // {0}’s stockpiled effect wore off! + PrintMessage pl_msg_00000368_00994, TAG_NICKNAME, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0126.s b/res/battle/scripts/subscripts/subscript_0126.s new file mode 100644 index 0000000000..c92a915c62 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0126.s @@ -0,0 +1,16 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareVarToValue OPCODE_NEQ, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_DIRECT, _009 + PrintAttackMessage + Wait + PlayMoveAnimation BTLSCR_ATTACKER + Wait + +_009: + PrintBufferedMessage + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0127.s b/res/battle/scripts/subscripts/subscript_0127.s new file mode 100644 index 0000000000..b67c830d23 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0127.s @@ -0,0 +1,18 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_DEFENDER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_TORMENT, _025 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_MISSED|MOVE_STATUS_SEMI_INVULNERABLE, _025 + Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION + UpdateMonData OPCODE_FLAG_ON, BTLSCR_DEFENDER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_TORMENT + // {0} was subjected to Torment! + PrintMessage pl_msg_00000368_00494, TAG_NICKNAME, BTLSCR_DEFENDER + Wait + WaitButtonABTime 30 + End + +_025: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/subscripts/subscript_0128.s b/res/battle/scripts/subscripts/subscript_0128.s new file mode 100644 index 0000000000..33455d0ea9 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0128.s @@ -0,0 +1,24 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CheckSubstitute BTLSCR_DEFENDER, _031 + CompareMonDataToValue OPCODE_NEQ, BTLSCR_DEFENDER, BATTLEMON_SP_ATTACK_STAGE, 12, _016 + CompareMonDataToValue OPCODE_FLAG_NOT, BTLSCR_DEFENDER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_CONFUSION, _028 + GoTo _031 + +_016: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_PARAM, MOVE_SUBSCRIPT_PTR_SP_ATTACK_UP_1_STAGE + Call BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_DEFENDER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_CONFUSION, _030 + +_028: + Call BATTLE_SUBSCRIPT_CONFUSE + +_030: + End + +_031: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/subscripts/subscript_0129.s b/res/battle/scripts/subscripts/subscript_0129.s new file mode 100644 index 0000000000..3aa7b82470 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0129.s @@ -0,0 +1,43 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PrintAttackMessage + Wait + CompareMonDataToValue OPCODE_NEQ, BTLSCR_DEFENDER, BATTLEMON_ATTACK_STAGE, 0, _013 + CompareMonDataToValue OPCODE_EQU, BTLSCR_DEFENDER, BATTLEMON_SP_ATTACK_STAGE, 0, _077 + +_013: + PlayMoveAnimation BTLSCR_ATTACKER + Wait + CheckSubstitute BTLSCR_DEFENDER, _062 + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_ATTACK_MESSAGE|SYSCTL_PLAYED_MOVE_ANIMATION + UpdateVarFromVar OPCODE_SET, BTLVAR_SIDE_EFFECT_MON, BTLVAR_DEFENDER + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_STAT_STAGE_CHANGE_SHOWN + CompareMonDataToValue OPCODE_EQU, BTLSCR_DEFENDER, BATTLEMON_ATTACK_STAGE, 0, _043 + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_PARAM, MOVE_SUBSCRIPT_PTR_ATTACK_DOWN_2_STAGES + Call BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE + +_043: + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_TURN_OFF_MESSAGES + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_PARAM, MOVE_SUBSCRIPT_PTR_SP_ATTACK_DOWN_2_STAGES + Call BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE + UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_UPDATE_STAT_STAGES + UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_STAT_STAGE_CHANGE_SHOWN + End + +_062: + PrintAttackMessage + Wait + WaitButtonABTime 30 + // But it had no effect! + PrintMessage pl_msg_00000368_00607, TAG_NONE + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_NO_MORE_WORK + End + +_077: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/subscripts/subscript_0130.s b/res/battle/scripts/subscripts/subscript_0130.s new file mode 100644 index 0000000000..edada26cd4 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0130.s @@ -0,0 +1,15 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareMonDataToValue OPCODE_EQU, BTLSCR_DEFENDER, BATTLEMON_CUR_HP, 0, _020 + UpdateMonData OPCODE_FLAG_OFF, BTLSCR_DEFENDER, BATTLEMON_STATUS, MON_CONDITION_PARALYSIS + // {0} was healed of paralysis! + PrintMessage pl_msg_00000368_00136, TAG_NICKNAME, BTLSCR_DEFENDER + Wait + SetHealthbarStatus BTLSCR_DEFENDER, BATTLE_ANIMATION_NONE + WaitButtonABTime 30 + +_020: + End diff --git a/res/battle/scripts/subscripts/subscript_0131.s b/res/battle/scripts/subscripts/subscript_0131.s new file mode 100644 index 0000000000..51a6e8a9ba --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0131.s @@ -0,0 +1,15 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateMonData OPCODE_FLAG_ON, BTLSCR_ATTACKER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_CHARGE + UpdateMonData OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_CHARGED_TURNS, 2 + // {0} began charging power! + PrintMessage pl_msg_00000368_00487, TAG_NICKNAME, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + UpdateVarFromVar OPCODE_SET, BTLVAR_SIDE_EFFECT_MON, BTLVAR_ATTACKER + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_PARAM, MOVE_SUBSCRIPT_PTR_SP_DEFENSE_UP_1_STAGE + Call BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE + End diff --git a/res/battle/scripts/subscripts/subscript_0132.s b/res/battle/scripts/subscripts/subscript_0132.s new file mode 100644 index 0000000000..53e2f4044a --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0132.s @@ -0,0 +1,19 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareMonDataToValue OPCODE_NEQ, BTLSCR_DEFENDER, BATTLEMON_TAUNTED_TURNS, 0, _028 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_MISSED|MOVE_STATUS_SEMI_INVULNERABLE, _028 + Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION + Random 2, 3 + UpdateMonDataFromVar OPCODE_SET, BTLSCR_DEFENDER, BATTLEMON_TAUNTED_TURNS, BTLVAR_CALC_TEMP + // {0} fell for the taunt! + PrintMessage pl_msg_00000368_00500, TAG_NICKNAME, BTLSCR_DEFENDER + Wait + WaitButtonABTime 30 + End + +_028: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/subscripts/subscript_0133.s b/res/battle/scripts/subscripts/subscript_0133.s new file mode 100644 index 0000000000..e8a0c2716b --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0133.s @@ -0,0 +1,11 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} can’t use {1} after the taunt! + PrintMessage pl_msg_00000368_00613, TAG_NICKNAME_MOVE, BTLSCR_ATTACKER, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + UnlockMoveChoice BTLSCR_ATTACKER + End diff --git a/res/battle/scripts/subscripts/subscript_0134.s b/res/battle/scripts/subscripts/subscript_0134.s new file mode 100644 index 0000000000..9626dcd4b1 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0134.s @@ -0,0 +1,52 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_MISSED|MOVE_STATUS_SEMI_INVULNERABLE, _118 + CheckSubstitute BTLSCR_DEFENDER, _118 + CompareMonDataToValue OPCODE_EQU, BTLSCR_DEFENDER, BATTLEMON_ABILITY, ABILITY_MULTITYPE, _118 + CompareMonDataToValue OPCODE_EQU, BTLSCR_ATTACKER, BATTLEMON_ABILITY, ABILITY_MULTITYPE, _118 + CompareMonDataToValue OPCODE_EQU, BTLSCR_ATTACKER, BATTLEMON_HELD_ITEM, ITEM_GRISEOUS_ORB, _118 + CompareMonDataToValue OPCODE_EQU, BTLSCR_DEFENDER, BATTLEMON_HELD_ITEM, ITEM_GRISEOUS_ORB, _118 + CompareMonDataToValue OPCODE_NEQ, BTLSCR_DEFENDER, BATTLEMON_QUICK_CLAW, 0, _118 + CompareMonDataToValue OPCODE_NEQ, BTLSCR_DEFENDER, BATTLEMON_CUSTAP_BERRY, 0, _118 + TrySwapItems _118, _104 + Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION + // {0} switched items with its target! + PrintMessage pl_msg_00000368_00510, TAG_NICKNAME, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_HELD_ITEM, BTLVAR_SCRIPT_TEMP + UpdateMonDataFromVar OPCODE_GET, BTLSCR_DEFENDER, BATTLEMON_HELD_ITEM, BTLVAR_CALC_TEMP + UpdateMonDataFromVar OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_HELD_ITEM, BTLVAR_CALC_TEMP + UpdateMonDataFromVar OPCODE_SET, BTLSCR_DEFENDER, BATTLEMON_HELD_ITEM, BTLVAR_SCRIPT_TEMP + CompareMonDataToValue OPCODE_EQU, BTLSCR_ATTACKER, BATTLEMON_HELD_ITEM, ITEM_NONE, _089 + // {0} obtained one {1}. + PrintMessage pl_msg_00000368_00513, TAG_NICKNAME_ITEM, BTLSCR_ATTACKER, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + +_089: + CompareMonDataToValue OPCODE_EQU, BTLSCR_DEFENDER, BATTLEMON_HELD_ITEM, ITEM_NONE, _103 + // {0} obtained one {1}. + PrintMessage pl_msg_00000368_00513, TAG_NICKNAME_ITEM, BTLSCR_DEFENDER, BTLSCR_DEFENDER + Wait + WaitButtonABTime 30 + +_103: + End + +_104: + PrintAttackMessage + Wait + WaitButtonABTime 30 + // {0}’s {1} made {2} ineffective! + PrintMessage pl_msg_00000368_00714, TAG_NICKNAME_ABILITY_MOVE, BTLSCR_DEFENDER, BTLSCR_DEFENDER, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + End + +_118: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/subscripts/subscript_0135.s b/res/battle/scripts/subscripts/subscript_0135.s new file mode 100644 index 0000000000..a7cadd1412 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0135.s @@ -0,0 +1,33 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_MISSED|MOVE_STATUS_SEMI_INVULNERABLE, _091 + CompareMonDataToValue OPCODE_EQU, BTLSCR_DEFENDER, BATTLEMON_ABILITY, ABILITY_WONDER_GUARD, _091 + CompareMonDataToValue OPCODE_EQU, BTLSCR_DEFENDER, BATTLEMON_ABILITY, ABILITY_MULTITYPE, _091 + CompareMonDataToValue OPCODE_EQU, BTLSCR_ATTACKER, BATTLEMON_ABILITY, ABILITY_MULTITYPE, _091 + CompareMonDataToValue OPCODE_EQU, BTLSCR_DEFENDER, BATTLEMON_ABILITY, ABILITY_NONE, _091 + Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION + UpdateVarFromVar OPCODE_SET, BTLVAR_SCRIPT_TEMP, BTLVAR_TOTAL_TURNS + UpdateVar OPCODE_BITWISE_AND, BTLVAR_SCRIPT_TEMP, 1 + UpdateMonDataFromVar OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_TRUANT, BTLVAR_SCRIPT_TEMP + UpdateMonDataFromVar OPCODE_GET, BTLSCR_DEFENDER, BATTLEMON_ABILITY, BTLVAR_SCRIPT_TEMP + UpdateMonDataFromVar OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_ABILITY, BTLVAR_SCRIPT_TEMP + CompareVarToValue OPCODE_NEQ, BTLVAR_SCRIPT_TEMP, 112, _081 + UpdateVarFromVar OPCODE_SET, BTLVAR_SCRIPT_TEMP, BTLVAR_TOTAL_TURNS + UpdateVar OPCODE_ADD, BTLVAR_SCRIPT_TEMP, 1 + UpdateMonDataFromVar OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_SLOW_START_TURN_NUMBER, BTLVAR_SCRIPT_TEMP + UpdateMonData OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_SLOW_START_ANNOUNCED, 0 + UpdateMonData OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_SLOW_START_FINISHED, 0 + +_081: + // {0} copied {1}’s {2}! + PrintMessage pl_msg_00000368_00523, TAG_NICKNAME_NICKNAME_ABILITY, BTLSCR_ATTACKER, BTLSCR_DEFENDER, BTLSCR_DEFENDER + Wait + WaitButtonABTime 30 + End + +_091: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/subscripts/subscript_0136.s b/res/battle/scripts/subscripts/subscript_0136.s new file mode 100644 index 0000000000..df0ce1cba2 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0136.s @@ -0,0 +1,36 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PrintBufferedMessage + Wait + WaitButtonABTime 30 + CompareMonDataToValue OPCODE_NEQ, BTLSCR_MSG_TEMP, BATTLEMON_HEAL_BLOCK_TURNS, 0, _048 + UpdateMonDataFromVar OPCODE_GET, BTLSCR_MSG_TEMP, BATTLEMON_MAX_HP, BTLVAR_CALC_TEMP + CompareMonDataToVar OPCODE_EQU, BTLSCR_MSG_TEMP, BATTLEMON_CUR_HP, BTLVAR_CALC_TEMP, _038 + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_SPRITE_BLINK + PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_RESTORE_HP + Wait + Call BATTLE_SUBSCRIPT_UPDATE_HP + // {0} regained health! + PrintMessage pl_msg_00000368_00184, TAG_NICKNAME, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + End + +_038: + WaitButtonABTime 30 + // {0}’s HP is full! + PrintMessage pl_msg_00000368_00187, TAG_NICKNAME, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + End + +_048: + UpdateVar OPCODE_SET, BTLVAR_MSG_MOVE_TEMP, MOVE_HEAL_BLOCK + // {0} was prevented from healing due to {1}! + PrintMessage pl_msg_00000368_01054, TAG_NICKNAME_MOVE, BTLSCR_MSG_TEMP, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0137.s b/res/battle/scripts/subscripts/subscript_0137.s new file mode 100644 index 0000000000..1f292914d5 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0137.s @@ -0,0 +1,23 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_DAMAGE_INGRAIN + Wait + // {0} absorbed nutrients with its roots! + PrintMessage pl_msg_00000368_00539, TAG_NICKNAME, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + UpdateMonDataFromVar OPCODE_GET, BTLSCR_MSG_TEMP, BATTLEMON_MAX_HP, BTLVAR_HP_CALC_TEMP + DivideVarByValue BTLVAR_HP_CALC_TEMP, 16 + CheckItemHoldEffect CHECK_NOT_HAVE, BTLSCR_MSG_TEMP, HOLD_EFFECT_LEECH_BOOST, _038 + GetItemEffectParam BTLSCR_MSG_TEMP, BTLVAR_CALC_TEMP + UpdateVar OPCODE_ADD, BTLVAR_CALC_TEMP, 0x00000064 + UpdateVarFromVar OPCODE_MUL, BTLVAR_HP_CALC_TEMP, BTLVAR_CALC_TEMP + UpdateVar OPCODE_DIV, BTLVAR_HP_CALC_TEMP, 100 + +_038: + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_SPRITE_BLINK + Call BATTLE_SUBSCRIPT_UPDATE_HP + End diff --git a/res/battle/scripts/subscripts/subscript_0138.s b/res/battle/scripts/subscripts/subscript_0138.s new file mode 100644 index 0000000000..b2897c7ca7 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0138.s @@ -0,0 +1,13 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_STAT_STAGE_CHANGE_SHOWN + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_PARAM, MOVE_SUBSCRIPT_PTR_ATTACK_DOWN_1_STAGE + Call BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_PARAM, MOVE_SUBSCRIPT_PTR_DEFENSE_DOWN_1_STAGE + Call BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE + UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_UPDATE_STAT_STAGES + UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_STAT_STAGE_CHANGE_SHOWN + End diff --git a/res/battle/scripts/subscripts/subscript_0139.s b/res/battle/scripts/subscripts/subscript_0139.s new file mode 100644 index 0000000000..1809e9a49e --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0139.s @@ -0,0 +1,15 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PrintAttackMessage + Wait + WaitButtonABTime 15 + // {0}’s {1} was bounced back by Magic Coat! + PrintMessage pl_msg_00000368_00574, TAG_NICKNAME_MOVE, BTLSCR_ATTACKER, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + MagicCoat + UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_PLAYED_MOVE_ANIMATION + End diff --git a/res/battle/scripts/subscripts/subscript_0140.s b/res/battle/scripts/subscripts/subscript_0140.s new file mode 100644 index 0000000000..d870cc7c05 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0140.s @@ -0,0 +1,20 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + TryBreakScreens _015 + UpdateVar OPCODE_SET, BTLVAR_MOVE_EFFECT_CHANCE, 1 + Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION + // It shattered the barrier! + PrintMessage pl_msg_00000368_00606, TAG_NONE + Wait + WaitButtonABTime 30 + GoTo _022 + +_015: + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_DID_NOT_HIT, _022 + Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION + +_022: + End diff --git a/res/battle/scripts/subscripts/subscript_0141.s b/res/battle/scripts/subscripts/subscript_0141.s new file mode 100644 index 0000000000..11988a3572 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0141.s @@ -0,0 +1,56 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CheckIgnorableAbility CHECK_HAVE, BTLSCR_SIDE_EFFECT_MON, ABILITY_INSOMNIA, _066 + CheckIgnorableAbility CHECK_HAVE, BTLSCR_SIDE_EFFECT_MON, ABILITY_VITAL_SPIRIT, _066 + CheckIgnoreWeather _021 + CompareVarToValue OPCODE_FLAG_NOT, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_SUNNY, _021 + CheckIgnorableAbility CHECK_HAVE, BTLSCR_SIDE_EFFECT_MON, ABILITY_LEAF_GUARD, _066 + +_021: + PrintAttackMessage + Wait + CheckSubstitute BTLSCR_SIDE_EFFECT_MON, _077 + CheckAbility CHECK_HAVE, BTLSCR_SIDE_EFFECT_MON, ABILITY_SOUNDPROOF, _036 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_UPROAR, _077 + +_036: + CompareMonDataToValue OPCODE_NEQ, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_STATUS, MON_CONDITION_NONE, _077 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_SIDE_CONDITIONS_EFFECT_MON, SIDE_CONDITION_SAFEGUARD, _083 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_MISSED|MOVE_STATUS_SEMI_INVULNERABLE, _077 + TryYawn _077 + PlayMoveAnimation BTLSCR_ATTACKER + Wait + // {0} made {1} drowsy! + PrintMessage pl_msg_00000368_00545, TAG_NICKNAME_NICKNAME, BTLSCR_ATTACKER, BTLSCR_SIDE_EFFECT_MON + Wait + WaitButtonABTime 30 + End + +_066: + PrintAttackMessage + Wait + WaitButtonABTime 30 + // {0}’s {1} made it ineffective! + PrintMessage pl_msg_00000368_00734, TAG_NICKNAME_ABILITY, BTLSCR_SIDE_EFFECT_MON, BTLSCR_SIDE_EFFECT_MON + GoTo _089 + +_077: + WaitButtonABTime 30 + Call BATTLE_SUBSCRIPT_BUT_IT_FAILED + GoTo _096 + +_083: + WaitButtonABTime 30 + // {0} is protected by Safeguard! + PrintMessage pl_msg_00000368_00200, TAG_NICKNAME, BTLSCR_SIDE_EFFECT_MON + +_089: + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_NO_MORE_WORK + +_096: + End diff --git a/res/battle/scripts/subscripts/subscript_0142.s b/res/battle/scripts/subscripts/subscript_0142.s new file mode 100644 index 0000000000..69677fd913 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0142.s @@ -0,0 +1,17 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CheckSubstitute BTLSCR_DEFENDER, _032 + CompareMonDataToValue OPCODE_EQU, BTLSCR_DEFENDER, BATTLEMON_ABILITY, ABILITY_MULTITYPE, _032 + CompareMonDataToValue OPCODE_EQU, BTLSCR_DEFENDER, BATTLEMON_HELD_ITEM, ITEM_GRISEOUS_ORB, _032 + CompareMonDataToValue OPCODE_NEQ, BTLSCR_DEFENDER, BATTLEMON_QUICK_CLAW, 0, _032 + CompareMonDataToValue OPCODE_NEQ, BTLSCR_DEFENDER, BATTLEMON_CUSTAP_BERRY, 0, _032 + TryKnockOff _032 + PrintBufferedMessage + Wait + WaitButtonABTime 30 + +_032: + End diff --git a/res/battle/scripts/subscripts/subscript_0143.s b/res/battle/scripts/subscripts/subscript_0143.s new file mode 100644 index 0000000000..b1f9a0e987 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0143.s @@ -0,0 +1,50 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_MISSED|MOVE_STATUS_SEMI_INVULNERABLE, _156 + CompareMonDataToValue OPCODE_EQU, BTLSCR_ATTACKER, BATTLEMON_ABILITY, ABILITY_WONDER_GUARD, _156 + CompareMonDataToValue OPCODE_EQU, BTLSCR_DEFENDER, BATTLEMON_ABILITY, ABILITY_WONDER_GUARD, _156 + CompareMonDataToValue OPCODE_EQU, BTLSCR_ATTACKER, BATTLEMON_ABILITY, ABILITY_MULTITYPE, _156 + CompareMonDataToValue OPCODE_EQU, BTLSCR_DEFENDER, BATTLEMON_ABILITY, ABILITY_MULTITYPE, _156 + CompareMonDataToValue OPCODE_EQU, BTLSCR_ATTACKER, BATTLEMON_HELD_ITEM, ITEM_GRISEOUS_ORB, _156 + CompareMonDataToValue OPCODE_EQU, BTLSCR_DEFENDER, BATTLEMON_HELD_ITEM, ITEM_GRISEOUS_ORB, _156 + CompareMonDataToValue OPCODE_NEQ, BTLSCR_ATTACKER, BATTLEMON_ABILITY, ABILITY_NONE, _052 + CompareMonDataToValue OPCODE_EQU, BTLSCR_DEFENDER, BATTLEMON_ABILITY, ABILITY_NONE, _156 + +_052: + Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION + UpdateVarFromVar OPCODE_SET, BTLVAR_SCRIPT_TEMP, BTLVAR_TOTAL_TURNS + UpdateVar OPCODE_BITWISE_AND, BTLVAR_SCRIPT_TEMP, 1 + UpdateMonDataFromVar OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_TRUANT, BTLVAR_SCRIPT_TEMP + UpdateMonDataFromVar OPCODE_SET, BTLSCR_DEFENDER, BATTLEMON_TRUANT, BTLVAR_SCRIPT_TEMP + UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_ABILITY, BTLVAR_CALC_TEMP + UpdateMonDataFromVar OPCODE_GET, BTLSCR_DEFENDER, BATTLEMON_ABILITY, BTLVAR_SCRIPT_TEMP + UpdateMonDataFromVar OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_ABILITY, BTLVAR_SCRIPT_TEMP + UpdateMonDataFromVar OPCODE_SET, BTLSCR_DEFENDER, BATTLEMON_ABILITY, BTLVAR_CALC_TEMP + CompareVarToValue OPCODE_NEQ, BTLVAR_SCRIPT_TEMP, 112, _120 + UpdateVarFromVar OPCODE_SET, BTLVAR_SCRIPT_TEMP, BTLVAR_TOTAL_TURNS + UpdateVar OPCODE_ADD, BTLVAR_SCRIPT_TEMP, 1 + UpdateMonDataFromVar OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_SLOW_START_TURN_NUMBER, BTLVAR_SCRIPT_TEMP + UpdateMonData OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_SLOW_START_ANNOUNCED, 0 + UpdateMonData OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_SLOW_START_FINISHED, 0 + +_120: + CompareVarToValue OPCODE_NEQ, BTLVAR_CALC_TEMP, 0x00000070, _148 + UpdateVarFromVar OPCODE_SET, BTLVAR_SCRIPT_TEMP, BTLVAR_TOTAL_TURNS + UpdateVar OPCODE_ADD, BTLVAR_SCRIPT_TEMP, 1 + UpdateMonDataFromVar OPCODE_SET, BTLSCR_DEFENDER, BATTLEMON_SLOW_START_TURN_NUMBER, BTLVAR_SCRIPT_TEMP + UpdateMonData OPCODE_SET, BTLSCR_DEFENDER, BATTLEMON_SLOW_START_ANNOUNCED, 0 + UpdateMonData OPCODE_SET, BTLSCR_DEFENDER, BATTLEMON_SLOW_START_FINISHED, 0 + +_148: + // {0} swapped abilities with its target! + PrintMessage pl_msg_00000368_00559, TAG_NICKNAME, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + End + +_156: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/subscripts/subscript_0144.s b/res/battle/scripts/subscripts/subscript_0144.s new file mode 100644 index 0000000000..b6b718dd44 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0144.s @@ -0,0 +1,11 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} can’t use the sealed {1}! + PrintMessage pl_msg_00000368_00616, TAG_NICKNAME_MOVE, BTLSCR_ATTACKER, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + UnlockMoveChoice BTLSCR_ATTACKER + End diff --git a/res/battle/scripts/subscripts/subscript_0145.s b/res/battle/scripts/subscripts/subscript_0145.s new file mode 100644 index 0000000000..26bb5a67a9 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0145.s @@ -0,0 +1,18 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareMonDataToValue OPCODE_FLAG_NOT, BTLSCR_ATTACKER, BATTLEMON_STATUS, MON_CONDITION_FACADE_BOOST, _023 + Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION + UpdateMonData OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_STATUS, MON_CONDITION_NONE + // {0}’s status returned to normal! + PrintMessage pl_msg_00000368_00491, TAG_NICKNAME, BTLSCR_ATTACKER + Wait + SetHealthbarStatus BTLSCR_ATTACKER, BATTLE_ANIMATION_NONE + WaitButtonABTime 30 + End + +_023: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/subscripts/subscript_0146.s b/res/battle/scripts/subscripts/subscript_0146.s new file mode 100644 index 0000000000..186618b7b9 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0146.s @@ -0,0 +1,28 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PrintAttackMessage + Wait + WaitButtonABTime 15 + UpdateVarFromVar OPCODE_SET, BTLVAR_MSG_ATTACKER, BTLVAR_ATTACKER + UpdateVarFromVar OPCODE_SET, BTLVAR_DEFENDER, BTLVAR_ATTACKER + UpdateVarFromVar OPCODE_SET, BTLVAR_ATTACKER, BTLVAR_MSG_BATTLER_TEMP + UpdateVar OPCODE_SET, BTLVAR_MOVE_EFFECT_CHANCE, 1 + UpdateVar OPCODE_SET, BTLVAR_MSG_MOVE_TEMP, MOVE_SNATCH + PlayMoveAnimation BTLSCR_MSG_TEMP + Wait + // {0} snatched {1}’s move! + PrintMessage pl_msg_00000368_00580, TAG_NICKNAME_NICKNAME, BTLSCR_MSG_TEMP, BTLSCR_MSG_ATTACKER + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_SET, BTLVAR_MOVE_EFFECT_CHANCE, 0 + UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_PLAYED_MOVE_ANIMATION + CompareVarToValue OPCODE_EQU, BTLVAR_CURRENT_MOVE, MOVE_ACUPRESSURE, _052 + UpdateVarFromVar OPCODE_SET, BTLVAR_DEFENDER, BTLVAR_MSG_ATTACKER + End + +_052: + UpdateVarFromVar OPCODE_SET, BTLVAR_DEFENDER, BTLVAR_ATTACKER + End diff --git a/res/battle/scripts/subscripts/subscript_0147.s b/res/battle/scripts/subscripts/subscript_0147.s new file mode 100644 index 0000000000..865a7ca680 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0147.s @@ -0,0 +1,22 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CheckAbility CHECK_HAVE, BTLSCR_ATTACKER, ABILITY_ROCK_HEAD, _038 + CheckAbility CHECK_HAVE, BTLSCR_ATTACKER, ABILITY_MAGIC_GUARD, _038 + UpdateVarFromVar OPCODE_SET, BTLVAR_MSG_BATTLER_TEMP, BTLVAR_ATTACKER + UpdateVarFromVar OPCODE_SET, BTLVAR_HP_CALC_TEMP, BTLVAR_HIT_DAMAGE + CompareVarToValue OPCODE_EQU, BTLVAR_HP_CALC_TEMP, 0, _025 + DivideVarByValue BTLVAR_HP_CALC_TEMP, 3 + +_025: + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_SPRITE_BLINK + Call BATTLE_SUBSCRIPT_UPDATE_HP + // {0} is hit with recoil! + PrintMessage pl_msg_00000368_00279, TAG_NICKNAME, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + +_038: + End diff --git a/res/battle/scripts/subscripts/subscript_0148.s b/res/battle/scripts/subscripts/subscript_0148.s new file mode 100644 index 0000000000..2d8653b493 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0148.s @@ -0,0 +1,34 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareMonDataToValue OPCODE_NEQ, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_ATTACK_STAGE, 0, _011 + CompareMonDataToValue OPCODE_EQU, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_DEFENSE_STAGE, 0, _050 + +_011: + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_MISSED|MOVE_STATUS_SEMI_INVULNERABLE, _045 + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_STAT_STAGE_CHANGE_SHOWN + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_PARAM, MOVE_SUBSCRIPT_PTR_ATTACK_DOWN_1_STAGE + Call BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_TURN_OFF_MESSAGES + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_PARAM, MOVE_SUBSCRIPT_PTR_DEFENSE_DOWN_1_STAGE + Call BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE + UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_UPDATE_STAT_STAGES + UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_STAT_STAGE_CHANGE_SHOWN + End + +_045: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End + +_050: + PrintAttackMessage + Wait + WaitButtonABTime 30 + // {0}’s stats won’t go any lower! + PrintMessage pl_msg_00000368_00771, TAG_NICKNAME, BTLSCR_SIDE_EFFECT_MON + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_NO_MORE_WORK + End diff --git a/res/battle/scripts/subscripts/subscript_0149.s b/res/battle/scripts/subscripts/subscript_0149.s new file mode 100644 index 0000000000..8727ceb5f7 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0149.s @@ -0,0 +1,31 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareMonDataToValue OPCODE_NEQ, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_DEFENSE_STAGE, 12, _011 + CompareMonDataToValue OPCODE_EQU, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_SP_DEFENSE_STAGE, 12, _046 + +_011: + Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_TURN_OFF_MESSAGES + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_ATTACK_MESSAGE|SYSCTL_PLAYED_MOVE_ANIMATION + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_STAT_STAGE_CHANGE_SHOWN + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_PARAM, MOVE_SUBSCRIPT_PTR_DEFENSE_UP_1_STAGE + Call BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_PARAM, MOVE_SUBSCRIPT_PTR_SP_DEFENSE_UP_1_STAGE + Call BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE + UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_UPDATE_STAT_STAGES + UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_STAT_STAGE_CHANGE_SHOWN + End + +_046: + PrintAttackMessage + Wait + WaitButtonABTime 30 + // {0}’s stats won’t go any higher! + PrintMessage pl_msg_00000368_00768, TAG_NICKNAME, BTLSCR_SIDE_EFFECT_MON + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_NO_MORE_WORK + End diff --git a/res/battle/scripts/subscripts/subscript_0150.s b/res/battle/scripts/subscripts/subscript_0150.s new file mode 100644 index 0000000000..f74be89d8d --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0150.s @@ -0,0 +1,31 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareMonDataToValue OPCODE_NEQ, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_ATTACK_STAGE, 12, _011 + CompareMonDataToValue OPCODE_EQU, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_DEFENSE_STAGE, 12, _046 + +_011: + Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_TURN_OFF_MESSAGES + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_ATTACK_MESSAGE|SYSCTL_PLAYED_MOVE_ANIMATION + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_STAT_STAGE_CHANGE_SHOWN + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_PARAM, MOVE_SUBSCRIPT_PTR_ATTACK_UP_1_STAGE + Call BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_PARAM, MOVE_SUBSCRIPT_PTR_DEFENSE_UP_1_STAGE + Call BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE + UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_UPDATE_STAT_STAGES + UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_STAT_STAGE_CHANGE_SHOWN + End + +_046: + PrintAttackMessage + Wait + WaitButtonABTime 30 + // {0}’s stats won’t go any higher! + PrintMessage pl_msg_00000368_00768, TAG_NICKNAME, BTLSCR_SIDE_EFFECT_MON + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_NO_MORE_WORK + End diff --git a/res/battle/scripts/subscripts/subscript_0151.s b/res/battle/scripts/subscripts/subscript_0151.s new file mode 100644 index 0000000000..0f4d77dab5 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0151.s @@ -0,0 +1,31 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareMonDataToValue OPCODE_NEQ, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_SP_ATTACK_STAGE, 12, _011 + CompareMonDataToValue OPCODE_EQU, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_SP_DEFENSE_STAGE, 12, _046 + +_011: + Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_TURN_OFF_MESSAGES + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_ATTACK_MESSAGE|SYSCTL_PLAYED_MOVE_ANIMATION + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_STAT_STAGE_CHANGE_SHOWN + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_PARAM, MOVE_SUBSCRIPT_PTR_SP_ATTACK_UP_1_STAGE + Call BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_PARAM, MOVE_SUBSCRIPT_PTR_SP_DEFENSE_UP_1_STAGE + Call BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE + UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_UPDATE_STAT_STAGES + UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_STAT_STAGE_CHANGE_SHOWN + End + +_046: + PrintAttackMessage + Wait + WaitButtonABTime 30 + // {0}’s stats won’t go any higher! + PrintMessage pl_msg_00000368_00768, TAG_NICKNAME, BTLSCR_SIDE_EFFECT_MON + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_NO_MORE_WORK + End diff --git a/res/battle/scripts/subscripts/subscript_0152.s b/res/battle/scripts/subscripts/subscript_0152.s new file mode 100644 index 0000000000..1ad4893489 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0152.s @@ -0,0 +1,31 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareMonDataToValue OPCODE_NEQ, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_ATTACK_STAGE, 12, _011 + CompareMonDataToValue OPCODE_EQU, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_SPEED_STAGE, 12, _046 + +_011: + Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_TURN_OFF_MESSAGES + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_ATTACK_MESSAGE|SYSCTL_PLAYED_MOVE_ANIMATION + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_STAT_STAGE_CHANGE_SHOWN + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_PARAM, MOVE_SUBSCRIPT_PTR_ATTACK_UP_1_STAGE + Call BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_PARAM, MOVE_SUBSCRIPT_PTR_SPEED_UP_1_STAGE + Call BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE + UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_UPDATE_STAT_STAGES + UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_STAT_STAGE_CHANGE_SHOWN + End + +_046: + PrintAttackMessage + Wait + WaitButtonABTime 30 + // {0}’s stats won’t go any higher! + PrintMessage pl_msg_00000368_00768, TAG_NICKNAME, BTLSCR_SIDE_EFFECT_MON + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_NO_MORE_WORK + End diff --git a/res/battle/scripts/subscripts/subscript_0153.s b/res/battle/scripts/subscripts/subscript_0153.s new file mode 100644 index 0000000000..4d0c24eb2c --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0153.s @@ -0,0 +1,120 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + Call BATTLE_SUBSCRIPT_PUSH_ATTACKER_AND_DEFENDER + +_001: + TryPursuit _238 + UpdateVar OPCODE_SET, BTLVAR_POWER_MULTI, 20 + CalcCrit + CalcDamage + ApplyTypeEffectiveness + UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_ATTACK_MESSAGE + UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_PLAYED_MOVE_ANIMATION + PrintAttackMessage + Wait + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_DID_NOT_HIT, _154 + PlayMoveAnimation BTLSCR_ATTACKER + Wait + CheckSubstitute BTLSCR_DEFENDER, _108 + UpdateVarFromVar OPCODE_SET, BTLVAR_SCRIPT_TEMP, BTLVAR_DAMAGE + UpdateVar OPCODE_MUL, BTLVAR_SCRIPT_TEMP, -1 + CompareMonDataToVar OPCODE_LTE, BTLSCR_DEFENDER, BATTLEMON_CUR_HP, BTLVAR_SCRIPT_TEMP, _051 + UpdateVarFromVar OPCODE_SET, BTLVAR_ATTACKER_SHELL_BELL_DAMAGE_DEALT, BTLVAR_DAMAGE + GoTo _060 + +_051: + UpdateMonDataFromVar OPCODE_GET, BTLSCR_DEFENDER, BATTLEMON_CUR_HP, BTLVAR_ATTACKER_SHELL_BELL_DAMAGE_DEALT + UpdateVar OPCODE_MUL, BTLVAR_ATTACKER_SHELL_BELL_DAMAGE_DEALT, -1 + +_060: + UpdateVarFromVar OPCODE_SET, BTLVAR_HP_CALC_TEMP, BTLVAR_DAMAGE + UpdateVarFromVar OPCODE_SET, BTLVAR_DEFENDER_PHYSICAL_DAMAGE_TAKEN, BTLVAR_DAMAGE + UpdateVarFromVar OPCODE_SET, BTLVAR_MSG_BATTLER_TEMP, BTLVAR_DEFENDER + CheckHoldOnWith1HP BTLSCR_MSG_TEMP + Call BATTLE_SUBSCRIPT_UPDATE_HP + Call BATTLE_SUBSCRIPT_CRITICAL_HIT + Call BATTLE_SUBSCRIPT_MOVE_FOLLOWUP_MESSAGE + CompareMonDataToValue OPCODE_EQU, BTLSCR_DEFENDER, BATTLEMON_CUR_HP, 0, _166 + TriggerAbilityOnHit _090 + CallFromVar BTLVAR_SCRIPT_TEMP + +_090: + TriggerHeldItemOnHit _094 + CallFromVar BTLVAR_SCRIPT_TEMP + +_094: + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_MOVE_HIT + TriggerHeldItemOnPivotMove _102 + CallFromVar BTLVAR_SCRIPT_TEMP + +_102: + UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_MOVE_HIT + GoTo _158 + +_108: + UpdateVarFromVar OPCODE_SET, BTLVAR_SCRIPT_TEMP, BTLVAR_DAMAGE + UpdateVar OPCODE_MUL, BTLVAR_SCRIPT_TEMP, -1 + CompareMonDataToVar OPCODE_LTE, BTLSCR_DEFENDER, BATTLEMON_SUBSTITUTE_HP, BTLVAR_SCRIPT_TEMP, _128 + UpdateVarFromVar OPCODE_SET, BTLVAR_ATTACKER_SHELL_BELL_DAMAGE_DEALT, BTLVAR_DAMAGE + GoTo _142 + +_128: + UpdateMonData OPCODE_FLAG_OFF, BTLSCR_DEFENDER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_SUBSTITUTE + UpdateMonDataFromVar OPCODE_GET, BTLSCR_DEFENDER, BATTLEMON_SUBSTITUTE_HP, BTLVAR_ATTACKER_SHELL_BELL_DAMAGE_DEALT + UpdateVar OPCODE_MUL, BTLVAR_ATTACKER_SHELL_BELL_DAMAGE_DEALT, -1 + +_142: + UpdateVarFromVar OPCODE_SET, BTLVAR_MSG_BATTLER_TEMP, BTLVAR_DEFENDER + Call BATTLE_SUBSCRIPT_HIT_SUBSTITUTE + Call BATTLE_SUBSCRIPT_CRITICAL_HIT + Call BATTLE_SUBSCRIPT_MOVE_FOLLOWUP_MESSAGE + GoTo _158 + +_154: + WaitButtonABTime 15 + Call BATTLE_SUBSCRIPT_MISSED + +_158: + Call BATTLE_SUBSCRIPT_POP_ATTACKER_AND_DEFENDER + UpdateVarFromVar OPCODE_GET, BTLVAR_MOVE_TEMP, BTLVAR_CURRENT_MOVE + GoTo _001 + +_166: + Call BATTLE_SUBSCRIPT_FAINT_CHECK_DESTINY_BOND + TriggerAbilityOnHit _172 + CallFromVar BTLVAR_SCRIPT_TEMP + +_172: + TriggerHeldItemOnHit _176 + CallFromVar BTLVAR_SCRIPT_TEMP + +_176: + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_MOVE_HIT + TriggerHeldItemOnPivotMove _184 + CallFromVar BTLVAR_SCRIPT_TEMP + +_184: + UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_MOVE_HIT + UpdateVarFromVar OPCODE_SET, BTLVAR_SCRIPT_TEMP, BTLVAR_FAINTED_MON + UpdateVar OPCODE_SET, BTLVAR_FAINTED_MON, BATTLER_PLAYER_SLOT_1 + UpdateVarFromVar OPCODE_SET, BTLVAR_CALC_TEMP, BTLVAR_BATTLE_CTX_STATUS_2 + UpdateVar OPCODE_RIGHT_SHIFT, BTLVAR_CALC_TEMP, 0x0000001C + UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_PAYOUT_EXP + +_208: + CompareVarToValue OPCODE_FLAG_NOT, BTLVAR_CALC_TEMP, 0x00000001, _215 + Call BATTLE_SUBSCRIPT_GRANT_EXP + +_215: + UpdateVar OPCODE_ADD, BTLVAR_FAINTED_MON, BATTLER_ENEMY_SLOT_1 + UpdateVar OPCODE_RIGHT_SHIFT, BTLVAR_CALC_TEMP, 0x00000001 + CompareVarToValue OPCODE_NEQ, BTLVAR_CALC_TEMP, 0x00000000, _208 + UpdateVarFromVar OPCODE_SUB_TO_ZERO, BTLVAR_FIELD_CONDITIONS, BTLVAR_SCRIPT_TEMP + Call BATTLE_SUBSCRIPT_POP_ATTACKER_AND_DEFENDER + UpdateVarFromVar OPCODE_GET, BTLVAR_MOVE_TEMP, BTLVAR_CURRENT_MOVE + +_238: + End diff --git a/res/battle/scripts/subscripts/subscript_0154.s b/res/battle/scripts/subscripts/subscript_0154.s new file mode 100644 index 0000000000..2c3906064c --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0154.s @@ -0,0 +1,16 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_MAX_HP, BTLVAR_HP_CALC_TEMP + DivideVarByValue BTLVAR_HP_CALC_TEMP, 2 + UpdateVarFromVar OPCODE_SET, BTLVAR_MSG_BATTLER_TEMP, BTLVAR_ATTACKER + PrintAttackMessage + Wait + Call BATTLE_SUBSCRIPT_RECOVER_HP + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_NO_MORE_WORK, _024 + SetTurnFlag BTLSCR_ATTACKER, TURN_FLAG_ROOSTING, 1 + +_024: + End diff --git a/res/battle/scripts/subscripts/subscript_0155.s b/res/battle/scripts/subscripts/subscript_0155.s new file mode 100644 index 0000000000..eedd42427f --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0155.s @@ -0,0 +1,15 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareMonDataToValue OPCODE_EQU, BTLSCR_DEFENDER, BATTLEMON_CUR_HP, 0, _020 + UpdateMonData OPCODE_FLAG_OFF, BTLSCR_DEFENDER, BATTLEMON_STATUS, MON_CONDITION_SLEEP + // {0} woke up! + PrintMessage pl_msg_00000368_00302, TAG_NICKNAME, BTLSCR_DEFENDER + Wait + SetHealthbarStatus BTLSCR_DEFENDER, BATTLE_ANIMATION_NONE + WaitButtonABTime 30 + +_020: + End diff --git a/res/battle/scripts/subscripts/subscript_0156.s b/res/battle/scripts/subscripts/subscript_0156.s new file mode 100644 index 0000000000..4771eabd43 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0156.s @@ -0,0 +1,43 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // Gravity intensified! + PrintMessage pl_msg_00000368_00997, TAG_NONE + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_ON, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_GRAVITY_INIT + UpdateVar OPCODE_SET, BTLVAR_BATTLER_SPEED_TEMP, 0 + +_013: + GetMonBySpeedOrder BTLVAR_MSG_BATTLER_TEMP + CompareMonDataToValue OPCODE_EQU, BTLSCR_MSG_TEMP, BATTLEMON_CUR_HP, 0, _085 + CompareMonDataToValue OPCODE_NEQ, BTLSCR_MSG_TEMP, BATTLEMON_MAGNET_RISE_TURNS, 0, _065 + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_MSG_TEMP, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_AIRBORNE, _072 + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_MSG_TEMP, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_ABILITY_SUPPRESSED, _085 + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_MSG_TEMP, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_INGRAIN, _085 + CompareMonDataToValue OPCODE_EQU, BTLSCR_MSG_TEMP, BATTLEMON_ABILITY, ABILITY_LEVITATE, _078 + CompareMonDataToValue OPCODE_EQU, BTLSCR_MSG_TEMP, BATTLEMON_TYPE_1, TYPE_FLYING, _078 + CompareMonDataToValue OPCODE_EQU, BTLSCR_MSG_TEMP, BATTLEMON_TYPE_2, TYPE_FLYING, _078 + GoTo _085 + +_065: + UpdateMonData OPCODE_SET, BTLSCR_MSG_TEMP, BATTLEMON_MAGNET_RISE_TURNS, 0 + GoTo _078 + +_072: + UnlockMoveChoice BTLSCR_MSG_TEMP + ToggleVanish BTLSCR_MSG_TEMP, FALSE + Wait + +_078: + // {0} couldn’t stay airborne because of gravity! + PrintMessage pl_msg_00000368_00998, TAG_NICKNAME, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + +_085: + UpdateVar OPCODE_ADD, BTLVAR_BATTLER_SPEED_TEMP, 1 + GoToIfValidMon BTLVAR_BATTLER_SPEED_TEMP, _013 + End diff --git a/res/battle/scripts/subscripts/subscript_0157.s b/res/battle/scripts/subscripts/subscript_0157.s new file mode 100644 index 0000000000..4db8aba19c --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0157.s @@ -0,0 +1,10 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} can’t use {1} because of gravity! + PrintMessage pl_msg_00000368_01001, TAG_NICKNAME_MOVE, BTLSCR_ATTACKER, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0158.s b/res/battle/scripts/subscripts/subscript_0158.s new file mode 100644 index 0000000000..2a0c9a6592 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0158.s @@ -0,0 +1,11 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateMonData OPCODE_FLAG_ON, BTLSCR_DEFENDER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_MIRACLE_EYE + // {0} identified {1}! + PrintMessage pl_msg_00000368_00432, TAG_NICKNAME_NICKNAME, BTLSCR_ATTACKER, BTLSCR_DEFENDER + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0159.s b/res/battle/scripts/subscripts/subscript_0159.s new file mode 100644 index 0000000000..437b884d3f --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0159.s @@ -0,0 +1,45 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateMonData OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_CUR_HP, 0 + UpdateVar OPCODE_SET, BTLVAR_HP_CALC_TEMP, 32767 + UpdateHealthBar BTLSCR_ATTACKER + Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION + TryFaintMon BTLSCR_ATTACKER + UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_MON_FAINTED + Call BATTLE_SUBSCRIPT_FAINT_MON + UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_PAYOUT_EXP + Call BATTLE_SUBSCRIPT_GRANT_EXP + +_026: + TryReplaceFaintedMon BTLSCR_ATTACKER, TRUE, _087 + ShowParty + WaitMonSelection + SwitchAndUpdateMon BTLSCR_SWITCHED_MON + PrintSendOutMessage BTLSCR_SWITCHED_MON + Wait + PokemonSendOut BTLSCR_SWITCHED_MON + WaitTime 72 + HealthbarSlideIn BTLSCR_SWITCHED_MON + Wait + Call BATTLE_SUBSCRIPT_HAZARDS_CHECK + CompareVarToValue OPCODE_FLAG_NOT, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_MON_FAINTED, _065 + Call BATTLE_SUBSCRIPT_FAINT_MON + UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_PAYOUT_EXP + Call BATTLE_SUBSCRIPT_GRANT_EXP + TryReplaceFaintedMon BTLSCR_ATTACKER, TRUE, _087 + GoTo _026 + +_065: + UpdateMonData OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_STATUS, MON_CONDITION_NONE + SetHealthbarStatus BTLSCR_ATTACKER, BATTLE_ANIMATION_NONE + UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_MAX_HP, BTLVAR_HP_CALC_TEMP + UpdateVarFromVar OPCODE_SET, BTLVAR_MSG_BATTLER_TEMP, BTLVAR_ATTACKER + // The healing wish came true! + BufferMessage pl_msg_00000368_01005, TAG_NONE + Call BATTLE_SUBSCRIPT_WISH_HEAL + +_087: + End diff --git a/res/battle/scripts/subscripts/subscript_0160.s b/res/battle/scripts/subscripts/subscript_0160.s new file mode 100644 index 0000000000..175f38fe99 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0160.s @@ -0,0 +1,17 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_SIDE_CONDITIONS_ATTACKER, SIDE_CONDITION_TAILWIND, _018 + Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION + // The tailwind blew from behind your team! + PrintMessage pl_msg_00000368_01230, TAG_NONE_SIDE_CONSCIOUS, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_ON, BTLVAR_SIDE_CONDITIONS_ATTACKER, SIDE_CONDITION_TAILWIND + End + +_018: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/subscripts/subscript_0161.s b/res/battle/scripts/subscripts/subscript_0161.s new file mode 100644 index 0000000000..07d182b6b0 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0161.s @@ -0,0 +1,13 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_STAT_STAGE_CHANGE_SHOWN + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_PARAM, MOVE_SUBSCRIPT_PTR_DEFENSE_DOWN_1_STAGE + Call BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_PARAM, MOVE_SUBSCRIPT_PTR_SP_DEFENSE_DOWN_1_STAGE + Call BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE + UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_UPDATE_STAT_STAGES + UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_STAT_STAGE_CHANGE_SHOWN + End diff --git a/res/battle/scripts/subscripts/subscript_0162.s b/res/battle/scripts/subscripts/subscript_0162.s new file mode 100644 index 0000000000..afe49cdb6e --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0162.s @@ -0,0 +1,15 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateMonData OPCODE_BITWISE_XOR, BTLSCR_ATTACKER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_POWER_TRICK + UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_ATTACK, BTLVAR_CALC_TEMP + UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_DEFENSE, BTLVAR_SCRIPT_TEMP + UpdateMonDataFromVar OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_ATTACK, BTLVAR_SCRIPT_TEMP + UpdateMonDataFromVar OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_DEFENSE, BTLVAR_CALC_TEMP + // {0} switched its Attack and Defense! + PrintMessage pl_msg_00000368_01009, TAG_NICKNAME, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0163.s b/res/battle/scripts/subscripts/subscript_0163.s new file mode 100644 index 0000000000..8738611fed --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0163.s @@ -0,0 +1,20 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CheckSubstitute BTLSCR_DEFENDER, _034 + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_DEFENDER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_ABILITY_SUPPRESSED, _034 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_MISSED|MOVE_STATUS_SEMI_INVULNERABLE, _034 + CompareMonDataToValue OPCODE_EQU, BTLSCR_DEFENDER, BATTLEMON_ABILITY, ABILITY_MULTITYPE, _034 + Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION + UpdateMonData OPCODE_FLAG_ON, BTLSCR_DEFENDER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_ABILITY_SUPPRESSED + // {0}’s ability was suppressed! + PrintMessage pl_msg_00000368_01012, TAG_NICKNAME, BTLSCR_DEFENDER + Wait + WaitButtonABTime 30 + End + +_034: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/subscripts/subscript_0164.s b/res/battle/scripts/subscripts/subscript_0164.s new file mode 100644 index 0000000000..de4e59b101 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0164.s @@ -0,0 +1,12 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_CALC_TEMP, 0x00005000 + UpdateVarFromVar OPCODE_FLAG_ON, BTLVAR_SIDE_CONDITIONS_ATTACKER, BTLVAR_CALC_TEMP + // The Lucky Chant shielded your team from critical hits! + PrintMessage pl_msg_00000368_01241, TAG_NONE_SIDE_CONSCIOUS, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0165.s b/res/battle/scripts/subscripts/subscript_0165.s new file mode 100644 index 0000000000..55889764b8 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0165.s @@ -0,0 +1,18 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_ATTACK_STAGE, BTLVAR_CALC_TEMP + UpdateMonDataFromVar OPCODE_GET, BTLSCR_DEFENDER, BATTLEMON_ATTACK_STAGE, BTLVAR_SCRIPT_TEMP + UpdateMonDataFromVar OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_ATTACK_STAGE, BTLVAR_SCRIPT_TEMP + UpdateMonDataFromVar OPCODE_SET, BTLSCR_DEFENDER, BATTLEMON_ATTACK_STAGE, BTLVAR_CALC_TEMP + UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_SP_ATTACK_STAGE, BTLVAR_CALC_TEMP + UpdateMonDataFromVar OPCODE_GET, BTLSCR_DEFENDER, BATTLEMON_SP_ATTACK_STAGE, BTLVAR_SCRIPT_TEMP + UpdateMonDataFromVar OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_SP_ATTACK_STAGE, BTLVAR_SCRIPT_TEMP + UpdateMonDataFromVar OPCODE_SET, BTLSCR_DEFENDER, BATTLEMON_SP_ATTACK_STAGE, BTLVAR_CALC_TEMP + // {0} switched all changes to its Attack and Sp. Atk with the target! + PrintMessage pl_msg_00000368_01015, TAG_NICKNAME, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0166.s b/res/battle/scripts/subscripts/subscript_0166.s new file mode 100644 index 0000000000..9a35cb52f6 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0166.s @@ -0,0 +1,18 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_DEFENSE_STAGE, BTLVAR_CALC_TEMP + UpdateMonDataFromVar OPCODE_GET, BTLSCR_DEFENDER, BATTLEMON_DEFENSE_STAGE, BTLVAR_SCRIPT_TEMP + UpdateMonDataFromVar OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_DEFENSE_STAGE, BTLVAR_SCRIPT_TEMP + UpdateMonDataFromVar OPCODE_SET, BTLSCR_DEFENDER, BATTLEMON_DEFENSE_STAGE, BTLVAR_CALC_TEMP + UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_SP_DEFENSE_STAGE, BTLVAR_CALC_TEMP + UpdateMonDataFromVar OPCODE_GET, BTLSCR_DEFENDER, BATTLEMON_SP_DEFENSE_STAGE, BTLVAR_SCRIPT_TEMP + UpdateMonDataFromVar OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_SP_DEFENSE_STAGE, BTLVAR_SCRIPT_TEMP + UpdateMonDataFromVar OPCODE_SET, BTLSCR_DEFENDER, BATTLEMON_SP_DEFENSE_STAGE, BTLVAR_CALC_TEMP + // {0} switched all changes to its Defense and Sp. Def with the target! + PrintMessage pl_msg_00000368_01018, TAG_NICKNAME, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0167.s b/res/battle/scripts/subscripts/subscript_0167.s new file mode 100644 index 0000000000..0ff9abfb04 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0167.s @@ -0,0 +1,21 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_MISSED|MOVE_STATUS_SEMI_INVULNERABLE, _041 + CheckSubstitute BTLSCR_DEFENDER, _041 + CompareMonDataToValue OPCODE_EQU, BTLSCR_DEFENDER, BATTLEMON_ABILITY, ABILITY_TRUANT, _041 + CompareMonDataToValue OPCODE_EQU, BTLSCR_DEFENDER, BATTLEMON_ABILITY, ABILITY_MULTITYPE, _041 + CompareMonDataToValue OPCODE_EQU, BTLSCR_DEFENDER, BATTLEMON_HELD_ITEM, ITEM_GRISEOUS_ORB, _041 + Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION + UpdateMonData OPCODE_SET, BTLSCR_DEFENDER, BATTLEMON_ABILITY, ABILITY_INSOMNIA + // {0} acquired {1}! + PrintMessage pl_msg_00000368_01021, TAG_NICKNAME_ABILITY, BTLSCR_DEFENDER, BTLSCR_DEFENDER + Wait + WaitButtonABTime 30 + End + +_041: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/subscripts/subscript_0168.s b/res/battle/scripts/subscripts/subscript_0168.s new file mode 100644 index 0000000000..e85ecf6ea0 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0168.s @@ -0,0 +1,62 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_MISSED|MOVE_STATUS_SEMI_INVULNERABLE, _198 + Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION + UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_ATTACK_STAGE, BTLVAR_CALC_TEMP + UpdateMonDataFromVar OPCODE_GET, BTLSCR_DEFENDER, BATTLEMON_ATTACK_STAGE, BTLVAR_SCRIPT_TEMP + UpdateMonDataFromVar OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_ATTACK_STAGE, BTLVAR_SCRIPT_TEMP + UpdateMonDataFromVar OPCODE_SET, BTLSCR_DEFENDER, BATTLEMON_ATTACK_STAGE, BTLVAR_CALC_TEMP + UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_DEFENSE_STAGE, BTLVAR_CALC_TEMP + UpdateMonDataFromVar OPCODE_GET, BTLSCR_DEFENDER, BATTLEMON_DEFENSE_STAGE, BTLVAR_SCRIPT_TEMP + UpdateMonDataFromVar OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_DEFENSE_STAGE, BTLVAR_SCRIPT_TEMP + UpdateMonDataFromVar OPCODE_SET, BTLSCR_DEFENDER, BATTLEMON_DEFENSE_STAGE, BTLVAR_CALC_TEMP + UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_SP_ATTACK_STAGE, BTLVAR_CALC_TEMP + UpdateMonDataFromVar OPCODE_GET, BTLSCR_DEFENDER, BATTLEMON_SP_ATTACK_STAGE, BTLVAR_SCRIPT_TEMP + UpdateMonDataFromVar OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_SP_ATTACK_STAGE, BTLVAR_SCRIPT_TEMP + UpdateMonDataFromVar OPCODE_SET, BTLSCR_DEFENDER, BATTLEMON_SP_ATTACK_STAGE, BTLVAR_CALC_TEMP + UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_SP_DEFENSE_STAGE, BTLVAR_CALC_TEMP + UpdateMonDataFromVar OPCODE_GET, BTLSCR_DEFENDER, BATTLEMON_SP_DEFENSE_STAGE, BTLVAR_SCRIPT_TEMP + UpdateMonDataFromVar OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_SP_DEFENSE_STAGE, BTLVAR_SCRIPT_TEMP + UpdateMonDataFromVar OPCODE_SET, BTLSCR_DEFENDER, BATTLEMON_SP_DEFENSE_STAGE, BTLVAR_CALC_TEMP + UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_SPEED_STAGE, BTLVAR_CALC_TEMP + UpdateMonDataFromVar OPCODE_GET, BTLSCR_DEFENDER, BATTLEMON_SPEED_STAGE, BTLVAR_SCRIPT_TEMP + UpdateMonDataFromVar OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_SPEED_STAGE, BTLVAR_SCRIPT_TEMP + UpdateMonDataFromVar OPCODE_SET, BTLSCR_DEFENDER, BATTLEMON_SPEED_STAGE, BTLVAR_CALC_TEMP + UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_ACCURACY_STAGE, BTLVAR_CALC_TEMP + UpdateMonDataFromVar OPCODE_GET, BTLSCR_DEFENDER, BATTLEMON_ACCURACY_STAGE, BTLVAR_SCRIPT_TEMP + UpdateMonDataFromVar OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_ACCURACY_STAGE, BTLVAR_SCRIPT_TEMP + UpdateMonDataFromVar OPCODE_SET, BTLSCR_DEFENDER, BATTLEMON_ACCURACY_STAGE, BTLVAR_CALC_TEMP + UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_EVASION_STAGE, BTLVAR_CALC_TEMP + UpdateMonDataFromVar OPCODE_GET, BTLSCR_DEFENDER, BATTLEMON_EVASION_STAGE, BTLVAR_SCRIPT_TEMP + UpdateMonDataFromVar OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_EVASION_STAGE, BTLVAR_SCRIPT_TEMP + UpdateMonDataFromVar OPCODE_SET, BTLSCR_DEFENDER, BATTLEMON_EVASION_STAGE, BTLVAR_CALC_TEMP + UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, BTLVAR_CALC_TEMP + UpdateMonDataFromVar OPCODE_GET, BTLSCR_DEFENDER, BATTLEMON_VOLATILE_STATUS, BTLVAR_SCRIPT_TEMP + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_CALC_TEMP, 0x00100000, _168 + UpdateMonData OPCODE_FLAG_OFF, BTLSCR_DEFENDER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_FOCUS_ENERGY + GoTo _173 + +_168: + UpdateMonData OPCODE_FLAG_ON, BTLSCR_DEFENDER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_FOCUS_ENERGY + +_173: + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_SCRIPT_TEMP, 1048576, _185 + UpdateMonData OPCODE_FLAG_OFF, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_FOCUS_ENERGY + GoTo _190 + +_185: + UpdateMonData OPCODE_FLAG_ON, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_FOCUS_ENERGY + +_190: + // {0} switched stat changes with the target! + PrintMessage pl_msg_00000368_01024, TAG_NICKNAME, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + End + +_198: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/subscripts/subscript_0169.s b/res/battle/scripts/subscripts/subscript_0169.s new file mode 100644 index 0000000000..1770a6528d --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0169.s @@ -0,0 +1,21 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {1} restored {0}’s HP! + PrintMessage pl_msg_00000368_01030, TAG_NICKNAME_MOVE, BTLSCR_MSG_TEMP, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_SPRITE_BLINK + CheckItemHoldEffect CHECK_NOT_HAVE, BTLSCR_MSG_TEMP, HOLD_EFFECT_LEECH_BOOST, _031 + GetItemEffectParam BTLSCR_MSG_TEMP, BTLVAR_CALC_TEMP + UpdateVar OPCODE_ADD, BTLVAR_CALC_TEMP, 0x00000064 + UpdateVarFromVar OPCODE_MUL, BTLVAR_HP_CALC_TEMP, BTLVAR_CALC_TEMP + UpdateVar OPCODE_DIV, BTLVAR_HP_CALC_TEMP, 100 + +_031: + PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_RESTORE_HP + Wait + Call BATTLE_SUBSCRIPT_UPDATE_HP + End diff --git a/res/battle/scripts/subscripts/subscript_0170.s b/res/battle/scripts/subscripts/subscript_0170.s new file mode 100644 index 0000000000..faf834ff6a --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0170.s @@ -0,0 +1,11 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + Call BATTLE_SUBSCRIPT_RECOIL_1_3 + CompareVarToValue OPCODE_FLAG_NOT, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_APPLY_SECONDARY_EFFECT, _008 + Call BATTLE_SUBSCRIPT_BURN + +_008: + End diff --git a/res/battle/scripts/subscripts/subscript_0171.s b/res/battle/scripts/subscripts/subscript_0171.s new file mode 100644 index 0000000000..bd663f0e71 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0171.s @@ -0,0 +1,73 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CheckSideCondition BTLSCR_DEFENDER, CHECK_SIDE_COND_VAL_NOT_ZERO, SIDE_COND_REFLECT_TURNS, _041 + CheckSideCondition BTLSCR_DEFENDER, CHECK_SIDE_COND_VAL_NOT_ZERO, SIDE_COND_LIGHT_SCREEN_TURNS, _041 + CheckSideCondition BTLSCR_DEFENDER, CHECK_SIDE_COND_VAL_NOT_ZERO, SIDE_COND_MIST_TURNS, _041 + CheckSideCondition BTLSCR_DEFENDER, CHECK_SIDE_COND_VAL_NOT_ZERO, SIDE_COND_SAFEGUARD_TURNS, _041 + CheckSideCondition BTLSCR_DEFENDER, CHECK_SIDE_COND_VAL_NOT_ZERO, SIDE_COND_SPIKES_LAYERS, _041 + CheckSideCondition BTLSCR_DEFENDER, CHECK_SIDE_COND_VAL_NOT_ZERO, SIDE_COND_TOXIC_SPIKES_LAYERS, _041 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_SIDE_CONDITIONS_DEFENDER, SIDE_CONDITION_STEALTH_ROCK, _041 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_DEEP_FOG, _041 + GoTo _043 + +_041: + Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION + +_043: + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_PARAM, MOVE_SUBSCRIPT_PTR_EVASION_DOWN_1_STAGE + Call BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE + CheckSideCondition BTLSCR_DEFENDER, CHECK_SIDE_COND_VAL_ZERO, SIDE_COND_REFLECT_TURNS, _065 + CheckSideCondition BTLSCR_DEFENDER, CHECK_SIDE_COND_CLEAR, SIDE_COND_REFLECT_TURNS, _065 + UpdateVar OPCODE_SET, BTLVAR_MSG_MOVE_TEMP, MOVE_REFLECT + Call BATTLE_SUBSCRIPT_DEFOG_MESSAGE + +_065: + CheckSideCondition BTLSCR_DEFENDER, CHECK_SIDE_COND_VAL_ZERO, SIDE_COND_LIGHT_SCREEN_TURNS, _081 + CheckSideCondition BTLSCR_DEFENDER, CHECK_SIDE_COND_CLEAR, SIDE_COND_LIGHT_SCREEN_TURNS, _081 + UpdateVar OPCODE_SET, BTLVAR_MSG_MOVE_TEMP, MOVE_LIGHT_SCREEN + Call BATTLE_SUBSCRIPT_DEFOG_MESSAGE + +_081: + CheckSideCondition BTLSCR_DEFENDER, CHECK_SIDE_COND_VAL_ZERO, SIDE_COND_MIST_TURNS, _097 + CheckSideCondition BTLSCR_DEFENDER, CHECK_SIDE_COND_CLEAR, SIDE_COND_MIST_TURNS, _097 + UpdateVar OPCODE_SET, BTLVAR_MSG_MOVE_TEMP, MOVE_MIST + Call BATTLE_SUBSCRIPT_DEFOG_MESSAGE + +_097: + CheckSideCondition BTLSCR_DEFENDER, CHECK_SIDE_COND_VAL_ZERO, SIDE_COND_SAFEGUARD_TURNS, _113 + CheckSideCondition BTLSCR_DEFENDER, CHECK_SIDE_COND_CLEAR, SIDE_COND_SAFEGUARD_TURNS, _113 + UpdateVar OPCODE_SET, BTLVAR_MSG_MOVE_TEMP, MOVE_SAFEGUARD + Call BATTLE_SUBSCRIPT_DEFOG_MESSAGE + +_113: + CheckSideCondition BTLSCR_DEFENDER, CHECK_SIDE_COND_VAL_ZERO, SIDE_COND_SPIKES_LAYERS, _133 + CheckSideCondition BTLSCR_DEFENDER, CHECK_SIDE_COND_CLEAR, SIDE_COND_SPIKES_LAYERS, _133 + UpdateVar OPCODE_FLAG_OFF, BTLVAR_SIDE_CONDITIONS_DEFENDER, SIDE_CONDITION_SPIKES + UpdateVar OPCODE_SET, BTLVAR_MSG_MOVE_TEMP, MOVE_SPIKES + Call BATTLE_SUBSCRIPT_DEFOG_MESSAGE + +_133: + CheckSideCondition BTLSCR_DEFENDER, CHECK_SIDE_COND_VAL_ZERO, SIDE_COND_TOXIC_SPIKES_LAYERS, _149 + CheckSideCondition BTLSCR_DEFENDER, CHECK_SIDE_COND_CLEAR, SIDE_COND_TOXIC_SPIKES_LAYERS, _149 + UpdateVar OPCODE_SET, BTLVAR_MSG_MOVE_TEMP, MOVE_TOXIC_SPIKES + Call BATTLE_SUBSCRIPT_DEFOG_MESSAGE + +_149: + CompareVarToValue OPCODE_FLAG_NOT, BTLVAR_SIDE_CONDITIONS_DEFENDER, SIDE_CONDITION_STEALTH_ROCK, _164 + UpdateVar OPCODE_FLAG_OFF, BTLVAR_SIDE_CONDITIONS_DEFENDER, SIDE_CONDITION_STEALTH_ROCK + UpdateVar OPCODE_SET, BTLVAR_MSG_MOVE_TEMP, MOVE_STEALTH_ROCK + Call BATTLE_SUBSCRIPT_DEFOG_MESSAGE + +_164: + CompareVarToValue OPCODE_FLAG_NOT, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_DEEP_FOG, _181 + UpdateVar OPCODE_FLAG_OFF, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_DEEP_FOG + // {0} blew away the deep fog with {1}! + PrintMessage pl_msg_00000368_01045, TAG_NICKNAME_MOVE, BTLSCR_ATTACKER, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + +_181: + End diff --git a/res/battle/scripts/subscripts/subscript_0172.s b/res/battle/scripts/subscripts/subscript_0172.s new file mode 100644 index 0000000000..01dcd5f2a1 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0172.s @@ -0,0 +1,10 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} blew away {1}! + PrintMessage pl_msg_00000368_01042, TAG_NICKNAME_MOVE, BTLSCR_ATTACKER, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0173.s b/res/battle/scripts/subscripts/subscript_0173.s new file mode 100644 index 0000000000..415529c2e4 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0173.s @@ -0,0 +1,26 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CheckSubstitute BTLSCR_DEFENDER, _028 + CompareMonDataToValue OPCODE_NEQ, BTLSCR_DEFENDER, BATTLEMON_HEAL_BLOCK_TURNS, 0, _028 + Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION + UpdateMonData OPCODE_FLAG_ON, BTLSCR_DEFENDER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_HEAL_BLOCK + UpdateMonData OPCODE_SET, BTLSCR_DEFENDER, BATTLEMON_HEAL_BLOCK_TURNS, 5 + // {0} was prevented from healing! + PrintMessage pl_msg_00000368_01051, TAG_NICKNAME, BTLSCR_DEFENDER + Wait + WaitButtonABTime 30 + End + +_028: + PrintAttackMessage + Wait + WaitButtonABTime 15 + // It failed to affect {0}! + PrintMessage pl_msg_00000368_01235, TAG_NICKNAME, BTLSCR_DEFENDER + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_NO_MORE_WORK + End diff --git a/res/battle/scripts/subscripts/subscript_0174.s b/res/battle/scripts/subscripts/subscript_0174.s new file mode 100644 index 0000000000..5d09c6cf37 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0174.s @@ -0,0 +1,11 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_MSG_MOVE_TEMP, MOVE_HEAL_BLOCK + // {0} can’t use {2} because of {1}! + PrintMessage pl_msg_00000368_01057, TAG_NICKNAME_MOVE_MOVE, BTLSCR_ATTACKER, BTLSCR_MSG_TEMP, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0175.s b/res/battle/scripts/subscripts/subscript_0175.s new file mode 100644 index 0000000000..72a75e49af --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0175.s @@ -0,0 +1,75 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CheckBlackOut BTLSCR_DEFENDER, _172 + TryReplaceFaintedMon BTLSCR_ATTACKER, TRUE, _172 + TriggerAbilityOnHit _010 + CallFromVar BTLVAR_SCRIPT_TEMP + +_010: + TriggerHeldItemOnPivotMove _014 + CallFromVar BTLVAR_SCRIPT_TEMP + +_014: + CompareMonDataToValue OPCODE_NEQ, BTLSCR_DEFENDER, BATTLEMON_CUR_HP, 0, _079 + CompareMonDataToValue OPCODE_FLAG_NOT, BTLSCR_DEFENDER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_DESTINY_BOND, _079 + IfSameSide BTLSCR_ATTACKER, BTLSCR_DEFENDER, _079 + CompareMonDataToValue OPCODE_EQU, BTLSCR_ATTACKER, BATTLEMON_CUR_HP, 0, _079 + // {0} took {1} down with it! + PrintMessage pl_msg_00000368_00391, TAG_NICKNAME_NICKNAME, BTLSCR_DEFENDER, BTLSCR_ATTACKER + UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_CUR_HP, BTLVAR_HP_CALC_TEMP + UpdateVar OPCODE_MUL, BTLVAR_HP_CALC_TEMP, -1 + UpdateVarFromVar OPCODE_SET, BTLVAR_MSG_BATTLER_TEMP, BTLVAR_ATTACKER + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_SPRITE_BLINK + Call BATTLE_SUBSCRIPT_UPDATE_HP + PlayFaintAnimation + Wait + HealthbarSlideOut BTLSCR_FAINTED_MON + // {0} fainted! + PrintMessage pl_msg_00000368_00030, TAG_NICKNAME, BTLSCR_FAINTED_MON + Wait + WaitButtonABTime 30 + IncrementGameStat BTLSCR_FAINTED_MON, BATTLER_TYPE_SOLO_ENEMY, 41 + IncrementGameStat BTLSCR_FAINTED_MON, BATTLER_TYPE_SOLO_PLAYER, 96 + +_079: + UpdateVarFromVar OPCODE_GET, BTLVAR_FAINTED_MON, BTLVAR_LAST_BATTLER_ID + UpdateVarFromVar OPCODE_SET, BTLVAR_FAINTED_MON, BTLVAR_DEFENDER + CompareMonDataToValue OPCODE_NEQ, BTLSCR_DEFENDER, BATTLEMON_CUR_HP, 0, _103 + TryGrudge _103 + // {0}’s {1} lost all its PP due to the grudge! + PrintMessage pl_msg_00000368_00568, TAG_NICKNAME_MOVE, BTLSCR_ATTACKER, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + +_103: + UpdateVarFromVar OPCODE_SET, BTLVAR_FAINTED_MON, BTLVAR_LAST_BATTLER_ID + CompareMonDataToValue OPCODE_EQU, BTLSCR_ATTACKER, BATTLEMON_CUR_HP, 0, _172 + UpdateVarFromVar OPCODE_SET, BTLVAR_SWITCHED_MON, BTLVAR_ATTACKER + // {0} went back to {1}! + PrintMessage pl_msg_00000368_01067, TAG_NICKNAME_TRNAME, BTLSCR_SWITCHED_MON, BTLSCR_SWITCHED_MON + Wait + WaitButtonABTime 30 + Call BATTLE_SUBSCRIPT_PURSUIT + CompareMonDataToValue OPCODE_EQU, BTLSCR_ATTACKER, BATTLEMON_CUR_HP, 0, _172 + TryRestoreStatusOnSwitch BTLSCR_ATTACKER, _141 + UpdateMonData OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_STATUS, MON_CONDITION_NONE + +_141: + UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_PLAYED_MOVE_ANIMATION + UpdateVar OPCODE_SET, BTLVAR_MOVE_EFFECT_CHANCE, 1 + PlayMoveAnimation BTLSCR_ATTACKER + Wait + DeletePokemon BTLSCR_ATTACKER + Wait + HealthbarSlideOut BTLSCR_ATTACKER + Wait + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_UTURN_ACTIVE + UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_TRY_SYNCHRONIZE_STATUS + UpdateVar OPCODE_SET, BTLVAR_ATTACKER_SELF_TURN_STATUS_FLAGS, SELF_TURN_FLAG_CLEAR + GoToSubscript BATTLE_SUBSCRIPT_SHOW_PARTY_LIST + +_172: + End diff --git a/res/battle/scripts/subscripts/subscript_0176.s b/res/battle/scripts/subscripts/subscript_0176.s new file mode 100644 index 0000000000..961de13204 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0176.s @@ -0,0 +1,11 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} avoided the attack! + PrintMessage pl_msg_00000368_00024, TAG_NICKNAME, BTLSCR_DEFENDER + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_NO_MORE_WORK + End diff --git a/res/battle/scripts/subscripts/subscript_0177.s b/res/battle/scripts/subscripts/subscript_0177.s new file mode 100644 index 0000000000..f9cad6b659 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0177.s @@ -0,0 +1,10 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} has {1}! + PrintMessage pl_msg_00000368_01087, TAG_NICKNAME_ABILITY, BTLSCR_MSG_TEMP, BTLSCR_MSG_BATTLER_TEMP + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0178.s b/res/battle/scripts/subscripts/subscript_0178.s new file mode 100644 index 0000000000..d6c01edb54 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0178.s @@ -0,0 +1,25 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PrintAttackMessage + Wait + WaitButtonABTime 15 + UpdateMonDataFromVar OPCODE_GET, BTLSCR_DEFENDER, BATTLEMON_MAX_HP, BTLVAR_CALC_TEMP + CompareMonDataToVar OPCODE_EQU, BTLSCR_DEFENDER, BATTLEMON_CUR_HP, BTLVAR_CALC_TEMP, _033 + UpdateVarFromVar OPCODE_SET, BTLVAR_MSG_BATTLER_TEMP, BTLVAR_DEFENDER + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_SPRITE_BLINK + Call BATTLE_SUBSCRIPT_UPDATE_HP + // {0} restored HP using its {1}! + PrintMessage pl_msg_00000368_00635, TAG_NICKNAME_ABILITY, BTLSCR_DEFENDER, BTLSCR_DEFENDER + Wait + WaitButtonABTime 30 + End + +_033: + // {0}’s {1} made {2} useless! + PrintMessage pl_msg_00000368_00638, TAG_NICKNAME_ABILITY_MOVE, BTLSCR_DEFENDER, BTLSCR_DEFENDER, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0179.s b/res/battle/scripts/subscripts/subscript_0179.s new file mode 100644 index 0000000000..a1b3d31ce1 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0179.s @@ -0,0 +1,22 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PrintAttackMessage + Wait + WaitButtonABTime 15 + CompareMonDataToValue OPCODE_NEQ, BTLSCR_DEFENDER, BATTLEMON_FLASH_FIRE, 0, _023 + // {0}’s {1} raised the power of its Fire-type moves! + PrintMessage pl_msg_00000368_00656, TAG_NICKNAME_ABILITY, BTLSCR_DEFENDER, BTLSCR_DEFENDER + Wait + WaitButtonABTime 30 + UpdateMonData OPCODE_FLAG_ON, BTLSCR_DEFENDER, BATTLEMON_FLASH_FIRE, 1 + End + +_023: + // {0}’s {1} made {2} ineffective! + PrintMessage pl_msg_00000368_00714, TAG_NICKNAME_ABILITY_MOVE, BTLSCR_DEFENDER, BTLSCR_DEFENDER, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0180.s b/res/battle/scripts/subscripts/subscript_0180.s new file mode 100644 index 0000000000..57cb360892 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0180.s @@ -0,0 +1,13 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PrintAttackMessage + Wait + WaitButtonABTime 15 + // {0}’s {1} took the attack! + PrintMessage pl_msg_00000368_00724, TAG_NICKNAME_ABILITY, BTLSCR_DEFENDER, BTLSCR_DEFENDER + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0181.s b/res/battle/scripts/subscripts/subscript_0181.s new file mode 100644 index 0000000000..35c4090b60 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0181.s @@ -0,0 +1,13 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PrintAttackMessage + Wait + WaitButtonABTime 15 + // {0}’s {1} blocks {2}! + PrintMessage pl_msg_00000368_00689, TAG_NICKNAME_ABILITY_MOVE, BTLSCR_DEFENDER, BTLSCR_DEFENDER, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0182.s b/res/battle/scripts/subscripts/subscript_0182.s new file mode 100644 index 0000000000..26b4373ed8 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0182.s @@ -0,0 +1,25 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PrintAttackMessage + Wait + WaitButtonABTime 15 + CompareMonDataToValue OPCODE_EQU, BTLSCR_DEFENDER, BATTLEMON_SPEED_STAGE, 12, _032 + PlayBattleAnimation BTLSCR_DEFENDER, BATTLE_ANIMATION_STAT_BOOST + Wait + UpdateMonData OPCODE_ADD, BTLSCR_DEFENDER, BATTLEMON_SPEED_STAGE, 1 + UpdateVar OPCODE_SET, BTLVAR_MSG_TEMP, 3 + // {0}’s {1} raised its {2}! + PrintMessage pl_msg_00000368_00622, TAG_NICKNAME_ABILITY_STAT, BTLSCR_DEFENDER, BTLSCR_DEFENDER, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + End + +_032: + // {0}’s {1} made {2} useless! + PrintMessage pl_msg_00000368_00638, TAG_NICKNAME_ABILITY_MOVE, BTLSCR_DEFENDER, BTLSCR_DEFENDER, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0183.s b/res/battle/scripts/subscripts/subscript_0183.s new file mode 100644 index 0000000000..4740af9bef --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0183.s @@ -0,0 +1,14 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PlayBattleAnimation BTLSCR_PLAYER, BATTLE_ANIMATION_WEATHER_RAIN + Wait + // {0}’s {1} made it rain! + PrintMessage pl_msg_00000368_00619, TAG_NICKNAME_ABILITY, BTLSCR_MSG_TEMP, BTLSCR_MSG_BATTLER_TEMP + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_OFF, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_WEATHER + UpdateVar OPCODE_FLAG_ON, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_RAINING_PERM + End diff --git a/res/battle/scripts/subscripts/subscript_0184.s b/res/battle/scripts/subscripts/subscript_0184.s new file mode 100644 index 0000000000..202743335f --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0184.s @@ -0,0 +1,14 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PlayBattleAnimation BTLSCR_PLAYER, BATTLE_ANIMATION_WEATHER_SAND + Wait + // {0}’s {1} whipped up a sandstorm! + PrintMessage pl_msg_00000368_00695, TAG_NICKNAME_ABILITY, BTLSCR_MSG_TEMP, BTLSCR_MSG_BATTLER_TEMP + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_OFF, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_WEATHER + UpdateVar OPCODE_FLAG_ON, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_SANDSTORM_PERM + End diff --git a/res/battle/scripts/subscripts/subscript_0185.s b/res/battle/scripts/subscripts/subscript_0185.s new file mode 100644 index 0000000000..0c8cd24b66 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0185.s @@ -0,0 +1,14 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PlayBattleAnimation BTLSCR_PLAYER, BATTLE_ANIMATION_WEATHER_SUN + Wait + // {0}’s {1} intensified the sun’s rays! + PrintMessage pl_msg_00000368_00698, TAG_NICKNAME_ABILITY, BTLSCR_MSG_TEMP, BTLSCR_MSG_BATTLER_TEMP + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_OFF, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_WEATHER + UpdateVar OPCODE_FLAG_ON, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_SUNNY_PERM + End diff --git a/res/battle/scripts/subscripts/subscript_0186.s b/res/battle/scripts/subscripts/subscript_0186.s new file mode 100644 index 0000000000..5de5323008 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0186.s @@ -0,0 +1,24 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + WaitButtonABTime 15 + UpdateVar OPCODE_SET, BTLVAR_BATTLER_SPEED_TEMP, 0 + UpdateVarFromVar OPCODE_SET, BTLVAR_LAST_BATTLER_ID, BTLVAR_ATTACKER + UpdateVarFromVar OPCODE_SET, BTLVAR_ATTACKER, BTLVAR_MSG_BATTLER_TEMP + +_013: + GetMonBySpeedOrder BTLVAR_SIDE_EFFECT_MON + IfSameSide BTLSCR_ATTACKER, BTLSCR_SIDE_EFFECT_MON, _038 + CheckSubstitute BTLSCR_SIDE_EFFECT_MON, _038 + CompareMonDataToValue OPCODE_EQU, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_CUR_HP, 0, _038 + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_PARAM, MOVE_SUBSCRIPT_PTR_ATTACK_DOWN_1_STAGE + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_ABILITY + Call BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE + +_038: + UpdateVar OPCODE_ADD, BTLVAR_BATTLER_SPEED_TEMP, 1 + GoToIfValidMon BTLVAR_BATTLER_SPEED_TEMP, _013 + UpdateVarFromVar OPCODE_SET, BTLVAR_ATTACKER, BTLVAR_LAST_BATTLER_ID + End diff --git a/res/battle/scripts/subscripts/subscript_0187.s b/res/battle/scripts/subscripts/subscript_0187.s new file mode 100644 index 0000000000..78b1a1bbfd --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0187.s @@ -0,0 +1,13 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + WaitButtonABTime 15 + UpdateMonDataFromVar OPCODE_GET, BTLSCR_MSG_DEFENDER, BATTLEMON_ABILITY, BTLVAR_CALC_TEMP + UpdateMonDataFromVar OPCODE_SET, BTLSCR_MSG_TEMP, BATTLEMON_ABILITY, BTLVAR_CALC_TEMP + // {0} traced {1}’s {2}! + PrintMessage pl_msg_00000368_00679, TAG_NICKNAME_NICKNAME_ABILITY, BTLSCR_MSG_TEMP, BTLSCR_MSG_DEFENDER, BTLSCR_MSG_DEFENDER + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0188.s b/res/battle/scripts/subscripts/subscript_0188.s new file mode 100644 index 0000000000..c4b1637698 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0188.s @@ -0,0 +1,12 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0}’s {1} made it the {2} type! + PrintMessage pl_msg_00000368_00641, TAG_NICKNAME_ABILITY_TYPE, BTLSCR_DEFENDER, BTLSCR_DEFENDER, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + UpdateMonDataFromVar OPCODE_SET, BTLSCR_DEFENDER, BATTLEMON_TYPE_1, BTLVAR_MSG_TEMP + UpdateMonDataFromVar OPCODE_SET, BTLSCR_DEFENDER, BATTLEMON_TYPE_2, BTLVAR_MSG_TEMP + End diff --git a/res/battle/scripts/subscripts/subscript_0189.s b/res/battle/scripts/subscripts/subscript_0189.s new file mode 100644 index 0000000000..611bd476c5 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0189.s @@ -0,0 +1,12 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_SPRITE_BLINK + Call BATTLE_SUBSCRIPT_UPDATE_HP + // {0}’s {1} hurt {2}! + PrintMessage pl_msg_00000368_00672, TAG_NICKNAME_ABILITY_NICKNAME, BTLSCR_DEFENDER, BTLSCR_DEFENDER, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0190.s b/res/battle/scripts/subscripts/subscript_0190.s new file mode 100644 index 0000000000..1c600ebac5 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0190.s @@ -0,0 +1,13 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateMonData OPCODE_SET, BTLSCR_MSG_TEMP, BATTLEMON_STATUS, MON_CONDITION_NONE + UpdateMonData OPCODE_FLAG_OFF, BTLSCR_MSG_TEMP, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_NIGHTMARE + // {0}’s {1} cured its {2} status! + PrintMessage pl_msg_00000368_00717, TAG_NICKNAME_ABILITY_STATUS, BTLSCR_MSG_TEMP, BTLSCR_MSG_BATTLER_TEMP, BTLSCR_MSG_TEMP + Wait + SetHealthbarStatus BTLSCR_MSG_TEMP, BATTLE_ANIMATION_NONE + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0191.s b/res/battle/scripts/subscripts/subscript_0191.s new file mode 100644 index 0000000000..5d2a85cb1b --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0191.s @@ -0,0 +1,11 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} is loafing around! + PrintMessage pl_msg_00000368_00832, TAG_NICKNAME, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + UnlockMoveChoice BTLSCR_ATTACKER + End diff --git a/res/battle/scripts/subscripts/subscript_0192.s b/res/battle/scripts/subscripts/subscript_0192.s new file mode 100644 index 0000000000..4dbb14fee3 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0192.s @@ -0,0 +1,12 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} restored HP using its {1}! + PrintMessage pl_msg_00000368_00635, TAG_NICKNAME_ABILITY, BTLSCR_MSG_TEMP, BTLSCR_MSG_BATTLER_TEMP + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_SPRITE_BLINK + Call BATTLE_SUBSCRIPT_UPDATE_HP + End diff --git a/res/battle/scripts/subscripts/subscript_0193.s b/res/battle/scripts/subscripts/subscript_0193.s new file mode 100644 index 0000000000..bd741bf285 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0193.s @@ -0,0 +1,12 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_SPRITE_BLINK + Call BATTLE_SUBSCRIPT_UPDATE_HP + // {2} was hurt by {0}’s {1}! + PrintMessage pl_msg_00000368_01099, TAG_NICKNAME_ABILITY_NICKNAME, BTLSCR_DEFENDER, BTLSCR_DEFENDER, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0194.s b/res/battle/scripts/subscripts/subscript_0194.s new file mode 100644 index 0000000000..c4dfeb7dda --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0194.s @@ -0,0 +1,10 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {1}’s {0} made it shudder! + PrintMessage pl_msg_00000368_01106, TAG_ABILITY_NICKNAME, BTLSCR_MSG_BATTLER_TEMP, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0195.s b/res/battle/scripts/subscripts/subscript_0195.s new file mode 100644 index 0000000000..1897004eea --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0195.s @@ -0,0 +1,10 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0}’s {1} alerted it to {2}! + PrintMessage pl_msg_00000368_01109, TAG_NICKNAME_ABILITY_MOVE, BTLSCR_MSG_TEMP, BTLSCR_MSG_BATTLER_TEMP, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0196.s b/res/battle/scripts/subscripts/subscript_0196.s new file mode 100644 index 0000000000..183e671cca --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0196.s @@ -0,0 +1,10 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} can’t get it going because of its {1}! + PrintMessage pl_msg_00000368_01112, TAG_NICKNAME_ABILITY, BTLSCR_MSG_TEMP, BTLSCR_MSG_BATTLER_TEMP + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0197.s b/res/battle/scripts/subscripts/subscript_0197.s new file mode 100644 index 0000000000..d2db0db9c0 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0197.s @@ -0,0 +1,10 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} finally got its act together! + PrintMessage pl_msg_00000368_01115, TAG_NICKNAME_ABILITY, BTLSCR_MSG_TEMP, BTLSCR_MSG_BATTLER_TEMP + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0198.s b/res/battle/scripts/subscripts/subscript_0198.s new file mode 100644 index 0000000000..5e5b204bf7 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0198.s @@ -0,0 +1,15 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_HELD_ITEM + Wait + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_SPRITE_BLINK + Call BATTLE_SUBSCRIPT_UPDATE_HP + // {0} restored its health using its {1}! + PrintMessage pl_msg_00000368_00899, TAG_NICKNAME_ITEM, BTLSCR_MSG_TEMP, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + Call BATTLE_SUBSCRIPT_PLUCK_CHECK + End diff --git a/res/battle/scripts/subscripts/subscript_0199.s b/res/battle/scripts/subscripts/subscript_0199.s new file mode 100644 index 0000000000..d6872a9887 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0199.s @@ -0,0 +1,15 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_HELD_ITEM + Wait + // {0}’s {1} cured its paralysis! + PrintMessage pl_msg_00000368_00875, TAG_NICKNAME_ITEM, BTLSCR_MSG_TEMP, BTLSCR_MSG_TEMP + Wait + SetHealthbarStatus BTLSCR_MSG_TEMP, BATTLE_ANIMATION_NONE + WaitButtonABTime 30 + UpdateMonData OPCODE_SET, BTLSCR_MSG_TEMP, BATTLEMON_STATUS, MON_CONDITION_NONE + Call BATTLE_SUBSCRIPT_PLUCK_CHECK + End diff --git a/res/battle/scripts/subscripts/subscript_0200.s b/res/battle/scripts/subscripts/subscript_0200.s new file mode 100644 index 0000000000..87e8aae9b2 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0200.s @@ -0,0 +1,16 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_HELD_ITEM + Wait + // {0}’s {1} woke it up! + PrintMessage pl_msg_00000368_00887, TAG_NICKNAME_ITEM, BTLSCR_MSG_TEMP, BTLSCR_MSG_TEMP + Wait + SetHealthbarStatus BTLSCR_MSG_TEMP, BATTLE_ANIMATION_NONE + WaitButtonABTime 30 + UpdateMonData OPCODE_SET, BTLSCR_MSG_TEMP, BATTLEMON_STATUS, MON_CONDITION_NONE + UpdateMonData OPCODE_FLAG_OFF, BTLSCR_MSG_TEMP, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_NIGHTMARE + Call BATTLE_SUBSCRIPT_PLUCK_CHECK + End diff --git a/res/battle/scripts/subscripts/subscript_0201.s b/res/battle/scripts/subscripts/subscript_0201.s new file mode 100644 index 0000000000..2dea85e675 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0201.s @@ -0,0 +1,15 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_HELD_ITEM + Wait + // {0}’s {1} cured its poison! + PrintMessage pl_msg_00000368_00878, TAG_NICKNAME_ITEM, BTLSCR_MSG_TEMP, BTLSCR_MSG_TEMP + Wait + SetHealthbarStatus BTLSCR_MSG_TEMP, BATTLE_ANIMATION_NONE + WaitButtonABTime 30 + UpdateMonData OPCODE_SET, BTLSCR_MSG_TEMP, BATTLEMON_STATUS, MON_CONDITION_NONE + Call BATTLE_SUBSCRIPT_PLUCK_CHECK + End diff --git a/res/battle/scripts/subscripts/subscript_0202.s b/res/battle/scripts/subscripts/subscript_0202.s new file mode 100644 index 0000000000..fea094b5f0 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0202.s @@ -0,0 +1,15 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_HELD_ITEM + Wait + // {0}’s {1} healed its burn! + PrintMessage pl_msg_00000368_00881, TAG_NICKNAME_ITEM, BTLSCR_MSG_TEMP, BTLSCR_MSG_TEMP + Wait + SetHealthbarStatus BTLSCR_MSG_TEMP, BATTLE_ANIMATION_NONE + WaitButtonABTime 30 + UpdateMonData OPCODE_SET, BTLSCR_MSG_TEMP, BATTLEMON_STATUS, MON_CONDITION_NONE + Call BATTLE_SUBSCRIPT_PLUCK_CHECK + End diff --git a/res/battle/scripts/subscripts/subscript_0203.s b/res/battle/scripts/subscripts/subscript_0203.s new file mode 100644 index 0000000000..903b84ce4b --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0203.s @@ -0,0 +1,15 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_HELD_ITEM + Wait + // {0}’s {1} defrosted it! + PrintMessage pl_msg_00000368_00884, TAG_NICKNAME_ITEM, BTLSCR_MSG_TEMP, BTLSCR_MSG_TEMP + Wait + SetHealthbarStatus BTLSCR_MSG_TEMP, BATTLE_ANIMATION_NONE + WaitButtonABTime 30 + UpdateMonData OPCODE_SET, BTLSCR_MSG_TEMP, BATTLEMON_STATUS, MON_CONDITION_NONE + Call BATTLE_SUBSCRIPT_PLUCK_CHECK + End diff --git a/res/battle/scripts/subscripts/subscript_0204.s b/res/battle/scripts/subscripts/subscript_0204.s new file mode 100644 index 0000000000..384b40f387 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0204.s @@ -0,0 +1,13 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_HELD_ITEM + Wait + // {0} restored {2}’s PP using its {1}! + PrintMessage pl_msg_00000368_00902, TAG_NICKNAME_ITEM_MOVE, BTLSCR_MSG_TEMP, BTLSCR_MSG_TEMP, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + Call BATTLE_SUBSCRIPT_PLUCK_CHECK + End diff --git a/res/battle/scripts/subscripts/subscript_0205.s b/res/battle/scripts/subscripts/subscript_0205.s new file mode 100644 index 0000000000..6b6f54ac95 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0205.s @@ -0,0 +1,14 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_HELD_ITEM + Wait + // {0}’s {1} snapped it out of confusion! + PrintMessage pl_msg_00000368_00890, TAG_NICKNAME_ITEM, BTLSCR_MSG_TEMP, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + UpdateMonData OPCODE_FLAG_OFF, BTLSCR_MSG_TEMP, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_CONFUSION + Call BATTLE_SUBSCRIPT_PLUCK_CHECK + End diff --git a/res/battle/scripts/subscripts/subscript_0206.s b/res/battle/scripts/subscripts/subscript_0206.s new file mode 100644 index 0000000000..0dd77fbe53 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0206.s @@ -0,0 +1,17 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_HELD_ITEM + Wait + // {0} normalized its status using its {1}! + PrintMessage pl_msg_00000368_00896, TAG_NICKNAME_ITEM, BTLSCR_MSG_TEMP, BTLSCR_MSG_TEMP + Wait + SetHealthbarStatus BTLSCR_MSG_TEMP, BATTLE_ANIMATION_NONE + WaitButtonABTime 30 + UpdateMonData OPCODE_SET, BTLSCR_MSG_TEMP, BATTLEMON_STATUS, MON_CONDITION_NONE + UpdateMonData OPCODE_FLAG_OFF, BTLSCR_MSG_TEMP, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_NIGHTMARE + UpdateMonData OPCODE_FLAG_OFF, BTLSCR_MSG_TEMP, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_CONFUSION + Call BATTLE_SUBSCRIPT_PLUCK_CHECK + End diff --git a/res/battle/scripts/subscripts/subscript_0207.s b/res/battle/scripts/subscripts/subscript_0207.s new file mode 100644 index 0000000000..03a127fb12 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0207.s @@ -0,0 +1,16 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + Call BATTLE_SUBSCRIPT_HELD_ITEM_HP_RESTORE + // For {1}, the {0} was {2}! + PrintMessage pl_msg_00000368_00594, TAG_ITEM_NICKNAME_FLAVOR, BTLSCR_MSG_TEMP, BTLSCR_MSG_TEMP, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_ATTACK_MESSAGE|SYSCTL_PLAYED_MOVE_ANIMATION + UpdateVarFromVar OPCODE_SET, BTLVAR_SIDE_EFFECT_MON, BTLVAR_MSG_BATTLER_TEMP + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_HELD_ITEM + Call BATTLE_SUBSCRIPT_CONFUSE + UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_ATTACK_MESSAGE|SYSCTL_PLAYED_MOVE_ANIMATION + End diff --git a/res/battle/scripts/subscripts/subscript_0208.s b/res/battle/scripts/subscripts/subscript_0208.s new file mode 100644 index 0000000000..7a2579d7ec --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0208.s @@ -0,0 +1,14 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_HELD_ITEM + Wait + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_PARAM, MOVE_SUBSCRIPT_PTR_QUARTER_RECOIL + UpdateVarFromVar OPCODE_ADD, BTLVAR_SIDE_EFFECT_PARAM, BTLVAR_MSG_TEMP + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_HELD_ITEM + UpdateVarFromVar OPCODE_SET, BTLVAR_SIDE_EFFECT_MON, BTLVAR_MSG_BATTLER_TEMP + Call BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE + Call BATTLE_SUBSCRIPT_PLUCK_CHECK + End diff --git a/res/battle/scripts/subscripts/subscript_0209.s b/res/battle/scripts/subscripts/subscript_0209.s new file mode 100644 index 0000000000..541f765254 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0209.s @@ -0,0 +1,14 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_HELD_ITEM + Wait + // {0} used the {1} to get pumped! + PrintMessage pl_msg_00000368_00597, TAG_NICKNAME_ITEM, BTLSCR_MSG_TEMP, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + UpdateMonData OPCODE_FLAG_ON, BTLSCR_MSG_TEMP, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_FOCUS_ENERGY + Call BATTLE_SUBSCRIPT_PLUCK_CHECK + End diff --git a/res/battle/scripts/subscripts/subscript_0210.s b/res/battle/scripts/subscripts/subscript_0210.s new file mode 100644 index 0000000000..d2182236ba --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0210.s @@ -0,0 +1,23 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_HELD_ITEM + Wait + WaitButtonABTime 15 + PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_STAT_BOOST + Wait + // The {1} sharply raised {0}’s {2}! + PrintMessage pl_msg_00000368_00759, TAG_NICKNAME_ITEM_STAT, BTLSCR_MSG_TEMP, BTLSCR_MSG_TEMP, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_SET, BTLVAR_SCRIPT_TEMP, 18 + UpdateVarFromVar OPCODE_ADD, BTLVAR_SCRIPT_TEMP, BTLVAR_MSG_TEMP + UpdateMonData OPCODE_ADD, BTLSCR_MSG_TEMP, BATTLEMON_TEMP, 2 + CompareMonDataToValue OPCODE_LTE, BTLSCR_MSG_TEMP, BATTLEMON_TEMP, 12, _042 + UpdateMonData OPCODE_SET, BTLSCR_MSG_TEMP, BATTLEMON_TEMP, 12 + +_042: + Call BATTLE_SUBSCRIPT_PLUCK_CHECK + End diff --git a/res/battle/scripts/subscripts/subscript_0211.s b/res/battle/scripts/subscripts/subscript_0211.s new file mode 100644 index 0000000000..4dae2d0c5e --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0211.s @@ -0,0 +1,13 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_HELD_ITEM + Wait + // {0} restored its status using its {1}! + PrintMessage pl_msg_00000368_00905, TAG_NICKNAME_ITEM, BTLSCR_MSG_TEMP, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + Call BATTLE_SUBSCRIPT_PLUCK_CHECK + End diff --git a/res/battle/scripts/subscripts/subscript_0212.s b/res/battle/scripts/subscripts/subscript_0212.s new file mode 100644 index 0000000000..bc208a870d --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0212.s @@ -0,0 +1,14 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_HELD_ITEM + Wait + // {0} cured its {2} status using its {1}! + PrintMessage pl_msg_00000368_00893, TAG_NICKNAME_ITEM_STATUS, BTLSCR_MSG_TEMP, BTLSCR_MSG_TEMP, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + UpdateMonData OPCODE_FLAG_OFF, BTLSCR_MSG_TEMP, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_ATTRACT + Call BATTLE_SUBSCRIPT_PLUCK_CHECK + End diff --git a/res/battle/scripts/subscripts/subscript_0213.s b/res/battle/scripts/subscripts/subscript_0213.s new file mode 100644 index 0000000000..eb0c40fb9c --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0213.s @@ -0,0 +1,14 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_HELD_ITEM + Wait + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_SPRITE_BLINK + Call BATTLE_SUBSCRIPT_UPDATE_HP + // {0} restored a little HP using its {1}! + PrintMessage pl_msg_00000368_00908, TAG_NICKNAME_ITEM, BTLSCR_MSG_TEMP, BTLSCR_MSG_BATTLER_TEMP + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0214.s b/res/battle/scripts/subscripts/subscript_0214.s new file mode 100644 index 0000000000..818631d519 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0214.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_SPRITE_BLINK + Call BATTLE_SUBSCRIPT_UPDATE_HP + End diff --git a/res/battle/scripts/subscripts/subscript_0215.s b/res/battle/scripts/subscripts/subscript_0215.s new file mode 100644 index 0000000000..809d3e9844 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0215.s @@ -0,0 +1,14 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_HELD_ITEM + Wait + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_SPRITE_BLINK + Call BATTLE_SUBSCRIPT_UPDATE_HP + // {0} is hurt by its {1}! + PrintMessage pl_msg_00000368_01132, TAG_NICKNAME_ITEM, BTLSCR_MSG_TEMP, BTLSCR_MSG_BATTLER_TEMP + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0216.s b/res/battle/scripts/subscripts/subscript_0216.s new file mode 100644 index 0000000000..8dc3c03f13 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0216.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateMonDataFromVar OPCODE_GET, BTLSCR_DEFENDER, BATTLEMON_HELD_ITEM, BTLVAR_SCRIPT_TEMP + UpdateMonDataFromVar OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_HELD_ITEM, BTLVAR_SCRIPT_TEMP + UpdateMonData OPCODE_SET, BTLSCR_DEFENDER, BATTLEMON_HELD_ITEM, ITEM_NONE + End diff --git a/res/battle/scripts/subscripts/subscript_0217.s b/res/battle/scripts/subscripts/subscript_0217.s new file mode 100644 index 0000000000..35333aa031 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0217.s @@ -0,0 +1,23 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PlayMoveAnimation BTLSCR_ATTACKER + Wait + CompareMonDataToValue OPCODE_FLAG_NOT, BTLSCR_ATTACKER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_SEMI_INVULNERABLE, _011 + ToggleVanish BTLSCR_ATTACKER, TRUE + +_011: + PrintBufferedMessage + Wait + WaitButtonABTime 30 + PlayBattleAnimation BTLSCR_ATTACKER, BATTLE_ANIMATION_HELD_ITEM + Wait + // {0} became fully charged due to its {1}! + PrintMessage pl_msg_00000368_01251, TAG_NICKNAME_ITEM, BTLSCR_ATTACKER, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + RemoveItem BTLSCR_ATTACKER + UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_PLAYED_MOVE_ANIMATION + End diff --git a/res/battle/scripts/subscripts/subscript_0218.s b/res/battle/scripts/subscripts/subscript_0218.s new file mode 100644 index 0000000000..0b9cb7c449 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0218.s @@ -0,0 +1,24 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_MISSED|MOVE_STATUS_SEMI_INVULNERABLE, _057 + CheckSubstitute BTLSCR_DEFENDER, _057 + CompareMonDataToValue OPCODE_EQU, BTLSCR_DEFENDER, BATTLEMON_ABILITY, ABILITY_MULTITYPE, _057 + CompareMonDataToValue OPCODE_NEQ, BTLSCR_DEFENDER, BATTLEMON_EMBARGO_TURNS, 0, _057 + CompareMonDataToValue OPCODE_EQU, BTLSCR_DEFENDER, BATTLEMON_HELD_ITEM, ITEM_GRISEOUS_ORB, _057 + CompareMonDataToValue OPCODE_NEQ, BTLSCR_DEFENDER, BATTLEMON_QUICK_CLAW, 0, _057 + CompareMonDataToValue OPCODE_NEQ, BTLSCR_DEFENDER, BATTLEMON_CUSTAP_BERRY, 0, _057 + Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION + UpdateMonData OPCODE_FLAG_ON, BTLSCR_DEFENDER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_EMBARGO + UpdateMonData OPCODE_SET, BTLSCR_DEFENDER, BATTLEMON_EMBARGO_TURNS, 5 + // {0} can’t use items anymore! + PrintMessage pl_msg_00000368_01135, TAG_NICKNAME, BTLSCR_DEFENDER + Wait + WaitButtonABTime 30 + End + +_057: + UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_FAILED + End diff --git a/res/battle/scripts/subscripts/subscript_0219.s b/res/battle/scripts/subscripts/subscript_0219.s new file mode 100644 index 0000000000..576b330ee6 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0219.s @@ -0,0 +1,24 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + TryPluck _024, _023 + // {0} stole and ate its foe’s {1}! + PrintMessage pl_msg_00000368_01141, TAG_NICKNAME_ITEM, BTLSCR_ATTACKER, BTLSCR_DEFENDER + Wait + WaitButtonABTime 30 + RemoveItem BTLSCR_DEFENDER + UpdateVarFromVar OPCODE_SET, BTLVAR_MSG_BATTLER_TEMP, BTLVAR_ATTACKER + CompareVarToValue OPCODE_EQU, BTLVAR_SCRIPT_TEMP, 0, _023 + CallFromVar BTLVAR_SCRIPT_TEMP + +_023: + End + +_024: + // {0}’s {1} made {2} ineffective! + PrintMessage pl_msg_00000368_00714, TAG_NICKNAME_ABILITY_MOVE, BTLSCR_DEFENDER, BTLSCR_DEFENDER, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0220.s b/res/battle/scripts/subscripts/subscript_0220.s new file mode 100644 index 0000000000..50bae34c44 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0220.s @@ -0,0 +1,13 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareVarToValue OPCODE_EQU, BTLVAR_FLING_SCRIPT, 0, _019 + CompareMonDataToValue OPCODE_EQU, BTLSCR_DEFENDER, BATTLEMON_CUR_HP, 0, _019 + CheckSubstitute BTLSCR_DEFENDER, _019 + UpdateVarFromVar OPCODE_SET, BTLVAR_HP_CALC_TEMP, BTLVAR_FLING_TEMP + CallFromVar BTLVAR_FLING_SCRIPT + +_019: + End diff --git a/res/battle/scripts/subscripts/subscript_0221.s b/res/battle/scripts/subscripts/subscript_0221.s new file mode 100644 index 0000000000..062256b98e --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0221.s @@ -0,0 +1,30 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} cured its {2} status with its {1}! + PrintMessage pl_msg_00000368_00740, TAG_NICKNAME_ABILITY_STATUS, BTLSCR_MSG_TEMP, BTLSCR_MSG_TEMP, BTLSCR_MSG_TEMP + Wait + SetHealthbarStatus BTLSCR_MSG_TEMP, BATTLE_ANIMATION_NONE + WaitButtonABTime 30 + CompareVarToValue OPCODE_EQU, BTLVAR_MSG_TEMP, 0, _033 + CompareVarToValue OPCODE_EQU, BTLVAR_MSG_TEMP, 5, _045 + CompareVarToValue OPCODE_EQU, BTLVAR_MSG_TEMP, 6, _052 + UpdateMonData OPCODE_SET, BTLSCR_MSG_TEMP, BATTLEMON_STATUS, MON_CONDITION_NONE + GoTo _057 + +_033: + UpdateMonData OPCODE_SET, BTLSCR_MSG_TEMP, BATTLEMON_STATUS, MON_CONDITION_NONE + UpdateMonData OPCODE_FLAG_OFF, BTLSCR_MSG_TEMP, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_NIGHTMARE + GoTo _057 + +_045: + UpdateMonData OPCODE_FLAG_OFF, BTLSCR_MSG_TEMP, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_CONFUSION + GoTo _057 + +_052: + UpdateMonData OPCODE_FLAG_OFF, BTLSCR_MSG_TEMP, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_ATTRACT + +_057: + End diff --git a/res/battle/scripts/subscripts/subscript_0222.s b/res/battle/scripts/subscripts/subscript_0222.s new file mode 100644 index 0000000000..f436d0f636 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0222.s @@ -0,0 +1,19 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // Used the {0}! + PrintMessage pl_msg_00000368_01206, TAG_ITEM, BTLSCR_MSG_TEMP + Wait + PlayBattleAnimation BTLSCR_PLAYER, BATTLE_ANIMATION_ITEM_ESCAPE + Wait + PlaySound BTLSCR_ATTACKER, 1791 + // Got away safely! + PrintMessage pl_msg_00000368_00781, TAG_NONE + Wait + WaitButtonABTime 30 + FadeOutBattle + Wait + UpdateVar OPCODE_FLAG_ON, BTLVAR_RESULT_MASK, BATTLE_RESULT_PLAYER_FLED + End diff --git a/res/battle/scripts/subscripts/subscript_0223.s b/res/battle/scripts/subscripts/subscript_0223.s new file mode 100644 index 0000000000..5dbdd53aa7 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0223.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + End diff --git a/res/battle/scripts/subscripts/subscript_0224.s b/res/battle/scripts/subscripts/subscript_0224.s new file mode 100644 index 0000000000..5debc3b349 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0224.s @@ -0,0 +1,14 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareMonDataToValue OPCODE_EQU, BTLSCR_ATTACKER, BATTLEMON_ITEM_HP_RECOVERY, 0, _025 + UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_ITEM_HP_RECOVERY, BTLVAR_HP_CALC_TEMP + UpdateMonData OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_ITEM_HP_RECOVERY, 0 + UpdateVarFromVar OPCODE_SET, BTLVAR_MSG_BATTLER_TEMP, BTLVAR_ATTACKER + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_SPRITE_BLINK + Call BATTLE_SUBSCRIPT_UPDATE_HP + +_025: + End diff --git a/res/battle/scripts/subscripts/subscript_0225.s b/res/battle/scripts/subscripts/subscript_0225.s new file mode 100644 index 0000000000..5dbdd53aa7 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0225.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + End diff --git a/res/battle/scripts/subscripts/subscript_0226.s b/res/battle/scripts/subscripts/subscript_0226.s new file mode 100644 index 0000000000..2b2d0aa262 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0226.s @@ -0,0 +1,11 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + Call BATTLE_SUBSCRIPT_RECOIL_1_3 + CompareVarToValue OPCODE_FLAG_NOT, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_APPLY_SECONDARY_EFFECT, _008 + Call BATTLE_SUBSCRIPT_PARALYZE + +_008: + End diff --git a/res/battle/scripts/subscripts/subscript_0227.s b/res/battle/scripts/subscripts/subscript_0227.s new file mode 100644 index 0000000000..17e2f3e214 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0227.s @@ -0,0 +1,28 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} threw some Bait at the {1}! + PrintGlobalMessage pl_msg_00000368_00851, TAG_TRNAME_NICKNAME, BTLSCR_ATTACKER, BTLSCR_DEFENDER + Wait + WaitButtonABTime 30 + ThrowPokeball BTLSCR_PLAYER, BTLSCR_THROW_SAFARI_BAIT + Wait + PlayBattleAnimation BTLSCR_ENEMY, BATTLE_ANIMATION_HAPPY + Wait + PlayBattleAnimation BTLSCR_ENEMY, BATTLE_ANIMATION_EATING + Wait + CompareVarToValue OPCODE_EQU, BTLVAR_SCRIPT_TEMP, 0, _030 + // {0} is eating! + PrintGlobalMessage pl_msg_00000368_00852, TAG_NICKNAME, BTLSCR_DEFENDER + GoTo _034 + +_030: + // {0} is busy eating! + PrintGlobalMessage pl_msg_00000368_00853, TAG_NICKNAME, BTLSCR_DEFENDER + +_034: + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0228.s b/res/battle/scripts/subscripts/subscript_0228.s new file mode 100644 index 0000000000..c7ca56053f --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0228.s @@ -0,0 +1,26 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} threw mud at the {1}! + PrintGlobalMessage pl_msg_00000368_00854, TAG_TRNAME_NICKNAME, BTLSCR_ATTACKER, BTLSCR_DEFENDER + Wait + WaitButtonABTime 30 + ThrowPokeball BTLSCR_PLAYER, BTLSCR_THROW_SAFARI_ROCK + Wait + PlayBattleAnimation BTLSCR_ENEMY, BATTLE_ANIMATION_ANGRY + Wait + CompareVarToValue OPCODE_EQU, BTLVAR_SCRIPT_TEMP, 0, _026 + // {0} is angry! + PrintGlobalMessage pl_msg_00000368_00855, TAG_NICKNAME, BTLSCR_DEFENDER + GoTo _030 + +_026: + // {0} is beside itself with anger! + PrintGlobalMessage pl_msg_00000368_00856, TAG_NICKNAME, BTLSCR_DEFENDER + +_030: + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0229.s b/res/battle/scripts/subscripts/subscript_0229.s new file mode 100644 index 0000000000..f72dd7f876 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0229.s @@ -0,0 +1,10 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} is watching carefully! + PrintGlobalMessage pl_msg_00000368_00849, TAG_NICKNAME, BTLSCR_DEFENDER + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0230.s b/res/battle/scripts/subscripts/subscript_0230.s new file mode 100644 index 0000000000..f48a7945bf --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0230.s @@ -0,0 +1,15 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PlaySound BTLSCR_ATTACKER, 1791 + // The wild {0} fled! + PrintGlobalMessage pl_msg_00000368_00784, TAG_NICKNAME, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + FadeOutBattle + Wait + UpdateVar OPCODE_FLAG_ON, BTLVAR_RESULT_MASK, BATTLE_RESULT_PLAYER_FLED + IncrementGameStat BTLSCR_ATTACKER, BATTLER_TYPE_SOLO_ENEMY, 99 + End diff --git a/res/battle/scripts/subscripts/subscript_0231.s b/res/battle/scripts/subscripts/subscript_0231.s new file mode 100644 index 0000000000..b25099ef65 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0231.s @@ -0,0 +1,69 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareVarToValue OPCODE_EQU, BTLVAR_SCRIPT_TEMP, 1, _034 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_TYPE, BATTLE_TYPE_TRAINER, _018 + // Use next Pokémon?{YESNO 0} + PrintMessage pl_msg_00000368_00011, TAG_NONE + Wait + YesNoMenu YES_NO_NEXT_MON + WaitYesNoResult _018, _024 + +_018: + ShowParty + WaitMonSelection + SwitchAndUpdateMon BTLSCR_SWITCHED_MON + GoTo _064 + +_024: + TryEscape BTLSCR_PLAYER, _031 + Call BATTLE_SUBSCRIPT_ESCAPE_FAILED + GoTo _018 + +_031: + Call BATTLE_SUBSCRIPT_ESCAPE + End + +_034: + ShowParty + WaitMonSelection + +_036: + SwitchAndUpdateMon BTLSCR_SWITCHED_MON + // {0} {1} is about to send in {2}. Will you switch your Pokémon?{YESNO 0} + PrintMessage pl_msg_00000368_00835, TAG_TRCLASS_TRNAME_NICKNAME_TRNAME, BTLSCR_SWITCHED_MON, BTLSCR_SWITCHED_MON, BTLSCR_SWITCHED_MON, BTLSCR_PLAYER + Wait + YesNoMenu YES_NO_CHANGE_MON + WaitYesNoResult _051, _064 + +_051: + UpdateVarFromVar OPCODE_SET, BTLVAR_SWITCHED_MON_TEMP, BTLVAR_SWITCHED_MON + ChoosePokemonMenu + WaitPokemonMenuResult _060 + Call BATTLE_SUBSCRIPT_SWITCH_POKEMON + +_060: + UpdateVarFromVar OPCODE_SET, BTLVAR_SWITCHED_MON, BTLVAR_SWITCHED_MON_TEMP + +_064: + LoadPartyGaugeGraphics + ShowPartyGauge BTLSCR_SWITCHED_MON + Wait + PrintSendOutMessage BTLSCR_SWITCHED_MON + Wait + HidePartyGauge BTLSCR_SWITCHED_MON + Wait + FreePartyGaugeGraphics + PokemonSendOut BTLSCR_SWITCHED_MON + WaitTime 72 + HealthbarSlideIn BTLSCR_SWITCHED_MON + Wait + Call BATTLE_SUBSCRIPT_HAZARDS_CHECK + CompareVarToValue OPCODE_FLAG_NOT, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_MON_FAINTED, _091 + Call BATTLE_SUBSCRIPT_FAINT_MON + +_091: + GoToIfAnySwitches _036 + End diff --git a/res/battle/scripts/subscripts/subscript_0232.s b/res/battle/scripts/subscripts/subscript_0232.s new file mode 100644 index 0000000000..19b9e5c543 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0232.s @@ -0,0 +1,14 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_MSG_MOVE_TEMP, MOVE_FOCUS_PUNCH + PlayMoveAnimationOnMons BTLSCR_MSG_TEMP, BTLSCR_MSG_TEMP, BTLSCR_MSG_TEMP + Wait + // {0} is tightening its focus! + PrintMessage pl_msg_00000368_00497, TAG_NICKNAME, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_PLAYED_MOVE_ANIMATION + End diff --git a/res/battle/scripts/subscripts/subscript_0233.s b/res/battle/scripts/subscripts/subscript_0233.s new file mode 100644 index 0000000000..1b774fd074 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0233.s @@ -0,0 +1,10 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // Your team’s tailwind petered out! + PrintMessage pl_msg_00000368_01232, TAG_NONE_SIDE_CONSCIOUS, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0234.s b/res/battle/scripts/subscripts/subscript_0234.s new file mode 100644 index 0000000000..e06549e22b --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0234.s @@ -0,0 +1,11 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_FLAG_OFF, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_RAINING_TEMP + // The rain stopped. + PrintMessage pl_msg_00000368_00803, TAG_NONE + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0235.s b/res/battle/scripts/subscripts/subscript_0235.s new file mode 100644 index 0000000000..6fb48078bd --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0235.s @@ -0,0 +1,11 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_FLAG_OFF, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_SANDSTORM_TEMP + // The sandstorm subsided. + PrintMessage pl_msg_00000368_00806, TAG_NONE + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0236.s b/res/battle/scripts/subscripts/subscript_0236.s new file mode 100644 index 0000000000..b38b610b76 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0236.s @@ -0,0 +1,11 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_FLAG_OFF, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_SUNNY_TEMP + // The sunlight faded. + PrintMessage pl_msg_00000368_00809, TAG_NONE + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0237.s b/res/battle/scripts/subscripts/subscript_0237.s new file mode 100644 index 0000000000..96b2d4157c --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0237.s @@ -0,0 +1,11 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_FLAG_OFF, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_HAILING_TEMP + // The hail stopped. + PrintMessage pl_msg_00000368_00812, TAG_NONE + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0238.s b/res/battle/scripts/subscripts/subscript_0238.s new file mode 100644 index 0000000000..1562a4e203 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0238.s @@ -0,0 +1,10 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // Gravity returned to normal! + PrintMessage pl_msg_00000368_01004, TAG_NONE + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0239.s b/res/battle/scripts/subscripts/subscript_0239.s new file mode 100644 index 0000000000..fbd57ab1be --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0239.s @@ -0,0 +1,11 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_MSG_MOVE_TEMP, MOVE_HEAL_BLOCK + // {0} was prevented from healing due to {1}! + PrintMessage pl_msg_00000368_01054, TAG_NICKNAME_MOVE, BTLSCR_MSG_TEMP, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0240.s b/res/battle/scripts/subscripts/subscript_0240.s new file mode 100644 index 0000000000..f35b1b5be3 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0240.s @@ -0,0 +1,10 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} is making an uproar! + PrintMessage pl_msg_00000368_00311, TAG_NICKNAME, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0241.s b/res/battle/scripts/subscripts/subscript_0241.s new file mode 100644 index 0000000000..6ed6b1f155 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0241.s @@ -0,0 +1,10 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} calmed down. + PrintMessage pl_msg_00000368_00314, TAG_NICKNAME, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0242.s b/res/battle/scripts/subscripts/subscript_0242.s new file mode 100644 index 0000000000..65ba852dbe --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0242.s @@ -0,0 +1,11 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0}’s electromagnetism wore off! + PrintMessage pl_msg_00000368_01039, TAG_NICKNAME, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + UpdateMonData OPCODE_FLAG_OFF, BTLSCR_MSG_TEMP, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_MAGNET_RISE + End diff --git a/res/battle/scripts/subscripts/subscript_0243.s b/res/battle/scripts/subscripts/subscript_0243.s new file mode 100644 index 0000000000..263b64a639 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0243.s @@ -0,0 +1,12 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_MSG_MOVE_TEMP, MOVE_HEAL_BLOCK + // {0}’s {1} wore off! + PrintMessage pl_msg_00000368_01060, TAG_NICKNAME_MOVE, BTLSCR_MSG_TEMP, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + UpdateMonData OPCODE_FLAG_OFF, BTLSCR_MSG_TEMP, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_HEAL_BLOCK + End diff --git a/res/battle/scripts/subscripts/subscript_0244.s b/res/battle/scripts/subscripts/subscript_0244.s new file mode 100644 index 0000000000..6d8ef46942 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0244.s @@ -0,0 +1,11 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} can use items again! + PrintMessage pl_msg_00000368_01138, TAG_NICKNAME, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + UpdateMonData OPCODE_FLAG_OFF, BTLSCR_MSG_TEMP, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_EMBARGO + End diff --git a/res/battle/scripts/subscripts/subscript_0245.s b/res/battle/scripts/subscripts/subscript_0245.s new file mode 100644 index 0000000000..1c248c4c8b --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0245.s @@ -0,0 +1,10 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0}’s rage is building! + PrintMessage pl_msg_00000368_00363, TAG_NICKNAME, BTLSCR_DEFENDER + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0246.s b/res/battle/scripts/subscripts/subscript_0246.s new file mode 100644 index 0000000000..ffe2c8c3ab --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0246.s @@ -0,0 +1,22 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CheckAbility CHECK_HAVE, BTLSCR_ATTACKER, ABILITY_ROCK_HEAD, _038 + CheckAbility CHECK_HAVE, BTLSCR_ATTACKER, ABILITY_MAGIC_GUARD, _038 + UpdateVarFromVar OPCODE_SET, BTLVAR_MSG_BATTLER_TEMP, BTLVAR_ATTACKER + UpdateVarFromVar OPCODE_SET, BTLVAR_HP_CALC_TEMP, BTLVAR_HIT_DAMAGE + CompareVarToValue OPCODE_EQU, BTLVAR_HP_CALC_TEMP, 0, _025 + DivideVarByValue BTLVAR_HP_CALC_TEMP, 2 + +_025: + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_SPRITE_BLINK + Call BATTLE_SUBSCRIPT_UPDATE_HP + // {0} is hit with recoil! + PrintMessage pl_msg_00000368_00279, TAG_NICKNAME, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + +_038: + End diff --git a/res/battle/scripts/subscripts/subscript_0247.s b/res/battle/scripts/subscripts/subscript_0247.s new file mode 100644 index 0000000000..fd67b2918b --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0247.s @@ -0,0 +1,14 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CheckEffectActivation _003 + Call BATTLE_SUBSCRIPT_BURN + +_003: + CheckEffectActivation _007 + Call BATTLE_SUBSCRIPT_FLINCH_MON + +_007: + End diff --git a/res/battle/scripts/subscripts/subscript_0248.s b/res/battle/scripts/subscripts/subscript_0248.s new file mode 100644 index 0000000000..3fd0a4bdbf --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0248.s @@ -0,0 +1,14 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CheckEffectActivation _003 + Call BATTLE_SUBSCRIPT_FREEZE + +_003: + CheckEffectActivation _007 + Call BATTLE_SUBSCRIPT_FLINCH_MON + +_007: + End diff --git a/res/battle/scripts/subscripts/subscript_0249.s b/res/battle/scripts/subscripts/subscript_0249.s new file mode 100644 index 0000000000..284aa00caa --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0249.s @@ -0,0 +1,14 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CheckEffectActivation _003 + Call BATTLE_SUBSCRIPT_PARALYZE + +_003: + CheckEffectActivation _007 + Call BATTLE_SUBSCRIPT_FLINCH_MON + +_007: + End diff --git a/res/battle/scripts/subscripts/subscript_0250.s b/res/battle/scripts/subscripts/subscript_0250.s new file mode 100644 index 0000000000..e8b3139c6d --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0250.s @@ -0,0 +1,10 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // Your team’s Lucky Chant wore off! + PrintMessage pl_msg_00000368_01085, TAG_NONE_SIDE_CONSCIOUS, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0251.s b/res/battle/scripts/subscripts/subscript_0251.s new file mode 100644 index 0000000000..7d03456d64 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0251.s @@ -0,0 +1,10 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // The twisted dimensions returned to normal! + PrintGlobalMessage pl_msg_00000368_01076, TAG_NONE + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0252.s b/res/battle/scripts/subscripts/subscript_0252.s new file mode 100644 index 0000000000..0e11f9bf54 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0252.s @@ -0,0 +1,15 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PlayBattleAnimation BTLSCR_PLAYER, BATTLE_ANIMATION_WEATHER_HAIL + Wait + WaitButtonABTime 15 + // {0}’s {1} whipped up a hailstorm! + PrintMessage pl_msg_00000368_00701, TAG_NICKNAME_ABILITY, BTLSCR_MSG_TEMP, BTLSCR_MSG_BATTLER_TEMP + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_OFF, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_WEATHER + UpdateVar OPCODE_FLAG_ON, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_HAILING_PERM + End diff --git a/res/battle/scripts/subscripts/subscript_0253.s b/res/battle/scripts/subscripts/subscript_0253.s new file mode 100644 index 0000000000..214454c371 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0253.s @@ -0,0 +1,11 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + WaitButtonABTime 15 + // {0} frisked its foe and found one {1}! + PrintMessage pl_msg_00000368_01118, TAG_NICKNAME_ITEM, BTLSCR_MSG_TEMP, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0254.s b/res/battle/scripts/subscripts/subscript_0254.s new file mode 100644 index 0000000000..e48189f2c1 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0254.s @@ -0,0 +1,11 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + WaitButtonABTime 15 + // {0} ignored orders while asleep! + PrintMessage pl_msg_00000368_00825, TAG_NICKNAME, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0255.s b/res/battle/scripts/subscripts/subscript_0255.s new file mode 100644 index 0000000000..c1db1e20d6 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0255.s @@ -0,0 +1,33 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + WaitButtonABTime 15 + Random 3, 0 + CompareVarToValue OPCODE_EQU, BTLVAR_CALC_TEMP, 0x00000001, _025 + CompareVarToValue OPCODE_EQU, BTLVAR_CALC_TEMP, 0x00000002, _031 + CompareVarToValue OPCODE_EQU, BTLVAR_CALC_TEMP, 0x00000003, _037 + // {0} is loafing around! + PrintMessage pl_msg_00000368_00828, TAG_NICKNAME, BTLSCR_ATTACKER + GoTo _043 + +_025: + // {0} won’t obey! + PrintMessage pl_msg_00000368_00829, TAG_NICKNAME, BTLSCR_ATTACKER + GoTo _043 + +_031: + // {0} turned away! + PrintMessage pl_msg_00000368_00830, TAG_NICKNAME, BTLSCR_ATTACKER + GoTo _043 + +_037: + // {0} pretended not to notice! + PrintMessage pl_msg_00000368_00831, TAG_NICKNAME, BTLSCR_ATTACKER + GoTo _043 + +_043: + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0256.s b/res/battle/scripts/subscripts/subscript_0256.s new file mode 100644 index 0000000000..b9093164e5 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0256.s @@ -0,0 +1,11 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + WaitButtonABTime 15 + // {0} ignored orders! + PrintMessage pl_msg_00000368_00826, TAG_NICKNAME, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0257.s b/res/battle/scripts/subscripts/subscript_0257.s new file mode 100644 index 0000000000..3c07e5c589 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0257.s @@ -0,0 +1,14 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + WaitButtonABTime 15 + // {0} began to nap! + PrintMessage pl_msg_00000368_00827, TAG_NICKNAME, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + UpdateVarFromVar OPCODE_SET, BTLVAR_SIDE_EFFECT_MON, BTLVAR_ATTACKER + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_DISOBEDIENCE + Call BATTLE_SUBSCRIPT_FALL_ASLEEP + End diff --git a/res/battle/scripts/subscripts/subscript_0258.s b/res/battle/scripts/subscripts/subscript_0258.s new file mode 100644 index 0000000000..fa58071557 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0258.s @@ -0,0 +1,15 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} won’t obey! + PrintMessage pl_msg_00000368_00829, TAG_NICKNAME, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + // It hurt itself in its confusion! + PrintMessage pl_msg_00000368_00797, TAG_NONE + Wait + WaitButtonABTime 30 + UnlockMoveChoice BTLSCR_ATTACKER + GoToSubscript BATTLE_SUBSCRIPT_UPDATE_HP diff --git a/res/battle/scripts/subscripts/subscript_0259.s b/res/battle/scripts/subscripts/subscript_0259.s new file mode 100644 index 0000000000..5f6fbf0b02 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0259.s @@ -0,0 +1,9 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_MOVE_EFFECT_CHANCE, 1 + UpdateMonData OPCODE_FLAG_OFF, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_MOVE_LOCKED + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_LAST_OF_MULTI_TURN + End diff --git a/res/battle/scripts/subscripts/subscript_0260.s b/res/battle/scripts/subscripts/subscript_0260.s new file mode 100644 index 0000000000..c4953d0bc7 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0260.s @@ -0,0 +1,10 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CheckChatterActivation _003 + Call BATTLE_SUBSCRIPT_CONFUSE + +_003: + End diff --git a/res/battle/scripts/subscripts/subscript_0261.s b/res/battle/scripts/subscripts/subscript_0261.s new file mode 100644 index 0000000000..e428c55def --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0261.s @@ -0,0 +1,53 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateMonData OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_CUR_HP, 0 + UpdateVar OPCODE_SET, BTLVAR_HP_CALC_TEMP, 32767 + UpdateHealthBar BTLSCR_ATTACKER + Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION + TryFaintMon BTLSCR_ATTACKER + UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_MON_FAINTED + Call BATTLE_SUBSCRIPT_FAINT_MON + UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_PAYOUT_EXP + Call BATTLE_SUBSCRIPT_GRANT_EXP + +_026: + TryReplaceFaintedMon BTLSCR_ATTACKER, TRUE, _127 + ShowParty + WaitMonSelection + SwitchAndUpdateMon BTLSCR_SWITCHED_MON + PrintSendOutMessage BTLSCR_SWITCHED_MON + Wait + PokemonSendOut BTLSCR_SWITCHED_MON + WaitTime 72 + HealthbarSlideIn BTLSCR_SWITCHED_MON + Wait + Call BATTLE_SUBSCRIPT_HAZARDS_CHECK + CompareVarToValue OPCODE_FLAG_NOT, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_MON_FAINTED, _065 + Call BATTLE_SUBSCRIPT_FAINT_MON + UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_PAYOUT_EXP + Call BATTLE_SUBSCRIPT_GRANT_EXP + TryReplaceFaintedMon BTLSCR_ATTACKER, TRUE, _127 + GoTo _026 + +_065: + UpdateMonData OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_STATUS, MON_CONDITION_NONE + SetHealthbarStatus BTLSCR_ATTACKER, BATTLE_ANIMATION_NONE + UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_MAX_PP_1, BTLVAR_CALC_TEMP + UpdateMonDataFromVar OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_CUR_PP_1, BTLVAR_CALC_TEMP + UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_MAX_PP_2, BTLVAR_CALC_TEMP + UpdateMonDataFromVar OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_CUR_PP_2, BTLVAR_CALC_TEMP + UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_MAX_PP_3, BTLVAR_CALC_TEMP + UpdateMonDataFromVar OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_CUR_PP_3, BTLVAR_CALC_TEMP + UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_MAX_PP_4, BTLVAR_CALC_TEMP + UpdateMonDataFromVar OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_CUR_PP_4, BTLVAR_CALC_TEMP + UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_MAX_HP, BTLVAR_HP_CALC_TEMP + UpdateVarFromVar OPCODE_SET, BTLVAR_MSG_BATTLER_TEMP, BTLVAR_ATTACKER + // It became cloaked in mystical moonlight! + BufferMessage pl_msg_00000368_01006, TAG_NONE + Call BATTLE_SUBSCRIPT_WISH_HEAL + +_127: + End diff --git a/res/battle/scripts/subscripts/subscript_0262.s b/res/battle/scripts/subscripts/subscript_0262.s new file mode 100644 index 0000000000..9bdc71908c --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0262.s @@ -0,0 +1,35 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareMonDataToValue OPCODE_FLAG_NOT, BTLSCR_MSG_TEMP, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_SUBSTITUTE, _016 + PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_SUB_OUT + Wait + RestoreSprite BTLSCR_MSG_TEMP + Wait + PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_SUB_IN + Wait + +_016: + PlaySound BTLSCR_MSG_TEMP, 1980 + SetMosaic BTLSCR_MSG_TEMP, 8, 1 + Wait + ChangeForm BTLSCR_MSG_TEMP + PlaySound BTLSCR_MSG_TEMP, 1984 + SetMosaic BTLSCR_MSG_TEMP, 0, 1 + Wait + // {0} transformed! + PrintMessage pl_msg_00000368_00721, TAG_NICKNAME, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + CompareMonDataToValue OPCODE_FLAG_NOT, BTLSCR_MSG_TEMP, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_SUBSTITUTE, _058 + PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_SUB_OUT + Wait + RefreshSprite BTLSCR_MSG_TEMP + Wait + PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_SUB_IN + Wait + +_058: + End diff --git a/res/battle/scripts/subscripts/subscript_0263.s b/res/battle/scripts/subscripts/subscript_0263.s new file mode 100644 index 0000000000..ae4a04fc9c --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0263.s @@ -0,0 +1,24 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_MSG_ATTACKER, 0 + +_003: + CompareVarToValue OPCODE_FLAG_NOT, BTLVAR_SCRIPT_TEMP, 1, _029 + // {2} is tormented by {0}’s {1}! + PrintMessage pl_msg_00000368_01121, TAG_NICKNAME_ABILITY_NICKNAME, BTLSCR_MSG_ATTACKER, BTLSCR_MSG_ATTACKER, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_SPRITE_BLINK + Call BATTLE_SUBSCRIPT_UPDATE_HP + CompareMonDataToValue OPCODE_EQU, BTLSCR_MSG_TEMP, BATTLEMON_CUR_HP, 0, _042 + +_029: + UpdateVar OPCODE_ADD, BTLVAR_MSG_ATTACKER, 1 + UpdateVar OPCODE_RIGHT_SHIFT, BTLVAR_SCRIPT_TEMP, 1 + CompareVarToValue OPCODE_NEQ, BTLVAR_SCRIPT_TEMP, 0, _003 + +_042: + End diff --git a/res/battle/scripts/subscripts/subscript_0264.s b/res/battle/scripts/subscripts/subscript_0264.s new file mode 100644 index 0000000000..fd79edb1ad --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0264.s @@ -0,0 +1,120 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_IGNORE_TYPE_CHECKS|SYSCTL_IGNORE_IMMUNITIES, _262 + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_ONE_HIT_KO, _262 + CheckAbility CHECK_NOT_HAVE, BTLSCR_ATTACKER, ABILITY_NORMALIZE, _020 + UpdateVar OPCODE_SET, BTLVAR_CALC_TEMP, 0x00000000 + GoTo _033 + +_020: + CompareVarToValue OPCODE_EQU, BTLVAR_MOVE_TYPE, TYPE_NORMAL, _031 + UpdateVarFromVar OPCODE_GET, BTLVAR_MOVE_TYPE, BTLVAR_CALC_TEMP + GoTo _033 + +_031: + GetCurrentMoveData MOVEATTRIBUTE_TYPE + +_033: + GetItemHoldEffect BTLSCR_MSG_TEMP, BTLVAR_SCRIPT_TEMP + CompareVarToValue OPCODE_EQU, BTLVAR_SCRIPT_TEMP, 35, _128 + CompareVarToValue OPCODE_FLAG_NOT, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_SUPER_EFFECTIVE, _262 + CompareVarToValue OPCODE_EQU, BTLVAR_SCRIPT_TEMP, 19, _135 + CompareVarToValue OPCODE_EQU, BTLVAR_SCRIPT_TEMP, 20, _142 + CompareVarToValue OPCODE_EQU, BTLVAR_SCRIPT_TEMP, 21, _149 + CompareVarToValue OPCODE_EQU, BTLVAR_SCRIPT_TEMP, 22, _156 + CompareVarToValue OPCODE_EQU, BTLVAR_SCRIPT_TEMP, 23, _163 + CompareVarToValue OPCODE_EQU, BTLVAR_SCRIPT_TEMP, 24, _170 + CompareVarToValue OPCODE_EQU, BTLVAR_SCRIPT_TEMP, 25, _177 + CompareVarToValue OPCODE_EQU, BTLVAR_SCRIPT_TEMP, 26, _184 + CompareVarToValue OPCODE_EQU, BTLVAR_SCRIPT_TEMP, 27, _191 + CompareVarToValue OPCODE_EQU, BTLVAR_SCRIPT_TEMP, 28, _198 + CompareVarToValue OPCODE_EQU, BTLVAR_SCRIPT_TEMP, 29, _205 + CompareVarToValue OPCODE_EQU, BTLVAR_SCRIPT_TEMP, 30, _212 + CompareVarToValue OPCODE_EQU, BTLVAR_SCRIPT_TEMP, 31, _219 + CompareVarToValue OPCODE_EQU, BTLVAR_SCRIPT_TEMP, 32, _226 + CompareVarToValue OPCODE_EQU, BTLVAR_SCRIPT_TEMP, 33, _233 + CompareVarToValue OPCODE_EQU, BTLVAR_SCRIPT_TEMP, 34, _240 + GoTo _262 + +_128: + CompareVarToValue OPCODE_EQU, BTLVAR_CALC_TEMP, 0x00000000, _245 + GoTo _262 + +_135: + CompareVarToValue OPCODE_EQU, BTLVAR_CALC_TEMP, 0x0000000A, _245 + GoTo _262 + +_142: + CompareVarToValue OPCODE_EQU, BTLVAR_CALC_TEMP, 0x0000000B, _245 + GoTo _262 + +_149: + CompareVarToValue OPCODE_EQU, BTLVAR_CALC_TEMP, 0x0000000D, _245 + GoTo _262 + +_156: + CompareVarToValue OPCODE_EQU, BTLVAR_CALC_TEMP, 0x0000000C, _245 + GoTo _262 + +_163: + CompareVarToValue OPCODE_EQU, BTLVAR_CALC_TEMP, 0x0000000F, _245 + GoTo _262 + +_170: + CompareVarToValue OPCODE_EQU, BTLVAR_CALC_TEMP, 0x00000001, _245 + GoTo _262 + +_177: + CompareVarToValue OPCODE_EQU, BTLVAR_CALC_TEMP, 0x00000003, _245 + GoTo _262 + +_184: + CompareVarToValue OPCODE_EQU, BTLVAR_CALC_TEMP, 0x00000004, _245 + GoTo _262 + +_191: + CompareVarToValue OPCODE_EQU, BTLVAR_CALC_TEMP, 0x00000002, _245 + GoTo _262 + +_198: + CompareVarToValue OPCODE_EQU, BTLVAR_CALC_TEMP, 0x0000000E, _245 + GoTo _262 + +_205: + CompareVarToValue OPCODE_EQU, BTLVAR_CALC_TEMP, 0x00000006, _245 + GoTo _262 + +_212: + CompareVarToValue OPCODE_EQU, BTLVAR_CALC_TEMP, 0x00000005, _245 + GoTo _262 + +_219: + CompareVarToValue OPCODE_EQU, BTLVAR_CALC_TEMP, 0x00000007, _245 + GoTo _262 + +_226: + CompareVarToValue OPCODE_EQU, BTLVAR_CALC_TEMP, 0x00000010, _245 + GoTo _262 + +_233: + CompareVarToValue OPCODE_EQU, BTLVAR_CALC_TEMP, 0x00000011, _245 + GoTo _262 + +_240: + CompareVarToValue OPCODE_NEQ, BTLVAR_CALC_TEMP, 0x00000008, _262 + +_245: + PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_HELD_ITEM + Wait + DivideVarByValue BTLVAR_HP_CALC_TEMP, 2 + // The {0} weakened {1}’s power! + PrintMessage pl_msg_00000368_01131, TAG_ITEM_MOVE, BTLSCR_MSG_BATTLER_TEMP, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + RemoveItem BTLSCR_MSG_TEMP + +_262: + End diff --git a/res/battle/scripts/subscripts/subscript_0265.s b/res/battle/scripts/subscripts/subscript_0265.s new file mode 100644 index 0000000000..1e50a3d022 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0265.s @@ -0,0 +1,14 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_HELD_ITEM + Wait + // {0} boosted the accuracy of its next move using its {1}! + PrintMessage pl_msg_00000368_01157, TAG_NICKNAME_ITEM, BTLSCR_MSG_TEMP, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + UpdateMonData OPCODE_SET, BTLSCR_MSG_TEMP, BATTLEMON_MICLE_BERRY, 1 + Call BATTLE_SUBSCRIPT_PLUCK_CHECK + End diff --git a/res/battle/scripts/subscripts/subscript_0266.s b/res/battle/scripts/subscripts/subscript_0266.s new file mode 100644 index 0000000000..8d6d4189af --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0266.s @@ -0,0 +1,19 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareMonDataToValue OPCODE_EQU, BTLSCR_DEFENDER, BATTLEMON_CUR_HP, 0, _009 + PlayBattleAnimation BTLSCR_DEFENDER, BATTLE_ANIMATION_HELD_ITEM + Wait + +_009: + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_SPRITE_BLINK + UpdateVarFromVar OPCODE_SET, BTLVAR_MSG_BATTLER_TEMP, BTLVAR_ATTACKER + Call BATTLE_SUBSCRIPT_UPDATE_HP + // {0} is hurt by {1}’s {2}! + PrintMessage pl_msg_00000368_01160, TAG_NICKNAME_NICKNAME_ITEM, BTLSCR_ATTACKER, BTLSCR_DEFENDER, BTLSCR_DEFENDER + Wait + WaitButtonABTime 30 + RemoveItem BTLSCR_DEFENDER + End diff --git a/res/battle/scripts/subscripts/subscript_0267.s b/res/battle/scripts/subscripts/subscript_0267.s new file mode 100644 index 0000000000..00ded8e3ee --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0267.s @@ -0,0 +1,21 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + WaitButtonABTime 15 + PlaySound BTLSCR_ATTACKER, 1516 + // {0} {1} used one {2}! + PrintMessage pl_msg_00000368_00858, TAG_TRCLASS_TRNAME_ITEM, BTLSCR_ATTACKER, BTLSCR_ATTACKER, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + UseBagItem BTLSCR_ATTACKER + CompareMonDataToValue OPCODE_EQU, BTLSCR_ATTACKER, BATTLEMON_ITEM_HP_RECOVERY, 0, _041 + UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_ITEM_HP_RECOVERY, BTLVAR_HP_CALC_TEMP + UpdateMonData OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_ITEM_HP_RECOVERY, 0 + UpdateVarFromVar OPCODE_SET, BTLVAR_MSG_BATTLER_TEMP, BTLVAR_ATTACKER + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_SPRITE_BLINK + Call BATTLE_SUBSCRIPT_UPDATE_HP + +_041: + End diff --git a/res/battle/scripts/subscripts/subscript_0268.s b/res/battle/scripts/subscripts/subscript_0268.s new file mode 100644 index 0000000000..1fb6ac4968 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0268.s @@ -0,0 +1,61 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + WaitButtonABTime 15 + PlaySound BTLSCR_ATTACKER, 1516 + // {0} {1} used one {2}! + PrintMessage pl_msg_00000368_00858, TAG_TRCLASS_TRNAME_ITEM, BTLSCR_ATTACKER, BTLSCR_ATTACKER, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + UseBagItem BTLSCR_ATTACKER + CompareVarToValue OPCODE_EQU, BTLVAR_MSG_TEMP, 0, _052 + CompareVarToValue OPCODE_EQU, BTLVAR_MSG_TEMP, 1, _064 + CompareVarToValue OPCODE_EQU, BTLVAR_MSG_TEMP, 2, _071 + CompareVarToValue OPCODE_EQU, BTLVAR_MSG_TEMP, 3, _078 + CompareVarToValue OPCODE_EQU, BTLVAR_MSG_TEMP, 4, _085 + CompareVarToValue OPCODE_EQU, BTLVAR_MSG_TEMP, 5, _092 + // {0} normalized its status using its {1}! + PrintMessage pl_msg_00000368_00896, TAG_NICKNAME_ITEM, BTLSCR_ATTACKER, BTLSCR_MSG_TEMP + GoTo _099 + +_052: + UpdateMonData OPCODE_FLAG_OFF, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_CONFUSION + // {0}’s {1} snapped it out of confusion! + PrintMessage pl_msg_00000368_00890, TAG_NICKNAME_ITEM, BTLSCR_ATTACKER, BTLSCR_MSG_TEMP + GoTo _104 + +_064: + // {0}’s {1} cured its paralysis! + PrintMessage pl_msg_00000368_00875, TAG_NICKNAME_ITEM, BTLSCR_ATTACKER, BTLSCR_MSG_TEMP + GoTo _099 + +_071: + // {0}’s {1} defrosted it! + PrintMessage pl_msg_00000368_00884, TAG_NICKNAME_ITEM, BTLSCR_ATTACKER, BTLSCR_MSG_TEMP + GoTo _099 + +_078: + // {0}’s {1} healed its burn! + PrintMessage pl_msg_00000368_00881, TAG_NICKNAME_ITEM, BTLSCR_ATTACKER, BTLSCR_MSG_TEMP + GoTo _099 + +_085: + // {0}’s {1} cured its poison! + PrintMessage pl_msg_00000368_00878, TAG_NICKNAME_ITEM, BTLSCR_ATTACKER, BTLSCR_MSG_TEMP + GoTo _099 + +_092: + // {0}’s {1} woke it up! + PrintMessage pl_msg_00000368_00887, TAG_NICKNAME_ITEM, BTLSCR_ATTACKER, BTLSCR_MSG_TEMP + GoTo _099 + +_099: + UpdateMonData OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_STATUS, MON_CONDITION_NONE + +_104: + Wait + SetHealthbarStatus BTLSCR_ATTACKER, BATTLE_ANIMATION_NONE + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0269.s b/res/battle/scripts/subscripts/subscript_0269.s new file mode 100644 index 0000000000..aca2c8310d --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0269.s @@ -0,0 +1,17 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + WaitButtonABTime 15 + PlaySound BTLSCR_ATTACKER, 1516 + // {0} {1} used one {2}! + PrintMessage pl_msg_00000368_00858, TAG_TRCLASS_TRNAME_ITEM, BTLSCR_ATTACKER, BTLSCR_ATTACKER, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + UseBagItem BTLSCR_ATTACKER + // The {1} raised {0}’s {2}! + PrintMessage pl_msg_00000368_00756, TAG_NICKNAME_ITEM_STAT, BTLSCR_ATTACKER, BTLSCR_MSG_TEMP, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0270.s b/res/battle/scripts/subscripts/subscript_0270.s new file mode 100644 index 0000000000..bf1da1eee1 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0270.s @@ -0,0 +1,17 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + WaitButtonABTime 15 + PlaySound BTLSCR_ATTACKER, 1516 + // {0} {1} used one {2}! + PrintMessage pl_msg_00000368_00858, TAG_TRCLASS_TRNAME_ITEM, BTLSCR_ATTACKER, BTLSCR_ATTACKER, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + UseBagItem BTLSCR_ATTACKER + // Your team became shrouded in mist! + PrintMessage pl_msg_00000368_00271, TAG_NONE_SIDE_CONSCIOUS, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0271.s b/res/battle/scripts/subscripts/subscript_0271.s new file mode 100644 index 0000000000..7db2b516ec --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0271.s @@ -0,0 +1,13 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PlayBattleAnimation BTLSCR_PLAYER, BATTLE_ANIMATION_WEATHER_RAIN + Wait + // It started to rain! + PrintMessage pl_msg_00000368_00799, TAG_NONE + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_ON, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_RAINING_PERM + End diff --git a/res/battle/scripts/subscripts/subscript_0272.s b/res/battle/scripts/subscripts/subscript_0272.s new file mode 100644 index 0000000000..829db5a580 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0272.s @@ -0,0 +1,13 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PlayBattleAnimation BTLSCR_PLAYER, BATTLE_ANIMATION_WEATHER_HAIL + Wait + // It started to hail! + PrintMessage pl_msg_00000368_00810, TAG_NONE + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_ON, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_HAILING_PERM + End diff --git a/res/battle/scripts/subscripts/subscript_0273.s b/res/battle/scripts/subscripts/subscript_0273.s new file mode 100644 index 0000000000..382901a985 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0273.s @@ -0,0 +1,13 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PlayBattleAnimation BTLSCR_PLAYER, BATTLE_ANIMATION_WEATHER_SAND + Wait + // A sandstorm brewed! + PrintMessage pl_msg_00000368_00804, TAG_NONE + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_ON, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_SANDSTORM_PERM + End diff --git a/res/battle/scripts/subscripts/subscript_0274.s b/res/battle/scripts/subscripts/subscript_0274.s new file mode 100644 index 0000000000..6354946b23 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0274.s @@ -0,0 +1,13 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PlayBattleAnimation BTLSCR_PLAYER, BATTLE_ANIMATION_WEATHER_FOG + Wait + // The fog is deep... + PrintMessage pl_msg_00000368_00813, TAG_NONE + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_ON, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_DEEP_FOG + End diff --git a/res/battle/scripts/subscripts/subscript_0275.s b/res/battle/scripts/subscripts/subscript_0275.s new file mode 100644 index 0000000000..4eda9c995a --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0275.s @@ -0,0 +1,34 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_TYPE, BATTLE_TYPE_PAL_PARK, _015 + // {0} used one {1}! + PrintMessage pl_msg_00000368_00857, TAG_TRNAME_ITEM, BTLSCR_ATTACKER, BTLSCR_MSG_TEMP + Wait + ThrowPokeball BTLSCR_PLAYER, BTLSCR_THROW_SAFARI_BALL + GoTo _023 + +_015: + // {0}, come back! + PrintGlobalMessage pl_msg_00000368_01225, TAG_NICKNAME, BTLSCR_ENEMY + Wait + ThrowPokeball BTLSCR_PLAYER, BTLSCR_THROW_PARK_BALL + +_023: + StartCatchMonTask CAPTURE_SAFARI + WaitCatchMonTask + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_RESULT_MASK, BATTLE_RESULT_CAPTURED_MON, _051 + CompareVarToValue OPCODE_NEQ, BTLVAR_NUM_SAFARI_BALLS, 0, _051 + PlaySound BTLSCR_ATTACKER, 1521 + // Announcer: You’re out of Safari Balls! Game over! + PrintMessage pl_msg_00000368_00850, TAG_NONE + Wait + WaitButtonABTime 30 + FadeOutBattle + Wait + UpdateVar OPCODE_FLAG_ON, BTLVAR_RESULT_MASK, BATTLE_RESULT_PLAYER_FLED + +_051: + End diff --git a/res/battle/scripts/subscripts/subscript_0276.s b/res/battle/scripts/subscripts/subscript_0276.s new file mode 100644 index 0000000000..3256965bca --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0276.s @@ -0,0 +1,12 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CalcExpGain _005 + StartGetExpTask + WaitGetExpTask + Dummy2A 4294967292 + +_005: + End diff --git a/res/battle/scripts/subscripts/subscript_0277.s b/res/battle/scripts/subscripts/subscript_0277.s new file mode 100644 index 0000000000..19aae1d2a8 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0277.s @@ -0,0 +1,7 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + Call BATTLE_SUBSCRIPT_FAINT_MON + End diff --git a/res/battle/scripts/subscripts/subscript_0278.s b/res/battle/scripts/subscripts/subscript_0278.s new file mode 100644 index 0000000000..482e1621df --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0278.s @@ -0,0 +1,32 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareMonDataToValue OPCODE_EQU, BTLSCR_ATTACKER, BATTLEMON_CUSTAP_BERRY, 1, _022 + CompareMonDataToValue OPCODE_EQU, BTLSCR_ATTACKER, BATTLEMON_QUICK_CLAW, 0, _063 + CompareVarToValue OPCODE_EQU, BTLVAR_WAITING_BATTLERS, 1, _039 + PlayBattleAnimation BTLSCR_ATTACKER, BATTLE_ANIMATION_HELD_ITEM + Wait + GoTo _039 + +_022: + PlayBattleAnimation BTLSCR_ATTACKER, BATTLE_ANIMATION_HELD_ITEM + Wait + CompareVarToValue OPCODE_EQU, BTLVAR_WAITING_BATTLERS, 1, _039 + // {0}’s {1} let it move first! + PrintMessage pl_msg_00000368_01254, TAG_NICKNAME_ITEM, BTLSCR_ATTACKER, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + +_039: + CompareMonDataToValue OPCODE_EQU, BTLSCR_ATTACKER, BATTLEMON_QUICK_CLAW, 0, _050 + UpdateMonData OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_QUICK_CLAW, 0 + +_050: + CompareMonDataToValue OPCODE_EQU, BTLSCR_ATTACKER, BATTLEMON_CUSTAP_BERRY, 0, _063 + UpdateMonData OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_CUSTAP_BERRY, 0 + RemoveItem BTLSCR_ATTACKER + +_063: + End diff --git a/res/battle/scripts/subscripts/subscript_0279.s b/res/battle/scripts/subscripts/subscript_0279.s new file mode 100644 index 0000000000..16332c87e7 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0279.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVarFromVar OPCODE_GET, BTLVAR_ATTACKER, BTLVAR_ATTACKER_TEMP + UpdateVarFromVar OPCODE_GET, BTLVAR_DEFENDER, BTLVAR_DEFENDER_TEMP + End diff --git a/res/battle/scripts/subscripts/subscript_0280.s b/res/battle/scripts/subscripts/subscript_0280.s new file mode 100644 index 0000000000..ff9a7c9798 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0280.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVarFromVar OPCODE_GET, BTLVAR_ATTACKER_TEMP, BTLVAR_ATTACKER + UpdateVarFromVar OPCODE_GET, BTLVAR_DEFENDER_TEMP, BTLVAR_DEFENDER + End diff --git a/res/battle/scripts/subscripts/subscript_0281.s b/res/battle/scripts/subscripts/subscript_0281.s new file mode 100644 index 0000000000..c4f4d17f85 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0281.s @@ -0,0 +1,19 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PrintAttackMessage + Wait + WaitButtonABTime 30 + // But there was no target... + PrintMessage pl_msg_00000368_01234, TAG_NONE + Wait + WaitButtonABTime 30 + UnlockMoveChoice BTLSCR_ATTACKER + CompareVarToValue OPCODE_EQU, BTLVAR_CURRENT_MOVE, MOVE_RAGE, _027 + CompareMonDataToValue OPCODE_FLAG_NOT, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_RAGE, _027 + UpdateMonData OPCODE_FLAG_OFF, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_RAGE + +_027: + End diff --git a/res/battle/scripts/subscripts/subscript_0282.s b/res/battle/scripts/subscripts/subscript_0282.s new file mode 100644 index 0000000000..d591b81e46 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0282.s @@ -0,0 +1,15 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} unleashed energy! + PrintMessage pl_msg_00000368_00335, TAG_NICKNAME, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + UpdateMonData OPCODE_FLAG_OFF, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_MOVE_LOCKED + // But there was no target... + PrintMessage pl_msg_00000368_01234, TAG_NONE + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0283.s b/res/battle/scripts/subscripts/subscript_0283.s new file mode 100644 index 0000000000..42ef71ecba --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0283.s @@ -0,0 +1,12 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + SetLinkBattleResult + PrintBattleResultMessage + Wait + WaitButtonABTime 30 + FadeOutBattle + Wait + End diff --git a/res/battle/scripts/subscripts/subscript_0284.s b/res/battle/scripts/subscripts/subscript_0284.s new file mode 100644 index 0000000000..7ae450a9e9 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0284.s @@ -0,0 +1,15 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PlaySound BTLSCR_ATTACKER, 1791 + // Got away safely! + PrintMessage pl_msg_00000368_00781, TAG_NONE + Wait + WaitButtonABTime 30 + FadeOutBattle + Wait + UpdateVar OPCODE_FLAG_ON, BTLVAR_RESULT_MASK, BATTLE_RESULT_WIN|BATTLE_RESULT_TRY_FLEE + SetLinkBattleResult + End diff --git a/res/battle/scripts/subscripts/subscript_0285.s b/res/battle/scripts/subscripts/subscript_0285.s new file mode 100644 index 0000000000..21e79a38e1 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0285.s @@ -0,0 +1,10 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} is exerting its {1}! + PrintMessage pl_msg_00000368_01238, TAG_NICKNAME_ABILITY, BTLSCR_MSG_TEMP, BTLSCR_MSG_BATTLER_TEMP + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0286.s b/res/battle/scripts/subscripts/subscript_0286.s new file mode 100644 index 0000000000..ecdb629c8d --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0286.s @@ -0,0 +1,10 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + // {0} can’t escape! + PrintMessage pl_msg_00000368_00043, TAG_NICKNAME, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0287.s b/res/battle/scripts/subscripts/subscript_0287.s new file mode 100644 index 0000000000..60c0a0bfee --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0287.s @@ -0,0 +1,8 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + ToggleVanish BTLSCR_MSG_TEMP, FALSE + Wait + End diff --git a/res/battle/scripts/subscripts/subscript_0288.s b/res/battle/scripts/subscripts/subscript_0288.s new file mode 100644 index 0000000000..1ebbfd80f2 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0288.s @@ -0,0 +1,11 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_MSG_MOVE_TEMP, MOVE_TAUNT + // {0}’s {1} wore off! + PrintMessage pl_msg_00000368_01257, TAG_NICKNAME_MOVE, BTLSCR_MSG_TEMP, BTLSCR_MSG_TEMP + Wait + WaitButtonABTime 30 + End diff --git a/res/battle/scripts/subscripts/subscript_0289.s b/res/battle/scripts/subscripts/subscript_0289.s new file mode 100644 index 0000000000..56b3d8c89b --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0289.s @@ -0,0 +1,10 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + SetHealthbarStatus BTLSCR_ATTACKER, BATTLE_ANIMATION_NONE + WaitButtonABTime 30 + UpdateMonData OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_STATUS, MON_CONDITION_NONE + UpdateMonData OPCODE_FLAG_OFF, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_CONFUSION + GoToSubscript BATTLE_SUBSCRIPT_USE_POTION diff --git a/res/battle/scripts/subscripts/subscript_0290.s b/res/battle/scripts/subscripts/subscript_0290.s new file mode 100644 index 0000000000..ae56e1c9be --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0290.s @@ -0,0 +1,11 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareVarToValue OPCODE_FLAG_SET, BTLVAR_ATTACKER_SELF_TURN_STATUS_FLAGS, SELF_TURN_FLAG_PLUCK_BERRY, _006 + RemoveItem BTLSCR_MSG_TEMP + +_006: + UpdateVar OPCODE_FLAG_OFF, BTLVAR_ATTACKER_SELF_TURN_STATUS_FLAGS, SELF_TURN_FLAG_PLUCK_BERRY + End diff --git a/res/battle/scripts/subscripts/subscript_0291.s b/res/battle/scripts/subscripts/subscript_0291.s new file mode 100644 index 0000000000..5dbdd53aa7 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0291.s @@ -0,0 +1,6 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + End diff --git a/res/battle/scripts/subscripts/subscript_0292.s b/res/battle/scripts/subscripts/subscript_0292.s new file mode 100644 index 0000000000..2b529e20e8 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0292.s @@ -0,0 +1,27 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PlayMoveAnimation BTLSCR_ATTACKER + Wait + CompareMonDataToValue OPCODE_FLAG_NOT, BTLSCR_ATTACKER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_SEMI_INVULNERABLE, _011 + ToggleVanish BTLSCR_ATTACKER, TRUE + +_011: + PrintBufferedMessage + Wait + WaitButtonABTime 30 + UpdateVarFromVar OPCODE_SET, BTLVAR_SIDE_EFFECT_MON, BTLVAR_ATTACKER + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_PARAM, MOVE_SUBSCRIPT_PTR_DEFENSE_UP_1_STAGE + UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_INDIRECT + Call BATTLE_SUBSCRIPT_UPDATE_STAT_STAGE + PlayBattleAnimation BTLSCR_ATTACKER, BATTLE_ANIMATION_HELD_ITEM + Wait + // {0} became fully charged due to its {1}! + PrintMessage pl_msg_00000368_01251, TAG_NICKNAME_ITEM, BTLSCR_ATTACKER, BTLSCR_ATTACKER + Wait + WaitButtonABTime 30 + RemoveItem BTLSCR_ATTACKER + UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_PLAYED_MOVE_ANIMATION + End diff --git a/res/battle/scripts/subscripts/subscript_0293.s b/res/battle/scripts/subscripts/subscript_0293.s new file mode 100644 index 0000000000..74262548fb --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0293.s @@ -0,0 +1,34 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + CompareVarToValue OPCODE_EQU, BTLVAR_DEFENDER, BATTLER_NONE, _097 + CompareMonDataToValue OPCODE_NEQ, BTLSCR_DEFENDER, BATTLEMON_SPECIES, 492, _097 + CompareMonDataToValue OPCODE_EQU, BTLSCR_DEFENDER, BATTLEMON_FORM_NUM, 0, _097 + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_DEFENDER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_SUBSTITUTE, _097 + CompareMonDataToValue OPCODE_NEQ, BTLSCR_DEFENDER, BATTLEMON_STATUS, MON_CONDITION_FREEZE, _097 + UpdateMonData OPCODE_SET, BTLSCR_DEFENDER, BATTLEMON_FORM_NUM, 0 + UpdateVar OPCODE_SET, BTLVAR_SCRIPT_TEMP, 0 + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_DEFENDER, BATTLEMON_PERSONALITY, 1, _049 + LoadArchivedMonData SPECIES_SHAYMIN, BTLVAR_SCRIPT_TEMP, MON_DATA_PERSONAL_ABILITY_1 + GoTo _062 + +_049: + LoadArchivedMonData SPECIES_SHAYMIN, BTLVAR_SCRIPT_TEMP, MON_DATA_PERSONAL_ABILITY_2 + CompareVarToValue OPCODE_NEQ, BTLVAR_SCRIPT_TEMP, 0, _062 + LoadArchivedMonData SPECIES_SHAYMIN, BTLVAR_SCRIPT_TEMP, MON_DATA_PERSONAL_ABILITY_1 + +_062: + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_RECALC_MON_STATS + UpdateMonDataFromVar OPCODE_SET, BTLSCR_DEFENDER, BATTLEMON_ABILITY, BTLVAR_CALC_TEMP + LoadArchivedMonData SPECIES_SHAYMIN, BTLVAR_SCRIPT_TEMP, MON_DATA_PERSONAL_TYPE_1 + UpdateMonDataFromVar OPCODE_SET, BTLSCR_DEFENDER, BATTLEMON_TYPE_1, BTLVAR_CALC_TEMP + LoadArchivedMonData SPECIES_SHAYMIN, BTLVAR_SCRIPT_TEMP, MON_DATA_PERSONAL_TYPE_2 + UpdateMonDataFromVar OPCODE_SET, BTLSCR_DEFENDER, BATTLEMON_TYPE_2, BTLVAR_CALC_TEMP + UpdateVarFromVar OPCODE_SET, BTLVAR_MSG_BATTLER_TEMP, BTLVAR_DEFENDER + Call BATTLE_SUBSCRIPT_FORM_CHANGE + RefreshMonData BTLSCR_DEFENDER + +_097: + End diff --git a/res/battle/scripts/subscripts/subscript_0294.s b/res/battle/scripts/subscripts/subscript_0294.s new file mode 100644 index 0000000000..cbdbbbe9b7 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0294.s @@ -0,0 +1,13 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + PlayBattleAnimation BTLSCR_PLAYER, BATTLE_ANIMATION_WEATHER_SUN + Wait + // The sunlight turned harsh! + PrintMessage pl_msg_00000368_00807, TAG_NONE + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_ON, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_SUNNY_PERM + End diff --git a/res/battle/scripts/subscripts/subscript_0295.s b/res/battle/scripts/subscripts/subscript_0295.s new file mode 100644 index 0000000000..5f5d19474c --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0295.s @@ -0,0 +1,16 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_SET, BTLVAR_MSG_MOVE_TEMP, MOVE_TRICK_ROOM + PlayMoveAnimation BTLSCR_MSG_TEMP + Wait + UpdateVar OPCODE_SET, BTLVAR_MOVE_EFFECT_CHANCE, 0 + UpdateVar OPCODE_FLAG_OFF, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_PLAYED_MOVE_ANIMATION + // The dimensions became distorted! + PrintMessage pl_msg_00000368_01267, TAG_NONE + Wait + WaitButtonABTime 30 + UpdateVar OPCODE_FLAG_ON, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_TRICK_ROOM_INIT + End diff --git a/res/battle/scripts/subscripts/subscript_0296.s b/res/battle/scripts/subscripts/subscript_0296.s new file mode 100644 index 0000000000..b3ddc01e73 --- /dev/null +++ b/res/battle/scripts/subscripts/subscript_0296.s @@ -0,0 +1,20 @@ + .include "macros/btlcmd.inc" + + .data + +_000: + UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_RECALC_MON_STATS + UpdateMonData OPCODE_SET, BTLSCR_MSG_BATTLER_TEMP, BATTLEMON_FORM_NUM, 0 + UpdateVar OPCODE_SET, BTLVAR_SCRIPT_TEMP, 0 + CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_MSG_BATTLER_TEMP, BATTLEMON_PERSONALITY, 1, _024 + LoadArchivedMonData SPECIES_GIRATINA, BTLVAR_SCRIPT_TEMP, MON_DATA_PERSONAL_ABILITY_1 + GoTo _028 + +_024: + LoadArchivedMonData SPECIES_GIRATINA, BTLVAR_SCRIPT_TEMP, MON_DATA_PERSONAL_ABILITY_2 + +_028: + UpdateMonDataFromVar OPCODE_SET, BTLSCR_MSG_BATTLER_TEMP, BATTLEMON_ABILITY, BTLVAR_CALC_TEMP + Call BATTLE_SUBSCRIPT_FORM_CHANGE + RefreshMonData BTLSCR_MSG_BATTLER_TEMP + End From 9d7019b8b01336f0aabf06791e08cfe0c92a6503 Mon Sep 17 00:00:00 2001 From: Rachel Date: Mon, 22 Jan 2024 09:26:04 -0800 Subject: [PATCH 5/7] Add new consts used by battle scripts --- asm/macros/btlcmd.inc | 15 ++++ consts/battle.json | 33 ++++++++- include/battle/btlcmd.h | 6 ++ include/constants/battle/condition.h | 90 +++++++++++++++++------ include/constants/battle/moves.h | 13 +++- include/constants/battle/system_control.h | 5 +- include/constants/battle/turn_flags.h | 1 + 7 files changed, 134 insertions(+), 29 deletions(-) diff --git a/asm/macros/btlcmd.inc b/asm/macros/btlcmd.inc index dbc6c8f05b..14a1d0fd06 100644 --- a/asm/macros/btlcmd.inc +++ b/asm/macros/btlcmd.inc @@ -1,11 +1,26 @@ .ifndef ASM_BATTLE_SCRIPT_INC .set ASM_BATTLE_SCRIPT_INC, 1 #define __ASM_PM_ + #include "constants/battle.h" +#include "constants/items.h" +#include "constants/species.h" #include "gmm/pl_msg_0368.h" #include "battle/btlcmd.h" + + .include "consts/generated/asm/abilities.inc" .include "consts/generated/asm/battle.inc" + .include "consts/generated/asm/battle_controller_params.inc" + .include "consts/generated/asm/battle_lib_params.inc" + .include "consts/generated/asm/battle_subscripts.inc" .include "consts/generated/asm/btlcmd.inc" + .include "consts/generated/asm/gender.inc" + .include "consts/generated/asm/items.inc" + .include "consts/generated/asm/moves.inc" + .include "consts/generated/asm/pokemon.inc" + + .equ FALSE 0 + .equ TRUE 1 .macro PlayEncounterAnimation .long 0 diff --git a/consts/battle.json b/consts/battle.json index 3cbe7521af..8916b8fb48 100644 --- a/consts/battle.json +++ b/consts/battle.json @@ -16,7 +16,10 @@ "@MessageStatusCondition", "@TurnFlag", "@CheckSideConditionOp", - "@SideCondition" + "@SideCondition", + "@Throw", + "@Capture", + "@YesNoType" ], "battle_lib_params": [ "@BattleContextParam", @@ -925,6 +928,34 @@ "AFTER_MOVE_MESSAGE_ONE_HIT", "AFTER_MOVE_MESSAGE_MULTI_HIT" ] + }, + "@Throw": { + "type": "enum", + "values": [ + "BTLSCR_THROW_POKE_BALL", + "BTLSCR_THROW_SAFARI_BALL", + "BTLSCR_THROW_SAFARI_ROCK", + "BTLSCR_THROW_SAFARI_BAIT", + "BTLSCR_THROW_PARK_BALL" + ] + }, + "@Capture": { + "type": "enum", + "values": [ + "CAPTURE_NORMAL", + "CAPTURE_SAFARI" + ] + }, + "@YesNoType": { + "type": "enum", + "values": [ + "YES_NO_BASIC", + "YES_NO_FORGET_MOVE", + "YES_NO_GIVE_UP_ON_MOVE", + "YES_NO_NEXT_MON", + "YES_NO_CHANGE_MON", + "YES_NO_GIVE_NICKNAME" + ] } } } diff --git a/include/battle/btlcmd.h b/include/battle/btlcmd.h index b23bda55ce..898cd9b72b 100644 --- a/include/battle/btlcmd.h +++ b/include/battle/btlcmd.h @@ -5,6 +5,12 @@ #include "consts/generated/c/btlcmd.h" #endif +// TODO: move these to constgen +#define TRAINER_MESSAGE_LOSE 1 +#define TRAINER_MESSAGE_LOSE_1 4 +#define TRAINER_MESSAGE_LOSE_2 8 +#define TRAINER_MESSAGE_WIN 100 + #define BTLSCR_MSG_TEMP (0xFF) #define WEATHER_EFFECT_HYDRATION 1 diff --git a/include/constants/battle/condition.h b/include/constants/battle/condition.h index ab7b6c8922..5744564e33 100644 --- a/include/constants/battle/condition.h +++ b/include/constants/battle/condition.h @@ -2,31 +2,51 @@ #define POKEPLATINUM_CONSTANTS_BATTLE_CONDITION_H #define MON_CONDITION_NONE 0 -#define MON_CONDITION_SLEEP ((1 << 0) | (1 << 1) | (1 << 2)) // counter for the number of sleep turns remaining +#define MON_CONDITION_SLEEP_0 (1 << 0) +#define MON_CONDITION_SLEEP_1 (1 << 1) +#define MON_CONDITION_SLEEP_2 (1 << 2) #define MON_CONDITION_POISON (1 << 3) #define MON_CONDITION_BURN (1 << 4) #define MON_CONDITION_FREEZE (1 << 5) #define MON_CONDITION_PARALYSIS (1 << 6) #define MON_CONDITION_TOXIC (1 << 7) -#define MON_CONDITION_TOXIC_COUNTER ((1 << 8) | (1 << 9) | (1 << 10) | (1 << 11)) // counter for increasing Toxic damage -#define MON_CONDITION_TOXIC_COUNT_INC ((1 << 8)) // increment value for the Toxic counter +#define MON_CONDITION_TOXIC_COUNTER_0 (1 << 8) +#define MON_CONDITION_TOXIC_COUNTER_1 (1 << 9) +#define MON_CONDITION_TOXIC_COUNTER_2 (1 << 10) +#define MON_CONDITION_TOXIC_COUNTER_3 (1 << 11) +#define MON_CONDITION_TOXIC_COUNT_INC MON_CONDITION_TOXIC_COUNTER_0 + +#define MON_CONDITION_SLEEP (MON_CONDITION_SLEEP_0 | MON_CONDITION_SLEEP_1 | MON_CONDITION_SLEEP_2) +#define MON_CONDITION_TOXIC_COUNTER (MON_CONDITION_TOXIC_COUNTER_0 | MON_CONDITION_TOXIC_COUNTER_1 | MON_CONDITION_TOXIC_COUNTER_2 | MON_CONDITION_TOXIC_COUNTER_3) #define MON_CONDITION_ANY_POISON (MON_CONDITION_POISON | MON_CONDITION_TOXIC | MON_CONDITION_TOXIC_COUNTER) #define MON_CONDITION_ANY (MON_CONDITION_SLEEP | MON_CONDITION_POISON | MON_CONDITION_BURN | MON_CONDITION_FREEZE | MON_CONDITION_PARALYSIS | MON_CONDITION_TOXIC) +#define MON_CONDITION_NOT_SLEEP ~MON_CONDITION_SLEEP #define MON_CONDITION_CAN_SYNCHRONIZE (MON_CONDITION_POISON | MON_CONDITION_BURN | MON_CONDITION_PARALYSIS) #define MON_CONDITION_FACADE_BOOST (MON_CONDITION_TOXIC | MON_CONDITION_POISON | MON_CONDITION_BURN | MON_CONDITION_PARALYSIS) #define VOLATILE_CONDITION_NONE 0 -#define VOLATILE_CONDITION_CONFUSION ((1 << 0) | (1 << 1) | (1 << 2)) // counter for the number of confusion turns remaining +#define VOLATILE_CONDITION_CONFUSION_0 (1 << 0) +#define VOLATILE_CONDITION_CONFUSION_1 (1 << 1) +#define VOLATILE_CONDITION_CONFUSION_2 (1 << 2) #define VOLATILE_CONDITION_FLINCH (1 << 3) -#define VOLATILE_CONDITION_UPROAR ((1 << 4) | (1 << 5) | (1 << 6)) // counter for the number of Uproar turns remaining +#define VOLATILE_CONDITION_UPROAR_0 (1 << 4) +#define VOLATILE_CONDITION_UPROAR_1 (1 << 5) +#define VOLATILE_CONDITION_UPROAR_2 (1 << 6) // unused flag: 1 << 7 -#define VOLATILE_CONDITION_BIDE ((1 << 8) | (1 << 9)) // counter for the number of Bide turns remaining -#define VOLATILE_CONDITION_THRASH ((1 << 10) | (1 << 11)) // counter for the number of Thrash turns remaining +#define VOLATILE_CONDITION_BIDE_0 (1 << 8) +#define VOLATILE_CONDITION_BIDE_1 (1 << 9) +#define VOLATILE_CONDITION_THRASH_0 (1 << 10) +#define VOLATILE_CONDITION_THRASH_1 (1 << 11) #define VOLATILE_CONDITION_MOVE_LOCKED (1 << 12) -#define VOLATILE_CONDITION_BIND ((1 << 13) | (1 << 14) | (1 << 15)) // counter for the number of Bind turns remaining -#define VOLATILE_CONDITION_ATTRACT ((1 << 16) | (1 << 17) | (1 << 18) | (1 << 19)) // each bit here defines which battlers the mon is infatuated with +#define VOLATILE_CONDITION_BIND_0 (1 << 13) +#define VOLATILE_CONDITION_BIND_1 (1 << 14) +#define VOLATILE_CONDITION_BIND_2 (1 << 15) +#define VOLATILE_CONDITION_ATTRACT_0 (1 << 16) +#define VOLATILE_CONDITION_ATTRACT_1 (1 << 17) +#define VOLATILE_CONDITION_ATTRACT_2 (1 << 18) +#define VOLATILE_CONDITION_ATTRACT_3 (1 << 19) #define VOLATILE_CONDITION_FOCUS_ENERGY (1 << 20) #define VOLATILE_CONDITION_TRANSFORM (1 << 21) #define VOLATILE_CONDITION_RECHARGING (1 << 22) @@ -40,6 +60,13 @@ #define VOLATILE_CONDITION_DEFENSE_CURL (1 << 30) #define VOLATILE_CONDITION_TORMENT (1 << 31) +#define VOLATILE_CONDITION_CONFUSION (VOLATILE_CONDITION_CONFUSION_0 | VOLATILE_CONDITION_CONFUSION_1 | VOLATILE_CONDITION_CONFUSION_2) +#define VOLATILE_CONDITION_UPROAR (VOLATILE_CONDITION_UPROAR_0 | VOLATILE_CONDITION_UPROAR_1 | VOLATILE_CONDITION_UPROAR_2) +#define VOLATILE_CONDITION_BIDE (VOLATILE_CONDITION_BIDE_0 | VOLATILE_CONDITION_BIDE_1) +#define VOLATILE_CONDITION_THRASH (VOLATILE_CONDITION_THRASH_0 | VOLATILE_CONDITION_THRASH_1) +#define VOLATILE_CONDITION_BIND (VOLATILE_CONDITION_BIND_0 | VOLATILE_CONDITION_BIND_1 | VOLATILE_CONDITION_BIND_2) +#define VOLATILE_CONDITION_ATTRACT (VOLATILE_CONDITION_ATTRACT_0 | VOLATILE_CONDITION_ATTRACT_1 | VOLATILE_CONDITION_ATTRACT_2 | VOLATILE_CONDITION_ATTRACT_3) + #define VOLATILE_CONDITION_BATON_PASSED (VOLATILE_CONDITION_FOCUS_ENERGY \ | VOLATILE_CONDITION_MEAN_LOOK \ | VOLATILE_CONDITION_CONFUSION \ @@ -55,21 +82,27 @@ #define VOLATILE_CONDITION_BIND_SHIFT 13 #define VOLATILE_CONDITION_ATTRACT_SHIFT 16 -#define SIDE_CONDITION_REFLECT (1 << 0) -#define SIDE_CONDITION_LIGHT_SCREEN (1 << 1) -#define SIDE_CONDITION_SPIKES (1 << 2) -#define SIDE_CONDITION_SAFEGUARD (1 << 3) -#define SIDE_CONDITION_FUTURE_SIGHT (1 << 4) -#define SIDE_CONDITION_WISH (1 << 5) -#define SIDE_CONDITION_MIST (1 << 6) -#define SIDE_CONDITION_STEALTH_ROCK (1 << 7) -#define SIDE_CONDITION_TAILWIND ((1 << 8) | (1 << 9)) // counter for the number of Tailwind turns remaining -#define SIDE_CONDITION_TOXIC_SPIKES (1 << 10) +#define SIDE_CONDITION_REFLECT (1 << 0) +#define SIDE_CONDITION_LIGHT_SCREEN (1 << 1) +#define SIDE_CONDITION_SPIKES (1 << 2) +#define SIDE_CONDITION_SAFEGUARD (1 << 3) +#define SIDE_CONDITION_FUTURE_SIGHT (1 << 4) +#define SIDE_CONDITION_WISH (1 << 5) +#define SIDE_CONDITION_MIST (1 << 6) +#define SIDE_CONDITION_STEALTH_ROCK (1 << 7) +#define SIDE_CONDITION_TAILWIND_0 (1 << 8) +#define SIDE_CONDITION_TAILWIND_1 (1 << 9) +#define SIDE_CONDITION_TOXIC_SPIKES (1 << 10) // unused flag: 1 << 11 -#define SIDE_CONDITION_LUCKY_CHANT ((1 << 12) | (1 << 13) | (1 << 14)) // counter for the number of Lucky Chant turns remaining +#define SIDE_CONDITION_LUCKY_CHANT_0 (1 << 12) +#define SIDE_CONDITION_LUCKY_CHANT_1 (1 << 13) +#define SIDE_CONDITION_LUCKY_CHANT_2 (1 << 14) -#define SIDE_CONDITION_TAILWIND_SHIFT (1 << 8) -#define SIDE_CONDITION_LUCKY_CHANT_SHIFT (1 << 12) +#define SIDE_CONDITION_TAILWIND (SIDE_CONDITION_TAILWIND_0 | SIDE_CONDITION_TAILWIND_1) +#define SIDE_CONDITION_LUCKY_CHANT (SIDE_CONDITION_LUCKY_CHANT_0 | SIDE_CONDITION_LUCKY_CHANT_1 | SIDE_CONDITION_LUCKY_CHANT_2) + +#define SIDE_CONDITION_TAILWIND_SHIFT SIDE_CONDITION_TAILWIND_0 +#define SIDE_CONDITION_LUCKY_CHANT_SHIFT SIDE_CONDITION_LUCKY_CHANT_0 #define FIELD_CONDITION_RAINING_TEMP (1 << 0) #define FIELD_CONDITION_RAINING_PERM (1 << 1) @@ -80,9 +113,13 @@ #define FIELD_CONDITION_HAILING_TEMP (1 << 6) #define FIELD_CONDITION_HAILING_PERM (1 << 7) #define FIELD_CONDITION_UPROAR ((1 << 8) | (1 << 9) | (1 << 10) | (1 << 11)) // mask for which clients are in an Uproar -#define FIELD_CONDITION_GRAVITY ((1 << 12) | (1 << 13) | (1 << 14)) // counter for the number of Gravity turns remaining +#define FIELD_CONDITION_GRAVITY_0 (1 << 12) +#define FIELD_CONDITION_GRAVITY_1 (1 << 13) +#define FIELD_CONDITION_GRAVITY_2 (1 << 14) #define FIELD_CONDITION_DEEP_FOG (1 << 15) -#define FIELD_CONDITION_TRICK_ROOM ((1 << 16) | (1 << 17) | (1 << 18)) // counter for the number of Trick Room turns remaining +#define FIELD_CONDITION_TRICK_ROOM_0 (1 << 16) +#define FIELD_CONDITION_TRICK_ROOM_1 (1 << 17) +#define FIELD_CONDITION_TRICK_ROOM_2 (1 << 18) #define FIELD_CONDITION_RAINING (FIELD_CONDITION_RAINING_TEMP | FIELD_CONDITION_RAINING_PERM) #define FIELD_CONDITION_SANDSTORM (FIELD_CONDITION_SANDSTORM_TEMP | FIELD_CONDITION_SANDSTORM_PERM) @@ -99,6 +136,11 @@ | FIELD_CONDITION_DEEP_FOG) #define FIELD_CONDITION_CASTFORM (FIELD_CONDITION_RAINING | FIELD_CONDITION_SUNNY | FIELD_CONDITION_HAILING) +#define FIELD_CONDITION_GRAVITY (FIELD_CONDITION_GRAVITY_0 | FIELD_CONDITION_GRAVITY_1 | FIELD_CONDITION_GRAVITY_2) +#define FIELD_CONDITION_GRAVITY_INIT (FIELD_CONDITION_GRAVITY_0 | FIELD_CONDITION_GRAVITY_2) +#define FIELD_CONDITION_TRICK_ROOM (FIELD_CONDITION_TRICK_ROOM_0 | FIELD_CONDITION_TRICK_ROOM_1 | FIELD_CONDITION_TRICK_ROOM_2) +#define FIELD_CONDITION_TRICK_ROOM_INIT (FIELD_CONDITION_TRICK_ROOM_0 | FIELD_CONDITION_TRICK_ROOM_2) + #define FIELD_CONDITION_UPROAR_SHIFT 8 #define FIELD_CONDITION_GRAVITY_SHIFT 12 #define FIELD_CONDITION_TRICK_ROOM_SHIFT 16 diff --git a/include/constants/battle/moves.h b/include/constants/battle/moves.h index cd88831fd5..ed0d465e55 100644 --- a/include/constants/battle/moves.h +++ b/include/constants/battle/moves.h @@ -2,16 +2,19 @@ #define POKEPLATINUM_CONSTANTS_BATTLE_MOVES_H #define MOVE_EFFECT_NONE 0 -#define MOVE_EFFECT_LEECH_SEED_RECIPIENT ((1 << 0) | (1 << 1)) // each bit defines which opponent receives the healing effect +#define MOVE_EFFECT_LEECH_SEED_RECIPIENT_0 (1 << 0) +#define MOVE_EFFECT_LEECH_SEED_RECIPIENT_1 (1 << 1) #define MOVE_EFFECT_LEECH_SEED (1 << 2) -#define MOVE_EFFECT_LOCK_ON ((1 << 3) | (1 << 4)) // counter for the number of Lock On turns remaining +#define MOVE_EFFECT_LOCK_ON_0 (1 << 3) +#define MOVE_EFFECT_LOCK_ON_1 (1 << 4) #define MOVE_EFFECT_PERISH_SONG (1 << 5) #define MOVE_EFFECT_AIRBORNE (1 << 6) // Fly, Bounce #define MOVE_EFFECT_UNDERGROUND (1 << 7) // Dig #define MOVE_EFFECT_MINIMIZE (1 << 8) #define MOVE_EFFECT_CHARGE (1 << 9) #define MOVE_EFFECT_INGRAIN (1 << 10) -#define MOVE_EFFECT_YAWN ((1 << 11) | (1 << 12)) +#define MOVE_EFFECT_YAWN_0 (1 << 11) +#define MOVE_EFFECT_YAWN_1 (1 << 12) #define MOVE_EFFECT_IMPRISON (1 << 13) // applied to mons which use Imprison #define MOVE_EFFECT_GRUDGE (1 << 14) #define MOVE_EFFECT_NO_CRITICAL (1 << 15) // checked for, but never set @@ -31,6 +34,10 @@ #define MOVE_EFFECT_SHADOW_FORCE (1 << 29) #define MOVE_EFFECT_IMPRISONED (1 << 30) // applied to mons which are affected by Imprison +#define MOVE_EFFECT_LEECH_SEED_RECIPIENT (MOVE_EFFECT_LEECH_SEED_RECIPIENT_0 | MOVE_EFFECT_LEECH_SEED_RECIPIENT_1) +#define MOVE_EFFECT_LOCK_ON (MOVE_EFFECT_LOCK_ON_0 | MOVE_EFFECT_LOCK_ON_1) +#define MOVE_EFFECT_YAWN (MOVE_EFFECT_YAWN_0 | MOVE_EFFECT_YAWN_1) + #define MOVE_EFFECT_SEMI_INVULNERABLE (MOVE_EFFECT_AIRBORNE | MOVE_EFFECT_UNDERGROUND | MOVE_EFFECT_UNDERWATER | MOVE_EFFECT_SHADOW_FORCE) #define MOVE_EFFECT_BATON_PASSED (MOVE_EFFECT_LEECH_SEED_RECIPIENT | MOVE_EFFECT_LEECH_SEED | MOVE_EFFECT_LOCK_ON | MOVE_EFFECT_PERISH_SONG | MOVE_EFFECT_INGRAIN \ diff --git a/include/constants/battle/system_control.h b/include/constants/battle/system_control.h index 022377f8cf..33a7992288 100644 --- a/include/constants/battle/system_control.h +++ b/include/constants/battle/system_control.h @@ -42,16 +42,19 @@ #define SYSCTL_MON_FAINTED_SHIFT 24 #define SYSCTL_MON_SELFDESTRUCTED_SHIFT 28 +#define SYSCTL_NO_EXPERIENCE_GIVEN (1 << 0) #define SYSCTL_UPDATE_STAT_STAGES (1 << 1) #define SYSCTL_ATTACK_MESSAGE_SHOWN (1 << 2) #define SYSCTL_MAGIC_COAT_REFLECTED (1 << 3) #define SYSCTL_UTURN_ACTIVE (1 << 4) #define SYSCTL_FIRST_DAMAGE_MSG_SHOWN (1 << 5) #define SYSCTL_MOVE_SUCCEEDED (1 << 6) // this only reflects that the move is executed, not whether it hit or missed +#define SYSCTL_STAT_STAGE_CHANGE_SHOWN (1 << 7) #define SYSCTL_RECOVER_HP_VISUAL (1 << 8) #define SYSCTL_FORM_CHANGE (1 << 26) +#define SYSCTL_RECALC_MON_STATS (1 << 27) -#define SYSCTL_LINK_WAITING ((1 << 24) | (1 << 25) | SYSCTL_FORM_CHANGE | (1 << 27)) +#define SYSCTL_LINK_WAITING ((1 << 24) | (1 << 25) | SYSCTL_FORM_CHANGE | SYSCTL_RECALC_MON_STATS) #define SYSCTL_PAYOUT_EXP ((1 << 28) | (1 << 29) | (1 << 30) | (1 << 31)) #define SYSCTL_INIT2 (~(SYSCTL_UPDATE_STAT_STAGES \ diff --git a/include/constants/battle/turn_flags.h b/include/constants/battle/turn_flags.h index 57ecef3418..c74379d96b 100644 --- a/include/constants/battle/turn_flags.h +++ b/include/constants/battle/turn_flags.h @@ -1,6 +1,7 @@ #ifndef POKEPLATINUM_CONSTANTS_BATTLE_TURN_FLAGS_H #define POKEPLATINUM_CONSTANTS_BATTLE_TURN_FLAGS_H +#define SELF_TURN_FLAG_CLEAR 0 // unused: 1 << 0 #define SELF_TURN_FLAG_PLUCK_BERRY (1 << 1) #define SELF_TURN_FLAG_INFATUATED (1 << 2) From ec549c8f6f368bdd55121bc863b691145750e396 Mon Sep 17 00:00:00 2001 From: Rachel Date: Tue, 23 Jan 2024 16:15:35 -0800 Subject: [PATCH 6/7] Wire up OK build for battle-script NARCs --- .github/workflows/build.yml | 2 +- INSTALL.md | 7 +- meson.build | 8 +- platinum.us/rom.rsf | 12 +- res/battle/meson.build | 3 +- res/battle/scripts/effects/meson.build | 279 ++++++++++++ res/battle/scripts/meson.build | 72 ++++ res/battle/scripts/moves/meson.build | 503 ++++++++++++++++++++++ res/battle/scripts/subscripts/meson.build | 299 +++++++++++++ res/meson.build | 3 +- res/prebuilt/battle/meson.build | 1 - res/prebuilt/battle/skill/be_seq.narc | Bin 16940 -> 0 bytes res/prebuilt/battle/skill/meson.build | 10 - res/prebuilt/battle/skill/sub_seq.narc | Bin 53196 -> 0 bytes res/prebuilt/battle/skill/waza_seq.narc | Bin 6416 -> 0 bytes tools/meson.build | 4 + tools/scripts/make_script_bin.sh | 76 ++++ tools/scripts/meson.build | 1 + 18 files changed, 1256 insertions(+), 24 deletions(-) create mode 100644 res/battle/scripts/effects/meson.build create mode 100644 res/battle/scripts/meson.build create mode 100644 res/battle/scripts/moves/meson.build create mode 100644 res/battle/scripts/subscripts/meson.build delete mode 100644 res/prebuilt/battle/skill/be_seq.narc delete mode 100644 res/prebuilt/battle/skill/meson.build delete mode 100644 res/prebuilt/battle/skill/sub_seq.narc delete mode 100644 res/prebuilt/battle/skill/waza_seq.narc create mode 100644 tools/scripts/make_script_bin.sh diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dbc8f7cf59..a1ba94978c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,7 +23,7 @@ jobs: sudo wget -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/ubuntu/dists/$(lsb_release -cs)/winehq-$(lsb_release -cs).sources sudo dpkg --add-architecture i386 sudo apt-get update -y - sudo apt-get install -y --install-recommends python3-pip ninja-build winehq-stable + sudo apt-get install -y --install-recommends python3-pip ninja-build winehq-stable binutils-arm-none-eabi pip install --user meson pyelftools - name: Checkout Repo diff --git a/INSTALL.md b/INSTALL.md index 2bf4594a39..415498d18d 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -31,7 +31,7 @@ You now have the choice between two different environments to use to build the p 3. Reopen an MSYS terminal (pink icon) and enter the following command to install the necessary packages: ``` - pacman -S git meson gcc + pacman -S git meson gcc arm-none-eabi-binutils ``` Press 'Y' when prompted to confirm the installation. @@ -74,7 +74,7 @@ You now have the choice between two different environments to use to build the p 7. Certain packages are required to build the repository. Install these packages by running the following command: ```bash - sudo apt install git build-essential + sudo apt install git build-essential binutils-arm-none-eabi ``` We are not done yet, the 'meson' package is also necessary, but the version provided by apt is too outdated. To get the most recent meson version, run: @@ -108,7 +108,7 @@ These can be installed using Homebrew; if you do not have Homebrew installed, re ``` brew update -brew install meson +brew install meson arm-none-eabi-binutils brew install --cask wine-stable ``` @@ -119,6 +119,7 @@ Building the ROM requires the following packages. If you cannot find one or more * git * meson (>= 1.2.0) * build-essentials (build-essential on Ubuntu) +* binutils-arm-none-eabi (arm-none-eabi-binutils on Arch Linux) * wine (to run the mwcc executables) * pkg-config diff --git a/meson.build b/meson.build index e85e4e2e06..261d1c2a2c 100644 --- a/meson.build +++ b/meson.build @@ -122,15 +122,15 @@ subdir('lib') ############################################################ -### FILE SYSTEM ### +### CONSTS ### ############################################################ -subdir('res') +subdir('consts') ############################################################ -### CONSTS ### +### FILE SYSTEM ### ############################################################ -subdir('consts') +subdir('res') ############################################################ diff --git a/platinum.us/rom.rsf b/platinum.us/rom.rsf index 4bde268144..1490b83ea6 100644 --- a/platinum.us/rom.rsf +++ b/platinum.us/rom.rsf @@ -242,9 +242,15 @@ RomSpec File battle/graphic/vs_demo_gra.narc File wazaeffect/we.arc File wazaeffect/we_sub.narc - File battle/skill/be_seq.narc - File battle/skill/sub_seq.narc - File battle/skill/waza_seq.narc + + Root /battle/skill + HostRoot res/battle/scripts + File be_seq.narc + File sub_seq.narc + File waza_seq.narc + + Root / + HostRoot res/prebuilt File wazaeffect/effectclact/wecell.narc File wazaeffect/effectclact/wecellanm.narc File wazaeffect/effectclact/wechar.narc diff --git a/res/battle/meson.build b/res/battle/meson.build index e2069e776a..0ca6e6ca42 100644 --- a/res/battle/meson.build +++ b/res/battle/meson.build @@ -1 +1,2 @@ -subdir('moves') \ No newline at end of file +subdir('moves') +subdir('scripts') diff --git a/res/battle/scripts/effects/meson.build b/res/battle/scripts/effects/meson.build new file mode 100644 index 0000000000..6e30727f48 --- /dev/null +++ b/res/battle/scripts/effects/meson.build @@ -0,0 +1,279 @@ +effect_script_files = files( + 'effect_script_0000.s', + 'effect_script_0001.s', + 'effect_script_0002.s', + 'effect_script_0003.s', + 'effect_script_0004.s', + 'effect_script_0005.s', + 'effect_script_0006.s', + 'effect_script_0007.s', + 'effect_script_0008.s', + 'effect_script_0009.s', + 'effect_script_0010.s', + 'effect_script_0011.s', + 'effect_script_0012.s', + 'effect_script_0013.s', + 'effect_script_0014.s', + 'effect_script_0015.s', + 'effect_script_0016.s', + 'effect_script_0017.s', + 'effect_script_0018.s', + 'effect_script_0019.s', + 'effect_script_0020.s', + 'effect_script_0021.s', + 'effect_script_0022.s', + 'effect_script_0023.s', + 'effect_script_0024.s', + 'effect_script_0025.s', + 'effect_script_0026.s', + 'effect_script_0027.s', + 'effect_script_0028.s', + 'effect_script_0029.s', + 'effect_script_0030.s', + 'effect_script_0031.s', + 'effect_script_0032.s', + 'effect_script_0033.s', + 'effect_script_0034.s', + 'effect_script_0035.s', + 'effect_script_0036.s', + 'effect_script_0037.s', + 'effect_script_0038.s', + 'effect_script_0039.s', + 'effect_script_0040.s', + 'effect_script_0041.s', + 'effect_script_0042.s', + 'effect_script_0043.s', + 'effect_script_0044.s', + 'effect_script_0045.s', + 'effect_script_0046.s', + 'effect_script_0047.s', + 'effect_script_0048.s', + 'effect_script_0049.s', + 'effect_script_0050.s', + 'effect_script_0051.s', + 'effect_script_0052.s', + 'effect_script_0053.s', + 'effect_script_0054.s', + 'effect_script_0055.s', + 'effect_script_0056.s', + 'effect_script_0057.s', + 'effect_script_0058.s', + 'effect_script_0059.s', + 'effect_script_0060.s', + 'effect_script_0061.s', + 'effect_script_0062.s', + 'effect_script_0063.s', + 'effect_script_0064.s', + 'effect_script_0065.s', + 'effect_script_0066.s', + 'effect_script_0067.s', + 'effect_script_0068.s', + 'effect_script_0069.s', + 'effect_script_0070.s', + 'effect_script_0071.s', + 'effect_script_0072.s', + 'effect_script_0073.s', + 'effect_script_0074.s', + 'effect_script_0075.s', + 'effect_script_0076.s', + 'effect_script_0077.s', + 'effect_script_0078.s', + 'effect_script_0079.s', + 'effect_script_0080.s', + 'effect_script_0081.s', + 'effect_script_0082.s', + 'effect_script_0083.s', + 'effect_script_0084.s', + 'effect_script_0085.s', + 'effect_script_0086.s', + 'effect_script_0087.s', + 'effect_script_0088.s', + 'effect_script_0089.s', + 'effect_script_0090.s', + 'effect_script_0091.s', + 'effect_script_0092.s', + 'effect_script_0093.s', + 'effect_script_0094.s', + 'effect_script_0095.s', + 'effect_script_0096.s', + 'effect_script_0097.s', + 'effect_script_0098.s', + 'effect_script_0099.s', + 'effect_script_0100.s', + 'effect_script_0101.s', + 'effect_script_0102.s', + 'effect_script_0103.s', + 'effect_script_0104.s', + 'effect_script_0105.s', + 'effect_script_0106.s', + 'effect_script_0107.s', + 'effect_script_0108.s', + 'effect_script_0109.s', + 'effect_script_0110.s', + 'effect_script_0111.s', + 'effect_script_0112.s', + 'effect_script_0113.s', + 'effect_script_0114.s', + 'effect_script_0115.s', + 'effect_script_0116.s', + 'effect_script_0117.s', + 'effect_script_0118.s', + 'effect_script_0119.s', + 'effect_script_0120.s', + 'effect_script_0121.s', + 'effect_script_0122.s', + 'effect_script_0123.s', + 'effect_script_0124.s', + 'effect_script_0125.s', + 'effect_script_0126.s', + 'effect_script_0127.s', + 'effect_script_0128.s', + 'effect_script_0129.s', + 'effect_script_0130.s', + 'effect_script_0131.s', + 'effect_script_0132.s', + 'effect_script_0133.s', + 'effect_script_0134.s', + 'effect_script_0135.s', + 'effect_script_0136.s', + 'effect_script_0137.s', + 'effect_script_0138.s', + 'effect_script_0139.s', + 'effect_script_0140.s', + 'effect_script_0141.s', + 'effect_script_0142.s', + 'effect_script_0143.s', + 'effect_script_0144.s', + 'effect_script_0145.s', + 'effect_script_0146.s', + 'effect_script_0147.s', + 'effect_script_0148.s', + 'effect_script_0149.s', + 'effect_script_0150.s', + 'effect_script_0151.s', + 'effect_script_0152.s', + 'effect_script_0153.s', + 'effect_script_0154.s', + 'effect_script_0155.s', + 'effect_script_0156.s', + 'effect_script_0157.s', + 'effect_script_0158.s', + 'effect_script_0159.s', + 'effect_script_0160.s', + 'effect_script_0161.s', + 'effect_script_0162.s', + 'effect_script_0163.s', + 'effect_script_0164.s', + 'effect_script_0165.s', + 'effect_script_0166.s', + 'effect_script_0167.s', + 'effect_script_0168.s', + 'effect_script_0169.s', + 'effect_script_0170.s', + 'effect_script_0171.s', + 'effect_script_0172.s', + 'effect_script_0173.s', + 'effect_script_0174.s', + 'effect_script_0175.s', + 'effect_script_0176.s', + 'effect_script_0177.s', + 'effect_script_0178.s', + 'effect_script_0179.s', + 'effect_script_0180.s', + 'effect_script_0181.s', + 'effect_script_0182.s', + 'effect_script_0183.s', + 'effect_script_0184.s', + 'effect_script_0185.s', + 'effect_script_0186.s', + 'effect_script_0187.s', + 'effect_script_0188.s', + 'effect_script_0189.s', + 'effect_script_0190.s', + 'effect_script_0191.s', + 'effect_script_0192.s', + 'effect_script_0193.s', + 'effect_script_0194.s', + 'effect_script_0195.s', + 'effect_script_0196.s', + 'effect_script_0197.s', + 'effect_script_0198.s', + 'effect_script_0199.s', + 'effect_script_0200.s', + 'effect_script_0201.s', + 'effect_script_0202.s', + 'effect_script_0203.s', + 'effect_script_0204.s', + 'effect_script_0205.s', + 'effect_script_0206.s', + 'effect_script_0207.s', + 'effect_script_0208.s', + 'effect_script_0209.s', + 'effect_script_0210.s', + 'effect_script_0211.s', + 'effect_script_0212.s', + 'effect_script_0213.s', + 'effect_script_0214.s', + 'effect_script_0215.s', + 'effect_script_0216.s', + 'effect_script_0217.s', + 'effect_script_0218.s', + 'effect_script_0219.s', + 'effect_script_0220.s', + 'effect_script_0221.s', + 'effect_script_0222.s', + 'effect_script_0223.s', + 'effect_script_0224.s', + 'effect_script_0225.s', + 'effect_script_0226.s', + 'effect_script_0227.s', + 'effect_script_0228.s', + 'effect_script_0229.s', + 'effect_script_0230.s', + 'effect_script_0231.s', + 'effect_script_0232.s', + 'effect_script_0233.s', + 'effect_script_0234.s', + 'effect_script_0235.s', + 'effect_script_0236.s', + 'effect_script_0237.s', + 'effect_script_0238.s', + 'effect_script_0239.s', + 'effect_script_0240.s', + 'effect_script_0241.s', + 'effect_script_0242.s', + 'effect_script_0243.s', + 'effect_script_0244.s', + 'effect_script_0245.s', + 'effect_script_0246.s', + 'effect_script_0247.s', + 'effect_script_0248.s', + 'effect_script_0249.s', + 'effect_script_0250.s', + 'effect_script_0251.s', + 'effect_script_0252.s', + 'effect_script_0253.s', + 'effect_script_0254.s', + 'effect_script_0255.s', + 'effect_script_0256.s', + 'effect_script_0257.s', + 'effect_script_0258.s', + 'effect_script_0259.s', + 'effect_script_0260.s', + 'effect_script_0261.s', + 'effect_script_0262.s', + 'effect_script_0263.s', + 'effect_script_0264.s', + 'effect_script_0265.s', + 'effect_script_0266.s', + 'effect_script_0267.s', + 'effect_script_0268.s', + 'effect_script_0269.s', + 'effect_script_0270.s', + 'effect_script_0271.s', + 'effect_script_0272.s', + 'effect_script_0273.s', + 'effect_script_0274.s', + 'effect_script_0275.s', + 'effect_script_0276.s' +) diff --git a/res/battle/scripts/meson.build b/res/battle/scripts/meson.build new file mode 100644 index 0000000000..f1150cf9b6 --- /dev/null +++ b/res/battle/scripts/meson.build @@ -0,0 +1,72 @@ +subdir('effects') +subdir('moves') +subdir('subscripts') + +s_to_bin_gen = generator(make_script_bin_sh, + arguments: [ + '--mwrap', + '-i', meson.project_source_root() / 'include', + '-i', meson.project_source_root() / 'asm', + '-i', meson.project_build_root() / 'res' / 'text', + '-i', meson.project_build_root(), + '--assembler', mwrap_exe.full_path(), + '--objcopy', arm_none_eabi_objcopy_exe.full_path(), + '@EXTRA_ARGS@', + '@INPUT@', + ], + depends: [ + pl_msg_narc # for GMM headers + ], + output: '@BASENAME@' + '.bin' +) + +be_seq_target_name = 'be_seq.narc' +sub_seq_target_name = 'sub_seq.narc' +waza_seq_target_name = 'waza_seq.narc' + +be_seq_private_dir = meson.current_build_dir() / be_seq_target_name + '.p' +sub_seq_private_dir = meson.current_build_dir() / sub_seq_target_name + '.p' +waza_seq_private_dir = meson.current_build_dir() / waza_seq_target_name + '.p' + +be_seq_narc = custom_target(be_seq_target_name, + output: be_seq_target_name, + input: s_to_bin_gen.process( + effect_script_files, + extra_args: ['--out-dir', be_seq_private_dir] + ), + command: [ + knarc_exe, + '-d', '@PRIVATE_DIR@', + '-p', '@OUTPUT@' + ] +) + +sub_seq_narc = custom_target(sub_seq_target_name, + output: sub_seq_target_name, + input: s_to_bin_gen.process( + subscript_files, + extra_args: ['--out-dir', sub_seq_private_dir] + ), + command: [ + knarc_exe, + '-d', '@PRIVATE_DIR@', + '-p', '@OUTPUT@' + ] +) + +waza_seq_narc = custom_target(waza_seq_target_name, + output: waza_seq_target_name, + input: s_to_bin_gen.process( + move_script_files, + extra_args: ['--out-dir', waza_seq_private_dir] + ), + command: [ + knarc_exe, + '-d', '@PRIVATE_DIR@', + '-p', '@OUTPUT@' + ] +) + +nitrofs_files += be_seq_narc +nitrofs_files += sub_seq_narc +nitrofs_files += waza_seq_narc diff --git a/res/battle/scripts/moves/meson.build b/res/battle/scripts/moves/meson.build new file mode 100644 index 0000000000..6e0076bac8 --- /dev/null +++ b/res/battle/scripts/moves/meson.build @@ -0,0 +1,503 @@ +move_script_files = files( + 'move_script_0000.s', + 'move_script_0001.s', + 'move_script_0002.s', + 'move_script_0003.s', + 'move_script_0004.s', + 'move_script_0005.s', + 'move_script_0006.s', + 'move_script_0007.s', + 'move_script_0008.s', + 'move_script_0009.s', + 'move_script_0010.s', + 'move_script_0011.s', + 'move_script_0012.s', + 'move_script_0013.s', + 'move_script_0014.s', + 'move_script_0015.s', + 'move_script_0016.s', + 'move_script_0017.s', + 'move_script_0018.s', + 'move_script_0019.s', + 'move_script_0020.s', + 'move_script_0021.s', + 'move_script_0022.s', + 'move_script_0023.s', + 'move_script_0024.s', + 'move_script_0025.s', + 'move_script_0026.s', + 'move_script_0027.s', + 'move_script_0028.s', + 'move_script_0029.s', + 'move_script_0030.s', + 'move_script_0031.s', + 'move_script_0032.s', + 'move_script_0033.s', + 'move_script_0034.s', + 'move_script_0035.s', + 'move_script_0036.s', + 'move_script_0037.s', + 'move_script_0038.s', + 'move_script_0039.s', + 'move_script_0040.s', + 'move_script_0041.s', + 'move_script_0042.s', + 'move_script_0043.s', + 'move_script_0044.s', + 'move_script_0045.s', + 'move_script_0046.s', + 'move_script_0047.s', + 'move_script_0048.s', + 'move_script_0049.s', + 'move_script_0050.s', + 'move_script_0051.s', + 'move_script_0052.s', + 'move_script_0053.s', + 'move_script_0054.s', + 'move_script_0055.s', + 'move_script_0056.s', + 'move_script_0057.s', + 'move_script_0058.s', + 'move_script_0059.s', + 'move_script_0060.s', + 'move_script_0061.s', + 'move_script_0062.s', + 'move_script_0063.s', + 'move_script_0064.s', + 'move_script_0065.s', + 'move_script_0066.s', + 'move_script_0067.s', + 'move_script_0068.s', + 'move_script_0069.s', + 'move_script_0070.s', + 'move_script_0071.s', + 'move_script_0072.s', + 'move_script_0073.s', + 'move_script_0074.s', + 'move_script_0075.s', + 'move_script_0076.s', + 'move_script_0077.s', + 'move_script_0078.s', + 'move_script_0079.s', + 'move_script_0080.s', + 'move_script_0081.s', + 'move_script_0082.s', + 'move_script_0083.s', + 'move_script_0084.s', + 'move_script_0085.s', + 'move_script_0086.s', + 'move_script_0087.s', + 'move_script_0088.s', + 'move_script_0089.s', + 'move_script_0090.s', + 'move_script_0091.s', + 'move_script_0092.s', + 'move_script_0093.s', + 'move_script_0094.s', + 'move_script_0095.s', + 'move_script_0096.s', + 'move_script_0097.s', + 'move_script_0098.s', + 'move_script_0099.s', + 'move_script_0100.s', + 'move_script_0101.s', + 'move_script_0102.s', + 'move_script_0103.s', + 'move_script_0104.s', + 'move_script_0105.s', + 'move_script_0106.s', + 'move_script_0107.s', + 'move_script_0108.s', + 'move_script_0109.s', + 'move_script_0110.s', + 'move_script_0111.s', + 'move_script_0112.s', + 'move_script_0113.s', + 'move_script_0114.s', + 'move_script_0115.s', + 'move_script_0116.s', + 'move_script_0117.s', + 'move_script_0118.s', + 'move_script_0119.s', + 'move_script_0120.s', + 'move_script_0121.s', + 'move_script_0122.s', + 'move_script_0123.s', + 'move_script_0124.s', + 'move_script_0125.s', + 'move_script_0126.s', + 'move_script_0127.s', + 'move_script_0128.s', + 'move_script_0129.s', + 'move_script_0130.s', + 'move_script_0131.s', + 'move_script_0132.s', + 'move_script_0133.s', + 'move_script_0134.s', + 'move_script_0135.s', + 'move_script_0136.s', + 'move_script_0137.s', + 'move_script_0138.s', + 'move_script_0139.s', + 'move_script_0140.s', + 'move_script_0141.s', + 'move_script_0142.s', + 'move_script_0143.s', + 'move_script_0144.s', + 'move_script_0145.s', + 'move_script_0146.s', + 'move_script_0147.s', + 'move_script_0148.s', + 'move_script_0149.s', + 'move_script_0150.s', + 'move_script_0151.s', + 'move_script_0152.s', + 'move_script_0153.s', + 'move_script_0154.s', + 'move_script_0155.s', + 'move_script_0156.s', + 'move_script_0157.s', + 'move_script_0158.s', + 'move_script_0159.s', + 'move_script_0160.s', + 'move_script_0161.s', + 'move_script_0162.s', + 'move_script_0163.s', + 'move_script_0164.s', + 'move_script_0165.s', + 'move_script_0166.s', + 'move_script_0167.s', + 'move_script_0168.s', + 'move_script_0169.s', + 'move_script_0170.s', + 'move_script_0171.s', + 'move_script_0172.s', + 'move_script_0173.s', + 'move_script_0174.s', + 'move_script_0175.s', + 'move_script_0176.s', + 'move_script_0177.s', + 'move_script_0178.s', + 'move_script_0179.s', + 'move_script_0180.s', + 'move_script_0181.s', + 'move_script_0182.s', + 'move_script_0183.s', + 'move_script_0184.s', + 'move_script_0185.s', + 'move_script_0186.s', + 'move_script_0187.s', + 'move_script_0188.s', + 'move_script_0189.s', + 'move_script_0190.s', + 'move_script_0191.s', + 'move_script_0192.s', + 'move_script_0193.s', + 'move_script_0194.s', + 'move_script_0195.s', + 'move_script_0196.s', + 'move_script_0197.s', + 'move_script_0198.s', + 'move_script_0199.s', + 'move_script_0200.s', + 'move_script_0201.s', + 'move_script_0202.s', + 'move_script_0203.s', + 'move_script_0204.s', + 'move_script_0205.s', + 'move_script_0206.s', + 'move_script_0207.s', + 'move_script_0208.s', + 'move_script_0209.s', + 'move_script_0210.s', + 'move_script_0211.s', + 'move_script_0212.s', + 'move_script_0213.s', + 'move_script_0214.s', + 'move_script_0215.s', + 'move_script_0216.s', + 'move_script_0217.s', + 'move_script_0218.s', + 'move_script_0219.s', + 'move_script_0220.s', + 'move_script_0221.s', + 'move_script_0222.s', + 'move_script_0223.s', + 'move_script_0224.s', + 'move_script_0225.s', + 'move_script_0226.s', + 'move_script_0227.s', + 'move_script_0228.s', + 'move_script_0229.s', + 'move_script_0230.s', + 'move_script_0231.s', + 'move_script_0232.s', + 'move_script_0233.s', + 'move_script_0234.s', + 'move_script_0235.s', + 'move_script_0236.s', + 'move_script_0237.s', + 'move_script_0238.s', + 'move_script_0239.s', + 'move_script_0240.s', + 'move_script_0241.s', + 'move_script_0242.s', + 'move_script_0243.s', + 'move_script_0244.s', + 'move_script_0245.s', + 'move_script_0246.s', + 'move_script_0247.s', + 'move_script_0248.s', + 'move_script_0249.s', + 'move_script_0250.s', + 'move_script_0251.s', + 'move_script_0252.s', + 'move_script_0253.s', + 'move_script_0254.s', + 'move_script_0255.s', + 'move_script_0256.s', + 'move_script_0257.s', + 'move_script_0258.s', + 'move_script_0259.s', + 'move_script_0260.s', + 'move_script_0261.s', + 'move_script_0262.s', + 'move_script_0263.s', + 'move_script_0264.s', + 'move_script_0265.s', + 'move_script_0266.s', + 'move_script_0267.s', + 'move_script_0268.s', + 'move_script_0269.s', + 'move_script_0270.s', + 'move_script_0271.s', + 'move_script_0272.s', + 'move_script_0273.s', + 'move_script_0274.s', + 'move_script_0275.s', + 'move_script_0276.s', + 'move_script_0277.s', + 'move_script_0278.s', + 'move_script_0279.s', + 'move_script_0280.s', + 'move_script_0281.s', + 'move_script_0282.s', + 'move_script_0283.s', + 'move_script_0284.s', + 'move_script_0285.s', + 'move_script_0286.s', + 'move_script_0287.s', + 'move_script_0288.s', + 'move_script_0289.s', + 'move_script_0290.s', + 'move_script_0291.s', + 'move_script_0292.s', + 'move_script_0293.s', + 'move_script_0294.s', + 'move_script_0295.s', + 'move_script_0296.s', + 'move_script_0297.s', + 'move_script_0298.s', + 'move_script_0299.s', + 'move_script_0300.s', + 'move_script_0301.s', + 'move_script_0302.s', + 'move_script_0303.s', + 'move_script_0304.s', + 'move_script_0305.s', + 'move_script_0306.s', + 'move_script_0307.s', + 'move_script_0308.s', + 'move_script_0309.s', + 'move_script_0310.s', + 'move_script_0311.s', + 'move_script_0312.s', + 'move_script_0313.s', + 'move_script_0314.s', + 'move_script_0315.s', + 'move_script_0316.s', + 'move_script_0317.s', + 'move_script_0318.s', + 'move_script_0319.s', + 'move_script_0320.s', + 'move_script_0321.s', + 'move_script_0322.s', + 'move_script_0323.s', + 'move_script_0324.s', + 'move_script_0325.s', + 'move_script_0326.s', + 'move_script_0327.s', + 'move_script_0328.s', + 'move_script_0329.s', + 'move_script_0330.s', + 'move_script_0331.s', + 'move_script_0332.s', + 'move_script_0333.s', + 'move_script_0334.s', + 'move_script_0335.s', + 'move_script_0336.s', + 'move_script_0337.s', + 'move_script_0338.s', + 'move_script_0339.s', + 'move_script_0340.s', + 'move_script_0341.s', + 'move_script_0342.s', + 'move_script_0343.s', + 'move_script_0344.s', + 'move_script_0345.s', + 'move_script_0346.s', + 'move_script_0347.s', + 'move_script_0348.s', + 'move_script_0349.s', + 'move_script_0350.s', + 'move_script_0351.s', + 'move_script_0352.s', + 'move_script_0353.s', + 'move_script_0354.s', + 'move_script_0355.s', + 'move_script_0356.s', + 'move_script_0357.s', + 'move_script_0358.s', + 'move_script_0359.s', + 'move_script_0360.s', + 'move_script_0361.s', + 'move_script_0362.s', + 'move_script_0363.s', + 'move_script_0364.s', + 'move_script_0365.s', + 'move_script_0366.s', + 'move_script_0367.s', + 'move_script_0368.s', + 'move_script_0369.s', + 'move_script_0370.s', + 'move_script_0371.s', + 'move_script_0372.s', + 'move_script_0373.s', + 'move_script_0374.s', + 'move_script_0375.s', + 'move_script_0376.s', + 'move_script_0377.s', + 'move_script_0378.s', + 'move_script_0379.s', + 'move_script_0380.s', + 'move_script_0381.s', + 'move_script_0382.s', + 'move_script_0383.s', + 'move_script_0384.s', + 'move_script_0385.s', + 'move_script_0386.s', + 'move_script_0387.s', + 'move_script_0388.s', + 'move_script_0389.s', + 'move_script_0390.s', + 'move_script_0391.s', + 'move_script_0392.s', + 'move_script_0393.s', + 'move_script_0394.s', + 'move_script_0395.s', + 'move_script_0396.s', + 'move_script_0397.s', + 'move_script_0398.s', + 'move_script_0399.s', + 'move_script_0400.s', + 'move_script_0401.s', + 'move_script_0402.s', + 'move_script_0403.s', + 'move_script_0404.s', + 'move_script_0405.s', + 'move_script_0406.s', + 'move_script_0407.s', + 'move_script_0408.s', + 'move_script_0409.s', + 'move_script_0410.s', + 'move_script_0411.s', + 'move_script_0412.s', + 'move_script_0413.s', + 'move_script_0414.s', + 'move_script_0415.s', + 'move_script_0416.s', + 'move_script_0417.s', + 'move_script_0418.s', + 'move_script_0419.s', + 'move_script_0420.s', + 'move_script_0421.s', + 'move_script_0422.s', + 'move_script_0423.s', + 'move_script_0424.s', + 'move_script_0425.s', + 'move_script_0426.s', + 'move_script_0427.s', + 'move_script_0428.s', + 'move_script_0429.s', + 'move_script_0430.s', + 'move_script_0431.s', + 'move_script_0432.s', + 'move_script_0433.s', + 'move_script_0434.s', + 'move_script_0435.s', + 'move_script_0436.s', + 'move_script_0437.s', + 'move_script_0438.s', + 'move_script_0439.s', + 'move_script_0440.s', + 'move_script_0441.s', + 'move_script_0442.s', + 'move_script_0443.s', + 'move_script_0444.s', + 'move_script_0445.s', + 'move_script_0446.s', + 'move_script_0447.s', + 'move_script_0448.s', + 'move_script_0449.s', + 'move_script_0450.s', + 'move_script_0451.s', + 'move_script_0452.s', + 'move_script_0453.s', + 'move_script_0454.s', + 'move_script_0455.s', + 'move_script_0456.s', + 'move_script_0457.s', + 'move_script_0458.s', + 'move_script_0459.s', + 'move_script_0460.s', + 'move_script_0461.s', + 'move_script_0462.s', + 'move_script_0463.s', + 'move_script_0464.s', + 'move_script_0465.s', + 'move_script_0466.s', + 'move_script_0467.s', + 'move_script_0468.s', + 'move_script_0469.s', + 'move_script_0470.s', + 'move_script_0471.s', + 'move_script_0472.s', + 'move_script_0473.s', + 'move_script_0474.s', + 'move_script_0475.s', + 'move_script_0476.s', + 'move_script_0477.s', + 'move_script_0478.s', + 'move_script_0479.s', + 'move_script_0480.s', + 'move_script_0481.s', + 'move_script_0482.s', + 'move_script_0483.s', + 'move_script_0484.s', + 'move_script_0485.s', + 'move_script_0486.s', + 'move_script_0487.s', + 'move_script_0488.s', + 'move_script_0489.s', + 'move_script_0490.s', + 'move_script_0491.s', + 'move_script_0492.s', + 'move_script_0493.s', + 'move_script_0494.s', + 'move_script_0495.s', + 'move_script_0496.s', + 'move_script_0497.s', + 'move_script_0498.s', + 'move_script_0499.s', + 'move_script_0500.s' +) diff --git a/res/battle/scripts/subscripts/meson.build b/res/battle/scripts/subscripts/meson.build new file mode 100644 index 0000000000..e1e65d6484 --- /dev/null +++ b/res/battle/scripts/subscripts/meson.build @@ -0,0 +1,299 @@ +subscript_files = files( + 'subscript_0000.s', + 'subscript_0001.s', + 'subscript_0002.s', + 'subscript_0003.s', + 'subscript_0004.s', + 'subscript_0005.s', + 'subscript_0006.s', + 'subscript_0007.s', + 'subscript_0008.s', + 'subscript_0009.s', + 'subscript_0010.s', + 'subscript_0011.s', + 'subscript_0012.s', + 'subscript_0013.s', + 'subscript_0014.s', + 'subscript_0015.s', + 'subscript_0016.s', + 'subscript_0017.s', + 'subscript_0018.s', + 'subscript_0019.s', + 'subscript_0020.s', + 'subscript_0021.s', + 'subscript_0022.s', + 'subscript_0023.s', + 'subscript_0024.s', + 'subscript_0025.s', + 'subscript_0026.s', + 'subscript_0027.s', + 'subscript_0028.s', + 'subscript_0029.s', + 'subscript_0030.s', + 'subscript_0031.s', + 'subscript_0032.s', + 'subscript_0033.s', + 'subscript_0034.s', + 'subscript_0035.s', + 'subscript_0036.s', + 'subscript_0037.s', + 'subscript_0038.s', + 'subscript_0039.s', + 'subscript_0040.s', + 'subscript_0041.s', + 'subscript_0042.s', + 'subscript_0043.s', + 'subscript_0044.s', + 'subscript_0045.s', + 'subscript_0046.s', + 'subscript_0047.s', + 'subscript_0048.s', + 'subscript_0049.s', + 'subscript_0050.s', + 'subscript_0051.s', + 'subscript_0052.s', + 'subscript_0053.s', + 'subscript_0054.s', + 'subscript_0055.s', + 'subscript_0056.s', + 'subscript_0057.s', + 'subscript_0058.s', + 'subscript_0059.s', + 'subscript_0060.s', + 'subscript_0061.s', + 'subscript_0062.s', + 'subscript_0063.s', + 'subscript_0064.s', + 'subscript_0065.s', + 'subscript_0066.s', + 'subscript_0067.s', + 'subscript_0068.s', + 'subscript_0069.s', + 'subscript_0070.s', + 'subscript_0071.s', + 'subscript_0072.s', + 'subscript_0073.s', + 'subscript_0074.s', + 'subscript_0075.s', + 'subscript_0076.s', + 'subscript_0077.s', + 'subscript_0078.s', + 'subscript_0079.s', + 'subscript_0080.s', + 'subscript_0081.s', + 'subscript_0082.s', + 'subscript_0083.s', + 'subscript_0084.s', + 'subscript_0085.s', + 'subscript_0086.s', + 'subscript_0087.s', + 'subscript_0088.s', + 'subscript_0089.s', + 'subscript_0090.s', + 'subscript_0091.s', + 'subscript_0092.s', + 'subscript_0093.s', + 'subscript_0094.s', + 'subscript_0095.s', + 'subscript_0096.s', + 'subscript_0097.s', + 'subscript_0098.s', + 'subscript_0099.s', + 'subscript_0100.s', + 'subscript_0101.s', + 'subscript_0102.s', + 'subscript_0103.s', + 'subscript_0104.s', + 'subscript_0105.s', + 'subscript_0106.s', + 'subscript_0107.s', + 'subscript_0108.s', + 'subscript_0109.s', + 'subscript_0110.s', + 'subscript_0111.s', + 'subscript_0112.s', + 'subscript_0113.s', + 'subscript_0114.s', + 'subscript_0115.s', + 'subscript_0116.s', + 'subscript_0117.s', + 'subscript_0118.s', + 'subscript_0119.s', + 'subscript_0120.s', + 'subscript_0121.s', + 'subscript_0122.s', + 'subscript_0123.s', + 'subscript_0124.s', + 'subscript_0125.s', + 'subscript_0126.s', + 'subscript_0127.s', + 'subscript_0128.s', + 'subscript_0129.s', + 'subscript_0130.s', + 'subscript_0131.s', + 'subscript_0132.s', + 'subscript_0133.s', + 'subscript_0134.s', + 'subscript_0135.s', + 'subscript_0136.s', + 'subscript_0137.s', + 'subscript_0138.s', + 'subscript_0139.s', + 'subscript_0140.s', + 'subscript_0141.s', + 'subscript_0142.s', + 'subscript_0143.s', + 'subscript_0144.s', + 'subscript_0145.s', + 'subscript_0146.s', + 'subscript_0147.s', + 'subscript_0148.s', + 'subscript_0149.s', + 'subscript_0150.s', + 'subscript_0151.s', + 'subscript_0152.s', + 'subscript_0153.s', + 'subscript_0154.s', + 'subscript_0155.s', + 'subscript_0156.s', + 'subscript_0157.s', + 'subscript_0158.s', + 'subscript_0159.s', + 'subscript_0160.s', + 'subscript_0161.s', + 'subscript_0162.s', + 'subscript_0163.s', + 'subscript_0164.s', + 'subscript_0165.s', + 'subscript_0166.s', + 'subscript_0167.s', + 'subscript_0168.s', + 'subscript_0169.s', + 'subscript_0170.s', + 'subscript_0171.s', + 'subscript_0172.s', + 'subscript_0173.s', + 'subscript_0174.s', + 'subscript_0175.s', + 'subscript_0176.s', + 'subscript_0177.s', + 'subscript_0178.s', + 'subscript_0179.s', + 'subscript_0180.s', + 'subscript_0181.s', + 'subscript_0182.s', + 'subscript_0183.s', + 'subscript_0184.s', + 'subscript_0185.s', + 'subscript_0186.s', + 'subscript_0187.s', + 'subscript_0188.s', + 'subscript_0189.s', + 'subscript_0190.s', + 'subscript_0191.s', + 'subscript_0192.s', + 'subscript_0193.s', + 'subscript_0194.s', + 'subscript_0195.s', + 'subscript_0196.s', + 'subscript_0197.s', + 'subscript_0198.s', + 'subscript_0199.s', + 'subscript_0200.s', + 'subscript_0201.s', + 'subscript_0202.s', + 'subscript_0203.s', + 'subscript_0204.s', + 'subscript_0205.s', + 'subscript_0206.s', + 'subscript_0207.s', + 'subscript_0208.s', + 'subscript_0209.s', + 'subscript_0210.s', + 'subscript_0211.s', + 'subscript_0212.s', + 'subscript_0213.s', + 'subscript_0214.s', + 'subscript_0215.s', + 'subscript_0216.s', + 'subscript_0217.s', + 'subscript_0218.s', + 'subscript_0219.s', + 'subscript_0220.s', + 'subscript_0221.s', + 'subscript_0222.s', + 'subscript_0223.s', + 'subscript_0224.s', + 'subscript_0225.s', + 'subscript_0226.s', + 'subscript_0227.s', + 'subscript_0228.s', + 'subscript_0229.s', + 'subscript_0230.s', + 'subscript_0231.s', + 'subscript_0232.s', + 'subscript_0233.s', + 'subscript_0234.s', + 'subscript_0235.s', + 'subscript_0236.s', + 'subscript_0237.s', + 'subscript_0238.s', + 'subscript_0239.s', + 'subscript_0240.s', + 'subscript_0241.s', + 'subscript_0242.s', + 'subscript_0243.s', + 'subscript_0244.s', + 'subscript_0245.s', + 'subscript_0246.s', + 'subscript_0247.s', + 'subscript_0248.s', + 'subscript_0249.s', + 'subscript_0250.s', + 'subscript_0251.s', + 'subscript_0252.s', + 'subscript_0253.s', + 'subscript_0254.s', + 'subscript_0255.s', + 'subscript_0256.s', + 'subscript_0257.s', + 'subscript_0258.s', + 'subscript_0259.s', + 'subscript_0260.s', + 'subscript_0261.s', + 'subscript_0262.s', + 'subscript_0263.s', + 'subscript_0264.s', + 'subscript_0265.s', + 'subscript_0266.s', + 'subscript_0267.s', + 'subscript_0268.s', + 'subscript_0269.s', + 'subscript_0270.s', + 'subscript_0271.s', + 'subscript_0272.s', + 'subscript_0273.s', + 'subscript_0274.s', + 'subscript_0275.s', + 'subscript_0276.s', + 'subscript_0277.s', + 'subscript_0278.s', + 'subscript_0279.s', + 'subscript_0280.s', + 'subscript_0281.s', + 'subscript_0282.s', + 'subscript_0283.s', + 'subscript_0284.s', + 'subscript_0285.s', + 'subscript_0286.s', + 'subscript_0287.s', + 'subscript_0288.s', + 'subscript_0289.s', + 'subscript_0290.s', + 'subscript_0291.s', + 'subscript_0292.s', + 'subscript_0293.s', + 'subscript_0294.s', + 'subscript_0295.s', + 'subscript_0296.s', +) diff --git a/res/meson.build b/res/meson.build index 1fc183859d..1ebb229dc3 100644 --- a/res/meson.build +++ b/res/meson.build @@ -4,9 +4,10 @@ nitrofs_files = [] subdir('prebuilt') # Decompiled data directories +subdir('text') # must be listed first for GMM header targets + subdir('battle') subdir('field') subdir('items') subdir('pokemon') -subdir('text') subdir('trainers') diff --git a/res/prebuilt/battle/meson.build b/res/prebuilt/battle/meson.build index 916dad36fc..8f917f1da0 100644 --- a/res/prebuilt/battle/meson.build +++ b/res/prebuilt/battle/meson.build @@ -2,5 +2,4 @@ subdir('b_pl_stage') subdir('b_pl_tower') subdir('b_tower') subdir('graphic') -subdir('skill') subdir('tr_ai') \ No newline at end of file diff --git a/res/prebuilt/battle/skill/be_seq.narc b/res/prebuilt/battle/skill/be_seq.narc deleted file mode 100644 index d521c458a04a71ff556e66de6b014f86838a5edb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16940 zcmc(mU$9o!RlpB{+!A}+Qc4?ADLpqpArT4bfF(`TFMmpI%neOj+R_#)8dOwlX~p(d zG5wO>w$xH(6cwGQbcSKjGET-}MjrCOLmpz}fuS9T%wQ(t@Q`uxkcW)s0ma|%e0$xj zd+zz*Lh5*CeqHCRz4uycuf6s@=ewj^?)~`v|8u#TxAwlOT2#%i?%R6r=93Gn>fQ6I z<{IUHr7qlqlx>B*NI6(Ifs~_+mz6gR*olj3(RIH(l7HXtyD2yXzdtnz+_7(Oc z6tC2U4M-U;oIuLy!jF*ha^W?k^xigLD^hkACXq5#IE<8|g$qb|y)gQA z;)XqiDWoiX$ABeBSyR}Blmmq$NEu%=U^`NF7y3v!SU8E4*9sHwq{iW?!qZ4OQ`oSW z{J?l&D^m6poj_p|H%Q>`)G&J!bzk& zSGa(bR||WVlRG$C7=1ruVQ=9nq+BSxij)QQfNeKJw7!ZRjb9 zilef65eT7r3)}$naG!Pa2l{?jf7|%psfV@EK6D)M3~jry)%Jb-#5KYVTe7ObIr+@> zD#y_DJZ@@K)gq=@y&ZgZu0HdMY{sY~&CR@-bH$Q2SLCAR>GIdBilfb(GAaal2-YQ@R#E+ggjR z*qnnl#oV;x$^P5pe~$i(9iua@tBsG?^hN%AFCw#!x@>egpSc}hv)YIC%aNm7|W}+iFMfg?=54azrLvX&V8+~`&#|g zjdbMetyT5JFrW7q8ytC+PsARvYB%Phz4O?}zU|k8&_%8}r=EZ@lWJ$4_!^+!33$o#%|4kkITW`s(W=)sTJ2D#V_1ZuZ^G6k`tR@|@=yQ{;sl z*27|=Pe1(FU*D^f@6fI3(B0OdyS+olCsH$)97Dd(IrxhwBn-%x^q8nx# zKh2ojp6_!U50tgaI&w41C+jvt=Xu~+-(}Y}&-~mL_u-IzkSwNf93=^BX4<}>oV8-qEeb@NXem;-8#`!+ej^|LE>Dh+ww6GE9wcmx##c?&*-)FCUPO7tQE^&O8 zei2`sJ->kYw(jAg8>7E5Yd^kA^;d%z-$T{Ef;qFcmVj{>v+HQhwQIsQ=|S7?L`N)- zq&16}x0HU_c2}(KiHPf$xHoS;<7Y;F42#J*JX(D1;6D4yb@j1QFJ0~0_(Vs%?kU^; z4Z>D@llg4y%fZ-&*`@!`Z>hTE?HuD>ANPwnG6z04XA*As9_#%5;krj$_Gj#LoeayD z{XWgox~}^2ng{;Qa_zzww~gNVQQ!8({%vfq&P_jlUo_uR+W%3}<=8$$Z1L>=(x)+W z!wqNcKp0(?<<6^GPFXztTzlgbGNarG71jijO&(7EL#`NIM*b`Y2UnlzU%{i4(r1{oc@OQya+q_TwIHOIT(}q@!r^c_FVLtcl8V(U*_5Q zXTQ$V*!1JKxZ@+%UnWmJ=k<#ATtma+GH=Fl85|dJ{wLqlJ`amCe3-8t#PA|AbjA<; zJO|q%M%OI*dar&AtO4!a4SmQpV!t?-WA4AgI{gm%wx4K!ti;vTZj38v&uuk2ed^zu zGdDSIi!I{z{qf2besg5IU!iYaLu)1MIN!X6p6fa{pV>yf|7xqP=GnNNxAUsOefWMK zxb!t_A3D#7MITq&hhL(PevX44nmtQW&8fMyJ^O2);UlzLlbqR2y^JBvuVXiY!F#?O z^PWrnW8j_+yZT_y_u@I`>~rkb72F%6wYd@_HPXv9@!Zfx%+Egg?*LJggxSwFjWc}G z)_Df>(6{?}286FTb0SXdT+L>G4mQ6=pV<2mzq!xxFPmD}&)vhuHCO|z7bR8)aPM2bkVP7^M{Og-`8MY?X3rXqc-QVI?PPhly%y!shqD|Q?WL= zhF)NN4PMt$L&P|%hH@>`*fUlyce(pHNT!$=EXHP2kmpp7}nX5E1zHC zLqA;oVflNA#+(OpQ-kB3llPkU*?iW(=Th@cX^i$U=DR@uF(%twkG_Ua6=|QGm;dke zFm~tSdbhvnb`kopyx%d$yyv>E@!?+3Uk_?<{ckU}%=55sydG_~J64-Fre}w@e`|dK zoqdmkYh>P?tM3@c`|RAbX`M(9Lg!d(@;9nC{{9rY-|Wy4LsMrFqxQLetp7F|v5sJP z88ZoA#`#+%rZMi#jdQln&VxCRzRusZZm)~|Zv(HWb#=Elnn5nZhV^Y*wh^(JM>FTT zZX+;bv#)tQ2R`e642;WX(Rf z^Nux+dQ>Mp2wl`8wSGk1hrmnQUjz5j7~%<~+6S8kg&@ZP(Zbb7U>pH|x#YQUWzr^^r55V=W_ZIkxC$Zi!__uGc5gxenUC zyTf*@$FO-Dzp+T<-5mT2c#gV9%uBRWqm8de@MXLD_+t(s#zoxs z&SAXkWb8dK#siRZ6ZbzT?be^`B>o0>J~3C%PS+!zT|dUpSpR4vG;6jWYvkCl8+{xP z{fMD6hm5i|X5|pQIeb`0T-oMa_wh)}_xG@qW63t}B!yjVx~Fbu{rf9whih zRODY@dpUE>XAS1j7<>Wc_mB1T6}sfS=h_c@_WLURe2%rL`h)#(4xRp%z!>PuXXmC* zYG%6DTqnoR<-6i{@z=HX#?*;PM{Ac1>?|Z`U zznkG7zHCTDJ|5%Vwb7R67uP)N%(L9_S+C#ubauS@Z0|~b^tZ~@2-i`65>xj`5+ry7RtZMxKeIXI!q$2&@48&(6<+89M(y>#US70KZA5 z=Ua2{MOd@`ZAQE9TVu37PFFMk*867W*2iAt*qWN_+#HwZ>zvg6xaXGhY;Gdfc&|Hm zYtGmQduPF{x>-V7`%LgGam+Vb=c9Tn+O-Ye1Ko{HU9U@Ztv}Y0jyo>6~9}-#ISUuc`-Y`h9d>CH`tH_vXZF9=s21dk=)(=g_;ZABOnbgnHjM zab|}Nb=G~vt_^EQ$+0|v?$fP)eV(_qbl>Lr zGcDbdJag{Mi0`{Rf3BrF!1H$ST>Ct@R-S2hfw@$#zpS?w)I0yIcU{y^wDi`4`pqr9 zwXD9^(vK9qdm`I6F8jMjv)=Pq{koRkeX4#`c%KHrMHIFyMMD^_k#L- zE}J*^pL+f0{`OOEKC<4u`vGvAd-+<=W9qKX^jmu zeJ0vA2F9(;_?BABeGTeeGY^T?h-2P!+4nIpPp+B1)R_aWIUIe&vVF5B|FS9d+< lK6`&UZ`!=l_g2JeZrDdha=vpL`)Oz!XTi|6#VkX%`M;E`jBWq` diff --git a/res/prebuilt/battle/skill/meson.build b/res/prebuilt/battle/skill/meson.build deleted file mode 100644 index f05ff3b453..0000000000 --- a/res/prebuilt/battle/skill/meson.build +++ /dev/null @@ -1,10 +0,0 @@ -prebuilt_files = [ - 'be_seq.narc', - 'sub_seq.narc', - 'waza_seq.narc' -] - -foreach f : prebuilt_files - nitrofs_files += fs.copyfile(f) -endforeach - diff --git a/res/prebuilt/battle/skill/sub_seq.narc b/res/prebuilt/battle/skill/sub_seq.narc deleted file mode 100644 index d892462fe4f5883b127a1f7a46b53b712689d81c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 53196 zcmd7b3%KT0eINRF3ldT=&~XTt8He=_!%dLO0Ez~~p3y-Nlo3HuQDDGZpn`_9UP!Xj z;5D3Rs?EWKwqOzI2}w1vl_W$_wDFi5PSS>^Ih^#IoF4Pk_90I>PxJJl<$OQy`~MA# zKkuFy1kZDpe)n4Iw|@8aTkHRS_ujL4^_GiX_CFq*EdBl;O(q9V_L*$Gc*{8#|KMbD z{L*CB*6ur*!07{iKRukd-yFB?KbgQ?e`}5d5135gupgS^^z`uFgXV}4h9)--xan_C zCh)+3&##$GVAFHwcsM<5T06(}hfgN3?-6sHo*urwZjL``lL_22o#VKpCKEXLxH;}k z4`-e*$2-!)T?4+G9xgk1j!&hBdrq0-!SrzOsdM~(dbsEGIlhw~wx2P__37b`0S}~y zb6+^e&FSG!1|0UHslE4|fc>@0`hGhI7*g>(86xiuABD;PdI> zfdP-EhqbSqrKzLfivzBBWAp^K47mDDlL_24 z;EU;D`Hj(gB;U3_ZAIz@zEmBRl5!M0&Vqz@Mjw`>vYf z+N&oMxcIGeY=3+F2p$;lH|gQpcg}HZdU$Za#XlCg;5!3Ozc#rKZXWPxdbsKD%<=j3 zaNBirY1y{z3LJxO>1ApG-Xk zw+z_+i`lPWWxyTj;o|>!jz3Qi2j4Qsx#{7N0q1@?^WfG252uHFe`$`jznpUyTs`29 z^f0+~j^on9)dTKG58oW{aC%t#kLEZtJ={FtJL%!le>}$*)5F34WR7do!`%ZOO%E%# z&G9$s;j-K3xH~;u{h2v#OAn6>SpKJz30yYduJrJo0XN){vmRXk**P9f58LmYss*zH5%P>EWya52lB!|JfWjrH2OxT>LB9r{Jyu-%JmW3}|=fP7f{^@ZR+B zsR7?i58oNE|F2FaaMpmE(!)Ii9!wAK{k1u6O%L}C_{;RL??0cTrH2~_+?5_481RYD z=Y9$98L14ESPt*#563d8c~yIR{7WzQJU&G7o}i~0|KW%>dDdj|zlVmO?0&&Mf%a#?`-1}mYd;jUVVqZz$x3iy z&;sjd`v=pY1w~uRn7=(OW+#8Uqh-jI$%f#$!8hWBIUPR|JTE~1cnCfH(1HHV5kKAd z9~$u=Fwh?v(Vsoge>Zx5Fyp@!h+E8jf)?;c6Q^9Q3I2Gnoo?nU|IQE0vn?|jdVXM_ zrJKcIU5>8^*fPiWy8%1KV!t_P0h$~epA=|(&`Qr&Gfs)mc=dF?a+uRsvG9++FAqK6 zDz?fmo!19^D}O33a&+%)OkWGHSl$q5PseX|pQ`=uHQw_3gxFjP z{mT0R0U7z1v)bE3GJYz0?~eoPBEyf`lSR6JE9(yhEzs0AJNEXh;DVsmE2ibp#PO%W zW5MA=&({`c+veRaJ^M%L=Fs>cFUtY{$dfx_7_T4tmYxrKjqMi)a*lq7WX5rA@>rZ|>Dkd%g69V_C2;`R5D; zpr(s3)c9D|A(@6Q2JVv8?^u%1M{*u&6u1#{86wPFI#w*1H6A2>@Dxp&2Nh> zK5An6@t_6OKAwU2ThQnE10$MywC=Rx^Q<^IkhfPPZ*pWWpyHFux~JJkZ$ar$V|2eP zAXhweseitm8Pqzt(rvv3rE4YQ7X-yiZ_i8D(ZPcOpWYEczW-)?w^qKZ6DZk5F_ewo zUp}*0@v}is@sR1~72|J&-hw`k!!mz)z`tqWxf(Zjo!656r=e{RTA=;#yqoz!_L3N1 zO}6U!q43G&y6_sep!a2YM6+g3=-(8GnQxUZzO|s&!H1U*^mM!Y^j^?{;*ATl{L#(7 zMZVK-zu3ihRInPK^I?emMw#>!JE`8cVf%m^LA6c=`v`@aS4ea+_K?@#VUz*vn_H*O4mHE3@3te-b z@-b;w{)+Z18F+p+gfx7AHx9Dd0uAkFLzCwgXlQ>gwA%ZkJ(>akT9D-#-!&N&O%BK` z2XZZE^vW5C^^<2g4J;d{*=iiZe3wH76EgsM2fZS2RN82YT1iMm-n@YAmrO8=r- zCQmyaIq@E~C7{RrrGc|R*Yg9d*JI6l06p^IIm~x+W6j=}lcV#~!8Bk4y}y6#B^v)r z#u=`$+#7#2_)14_8EYp5^pZa>z)NT4qdsSqzWW9qzI`oFQr5ha^IOh~m+w~vEs!rc z!S9U7n|BWO(KiQln%jd{2l7J~TIJhZ4$)2wR*SD9aM7S!nG3PUp^Hd|dk5 z1C9K#f!b{WIeNvU@A;lP(Cit1$(|9|-^xpdvwD9tJ^2=tPCec=!M~4z1Jct0d&+UY zH+`dYE1oEH+H_&gFCj5(|M)SndQfR z6s7e(lx_KZZ9xAt(9r5!tMU=_ z7%G;>>vd_Sm+VP_+Fea1OS9bZ9>06W zxaWUc=D!k512*tgF8))-J+CuPz6Hh0iT@{a@=HOkuZV$Bb`{y(6Y5e|Z zusgqdet!RC(1N9aU-m=a^V!Q^3|dfpdc6I;m+4GaxxvnWuOAMkLB(6SxihrA$<40~ z@@)3Gd3WY5(D=-z8fgJr_HHTvdwcp8pt*0I^)Ci3SPIDM$san5e<=O7fIVyG?teVu zeo0Vwjd;BGv_LCg)G2?QB{Fo?dj$ICU{j!$y`x%Zr_RCFfmZgXnO6?$ZZ+RB@S%yV z=5<%B4b48eD~^n^I$xR2eC6BU4_cs=|5Y1BV+(4}%TKYK7rp(x$rtry?N4LCeJnnx zc=5bBXo1EqUoHq4DFApnUjJ#&owpvmbc+eKD3Fbh$V`;KR#?`R9lE z+38!Ll~4A&A*7X0Vk-OMlyCm?gWh9;7HFmCxQwR(AMnv}eZa3?*Evg1)a4BJ>n|Iv z%Y6&9vZdC0nQvxZ{`GaH4%ITGtvr-3buR6dJFE25&2M*B)%U4`FL=c*Hu*TIqqDa) zz@wF4&JNw^#&q{I`AOTKPjsFz=uG#7v$8F7w4&o@!~Na@e$V2|#F(yi4s#lxFAiF; zi!X`}$(&v}BP#}SpNJg2=x}GiuJPN4{#!%e=b0TowV>>*WK7pIC>a7UzTfjK>TF}I-fv1?4dd~oSMCZtzm5%BfY+Mm?#7_!e_Q6a2J*TtxINHH*FVgdu0BVli{74} zu8#&SSPHCH>^&c!KNqy1`1E+|UbLpsAr-JQVEdL}8r1n$>vDPb0{Tj5cMkM)GkI~+ z=f0yyqu2hTeuN&(^Ecw*al4tzto2 z3drjDcIYrx7uy2%v7daTdqMd6_X`drBYn|zR$_eJrV^czyZ_J*Bte#w+y)^`MA?(IFm zP}FWpj z-2mh?m7@<0bhi5(y(RM&Xk}j=wSdieEiLVO zj~(X{ADv|N{6BOUtD!cGt;2r7wtx?GSDiUSMW+LO{Ond6Ezsz~=dNjih6ZHC;QY%o zTlQQHpkEqn3hIukb+Xn!nIQRtUT0|QFlTeafRo70P{Xzb!a=WEfO#TIDn z^7Hbb1sWP#?&`AVoYr&l;*49MmHdSnH-xm3e`UrcFSZ>)pA-JIKr1~j&A1_?l^)-t z==H42yw~IWw?HdBCuH0Z(n`-U8CTu+`hG3S-=h4x- z=s8)>7Wb!nZ7EPI==QDF<;dRm_q&+vwY93R%Eh*UMu$2kTlKV@@lgS}hl1M!O}>r` zZVcRC^3VcxXU$z*^}^4}lfKvCu2L^8C_X)VwP!msrgJ%%24%xpZ2|w$HGJyCSvoi9 z>Fy=;tpj~2J$`yL@w9+`@%v05_7uCg zC13j_|1Hqu5x;kaTJO*5X`#13E8debE?#G_V(WR1?s)h$K6AeJ-2$!j9+q+KRj>b< zJ}3OSE)e%pAWvm)+d!*)Ka{zB<%4>!TA|}T0UdP?GTs!}=R*SP{W+tj_N`?s4zeqOwatOJil#o$)K^bynQLVD z;aS=Ot$cM)m#zNHj-RFEUm3JOEBS31m%Nxi81ymspH0YE`+h%5Z;BDQkk`un+Kl=4 z|K+oky}uubS#2%4Bjf~q%fMqVr^A@c_CS-zJ$>eL=l9RuJ2R&PZVWtc?i%LxnQs5g zjjs-#?q@zV*gxmhli20q=Z3L)pNFbl`{Wt0x1ZzA4lli@Ii#xosxamQ0+X9sOrE_{f);EJ z`g^)R`_}57TF$s)l#@fFWKq7^b#B`mD>+T!$^3(jVfR0xM>V!>sVe{7m zbwbwrQsrqw#$?!H1C|4{%GaXUD^`A%50xu+uN!o<^lYkCb>!aa?@~4%4!l3VD`){; zXIY-#8T9;b%lt0`XKqK(g3?cJYtZx4|EB@{VrxOK-?-1O=v(krXq4Df68tPjwCBk1Y)>HpOc9Y6Z#2KrL^@+ZUD^Pr{Yr@h5{YalmQ z2Db+q8F_HdcbA8rUmiXdv|uTaCwr~$`JS8kF9j_qK0V&5pPd==;S<3$80XbpI;O9L z_UVD1ZYE!O{p^Tdc`ZFXznqNqR9-(h=;3dlSFyK%pK8YU46aPyf8t#o=%YY1s2e`>}h&p-Dn-z(o6Gj4%a zdNyU;5YkG|ks0@T)@9!7IXLqcXr+g}hLBczocCVOH#09iRa4gOl^TMym51`Bzt2y| z+;aq!5DPx%ncr^=dR}`Vz82ucL+PdI`n~czY=N_`(Rp&vf~$f<12l0>gWm4n zqSAFrHALYNe*9W~#wRL@<&U?A~UANNP$4+nk zu3N2(tC#=n%*$@YUgxpbr3NckeDOYaW+0zH7QgdnZ`B4p?BYi!?+!7pT$hZvtdp@H zb&gMug7R7mf9B9sR(fERIO-EDPXmV40M-MdnT(n~bn))f)u^HP_`u2-Y>VZGwJJ}vs zvmeU=Kjd0I$^PJOWbsta!#2w~eJyx)K&L`|K{~n)3=`dW`+BSM&<6S?>5cK)YxlA7 zDS>;G4fmOGu8zm>8{@I(@?hQqb=T`hulb(tD)G6u)ZOVpovGOwNMK@GJH(_$`hP5WBTL_AQyC;d`=;l^LBbXSwpr*Owb=R`&_Sw7^*_y>(wyt**_w z99QiXotzrJGe`(C`!}X%@2+9)o~M^Ru+EgYP7e57G`wgnP~%ne=Iq)N{P@a`MQ6?amd>)%LZg$sv7U}PN6v56+U|7Q zy3#%NcW-pBiTvpvQfYl&<*V$&`$7M+EL- zcFf)D?)35fT(LXX_+A;vb?xn%jNc!pQowuQDi=bPde%OSm3-HpBaU#?RWXcC%X0gM6bF*m){oj zHP62*1F`ot`|}YvDl~Dd_G~J<{8|p^zbZH>I6AN{hw{yS`NKB?{oS}Gq+bZrG(BE+ zq0e9K8@lJ>2>}`#WQwM?>O7)pYFJIM^Q|c0U)dnr+ZpF+vhw8L89VR6BWJb5U-_hK zsMmebb`CVPPM{7Z?J9D*8mnJ{;OrK_qm+Y|TOPex&Yp^cZ z7FatxkcZm$p1*Qk_sRIau`lA2)5{`gOuo-6pVSxNJFVLfdi%A@SJ6>^%xh`>?$RPF zzVc1J|1^+OF;#Ba+%f1aTG^atjSlq65q`NrJ0cLv*N3@rt;xAL{6-D-UYXwKj<*H&tIo%_GbSeo{k>wWp|{&6+&%^Qu5THU@NW4&+4K{IOOv z^yPsjKc9?&vdxzK$f>mrA)rCke)+LBG`4Eq>koN_P4?+3z4uM_ZDQ-`^V(=nc>cUS zJow&_B(jlirlYsFT1-0!Ub%m=oyq>j|}K=|I01fDM1S^8G5RNVM$y>gxu?8-UYd}@KuJ+%krSH-=Y^*V!VGp;!C ztqE?A(t4($_4~70&F-#FHVit-=ciI9cf}VzJe4{rU)0c!;H^Om}@6!&iGz?{?^gu|4lz^pU@I82?qy<7#Jz?_UaY-J#=JpJrV>q1)pY$Vu%Py~g&q zAHO1VDd9gKEB0}$e~1bk@$zkeXWqZjM* zqWqBbcq=Bcw?Jc`{^H*nB?n}Vmz*3tJD}^_(OSP3m7g~7tLLkDlM!h5>Se|I~p0Vs3#}e!43gLR$Gb%~%cg zy7>3u_$MxYLBC$M*h^bkWQ$+))c31PPx;^LBain3ar~I{#jEDWd@VGsViIfb&vNFa z@3R@#UCM5+Yg^_^LB&SK{$3OCywm7O*+H)0XEoS~mMQ?u&6e<2YJq zz0Z8=^UTH#0pGzs@Y%Wlc7P`Drw4pDH`dV2<=$t<8rM6ByRPmrxthfgCh?p1IbP13 zFF!H#_U8A(dt`cg#Wju%Kfaw|ps)D)`o%L1%GZiRPQ*#xJ=KCSpF6tv>b*-p<~z9K zJ3M3h+^=K4<xbWF`emDokkH$~&@?mSR6lmqYdF_K3E0=Vw40HRnF|Y^de8N|B zelMb{uSImZT125NOE)Mo;zLIh6M~1VQ>Uk*sx+}zXO3;E!hMukq1NCbie+#Ao zTk5sXP3dJ{+%3ps`LU|awVBI{^{UO~jLUC#3p-@hli0r+0zc5lHCB4)S`Ng?M$h;D zVP3WDeTkVnf&P+Cyzk(9>)0#KIqE06+RtfZyM*wioDq zj$7t(BNohL>?J<5+ROSIW9Wwr^bP6Z&VU_jZx7h{)-boP#mA3DKV!wyf@-hKz`gN- zKuuJ=lK^*%oU&(k}1Iv36o4rX}AzL};*LA^~;QvU%+2Vg+2USbx;;p`P^!rnL zydiu*b{dG8?&0jN;A;Uozr6RWk*Z5MMek+!_@84O4aPpo5gAwx*xni79e)N=6ZYe& zeg@)0?d3Qw^}?3*qXYIA`BZr$pKxX}YD804=o(%8)Ru!j&lT4Rp_dJ^OJS_%3p<{# zwa%}Vpx58q#aA_dQpOc$$MPz`m;ZtF9guUjdu2&G}HNihd>{C zA49(nd=gXTt-ll4n+D|RSq?P&-Gcs%h{3*G5S$s{cTc+W=q`EBR=kfyDH`;?t(H$R zZw<4&^9OplEdz~w3wqz)lljhot?PnmpqU>Lyf1iXQ1qpae$|NnqRg)k-rUjYDf;UN zIvwb*3$)h+^cVdS#I*B+pAOCq_{~_RkS^PY8-uzQ{9L)djwuR(xdn zrLlugbN}#RDU52w+SrehD_voElAJZ@{kKPp&fDJnJb!a!$9HK9t>5q3gOGRa@!=WQ z9`tm3Zx1RKF&+`1d)60S4CtCOR{QkgjOAD!+2G&WVNO@S2ljZpS9BJw_Nr(tYjjvw zbB6|t?Aa?kV|#BH=>7e0MQB=2yK+vN?e_r*v}I1$YJ0b655(N>@pRDPeP(;09UI7p zy+=PKP?Hx18rsPLn%XNn?)T-ue&AsT>;WI~KHcwW)V*U5jta)#gJ8F8Z^#(PluyTH z%qPCAi&Oj>^N(Y1;c*Y>4-W1O{2Wp|--D=(U8d_j|oWIIf z#p)cPtqiD8{Aie0yTgAr>!oM*OkbYs z`C#aBTfWGnJn_ZzhTgYuA`PFt0nbOix1jC^-V7qMX34gIe`p*yKHW4}3ecQYOdAA5Q|bJf;|134StTMvcS zhP8Q}F75ie$sx~d@JEjSK|sG&exlzT6n!b<^532mz4*no($Vo(T<`Db_=|qSK*wA9 zGknrJI=k9Cf~xlyXKXLj9$)Q)9GKJflEAvLx<@Y>A9|WvDf?;)A6muM%NAcxD?YL< zz+>H>s@p}r?mzJ0Ex(N4FwmWq^8bpAwVrn6oHS|a$+7)Z?eTkT5ABLTD|={VPmP`& z0vfyhSx|HKq0Yl{#%N^T5rKIfK3Q%{*6G4K4csN>>^~TguYE6{YCTJ{_5T<`@6*=M z@n{TSGYH8zmCYbpC3G$TU#55*KQ7Qm&Z~2RkS{bB}rcZN+To>JPRsQmi&*JQ9{6ur^G(K(%HU>RyN9I1qm#o>L4D?!? zeVucNjo-ZLI1qqd)a1lWtfu_ z>-c@3e58q7@!2o(?p<{GuNeCIO6Yr2Qyap!CfFy*kq36hdtPTIODlAWc`3jvX1>TL zx`xhAbalqR3j+R)Fu3i_#{!H(?+FTU-{~!1LkRd1E?|rwAeNMjL`_7iT@#oY3 z$H2LA{=6rs^>2ri<{3j1|_Dk;N8I$u)J${G6Z@qLH_dlm=nUgJDTSjy7JBJSho|$sR zZ+)FlbukSzYiw%UgKq?AFAc==`=dF(>W-YW{Jdtt`T?Pd*SZ+Vl)rnEvp0qx-)cD% z|LFlcd_5ybTk;;D7SZU~T^=h>@`87qAAau}xRVbW*3}rk!xzJbC8TKGAhb(1J^b-riL#_DBr!Y|rVuE@*+hQHNT^(K!$cZ^VXG`2^2U#~Rx_R2edgtqg^yEOT zJ1-{&zJEmSyrCDHGDG{b;M}0>SflT%pasry*{`*|^`Y)Bf19VzgR!`p9*FIUXQ$14d1UZ~T)!`U&d2*8&e`)J z_n`W)ZvQI2f4jim&|tue;fw-v6}= z?4gbAjcM$SW%;j;$Nr;@^^Ixtm8|;uZ@cloWnE2G?HrwP)!fF6)tpABI&#Oa55{!$ zC67J*MVVh8931p@r(Q~*n&jhukBpD`q0R>K+W+%Wvk`Wg98Hk@S(e(J*TbJ zJzHxnG&<-T>nQt+bo6V^3?*!$@6CB3vtMNR<9%$=JDD}_63fAz0p0j+44l=whPn7R z2j1a~uMS=uc(%5n*8RN5-1@elZ1UGx<-g~E@h5{8JpO*OJX^PBpYZ*1P%&pX`+cXL z#@`n7H2mvEv|Kl{GuHDZHM7qjJ&i9FlXc^jz`nNt%@~oL9|`n)_MDX?>l=gh0XiLJ zBg0u!KSd+2)jJ*eqk(R$f0FOaP| z;A{C^v^Aj}k^tznH!wc4c-C}0byhZn4(fkrAU~eP(|{iHyn4-=XO5UI2>QF{M`o*& zXQA<_WW>zwy4Xd7v0wF>oDcQ9{^M2nH-|@zkha2Sw5s9yy^Cq&H-^rCaW2ZoH$&&o z{}S9V@Zh^M_(ou@zIXMnNAqdsc=4PZXmWrqX7u@eJb9M>GePm6nlU~Nt>jP0Sgz{t z*3ezOP`z7s%LX!ZFAuK(>qyyy#DMHKJPesHtDFboY$BRx!{Xj^*UFExm;G9?j!u_ zU0mL0dmD2^XTIB0_kr5mHqgw)Dn{pxZhUla4%C;=0s91e zcvl$IfBCTJ`G9Y4_Jx*tn-@8@bUl3i_0p3l$Szo+=| zT@*g|hx1i2i2=&LOTu&Xu)aIKOT$;WtMfY6^`<@WIPd(hukx_F7=JeTRcH9ezN>wI zH&+Z}o#MV`f$XBaTvQ`_(*5_IhVDi6w3RYI(dz?vOp@abapMMq1&Uh{%?{k%h@mcB5*wXUj&nVBO zwSjf|Jy(G4qXTs3-8&z-MQ5#KH-^V~_WbiKG9N#)=&t8u*=EZ#Y)|>UBr&db7s!?S zMBMW`{ovi|v(I#G8)Vq$`VBW+@u1!2(cZ82e7?E!bJ4S6HQCi_ zY&ARA=6O?fvB-{h3$GH_v#&24 zXy|K$KBsC7y`Fb!?Ef5mMu(pNTLVpg?1i&8S)TjSGK}a_*P_Wx*FSCDm=(PXa0%u7a z=0^rgf&Yk+eR+<>w7yn04s*FwEB1g+Ho#n?=knQTUa!tSJ4J69SKLJlY1e+O%~<`E z9eG?1)P1&Wmp$`O1})$RKAd>0iHTo6|GhTxtV_?H^*$~+6fRV5oO}HJeEl$Q>9wkB zcGtnL zr^Eg0eZroI+h^l@1H5#q3-1fo{!2cun_J_{Sf0(7Wl{aoSHNFB(E0g5^S#NsbI#0I zj=m85dSL(95=-$|$M@CXD*^rVp4W}<>&9Qpm~DK27MvT%Ny*WFRnUUR&%@-PvW@Sg z;CBcWA=jA_jvFgzZbmA1Mi8e@Y3_$Rn|6Vt@2ktGuaSF-HnyUaZL2RXq9}5 z+4@WNuzpZ%EZUF${#V~=`&S;ves0>0p9}QN{(Ay^d(Yn6-nZhZzlFo+aX!2UX==gU zwlU~wJ2H3I)tRYhL(N;(UKr@LHv2k1C*GON*|k^p#Ti%*oE3C2?e5?8{ELAP|KUMD z7mFBs+Pcwv5zmpU@bKlO$*)|D&l)@Ki_^2Njq@mX%2a-8%`=qF-$|g(9G!;*wZ0)^ zd8zaG*vjL1QZJd#;=@02_F&!Yl4Ed8Eq=yl$W&j=(QPn{P+Z2!xEJb#W3(8%(U z?8$*v`dh}|uiw+XGP+L)`saQB+>{3U`Ba{hawax%VsI|Z(-!`&@NyQ^*;D;J-D4x8 zcICfv=T0bEy(@cnDO&Nhj#hlfceLW0cC_Mqen%_5jUBD{P6@3ARhM<=x;y^!P+#)$ zkw6WwrB>Yuv-(Ln$elY0O-;+~*N3@rtvTc7;>UY$9J^;2drw;mtpDafE57?WzAWwH zTa)p(Q>5yYKC&AI?5&^wrjs4}Dc-8@BQn-nAb$18UwPukmANZ7rRM{T{h_DM*mA~l z%5Q#Z`0Gr0x5O_e?6PAnw`I3wjBc)}Oa8VXuFUG%radc6MPuLizXzVXS(@RB^mPu@ ziaONPJ6~F$sSypYu^Q6j$19#M1z}hQ<7HHPg)v1BC<)8(cHD~nsfi*SU0?nHG zR;SjSyB28H)U18BR(q7;Y|YtGkJj7;Ezro--Dgcrv_P}w9FeuAc3ZF%SaSzhue-^f z@x5{+#x=n;NrZZ4pDZ4A2Hy&t#fO5i9dti8blz3l0k^9|j;(tTD?KOdZCtns7n zFMGlcTKOxF#&WwH$T_{vG~0AmEFXyidf7sQ-Y4;(iAQ|oj|}jCHyb3TH>PM#8))d` zxPE(BV@Jbt`E2z4`##pw^|cNDsS&LWFh&!@u|W$oGt}#H|8c`w{rtFJbEe4E&o%osHEpeap4zXe z3v2ar+Z%L`nCpmHG2jR4gJ%pHGV#l4Uy;aWn7ofl%0cOfDP!+ z4*kxi8t{y*{2hrf%*6|v17}tq>%5h$b6c{{--GN*cze6{vt&2zLDv1(%gSNNzF-fs zla;w_i;Vi7wFIJG>3Kus)m`lcy<(*nO^vfJPycHa$N@b)pSg2@|CFEwXw#vWrxsZE z&ZYG=^w-0EbY0S6=q+Qd_~lNX|3e%VGhU!$!+>de4ZZvjBVX)APw#of zqT%Uzi~g<9$;yFe4S)G?b~pD-UJiO5>-b8>IzBvf^uCL2r%g!f>02^qy9Ju(@>PMl zn+D>uenv2vtjy+O=oGGsY_))F<xt;$aL23Qj>g}lRveW0R_R{&^ oG1Kt4FO~ag=+xsG@1?(`-0x-WQ_<~Z<&*pofqm)oht9YE7i~MpX8-^I diff --git a/res/prebuilt/battle/skill/waza_seq.narc b/res/prebuilt/battle/skill/waza_seq.narc deleted file mode 100644 index c584298cc2b51334f4e8e01045cb68b4f44a11a7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6416 zcmeI$Axxy{0f+I~cG^yxNjhSh%q1g6j2JOu1cEdO?v8A^WV)R+BM=A#0)apv5C{YU zfj}S-2m}IwKp+qZk|GcYk|P%`A$O#q$s|RPhD#8WUY}?8-(Vw9-LQK70vjjA3Es%EsP+R>pJiBYPt7^j+uNvdx2sQNKQ zH61flvoS|C9}85Au|%~V8&sRIMYSC}RJ(CRbsQ&Dr*TGg9v4)XF`&AOd#Zc zMW1Rarm1FPmTE5MsTN|9YAKefR$`TEE!L?vVv}kswyAbvmufHesSe_h>L`w>PU4j6 zEY7Je;*#nruBmR~mTC}pRQK^f^%z5{*S|c9BuZ4}s8Cg-MpcgnRWn*t?dVXA#3GJLp2hkRAVttH4&3k z-RM#EV~T1zW~gRkj%q#@s1{?1YB^S@R%4B7J9emcV~=V-4yX>}i0U{_s7~XI>O3x} zF5`;oI&P?LV?cEm_f!w@NHvVYFWFxdqeNAX3RN{~RP|_3HKRqfax@iY4|Rr6^NXqDobZI#nZ@RIO-Jbz+2SG{&gLV}fcjx>UXB zQ%%J*)lAG%&BZ*`LM&1(#WK}KY*KB-Hq}8KQXR!H)k&OEoy9rTMO;!{#WmGU+)@qV zj_N)hs2*cTRrvKAMXFMisVY&Wszsfu5lyOAw5d8VLOqVR`5e)e*V z=bQZPxqinvpTmE8^U>$Op6|G?-x=p~e+QR-^8EK%m-G2K`Nx{?eXjXqjB(vxyyrb| z>_0Nrd;Zk*9sk#i|GxcsYM%e)_+Plb*Y@!WPtE0;zr}a$qsP9)Q?Ix0yM}Z4e=zSe z$J=Y~a?acHzJ2UZ?;Lx3+)sc0&-?Zv?uUDN#f$9SJ@xtL{JeaKwLN!E*ZeoU`@KAO zo)0{<~gJ N9{+ug|3B^XzX01wOTqvE diff --git a/tools/meson.build b/tools/meson.build index 5444fa698a..55f88ea798 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -8,10 +8,14 @@ subdir('postconf') subdir('scripts') # Prebuilt tools +mwrap_exe = find_program('cw/mwrap', native: true) makebanner_exe = find_program('makebanner', native: true) makelcf_exe = find_program('makelcf', native: true) makerom_exe = find_program('makerom', native: true) +# ARM binutils +arm_none_eabi_objcopy_exe = find_program('arm-none-eabi-objcopy', native: true) + # External tools nitrogfx_exe = find_program('nitrogfx', native: true, required: false) if not nitrogfx_exe.found() diff --git a/tools/scripts/make_script_bin.sh b/tools/scripts/make_script_bin.sh new file mode 100644 index 0000000000..f854ec1ea1 --- /dev/null +++ b/tools/scripts/make_script_bin.sh @@ -0,0 +1,76 @@ +#!/usr/bin/env bash + +help() { + echo "Syntax: ./make_script_bin.sh [OPTIONS] FILE..." + echo "options:" + echo " -h | --help print this help message and exit" + echo " -i | --include append an include directory for the assembler" + echo " -a | --assembler path to the assembler executable" + echo " -o | --objcopy path to the objcopy executable for data extraction" + echo " -d | --out-dir directory for output files (default: current directory)" + echo " -m | --mwrap if set, will treat the assembler as mwrap" +} + +INCLUDE_ARGS=() +SCRIPT_FILES=() +AS="" +OBJCOPY="arm-none-eabi-objcopy" +MWRAP=false +OUTDIR="." + +while [[ $# -gt 0 ]] ; do + case $1 in + -h|--help) + help + exit 0 + ;; + -i|--include) + INCLUDE_ARGS+=("-i" "$2") + shift + shift + ;; + -a|--assembler) + AS="$2" + shift + shift + ;; + -o|--objcopy) + OBJCOPY="$2" + shift + shift + ;; + -d|--out-dir) + OUTDIR="$2" + shift + shift + ;; + -m|--mwrap) + MWRAP=true + shift + ;; + *) + SCRIPT_FILES+=("$1") + shift + ;; + esac +done + +MWRAP_ARG="" +if $MWRAP ; then + MWRAP_ARG=" mwasmarm" +fi + +for script_file in "${SCRIPT_FILES[@]}" ; do + script_dir=${script_file%/*} + script_fname=${script_file##*/} + script_noext=${script_fname%.*} + + # Target output files + script_obj="$OUTDIR/$script_noext.o" + script_bin="$OUTDIR/$script_noext.bin" + + # Convert + clean-up + $AS$MWRAP_ARG ${INCLUDE_ARGS[@]} -gccinc -o $script_obj $script_file + $OBJCOPY -O binary --file-alignment 4 $script_obj $script_bin + rm $script_obj +done diff --git a/tools/scripts/meson.build b/tools/scripts/meson.build index 82f1068a05..f9a7df73a1 100644 --- a/tools/scripts/meson.build +++ b/tools/scripts/meson.build @@ -2,3 +2,4 @@ make_pl_poke_icon_py = find_program('make_pl_poke_icon.py', native: true) make_pl_pokegra_py = find_program('make_pl_pokegra.py', native: true) make_pl_otherpoke_py = find_program('make_pl_otherpoke.py', native: true) make_height_py = find_program('make_height.py', native: true) +make_script_bin_sh = find_program('make_script_bin.sh', native: true) From c549254e6462d7b815748c57ab8d0ccd4e5363bb Mon Sep 17 00:00:00 2001 From: Rachel Date: Wed, 24 Jan 2024 10:37:45 -0800 Subject: [PATCH 7/7] Update command name references in battle_script.c --- src/overlay016/battle_script.c | 692 ++++++++++++++++----------------- 1 file changed, 346 insertions(+), 346 deletions(-) diff --git a/src/overlay016/battle_script.c b/src/overlay016/battle_script.c index 23d947eb68..3a8b208e15 100644 --- a/src/overlay016/battle_script.c +++ b/src/overlay016/battle_script.c @@ -100,93 +100,93 @@ typedef struct BattleMessageParams { int params[6]; //< Params for the rendered message } BattleMessageParams; -static BOOL BtlCmd_SetupBattleUI(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_SetEncounter(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_ShowEncounter(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_ShowPokemon(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_ReturnPokemon(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_PlayEncounterAnimation(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_SetPokemonEncounter(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_PokemonSlideIn(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_PokemonSendOut(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_RecallPokemon(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_DeletePokemon(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_SetTrainerEncounter(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_ThrowTrainerBall(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_SlideTrainerOut(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_SlideTrainerIn(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_Unused0A(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_SlideHPGaugeIn(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_SlideHPGaugeInWait(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_SlideHPGaugeOut(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_ThrowPokeball(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_TrainerSlideOut(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_TrainerSlideIn(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_BackgroundSlideIn(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_HealthbarSlideIn(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_HealthbarSlideInDelay(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_HealthbarSlideOut(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_Wait(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_CalcDamage(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_CalcMaxDamage(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_PrintAttackMessage(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_PrintMessage(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_PrintGlobalMessage(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_PrintPreparedMessage(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_PrepareMessage(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_PrintSideLocalMessage(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_PrintBufferedMessage(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_BufferMessage(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_BufferLocalMessage(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_PlayMoveAnimation(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_PlayMoveAnimationA2D(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_FlickerBattler(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_UpdateHPValue(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_UpdateHPGauge(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_FaintBattler(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_PlayFaintingSequence(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_WaitFrames(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_PlayMoveAnimationOnMons(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_FlickerMon(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_UpdateHealthBarValue(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_UpdateHealthBar(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_TryFaintMon(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_PlayFaintAnimation(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_WaitButtonABTime(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_PlaySound(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_If(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_IfMonData(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_FadeOut(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_JumpToSub(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_JumpToBattleEffect(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_JumpToMove(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_CheckCritical(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_CompareVarToValue(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_CompareMonDataToValue(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_FadeOutBattle(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_GoToSubscript(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_GoToEffectScript(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_GoToMoveScript(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_CalcCrit(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_CalcExpGain(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_StartGetExpTask(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_WaitGetExpTask(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_Dummy2A(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_ShowPartyList(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_WaitPartyList(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_Switch(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_JumpIfAnySwitches(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_ShowParty(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_WaitMonSelection(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_SwitchAndUpdateMon(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_GoToIfAnySwitches(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_StartCatchMonTask(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_WaitCatchMonTask(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_SetupMultiHit(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_SetVarValue(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_SetMultiHit(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_UpdateVar(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_ChangeStatStage(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_SetMonDataValue(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_UpdateMonData(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_ClearVolatileStatus(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_ToggleVanish(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_CheckAbility(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_Random(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_SetVarFromVar(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_SetMonDataFromVar(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_Jump(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_CallSub(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_CallSubFromVar(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_UpdateVarFromVar(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_UpdateMonDataFromVar(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_GoTo(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_Call(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_CallFromVar(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_SetMirrorMove(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_ResetStatChanges(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_ResetAllStatChanges(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_LockMoveChoice(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_UnlockMoveChoice(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_SetStatusIcon(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_TrainerMessage(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_SetHealthbarStatus(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_PrintTrainerMessage(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_PayPrizeMoney(BattleSystem * param0, BattleContext * param1); -static BOOL BtlCmd_PlayStatusEffect(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_PlayStatusEffectAToD(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_PlayStatusEffectFromVar(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_PlayBattleAnimation(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_PlayBattleAnimationOnMons(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_PlayBattleAnimationFromVar(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_PrintRecallMessage(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_PrintSendOutMessage(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_PrintBattleStartMessage(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_PrintLeadMonMessage(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_PreparedTrainerMessage(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_PrintEncounterMessage(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_PrintFirstSendOutMessage(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_PrintBufferedTrainerMessage(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_TryConversion(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_IfVar(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_IfMonDataVar(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_GivePayDayMoney(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_CompareVarToVar(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_CompareMonDataToVar(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_AddPayDayMoney(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_TryLightScreen(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_TryReflect(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_TryMist(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_TryOHKOMove(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_Divide(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_DivideByVar(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_DivideVarByValue(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_DivideVarByVar(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_TryMimic(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_Metronome(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_TryDisable(BattleSystem *battleSys, BattleContext *battleCtx); @@ -199,39 +199,39 @@ static BOOL BtlCmd_TrySleepTalk(BattleSystem *battleSys, BattleContext *battleCt static BOOL BtlCmd_CalcFlailPower(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_TrySpite(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_TryPartyStatusRefresh(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_CanStealItem(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_TryProtectEndure(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_TryStealItem(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_TryProtection(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_TrySubstitute(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_CanWhirlwind(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_TryWhirlwind(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_Transform(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_TrySpikes(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_CheckSpikes(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_TryPerishSong(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_GetBattlerBySpeedOrder(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_IfVarIsValidBattler(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_GetMonBySpeedOrder(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_GoToIfValidMon(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_EndOfTurnWeatherEffect(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_CalcRolloutPower(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_CalcFuryCutterPower(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_TryAttract(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_TrySafeguard(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_TryPresent(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_Present(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_CalcMagnitudePower(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_TryReplaceBattler(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_TryReplaceFaintedMon(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_RapidSpin(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_WeatherHPRecovery(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_CalcHiddenPowerParams(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_CopyStatStages(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_TrySetupFutureSight(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_TryFutureSight(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_CheckMoveHit(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_TryTeleport(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_BeatUp(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_FollowMe(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_TryHelpingHand(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_CanSwapItems(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_TrySetupWish(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_TrySwapItems(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_TryWish(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_TryAssist(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_TrySetupMagicCoat(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_MagicCoatReflect(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_TrySetMagicCoat(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_MagicCoat(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_CalcRevengePowerMul(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_TryBreakScreens(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_TryYawn(BattleSystem *battleSys, BattleContext *battleCtx); @@ -239,11 +239,11 @@ static BOOL BtlCmd_TryKnockOff(BattleSystem *battleSys, BattleContext *battleCtx static BOOL BtlCmd_CalcHPFalloffPower(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_TryImprison(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_TryGrudge(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_TrySetupSnatch(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_TrySnatch(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_CalcWeightBasedPower(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_CalcWeatherBallPower(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_CheckForPursuit(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_ApplyTypeMatchup(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_CalcWeatherBallParams(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_TryPursuit(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_ApplyTypeEffectiveness(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_IfTurnFlag(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_SetTurnFlag(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_CalcGyroBallPower(BattleSystem *battleSys, BattleContext *battleCtx); @@ -256,7 +256,7 @@ static BOOL BtlCmd_TryCopycat(BattleSystem *battleSys, BattleContext *battleCtx) static BOOL BtlCmd_CalcPunishmentPower(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_TrySuckerPunch(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_CheckSideCondition(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_CheckDefenderProtecting(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_TryFeint(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_CheckCanShareStatus(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_TryLastResort(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_TryToxicSpikes(BattleSystem *battleSys, BattleContext *battleCtx); @@ -264,29 +264,29 @@ static BOOL BtlCmd_CheckToxicSpikes(BattleSystem *battleSys, BattleContext *batt static BOOL BtlCmd_CheckIgnorableAbility(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_IfSameSide(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_GenerateEndOfBattleItem(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_SetTrickRoom(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_TrickRoom(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_IfMovedThisTurn(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_IfItemEffect(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_GetItemEffect(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_GetItemEffectPower(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_CheckItemHoldEffect(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_GetItemHoldEffect(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_GetItemEffectParam(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_TryCamouflage(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_GetTerrainMove(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_GetTerrainSecondaryEffect(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_CalcNaturalGiftParams(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_TryPluckBerry(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_TryFlingItem(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_ShowYesNoScreen(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_TryPluck(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_TryFling(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_YesNoMenu(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_WaitYesNoResult(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_ShowPartyScreen(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_WaitPartyScreenResult(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_SubmitResult(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_ChoosePokemonMenu(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_WaitPokemonMenuResult(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_SetLinkBattleResult(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_CheckStealthRock(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_CheckActivateSecondaryEffect(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_CheckActivateChatterEffect(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_CheckEffectActivation(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_CheckChatterActivation(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_GetCurrentMoveData(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_SetMosaic(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_ChangeWeatherForm(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_UpdateBG(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_ChangeForm(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_SetBattleBackground(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_UseBagItem(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_TryEscape(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_ShowBattleStartPartyGauge(BattleSystem *battleSys, BattleContext *battleCtx); @@ -295,33 +295,33 @@ static BOOL BtlCmd_ShowPartyGauge(BattleSystem *battleSys, BattleContext *battle static BOOL BtlCmd_HidePartyGauge(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_LoadPartyGaugeGraphics(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_FreePartyGaugeGraphics(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_IncrementRecord(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_IncrementGameStat(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_RestoreSprite(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_TriggerAbilityOnHit(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_SpriteToOAM(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_OAMToSprite(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_CheckWhiteOut(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_CheckBlackOut(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_BoostRandomStatBy2(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_RemoveItem(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_TryRecycle(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_TriggerHeldItemOnHit(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_ResultMesage(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_EscapeMesage(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_ForfeitMesage(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_CheckLeaveWith1HP(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_PrintBattleResultMessage(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_PrintEscapeMessage(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_PrintForfeitMessage(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_CheckHoldOnWith1HP(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_TryRestoreStatusOnSwitch(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_CheckSubstitute(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_CheckWeatherNegated(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_CheckIgnoreWeather(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_SetRandomTarget(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_TriggerHeldItemOnPivotMove(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_RefreshSprite(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_PlayMoveHitSoundEffect(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_PlayMusic(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_CheckSafariContinues(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_WaitFramesNoSkip(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_CheckMoveIsType(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_LoadPersonalFormData(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_ReloadPokemon(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_PlayMoveHitSound(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_PlayBGM(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_CheckSafariGameDone(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_WaitTime(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_CheckCurMoveIsType(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_LoadArchivedMonData(BattleSystem *battleSys, BattleContext *battleCtx); +static BOOL BtlCmd_RefreshMonData(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_End(BattleSystem *battleSys, BattleContext *battleCtx); static int BattleScript_Read(BattleContext *battleCtx); @@ -360,93 +360,93 @@ static void BattleScript_GetExpTask(SysTask *task, void *data); static void BattleScript_CatchMonTask(SysTask *task, void *data); static const BtlCmd sBattleCommands[] = { - BtlCmd_SetupBattleUI, - BtlCmd_SetEncounter, - BtlCmd_ShowEncounter, - BtlCmd_ShowPokemon, - BtlCmd_ReturnPokemon, + BtlCmd_PlayEncounterAnimation, + BtlCmd_SetPokemonEncounter, + BtlCmd_PokemonSlideIn, + BtlCmd_PokemonSendOut, + BtlCmd_RecallPokemon, BtlCmd_DeletePokemon, BtlCmd_SetTrainerEncounter, - BtlCmd_ThrowTrainerBall, - BtlCmd_SlideTrainerOut, - BtlCmd_SlideTrainerIn, - BtlCmd_Unused0A, - BtlCmd_SlideHPGaugeIn, - BtlCmd_SlideHPGaugeInWait, - BtlCmd_SlideHPGaugeOut, + BtlCmd_ThrowPokeball, + BtlCmd_TrainerSlideOut, + BtlCmd_TrainerSlideIn, + BtlCmd_BackgroundSlideIn, + BtlCmd_HealthbarSlideIn, + BtlCmd_HealthbarSlideInDelay, + BtlCmd_HealthbarSlideOut, BtlCmd_Wait, BtlCmd_CalcDamage, BtlCmd_CalcMaxDamage, BtlCmd_PrintAttackMessage, BtlCmd_PrintMessage, BtlCmd_PrintGlobalMessage, - BtlCmd_PrintPreparedMessage, - BtlCmd_PrepareMessage, - BtlCmd_PrintSideLocalMessage, + BtlCmd_PrintBufferedMessage, + BtlCmd_BufferMessage, + BtlCmd_BufferLocalMessage, BtlCmd_PlayMoveAnimation, - BtlCmd_PlayMoveAnimationA2D, - BtlCmd_FlickerBattler, - BtlCmd_UpdateHPValue, - BtlCmd_UpdateHPGauge, - BtlCmd_FaintBattler, - BtlCmd_PlayFaintingSequence, - BtlCmd_WaitFrames, + BtlCmd_PlayMoveAnimationOnMons, + BtlCmd_FlickerMon, + BtlCmd_UpdateHealthBarValue, + BtlCmd_UpdateHealthBar, + BtlCmd_TryFaintMon, + BtlCmd_PlayFaintAnimation, + BtlCmd_WaitButtonABTime, BtlCmd_PlaySound, - BtlCmd_If, - BtlCmd_IfMonData, - BtlCmd_FadeOut, - BtlCmd_JumpToSub, - BtlCmd_JumpToBattleEffect, - BtlCmd_JumpToMove, - BtlCmd_CheckCritical, + BtlCmd_CompareVarToValue, + BtlCmd_CompareMonDataToValue, + BtlCmd_FadeOutBattle, + BtlCmd_GoToSubscript, + BtlCmd_GoToEffectScript, + BtlCmd_GoToMoveScript, + BtlCmd_CalcCrit, BtlCmd_CalcExpGain, BtlCmd_StartGetExpTask, BtlCmd_WaitGetExpTask, BtlCmd_Dummy2A, - BtlCmd_ShowPartyList, - BtlCmd_WaitPartyList, - BtlCmd_Switch, - BtlCmd_JumpIfAnySwitches, + BtlCmd_ShowParty, + BtlCmd_WaitMonSelection, + BtlCmd_SwitchAndUpdateMon, + BtlCmd_GoToIfAnySwitches, BtlCmd_StartCatchMonTask, BtlCmd_WaitCatchMonTask, - BtlCmd_SetupMultiHit, - BtlCmd_SetVarValue, + BtlCmd_SetMultiHit, + BtlCmd_UpdateVar, BtlCmd_ChangeStatStage, - BtlCmd_SetMonDataValue, + BtlCmd_UpdateMonData, BtlCmd_ClearVolatileStatus, BtlCmd_ToggleVanish, BtlCmd_CheckAbility, BtlCmd_Random, - BtlCmd_SetVarFromVar, - BtlCmd_SetMonDataFromVar, - BtlCmd_Jump, - BtlCmd_CallSub, - BtlCmd_CallSubFromVar, + BtlCmd_UpdateVarFromVar, + BtlCmd_UpdateMonDataFromVar, + BtlCmd_GoTo, + BtlCmd_Call, + BtlCmd_CallFromVar, BtlCmd_SetMirrorMove, - BtlCmd_ResetStatChanges, + BtlCmd_ResetAllStatChanges, BtlCmd_LockMoveChoice, BtlCmd_UnlockMoveChoice, - BtlCmd_SetStatusIcon, - BtlCmd_TrainerMessage, + BtlCmd_SetHealthbarStatus, + BtlCmd_PrintTrainerMessage, BtlCmd_PayPrizeMoney, - BtlCmd_PlayStatusEffect, - BtlCmd_PlayStatusEffectAToD, - BtlCmd_PlayStatusEffectFromVar, + BtlCmd_PlayBattleAnimation, + BtlCmd_PlayBattleAnimationOnMons, + BtlCmd_PlayBattleAnimationFromVar, BtlCmd_PrintRecallMessage, BtlCmd_PrintSendOutMessage, - BtlCmd_PrintBattleStartMessage, - BtlCmd_PrintLeadMonMessage, - BtlCmd_PreparedTrainerMessage, + BtlCmd_PrintEncounterMessage, + BtlCmd_PrintFirstSendOutMessage, + BtlCmd_PrintBufferedTrainerMessage, BtlCmd_TryConversion, - BtlCmd_IfVar, - BtlCmd_IfMonDataVar, - BtlCmd_GivePayDayMoney, + BtlCmd_CompareVarToVar, + BtlCmd_CompareMonDataToVar, + BtlCmd_AddPayDayMoney, BtlCmd_TryLightScreen, BtlCmd_TryReflect, BtlCmd_TryMist, BtlCmd_TryOHKOMove, - BtlCmd_Divide, - BtlCmd_DivideByVar, + BtlCmd_DivideVarByValue, + BtlCmd_DivideVarByVar, BtlCmd_TryMimic, BtlCmd_Metronome, BtlCmd_TryDisable, @@ -459,39 +459,39 @@ static const BtlCmd sBattleCommands[] = { BtlCmd_CalcFlailPower, BtlCmd_TrySpite, BtlCmd_TryPartyStatusRefresh, - BtlCmd_CanStealItem, - BtlCmd_TryProtectEndure, + BtlCmd_TryStealItem, + BtlCmd_TryProtection, BtlCmd_TrySubstitute, - BtlCmd_CanWhirlwind, + BtlCmd_TryWhirlwind, BtlCmd_Transform, BtlCmd_TrySpikes, BtlCmd_CheckSpikes, BtlCmd_TryPerishSong, - BtlCmd_GetBattlerBySpeedOrder, - BtlCmd_IfVarIsValidBattler, + BtlCmd_GetMonBySpeedOrder, + BtlCmd_GoToIfValidMon, BtlCmd_EndOfTurnWeatherEffect, BtlCmd_CalcRolloutPower, BtlCmd_CalcFuryCutterPower, BtlCmd_TryAttract, BtlCmd_TrySafeguard, - BtlCmd_TryPresent, + BtlCmd_Present, BtlCmd_CalcMagnitudePower, - BtlCmd_TryReplaceBattler, + BtlCmd_TryReplaceFaintedMon, BtlCmd_RapidSpin, BtlCmd_WeatherHPRecovery, BtlCmd_CalcHiddenPowerParams, BtlCmd_CopyStatStages, - BtlCmd_TrySetupFutureSight, + BtlCmd_TryFutureSight, BtlCmd_CheckMoveHit, BtlCmd_TryTeleport, BtlCmd_BeatUp, BtlCmd_FollowMe, BtlCmd_TryHelpingHand, - BtlCmd_CanSwapItems, - BtlCmd_TrySetupWish, + BtlCmd_TrySwapItems, + BtlCmd_TryWish, BtlCmd_TryAssist, - BtlCmd_TrySetupMagicCoat, - BtlCmd_MagicCoatReflect, + BtlCmd_TrySetMagicCoat, + BtlCmd_MagicCoat, BtlCmd_CalcRevengePowerMul, BtlCmd_TryBreakScreens, BtlCmd_TryYawn, @@ -499,11 +499,11 @@ static const BtlCmd sBattleCommands[] = { BtlCmd_CalcHPFalloffPower, BtlCmd_TryImprison, BtlCmd_TryGrudge, - BtlCmd_TrySetupSnatch, + BtlCmd_TrySnatch, BtlCmd_CalcWeightBasedPower, - BtlCmd_CalcWeatherBallPower, - BtlCmd_CheckForPursuit, - BtlCmd_ApplyTypeMatchup, + BtlCmd_CalcWeatherBallParams, + BtlCmd_TryPursuit, + BtlCmd_ApplyTypeEffectiveness, BtlCmd_IfTurnFlag, BtlCmd_SetTurnFlag, BtlCmd_CalcGyroBallPower, @@ -516,7 +516,7 @@ static const BtlCmd sBattleCommands[] = { BtlCmd_CalcPunishmentPower, BtlCmd_TrySuckerPunch, BtlCmd_CheckSideCondition, - BtlCmd_CheckDefenderProtecting, + BtlCmd_TryFeint, BtlCmd_CheckCanShareStatus, BtlCmd_TryLastResort, BtlCmd_TryToxicSpikes, @@ -524,29 +524,29 @@ static const BtlCmd sBattleCommands[] = { BtlCmd_CheckIgnorableAbility, BtlCmd_IfSameSide, BtlCmd_GenerateEndOfBattleItem, - BtlCmd_SetTrickRoom, + BtlCmd_TrickRoom, BtlCmd_IfMovedThisTurn, - BtlCmd_IfItemEffect, - BtlCmd_GetItemEffect, - BtlCmd_GetItemEffectPower, + BtlCmd_CheckItemHoldEffect, + BtlCmd_GetItemHoldEffect, + BtlCmd_GetItemEffectParam, BtlCmd_TryCamouflage, BtlCmd_GetTerrainMove, BtlCmd_GetTerrainSecondaryEffect, BtlCmd_CalcNaturalGiftParams, - BtlCmd_TryPluckBerry, - BtlCmd_TryFlingItem, - BtlCmd_ShowYesNoScreen, + BtlCmd_TryPluck, + BtlCmd_TryFling, + BtlCmd_YesNoMenu, BtlCmd_WaitYesNoResult, - BtlCmd_ShowPartyScreen, - BtlCmd_WaitPartyScreenResult, - BtlCmd_SubmitResult, + BtlCmd_ChoosePokemonMenu, + BtlCmd_WaitPokemonMenuResult, + BtlCmd_SetLinkBattleResult, BtlCmd_CheckStealthRock, - BtlCmd_CheckActivateSecondaryEffect, - BtlCmd_CheckActivateChatterEffect, + BtlCmd_CheckEffectActivation, + BtlCmd_CheckChatterActivation, BtlCmd_GetCurrentMoveData, BtlCmd_SetMosaic, - BtlCmd_ChangeWeatherForm, - BtlCmd_UpdateBG, + BtlCmd_ChangeForm, + BtlCmd_SetBattleBackground, BtlCmd_UseBagItem, BtlCmd_TryEscape, BtlCmd_ShowBattleStartPartyGauge, @@ -555,33 +555,33 @@ static const BtlCmd sBattleCommands[] = { BtlCmd_HidePartyGauge, BtlCmd_LoadPartyGaugeGraphics, BtlCmd_FreePartyGaugeGraphics, - BtlCmd_IncrementRecord, + BtlCmd_IncrementGameStat, BtlCmd_RestoreSprite, BtlCmd_TriggerAbilityOnHit, BtlCmd_SpriteToOAM, BtlCmd_OAMToSprite, - BtlCmd_CheckWhiteOut, + BtlCmd_CheckBlackOut, BtlCmd_BoostRandomStatBy2, BtlCmd_RemoveItem, BtlCmd_TryRecycle, BtlCmd_TriggerHeldItemOnHit, - BtlCmd_ResultMesage, - BtlCmd_EscapeMesage, - BtlCmd_ForfeitMesage, - BtlCmd_CheckLeaveWith1HP, + BtlCmd_PrintBattleResultMessage, + BtlCmd_PrintEscapeMessage, + BtlCmd_PrintForfeitMessage, + BtlCmd_CheckHoldOnWith1HP, BtlCmd_TryRestoreStatusOnSwitch, BtlCmd_CheckSubstitute, - BtlCmd_CheckWeatherNegated, + BtlCmd_CheckIgnoreWeather, BtlCmd_SetRandomTarget, BtlCmd_TriggerHeldItemOnPivotMove, BtlCmd_RefreshSprite, - BtlCmd_PlayMoveHitSoundEffect, - BtlCmd_PlayMusic, - BtlCmd_CheckSafariContinues, - BtlCmd_WaitFramesNoSkip, - BtlCmd_CheckMoveIsType, - BtlCmd_LoadPersonalFormData, - BtlCmd_ReloadPokemon, + BtlCmd_PlayMoveHitSound, + BtlCmd_PlayBGM, + BtlCmd_CheckSafariGameDone, + BtlCmd_WaitTime, + BtlCmd_CheckCurMoveIsType, + BtlCmd_LoadArchivedMonData, + BtlCmd_RefreshMonData, BtlCmd_End }; @@ -605,7 +605,7 @@ BOOL BattleScript_Exec(BattleSystem *battleSys, BattleContext *battleCtx) * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_SetupBattleUI(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_PlayEncounterAnimation(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); BattleIO_SetupBattleUI(battleSys, BATTLER_US); @@ -625,7 +625,7 @@ static BOOL BtlCmd_SetupBattleUI(BattleSystem *battleSys, BattleContext *battleC * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_SetEncounter(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_SetPokemonEncounter(BattleSystem *battleSys, BattleContext *battleCtx) { int i; int maxBattlers = BattleSystem_MaxBattlers(battleSys); @@ -672,7 +672,7 @@ static BOOL BtlCmd_SetEncounter(BattleSystem *battleSys, BattleContext *battleCt * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_ShowEncounter(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_PokemonSlideIn(BattleSystem *battleSys, BattleContext *battleCtx) { int i; int maxBattlers = BattleSystem_MaxBattlers(battleSys); @@ -778,7 +778,7 @@ static BOOL BtlCmd_ShowEncounter(BattleSystem *battleSys, BattleContext *battleC * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_ShowPokemon(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_PokemonSendOut(BattleSystem *battleSys, BattleContext *battleCtx) { int i; int maxBattlers = BattleSystem_MaxBattlers(battleSys); @@ -882,7 +882,7 @@ static BOOL BtlCmd_ShowPokemon(BattleSystem *battleSys, BattleContext *battleCtx * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_ReturnPokemon(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_RecallPokemon(BattleSystem *battleSys, BattleContext *battleCtx) { int i; int maxBattlers = BattleSystem_MaxBattlers(battleSys); @@ -1042,7 +1042,7 @@ static BOOL BtlCmd_SetTrainerEncounter(BattleSystem *battleSys, BattleContext *b * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_ThrowTrainerBall(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_ThrowPokeball(BattleSystem *battleSys, BattleContext *battleCtx) { int i; int maxBattlers = BattleSystem_MaxBattlers(battleSys); @@ -1113,7 +1113,7 @@ static BOOL BtlCmd_ThrowTrainerBall(BattleSystem *battleSys, BattleContext *batt * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_SlideTrainerOut(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_TrainerSlideOut(BattleSystem *battleSys, BattleContext *battleCtx) { int i; int maxBattlers = BattleSystem_MaxBattlers(battleSys); @@ -1230,7 +1230,7 @@ static BOOL BtlCmd_SlideTrainerOut(BattleSystem *battleSys, BattleContext *battl * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_SlideTrainerIn(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_TrainerSlideIn(BattleSystem *battleSys, BattleContext *battleCtx) { int i; int maxBattlers = BattleSystem_MaxBattlers(battleSys); @@ -1332,7 +1332,7 @@ static BOOL BtlCmd_SlideTrainerIn(BattleSystem *battleSys, BattleContext *battle return FALSE; } -static BOOL BtlCmd_Unused0A(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_BackgroundSlideIn(BattleSystem *battleSys, BattleContext *battleCtx) { int i; int maxBattlers = BattleSystem_MaxBattlers(battleSys); @@ -1356,7 +1356,7 @@ static BOOL BtlCmd_Unused0A(BattleSystem *battleSys, BattleContext *battleCtx) * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_SlideHPGaugeIn(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_HealthbarSlideIn(BattleSystem *battleSys, BattleContext *battleCtx) { int i; int maxBattlers = BattleSystem_MaxBattlers(battleSys); @@ -1413,7 +1413,7 @@ static BOOL BtlCmd_SlideHPGaugeIn(BattleSystem *battleSys, BattleContext *battle * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_SlideHPGaugeInWait(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_HealthbarSlideInDelay(BattleSystem *battleSys, BattleContext *battleCtx) { int i; int maxBattlers = BattleSystem_MaxBattlers(battleSys); @@ -1472,7 +1472,7 @@ static BOOL BtlCmd_SlideHPGaugeInWait(BattleSystem *battleSys, BattleContext *ba * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_SlideHPGaugeOut(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_HealthbarSlideOut(BattleSystem *battleSys, BattleContext *battleCtx) { int i; int maxBattlers = BattleSystem_MaxBattlers(battleSys); @@ -1523,7 +1523,7 @@ static BOOL BtlCmd_SlideHPGaugeOut(BattleSystem *battleSys, BattleContext *battl * @brief Wait until the battle IO queue is empty. * * This command ensures that all linked battlers are in sync with the present - * state of the battle after a given action. If any linked battler hangs in + * state of the battle after a given action. CompareVarToValue any linked battler hangs in * this state for 1800 frames (~30 seconds), then the link status will be set * to an error state, forcing the battle to end. * @@ -1741,7 +1741,7 @@ static BOOL BtlCmd_PrintGlobalMessage(BattleSystem *battleSys, BattleContext *ba * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_PrintPreparedMessage(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_PrintBufferedMessage(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); BattleIO_PrintMessage(battleSys, battleCtx, &battleCtx->msgBuffer); @@ -1759,13 +1759,13 @@ static BOOL BtlCmd_PrintPreparedMessage(BattleSystem *battleSys, BattleContext * * * Side effects: * - The contents of the prepared message are stored in battleCtx->msgBuffer. - * This message can later be printed by invoking PrintPreparedMessage. + * This message can later be printed by invoking PrintBufferedMessage. * * @param battleSys * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_PrepareMessage(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_BufferMessage(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); @@ -1789,7 +1789,7 @@ static BOOL BtlCmd_PrepareMessage(BattleSystem *battleSys, BattleContext *battle * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_PrintSideLocalMessage(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_BufferLocalMessage(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int inBattler = BattleScript_Read(battleCtx); @@ -1811,7 +1811,7 @@ static BOOL BtlCmd_PrintSideLocalMessage(BattleSystem *battleSys, BattleContext * @brief Play a move animation, if move animations are enabled. * * Inputs: - * 1. The location from which the animation is sourced. If the input here is + * 1. The location from which the animation is sourced. CompareVarToValue the input here is * BTLSCR_MSG_TEMP, then the move to load is picked from battleCtx->msgMoveTemp. * Otherwise, it is picked from battleCtx->moveCur. * @@ -1849,7 +1849,7 @@ static BOOL BtlCmd_PlayMoveAnimation(BattleSystem *battleSys, BattleContext *bat * if move animations are enabled. * * Inputs: - * 1. The location from which the animation is sourced. If the input here is + * 1. The location from which the animation is sourced. CompareVarToValue the input here is * BTLSCR_MSG_TEMP, then the move to load is picked from battleCtx->msgMoveTemp. * Otherwise, it is picked from battleCtx->moveCur. * 2. The attacker for the move animation. @@ -1859,7 +1859,7 @@ static BOOL BtlCmd_PlayMoveAnimation(BattleSystem *battleSys, BattleContext *bat * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_PlayMoveAnimationA2D(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_PlayMoveAnimationOnMons(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int inMoveSource = BattleScript_Read(battleCtx); @@ -1896,7 +1896,7 @@ static BOOL BtlCmd_PlayMoveAnimationA2D(BattleSystem *battleSys, BattleContext * * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_FlickerBattler(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_FlickerMon(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); @@ -1930,7 +1930,7 @@ static BOOL BtlCmd_FlickerBattler(BattleSystem *battleSys, BattleContext *battle * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_UpdateHPValue(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_UpdateHealthBarValue(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int inBattler = BattleScript_Read(battleCtx); @@ -1971,7 +1971,7 @@ static BOOL BtlCmd_UpdateHPValue(BattleSystem *battleSys, BattleContext *battleC * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_UpdateHPGauge(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_UpdateHealthBar(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int inBattler = BattleScript_Read(battleCtx); @@ -1999,7 +1999,7 @@ static BOOL BtlCmd_UpdateHPGauge(BattleSystem *battleSys, BattleContext *battleC * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_FaintBattler(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_TryFaintMon(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int inBattler = BattleScript_Read(battleCtx); @@ -2030,7 +2030,7 @@ static BOOL BtlCmd_FaintBattler(BattleSystem *battleSys, BattleContext *battleCt * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_PlayFaintingSequence(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_PlayFaintAnimation(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); @@ -2059,7 +2059,7 @@ static BOOL BtlCmd_PlayFaintingSequence(BattleSystem *battleSys, BattleContext * * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_WaitFrames(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_WaitButtonABTime(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int frames = BattleScript_Read(battleCtx); @@ -2127,7 +2127,7 @@ static BOOL BtlCmd_PlaySound(BattleSystem *battleSys, BattleContext *battleCtx) * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_If(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_CompareVarToValue(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int op = BattleScript_Read(battleCtx); @@ -2206,7 +2206,7 @@ static BOOL BtlCmd_If(BattleSystem *battleSys, BattleContext *battleCtx) * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_IfMonData(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_CompareMonDataToValue(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int op = BattleScript_Read(battleCtx); @@ -2281,7 +2281,7 @@ static BOOL BtlCmd_IfMonData(BattleSystem *battleSys, BattleContext *battleCtx) * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_FadeOut(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_FadeOutBattle(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); BattleIO_FadeOut(battleSys, battleCtx); @@ -2290,7 +2290,7 @@ static BOOL BtlCmd_FadeOut(BattleSystem *battleSys, BattleContext *battleCtx) } /** - * @brief Jump to a subroutine sequence, abandoning the current script. + * @brief GoTo to a subroutine sequence, abandoning the current script. * * Inputs: * 1. The subroutine sequence to jump to. @@ -2299,7 +2299,7 @@ static BOOL BtlCmd_FadeOut(BattleSystem *battleSys, BattleContext *battleCtx) * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_JumpToSub(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_GoToSubscript(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int subseq = BattleScript_Read(battleCtx); @@ -2310,13 +2310,13 @@ static BOOL BtlCmd_JumpToSub(BattleSystem *battleSys, BattleContext *battleCtx) } /** - * @brief Jump to the battle effect sequence for the current move. + * @brief GoTo to the battle effect sequence for the current move. * * @param battleSys * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_JumpToBattleEffect(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_GoToEffectScript(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); @@ -2326,7 +2326,7 @@ static BOOL BtlCmd_JumpToBattleEffect(BattleSystem *battleSys, BattleContext *ba } /** - * @brief Jump to the move sequence for the chosen move. + * @brief GoTo to the move sequence for the chosen move. * * This is specifically for moves which call other moves (e.g., Assist, Me * First, Metronome, Sleep Talk) by setting battleCtx->msgMoveTemp. @@ -2347,7 +2347,7 @@ static BOOL BtlCmd_JumpToBattleEffect(BattleSystem *battleSys, BattleContext *ba * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_JumpToMove(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_GoToMoveScript(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); BOOL targetIsSet = BattleScript_Read(battleCtx); @@ -2375,7 +2375,7 @@ static BOOL BtlCmd_JumpToMove(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Check if a critical hit should occur. * - * If the battle is either the catching tutorial or the player's first battle, + * CompareVarToValue the battle is either the catching tutorial or the player's first battle, * then this will always flag no critical hits. * * Side effects: @@ -2386,7 +2386,7 @@ static BOOL BtlCmd_JumpToMove(BattleSystem *battleSys, BattleContext *battleCtx) * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_CheckCritical(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_CalcCrit(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); @@ -2614,7 +2614,7 @@ static BOOL BtlCmd_Dummy2A(BattleSystem *battleSys, BattleContext *battleCtx) * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_ShowPartyList(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_ShowParty(BattleSystem *battleSys, BattleContext *battleCtx) { int maxBattlers = BattleSystem_MaxBattlers(battleSys); @@ -2632,7 +2632,7 @@ static BOOL BtlCmd_ShowPartyList(BattleSystem *battleSys, BattleContext *battleC for (battler = 0; battler < maxBattlers; battler++) { if (BattleSystem_BattleType(battleSys) == BATTLE_TYPE_LINK_DOUBLES) { - // If both battlers are done selecting replacements, wait for all other battlers + // CompareVarToValue both battlers are done selecting replacements, wait for all other battlers int partner = BattleSystem_Partner(battleSys, battler); if ((switchingMask & FlagIndex(battler)) == FALSE && (switchingMask & FlagIndex(partner)) == FALSE) { @@ -2665,7 +2665,7 @@ static BOOL BtlCmd_ShowPartyList(BattleSystem *battleSys, BattleContext *battleC * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_WaitPartyList(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_WaitMonSelection(BattleSystem *battleSys, BattleContext *battleCtx) { int maxBattlers = BattleSystem_MaxBattlers(battleSys); int totalSwitching = 0; @@ -2707,7 +2707,7 @@ static BOOL BtlCmd_WaitPartyList(BattleSystem *battleSys, BattleContext *battleC } /** - * @brief Switch a battler for another. + * @brief SwitchAndUpdateMon a battler for another. * * Inputs: * 1. The battler who is switching @@ -2724,7 +2724,7 @@ static BOOL BtlCmd_WaitPartyList(BattleSystem *battleSys, BattleContext *battleC * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_Switch(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_SwitchAndUpdateMon(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int inBattler = BattleScript_Read(battleCtx); @@ -2764,7 +2764,7 @@ static BOOL BtlCmd_Switch(BattleSystem *battleSys, BattleContext *battleCtx) } /** - * @brief Jump to the designated address if any battlers are switching. + * @brief GoTo to the designated address if any battlers are switching. * * Inputs: * 1. The jump distance @@ -2773,7 +2773,7 @@ static BOOL BtlCmd_Switch(BattleSystem *battleSys, BattleContext *battleCtx) * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_JumpIfAnySwitches(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_GoToIfAnySwitches(BattleSystem *battleSys, BattleContext *battleCtx) { int i; // must declare here to match int maxBattlers = BattleSystem_MaxBattlers(battleSys); @@ -2849,8 +2849,8 @@ static BOOL BtlCmd_WaitCatchMonTask(BattleSystem *battleSys, BattleContext *batt * Twineedle, Triple Kick). * * Inputs: - * 1. The number of hits to apply to the move. If this value is passed as 0, - * then a number of hits will be generated from 2 through 5. If the attacker + * 1. The number of hits to apply to the move. CompareVarToValue this value is passed as 0, + * then a number of hits will be generated from 2 through 5. CompareVarToValue the attacker * has Skill Link, then the generated number of hits will always be 5. * 2. The flags to set for the move, which control how to evaluate successive * hits. The relevant flags of note are: @@ -2870,7 +2870,7 @@ static BOOL BtlCmd_WaitCatchMonTask(BattleSystem *battleSys, BattleContext *batt * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_SetupMultiHit(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_SetMultiHit(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int hits = BattleScript_Read(battleCtx); @@ -2911,7 +2911,7 @@ static BOOL BtlCmd_SetupMultiHit(BattleSystem *battleSys, BattleContext *battleC * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_SetVarValue(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_UpdateVar(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int op = BattleScript_Read(battleCtx); @@ -3226,7 +3226,7 @@ static BOOL BtlCmd_ChangeStatStage(BattleSystem *battleSys, BattleContext *battl * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_SetMonDataValue(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_UpdateMonData(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int op = BattleScript_Read(battleCtx); @@ -3367,10 +3367,10 @@ static BOOL BtlCmd_ToggleVanish(BattleSystem *battleSys, BattleContext *battleCt * 1. Op-code which controls the behavior. See enum CheckHaveOp * 2. Input battler (or set of battlers) whose ability should be checked * 3. The ability to check for any battler to have (or not have) - * 4. Jump distance if a battler in the input set meets the criteria + * 4. GoTo distance if a battler in the input set meets the criteria * * Side effects: - * - If any battler matches the criteria, battleCtx->abilityMon will be set + * - CompareVarToValue any battler matches the criteria, battleCtx->abilityMon will be set * to their identifier. * * @param battleSys @@ -3458,7 +3458,7 @@ static BOOL BtlCmd_Random(BattleSystem *battleSys, BattleContext *battleCtx) * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_SetVarFromVar(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_UpdateVarFromVar(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int op = BattleScript_Read(battleCtx); @@ -3554,7 +3554,7 @@ static BOOL BtlCmd_SetVarFromVar(BattleSystem *battleSys, BattleContext *battleC * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_SetMonDataFromVar(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_UpdateMonDataFromVar(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int op = BattleScript_Read(battleCtx); @@ -3647,7 +3647,7 @@ static BOOL BtlCmd_SetMonDataFromVar(BattleSystem *battleSys, BattleContext *bat } /** - * @brief Jump ahead a certain distance. + * @brief GoTo ahead a certain distance. * * Inputs: * 1. The distance to jump forward in words. @@ -3656,7 +3656,7 @@ static BOOL BtlCmd_SetMonDataFromVar(BattleSystem *battleSys, BattleContext *bat * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_Jump(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_GoTo(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int jump = BattleScript_Read(battleCtx); @@ -3677,7 +3677,7 @@ static BOOL BtlCmd_Jump(BattleSystem *battleSys, BattleContext *battleCtx) * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_CallSub(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_Call(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int subseq = BattleScript_Read(battleCtx); @@ -3698,7 +3698,7 @@ static BOOL BtlCmd_CallSub(BattleSystem *battleSys, BattleContext *battleCtx) * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_CallSubFromVar(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_CallFromVar(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int var = BattleScript_Read(battleCtx); @@ -3767,7 +3767,7 @@ static BOOL BtlCmd_SetMirrorMove(BattleSystem *battleSys, BattleContext *battleC * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_ResetStatChanges(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_ResetAllStatChanges(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); @@ -3842,7 +3842,7 @@ static BOOL BtlCmd_UnlockMoveChoice(BattleSystem *battleSys, BattleContext *batt * @param battleCtx * @return BOOL */ -static BOOL BtlCmd_SetStatusIcon(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_SetHealthbarStatus(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int inBattler = BattleScript_Read(battleCtx); @@ -3865,7 +3865,7 @@ static BOOL BtlCmd_SetStatusIcon(BattleSystem *battleSys, BattleContext *battleC * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_TrainerMessage(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_PrintTrainerMessage(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int inBattler = BattleScript_Read(battleCtx); @@ -3981,7 +3981,7 @@ static BOOL BtlCmd_PayPrizeMoney(BattleSystem *battleSys, BattleContext *battleC * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_PlayStatusEffect(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_PlayBattleAnimation(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int inBattler = BattleScript_Read(battleCtx); @@ -4016,7 +4016,7 @@ static BOOL BtlCmd_PlayStatusEffect(BattleSystem *battleSys, BattleContext *batt * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_PlayStatusEffectAToD(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_PlayBattleAnimationOnMons(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int inAttacker = BattleScript_Read(battleCtx); @@ -4051,7 +4051,7 @@ static BOOL BtlCmd_PlayStatusEffectAToD(BattleSystem *battleSys, BattleContext * * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_PlayStatusEffectFromVar(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_PlayBattleAnimationFromVar(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int inBattler = BattleScript_Read(battleCtx); @@ -4125,7 +4125,7 @@ static BOOL BtlCmd_PrintSendOutMessage(BattleSystem *battleSys, BattleContext *b * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_PrintBattleStartMessage(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_PrintEncounterMessage(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int inBattler = BattleScript_Read(battleCtx); @@ -4146,7 +4146,7 @@ static BOOL BtlCmd_PrintBattleStartMessage(BattleSystem *battleSys, BattleContex * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_PrintLeadMonMessage(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_PrintFirstSendOutMessage(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int inBattler = BattleScript_Read(battleCtx); @@ -4167,7 +4167,7 @@ static BOOL BtlCmd_PrintLeadMonMessage(BattleSystem *battleSys, BattleContext *b * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_PreparedTrainerMessage(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_PrintBufferedTrainerMessage(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int inBattler = BattleScript_Read(battleCtx); @@ -4269,7 +4269,7 @@ static BOOL BtlCmd_TryConversion(BattleSystem *battleSys, BattleContext *battleC * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_IfVar(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_CompareVarToVar(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int op = BattleScript_Read(battleCtx); @@ -4349,7 +4349,7 @@ static BOOL BtlCmd_IfVar(BattleSystem *battleSys, BattleContext *battleCtx) * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_IfMonDataVar(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_CompareMonDataToVar(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int op = BattleScript_Read(battleCtx); @@ -4423,7 +4423,7 @@ static BOOL BtlCmd_IfMonDataVar(BattleSystem *battleSys, BattleContext *battleCt * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_GivePayDayMoney(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_AddPayDayMoney(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); @@ -4555,7 +4555,7 @@ static BOOL BtlCmd_TryMist(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Try to execute a one-hit KO move (e.g., Guillotine, Sheer Cold). * - * These moves do not follow the standard accuracy formula. If the defender is + * These moves do not follow the standard accuracy formula. CompareVarToValue the defender is * a higher level than the attacker, then the move will always fail to hit, even * if the attacker is under the effect of No Guard or Lock On. Accuracy for * these moves scales linearly from their base accuracy according to the @@ -4624,10 +4624,10 @@ static BOOL BtlCmd_TryOHKOMove(BattleSystem *battleSys, BattleContext *battleCtx } /** - * @brief Divide the value of a variable by another static value, storing the + * @brief DivideVarByValue the value of a variable by another static value, storing the * result back into the source variable. * - * This operation will not permit quotients of 0. If the variable's value is + * This operation will not permit quotients of 0. CompareVarToValue the variable's value is * positive, then the minimum permissible quotient will be 1. Likewise, a * negative value will permit a maximum quotient of -1. * @@ -4639,7 +4639,7 @@ static BOOL BtlCmd_TryOHKOMove(BattleSystem *battleSys, BattleContext *battleCtx * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_Divide(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_DivideVarByValue(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int srcVar = BattleScript_Read(battleCtx); @@ -4652,10 +4652,10 @@ static BOOL BtlCmd_Divide(BattleSystem *battleSys, BattleContext *battleCtx) } /** - * @brief Divide the value of a variable by the value of another variable, + * @brief DivideVarByValue the value of a variable by the value of another variable, * storing the result back into the former. * - * This operation will not permit quotients of 0. If the variable's value is + * This operation will not permit quotients of 0. CompareVarToValue the variable's value is * positive, then the minimum permissible quotient will be 1. Likewise, a * negative value will permit a maximum quotient of -1. * @@ -4667,7 +4667,7 @@ static BOOL BtlCmd_Divide(BattleSystem *battleSys, BattleContext *battleCtx) * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_DivideByVar (BattleSystem * battleSys, BattleContext * battleCtx) +static BOOL BtlCmd_DivideVarByVar (BattleSystem * battleSys, BattleContext * battleCtx) { BattleScript_Iter(battleCtx, 1); int srcVar = BattleScript_Read(battleCtx); @@ -4868,12 +4868,12 @@ static BOOL BtlCmd_Counter(BattleSystem *battleSys, BattleContext *battleCtx) battleCtx->defender = lastAttacker; } - // If the target is no longer active, pick a random opponent + // CompareVarToValue the target is no longer active, pick a random opponent // This should always give us an active opponent, unless both have fainted if (DEFENDING_MON.curHP == 0) { battleCtx->defender = BattleSystem_RandomOpponent(battleSys, battleCtx, battleCtx->attacker); - // If there are no possible targets, fail + // CompareVarToValue there are no possible targets, fail if (DEFENDING_MON.curHP == 0) { battleCtx->commandNext = BATTLE_CONTROL_UPDATE_MOVE_BUFFERS; BattleScript_Jump(battleCtx, NARC_INDEX_BATTLE__SKILL__SUB_SEQ, BATTLE_SUBSCRIPT_NO_TARGET); @@ -4921,12 +4921,12 @@ static BOOL BtlCmd_MirrorCoat(BattleSystem *battleSys, BattleContext *battleCtx) battleCtx->defender = lastAttacker; } - // If the target is no longer active, pick a random opponent + // CompareVarToValue the target is no longer active, pick a random opponent // This should always give us an active opponent, unless both have fainted if (DEFENDING_MON.curHP == 0) { battleCtx->defender = BattleSystem_RandomOpponent(battleSys, battleCtx, battleCtx->attacker); - // If there are no possible targets, fail + // CompareVarToValue there are no possible targets, fail if (DEFENDING_MON.curHP == 0) { battleCtx->commandNext = BATTLE_CONTROL_UPDATE_MOVE_BUFFERS; BattleScript_Jump(battleCtx, NARC_INDEX_BATTLE__SKILL__SUB_SEQ, BATTLE_SUBSCRIPT_NO_TARGET); @@ -5256,7 +5256,7 @@ static BOOL BtlCmd_TrySpite(BattleSystem *battleSys, BattleContext *battleCtx) * @brief Try to clear the status of each party Pokemon. * * This command does not fail in the traditional sense; failure always occurs - * silently, and will only occur for individual party Pokemon. If the move using + * silently, and will only occur for individual party Pokemon. CompareVarToValue the move using * this effect is Heal Bell, then it will fail for any party Pokemon with the * ability Soundproof. * @@ -5327,7 +5327,7 @@ static BOOL BtlCmd_TryPartyStatusRefresh(BattleSystem *battleSys, BattleContext * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_CanStealItem(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_TryStealItem(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int jumpOnFail = BattleScript_Read(battleCtx); @@ -5383,7 +5383,7 @@ static const u16 sProtectSuccessRate[] = { * @param battleCtx * @return BOOL */ -static BOOL BtlCmd_TryProtectEndure(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_TryProtection(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int jumpOnFail = BattleScript_Read(battleCtx); @@ -5475,7 +5475,7 @@ static BOOL BtlCmd_TrySubstitute(BattleSystem *battleSys, BattleContext *battleC * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_CanWhirlwind(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_TryWhirlwind(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int jumpOnFail = BattleScript_Read(battleCtx); @@ -5613,7 +5613,7 @@ static BOOL BtlCmd_Transform(BattleSystem * battleSys, BattleContext * battleCtx /** * @brief Try to execute the Spikes effect. * - * If the defending side already has 3 layers of Spikes, then this command + * CompareVarToValue the defending side already has 3 layers of Spikes, then this command * will fail. * * Inputs: @@ -5687,7 +5687,7 @@ static BOOL BtlCmd_CheckSpikes(BattleSystem *battleSys, BattleContext *battleCtx * reset the perish count for any of these active battlers, nor will it affect * any battler with Soundproof. * - * If there are no active battlers which could be affected and do not have an + * CompareVarToValue there are no active battlers which could be affected and do not have an * active perish count, then this command will fail. * * Inputs: @@ -5738,7 +5738,7 @@ static BOOL BtlCmd_TryPerishSong(BattleSystem *battleSys, BattleContext *battleC * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_GetBattlerBySpeedOrder(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_GetMonBySpeedOrder(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int dstVar = BattleScript_Read(battleCtx); @@ -5761,7 +5761,7 @@ static BOOL BtlCmd_GetBattlerBySpeedOrder(BattleSystem *battleSys, BattleContext * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_IfVarIsValidBattler(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_GoToIfValidMon(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int srcVar = BattleScript_Read(battleCtx); @@ -5787,9 +5787,9 @@ static BOOL BtlCmd_IfVarIsValidBattler(BattleSystem *battleSys, BattleContext *b * Side effects: * - battleCtx->hpCalcTemp will be updated with the (signed) amount of HP to * add to an affected battler's current HP. - * - If the effect to apply is due to Solar Power or Hydration, then + * - CompareVarToValue the effect to apply is due to Solar Power or Hydration, then * battleCtx->scriptTemp will be updated with an appropriate identifier. - * - If the effect to apply is due to Hydration, then battleCtx->msgTemp will + * - CompareVarToValue the effect to apply is due to Hydration, then battleCtx->msgTemp will * be updated with the condition to be restored. * * @param battleSys @@ -6024,7 +6024,7 @@ static BOOL BtlCmd_TrySafeguard(BattleSystem *battleSys, BattleContext *battleCt * @param battleCtx * @return BOOL */ -static BOOL BtlCmd_TryPresent(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_Present(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int jumpIfHeal = BattleScript_Read(battleCtx); @@ -6102,7 +6102,7 @@ static BOOL BtlCmd_CalcMagnitudePower(BattleSystem *battleSys, BattleContext *ba * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_TryReplaceBattler(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_TryReplaceFaintedMon(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int inBattler = BattleScript_Read(battleCtx); @@ -6193,9 +6193,9 @@ static BOOL BtlCmd_RapidSpin(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Recover HP using a weather-based move. * - * - If no weather is active, recovery is equal to 1/2 of the user's maximum HP. - * - If the weather is sun, recovery is equal to 2/3 of the user's maximum HP. - * - If any other weather is active, recovery is equal to 1/4 of the user's maximum HP. + * - CompareVarToValue no weather is active, recovery is equal to 1/2 of the user's maximum HP. + * - CompareVarToValue the weather is sun, recovery is equal to 2/3 of the user's maximum HP. + * - CompareVarToValue any other weather is active, recovery is equal to 1/4 of the user's maximum HP. * * @param battleSys * @param battleCtx @@ -6300,7 +6300,7 @@ static BOOL BtlCmd_CopyStatStages(BattleSystem *battleSys, BattleContext *battle * @param battleCtx * @return BOOL */ -static BOOL BtlCmd_TrySetupFutureSight(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_TryFutureSight(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int jumpOnFail = BattleScript_Read(battleCtx); @@ -6569,7 +6569,7 @@ static BOOL BtlCmd_TryHelpingHand (BattleSystem *battleSys, BattleContext *battl * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_CanSwapItems(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_TrySwapItems(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int jumpOnFail = BattleScript_Read(battleCtx); @@ -6606,7 +6606,7 @@ static BOOL BtlCmd_CanSwapItems(BattleSystem *battleSys, BattleContext *battleCt * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_TrySetupWish (BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_TryWish (BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int jumpOnFail = BattleScript_Read(battleCtx); @@ -6692,7 +6692,7 @@ static BOOL BtlCmd_TryAssist(BattleSystem *battleSys, BattleContext *battleCtx) * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_TrySetupMagicCoat(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_TrySetMagicCoat(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); @@ -6720,7 +6720,7 @@ static BOOL BtlCmd_TrySetupMagicCoat(BattleSystem *battleSys, BattleContext *bat * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_MagicCoatReflect(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_MagicCoat(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); @@ -6833,7 +6833,7 @@ static BOOL BtlCmd_TryYawn(BattleSystem *battleSys, BattleContext *battleCtx) * 1. The distance to jump if the defender does not have a held item. * * Side effects: - * - If the target has a held item and does not have Sticky Hold, the mask + * - CompareVarToValue the target has a held item and does not have Sticky Hold, the mask * of knocked off items for the defending side will be updated to toggle the * flag for the target. * @@ -7010,7 +7010,7 @@ static BOOL BtlCmd_TryGrudge(BattleSystem *battleSys, BattleContext *battleCtx) * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_TrySetupSnatch(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_TrySnatch(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int jumpOnFail = BattleScript_Read(battleCtx); @@ -7083,7 +7083,7 @@ static BOOL BtlCmd_CalcWeightBasedPower(BattleSystem *battleSys, BattleContext * * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_CalcWeatherBallPower(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_CalcWeatherBallParams(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); @@ -7124,7 +7124,7 @@ static BOOL BtlCmd_CalcWeatherBallPower(BattleSystem *battleSys, BattleContext * * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_CheckForPursuit(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_TryPursuit(BattleSystem *battleSys, BattleContext *battleCtx) { int jumpIfNoTrigger; int i; @@ -7159,7 +7159,7 @@ static BOOL BtlCmd_CheckForPursuit(BattleSystem *battleSys, BattleContext *battl && battleCtx->battleMons[i].ppCur[moveSlot]) { battleCtx->battleMons[i].ppCur[moveSlot]--; - // If the switching battler has Pressure, apply it to the battler using Pursuit. + // CompareVarToValue the switching battler has Pressure, apply it to the battler using Pursuit. if (Battler_Ability(battleCtx, battleCtx->switchedMon) == ABILITY_PRESSURE && battleCtx->battleMons[i].ppCur[moveSlot]) { battleCtx->battleMons[i].ppCur[moveSlot]--; @@ -7203,7 +7203,7 @@ static BOOL BtlCmd_CheckForPursuit(BattleSystem *battleSys, BattleContext *battl * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_ApplyTypeMatchup(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_ApplyTypeEffectiveness(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); @@ -7387,7 +7387,7 @@ static BOOL BtlCmd_CalcGyroBallPower(BattleSystem *battleSys, BattleContext *bat * - battleCtx->defender will be set to the last battler to deal damage to the * attacker, or to the defending side's Follow Me user (if one exists), or to * either's partner (if the former has fainted). - * - If there is no valid target, the "no target" subsequence will be executed. + * - CompareVarToValue there is no valid target, the "no target" subsequence will be executed. * * @param battleSys * @param battleCtx @@ -7758,7 +7758,7 @@ static BOOL BtlCmd_CheckSideCondition(BattleSystem *battleSys, BattleContext *ba * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_CheckDefenderProtecting(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_TryFeint(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int jumpOnFail = BattleScript_Read(battleCtx); @@ -7858,11 +7858,11 @@ static BOOL BtlCmd_TryToxicSpikes(BattleSystem * battleSys, BattleContext * batt * * Side effects: * - battleCtx->calcTemp will be set to the number of layers of Toxic Spikes on - * the switched-in battler's side of the field. If the switched-in battler has + * the switched-in battler's side of the field. CompareVarToValue the switched-in battler has * the Poison type, then this will instead be set to 0. * - battleCtx->sideEffectType will be set to SIDE_EFFECT_TYPE_TOXIC_SPIKES. * - battleCtx->sideEffectMon will be set to the switched-in battler. - * - If the switched-in battler has the Poison type, then Toxic Spikes will be + * - CompareVarToValue the switched-in battler has the Poison type, then Toxic Spikes will be * cleared from its side of the field. * * @param battleSys @@ -7903,10 +7903,10 @@ static BOOL BtlCmd_CheckToxicSpikes(BattleSystem * battleSys, BattleContext * ba * 1. Op-code which controls the behavior. See enum CheckHaveOp * 2. Input battler (or set of battlers) whose ability should be checked * 3. The ability to check for any battler to have (or not have) - * 4. Jump distance if a battler in the input set meets the criteria + * 4. GoTo distance if a battler in the input set meets the criteria * * Side effects: - * - If any battler matches the criteria, battleCtx->abilityMon will be set + * - CompareVarToValue any battler matches the criteria, battleCtx->abilityMon will be set * to their identifier. * * @param battleSys @@ -7962,7 +7962,7 @@ static BOOL BtlCmd_CheckIgnorableAbility(BattleSystem *battleSys, BattleContext } /** - * @brief Jump forward a certain distance if two battlers are on the same + * @brief GoTo forward a certain distance if two battlers are on the same * side of the field. * * Inputs: @@ -8099,7 +8099,7 @@ static BOOL BtlCmd_GenerateEndOfBattleItem(BattleSystem *battleSys, BattleContex * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_SetTrickRoom(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_TrickRoom(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); @@ -8109,7 +8109,7 @@ static BOOL BtlCmd_SetTrickRoom(BattleSystem *battleSys, BattleContext *battleCt } /** - * @brief Jump ahead if a given battler has already moved this turn. + * @brief GoTo ahead if a given battler has already moved this turn. * * Inputs: * 1. The battler to check. @@ -8134,7 +8134,7 @@ static BOOL BtlCmd_IfMovedThisTurn(BattleSystem *battleSys, BattleContext *battl } /** - * @brief Jump ahead if a given battler has (or does not have) an item with the + * @brief GoTo ahead if a given battler has (or does not have) an item with the * given hold effect. * * Inputs: @@ -8148,7 +8148,7 @@ static BOOL BtlCmd_IfMovedThisTurn(BattleSystem *battleSys, BattleContext *battl * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_IfItemEffect(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_CheckItemHoldEffect(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int op = BattleScript_Read(battleCtx); @@ -8181,7 +8181,7 @@ static BOOL BtlCmd_IfItemEffect(BattleSystem *battleSys, BattleContext *battleCt * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_GetItemEffect(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_GetItemHoldEffect(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int inBattler = BattleScript_Read(battleCtx); @@ -8208,7 +8208,7 @@ static BOOL BtlCmd_GetItemEffect(BattleSystem *battleSys, BattleContext *battleC * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_GetItemEffectPower(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_GetItemEffectParam(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int inBattler = BattleScript_Read(battleCtx); @@ -8357,7 +8357,7 @@ static BOOL BtlCmd_CalcNaturalGiftParams(BattleSystem *battleSys, BattleContext * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_TryPluckBerry(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_TryPluck(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int jumpStickyHold = BattleScript_Read(battleCtx); @@ -8385,7 +8385,7 @@ static BOOL BtlCmd_TryPluckBerry(BattleSystem *battleSys, BattleContext *battleC * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_TryFlingItem(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_TryFling(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int jumpNoEffect = BattleScript_Read(battleCtx); @@ -8407,7 +8407,7 @@ static BOOL BtlCmd_TryFlingItem(BattleSystem *battleSys, BattleContext *battleCt * @param battleCtx * @return BOOL */ -static BOOL BtlCmd_ShowYesNoScreen(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_YesNoMenu(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int type = BattleScript_Read(battleCtx); @@ -8462,7 +8462,7 @@ static BOOL BtlCmd_WaitYesNoResult(BattleSystem *battleSys, BattleContext *battl * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_ShowPartyScreen(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_ChoosePokemonMenu(BattleSystem *battleSys, BattleContext *battleCtx) { BattleSystem_MaxBattlers(battleSys); // must stay to match BattleScript_Iter(battleCtx, 1); @@ -8490,7 +8490,7 @@ static BOOL BtlCmd_ShowPartyScreen(BattleSystem *battleSys, BattleContext *battl * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_WaitPartyScreenResult(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_WaitPokemonMenuResult(BattleSystem *battleSys, BattleContext *battleCtx) { u8 input = BattleContext_IOBufferVal(battleCtx, 0); @@ -8517,7 +8517,7 @@ static BOOL BtlCmd_WaitPartyScreenResult(BattleSystem *battleSys, BattleContext * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_SubmitResult(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_SetLinkBattleResult(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); @@ -8604,7 +8604,7 @@ static BOOL BtlCmd_CheckStealthRock(BattleSystem *battleSys, BattleContext *batt * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_CheckActivateSecondaryEffect(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_CheckEffectActivation(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int jumpNoEffect = BattleScript_Read(battleCtx); @@ -8638,7 +8638,7 @@ static BOOL BtlCmd_CheckActivateSecondaryEffect(BattleSystem *battleSys, BattleC * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_CheckActivateChatterEffect(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_CheckChatterActivation(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int jumpNoEffect = BattleScript_Read(battleCtx); @@ -8737,7 +8737,7 @@ static BOOL BtlCmd_SetMosaic(BattleSystem *battleSys, BattleContext *battleCtx) * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_ChangeWeatherForm(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_ChangeForm(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int inBattler = BattleScript_Read(battleCtx); @@ -8755,7 +8755,7 @@ static BOOL BtlCmd_ChangeWeatherForm(BattleSystem *battleSys, BattleContext *bat * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_UpdateBG(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_SetBattleBackground(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); @@ -8925,7 +8925,7 @@ static BOOL BtlCmd_FreePartyGaugeGraphics(BattleSystem *battleSys, BattleContext return FALSE; } -static BOOL BtlCmd_IncrementRecord(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_IncrementGameStat(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int inBattler = BattleScript_Read(battleCtx); @@ -9077,7 +9077,7 @@ static BOOL BtlCmd_OAMToSprite(BattleSystem *battleSys, BattleContext *battleCtx } /** - * @brief Jump ahead a certain distance if the battler is out of Pokemon. + * @brief GoTo ahead a certain distance if the battler is out of Pokemon. * * Inputs: * 1. The battler to be checked @@ -9087,7 +9087,7 @@ static BOOL BtlCmd_OAMToSprite(BattleSystem *battleSys, BattleContext *battleCtx * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_CheckWhiteOut(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_CheckBlackOut(BattleSystem *battleSys, BattleContext *battleCtx) { int inBattler; int jumpIfWhiteOut; @@ -9285,7 +9285,7 @@ static BOOL BtlCmd_TriggerHeldItemOnHit(BattleSystem *battleSys, BattleContext * * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_ResultMesage(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_PrintBattleResultMessage(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); BattleIO_ResultMessage(battleSys); @@ -9300,7 +9300,7 @@ static BOOL BtlCmd_ResultMesage(BattleSystem *battleSys, BattleContext *battleCt * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_EscapeMesage(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_PrintEscapeMessage(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); BattleIO_EscapeMessage(battleSys, battleCtx); @@ -9315,7 +9315,7 @@ static BOOL BtlCmd_EscapeMesage(BattleSystem *battleSys, BattleContext *battleCt * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_ForfeitMesage(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_PrintForfeitMessage(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); BattleIO_ForfeitMessage(battleSys); @@ -9330,7 +9330,7 @@ static BOOL BtlCmd_ForfeitMesage(BattleSystem *battleSys, BattleContext *battleC * 1. The battler to be checked. * * Side effects: - * - If the battler should endure the hit, battleCtx->hpCalcTemp will be updated + * - CompareVarToValue the battler should endure the hit, battleCtx->hpCalcTemp will be updated * with the correct amount of damage to leave them at 1 HP, and * battleCtx->moveStatusFlags will be updated with the MOVE_STATUS_ENDURED_ITEM * flag. @@ -9339,7 +9339,7 @@ static BOOL BtlCmd_ForfeitMesage(BattleSystem *battleSys, BattleContext *battleC * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_CheckLeaveWith1HP(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_CheckHoldOnWith1HP(BattleSystem *battleSys, BattleContext *battleCtx) { BOOL endure = FALSE; @@ -9430,13 +9430,13 @@ static BOOL BtlCmd_CheckSubstitute(BattleSystem *battleSys, BattleContext *battl } /** - * @brief Jump ahead a certain distance if a weather-negation effect is active. + * @brief GoTo ahead a certain distance if a weather-negation effect is active. * * @param battleSys * @param battleCtx * @return BOOL */ -static BOOL BtlCmd_CheckWeatherNegated(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_CheckIgnoreWeather(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int jumpIfActive = BattleScript_Read(battleCtx); @@ -9524,7 +9524,7 @@ static BOOL BtlCmd_RefreshSprite(BattleSystem *battleSys, BattleContext *battleC * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_PlayMoveHitSoundEffect(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_PlayMoveHitSound(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int inBattler = BattleScript_Read(battleCtx); @@ -9546,7 +9546,7 @@ static BOOL BtlCmd_PlayMoveHitSoundEffect(BattleSystem *battleSys, BattleContext * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_PlayMusic(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_PlayBGM(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int inBattler = BattleScript_Read(battleCtx); @@ -9568,7 +9568,7 @@ static BOOL BtlCmd_PlayMusic(BattleSystem *battleSys, BattleContext *battleCtx) * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_CheckSafariContinues(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_CheckSafariGameDone(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int jumpNotOver = BattleScript_Read(battleCtx); @@ -9594,7 +9594,7 @@ static BOOL BtlCmd_CheckSafariContinues(BattleSystem *battleSys, BattleContext * * @param battleCtx * @return BOOL */ -static BOOL BtlCmd_WaitFramesNoSkip(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_WaitTime(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int wait = BattleScript_Read(battleCtx); @@ -9629,7 +9629,7 @@ static BOOL BtlCmd_WaitFramesNoSkip(BattleSystem *battleSys, BattleContext *batt * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_CheckMoveIsType(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_CheckCurMoveIsType(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int type = BattleScript_Read(battleCtx); @@ -9655,7 +9655,7 @@ static BOOL BtlCmd_CheckMoveIsType(BattleSystem *battleSys, BattleContext *battl * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_LoadPersonalFormData(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_LoadArchivedMonData(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int species = BattleScript_Read(battleCtx); @@ -9679,7 +9679,7 @@ static BOOL BtlCmd_LoadPersonalFormData(BattleSystem *battleSys, BattleContext * * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_ReloadPokemon(BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_RefreshMonData(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int inBattler = BattleScript_Read(battleCtx);