diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-23 12:57:46 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-23 12:57:46 -0500 |
| commit | fdd7e7cb848747a1e0ace8a63d29aaa22dfd1140 (patch) | |
| tree | 6ddaed4de52bfcc517d573a8f30c5bd0a1650782 /data/battle_scripts_2.s | |
| parent | bb8f652504f886af296ffcaac57bf76cdc893c97 (diff) | |
| parent | 1c1ce902515ccb3ccecde29611711c9b1a3ce955 (diff) | |
Merge branch 'master' into cable_car
Diffstat (limited to 'data/battle_scripts_2.s')
| -rw-r--r-- | data/battle_scripts_2.s | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s index b10b7f96f..22ecc7769 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -5,7 +5,7 @@ .section script_data, "aw", %progbits .align 2 -gUnknown_081D9E48:: @ 81D9E48 +gBattlescriptsForBallThrow:: @ 81D9E48 .4byte BattleScript_1D9EA8 .4byte BattleScript_1D9EA8 .4byte BattleScript_1D9EA8 @@ -28,10 +28,10 @@ gUnknown_081D9E7C:: @ 81D9E7C .4byte BattleScript_1D9F9C .4byte BattleScript_1D9FBB -gUnknown_081D9E94:: @ 81D9E94 +gBattlescriptsForRunningByItem:: @ 81D9E94 .4byte BattleScript_1D9FDA -gUnknown_081D9E98:: @ 81D9E98 +gBattlescriptsForSafariActions:: @ 81D9E98 .4byte BattleScript_1D9FE4 .4byte BattleScript_1D9FEB .4byte BattleScript_1D9FF4 @@ -102,7 +102,7 @@ BattleScript_TrainerBallBlock:: @ 81D9F35 atkf6 BattleScript_1D9F45: @ 81D9F45 - setbyte 0x201600c, 15 + setbyte gSharedMem + 0x1600C, 15 atk49 1, 0 end @@ -118,7 +118,7 @@ BattleScript_1D9F4F: @ 81D9F4F printstring BATTLE_TEXT_RestoredHealth waitmessage 64 atk98 1 - setbyte 0x201600c, 15 + setbyte gSharedMem + 0x1600C, 15 atk49 1, 0 atkf6 @@ -131,7 +131,7 @@ BattleScript_1D9F7B: @ 81D9F7B printfromtable BattleTextList_401620 waitmessage 64 atk98 1 - setbyte 0x201600c, 15 + setbyte gSharedMem + 0x1600C, 15 atk49 1, 0 atkf6 @@ -143,7 +143,7 @@ BattleScript_1D9F9C: @ 81D9F9C atk75 printfromtable BattleTextList_401570 waitmessage 64 - setbyte 0x201600c, 15 + setbyte gSharedMem + 0x1600C, 15 atk49 1, 0 atkf6 @@ -155,7 +155,7 @@ BattleScript_1D9FBB: @ 81D9FBB atk75 printfromtable BattleTextList_4015A0 waitmessage 64 - setbyte 0x201600c, 15 + setbyte gSharedMem + 0x1600C, 15 atk49 1, 0 atkf6 @@ -177,7 +177,7 @@ BattleScript_1D9FEB: @ 81D9FEB BattleScript_1D9FF4: @ 81D9FF4 printstring BATTLE_TEXT_ThrewBlock waitmessage 64 - playanimation USER, 4, 0x0 + playanimation USER, B_ANIM_POKEBLOCK_THROW, 0x0 printfromtable BattleTextList_40161A waitmessage 64 end2 |