summaryrefslogtreecommitdiff
path: root/data/battle_scripts_2.s
diff options
context:
space:
mode:
authorDiegoisawesome <Diegoisawesome@users.noreply.github.com>2017-10-06 17:08:27 -0500
committerGitHub <noreply@github.com>2017-10-06 17:08:27 -0500
commitdea28a0a236412f267e3da8a7c200d947a9c5fe1 (patch)
tree84300b68d6e6402c16edd4e1dc30f0d8d103ab40 /data/battle_scripts_2.s
parent1bd7739ea6bf3d4d90e65cb7ea3dcf5e8fe286d4 (diff)
parent7b88c7f2f0bceb6adc0ea3081c18e175dd4cb21c (diff)
Merge pull request #57 from DizzyEggg/decomp_battle2
Decompile battle2
Diffstat (limited to 'data/battle_scripts_2.s')
-rw-r--r--data/battle_scripts_2.s10
1 files changed, 5 insertions, 5 deletions
diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s
index adabccb88..4a4dc4665 100644
--- a/data/battle_scripts_2.s
+++ b/data/battle_scripts_2.s
@@ -4,7 +4,7 @@
.section script_data, "aw", %progbits
.align 2
-gUnknown_082DBD08:: @ 82DBD08
+gBattlescriptsForBallThrow:: @ 82DBD08
.4byte gUnknown_082DBD68
.4byte gUnknown_082DBD68
.4byte gUnknown_082DBD68
@@ -29,11 +29,11 @@ gUnknown_082DBD3C:: @ 82DBD3C
.4byte gUnknown_082DBE91
.align 2
-gUnknown_082DBD54:: @ 82DBD54
- .4byte gUnknown_082DBEB3
+gBattlescriptsForRunningByItem:: @ 82DBD54
+ .4byte BattleScript_RunByUsingItem
.align 2
-gUnknown_082DBD58:: @ 82DBD58
+gBattlescriptsForSafariActions:: @ 82DBD58
.4byte gUnknown_082DBEBD
.4byte gUnknown_082DBEC4
.4byte gUnknown_082DBECD
@@ -72,7 +72,7 @@ gUnknown_082DBE6F:: @ 82DBE6F
gUnknown_082DBE91:: @ 82DBE91
.incbin "baserom.gba", 0x2dbe91, 0x22
-gUnknown_082DBEB3:: @ 82DBEB3
+BattleScript_RunByUsingItem:: @ 82DBEB3
.incbin "baserom.gba", 0x2dbeb3, 0xA
gUnknown_082DBEBD:: @ 82DBEBD