diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-27 20:52:55 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-27 20:52:55 -0400 |
| commit | 47534a1471019a25e25c29a3f5bb529ccbd73e86 (patch) | |
| tree | da4f2abb0fa27f5f07bcbdd4af47ca4eec84a786 /data/battle_scripts_2.s | |
| parent | b8fec3d9f617ec9a764bb56804c526ff7449631f (diff) | |
| parent | 922411abebd56d0f5d6072bad4924c909c8e2c27 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into trade
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 c3747cd8d..199fd0c78 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -1,15 +1,15 @@ .section script_data, "aw", %progbits -gUnknown_81D99B0:: @ 81D99B0 +gBattlescriptsForBallThrow:: @ 81D99B0 .incbin "baserom.gba", 0x1D99B0, 0x34 -gUnknown_81D99E4:: @ 81D99E4 +gBattlescriptsForUsingItem:: @ 81D99E4 .incbin "baserom.gba", 0x1D99E4, 0x18 -gUnknown_81D99FC:: @ 81D99FC +gBattlescriptsForRunningByItem:: @ 81D99FC .incbin "baserom.gba", 0x1D99FC, 0x8 -gUnknown_81D9A04:: @ 81D9A04 +gBattlescriptsForSafariActions:: @ 81D9A04 .incbin "baserom.gba", 0x1D9A04, 0x3E BattleScript_SuccessBallThrow:: @ 81D9A42 |