diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/battle_811DA74.s | 20 | ||||
| -rw-r--r-- | data/battle_anim_81258BC.s | 8 | ||||
| -rw-r--r-- | data/battle_anim_8137220.s | 2 | ||||
| -rw-r--r-- | data/battle_scripts_1.s | 330 | ||||
| -rw-r--r-- | data/battle_scripts_2.s | 16 | ||||
| -rw-r--r-- | data/data2.s | 216 | ||||
| -rw-r--r-- | data/text/battle_strings.inc | 20 |
7 files changed, 306 insertions, 306 deletions
diff --git a/data/battle_811DA74.s b/data/battle_811DA74.s index a17937823..873c76eb9 100644 --- a/data/battle_811DA74.s +++ b/data/battle_811DA74.s @@ -4,10 +4,10 @@ .section .rodata .align 2 -gUnknown_083FE4F4:: @ 83FE4F4 - .4byte dp01t_00_3_getattr +gLinkPartnerBufferCommands:: @ 83FE4F4 + .4byte LinkPartnerHandleGetAttributes .4byte sub_811EC04 - .4byte sub_811EC10 + .4byte LinkPartnerHandleSetAttributes .4byte sub_811F664 .4byte sub_811F6D8 .4byte sub_811F7F4 @@ -29,10 +29,10 @@ gUnknown_083FE4F4:: @ 83FE4F4 .4byte sub_8120128 .4byte sub_8120134 .4byte sub_8120140 - .4byte sub_812014C - .4byte sub_812023C - .4byte sub_8120248 - .4byte sub_81202BC + .4byte LinkPartnerHandleHealthBarUpdate + .4byte LinkPartnerHandleExpBarUpdate + .4byte LinkPartnerHandleStatusIconUpdate + .4byte LinkPartnerHandleStatusAnimation .4byte sub_8120324 .4byte sub_8120330 .4byte sub_812033C @@ -46,11 +46,11 @@ gUnknown_083FE4F4:: @ 83FE4F4 .4byte sub_81203AC .4byte sub_81203E4 .4byte sub_81203FC - .4byte dp01t_29_3_blink + .4byte LinkPartnerHandleHitAnimation .4byte sub_8120494 - .4byte sub_81204A0 + .4byte LinkPartnerHandleEffectivenessSound .4byte sub_81204E4 - .4byte sub_8120514 + .4byte LinkPartnerHandleFaintingCry .4byte dp01t_2E_3_battle_intro .4byte sub_8120588 .4byte dp01t_30_3_80EB11C diff --git a/data/battle_anim_81258BC.s b/data/battle_anim_81258BC.s index b4f88fc67..993adbc2e 100644 --- a/data/battle_anim_81258BC.s +++ b/data/battle_anim_81258BC.s @@ -4,8 +4,8 @@ .section .rodata .align 2 -gUnknown_08402080:: @ 8402080 - .4byte sub_812B864 +gSafariBufferCommands:: @ 8402080 + .4byte SafariHandleGetAttributes .4byte sub_812B870 .4byte sub_812B87C .4byte sub_812B888 @@ -21,8 +21,8 @@ gUnknown_08402080:: @ 8402080 .4byte sub_812BA14 .4byte sub_812BA70 .4byte sub_812BA7C - .4byte dp01t_10_6_message - .4byte dp01t_11_6_message_for_player_only + .4byte SafariHandlePrintString + .4byte SafariHandlePrintStringPlayerOnly .4byte sub_812BB10 .4byte sub_812BBFC .4byte sub_812BC08 diff --git a/data/battle_anim_8137220.s b/data/battle_anim_8137220.s index a2f7c1d74..c1673af9a 100644 --- a/data/battle_anim_8137220.s +++ b/data/battle_anim_8137220.s @@ -4,7 +4,7 @@ .section .rodata .align 2 -gUnknown_084061A4:: @ 84061A4 +gWallyBufferCommands:: @ 84061A4 .4byte dp01t_00_5_getattr .4byte sub_8138230 .4byte sub_813823C diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 32d8e6da5..fbb0826fc 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -280,7 +280,7 @@ BattleScript_1D6F48: @ 81D6F48 seteffectwithchancetarget faintpokemon TARGET, 0, 0x0 -BattleScript_1D6F62:: @ 81D6F62 +BattleScript_EndTurn:: @ 81D6F62 setbyte 0x201600c, 0 atk49 0, 0 end @@ -299,7 +299,7 @@ BattleScript_1D6F77: @ 81D6F77 missmessage resultmessage waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Sleep: @ 81D6F81 attackcanceler @@ -315,25 +315,25 @@ MoveEffect_Sleep: @ 81D6F81 waitanimation setbyte 0x2024d21, 1 seteffecttarget - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D6FC4: @ 81D6FC4 pause 32 printstring BATTLE_TEXT_DefendingAsleep waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D6FD2: @ 81D6FD2 pause 32 printstring BATTLE_TEXT_WasntAffected waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D6FE0: @ 81D6FE0 pause 32 printfromtable BattleTextList_40156A waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_PoisonHit: @ 81D6FF0 MoveEffect_PoisonTail: @ 81D6FF0 @@ -380,7 +380,7 @@ BattleScript_1D703F: @ 81D703F BattleScript_1D7056: @ 81D7056 faintpokemon USER, 0, 0x0 faintpokemon TARGET, 0, 0x0 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_BlazeKick: @ 81D7069 MoveEffect_BurnHit: @ 81D7069 @@ -490,7 +490,7 @@ BattleScript_1D7129: @ 81D7129 BattleScript_1D7167: @ 81D7167 faintpokemon TARGET, 0, 0x0 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_MirrorMove: @ 81D7173 attackcanceler @@ -501,7 +501,7 @@ MoveEffect_MirrorMove: @ 81D7173 orbyte 0x2024c68, 32 printstring BATTLE_TEXT_MirrorFail waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_AttackUp: @ 81D718B setbyte 0x201601e, 17 @@ -542,9 +542,9 @@ BattleScript_1D71D8: @ 81D71D8 waitmessage 64 BattleScript_1D71E0: @ 81D71E0 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn -gUnknown_081D71E5:: @ 81D71E5 +BattleScript_StatUp:: @ 81D71E5 playanimation 2, 1, 0x20160a4 printfromtable BattleTextList_401570 waitmessage 64 @@ -592,9 +592,9 @@ BattleScript_1D7269: @ 81D7269 waitmessage 64 BattleScript_1D7271: @ 81D7271 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn -gUnknown_081D7276:: @ 81D7276 +BattleScript_StatDown:: @ 81D7276 playanimation 2, 1, 0x20160a4 printfromtable BattleTextList_40157C waitmessage 64 @@ -609,7 +609,7 @@ MoveEffect_Haze: @ 81D7286 normalisebuffs printstring BATTLE_TEXT_StatElim waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Bide: @ 81D7297 attackcanceler @@ -619,7 +619,7 @@ MoveEffect_Bide: @ 81D7297 waitanimation orword 0x2024c6c, 0x8000000 setbide - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Rampage: @ 81D72AB attackcanceler @@ -690,7 +690,7 @@ BattleScript_1D7377: @ 81D7377 resultmessage waitmessage 64 jumpifbyte 4, 0x2024c68, 41, BattleScript_1D7396 - copyarray gUnknown_030041C0, 0x20160e0, 6 + copyarray gBattleTextBuff1, 0x20160e0, 6 printstring BATTLE_TEXT_HitMulti waitmessage 64 @@ -712,7 +712,7 @@ MoveEffect_Conversion: @ 81D73B1 waitanimation printstring BATTLE_TEXT_TypeTransform waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_FlinchHit: @ 81D73C6 setbyte 0x2024d21, 8 @@ -730,7 +730,7 @@ MoveEffect_RestoreHp: @ 81D73D1 datahpupdate USER printstring BATTLE_TEXT_RegainedHealth waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Toxic: @ 81D73F4 attackcanceler @@ -751,19 +751,19 @@ MoveEffect_Toxic: @ 81D73F4 seteffecttarget resultmessage waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D7455: @ 81D7455 pause 64 printstring BATTLE_TEXT_AlreadyPoisoned waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D7463: @ 81D7463 copyarray 0x2024c0a, 0x2024c08, 1 setbyte 0x2024d23, 0 - callatk BattleScript_1D98BD - jump BattleScript_1D6F62 + callatk BattleScript_PSNPrevention + jump BattleScript_EndTurn MoveEffect_PayDay: @ 81D747D setbyte 0x2024d21, 11 @@ -798,13 +798,13 @@ BattleScript_1D74C6: @ 81D74C6 pause 64 printfromtable BattleTextList_40156A waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D74D6: @ 81D74D6 pause 32 printstring BATTLE_TEXT_AttackingAsleep waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Ohko: @ 81D74E4 attackcanceler @@ -821,14 +821,14 @@ BattleScript_1D7505: @ 81D7505 pause 64 printfromtable BattleTextList_4015C8 waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_RazorWind: @ 81D7515 jumpifsecondarytstatus USER, S_CONTINUE, BattleScript_1D753D jumpifword 4, 0x2024c6c, 0x200, BattleScript_1D753D setbyte 0x2016055, 0 callatk BattleScript_1D756C - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D753D: @ 81D753D attackcanceler @@ -909,7 +909,7 @@ BattleScript_1D7632: @ 81D7632 pause 64 resultmessage waitmessage 64 - jumpifbyte 4, 0x2024c68, 8, BattleScript_1D6F62 + jumpifbyte 4, 0x2024c68, 8, BattleScript_EndTurn printstring BATTLE_TEXT_KeptGoingCrash waitmessage 64 atk5 @@ -922,7 +922,7 @@ BattleScript_1D7632: @ 81D7632 datahpupdate USER faintpokemon USER, 0, 0x0 orbyte 0x2024c68, 1 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Mist: @ 81D7676 attackcanceler @@ -933,7 +933,7 @@ MoveEffect_Mist: @ 81D7676 waitanimation printfromtable BattleTextList_4015A0 waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_FocusEnergy: @ 81D7689 attackcanceler @@ -945,7 +945,7 @@ MoveEffect_FocusEnergy: @ 81D7689 waitanimation printfromtable BattleTextList_4015A4 waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Recoil: @ 81D76A6 setbyte 0x2024d21, 206 @@ -968,13 +968,13 @@ MoveEffect_Confuse: @ 81D76BF seteffecttarget resultmessage waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D76FE: @ 81D76FE pause 32 printstring BATTLE_TEXT_AlreadyConfused waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_AttackUp2: @ 81D770C setbyte 0x201601e, 33 @@ -1005,7 +1005,7 @@ MoveEffect_Transform: @ 81D7743 waitanimation printfromtable BattleTextList_4015A8 waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_AttackDown2: @ 81D7756 setbyte 0x201601e, 161 @@ -1034,7 +1034,7 @@ BattleScript_1D7786: @ 81D7786 waitanimation printfromtable BattleTextList_401540 waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Poison: @ 81D7795 attackcanceler @@ -1055,7 +1055,7 @@ MoveEffect_Poison: @ 81D7795 seteffecttarget resultmessage waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Paralyze: @ 81D77F6 attackcanceler @@ -1075,19 +1075,19 @@ MoveEffect_Paralyze: @ 81D77F6 seteffecttarget resultmessage waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D784B: @ 81D784B pause 32 printstring BATTLE_TEXT_AlreadyParalyzed waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D7859: @ 81D7859 copyarray 0x2024c0a, 0x2024c08, 1 setbyte 0x2024d23, 0 - callatk BattleScript_1D98B1 - jump BattleScript_1D6F62 + callatk BattleScript_PRLZPrevention + jump BattleScript_EndTurn MoveEffect_AttackDownHit: @ 81D7873 setbyte 0x2024d21, 22 @@ -1118,7 +1118,7 @@ MoveEffect_SkyAttack: @ 81D78B5 jumpifword 4, 0x2024c6c, 0x200, BattleScript_1D753D setbyte 0x2016055, 3 callatk BattleScript_1D756C - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_ConfuseHit: @ 81D78DD setbyte 0x2024d21, 7 @@ -1154,13 +1154,13 @@ BattleScript_1D7922: @ 81D7922 BattleScript_1D7928: @ 81D7928 printfromtable BattleTextList_4015AC waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D7935: @ 81D7935 pause 32 printstring BATTLE_TEXT_SubAlready waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Recharge: @ 81D7943 attackcanceler @@ -1171,7 +1171,7 @@ MoveEffect_Recharge: @ 81D7943 gUnknown_081D7956:: @ 81D7956 printstring BATTLE_TEXT_MustRecharge waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Rage: @ 81D7961 attackcanceler @@ -1197,7 +1197,7 @@ MoveEffect_Mimic: @ 81D7988 waitanimation printstring BATTLE_TEXT_LearnedMove2 waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Metronome: @ 81D79AE attackcanceler @@ -1223,7 +1223,7 @@ BattleScript_1D79D9: @ 81D79D9 waitanimation printfromtable BattleTextList_40154C waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Splash: @ 81D79E9 attackcanceler @@ -1234,7 +1234,7 @@ MoveEffect_Splash: @ 81D79E9 atk60 26 printstring BATTLE_TEXT_Nothing waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Disable: @ 81D79FB attackcanceler @@ -1246,7 +1246,7 @@ MoveEffect_Disable: @ 81D79FB waitanimation printstring BATTLE_TEXT_MoveWasDisabled waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_LevelDamage: @ 81D7A17 attackcanceler @@ -1290,7 +1290,7 @@ MoveEffect_Encore: @ 81D7A5D waitanimation printstring BATTLE_TEXT_EncoreGot waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_PainSplit: @ 81D7A79 attackcanceler @@ -1308,7 +1308,7 @@ MoveEffect_PainSplit: @ 81D7A79 datahpupdate TARGET printstring BATTLE_TEXT_PainSplit waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Snore: @ 81D7AB0 attackcanceler @@ -1339,7 +1339,7 @@ MoveEffect_Conversion2: @ 81D7AEA waitanimation printstring BATTLE_TEXT_TypeTransform waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_LockOn: @ 81D7AFF attackcanceler @@ -1352,7 +1352,7 @@ MoveEffect_LockOn: @ 81D7AFF waitanimation printstring BATTLE_TEXT_TookAim waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Sketch: @ 81D7B21 attackcanceler @@ -1364,7 +1364,7 @@ MoveEffect_Sketch: @ 81D7B21 waitanimation printstring BATTLE_TEXT_SketchedMove waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_SleepTalk: @ 81D7B40 attackcanceler @@ -1400,7 +1400,7 @@ MoveEffect_DestinyBond: @ 81D7B82 waitanimation printstring BATTLE_TEXT_DestinyBondTake waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Flail: @ 81D7B93 remaininghptopower @@ -1416,7 +1416,7 @@ MoveEffect_Spite: @ 81D7B99 waitanimation printstring BATTLE_TEXT_ReducedBy waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_HealBell: @ 81D7BB5 attackcanceler @@ -1441,7 +1441,7 @@ BattleScript_1D7BE1: @ 81D7BE1 BattleScript_1D7BF2: @ 81D7BF2 atk98 4 waitstateatk - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_TripleKick: @ 81D7BFA attackcanceler @@ -1493,7 +1493,7 @@ BattleScript_1D7C90: @ 81D7C90 resultmessage waitmessage 64 jumpifbyte 0, 0x20160e4, 0, BattleScript_1D7CAF - copyarray gUnknown_030041C0, 0x20160e0, 6 + copyarray gBattleTextBuff1, 0x20160e0, 6 printstring BATTLE_TEXT_HitMulti waitmessage 64 @@ -1520,7 +1520,7 @@ MoveEffect_MeanLook: @ 81D7CCC seteffecttarget printstring BATTLE_TEXT_CantEscapeNow waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Nightmare: @ 81D7CF4 attackcanceler @@ -1538,7 +1538,7 @@ BattleScript_1D7D1A: @ 81D7D1A seteffecttarget printstring BATTLE_TEXT_NightmareStart waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Minimize: @ 81D7D2E attackcanceler @@ -1578,7 +1578,7 @@ BattleScript_1D7D9A: @ 81D7D9A waitmessage 64 BattleScript_1D7DAE: @ 81D7DAE - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D7DB3: @ 81D7DB3 jumpifarraynotequal 0x2024c07, 0x2024c08, 1, BattleScript_1D7DC4 @@ -1599,7 +1599,7 @@ BattleScript_1D7DC4: @ 81D7DC4 printstring BATTLE_TEXT_CurseLay waitmessage 64 faintpokemon USER, 0, 0x0 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Endure: @ 81D7DFD MoveEffect_Protect: @ 81D7DFD @@ -1611,7 +1611,7 @@ MoveEffect_Protect: @ 81D7DFD waitanimation printfromtable BattleTextList_40153A waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Spikes: @ 81D7E10 attackcanceler @@ -1622,7 +1622,7 @@ MoveEffect_Spikes: @ 81D7E10 waitanimation printstring BATTLE_TEXT_SpikesScattered waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Foresight: @ 81D7E25 attackcanceler @@ -1634,7 +1634,7 @@ MoveEffect_Foresight: @ 81D7E25 waitanimation printstring BATTLE_TEXT_IdentifiedPoke waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_PerishSong: @ 81D7E3D attackcanceler @@ -1653,7 +1653,7 @@ BattleScript_1D7E53: @ 81D7E53 BattleScript_1D7E5A: @ 81D7E5A addbyte 0x2016003, 1 jumpifarraynotequal 0x2016003, 0x2024a68, 1, BattleScript_1D7E53 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D7E73: @ 81D7E73 printstring BATTLE_TEXT_BlocksOther2 @@ -1703,7 +1703,7 @@ BattleScript_1D7EE5: @ 81D7EE5 jumpifhalverset TARGET, 32, BattleScript_1D9037 setbyte 0x2024d21, 7 seteffecttarget - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_FuryCutter: @ 81D7F00 attackcanceler @@ -1730,7 +1730,7 @@ MoveEffect_Attract: @ 81D7F1F waitanimation printstring BATTLE_TEXT_FellLove waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Frustration: @ 81D7F3B MoveEffect_Return: @ 81D7F3B @@ -1788,7 +1788,7 @@ MoveEffect_BatonPass: @ 81D7F7C switch3 USER, 1 waitstateatk atk52 USER - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_RapidSpin: @ 81D7FA9 setbyte 0x2024d21, 163 @@ -1833,7 +1833,7 @@ BattleScript_1D7FFA: @ 81D7FFA printfromtable BattleTextList_40151C waitmessage 64 callatk BattleScript_1D9761 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_SunnyDay: @ 81D800E attackcanceler @@ -1866,7 +1866,7 @@ MoveEffect_BellyDrum: @ 81D8038 datahpupdate USER printstring BATTLE_TEXT_CutHPMaxATK waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_PsychUp: @ 81D805A attackcanceler @@ -1877,7 +1877,7 @@ MoveEffect_PsychUp: @ 81D805A waitanimation printstring BATTLE_TEXT_CopyStatChanges waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_MirrorCoat: @ 81D806F attackcanceler @@ -1903,7 +1903,7 @@ MoveEffect_SkullBash: @ 81D8085 waitmessage 64 BattleScript_1D80CF: @ 81D80CF - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Twister: @ 81D80D4 jumpifspecialstatusflag TARGET, 0x40, 1, BattleScript_1D80EE @@ -1976,7 +1976,7 @@ MoveEffect_FutureSight: @ 81D817D waitanimation printfromtable BattleTextList_4015E2 waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Gust: @ 81D8194 jumpifspecialstatusflag TARGET, 0x40, 1, BattleScript_1D6F14 @@ -1999,7 +1999,7 @@ BattleScript_1D81E1: @ 81D81E1 jumpifword 4, 0x2024c6c, 0x200, BattleScript_1D753D setbyte 0x2016055, 1 callatk BattleScript_1D756C - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D8209: @ 81D8209 orword 0x2024c6c, 0x8000000 @@ -2026,7 +2026,7 @@ MoveEffect_Teleport: @ 81D8233 printstring BATTLE_TEXT_FledBattle waitmessage 64 setbyte 0x2024d26, 5 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_BeatUp: @ 81D826E attackcanceler @@ -2088,7 +2088,7 @@ BattleScript_1D8322: @ 81D8322 BattleScript_1D8328: @ 81D8328 callatk BattleScript_1D756C hidepreattack - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D8333: @ 81D8333 attackcanceler @@ -2136,13 +2136,13 @@ BattleScript_1D839B:: @ 81D839B datahpupdate TARGET printstring BATTLE_TEXT_RegainedHealth waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D83B5:: @ 81D83B5 pause 32 printstring BATTLE_TEXT_HPFull waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_FakeOut: @ 81D83C3 attackcanceler @@ -2161,14 +2161,14 @@ BattleScript_1D83D6:: @ 81D83D6 orbyte 0x2024c68, 32 resultmessage waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D83E8: @ 81D83E8 pause 32 orbyte 0x2024c68, 8 resultmessage waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Uproar: @ 81D83FA attackcanceler @@ -2191,7 +2191,7 @@ MoveEffect_Stockpile: @ 81D841A waitanimation printfromtable BattleTextList_40155E waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_SpitUp: @ 81D842D attackcanceler @@ -2208,7 +2208,7 @@ BattleScript_1D844E: @ 81D844E pause 32 printstring BATTLE_TEXT_SpitUpFail waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D845C: @ 81D845C attackstring @@ -2217,7 +2217,7 @@ BattleScript_1D845C: @ 81D845C stockpiletobasedamage BattleScript_1D844E resultmessage waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Swallow: @ 81D846F attackcanceler @@ -2230,7 +2230,7 @@ BattleScript_1D847C: @ 81D847C pause 32 printfromtable BattleTextList_401566 waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Hail: @ 81D848C attackcanceler @@ -2249,7 +2249,7 @@ MoveEffect_Torment: @ 81D8495 waitanimation printstring BATTLE_TEXT_TormentSubject waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Flatter: @ 81D84B1 attackcanceler @@ -2273,7 +2273,7 @@ BattleScript_1D84F4: @ 81D84F4 jumpifhalverset TARGET, 32, BattleScript_1D9037 setbyte 0x2024d21, 7 seteffecttarget - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_WillOWisp: @ 81D850F attackcanceler @@ -2290,19 +2290,19 @@ MoveEffect_WillOWisp: @ 81D850F waitanimation setbyte 0x2024d21, 3 seteffecttarget - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D855B: @ 81D855B copyarray 0x2024c0a, 0x2024c08, 1 setbyte 0x2024d23, 0 - callatk BattleScript_1D98A5 - jump BattleScript_1D6F62 + callatk BattleScript_BRNPrevention + jump BattleScript_EndTurn BattleScript_1D8575: @ 81D8575 pause 32 printstring BATTLE_TEXT_AlreadyBurned waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Memento: @ 81D8583 attackcanceler @@ -2333,7 +2333,7 @@ BattleScript_1D85D0: @ 81D85D0 BattleScript_1D85F3: @ 81D85F3 faintpokemon USER, 0, 0x0 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D85FF: @ 81D85FF printstring BATTLE_TEXT_NoEffect @@ -2352,7 +2352,7 @@ BattleScript_1D8611: @ 81D8611 resultmessage waitmessage 64 faintpokemon USER, 0, 0x0 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Facade: @ 81D8626 jumpifstatus USER, PSN | BRN | PAR | TOX, BattleScript_1D8635 @@ -2368,7 +2368,7 @@ MoveEffect_FocusPunch: @ 81D8640 ppreduce printstring BATTLE_TEXT_LostFocus waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Smellingsalt: @ 81D8652 jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D6F14 @@ -2389,7 +2389,7 @@ MoveEffect_FollowMe: @ 81D867C waitanimation printstring BATTLE_TEXT_CenterAttention waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_NaturePower: @ 81D868D attackcanceler @@ -2409,7 +2409,7 @@ MoveEffect_Charge: @ 81D869A waitanimation printstring BATTLE_TEXT_ChargingPower waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Taunt: @ 81D86AB attackcanceler @@ -2421,7 +2421,7 @@ MoveEffect_Taunt: @ 81D86AB waitanimation printstring BATTLE_TEXT_TauntFell waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_HelpingHand: @ 81D86C7 attackcanceler @@ -2432,7 +2432,7 @@ MoveEffect_HelpingHand: @ 81D86C7 waitanimation printstring BATTLE_TEXT_ReadyToHelp waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Trick: @ 81D86DC attackcanceler @@ -2447,7 +2447,7 @@ MoveEffect_Trick: @ 81D86DC waitmessage 64 printfromtable BattleTextList_401642 waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_RolePlay: @ 81D870A attackcanceler @@ -2459,7 +2459,7 @@ MoveEffect_RolePlay: @ 81D870A waitanimation printstring BATTLE_TEXT_CopiedObject waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Wish: @ 81D8726 attackcanceler @@ -2468,7 +2468,7 @@ MoveEffect_Wish: @ 81D8726 atkd4 0, BattleScript_1D83D6 attackanimation waitanimation - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Assist: @ 81D8736 attackcanceler @@ -2489,7 +2489,7 @@ MoveEffect_Ingrain: @ 81D874D waitanimation printstring BATTLE_TEXT_PlantedRoots waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Superpower: @ 81D8762 setbyte 0x2024d21, 229 @@ -2504,7 +2504,7 @@ MoveEffect_MagicCoat: @ 81D876D waitanimation printstring BATTLE_TEXT_ShroudedItself waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Recycle: @ 81D8782 attackcanceler @@ -2515,7 +2515,7 @@ MoveEffect_Recycle: @ 81D8782 waitanimation printstring BATTLE_TEXT_FoundOne waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Revenge: @ 81D8797 doubledamagedealtifdamaged @@ -2554,7 +2554,7 @@ BattleScript_1D87D0: @ 81D87D0 waitmessage 64 seteffectwithchancetarget faintpokemon TARGET, 0, 0x0 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Yawn: @ 81D87EE attackcanceler @@ -2571,7 +2571,7 @@ MoveEffect_Yawn: @ 81D87EE waitanimation printstring BATTLE_TEXT_DrowsyMade waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D882F: @ 81D882F copyarray 0x2016003, 0x20160f8, 1 @@ -2580,7 +2580,7 @@ BattleScript_1D8839: @ 81D8839 pause 32 printstring BATTLE_TEXT_MadeIneffective2 waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_KnockOff: @ 81D8847 setbyte 0x2024d21, 54 @@ -2614,7 +2614,7 @@ MoveEffect_SkillSwap: @ 81D8893 waitanimation printstring BATTLE_TEXT_AbilitySwap waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Imprison: @ 81D88AF attackcanceler @@ -2625,7 +2625,7 @@ MoveEffect_Imprison: @ 81D88AF waitanimation printstring BATTLE_TEXT_SealedMove waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Refresh: @ 81D88C4 attackcanceler @@ -2637,7 +2637,7 @@ MoveEffect_Refresh: @ 81D88C4 printstring BATTLE_TEXT_StatusNormal waitmessage 64 atk98 1 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Grudge: @ 81D88DB attackcanceler @@ -2648,7 +2648,7 @@ MoveEffect_Grudge: @ 81D88DB waitanimation printstring BATTLE_TEXT_GrudgeBear waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Snatch: @ 81D88F0 attackcanceler @@ -2660,7 +2660,7 @@ MoveEffect_Snatch: @ 81D88F0 pause 32 printstring BATTLE_TEXT_AwaitMove waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_LowKick: @ 81D8908 attackcanceler @@ -2745,7 +2745,7 @@ MoveEffect_WaterSport: @ 81D89D7 waitanimation printfromtable BattleTextList_4015D4 waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_PoisonFang: @ 81D89EE setbyte 0x2024d21, 6 @@ -2788,14 +2788,14 @@ BattleScript_1D8A55: @ 81D8A55 waitmessage 64 BattleScript_1D8A78: @ 81D8A78 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D8A7D: @ 81D8A7D pause 32 orbyte 0x2024c68, 32 printstring BATTLE_TEXT_StatNoLower waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_CosmicPower: @ 81D8A91 attackcanceler @@ -2823,7 +2823,7 @@ BattleScript_1D8AD1: @ 81D8AD1 waitmessage 64 BattleScript_1D8AF0: @ 81D8AF0 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_SkyUppercut: @ 81D8AF5 orword 0x2024c6c, 0x10000 @@ -2855,7 +2855,7 @@ BattleScript_1D8B43: @ 81D8B43 waitmessage 64 BattleScript_1D8B62: @ 81D8B62 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_CalmMind: @ 81D8B67 attackcanceler @@ -2883,14 +2883,14 @@ BattleScript_1D8BA7: @ 81D8BA7 waitmessage 64 BattleScript_1D8BC6: @ 81D8BC6 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D8BCB: @ 81D8BCB pause 32 orbyte 0x2024c68, 32 printstring BATTLE_TEXT_StatNoHigher waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_DragonDance: @ 81D8BDF attackcanceler @@ -2918,7 +2918,7 @@ BattleScript_1D8C1F: @ 81D8C1F waitmessage 64 BattleScript_1D8C3E: @ 81D8C3E - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Camouflage: @ 81D8C43 attackcanceler @@ -2929,7 +2929,7 @@ MoveEffect_Camouflage: @ 81D8C43 waitanimation printstring BATTLE_TEXT_TypeTransform waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn gUnknown_081D8C58:: @ 81D8C58 atk56 1 @@ -3188,11 +3188,11 @@ BattleScript_1D8EAD: @ 81D8EAD BattleScript_1D8EEE: @ 81D8EEE return -gUnknown_081D8EEF:: @ 81D8EEF +BattleScript_Pausex20:: @ 81D8EEF pause 32 return -gUnknown_081D8EF3:: @ 81D8EF3 +BattleScript_LevelUp:: @ 81D8EF3 atk55 0xe10016f attackcanceler setbyte 0x201609c, 0 @@ -3338,7 +3338,7 @@ BattleScript_1D9083: @ 81D9083 gUnknown_081D90A7:: @ 81D90A7 printstring BATTLE_TEXT_StoringEnergy waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn gUnknown_081D90B2:: @ 81D90B2 printstring BATTLE_TEXT_UnleashedEnergy @@ -3359,7 +3359,7 @@ gUnknown_081D90B2:: @ 81D90B2 resultmessage waitmessage 64 faintpokemon TARGET, 0, 0x0 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn gUnknown_081D90F1:: @ 81D90F1 printstring BATTLE_TEXT_UnleashedEnergy @@ -3383,7 +3383,7 @@ BattleScript_1D9116: @ 81D9116 waitstateatk printstring BATTLE_TEXT_DraggedOut atk52 TARGET - jump BattleScript_1D6F62 + jump BattleScript_EndTurn gUnknown_081D9128:: @ 81D9128 pause 32 @@ -3399,7 +3399,7 @@ gUnknown_081D9132:: @ 81D9132 gUnknown_081D9139:: @ 81D9139 printstring BATTLE_TEXT_MoveIsDisabled waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn gUnknown_081D9144:: @ 81D9144 printstring2 BATTLE_TEXT_MoveIsDisabled @@ -3527,7 +3527,7 @@ BattleScript_1D92AB: @ 81D92AB BattleScript_1D92BF: @ 81D92BF return -gUnknown_081D92C0:: @ 81D92C0 +BattleScript_RapidSpinAway:: @ 81D92C0 breakfree return @@ -3601,19 +3601,19 @@ gUnknown_081D9369:: @ 81D9369 printstring2 BATTLE_TEXT_NoPP1 atk44 -gUnknown_081D936D:: @ 81D936D +BattleScript_NoPPForMove:: @ 81D936D attackstring pause 32 printstring BATTLE_TEXT_NoPP2 waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn gUnknown_081D937C:: @ 81D937C printstring2 BATTLE_TEXT_TormentNoUse atk44 printstring BATTLE_TEXT_TormentNoUse waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn gUnknown_081D938B:: @ 81D938B printstring2 BATTLE_TEXT_TauntNoUse @@ -3622,7 +3622,7 @@ gUnknown_081D938B:: @ 81D938B gUnknown_081D938F:: @ 81D938F printstring BATTLE_TEXT_TauntNoUse waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn gUnknown_081D939A:: @ 81D939A atkd4 1, BattleScript_1D93C1 @@ -3657,7 +3657,7 @@ BattleScript_1D93EC: @ 81D93EC pause 32 printstring BATTLE_TEXT_AnchoredItself waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn gUnknown_081D93FA:: @ 81D93FA setbyte 0x20160dc, 0 @@ -3680,7 +3680,7 @@ BattleScript_1D9427: @ 81D9427 BattleScript_1D944A: @ 81D944A return -gUnknown_081D944B:: @ 81D944B +BattleScript_KnockedOff:: @ 81D944B playanimation TARGET, 5, 0x0 printstring BATTLE_TEXT_KnockedOffItem waitmessage 64 @@ -3689,7 +3689,7 @@ gUnknown_081D944B:: @ 81D944B gUnknown_081D9459:: @ 81D9459 printstring BATTLE_TEXT_SealedNoUse waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn gUnknown_081D9464:: @ 81D9464 printstring2 BATTLE_TEXT_SealedNoUse @@ -3700,7 +3700,7 @@ gUnknown_081D9468:: @ 81D9468 waitmessage 64 return -gUnknown_081D946F:: @ 81D946F +BattleScript_MagicCoatBounce:: @ 81D946F attackstring ppreduce pause 32 @@ -3710,7 +3710,7 @@ gUnknown_081D946F:: @ 81D946F atk76 USER, 1 return -gUnknown_081D9487:: @ 81D9487 +BattleScript_SnatchedMove:: @ 81D9487 attackstring ppreduce snatchmove @@ -3721,12 +3721,12 @@ gUnknown_081D9487:: @ 81D9487 atk5f return -gUnknown_081D94A2:: @ 81D94A2 +BattleScript_EnduredMsg:: @ 81D94A2 printstring BATTLE_TEXT_EnduredHit waitmessage 64 return -gUnknown_081D94A9:: @ 81D94A9 +BattleScript_OneHitKOMsg:: @ 81D94A9 printstring BATTLE_TEXT_GrandSlam waitmessage 64 return @@ -3755,7 +3755,7 @@ gUnknown_081D94EE:: @ 81D94EE printstring BATTLE_TEXT_FastAsleep waitmessage 64 statusanimation USER - jump BattleScript_1D6F62 + jump BattleScript_EndTurn gUnknown_081D94FB:: @ 81D94FB bicword 0x2024c6c, 0x10 @@ -3796,7 +3796,7 @@ gUnknown_081D9545:: @ 81D9545 printstring BATTLE_TEXT_FrozenSolid waitmessage 64 statusanimation USER - jump BattleScript_1D6F62 + jump BattleScript_EndTurn gUnknown_081D9552:: @ 81D9552 printfromtable BattleTextList_4015C4 @@ -3814,12 +3814,12 @@ gUnknown_081D9566:: @ 81D9566 printstring BATTLE_TEXT_Paralyzed3 waitmessage 64 statusanimation USER - jump BattleScript_1D6F62 + jump BattleScript_EndTurn gUnknown_081D9573:: @ 81D9573 printstring BATTLE_TEXT_Flinched waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn gUnknown_081D957E:: @ 81D957E printfromtable BattleTextList_40155A @@ -3850,7 +3850,7 @@ BattleScript_1D95AC: @ 81D95AC graphicalhpupdate USER datahpupdate USER faintpokemon USER, 0, 0x0 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D95D3: @ 81D95D3 return @@ -3885,7 +3885,7 @@ gUnknown_081D95FB:: @ 81D95FB gUnknown_081D9608:: @ 81D9608 printstring BATTLE_TEXT_ImmobilizedBy waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn gUnknown_081D9613:: @ 81D9613 printstring BATTLE_TEXT_NightmareLock @@ -3899,7 +3899,7 @@ gUnknown_081D9624:: @ 81D9624 atk65 1, 0x10000000 jump BattleScript_1D9520 -gUnknown_081D9635:: @ 81D9635 +BattleScript_TargetPRLZHeal:: @ 81D9635 printstring BATTLE_TEXT_ParalysisHealed waitmessage 64 atk98 0 @@ -3990,7 +3990,7 @@ BattleScript_1D96DB: @ 81D96DB BattleScript_1D96F5: @ 81D96F5 return -gUnknown_081D96F6:: @ 81D96F6 +BattleScript_ItemSteal:: @ 81D96F6 playanimation TARGET, 16, 0x0 printstring BATTLE_TEXT_StoleSomething waitmessage 64 @@ -4103,7 +4103,7 @@ gUnknown_081D97FE:: @ 81D97FE callatk BattleScript_1D9761 end3 -gUnknown_081D9812:: @ 81D9812 +BattleScript_TookAttack:: @ 81D9812 attackstring pause 32 printstring BATTLE_TEXT_TookAttack2 @@ -4115,13 +4115,13 @@ gUnknown_081D9826:: @ 81D9826 pause 32 printstring BATTLE_TEXT_ProtectedBy pause 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn gUnknown_081D9834:: @ 81D9834 pause 32 printstring BATTLE_TEXT_PreventedBy pause 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn gUnknown_081D9842:: @ 81D9842 ppreduce @@ -4135,7 +4135,7 @@ gUnknown_081D9843:: @ 81D9843 printstring BATTLE_TEXT_HPRestoredUsing waitmessage 64 orbyte 0x2024c68, 8 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn gUnknown_081D9865:: @ 81D9865 ppreduce @@ -4146,7 +4146,7 @@ gUnknown_081D9866:: @ 81D9866 printstring BATTLE_TEXT_MadeUseless waitmessage 64 orbyte 0x2024c68, 8 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn gUnknown_081D987B:: @ 81D987B ppreduce @@ -4156,13 +4156,13 @@ gUnknown_081D987C:: @ 81D987C pause 32 printfromtable BattleTextList_401648 waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D988D: @ 81D988D pause 32 printstring BATTLE_TEXT_AnchorsItself waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn gUnknown_081D989B:: @ 81D989B pause 32 @@ -4170,19 +4170,19 @@ gUnknown_081D989B:: @ 81D989B waitmessage 64 return -BattleScript_1D98A5:: @ 81D98A5 +BattleScript_BRNPrevention:: @ 81D98A5 pause 32 printfromtable BattleTextList_401630 waitmessage 64 return -BattleScript_1D98B1:: @ 81D98B1 +BattleScript_PRLZPrevention:: @ 81D98B1 pause 32 printfromtable BattleTextList_401636 waitmessage 64 return -BattleScript_1D98BD:: @ 81D98BD +BattleScript_PSNPrevention:: @ 81D98BD pause 32 printfromtable BattleTextList_40163C waitmessage 64 @@ -4192,19 +4192,19 @@ gUnknown_081D98C9:: @ 81D98C9 pause 32 printstring BATTLE_TEXT_PreventedRomance waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn -gUnknown_081D98D7:: @ 81D98D7 +BattleScript_FlinchPrevention:: @ 81D98D7 pause 32 printstring BATTLE_TEXT_PreventedFlinching waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D98E5: @ 81D98E5 pause 32 printstring BATTLE_TEXT_PreventedConfusion waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn gUnknown_081D98F3:: @ 81D98F3 attackstring @@ -4212,7 +4212,7 @@ gUnknown_081D98F3:: @ 81D98F3 pause 32 printstring BATTLE_TEXT_BlocksOther waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn gUnknown_081D9903:: @ 81D9903 pause 32 @@ -4221,11 +4221,11 @@ gUnknown_081D9903:: @ 81D9903 setbyte 0x2024d23, 3 return -gUnknown_081D9913:: @ 81D9913 +BattleScript_NoItemSteal:: @ 81D9913 pause 32 printstring BATTLE_TEXT_MadeIneffective waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn gUnknown_081D9921:: @ 81D9921 printstring BATTLE_TEXT_MadeType @@ -4296,7 +4296,7 @@ gUnknown_081D99A0:: @ 81D99A0 waitmessage 64 jump BattleScript_1D95AC -gUnknown_081D99AB:: @ 81D99AB +BattleScript_SubstituteFade:: @ 81D99AB playanimation TARGET, 2, 0x0 printstring BATTLE_TEXT_SubFaded return @@ -4429,7 +4429,7 @@ gUnknown_081D9AC2:: @ 81D9AC2 printstring2 BATTLE_TEXT_ChoiceBand atk44 -gUnknown_081D9AC6:: @ 81D9AC6 +BattleScript_HangedOnMsg:: @ 81D9AC6 playanimation TARGET, 9, 0x0 printstring BATTLE_TEXT_FocusSash waitmessage 64 @@ -4455,7 +4455,7 @@ gUnknown_081D9AFE:: @ 81D9AFE BattleScript_1D9B0B: @ 81D9B0B setbyte 0x2024d23, 4 - callatk gUnknown_081D71E5 + callatk BattleScript_StatUp removeitem USER end2 diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s index 0ed54d11e..3f0dc8af1 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -52,7 +52,7 @@ BattleScript_1D9EBC: @ 81D9EBC pokemoncatchfunction gUnknown_081D9EC2:: @ 81D9EC2 - jumpifhalfword 0, gUnknown_02024C04, 5, BattleScript_1D9ED0 + jumpifhalfword 0, gLastUsedItem, 5, BattleScript_1D9ED0 atk60 11 BattleScript_1D9ED0: @ 81D9ED0 @@ -60,25 +60,25 @@ BattleScript_1D9ED0: @ 81D9ED0 capturesomethingf1 BattleScript_1D9EE3 printstring BATTLE_TEXT_AddedToDex waitstateatk - setbyte gUnknown_02024D1E, 0 + setbyte gBattleCommunication, 0 capturesomethingf2 BattleScript_1D9EE3: @ 81D9EE3 printstring BATTLE_TEXT_GiveNickname waitstateatk - setbyte gUnknown_02024D1E, 0 + setbyte gBattleCommunication, 0 capturesomethingf3 BattleScript_1D9EF8 printstring BATTLE_TEXT_SentToPC waitmessage 64 BattleScript_1D9EF8: @ 81D9EF8 catchpoke - setbyte gUnknown_02024D26, 7 + setbyte gBattleOutcome, 7 activesidesomething gUnknown_081D9F00:: @ 81D9F00 printstring BATTLE_TEXT_BallCaught2 - setbyte gUnknown_02024D26, 7 + setbyte gBattleOutcome, 7 activesidesomething gUnknown_081D9F0A:: @ 81D9F0A @@ -88,7 +88,7 @@ gUnknown_081D9F0A:: @ 81D9F0A jumpifbyte 1, gNumSafariBalls, 0, BattleScript_1D9F34 printstring BATTLE_TEXT_SafariOver waitmessage 64 - setbyte gUnknown_02024D26, 8 + setbyte gBattleOutcome, 8 BattleScript_1D9F34: @ 81D9F34 atkf6 @@ -112,7 +112,7 @@ BattleScript_1D9F4F: @ 81D9F4F printstring BATTLE_TEXT_Used2 waitmessage 64 atk75 - orword gUnknown_02024C6C, 0x100 + orword gHitMarker, 0x100 graphicalhpupdate USER datahpupdate USER printstring BATTLE_TEXT_RestoredHealth @@ -161,7 +161,7 @@ BattleScript_1D9FBB: @ 81D9FBB BattleScript_1D9FDA: @ 81D9FDA atk54 17 - setbyte gUnknown_02024D26, 4 + setbyte gBattleOutcome, 4 activesidesomething BattleScript_1D9FE4: @ 81D9FE4 diff --git a/data/data2.s b/data/data2.s index b8b6dc7db..00ef5c26e 100644 --- a/data/data2.s +++ b/data/data2.s @@ -1029,79 +1029,79 @@ gUnknown_081FA724:: @ 81FA724 .2byte 0xFFFF .align 2 -gUnknown_081FA73C:: @ 81FA73C +gBattleScriptingCommandsTable:: @ 81FA73C .4byte atk00_attackcanceler .4byte atk01_accuracycheck .4byte atk02_attackstring .4byte atk03_ppreduce .4byte atk04_critcalc .4byte atk05_damagecalc1 - .4byte atk06_damagecalc2 - .4byte atk07_damagecalc3 - .4byte atk08_cmd8 - .4byte sub_801D8EC - .4byte sub_801DA60 - .4byte sub_801DA80 + .4byte atk06_typecalc + .4byte atk07_dmg_adjustment + .4byte atk08_dmg_adjustment2 + .4byte atk09_attackanimation + .4byte atk0A_waitanimation + .4byte atk0B_healthbarupdate .4byte atk0C_datahpupdate .4byte atk0D_critmessage - .4byte atk0E_missmessage + .4byte atk0E_effectiveness_sound .4byte atk0F_resultmessage .4byte atk10_printstring - .4byte atk11_printstring2 + .4byte atk11_printstring_playeronly .4byte atk12_waitmessage .4byte atk13_printfromtable - .4byte atk14_printfromtable2 + .4byte atk14_printfromtable_playeronly .4byte atk15_seteffectwithchancetarget - .4byte sub_801F708 - .4byte sub_801F718 - .4byte sub_801F728 - .4byte sub_801F7AC - .4byte sub_801FB34 - .4byte atkE2_cmde2 + .4byte atk16_seteffectprimary + .4byte atk17_seteffectsecondary + .4byte atk18_status_effect_clear + .4byte atk19_faint_pokemon + .4byte atk1A_faint_animation + .4byte atk1B_faint_effects_clear .4byte atk1C_jumpifstatus - .4byte atk1D_jumpifsecondarystatus + .4byte atk1D_jumpifstatus2 .4byte atk1E_jumpifability - .4byte sub_801FDB4 - .4byte sub_801FE2C - .4byte atk21_jumpifspecialstatusflag - .4byte sub_801FFA8 - .4byte sub_8020004 - .4byte sub_80209B4 - .4byte atk25_resetflags - .4byte sub_8020BB4 - .4byte atk27_cmd27 - .4byte sub_8020C14 + .4byte atk1F_jumpifsideaffecting + .4byte atk20_jumpifstat + .4byte atk21_jumpifstatus3 + .4byte atk22_jumpiftype + .4byte atk23_getexp + .4byte atk24 + .4byte atk25_move_values_cleanup + .4byte atk26_set_multihit + .4byte atk27_decrement_multihit + .4byte atk28_goto .4byte atk29_jumpifbyte - .4byte sub_8020CD4 - .4byte sub_8020D7C - .4byte sub_8020E30 - .4byte sub_8020EB8 - .4byte sub_8020F3C - .4byte sub_8020F64 - .4byte sub_8020F90 + .4byte atk2A_jumpifhalfword + .4byte atk2B_jumpifword + .4byte atk2C_jumpifarrayequal + .4byte atk2D_jumpifarraynotequal + .4byte atk2E_setbyte + .4byte atk2F_addbyte + .4byte atk30_subbyte .4byte atk31_copyarray - .4byte atk32_memcpy_with_offset - .4byte sub_802107C + .4byte atk32_copyarray_withindex + .4byte atk33_orbyte .4byte atk34_orhalfword .4byte atk35_orword - .4byte sub_8021124 + .4byte atk36_bicbyte .4byte atk37_bichalfword .4byte atk38_bicword .4byte atk39_pause - .4byte sub_802120C - .4byte atk3B_8022C68 + .4byte atk3A_waitstate + .4byte atk3B_healthbar_update .4byte atk3C_return - .4byte sub_8021290 - .4byte sub_80212B0 + .4byte atk3D_end + .4byte atk3E_end2 .4byte atk3F_end3 - .4byte atk40_801DBA0 + .4byte atk40_jump_if_move_affected_by_protect .4byte atk41_call .4byte atk42_jumpiftype2 - .4byte sub_8021384 - .4byte sub_80213D0 - .4byte atk46_cmd46 - .4byte sub_80214B4 - .4byte atk47 + .4byte atk43_jumpifabilitypresent + .4byte atk44 + .4byte atk45_playanimation + .4byte atk46_playanimation2 + .4byte atk47_setgraphicalstatchangevalues_setgraphicalstatchangevalues_setgraphicalstatchangevalues .4byte atk48_playstatchangeanimation .4byte sub_80217F8 .4byte atk4A_damageflags @@ -1305,7 +1305,7 @@ gCriticalHitChance:: @ 81FAB50 .2byte 2 @ +4 .align 2 -gUnknown_081FAB5C:: @ 81FAB5C +gStatusFlagsForMoveEffects:: @ 81FAB5C .4byte 0x00000000 .4byte 0x00000007 .4byte 0x00000008 @@ -1368,7 +1368,7 @@ gUnknown_081FAB5C:: @ 81FAB5C .4byte 0x00000000 .align 2 -gUnknown_081FAC4C:: @ 81FAC4C +gMoveEffectBS_Ptrs:: @ 81FAC4C .4byte BattleScript_1D963E .4byte BattleScript_1D963E .4byte BattleScript_1D965A @@ -1514,38 +1514,38 @@ gBallCatchBonuses:: @ 81FAD90 .string "ターン$" @ "turn" .align 2 -gUnknown_081FAD98:: @ 81FAD98 - .4byte dp01t_00_1_getattr +gPlayerBufferCommands:: @ 81FAD98 + .4byte PlayerHandleGetAttributes .4byte sub_802ECF0 - .4byte dp01t_02_1_setattr + .4byte PlayerHandleSetAttributes .4byte sub_802F7CC - .4byte sub_802F840 - .4byte sub_802F8A8 - .4byte sub_802FAA0 - .4byte sub_802FBB4 - .4byte sub_802FCE0 - .4byte sub_802FDBC + .4byte PlayerHandleLoadPokeSprite + .4byte PlayerHandleSendOutPoke + .4byte PlayerHandleReturnPokeToBall + .4byte PlayerHandleTrainerThrow + .4byte PlayerHandleTrainerSlide + .4byte PlayerHandleTrainerSlideBack .4byte sub_802FE7C .4byte sub_802FF60 .4byte sub_802FF80 - .4byte sub_802FFD0 - .4byte sub_803002C - .4byte dp01t_0F_1_move_anim - .4byte sub_80302F4 - .4byte dp01t_11_1_message_for_player_only + .4byte PlayerHandleBallThrow + .4byte PlayerHandlePuase + .4byte PlayerHandleMoveAnimation + .4byte PlayerHandlePrintString + .4byte PlayerHandlePrintStringPlayerOnly .4byte sub_803037C .4byte nullsub_42 .4byte sub_8030468 - .4byte sub_8030530 + .4byte PlayerHandleOpenBag .4byte sub_8030594 .4byte sub_8030674 - .4byte sub_8030698 - .4byte sub_8030798 - .4byte sub_8030834 - .4byte sub_80308A8 - .4byte sub_8030910 + .4byte PlayerHandleHealthBarUpdate + .4byte PlayerHandleExpBarUpdate + .4byte PlayerHandleStatusIconUpdate + .4byte PlayerHandleStatusAnimation + .4byte PlayerHandleStatusXor .4byte sub_803097C - .4byte sub_8030988 + .4byte PlayerHandleDMATransfer .4byte sub_8030A3C .4byte sub_8030A6C .4byte sub_8030A78 @@ -1556,20 +1556,20 @@ gUnknown_081FAD98:: @ 81FAD98 .4byte sub_8030AE4 .4byte sub_8030B1C .4byte sub_8030B34 - .4byte dp01t_29_1_blink + .4byte PlayerHandleHitAnimation .4byte sub_8030BCC - .4byte sub_8030BD8 + .4byte PlayerHandleEffectivenessSound .4byte sub_8030C1C - .4byte sub_8030C4C - .4byte dp01t_2E_1_battle_intro - .4byte sub_8030CC0 + .4byte PlayerHandleFaintingCry + .4byte PlayerHandleIntroSlide + .4byte PlayerHandleTrainerBallThrow .4byte sub_8030FAC .4byte sub_80310A4 .4byte sub_80310F0 - .4byte dp01t_33_1_enemy_move - .4byte bx_exec_buffer_A_ch0_tbl1 - .4byte dp01t_35_1_link_standby_message_and_free_vram - .4byte sub_8031238 + .4byte PlayerHandleSpriteInvisibility + .4byte PlayerHandleBattleAnimation + .4byte PlayerHandleLinkStandbyMsg + .4byte PlayerHandleResetActionMoveSelection .4byte sub_80312A0 .4byte nullsub_43 @@ -1670,38 +1670,38 @@ gUnknown_081FAF4C:: @ 81FAF4C .4byte 0x0200e000 .align 2 -gUnknown_081FAF5C:: @ 81FAF5C - .4byte dp01t_00_7_getattr +gOpponentBufferCommands:: @ 81FAF5C + .4byte OpponentHandleGetAttributes .4byte dp01t_01_2_read_pokmon_data_slice - .4byte dp01t_02_7_setattr + .4byte OpponentHandleSetAttributes .4byte sub_8034744 - .4byte sub_80347B8 - .4byte sub_8034910 - .4byte sub_8034AE0 - .4byte sub_8034BFC - .4byte sub_8034DC0 - .4byte sub_8034F84 + .4byte OpponentHandleLoadPokeSprite + .4byte OpponentHandleSendOutPoke + .4byte OpponentHandleReturnPokeToBall + .4byte OpponentHandleTrainerThrow + .4byte OpponentHandleTrainerSlide + .4byte OpponentHandleTrainerSlideBack .4byte sub_8035030 .4byte sub_80350D4 .4byte sub_80350E0 - .4byte sub_80350EC - .4byte sub_80350F8 - .4byte sub_8035104 - .4byte sub_803539C - .4byte sub_8035400 + .4byte OpponentHandleBallThrow + .4byte OpponentHandlePause + .4byte OpponentHandleMoveAnimation + .4byte OpponentHandlePrintString + .4byte OpponentHandlePrintStringPlayerOnly .4byte sub_803540C .4byte sub_803541C .4byte sub_8035428 .4byte sub_8035590 .4byte sub_80355C0 .4byte sub_80356C0 - .4byte sub_80356CC - .4byte sub_80357BC - .4byte sub_80357C8 - .4byte sub_803583C - .4byte sub_80358A4 + .4byte OpponentHandleHealthBarUpdate + .4byte OpponentHandleExpBarUpdate + .4byte OpponentHandleStatusIconUpdate + .4byte OpponentHandleStatusAnimation + .4byte OpponentHandleStatusXor .4byte sub_80358B0 - .4byte sub_80358BC + .4byte OpponentHandleDMATransfer .4byte sub_80358C8 .4byte sub_80358D4 .4byte sub_80358E0 @@ -1712,20 +1712,20 @@ gUnknown_081FAF5C:: @ 81FAF5C .4byte sub_803592C .4byte sub_8035964 .4byte sub_803597C - .4byte dp01t_29_7_blink + .4byte OpponentHandleHitAnimation .4byte sub_8035A14 - .4byte sub_8035A20 + .4byte OpponentHandleEffectivenessSound .4byte sub_8035A64 - .4byte sub_8035A94 + .4byte OpponentHandleFaintingCry .4byte dp01t_2E_7_battle_intro .4byte sub_8035B04 .4byte dp01t_30_7_0803D67C .4byte sub_8035E6C .4byte sub_8035EB8 - .4byte sub_8035EC4 - .4byte dp01t_34_7_move_anim_start_t3 - .4byte sub_8035F8C - .4byte sub_8035F98 + .4byte OpponentHandleSpriteInvisibility + .4byte OpponentHandleBattleAnimation + .4byte OpponentHandleLinkStandbyMsg + .4byte OpponentHandleResetActionMoveSelection .4byte sub_8035FA4 .4byte nullsub_46 @@ -1733,8 +1733,8 @@ gUnknown_081FAF5C:: @ 81FAF5C .byte 0xB0, 0xB0, 0xC8, 0x98, 0x28, 0x28, 0x28, 0x20 .align 2 -gUnknown_081FB048:: @ 81FB048 - .4byte dp01t_00_4_getattr +gLinkOpponentBufferCommands:: @ 81FB048 + .4byte LinkOpponentHandleGetAttributes .4byte sub_803889C .4byte sub_80388A8 .4byte sub_8039220 diff --git a/data/text/battle_strings.inc b/data/text/battle_strings.inc index d0c8f74d5..7a47caa0e 100644 --- a/data/text/battle_strings.inc +++ b/data/text/battle_strings.inc @@ -1177,7 +1177,7 @@ gUnknown_08400F78:: @ 8400F78 .4byte ContestStatText_TooSour .align 2 -gUnknown_08400F8C:: @ 8400F8C +gBattleStringsTable:: @ 8400F8C .4byte BattleText_UnknownString .4byte BattleText_GainExpPoints .4byte BattleText_GrewLevel @@ -1531,8 +1531,8 @@ gUnknown_08400F8C:: @ 8400F8C .4byte BattleText_NoEffectOn .align 1 -gUnknown_08401508:: @ 8401508 -@ Each entry refers to a text pointer in gUnknown_08400F8C, but the values are offset +gMissStrings:: @ 8401508 +@ Each entry refers to a text pointer in gBattleStringsTable, but the values are offset @ by 0xc. For example, 0x0017 refers to BattleText_AttackMissed because it is the @ 11th entry in the pointer table. .2byte BATTLE_TEXT_AttackMissed @@ -1790,13 +1790,13 @@ BattleTextList_401648:: @ 8401648 .2byte BATTLE_TEXT_RaisedFirePower .2byte BATTLE_TEXT_MadeIneffective -gUnknown_0840164C:: @ 840164C - .2byte BATTLE_TEXT_StopLearning - .2byte BATTLE_TEXT_FellAsleep - .2byte BATTLE_TEXT_SpeltHealthy - .2byte BATTLE_TEXT_SubTookDamage - .2byte BATTLE_TEXT_CoinScatter - .2byte BATTLE_TEXT_SandTombTrapped +gTrappingMoves:: @ 840164C + .2byte MOVE_BIND + .2byte MOVE_WRAP + .2byte MOVE_FIRE_SPIN + .2byte MOVE_CLAMP + .2byte MOVE_WHIRLPOOL + .2byte MOVE_SAND_TOMB .2byte 0xFFFF .align 2 |