diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-02-02 00:24:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-02 00:24:16 -0500 |
| commit | 64460e01aede2bbcaa8d1dd18dd3fab590fa4a6e (patch) | |
| tree | 58be3a15322f5c0972b71525f5cd22149bb67696 /data | |
| parent | 7e26aa3d21f55e1375bfde6ffbc70210170fdc37 (diff) | |
| parent | 3fd5e143a986334985c2c786c324663dbba2db9b (diff) | |
Merge pull request #1314 from GriffinRichards/doc-controllers
Document battle controllers, misc other battle
Diffstat (limited to 'data')
| -rw-r--r-- | data/battle_scripts_1.s | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 1c3f3ea5b..6e0476182 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -2989,7 +2989,7 @@ BattleScript_LocalBattleLostDoTrainer2WinText:: BattleScript_LocalBattleLostEnd_:: end2 -BattleScript_82DAA0B:: +BattleScript_FrontierLinkBattleLost:: returnopponentmon1toball BS_ATTACKER waitstate returnopponentmon2toball BS_ATTACKER @@ -3002,23 +3002,23 @@ BattleScript_82DAA0B:: trainerslidein BS_FAINTED waitstate printstring STRINGID_TRAINER2WINTEXT - jumpifbattletype BATTLE_TYPE_RECORDED, BattleScript_82DAA31 - atk57 -BattleScript_82DAA31:: + jumpifbattletype BATTLE_TYPE_RECORDED, BattleScript_FrontierLinkBattleLostEnd + endlinkbattle +BattleScript_FrontierLinkBattleLostEnd:: waitmessage 0x40 end2 BattleScript_LinkBattleWonOrLost:: - jumpifbattletype BATTLE_TYPE_BATTLE_TOWER, BattleScript_82DAA5C + jumpifbattletype BATTLE_TYPE_BATTLE_TOWER, BattleScript_TowerLinkBattleWon printstring STRINGID_BATTLEEND waitmessage 0x40 jumpifbattletype BATTLE_TYPE_RECORDED, BattleScript_LinkBattleWonOrLostWaitEnd - atk57 + endlinkbattle BattleScript_LinkBattleWonOrLostWaitEnd:: waitmessage 0x40 end2 -BattleScript_82DAA5C:: +BattleScript_TowerLinkBattleWon:: playtrainerdefeatbgm BS_ATTACKER printstring STRINGID_BATTLEEND waitmessage 0x40 @@ -3030,9 +3030,9 @@ BattleScript_82DAA5C:: trainerslidein BS_FAINTED waitstate printstring STRINGID_TRAINER2LOSETEXT - jumpifbattletype BATTLE_TYPE_RECORDED, BattleScript_82DAA83 - atk57 -BattleScript_82DAA83:: + jumpifbattletype BATTLE_TYPE_RECORDED, BattleScript_TowerLinkBattleWonEnd + endlinkbattle +BattleScript_TowerLinkBattleWonEnd:: waitmessage 0x40 end2 @@ -4566,6 +4566,6 @@ BattleScript_PrintPlayerForfeited:: BattleScript_PrintPlayerForfeitedLinkBattle:: printstring STRINGID_FORFEITEDMATCH waitmessage 0x40 - atk57 + endlinkbattle waitmessage 0x40 end2 |