diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2017-07-22 18:44:01 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-22 18:44:01 -0500 |
| commit | 5891cedc1bf4c9c95d60e5118c2809895d6191a5 (patch) | |
| tree | a37133a5c3be531d63b1e2a171c0264a62cd62cc /data/battle_scripts_2.s | |
| parent | 5e80a12ec9fcf2201c070712d8e2dcefe2a0e364 (diff) | |
| parent | 959f78fe146e75f9ce02b318eb6a8d97652a9996 (diff) | |
Merge pull request #372 from DizzyEggg/master
decompile battle_4
Diffstat (limited to 'data/battle_scripts_2.s')
| -rw-r--r-- | data/battle_scripts_2.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s index 3f0dc8af1..b10b7f96f 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -51,7 +51,7 @@ BattleScript_1D9EBC: @ 81D9EBC atk98 1 pokemoncatchfunction -gUnknown_081D9EC2:: @ 81D9EC2 +BattleScript_SuccessBallThrow:: @ 81D9EC2 jumpifhalfword 0, gLastUsedItem, 5, BattleScript_1D9ED0 atk60 11 @@ -76,12 +76,12 @@ BattleScript_1D9EF8: @ 81D9EF8 setbyte gBattleOutcome, 7 activesidesomething -gUnknown_081D9F00:: @ 81D9F00 +BattleScript_WallyBallThrow:: @ 81D9F00 printstring BATTLE_TEXT_BallCaught2 setbyte gBattleOutcome, 7 activesidesomething -gUnknown_081D9F0A:: @ 81D9F0A +BattleScript_ShakeBallThrow:: @ 81D9F0A printfromtable BattleTextList_4015E6 waitmessage 64 jumpifbyte 5, gBattleTypeFlags, 128, BattleScript_1D9F34 @@ -93,7 +93,7 @@ gUnknown_081D9F0A:: @ 81D9F0A BattleScript_1D9F34: @ 81D9F34 atkf6 -gUnknown_081D9F35:: @ 81D9F35 +BattleScript_TrainerBallBlock:: @ 81D9F35 waitmessage 64 printstring BATTLE_TEXT_BlockBall waitmessage 64 |