diff options
| author | froggestspirit <froggestspirit@gmail.com> | 2021-09-06 10:32:14 -0400 |
|---|---|---|
| committer | froggestspirit <froggestspirit@gmail.com> | 2021-09-06 10:32:14 -0400 |
| commit | 73554ec88d4f269b6146f6d1ab5d2742cb0a6f89 (patch) | |
| tree | fac5bee8a4ce4757816dbbe42265523478b78781 /data/battle_scripts_2.s | |
| parent | ec6b1ea3735ff98a9714b219e4a999894ecc6010 (diff) | |
| parent | 63e6b914e4d9b9bdb0a8d621b2ed233990f2ef66 (diff) | |
Merge remote-tracking branch 'pret/master'
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 996048dd3..b7f0f693f 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -12,7 +12,7 @@ .section script_data, "aw", %progbits .align 2 -gBattlescriptsForBallThrow:: @ 82DBD08 +gBattlescriptsForBallThrow:: .4byte BattleScript_BallThrow @ ITEM_NONE .4byte BattleScript_BallThrow @ ITEM_MASTER_BALL .4byte BattleScript_BallThrow @ ITEM_ULTRA_BALL @@ -28,7 +28,7 @@ gBattlescriptsForBallThrow:: @ 82DBD08 .4byte BattleScript_BallThrow @ ITEM_PREMIER_BALL .align 2 -gBattlescriptsForUsingItem:: @ 82DBD3C +gBattlescriptsForUsingItem:: .4byte BattleScript_PlayerUsesItem .4byte BattleScript_OpponentUsesHealItem @ AI_ITEM_FULL_RESTORE .4byte BattleScript_OpponentUsesHealItem @ AI_ITEM_HEAL_HP @@ -37,11 +37,11 @@ gBattlescriptsForUsingItem:: @ 82DBD3C .4byte BattleScript_OpponentUsesGuardSpec @ AI_ITEM_GUARD_SPEC .align 2 -gBattlescriptsForRunningByItem:: @ 82DBD54 +gBattlescriptsForRunningByItem:: .4byte BattleScript_RunByUsingItem .align 2 -gBattlescriptsForSafariActions:: @ 82DBD58 +gBattlescriptsForSafariActions:: .4byte BattleScript_ActionWatchesCarefully .4byte BattleScript_ActionGetNear .4byte BattleScript_ActionThrowPokeblock |