From 938d346b6d905709deed5336086c888c98a24247 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 26 Nov 2017 01:19:57 +0100 Subject: [PATCH] fixes and labels --- asm/macros/battle_script.inc | 4 +- data/battle_scripts_1.s | 171 ++++++++++++++++------------------- data/battle_scripts_2.s | 50 +++++----- include/battle_scripts.h | 62 ++++++------- src/battle_script_commands.c | 12 +-- 5 files changed, 140 insertions(+), 159 deletions(-) diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc index 55ec0438e..0d88f545d 100644 --- a/asm/macros/battle_script.inc +++ b/asm/macros/battle_script.inc @@ -850,7 +850,7 @@ .4byte \param0 .endm - .macro sleeptalk_choose_move param0 + .macro trychoosesleeptalkmove param0 .byte 0xa9 .4byte \param0 .endm @@ -1171,7 +1171,7 @@ .byte 0xee .endm - .macro pokeball_catch_calculation + .macro handleballthrow .byte 0xef .endm diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index bac2f77c5..991e8fde6 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -303,7 +303,7 @@ BattleScript_EffectSleep:: jumpifcantmakeasleep BattleScript_82D8ACF jumpifstatus TARGET, STATUS_ANY, BattleScript_ButItFailed accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE - jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_82DAD01 + jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected attackanimation waitanimation setmoveeffect EFFECT_SLEEP @@ -396,7 +396,6 @@ BattleScript_EffectExplosion:: jumpifbyte NO_COMMON_BITS, gBattleMoveFlags, MOVESTATUS_MISSED, BattleScript_82D8B94 call BattleScript_82D8BEA goto BattleScript_82D8B96 - BattleScript_82D8B94:: attackanimation waitanimation @@ -422,7 +421,6 @@ BattleScript_82D8B96:: jumpifnexttargetvalid BattleScript_82D8B96 tryfaintmon ATTACKER, FALSE, NULL end - BattleScript_82D8BCF:: effectivenesssound resultmessage @@ -449,7 +447,6 @@ BattleScript_82D8C0E:: ppreduce waitmessage 0x40 goto BattleScript_82D8AC1 - BattleScript_82D8C18:: accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE attackstring @@ -510,21 +507,20 @@ BattleScript_EffectStatUp:: BattleScript_EffectStatUpAfterAtkCanceler:: attackstring ppreduce - statbuffchange 0x41, BattleScript_82D8CCF - jumpifbyte NOT_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_82D8CBD + statbuffchange 0x41, BattleScript_StatUpEnd + jumpifbyte NOT_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_StatUpAttackAnim pause 0x20 - goto BattleScript_82D8CC7 - -BattleScript_82D8CBD:: + goto BattleScript_StatUpPrintString +BattleScript_StatUpAttackAnim:: attackanimation waitanimation -BattleScript_82D8CBF:: +BattleScript_StatUpDoAnim:: setgraphicalstatchangevalues playanimation ATTACKER, ANIM_STATS_CHANGE, sANIM_ARG1 -BattleScript_82D8CC7:: +BattleScript_StatUpPrintString:: printfromtable gStatUpStringIds waitmessage 0x40 -BattleScript_82D8CCF:: +BattleScript_StatUpEnd:: goto BattleScript_MoveEnd BattleScript_StatUp:: @@ -557,21 +553,20 @@ BattleScript_EffectStatDown:: accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE attackstring ppreduce - statbuffchange 0x1, BattleScript_82D8D60 - jumpifbyte LESS_THAN, cMULTISTRING_CHOOSER, 0x2, BattleScript_82D8D4E - jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 0x3, BattleScript_82D8D60 + statbuffchange 0x1, BattleScript_StatDownEnd + jumpifbyte LESS_THAN, cMULTISTRING_CHOOSER, 0x2, BattleScript_StatDownDoAnim + jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 0x3, BattleScript_StatDownEnd pause 0x20 - goto BattleScript_82D8D58 - -BattleScript_82D8D4E:: + goto BattleScript_StatDownPrintString +BattleScript_StatDownDoAnim:: attackanimation waitanimation setgraphicalstatchangevalues playanimation TARGET, ANIM_STATS_CHANGE, sANIM_ARG1 -BattleScript_82D8D58:: +BattleScript_StatDownPrintString:: printfromtable gStatDownStringIds waitmessage 0x40 -BattleScript_82D8D60:: +BattleScript_StatDownEnd:: goto BattleScript_MoveEnd BattleScript_StatDown:: @@ -712,7 +707,7 @@ BattleScript_EffectToxic:: attackcanceler attackstring ppreduce - jumpifability TARGET, ABILITY_IMMUNITY, BattleScript_82D8F63 + jumpifability TARGET, ABILITY_IMMUNITY, BattleScript_ImmunityProtected jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed jumpifstatus TARGET, STATUS_POISON, BattleScript_AlreadyPoisoned jumpifstatus TARGET, STATUS_TOXIC_POISON, BattleScript_AlreadyPoisoned @@ -720,7 +715,7 @@ BattleScript_EffectToxic:: jumpiftype TARGET, TYPE_POISON, BattleScript_NotAffected jumpiftype TARGET, TYPE_STEEL, BattleScript_NotAffected accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE - jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_82DAD01 + jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected attackanimation waitanimation setmoveeffect EFFECT_TOXIC @@ -736,7 +731,7 @@ BattleScript_AlreadyPoisoned:: waitmessage 0x40 goto BattleScript_MoveEnd -BattleScript_82D8F63:: +BattleScript_ImmunityProtected:: copybyte gEffectBank, gBankTarget setbyte cMULTISTRING_CHOOSER, 0x0 call BattleScript_PSNPrevention @@ -930,11 +925,11 @@ BattleScript_EffectConfuse:: attackcanceler attackstring ppreduce - jumpifability TARGET, ABILITY_OWN_TEMPO, BattleScript_82DB611 + jumpifability TARGET, ABILITY_OWN_TEMPO, BattleScript_OwnTempoPrevents jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed jumpifstatus2 TARGET, STATUS2_CONFUSION, BattleScript_82D9201 accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE - jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_82DAD01 + jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected attackanimation waitanimation setmoveeffect EFFECT_CONFUSION @@ -1013,7 +1008,7 @@ BattleScript_EffectPoison:: attackcanceler attackstring ppreduce - jumpifability TARGET, ABILITY_IMMUNITY, BattleScript_82D8F63 + jumpifability TARGET, ABILITY_IMMUNITY, BattleScript_ImmunityProtected jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed jumpifstatus TARGET, STATUS_POISON, BattleScript_AlreadyPoisoned jumpifstatus TARGET, STATUS_TOXIC_POISON, BattleScript_AlreadyPoisoned @@ -1021,7 +1016,7 @@ BattleScript_EffectPoison:: jumpiftype TARGET, TYPE_STEEL, BattleScript_NotAffected jumpifstatus TARGET, STATUS_ANY, BattleScript_ButItFailed accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE - jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_82DAD01 + jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected attackanimation waitanimation setmoveeffect EFFECT_POISON @@ -1034,14 +1029,14 @@ BattleScript_EffectParalyze:: attackcanceler attackstring ppreduce - jumpifability TARGET, ABILITY_LIMBER, BattleScript_82D9362 + jumpifability TARGET, ABILITY_LIMBER, BattleScript_LimberProtected jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed typecalc jumpifbyte COMMON_BITS, gBattleMoveFlags, MOVESTATUS_MISSED | MOVESTATUS_NOTAFFECTED | MOVESTATUS_FAILED, BattleScript_ButItFailed jumpifstatus TARGET, STATUS_PARALYSIS, BattleScript_82D9351 jumpifstatus TARGET, STATUS_ANY, BattleScript_ButItFailed accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE - jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_82DAD01 + jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected attackanimation waitanimation setmoveeffect EFFECT_PARALYSIS @@ -1057,7 +1052,7 @@ BattleScript_82D9351:: waitmessage 0x40 goto BattleScript_MoveEnd -BattleScript_82D9362:: +BattleScript_LimberProtected:: copybyte gEffectBank, gBankTarget setbyte cMULTISTRING_CHOOSER, 0x0 call BattleScript_PRLZPrevention @@ -1127,7 +1122,6 @@ BattleScript_82D9431:: printfromtable gSubsituteUsedStringIds waitmessage 0x40 goto BattleScript_MoveEnd - BattleScript_82D943E:: various ATTACKER, 0x17 pause 0x20 @@ -1148,13 +1142,12 @@ BattleScript_MoveUsedMustRecharge:: BattleScript_EffectRage:: attackcanceler - accuracycheck BattleScript_82D9487, ACC_CURR_MOVE + accuracycheck BattleScript_RageMiss, ACC_CURR_MOVE setmoveeffect EFFECT_RAGE seteffectprimary setmoveeffect 0 goto BattleScript_HitFromAtkString - -BattleScript_82D9487:: +BattleScript_RageMiss:: setmoveeffect EFFECT_RAGE clearstatusfromeffect ATTACKER goto BattleScript_PrintMoveMissed @@ -1181,6 +1174,7 @@ BattleScript_EffectMetronome:: setbyte sANIM_TURN, 0x0 setbyte sANIM_TARGETS_HIT, 0x0 metronome + BattleScript_EffectLeechSeed:: attackcanceler attackstring @@ -1287,7 +1281,6 @@ BattleScript_EffectSnore:: attackstring ppreduce goto BattleScript_ButItFailed - BattleScript_82D95CE:: jumpifhalfword EQUAL, gLastUsedMove, 0xD6, BattleScript_82D95E2 printstring STRINGID_PKMNFASTASLEEP @@ -1338,23 +1331,21 @@ BattleScript_EffectSketch:: BattleScript_EffectSleepTalk:: attackcanceler - jumpifstatus ATTACKER, STATUS_SLEEP, BattleScript_82D965E + jumpifstatus ATTACKER, STATUS_SLEEP, BattleScript_SleepTalkIsAsleep attackstring ppreduce goto BattleScript_ButItFailed - -BattleScript_82D965E:: +BattleScript_SleepTalkIsAsleep:: printstring STRINGID_PKMNFASTASLEEP waitmessage 0x40 statusanimation ATTACKER attackstring ppreduce orword gHitMarker, HITMARKER_NO_PPDEDUCT - sleeptalk_choose_move BattleScript_82D967E + trychoosesleeptalkmove BattleScript_SleepTalkUsingMove pause 0x40 goto BattleScript_ButItFailed - -BattleScript_82D967E:: +BattleScript_SleepTalkUsingMove:: attackanimation waitanimation setbyte sANIM_TURN, 0x0 @@ -1451,7 +1442,6 @@ BattleScript_82D973A:: jumpifbyte COMMON_BITS, gBattleMoveFlags, MOVESTATUS_ENDURED, BattleScript_82D97AD decrementmultihit BattleScript_82D9718 goto BattleScript_82D97AD - BattleScript_82D9799:: pause 0x20 jumpifbyte EQUAL, sMULTIHIT_STRING + 4, 0x0, BattleScript_82D97AD @@ -1498,7 +1488,6 @@ BattleScript_EffectNightmare:: jumpifstatus2 TARGET, STATUS2_NIGHTMARE, BattleScript_ButItFailed jumpifstatus TARGET, STATUS_SLEEP, BattleScript_NightmareWorked goto BattleScript_ButItFailed - BattleScript_NightmareWorked:: attackanimation waitanimation @@ -1515,39 +1504,38 @@ BattleScript_EffectMinimize:: goto BattleScript_EffectStatUpAfterAtkCanceler BattleScript_EffectCurse:: - jumpiftype2 ATTACKER, TYPE_GHOST, BattleScript_82D98E5 + jumpiftype2 ATTACKER, TYPE_GHOST, BattleScript_GhostCurse attackcanceler attackstring ppreduce - jumpifstat ATTACKER, GREATER_THAN, SPEED, 0x0, BattleScript_82D9892 - jumpifstat ATTACKER, NOT_EQUAL, ATK, 0xC, BattleScript_82D9892 + jumpifstat ATTACKER, GREATER_THAN, SPEED, 0x0, BattleScript_CurseTrySpeed + jumpifstat ATTACKER, NOT_EQUAL, ATK, 0xC, BattleScript_CurseTrySpeed jumpifstat ATTACKER, EQUAL, DEF, 0xC, BattleScript_ButItFailed -BattleScript_82D9892:: +BattleScript_CurseTrySpeed:: copybyte gBankTarget, gBankAttacker setbyte sANIM_TURN, 0x1 attackanimation waitanimation setstatchanger SPEED, 1, TRUE - statbuffchange 0x41, BattleScript_82D98B8 + statbuffchange 0x41, BattleScript_CurseTryAttack printfromtable gStatDownStringIds waitmessage 0x40 -BattleScript_82D98B8:: +BattleScript_CurseTryAttack:: setstatchanger ATK, 1, FALSE - statbuffchange 0x41, BattleScript_82D98CC + statbuffchange 0x41, BattleScript_CurseTryDefence printfromtable gStatUpStringIds waitmessage 0x40 -BattleScript_82D98CC:: +BattleScript_CurseTryDefence:: setstatchanger DEF, 1, FALSE - statbuffchange 0x41, BattleScript_82D98E0 + statbuffchange 0x41, BattleScript_CurseEnd printfromtable gStatUpStringIds waitmessage 0x40 -BattleScript_82D98E0:: +BattleScript_CurseEnd:: goto BattleScript_MoveEnd - -BattleScript_82D98E5:: - jumpifbytenotequal gBankAttacker, gBankTarget, BattleScript_82D98F6 +BattleScript_GhostCurse:: + jumpifbytenotequal gBankAttacker, gBankTarget, BattleScript_DoGhostCurse various ATTACKER, VARIOUS_GET_MOVE_TARGET -BattleScript_82D98F6:: +BattleScript_DoGhostCurse:: attackcanceler attackstring ppreduce @@ -1658,8 +1646,8 @@ BattleScript_EffectSwagger:: printfromtable gStatUpStringIds waitmessage 0x40 BattleScript_82D9A1E:: - jumpifability TARGET, ABILITY_OWN_TEMPO, BattleScript_82DB611 - jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_82DAD01 + jumpifability TARGET, ABILITY_OWN_TEMPO, BattleScript_OwnTempoPrevents + jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected setmoveeffect EFFECT_CONFUSION seteffectprimary goto BattleScript_MoveEnd @@ -1787,7 +1775,7 @@ BattleScript_82D9B41:: waitanimation printfromtable gMoveWeatherChangeStringIds waitmessage 0x40 - call BattleScript_82DB48D + call BattleScript_WeatherFormChanges goto BattleScript_MoveEnd BattleScript_EffectSunnyDay:: @@ -1943,15 +1931,14 @@ BattleScript_EffectStomp:: BattleScript_EffectSolarbeam:: jumpifabilitypresent ABILITY_CLOUD_NINE, BattleScript_82D9D28 jumpifabilitypresent ABILITY_AIR_LOCK, BattleScript_82D9D28 - jumpifhalfword COMMON_BITS, gBattleWeather, WEATHER_SUN_TEMPORARY | WEATHER_SUN_PERMANENT, BattleScript_82D9D50 + jumpifhalfword COMMON_BITS, gBattleWeather, WEATHER_SUN_TEMPORARY | WEATHER_SUN_PERMANENT, BattleScript_SolarbeamOnFirstTurn BattleScript_82D9D28:: jumpifstatus2 ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_82D9040 jumpifword COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_82D9040 setbyte sTWOTURN_STRINGID, 0x1 call BattleScriptFirstChargingTurn goto BattleScript_MoveEnd - -BattleScript_82D9D50:: +BattleScript_SolarbeamOnFirstTurn:: orword gHitMarker, HITMARKER_x8000000 setmoveeffect EFFECT_CHARGING | AFFECTS_USER seteffectprimary @@ -2060,11 +2047,11 @@ BattleScript_EffectDefenseCurl:: setdefensecurlbit setstatchanger DEF, 1, FALSE statbuffchange 0x41, BattleScript_82D9ED3 - jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_82D8CC7 + jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_StatUpPrintString attackanimation waitanimation BattleScript_82D9ED3:: - goto BattleScript_82D8CBF + goto BattleScript_StatUpDoAnim BattleScript_EffectSoftboiled:: attackcanceler @@ -2143,7 +2130,6 @@ BattleScript_EffectSpitUp:: typecalc adjustsetdamage goto BattleScript_HitFromAtkAnimation - BattleScript_SpitUpFail:: pause 0x20 printstring STRINGID_FAILEDTOSPITUP @@ -2208,8 +2194,8 @@ BattleScript_EffectFlatter:: printfromtable gStatUpStringIds waitmessage 0x40 BattleScript_82DA03A:: - jumpifability TARGET, ABILITY_OWN_TEMPO, BattleScript_82DB611 - jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_82DAD01 + jumpifability TARGET, ABILITY_OWN_TEMPO, BattleScript_OwnTempoPrevents + jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected setmoveeffect EFFECT_CONFUSION seteffectprimary goto BattleScript_MoveEnd @@ -2221,17 +2207,17 @@ BattleScript_EffectWillOWisp:: jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed jumpifstatus TARGET, STATUS_BURN, BattleScript_82DA0BB jumpiftype TARGET, TYPE_FIRE, BattleScript_NotAffected - jumpifability TARGET, ABILITY_WATER_VEIL, BattleScript_82DA0A1 + jumpifability TARGET, ABILITY_WATER_VEIL, BattleScript_WaterVeilPrevents jumpifstatus TARGET, STATUS_ANY, BattleScript_ButItFailed accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE - jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_82DAD01 + jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected attackanimation waitanimation setmoveeffect EFFECT_BURN seteffectprimary goto BattleScript_MoveEnd -BattleScript_82DA0A1:: +BattleScript_WaterVeilPrevents:: copybyte gEffectBank, gBankTarget setbyte cMULTISTRING_CHOOSER, 0x0 call BattleScript_BRNPrevention @@ -2272,12 +2258,10 @@ BattleScript_82DA119:: BattleScript_82DA13C:: tryfaintmon ATTACKER, FALSE, NULL goto BattleScript_MoveEnd - BattleScript_82DA148:: printstring STRINGID_BUTNOEFFECT waitmessage 0x40 goto BattleScript_82DA13C - BattleScript_82DA153:: attackstring ppreduce @@ -2498,7 +2482,7 @@ BattleScript_EffectYawn:: jumpifability TARGET, ABILITY_VITAL_SPIRIT, BattleScript_82DA378 jumpifability TARGET, ABILITY_INSOMNIA, BattleScript_82DA378 jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed - jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_82DAD01 + jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON jumpifcantmakeasleep BattleScript_ButItFailed setyawn BattleScript_ButItFailed @@ -2507,7 +2491,6 @@ BattleScript_EffectYawn:: printstring STRINGID_PKMNWASMADEDROWSY waitmessage 0x40 goto BattleScript_MoveEnd - BattleScript_82DA378:: copybyte sBANK, sFIELD_15 BattleScript_82DA382:: @@ -2958,23 +2941,22 @@ BattleScript_82DA92C:: end2 BattleScript_LocalTrainerBattleWon:: - jumpifword COMMON_BITS, gBattleTypeFlags, BATTLE_TYPE_TWO_OPPONENTS, BattleScript_82DA943 + jumpifword COMMON_BITS, gBattleTypeFlags, BATTLE_TYPE_TWO_OPPONENTS, BattleScript_LocalTwoTrainersDefeated printstring STRINGID_PLAYERDEFEATEDTRAINER1 - goto BattleScript_82DA946 - -BattleScript_82DA943:: + goto BattleScript_LocalBattleWonLoseTexts +BattleScript_LocalTwoTrainersDefeated:: printstring STRINGID_TWOENEMIESDEFEATED -BattleScript_82DA946:: +BattleScript_LocalBattleWonLoseTexts:: trainerslidein ATTACKER waitstate printstring STRINGID_TRAINER1LOSETEXT - jumpifword NO_COMMON_BITS, gBattleTypeFlags, BATTLE_TYPE_TWO_OPPONENTS, BattleScript_82DA963 + jumpifword NO_COMMON_BITS, gBattleTypeFlags, BATTLE_TYPE_TWO_OPPONENTS, BattleScript_LocalBattleWonReward trainerslideout IDENTITY_OPPONENT_MON1 waitstate trainerslidein GBANK_1 waitstate printstring STRINGID_TRAINER2LOSETEXT -BattleScript_82DA963:: +BattleScript_LocalBattleWonReward:: getmoneyreward printstring STRINGID_PLAYERGOTMONEY waitmessage 0x40 @@ -3297,7 +3279,7 @@ BattleScript_82DACFA:: waitmessage 0x40 end2 -BattleScript_82DAD01:: +BattleScript_SafeguardProtected:: pause 0x20 printstring STRINGID_PKMNUSEDSAFEGUARD waitmessage 0x40 @@ -3869,7 +3851,6 @@ BattleScript_82DB2D4:: waitmessage 0x40 tryfaintmon ATTACKER, FALSE, NULL goto BattleScript_MoveEnd - BattleScript_82DB2FF:: return @@ -3993,16 +3974,16 @@ BattleScript_MoveEffectConfusion:: return BattleScript_MoveEffectRecoil33:: - jumpifhalfword EQUAL, gCurrentMove, MOVE_STRUGGLE, BattleScript_82DB407 - jumpifability ATTACKER, ABILITY_ROCK_HEAD, BattleScript_82DB421 -BattleScript_82DB407:: + jumpifhalfword EQUAL, gCurrentMove, MOVE_STRUGGLE, BattleScript_DoRecoil33 + jumpifability ATTACKER, ABILITY_ROCK_HEAD, BattleScript_Recoil33End +BattleScript_DoRecoil33:: orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 healthbarupdate ATTACKER datahpupdate ATTACKER printstring STRINGID_PKMNHITWITHRECOIL waitmessage 0x40 tryfaintmon ATTACKER, FALSE, NULL -BattleScript_82DB421:: +BattleScript_Recoil33End:: return BattleScript_ItemSteal:: @@ -4016,7 +3997,7 @@ BattleScript_DrizzleActivates:: printstring STRINGID_PKMNMADEITRAIN waitstate playanimation BANK0, ANIM_RAIN_CONTINUES, NULL - call BattleScript_82DB48D + call BattleScript_WeatherFormChanges end3 BattleScript_SpeedBoostActivates:: @@ -4044,7 +4025,7 @@ BattleScript_SandstreamActivates:: printstring STRINGID_PKMNSXWHIPPEDUPSANDSTORM waitstate playanimation BANK0, ANIM_SANDSTORM_CONTINUES, NULL - call BattleScript_82DB48D + call BattleScript_WeatherFormChanges end3 BattleScript_ShedSkinActivates:: @@ -4053,12 +4034,12 @@ BattleScript_ShedSkinActivates:: updatestatusicon ATTACKER end3 -BattleScript_82DB48D:: +BattleScript_WeatherFormChanges:: setbyte sBANK, 0x0 -BattleScript_82DB493:: +BattleScript_WeatherFormChangesLoop:: trycastformdatachange addbyte sBANK, 0x1 - jumpifbytenotequal sBANK, gNoOfAllBanks, BattleScript_82DB493 + jumpifbytenotequal sBANK, gNoOfAllBanks, BattleScript_WeatherFormChangesLoop return BattleScript_CastformChange:: @@ -4110,7 +4091,7 @@ BattleScript_DroughtActivates:: printstring STRINGID_PKMNSXINTENSIFIEDSUN waitstate playanimation BANK0, ANIM_SUN_CONTINUES, NULL - call BattleScript_82DB48D + call BattleScript_WeatherFormChanges end3 BattleScript_TookAttack:: @@ -4207,7 +4188,7 @@ BattleScript_FlinchPrevention:: waitmessage 0x40 goto BattleScript_MoveEnd -BattleScript_82DB611:: +BattleScript_OwnTempoPrevents:: pause 0x20 printstring STRINGID_PKMNPREVENTSCONFUSIONWITH waitmessage 0x40 diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s index 8b2af14aa..f54b0a6a0 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -9,19 +9,19 @@ .align 2 gBattlescriptsForBallThrow:: @ 82DBD08 - .4byte BattleScript_82DBD68 - .4byte BattleScript_82DBD68 - .4byte BattleScript_82DBD68 - .4byte BattleScript_82DBD68 - .4byte BattleScript_82DBD68 - .4byte BattleScript_82DBD7E - .4byte BattleScript_82DBD68 - .4byte BattleScript_82DBD68 - .4byte BattleScript_82DBD68 - .4byte BattleScript_82DBD68 - .4byte BattleScript_82DBD68 - .4byte BattleScript_82DBD68 - .4byte BattleScript_82DBD68 + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_SafariBallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow .align 2 gUnknown_082DBD3C:: @ 82DBD3C @@ -43,19 +43,19 @@ gBattlescriptsForSafariActions:: @ 82DBD58 .4byte BattleScript_ActionThrowPokeblock .4byte BattleScript_82DBEE3 -BattleScript_82DBD68:: - jumpifword COMMON_BITS, gBattleTypeFlags, BATTLE_TYPE_WALLY_TUTORIAL, BattleScript_82DBD7A +BattleScript_BallThrow:: + jumpifword COMMON_BITS, gBattleTypeFlags, BATTLE_TYPE_WALLY_TUTORIAL, BattleScript_BallThrowByWally printstring STRINGID_PLAYERUSEDITEM - pokeball_catch_calculation + handleballthrow -BattleScript_82DBD7A:: +BattleScript_BallThrowByWally:: printstring STRINGID_WALLYUSEDITEM - pokeball_catch_calculation + handleballthrow -BattleScript_82DBD7E:: +BattleScript_SafariBallThrow:: printstring STRINGID_PLAYERUSEDITEM updatestatusicon ATTACKER - pokeball_catch_calculation + handleballthrow BattleScript_SuccessBallThrow:: jumpifhalfword EQUAL, gLastUsedItem, 0x5, BattleScript_82DBD92 @@ -114,7 +114,7 @@ BattleScript_82DBE12:: BattleScript_82DBE1C:: printstring STRINGID_EMPTYSTRING3 pause 0x30 - playse 0x1 + playse SE_KAIFUKU printstring STRINGID_TRAINER1USEDITEM waitmessage 0x40 useitemonopponent @@ -131,7 +131,7 @@ BattleScript_82DBE1C:: BattleScript_82DBE4B:: printstring STRINGID_EMPTYSTRING3 pause 0x30 - playse 0x1 + playse SE_KAIFUKU printstring STRINGID_TRAINER1USEDITEM waitmessage 0x40 useitemonopponent @@ -145,7 +145,7 @@ BattleScript_82DBE4B:: BattleScript_82DBE6F:: printstring STRINGID_EMPTYSTRING3 pause 0x30 - playse 0x1 + playse SE_KAIFUKU printstring STRINGID_TRAINER1USEDITEM waitmessage 0x40 useitemonopponent @@ -158,7 +158,7 @@ BattleScript_82DBE6F:: BattleScript_82DBE91:: printstring STRINGID_EMPTYSTRING3 pause 0x30 - playse 0x1 + playse SE_KAIFUKU printstring STRINGID_TRAINER1USEDITEM waitmessage 0x40 useitemonopponent @@ -169,7 +169,7 @@ BattleScript_82DBE91:: finishaction BattleScript_RunByUsingItem:: - playse 0x11 + playse SE_NIGERU setbyte gBattleOutcome, RAN finishturn diff --git a/include/battle_scripts.h b/include/battle_scripts.h index 85e1488d7..3c6d63e88 100644 --- a/include/battle_scripts.h +++ b/include/battle_scripts.h @@ -40,10 +40,10 @@ extern const u8 BattleScript_EffectSpecialAttackUp[]; extern const u8 BattleScript_EffectEvasionUp[]; extern const u8 BattleScript_EffectStatUp[]; extern const u8 BattleScript_EffectStatUpAfterAtkCanceler[]; -extern const u8 BattleScript_82D8CBD[]; -extern const u8 BattleScript_82D8CBF[]; -extern const u8 BattleScript_82D8CC7[]; -extern const u8 BattleScript_82D8CCF[]; +extern const u8 BattleScript_StatUpAttackAnim[]; +extern const u8 BattleScript_StatUpDoAnim[]; +extern const u8 BattleScript_StatUpPrintString[]; +extern const u8 BattleScript_StatUpEnd[]; extern const u8 BattleScript_StatUp[]; extern const u8 BattleScript_EffectAttackDown[]; extern const u8 BattleScript_EffectDefenseDown[]; @@ -51,8 +51,8 @@ extern const u8 BattleScript_EffectSpeedDown[]; extern const u8 BattleScript_EffectAccuracyDown[]; extern const u8 BattleScript_EffectEvasionDown[]; extern const u8 BattleScript_EffectStatDown[]; -extern const u8 BattleScript_82D8D4E[]; -extern const u8 BattleScript_82D8D58[]; +extern const u8 BattleScript_StatDownDoAnim[]; +extern const u8 BattleScript_StatDownPrintString[]; extern const u8 BattleScript_82D8D60[]; extern const u8 BattleScript_StatDown[]; extern const u8 BattleScript_EffectHaze[]; @@ -71,7 +71,7 @@ extern const u8 BattleScript_EffectFlinchHit[]; extern const u8 BattleScript_EffectRestoreHp[]; extern const u8 BattleScript_EffectToxic[]; extern const u8 BattleScript_AlreadyPoisoned[]; -extern const u8 BattleScript_82D8F63[]; +extern const u8 BattleScript_ImmunityProtected[]; extern const u8 BattleScript_EffectPayDay[]; extern const u8 BattleScript_EffectLightScreen[]; extern const u8 BattleScript_EffectTriAttack[]; @@ -110,7 +110,7 @@ extern const u8 BattleScript_82D928C[]; extern const u8 BattleScript_EffectPoison[]; extern const u8 BattleScript_EffectParalyze[]; extern const u8 BattleScript_82D9351[]; -extern const u8 BattleScript_82D9362[]; +extern const u8 BattleScript_LimberProtected[]; extern const u8 BattleScript_EffectAttackDownHit[]; extern const u8 BattleScript_EffectDefenseDownHit[]; extern const u8 BattleScript_EffectSpeedDownHit[]; @@ -127,7 +127,7 @@ extern const u8 BattleScript_82D943E[]; extern const u8 BattleScript_EffectRecharge[]; extern const u8 BattleScript_MoveUsedMustRecharge[]; extern const u8 BattleScript_EffectRage[]; -extern const u8 BattleScript_82D9487[]; +extern const u8 BattleScript_RageMiss[]; extern const u8 BattleScript_EffectMimic[]; extern const u8 BattleScript_EffectMetronome[]; extern const u8 BattleScript_EffectLeechSeed[]; @@ -146,8 +146,8 @@ extern const u8 BattleScript_EffectConversion2[]; extern const u8 BattleScript_EffectLockOn[]; extern const u8 BattleScript_EffectSketch[]; extern const u8 BattleScript_EffectSleepTalk[]; -extern const u8 BattleScript_82D965E[]; -extern const u8 BattleScript_82D967E[]; +extern const u8 BattleScript_SleepTalkIsAsleep[]; +extern const u8 BattleScript_SleepTalkUsingMove[]; extern const u8 BattleScript_EffectDestinyBond[]; extern const u8 BattleScript_EffectFlail[]; extern const u8 BattleScript_EffectSpite[]; @@ -166,12 +166,12 @@ extern const u8 BattleScript_EffectNightmare[]; extern const u8 BattleScript_NightmareWorked[]; extern const u8 BattleScript_EffectMinimize[]; extern const u8 BattleScript_EffectCurse[]; -extern const u8 BattleScript_82D9892[]; -extern const u8 BattleScript_82D98B8[]; -extern const u8 BattleScript_82D98CC[]; -extern const u8 BattleScript_82D98E0[]; -extern const u8 BattleScript_82D98E5[]; -extern const u8 BattleScript_82D98F6[]; +extern const u8 BattleScript_CurseTrySpeed[]; +extern const u8 BattleScript_CurseTryAttack[]; +extern const u8 BattleScript_CurseTryDefence[]; +extern const u8 BattleScript_CurseEnd[]; +extern const u8 BattleScript_GhostCurse[]; +extern const u8 BattleScript_DoGhostCurse[]; extern const u8 BattleScript_EffectProtect[]; extern const u8 BattleScript_EffectSpikes[]; extern const u8 BattleScript_EffectForesight[]; @@ -221,7 +221,7 @@ extern const u8 BattleScript_EffectGust[]; extern const u8 BattleScript_EffectStomp[]; extern const u8 BattleScript_EffectSolarbeam[]; extern const u8 BattleScript_82D9D28[]; -extern const u8 BattleScript_82D9D50[]; +extern const u8 BattleScript_SolarbeamOnFirstTurn[]; extern const u8 BattleScript_EffectThunder[]; extern const u8 BattleScript_EffectTeleport[]; extern const u8 BattleScript_EffectBeatUp[]; @@ -259,7 +259,7 @@ extern const u8 BattleScript_EffectTorment[]; extern const u8 BattleScript_EffectFlatter[]; extern const u8 BattleScript_82DA03A[]; extern const u8 BattleScript_EffectWillOWisp[]; -extern const u8 BattleScript_82DA0A1[]; +extern const u8 BattleScript_WaterVeilPrevents[]; extern const u8 BattleScript_82DA0BB[]; extern const u8 BattleScript_EffectMemento[]; extern const u8 BattleScript_82DA119[]; @@ -352,9 +352,9 @@ extern const u8 BattleScript_82DA8FC[]; extern const u8 BattleScript_82DA908[]; extern const u8 BattleScript_82DA92C[]; extern const u8 BattleScript_LocalTrainerBattleWon[]; -extern const u8 BattleScript_82DA943[]; -extern const u8 BattleScript_82DA946[]; -extern const u8 BattleScript_82DA963[]; +extern const u8 BattleScript_LocalTwoTrainersDefeated[]; +extern const u8 BattleScript_LocalBattleWonLoseTexts[]; +extern const u8 BattleScript_LocalBattleWonReward[]; extern const u8 BattleScript_PayDayMoneyAndPickUpItems[]; extern const u8 BattleScript_LocalBattleLost[]; extern const u8 BattleScript_82DA9B1[]; @@ -406,7 +406,7 @@ extern const u8 BattleScript_82DACD2[]; extern const u8 BattleScript_82DACE0[]; extern const u8 BattleScript_82DACE7[]; extern const u8 BattleScript_82DACFA[]; -extern const u8 BattleScript_82DAD01[]; +extern const u8 BattleScript_SafeguardProtected[]; extern const u8 BattleScript_82DAD0B[]; extern const u8 BattleScript_LeechSeedTurnDrain[]; extern const u8 BattleScript_82DAD47[]; @@ -520,8 +520,8 @@ extern const u8 BattleScript_MoveEffectPayDay[]; extern const u8 BattleScript_MoveEffectWrap[]; extern const u8 BattleScript_MoveEffectConfusion[]; extern const u8 BattleScript_MoveEffectRecoil33[]; -extern const u8 BattleScript_82DB407[]; -extern const u8 BattleScript_82DB421[]; +extern const u8 BattleScript_DoRecoil33[]; +extern const u8 BattleScript_Recoil33End[]; extern const u8 BattleScript_ItemSteal[]; extern const u8 BattleScript_DrizzleActivates[]; extern const u8 BattleScript_SpeedBoostActivates[]; @@ -529,8 +529,8 @@ extern const u8 BattleScript_TraceActivates[]; extern const u8 BattleScript_RainDishActivates[]; extern const u8 BattleScript_SandstreamActivates[]; extern const u8 BattleScript_ShedSkinActivates[]; -extern const u8 BattleScript_82DB48D[]; -extern const u8 BattleScript_82DB493[]; +extern const u8 BattleScript_WeatherFormChanges[]; +extern const u8 BattleScript_WeatherFormChangesLoop[]; extern const u8 BattleScript_CastformChange[]; extern const u8 BattleScript_82DB4AF[]; extern const u8 BattleScript_82DB4B8[]; @@ -557,7 +557,7 @@ extern const u8 BattleScript_PRLZPrevention[]; extern const u8 BattleScript_PSNPrevention[]; extern const u8 BattleScript_ObliviousPreventsAttraction[]; extern const u8 BattleScript_FlinchPrevention[]; -extern const u8 BattleScript_82DB611[]; +extern const u8 BattleScript_OwnTempoPrevents[]; extern const u8 BattleScript_SoundproofProtected[]; extern const u8 BattleScript_AbilityNoSpecificStatLoss[]; extern const u8 BattleScript_StickyHoldActivates[]; @@ -614,9 +614,9 @@ extern const u8 BattleScript_82DB992[]; extern const u8 BattleScript_82DB9BA[]; extern const u8 BattleScript_82DB9C1[]; extern const u8 BattleScript_82DB9C8[]; -extern const u8 BattleScript_82DBD68[]; -extern const u8 BattleScript_82DBD7A[]; -extern const u8 BattleScript_82DBD7E[]; +extern const u8 BattleScript_BallThrow[]; +extern const u8 BattleScript_BallThrowByWally[]; +extern const u8 BattleScript_SafariBallThrow[]; extern const u8 BattleScript_SuccessBallThrow[]; extern const u8 BattleScript_82DBD92[]; extern const u8 BattleScript_82DBDA5[]; diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index ded0629f2..dcc7c783c 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -350,7 +350,7 @@ static void atkA5_painsplitdmgcalc(void); static void atkA6_settypetorandomresistance(void); static void atkA7_setalwayshitflag(void); static void atkA8_copymovepermanently(void); -static void atkA9_sleeptalk_choose_move(void); +static void atkA9_trychoosesleeptalkmove(void); static void atkAA_setdestinybond(void); static void atkAB_trysetdestinybondtohappen(void); static void atkAC_remaininghptopower(void); @@ -420,7 +420,7 @@ static void atkEB_settypetoterrain(void); static void atkEC_pursuitrelated(void); static void atkEF_snatchsetbanks(void); static void atkEE_removelightscreenreflect(void); -static void atkEF_pokeball_catch_calculation(void); +static void atkEF_handleballthrow(void); static void atkF0_givecaughtmon(void); static void atkF1_trysetcaughtmondexflags(void); static void atkF2_displaydexinfo(void); @@ -602,7 +602,7 @@ void (* const gBattleScriptingCommandsTable[])(void) = atkA6_settypetorandomresistance, atkA7_setalwayshitflag, atkA8_copymovepermanently, - atkA9_sleeptalk_choose_move, + atkA9_trychoosesleeptalkmove, atkAA_setdestinybond, atkAB_trysetdestinybondtohappen, atkAC_remaininghptopower, @@ -672,7 +672,7 @@ void (* const gBattleScriptingCommandsTable[])(void) = atkEC_pursuitrelated, atkEF_snatchsetbanks, atkEE_removelightscreenreflect, - atkEF_pokeball_catch_calculation, + atkEF_handleballthrow, atkF0_givecaughtmon, atkF1_trysetcaughtmondexflags, atkF2_displaydexinfo, @@ -8819,7 +8819,7 @@ static u8 AttacksThisTurn(u8 bank, u16 move) // Note: returns 1 if it's a chargi return 2; } -static void atkA9_sleeptalk_choose_move(void) +static void atkA9_trychoosesleeptalkmove(void) { s32 i; u8 unusableMovesBits = 0; @@ -10597,7 +10597,7 @@ static void atkEE_removelightscreenreflect(void) // brick break gBattlescriptCurrInstr++; } -static void atkEF_pokeball_catch_calculation(void) +static void atkEF_handleballthrow(void) { u8 ballMultiplier = 0;